diff --git a/config/external/icu/data/icudt67l.dat b/config/external/icu/data/icudt68l.dat similarity index 70% rename from config/external/icu/data/icudt67l.dat rename to config/external/icu/data/icudt68l.dat index 0bc50f6407a8..657ae1bf7003 100644 Binary files a/config/external/icu/data/icudt67l.dat and b/config/external/icu/data/icudt68l.dat differ diff --git a/config/external/icu/i18n/sources.mozbuild b/config/external/icu/i18n/sources.mozbuild index 2f24d271b695..d52f1b2e270e 100644 --- a/config/external/icu/i18n/sources.mozbuild +++ b/config/external/icu/i18n/sources.mozbuild @@ -79,7 +79,6 @@ sources = [ '/intl/icu/source/i18n/nfrs.cpp', '/intl/icu/source/i18n/nfrule.cpp', '/intl/icu/source/i18n/nfsubs.cpp', - '/intl/icu/source/i18n/nounit.cpp', '/intl/icu/source/i18n/number_affixutils.cpp', '/intl/icu/source/i18n/number_asformat.cpp', '/intl/icu/source/i18n/number_capi.cpp', @@ -103,6 +102,8 @@ sources = [ '/intl/icu/source/i18n/number_rounding.cpp', '/intl/icu/source/i18n/number_scientific.cpp', '/intl/icu/source/i18n/number_skeletons.cpp', + '/intl/icu/source/i18n/number_symbolswrapper.cpp', + '/intl/icu/source/i18n/number_usageprefs.cpp', '/intl/icu/source/i18n/number_utils.cpp', '/intl/icu/source/i18n/numfmt.cpp', '/intl/icu/source/i18n/numparse_affixes.cpp', @@ -114,11 +115,13 @@ sources = [ '/intl/icu/source/i18n/numparse_scientific.cpp', '/intl/icu/source/i18n/numparse_symbols.cpp', '/intl/icu/source/i18n/numparse_validators.cpp', + '/intl/icu/source/i18n/numrange_capi.cpp', '/intl/icu/source/i18n/numrange_fluent.cpp', '/intl/icu/source/i18n/numrange_impl.cpp', '/intl/icu/source/i18n/numsys.cpp', '/intl/icu/source/i18n/olsontz.cpp', '/intl/icu/source/i18n/persncal.cpp', + '/intl/icu/source/i18n/pluralranges.cpp', '/intl/icu/source/i18n/plurfmt.cpp', '/intl/icu/source/i18n/plurrule.cpp', '/intl/icu/source/i18n/quantityformatter.cpp', @@ -163,6 +166,10 @@ sources = [ '/intl/icu/source/i18n/uitercollationiterator.cpp', '/intl/icu/source/i18n/ulistformatter.cpp', '/intl/icu/source/i18n/umsg.cpp', + '/intl/icu/source/i18n/units_complexconverter.cpp', + '/intl/icu/source/i18n/units_converter.cpp', + '/intl/icu/source/i18n/units_data.cpp', + '/intl/icu/source/i18n/units_router.cpp', '/intl/icu/source/i18n/unum.cpp', '/intl/icu/source/i18n/unumsys.cpp', '/intl/icu/source/i18n/upluralrules.cpp', @@ -313,6 +320,7 @@ EXPORTS.unicode += [ '/intl/icu/source/i18n/unicode/unirepl.h', '/intl/icu/source/i18n/unicode/unum.h', '/intl/icu/source/i18n/unicode/unumberformatter.h', + '/intl/icu/source/i18n/unicode/unumberrangeformatter.h', '/intl/icu/source/i18n/unicode/unumsys.h', '/intl/icu/source/i18n/unicode/upluralrules.h', '/intl/icu/source/i18n/unicode/uregex.h', diff --git a/intl/icu/GIT-INFO b/intl/icu/GIT-INFO index bb5e9860e85c..ea7c1e1412d9 100644 --- a/intl/icu/GIT-INFO +++ b/intl/icu/GIT-INFO @@ -1,10 +1,5 @@ -commit 40252f6fe1dabbe6b043773b639acfae2294add3 +commit 6fe67a037c07135b6b3edafca18326a824e338c3 Author: Jeff Genovy <29107334+jefgen@users.noreply.github.com> -Date: Wed Jun 10 10:34:28 2020 -0700 +Date: Wed Jan 27 12:48:40 2021 -0800 - ICU-21150 Backport fix for broken Windows build with prebuilt datafile to ICU 67 - - This is cherry-picked from: - ICU-21102 Fix broken builds on Windows when using a pre-built data file (from the tgz). - - (cherry picked from commit 82a5959b863ac647fce3bcc5804ed906fb3b4bc0) + ICU-21473 Disable LayoutEx in GHA CI script for ICU 68, was disabled by default in ICU 69 diff --git a/intl/icu/source/.clang-format b/intl/icu/source/.clang-format new file mode 100644 index 000000000000..83cbf646a43d --- /dev/null +++ b/intl/icu/source/.clang-format @@ -0,0 +1,11 @@ +# © 2020 and later: Unicode, Inc. and others. +# License & terms of use: http://www.unicode.org/copyright.html + +--- +Language: Cpp +BasedOnStyle: LLVM +IndentWidth: 4 +ColumnLimit: 105 +AllowShortBlocksOnASingleLine: false +AllowShortIfStatementsOnASingleLine: true +... diff --git a/intl/icu/source/Doxyfile.in b/intl/icu/source/Doxyfile.in index 25b535cc7ac7..7ced104ce80b 100644 --- a/intl/icu/source/Doxyfile.in +++ b/intl/icu/source/Doxyfile.in @@ -1310,7 +1310,7 @@ CHM_FILE = HHC_LOCATION = # The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the master .chm file (NO). +# (YES) or that it should be included in the primary .chm file (NO). # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. diff --git a/intl/icu/source/allinone/Build.Windows.PlatformToolset.props b/intl/icu/source/allinone/Build.Windows.PlatformToolset.props index b4777679b80a..adee8f671917 100644 --- a/intl/icu/source/allinone/Build.Windows.PlatformToolset.props +++ b/intl/icu/source/allinone/Build.Windows.PlatformToolset.props @@ -1,16 +1,22 @@ - - + + - + $(VisualStudioVersion) - $(MSBuildToolsVersion) - + + $(MSBuildToolsVersion) + v140 v141 + v142 $(AutoDetectedPlatformToolset) @@ -18,9 +24,36 @@ $(DefaultPlatformToolset) + + + + + 10.0 + + + + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) + + $(WindowsTargetPlatformVersion_10).0 + + $(WindowsTargetPlatformVersion_10) + + + 8.1 + + - - + MSB8012 diff --git a/intl/icu/source/allinone/Build.Windows.ProjectConfiguration.props b/intl/icu/source/allinone/Build.Windows.ProjectConfiguration.props index ab535881c794..147689b910af 100644 --- a/intl/icu/source/allinone/Build.Windows.ProjectConfiguration.props +++ b/intl/icu/source/allinone/Build.Windows.ProjectConfiguration.props @@ -56,13 +56,7 @@ binARM64 libARM64 - - - - 8.1 - - + diff --git a/intl/icu/source/allinone/Build.Windows.UWP.ProjectConfiguration.props b/intl/icu/source/allinone/Build.Windows.UWP.ProjectConfiguration.props index 359d2c2de438..89d528a77919 100644 --- a/intl/icu/source/allinone/Build.Windows.UWP.ProjectConfiguration.props +++ b/intl/icu/source/allinone/Build.Windows.UWP.ProjectConfiguration.props @@ -8,18 +8,8 @@ Windows Store 10.0 - - - - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) - - $(WindowsTargetPlatformVersion_10).0 - - $(WindowsTargetPlatformVersion_10) - + + 10.0.10240.0 diff --git a/intl/icu/source/common/Makefile.in b/intl/icu/source/common/Makefile.in index 7d149eba6ac6..67bcf00349fa 100644 --- a/intl/icu/source/common/Makefile.in +++ b/intl/icu/source/common/Makefile.in @@ -79,45 +79,8 @@ endif # $(LIBICUDT) is either stub data or the real DLL common data. LIBS = $(LIBICUDT) $(DEFAULT_LIBS) -OBJECTS = errorcode.o putil.o umath.o utypes.o uinvchar.o umutex.o ucln_cmn.o \ -uinit.o uobject.o cmemory.o charstr.o cstr.o \ -udata.o ucmndata.o udatamem.o umapfile.o udataswp.o utrie_swap.o ucol_swp.o utrace.o \ -uhash.o uhash_us.o uenum.o ustrenum.o uvector.o ustack.o uvectr32.o uvectr64.o \ -ucnv.o ucnv_bld.o ucnv_cnv.o ucnv_io.o ucnv_cb.o ucnv_err.o ucnvlat1.o \ -ucnv_u7.o ucnv_u8.o ucnv_u16.o ucnv_u32.o ucnvscsu.o ucnvbocu.o \ -ucnv_ext.o ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvisci.o ucnvdisp.o ucnv_set.o ucnv_ct.o \ -resource.o uresbund.o ures_cnv.o uresdata.o resbund.o resbund_cnv.o \ -ucurr.o \ -localebuilder.o localeprioritylist.o \ -messagepattern.o ucat.o locmap.o uloc.o locid.o locutil.o locavailable.o locdispnames.o locdspnm.o loclikely.o locresdata.o \ -lsr.o loclikelysubtags.o locdistance.o localematcher.o \ -bytestream.o stringpiece.o bytesinkutil.o \ -stringtriebuilder.o bytestriebuilder.o \ -bytestrie.o bytestrieiterator.o \ -ucharstrie.o ucharstriebuilder.o ucharstrieiterator.o \ -dictionarydata.o \ -edits.o \ -appendable.o ustr_cnv.o unistr_cnv.o unistr.o unistr_case.o unistr_props.o \ -utf_impl.o ustring.o ustrcase.o ucasemap.o ucasemap_titlecase_brkiter.o cstring.o ustrfmt.o ustrtrns.o ustr_wcs.o utext.o \ -unistr_case_locale.o ustrcase_locale.o unistr_titlecase_brkiter.o ustr_titlecase_brkiter.o \ -normalizer2impl.o normalizer2.o filterednormalizer2.o normlzr.o unorm.o unormcmp.o loadednormalizer2impl.o \ -chariter.o schriter.o uchriter.o uiter.o \ -patternprops.o uchar.o uprops.o ucase.o propname.o ubidi_props.o characterproperties.o \ -ubidi.o ubidiwrt.o ubidiln.o ushape.o \ -uscript.o uscript_props.o usc_impl.o unames.o \ -utrie.o utrie2.o utrie2_builder.o ucptrie.o umutablecptrie.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 filteredbrk.o \ -rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o rbbi_cache.o \ -serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o \ -uidna.o usprep.o uts46.o punycode.o \ -util.o util_props.o parsepos.o locbased.o cwchar.o wintz.o dtintrv.o ucnvsel.o propsvec.o \ -ulist.o uloc_tag.o icudataver.o icuplug.o \ -sharedobject.o simpleformatter.o unifiedcache.o uloc_keytype.o \ -ubiditransform.o \ -pluralmap.o \ -static_unicode_sets.o \ -restrace.o +SOURCES = $(shell cat $(srcdir)/sources.txt) +OBJECTS = $(SOURCES:.cpp=.o) ## Header files to install HEADERS = $(srcdir)/unicode/*.h diff --git a/intl/icu/source/common/bmpset.h b/intl/icu/source/common/bmpset.h index 018aeb7f95b0..e1982ac669db 100644 --- a/intl/icu/source/common/bmpset.h +++ b/intl/icu/source/common/bmpset.h @@ -101,7 +101,7 @@ private: */ UBool latin1Contains[0x100]; - /* TRUE if contains(U+FFFD). */ + /* true if contains(U+FFFD). */ UBool containsFFFD; /* diff --git a/intl/icu/source/common/brkeng.h b/intl/icu/source/common/brkeng.h index e40fce13f64b..155433b89a86 100644 --- a/intl/icu/source/common/brkeng.h +++ b/intl/icu/source/common/brkeng.h @@ -54,7 +54,7 @@ class LanguageBreakEngine : public UMemory { * a particular kind of break.

* * @param c A character which begins a run that the engine might handle - * @return TRUE if this engine handles the particular character and break + * @return true if this engine handles the particular character and break * type. */ virtual UBool handles(UChar32 c) const = 0; @@ -171,7 +171,7 @@ class UnhandledEngine : public LanguageBreakEngine { * a particular kind of break.

* * @param c A character which begins a run that the engine might handle - * @return TRUE if this engine handles the particular character and break + * @return true if this engine handles the particular character and break * type. */ virtual UBool handles(UChar32 c) const; diff --git a/intl/icu/source/common/bytesinkutil.h b/intl/icu/source/common/bytesinkutil.h index 6808fbe67778..ab2516432d31 100644 --- a/intl/icu/source/common/bytesinkutil.h +++ b/intl/icu/source/common/bytesinkutil.h @@ -45,9 +45,9 @@ public: static UBool appendUnchanged(const uint8_t *s, int32_t length, ByteSink &sink, uint32_t options, Edits *edits, UErrorCode &errorCode) { - if (U_FAILURE(errorCode)) { return FALSE; } + if (U_FAILURE(errorCode)) { return false; } if (length > 0) { appendNonEmptyUnchanged(s, length, sink, options, edits); } - return TRUE; + return true; } static UBool appendUnchanged(const uint8_t *s, const uint8_t *limit, diff --git a/intl/icu/source/common/charstr.cpp b/intl/icu/source/common/charstr.cpp index dda29dac6327..318a185b3f1d 100644 --- a/intl/icu/source/common/charstr.cpp +++ b/intl/icu/source/common/charstr.cpp @@ -20,6 +20,7 @@ #include "cmemory.h" #include "cstring.h" #include "uinvchar.h" +#include "ustr_imp.h" U_NAMESPACE_BEGIN @@ -46,6 +47,19 @@ char *CharString::cloneData(UErrorCode &errorCode) const { return p; } +int32_t CharString::extract(char *dest, int32_t capacity, UErrorCode &errorCode) const { + if (U_FAILURE(errorCode)) { return len; } + if (capacity < 0 || (capacity > 0 && dest == nullptr)) { + errorCode = U_ILLEGAL_ARGUMENT_ERROR; + return len; + } + const char *src = buffer.getAlias(); + if (0 < len && len <= capacity && src != dest) { + uprv_memcpy(dest, src, len); + } + return u_terminateChars(dest, capacity, len, &errorCode); +} + CharString &CharString::copyFrom(const CharString &s, UErrorCode &errorCode) { if(U_SUCCESS(errorCode) && this!=&s && ensureCapacity(s.len+1, 0, errorCode)) { len=s.len; @@ -197,7 +211,7 @@ CharString &CharString::appendPathPart(StringPiece s, UErrorCode &errorCode) { } char c; if(len>0 && (c=buffer[len-1])!=U_FILE_SEP_CHAR && c!=U_FILE_ALT_SEP_CHAR) { - append(U_FILE_SEP_CHAR, errorCode); + append(getDirSepChar(), errorCode); } append(s, errorCode); return *this; @@ -207,9 +221,19 @@ CharString &CharString::ensureEndsWithFileSeparator(UErrorCode &errorCode) { char c; if(U_SUCCESS(errorCode) && len>0 && (c=buffer[len-1])!=U_FILE_SEP_CHAR && c!=U_FILE_ALT_SEP_CHAR) { - append(U_FILE_SEP_CHAR, errorCode); + append(getDirSepChar(), errorCode); } return *this; } +char CharString::getDirSepChar() const { + char dirSepChar = U_FILE_SEP_CHAR; +#if (U_FILE_SEP_CHAR != U_FILE_ALT_SEP_CHAR) + // We may need to return a different directory separator when building for Cygwin or MSYS2. + if(len>0 && !uprv_strchr(data(), U_FILE_SEP_CHAR) && uprv_strchr(data(), U_FILE_ALT_SEP_CHAR)) + dirSepChar = U_FILE_ALT_SEP_CHAR; +#endif + return dirSepChar; +} + U_NAMESPACE_END diff --git a/intl/icu/source/common/charstr.h b/intl/icu/source/common/charstr.h index 23b950ed6ecc..6619faac6181 100644 --- a/intl/icu/source/common/charstr.h +++ b/intl/icu/source/common/charstr.h @@ -87,6 +87,22 @@ public: * The caller must uprv_free() the result. */ char *cloneData(UErrorCode &errorCode) const; + /** + * Copies the contents of the string into dest. + * Checks if there is enough space in dest, extracts the entire string if possible, + * and NUL-terminates dest if possible. + * + * If the string fits into dest but cannot be NUL-terminated (length()==capacity), + * then the error code is set to U_STRING_NOT_TERMINATED_WARNING. + * If the string itself does not fit into dest (length()>capacity), + * then the error code is set to U_BUFFER_OVERFLOW_ERROR. + * + * @param dest Destination string buffer. + * @param capacity Size of the dest buffer (number of chars). + * @param errorCode ICU error code. + * @return length() + */ + int32_t extract(char *dest, int32_t capacity, UErrorCode &errorCode) const; bool operator==(StringPiece other) const { return len == other.length() && (len == 0 || uprv_memcmp(data(), other.data(), len) == 0); @@ -141,13 +157,13 @@ public: /** * Appends a filename/path part, e.g., a directory name. - * First appends a U_FILE_SEP_CHAR if necessary. + * First appends a U_FILE_SEP_CHAR or U_FILE_ALT_SEP_CHAR if necessary. * Does nothing if s is empty. */ CharString &appendPathPart(StringPiece s, UErrorCode &errorCode); /** - * Appends a U_FILE_SEP_CHAR if this string is not empty + * Appends a U_FILE_SEP_CHAR or U_FILE_ALT_SEP_CHAR if this string is not empty * and does not already end with a U_FILE_SEP_CHAR or U_FILE_ALT_SEP_CHAR. */ CharString &ensureEndsWithFileSeparator(UErrorCode &errorCode); @@ -160,6 +176,12 @@ private: CharString(const CharString &other); // forbid copying of this class CharString &operator=(const CharString &other); // forbid copying of this class + + /** + * Returns U_FILE_ALT_SEP_CHAR if found in string, and U_FILE_SEP_CHAR is not found. + * Otherwise returns U_FILE_SEP_CHAR. + */ + char getDirSepChar() const; }; U_NAMESPACE_END diff --git a/intl/icu/source/common/charstrmap.h b/intl/icu/source/common/charstrmap.h new file mode 100644 index 000000000000..3320a4620852 --- /dev/null +++ b/intl/icu/source/common/charstrmap.h @@ -0,0 +1,55 @@ +// © 2020 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +// charstrmap.h +// created: 2020sep01 Frank Yung-Fong Tang + +#ifndef __CHARSTRMAP_H__ +#define __CHARSTRMAP_H__ + +#include +#include "unicode/utypes.h" +#include "unicode/uobject.h" +#include "uhash.h" + +U_NAMESPACE_BEGIN + +/** + * Map of const char * keys & values. + * Stores pointers as is: Does not own/copy/adopt/release strings. + */ +class CharStringMap final : public UMemory { +public: + /** Constructs an unusable non-map. */ + CharStringMap() : map(nullptr) {} + CharStringMap(int32_t size, UErrorCode &errorCode) { + map = uhash_openSize(uhash_hashChars, uhash_compareChars, uhash_compareChars, + size, &errorCode); + } + CharStringMap(CharStringMap &&other) U_NOEXCEPT : map(other.map) { + other.map = nullptr; + } + CharStringMap(const CharStringMap &other) = delete; + ~CharStringMap() { + uhash_close(map); + } + + CharStringMap &operator=(CharStringMap &&other) U_NOEXCEPT { + map = other.map; + other.map = nullptr; + return *this; + } + CharStringMap &operator=(const CharStringMap &other) = delete; + + const char *get(const char *key) const { return static_cast(uhash_get(map, key)); } + void put(const char *key, const char *value, UErrorCode &errorCode) { + uhash_put(map, const_cast(key), const_cast(value), &errorCode); + } + +private: + UHashtable *map; +}; + +U_NAMESPACE_END + +#endif // __CHARSTRMAP_H__ diff --git a/intl/icu/source/common/cmemory.h b/intl/icu/source/common/cmemory.h index 8d6044202155..a9d9424b4e24 100644 --- a/intl/icu/source/common/cmemory.h +++ b/intl/icu/source/common/cmemory.h @@ -292,14 +292,21 @@ public: /** * Default constructor initializes with internal T[stackCapacity] buffer. */ - MaybeStackArray() : ptr(stackArray), capacity(stackCapacity), needToRelease(FALSE) {} + MaybeStackArray() : ptr(stackArray), capacity(stackCapacity), needToRelease(false) {} /** * Automatically allocates the heap array if the argument is larger than the stack capacity. * Intended for use when an approximate capacity is known at compile time but the true * capacity is not known until runtime. */ - MaybeStackArray(int32_t newCapacity) : MaybeStackArray() { - if (capacity < newCapacity) { resize(newCapacity); } + MaybeStackArray(int32_t newCapacity, UErrorCode status) : MaybeStackArray() { + if (U_FAILURE(status)) { + return; + } + if (capacity < newCapacity) { + if (resize(newCapacity) == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + } + } } /** * Destructor deletes the array (if owned). @@ -355,7 +362,7 @@ public: releaseArray(); ptr=otherArray; capacity=otherCapacity; - needToRelease=FALSE; + needToRelease=false; } } /** @@ -380,6 +387,20 @@ public: * caller becomes responsible for deleting the array */ inline T *orphanOrClone(int32_t length, int32_t &resultCapacity); + +protected: + // Resizes the array to the size of src, then copies the contents of src. + void copyFrom(const MaybeStackArray &src, UErrorCode &status) { + if (U_FAILURE(status)) { + return; + } + if (this->resize(src.capacity, 0) == NULL) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + uprv_memcpy(this->ptr, src.ptr, (size_t)capacity * sizeof(T)); + } + private: T *ptr; int32_t capacity; @@ -393,14 +414,14 @@ private: void resetToStackArray() { ptr=stackArray; capacity=stackCapacity; - needToRelease=FALSE; + needToRelease=false; } /* No comparison operators with other MaybeStackArray's. */ - bool operator==(const MaybeStackArray & /*other*/) {return FALSE;} - bool operator!=(const MaybeStackArray & /*other*/) {return TRUE;} + bool operator==(const MaybeStackArray & /*other*/) = delete; + bool operator!=(const MaybeStackArray & /*other*/) = delete; /* No ownership transfer: No copy constructor, no assignment operator. */ - MaybeStackArray(const MaybeStackArray & /*other*/) {} - void operator=(const MaybeStackArray & /*other*/) {} + MaybeStackArray(const MaybeStackArray & /*other*/) = delete; + void operator=(const MaybeStackArray & /*other*/) = delete; }; template @@ -435,7 +456,7 @@ template inline T *MaybeStackArray::resize(int32_t newCapacity, int32_t length) { if(newCapacity>0) { #if U_DEBUG && defined(UPRV_MALLOC_COUNT) - ::fprintf(::stderr,"MaybeStacArray (resize) alloc %d * %lu\n", newCapacity,sizeof(T)); + ::fprintf(::stderr, "MaybeStackArray (resize) alloc %d * %lu\n", newCapacity, sizeof(T)); #endif T *p=(T *)uprv_malloc(newCapacity*sizeof(T)); if(p!=NULL) { @@ -451,7 +472,7 @@ inline T *MaybeStackArray::resize(int32_t newCapacity, int32_t releaseArray(); ptr=p; capacity=newCapacity; - needToRelease=TRUE; + needToRelease=true; } return p; } else { @@ -507,7 +528,7 @@ public: /** * Default constructor initializes with internal H+T[stackCapacity] buffer. */ - MaybeStackHeaderAndArray() : ptr(&stackHeader), capacity(stackCapacity), needToRelease(FALSE) {} + MaybeStackHeaderAndArray() : ptr(&stackHeader), capacity(stackCapacity), needToRelease(false) {} /** * Destructor deletes the memory (if owned). */ @@ -556,7 +577,7 @@ public: releaseMemory(); ptr=otherMemory; capacity=otherCapacity; - needToRelease=FALSE; + needToRelease=false; } } /** @@ -595,8 +616,8 @@ private: } } /* No comparison operators with other MaybeStackHeaderAndArray's. */ - bool operator==(const MaybeStackHeaderAndArray & /*other*/) {return FALSE;} - bool operator!=(const MaybeStackHeaderAndArray & /*other*/) {return TRUE;} + bool operator==(const MaybeStackHeaderAndArray & /*other*/) {return false;} + bool operator!=(const MaybeStackHeaderAndArray & /*other*/) {return true;} /* No ownership transfer: No copy constructor, no assignment operator. */ MaybeStackHeaderAndArray(const MaybeStackHeaderAndArray & /*other*/) {} void operator=(const MaybeStackHeaderAndArray & /*other*/) {} @@ -625,7 +646,7 @@ inline H *MaybeStackHeaderAndArray::resize(int32_t newCapac releaseMemory(); ptr=p; capacity=newCapacity; - needToRelease=TRUE; + needToRelease=true; } return p; } else { @@ -657,7 +678,7 @@ inline H *MaybeStackHeaderAndArray::orphanOrClone(int32_t l resultCapacity=length; ptr=&stackHeader; capacity=stackCapacity; - needToRelease=FALSE; + needToRelease=false; return p; } @@ -704,9 +725,14 @@ public: } MemoryPool& operator=(MemoryPool&& other) U_NOEXCEPT { - fCount = other.fCount; - fPool = std::move(other.fPool); - other.fCount = 0; + // Since `this` may contain instances that need to be deleted, we can't + // just throw them away and replace them with `other`. The normal way of + // dealing with this in C++ is to swap `this` and `other`, rather than + // simply overwrite: the destruction of `other` can then take care of + // running MemoryPool::~MemoryPool() over the still-to-be-deallocated + // instances. + std::swap(fCount, other.fCount); + std::swap(fPool, other.fPool); return *this; } @@ -728,6 +754,18 @@ public: return fPool[fCount++] = new T(std::forward(args)...); } + template + T* createAndCheckErrorCode(UErrorCode &status, Args &&... args) { + if (U_FAILURE(status)) { + return nullptr; + } + T *pointer = this->create(args...); + if (U_SUCCESS(status) && pointer == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + } + return pointer; + } + /** * @return Number of elements that have been allocated. */ @@ -763,14 +801,16 @@ protected: template class MaybeStackVector : protected MemoryPool { public: - using MemoryPool::MemoryPool; - using MemoryPool::operator=; - template T* emplaceBack(Args&&... args) { return this->create(args...); } + template + T *emplaceBackAndCheckErrorCode(UErrorCode &status, Args &&... args) { + return this->createAndCheckErrorCode(status, args...); + } + int32_t length() const { return this->fCount; } @@ -779,6 +819,10 @@ public: return this->fPool.getAlias(); } + const T *const *getAlias() const { + return this->fPool.getAlias(); + } + /** * Array item access (read-only). * No index bounds check. @@ -798,19 +842,6 @@ public: T* operator[](ptrdiff_t i) { return this->fPool[i]; } - - /** - * Append all the items from another MaybeStackVector to this one. - */ - void appendAll(const MaybeStackVector& other, UErrorCode& status) { - for (int32_t i = 0; i < other.fCount; i++) { - T* item = emplaceBack(*other[i]); - if (!item) { - status = U_MEMORY_ALLOCATION_ERROR; - return; - } - } - } }; diff --git a/intl/icu/source/common/common.vcxproj b/intl/icu/source/common/common.vcxproj index 3cee6576846e..d7f668ea9d83 100644 --- a/intl/icu/source/common/common.vcxproj +++ b/intl/icu/source/common/common.vcxproj @@ -16,22 +16,6 @@ - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 @@ -74,7 +58,7 @@ MultiThreadedDebugDLL - ..\..\$(IcuBinOutputDir)\icuuc67d.dll + ..\..\$(IcuBinOutputDir)\icuuc68d.dll .\..\..\$(IcuLibOutputDir)\icuucd.pdb ..\..\$(IcuLibOutputDir)\icuucd.lib @@ -86,7 +70,7 @@ true - ..\..\$(IcuBinOutputDir)\icuuc67.dll + ..\..\$(IcuBinOutputDir)\icuuc68.dll .\..\..\$(IcuLibOutputDir)\icuuc.pdb ..\..\$(IcuLibOutputDir)\icuuc.lib @@ -357,7 +341,9 @@ + + diff --git a/intl/icu/source/common/common.vcxproj.filters b/intl/icu/source/common/common.vcxproj.filters index 5fabc6f46190..f1ba90109ce3 100644 --- a/intl/icu/source/common/common.vcxproj.filters +++ b/intl/icu/source/common/common.vcxproj.filters @@ -840,6 +840,12 @@ locales & resources + + locales & resources + + + locales & resources + locales & resources diff --git a/intl/icu/source/common/common_uwp.vcxproj b/intl/icu/source/common/common_uwp.vcxproj index cd97800aa736..a57917292a74 100644 --- a/intl/icu/source/common/common_uwp.vcxproj +++ b/intl/icu/source/common/common_uwp.vcxproj @@ -52,10 +52,6 @@ - - - - <_ProjectFileVersion>10.0.30319.1 @@ -129,7 +125,7 @@ true vccorlib.lib;msvcrt.lib;vcruntime.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuuc67.dll + ..\..\$(IcuBinOutputDir)\icuuc68.dll .\..\..\$(IcuLibOutputDir)\icuuc.pdb ..\..\$(IcuLibOutputDir)\icuuc.lib @@ -152,7 +148,7 @@ true vccorlibd.lib;msvcrtd.lib;vcruntimed.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuuc67d.dll + ..\..\$(IcuBinOutputDir)\icuuc68d.dll .\..\..\$(IcuLibOutputDir)\icuucd.pdb ..\..\$(IcuLibOutputDir)\icuucd.lib @@ -480,6 +476,8 @@ + + @@ -532,4 +530,4 @@ - \ No newline at end of file + diff --git a/intl/icu/source/common/dictbe.h b/intl/icu/source/common/dictbe.h index 731bfdff9f22..4ea676fc7161 100644 --- a/intl/icu/source/common/dictbe.h +++ b/intl/icu/source/common/dictbe.h @@ -59,7 +59,7 @@ class DictionaryBreakEngine : public LanguageBreakEngine { * a particular kind of break.

* * @param c A character which begins a run that the engine might handle - * @return TRUE if this engine handles the particular character and break + * @return true if this engine handles the particular character and break * type. */ virtual UBool handles(UChar32 c) const; diff --git a/intl/icu/source/common/icuplug.cpp b/intl/icu/source/common/icuplug.cpp index c6439cc819a3..4ab8c66ebe31 100644 --- a/intl/icu/source/common/icuplug.cpp +++ b/intl/icu/source/common/icuplug.cpp @@ -145,7 +145,7 @@ static int32_t searchForLibrary(void *lib) { return -1; } -U_INTERNAL char * U_EXPORT2 +U_CAPI char * U_EXPORT2 uplug_findLibrary(void *lib, UErrorCode *status) { int32_t libEnt; char *ret = NULL; @@ -161,7 +161,7 @@ uplug_findLibrary(void *lib, UErrorCode *status) { return ret; } -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uplug_openLibrary(const char *libName, UErrorCode *status) { int32_t libEntry = -1; void *lib = NULL; @@ -209,7 +209,7 @@ uplug_openLibrary(const char *libName, UErrorCode *status) { return lib; } -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_closeLibrary(void *lib, UErrorCode *status) { int32_t i; @@ -507,7 +507,7 @@ uplug_getConfiguration(UPlugData *data) { return data->config; } -U_INTERNAL UPlugData* U_EXPORT2 +U_CAPI UPlugData* U_EXPORT2 uplug_getPlugInternal(int32_t n) { if(n <0 || n >= pluginCount) { return NULL; @@ -707,7 +707,7 @@ static void uplug_loadWaitingPlugs(UErrorCode *status) { static char plugin_file[2048] = ""; #endif -U_INTERNAL const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uplug_getPluginFile() { #if U_ENABLE_DYLOAD && !UCONFIG_NO_FILE_IO return plugin_file; @@ -782,8 +782,8 @@ uplug_init(UErrorCode *status) { /* plugin_file is not used for processing - it is only used so that uplug_getPluginFile() works (i.e. icuinfo) */ - uprv_strncpy(plugin_file, pluginFile.data(), sizeof(plugin_file)); - + pluginFile.extract(plugin_file, sizeof(plugin_file), *status); + #if UPLUG_TRACE DBG((stderr, "pluginfile= %s len %d/%d\n", plugin_file, (int)strlen(plugin_file), (int)sizeof(plugin_file))); #endif diff --git a/intl/icu/source/common/icuplugimp.h b/intl/icu/source/common/icuplugimp.h index 3cad8f87f18c..9df309204e7a 100644 --- a/intl/icu/source/common/icuplugimp.h +++ b/intl/icu/source/common/icuplugimp.h @@ -36,7 +36,7 @@ * @return the library pointer, or NULL * @internal internal use only */ -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uplug_openLibrary(const char *libName, UErrorCode *status); /** @@ -45,7 +45,7 @@ uplug_openLibrary(const char *libName, UErrorCode *status); * @param status error code * @internal internal use only */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_closeLibrary(void *lib, UErrorCode *status); /** @@ -55,7 +55,7 @@ uplug_closeLibrary(void *lib, UErrorCode *status); * @return the library name, or NULL if not found. * @internal internal use only */ -U_INTERNAL char * U_EXPORT2 +U_CAPI char * U_EXPORT2 uplug_findLibrary(void *lib, UErrorCode *status); /** @} */ @@ -69,21 +69,21 @@ uplug_findLibrary(void *lib, UErrorCode *status); * @param status error result * @internal - Internal use only. */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_init(UErrorCode *status); /** * Get raw plug N * @internal - Internal use only */ -U_INTERNAL UPlugData* U_EXPORT2 +U_CAPI UPlugData* U_EXPORT2 uplug_getPlugInternal(int32_t n); /** * Get the name of the plugin file. * @internal - Internal use only. */ -U_INTERNAL const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uplug_getPluginFile(void); /** @} */ diff --git a/intl/icu/source/common/localematcher.cpp b/intl/icu/source/common/localematcher.cpp index 85db8c8bf324..5795cbf87e63 100644 --- a/intl/icu/source/common/localematcher.cpp +++ b/intl/icu/source/common/localematcher.cpp @@ -1,12 +1,9 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // localematcher.cpp // created: 2019may08 Markus W. Scherer -#ifndef __LOCMATCHER_H__ -#define __LOCMATCHER_H__ - #include "unicode/utypes.h" #include "unicode/localebuilder.h" #include "unicode/localematcher.h" @@ -131,6 +128,7 @@ LocaleMatcher::Builder::Builder(LocaleMatcher::Builder &&src) U_NOEXCEPT : thresholdDistance_(src.thresholdDistance_), demotion_(src.demotion_), defaultLocale_(src.defaultLocale_), + withDefault_(src.withDefault_), favor_(src.favor_), direction_(src.direction_) { src.supportedLocales_ = nullptr; @@ -140,6 +138,8 @@ LocaleMatcher::Builder::Builder(LocaleMatcher::Builder &&src) U_NOEXCEPT : LocaleMatcher::Builder::~Builder() { delete supportedLocales_; delete defaultLocale_; + delete maxDistanceDesired_; + delete maxDistanceSupported_; } LocaleMatcher::Builder &LocaleMatcher::Builder::operator=(LocaleMatcher::Builder &&src) U_NOEXCEPT { @@ -150,6 +150,7 @@ LocaleMatcher::Builder &LocaleMatcher::Builder::operator=(LocaleMatcher::Builder thresholdDistance_ = src.thresholdDistance_; demotion_ = src.demotion_; defaultLocale_ = src.defaultLocale_; + withDefault_ = src.withDefault_, favor_ = src.favor_; direction_ = src.direction_; @@ -229,6 +230,14 @@ LocaleMatcher::Builder &LocaleMatcher::Builder::addSupportedLocale(const Locale return *this; } +LocaleMatcher::Builder &LocaleMatcher::Builder::setNoDefaultLocale() { + if (U_FAILURE(errorCode_)) { return *this; } + delete defaultLocale_; + defaultLocale_ = nullptr; + withDefault_ = false; + return *this; +} + LocaleMatcher::Builder &LocaleMatcher::Builder::setDefaultLocale(const Locale *defaultLocale) { if (U_FAILURE(errorCode_)) { return *this; } Locale *clone = nullptr; @@ -241,6 +250,7 @@ LocaleMatcher::Builder &LocaleMatcher::Builder::setDefaultLocale(const Locale *d } delete defaultLocale_; defaultLocale_ = clone; + withDefault_ = true; return *this; } @@ -256,6 +266,24 @@ LocaleMatcher::Builder &LocaleMatcher::Builder::setDemotionPerDesiredLocale(ULoc return *this; } +LocaleMatcher::Builder &LocaleMatcher::Builder::setMaxDistance(const Locale &desired, + const Locale &supported) { + if (U_FAILURE(errorCode_)) { return *this; } + Locale *desiredClone = desired.clone(); + Locale *supportedClone = supported.clone(); + if (desiredClone == nullptr || supportedClone == nullptr) { + delete desiredClone; // in case only one could not be allocated + delete supportedClone; + errorCode_ = U_MEMORY_ALLOCATION_ERROR; + return *this; + } + delete maxDistanceDesired_; + delete maxDistanceSupported_; + maxDistanceDesired_ = desiredClone; + maxDistanceSupported_ = supportedClone; + return *this; +} + #if 0 /** * Internal only! @@ -340,9 +368,6 @@ LocaleMatcher::LocaleMatcher(const Builder &builder, UErrorCode &errorCode) : supportedLSRs(nullptr), supportedIndexes(nullptr), supportedLSRsLength(0), ownedDefaultLocale(nullptr), defaultLocale(nullptr) { if (U_FAILURE(errorCode)) { return; } - if (thresholdDistance < 0) { - thresholdDistance = localeDistance.getDefaultScriptDistance(); - } const Locale *def = builder.defaultLocale_; LSR builderDefaultLSR; const LSR *defLSR = nullptr; @@ -408,22 +433,20 @@ LocaleMatcher::LocaleMatcher(const Builder &builder, UErrorCode &errorCode) : int32_t suppLength = 0; // Determine insertion order. // Add locales immediately that are equivalent to the default. - MaybeStackArray order(supportedLocalesLength); - if (order.getAlias() == nullptr) { - errorCode = U_MEMORY_ALLOCATION_ERROR; - return; - } + MaybeStackArray order(supportedLocalesLength, errorCode); + if (U_FAILURE(errorCode)) { return; } int32_t numParadigms = 0; for (int32_t i = 0; i < supportedLocalesLength; ++i) { const Locale &locale = *supportedLocales[i]; const LSR &lsr = lsrs[i]; - if (defLSR == nullptr) { + if (defLSR == nullptr && builder.withDefault_) { + // Implicit default locale = first supported locale, if not turned off. U_ASSERT(i == 0); def = &locale; defLSR = &lsr; order[i] = 1; suppLength = putIfAbsent(lsr, 0, suppLength, errorCode); - } else if (lsr.isEquivalentTo(*defLSR)) { + } else if (defLSR != nullptr && lsr.isEquivalentTo(*defLSR)) { order[i] = 1; suppLength = putIfAbsent(lsr, i, suppLength, errorCode); } else if (localeDistance.isParadigmLSR(lsr)) { @@ -458,6 +481,25 @@ LocaleMatcher::LocaleMatcher(const Builder &builder, UErrorCode &errorCode) : if (builder.demotion_ == ULOCMATCH_DEMOTION_REGION) { demotionPerDesiredLocale = localeDistance.getDefaultDemotionPerDesiredLocale(); } + + if (thresholdDistance >= 0) { + // already copied + } else if (builder.maxDistanceDesired_ != nullptr) { + LSR suppLSR = getMaximalLsrOrUnd(likelySubtags, *builder.maxDistanceSupported_, errorCode); + const LSR *pSuppLSR = &suppLSR; + int32_t indexAndDistance = localeDistance.getBestIndexAndDistance( + getMaximalLsrOrUnd(likelySubtags, *builder.maxDistanceDesired_, errorCode), + &pSuppLSR, 1, + LocaleDistance::shiftDistance(100), favorSubtag, direction); + if (U_SUCCESS(errorCode)) { + // +1 for an exclusive threshold from an inclusive max. + thresholdDistance = LocaleDistance::getDistanceFloor(indexAndDistance) + 1; + } else { + thresholdDistance = 0; + } + } else { + thresholdDistance = localeDistance.getDefaultScriptDistance(); + } } LocaleMatcher::LocaleMatcher(LocaleMatcher &&src) U_NOEXCEPT : @@ -683,6 +725,18 @@ int32_t LocaleMatcher::getBestSuppIndex(LSR desiredLSR, LocaleLsrIterator *remai return supportedIndexes[bestSupportedLsrIndex]; } +UBool LocaleMatcher::isMatch(const Locale &desired, const Locale &supported, + UErrorCode &errorCode) const { + LSR suppLSR = getMaximalLsrOrUnd(likelySubtags, supported, errorCode); + if (U_FAILURE(errorCode)) { return 0; } + const LSR *pSuppLSR = &suppLSR; + int32_t indexAndDistance = localeDistance.getBestIndexAndDistance( + getMaximalLsrOrUnd(likelySubtags, desired, errorCode), + &pSuppLSR, 1, + LocaleDistance::shiftDistance(thresholdDistance), favorSubtag, direction); + return indexAndDistance >= 0; +} + double LocaleMatcher::internalMatch(const Locale &desired, const Locale &supported, UErrorCode &errorCode) const { // Returns the inverse of the distance: That is, 1-distance(desired, supported). LSR suppLSR = getMaximalLsrOrUnd(likelySubtags, supported, errorCode); @@ -790,5 +844,3 @@ uloc_acceptLanguageFromHTTP(char *result, int32_t resultAvailable, return acceptLanguage(*availableLocales, desiredLocales, result, resultAvailable, outResult, *status); } - -#endif // __LOCMATCHER_H__ diff --git a/intl/icu/source/common/localeprioritylist.cpp b/intl/icu/source/common/localeprioritylist.cpp index cee408269c9b..8916b121be30 100644 --- a/intl/icu/source/common/localeprioritylist.cpp +++ b/intl/icu/source/common/localeprioritylist.cpp @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // localeprioritylist.cpp // created: 2019jul11 Markus W. Scherer diff --git a/intl/icu/source/common/localeprioritylist.h b/intl/icu/source/common/localeprioritylist.h index 80ca38a7b528..41e9d3ea081f 100644 --- a/intl/icu/source/common/localeprioritylist.h +++ b/intl/icu/source/common/localeprioritylist.h @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // localeprioritylist.h // created: 2019jul11 Markus W. Scherer diff --git a/intl/icu/source/common/locdispnames.cpp b/intl/icu/source/common/locdispnames.cpp index d92348e31c88..47c0667417c7 100644 --- a/intl/icu/source/common/locdispnames.cpp +++ b/intl/icu/source/common/locdispnames.cpp @@ -26,6 +26,8 @@ #include "unicode/uloc.h" #include "unicode/ures.h" #include "unicode/ustring.h" +#include "bytesinkutil.h" +#include "charstr.h" #include "cmemory.h" #include "cstring.h" #include "putilimp.h" @@ -406,20 +408,26 @@ uloc_getDisplayScript(const char* locale, UChar *dest, int32_t destCapacity, UErrorCode *pErrorCode) { - UErrorCode err = U_ZERO_ERROR; - int32_t res = _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity, + UErrorCode err = U_ZERO_ERROR; + int32_t res = _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity, uloc_getScript, _kScriptsStandAlone, &err); - - if ( err == U_USING_DEFAULT_WARNING ) { + + if (destCapacity == 0 && err == U_BUFFER_OVERFLOW_ERROR) { + // For preflight, return the max of the value and the fallback. + int32_t fallback_res = _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity, + uloc_getScript, _kScripts, pErrorCode); + return (fallback_res > res) ? fallback_res : res; + } + if ( err == U_USING_DEFAULT_WARNING ) { return _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity, - uloc_getScript, _kScripts, pErrorCode); - } else { - *pErrorCode = err; - return res; - } + uloc_getScript, _kScripts, pErrorCode); + } else { + *pErrorCode = err; + return res; + } } -U_INTERNAL int32_t U_EXPORT2 +static int32_t uloc_getDisplayScriptInContext(const char* locale, const char* displayLocale, UChar *dest, int32_t destCapacity, @@ -727,7 +735,7 @@ uloc_getDisplayName(const char *locale, int32_t padLen; patPos+=subLen; padLen=(subi==0 ? sub1Pos : patLen)-patPos; - if(length+padLen < destCapacity) { + if(length+padLen <= destCapacity) { p=dest+length; for(int32_t i=0;i> DISTANCE_SHIFT; + } + static int32_t getIndex(int32_t indexAndDistance) { // assert indexAndDistance >= 0; return indexAndDistance >> INDEX_SHIFT; @@ -79,10 +83,6 @@ private: // tic constexpr int32_t MAX_INDEX = 0x1fffff; // avoids sign bit static constexpr int32_t INDEX_NEG_1 = 0xfffffc00; - static int32_t getDistanceFloor(int32_t indexAndDistance) { - return (indexAndDistance & DISTANCE_MASK) >> DISTANCE_SHIFT; - } - LocaleDistance(const LocaleDistanceData &data, const XLikelySubtags &likely); LocaleDistance(const LocaleDistance &other) = delete; LocaleDistance &operator=(const LocaleDistance &other) = delete; diff --git a/intl/icu/source/common/locid.cpp b/intl/icu/source/common/locid.cpp index 753a452120ee..874e4a70556f 100644 --- a/intl/icu/source/common/locid.cpp +++ b/intl/icu/source/common/locid.cpp @@ -35,6 +35,7 @@ #include "unicode/bytestream.h" #include "unicode/locid.h" +#include "unicode/localebuilder.h" #include "unicode/strenum.h" #include "unicode/stringpiece.h" #include "unicode/uloc.h" @@ -42,6 +43,7 @@ #include "bytesinkutil.h" #include "charstr.h" +#include "charstrmap.h" #include "cmemory.h" #include "cstring.h" #include "mutex.h" @@ -51,7 +53,9 @@ #include "uhash.h" #include "ulocimp.h" #include "umutex.h" +#include "uniquecharstr.h" #include "ustr_imp.h" +#include "uvector.h" U_CDECL_BEGIN static UBool U_CALLCONV locale_cleanup(void); @@ -102,12 +106,6 @@ typedef enum ELocalePos { eMAX_LOCALES } ELocalePos; -U_CFUNC int32_t locale_getKeywords(const char *localeID, - char prev, - char *keywords, int32_t keywordCapacity, - UBool valuesToo, - UErrorCode *status); - U_CDECL_BEGIN // // Deleter function for Locales owned by the default Locale hash table/ @@ -252,6 +250,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(Locale) // '_' // In the platform codepage. #define SEP_CHAR '_' +#define NULL_CHAR '\0' Locale::~Locale() { @@ -506,38 +505,1132 @@ Locale::operator==( const Locale& other) const return (uprv_strcmp(other.fullName, fullName) == 0); } -#define ISASCIIALPHA(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z')) - namespace { -CharString& AppendLSCVE(CharString& out, const char* language, const char* script, - const char* country, const char* variants, const char* extension, - UErrorCode& status) { - out.append(language, status); - if (script && script[0] != '\0') { - out.append('_', status); - out.append(script, status); +UInitOnce gKnownCanonicalizedInitOnce = U_INITONCE_INITIALIZER; +UHashtable *gKnownCanonicalized = nullptr; + +static const char* const KNOWN_CANONICALIZED[] = { + "c", + // Commonly used locales known are already canonicalized + "af", "af_ZA", "am", "am_ET", "ar", "ar_001", "as", "as_IN", "az", "az_AZ", + "be", "be_BY", "bg", "bg_BG", "bn", "bn_IN", "bs", "bs_BA", "ca", "ca_ES", + "cs", "cs_CZ", "cy", "cy_GB", "da", "da_DK", "de", "de_DE", "el", "el_GR", + "en", "en_GB", "en_US", "es", "es_419", "es_ES", "et", "et_EE", "eu", + "eu_ES", "fa", "fa_IR", "fi", "fi_FI", "fil", "fil_PH", "fr", "fr_FR", + "ga", "ga_IE", "gl", "gl_ES", "gu", "gu_IN", "he", "he_IL", "hi", "hi_IN", + "hr", "hr_HR", "hu", "hu_HU", "hy", "hy_AM", "id", "id_ID", "is", "is_IS", + "it", "it_IT", "ja", "ja_JP", "jv", "jv_ID", "ka", "ka_GE", "kk", "kk_KZ", + "km", "km_KH", "kn", "kn_IN", "ko", "ko_KR", "ky", "ky_KG", "lo", "lo_LA", + "lt", "lt_LT", "lv", "lv_LV", "mk", "mk_MK", "ml", "ml_IN", "mn", "mn_MN", + "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "nb", "nb_NO", "ne", "ne_NP", + "nl", "nl_NL", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", + "pt", "pt_BR", "pt_PT", "ro", "ro_RO", "ru", "ru_RU", "sd", "sd_IN", "si", + "si_LK", "sk", "sk_SK", "sl", "sl_SI", "so", "so_SO", "sq", "sq_AL", "sr", + "sr_Cyrl_RS", "sr_Latn", "sr_RS", "sv", "sv_SE", "sw", "sw_TZ", "ta", + "ta_IN", "te", "te_IN", "th", "th_TH", "tk", "tk_TM", "tr", "tr_TR", "uk", + "uk_UA", "ur", "ur_PK", "uz", "uz_UZ", "vi", "vi_VN", "yue", "yue_Hant", + "yue_Hant_HK", "yue_HK", "zh", "zh_CN", "zh_Hans", "zh_Hans_CN", "zh_Hant", + "zh_Hant_TW", "zh_TW", "zu", "zu_ZA" +}; + +static UBool U_CALLCONV cleanupKnownCanonicalized() { + gKnownCanonicalizedInitOnce.reset(); + if (gKnownCanonicalized) { uhash_close(gKnownCanonicalized); } + return TRUE; +} + +static void U_CALLCONV loadKnownCanonicalized(UErrorCode &status) { + ucln_common_registerCleanup(UCLN_COMMON_LOCALE_KNOWN_CANONICALIZED, + cleanupKnownCanonicalized); + LocalUHashtablePointer newKnownCanonicalizedMap( + uhash_open(uhash_hashChars, uhash_compareChars, nullptr, &status)); + for (int32_t i = 0; + U_SUCCESS(status) && i < UPRV_LENGTHOF(KNOWN_CANONICALIZED); + i++) { + uhash_puti(newKnownCanonicalizedMap.getAlias(), + (void*)KNOWN_CANONICALIZED[i], + 1, &status); } - if (country && country[0] != '\0') { - out.append('_', status); - out.append(country, status); + if (U_FAILURE(status)) { + return; } - if (variants && variants[0] != '\0') { - if ((script == nullptr || script[0] == '\0') && - (country == nullptr || country[0] == '\0')) { - out.append('_', status); + + gKnownCanonicalized = newKnownCanonicalizedMap.orphan(); +} + +class AliasData; + +/** + * A Builder class to build the alias data. + */ +class AliasDataBuilder { +public: + AliasDataBuilder() { + } + + // Build the AliasData from resource. + AliasData* build(UErrorCode &status); + +private: + void readAlias(UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + void (*checkType)(const char* type), + void (*checkReplacement)(const UnicodeString& replacement), + UErrorCode &status); + + // Read the languageAlias data from alias to + // strings+types+replacementIndexes + // The number of record will be stored into length. + // Allocate length items for types, to store the type field. + // Allocate length items for replacementIndexes, + // to store the index in the strings for the replacement script. + void readLanguageAlias(UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + UErrorCode &status); + + // Read the scriptAlias data from alias to + // strings+types+replacementIndexes + // Allocate length items for types, to store the type field. + // Allocate length items for replacementIndexes, + // to store the index in the strings for the replacement script. + void readScriptAlias(UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, UErrorCode &status); + + // Read the territoryAlias data from alias to + // strings+types+replacementIndexes + // Allocate length items for types, to store the type field. + // Allocate length items for replacementIndexes, + // to store the index in the strings for the replacement script. + void readTerritoryAlias(UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, UErrorCode &status); + + // Read the variantAlias data from alias to + // strings+types+replacementIndexes + // Allocate length items for types, to store the type field. + // Allocate length items for replacementIndexes, + // to store the index in the strings for the replacement variant. + void readVariantAlias(UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, UErrorCode &status); +}; + +/** + * A class to hold the Alias Data. + */ +class AliasData : public UMemory { +public: + static const AliasData* singleton(UErrorCode& status) { + if (U_FAILURE(status)) { + // Do not get into loadData if the status already has error. + return nullptr; } - out.append('_', status); - out.append(variants, status); + umtx_initOnce(AliasData::gInitOnce, &AliasData::loadData, status); + return gSingleton; } - if (extension && extension[0] != '\0') { - out.append(extension, status); + + const CharStringMap& languageMap() const { return language; } + const CharStringMap& scriptMap() const { return script; } + const CharStringMap& territoryMap() const { return territory; } + const CharStringMap& variantMap() const { return variant; } + + static void U_CALLCONV loadData(UErrorCode &status); + static UBool U_CALLCONV cleanup(); + + static UInitOnce gInitOnce; + +private: + AliasData(CharStringMap languageMap, + CharStringMap scriptMap, + CharStringMap territoryMap, + CharStringMap variantMap, + CharString* strings) + : language(std::move(languageMap)), + script(std::move(scriptMap)), + territory(std::move(territoryMap)), + variant(std::move(variantMap)), + strings(strings) { + } + + ~AliasData() { + delete strings; + } + + static const AliasData* gSingleton; + + CharStringMap language; + CharStringMap script; + CharStringMap territory; + CharStringMap variant; + CharString* strings; + + friend class AliasDataBuilder; +}; + + +const AliasData* AliasData::gSingleton = nullptr; +UInitOnce AliasData::gInitOnce = U_INITONCE_INITIALIZER; + +UBool U_CALLCONV +AliasData::cleanup() +{ + gInitOnce.reset(); + delete gSingleton; + return TRUE; +} + +void +AliasDataBuilder::readAlias( + UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + void (*checkType)(const char* type), + void (*checkReplacement)(const UnicodeString& replacement), + UErrorCode &status) { + if (U_FAILURE(status)) { + return; + } + length = ures_getSize(alias); + const char** rawTypes = types.allocateInsteadAndCopy(length); + if (rawTypes == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + int32_t* rawIndexes = replacementIndexes.allocateInsteadAndCopy(length); + if (rawIndexes == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + int i = 0; + while (ures_hasNext(alias)) { + LocalUResourceBundlePointer res( + ures_getNextResource(alias, nullptr, &status)); + const char* aliasFrom = ures_getKey(res.getAlias()); + UnicodeString aliasTo = + ures_getUnicodeStringByKey(res.getAlias(), "replacement", &status); + + checkType(aliasFrom); + checkReplacement(aliasTo); + + rawTypes[i] = aliasFrom; + rawIndexes[i] = strings->add(aliasTo, status); + i++; + } +} + +/** + * Read the languageAlias data from alias to strings+types+replacementIndexes. + * Allocate length items for types, to store the type field. Allocate length + * items for replacementIndexes, to store the index in the strings for the + * replacement language. + */ +void +AliasDataBuilder::readLanguageAlias( + UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + UErrorCode &status) +{ + return readAlias( + alias, strings, types, replacementIndexes, length, +#if U_DEBUG + [](const char* type) { + // Assert the aliasFrom only contains the following possibilties + // language_REGION_variant + // language_REGION + // language_variant + // language + // und_variant + Locale test(type); + // Assert no script in aliasFrom + U_ASSERT(test.getScript()[0] == '\0'); + // Assert when language is und, no REGION in aliasFrom. + U_ASSERT(test.getLanguage()[0] != '\0' || test.getCountry()[0] == '\0'); + }, +#else + [](const char*) {}, +#endif + [](const UnicodeString&) {}, status); +} + +/** + * Read the scriptAlias data from alias to strings+types+replacementIndexes. + * Allocate length items for types, to store the type field. Allocate length + * items for replacementIndexes, to store the index in the strings for the + * replacement script. + */ +void +AliasDataBuilder::readScriptAlias( + UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + UErrorCode &status) +{ + return readAlias( + alias, strings, types, replacementIndexes, length, +#if U_DEBUG + [](const char* type) { + U_ASSERT(uprv_strlen(type) == 4); + }, + [](const UnicodeString& replacement) { + U_ASSERT(replacement.length() == 4); + }, +#else + [](const char*) {}, + [](const UnicodeString&) { }, +#endif + status); +} + +/** + * Read the territoryAlias data from alias to strings+types+replacementIndexes. + * Allocate length items for types, to store the type field. Allocate length + * items for replacementIndexes, to store the index in the strings for the + * replacement regions. + */ +void +AliasDataBuilder::readTerritoryAlias( + UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + UErrorCode &status) +{ + return readAlias( + alias, strings, types, replacementIndexes, length, +#if U_DEBUG + [](const char* type) { + U_ASSERT(uprv_strlen(type) == 2 || uprv_strlen(type) == 3); + }, +#else + [](const char*) {}, +#endif + [](const UnicodeString&) { }, + status); +} + +/** + * Read the variantAlias data from alias to strings+types+replacementIndexes. + * Allocate length items for types, to store the type field. Allocate length + * items for replacementIndexes, to store the index in the strings for the + * replacement variant. + */ +void +AliasDataBuilder::readVariantAlias( + UResourceBundle* alias, + UniqueCharStrings* strings, + LocalMemory& types, + LocalMemory& replacementIndexes, + int32_t &length, + UErrorCode &status) +{ + return readAlias( + alias, strings, types, replacementIndexes, length, +#if U_DEBUG + [](const char* type) { + U_ASSERT(uprv_strlen(type) >= 4 && uprv_strlen(type) <= 8); + U_ASSERT(uprv_strlen(type) != 4 || + (type[0] >= '0' && type[0] <= '9')); + }, + [](const UnicodeString& replacement) { + U_ASSERT(replacement.length() >= 4 && replacement.length() <= 8); + U_ASSERT(replacement.length() != 4 || + (replacement.charAt(0) >= u'0' && + replacement.charAt(0) <= u'9')); + }, +#else + [](const char*) {}, + [](const UnicodeString&) { }, +#endif + status); +} + +/** + * Initializes the alias data from the ICU resource bundles. The alias data + * contains alias of language, country, script and variants. + * + * If the alias data has already loaded, then this method simply returns without + * doing anything meaningful. + */ +void U_CALLCONV +AliasData::loadData(UErrorCode &status) +{ +#ifdef LOCALE_CANONICALIZATION_DEBUG + UDate start = uprv_getRawUTCtime(); +#endif // LOCALE_CANONICALIZATION_DEBUG + ucln_common_registerCleanup(UCLN_COMMON_LOCALE_ALIAS, cleanup); + AliasDataBuilder builder; + gSingleton = builder.build(status); +#ifdef LOCALE_CANONICALIZATION_DEBUG + UDate end = uprv_getRawUTCtime(); + printf("AliasData::loadData took total %f ms\n", end - start); +#endif // LOCALE_CANONICALIZATION_DEBUG +} + +/** + * Build the alias data from resources. + */ +AliasData* +AliasDataBuilder::build(UErrorCode &status) { + LocalUResourceBundlePointer metadata( + ures_openDirect(nullptr, "metadata", &status)); + LocalUResourceBundlePointer metadataAlias( + ures_getByKey(metadata.getAlias(), "alias", nullptr, &status)); + LocalUResourceBundlePointer languageAlias( + ures_getByKey(metadataAlias.getAlias(), "language", nullptr, &status)); + LocalUResourceBundlePointer scriptAlias( + ures_getByKey(metadataAlias.getAlias(), "script", nullptr, &status)); + LocalUResourceBundlePointer territoryAlias( + ures_getByKey(metadataAlias.getAlias(), "territory", nullptr, &status)); + LocalUResourceBundlePointer variantAlias( + ures_getByKey(metadataAlias.getAlias(), "variant", nullptr, &status)); + + if (U_FAILURE(status)) { + return nullptr; + } + int32_t languagesLength = 0, scriptLength = 0, territoryLength = 0, + variantLength = 0; + + // Read the languageAlias into languageTypes, languageReplacementIndexes + // and strings + UniqueCharStrings strings(status); + LocalMemory languageTypes; + LocalMemory languageReplacementIndexes; + readLanguageAlias(languageAlias.getAlias(), + &strings, + languageTypes, + languageReplacementIndexes, + languagesLength, + status); + + // Read the scriptAlias into scriptTypes, scriptReplacementIndexes + // and strings + LocalMemory scriptTypes; + LocalMemory scriptReplacementIndexes; + readScriptAlias(scriptAlias.getAlias(), + &strings, + scriptTypes, + scriptReplacementIndexes, + scriptLength, + status); + + // Read the territoryAlias into territoryTypes, territoryReplacementIndexes + // and strings + LocalMemory territoryTypes; + LocalMemory territoryReplacementIndexes; + readTerritoryAlias(territoryAlias.getAlias(), + &strings, + territoryTypes, + territoryReplacementIndexes, + territoryLength, status); + + // Read the variantAlias into variantTypes, variantReplacementIndexes + // and strings + LocalMemory variantTypes; + LocalMemory variantReplacementIndexes; + readVariantAlias(variantAlias.getAlias(), + &strings, + variantTypes, + variantReplacementIndexes, + variantLength, status); + + if (U_FAILURE(status)) { + return nullptr; + } + + // We can only use strings after freeze it. + strings.freeze(); + + // Build the languageMap from languageTypes & languageReplacementIndexes + CharStringMap languageMap(490, status); + for (int32_t i = 0; U_SUCCESS(status) && i < languagesLength; i++) { + languageMap.put(languageTypes[i], + strings.get(languageReplacementIndexes[i]), + status); + } + + // Build the scriptMap from scriptTypes & scriptReplacementIndexes + CharStringMap scriptMap(1, status); + for (int32_t i = 0; U_SUCCESS(status) && i < scriptLength; i++) { + scriptMap.put(scriptTypes[i], + strings.get(scriptReplacementIndexes[i]), + status); + } + + // Build the territoryMap from territoryTypes & territoryReplacementIndexes + CharStringMap territoryMap(650, status); + for (int32_t i = 0; U_SUCCESS(status) && i < territoryLength; i++) { + territoryMap.put(territoryTypes[i], + strings.get(territoryReplacementIndexes[i]), + status); + } + + // Build the variantMap from variantTypes & variantReplacementIndexes. + CharStringMap variantMap(2, status); + for (int32_t i = 0; U_SUCCESS(status) && i < variantLength; i++) { + variantMap.put(variantTypes[i], + strings.get(variantReplacementIndexes[i]), + status); + } + + if (U_FAILURE(status)) { + return nullptr; + } + + // copy hashtables + auto *data = new AliasData( + std::move(languageMap), + std::move(scriptMap), + std::move(territoryMap), + std::move(variantMap), + strings.orphanCharStrings()); + + if (data == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + } + return data; +} + +/** + * A class that find the replacement values of locale fields by using AliasData. + */ +class AliasReplacer { +public: + AliasReplacer(UErrorCode status) : + language(nullptr), script(nullptr), region(nullptr), + extensions(nullptr), variants(status), + data(nullptr) { + } + ~AliasReplacer() { + } + + // Check the fields inside locale, if need to replace fields, + // place the the replaced locale ID in out and return true. + // Otherwise return false for no replacement or error. + bool replace( + const Locale& locale, CharString& out, UErrorCode& status); + +private: + const char* language; + const char* script; + const char* region; + const char* extensions; + UVector variants; + + const AliasData* data; + + inline bool notEmpty(const char* str) { + return str && str[0] != NULL_CHAR; + } + + /** + * If replacement is neither null nor empty and input is either null or empty, + * return replacement. + * If replacement is neither null nor empty but input is not empty, return input. + * If replacement is either null or empty and type is either null or empty, + * return input. + * Otherwise return null. + * replacement input type return + * AAA nullptr * AAA + * AAA BBB * BBB + * nullptr || "" CCC nullptr CCC + * nullptr || "" * DDD nullptr + */ + inline const char* deleteOrReplace( + const char* input, const char* type, const char* replacement) { + return notEmpty(replacement) ? + ((input == nullptr) ? replacement : input) : + ((type == nullptr) ? input : nullptr); + } + + inline bool same(const char* a, const char* b) { + if (a == nullptr && b == nullptr) { + return true; + } + if ((a == nullptr && b != nullptr) || + (a != nullptr && b == nullptr)) { + return false; + } + return uprv_strcmp(a, b) == 0; + } + + // Gather fields and generate locale ID into out. + CharString& outputToString(CharString& out, UErrorCode status); + + // Generate the lookup key. + CharString& generateKey(const char* language, const char* region, + const char* variant, CharString& out, + UErrorCode status); + + void parseLanguageReplacement(const char* replacement, + const char*& replaceLanguage, + const char*& replaceScript, + const char*& replaceRegion, + const char*& replaceVariant, + const char*& replaceExtensions, + UVector& toBeFreed, + UErrorCode& status); + + // Replace by using languageAlias. + bool replaceLanguage(bool checkLanguage, bool checkRegion, + bool checkVariants, UVector& toBeFreed, + UErrorCode& status); + + // Replace by using territoryAlias. + bool replaceTerritory(UVector& toBeFreed, UErrorCode& status); + + // Replace by using scriptAlias. + bool replaceScript(UErrorCode& status); + + // Replace by using variantAlias. + bool replaceVariant(UErrorCode& status); +}; + +CharString& +AliasReplacer::generateKey( + const char* language, const char* region, const char* variant, + CharString& out, UErrorCode status) +{ + out.append(language, status); + if (notEmpty(region)) { + out.append(SEP_CHAR, status) + .append(region, status); + } + if (notEmpty(variant)) { + out.append(SEP_CHAR, status) + .append(variant, status); } return out; } +void +AliasReplacer::parseLanguageReplacement( + const char* replacement, + const char*& replacedLanguage, + const char*& replacedScript, + const char*& replacedRegion, + const char*& replacedVariant, + const char*& replacedExtensions, + UVector& toBeFreed, + UErrorCode& status) +{ + if (U_FAILURE(status)) { + return; + } + replacedScript = replacedRegion = replacedVariant + = replacedExtensions = nullptr; + if (uprv_strchr(replacement, '_') == nullptr) { + replacedLanguage = replacement; + // reach the end, just return it. + return; + } + // We have multiple field so we have to allocate and parse + CharString* str = new CharString( + replacement, (int32_t)uprv_strlen(replacement), status); + if (U_FAILURE(status)) { + return; + } + if (str == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + toBeFreed.addElement(str, status); + char* data = str->data(); + replacedLanguage = (const char*) data; + char* endOfField = uprv_strchr(data, '_'); + *endOfField = '\0'; // null terminiate it. + endOfField++; + const char* start = endOfField; + endOfField = (char*) uprv_strchr(start, '_'); + size_t len = 0; + if (endOfField == nullptr) { + len = uprv_strlen(start); + } else { + len = endOfField - start; + *endOfField = '\0'; // null terminiate it. + } + if (len == 4 && uprv_isASCIILetter(*start)) { + // Got a script + replacedScript = start; + if (endOfField == nullptr) { + return; + } + start = endOfField++; + endOfField = (char*)uprv_strchr(start, '_'); + if (endOfField == nullptr) { + len = uprv_strlen(start); + } else { + len = endOfField - start; + *endOfField = '\0'; // null terminiate it. + } + } + if (len >= 2 && len <= 3) { + // Got a region + replacedRegion = start; + if (endOfField == nullptr) { + return; + } + start = endOfField++; + endOfField = (char*)uprv_strchr(start, '_'); + if (endOfField == nullptr) { + len = uprv_strlen(start); + } else { + len = endOfField - start; + *endOfField = '\0'; // null terminiate it. + } + } + if (len >= 4) { + // Got a variant + replacedVariant = start; + if (endOfField == nullptr) { + return; + } + start = endOfField++; + } + replacedExtensions = start; +} + +bool +AliasReplacer::replaceLanguage( + bool checkLanguage, bool checkRegion, + bool checkVariants, UVector& toBeFreed, UErrorCode& status) +{ + if (U_FAILURE(status)) { + return false; + } + if ( (checkRegion && region == nullptr) || + (checkVariants && variants.size() == 0)) { + // Nothing to search. + return false; + } + int32_t variant_size = checkVariants ? variants.size() : 1; + // Since we may have more than one variant, we need to loop through them. + const char* searchLanguage = checkLanguage ? language : "und"; + const char* searchRegion = checkRegion ? region : nullptr; + const char* searchVariant = nullptr; + for (int32_t variant_index = 0; + variant_index < variant_size; + variant_index++) { + if (checkVariants) { + U_ASSERT(variant_index < variant_size); + searchVariant = (const char*)(variants.elementAt(variant_index)); + } + + if (searchVariant != nullptr && uprv_strlen(searchVariant) < 4) { + // Do not consider ill-formed variant subtag. + searchVariant = nullptr; + } + CharString typeKey; + generateKey(searchLanguage, searchRegion, searchVariant, typeKey, + status); + if (U_FAILURE(status)) { + return false; + } + const char *replacement = data->languageMap().get(typeKey.data()); + if (replacement == nullptr) { + // Found no replacement data. + continue; + } + + const char* replacedLanguage = nullptr; + const char* replacedScript = nullptr; + const char* replacedRegion = nullptr; + const char* replacedVariant = nullptr; + const char* replacedExtensions = nullptr; + parseLanguageReplacement(replacement, + replacedLanguage, + replacedScript, + replacedRegion, + replacedVariant, + replacedExtensions, + toBeFreed, + status); + replacedLanguage = + (replacedLanguage != nullptr && uprv_strcmp(replacedLanguage, "und") == 0) ? + language : replacedLanguage; + replacedScript = deleteOrReplace(script, nullptr, replacedScript); + replacedRegion = deleteOrReplace(region, searchRegion, replacedRegion); + replacedVariant = deleteOrReplace( + searchVariant, searchVariant, replacedVariant); + + if ( same(language, replacedLanguage) && + same(script, replacedScript) && + same(region, replacedRegion) && + same(searchVariant, replacedVariant) && + replacedExtensions == nullptr) { + // Replacement produce no changes. + continue; + } + + language = replacedLanguage; + region = replacedRegion; + script = replacedScript; + if (searchVariant != nullptr) { + if (notEmpty(replacedVariant)) { + variants.setElementAt((void*)replacedVariant, variant_index); + } else { + variants.removeElementAt(variant_index); + } + } + if (replacedExtensions != nullptr) { + // TODO(ICU-21292) + // DO NOTHING + // UTS35 does not specifiy what should we do if we have extensions in the + // replacement. Currently we know only the following 4 "BCP47 LegacyRules" have + // extensions in them languageAlias: + // i_default => en_x_i_default + // i_enochian => und_x_i_enochian + // i_mingo => see_x_i_mingo + // zh_min => nan_x_zh_min + // But all of them are already changed by code inside ultag_parse() before + // hitting this code. + } + + // Something changed by language alias data. + return true; + } + // Nothing changed by language alias data. + return false; +} + +bool +AliasReplacer::replaceTerritory(UVector& toBeFreed, UErrorCode& status) +{ + if (U_FAILURE(status)) { + return false; + } + if (region == nullptr) { + // No region to search. + return false; + } + const char *replacement = data->territoryMap().get(region); + if (replacement == nullptr) { + // Found no replacement data for this region. + return false; + } + const char* replacedRegion = replacement; + const char* firstSpace = uprv_strchr(replacement, ' '); + if (firstSpace != nullptr) { + // If there are are more than one region in the replacement. + // We need to check which one match based on the language. + // Cannot use nullptr for language because that will construct + // the default locale, in that case, use "und" to get the correct + // locale. + Locale l = LocaleBuilder() + .setLanguage(language == nullptr ? "und" : language) + .setScript(script) + .build(status); + l.addLikelySubtags(status); + const char* likelyRegion = l.getCountry(); + LocalPointer item; + if (likelyRegion != nullptr && uprv_strlen(likelyRegion) > 0) { + size_t len = uprv_strlen(likelyRegion); + const char* foundInReplacement = uprv_strstr(replacement, + likelyRegion); + if (foundInReplacement != nullptr) { + // Assuming the case there are no three letter region code in + // the replacement of territoryAlias + U_ASSERT(foundInReplacement == replacement || + *(foundInReplacement-1) == ' '); + U_ASSERT(foundInReplacement[len] == ' ' || + foundInReplacement[len] == '\0'); + item.adoptInsteadAndCheckErrorCode( + new CharString(foundInReplacement, (int32_t)len, status), status); + } + } + if (item.isNull() && U_SUCCESS(status)) { + item.adoptInsteadAndCheckErrorCode( + new CharString(replacement, + (int32_t)(firstSpace - replacement), status), status); + } + if (U_FAILURE(status)) { return false; } + if (item.isNull()) { + status = U_MEMORY_ALLOCATION_ERROR; + return false; + } + replacedRegion = item->data(); + toBeFreed.addElement(item.orphan(), status); + } + U_ASSERT(!same(region, replacedRegion)); + region = replacedRegion; + // The region is changed by data in territory alias. + return true; +} + +bool +AliasReplacer::replaceScript(UErrorCode& status) +{ + if (U_FAILURE(status)) { + return false; + } + if (script == nullptr) { + // No script to search. + return false; + } + const char *replacement = data->scriptMap().get(script); + if (replacement == nullptr) { + // Found no replacement data for this script. + return false; + } + U_ASSERT(!same(script, replacement)); + script = replacement; + // The script is changed by data in script alias. + return true; +} + +bool +AliasReplacer::replaceVariant(UErrorCode& status) +{ + if (U_FAILURE(status)) { + return false; + } + // Since we may have more than one variant, we need to loop through them. + for (int32_t i = 0; i < variants.size(); i++) { + const char *variant = (const char*)(variants.elementAt(i)); + const char *replacement = data->variantMap().get(variant); + if (replacement == nullptr) { + // Found no replacement data for this variant. + continue; + } + U_ASSERT((uprv_strlen(replacement) >= 5 && + uprv_strlen(replacement) <= 8) || + (uprv_strlen(replacement) == 4 && + replacement[0] >= '0' && + replacement[0] <= '9')); + if (!same(variant, replacement)) { + variants.setElementAt((void*)replacement, i); + // Special hack to handle hepburn-heploc => alalc97 + if (uprv_strcmp(variant, "heploc") == 0) { + for (int32_t j = 0; j < variants.size(); j++) { + if (uprv_strcmp((const char*)(variants.elementAt(j)), + "hepburn") == 0) { + variants.removeElementAt(j); + } + } + } + return true; + } + } + return false; +} + +CharString& +AliasReplacer::outputToString( + CharString& out, UErrorCode status) +{ + out.append(language, status); + if (notEmpty(script)) { + out.append(SEP_CHAR, status) + .append(script, status); + } + if (notEmpty(region)) { + out.append(SEP_CHAR, status) + .append(region, status); + } + if (variants.size() > 0) { + if (!notEmpty(script) && !notEmpty(region)) { + out.append(SEP_CHAR, status); + } + variants.sort([](UElement e1, UElement e2) -> int8_t { + return uprv_strcmp( + (const char*)e1.pointer, (const char*)e2.pointer); + }, status); + int32_t variantsStart = out.length(); + for (int32_t i = 0; i < variants.size(); i++) { + out.append(SEP_CHAR, status) + .append((const char*)(variants.elementAt(i)), + status); + } + T_CString_toUpperCase(out.data() + variantsStart); + } + if (notEmpty(extensions)) { + CharString tmp("und_", status); + tmp.append(extensions, status); + Locale tmpLocale(tmp.data()); + // only support x extension inside CLDR for now. + U_ASSERT(extensions[0] == 'x'); + out.append(tmpLocale.getName() + 1, status); + } + return out; +} + +bool +AliasReplacer::replace(const Locale& locale, CharString& out, UErrorCode& status) +{ + data = AliasData::singleton(status); + if (U_FAILURE(status)) { + return false; + } + U_ASSERT(data != nullptr); + out.clear(); + language = locale.getLanguage(); + if (!notEmpty(language)) { + language = nullptr; + } + script = locale.getScript(); + if (!notEmpty(script)) { + script = nullptr; + } + region = locale.getCountry(); + if (!notEmpty(region)) { + region = nullptr; + } + const char* variantsStr = locale.getVariant(); + const char* extensionsStr = locale_getKeywordsStart(locale.getName()); + CharString variantsBuff(variantsStr, -1, status); + if (!variantsBuff.isEmpty()) { + if (U_FAILURE(status)) { return false; } + char* start = variantsBuff.data(); + T_CString_toLowerCase(start); + char* end; + while ((end = uprv_strchr(start, SEP_CHAR)) != nullptr && + U_SUCCESS(status)) { + *end = NULL_CHAR; // null terminate inside variantsBuff + variants.addElement(start, status); + start = end + 1; + } + variants.addElement(start, status); + } + if (U_FAILURE(status)) { return false; } + + // Sort the variants + variants.sort([](UElement e1, UElement e2) -> int8_t { + return uprv_strcmp( + (const char*)e1.pointer, (const char*)e2.pointer); + }, status); + + // A changed count to assert when loop too many times. + int changed = 0; + // A UVector to to hold CharString allocated by the replace* method + // and freed when out of scope from his function. + UVector stringsToBeFreed([](void *obj){ delete ((CharString*) obj); }, + nullptr, 10, status); + while (U_SUCCESS(status)) { + // Something wrong with the data cause looping here more than 10 times + // already. + U_ASSERT(changed < 5); + // From observation of key in data/misc/metadata.txt + // we know currently we only need to search in the following combination + // of fields for type in languageAlias: + // * lang_region_variant + // * lang_region + // * lang_variant + // * lang + // * und_variant + // This assumption is ensured by the U_ASSERT in readLanguageAlias + // + // lang REGION variant + if ( replaceLanguage(true, true, true, stringsToBeFreed, status) || + replaceLanguage(true, true, false, stringsToBeFreed, status) || + replaceLanguage(true, false, true, stringsToBeFreed, status) || + replaceLanguage(true, false, false, stringsToBeFreed, status) || + replaceLanguage(false,false, true, stringsToBeFreed, status) || + replaceTerritory(stringsToBeFreed, status) || + replaceScript(status) || + replaceVariant(status)) { + // Some values in data is changed, try to match from the beginning + // again. + changed++; + continue; + } + // Nothing changed. Break out. + break; + } // while(1) + + if (U_FAILURE(status)) { return false; } + // Nothing changed and we know the order of the vaiants are not change + // because we have no variant or only one. + if (changed == 0 && variants.size() <= 1) { + return false; + } + outputToString(out, status); + if (extensionsStr != nullptr) { + out.append(extensionsStr, status); + } + if (U_FAILURE(status)) { + return false; + } + // If the tag is not changed, return. + if (uprv_strcmp(out.data(), locale.getName()) == 0) { + U_ASSERT(changed == 0); + U_ASSERT(variants.size() > 1); + out.clear(); + return false; + } + return true; +} + +// Return true if the locale is changed during canonicalization. +// The replaced value then will be put into out. +bool +canonicalizeLocale(const Locale& locale, CharString& out, UErrorCode& status) +{ + AliasReplacer replacer(status); + return replacer.replace(locale, out, status); +} + +// Function to optimize for known cases without so we can skip the loading +// of resources in the startup time until we really need it. +bool +isKnownCanonicalizedLocale(const char* locale, UErrorCode& status) +{ + if ( uprv_strcmp(locale, "c") == 0 || + uprv_strcmp(locale, "en") == 0 || + uprv_strcmp(locale, "en_US") == 0) { + return true; + } + + // common well-known Canonicalized. + umtx_initOnce(gKnownCanonicalizedInitOnce, + &loadKnownCanonicalized, status); + if (U_FAILURE(status)) { + return false; + } + U_ASSERT(gKnownCanonicalized != nullptr); + return uhash_geti(gKnownCanonicalized, locale) != 0; +} + } // namespace +// Function for testing. +U_CAPI const char* const* +ulocimp_getKnownCanonicalizedLocaleForTest(int32_t* length) +{ + *length = UPRV_LENGTHOF(KNOWN_CANONICALIZED); + return KNOWN_CANONICALIZED; +} + +// Function for testing. +U_CAPI bool +ulocimp_isCanonicalizedLocaleForTest(const char* localeName) +{ + Locale l(localeName); + UErrorCode status = U_ZERO_ERROR; + CharString temp; + return !canonicalizeLocale(l, temp, status) && U_SUCCESS(status); +} + /*This function initializes a Locale from a C locale ID*/ Locale& Locale::init(const char* localeID, UBool canonicalize) { @@ -632,9 +1725,9 @@ Locale& Locale::init(const char* localeID, UBool canonicalize) uprv_memcpy(language, fullName, fieldLen[0]); language[fieldLen[0]] = 0; } - if (fieldLen[1] == 4 && ISASCIIALPHA(field[1][0]) && - ISASCIIALPHA(field[1][1]) && ISASCIIALPHA(field[1][2]) && - ISASCIIALPHA(field[1][3])) { + if (fieldLen[1] == 4 && uprv_isASCIILetter(field[1][0]) && + uprv_isASCIILetter(field[1][1]) && uprv_isASCIILetter(field[1][2]) && + uprv_isASCIILetter(field[1][3])) { /* We have at least a script */ uprv_memcpy(script, field[1], fieldLen[1]); script[fieldLen[1]] = 0; @@ -662,192 +1755,18 @@ Locale& Locale::init(const char* localeID, UBool canonicalize) } if (canonicalize) { - UErrorCode status = U_ZERO_ERROR; - // TODO: Try to use ResourceDataValue and ures_getValueWithFallback() etc. - LocalUResourceBundlePointer metadata(ures_openDirect(NULL, "metadata", &status)); - LocalUResourceBundlePointer metadataAlias(ures_getByKey(metadata.getAlias(), "alias", NULL, &status)); - // Look up the metadata:alias:language:$key:replacement entries - // key could be one of the following: - // language - // language_Script_REGION - // language_REGION - // language_variant - do { - // The resource structure looks like - // metadata { - // alias { - // language { - // art_lojban { - // replacement{"jbo"} - // } - // ... - // ks_Arab_IN { - // replacement{"ks_IN"} - // } - // ... - // no { - // replacement{"nb"} - // } - // .... - // zh_CN { - // replacement{"zh_Hans_CN"} - // } - // } - // ... - // } - // } - LocalUResourceBundlePointer languageAlias(ures_getByKey(metadataAlias.getAlias(), "language", NULL, &status)); - if (U_FAILURE(status)) + if (!isKnownCanonicalizedLocale(fullName, err)) { + CharString replaced; + // Not sure it is already canonicalized + if (canonicalizeLocale(*this, replaced, err)) { + U_ASSERT(U_SUCCESS(err)); + // If need replacement, call init again. + init(replaced.data(), false); + } + if (U_FAILURE(err)) { break; - CharString temp; - // Handle cases of key pattern "language _ variant" - // ex: Map "art_lojban" to "jbo" - const char* variants = getVariant(); - if (variants != nullptr && variants[0] != '\0') { - const char* begin = variants; - const char* end = begin; - // We may have multiple variants, need to look at each of - // them. - do { - status = U_ZERO_ERROR; - end = uprv_strchr(begin, '_'); - int32_t len = (end == nullptr) ? int32_t(uprv_strlen(begin)) : int32_t(end - begin); - temp.clear().append(getLanguage(), status).append("_", status).append(begin, len, status); - LocalUResourceBundlePointer languageVariantAlias( - ures_getByKey(languageAlias.getAlias(), - temp.data(), - NULL, &status)); - temp.clear().appendInvariantChars( - UnicodeString(ures_getStringByKey(languageVariantAlias.getAlias(), "replacement", nullptr, &status)), status); - if (U_SUCCESS(status)) { - CharString newVar; - if (begin != variants) { - newVar.append(variants, static_cast(begin - variants - 1), status); - } - if (end != nullptr) { - if (begin != variants) { - newVar.append("_", status); - } - newVar.append(end + 1, status); - } - Locale l(temp.data()); - init(AppendLSCVE(temp.clear(), - l.getLanguage(), - (getScript() != nullptr && getScript()[0] != '\0') ? getScript() : l.getScript(), - (getCountry() != nullptr && getCountry()[0] != '\0') ? getCountry() : l.getCountry(), - newVar.data(), - uprv_strchr(fullName, '@'), status).data(), false); - break; - } - begin = end + 1; - } while (end != nullptr); - } // End of handle language _ variant - // Handle cases of key pattern "language _ Script _ REGION" - // ex: Map "ks_Arab_IN" to "ks_IN" - if (getScript() != nullptr && getScript()[0] != '\0' && - getCountry() != nullptr && getCountry()[0] != '\0') { - status = U_ZERO_ERROR; - LocalUResourceBundlePointer replacedAlias( - ures_getByKey(languageAlias.getAlias(), - AppendLSCVE(temp.clear(), getLanguage(), getScript(), getCountry(), - nullptr, nullptr, status).data(), NULL, &status)); - temp.clear().appendInvariantChars( - UnicodeString(ures_getStringByKey(replacedAlias.getAlias(), "replacement", nullptr, &status)), status); - if (U_SUCCESS(status)) { - Locale l(temp.data()); - init(AppendLSCVE(temp.clear(), - l.getLanguage(), - l.getScript(), - l.getCountry(), - getVariant(), - uprv_strchr(fullName, '@'), status).data(), false); - } - } // End of handle language _ Script _ REGION - // Handle cases of key pattern "language _ REGION" - // ex: Map "zh_CN" to "zh_Hans_CN" - if (getCountry() != nullptr && getCountry()[0] != '\0') { - status = U_ZERO_ERROR; - LocalUResourceBundlePointer replacedAlias( - ures_getByKey(languageAlias.getAlias(), - AppendLSCVE(temp.clear(), getLanguage(), nullptr, getCountry(), - nullptr, nullptr, status).data(), NULL, &status)); - temp.clear().appendInvariantChars( - UnicodeString(ures_getStringByKey(replacedAlias.getAlias(), "replacement", nullptr, &status)), status); - if (U_SUCCESS(status)) { - Locale l(temp.data()); - init(AppendLSCVE(temp.clear(), - l.getLanguage(), - (getScript() != nullptr && getScript()[0] != '\0') ? getScript() : l.getScript(), - l.getCountry(), - getVariant(), - uprv_strchr(fullName, '@'), status).data(), false); - } - } // End of handle "language _ REGION" - // Handle cases of key pattern "language" - // ex: Map "no" to "nb" - { - status = U_ZERO_ERROR; - LocalUResourceBundlePointer replaceLanguageAlias(ures_getByKey(languageAlias.getAlias(), getLanguage(), NULL, &status)); - temp.clear().appendInvariantChars( - UnicodeString(ures_getStringByKey(replaceLanguageAlias.getAlias(), "replacement", nullptr, &status)), status); - if (U_SUCCESS(status)) { - Locale l(temp.data()); - init(AppendLSCVE(temp.clear(), - l.getLanguage(), - (getScript() != nullptr && getScript()[0] != '\0') ? getScript() : l.getScript(), - (getCountry() != nullptr && getCountry()[0] != '\0') ? getCountry() : l.getCountry(), - getVariant(), - uprv_strchr(fullName, '@'), status).data(), false); - } - } // End of handle "language" - - // Look up the metadata:alias:territory:$key:replacement entries - // key is region code. - if (getCountry() != nullptr) { - status = U_ZERO_ERROR; - // The resource structure looks like - // metadata { - // alias { - // ... - // territory: { - // 172 { - // replacement{"RU AM AZ BY GE KG KZ MD TJ TM UA UZ"} - // } - // ... - // 554 { - // replacement{"NZ"} - // } - // } - // } - // } - LocalUResourceBundlePointer territoryAlias(ures_getByKey(metadataAlias.getAlias(), "territory", NULL, &status)); - LocalUResourceBundlePointer countryAlias(ures_getByKey(territoryAlias.getAlias(), getCountry(), NULL, &status)); - UnicodeString replacements( - ures_getStringByKey(countryAlias.getAlias(), "replacement", nullptr, &status)); - if (U_SUCCESS(status)) { - CharString replacedCountry; - int32_t delPos = replacements.indexOf(' '); - if (delPos == -1) { - replacedCountry.appendInvariantChars(replacements, status); - } else { - Locale l(AppendLSCVE(temp.clear(), getLanguage(), nullptr, getScript(), - nullptr, nullptr, status).data()); - l.addLikelySubtags(status); - if (replacements.indexOf(UnicodeString(l.getCountry())) != -1) { - replacedCountry.append(l.getCountry(), status); - } else { - replacedCountry.appendInvariantChars(replacements.getBuffer(), delPos, status); - } - } - init(AppendLSCVE(temp.clear(), - getLanguage(), - getScript(), - replacedCountry.data(), - getVariant(), - uprv_strchr(fullName, '@'), status).data(), false); - } - } // End of handle REGION - } while (0); + } + } } // if (canonicalize) { // successful end of init() @@ -1024,13 +1943,14 @@ Locale::forLanguageTag(StringPiece tag, UErrorCode& status) return result; } - // If a BCP-47 language tag is passed as the language parameter to the + // If a BCP 47 language tag is passed as the language parameter to the // normal Locale constructor, it will actually fall back to invoking // uloc_forLanguageTag() to parse it if it somehow is able to detect that - // the string actually is BCP-47. This works well for things like strings - // using BCP-47 extensions, but it does not at all work for things like - // BCP-47 grandfathered tags (eg. "en-GB-oed") which are possible to also - // interpret as ICU locale IDs and because of that won't trigger the BCP-47 + // the string actually is BCP 47. This works well for things like strings + // using BCP 47 extensions, but it does not at all work for things like + // legacy language tags (marked as “Type: grandfathered” in BCP 47, + // e.g., "en-GB-oed") which are possible to also + // interpret as ICU locale IDs and because of that won't trigger the BCP 47 // parsing. Therefore the code here explicitly calls uloc_forLanguageTag() // and then Locale::init(), instead of just calling the normal constructor. @@ -1414,8 +2334,6 @@ UnicodeKeywordEnumeration::~UnicodeKeywordEnumeration() = default; StringEnumeration * Locale::createKeywords(UErrorCode &status) const { - char keywords[256]; - int32_t keywordCapacity = sizeof keywords; StringEnumeration *result = NULL; if (U_FAILURE(status)) { @@ -1426,9 +2344,11 @@ Locale::createKeywords(UErrorCode &status) const const char* assignment = uprv_strchr(fullName, '='); if(variantStart) { if(assignment > variantStart) { - int32_t keyLen = locale_getKeywords(variantStart+1, '@', keywords, keywordCapacity, FALSE, &status); - if(U_SUCCESS(status) && keyLen) { - result = new KeywordEnumeration(keywords, keyLen, 0, status); + CharString keywords; + CharStringByteSink sink(&keywords); + ulocimp_getKeywords(variantStart+1, '@', sink, FALSE, &status); + if (U_SUCCESS(status) && !keywords.isEmpty()) { + result = new KeywordEnumeration(keywords.data(), keywords.length(), 0, status); if (!result) { status = U_MEMORY_ALLOCATION_ERROR; } @@ -1443,8 +2363,6 @@ Locale::createKeywords(UErrorCode &status) const StringEnumeration * Locale::createUnicodeKeywords(UErrorCode &status) const { - char keywords[256]; - int32_t keywordCapacity = sizeof keywords; StringEnumeration *result = NULL; if (U_FAILURE(status)) { @@ -1455,9 +2373,11 @@ Locale::createUnicodeKeywords(UErrorCode &status) const const char* assignment = uprv_strchr(fullName, '='); if(variantStart) { if(assignment > variantStart) { - int32_t keyLen = locale_getKeywords(variantStart+1, '@', keywords, keywordCapacity, FALSE, &status); - if(U_SUCCESS(status) && keyLen) { - result = new UnicodeKeywordEnumeration(keywords, keyLen, 0, status); + CharString keywords; + CharStringByteSink sink(&keywords); + ulocimp_getKeywords(variantStart+1, '@', sink, FALSE, &status); + if (U_SUCCESS(status) && !keywords.isEmpty()) { + result = new UnicodeKeywordEnumeration(keywords.data(), keywords.length(), 0, status); if (!result) { status = U_MEMORY_ALLOCATION_ERROR; } @@ -1492,48 +2412,7 @@ Locale::getKeywordValue(StringPiece keywordName, ByteSink& sink, UErrorCode& sta return; } - LocalMemory scratch; - int32_t scratch_capacity = 16; // Arbitrarily chosen default size. - - char* buffer; - int32_t result_capacity, reslen; - - for (;;) { - if (scratch.allocateInsteadAndReset(scratch_capacity) == nullptr) { - status = U_MEMORY_ALLOCATION_ERROR; - return; - } - - buffer = sink.GetAppendBuffer( - /*min_capacity=*/scratch_capacity, - /*desired_capacity_hint=*/scratch_capacity, - scratch.getAlias(), - scratch_capacity, - &result_capacity); - - reslen = uloc_getKeywordValue( - fullName, - keywordName_nul.data(), - buffer, - result_capacity, - &status); - - if (status != U_BUFFER_OVERFLOW_ERROR) { - break; - } - - scratch_capacity = reslen; - status = U_ZERO_ERROR; - } - - if (U_FAILURE(status)) { - return; - } - - sink.Append(buffer, reslen); - if (status == U_STRING_NOT_TERMINATED_WARNING) { - status = U_ZERO_ERROR; // Terminators not used. - } + ulocimp_getKeywordValue(fullName, keywordName_nul.data(), sink, &status); } void @@ -1580,9 +2459,13 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro if (U_FAILURE(status)) { return; } + if (status == U_STRING_NOT_TERMINATED_WARNING) { + status = U_ZERO_ERROR; + } int32_t bufferLength = uprv_max((int32_t)(uprv_strlen(fullName) + 1), ULOC_FULLNAME_CAPACITY); int32_t newLength = uloc_setKeywordValue(keywordName, keywordValue, fullName, bufferLength, &status) + 1; + U_ASSERT(status != U_STRING_NOT_TERMINATED_WARNING); /* Handle the case the current buffer is not enough to hold the new id */ if (status == U_BUFFER_OVERFLOW_ERROR) { U_ASSERT(newLength > bufferLength); @@ -1599,6 +2482,7 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro fullName = newFullName; status = U_ZERO_ERROR; uloc_setKeywordValue(keywordName, keywordValue, fullName, newLength, &status); + U_ASSERT(status != U_STRING_NOT_TERMINATED_WARNING); } else { U_ASSERT(newLength <= bufferLength); } diff --git a/intl/icu/source/common/loclikely.cpp b/intl/icu/source/common/loclikely.cpp index a7353784f08a..94a60aba3e07 100644 --- a/intl/icu/source/common/loclikely.cpp +++ b/intl/icu/source/common/loclikely.cpp @@ -464,8 +464,7 @@ parseTagString( goto error; } - subtagLength = ulocimp_getLanguage(position, lang, *langLength, &position); - u_terminateChars(lang, *langLength, subtagLength, err); + subtagLength = ulocimp_getLanguage(position, &position, *err).extract(lang, *langLength, *err); /* * Note that we explicit consider U_STRING_NOT_TERMINATED_WARNING @@ -486,8 +485,7 @@ parseTagString( ++position; } - subtagLength = ulocimp_getScript(position, script, *scriptLength, &position); - u_terminateChars(script, *scriptLength, subtagLength, err); + subtagLength = ulocimp_getScript(position, &position, *err).extract(script, *scriptLength, *err); if(U_FAILURE(*err)) { goto error; @@ -511,8 +509,7 @@ parseTagString( } } - subtagLength = ulocimp_getCountry(position, region, *regionLength, &position); - u_terminateChars(region, *regionLength, subtagLength, err); + subtagLength = ulocimp_getCountry(position, &position, *err).extract(region, *regionLength, *err); if(U_FAILURE(*err)) { goto error; @@ -826,7 +823,7 @@ error: } \ } UPRV_BLOCK_MACRO_END -static void +static UBool _uloc_addLikelySubtags(const char* localeID, icu::ByteSink& sink, UErrorCode* err) { @@ -897,15 +894,22 @@ _uloc_addLikelySubtags(const char* localeID, sink.Append(localeID, localIDLength); } - return; + return success; error: if (!U_FAILURE(*err)) { *err = U_ILLEGAL_ARGUMENT_ERROR; } + return FALSE; } +// Add likely subtags to the sink +// return true if the value in the sink is produced by a match during the lookup +// return false if the value in the sink is the same as input because there are +// no match after the lookup. +static UBool _ulocimp_addLikelySubtags(const char*, icu::ByteSink&, UErrorCode*); + static void _uloc_minimizeSubtags(const char* localeID, icu::ByteSink& sink, @@ -921,6 +925,7 @@ _uloc_minimizeSubtags(const char* localeID, const char* trailing = ""; int32_t trailingLength = 0; int32_t trailingIndex = 0; + UBool successGetMax = FALSE; if(U_FAILURE(*err)) { goto error; @@ -961,7 +966,7 @@ _uloc_minimizeSubtags(const char* localeID, { icu::CharString base; { - icu::CharStringByteSink sink(&base); + icu::CharStringByteSink baseSink(&base); createTagString( lang, langLength, @@ -971,7 +976,7 @@ _uloc_minimizeSubtags(const char* localeID, regionLength, NULL, 0, - sink, + baseSink, err); } @@ -980,8 +985,8 @@ _uloc_minimizeSubtags(const char* localeID, * from AddLikelySubtags. **/ { - icu::CharStringByteSink sink(&maximizedTagBuffer); - ulocimp_addLikelySubtags(base.data(), sink, err); + icu::CharStringByteSink maxSink(&maximizedTagBuffer); + successGetMax = _ulocimp_addLikelySubtags(base.data(), maxSink, err); } } @@ -989,13 +994,40 @@ _uloc_minimizeSubtags(const char* localeID, goto error; } + if (!successGetMax) { + /** + * If we got here, return the locale ID parameter unchanged. + **/ + const int32_t localeIDLength = (int32_t)uprv_strlen(localeID); + sink.Append(localeID, localeIDLength); + return; + } + + // In the following, the lang, script, region are referring to those in + // the maximizedTagBuffer, not the one in the localeID. + langLength = sizeof(lang); + scriptLength = sizeof(script); + regionLength = sizeof(region); + parseTagString( + maximizedTagBuffer.data(), + lang, + &langLength, + script, + &scriptLength, + region, + ®ionLength, + err); + if(U_FAILURE(*err)) { + goto error; + } + /** * Start first with just the language. **/ { icu::CharString tagBuffer; { - icu::CharStringByteSink sink(&tagBuffer); + icu::CharStringByteSink tagSink(&tagBuffer); createLikelySubtagsString( lang, langLength, @@ -1005,14 +1037,15 @@ _uloc_minimizeSubtags(const char* localeID, 0, NULL, 0, - sink, + tagSink, err); } if(U_FAILURE(*err)) { goto error; } - else if (!tagBuffer.isEmpty() && uprv_strnicmp( + else if (!tagBuffer.isEmpty() && + uprv_strnicmp( maximizedTagBuffer.data(), tagBuffer.data(), tagBuffer.length()) == 0) { @@ -1039,7 +1072,7 @@ _uloc_minimizeSubtags(const char* localeID, icu::CharString tagBuffer; { - icu::CharStringByteSink sink(&tagBuffer); + icu::CharStringByteSink tagSink(&tagBuffer); createLikelySubtagsString( lang, langLength, @@ -1049,14 +1082,15 @@ _uloc_minimizeSubtags(const char* localeID, regionLength, NULL, 0, - sink, + tagSink, err); } if(U_FAILURE(*err)) { goto error; } - else if (!tagBuffer.isEmpty() && uprv_strnicmp( + else if (!tagBuffer.isEmpty() && + uprv_strnicmp( maximizedTagBuffer.data(), tagBuffer.data(), tagBuffer.length()) == 0) { @@ -1081,10 +1115,10 @@ _uloc_minimizeSubtags(const char* localeID, * since trying with all three subtags would only yield the * maximal version that we already have. **/ - if (scriptLength > 0 && regionLength > 0) { + if (scriptLength > 0) { icu::CharString tagBuffer; { - icu::CharStringByteSink sink(&tagBuffer); + icu::CharStringByteSink tagSink(&tagBuffer); createLikelySubtagsString( lang, langLength, @@ -1094,14 +1128,15 @@ _uloc_minimizeSubtags(const char* localeID, 0, NULL, 0, - sink, + tagSink, err); } if(U_FAILURE(*err)) { goto error; } - else if (!tagBuffer.isEmpty() && uprv_strnicmp( + else if (!tagBuffer.isEmpty() && + uprv_strnicmp( maximizedTagBuffer.data(), tagBuffer.data(), tagBuffer.length()) == 0) { @@ -1123,10 +1158,19 @@ _uloc_minimizeSubtags(const char* localeID, { /** - * If we got here, return the locale ID parameter. + * If we got here, return the max + trail. **/ - const int32_t localeIDLength = (int32_t)uprv_strlen(localeID); - sink.Append(localeID, localeIDLength); + createTagString( + lang, + langLength, + script, + scriptLength, + region, + regionLength, + trailing, + trailingLength, + sink, + err); return; } @@ -1193,15 +1237,23 @@ uloc_addLikelySubtags(const char* localeID, return reslen; } +static UBool +_ulocimp_addLikelySubtags(const char* localeID, + icu::ByteSink& sink, + UErrorCode* status) { + char localeBuffer[ULOC_FULLNAME_CAPACITY]; + + if (do_canonicalize(localeID, localeBuffer, sizeof localeBuffer, status)) { + return _uloc_addLikelySubtags(localeBuffer, sink, status); + } + return FALSE; +} + U_CAPI void U_EXPORT2 ulocimp_addLikelySubtags(const char* localeID, icu::ByteSink& sink, UErrorCode* status) { - char localeBuffer[ULOC_FULLNAME_CAPACITY]; - - if (do_canonicalize(localeID, localeBuffer, sizeof localeBuffer, status)) { - _uloc_addLikelySubtags(localeBuffer, sink, status); - } + _ulocimp_addLikelySubtags(localeID, sink, status); } U_CAPI int32_t U_EXPORT2 diff --git a/intl/icu/source/common/loclikelysubtags.cpp b/intl/icu/source/common/loclikelysubtags.cpp index 1fbf1a146329..a031bfa58726 100644 --- a/intl/icu/source/common/loclikelysubtags.cpp +++ b/intl/icu/source/common/loclikelysubtags.cpp @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // loclikelysubtags.cpp // created: 2019may08 Markus W. Scherer @@ -20,6 +20,7 @@ #include "uhash.h" #include "uinvchar.h" #include "umutex.h" +#include "uniquecharstr.h" #include "uresdata.h" #include "uresimp.h" @@ -31,71 +32,6 @@ constexpr char PSEUDO_ACCENTS_PREFIX = '\''; // -XA, -PSACCENT constexpr char PSEUDO_BIDI_PREFIX = '+'; // -XB, -PSBIDI constexpr char PSEUDO_CRACKED_PREFIX = ','; // -XC, -PSCRACK -/** - * Stores NUL-terminated strings with duplicate elimination. - * Checks for unique UTF-16 string pointers and converts to invariant characters. - */ -class UniqueCharStrings { -public: - UniqueCharStrings(UErrorCode &errorCode) : strings(nullptr) { - uhash_init(&map, uhash_hashUChars, uhash_compareUChars, uhash_compareLong, &errorCode); - if (U_FAILURE(errorCode)) { return; } - strings = new CharString(); - if (strings == nullptr) { - errorCode = U_MEMORY_ALLOCATION_ERROR; - } - } - ~UniqueCharStrings() { - uhash_close(&map); - delete strings; - } - - /** Returns/orphans the CharString that contains all strings. */ - CharString *orphanCharStrings() { - CharString *result = strings; - strings = nullptr; - return result; - } - - /** Adds a string and returns a unique number for it. */ - int32_t add(const UnicodeString &s, UErrorCode &errorCode) { - if (U_FAILURE(errorCode)) { return 0; } - if (isFrozen) { - errorCode = U_NO_WRITE_PERMISSION; - return 0; - } - // The string points into the resource bundle. - const char16_t *p = s.getBuffer(); - int32_t oldIndex = uhash_geti(&map, p); - if (oldIndex != 0) { // found duplicate - return oldIndex; - } - // Explicit NUL terminator for the previous string. - // The strings object is also terminated with one implicit NUL. - strings->append(0, errorCode); - int32_t newIndex = strings->length(); - strings->appendInvariantChars(s, errorCode); - uhash_puti(&map, const_cast(p), newIndex, &errorCode); - return newIndex; - } - - void freeze() { isFrozen = true; } - - /** - * Returns a string pointer for its unique number, if this object is frozen. - * Otherwise nullptr. - */ - const char *get(int32_t i) const { - U_ASSERT(isFrozen); - return isFrozen && i > 0 ? strings->data() + i : nullptr; - } - -private: - UHashtable map; - CharString *strings; - bool isFrozen = false; -}; - } // namespace LocaleDistanceData::LocaleDistanceData(LocaleDistanceData &&data) : diff --git a/intl/icu/source/common/loclikelysubtags.h b/intl/icu/source/common/loclikelysubtags.h index 90ddfffaca67..14a01a5eac7e 100644 --- a/intl/icu/source/common/loclikelysubtags.h +++ b/intl/icu/source/common/loclikelysubtags.h @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // loclikelysubtags.h // created: 2019may08 Markus W. Scherer @@ -13,49 +13,13 @@ #include "unicode/locid.h" #include "unicode/uobject.h" #include "unicode/ures.h" +#include "charstrmap.h" #include "lsr.h" -#include "uhash.h" U_NAMESPACE_BEGIN struct XLikelySubtagsData; -/** - * Map of const char * keys & values. - * Stores pointers as is: Does not own/copy/adopt/release strings. - */ -class CharStringMap final : public UMemory { -public: - /** Constructs an unusable non-map. */ - CharStringMap() : map(nullptr) {} - CharStringMap(int32_t size, UErrorCode &errorCode) { - map = uhash_openSize(uhash_hashChars, uhash_compareChars, uhash_compareChars, - size, &errorCode); - } - CharStringMap(CharStringMap &&other) U_NOEXCEPT : map(other.map) { - other.map = nullptr; - } - CharStringMap(const CharStringMap &other) = delete; - ~CharStringMap() { - uhash_close(map); - } - - CharStringMap &operator=(CharStringMap &&other) U_NOEXCEPT { - map = other.map; - other.map = nullptr; - return *this; - } - CharStringMap &operator=(const CharStringMap &other) = delete; - - const char *get(const char *key) const { return static_cast(uhash_get(map, key)); } - void put(const char *key, const char *value, UErrorCode &errorCode) { - uhash_put(map, const_cast(key), const_cast(value), &errorCode); - } - -private: - UHashtable *map; -}; - struct LocaleDistanceData { LocaleDistanceData() = default; LocaleDistanceData(LocaleDistanceData &&data); diff --git a/intl/icu/source/common/locmap.cpp b/intl/icu/source/common/locmap.cpp index a6311343551e..29a5646385e7 100644 --- a/intl/icu/source/common/locmap.cpp +++ b/intl/icu/source/common/locmap.cpp @@ -28,8 +28,11 @@ */ #include "locmap.h" +#include "bytesinkutil.h" +#include "charstr.h" #include "cstring.h" #include "cmemory.h" +#include "ulocimp.h" #include "unicode/uloc.h" #if U_PLATFORM_HAS_WIN32_API && UCONFIG_USE_WINDOWS_LCID_MAPPING_API @@ -1167,15 +1170,18 @@ uprv_convertToLCIDPlatform(const char* localeID, UErrorCode* status) // conversion functionality when available. #if U_PLATFORM_HAS_WIN32_API && UCONFIG_USE_WINDOWS_LCID_MAPPING_API int32_t len; - char collVal[ULOC_KEYWORDS_CAPACITY] = {}; char baseName[ULOC_FULLNAME_CAPACITY] = {}; const char * mylocaleID = localeID; // Check any for keywords. if (uprv_strchr(localeID, '@')) { - len = uloc_getKeywordValue(localeID, "collation", collVal, UPRV_LENGTHOF(collVal) - 1, status); - if (U_SUCCESS(*status) && len > 0) + icu::CharString collVal; + { + icu::CharStringByteSink sink(&collVal); + ulocimp_getKeywordValue(localeID, "collation", sink, status); + } + if (U_SUCCESS(*status) && !collVal.isEmpty()) { // If it contains the keyword collation, return 0 so that the LCID lookup table will be used. return 0; diff --git a/intl/icu/source/common/lsr.cpp b/intl/icu/source/common/lsr.cpp index d4308ad02754..b81808f2c4aa 100644 --- a/intl/icu/source/common/lsr.cpp +++ b/intl/icu/source/common/lsr.cpp @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // lsr.cpp // created: 2019may08 Markus W. Scherer diff --git a/intl/icu/source/common/lsr.h b/intl/icu/source/common/lsr.h index d535e5b0376c..a33f85524533 100644 --- a/intl/icu/source/common/lsr.h +++ b/intl/icu/source/common/lsr.h @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // lsr.h // created: 2019may08 Markus W. Scherer diff --git a/intl/icu/source/common/messageimpl.h b/intl/icu/source/common/messageimpl.h index dc7a6edd6c0e..a56479066bc0 100644 --- a/intl/icu/source/common/messageimpl.h +++ b/intl/icu/source/common/messageimpl.h @@ -33,7 +33,7 @@ U_NAMESPACE_BEGIN class U_COMMON_API MessageImpl { public: /** - * @return TRUE if getApostropheMode()==UMSGPAT_APOS_DOUBLE_REQUIRED + * @return true if getApostropheMode()==UMSGPAT_APOS_DOUBLE_REQUIRED */ static UBool jdkAposMode(const MessagePattern &msgPattern) { return msgPattern.getApostropheMode()==UMSGPAT_APOS_DOUBLE_REQUIRED; diff --git a/intl/icu/source/common/norm2allmodes.h b/intl/icu/source/common/norm2allmodes.h index 682ece28f130..e8bd52c6ae39 100644 --- a/intl/icu/source/common/norm2allmodes.h +++ b/intl/icu/source/common/norm2allmodes.h @@ -65,13 +65,13 @@ public: normalizeSecondAndAppend(UnicodeString &first, const UnicodeString &second, UErrorCode &errorCode) const { - return normalizeSecondAndAppend(first, second, TRUE, errorCode); + return normalizeSecondAndAppend(first, second, true, errorCode); } virtual UnicodeString & append(UnicodeString &first, const UnicodeString &second, UErrorCode &errorCode) const { - return normalizeSecondAndAppend(first, second, FALSE, errorCode); + return normalizeSecondAndAppend(first, second, false, errorCode); } UnicodeString & normalizeSecondAndAppend(UnicodeString &first, @@ -112,14 +112,14 @@ public: int32_t length; const UChar *d=impl.getDecomposition(c, buffer, length); if(d==NULL) { - return FALSE; + return false; } if(d==buffer) { decomposition.setTo(buffer, length); // copy the string (Jamos from Hangul syllable c) } else { - decomposition.setTo(FALSE, d, length); // read-only alias + decomposition.setTo(false, d, length); // read-only alias } - return TRUE; + return true; } virtual UBool getRawDecomposition(UChar32 c, UnicodeString &decomposition) const { @@ -127,14 +127,14 @@ public: int32_t length; const UChar *d=impl.getRawDecomposition(c, buffer, length); if(d==NULL) { - return FALSE; + return false; } if(d==buffer) { decomposition.setTo(buffer, length); // copy the string (algorithmic decomposition) } else { - decomposition.setTo(FALSE, d, length); // read-only alias + decomposition.setTo(false, d, length); // read-only alias } - return TRUE; + return true; } virtual UChar32 composePair(UChar32 a, UChar32 b) const { @@ -150,12 +150,12 @@ public: virtual UBool isNormalized(const UnicodeString &s, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { - return FALSE; + return false; } const UChar *sArray=s.getBuffer(); if(sArray==NULL) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; - return FALSE; + return false; } const UChar *sLimit=sArray+s.length(); return sLimit==spanQuickCheckYes(sArray, sLimit, errorCode); @@ -227,7 +227,7 @@ private: virtual void normalize(const UChar *src, const UChar *limit, ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { - impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); + impl.compose(src, limit, onlyContiguous, true, buffer, errorCode); } using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. @@ -256,24 +256,24 @@ private: virtual UBool isNormalized(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE { if(U_FAILURE(errorCode)) { - return FALSE; + return false; } const UChar *sArray=s.getBuffer(); if(sArray==NULL) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; - return FALSE; + return false; } UnicodeString temp; ReorderingBuffer buffer(impl, temp); if(!buffer.init(5, errorCode)) { // small destCapacity for substring normalization - return FALSE; + return false; } - return impl.compose(sArray, sArray+s.length(), onlyContiguous, FALSE, buffer, errorCode); + return impl.compose(sArray, sArray+s.length(), onlyContiguous, false, buffer, errorCode); } virtual UBool isNormalizedUTF8(StringPiece sp, UErrorCode &errorCode) const U_OVERRIDE { if(U_FAILURE(errorCode)) { - return FALSE; + return false; } const uint8_t *s = reinterpret_cast(sp.data()); return impl.composeUTF8(0, onlyContiguous, s, s + sp.length(), nullptr, nullptr, errorCode); @@ -343,7 +343,7 @@ private: struct Norm2AllModes : public UMemory { Norm2AllModes(Normalizer2Impl *i) - : impl(i), comp(*i, FALSE), decomp(*i), fcd(*i), fcc(*i, TRUE) {} + : impl(i), comp(*i, false), decomp(*i), fcd(*i), fcc(*i, true) {} ~Norm2AllModes(); static Norm2AllModes *createInstance(Normalizer2Impl *impl, UErrorCode &errorCode); diff --git a/intl/icu/source/common/normalizer2impl.h b/intl/icu/source/common/normalizer2impl.h index cf3015ea881b..4218a30a3452 100644 --- a/intl/icu/source/common/normalizer2impl.h +++ b/intl/icu/source/common/normalizer2impl.h @@ -171,7 +171,7 @@ public: UErrorCode &errorCode); UBool appendBMP(UChar c, uint8_t cc, UErrorCode &errorCode) { if(remainingCapacity==0 && !resize(1, errorCode)) { - return FALSE; + return false; } if(lastCC<=cc || cc==0) { *limit++=c; @@ -183,7 +183,7 @@ public: insert(c, cc); } --remainingCapacity; - return TRUE; + return true; } UBool appendZeroCC(UChar32 c, UErrorCode &errorCode); UBool appendZeroCC(const UChar *s, const UChar *sLimit, UErrorCode &errorCode); @@ -359,7 +359,7 @@ public: return getFCD16FromNormData(c); } - /** Returns TRUE if the single-or-lead code unit c might have non-zero FCD data. */ + /** Returns true if the single-or-lead code unit c might have non-zero FCD data. */ UBool singleLeadMightHaveNonZeroFCD16(UChar32 lead) const { // 0<=lead<=0xffff uint8_t bits=smallFCD[lead>>8]; @@ -397,8 +397,8 @@ public: MIN_YES_YES_WITH_CC=0xfe02, JAMO_VT=0xfe00, MIN_NORMAL_MAYBE_YES=0xfc00, - JAMO_L=2, // offset=1 hasCompBoundaryAfter=FALSE - INERT=1, // offset=0 hasCompBoundaryAfter=TRUE + JAMO_L=2, // offset=1 hasCompBoundaryAfter=false + INERT=1, // offset=0 hasCompBoundaryAfter=true // norm16 bit 0 is comp-boundary-after. HAS_COMP_BOUNDARY_AFTER=1, diff --git a/intl/icu/source/common/patternprops.h b/intl/icu/source/common/patternprops.h index b57cdeb6e534..95898d580c82 100644 --- a/intl/icu/source/common/patternprops.h +++ b/intl/icu/source/common/patternprops.h @@ -44,17 +44,17 @@ U_NAMESPACE_BEGIN class U_COMMON_API PatternProps { public: /** - * @return TRUE if c is a Pattern_Syntax code point. + * @return true if c is a Pattern_Syntax code point. */ static UBool isSyntax(UChar32 c); /** - * @return TRUE if c is a Pattern_Syntax or Pattern_White_Space code point. + * @return true if c is a Pattern_Syntax or Pattern_White_Space code point. */ static UBool isSyntaxOrWhiteSpace(UChar32 c); /** - * @return TRUE if c is a Pattern_White_Space character. + * @return true if c is a Pattern_White_Space character. */ static UBool isWhiteSpace(UChar32 c); @@ -78,7 +78,7 @@ public: /** * Tests whether the string contains a "pattern identifier", that is, * whether it contains only non-Pattern_White_Space, non-Pattern_Syntax characters. - * @return TRUE if there are no Pattern_White_Space or Pattern_Syntax characters in s. + * @return true if there are no Pattern_White_Space or Pattern_Syntax characters in s. */ static UBool isIdentifier(const UChar *s, int32_t length); diff --git a/intl/icu/source/common/pluralmap.h b/intl/icu/source/common/pluralmap.h index db644093a1fc..d898ac4671f7 100644 --- a/intl/icu/source/common/pluralmap.h +++ b/intl/icu/source/common/pluralmap.h @@ -234,7 +234,7 @@ public: } /** - * Returns TRUE if this object equals rhs. + * Returns true if this object equals rhs. */ UBool equals( const PluralMap &rhs, @@ -244,13 +244,13 @@ public: continue; } if (fVariants[i] == NULL || rhs.fVariants[i] == NULL) { - return FALSE; + return false; } if (!eqFunc(*fVariants[i], *rhs.fVariants[i])) { - return FALSE; + return false; } } - return TRUE; + return true; } private: diff --git a/intl/icu/source/common/punycode.cpp b/intl/icu/source/common/punycode.cpp index 90fe1ec3c802..4832938ff7eb 100644 --- a/intl/icu/source/common/punycode.cpp +++ b/intl/icu/source/common/punycode.cpp @@ -107,36 +107,26 @@ digitToBasic(int32_t digit, UBool uppercase) { } /** - * basicToDigit[] contains the numeric value of a basic code - * point (for use in representing integers) in the range 0 to - * BASE-1, or -1 if b is does not represent a value. + * @return the numeric value of a basic code point (for use in representing integers) + * in the range 0 to BASE-1, or a negative value if cp is invalid. */ -static const int8_t -basicToDigit[256]={ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, -1, - - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 -}; +static int32_t decodeDigit(int32_t cp) { + if(cp<=u'Z') { + if(cp<=u'9') { + if(cp 26..35 + } + } else { + return cp-u'A'; // A-Z -> 0..25 + } + } else if(cp<=u'z') { + return cp-'a'; // a..z -> 0..25 + } else { + return -1; + } +} static inline char asciiCaseMap(char b, UBool uppercase) { @@ -178,15 +168,23 @@ adaptBias(int32_t delta, int32_t length, UBool firstTime) { return count+(((BASE-TMIN+1)*delta)/(delta+SKEW)); } -#define MAX_CP_COUNT 200 +namespace { -U_CFUNC int32_t +// ICU-13727: Limit input length for n^2 algorithm +// where well-formed strings are at most 59 characters long. +constexpr int32_t ENCODE_MAX_CODE_UNITS=1000; +constexpr int32_t DECODE_MAX_CHARS=2000; + +} // namespace + +// encode +U_CAPI int32_t u_strToPunycode(const UChar *src, int32_t srcLength, UChar *dest, int32_t destCapacity, const UBool *caseFlags, UErrorCode *pErrorCode) { - int32_t cpBuffer[MAX_CP_COUNT]; + int32_t cpBuffer[ENCODE_MAX_CODE_UNITS]; int32_t n, delta, handledCPCount, basicLength, destLength, bias, j, m, q, k, t, srcCPCount; UChar c, c2; @@ -199,6 +197,10 @@ u_strToPunycode(const UChar *src, int32_t srcLength, *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } + if (srcLength>ENCODE_MAX_CODE_UNITS) { + *pErrorCode=U_INPUT_TOO_LONG_ERROR; + return 0; + } /* * Handle the basic code points and @@ -211,9 +213,8 @@ u_strToPunycode(const UChar *src, int32_t srcLength, if((c=src[j])==0) { break; } - if(srcCPCount==MAX_CP_COUNT) { - /* too many input code points */ - *pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR; + if(j>=ENCODE_MAX_CODE_UNITS) { + *pErrorCode=U_INPUT_TOO_LONG_ERROR; return 0; } if(IS_BASIC(c)) { @@ -243,11 +244,6 @@ u_strToPunycode(const UChar *src, int32_t srcLength, } else { /* length-specified input */ for(j=0; j state to , but guard against overflow: */ - if(m-n>(0x7fffffff-MAX_CP_COUNT-delta)/(handledCPCount+1)) { + if(m-n>(0x7fffffff-handledCPCount-delta)/(handledCPCount+1)) { *pErrorCode=U_INTERNAL_PROGRAM_ERROR; return 0; } @@ -373,7 +369,8 @@ u_strToPunycode(const UChar *src, int32_t srcLength, return u_terminateUChars(dest, destCapacity, destLength, pErrorCode); } -U_CFUNC int32_t +// decode +U_CAPI int32_t u_strFromPunycode(const UChar *src, int32_t srcLength, UChar *dest, int32_t destCapacity, UBool *caseFlags, @@ -395,6 +392,10 @@ u_strFromPunycode(const UChar *src, int32_t srcLength, if(srcLength==-1) { srcLength=u_strlen(src); } + if (srcLength>DECODE_MAX_CHARS) { + *pErrorCode=U_INPUT_TOO_LONG_ERROR; + return 0; + } /* * Handle the basic code points: @@ -455,7 +456,7 @@ u_strFromPunycode(const UChar *src, int32_t srcLength, return 0; } - digit=basicToDigit[(uint8_t)src[in++]]; + digit=decodeDigit(src[in++]); if(digit<0) { *pErrorCode=U_INVALID_CHAR_FOUND; return 0; diff --git a/intl/icu/source/common/punycode.h b/intl/icu/source/common/punycode.h index 5d8a243175cc..9e28f770c407 100644 --- a/intl/icu/source/common/punycode.h +++ b/intl/icu/source/common/punycode.h @@ -50,7 +50,7 @@ http://www.nicemice.net/amc/ * @param caseFlags Vector of boolean values, one per input UChar, * indicating that the corresponding character is to be * marked for the decoder optionally - * uppercasing (TRUE) or lowercasing (FALSE) + * uppercasing (true) or lowercasing (false) * the character. * ASCII characters are output directly in the case as marked. * Flags corresponding to trail surrogates are ignored. @@ -65,7 +65,7 @@ http://www.nicemice.net/amc/ * * @see u_strFromPunycode */ -U_CFUNC int32_t +U_CAPI int32_t u_strToPunycode(const UChar *src, int32_t srcLength, UChar *dest, int32_t destCapacity, const UBool *caseFlags, @@ -83,10 +83,10 @@ u_strToPunycode(const UChar *src, int32_t srcLength, * and of caseFlags in numbers of UBools. * @param caseFlags Output array for case flags as * defined by the Punycode string. - * The caller should uppercase (TRUE) or lowercase (FASLE) + * The caller should uppercase (true) or lowercase (FASLE) * the corresponding character in dest. * For supplementary characters, only the lead surrogate - * is marked, and FALSE is stored for the trail surrogate. + * is marked, and false is stored for the trail surrogate. * This is redundant and not necessary for ASCII characters * because they are already in the case indicated. * Can be NULL if the case flags are not needed. @@ -100,7 +100,7 @@ u_strToPunycode(const UChar *src, int32_t srcLength, * * @see u_strToPunycode */ -U_CFUNC int32_t +U_CAPI int32_t u_strFromPunycode(const UChar *src, int32_t srcLength, UChar *dest, int32_t destCapacity, UBool *caseFlags, diff --git a/intl/icu/source/common/putil.cpp b/intl/icu/source/common/putil.cpp index 0ba6c714e222..3ed6a05d22d8 100644 --- a/intl/icu/source/common/putil.cpp +++ b/intl/icu/source/common/putil.cpp @@ -81,7 +81,7 @@ #include #ifndef U_COMMON_IMPLEMENTATION -#error U_COMMON_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see http://userguide.icu-project.org/howtouseicu +#error U_COMMON_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see https://unicode-org.github.io/icu/userguide/howtouseicu #endif @@ -890,7 +890,7 @@ typedef struct DefaultTZInfo { * It is currently use to compare two TZ files. */ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFileName, DefaultTZInfo* tzInfo) { - FILE* file; + FILE* file; int64_t sizeFile; int64_t sizeFileLeft; int32_t sizeFileRead; @@ -1065,7 +1065,7 @@ static void u_property_read(void* cookie, const char* name, const char* value, #endif U_CAPI void U_EXPORT2 -uprv_tzname_clear_cache() +uprv_tzname_clear_cache(void) { #if U_PLATFORM == U_PF_ANDROID /* Android's timezone is stored in system property. */ @@ -1143,10 +1143,10 @@ uprv_tzname(int n) && uprv_strcmp(tzid, TZ_ENV_CHECK) != 0 #endif ) { - /* The colon forces tzset() to treat the remainder as zoneinfo path */ - if (tzid[0] == ':') { - tzid++; - } + /* The colon forces tzset() to treat the remainder as zoneinfo path */ + if (tzid[0] == ':') { + tzid++; + } /* This might be a good Olson ID. */ skipZoneIDPrefix(&tzid); return tzid; @@ -1167,7 +1167,7 @@ uprv_tzname(int n) int32_t tzZoneInfoTailLen = uprv_strlen(TZZONEINFOTAIL); gTimeZoneBuffer[ret] = 0; char * tzZoneInfoTailPtr = uprv_strstr(gTimeZoneBuffer, TZZONEINFOTAIL); - + if (tzZoneInfoTailPtr != NULL && isValidOlsonID(tzZoneInfoTailPtr + tzZoneInfoTailLen)) { @@ -1497,7 +1497,7 @@ static void setTimeZoneFilesDir(const char *path, UErrorCode &status) { #endif } -#define TO_STRING(x) TO_STRING_2(x) +#define TO_STRING(x) TO_STRING_2(x) #define TO_STRING_2(x) #x static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) { @@ -1604,7 +1604,7 @@ static const char *uprv_getPOSIXIDForCategory(int category) { /* Maybe we got some garbage. Try something more reasonable */ posixID = getenv("LC_ALL"); - /* Solaris speaks POSIX - See IEEE Std 1003.1-2008 + /* Solaris speaks POSIX - See IEEE Std 1003.1-2008 * This is needed to properly handle empty env. variables */ #if U_PLATFORM == U_PF_SOLARIS @@ -1615,7 +1615,7 @@ static const char *uprv_getPOSIXIDForCategory(int category) if (posixID == 0) { posixID = getenv(category == LC_MESSAGES ? "LC_MESSAGES" : "LC_CTYPE"); if (posixID == 0) { -#endif +#endif posixID = getenv("LANG"); } } @@ -1723,7 +1723,7 @@ The leftmost codepage (.xxx) wins. // (The "C"/"POSIX" case is handled in uprv_getPOSIXIDForCategory()) uprv_strcpy(correctedPOSIXLocale, "en_US_POSIX"); } - + /* Note that we scan the *uncorrected* ID. */ const char *p; if ((p = uprv_strrchr(posixID, '@')) != nullptr) { @@ -2144,7 +2144,7 @@ int_getDefaultCodepage() #endif // Special case for UTF-8 if (codepageNumber == 65001) - { + { return "UTF-8"; } // Windows codepages can look like windows-1252, so format the found number @@ -2337,7 +2337,7 @@ u_getVersion(UVersionInfo versionArray) { } /** - * icucfg.h dependent code + * icucfg.h dependent code */ #if U_ENABLE_DYLOAD && HAVE_DLOPEN && !U_PLATFORM_USES_ONLY_WIN32_API @@ -2351,7 +2351,7 @@ u_getVersion(UVersionInfo versionArray) { #include #endif /* HAVE_DLFCN_H */ -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { void *ret = NULL; if(U_FAILURE(*status)) return ret; @@ -2365,13 +2365,13 @@ uprv_dl_open(const char *libName, UErrorCode *status) { return ret; } -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uprv_dl_close(void *lib, UErrorCode *status) { if(U_FAILURE(*status)) return; dlclose(lib); } -U_INTERNAL UVoidFunction* U_EXPORT2 +U_CAPI UVoidFunction* U_EXPORT2 uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { union { UVoidFunction *fp; @@ -2394,40 +2394,40 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { /* Windows API implementation. */ // Note: UWP does not expose/allow these APIs, so the UWP version gets the null implementation. */ -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { HMODULE lib = NULL; - + if(U_FAILURE(*status)) return NULL; - + lib = LoadLibraryA(libName); - + if(lib==NULL) { *status = U_MISSING_RESOURCE_ERROR; } - + return (void*)lib; } -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uprv_dl_close(void *lib, UErrorCode *status) { HMODULE handle = (HMODULE)lib; if(U_FAILURE(*status)) return; - + FreeLibrary(handle); - + return; } -U_INTERNAL UVoidFunction* U_EXPORT2 +U_CAPI UVoidFunction* U_EXPORT2 uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { HMODULE handle = (HMODULE)lib; UVoidFunction* addr = NULL; - + if(U_FAILURE(*status) || lib==NULL) return NULL; - + addr = (UVoidFunction*)GetProcAddress(handle, sym); - + if(addr==NULL) { DWORD lastError = GetLastError(); if(lastError == ERROR_PROC_NOT_FOUND) { @@ -2436,7 +2436,7 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { *status = U_UNSUPPORTED_ERROR; /* other unknown error. */ } } - + return addr; } @@ -2444,7 +2444,7 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { /* No dynamic loading, null (nonexistent) implementation. */ -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { (void)libName; if(U_FAILURE(*status)) return NULL; @@ -2452,7 +2452,7 @@ uprv_dl_open(const char *libName, UErrorCode *status) { return NULL; } -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uprv_dl_close(void *lib, UErrorCode *status) { (void)lib; if(U_FAILURE(*status)) return; @@ -2460,7 +2460,7 @@ uprv_dl_close(void *lib, UErrorCode *status) { return; } -U_INTERNAL UVoidFunction* U_EXPORT2 +U_CAPI UVoidFunction* U_EXPORT2 uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { (void)lib; (void)sym; diff --git a/intl/icu/source/common/putilimp.h b/intl/icu/source/common/putilimp.h index 410770aa7c0d..ab5e8ac68ad6 100644 --- a/intl/icu/source/common/putilimp.h +++ b/intl/icu/source/common/putilimp.h @@ -216,93 +216,93 @@ typedef size_t uintptr_t; * Floating point utility to determine if a double is Not a Number (NaN). * @internal */ -U_INTERNAL UBool U_EXPORT2 uprv_isNaN(double d); +U_CAPI UBool U_EXPORT2 uprv_isNaN(double d); /** * Floating point utility to determine if a double has an infinite value. * @internal */ -U_INTERNAL UBool U_EXPORT2 uprv_isInfinite(double d); +U_CAPI UBool U_EXPORT2 uprv_isInfinite(double d); /** * Floating point utility to determine if a double has a positive infinite value. * @internal */ -U_INTERNAL UBool U_EXPORT2 uprv_isPositiveInfinity(double d); +U_CAPI UBool U_EXPORT2 uprv_isPositiveInfinity(double d); /** * Floating point utility to determine if a double has a negative infinite value. * @internal */ -U_INTERNAL UBool U_EXPORT2 uprv_isNegativeInfinity(double d); +U_CAPI UBool U_EXPORT2 uprv_isNegativeInfinity(double d); /** * Floating point utility that returns a Not a Number (NaN) value. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_getNaN(void); +U_CAPI double U_EXPORT2 uprv_getNaN(void); /** * Floating point utility that returns an infinite value. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_getInfinity(void); +U_CAPI double U_EXPORT2 uprv_getInfinity(void); /** * Floating point utility to truncate a double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_trunc(double d); +U_CAPI double U_EXPORT2 uprv_trunc(double d); /** * Floating point utility to calculate the floor of a double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_floor(double d); +U_CAPI double U_EXPORT2 uprv_floor(double d); /** * Floating point utility to calculate the ceiling of a double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_ceil(double d); +U_CAPI double U_EXPORT2 uprv_ceil(double d); /** * Floating point utility to calculate the absolute value of a double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_fabs(double d); +U_CAPI double U_EXPORT2 uprv_fabs(double d); /** * Floating point utility to calculate the fractional and integer parts of a double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_modf(double d, double* pinteger); +U_CAPI double U_EXPORT2 uprv_modf(double d, double* pinteger); /** * Floating point utility to calculate the remainder of a double divided by another double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_fmod(double d, double y); +U_CAPI double U_EXPORT2 uprv_fmod(double d, double y); /** * Floating point utility to calculate d to the power of exponent (d^exponent). * @internal */ -U_INTERNAL double U_EXPORT2 uprv_pow(double d, double exponent); +U_CAPI double U_EXPORT2 uprv_pow(double d, double exponent); /** * Floating point utility to calculate 10 to the power of exponent (10^exponent). * @internal */ -U_INTERNAL double U_EXPORT2 uprv_pow10(int32_t exponent); +U_CAPI double U_EXPORT2 uprv_pow10(int32_t exponent); /** * Floating point utility to calculate the maximum value of two doubles. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_fmax(double d, double y); +U_CAPI double U_EXPORT2 uprv_fmax(double d, double y); /** * Floating point utility to calculate the minimum value of two doubles. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_fmin(double d, double y); +U_CAPI double U_EXPORT2 uprv_fmin(double d, double y); /** * Private utility to calculate the maximum value of two integers. * @internal */ -U_INTERNAL int32_t U_EXPORT2 uprv_max(int32_t d, int32_t y); +U_CAPI int32_t U_EXPORT2 uprv_max(int32_t d, int32_t y); /** * Private utility to calculate the minimum value of two integers. * @internal */ -U_INTERNAL int32_t U_EXPORT2 uprv_min(int32_t d, int32_t y); +U_CAPI int32_t U_EXPORT2 uprv_min(int32_t d, int32_t y); #if U_IS_BIG_ENDIAN # define uprv_isNegative(number) (*((signed char *)&(number))<0) @@ -315,13 +315,13 @@ U_INTERNAL int32_t U_EXPORT2 uprv_min(int32_t d, int32_t y); * type of arbitrary bit length. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_maxMantissa(void); +U_CAPI double U_EXPORT2 uprv_maxMantissa(void); /** * Floating point utility to calculate the logarithm of a double. * @internal */ -U_INTERNAL double U_EXPORT2 uprv_log(double d); +U_CAPI double U_EXPORT2 uprv_log(double d); /** * Does common notion of rounding e.g. uprv_floor(x + 0.5); @@ -329,7 +329,7 @@ U_INTERNAL double U_EXPORT2 uprv_log(double d); * @return the rounded double * @internal */ -U_INTERNAL double U_EXPORT2 uprv_round(double x); +U_CAPI double U_EXPORT2 uprv_round(double x); /** * Adds the signed integers a and b, storing the result in res. @@ -342,7 +342,7 @@ U_INTERNAL double U_EXPORT2 uprv_round(double x); * @return true if overflow occurred; false if no overflow occurred. * @internal */ -U_INTERNAL UBool U_EXPORT2 uprv_add32_overflow(int32_t a, int32_t b, int32_t* res); +U_CAPI UBool U_EXPORT2 uprv_add32_overflow(int32_t a, int32_t b, int32_t* res); /** * Multiplies the signed integers a and b, storing the result in res. @@ -355,7 +355,7 @@ U_INTERNAL UBool U_EXPORT2 uprv_add32_overflow(int32_t a, int32_t b, int32_t* re * @return true if overflow occurred; false if no overflow occurred. * @internal */ -U_INTERNAL UBool U_EXPORT2 uprv_mul32_overflow(int32_t a, int32_t b, int32_t* res); +U_CAPI UBool U_EXPORT2 uprv_mul32_overflow(int32_t a, int32_t b, int32_t* res); #if 0 /** @@ -365,7 +365,7 @@ U_INTERNAL UBool U_EXPORT2 uprv_mul32_overflow(int32_t a, int32_t b, int32_t* re * @return the number of digits after the decimal point in a double number x. * @internal */ -/*U_INTERNAL int32_t U_EXPORT2 uprv_digitsAfterDecimal(double x);*/ +/*U_CAPI int32_t U_EXPORT2 uprv_digitsAfterDecimal(double x);*/ #endif #if !U_CHARSET_IS_UTF8 @@ -374,22 +374,22 @@ U_INTERNAL UBool U_EXPORT2 uprv_mul32_overflow(int32_t a, int32_t b, int32_t* re * Return the default codepage for this platform and locale. * This function can call setlocale() on Unix platforms. Please read the * platform documentation on setlocale() before calling this function. - * @return the default codepage for this platform + * @return the default codepage for this platform * @internal */ -U_INTERNAL const char* U_EXPORT2 uprv_getDefaultCodepage(void); +U_CAPI const char* U_EXPORT2 uprv_getDefaultCodepage(void); #endif /** * Please use uloc_getDefault() instead. * Return the default locale ID string by querying the system, or - * zero if one cannot be found. + * zero if one cannot be found. * This function can call setlocale() on Unix platforms. Please read the * platform documentation on setlocale() before calling this function. * @return the default locale ID string * @internal */ -U_INTERNAL const char* U_EXPORT2 uprv_getDefaultLocaleID(void); +U_CAPI const char* U_EXPORT2 uprv_getDefaultLocaleID(void); /** * Time zone utilities @@ -423,7 +423,7 @@ U_INTERNAL const char* U_EXPORT2 uprv_getDefaultLocaleID(void); * Date/Time application. * @internal */ -U_INTERNAL void U_EXPORT2 uprv_tzset(void); +U_CAPI void U_EXPORT2 uprv_tzset(void); /** * Difference in seconds between coordinated universal @@ -431,7 +431,7 @@ U_INTERNAL void U_EXPORT2 uprv_tzset(void); * @return the difference in seconds between coordinated universal time and local time. * @internal */ -U_INTERNAL int32_t U_EXPORT2 uprv_timezone(void); +U_CAPI int32_t U_EXPORT2 uprv_timezone(void); /** * tzname(0) Three-letter time-zone name derived from TZ environment @@ -441,13 +441,13 @@ U_INTERNAL int32_t U_EXPORT2 uprv_timezone(void); * tzname(1) is an empty string. * @internal */ -U_INTERNAL const char* U_EXPORT2 uprv_tzname(int n); +U_CAPI const char* U_EXPORT2 uprv_tzname(int n); /** * Reset the global tzname cache. * @internal */ -U_INTERNAL void uprv_tzname_clear_cache(); +U_CAPI void uprv_tzname_clear_cache(void); /** * Get UTC (GMT) time measured in milliseconds since 0:00 on 1/1/1970. @@ -455,7 +455,7 @@ U_INTERNAL void uprv_tzname_clear_cache(); * @return the UTC time measured in milliseconds * @internal */ -U_INTERNAL UDate U_EXPORT2 uprv_getUTCtime(void); +U_CAPI UDate U_EXPORT2 uprv_getUTCtime(void); /** * Get UTC (GMT) time measured in milliseconds since 0:00 on 1/1/1970. @@ -464,15 +464,15 @@ U_INTERNAL UDate U_EXPORT2 uprv_getUTCtime(void); * @return the UTC time measured in milliseconds * @internal */ -U_INTERNAL UDate U_EXPORT2 uprv_getRawUTCtime(void); +U_CAPI UDate U_EXPORT2 uprv_getRawUTCtime(void); /** * Determine whether a pathname is absolute or not, as defined by the platform. * @param path Pathname to test - * @return TRUE if the path is absolute + * @return true if the path is absolute * @internal (ICU 3.0) */ -U_INTERNAL UBool U_EXPORT2 uprv_pathIsAbsolute(const char *path); +U_CAPI UBool U_EXPORT2 uprv_pathIsAbsolute(const char *path); /** * Use U_MAX_PTR instead of this function. @@ -480,7 +480,7 @@ U_INTERNAL UBool U_EXPORT2 uprv_pathIsAbsolute(const char *path); * @return the largest possible pointer greater than the base * @internal (ICU 3.8) */ -U_INTERNAL void * U_EXPORT2 uprv_maximumPtr(void *base); +U_CAPI void * U_EXPORT2 uprv_maximumPtr(void *base); /** * Maximum value of a (void*) - use to indicate the limit of an 'infinite' buffer. @@ -578,26 +578,26 @@ typedef void (UVoidFunction)(void); * Load a library * @internal (ICU 4.4) */ -U_INTERNAL void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status); +U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status); /** * Close a library * @internal (ICU 4.4) */ -U_INTERNAL void U_EXPORT2 uprv_dl_close( void *lib, UErrorCode *status); +U_CAPI void U_EXPORT2 uprv_dl_close( void *lib, UErrorCode *status); /** * Extract a symbol from a library (function) * @internal (ICU 4.8) */ -U_INTERNAL UVoidFunction* U_EXPORT2 uprv_dlsym_func( void *lib, const char *symbolName, UErrorCode *status); +U_CAPI UVoidFunction* U_EXPORT2 uprv_dlsym_func( void *lib, const char *symbolName, UErrorCode *status); /** * Extract a symbol from a library (function) * Not implemented, no clients. * @internal */ -/* U_INTERNAL void * U_EXPORT2 uprv_dlsym_data( void *lib, const char *symbolName, UErrorCode *status); */ +/* U_CAPI void * U_EXPORT2 uprv_dlsym_data( void *lib, const char *symbolName, UErrorCode *status); */ #endif diff --git a/intl/icu/source/common/rbbi.cpp b/intl/icu/source/common/rbbi.cpp index 43ba58ba9e65..9b7e70c3cf41 100644 --- a/intl/icu/source/common/rbbi.cpp +++ b/intl/icu/source/common/rbbi.cpp @@ -68,10 +68,18 @@ RuleBasedBreakIterator::RuleBasedBreakIterator(RBBIDataHeader* data, UErrorCode init(status); fData = new RBBIDataWrapper(data, status); // status checked in constructor if (U_FAILURE(status)) {return;} - if(fData == 0) { + if(fData == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } + if (fData->fForwardTable->fLookAheadResultsSize > 0) { + fLookAheadMatches = static_cast( + uprv_malloc(fData->fForwardTable->fLookAheadResultsSize * sizeof(int32_t))); + if (fLookAheadMatches == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + } } // @@ -98,10 +106,18 @@ RuleBasedBreakIterator::RuleBasedBreakIterator(const uint8_t *compiledRules, } fData = new RBBIDataWrapper(data, RBBIDataWrapper::kDontAdopt, status); if (U_FAILURE(status)) {return;} - if(fData == 0) { + if(fData == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } + if (fData->fForwardTable->fLookAheadResultsSize > 0) { + fLookAheadMatches = static_cast( + uprv_malloc(fData->fForwardTable->fLookAheadResultsSize * sizeof(int32_t))); + if (fLookAheadMatches == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + } } @@ -117,10 +133,18 @@ RuleBasedBreakIterator::RuleBasedBreakIterator(UDataMemory* udm, UErrorCode &sta init(status); fData = new RBBIDataWrapper(udm, status); // status checked in constructor if (U_FAILURE(status)) {return;} - if(fData == 0) { + if(fData == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } + if (fData->fForwardTable->fLookAheadResultsSize > 0) { + fLookAheadMatches = static_cast( + uprv_malloc(fData->fForwardTable->fLookAheadResultsSize * sizeof(int32_t))); + if (fLookAheadMatches == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + } } @@ -188,30 +212,34 @@ RuleBasedBreakIterator::~RuleBasedBreakIterator() { // fCharIter was adopted from the outside. delete fCharIter; } - fCharIter = NULL; + fCharIter = nullptr; utext_close(&fText); - if (fData != NULL) { + if (fData != nullptr) { fData->removeReference(); - fData = NULL; + fData = nullptr; } delete fBreakCache; - fBreakCache = NULL; + fBreakCache = nullptr; delete fDictionaryCache; - fDictionaryCache = NULL; + fDictionaryCache = nullptr; delete fLanguageBreakEngines; - fLanguageBreakEngines = NULL; + fLanguageBreakEngines = nullptr; delete fUnhandledBreakEngine; - fUnhandledBreakEngine = NULL; + fUnhandledBreakEngine = nullptr; + + uprv_free(fLookAheadMatches); + fLookAheadMatches = nullptr; } /** * Assignment operator. Sets this iterator to have the same behavior, * and iterate over the same text, as the one passed in. + * TODO: needs better handling of memory allocation errors. */ RuleBasedBreakIterator& RuleBasedBreakIterator::operator=(const RuleBasedBreakIterator& that) { @@ -252,6 +280,14 @@ RuleBasedBreakIterator::operator=(const RuleBasedBreakIterator& that) { fData = that.fData->addReference(); } + uprv_free(fLookAheadMatches); + fLookAheadMatches = nullptr; + if (fData && fData->fForwardTable->fLookAheadResultsSize > 0) { + fLookAheadMatches = static_cast( + uprv_malloc(fData->fForwardTable->fLookAheadResultsSize * sizeof(int32_t))); + } + + fPosition = that.fPosition; fRuleStatusIndex = that.fRuleStatusIndex; fDone = that.fDone; @@ -275,16 +311,17 @@ RuleBasedBreakIterator::operator=(const RuleBasedBreakIterator& that) { // //----------------------------------------------------------------------------- void RuleBasedBreakIterator::init(UErrorCode &status) { - fCharIter = NULL; - fData = NULL; + fCharIter = nullptr; + fData = nullptr; fPosition = 0; fRuleStatusIndex = 0; fDone = false; fDictionaryCharCount = 0; - fLanguageBreakEngines = NULL; - fUnhandledBreakEngine = NULL; - fBreakCache = NULL; - fDictionaryCache = NULL; + fLanguageBreakEngines = nullptr; + fUnhandledBreakEngine = nullptr; + fBreakCache = nullptr; + fDictionaryCache = nullptr; + fLookAheadMatches = nullptr; // Note: IBM xlC is unable to assign or initialize member fText from UTEXT_INITIALIZER. // fText = UTEXT_INITIALIZER; @@ -700,50 +737,53 @@ enum RBBIRunMode { }; -// Map from look-ahead break states (corresponds to rules) to boundary positions. -// Allows multiple lookahead break rules to be in flight at the same time. +// Wrapper functions to select the appropriate handleNext() or handleSafePrevious() +// instantiation, based on whether an 8 or 16 bit table is required. // -// This is a temporary approach for ICU 57. A better fix is to make the look-ahead numbers -// in the state table be sequential, then we can just index an array. And the -// table could also tell us in advance how big that array needs to be. -// -// Before ICU 57 there was just a single simple variable for a look-ahead match that -// was in progress. Two rules at once did not work. +// These Trie access functions will be inlined within the handleNext()/Previous() instantions. +static inline uint16_t TrieFunc8(const UCPTrie *trie, UChar32 c) { + return UCPTRIE_FAST_GET(trie, UCPTRIE_8, c); +} -static const int32_t kMaxLookaheads = 8; -struct LookAheadResults { - int32_t fUsedSlotLimit; - int32_t fPositions[8]; - int16_t fKeys[8]; +static inline uint16_t TrieFunc16(const UCPTrie *trie, UChar32 c) { + return UCPTRIE_FAST_GET(trie, UCPTRIE_16, c); +} - LookAheadResults() : fUsedSlotLimit(0), fPositions(), fKeys() {} - - int32_t getPosition(int16_t key) { - for (int32_t i=0; ifForwardTable; + bool use8BitsTrie = ucptrie_getValueWidth(fData->fTrie) == UCPTRIE_VALUE_BITS_8; + if (statetable->fFlags & RBBI_8BITS_ROWS) { + if (use8BitsTrie) { + return handleNext(); + } else { + return handleNext(); + } + } else { + if (use8BitsTrie) { + return handleNext(); + } else { + return handleNext(); } - UPRV_UNREACHABLE; } +} - void setPosition(int16_t key, int32_t position) { - int32_t i; - for (i=0; ifReverseTable; + bool use8BitsTrie = ucptrie_getValueWidth(fData->fTrie) == UCPTRIE_VALUE_BITS_8; + if (statetable->fFlags & RBBI_8BITS_ROWS) { + if (use8BitsTrie) { + return handleSafePrevious(fromPosition); + } else { + return handleSafePrevious(fromPosition); } - if (i >= kMaxLookaheads) { - UPRV_UNREACHABLE; + } else { + if (use8BitsTrie) { + return handleSafePrevious(fromPosition); + } else { + return handleSafePrevious(fromPosition); } - fKeys[i] = key; - fPositions[i] = position; - U_ASSERT(fUsedSlotLimit == i); - fUsedSlotLimit = i + 1; } -}; +} //----------------------------------------------------------------------------------- @@ -752,19 +792,20 @@ struct LookAheadResults { // Run the state machine to find a boundary // //----------------------------------------------------------------------------------- +template int32_t RuleBasedBreakIterator::handleNext() { int32_t state; uint16_t category = 0; RBBIRunMode mode; - RBBIStateTableRow *row; + RowType *row; UChar32 c; - LookAheadResults lookAheadMatches; int32_t result = 0; int32_t initialPosition = 0; const RBBIStateTable *statetable = fData->fForwardTable; const char *tableData = statetable->fTableData; uint32_t tableRowLen = statetable->fRowLen; + uint32_t dictStart = statetable->fDictCategoriesStart; #ifdef RBBI_DEBUG if (gTrace) { RBBIDebugPuts("Handle Next pos char state category"); @@ -789,7 +830,7 @@ int32_t RuleBasedBreakIterator::handleNext() { // Set the initial state for the state machine state = START_STATE; - row = (RBBIStateTableRow *) + row = (RowType *) //(statetable->fTableData + (statetable->fRowLen * state)); (tableData + tableRowLen * state); @@ -825,21 +866,8 @@ int32_t RuleBasedBreakIterator::handleNext() { if (mode == RBBI_RUN) { // look up the current character's character category, which tells us // which column in the state table to look at. - // Note: the 16 in UTRIE_GET16 refers to the size of the data being returned, - // not the size of the character going in, which is a UChar32. - // - category = UTRIE2_GET16(fData->fTrie, c); - - // Check the dictionary bit in the character's category. - // Counter is only used by dictionary based iteration. - // Chars that need to be handled by a dictionary have a flag bit set - // in their category values. - // - if ((category & 0x4000) != 0) { - fDictionaryCharCount++; - // And off the dictionary flag bit. - category &= ~0x4000; - } + category = trieFunc(fData->fTrie, c); + fDictionaryCharCount += (category >= dictStart); } #ifdef RBBI_DEBUG @@ -860,25 +888,24 @@ int32_t RuleBasedBreakIterator::handleNext() { // fNextState is a variable-length array. U_ASSERT(categoryfHeader->fCatCount); state = row->fNextState[category]; /*Not accessing beyond memory*/ - row = (RBBIStateTableRow *) + row = (RowType *) // (statetable->fTableData + (statetable->fRowLen * state)); (tableData + tableRowLen * state); - if (row->fAccepting == -1) { + uint16_t accepting = row->fAccepting; + if (accepting == ACCEPTING_UNCONDITIONAL) { // Match found, common case. if (mode != RBBI_START) { result = (int32_t)UTEXT_GETNATIVEINDEX(&fText); } - fRuleStatusIndex = row->fTagIdx; // Remember the break status (tag) values. - } - - int16_t completedRule = row->fAccepting; - if (completedRule > 0) { + fRuleStatusIndex = row->fTagsIdx; // Remember the break status (tag) values. + } else if (accepting > ACCEPTING_UNCONDITIONAL) { // Lookahead match is completed. - int32_t lookaheadResult = lookAheadMatches.getPosition(completedRule); + U_ASSERT(accepting < fData->fForwardTable->fLookAheadResultsSize); + int32_t lookaheadResult = fLookAheadMatches[accepting]; if (lookaheadResult >= 0) { - fRuleStatusIndex = row->fTagIdx; + fRuleStatusIndex = row->fTagsIdx; fPosition = lookaheadResult; return lookaheadResult; } @@ -890,10 +917,12 @@ int32_t RuleBasedBreakIterator::handleNext() { // This would enable hard-break rules with no following context. // But there are line break test failures when trying this. Investigate. // Issue ICU-20837 - int16_t rule = row->fLookAhead; - if (rule != 0) { + uint16_t rule = row->fLookAhead; + U_ASSERT(rule == 0 || rule > ACCEPTING_UNCONDITIONAL); + U_ASSERT(rule == 0 || rule < fData->fForwardTable->fLookAheadResultsSize); + if (rule > ACCEPTING_UNCONDITIONAL) { int32_t pos = (int32_t)UTEXT_GETNATIVEINDEX(&fText); - lookAheadMatches.setPosition(rule, pos); + fLookAheadMatches[rule] = pos; } if (state == STOP_STATE) { @@ -948,10 +977,12 @@ int32_t RuleBasedBreakIterator::handleNext() { // because the safe table does not require as many options. // //----------------------------------------------------------------------------------- +template int32_t RuleBasedBreakIterator::handleSafePrevious(int32_t fromPosition) { + int32_t state; uint16_t category = 0; - RBBIStateTableRow *row; + RowType *row; UChar32 c; int32_t result = 0; @@ -971,7 +1002,7 @@ int32_t RuleBasedBreakIterator::handleSafePrevious(int32_t fromPosition) { // Set the initial state for the state machine c = UTEXT_PREVIOUS32(&fText); state = START_STATE; - row = (RBBIStateTableRow *) + row = (RowType *) (stateTable->fTableData + (stateTable->fRowLen * state)); // loop until we reach the start of the text or transition to state 0 @@ -980,12 +1011,9 @@ int32_t RuleBasedBreakIterator::handleSafePrevious(int32_t fromPosition) { // look up the current character's character category, which tells us // which column in the state table to look at. - // Note: the 16 in UTRIE_GET16 refers to the size of the data being returned, - // not the size of the character going in, which is a UChar32. // - // And off the dictionary flag bit. For reverse iteration it is not used. - category = UTRIE2_GET16(fData->fTrie, c); - category &= ~0x4000; + // Off the dictionary flag bit. For reverse iteration it is not used. + category = trieFunc(fData->fTrie, c); #ifdef RBBI_DEBUG if (gTrace) { @@ -1004,7 +1032,7 @@ int32_t RuleBasedBreakIterator::handleSafePrevious(int32_t fromPosition) { // fNextState is a variable-length array. U_ASSERT(categoryfHeader->fCatCount); state = row->fNextState[category]; /*Not accessing beyond memory*/ - row = (RBBIStateTableRow *) + row = (RowType *) (stateTable->fTableData + (stateTable->fRowLen * state)); if (state == STOP_STATE) { @@ -1024,6 +1052,7 @@ int32_t RuleBasedBreakIterator::handleSafePrevious(int32_t fromPosition) { return result; } + //------------------------------------------------------------------------------- // // getRuleStatus() Return the break rule tag associated with the current diff --git a/intl/icu/source/common/rbbi_cache.cpp b/intl/icu/source/common/rbbi_cache.cpp index 4f9e83360a2a..63ff3001c703 100644 --- a/intl/icu/source/common/rbbi_cache.cpp +++ b/intl/icu/source/common/rbbi_cache.cpp @@ -142,13 +142,15 @@ void RuleBasedBreakIterator::DictionaryCache::populateDictionary(int32_t startPo utext_setNativeIndex(text, rangeStart); UChar32 c = utext_current32(text); - category = UTRIE2_GET16(fBI->fData->fTrie, c); + category = ucptrie_get(fBI->fData->fTrie, c); + uint32_t dictStart = fBI->fData->fForwardTable->fDictCategoriesStart; while(U_SUCCESS(status)) { - while((current = (int32_t)UTEXT_GETNATIVEINDEX(text)) < rangeEnd && (category & 0x4000) == 0) { + while((current = (int32_t)UTEXT_GETNATIVEINDEX(text)) < rangeEnd + && (category < dictStart)) { utext_next32(text); // TODO: cleaner loop structure. c = utext_current32(text); - category = UTRIE2_GET16(fBI->fData->fTrie, c); + category = ucptrie_get(fBI->fData->fTrie, c); } if (current >= rangeEnd) { break; @@ -166,7 +168,7 @@ void RuleBasedBreakIterator::DictionaryCache::populateDictionary(int32_t startPo // Reload the loop variables for the next go-round c = utext_current32(text); - category = UTRIE2_GET16(fBI->fData->fTrie, c); + category = ucptrie_get(fBI->fData->fTrie, c); } // If we found breaks, ensure that the first and last entries are diff --git a/intl/icu/source/common/rbbi_cache.h b/intl/icu/source/common/rbbi_cache.h index 7991d6c0c7bf..597312e85c45 100644 --- a/intl/icu/source/common/rbbi_cache.h +++ b/intl/icu/source/common/rbbi_cache.h @@ -126,13 +126,13 @@ class RuleBasedBreakIterator::BreakCache: public UMemory { * Additional boundaries, either preceding or following, may be added * to the cache as a side effect. * - * Return FALSE if the operation failed. + * Return false if the operation failed. */ UBool populateNear(int32_t position, UErrorCode &status); /** * Add boundary(s) to the cache following the current last boundary. - * Return FALSE if at the end of the text, and no more boundaries can be added. + * Return false if at the end of the text, and no more boundaries can be added. * Leave iteration position at the first newly added boundary, or unchanged if no boundary was added. */ UBool populateFollowing(); @@ -170,7 +170,7 @@ class RuleBasedBreakIterator::BreakCache: public UMemory { * Fails if the requested position is outside of the range of boundaries currently held by the cache. * The startPosition must be on a code point boundary. * - * Return TRUE if successful, FALSE if the specified position is after + * Return true if successful, false if the specified position is after * the last cached boundary or before the first. */ UBool seek(int32_t startPosition); diff --git a/intl/icu/source/common/rbbicst.pl b/intl/icu/source/common/rbbicst.pl index 32dd2ffff107..9aee3c166270 100755 --- a/intl/icu/source/common/rbbicst.pl +++ b/intl/icu/source/common/rbbicst.pl @@ -1,6 +1,6 @@ #************************************************************************** # Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html #************************************************************************** #************************************************************************** # Copyright (C) 2002-2016 International Business Machines Corporation diff --git a/intl/icu/source/common/rbbidata.cpp b/intl/icu/source/common/rbbidata.cpp index 1d4c9e5895f3..193acafc4420 100644 --- a/intl/icu/source/common/rbbidata.cpp +++ b/intl/icu/source/common/rbbidata.cpp @@ -11,10 +11,10 @@ #if !UCONFIG_NO_BREAK_ITERATION +#include "unicode/ucptrie.h" #include "unicode/utypes.h" #include "rbbidata.h" #include "rbbirb.h" -#include "utrie2.h" #include "udatamem.h" #include "cmemory.h" #include "cstring.h" @@ -110,17 +110,24 @@ void RBBIDataWrapper::init(const RBBIDataHeader *data, UErrorCode &status) { fReverseTable = (RBBIStateTable *)((char *)data + fHeader->fRTable); } - fTrie = utrie2_openFromSerialized(UTRIE2_16_VALUE_BITS, - (uint8_t *)data + fHeader->fTrie, - fHeader->fTrieLen, - NULL, // *actual length - &status); + fTrie = ucptrie_openFromBinary(UCPTRIE_TYPE_FAST, + UCPTRIE_VALUE_BITS_ANY, + (uint8_t *)data + fHeader->fTrie, + fHeader->fTrieLen, + nullptr, // *actual length + &status); if (U_FAILURE(status)) { return; } - fRuleSource = (UChar *)((char *)data + fHeader->fRuleSource); - fRuleString.setTo(TRUE, fRuleSource, -1); + UCPTrieValueWidth width = ucptrie_getValueWidth(fTrie); + if (!(width == UCPTRIE_VALUE_BITS_8 || width == UCPTRIE_VALUE_BITS_16)) { + status = U_INVALID_FORMAT_ERROR; + return; + } + + fRuleSource = ((char *)data + fHeader->fRuleSource); + fRuleString = UnicodeString::fromUTF8(StringPiece(fRuleSource, fHeader->fRuleSourceLen)); U_ASSERT(data->fRuleSourceLen > 0); fRuleStatusTable = (int32_t *)((char *)data + fHeader->fStatusTable); @@ -142,8 +149,8 @@ void RBBIDataWrapper::init(const RBBIDataHeader *data, UErrorCode &status) { //----------------------------------------------------------------------------- RBBIDataWrapper::~RBBIDataWrapper() { U_ASSERT(fRefCount == 0); - utrie2_close(fTrie); - fTrie = NULL; + ucptrie_close(fTrie); + fTrie = nullptr; if (fUDataMem) { udata_close(fUDataMem); } else if (!fDontFreeData) { @@ -223,9 +230,16 @@ void RBBIDataWrapper::printTable(const char *heading, const RBBIStateTable *tab uint32_t c; uint32_t s; - RBBIDebugPrintf(" %s\n", heading); + RBBIDebugPrintf("%s\n", heading); - RBBIDebugPrintf("State | Acc LA TagIx"); + RBBIDebugPrintf(" fDictCategoriesStart: %d\n", table->fDictCategoriesStart); + RBBIDebugPrintf(" fLookAheadResultsSize: %d\n", table->fLookAheadResultsSize); + RBBIDebugPrintf(" Flags: %4x RBBI_LOOKAHEAD_HARD_BREAK=%s RBBI_BOF_REQUIRED=%s RBBI_8BITS_ROWS=%s\n", + table->fFlags, + table->fFlags & RBBI_LOOKAHEAD_HARD_BREAK ? "T" : "F", + table->fFlags & RBBI_BOF_REQUIRED ? "T" : "F", + table->fFlags & RBBI_8BITS_ROWS ? "T" : "F"); + RBBIDebugPrintf("\nState | Acc LA TagIx"); for (c=0; cfCatCount; c++) {RBBIDebugPrintf("%3d ", c);} RBBIDebugPrintf("\n------|---------------"); for (c=0;cfCatCount; c++) { RBBIDebugPrintf("----"); @@ -236,12 +250,20 @@ void RBBIDataWrapper::printTable(const char *heading, const RBBIStateTable *tab RBBIDebugPrintf(" N U L L T A B L E\n\n"); return; } + UBool use8Bits = table->fFlags & RBBI_8BITS_ROWS; for (s=0; sfNumStates; s++) { RBBIStateTableRow *row = (RBBIStateTableRow *) (table->fTableData + (table->fRowLen * s)); - RBBIDebugPrintf("%4d | %3d %3d %3d ", s, row->fAccepting, row->fLookAhead, row->fTagIdx); - for (c=0; cfCatCount; c++) { - RBBIDebugPrintf("%3d ", row->fNextState[c]); + if (use8Bits) { + RBBIDebugPrintf("%4d | %3d %3d %3d ", s, row->r8.fAccepting, row->r8.fLookAhead, row->r8.fTagsIdx); + for (c=0; cfCatCount; c++) { + RBBIDebugPrintf("%3d ", row->r8.fNextState[c]); + } + } else { + RBBIDebugPrintf("%4d | %3d %3d %3d ", s, row->r16.fAccepting, row->r16.fLookAhead, row->r16.fTagsIdx); + for (c=0; cfCatCount; c++) { + RBBIDebugPrintf("%3d ", row->r16.fNextState[c]); + } } RBBIDebugPrintf("\n"); } @@ -377,35 +399,64 @@ ubrk_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *outD // int32_t topSize = offsetof(RBBIStateTable, fTableData); - // Forward state table. + // Forward state table. tableStartOffset = ds->readUInt32(rbbiDH->fFTable); tableLength = ds->readUInt32(rbbiDH->fFTableLen); if (tableLength > 0) { - ds->swapArray32(ds, inBytes+tableStartOffset, topSize, + RBBIStateTable *rbbiST = (RBBIStateTable *)(inBytes+tableStartOffset); + UBool use8Bits = ds->readUInt32(rbbiST->fFlags) & RBBI_8BITS_ROWS; + + ds->swapArray32(ds, inBytes+tableStartOffset, topSize, outBytes+tableStartOffset, status); - ds->swapArray16(ds, inBytes+tableStartOffset+topSize, tableLength-topSize, - outBytes+tableStartOffset+topSize, status); + + // Swap the state table if the table is in 16 bits. + if (use8Bits) { + if (outBytes != inBytes) { + uprv_memmove(outBytes+tableStartOffset+topSize, + inBytes+tableStartOffset+topSize, + tableLength-topSize); + } + } else { + ds->swapArray16(ds, inBytes+tableStartOffset+topSize, tableLength-topSize, + outBytes+tableStartOffset+topSize, status); + } } - + // Reverse state table. Same layout as forward table, above. tableStartOffset = ds->readUInt32(rbbiDH->fRTable); tableLength = ds->readUInt32(rbbiDH->fRTableLen); if (tableLength > 0) { - ds->swapArray32(ds, inBytes+tableStartOffset, topSize, + RBBIStateTable *rbbiST = (RBBIStateTable *)(inBytes+tableStartOffset); + UBool use8Bits = ds->readUInt32(rbbiST->fFlags) & RBBI_8BITS_ROWS; + + ds->swapArray32(ds, inBytes+tableStartOffset, topSize, outBytes+tableStartOffset, status); - ds->swapArray16(ds, inBytes+tableStartOffset+topSize, tableLength-topSize, - outBytes+tableStartOffset+topSize, status); + + // Swap the state table if the table is in 16 bits. + if (use8Bits) { + if (outBytes != inBytes) { + uprv_memmove(outBytes+tableStartOffset+topSize, + inBytes+tableStartOffset+topSize, + tableLength-topSize); + } + } else { + ds->swapArray16(ds, inBytes+tableStartOffset+topSize, tableLength-topSize, + outBytes+tableStartOffset+topSize, status); + } } // Trie table for character categories - utrie2_swap(ds, inBytes+ds->readUInt32(rbbiDH->fTrie), ds->readUInt32(rbbiDH->fTrieLen), - outBytes+ds->readUInt32(rbbiDH->fTrie), status); + ucptrie_swap(ds, inBytes+ds->readUInt32(rbbiDH->fTrie), ds->readUInt32(rbbiDH->fTrieLen), + outBytes+ds->readUInt32(rbbiDH->fTrie), status); - // Source Rules Text. It's UChar data - ds->swapArray16(ds, inBytes+ds->readUInt32(rbbiDH->fRuleSource), ds->readUInt32(rbbiDH->fRuleSourceLen), - outBytes+ds->readUInt32(rbbiDH->fRuleSource), status); + // Source Rules Text. It's UTF8 data + if (outBytes != inBytes) { + uprv_memmove(outBytes+ds->readUInt32(rbbiDH->fRuleSource), + inBytes+ds->readUInt32(rbbiDH->fRuleSource), + ds->readUInt32(rbbiDH->fRuleSourceLen)); + } // Table of rule status values. It's all int_32 values ds->swapArray32(ds, inBytes+ds->readUInt32(rbbiDH->fStatusTable), ds->readUInt32(rbbiDH->fStatusTableLen), diff --git a/intl/icu/source/common/rbbidata.h b/intl/icu/source/common/rbbidata.h index 7b9b8d825269..3749f16799e6 100644 --- a/intl/icu/source/common/rbbidata.h +++ b/intl/icu/source/common/rbbidata.h @@ -49,16 +49,17 @@ ubrk_swap(const UDataSwapper *ds, #ifdef __cplusplus +#include "unicode/ucptrie.h" #include "unicode/uobject.h" #include "unicode/unistr.h" #include "unicode/uversion.h" #include "umutex.h" -#include "utrie2.h" + U_NAMESPACE_BEGIN // The current RBBI data format version. -static const uint8_t RBBI_DATA_FORMAT_VERSION[] = {5, 0, 0, 0}; +static const uint8_t RBBI_DATA_FORMAT_VERSION[] = {6, 0, 0, 0}; /* * The following structs map exactly onto the raw data from ICU common data file. @@ -94,49 +95,61 @@ struct RBBIDataHeader { -struct RBBIStateTableRow { - int16_t fAccepting; /* Non-zero if this row is for an accepting state. */ - /* Value 0: not an accepting state. */ - /* -1: Unconditional Accepting state. */ - /* positive: Look-ahead match has completed. */ - /* Actual boundary position happened earlier */ - /* Value here == fLookAhead in earlier */ - /* state, at actual boundary pos. */ - int16_t fLookAhead; /* Non-zero if this row is for a state that */ - /* corresponds to a '/' in the rule source. */ - /* Value is the same as the fAccepting */ - /* value for the rule (which will appear */ - /* in a different state. */ - int16_t fTagIdx; /* Non-zero if this row covers a {tagged} position */ - /* from a rule. Value is the index in the */ - /* StatusTable of the set of matching */ - /* tags (rule status values) */ - int16_t fReserved; - uint16_t fNextState[1]; /* Next State, indexed by char category. */ - /* Variable-length array declared with length 1 */ - /* to disable bounds checkers. */ - /* Array Size is actually fData->fHeader->fCatCount*/ - /* CAUTION: see RBBITableBuilder::getTableSize() */ - /* before changing anything here. */ +template +struct RBBIStateTableRowT { + T fAccepting; // Non-zero if this row is for an accepting state. + // Value 0: not an accepting state. + // 1: (ACCEPTING_UNCONDITIONAL) Unconditional Accepting state. + // >1: Look-ahead match has completed. + // Actual boundary position happened earlier. + // Value here == fLookAhead in earlier + // state, at actual boundary pos. + T fLookAhead; // Non-zero if this row is for a state that + // corresponds to a '/' in the rule source. + // Value is the same as the fAccepting + // value for the rule (which will appear + // in a different state. + T fTagsIdx; // Non-zero if this row covers a {tagged} position + // from a rule. Value is the index in the + // StatusTable of the set of matching + // tags (rule status values) + T fNextState[1]; // Next State, indexed by char category. + // Variable-length array declared with length 1 + // to disable bounds checkers. + // Array Size is actually fData->fHeader->fCatCount + // CAUTION: see RBBITableBuilder::getTableSize() + // before changing anything here. }; +typedef RBBIStateTableRowT RBBIStateTableRow8; +typedef RBBIStateTableRowT RBBIStateTableRow16; + +constexpr uint16_t ACCEPTING_UNCONDITIONAL = 1; // Value constant for RBBIStateTableRow::fAccepting + +union RBBIStateTableRow { + RBBIStateTableRow16 r16; + RBBIStateTableRow8 r8; +}; struct RBBIStateTable { - uint32_t fNumStates; /* Number of states. */ - uint32_t fRowLen; /* Length of a state table row, in bytes. */ - uint32_t fFlags; /* Option Flags for this state table */ - uint32_t fReserved; /* reserved */ - char fTableData[1]; /* First RBBIStateTableRow begins here. */ - /* Variable-length array declared with length 1 */ - /* to disable bounds checkers. */ - /* (making it char[] simplifies ugly address */ - /* arithmetic for indexing variable length rows.) */ + uint32_t fNumStates; // Number of states. + uint32_t fRowLen; // Length of a state table row, in bytes. + uint32_t fDictCategoriesStart; // Char category number of the first dictionary + // char class, or the the largest category number + 1 + // if there are no dictionary categories. + uint32_t fLookAheadResultsSize; // Size of run-time array required for holding + // look-ahead results. Indexed by row.fLookAhead. + uint32_t fFlags; // Option Flags for this state table. + char fTableData[1]; // First RBBIStateTableRow begins here. + // Variable-length array declared with length 1 + // to disable bounds checkers. + // (making it char[] simplifies ugly address + // arithmetic for indexing variable length rows.) }; -typedef enum { - RBBI_LOOKAHEAD_HARD_BREAK = 1, - RBBI_BOF_REQUIRED = 2 -} RBBIStateTableFlags; +constexpr uint32_t RBBI_LOOKAHEAD_HARD_BREAK = 1; +constexpr uint32_t RBBI_BOF_REQUIRED = 2; +constexpr uint32_t RBBI_8BITS_ROWS = 4; /* */ @@ -170,13 +183,13 @@ public: const RBBIDataHeader *fHeader; const RBBIStateTable *fForwardTable; const RBBIStateTable *fReverseTable; - const UChar *fRuleSource; + const char *fRuleSource; const int32_t *fRuleStatusTable; /* number of int32_t values in the rule status table. Used to sanity check indexing */ int32_t fStatusMaxIdx; - UTrie2 *fTrie; + UCPTrie *fTrie; private: u_atomic_int32_t fRefCount; @@ -184,8 +197,8 @@ private: UnicodeString fRuleString; UBool fDontFreeData; - RBBIDataWrapper(const RBBIDataWrapper &other); /* forbid copying of this class */ - RBBIDataWrapper &operator=(const RBBIDataWrapper &other); /* forbid copying of this class */ + RBBIDataWrapper(const RBBIDataWrapper &other) = delete; /* forbid copying of this class */ + RBBIDataWrapper &operator=(const RBBIDataWrapper &other) = delete; /* forbid copying of this class */ }; diff --git a/intl/icu/source/common/rbbinode.h b/intl/icu/source/common/rbbinode.h index f35259602255..cff3ba70c427 100644 --- a/intl/icu/source/common/rbbinode.h +++ b/intl/icu/source/common/rbbinode.h @@ -79,7 +79,7 @@ class RBBINode : public UMemory { // corresponds to columns in the final // state transition table. - UBool fLookAheadEnd; // For endMark nodes, set TRUE if + UBool fLookAheadEnd; // For endMark nodes, set true if // marking the end of a look-ahead rule. UBool fRuleRoot; // True if this node is the root of a rule. diff --git a/intl/icu/source/common/rbbirb.cpp b/intl/icu/source/common/rbbirb.cpp index 68ded32e1d0e..e5c250dfe405 100644 --- a/intl/icu/source/common/rbbirb.cpp +++ b/intl/icu/source/common/rbbirb.cpp @@ -22,6 +22,7 @@ #include "unicode/uniset.h" #include "unicode/uchar.h" #include "unicode/uchriter.h" +#include "unicode/ustring.h" #include "unicode/parsepos.h" #include "unicode/parseerr.h" @@ -154,7 +155,14 @@ RBBIDataHeader *RBBIRuleBuilder::flattenData() { int32_t reverseTableSize = align8(fForwardTable->getSafeTableSize()); int32_t trieSize = align8(fSetBuilder->getTrieSize()); int32_t statusTableSize = align8(fRuleStatusVals->size() * sizeof(int32_t)); - int32_t rulesSize = align8((fStrippedRules.length()+1) * sizeof(UChar)); + + int32_t rulesLengthInUTF8 = 0; + u_strToUTF8WithSub(0, 0, &rulesLengthInUTF8, + fStrippedRules.getBuffer(), fStrippedRules.length(), + 0xfffd, nullptr, fStatus); + *fStatus = U_ZERO_ERROR; + + int32_t rulesSize = align8((rulesLengthInUTF8+1)); int32_t totalSize = headerSize + forwardTableSize @@ -197,11 +205,11 @@ RBBIDataHeader *RBBIRuleBuilder::flattenData() { data->fRTableLen = reverseTableSize; data->fTrie = data->fRTable + data->fRTableLen; - data->fTrieLen = fSetBuilder->getTrieSize(); - data->fStatusTable = data->fTrie + trieSize; + data->fTrieLen = trieSize; + data->fStatusTable = data->fTrie + data->fTrieLen; data->fStatusTableLen= statusTableSize; data->fRuleSource = data->fStatusTable + statusTableSize; - data->fRuleSourceLen = fStrippedRules.length() * sizeof(UChar); + data->fRuleSourceLen = rulesLengthInUTF8; uprv_memset(data->fReserved, 0, sizeof(data->fReserved)); @@ -214,7 +222,12 @@ RBBIDataHeader *RBBIRuleBuilder::flattenData() { ruleStatusTable[i] = fRuleStatusVals->elementAti(i); } - fStrippedRules.extract((UChar *)((uint8_t *)data+data->fRuleSource), rulesSize/2+1, *fStatus); + u_strToUTF8WithSub((char *)data+data->fRuleSource, rulesSize, &rulesLengthInUTF8, + fStrippedRules.getBuffer(), fStrippedRules.length(), + 0xfffd, nullptr, fStatus); + if (U_FAILURE(*fStatus)) { + return NULL; + } return data; } @@ -274,9 +287,7 @@ RBBIDataHeader *RBBIRuleBuilder::build(UErrorCode &status) { // // UnicodeSet processing. - // Munge the Unicode Sets to create a set of character categories. - // Generate the mapping tables (TRIE) from input code points to - // the character categories. + // Munge the Unicode Sets to create an initial set of character categories. // fSetBuilder->buildRanges(); @@ -290,6 +301,12 @@ RBBIDataHeader *RBBIRuleBuilder::build(UErrorCode &status) { } fForwardTable->buildForwardTable(); + + // State table and character category optimization. + // Merge equivalent rows and columns. + // Note that this process alters the initial set of character categories, + // causing the representation of UnicodeSets in the parse tree to become invalid. + optimizeTables(); fForwardTable->buildSafeReverseTable(status); @@ -302,6 +319,9 @@ RBBIDataHeader *RBBIRuleBuilder::build(UErrorCode &status) { } #endif + // Generate the mapping tables (TRIE) from input code points to + // the character categories. + // fSetBuilder->buildTrie(); // diff --git a/intl/icu/source/common/rbbirpt.txt b/intl/icu/source/common/rbbirpt.txt index c27857eb2957..83f7aa401b02 100644 --- a/intl/icu/source/common/rbbirpt.txt +++ b/intl/icu/source/common/rbbirpt.txt @@ -2,7 +2,7 @@ #***************************************************************************** # # Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html # #***************************************************************************** #***************************************************************************** diff --git a/intl/icu/source/common/rbbiscan.cpp b/intl/icu/source/common/rbbiscan.cpp index 4eb324b4b900..9c406af67136 100644 --- a/intl/icu/source/common/rbbiscan.cpp +++ b/intl/icu/source/common/rbbiscan.cpp @@ -829,16 +829,14 @@ static const UChar chRParen = 0x29; UnicodeString RBBIRuleScanner::stripRules(const UnicodeString &rules) { UnicodeString strippedRules; int32_t rulesLength = rules.length(); - bool skippingSpaces = false; for (int32_t idx=0; idxfStatus; - fRangeList = 0; - fTrie = 0; + fRangeList = nullptr; + fMutableTrie = nullptr; + fTrie = nullptr; fTrieSize = 0; fGroupCount = 0; - fSawBOF = FALSE; + fSawBOF = false; } @@ -79,7 +80,8 @@ RBBISetBuilder::~RBBISetBuilder() delete r; } - utrie2_close(fTrie); + ucptrie_close(fTrie); + umutablecptrie_close(fMutableTrie); } @@ -194,25 +196,48 @@ void RBBISetBuilder::buildRanges() { // // Numbering: # 0 (state table column 0) is unused. // # 1 is reserved - table column 1 is for end-of-input - // # 2 is reserved - table column 2 is for beginning-in-input + // # 2 is reserved - table column 2 is for beginning-of-input // # 3 is the first range list. // RangeDescriptor *rlSearchRange; - for (rlRange = fRangeList; rlRange!=0; rlRange=rlRange->fNext) { + int32_t dictGroupCount = 0; + + for (rlRange = fRangeList; rlRange!=nullptr; rlRange=rlRange->fNext) { for (rlSearchRange=fRangeList; rlSearchRange != rlRange; rlSearchRange=rlSearchRange->fNext) { if (rlRange->fIncludesSets->equals(*rlSearchRange->fIncludesSets)) { rlRange->fNum = rlSearchRange->fNum; + rlRange->fIncludesDict = rlSearchRange->fIncludesDict; break; } } if (rlRange->fNum == 0) { - fGroupCount ++; - rlRange->fNum = fGroupCount+2; - rlRange->setDictionaryFlag(); - addValToSets(rlRange->fIncludesSets, fGroupCount+2); + rlRange->fFirstInGroup = true; + if (rlRange->isDictionaryRange()) { + rlRange->fNum = ++dictGroupCount; + rlRange->fIncludesDict = true; + } else { + fGroupCount++; + rlRange->fNum = fGroupCount+2; + addValToSets(rlRange->fIncludesSets, rlRange->fNum); + } } } + // Move the character category numbers for any dictionary ranges up, so that they + // immediately follow the non-dictionary ranges. + + fDictCategoriesStart = fGroupCount + 3; + for (rlRange = fRangeList; rlRange!=nullptr; rlRange=rlRange->fNext) { + if (rlRange->fIncludesDict) { + rlRange->fNum += fDictCategoriesStart - 1; + if (rlRange->fFirstInGroup) { + addValToSets(rlRange->fIncludesSets, rlRange->fNum); + } + } + } + fGroupCount += dictGroupCount; + + // Handle input sets that contain the special string {eof}. // Column 1 of the state table is reserved for EOF on input. // Column 2 is reserved for before-the-start-input. @@ -220,13 +245,11 @@ void RBBISetBuilder::buildRanges() { // references to {bof}.) // Add this column value (1 or 2) to the equivalent expression // subtree for each UnicodeSet that contains the string {eof} - // Because {bof} and {eof} are not a characters in the normal sense, - // they doesn't affect the computation of ranges or TRIE. - static const UChar eofUString[] = {0x65, 0x6f, 0x66, 0}; - static const UChar bofUString[] = {0x62, 0x6f, 0x66, 0}; + // Because {bof} and {eof} are not characters in the normal sense, + // they don't affect the computation of the ranges or TRIE. - UnicodeString eofString(eofUString); - UnicodeString bofString(bofUString); + UnicodeString eofString(u"eof"); + UnicodeString bofString(u"bof"); for (ni=0; ; ni++) { // Loop over each of the UnicodeSets encountered in the input rules usetNode = (RBBINode *)this->fRB->fUSetNodes->elementAt(ni); if (usetNode==NULL) { @@ -253,19 +276,17 @@ void RBBISetBuilder::buildRanges() { // range group number. // void RBBISetBuilder::buildTrie() { - RangeDescriptor *rlRange; - - fTrie = utrie2_open(0, // Initial value for all code points. + fMutableTrie = umutablecptrie_open( + 0, // Initial value for all code points. 0, // Error value for out-of-range input. fStatus); - for (rlRange = fRangeList; rlRange!=0 && U_SUCCESS(*fStatus); rlRange=rlRange->fNext) { - utrie2_setRange32(fTrie, - rlRange->fStartChar, // Range start - rlRange->fEndChar, // Range end (inclusive) - rlRange->fNum, // value for range - TRUE, // Overwrite previously written values - fStatus); + for (RangeDescriptor *range = fRangeList; range!=nullptr && U_SUCCESS(*fStatus); range=range->fNext) { + umutablecptrie_setRange(fMutableTrie, + range->fStartChar, // Range start + range->fEndChar, // Range end (inclusive) + range->fNum, // value for range + fStatus); } } @@ -273,16 +294,21 @@ void RBBISetBuilder::buildTrie() { void RBBISetBuilder::mergeCategories(IntPair categories) { U_ASSERT(categories.first >= 1); U_ASSERT(categories.second > categories.first); + U_ASSERT((categories.first < fDictCategoriesStart && categories.second < fDictCategoriesStart) || + (categories.first >= fDictCategoriesStart && categories.second >= fDictCategoriesStart)); + for (RangeDescriptor *rd = fRangeList; rd != nullptr; rd = rd->fNext) { - int32_t rangeNum = rd->fNum & ~DICT_BIT; - int32_t rangeDict = rd->fNum & DICT_BIT; + int32_t rangeNum = rd->fNum; if (rangeNum == categories.second) { - rd->fNum = categories.first | rangeDict; + rd->fNum = categories.first; } else if (rangeNum > categories.second) { rd->fNum--; } } --fGroupCount; + if (categories.second <= fDictCategoriesStart) { + --fDictCategoriesStart; + } } @@ -295,15 +321,18 @@ int32_t RBBISetBuilder::getTrieSize() { if (U_FAILURE(*fStatus)) { return 0; } - utrie2_freeze(fTrie, UTRIE2_16_VALUE_BITS, fStatus); - fTrieSize = utrie2_serialize(fTrie, - NULL, // Buffer - 0, // Capacity - fStatus); - if (*fStatus == U_BUFFER_OVERFLOW_ERROR) { - *fStatus = U_ZERO_ERROR; + if (fTrie == nullptr) { + bool use8Bits = getNumCharCategories() <= kMaxCharCategoriesFor8BitsTrie; + fTrie = umutablecptrie_buildImmutable( + fMutableTrie, + UCPTRIE_TYPE_FAST, + use8Bits ? UCPTRIE_VALUE_BITS_8 : UCPTRIE_VALUE_BITS_16, + fStatus); + fTrieSize = ucptrie_toBinary(fTrie, nullptr, 0, fStatus); + if (*fStatus == U_BUFFER_OVERFLOW_ERROR) { + *fStatus = U_ZERO_ERROR; + } } - // RBBIDebugPrintf("Trie table size is %d\n", trieSize); return fTrieSize; } @@ -316,9 +345,9 @@ int32_t RBBISetBuilder::getTrieSize() { // //----------------------------------------------------------------------------------- void RBBISetBuilder::serializeTrie(uint8_t *where) { - utrie2_serialize(fTrie, - where, // Buffer - fTrieSize, // Capacity + ucptrie_toBinary(fTrie, + where, // Buffer + fTrieSize, // Capacity fStatus); } @@ -384,6 +413,16 @@ int32_t RBBISetBuilder::getNumCharCategories() const { } +//------------------------------------------------------------------------ +// +// getDictCategoriesStart +// +//------------------------------------------------------------------------ +int32_t RBBISetBuilder::getDictCategoriesStart() const { + return fDictCategoriesStart; +} + + //------------------------------------------------------------------------ // // sawBOF @@ -403,7 +442,7 @@ UBool RBBISetBuilder::sawBOF() const { UChar32 RBBISetBuilder::getFirstChar(int32_t category) const { RangeDescriptor *rlRange; UChar32 retVal = (UChar32)-1; - for (rlRange = fRangeList; rlRange!=0; rlRange=rlRange->fNext) { + for (rlRange = fRangeList; rlRange!=nullptr; rlRange=rlRange->fNext) { if (rlRange->fNum == category) { retVal = rlRange->fStartChar; break; @@ -413,7 +452,6 @@ UChar32 RBBISetBuilder::getFirstChar(int32_t category) const { } - //------------------------------------------------------------------------ // // printRanges A debugging function. @@ -426,16 +464,16 @@ void RBBISetBuilder::printRanges() { int i; RBBIDebugPrintf("\n\n Nonoverlapping Ranges ...\n"); - for (rlRange = fRangeList; rlRange!=0; rlRange=rlRange->fNext) { - RBBIDebugPrintf("%2i %4x-%4x ", rlRange->fNum, rlRange->fStartChar, rlRange->fEndChar); + for (rlRange = fRangeList; rlRange!=nullptr; rlRange=rlRange->fNext) { + RBBIDebugPrintf("%4x-%4x ", rlRange->fStartChar, rlRange->fEndChar); for (i=0; ifIncludesSets->size(); i++) { RBBINode *usetNode = (RBBINode *)rlRange->fIncludesSets->elementAt(i); - UnicodeString setName = UNICODE_STRING("anon", 4); + UnicodeString setName {u"anon"}; RBBINode *setRef = usetNode->fParent; - if (setRef != NULL) { + if (setRef != nullptr) { RBBINode *varRef = setRef->fParent; - if (varRef != NULL && varRef->fType == RBBINode::varRef) { + if (varRef != nullptr && varRef->fType == RBBINode::varRef) { setName = varRef->fText; } } @@ -455,19 +493,15 @@ void RBBISetBuilder::printRanges() { //------------------------------------------------------------------------ #ifdef RBBI_DEBUG void RBBISetBuilder::printRangeGroups() { - RangeDescriptor *rlRange; - RangeDescriptor *tRange; int i; - int lastPrintedGroupNum = 0; RBBIDebugPrintf("\nRanges grouped by Unicode Set Membership...\n"); - for (rlRange = fRangeList; rlRange!=0; rlRange=rlRange->fNext) { - int groupNum = rlRange->fNum & 0xbfff; - if (groupNum > lastPrintedGroupNum) { - lastPrintedGroupNum = groupNum; + for (RangeDescriptor *rlRange = fRangeList; rlRange!=nullptr; rlRange=rlRange->fNext) { + if (rlRange->fFirstInGroup) { + int groupNum = rlRange->fNum; RBBIDebugPrintf("%2i ", groupNum); - if (rlRange->fNum & DICT_BIT) { RBBIDebugPrintf(" ");} + if (groupNum >= fDictCategoriesStart) { RBBIDebugPrintf(" ");} for (i=0; ifIncludesSets->size(); i++) { RBBINode *usetNode = (RBBINode *)rlRange->fIncludesSets->elementAt(i); @@ -483,7 +517,7 @@ void RBBISetBuilder::printRangeGroups() { } i = 0; - for (tRange = rlRange; tRange != 0; tRange = tRange->fNext) { + for (RangeDescriptor *tRange = rlRange; tRange != nullptr; tRange = tRange->fNext) { if (tRange->fNum == rlRange->fNum) { if (i++ % 5 == 0) { RBBIDebugPrintf("\n "); @@ -550,28 +584,22 @@ void RBBISetBuilder::printSets() { // //------------------------------------------------------------------------------------- -RangeDescriptor::RangeDescriptor(const RangeDescriptor &other, UErrorCode &status) { - int i; +RangeDescriptor::RangeDescriptor(const RangeDescriptor &other, UErrorCode &status) : + fStartChar(other.fStartChar), fEndChar {other.fEndChar}, fNum {other.fNum}, + fIncludesDict{other.fIncludesDict}, fFirstInGroup{other.fFirstInGroup} { - this->fStartChar = other.fStartChar; - this->fEndChar = other.fEndChar; - this->fNum = other.fNum; - this->fNext = NULL; - UErrorCode oldstatus = status; - this->fIncludesSets = new UVector(status); - if (U_FAILURE(oldstatus)) { - status = oldstatus; + if (U_FAILURE(status)) { + return; + } + fIncludesSets = new UVector(status); + if (this->fIncludesSets == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; } if (U_FAILURE(status)) { return; } - /* test for NULL */ - if (this->fIncludesSets == 0) { - status = U_MEMORY_ALLOCATION_ERROR; - return; - } - for (i=0; isize(); i++) { + for (int32_t i=0; isize(); i++) { this->fIncludesSets->addElement(other.fIncludesSets->elementAt(i), status); } } @@ -583,24 +611,13 @@ RangeDescriptor::RangeDescriptor(const RangeDescriptor &other, UErrorCode &statu // //------------------------------------------------------------------------------------- RangeDescriptor::RangeDescriptor(UErrorCode &status) { - this->fStartChar = 0; - this->fEndChar = 0; - this->fNum = 0; - this->fNext = NULL; - UErrorCode oldstatus = status; - this->fIncludesSets = new UVector(status); - if (U_FAILURE(oldstatus)) { - status = oldstatus; - } if (U_FAILURE(status)) { return; } - /* test for NULL */ - if(this->fIncludesSets == 0) { + fIncludesSets = new UVector(status); + if (fIncludesSets == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return; } - } @@ -611,7 +628,7 @@ RangeDescriptor::RangeDescriptor(UErrorCode &status) { //------------------------------------------------------------------------------------- RangeDescriptor::~RangeDescriptor() { delete fIncludesSets; - fIncludesSets = NULL; + fIncludesSets = nullptr; } //------------------------------------------------------------------------------------- @@ -622,7 +639,7 @@ RangeDescriptor::~RangeDescriptor() { void RangeDescriptor::split(UChar32 where, UErrorCode &status) { U_ASSERT(where>fStartChar && where<=fEndChar); RangeDescriptor *nr = new RangeDescriptor(*this, status); - if(nr == 0) { + if(nr == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -641,27 +658,22 @@ void RangeDescriptor::split(UChar32 where, UErrorCode &status) { //------------------------------------------------------------------------------------- // -// RangeDescriptor::setDictionaryFlag +// RangeDescriptor::isDictionaryRange // -// Character Category Numbers that include characters from -// the original Unicode Set named "dictionary" have bit 14 -// set to 1. The RBBI runtime engine uses this to trigger -// use of the word dictionary. +// Test whether this range includes characters from +// the original Unicode Set named "dictionary". // -// This function looks through the Unicode Sets that it -// (the range) includes, and sets the bit in fNum when -// "dictionary" is among them. +// This function looks through the Unicode Sets that +// the range includes, checking for one named "dictionary" // // TODO: a faster way would be to find the set node for // "dictionary" just once, rather than looking it // up by name every time. // //------------------------------------------------------------------------------------- -void RangeDescriptor::setDictionaryFlag() { - int i; - +bool RangeDescriptor::isDictionaryRange() { static const char16_t *dictionary = u"dictionary"; - for (i=0; isize(); i++) { + for (int32_t i=0; isize(); i++) { RBBINode *usetNode = (RBBINode *)fIncludesSets->elementAt(i); RBBINode *setRef = usetNode->fParent; if (setRef != nullptr) { @@ -669,16 +681,14 @@ void RangeDescriptor::setDictionaryFlag() { if (varRef && varRef->fType == RBBINode::varRef) { const UnicodeString *setName = &varRef->fText; if (setName->compare(dictionary, -1) == 0) { - fNum |= RBBISetBuilder::DICT_BIT; - break; + return true; } } } } + return false; } - - U_NAMESPACE_END #endif /* #if !UCONFIG_NO_BREAK_ITERATION */ diff --git a/intl/icu/source/common/rbbisetb.h b/intl/icu/source/common/rbbisetb.h index ed6a76b12146..6409a4ea5798 100644 --- a/intl/icu/source/common/rbbisetb.h +++ b/intl/icu/source/common/rbbisetb.h @@ -16,9 +16,10 @@ #if !UCONFIG_NO_BREAK_ITERATION +#include "unicode/ucptrie.h" +#include "unicode/umutablecptrie.h" #include "unicode/uobject.h" #include "rbbirb.h" -#include "utrie2.h" #include "uvector.h" U_NAMESPACE_BEGIN @@ -40,25 +41,26 @@ U_NAMESPACE_BEGIN // class RangeDescriptor : public UMemory { public: - UChar32 fStartChar; // Start of range, unicode 32 bit value. - UChar32 fEndChar; // End of range, unicode 32 bit value. - int32_t fNum; // runtime-mapped input value for this range. - UVector *fIncludesSets; // vector of the the original - // Unicode sets that include this range. - // (Contains ptrs to uset nodes) - RangeDescriptor *fNext; // Next RangeDescriptor in the linked list. + UChar32 fStartChar {}; // Start of range, unicode 32 bit value. + UChar32 fEndChar {}; // End of range, unicode 32 bit value. + int32_t fNum {0}; // runtime-mapped input value for this range. + bool fIncludesDict {false}; // True if the range includes $dictionary. + bool fFirstInGroup {false}; // True if first range in a group with the same fNum. + UVector *fIncludesSets {nullptr}; // vector of the the original + // Unicode sets that include this range. + // (Contains ptrs to uset nodes) + RangeDescriptor *fNext {nullptr}; // Next RangeDescriptor in the linked list. RangeDescriptor(UErrorCode &status); RangeDescriptor(const RangeDescriptor &other, UErrorCode &status); ~RangeDescriptor(); void split(UChar32 where, UErrorCode &status); // Spit this range in two at "where", with // where appearing in the second (higher) part. - void setDictionaryFlag(); // Check whether this range appears as part of + bool isDictionaryRange(); // Check whether this range appears as part of // the Unicode set named "dictionary" -private: - RangeDescriptor(const RangeDescriptor &other); // forbid copying of this class - RangeDescriptor &operator=(const RangeDescriptor &other); // forbid copying of this class + RangeDescriptor(const RangeDescriptor &other) = delete; // forbid default copying of this class + RangeDescriptor &operator=(const RangeDescriptor &other) = delete; // forbid assigning of this class }; @@ -89,6 +91,8 @@ public: int32_t getNumCharCategories() const; // CharCategories are the same as input symbol set to the // runtime state machine, which are the same as // columns in the DFA state table + int32_t getDictCategoriesStart() const; // First char category that includes $dictionary, or + // last category + 1 if there are no dictionary categories. int32_t getTrieSize() /*const*/; // Size in bytes of the serialized Trie. void serializeTrie(uint8_t *where); // write out the serialized Trie. UChar32 getFirstChar(int32_t val) const; @@ -101,8 +105,6 @@ public: */ void mergeCategories(IntPair categories); - static constexpr int32_t DICT_BIT = 0x4000; - #ifdef RBBI_DEBUG void printSets(); void printRanges(); @@ -114,24 +116,22 @@ public: #endif private: - void numberSets(); - RBBIRuleBuilder *fRB; // The RBBI Rule Compiler that owns us. UErrorCode *fStatus; RangeDescriptor *fRangeList; // Head of the linked list of RangeDescriptors - UTrie2 *fTrie; // The mapping TRIE that is the end result of processing - uint32_t fTrieSize; // the Unicode Sets. + UMutableCPTrie *fMutableTrie; // The mapping TRIE that is the end result of processing + UCPTrie *fTrie; // the Unicode Sets. + uint32_t fTrieSize; - // Groups correspond to character categories - - // groups of ranges that are in the same original UnicodeSets. - // fGroupCount is the index of the last used group. - // fGroupCount+1 is also the number of columns in the RBBI state table being compiled. - // State table column 0 is not used. Column 1 is for end-of-input. - // column 2 is for group 0. Funny counting. + // Number of range groups, which are groups of ranges that are in the same original UnicodeSets. int32_t fGroupCount; + // The number of the first dictionary char category. + // If there are no Dictionary categories, set to the last category + 1. + int32_t fDictCategoriesStart; + UBool fSawBOF; RBBISetBuilder(const RBBISetBuilder &other); // forbid copying of this class diff --git a/intl/icu/source/common/rbbitblb.cpp b/intl/icu/source/common/rbbitblb.cpp index 960ef7ec8229..70e260fc08ba 100644 --- a/intl/icu/source/common/rbbitblb.cpp +++ b/intl/icu/source/common/rbbitblb.cpp @@ -28,6 +28,8 @@ U_NAMESPACE_BEGIN +const int32_t kMaxStateFor8BitsTable = 255; + RBBITableBuilder::RBBITableBuilder(RBBIRuleBuilder *rb, RBBINode **rootNode, UErrorCode &status) : fRB(rb), fTree(*rootNode), @@ -712,7 +714,6 @@ void RBBITableBuilder::mapLookAheadRules() { return; } fLookAheadRuleMap->setSize(fRB->fScanner->numRules() + 1); - int32_t laSlotsInUse = 0; for (int32_t n=0; nsize(); n++) { RBBIStateDescriptor *sd = (RBBIStateDescriptor *)fDStates->elementAt(n); @@ -749,7 +750,7 @@ void RBBITableBuilder::mapLookAheadRules() { } if (laSlotForState == 0) { - laSlotForState = ++laSlotsInUse; + laSlotForState = ++fLASlotsInUse; } // For each look ahead node covered by this state, @@ -805,23 +806,23 @@ void RBBITableBuilder::flagAcceptingStates() { if (sd->fPositions->indexOf(endMarker) >= 0) { // Any non-zero value for fAccepting means this is an accepting node. // The value is what will be returned to the user as the break status. - // If no other value was specified, force it to -1. + // If no other value was specified, force it to ACCEPTING_UNCONDITIONAL (1). if (sd->fAccepting==0) { // State hasn't been marked as accepting yet. Do it now. sd->fAccepting = fLookAheadRuleMap->elementAti(endMarker->fVal); if (sd->fAccepting == 0) { - sd->fAccepting = -1; + sd->fAccepting = ACCEPTING_UNCONDITIONAL; } } - if (sd->fAccepting==-1 && endMarker->fVal != 0) { + if (sd->fAccepting==ACCEPTING_UNCONDITIONAL && endMarker->fVal != 0) { // Both lookahead and non-lookahead accepting for this state. // Favor the look-ahead, because a look-ahead match needs to // immediately stop the run-time engine. First match, not longest. sd->fAccepting = fLookAheadRuleMap->elementAti(endMarker->fVal); } // implicit else: - // if sd->fAccepting already had a value other than 0 or -1, leave it be. + // if sd->fAccepting already had a value other than 0 or 1, leave it be. } } } @@ -855,7 +856,7 @@ void RBBITableBuilder::flagLookAheadStates() { int32_t positionsIdx = sd->fPositions->indexOf(lookAheadNode); if (positionsIdx >= 0) { U_ASSERT(lookAheadNode == sd->fPositions->elementAt(positionsIdx)); - int32_t lookaheadSlot = fLookAheadRuleMap->elementAti(lookAheadNode->fVal); + uint32_t lookaheadSlot = fLookAheadRuleMap->elementAti(lookAheadNode->fVal); U_ASSERT(sd->fLookAhead == 0 || sd->fLookAhead == lookaheadSlot); // if (sd->fLookAhead != 0 && sd->fLookAhead != lookaheadSlot) { // printf("%s:%d Bingo. sd->fLookAhead:%d lookaheadSlot:%d\n", @@ -1148,7 +1149,13 @@ bool RBBITableBuilder::findDuplCharClassFrom(IntPair *categories) { int32_t numCols = fRB->fSetBuilder->getNumCharCategories(); for (; categories->first < numCols-1; categories->first++) { - for (categories->second=categories->first+1; categories->second < numCols; categories->second++) { + // Note: dictionary & non-dictionary columns cannot be merged. + // The limitSecond value prevents considering mixed pairs. + // Dictionary categories are >= DictCategoriesStart. + // Non dict categories are < DictCategoriesStart. + int limitSecond = categories->first < fRB->fSetBuilder->getDictCategoriesStart() ? + fRB->fSetBuilder->getDictCategoriesStart() : numCols; + for (categories->second=categories->first+1; categories->second < limitSecond; categories->second++) { // Initialized to different values to prevent returning true if numStates = 0 (implies no duplicates). uint16_t table_base = 0; uint16_t table_dupl = 1; @@ -1335,11 +1342,18 @@ int32_t RBBITableBuilder::getTableSize() const { numRows = fDStates->size(); numCols = fRB->fSetBuilder->getNumCharCategories(); - rowSize = offsetof(RBBIStateTableRow, fNextState) + sizeof(uint16_t)*numCols; + if (use8BitsForTable()) { + rowSize = offsetof(RBBIStateTableRow8, fNextState) + sizeof(int8_t)*numCols; + } else { + rowSize = offsetof(RBBIStateTableRow16, fNextState) + sizeof(int16_t)*numCols; + } size += numRows * rowSize; return size; } +bool RBBITableBuilder::use8BitsForTable() const { + return fDStates->size() <= kMaxStateFor8BitsTable; +} //----------------------------------------------------------------------------- // @@ -1364,27 +1378,48 @@ void RBBITableBuilder::exportTable(void *where) { return; } - table->fRowLen = offsetof(RBBIStateTableRow, fNextState) + sizeof(uint16_t) * catCount; table->fNumStates = fDStates->size(); + table->fDictCategoriesStart = fRB->fSetBuilder->getDictCategoriesStart(); + table->fLookAheadResultsSize = fLASlotsInUse == ACCEPTING_UNCONDITIONAL ? 0 : fLASlotsInUse + 1; table->fFlags = 0; + if (use8BitsForTable()) { + table->fRowLen = offsetof(RBBIStateTableRow8, fNextState) + sizeof(uint8_t) * catCount; + table->fFlags |= RBBI_8BITS_ROWS; + } else { + table->fRowLen = offsetof(RBBIStateTableRow16, fNextState) + sizeof(int16_t) * catCount; + } if (fRB->fLookAheadHardBreak) { table->fFlags |= RBBI_LOOKAHEAD_HARD_BREAK; } if (fRB->fSetBuilder->sawBOF()) { table->fFlags |= RBBI_BOF_REQUIRED; } - table->fReserved = 0; for (state=0; statefNumStates; state++) { RBBIStateDescriptor *sd = (RBBIStateDescriptor *)fDStates->elementAt(state); RBBIStateTableRow *row = (RBBIStateTableRow *)(table->fTableData + state*table->fRowLen); - U_ASSERT (-32768 < sd->fAccepting && sd->fAccepting <= 32767); - U_ASSERT (-32768 < sd->fLookAhead && sd->fLookAhead <= 32767); - row->fAccepting = (int16_t)sd->fAccepting; - row->fLookAhead = (int16_t)sd->fLookAhead; - row->fTagIdx = (int16_t)sd->fTagsIdx; - for (col=0; colfNextState[col] = (uint16_t)sd->fDtran->elementAti(col); + if (use8BitsForTable()) { + U_ASSERT (sd->fAccepting <= 255); + U_ASSERT (sd->fLookAhead <= 255); + U_ASSERT (0 <= sd->fTagsIdx && sd->fTagsIdx <= 255); + RBBIStateTableRow8 *r8 = (RBBIStateTableRow8*)row; + r8->fAccepting = sd->fAccepting; + r8->fLookAhead = sd->fLookAhead; + r8->fTagsIdx = sd->fTagsIdx; + for (col=0; colfDtran->elementAti(col) <= kMaxStateFor8BitsTable); + r8->fNextState[col] = sd->fDtran->elementAti(col); + } + } else { + U_ASSERT (sd->fAccepting <= 0xffff); + U_ASSERT (sd->fLookAhead <= 0xffff); + U_ASSERT (0 <= sd->fTagsIdx && sd->fTagsIdx <= 0xffff); + row->r16.fAccepting = sd->fAccepting; + row->r16.fLookAhead = sd->fLookAhead; + row->r16.fTagsIdx = sd->fTagsIdx; + for (col=0; colr16.fNextState[col] = sd->fDtran->elementAti(col); + } } } } @@ -1520,11 +1555,18 @@ int32_t RBBITableBuilder::getSafeTableSize() const { numRows = fSafeTable->size(); numCols = fRB->fSetBuilder->getNumCharCategories(); - rowSize = offsetof(RBBIStateTableRow, fNextState) + sizeof(uint16_t)*numCols; + if (use8BitsForSafeTable()) { + rowSize = offsetof(RBBIStateTableRow8, fNextState) + sizeof(int8_t)*numCols; + } else { + rowSize = offsetof(RBBIStateTableRow16, fNextState) + sizeof(int16_t)*numCols; + } size += numRows * rowSize; return size; } +bool RBBITableBuilder::use8BitsForSafeTable() const { + return fSafeTable->size() <= kMaxStateFor8BitsTable; +} //----------------------------------------------------------------------------- // @@ -1549,20 +1591,34 @@ void RBBITableBuilder::exportSafeTable(void *where) { return; } - table->fRowLen = offsetof(RBBIStateTableRow, fNextState) + sizeof(uint16_t) * catCount; table->fNumStates = fSafeTable->size(); table->fFlags = 0; - table->fReserved = 0; + if (use8BitsForSafeTable()) { + table->fRowLen = offsetof(RBBIStateTableRow8, fNextState) + sizeof(uint8_t) * catCount; + table->fFlags |= RBBI_8BITS_ROWS; + } else { + table->fRowLen = offsetof(RBBIStateTableRow16, fNextState) + sizeof(int16_t) * catCount; + } for (state=0; statefNumStates; state++) { UnicodeString *rowString = (UnicodeString *)fSafeTable->elementAt(state); RBBIStateTableRow *row = (RBBIStateTableRow *)(table->fTableData + state*table->fRowLen); - row->fAccepting = 0; - row->fLookAhead = 0; - row->fTagIdx = 0; - row->fReserved = 0; - for (col=0; colfNextState[col] = rowString->charAt(col); + if (use8BitsForSafeTable()) { + RBBIStateTableRow8 *r8 = (RBBIStateTableRow8*)row; + r8->fAccepting = 0; + r8->fLookAhead = 0; + r8->fTagsIdx = 0; + for (col=0; colcharAt(col) <= kMaxStateFor8BitsTable); + r8->fNextState[col] = static_cast(rowString->charAt(col)); + } + } else { + row->r16.fAccepting = 0; + row->r16.fLookAhead = 0; + row->r16.fTagsIdx = 0; + for (col=0; colr16.fNextState[col] = rowString->charAt(col); + } } } } @@ -1600,12 +1656,12 @@ void RBBITableBuilder::printStates() { RBBIDebugPrintf("state | i n p u t s y m b o l s \n"); RBBIDebugPrintf(" | Acc LA Tag"); for (c=0; cfSetBuilder->getNumCharCategories(); c++) { - RBBIDebugPrintf(" %2d", c); + RBBIDebugPrintf(" %3d", c); } RBBIDebugPrintf("\n"); RBBIDebugPrintf(" |---------------"); for (c=0; cfSetBuilder->getNumCharCategories(); c++) { - RBBIDebugPrintf("---"); + RBBIDebugPrintf("----"); } RBBIDebugPrintf("\n"); @@ -1614,7 +1670,7 @@ void RBBITableBuilder::printStates() { RBBIDebugPrintf(" %3d | " , n); RBBIDebugPrintf("%3d %3d %5d ", sd->fAccepting, sd->fLookAhead, sd->fTagsIdx); for (c=0; cfSetBuilder->getNumCharCategories(); c++) { - RBBIDebugPrintf(" %2d", sd->fDtran->elementAti(c)); + RBBIDebugPrintf(" %3d", sd->fDtran->elementAti(c)); } RBBIDebugPrintf("\n"); } diff --git a/intl/icu/source/common/rbbitblb.h b/intl/icu/source/common/rbbitblb.h index c2b574fe1b8f..fe3db8d7bf1a 100644 --- a/intl/icu/source/common/rbbitblb.h +++ b/intl/icu/source/common/rbbitblb.h @@ -20,6 +20,7 @@ #include "unicode/uobject.h" #include "unicode/rbbi.h" +#include "rbbidata.h" #include "rbbirb.h" #include "rbbinode.h" @@ -53,6 +54,9 @@ public: */ void exportTable(void *where); + /** Use 8 bits to encode the forward table */ + bool use8BitsForTable() const; + /** * Find duplicate (redundant) character classes. Begin looking with categories.first. * Duplicate, if found are returned in the categories parameter. @@ -85,6 +89,8 @@ public: */ void exportSafeTable(void *where); + /** Use 8 bits to encode the safe reverse table */ + bool use8BitsForSafeTable() const; private: void calcNullable(RBBINode *n); @@ -179,9 +185,15 @@ private: /** Map from rule number (fVal in look ahead nodes) to sequential lookahead index. */ UVector32 *fLookAheadRuleMap = nullptr; + /* Counter used when assigning lookahead rule numbers. + * Contains the last look-ahead number already in use. + * The first look-ahead number is 2; Number 1 (ACCEPTING_UNCONDITIONAL) is reserved + * for non-lookahead accepting states. See the declarations of RBBIStateTableRowT. */ + int32_t fLASlotsInUse = ACCEPTING_UNCONDITIONAL; - RBBITableBuilder(const RBBITableBuilder &other); // forbid copying of this class - RBBITableBuilder &operator=(const RBBITableBuilder &other); // forbid copying of this class + + RBBITableBuilder(const RBBITableBuilder &other) = delete; // forbid copying of this class + RBBITableBuilder &operator=(const RBBITableBuilder &other) = delete; // forbid copying of this class }; // @@ -190,8 +202,8 @@ private: class RBBIStateDescriptor : public UMemory { public: UBool fMarked; - int32_t fAccepting; - int32_t fLookAhead; + uint32_t fAccepting; + uint32_t fLookAhead; UVector *fTagVals; int32_t fTagsIdx; UVector *fPositions; // Set of parse tree positions associated diff --git a/intl/icu/source/common/resource.h b/intl/icu/source/common/resource.h index 5199b8588807..3795694412a0 100644 --- a/intl/icu/source/common/resource.h +++ b/intl/icu/source/common/resource.h @@ -60,7 +60,7 @@ public: /** * @param i Array item index. * @param value Output-only, receives the value of the i'th item. - * @return TRUE if i is non-negative and less than getSize(). + * @return true if i is non-negative and less than getSize(). */ UBool getValue(int32_t i, ResourceValue &value) const; @@ -97,14 +97,14 @@ public: * @param i Table item index. * @param key Output-only, receives the key of the i'th item. * @param value Output-only, receives the value of the i'th item. - * @return TRUE if i is non-negative and less than getSize(). + * @return true if i is non-negative and less than getSize(). */ UBool getKeyAndValue(int32_t i, const char *&key, ResourceValue &value) const; /** * @param key Key string to find in the table. * @param value Output-only, receives the value of the item with that key. - * @return TRUE if the table contains the key. + * @return true if the table contains the key. */ UBool findValue(const char *key, ResourceValue &value) const; @@ -141,7 +141,7 @@ public: inline UnicodeString getUnicodeString(UErrorCode &errorCode) const { int32_t len = 0; const UChar *r = getString(len, errorCode); - return UnicodeString(TRUE, r, len); + return UnicodeString(true, r, len); } /** @@ -152,7 +152,7 @@ public: inline UnicodeString getAliasUnicodeString(UErrorCode &errorCode) const { int32_t len = 0; const UChar *r = getAliasString(len, errorCode); - return UnicodeString(TRUE, r, len); + return UnicodeString(true, r, len); } /** @@ -199,7 +199,7 @@ public: * CLDR no-fallback data values of (three empty-set symbols)=={2205, 2205, 2205} * when enumerating tables with fallback from the specific resource bundle to root. * - * @return TRUE if this is a no-inheritance marker string + * @return true if this is a no-inheritance marker string */ virtual UBool isNoInheritanceMarker() const = 0; diff --git a/intl/icu/source/common/ruleiter.h b/intl/icu/source/common/ruleiter.h index 4e1be53823d7..28e2ca57530e 100644 --- a/intl/icu/source/common/ruleiter.h +++ b/intl/icu/source/common/ruleiter.h @@ -114,7 +114,7 @@ public: * character. * @param options one or more of the following options, bitwise-OR-ed * together: PARSE_VARIABLES, PARSE_ESCAPES, SKIP_WHITESPACE. - * @param isEscaped output parameter set to TRUE if the character + * @param isEscaped output parameter set to true if the character * was escaped * @param ec input-output error code. An error will only be set by * this routing if options includes PARSE_VARIABLES and an unknown diff --git a/intl/icu/source/common/serv.h b/intl/icu/source/common/serv.h index e1f69cd4119e..ca070b6c6d69 100644 --- a/intl/icu/source/common/serv.h +++ b/intl/icu/source/common/serv.h @@ -138,16 +138,16 @@ class U_COMMON_API ICUServiceKey : public UObject { * must eventually return false. This implementation has no fallbacks * and always returns false.

* - * @return TRUE if the ICUServiceKey changed to a valid fallback value. + * @return true if the ICUServiceKey changed to a valid fallback value. */ virtual UBool fallback(); /** - *

Return TRUE if a key created from id matches, or would eventually + *

Return true if a key created from id matches, or would eventually * fallback to match, the canonical ID of this ICUServiceKey.

* * @param id the id to test. - * @return TRUE if this ICUServiceKey's canonical ID is a fallback of id. + * @return true if this ICUServiceKey's canonical ID is a fallback of id. */ virtual UBool isFallbackOf(const UnicodeString& id) const; @@ -291,15 +291,15 @@ class U_COMMON_API SimpleFactory : public ICUServiceFactory { public: /** *

Construct a SimpleFactory that maps a single ID to a single - * service instance. If visible is TRUE, the ID will be visible. + * service instance. If visible is true, the ID will be visible. * The instance must not be NULL. The SimpleFactory will adopt * the instance, which must not be changed subsequent to this call.

* * @param instanceToAdopt the service instance to adopt. * @param id the ID to assign to this service instance. - * @param visible if TRUE, the ID will be visible. + * @param visible if true, the ID will be visible. */ - SimpleFactory(UObject* instanceToAdopt, const UnicodeString& id, UBool visible = TRUE); + SimpleFactory(UObject* instanceToAdopt, const UnicodeString& id, UBool visible = true); /** *

Destructor.

@@ -318,7 +318,7 @@ class U_COMMON_API SimpleFactory : public ICUServiceFactory { virtual UObject* create(const ICUServiceKey& key, const ICUService* service, UErrorCode& status) const; /** - *

This implementation adds a mapping from ID -> this to result if visible is TRUE, + *

This implementation adds a mapping from ID -> this to result if visible is true, * otherwise it removes ID from result.

* * @param result the mapping table to update. @@ -327,7 +327,7 @@ class U_COMMON_API SimpleFactory : public ICUServiceFactory { virtual void updateVisibleIDs(Hashtable& result, UErrorCode& status) const; /** - *

This implementation returns the factory ID if it equals id and visible is TRUE, + *

This implementation returns the factory ID if it equals id and visible is true, * otherwise it returns the empty string. (This implementation provides * no localized id information.)

* @@ -427,8 +427,8 @@ public: UErrorCode& status); /** - *

Return TRUE if either string of the pair is bogus.

- * @return TRUE if either string of the pair is bogus. + *

Return true if either string of the pair is bogus.

+ * @return true if either string of the pair is bogus. */ UBool isBogus() const; @@ -761,7 +761,7 @@ class U_COMMON_API ICUService : public ICUNotifier { /** *

A convenience override of registerInstance(UObject*, const UnicodeString&, UBool) - * that defaults visible to TRUE.

+ * that defaults visible to true.

* * @param objToAdopt the object to register and adopt. * @param id the ID to assign to this object. @@ -774,7 +774,7 @@ class U_COMMON_API ICUService : public ICUNotifier { /** *

Register a service instance with the provided ID. The ID will be * canonicalized. The canonicalized ID will be returned by - * getVisibleIDs if visible is TRUE. The service instance will be adopted and + * getVisibleIDs if visible is true. The service instance will be adopted and * must not be modified subsequent to this call.

* *

This issues a serviceChanged notification to registered listeners.

@@ -784,7 +784,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * * @param objToAdopt the object to register and adopt. * @param id the ID to assign to this object. - * @param visible TRUE if getVisibleIDs is to return this ID. + * @param visible true if getVisibleIDs is to return this ID. * @param status the error code status. * @return a registry key that can be passed to unregister() to unregister * (and discard) this instance. @@ -820,7 +820,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * * @param rkey the registry key. * @param status the error code status. - * @return TRUE if the call successfully unregistered the factory. + * @return true if the call successfully unregistered the factory. */ virtual UBool unregister(URegistryKey rkey, UErrorCode& status); @@ -833,9 +833,9 @@ class U_COMMON_API ICUService : public ICUNotifier { virtual void reset(void); /** - *

Return TRUE if the service is in its default state.

+ *

Return true if the service is in its default state.

* - *

The default implementation returns TRUE if there are no + *

The default implementation returns true if there are no * factories registered.

*/ virtual UBool isDefault(void) const; @@ -877,7 +877,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * * @param instanceToAdopt the service instance to adopt. * @param id the ID to assign to this service instance. - * @param visible if TRUE, the ID will be visible. + * @param visible if true, the ID will be visible. * @param status the error code status. * @return an instance of ICUServiceFactory that maps this instance to the provided ID. */ @@ -885,7 +885,7 @@ class U_COMMON_API ICUService : public ICUNotifier { /** *

Reinitialize the factory list to its default state. After this call, isDefault() - * must return TRUE.

+ * must return true.

* *

This issues a serviceChanged notification to registered listeners.

* @@ -928,7 +928,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * different listeners.

* * @param l the listener to test. - * @return TRUE if the service accepts the listener. + * @return true if the service accepts the listener. */ virtual UBool acceptsListener(const EventListener& l) const; diff --git a/intl/icu/source/common/servnotf.h b/intl/icu/source/common/servnotf.h index dba7a0fea3b2..305570c1e679 100644 --- a/intl/icu/source/common/servnotf.h +++ b/intl/icu/source/common/servnotf.h @@ -105,7 +105,7 @@ public: protected: /** - * Subclasses implement this to return TRUE if the listener is + * Subclasses implement this to return true if the listener is * of the appropriate type. */ virtual UBool acceptsListener(const EventListener& l) const = 0; diff --git a/intl/icu/source/common/sharedobject.h b/intl/icu/source/common/sharedobject.h index c0a5aba47828..6ccfb27b018b 100644 --- a/intl/icu/source/common/sharedobject.h +++ b/intl/icu/source/common/sharedobject.h @@ -90,13 +90,13 @@ public: int32_t getRefCount() const; /** - * If noHardReferences() == TRUE then this object has no hard references. + * If noHardReferences() == true then this object has no hard references. * Must be called only from within the internals of UnifiedCache. */ inline UBool noHardReferences() const { return getRefCount() == 0; } /** - * If hasHardReferences() == TRUE then this object has hard references. + * If hasHardReferences() == true then this object has hard references. * Must be called only from within the internals of UnifiedCache. */ inline UBool hasHardReferences() const { return getRefCount() != 0; } diff --git a/intl/icu/source/common/simpleformatter.cpp b/intl/icu/source/common/simpleformatter.cpp index 76d8f54efd4a..f7f7aead6171 100644 --- a/intl/icu/source/common/simpleformatter.cpp +++ b/intl/icu/source/common/simpleformatter.cpp @@ -263,6 +263,8 @@ UnicodeString SimpleFormatter::getTextWithNoArguments( sb.append(compiledPattern + i, n); i += n; } else if (n < offsetsLength) { + // TODO(ICU-20406): This does not distinguish between "{0}{1}" and "{1}{0}". + // Consider removing this function and replacing it with an iterator interface. offsets[n] = sb.length(); } } diff --git a/intl/icu/source/common/sources.txt b/intl/icu/source/common/sources.txt new file mode 100644 index 000000000000..e0410daaa475 --- /dev/null +++ b/intl/icu/source/common/sources.txt @@ -0,0 +1,196 @@ +appendable.cpp +bmpset.cpp +brkeng.cpp +brkiter.cpp +bytesinkutil.cpp +bytestream.cpp +bytestrie.cpp +bytestriebuilder.cpp +bytestrieiterator.cpp +caniter.cpp +characterproperties.cpp +chariter.cpp +charstr.cpp +cmemory.cpp +cstr.cpp +cstring.cpp +cwchar.cpp +dictbe.cpp +dictionarydata.cpp +dtintrv.cpp +edits.cpp +errorcode.cpp +filteredbrk.cpp +filterednormalizer2.cpp +icudataver.cpp +icuplug.cpp +loadednormalizer2impl.cpp +localebuilder.cpp +localematcher.cpp +localeprioritylist.cpp +locavailable.cpp +locbased.cpp +locdispnames.cpp +locdistance.cpp +locdspnm.cpp +locid.cpp +loclikely.cpp +loclikelysubtags.cpp +locmap.cpp +locresdata.cpp +locutil.cpp +lsr.cpp +messagepattern.cpp +normalizer2.cpp +normalizer2impl.cpp +normlzr.cpp +parsepos.cpp +patternprops.cpp +pluralmap.cpp +propname.cpp +propsvec.cpp +punycode.cpp +putil.cpp +rbbi.cpp +rbbi_cache.cpp +rbbidata.cpp +rbbinode.cpp +rbbirb.cpp +rbbiscan.cpp +rbbisetb.cpp +rbbistbl.cpp +rbbitblb.cpp +resbund.cpp +resbund_cnv.cpp +resource.cpp +restrace.cpp +ruleiter.cpp +schriter.cpp +serv.cpp +servlk.cpp +servlkf.cpp +servls.cpp +servnotf.cpp +servrbf.cpp +servslkf.cpp +sharedobject.cpp +simpleformatter.cpp +static_unicode_sets.cpp +stringpiece.cpp +stringtriebuilder.cpp +uarrsort.cpp +ubidi.cpp +ubidi_props.cpp +ubidiln.cpp +ubiditransform.cpp +ubidiwrt.cpp +ubrk.cpp +ucase.cpp +ucasemap.cpp +ucasemap_titlecase_brkiter.cpp +ucat.cpp +uchar.cpp +ucharstrie.cpp +ucharstriebuilder.cpp +ucharstrieiterator.cpp +uchriter.cpp +ucln_cmn.cpp +ucmndata.cpp +ucnv.cpp +ucnv2022.cpp +ucnv_bld.cpp +ucnv_cb.cpp +ucnv_cnv.cpp +ucnv_ct.cpp +ucnv_err.cpp +ucnv_ext.cpp +ucnv_io.cpp +ucnv_lmb.cpp +ucnv_set.cpp +ucnv_u16.cpp +ucnv_u32.cpp +ucnv_u7.cpp +ucnv_u8.cpp +ucnvbocu.cpp +ucnvdisp.cpp +ucnvhz.cpp +ucnvisci.cpp +ucnvlat1.cpp +ucnvmbcs.cpp +ucnvscsu.cpp +ucnvsel.cpp +ucol_swp.cpp +ucptrie.cpp +ucurr.cpp +udata.cpp +udatamem.cpp +udataswp.cpp +uenum.cpp +uhash.cpp +uhash_us.cpp +uidna.cpp +uinit.cpp +uinvchar.cpp +uiter.cpp +ulist.cpp +uloc.cpp +uloc_keytype.cpp +uloc_tag.cpp +umapfile.cpp +umath.cpp +umutablecptrie.cpp +umutex.cpp +unames.cpp +unifiedcache.cpp +unifilt.cpp +unifunct.cpp +uniset.cpp +uniset_closure.cpp +uniset_props.cpp +unisetspan.cpp +unistr.cpp +unistr_case.cpp +unistr_case_locale.cpp +unistr_cnv.cpp +unistr_props.cpp +unistr_titlecase_brkiter.cpp +unorm.cpp +unormcmp.cpp +uobject.cpp +uprops.cpp +ures_cnv.cpp +uresbund.cpp +uresdata.cpp +usc_impl.cpp +uscript.cpp +uscript_props.cpp +uset.cpp +uset_props.cpp +usetiter.cpp +ushape.cpp +usprep.cpp +ustack.cpp +ustr_cnv.cpp +ustr_titlecase_brkiter.cpp +ustr_wcs.cpp +ustrcase.cpp +ustrcase_locale.cpp +ustrenum.cpp +ustrfmt.cpp +ustring.cpp +ustrtrns.cpp +utext.cpp +utf_impl.cpp +util.cpp +util_props.cpp +utrace.cpp +utrie.cpp +utrie2.cpp +utrie2_builder.cpp +utrie_swap.cpp +uts46.cpp +utypes.cpp +uvector.cpp +uvectr32.cpp +uvectr64.cpp +wintz.cpp diff --git a/intl/icu/source/common/uassert.h b/intl/icu/source/common/uassert.h index 15cd55c87348..afd31eeffd91 100644 --- a/intl/icu/source/common/uassert.h +++ b/intl/icu/source/common/uassert.h @@ -32,7 +32,7 @@ # include # define U_ASSERT(exp) assert(exp) #elif U_CPLUSPLUS_VERSION -# define U_ASSERT(exp) void() +# define U_ASSERT(exp) (void)0 #else # define U_ASSERT(exp) #endif diff --git a/intl/icu/source/common/ubidi_props.cpp b/intl/icu/source/common/ubidi_props.cpp index 4141c21938a7..afcc4aaf4f99 100644 --- a/intl/icu/source/common/ubidi_props.cpp +++ b/intl/icu/source/common/ubidi_props.cpp @@ -248,7 +248,7 @@ u_charMirror(UChar32 c) { return ubidi_getMirror(c); } -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 u_getBidiPairedBracket(UChar32 c) { return ubidi_getPairedBracket(c); } diff --git a/intl/icu/source/common/ubidiimp.h b/intl/icu/source/common/ubidiimp.h index 9746b2bc1031..e48fc6f94162 100644 --- a/intl/icu/source/common/ubidiimp.h +++ b/intl/icu/source/common/ubidiimp.h @@ -26,6 +26,14 @@ /* miscellaneous definitions ---------------------------------------------- */ +// ICU-20853=ICU-20935 Solaris #defines CS and ES in sys/regset.h +#ifdef CS +# undef CS +#endif +#ifdef ES +# undef ES +#endif + typedef uint8_t DirProp; typedef uint32_t Flags; @@ -451,26 +459,26 @@ ubidi_getMemory(BidiMemoryForAllocation *pMemory, int32_t *pSize, UBool mayAlloc /* additional macros used by ubidi_open() - always allow allocation */ #define getInitialDirPropsMemory(pBiDi, length) \ ubidi_getMemory((BidiMemoryForAllocation *)&(pBiDi)->dirPropsMemory, &(pBiDi)->dirPropsSize, \ - TRUE, (length)) + true, (length)) #define getInitialLevelsMemory(pBiDi, length) \ ubidi_getMemory((BidiMemoryForAllocation *)&(pBiDi)->levelsMemory, &(pBiDi)->levelsSize, \ - TRUE, (length)) + true, (length)) #define getInitialOpeningsMemory(pBiDi, length) \ ubidi_getMemory((BidiMemoryForAllocation *)&(pBiDi)->openingsMemory, &(pBiDi)->openingsSize, \ - TRUE, (length)*sizeof(Opening)) + true, (length)*sizeof(Opening)) #define getInitialParasMemory(pBiDi, length) \ ubidi_getMemory((BidiMemoryForAllocation *)&(pBiDi)->parasMemory, &(pBiDi)->parasSize, \ - TRUE, (length)*sizeof(Para)) + true, (length)*sizeof(Para)) #define getInitialRunsMemory(pBiDi, length) \ ubidi_getMemory((BidiMemoryForAllocation *)&(pBiDi)->runsMemory, &(pBiDi)->runsSize, \ - TRUE, (length)*sizeof(Run)) + true, (length)*sizeof(Run)) #define getInitialIsolatesMemory(pBiDi, length) \ ubidi_getMemory((BidiMemoryForAllocation *)&(pBiDi)->isolatesMemory, &(pBiDi)->isolatesSize, \ - TRUE, (length)*sizeof(Isolate)) + true, (length)*sizeof(Isolate)) #endif diff --git a/intl/icu/source/common/ubiditransform.cpp b/intl/icu/source/common/ubiditransform.cpp index 5b0d5cf96a4e..d56bf1518bfa 100644 --- a/intl/icu/source/common/ubiditransform.cpp +++ b/intl/icu/source/common/ubiditransform.cpp @@ -89,7 +89,7 @@ struct UBiDiTransform { uint32_t letters; /* letter option for ArabicShaping */ }; -U_DRAFT UBiDiTransform* U_EXPORT2 +U_CAPI UBiDiTransform* U_EXPORT2 ubiditransform_open(UErrorCode *pErrorCode) { UBiDiTransform *pBiDiTransform = NULL; @@ -102,7 +102,7 @@ ubiditransform_open(UErrorCode *pErrorCode) return pBiDiTransform; } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 ubiditransform_close(UBiDiTransform *pBiDiTransform) { if (pBiDiTransform != NULL) { @@ -434,7 +434,7 @@ findMatchingScheme(UBiDiLevel inLevel, UBiDiLevel outLevel, return NULL; } -U_DRAFT uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 ubiditransform_transform(UBiDiTransform *pBiDiTransform, const UChar *src, int32_t srcLength, UChar *dest, int32_t destSize, diff --git a/intl/icu/source/common/ucase.cpp b/intl/icu/source/common/ucase.cpp index 4ec25a27a503..2b142f5bc245 100644 --- a/intl/icu/source/common/ucase.cpp +++ b/intl/icu/source/common/ucase.cpp @@ -707,6 +707,7 @@ ucase_isCaseSensitive(UChar32 c) { #define is_r(c) ((c)=='r' || (c)=='R') #define is_t(c) ((c)=='t' || (c)=='T') #define is_u(c) ((c)=='u' || (c)=='U') +#define is_y(c) ((c)=='y' || (c)=='Y') #define is_z(c) ((c)=='z' || (c)=='Z') /* separator? */ @@ -804,6 +805,18 @@ ucase_getCaseLocale(const char *locale) { return UCASE_LOC_DUTCH; } } + } else if(c=='h') { + /* hy or hye? *not* hyw */ + c=*locale++; + if(is_y(c)) { + c=*locale++; + if(is_e(c)) { + c=*locale; + } + if(is_sep(c)) { + return UCASE_LOC_ARMENIAN; + } + } } } else { // uppercase c @@ -868,6 +881,18 @@ ucase_getCaseLocale(const char *locale) { return UCASE_LOC_DUTCH; } } + } else if(c=='H') { + /* hy or hye? *not* hyw */ + c=*locale++; + if(is_y(c)) { + c=*locale++; + if(is_e(c)) { + c=*locale; + } + if(is_sep(c)) { + return UCASE_LOC_ARMENIAN; + } + } } } return UCASE_LOC_ROOT; @@ -1229,6 +1254,17 @@ toUpperOrTitle(UChar32 c, */ *pString=nullptr; return 0; /* remove the dot (continue without output) */ + } else if(c==0x0587) { + // See ICU-13416: + // և ligature ech-yiwn + // uppercases to ԵՒ=ech+yiwn by default and in Western Armenian, + // but to ԵՎ=ech+vew in Eastern Armenian. + if(loc==UCASE_LOC_ARMENIAN) { + *pString=upperNotTitle ? u"ԵՎ" : u"Եվ"; + } else { + *pString=upperNotTitle ? u"ԵՒ" : u"Եւ"; + } + return 2; } else { /* no known conditional special case mapping, use a normal mapping */ } diff --git a/intl/icu/source/common/ucase.h b/intl/icu/source/common/ucase.h index b0a453b87e8a..a018f82b81b2 100644 --- a/intl/icu/source/common/ucase.h +++ b/intl/icu/source/common/ucase.h @@ -56,7 +56,8 @@ enum { UCASE_LOC_TURKISH, UCASE_LOC_LITHUANIAN, UCASE_LOC_GREEK, - UCASE_LOC_DUTCH + UCASE_LOC_DUTCH, + UCASE_LOC_ARMENIAN }; /** @@ -117,7 +118,7 @@ ucase_addCaseClosure(UChar32 c, const USetAdder *sa); * the string itself is added as well as part of its code points' closure. * It must be length>=0. * - * @return TRUE if the string was found + * @return true if the string was found */ U_CFUNC UBool U_EXPORT2 ucase_addStringCaseClosure(const UChar *s, int32_t length, const USetAdder *sa); diff --git a/intl/icu/source/common/ucase_props_data.h b/intl/icu/source/common/ucase_props_data.h index 7c9723095702..aead6d58d1ec 100644 --- a/intl/icu/source/common/ucase_props_data.h +++ b/intl/icu/source/common/ucase_props_data.h @@ -13,7 +13,7 @@ static const UVersionInfo ucase_props_dataVersion={0xd,0,0,0}; -static const int32_t ucase_props_indexes[UCASE_IX_TOP]={0x10,0x70ca,0x6098,0x687,0x172,0,0,0,0,0,0,0,0,0,0,3}; +static const int32_t ucase_props_indexes[UCASE_IX_TOP]={0x10,0x70c2,0x6098,0x683,0x172,0,0,0,0,0,0,0,0,0,0,3}; static const uint16_t ucase_props_trieIndex[12356]={ 0x336,0x33e,0x346,0x34e,0x35c,0x364,0x36c,0x374,0x37c,0x384,0x38b,0x393,0x39b,0x3a3,0x3ab,0x3b3, @@ -411,18 +411,18 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0,0,0,0,0,4,4,4,4,0,0,0,0,0,0,0, 0,0,0,0,0,0,4,0,0,4,4,0,0,0,0,0, 0,0x64,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,4,0,0,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a, -0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0x179a, -0x179a,0x179a,0x179a,0x179a,0x179a,0x179a,0,0x179a,0,0,0,0,0,0x179a,0,0, -0x17b9,0x17e9,0x1819,0x1849,0x1879,0x18a9,0x18d9,0x1909,0x1939,0x1969,0x1999,0x19c9,0x19f9,0x1a29,0x1a59,0x1a89, -0x1ab9,0x1ae9,0x1b19,0x1b49,0x1b79,0x1ba9,0x1bd9,0x1c09,0x1c39,0x1c69,0x1c99,0x1cc9,0x1cf9,0x1d29,0x1d59,0x1d89, -0x1db9,0x1de9,0x1e19,0x1e49,0x1e79,0x1ea9,0x1ed9,0x1f09,0x1f39,0x1f69,0x1f99,0,4,0x1fc9,0x1ff9,0x2029, +0,4,0,0,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a, +0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0x175a, +0x175a,0x175a,0x175a,0x175a,0x175a,0x175a,0,0x175a,0,0,0,0,0,0x175a,0,0, +0x1779,0x17a9,0x17d9,0x1809,0x1839,0x1869,0x1899,0x18c9,0x18f9,0x1929,0x1959,0x1989,0x19b9,0x19e9,0x1a19,0x1a49, +0x1a79,0x1aa9,0x1ad9,0x1b09,0x1b39,0x1b69,0x1b99,0x1bc9,0x1bf9,0x1c29,0x1c59,0x1c89,0x1cb9,0x1ce9,0x1d19,0x1d49, +0x1d79,0x1da9,0x1dd9,0x1e09,0x1e39,0x1e69,0x1e99,0x1ec9,0x1ef9,0x1f29,0x1f59,0,4,0x1f89,0x1fb9,0x1fe9, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0x44,0x44,0x44, -0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a, -0x207a,0x207a,0x207a,0x207a,0x207a,0x207a,0,0,0x2099,0x20c9,0x20f9,0x2129,0x2159,0x2189,0,0, -0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a, -0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a,0x205a, +0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a, +0x203a,0x203a,0x203a,0x203a,0x203a,0x203a,0,0,0x2059,0x2089,0x20b9,0x20e9,0x2119,0x2149,0,0, +0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a, +0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a,0x201a, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,4,4,0x64,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,4,4,0,4, @@ -458,9 +458,9 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0,0,0,0,4,4,4,4,4,4,4,4,0,0,4,0x64, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,4,4,4,4,4,4,0,0, -0x21b9,0x21e9,0x2219,0x2249,0x2279,0x22c9,0x2319,0x2349,0x2379,0,0,0,0,0,0,0, -0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa, -0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0x23aa,0,0,0x23aa,0x23aa,0x23aa, +0x2179,0x21a9,0x21d9,0x2209,0x2239,0x2289,0x22d9,0x2309,0x2339,0,0,0,0,0,0,0, +0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a, +0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0x236a,0,0,0x236a,0x236a,0x236a, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x44,0x44,0x44,0,0x64,0x64,0x64,0x64,0x64,0x64,0x44,0x44,0x64,0x64,0x64,0x64, 0x44,0,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0,0,0,0,0x64,0,0, @@ -470,10 +470,10 @@ static const uint16_t ucase_props_trieIndex[12356]={ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, 5,5,0x25,5,5,5,5,5,5,5,5,1,1,1,1,1, -1,1,1,1,1,1,1,1,5,0x23c9,1,1,1,0x23e9,1,1, +1,1,1,1,1,1,1,1,5,0x2389,1,1,1,0x23a9,1,1, 5,5,5,5,0x25,5,5,5,0x25,5,5,5,5,5,5,5, 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, -1,1,1,1,1,1,1,1,1,1,1,1,1,1,0x2409,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,0x23c9,1, 1,1,1,1,1,1,0x21,1,1,1,1,5,5,5,5,5, 0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44, 0x44,0x44,0x44,0x44,0x44,0x44,0x64,0x64,0x64,0x64,0,0x44,0x64,0x64,0x44,0x64, @@ -481,27 +481,27 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0x64,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xffb1,0x92,0xff91, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, -0x242a,0x2469,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, +0x23ea,0x2429,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, -0x92,0xff91,0x24a9,0x2529,0x25a9,0x2629,0x26a9,0x2729,1,1,0x275a,1,0x92,0xff91,0x92,0xff91, +0x92,0xff91,0x2469,0x24e9,0x2569,0x25e9,0x2669,0x26e9,1,1,0x271a,1,0x92,0xff91,0x92,0xff91, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xffb1,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x411,0x411,0x411,0x411, 0x411,0x411,0x411,0x411,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0x411,0x411,0x411,0x411, 0x411,0x411,0,0,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0,0,0x411,0x411,0x411,0x411, 0x411,0x411,0x411,0x411,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0x411,0x411,0x411,0x411, 0x411,0x411,0x411,0x411,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0x411,0x411,0x411,0x411, -0x411,0x411,0,0,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0,0,0x27a9,0x411,0x2829,0x411, -0x28d9,0x411,0x2989,0x411,0,0xfc12,0,0xfc12,0,0xfc12,0,0xfc12,0x411,0x411,0x411,0x411, +0x411,0x411,0,0,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0,0,0x2769,0x411,0x27e9,0x411, +0x2899,0x411,0x2949,0x411,0,0xfc12,0,0xfc12,0,0xfc12,0,0xfc12,0x411,0x411,0x411,0x411, 0x411,0x411,0x411,0x411,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0xfc12,0x2511,0x2511,0x2b11,0x2b11, -0x2b11,0x2b11,0x3211,0x3211,0x4011,0x4011,0x3811,0x3811,0x3f11,0x3f11,0,0,0x2a39,0x2aa9,0x2b19,0x2b89, -0x2bf9,0x2c69,0x2cd9,0x2d49,0x2dbb,0x2e2b,0x2e9b,0x2f0b,0x2f7b,0x2feb,0x305b,0x30cb,0x3139,0x31a9,0x3219,0x3289, -0x32f9,0x3369,0x33d9,0x3449,0x34bb,0x352b,0x359b,0x360b,0x367b,0x36eb,0x375b,0x37cb,0x3839,0x38a9,0x3919,0x3989, -0x39f9,0x3a69,0x3ad9,0x3b49,0x3bbb,0x3c2b,0x3c9b,0x3d0b,0x3d7b,0x3deb,0x3e5b,0x3ecb,0x411,0x411,0x3f39,0x3fb9, -0x4029,0,0x40a9,0x4129,0xfc12,0xfc12,0xdb12,0xdb12,0x41db,4,0x4249,4,4,4,0x4299,0x4319, -0x4389,0,0x4409,0x4489,0xd512,0xd512,0xd512,0xd512,0x453b,4,4,4,0x411,0x411,0x45a9,0x4659, -0,0,0x4729,0x47a9,0xfc12,0xfc12,0xce12,0xce12,0,4,4,4,0x411,0x411,0x4859,0x4909, -0x49d9,0x391,0x4a59,0x4ad9,0xfc12,0xfc12,0xc812,0xc812,0xfc92,4,4,4,0,0,0x4b89,0x4c09, -0x4c79,0,0x4cf9,0x4d79,0xc012,0xc012,0xc112,0xc112,0x4e2b,4,4,0,0,0,0,0, +0x2b11,0x2b11,0x3211,0x3211,0x4011,0x4011,0x3811,0x3811,0x3f11,0x3f11,0,0,0x29f9,0x2a69,0x2ad9,0x2b49, +0x2bb9,0x2c29,0x2c99,0x2d09,0x2d7b,0x2deb,0x2e5b,0x2ecb,0x2f3b,0x2fab,0x301b,0x308b,0x30f9,0x3169,0x31d9,0x3249, +0x32b9,0x3329,0x3399,0x3409,0x347b,0x34eb,0x355b,0x35cb,0x363b,0x36ab,0x371b,0x378b,0x37f9,0x3869,0x38d9,0x3949, +0x39b9,0x3a29,0x3a99,0x3b09,0x3b7b,0x3beb,0x3c5b,0x3ccb,0x3d3b,0x3dab,0x3e1b,0x3e8b,0x411,0x411,0x3ef9,0x3f79, +0x3fe9,0,0x4069,0x40e9,0xfc12,0xfc12,0xdb12,0xdb12,0x419b,4,0x4209,4,4,4,0x4259,0x42d9, +0x4349,0,0x43c9,0x4449,0xd512,0xd512,0xd512,0xd512,0x44fb,4,4,4,0x411,0x411,0x4569,0x4619, +0,0,0x46e9,0x4769,0xfc12,0xfc12,0xce12,0xce12,0,4,4,4,0x411,0x411,0x4819,0x48c9, +0x4999,0x391,0x4a19,0x4a99,0xfc12,0xfc12,0xc812,0xc812,0xfc92,4,4,4,0,0,0x4b49,0x4bc9, +0x4c39,0,0x4cb9,0x4d39,0xc012,0xc012,0xc112,0xc112,0x4deb,4,4,0,0,0,0,0, 0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0, 0,0,0,0,4,4,0,0,0,0,0,0,4,0,0,4, 0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0, @@ -515,8 +515,8 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0x64,0x44,0x64,0x64,0x64,0x64,0x64,0x64,0x44,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,2, 0,0,1,2,2,2,1,1,2,2,2,1,0,2,0,0, -0,2,2,2,2,2,0,0,0,0,0,0,2,0,0x4e9a,0, -2,0,0x4eda,0x4f1a,2,2,0,1,2,2,0xe12,2,1,0,0,0, +0,2,2,2,2,2,0,0,0,0,0,0,2,0,0x4e5a,0, +2,0,0x4e9a,0x4eda,2,2,0,1,2,2,0xe12,2,1,0,0,0, 0,1,0,0,1,1,2,2,0,0,0,0,0,2,1,1, 0x21,0x21,0,0,0,0,0xf211,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0x812,0x812,0x812,0x812,0x812,0x812,0x812,0x812, @@ -531,14 +531,14 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812, 0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0x1812,0,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811, 0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811, -0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0,0x92,0xff91,0x4f5a,0x4f7a,0x4f9a,0x4fb9,0x4fd9,0x92, -0xff91,0x92,0xff91,0x92,0xff91,0x4ffa,0x501a,0x503a,0x505a,1,0x92,0xff91,1,0x92,0xff91,1, -1,1,1,1,0x25,5,0x507a,0x507a,0x92,0xff91,0x92,0xff91,1,0,0,0, +0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0xe811,0,0x92,0xff91,0x4f1a,0x4f3a,0x4f5a,0x4f79,0x4f99,0x92, +0xff91,0x92,0xff91,0x92,0xff91,0x4fba,0x4fda,0x4ffa,0x501a,1,0x92,0xff91,1,0x92,0xff91,1, +1,1,1,1,0x25,5,0x503a,0x503a,0x92,0xff91,0x92,0xff91,1,0,0,0, 0,0,0,0x92,0xff91,0x92,0xff91,0x44,0x44,0x44,0x92,0xff91,0,0,0,0, -0,0,0,0,0,0,0,0,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099, -0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099, -0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0x5099,0,0x5099,0,0,0,0, -0,0x5099,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059, +0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059, +0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0x5059,0,0x5059,0,0,0,0, +0,0x5059,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0x64,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44, 0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44, @@ -552,7 +552,7 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0x92,0xff91,0x92,0xff91, -0x92,0xff91,0x92,0xff91,0x92,0xff91,0x50ba,0x50f9,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, +0x92,0xff91,0x92,0xff91,0x92,0xff91,0x507a,0x50b9,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0,0x44, 4,4,4,0,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0,4, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, @@ -564,11 +564,11 @@ static const uint16_t ucase_props_trieIndex[12356]={ 4,4,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, 1,1,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91, 0x92,0xff91,0x92,0xff91,5,1,1,1,1,1,1,1,1,0x92,0xff91,0x92, -0xff91,0x513a,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,4,4,4,0x92, -0xff91,0x515a,1,0,0x92,0xff91,0x92,0xff91,0x1811,1,0x92,0xff91,0x92,0xff91,0x92,0xff91, -0x92,0xff91,0x92,0xff91,0x92,0xff91,0x517a,0x519a,0x51ba,0x51da,0x517a,1,0x51fa,0x521a,0x523a,0x525a, +0xff91,0x50fa,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,4,4,4,0x92, +0xff91,0x511a,1,0,0x92,0xff91,0x92,0xff91,0x1811,1,0x92,0xff91,0x92,0xff91,0x92,0xff91, +0x92,0xff91,0x92,0xff91,0x92,0xff91,0x513a,0x515a,0x517a,0x519a,0x513a,1,0x51ba,0x51da,0x51fa,0x521a, 0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0x92,0xff91,0,0,0x92,0xff91, -0xe812,0x527a,0x529a,0x92,0xff91,0x92,0xff91,0,0,0,0,0,0,0,0,0, +0xe812,0x523a,0x525a,0x92,0xff91,0x92,0xff91,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0x92,0xff91,0, 5,5,1,0,0,0,0,0,0,0,4,0,0,0,0x64,0, 0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0, @@ -597,17 +597,17 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0,0,0,0,4,4,0,0,0,0,0,4,4,0,0x64,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, -1,1,1,0x52b9,1,1,1,1,1,1,1,4,5,5,5,5, +1,1,1,0x5279,1,1,1,1,1,1,1,4,5,5,5,5, 1,1,1,1,1,1,1,1,1,4,4,4,0,0,0,0, -0x52d9,0x5309,0x5339,0x5369,0x5399,0x53c9,0x53f9,0x5429,0x5459,0x5489,0x54b9,0x54e9,0x5519,0x5549,0x5579,0x55a9, -0x5bd9,0x5c09,0x5c39,0x5c69,0x5c99,0x5cc9,0x5cf9,0x5d29,0x5d59,0x5d89,0x5db9,0x5de9,0x5e19,0x5e49,0x5e79,0x5ea9, -0x5ed9,0x5f09,0x5f39,0x5f69,0x5f99,0x5fc9,0x5ff9,0x6029,0x6059,0x6089,0x60b9,0x60e9,0x6119,0x6149,0x6179,0x61a9, -0x55d9,0x5609,0x5639,0x5669,0x5699,0x56c9,0x56f9,0x5729,0x5759,0x5789,0x57b9,0x57e9,0x5819,0x5849,0x5879,0x58a9, -0x58d9,0x5909,0x5939,0x5969,0x5999,0x59c9,0x59f9,0x5a29,0x5a59,0x5a89,0x5ab9,0x5ae9,0x5b19,0x5b49,0x5b79,0x5ba9, +0x5299,0x52c9,0x52f9,0x5329,0x5359,0x5389,0x53b9,0x53e9,0x5419,0x5449,0x5479,0x54a9,0x54d9,0x5509,0x5539,0x5569, +0x5b99,0x5bc9,0x5bf9,0x5c29,0x5c59,0x5c89,0x5cb9,0x5ce9,0x5d19,0x5d49,0x5d79,0x5da9,0x5dd9,0x5e09,0x5e39,0x5e69, +0x5e99,0x5ec9,0x5ef9,0x5f29,0x5f59,0x5f89,0x5fb9,0x5fe9,0x6019,0x6049,0x6079,0x60a9,0x60d9,0x6109,0x6139,0x6169, +0x5599,0x55c9,0x55f9,0x5629,0x5659,0x5689,0x56b9,0x56e9,0x5719,0x5749,0x5779,0x57a9,0x57d9,0x5809,0x5839,0x5869, +0x5899,0x58c9,0x58f9,0x5929,0x5959,0x5989,0x59b9,0x59e9,0x5a19,0x5a49,0x5a79,0x5aa9,0x5ad9,0x5b09,0x5b39,0x5b69, 0,0,0,0,0,4,0,0,4,0,0,0,0,0x64,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0x61d9,0x6259,0x62d9,0x6359,0x6409,0x64b9,0x6559,0,0,0,0,0,0,0,0,0, -0,0,0,0x65f9,0x6679,0x66f9,0x6779,0x67f9,0,0,0,0,0,0,0x64,0, +0x6199,0x6219,0x6299,0x6319,0x63c9,0x6479,0x6519,0,0,0,0,0,0,0,0,0, +0,0,0,0x65b9,0x6639,0x66b9,0x6739,0x67b9,0,0,0,0,0,0,0x64,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4, 4,4,4,4,0,0,0,4,0,0,0,0,0,0,0,0, @@ -791,7 +791,7 @@ static const uint16_t ucase_props_trieIndex[12356]={ 0,0,0,0 }; -static const uint16_t ucase_props_exceptions[1671]={ +static const uint16_t ucase_props_exceptions[1667]={ 0xc850,0x20,2,0x130,0x131,0x4810,0x20,0x841,0x6b,1,0x212a,0x841,0x73,1,0x17f,0x5c50, 0x20,2,0x130,0x131,0x844,0x4b,1,0x212a,0x844,0x53,1,0x17f,0x806,0x3bc,0x39c,0x841, 0xe5,1,0x212b,0x8c0,1,0x2220,0x73,0x73,0x53,0x53,0x53,0x73,0x1e9e,0x844,0xc5,1, @@ -815,88 +815,88 @@ static const uint16_t ucase_props_exceptions[1671]={ 0x43e,1,0x1c82,0x841,0x441,1,0x1c83,0x841,0x442,2,0x1c84,0x1c85,0x841,0x44a,1,0x1c86, 0x844,0x412,1,0x1c80,0x844,0x414,1,0x1c81,0x844,0x41e,1,0x1c82,0x844,0x421,1,0x1c83, 0x844,0x422,2,0x1c84,0x1c85,0x844,0x42a,1,0x1c86,0x841,0x463,1,0x1c87,0x844,0x462,1, -0x1c87,0x880,0x2220,0x565,0x582,0x535,0x552,0x535,0x582,0x810,0x1c60,0x80c,0x1c90,0x10d0,0x80c,0x1c91, -0x10d1,0x80c,0x1c92,0x10d2,0x80c,0x1c93,0x10d3,0x80c,0x1c94,0x10d4,0x80c,0x1c95,0x10d5,0x80c,0x1c96,0x10d6, -0x80c,0x1c97,0x10d7,0x80c,0x1c98,0x10d8,0x80c,0x1c99,0x10d9,0x80c,0x1c9a,0x10da,0x80c,0x1c9b,0x10db,0x80c, -0x1c9c,0x10dc,0x80c,0x1c9d,0x10dd,0x80c,0x1c9e,0x10de,0x80c,0x1c9f,0x10df,0x80c,0x1ca0,0x10e0,0x80c,0x1ca1, -0x10e1,0x80c,0x1ca2,0x10e2,0x80c,0x1ca3,0x10e3,0x80c,0x1ca4,0x10e4,0x80c,0x1ca5,0x10e5,0x80c,0x1ca6,0x10e6, -0x80c,0x1ca7,0x10e7,0x80c,0x1ca8,0x10e8,0x80c,0x1ca9,0x10e9,0x80c,0x1caa,0x10ea,0x80c,0x1cab,0x10eb,0x80c, -0x1cac,0x10ec,0x80c,0x1cad,0x10ed,0x80c,0x1cae,0x10ee,0x80c,0x1caf,0x10ef,0x80c,0x1cb0,0x10f0,0x80c,0x1cb1, -0x10f1,0x80c,0x1cb2,0x10f2,0x80c,0x1cb3,0x10f3,0x80c,0x1cb4,0x10f4,0x80c,0x1cb5,0x10f5,0x80c,0x1cb6,0x10f6, -0x80c,0x1cb7,0x10f7,0x80c,0x1cb8,0x10f8,0x80c,0x1cb9,0x10f9,0x80c,0x1cba,0x10fa,0x80c,0x1cbd,0x10fd,0x80c, -0x1cbe,0x10fe,0x80c,0x1cbf,0x10ff,0xa10,0x97d0,0xa10,8,0x806,0x13f0,0x13f0,0x806,0x13f1,0x13f1,0x806, -0x13f2,0x13f2,0x806,0x13f3,0x13f3,0x806,0x13f4,0x13f4,0x806,0x13f5,0x13f5,0x806,0x432,0x412,0x806,0x434, -0x414,0x806,0x43e,0x41e,0x806,0x441,0x421,0x846,0x442,0x422,1,0x1c85,0x846,0x442,0x422,1, -0x1c84,0x806,0x44a,0x42a,0x806,0x463,0x462,0x806,0xa64b,0xa64a,0xc10,0xbc0,0x810,0x8a04,0x810,0xee6, -0x810,0x8a38,0x841,0x1e61,1,0x1e9b,0x844,0x1e60,1,0x1e9b,0x880,0x2220,0x68,0x331,0x48,0x331, -0x48,0x331,0x880,0x2220,0x74,0x308,0x54,0x308,0x54,0x308,0x880,0x2220,0x77,0x30a,0x57,0x30a, -0x57,0x30a,0x880,0x2220,0x79,0x30a,0x59,0x30a,0x59,0x30a,0x880,0x2220,0x61,0x2be,0x41,0x2be, -0x41,0x2be,0x806,0x1e61,0x1e60,0xc90,0x1dbf,0x20,0x73,0x73,0x880,0x2220,0x3c5,0x313,0x3a5,0x313, -0x3a5,0x313,0x880,0x3330,0x3c5,0x313,0x300,0x3a5,0x313,0x300,0x3a5,0x313,0x300,0x880,0x3330,0x3c5, -0x313,0x301,0x3a5,0x313,0x301,0x3a5,0x313,0x301,0x880,0x3330,0x3c5,0x313,0x342,0x3a5,0x313,0x342, -0x3a5,0x313,0x342,0x890,8,0x220,0x1f00,0x3b9,0x1f08,0x399,0x890,8,0x220,0x1f01,0x3b9,0x1f09, -0x399,0x890,8,0x220,0x1f02,0x3b9,0x1f0a,0x399,0x890,8,0x220,0x1f03,0x3b9,0x1f0b,0x399,0x890, -8,0x220,0x1f04,0x3b9,0x1f0c,0x399,0x890,8,0x220,0x1f05,0x3b9,0x1f0d,0x399,0x890,8,0x220, -0x1f06,0x3b9,0x1f0e,0x399,0x890,8,0x220,0x1f07,0x3b9,0x1f0f,0x399,0xc90,8,0x220,0x1f00,0x3b9, -0x1f08,0x399,0xc90,8,0x220,0x1f01,0x3b9,0x1f09,0x399,0xc90,8,0x220,0x1f02,0x3b9,0x1f0a,0x399, -0xc90,8,0x220,0x1f03,0x3b9,0x1f0b,0x399,0xc90,8,0x220,0x1f04,0x3b9,0x1f0c,0x399,0xc90,8, -0x220,0x1f05,0x3b9,0x1f0d,0x399,0xc90,8,0x220,0x1f06,0x3b9,0x1f0e,0x399,0xc90,8,0x220,0x1f07, -0x3b9,0x1f0f,0x399,0x890,8,0x220,0x1f20,0x3b9,0x1f28,0x399,0x890,8,0x220,0x1f21,0x3b9,0x1f29, -0x399,0x890,8,0x220,0x1f22,0x3b9,0x1f2a,0x399,0x890,8,0x220,0x1f23,0x3b9,0x1f2b,0x399,0x890, -8,0x220,0x1f24,0x3b9,0x1f2c,0x399,0x890,8,0x220,0x1f25,0x3b9,0x1f2d,0x399,0x890,8,0x220, -0x1f26,0x3b9,0x1f2e,0x399,0x890,8,0x220,0x1f27,0x3b9,0x1f2f,0x399,0xc90,8,0x220,0x1f20,0x3b9, -0x1f28,0x399,0xc90,8,0x220,0x1f21,0x3b9,0x1f29,0x399,0xc90,8,0x220,0x1f22,0x3b9,0x1f2a,0x399, -0xc90,8,0x220,0x1f23,0x3b9,0x1f2b,0x399,0xc90,8,0x220,0x1f24,0x3b9,0x1f2c,0x399,0xc90,8, -0x220,0x1f25,0x3b9,0x1f2d,0x399,0xc90,8,0x220,0x1f26,0x3b9,0x1f2e,0x399,0xc90,8,0x220,0x1f27, -0x3b9,0x1f2f,0x399,0x890,8,0x220,0x1f60,0x3b9,0x1f68,0x399,0x890,8,0x220,0x1f61,0x3b9,0x1f69, -0x399,0x890,8,0x220,0x1f62,0x3b9,0x1f6a,0x399,0x890,8,0x220,0x1f63,0x3b9,0x1f6b,0x399,0x890, -8,0x220,0x1f64,0x3b9,0x1f6c,0x399,0x890,8,0x220,0x1f65,0x3b9,0x1f6d,0x399,0x890,8,0x220, -0x1f66,0x3b9,0x1f6e,0x399,0x890,8,0x220,0x1f67,0x3b9,0x1f6f,0x399,0xc90,8,0x220,0x1f60,0x3b9, -0x1f68,0x399,0xc90,8,0x220,0x1f61,0x3b9,0x1f69,0x399,0xc90,8,0x220,0x1f62,0x3b9,0x1f6a,0x399, -0xc90,8,0x220,0x1f63,0x3b9,0x1f6b,0x399,0xc90,8,0x220,0x1f64,0x3b9,0x1f6c,0x399,0xc90,8, -0x220,0x1f65,0x3b9,0x1f6d,0x399,0xc90,8,0x220,0x1f66,0x3b9,0x1f6e,0x399,0xc90,8,0x220,0x1f67, -0x3b9,0x1f6f,0x399,0x880,0x2220,0x1f70,0x3b9,0x1fba,0x399,0x1fba,0x345,0x890,9,0x220,0x3b1,0x3b9, -0x391,0x399,0x880,0x2220,0x3ac,0x3b9,0x386,0x399,0x386,0x345,0x880,0x2220,0x3b1,0x342,0x391,0x342, -0x391,0x342,0x880,0x3330,0x3b1,0x342,0x3b9,0x391,0x342,0x399,0x391,0x342,0x345,0xc90,9,0x220, -0x3b1,0x3b9,0x391,0x399,0x846,0x3b9,0x399,1,0x345,0x880,0x2220,0x1f74,0x3b9,0x1fca,0x399,0x1fca, -0x345,0x890,9,0x220,0x3b7,0x3b9,0x397,0x399,0x880,0x2220,0x3ae,0x3b9,0x389,0x399,0x389,0x345, -0x880,0x2220,0x3b7,0x342,0x397,0x342,0x397,0x342,0x880,0x3330,0x3b7,0x342,0x3b9,0x397,0x342,0x399, -0x397,0x342,0x345,0xc90,9,0x220,0x3b7,0x3b9,0x397,0x399,0x880,0x3330,0x3b9,0x308,0x300,0x399, -0x308,0x300,0x399,0x308,0x300,0x8c0,1,0x3330,0x3b9,0x308,0x301,0x399,0x308,0x301,0x399,0x308, -0x301,0x390,0x880,0x2220,0x3b9,0x342,0x399,0x342,0x399,0x342,0x880,0x3330,0x3b9,0x308,0x342,0x399, -0x308,0x342,0x399,0x308,0x342,0x880,0x3330,0x3c5,0x308,0x300,0x3a5,0x308,0x300,0x3a5,0x308,0x300, -0x8c0,1,0x3330,0x3c5,0x308,0x301,0x3a5,0x308,0x301,0x3a5,0x308,0x301,0x3b0,0x880,0x2220,0x3c1, -0x313,0x3a1,0x313,0x3a1,0x313,0x880,0x2220,0x3c5,0x342,0x3a5,0x342,0x3a5,0x342,0x880,0x3330,0x3c5, -0x308,0x342,0x3a5,0x308,0x342,0x3a5,0x308,0x342,0x880,0x2220,0x1f7c,0x3b9,0x1ffa,0x399,0x1ffa,0x345, -0x890,9,0x220,0x3c9,0x3b9,0x3a9,0x399,0x880,0x2220,0x3ce,0x3b9,0x38f,0x399,0x38f,0x345,0x880, -0x2220,0x3c9,0x342,0x3a9,0x342,0x3a9,0x342,0x880,0x3330,0x3c9,0x342,0x3b9,0x3a9,0x342,0x399,0x3a9, -0x342,0x345,0xc90,9,0x220,0x3c9,0x3b9,0x3a9,0x399,0xc50,0x1d5d,1,0x3a9,0xc50,0x20bf,1, -0x4b,0xc50,0x2046,1,0xc5,0xc10,0x29f7,0xc10,0xee6,0xc10,0x29e7,0xc10,0x2a2b,0xc10,0x2a28,0xc10, -0x2a1c,0xc10,0x29fd,0xc10,0x2a1f,0xc10,0x2a1e,0xc10,0x2a3f,0xc10,0x1c60,0x841,0xa64b,1,0x1c88,0x844, -0xa64a,1,0x1c88,0xc10,0x8a04,0xc10,0xa528,0xc10,0xa544,0xc10,0xa54f,0xc10,0xa54b,0xc10,0xa541,0xc10, -0xa512,0xc10,0xa52a,0xc10,0xa515,0x810,0x3a0,0xc10,0xa543,0xc10,0x8a38,0xc10,0x3a0,0x806,0x13a0,0x13a0, -0x806,0x13a1,0x13a1,0x806,0x13a2,0x13a2,0x806,0x13a3,0x13a3,0x806,0x13a4,0x13a4,0x806,0x13a5,0x13a5,0x806, -0x13a6,0x13a6,0x806,0x13a7,0x13a7,0x806,0x13a8,0x13a8,0x806,0x13a9,0x13a9,0x806,0x13aa,0x13aa,0x806,0x13ab, -0x13ab,0x806,0x13ac,0x13ac,0x806,0x13ad,0x13ad,0x806,0x13ae,0x13ae,0x806,0x13af,0x13af,0x806,0x13b0,0x13b0, -0x806,0x13b1,0x13b1,0x806,0x13b2,0x13b2,0x806,0x13b3,0x13b3,0x806,0x13b4,0x13b4,0x806,0x13b5,0x13b5,0x806, -0x13b6,0x13b6,0x806,0x13b7,0x13b7,0x806,0x13b8,0x13b8,0x806,0x13b9,0x13b9,0x806,0x13ba,0x13ba,0x806,0x13bb, -0x13bb,0x806,0x13bc,0x13bc,0x806,0x13bd,0x13bd,0x806,0x13be,0x13be,0x806,0x13bf,0x13bf,0x806,0x13c0,0x13c0, -0x806,0x13c1,0x13c1,0x806,0x13c2,0x13c2,0x806,0x13c3,0x13c3,0x806,0x13c4,0x13c4,0x806,0x13c5,0x13c5,0x806, -0x13c6,0x13c6,0x806,0x13c7,0x13c7,0x806,0x13c8,0x13c8,0x806,0x13c9,0x13c9,0x806,0x13ca,0x13ca,0x806,0x13cb, -0x13cb,0x806,0x13cc,0x13cc,0x806,0x13cd,0x13cd,0x806,0x13ce,0x13ce,0x806,0x13cf,0x13cf,0x806,0x13d0,0x13d0, -0x806,0x13d1,0x13d1,0x806,0x13d2,0x13d2,0x806,0x13d3,0x13d3,0x806,0x13d4,0x13d4,0x806,0x13d5,0x13d5,0x806, -0x13d6,0x13d6,0x806,0x13d7,0x13d7,0x806,0x13d8,0x13d8,0x806,0x13d9,0x13d9,0x806,0x13da,0x13da,0x806,0x13db, -0x13db,0x806,0x13dc,0x13dc,0x806,0x13dd,0x13dd,0x806,0x13de,0x13de,0x806,0x13df,0x13df,0x806,0x13e0,0x13e0, -0x806,0x13e1,0x13e1,0x806,0x13e2,0x13e2,0x806,0x13e3,0x13e3,0x806,0x13e4,0x13e4,0x806,0x13e5,0x13e5,0x806, -0x13e6,0x13e6,0x806,0x13e7,0x13e7,0x806,0x13e8,0x13e8,0x806,0x13e9,0x13e9,0x806,0x13ea,0x13ea,0x806,0x13eb, -0x13eb,0x806,0x13ec,0x13ec,0x806,0x13ed,0x13ed,0x806,0x13ee,0x13ee,0x806,0x13ef,0x13ef,0x880,0x2220,0x66, -0x66,0x46,0x46,0x46,0x66,0x880,0x2220,0x66,0x69,0x46,0x49,0x46,0x69,0x880,0x2220,0x66, -0x6c,0x46,0x4c,0x46,0x6c,0x880,0x3330,0x66,0x66,0x69,0x46,0x46,0x49,0x46,0x66,0x69, -0x880,0x3330,0x66,0x66,0x6c,0x46,0x46,0x4c,0x46,0x66,0x6c,0x8c0,1,0x2220,0x73,0x74, -0x53,0x54,0x53,0x74,0xfb06,0x8c0,1,0x2220,0x73,0x74,0x53,0x54,0x53,0x74,0xfb05,0x880, -0x2220,0x574,0x576,0x544,0x546,0x544,0x576,0x880,0x2220,0x574,0x565,0x544,0x535,0x544,0x565,0x880, -0x2220,0x574,0x56b,0x544,0x53b,0x544,0x56b,0x880,0x2220,0x57e,0x576,0x54e,0x546,0x54e,0x576,0x880, -0x2220,0x574,0x56d,0x544,0x53d,0x544,0x56d +0x1c87,0x4880,0x20,0x565,0x582,0x810,0x1c60,0x80c,0x1c90,0x10d0,0x80c,0x1c91,0x10d1,0x80c,0x1c92,0x10d2, +0x80c,0x1c93,0x10d3,0x80c,0x1c94,0x10d4,0x80c,0x1c95,0x10d5,0x80c,0x1c96,0x10d6,0x80c,0x1c97,0x10d7,0x80c, +0x1c98,0x10d8,0x80c,0x1c99,0x10d9,0x80c,0x1c9a,0x10da,0x80c,0x1c9b,0x10db,0x80c,0x1c9c,0x10dc,0x80c,0x1c9d, +0x10dd,0x80c,0x1c9e,0x10de,0x80c,0x1c9f,0x10df,0x80c,0x1ca0,0x10e0,0x80c,0x1ca1,0x10e1,0x80c,0x1ca2,0x10e2, +0x80c,0x1ca3,0x10e3,0x80c,0x1ca4,0x10e4,0x80c,0x1ca5,0x10e5,0x80c,0x1ca6,0x10e6,0x80c,0x1ca7,0x10e7,0x80c, +0x1ca8,0x10e8,0x80c,0x1ca9,0x10e9,0x80c,0x1caa,0x10ea,0x80c,0x1cab,0x10eb,0x80c,0x1cac,0x10ec,0x80c,0x1cad, +0x10ed,0x80c,0x1cae,0x10ee,0x80c,0x1caf,0x10ef,0x80c,0x1cb0,0x10f0,0x80c,0x1cb1,0x10f1,0x80c,0x1cb2,0x10f2, +0x80c,0x1cb3,0x10f3,0x80c,0x1cb4,0x10f4,0x80c,0x1cb5,0x10f5,0x80c,0x1cb6,0x10f6,0x80c,0x1cb7,0x10f7,0x80c, +0x1cb8,0x10f8,0x80c,0x1cb9,0x10f9,0x80c,0x1cba,0x10fa,0x80c,0x1cbd,0x10fd,0x80c,0x1cbe,0x10fe,0x80c,0x1cbf, +0x10ff,0xa10,0x97d0,0xa10,8,0x806,0x13f0,0x13f0,0x806,0x13f1,0x13f1,0x806,0x13f2,0x13f2,0x806,0x13f3, +0x13f3,0x806,0x13f4,0x13f4,0x806,0x13f5,0x13f5,0x806,0x432,0x412,0x806,0x434,0x414,0x806,0x43e,0x41e, +0x806,0x441,0x421,0x846,0x442,0x422,1,0x1c85,0x846,0x442,0x422,1,0x1c84,0x806,0x44a,0x42a, +0x806,0x463,0x462,0x806,0xa64b,0xa64a,0xc10,0xbc0,0x810,0x8a04,0x810,0xee6,0x810,0x8a38,0x841,0x1e61, +1,0x1e9b,0x844,0x1e60,1,0x1e9b,0x880,0x2220,0x68,0x331,0x48,0x331,0x48,0x331,0x880,0x2220, +0x74,0x308,0x54,0x308,0x54,0x308,0x880,0x2220,0x77,0x30a,0x57,0x30a,0x57,0x30a,0x880,0x2220, +0x79,0x30a,0x59,0x30a,0x59,0x30a,0x880,0x2220,0x61,0x2be,0x41,0x2be,0x41,0x2be,0x806,0x1e61, +0x1e60,0xc90,0x1dbf,0x20,0x73,0x73,0x880,0x2220,0x3c5,0x313,0x3a5,0x313,0x3a5,0x313,0x880,0x3330, +0x3c5,0x313,0x300,0x3a5,0x313,0x300,0x3a5,0x313,0x300,0x880,0x3330,0x3c5,0x313,0x301,0x3a5,0x313, +0x301,0x3a5,0x313,0x301,0x880,0x3330,0x3c5,0x313,0x342,0x3a5,0x313,0x342,0x3a5,0x313,0x342,0x890, +8,0x220,0x1f00,0x3b9,0x1f08,0x399,0x890,8,0x220,0x1f01,0x3b9,0x1f09,0x399,0x890,8,0x220, +0x1f02,0x3b9,0x1f0a,0x399,0x890,8,0x220,0x1f03,0x3b9,0x1f0b,0x399,0x890,8,0x220,0x1f04,0x3b9, +0x1f0c,0x399,0x890,8,0x220,0x1f05,0x3b9,0x1f0d,0x399,0x890,8,0x220,0x1f06,0x3b9,0x1f0e,0x399, +0x890,8,0x220,0x1f07,0x3b9,0x1f0f,0x399,0xc90,8,0x220,0x1f00,0x3b9,0x1f08,0x399,0xc90,8, +0x220,0x1f01,0x3b9,0x1f09,0x399,0xc90,8,0x220,0x1f02,0x3b9,0x1f0a,0x399,0xc90,8,0x220,0x1f03, +0x3b9,0x1f0b,0x399,0xc90,8,0x220,0x1f04,0x3b9,0x1f0c,0x399,0xc90,8,0x220,0x1f05,0x3b9,0x1f0d, +0x399,0xc90,8,0x220,0x1f06,0x3b9,0x1f0e,0x399,0xc90,8,0x220,0x1f07,0x3b9,0x1f0f,0x399,0x890, +8,0x220,0x1f20,0x3b9,0x1f28,0x399,0x890,8,0x220,0x1f21,0x3b9,0x1f29,0x399,0x890,8,0x220, +0x1f22,0x3b9,0x1f2a,0x399,0x890,8,0x220,0x1f23,0x3b9,0x1f2b,0x399,0x890,8,0x220,0x1f24,0x3b9, +0x1f2c,0x399,0x890,8,0x220,0x1f25,0x3b9,0x1f2d,0x399,0x890,8,0x220,0x1f26,0x3b9,0x1f2e,0x399, +0x890,8,0x220,0x1f27,0x3b9,0x1f2f,0x399,0xc90,8,0x220,0x1f20,0x3b9,0x1f28,0x399,0xc90,8, +0x220,0x1f21,0x3b9,0x1f29,0x399,0xc90,8,0x220,0x1f22,0x3b9,0x1f2a,0x399,0xc90,8,0x220,0x1f23, +0x3b9,0x1f2b,0x399,0xc90,8,0x220,0x1f24,0x3b9,0x1f2c,0x399,0xc90,8,0x220,0x1f25,0x3b9,0x1f2d, +0x399,0xc90,8,0x220,0x1f26,0x3b9,0x1f2e,0x399,0xc90,8,0x220,0x1f27,0x3b9,0x1f2f,0x399,0x890, +8,0x220,0x1f60,0x3b9,0x1f68,0x399,0x890,8,0x220,0x1f61,0x3b9,0x1f69,0x399,0x890,8,0x220, +0x1f62,0x3b9,0x1f6a,0x399,0x890,8,0x220,0x1f63,0x3b9,0x1f6b,0x399,0x890,8,0x220,0x1f64,0x3b9, +0x1f6c,0x399,0x890,8,0x220,0x1f65,0x3b9,0x1f6d,0x399,0x890,8,0x220,0x1f66,0x3b9,0x1f6e,0x399, +0x890,8,0x220,0x1f67,0x3b9,0x1f6f,0x399,0xc90,8,0x220,0x1f60,0x3b9,0x1f68,0x399,0xc90,8, +0x220,0x1f61,0x3b9,0x1f69,0x399,0xc90,8,0x220,0x1f62,0x3b9,0x1f6a,0x399,0xc90,8,0x220,0x1f63, +0x3b9,0x1f6b,0x399,0xc90,8,0x220,0x1f64,0x3b9,0x1f6c,0x399,0xc90,8,0x220,0x1f65,0x3b9,0x1f6d, +0x399,0xc90,8,0x220,0x1f66,0x3b9,0x1f6e,0x399,0xc90,8,0x220,0x1f67,0x3b9,0x1f6f,0x399,0x880, +0x2220,0x1f70,0x3b9,0x1fba,0x399,0x1fba,0x345,0x890,9,0x220,0x3b1,0x3b9,0x391,0x399,0x880,0x2220, +0x3ac,0x3b9,0x386,0x399,0x386,0x345,0x880,0x2220,0x3b1,0x342,0x391,0x342,0x391,0x342,0x880,0x3330, +0x3b1,0x342,0x3b9,0x391,0x342,0x399,0x391,0x342,0x345,0xc90,9,0x220,0x3b1,0x3b9,0x391,0x399, +0x846,0x3b9,0x399,1,0x345,0x880,0x2220,0x1f74,0x3b9,0x1fca,0x399,0x1fca,0x345,0x890,9,0x220, +0x3b7,0x3b9,0x397,0x399,0x880,0x2220,0x3ae,0x3b9,0x389,0x399,0x389,0x345,0x880,0x2220,0x3b7,0x342, +0x397,0x342,0x397,0x342,0x880,0x3330,0x3b7,0x342,0x3b9,0x397,0x342,0x399,0x397,0x342,0x345,0xc90, +9,0x220,0x3b7,0x3b9,0x397,0x399,0x880,0x3330,0x3b9,0x308,0x300,0x399,0x308,0x300,0x399,0x308, +0x300,0x8c0,1,0x3330,0x3b9,0x308,0x301,0x399,0x308,0x301,0x399,0x308,0x301,0x390,0x880,0x2220, +0x3b9,0x342,0x399,0x342,0x399,0x342,0x880,0x3330,0x3b9,0x308,0x342,0x399,0x308,0x342,0x399,0x308, +0x342,0x880,0x3330,0x3c5,0x308,0x300,0x3a5,0x308,0x300,0x3a5,0x308,0x300,0x8c0,1,0x3330,0x3c5, +0x308,0x301,0x3a5,0x308,0x301,0x3a5,0x308,0x301,0x3b0,0x880,0x2220,0x3c1,0x313,0x3a1,0x313,0x3a1, +0x313,0x880,0x2220,0x3c5,0x342,0x3a5,0x342,0x3a5,0x342,0x880,0x3330,0x3c5,0x308,0x342,0x3a5,0x308, +0x342,0x3a5,0x308,0x342,0x880,0x2220,0x1f7c,0x3b9,0x1ffa,0x399,0x1ffa,0x345,0x890,9,0x220,0x3c9, +0x3b9,0x3a9,0x399,0x880,0x2220,0x3ce,0x3b9,0x38f,0x399,0x38f,0x345,0x880,0x2220,0x3c9,0x342,0x3a9, +0x342,0x3a9,0x342,0x880,0x3330,0x3c9,0x342,0x3b9,0x3a9,0x342,0x399,0x3a9,0x342,0x345,0xc90,9, +0x220,0x3c9,0x3b9,0x3a9,0x399,0xc50,0x1d5d,1,0x3a9,0xc50,0x20bf,1,0x4b,0xc50,0x2046,1, +0xc5,0xc10,0x29f7,0xc10,0xee6,0xc10,0x29e7,0xc10,0x2a2b,0xc10,0x2a28,0xc10,0x2a1c,0xc10,0x29fd,0xc10, +0x2a1f,0xc10,0x2a1e,0xc10,0x2a3f,0xc10,0x1c60,0x841,0xa64b,1,0x1c88,0x844,0xa64a,1,0x1c88,0xc10, +0x8a04,0xc10,0xa528,0xc10,0xa544,0xc10,0xa54f,0xc10,0xa54b,0xc10,0xa541,0xc10,0xa512,0xc10,0xa52a,0xc10, +0xa515,0x810,0x3a0,0xc10,0xa543,0xc10,0x8a38,0xc10,0x3a0,0x806,0x13a0,0x13a0,0x806,0x13a1,0x13a1,0x806, +0x13a2,0x13a2,0x806,0x13a3,0x13a3,0x806,0x13a4,0x13a4,0x806,0x13a5,0x13a5,0x806,0x13a6,0x13a6,0x806,0x13a7, +0x13a7,0x806,0x13a8,0x13a8,0x806,0x13a9,0x13a9,0x806,0x13aa,0x13aa,0x806,0x13ab,0x13ab,0x806,0x13ac,0x13ac, +0x806,0x13ad,0x13ad,0x806,0x13ae,0x13ae,0x806,0x13af,0x13af,0x806,0x13b0,0x13b0,0x806,0x13b1,0x13b1,0x806, +0x13b2,0x13b2,0x806,0x13b3,0x13b3,0x806,0x13b4,0x13b4,0x806,0x13b5,0x13b5,0x806,0x13b6,0x13b6,0x806,0x13b7, +0x13b7,0x806,0x13b8,0x13b8,0x806,0x13b9,0x13b9,0x806,0x13ba,0x13ba,0x806,0x13bb,0x13bb,0x806,0x13bc,0x13bc, +0x806,0x13bd,0x13bd,0x806,0x13be,0x13be,0x806,0x13bf,0x13bf,0x806,0x13c0,0x13c0,0x806,0x13c1,0x13c1,0x806, +0x13c2,0x13c2,0x806,0x13c3,0x13c3,0x806,0x13c4,0x13c4,0x806,0x13c5,0x13c5,0x806,0x13c6,0x13c6,0x806,0x13c7, +0x13c7,0x806,0x13c8,0x13c8,0x806,0x13c9,0x13c9,0x806,0x13ca,0x13ca,0x806,0x13cb,0x13cb,0x806,0x13cc,0x13cc, +0x806,0x13cd,0x13cd,0x806,0x13ce,0x13ce,0x806,0x13cf,0x13cf,0x806,0x13d0,0x13d0,0x806,0x13d1,0x13d1,0x806, +0x13d2,0x13d2,0x806,0x13d3,0x13d3,0x806,0x13d4,0x13d4,0x806,0x13d5,0x13d5,0x806,0x13d6,0x13d6,0x806,0x13d7, +0x13d7,0x806,0x13d8,0x13d8,0x806,0x13d9,0x13d9,0x806,0x13da,0x13da,0x806,0x13db,0x13db,0x806,0x13dc,0x13dc, +0x806,0x13dd,0x13dd,0x806,0x13de,0x13de,0x806,0x13df,0x13df,0x806,0x13e0,0x13e0,0x806,0x13e1,0x13e1,0x806, +0x13e2,0x13e2,0x806,0x13e3,0x13e3,0x806,0x13e4,0x13e4,0x806,0x13e5,0x13e5,0x806,0x13e6,0x13e6,0x806,0x13e7, +0x13e7,0x806,0x13e8,0x13e8,0x806,0x13e9,0x13e9,0x806,0x13ea,0x13ea,0x806,0x13eb,0x13eb,0x806,0x13ec,0x13ec, +0x806,0x13ed,0x13ed,0x806,0x13ee,0x13ee,0x806,0x13ef,0x13ef,0x880,0x2220,0x66,0x66,0x46,0x46,0x46, +0x66,0x880,0x2220,0x66,0x69,0x46,0x49,0x46,0x69,0x880,0x2220,0x66,0x6c,0x46,0x4c,0x46, +0x6c,0x880,0x3330,0x66,0x66,0x69,0x46,0x46,0x49,0x46,0x66,0x69,0x880,0x3330,0x66,0x66, +0x6c,0x46,0x46,0x4c,0x46,0x66,0x6c,0x8c0,1,0x2220,0x73,0x74,0x53,0x54,0x53,0x74, +0xfb06,0x8c0,1,0x2220,0x73,0x74,0x53,0x54,0x53,0x74,0xfb05,0x880,0x2220,0x574,0x576,0x544, +0x546,0x544,0x576,0x880,0x2220,0x574,0x565,0x544,0x535,0x544,0x565,0x880,0x2220,0x574,0x56b,0x544, +0x53b,0x544,0x56b,0x880,0x2220,0x57e,0x576,0x54e,0x546,0x54e,0x576,0x880,0x2220,0x574,0x56d,0x544, +0x53d,0x544,0x56d }; static const uint16_t ucase_props_unfold[370]={ diff --git a/intl/icu/source/common/ucasemap_imp.h b/intl/icu/source/common/ucasemap_imp.h index 7788fd937103..e17a0ae5a36b 100644 --- a/intl/icu/source/common/ucasemap_imp.h +++ b/intl/icu/source/common/ucasemap_imp.h @@ -68,15 +68,15 @@ class BreakIterator; // unicode/brkiter.h class ByteSink; class Locale; // unicode/locid.h -/** Returns TRUE if the options are valid. Otherwise FALSE, and sets an error. */ +/** Returns true if the options are valid. Otherwise false, and sets an error. */ inline UBool ustrcase_checkTitleAdjustmentOptions(uint32_t options, UErrorCode &errorCode) { - if (U_FAILURE(errorCode)) { return FALSE; } + if (U_FAILURE(errorCode)) { return false; } if ((options & U_TITLECASE_ADJUSTMENT_MASK) == U_TITLECASE_ADJUSTMENT_MASK) { // Both options together. errorCode = U_ILLEGAL_ARGUMENT_ERROR; - return FALSE; + return false; } - return TRUE; + return true; } inline UBool ustrcase_isLNS(UChar32 c) { diff --git a/intl/icu/source/common/ucln_cmn.h b/intl/icu/source/common/ucln_cmn.h index b837fb946296..44b73e94da79 100644 --- a/intl/icu/source/common/ucln_cmn.h +++ b/intl/icu/source/common/ucln_cmn.h @@ -38,6 +38,8 @@ typedef enum ECleanupCommonType { UCLN_COMMON_SERVICE, UCLN_COMMON_LOCALE_KEY_TYPE, UCLN_COMMON_LOCALE, + UCLN_COMMON_LOCALE_ALIAS, + UCLN_COMMON_LOCALE_KNOWN_CANONICALIZED, UCLN_COMMON_LOCALE_AVAILABLE, UCLN_COMMON_LIKELY_SUBTAGS, UCLN_COMMON_LOCALE_DISTANCE, diff --git a/intl/icu/source/common/ucln_imp.h b/intl/icu/source/common/ucln_imp.h index 1bfcde0fb8ea..63a54c86f624 100644 --- a/intl/icu/source/common/ucln_imp.h +++ b/intl/icu/source/common/ucln_imp.h @@ -78,7 +78,7 @@ * Use the ANSI C 'atexit' function. Note that this mechanism does not * guarantee the order of cleanup relative to other users of ICU! */ -static UBool gAutoCleanRegistered = FALSE; +static UBool gAutoCleanRegistered = false; static void ucln_atexit_handler() { @@ -88,7 +88,7 @@ static void ucln_atexit_handler() static void ucln_registerAutomaticCleanup() { if(!gAutoCleanRegistered) { - gAutoCleanRegistered = TRUE; + gAutoCleanRegistered = true; atexit(&ucln_atexit_handler); } } @@ -135,7 +135,7 @@ U_CAPI void U_EXPORT2 UCLN_FINI () */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - BOOL status = TRUE; + BOOL status = true; switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/intl/icu/source/common/ucnv_bld.cpp b/intl/icu/source/common/ucnv_bld.cpp index 56fc3d6822f7..0e198892f1bd 100644 --- a/intl/icu/source/common/ucnv_bld.cpp +++ b/intl/icu/source/common/ucnv_bld.cpp @@ -224,7 +224,7 @@ static UBool gDefaultConverterContainsOption; static const char DATA_TYPE[] = "cnv"; /* ucnv_flushAvailableConverterCache. This is only called from ucnv_cleanup(). - * If it is ever to be called from elsewhere, synchronization + * If it is ever to be called from elsewhere, synchronization * will need to be considered. */ static void @@ -262,7 +262,7 @@ static UBool U_CALLCONV ucnv_cleanup(void) { } U_CAPI void U_EXPORT2 -ucnv_enableCleanup() { +ucnv_enableCleanup(void) { ucln_common_registerCleanup(UCLN_COMMON_UCNV, ucnv_cleanup); } @@ -1309,7 +1309,7 @@ ucnv_setDefaultName(const char *converterName) { /* The close may make the current name go away. */ ucnv_close(cnv); - + /* reset the converter cache */ u_flushDefaultConverter(); } diff --git a/intl/icu/source/common/ucnv_bld.h b/intl/icu/source/common/ucnv_bld.h index 18b3795e4d8b..43e6c09ac0b0 100644 --- a/intl/icu/source/common/ucnv_bld.h +++ b/intl/icu/source/common/ucnv_bld.h @@ -66,8 +66,8 @@ typedef struct UConverterImpl UConverterImpl; typedef struct UConverterStaticData { /* +offset: size */ uint32_t structSize; /* +0: 4 Size of this structure */ - - char name + + char name [UCNV_MAX_CONVERTER_NAME_LENGTH]; /* +4: 60 internal name of the converter- invariant chars */ int32_t codepage; /* +64: 4 codepage # (now IBM-$codepage) */ @@ -80,7 +80,7 @@ typedef struct UConverterStaticData { /* +offset: size */ uint8_t subChar[UCNV_MAX_SUBCHAR_LEN]; /* +72: 4 [note: 4 and 8 byte boundary] */ int8_t subCharLen; /* +76: 1 */ - + uint8_t hasToUnicodeFallback; /* +77: 1 UBool needs to be changed to UBool to be consistent across platform */ uint8_t hasFromUnicodeFallback; /* +78: 1 */ uint8_t unicodeMask; /* +79: 1 bit 0: has supplementary bit 1: has single surrogates */ @@ -101,8 +101,8 @@ struct UConverterSharedData { const UConverterStaticData *staticData; /* pointer to the static (non changing) data. */ - UBool sharedDataCached; /* TRUE: shared data is in cache, don't destroy on ucnv_close() if 0 ref. FALSE: shared data isn't in the cache, do attempt to clean it up if the ref is 0 */ - /** If FALSE, then referenceCounter is not used. Must not change after initialization. */ + UBool sharedDataCached; /* true: shared data is in cache, don't destroy on ucnv_close() if 0 ref. false: shared data isn't in the cache, do attempt to clean it up if the ref is 0 */ + /** If false, then referenceCounter is not used. Must not change after initialization. */ UBool isReferenceCounted; const UConverterImpl *impl; /* vtable-style struct of mostly function pointers */ @@ -128,7 +128,7 @@ struct UConverterSharedData { #define UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(pStaticData, pImpl) \ { \ sizeof(UConverterSharedData), ~((uint32_t)0), \ - NULL, pStaticData, FALSE, FALSE, pImpl, \ + NULL, pStaticData, false, false, pImpl, \ 0, UCNV_MBCS_TABLE_INITIALIZER \ } @@ -181,9 +181,9 @@ struct UConverter { uint32_t options; /* options flags from UConverterOpen, may contain additional bits */ - UBool sharedDataIsCached; /* TRUE: shared data is in cache, don't destroy on ucnv_close() if 0 ref. FALSE: shared data isn't in the cache, do attempt to clean it up if the ref is 0 */ - UBool isCopyLocal; /* TRUE if UConverter is not owned and not released in ucnv_close() (stack-allocated, safeClone(), etc.) */ - UBool isExtraLocal; /* TRUE if extraInfo is not owned and not released in ucnv_close() (stack-allocated, safeClone(), etc.) */ + UBool sharedDataIsCached; /* true: shared data is in cache, don't destroy on ucnv_close() if 0 ref. false: shared data isn't in the cache, do attempt to clean it up if the ref is 0 */ + UBool isCopyLocal; /* true if UConverter is not owned and not released in ucnv_close() (stack-allocated, safeClone(), etc.) */ + UBool isExtraLocal; /* true if extraInfo is not owned and not released in ucnv_close() (stack-allocated, safeClone(), etc.) */ UBool useFallback; int8_t toULength; /* number of bytes in toUBytes */ @@ -289,7 +289,7 @@ ucnv_swap(const UDataSwapper *ds, UErrorCode *pErrorCode); U_CAPI void U_EXPORT2 -ucnv_enableCleanup(); +ucnv_enableCleanup(void); #endif diff --git a/intl/icu/source/common/ucnv_cnv.h b/intl/icu/source/common/ucnv_cnv.h index 2eed2c60df60..59be8bdb37b5 100644 --- a/intl/icu/source/common/ucnv_cnv.h +++ b/intl/icu/source/common/ucnv_cnv.h @@ -59,7 +59,7 @@ typedef struct { } UConverterLoadArgs; #define UCNV_LOAD_ARGS_INITIALIZER \ - { (int32_t)sizeof(UConverterLoadArgs), 0, FALSE, FALSE, 0, 0, NULL, NULL, NULL } + { (int32_t)sizeof(UConverterLoadArgs), 0, false, false, 0, 0, NULL, NULL, NULL } typedef void (*UConverterLoad) (UConverterSharedData *sharedData, UConverterLoadArgs *pArgs, @@ -267,8 +267,8 @@ extern const UConverterSharedData U_CDECL_END /** Always use fallbacks from codepage to Unicode */ -#define TO_U_USE_FALLBACK(useFallback) TRUE -#define UCNV_TO_U_USE_FALLBACK(cnv) TRUE +#define TO_U_USE_FALLBACK(useFallback) true +#define UCNV_TO_U_USE_FALLBACK(cnv) true /** Use fallbacks from Unicode to codepage when cnv->useFallback or for private-use code points */ #define IS_PRIVATE_USE(c) ((uint32_t)((c)-0xe000)<0x1900 || (uint32_t)((c)-0xf0000)<0x20000) diff --git a/intl/icu/source/common/ucnv_u8.cpp b/intl/icu/source/common/ucnv_u8.cpp index 9b518e08df67..1ef7fa2f02f0 100644 --- a/intl/icu/source/common/ucnv_u8.cpp +++ b/intl/icu/source/common/ucnv_u8.cpp @@ -707,9 +707,9 @@ ucnv_UTF8FromUTF8(UConverterFromUnicodeArgs *pFromUArgs, // Do not go back into the bytes that will be read for finishing a partial // sequence from the previous buffer. - int32_t length=count-toULimit; + int32_t length=count-toULength; U8_TRUNCATE_IF_INCOMPLETE(source, 0, length); - count=toULimit+length; + count=toULength+length; } if(c!=0) { diff --git a/intl/icu/source/common/ucnvmbcs.h b/intl/icu/source/common/ucnvmbcs.h index 209cdc532d4d..c8f3b89a5e46 100644 --- a/intl/icu/source/common/ucnvmbcs.h +++ b/intl/icu/source/common/ucnvmbcs.h @@ -420,7 +420,7 @@ typedef struct UConverterMBCSTable { NULL, \ 0, \ 0, 0, \ - FALSE, \ + false, \ 0, \ \ /* roundtrips */ \ diff --git a/intl/icu/source/common/ucol_swp.h b/intl/icu/source/common/ucol_swp.h index fd8be9aa54ff..0c2990a85ecf 100644 --- a/intl/icu/source/common/ucol_swp.h +++ b/intl/icu/source/common/ucol_swp.h @@ -31,7 +31,7 @@ * Does the data look like a collation binary? * @internal */ -U_INTERNAL UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucol_looksLikeCollationBinary(const UDataSwapper *ds, const void *inData, int32_t length); diff --git a/intl/icu/source/common/ucurr.cpp b/intl/icu/source/common/ucurr.cpp index 5eacc4a99bc0..0e14cddcff3d 100644 --- a/intl/icu/source/common/ucurr.cpp +++ b/intl/icu/source/common/ucurr.cpp @@ -91,6 +91,8 @@ static const char VAR_DELIM = '_'; // Tag for localized display names (symbols) of currencies static const char CURRENCIES[] = "Currencies"; static const char CURRENCIES_NARROW[] = "Currencies%narrow"; +static const char CURRENCIES_FORMAL[] = "Currencies%formal"; +static const char CURRENCIES_VARIANT[] = "Currencies%variant"; static const char CURRENCYPLURALS[] = "CurrencyPlurals"; // ISO codes mapping table @@ -649,7 +651,7 @@ ucurr_getName(const UChar* currency, } int32_t choice = (int32_t) nameStyle; - if (choice < 0 || choice > 2) { + if (choice < 0 || choice > 4) { *ec = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -684,9 +686,22 @@ ucurr_getName(const UChar* currency, ec2 = U_ZERO_ERROR; LocalUResourceBundlePointer rb(ures_open(U_ICUDATA_CURR, loc, &ec2)); - if (nameStyle == UCURR_NARROW_SYMBOL_NAME) { + if (nameStyle == UCURR_NARROW_SYMBOL_NAME || nameStyle == UCURR_FORMAL_SYMBOL_NAME || nameStyle == UCURR_VARIANT_SYMBOL_NAME) { CharString key; - key.append(CURRENCIES_NARROW, ec2); + switch (nameStyle) { + case UCURR_NARROW_SYMBOL_NAME: + key.append(CURRENCIES_NARROW, ec2); + break; + case UCURR_FORMAL_SYMBOL_NAME: + key.append(CURRENCIES_FORMAL, ec2); + break; + case UCURR_VARIANT_SYMBOL_NAME: + key.append(CURRENCIES_VARIANT, ec2); + break; + default: + *ec = U_UNSUPPORTED_ERROR; + return 0; + } key.append("/", ec2); key.append(buf, ec2); s = ures_getStringByKeyWithFallback(rb.getAlias(), key.data(), len, &ec2); @@ -1610,7 +1625,7 @@ ucurr_getDefaultFractionDigits(const UChar* currency, UErrorCode* ec) { return ucurr_getDefaultFractionDigitsForUsage(currency,UCURR_USAGE_STANDARD,ec); } -U_DRAFT int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_getDefaultFractionDigitsForUsage(const UChar* currency, const UCurrencyUsage usage, UErrorCode* ec) { int32_t fracDigits = 0; if (U_SUCCESS(*ec)) { @@ -1633,7 +1648,7 @@ ucurr_getRoundingIncrement(const UChar* currency, UErrorCode* ec) { return ucurr_getRoundingIncrementForUsage(currency, UCURR_USAGE_STANDARD, ec); } -U_DRAFT double U_EXPORT2 +U_CAPI double U_EXPORT2 ucurr_getRoundingIncrementForUsage(const UChar* currency, const UCurrencyUsage usage, UErrorCode* ec) { double result = 0.0; @@ -2259,7 +2274,6 @@ ucurr_countCurrencies(const char* locale, // local variables UErrorCode localStatus = U_ZERO_ERROR; char id[ULOC_FULLNAME_CAPACITY]; - uloc_getKeywordValue(locale, "currency", id, ULOC_FULLNAME_CAPACITY, &localStatus); // get country or country_variant in `id' idForLocale(locale, id, sizeof(id), ec); @@ -2375,7 +2389,6 @@ ucurr_forLocaleAndDate(const char* locale, // local variables UErrorCode localStatus = U_ZERO_ERROR; char id[ULOC_FULLNAME_CAPACITY]; - resLen = uloc_getKeywordValue(locale, "currency", id, ULOC_FULLNAME_CAPACITY, &localStatus); // get country or country_variant in `id' idForLocale(locale, id, sizeof(id), ec); diff --git a/intl/icu/source/common/uelement.h b/intl/icu/source/common/uelement.h index 05f36a098253..88dd4d66fb99 100644 --- a/intl/icu/source/common/uelement.h +++ b/intl/icu/source/common/uelement.h @@ -46,7 +46,7 @@ typedef union UElement UElement; * An element-equality (boolean) comparison function. * @param e1 An element (object or integer) * @param e2 An element (object or integer) - * @return TRUE if the two elements are equal. + * @return true if the two elements are equal. */ typedef UBool U_CALLCONV UElementsAreEqual(const UElement e1, const UElement e2); diff --git a/intl/icu/source/common/uinvchar.cpp b/intl/icu/source/common/uinvchar.cpp index 05bcf10df489..52b890656856 100644 --- a/intl/icu/source/common/uinvchar.cpp +++ b/intl/icu/source/common/uinvchar.cpp @@ -579,7 +579,7 @@ uprv_ebcdicToLowercaseAscii(char c) { return (char)lowercaseAsciiFromEbcdic[(uint8_t)c]; } -U_INTERNAL uint8_t* U_EXPORT2 +U_CAPI uint8_t* U_EXPORT2 uprv_aestrncpy(uint8_t *dst, const uint8_t *src, int32_t n) { uint8_t *orig_dst = dst; @@ -600,7 +600,7 @@ uprv_aestrncpy(uint8_t *dst, const uint8_t *src, int32_t n) return orig_dst; } -U_INTERNAL uint8_t* U_EXPORT2 +U_CAPI uint8_t* U_EXPORT2 uprv_eastrncpy(uint8_t *dst, const uint8_t *src, int32_t n) { uint8_t *orig_dst = dst; diff --git a/intl/icu/source/common/uinvchar.h b/intl/icu/source/common/uinvchar.h index a43cfcd98286..9b7a9bd11417 100644 --- a/intl/icu/source/common/uinvchar.h +++ b/intl/icu/source/common/uinvchar.h @@ -33,11 +33,11 @@ * * @param s Input string pointer. * @param length Length of the string, can be -1 if NUL-terminated. - * @return TRUE if s contains only invariant characters. + * @return true if s contains only invariant characters. * * @internal (ICU 2.8) */ -U_INTERNAL UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uprv_isInvariantString(const char *s, int32_t length); /** @@ -46,11 +46,11 @@ uprv_isInvariantString(const char *s, int32_t length); * * @param s Input string pointer. * @param length Length of the string, can be -1 if NUL-terminated. - * @return TRUE if s contains only invariant characters. + * @return true if s contains only invariant characters. * * @internal (ICU 2.8) */ -U_INTERNAL UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uprv_isInvariantUString(const UChar *s, int32_t length); /** @@ -141,7 +141,7 @@ uprv_isEbcdicAtSign(char c); * Compare two EBCDIC invariant-character strings in ASCII order. * @internal */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uprv_compareInvEbcdicAsAscii(const char *s1, const char *s2); /** @@ -161,7 +161,7 @@ uprv_compareInvEbcdicAsAscii(const char *s1, const char *s2); * Converts an EBCDIC invariant character to ASCII. * @internal */ -U_INTERNAL char U_EXPORT2 +U_CAPI char U_EXPORT2 uprv_ebcdicToAscii(char c); /** @@ -181,7 +181,7 @@ uprv_ebcdicToAscii(char c); * Converts an EBCDIC invariant character to lowercase ASCII. * @internal */ -U_INTERNAL char U_EXPORT2 +U_CAPI char U_EXPORT2 uprv_ebcdicToLowercaseAscii(char c); /** @@ -202,7 +202,7 @@ uprv_ebcdicToLowercaseAscii(char c); * @internal * @see uprv_strncpy */ -U_INTERNAL uint8_t* U_EXPORT2 +U_CAPI uint8_t* U_EXPORT2 uprv_aestrncpy(uint8_t *dst, const uint8_t *src, int32_t n); @@ -211,7 +211,7 @@ uprv_aestrncpy(uint8_t *dst, const uint8_t *src, int32_t n); * @internal * @see uprv_strncpy */ -U_INTERNAL uint8_t* U_EXPORT2 +U_CAPI uint8_t* U_EXPORT2 uprv_eastrncpy(uint8_t *dst, const uint8_t *src, int32_t n); diff --git a/intl/icu/source/common/uloc.cpp b/intl/icu/source/common/uloc.cpp index 0e235d7958ce..ebfbb506508c 100644 --- a/intl/icu/source/common/uloc.cpp +++ b/intl/icu/source/common/uloc.cpp @@ -50,9 +50,6 @@ #include "uassert.h" #include "charstr.h" -#include -#include /* for sprintf */ - U_NAMESPACE_USE /* ### Declarations **************************************************/ @@ -60,12 +57,6 @@ U_NAMESPACE_USE /* Locale stuff from locid.cpp */ U_CFUNC void locale_set_default(const char *id); U_CFUNC const char *locale_get_default(void); -U_CFUNC int32_t -locale_getKeywords(const char *localeID, - char prev, - char *keywords, int32_t keywordCapacity, - UBool valuesToo, - UErrorCode *status); /* ### Data tables **************************************************/ @@ -601,12 +592,12 @@ compareKeywordStructs(const void * /*context*/, const void *left, const void *ri return uprv_strcmp(leftString, rightString); } -static void -_getKeywords(const char *localeID, - char prev, - ByteSink& sink, - UBool valuesToo, - UErrorCode *status) +U_CFUNC void +ulocimp_getKeywords(const char *localeID, + char prev, + ByteSink& sink, + UBool valuesToo, + UErrorCode *status) { KeywordStruct keywordList[ULOC_MAX_NO_KEYWORDS]; @@ -722,18 +713,18 @@ _getKeywords(const char *localeID, } } -U_CFUNC int32_t -locale_getKeywords(const char *localeID, - char prev, - char *keywords, int32_t keywordCapacity, - UBool valuesToo, - UErrorCode *status) { +U_CAPI int32_t U_EXPORT2 +uloc_getKeywordValue(const char* localeID, + const char* keywordName, + char* buffer, int32_t bufferCapacity, + UErrorCode* status) +{ if (U_FAILURE(*status)) { return 0; } - CheckedArrayByteSink sink(keywords, keywordCapacity); - _getKeywords(localeID, prev, sink, valuesToo, status); + CheckedArrayByteSink sink(buffer, bufferCapacity); + ulocimp_getKeywordValue(localeID, keywordName, sink, status); int32_t reslen = sink.NumberOfBytesAppended(); @@ -744,26 +735,22 @@ locale_getKeywords(const char *localeID, if (sink.Overflowed()) { *status = U_BUFFER_OVERFLOW_ERROR; } else { - u_terminateChars(keywords, keywordCapacity, reslen, status); + u_terminateChars(buffer, bufferCapacity, reslen, status); } return reslen; } -U_CAPI int32_t U_EXPORT2 -uloc_getKeywordValue(const char* localeID, - const char* keywordName, - char* buffer, int32_t bufferCapacity, - UErrorCode* status) +U_CAPI void U_EXPORT2 +ulocimp_getKeywordValue(const char* localeID, + const char* keywordName, + icu::ByteSink& sink, + UErrorCode* status) { - if (buffer != nullptr) { - buffer[0] = '\0'; - } const char* startSearchHere = NULL; const char* nextSeparator = NULL; char keywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN]; char localeKeywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN]; - int32_t result = 0; if(status && U_SUCCESS(*status) && localeID) { char tempBuffer[ULOC_FULLNAME_CAPACITY]; @@ -771,12 +758,12 @@ uloc_getKeywordValue(const char* localeID, if (keywordName == NULL || keywordName[0] == 0) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; + return; } locale_canonKeywordName(keywordNameBuffer, keywordName, status); if(U_FAILURE(*status)) { - return 0; + return; } if (_hasBCP47Extension(localeID)) { @@ -788,7 +775,7 @@ uloc_getKeywordValue(const char* localeID, startSearchHere = locale_getKeywordsStart(tmpLocaleID); if(startSearchHere == NULL) { /* no keywords, return at once */ - return 0; + return; } /* find the first keyword */ @@ -800,7 +787,7 @@ uloc_getKeywordValue(const char* localeID, nextSeparator = uprv_strchr(startSearchHere, '='); if(!nextSeparator) { *status = U_ILLEGAL_ARGUMENT_ERROR; /* key must have =value */ - return 0; + return; } /* strip leading & trailing spaces (TC decided to tolerate these) */ while(*startSearchHere == ' ') { @@ -814,20 +801,20 @@ uloc_getKeywordValue(const char* localeID, /* copy & normalize keyName from locale */ if (startSearchHere == keyValueTail) { *status = U_ILLEGAL_ARGUMENT_ERROR; /* empty keyword name in passed-in locale */ - return 0; + return; } keyValueLen = 0; while (startSearchHere < keyValueTail) { if (!UPRV_ISALPHANUM(*startSearchHere)) { *status = U_ILLEGAL_ARGUMENT_ERROR; /* malformed keyword name */ - return 0; + return; } if (keyValueLen < ULOC_KEYWORD_BUFFER_LEN - 1) { localeKeywordNameBuffer[keyValueLen++] = uprv_tolower(*startSearchHere++); } else { /* keyword name too long for internal buffer */ *status = U_INTERNAL_PROGRAM_ERROR; - return 0; + return; } } localeKeywordNameBuffer[keyValueLen] = 0; /* terminate */ @@ -848,28 +835,20 @@ uloc_getKeywordValue(const char* localeID, /* Now copy the value, but check well-formedness */ if (nextSeparator == keyValueTail) { *status = U_ILLEGAL_ARGUMENT_ERROR; /* empty key value name in passed-in locale */ - return 0; + return; } - keyValueLen = 0; while (nextSeparator < keyValueTail) { if (!UPRV_ISALPHANUM(*nextSeparator) && !UPRV_OK_VALUE_PUNCTUATION(*nextSeparator)) { *status = U_ILLEGAL_ARGUMENT_ERROR; /* malformed key value */ - return 0; - } - if (keyValueLen < bufferCapacity) { - /* Should we lowercase value to return here? Tests expect as-is. */ - buffer[keyValueLen++] = *nextSeparator++; - } else { /* keep advancing so we return correct length in case of overflow */ - keyValueLen++; - nextSeparator++; + return; } + /* Should we lowercase value to return here? Tests expect as-is. */ + sink.Append(nextSeparator++, 1); } - result = u_terminateChars(buffer, bufferCapacity, keyValueLen, status); - return result; + return; } } } - return 0; } U_CAPI int32_t U_EXPORT2 @@ -892,13 +871,15 @@ uloc_setKeywordValue(const char* keywordName, char* startSearchHere = NULL; char* keywordStart = NULL; CharString updatedKeysAndValues; - int32_t updatedKeysAndValuesLen; UBool handledInputKeyAndValue = FALSE; char keyValuePrefix = '@'; if(U_FAILURE(*status)) { return -1; } + if (*status == U_STRING_NOT_TERMINATED_WARNING) { + *status = U_ZERO_ERROR; + } if (keywordName == NULL || keywordName[0] == 0 || bufferCapacity <= 1) { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -936,6 +917,7 @@ uloc_setKeywordValue(const char* keywordName, startSearchHere = (char*)locale_getKeywordsStart(buffer); if(startSearchHere == NULL || (startSearchHere[1]==0)) { if(keywordValueLen == 0) { /* no keywords = nothing to remove */ + U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING); return bufLen; } @@ -955,6 +937,7 @@ uloc_setKeywordValue(const char* keywordName, startSearchHere += keywordNameLen; *startSearchHere++ = '='; uprv_strcpy(startSearchHere, keywordValueBuffer); + U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING); return needLen; } /* end shortcut - no @ */ @@ -1069,20 +1052,26 @@ uloc_setKeywordValue(const char* keywordName, if (!handledInputKeyAndValue || U_FAILURE(*status)) { /* if input key/value specified removal of a keyword not present in locale, or * there was an error in CharString.append, leave original locale alone. */ + U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING); return bufLen; } - updatedKeysAndValuesLen = updatedKeysAndValues.length(); - /* needLen = length of the part before '@' + length of updated key-value part including '@' */ - needLen = (int32_t)(startSearchHere - buffer) + updatedKeysAndValuesLen; - if(needLen >= bufferCapacity) { + // needLen = length of the part before '@' + needLen = (int32_t)(startSearchHere - buffer); + // Check to see can we fit the startSearchHere, if not, return + // U_BUFFER_OVERFLOW_ERROR without copy updatedKeysAndValues into it. + // We do this because this API function does not behave like most others: + // It promises never to set a U_STRING_NOT_TERMINATED_WARNING. + // When the contents fits but without the terminating NUL, in this case we need to not change + // the buffer contents and return with a buffer overflow error. + int32_t appendLength = updatedKeysAndValues.length(); + if (appendLength >= bufferCapacity - needLen) { *status = U_BUFFER_OVERFLOW_ERROR; - return needLen; /* no change */ + return needLen + appendLength; } - if (updatedKeysAndValuesLen > 0) { - uprv_strncpy(startSearchHere, updatedKeysAndValues.data(), updatedKeysAndValuesLen); - } - buffer[needLen]=0; + needLen += updatedKeysAndValues.extract( + startSearchHere, bufferCapacity - needLen, *status); + U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING); return needLen; } @@ -1148,7 +1137,7 @@ uloc_getCurrentLanguageID(const char* oldID){ * * TODO try to use this in Locale */ -static CharString +CharString U_EXPORT2 ulocimp_getLanguage(const char *localeID, const char **pEnd, UErrorCode &status) { @@ -1193,21 +1182,7 @@ ulocimp_getLanguage(const char *localeID, return result; } -U_CFUNC int32_t -ulocimp_getLanguage(const char *localeID, - char *language, int32_t languageCapacity, - const char **pEnd) { - ErrorCode status; - CharString result = ulocimp_getLanguage(localeID, pEnd, status); - if (status.isFailure()) { - return 0; - } - int32_t reslen = result.length(); - uprv_memcpy(language, result.data(), std::min(reslen, languageCapacity)); - return reslen; -} - -static CharString +CharString U_EXPORT2 ulocimp_getScript(const char *localeID, const char **pEnd, UErrorCode &status) { @@ -1241,21 +1216,7 @@ ulocimp_getScript(const char *localeID, return result; } -U_CFUNC int32_t -ulocimp_getScript(const char *localeID, - char *script, int32_t scriptCapacity, - const char **pEnd) { - ErrorCode status; - CharString result = ulocimp_getScript(localeID, pEnd, status); - if (status.isFailure()) { - return 0; - } - int32_t reslen = result.length(); - uprv_memcpy(script, result.data(), std::min(reslen, scriptCapacity)); - return reslen; -} - -static CharString +CharString U_EXPORT2 ulocimp_getCountry(const char *localeID, const char **pEnd, UErrorCode &status) { @@ -1290,29 +1251,15 @@ ulocimp_getCountry(const char *localeID, return result; } -U_CFUNC int32_t -ulocimp_getCountry(const char *localeID, - char *country, int32_t countryCapacity, - const char **pEnd) { - ErrorCode status; - CharString result = ulocimp_getCountry(localeID, pEnd, status); - if (status.isFailure()) { - return 0; - } - int32_t reslen = result.length(); - uprv_memcpy(country, result.data(), std::min(reslen, countryCapacity)); - return reslen; -} - /** * @param needSeparator if true, then add leading '_' if any variants * are added to 'variant' */ static void -_getVariantEx(const char *localeID, - char prev, - ByteSink& sink, - UBool needSeparator) { +_getVariant(const char *localeID, + char prev, + ByteSink& sink, + UBool needSeparator) { UBool hasVariant = FALSE; /* get one or more variant tags and separate them with '_' */ @@ -1353,23 +1300,6 @@ _getVariantEx(const char *localeID, } } -static int32_t -_getVariantEx(const char *localeID, - char prev, - char *variant, int32_t variantCapacity, - UBool needSeparator) { - CheckedArrayByteSink sink(variant, variantCapacity); - _getVariantEx(localeID, prev, sink, needSeparator); - return sink.NumberOfBytesAppended(); -} - -static int32_t -_getVariant(const char *localeID, - char prev, - char *variant, int32_t variantCapacity) { - return _getVariantEx(localeID, prev, variant, variantCapacity, FALSE); -} - /* Keyword enumeration */ typedef struct UKeywordsContext { @@ -1466,9 +1396,6 @@ U_CAPI UEnumeration* U_EXPORT2 uloc_openKeywords(const char* localeID, UErrorCode* status) { - int32_t i=0; - char keywords[256]; - int32_t keywordsCapacity = 256; char tempBuffer[ULOC_FULLNAME_CAPACITY]; const char* tmpLocaleID; @@ -1486,34 +1413,42 @@ uloc_openKeywords(const char* localeID, } /* Skip the language */ - ulocimp_getLanguage(tmpLocaleID, NULL, 0, &tmpLocaleID); + ulocimp_getLanguage(tmpLocaleID, &tmpLocaleID, *status); + if (U_FAILURE(*status)) { + return 0; + } + if(_isIDSeparator(*tmpLocaleID)) { const char *scriptID; /* Skip the script if available */ - ulocimp_getScript(tmpLocaleID+1, NULL, 0, &scriptID); + ulocimp_getScript(tmpLocaleID+1, &scriptID, *status); + if (U_FAILURE(*status)) { + return 0; + } if(scriptID != tmpLocaleID+1) { /* Found optional script */ tmpLocaleID = scriptID; } /* Skip the Country */ if (_isIDSeparator(*tmpLocaleID)) { - ulocimp_getCountry(tmpLocaleID+1, NULL, 0, &tmpLocaleID); - if(_isIDSeparator(*tmpLocaleID)) { - _getVariant(tmpLocaleID+1, *tmpLocaleID, NULL, 0); + ulocimp_getCountry(tmpLocaleID+1, &tmpLocaleID, *status); + if (U_FAILURE(*status)) { + return 0; } } } /* keywords are located after '@' */ if((tmpLocaleID = locale_getKeywordsStart(tmpLocaleID)) != NULL) { - i=locale_getKeywords(tmpLocaleID+1, '@', keywords, keywordsCapacity, FALSE, status); - } - - if(i) { - return uloc_openKeywordList(keywords, i, status); - } else { - return NULL; + CharString keywords; + CharStringByteSink sink(&keywords); + ulocimp_getKeywords(tmpLocaleID+1, '@', sink, FALSE, status); + if (U_FAILURE(*status)) { + return NULL; + } + return uloc_openKeywordList(keywords.data(), keywords.length(), status); } + return NULL; } @@ -1605,7 +1540,7 @@ _canonicalize(const char* localeID, variantSize = -tag.length(); { CharStringByteSink s(&tag); - _getVariantEx(tmpLocaleID+1, *tmpLocaleID, s, FALSE); + _getVariant(tmpLocaleID+1, *tmpLocaleID, s, FALSE); } variantSize += tag.length(); if (variantSize > 0) { @@ -1667,7 +1602,7 @@ _canonicalize(const char* localeID, int32_t posixVariantSize = -tag.length(); { CharStringByteSink s(&tag); - _getVariantEx(tmpLocaleID+1, '@', s, (UBool)(variantSize > 0)); + _getVariant(tmpLocaleID+1, '@', s, (UBool)(variantSize > 0)); } posixVariantSize += tag.length(); if (posixVariantSize > 0) { @@ -1696,7 +1631,7 @@ _canonicalize(const char* localeID, (!separatorIndicator || separatorIndicator > keywordAssign)) { sink.Append("@", 1); ++fieldCount; - _getKeywords(tmpLocaleID+1, '@', sink, TRUE, err); + ulocimp_getKeywords(tmpLocaleID+1, '@', sink, TRUE, err); } } } @@ -1745,7 +1680,6 @@ uloc_getLanguage(const char* localeID, UErrorCode* err) { /* uloc_getLanguage will return a 2 character iso-639 code if one exists. *CWB*/ - int32_t i=0; if (err==NULL || U_FAILURE(*err)) { return 0; @@ -1755,8 +1689,7 @@ uloc_getLanguage(const char* localeID, localeID=uloc_getDefault(); } - i=ulocimp_getLanguage(localeID, language, languageCapacity, NULL); - return u_terminateChars(language, languageCapacity, i, err); + return ulocimp_getLanguage(localeID, NULL, *err).extract(language, languageCapacity, *err); } U_CAPI int32_t U_EXPORT2 @@ -1765,8 +1698,6 @@ uloc_getScript(const char* localeID, int32_t scriptCapacity, UErrorCode* err) { - int32_t i=0; - if(err==NULL || U_FAILURE(*err)) { return 0; } @@ -1776,11 +1707,15 @@ uloc_getScript(const char* localeID, } /* skip the language */ - ulocimp_getLanguage(localeID, NULL, 0, &localeID); - if(_isIDSeparator(*localeID)) { - i=ulocimp_getScript(localeID+1, script, scriptCapacity, NULL); + ulocimp_getLanguage(localeID, &localeID, *err); + if (U_FAILURE(*err)) { + return 0; } - return u_terminateChars(script, scriptCapacity, i, err); + + if(_isIDSeparator(*localeID)) { + return ulocimp_getScript(localeID+1, NULL, *err).extract(script, scriptCapacity, *err); + } + return u_terminateChars(script, scriptCapacity, 0, err); } U_CAPI int32_t U_EXPORT2 @@ -1789,8 +1724,6 @@ uloc_getCountry(const char* localeID, int32_t countryCapacity, UErrorCode* err) { - int32_t i=0; - if(err==NULL || U_FAILURE(*err)) { return 0; } @@ -1800,20 +1733,27 @@ uloc_getCountry(const char* localeID, } /* Skip the language */ - ulocimp_getLanguage(localeID, NULL, 0, &localeID); + ulocimp_getLanguage(localeID, &localeID, *err); + if (U_FAILURE(*err)) { + return 0; + } + if(_isIDSeparator(*localeID)) { const char *scriptID; /* Skip the script if available */ - ulocimp_getScript(localeID+1, NULL, 0, &scriptID); + ulocimp_getScript(localeID+1, &scriptID, *err); + if (U_FAILURE(*err)) { + return 0; + } if(scriptID != localeID+1) { /* Found optional script */ localeID = scriptID; } if(_isIDSeparator(*localeID)) { - i=ulocimp_getCountry(localeID+1, country, countryCapacity, NULL); + return ulocimp_getCountry(localeID+1, NULL, *err).extract(country, countryCapacity, *err); } } - return u_terminateChars(country, countryCapacity, i, err); + return u_terminateChars(country, countryCapacity, 0, err); } U_CAPI int32_t U_EXPORT2 @@ -1840,11 +1780,18 @@ uloc_getVariant(const char* localeID, } /* Skip the language */ - ulocimp_getLanguage(tmpLocaleID, NULL, 0, &tmpLocaleID); + ulocimp_getLanguage(tmpLocaleID, &tmpLocaleID, *err); + if (U_FAILURE(*err)) { + return 0; + } + if(_isIDSeparator(*tmpLocaleID)) { const char *scriptID; /* Skip the script if available */ - ulocimp_getScript(tmpLocaleID+1, NULL, 0, &scriptID); + ulocimp_getScript(tmpLocaleID+1, &scriptID, *err); + if (U_FAILURE(*err)) { + return 0; + } if(scriptID != tmpLocaleID+1) { /* Found optional script */ tmpLocaleID = scriptID; @@ -1852,7 +1799,10 @@ uloc_getVariant(const char* localeID, /* Skip the Country */ if (_isIDSeparator(*tmpLocaleID)) { const char *cntryID; - ulocimp_getCountry(tmpLocaleID+1, NULL, 0, &cntryID); + ulocimp_getCountry(tmpLocaleID+1, &cntryID, *err); + if (U_FAILURE(*err)) { + return 0; + } if (cntryID != tmpLocaleID+1) { /* Found optional country */ tmpLocaleID = cntryID; @@ -1862,18 +1812,24 @@ uloc_getVariant(const char* localeID, if (tmpLocaleID != cntryID && _isIDSeparator(tmpLocaleID[1])) { tmpLocaleID++; } - i=_getVariant(tmpLocaleID+1, *tmpLocaleID, variant, variantCapacity); + + CheckedArrayByteSink sink(variant, variantCapacity); + _getVariant(tmpLocaleID+1, *tmpLocaleID, sink, FALSE); + + i = sink.NumberOfBytesAppended(); + + if (U_FAILURE(*err)) { + return i; + } + + if (sink.Overflowed()) { + *err = U_BUFFER_OVERFLOW_ERROR; + return i; + } } } } - /* removed by weiv. We don't want to handle POSIX variants anymore. Use canonicalization function */ - /* if we do not have a variant tag yet then try a POSIX variant after '@' */ -/* - if(!haveVariant && (localeID=uprv_strrchr(localeID, '@'))!=NULL) { - i=_getVariant(localeID+1, '@', variant, variantCapacity); - } -*/ return u_terminateChars(variant, variantCapacity, i, err); } @@ -1905,7 +1861,7 @@ uloc_getName(const char* localeID, return reslen; } -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_getName(const char* localeID, ByteSink& sink, UErrorCode* err) @@ -1941,7 +1897,7 @@ uloc_getBaseName(const char* localeID, return reslen; } -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_getBaseName(const char* localeID, ByteSink& sink, UErrorCode* err) @@ -1977,7 +1933,7 @@ uloc_canonicalize(const char* localeID, return reslen; } -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_canonicalize(const char* localeID, ByteSink& sink, UErrorCode* err) @@ -2058,22 +2014,22 @@ uloc_getLCID(const char* localeID) // uprv_convertToLCID does not support keywords other than collation. // Remove all keywords except collation. int32_t len; - char collVal[ULOC_KEYWORDS_CAPACITY]; char tmpLocaleID[ULOC_FULLNAME_CAPACITY]; - len = uloc_getKeywordValue(localeID, "collation", collVal, - UPRV_LENGTHOF(collVal) - 1, &status); - - if (U_SUCCESS(status) && len > 0) { - collVal[len] = 0; + CharString collVal; + { + CharStringByteSink sink(&collVal); + ulocimp_getKeywordValue(localeID, "collation", sink, &status); + } + if (U_SUCCESS(status) && !collVal.isEmpty()) { len = uloc_getBaseName(localeID, tmpLocaleID, UPRV_LENGTHOF(tmpLocaleID) - 1, &status); if (U_SUCCESS(status) && len > 0) { tmpLocaleID[len] = 0; - len = uloc_setKeywordValue("collation", collVal, tmpLocaleID, + len = uloc_setKeywordValue("collation", collVal.data(), tmpLocaleID, UPRV_LENGTHOF(tmpLocaleID) - len - 1, &status); if (U_SUCCESS(status) && len > 0) { diff --git a/intl/icu/source/common/uloc_tag.cpp b/intl/icu/source/common/uloc_tag.cpp index ad5dd6430c95..7f7fd9119e90 100644 --- a/intl/icu/source/common/uloc_tag.cpp +++ b/intl/icu/source/common/uloc_tag.cpp @@ -15,6 +15,7 @@ #include "unicode/uenum.h" #include "unicode/uloc.h" #include "ustr_imp.h" +#include "bytesinkutil.h" #include "charstr.h" #include "cmemory.h" #include "cstring.h" @@ -53,7 +54,7 @@ typedef struct ULanguageTag { VariantListEntry *variants; ExtensionListEntry *extensions; const char *privateuse; - const char *grandfathered; + const char *legacy; } ULanguageTag; #define MINLEN 2 @@ -85,8 +86,9 @@ static const char LOCALE_TYPE_YES[] = "yes"; Updated on 2018-09-12 from https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry . - This table has 2 parts. The parts for Grandfathered tags is generated by the - following scripts from the IANA language tag registry. + This table has 2 parts. The part for + legacy language tags (marked as “Type: grandfathered” in BCP 47) + is generated by the following scripts from the IANA language tag registry. curl https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry |\ egrep -A 7 'Type: grandfathered' | \ @@ -100,8 +102,8 @@ static const char LOCALE_TYPE_YES[] = "yes"; values. They may have to be removed for the strict BCP 47 compliance. */ -static const char* const GRANDFATHERED[] = { -/* grandfathered preferred */ +static const char* const LEGACY[] = { +/* legacy preferred */ "art-lojban", "jbo", "en-gb-oed", "en-gb-oxendict", "i-ami", "ami", @@ -124,7 +126,7 @@ static const char* const GRANDFATHERED[] = { "zh-min-nan", "nan", "zh-xiang", "hsn", - // Grandfathered tags with no preferred value in the IANA + // Legacy tags with no preferred value in the IANA // registry. Kept for now for the backward compatibility // because ICU has mapped them this way. "cel-gaulish", "xtg-x-cel-gaulish", @@ -346,7 +348,7 @@ ultag_getPrivateUse(const ULanguageTag* langtag); #if 0 static const char* -ultag_getGrandfathered(const ULanguageTag* langtag); +ultag_getLegacy(const ULanguageTag* langtag); #endif U_NAMESPACE_BEGIN @@ -986,7 +988,7 @@ _initializeULanguageTag(ULanguageTag* langtag) { langtag->variants = NULL; langtag->extensions = NULL; - langtag->grandfathered = EMPTY; + langtag->legacy = EMPTY; langtag->privateuse = EMPTY; } @@ -1268,35 +1270,17 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st UBool isBcpUExt; while (TRUE) { - icu::CharString buf; key = uenum_next(keywordEnum.getAlias(), NULL, status); if (key == NULL) { break; } - char* buffer; - int32_t resultCapacity = ULOC_KEYWORD_AND_VALUES_CAPACITY; - for (;;) { - buffer = buf.getAppendBuffer( - /*minCapacity=*/resultCapacity, - /*desiredCapacityHint=*/resultCapacity, - resultCapacity, - tmpStatus); - - if (U_FAILURE(tmpStatus)) { - break; - } - - len = uloc_getKeywordValue( - localeID, key, buffer, resultCapacity, &tmpStatus); - - if (tmpStatus != U_BUFFER_OVERFLOW_ERROR) { - break; - } - - resultCapacity = len; - tmpStatus = U_ZERO_ERROR; + icu::CharString buf; + { + icu::CharStringByteSink sink(&buf); + ulocimp_getKeywordValue(localeID, key, sink, &tmpStatus); } + len = buf.length(); if (U_FAILURE(tmpStatus)) { if (tmpStatus == U_MEMORY_ALLOCATION_ERROR) { @@ -1312,11 +1296,6 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st continue; } - buf.append(buffer, len, tmpStatus); - if (tmpStatus == U_STRING_NOT_TERMINATED_WARNING) { - tmpStatus = U_ZERO_ERROR; // Terminators provided by CharString. - } - keylen = (int32_t)uprv_strlen(key); isBcpUExt = (keylen > 1); @@ -1395,32 +1374,18 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st no known mapping. This implementation normalizes the value to lower case */ - icu::CharString* extBuf = extBufPool.create(); + icu::CharString* extBuf = extBufPool.create(buf, tmpStatus); + if (extBuf == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } - int32_t bcpValueLen = static_cast(uprv_strlen(bcpValue)); - int32_t resultCapacity; - char* pExtBuf = extBuf->getAppendBuffer( - /*minCapacity=*/bcpValueLen, - /*desiredCapacityHint=*/bcpValueLen, - resultCapacity, - tmpStatus); - if (U_FAILURE(tmpStatus)) { - *status = tmpStatus; - break; - } - - uprv_strcpy(pExtBuf, bcpValue); - T_CString_toLowerCase(pExtBuf); - - extBuf->append(pExtBuf, bcpValueLen, tmpStatus); if (U_FAILURE(tmpStatus)) { *status = tmpStatus; break; } + T_CString_toLowerCase(extBuf->data()); bcpValue = extBuf->data(); } } else { @@ -2023,11 +1988,12 @@ _appendPrivateuseToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool #define PRIV 0x0080 /** - * Ticket #12705 - Visual Studio 2015 Update 3 contains a new code optimizer which has problems optimizing - * this function. (See https://blogs.msdn.microsoft.com/vcblog/2016/05/04/new-code-optimizer/ ) - * As a workaround, we will turn off optimization just for this function on VS2015 Update 3 and above. + * Ticket #12705 - The optimizer in Visual Studio 2015 Update 3 has problems optimizing this function. + * As a work-around, optimization is disabled for this function on VS2015 and VS2017. + * This work-around should be removed once the following versions of Visual Studio are no + * longer supported: All versions of VS2015/VS2017, and versions of VS2019 below 16.4. */ -#if (defined(_MSC_VER) && (_MSC_VER >= 1900) && defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 190024210)) +#if defined(_MSC_VER) && (_MSC_VER >= 1900) && (_MSC_VER < 1924) #pragma optimize( "", off ) #endif @@ -2042,7 +2008,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta char *pExtValueSubtag, *pExtValueSubtagEnd; int32_t i; UBool privateuseVar = FALSE; - int32_t grandfatheredLen = 0; + int32_t legacyLen = 0; if (parsedLen != NULL) { *parsedLen = 0; @@ -2082,25 +2048,25 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } size_t parsedLenDelta = 0; - // Grandfathered tag will be consider together. Grandfathered tag with intervening + // Legacy tag will be consider together. Legacy tag with intervening // script and region such as art-DE-lojban or art-Latn-lojban won't be // matched. - /* check if the tag is grandfathered */ - for (i = 0; i < UPRV_LENGTHOF(GRANDFATHERED); i += 2) { - int32_t checkGrandfatheredLen = static_cast(uprv_strlen(GRANDFATHERED[i])); - if (tagLen < checkGrandfatheredLen) { + /* check if the tag is legacy */ + for (i = 0; i < UPRV_LENGTHOF(LEGACY); i += 2) { + int32_t checkLegacyLen = static_cast(uprv_strlen(LEGACY[i])); + if (tagLen < checkLegacyLen) { continue; } - if (tagLen > checkGrandfatheredLen && tagBuf[checkGrandfatheredLen] != '-') { + if (tagLen > checkLegacyLen && tagBuf[checkLegacyLen] != '-') { // make sure next char is '-'. continue; } - if (uprv_strnicmp(GRANDFATHERED[i], tagBuf, checkGrandfatheredLen) == 0) { + if (uprv_strnicmp(LEGACY[i], tagBuf, checkLegacyLen) == 0) { int32_t newTagLength; - grandfatheredLen = checkGrandfatheredLen; /* back up for output parsedLen */ - int32_t replacementLen = static_cast(uprv_strlen(GRANDFATHERED[i+1])); - newTagLength = replacementLen + tagLen - checkGrandfatheredLen; + legacyLen = checkLegacyLen; /* back up for output parsedLen */ + int32_t replacementLen = static_cast(uprv_strlen(LEGACY[i+1])); + newTagLength = replacementLen + tagLen - checkLegacyLen; if (tagLen < newTagLength) { uprv_free(tagBuf); tagBuf = (char*)uprv_malloc(newTagLength + 1); @@ -2111,16 +2077,16 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta t->buf = tagBuf; tagLen = newTagLength; } - parsedLenDelta = checkGrandfatheredLen - replacementLen; - uprv_strcpy(t->buf, GRANDFATHERED[i + 1]); - if (checkGrandfatheredLen != tagLen) { - uprv_strcpy(t->buf + replacementLen, tag + checkGrandfatheredLen); + parsedLenDelta = checkLegacyLen - replacementLen; + uprv_strcpy(t->buf, LEGACY[i + 1]); + if (checkLegacyLen != tagLen) { + uprv_strcpy(t->buf + replacementLen, tag + checkLegacyLen); } break; } } - if (grandfatheredLen == 0) { + if (legacyLen == 0) { for (i = 0; i < UPRV_LENGTHOF(REDUNDANT); i += 2) { const char* redundantTag = REDUNDANT[i]; size_t redundantTagLen = uprv_strlen(redundantTag); @@ -2440,10 +2406,8 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta return t.orphan(); } -/** -* Ticket #12705 - Turn optimization back on. -*/ -#if (defined(_MSC_VER) && (_MSC_VER >= 1900) && defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 190024210)) +// Ticket #12705 - Turn optimization back on. +#if defined(_MSC_VER) && (_MSC_VER >= 1900) && (_MSC_VER < 1924) #pragma optimize( "", on ) #endif @@ -2608,8 +2572,8 @@ ultag_getPrivateUse(const ULanguageTag* langtag) { #if 0 static const char* -ultag_getGrandfathered(const ULanguageTag* langtag) { - return langtag->grandfathered; +ultag_getLegacy(const ULanguageTag* langtag) { + return langtag->legacy; } #endif @@ -2720,14 +2684,17 @@ ulocimp_toLanguageTag(const char* localeID, key = uenum_next(kwdEnum.getAlias(), &len, &tmpStatus); if (len == 1 && *key == PRIVATEUSE) { - char buf[ULOC_KEYWORD_AND_VALUES_CAPACITY]; - buf[0] = PRIVATEUSE; - buf[1] = SEP; - len = uloc_getKeywordValue(localeID, key, &buf[2], sizeof(buf) - 2, &tmpStatus); + icu::CharString buf; + { + icu::CharStringByteSink sink(&buf); + ulocimp_getKeywordValue(localeID, key, sink, &tmpStatus); + } if (U_SUCCESS(tmpStatus)) { - if (ultag_isPrivateuseValueSubtags(&buf[2], len)) { + if (ultag_isPrivateuseValueSubtags(buf.data(), buf.length())) { /* return private use only tag */ - sink.Append(buf, len + 2); + static const char PREFIX[] = { PRIVATEUSE, SEP }; + sink.Append(PREFIX, sizeof(PREFIX)); + sink.Append(buf.data(), buf.length()); done = TRUE; } else if (strict) { *status = U_ILLEGAL_ARGUMENT_ERROR; diff --git a/intl/icu/source/common/ulocimp.h b/intl/icu/source/common/ulocimp.h index b9e2eb4bfeb0..5691fe9a77fb 100644 --- a/intl/icu/source/common/ulocimp.h +++ b/intl/icu/source/common/ulocimp.h @@ -13,6 +13,8 @@ #include "unicode/bytestream.h" #include "unicode/uloc.h" +#include "charstr.h" + /** * Create an iterator over the specified keywords list * @param keywordList double-null terminated list. Will be copied. @@ -38,7 +40,7 @@ uloc_getTableStringWithFallback( int32_t *pLength, UErrorCode *pErrorCode); -/*returns TRUE if a is an ID separator FALSE otherwise*/ +/*returns true if a is an ID separator false otherwise*/ #define _isIDSeparator(a) (a == '_' || a == '-') U_CFUNC const char* @@ -47,42 +49,55 @@ uloc_getCurrentCountryID(const char* oldID); U_CFUNC const char* uloc_getCurrentLanguageID(const char* oldID); -U_CFUNC int32_t +U_CFUNC void +ulocimp_getKeywords(const char *localeID, + char prev, + icu::ByteSink& sink, + UBool valuesToo, + UErrorCode *status); + +icu::CharString U_EXPORT2 ulocimp_getLanguage(const char *localeID, - char *language, int32_t languageCapacity, - const char **pEnd); + const char **pEnd, + UErrorCode &status); -U_CFUNC int32_t +icu::CharString U_EXPORT2 ulocimp_getScript(const char *localeID, - char *script, int32_t scriptCapacity, - const char **pEnd); + const char **pEnd, + UErrorCode &status); -U_CFUNC int32_t +icu::CharString U_EXPORT2 ulocimp_getCountry(const char *localeID, - char *country, int32_t countryCapacity, - const char **pEnd); + const char **pEnd, + UErrorCode &status); -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_getName(const char* localeID, icu::ByteSink& sink, UErrorCode* err); -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_getBaseName(const char* localeID, icu::ByteSink& sink, UErrorCode* err); -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_canonicalize(const char* localeID, icu::ByteSink& sink, UErrorCode* err); +U_CAPI void U_EXPORT2 +ulocimp_getKeywordValue(const char* localeID, + const char* keywordName, + icu::ByteSink& sink, + UErrorCode* status); + /** * Writes a well-formed language tag for this locale ID. * - * **Note**: When `strict` is FALSE, any locale fields which do not satisfy the + * **Note**: When `strict` is false, any locale fields which do not satisfy the * BCP47 syntax requirement will be omitted from the result. When `strict` is - * TRUE, this function sets U_ILLEGAL_ARGUMENT_ERROR to the `err` if any locale + * true, this function sets U_ILLEGAL_ARGUMENT_ERROR to the `err` if any locale * fields do not satisfy the BCP47 syntax requirement. * * @param localeID the input locale ID @@ -96,7 +111,7 @@ ulocimp_canonicalize(const char* localeID, * * @internal ICU 64 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_toLanguageTag(const char* localeID, icu::ByteSink& sink, UBool strict, @@ -107,13 +122,17 @@ ulocimp_toLanguageTag(const char* localeID, * If the specified language tag contains any ill-formed subtags, * the first such subtag and all following subtags are ignored. *

- * This implements the 'Language-Tag' production of BCP47, and so - * supports grandfathered (regular and irregular) as well as private - * use language tags. Private use tags are represented as 'x-whatever', - * and grandfathered tags are converted to their canonical replacements - * where they exist. Note that a few grandfathered tags have no modern - * replacement, these will be converted using the fallback described in + * This implements the 'Language-Tag' production of BCP 47, and so + * supports legacy language tags (marked as “Type: grandfathered” in BCP 47) + * (regular and irregular) as well as private use language tags. + * + * Private use tags are represented as 'x-whatever', + * and legacy tags are converted to their canonical replacements where they exist. + * + * Note that a few legacy tags have no modern replacement; + * these will be converted using the fallback described in * the first paragraph, so some information might be lost. + * * @param langtag the input BCP47 language tag. * @param tagLen the length of langtag, or -1 to call uprv_strlen(). * @param sink the output sink receiving a locale ID for the @@ -135,7 +154,7 @@ ulocimp_forLanguageTag(const char* langtag, * Get the region to use for supplemental data lookup. Uses * (1) any region specified by locale tag "rg"; if none then * (2) any unicode_region_tag in the locale ID; if none then - * (3) if inferRegion is TRUE, the region suggested by + * (3) if inferRegion is true, the region suggested by * getLikelySubtags on the localeID. * If no region is found, returns length 0. * @@ -143,7 +162,7 @@ ulocimp_forLanguageTag(const char* langtag, * The complete locale ID (with keywords) from which * to get the region to use for supplemental data. * @param inferRegion - * If TRUE, will try to infer region from localeID if + * If true, will try to infer region from localeID if * no other region is found. * @param region * Buffer in which to put the region ID found; should @@ -189,7 +208,7 @@ ulocimp_getRegionForSupplementalData(const char *localeID, UBool inferRegion, * or the localeId is not well-formed, the error code is U_ILLEGAL_ARGUMENT_ERROR. * @internal ICU 64 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_addLikelySubtags(const char* localeID, icu::ByteSink& sink, UErrorCode* err); @@ -223,7 +242,7 @@ ulocimp_addLikelySubtags(const char* localeID, * or the localeId is not well-formed, the error code is U_ILLEGAL_ARGUMENT_ERROR. * @internal ICU 64 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ulocimp_minimizeSubtags(const char* localeID, icu::ByteSink& sink, UErrorCode* err); @@ -279,4 +298,10 @@ ulocimp_toBcpType(const char* key, const char* type, UBool* isKnownKey, UBool* i U_CFUNC const char* ulocimp_toLegacyType(const char* key, const char* type, UBool* isKnownKey, UBool* isSpecialType); +/* Function for testing purpose */ +U_CAPI const char* const* ulocimp_getKnownCanonicalizedLocaleForTest(int32_t* length); + +// Return true if the value is already canonicalized. +U_CAPI bool ulocimp_isCanonicalizedLocaleForTest(const char* localeName); + #endif diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h index 49c348444703..c1a58db75a90 100644 --- a/intl/icu/source/common/umutex.h +++ b/intl/icu/source/common/umutex.h @@ -302,13 +302,13 @@ private: * the global ICU mutex. Recursive locks are an error * and may cause a deadlock on some platforms. */ -U_INTERNAL void U_EXPORT2 umtx_lock(UMutex* mutex); +U_CAPI void U_EXPORT2 umtx_lock(UMutex* mutex); /* Unlock a mutex. * @param mutex The given mutex to be unlocked. Pass NULL to specify * the global ICU mutex. */ -U_INTERNAL void U_EXPORT2 umtx_unlock (UMutex* mutex); +U_CAPI void U_EXPORT2 umtx_unlock (UMutex* mutex); U_NAMESPACE_END diff --git a/intl/icu/source/common/unicode/appendable.h b/intl/icu/source/common/unicode/appendable.h index 4beacaf65836..fc99254de14e 100644 --- a/intl/icu/source/common/unicode/appendable.h +++ b/intl/icu/source/common/unicode/appendable.h @@ -45,7 +45,7 @@ class UnicodeString; * * The methods do not take UErrorCode parameters. * If an error occurs (e.g., out-of-memory), - * in addition to returning FALSE from failing operations, + * in addition to returning false from failing operations, * the implementation must prevent unexpected behavior (e.g., crashes) * from further calls and should make the error condition available separately * (e.g., store a UErrorCode, make/keep a UnicodeString bogus). @@ -62,7 +62,7 @@ public: /** * Appends a 16-bit code unit. * @param c code unit - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool appendCodeUnit(char16_t c) = 0; @@ -71,7 +71,7 @@ public: * Appends a code point. * The default implementation calls appendCodeUnit(char16_t) once or twice. * @param c code point 0..0x10ffff - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool appendCodePoint(UChar32 c); @@ -81,7 +81,7 @@ public: * The default implementation calls appendCodeUnit(char16_t) for each code unit. * @param s string, must not be NULL if length!=0 * @param length string length, or -1 if NUL-terminated - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool appendString(const char16_t *s, int32_t length); @@ -90,9 +90,9 @@ public: * Tells the object that the caller is going to append roughly * appendCapacity char16_ts. A subclass might use this to pre-allocate * a larger buffer if necessary. - * The default implementation does nothing. (It always returns TRUE.) + * The default implementation does nothing. (It always returns true.) * @param appendCapacity estimated number of char16_ts that will be appended - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool reserveAppendCapacity(int32_t appendCapacity); @@ -171,7 +171,7 @@ public: /** * Appends a 16-bit code unit to the string. * @param c code unit - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool appendCodeUnit(char16_t c); @@ -179,7 +179,7 @@ public: /** * Appends a code point to the string. * @param c code point 0..0x10ffff - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool appendCodePoint(UChar32 c); @@ -188,7 +188,7 @@ public: * Appends a string to the UnicodeString. * @param s string, must not be NULL if length!=0 * @param length string length, or -1 if NUL-terminated - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool appendString(const char16_t *s, int32_t length); @@ -197,7 +197,7 @@ public: * Tells the UnicodeString that the caller is going to append roughly * appendCapacity char16_ts. * @param appendCapacity estimated number of char16_ts that will be appended - * @return TRUE if the operation succeeded + * @return true if the operation succeeded * @stable ICU 4.8 */ virtual UBool reserveAppendCapacity(int32_t appendCapacity); diff --git a/intl/icu/source/common/unicode/brkiter.h b/intl/icu/source/common/unicode/brkiter.h index b94449734547..9bba5fcccc31 100644 --- a/intl/icu/source/common/unicode/brkiter.h +++ b/intl/icu/source/common/unicode/brkiter.h @@ -564,7 +564,7 @@ public: * BreakIterator::createXXXInstance to avoid undefined behavior. * @param key the registry key returned by a previous call to registerInstance * @param status the in/out status code, no special meanings are assigned - * @return TRUE if the iterator for the key was successfully unregistered + * @return true if the iterator for the key was successfully unregistered * @stable ICU 2.4 */ static UBool U_EXPORT2 unregister(URegistryKey key, UErrorCode& status); @@ -655,7 +655,7 @@ private: inline UBool BreakIterator::isBufferClone() { - return FALSE; + return false; } #endif /* U_HIDE_DEPRECATED_API */ diff --git a/intl/icu/source/common/unicode/bytestream.h b/intl/icu/source/common/unicode/bytestream.h index 7fe24062228c..044f7a77e784 100644 --- a/intl/icu/source/common/unicode/bytestream.h +++ b/intl/icu/source/common/unicode/bytestream.h @@ -197,7 +197,7 @@ public: * Returns the sink to its original state, without modifying the buffer. * Useful for reusing both the buffer and the sink for multiple streams. * Resets the state to NumberOfBytesWritten()=NumberOfBytesAppended()=0 - * and Overflowed()=FALSE. + * and Overflowed()=false. * @return *this * @stable ICU 4.6 */ @@ -236,7 +236,7 @@ public: /** * Returns true if any bytes were discarded, i.e., if there was an * attempt to write more than 'capacity' bytes. - * @return TRUE if more than 'capacity' bytes were Append()ed + * @return true if more than 'capacity' bytes were Append()ed * @stable ICU 4.2 */ UBool Overflowed() const { return overflowed_; } diff --git a/intl/icu/source/common/unicode/bytestrie.h b/intl/icu/source/common/unicode/bytestrie.h index 51405f64a10e..85f802df4202 100644 --- a/intl/icu/source/common/unicode/bytestrie.h +++ b/intl/icu/source/common/unicode/bytestrie.h @@ -97,14 +97,13 @@ public: return *this; } -#ifndef U_HIDE_DRAFT_API /** * Returns the state of this trie as a 64-bit integer. * The state value is never 0. * * @return opaque state value * @see resetToState64 - * @draft ICU 65 + * @stable ICU 65 */ uint64_t getState64() const { return (static_cast(remainingMatchLength_ + 2) << kState64RemainingShift) | @@ -123,14 +122,13 @@ public: * @see getState64 * @see resetToState * @see reset - * @draft ICU 65 + * @stable ICU 65 */ BytesTrie &resetToState64(uint64_t state) { remainingMatchLength_ = static_cast(state >> kState64RemainingShift) - 2; pos_ = bytes_ + (state & kState64PosMask); return *this; } -#endif /* U_HIDE_DRAFT_API */ /** * BytesTrie state object, for saving a trie's current state @@ -253,16 +251,16 @@ public: /** * Determines whether all byte sequences reachable from the current state * map to the same value. - * @param uniqueValue Receives the unique value, if this function returns TRUE. + * @param uniqueValue Receives the unique value, if this function returns true. * (output-only) - * @return TRUE if all byte sequences reachable from the current state + * @return true if all byte sequences reachable from the current state * map to the same value. * @stable ICU 4.8 */ inline UBool hasUniqueValue(int32_t &uniqueValue) const { const uint8_t *pos=pos_; // Skip the rest of a pending linear-match node. - return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, FALSE, uniqueValue); + return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue); } /** @@ -321,7 +319,7 @@ public: Iterator &reset(); /** - * @return TRUE if there are more elements. + * @return true if there are more elements. * @stable ICU 4.8 */ UBool hasNext() const; @@ -337,7 +335,7 @@ public: * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with * function chaining. (See User Guide for details.) - * @return TRUE if there is another element. + * @return true if there is another element. * @stable ICU 4.8 */ UBool next(UErrorCode &errorCode); diff --git a/intl/icu/source/common/unicode/bytestriebuilder.h b/intl/icu/source/common/unicode/bytestriebuilder.h index b98374bb8fdb..cae16e48b45b 100644 --- a/intl/icu/source/common/unicode/bytestriebuilder.h +++ b/intl/icu/source/common/unicode/bytestriebuilder.h @@ -101,9 +101,10 @@ public: * Multiple calls to buildStringPiece() return StringPieces referring to the * builder's same byte array, without rebuilding. * If buildStringPiece() is called after build(), the trie will be - * re-serialized into a new array. - * If build() is called after buildStringPiece(), the trie object will become - * the owner of the previously returned array. + * re-serialized into a new array (because build() passes on ownership). + * If build() is called after buildStringPiece(), the trie object returned + * by build() will become the owner of the underlying string for the + * previously returned StringPiece. * After clear() has been called, a new array will be used as well. * @param buildOption Build option, see UStringTrieBuildOption. * @param errorCode Standard ICU error code. Its input value must @@ -139,7 +140,7 @@ private: virtual int32_t skipElementsBySomeUnits(int32_t i, int32_t byteIndex, int32_t count) const; virtual int32_t indexOfElementWithNextUnit(int32_t i, int32_t byteIndex, char16_t byte) const; - virtual UBool matchNodesCanHaveValues() const { return FALSE; } + virtual UBool matchNodesCanHaveValues() const { return false; } virtual int32_t getMaxBranchLinearSubNodeLength() const { return BytesTrie::kMaxBranchLinearSubNodeLength; } virtual int32_t getMinLinearMatch() const { return BytesTrie::kMinLinearMatch; } diff --git a/intl/icu/source/common/unicode/caniter.h b/intl/icu/source/common/unicode/caniter.h index 13e524ff6ad3..4ed2b74b1014 100644 --- a/intl/icu/source/common/unicode/caniter.h +++ b/intl/icu/source/common/unicode/caniter.h @@ -25,11 +25,11 @@ */ /** Should permutation skip characters with combining class zero - * Should be either TRUE or FALSE. This is a compile time option + * Should be either true or false. This is a compile time option * @stable ICU 2.4 */ #ifndef CANITER_SKIP_ZEROES -#define CANITER_SKIP_ZEROES TRUE +#define CANITER_SKIP_ZEROES true #endif U_NAMESPACE_BEGIN diff --git a/intl/icu/source/common/unicode/chariter.h b/intl/icu/source/common/unicode/chariter.h index db86f79e42ee..96dc5db7c9ec 100644 --- a/intl/icu/source/common/unicode/chariter.h +++ b/intl/icu/source/common/unicode/chariter.h @@ -65,7 +65,7 @@ U_NAMESPACE_BEGIN * check for the end of the iteration. When there are no more * characters in the text object: *

    - *
  • The hasNext() function returns FALSE.
  • + *
  • The hasNext() function returns false.
  • *
  • nextPostInc() and next32PostInc() return DONE * when one attempts to read beyond the end of the text object.
  • *
@@ -165,11 +165,11 @@ public: virtual UChar32 next32PostInc(void) = 0; /** - * Returns FALSE if there are no more code units or code points + * Returns false if there are no more code units or code points * at or after the current position in the iteration range. * This is used with nextPostInc() or next32PostInc() in forward * iteration. - * @returns FALSE if there are no more code units or code points + * @returns false if there are no more code units or code points * at or after the current position in the iteration range. * @stable ICU 2.0 */ @@ -535,12 +535,12 @@ public: virtual UChar32 previous32(void) = 0; /** - * Returns FALSE if there are no more code units or code points + * Returns false if there are no more code units or code points * before the current position in the iteration range. * This is used with previous() or previous32() in backward * iteration. - * @return FALSE if there are no more code units or code points - * before the current position in the iteration range, return TRUE otherwise. + * @return false if there are no more code units or code points + * before the current position in the iteration range, return true otherwise. * @stable ICU 2.0 */ virtual UBool hasPrevious() = 0; diff --git a/intl/icu/source/common/unicode/docmain.h b/intl/icu/source/common/unicode/docmain.h index 704139a85ed5..edcb5d4e835f 100644 --- a/intl/icu/source/common/unicode/docmain.h +++ b/intl/icu/source/common/unicode/docmain.h @@ -53,10 +53,10 @@ * *

Architecture (User's Guide)

* * *
@@ -143,13 +143,18 @@ * icu::MessageFormat * * + * List Formatting + * ulistformatter.h + * icu::ListFormatter + * + * * Number Formatting
(includes currency and unit formatting) * unumberformatter.h, unum.h * icu::number::NumberFormatter (ICU 60+) or icu::NumberFormat (older versions) * * * Number Range Formatting
(includes currency and unit ranges) - * (no C API) + * unumberrangeformatter.h * icu::number::NumberRangeFormatter * * diff --git a/intl/icu/source/common/unicode/dtintrv.h b/intl/icu/source/common/unicode/dtintrv.h index 15e15c9d405b..4f4b6bf7f405 100644 --- a/intl/icu/source/common/unicode/dtintrv.h +++ b/intl/icu/source/common/unicode/dtintrv.h @@ -106,14 +106,14 @@ public: /** * Equality operator. - * @return TRUE if the two DateIntervals are the same + * @return true if the two DateIntervals are the same * @stable ICU 4.0 */ virtual UBool operator==(const DateInterval& other) const; /** * Non-equality operator - * @return TRUE if the two DateIntervals are not the same + * @return true if the two DateIntervals are not the same * @stable ICU 4.0 */ inline UBool operator!=(const DateInterval& other) const; diff --git a/intl/icu/source/common/unicode/edits.h b/intl/icu/source/common/unicode/edits.h index c3ceaccb3b38..bfa07fa6765b 100644 --- a/intl/icu/source/common/unicode/edits.h +++ b/intl/icu/source/common/unicode/edits.h @@ -159,7 +159,7 @@ public: * @param outErrorCode Set to an error code if it does not contain one already * and an error occurred while recording edits. * Otherwise unchanged. - * @return TRUE if U_FAILURE(outErrorCode) + * @return true if U_FAILURE(outErrorCode) * @stable ICU 59 */ UBool copyErrorTo(UErrorCode &outErrorCode) const; @@ -171,7 +171,7 @@ public: */ int32_t lengthDelta() const { return delta; } /** - * @return TRUE if there are any change edits + * @return true if there are any change edits * @stable ICU 59 */ UBool hasChanges() const { return numChanges != 0; } @@ -207,8 +207,8 @@ public: */ Iterator() : array(nullptr), index(0), length(0), - remaining(0), onlyChanges_(FALSE), coarse(FALSE), - dir(0), changed(FALSE), oldLength_(0), newLength_(0), + remaining(0), onlyChanges_(false), coarse(false), + dir(0), changed(false), oldLength_(0), newLength_(0), srcIndex(0), replIndex(0), destIndex(0) {} /** * Copy constructor. @@ -226,7 +226,7 @@ public: * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) - * @return TRUE if there is another edit + * @return true if there is another edit * @stable ICU 59 */ UBool next(UErrorCode &errorCode) { return next(onlyChanges_, errorCode); } @@ -247,11 +247,11 @@ public: * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) - * @return TRUE if the edit for the source index was found + * @return true if the edit for the source index was found * @stable ICU 59 */ UBool findSourceIndex(int32_t i, UErrorCode &errorCode) { - return findIndex(i, TRUE, errorCode) == 0; + return findIndex(i, true, errorCode) == 0; } /** @@ -270,11 +270,11 @@ public: * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) - * @return TRUE if the edit for the destination index was found + * @return true if the edit for the destination index was found * @stable ICU 60 */ UBool findDestinationIndex(int32_t i, UErrorCode &errorCode) { - return findIndex(i, FALSE, errorCode) == 0; + return findIndex(i, false, errorCode) == 0; } /** @@ -328,8 +328,8 @@ public: /** * Returns whether the edit currently represented by the iterator is a change edit. * - * @return TRUE if this edit replaces oldLength() units with newLength() different ones. - * FALSE if oldLength units remain unchanged. + * @return true if this edit replaces oldLength() units with newLength() different ones. + * false if oldLength units remain unchanged. * @stable ICU 59 */ UBool hasChange() const { return changed; } @@ -347,8 +347,8 @@ public: * {@link #destinationIndex}, or in the replacement string, which starts at * {@link #replacementIndex}. * - * @return the number of units in the modified string, if hasChange() is TRUE. - * Same as oldLength if hasChange() is FALSE. + * @return the number of units in the modified string, if hasChange() is true. + * Same as oldLength if hasChange() is false. * @stable ICU 59 */ int32_t newLength() const { return newLength_; } @@ -436,7 +436,7 @@ public: * @stable ICU 59 */ Iterator getCoarseChangesIterator() const { - return Iterator(array, length, TRUE, TRUE); + return Iterator(array, length, true, true); } /** @@ -448,7 +448,7 @@ public: * @stable ICU 59 */ Iterator getCoarseIterator() const { - return Iterator(array, length, FALSE, TRUE); + return Iterator(array, length, false, true); } /** @@ -460,7 +460,7 @@ public: * @stable ICU 59 */ Iterator getFineChangesIterator() const { - return Iterator(array, length, TRUE, FALSE); + return Iterator(array, length, true, false); } /** @@ -471,7 +471,7 @@ public: * @stable ICU 59 */ Iterator getFineIterator() const { - return Iterator(array, length, FALSE, FALSE); + return Iterator(array, length, false, false); } /** diff --git a/intl/icu/source/common/unicode/filteredbrk.h b/intl/icu/source/common/unicode/filteredbrk.h index 42936763259e..8b07e39ae12b 100644 --- a/intl/icu/source/common/unicode/filteredbrk.h +++ b/intl/icu/source/common/unicode/filteredbrk.h @@ -85,8 +85,8 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { * by the iterator. * @param string the string to suppress, such as "Mr." * @param status error code - * @return returns TRUE if the string was not present and now added, - * FALSE if the call was a no-op because the string was already being suppressed. + * @return returns true if the string was not present and now added, + * false if the call was a no-op because the string was already being suppressed. * @stable ICU 56 */ virtual UBool suppressBreakAfter(const UnicodeString& string, UErrorCode& status) = 0; @@ -98,8 +98,8 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { * locale data which may be suppressing certain strings. * @param string the exception to remove * @param status error code - * @return returns TRUE if the string was present and now removed, - * FALSE if the call was a no-op because the string was not being suppressed. + * @return returns true if the string was present and now removed, + * false if the call was a no-op because the string was not being suppressed. * @stable ICU 56 */ virtual UBool unsuppressBreakAfter(const UnicodeString& string, UErrorCode& status) = 0; diff --git a/intl/icu/source/common/unicode/icudataver.h b/intl/icu/source/common/unicode/icudataver.h index 1cb202e3d45c..f218ed8ebccb 100644 --- a/intl/icu/source/common/unicode/icudataver.h +++ b/intl/icu/source/common/unicode/icudataver.h @@ -38,6 +38,6 @@ * * @stable ICU 49 */ -U_STABLE void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status); +U_CAPI void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status); #endif diff --git a/intl/icu/source/common/unicode/icuplug.h b/intl/icu/source/common/unicode/icuplug.h index 2e57b149e14e..52f810da57d2 100644 --- a/intl/icu/source/common/unicode/icuplug.h +++ b/intl/icu/source/common/unicode/icuplug.h @@ -208,7 +208,7 @@ typedef UPlugTokenReturn (U_EXPORT2 UPlugEntrypoint) ( * @param dontUnload set true if this plugin can't be unloaded * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_setPlugNoUnload(UPlugData *plug, UBool dontUnload); /** @@ -217,7 +217,7 @@ uplug_setPlugNoUnload(UPlugData *plug, UBool dontUnload); * @param level the level of this plugin * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_setPlugLevel(UPlugData *plug, UPlugLevel level); /** @@ -226,7 +226,7 @@ uplug_setPlugLevel(UPlugData *plug, UPlugLevel level); * @return the level of this plugin * @internal ICU 4.4 Technology Preview */ -U_INTERNAL UPlugLevel U_EXPORT2 +U_CAPI UPlugLevel U_EXPORT2 uplug_getPlugLevel(UPlugData *plug); /** @@ -236,7 +236,7 @@ uplug_getPlugLevel(UPlugData *plug); * @return the lowest level of plug which can currently load * @internal ICU 4.4 Technology Preview */ -U_INTERNAL UPlugLevel U_EXPORT2 +U_CAPI UPlugLevel U_EXPORT2 uplug_getCurrentLevel(void); @@ -245,7 +245,7 @@ uplug_getCurrentLevel(void); * @return The error code of this plugin's load attempt. * @internal ICU 4.4 Technology Preview */ -U_INTERNAL UErrorCode U_EXPORT2 +U_CAPI UErrorCode U_EXPORT2 uplug_getPlugLoadStatus(UPlugData *plug); /** @@ -254,7 +254,7 @@ uplug_getPlugLoadStatus(UPlugData *plug); * @param name the name of this plugin. The first UPLUG_NAME_MAX characters willi be copied into a new buffer. * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_setPlugName(UPlugData *plug, const char *name); /** @@ -263,7 +263,7 @@ uplug_setPlugName(UPlugData *plug, const char *name); * @return the name of this plugin * @internal ICU 4.4 Technology Preview */ -U_INTERNAL const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 uplug_getPlugName(UPlugData *plug); /** @@ -272,7 +272,7 @@ uplug_getPlugName(UPlugData *plug); * @return the symbol name, or NULL * @internal ICU 4.4 Technology Preview */ -U_INTERNAL const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 uplug_getSymbolName(UPlugData *plug); /** @@ -282,7 +282,7 @@ uplug_getSymbolName(UPlugData *plug); * @return the library name, or NULL * @internal ICU 4.4 Technology Preview */ -U_INTERNAL const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 uplug_getLibraryName(UPlugData *plug, UErrorCode *status); /** @@ -292,7 +292,7 @@ uplug_getLibraryName(UPlugData *plug, UErrorCode *status); * @return the library, or NULL * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uplug_getLibrary(UPlugData *plug); /** @@ -301,7 +301,7 @@ uplug_getLibrary(UPlugData *plug); * @return the context, or NULL if not set * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void * U_EXPORT2 +U_CAPI void * U_EXPORT2 uplug_getContext(UPlugData *plug); /** @@ -310,7 +310,7 @@ uplug_getContext(UPlugData *plug); * @param context new context to set * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_setContext(UPlugData *plug, void *context); @@ -321,7 +321,7 @@ uplug_setContext(UPlugData *plug, void *context); * @return configuration string, or else null. * @internal ICU 4.4 Technology Preview */ -U_INTERNAL const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 uplug_getConfiguration(UPlugData *plug); /** @@ -339,7 +339,7 @@ uplug_getConfiguration(UPlugData *plug); * @return the next oldest plugin, or NULL if no more. * @internal ICU 4.4 Technology Preview */ -U_INTERNAL UPlugData* U_EXPORT2 +U_CAPI UPlugData* U_EXPORT2 uplug_nextPlug(UPlugData *prior); /** @@ -354,7 +354,7 @@ uplug_nextPlug(UPlugData *prior); * @return the new UPlugData associated with this plugin, or NULL if error. * @internal ICU 4.4 Technology Preview */ -U_INTERNAL UPlugData* U_EXPORT2 +U_CAPI UPlugData* U_EXPORT2 uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UErrorCode *status); @@ -368,7 +368,7 @@ uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UE * @return the new UPlugData associated with this plugin, or NULL if error. * @internal ICU 4.4 Technology Preview */ -U_INTERNAL UPlugData* U_EXPORT2 +U_CAPI UPlugData* U_EXPORT2 uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status); /** @@ -378,7 +378,7 @@ uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *conf * @param status error result * @internal ICU 4.4 Technology Preview */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 uplug_removePlug(UPlugData *plug, UErrorCode *status); #endif /* U_HIDE_INTERNAL_API */ diff --git a/intl/icu/source/common/unicode/idna.h b/intl/icu/source/common/unicode/idna.h index 6dfcfe48db28..1305dc604842 100644 --- a/intl/icu/source/common/unicode/idna.h +++ b/intl/icu/source/common/unicode/idna.h @@ -95,7 +95,7 @@ public: /** * Converts a single domain name label into its ASCII form for DNS lookup. - * If any processing step fails, then info.hasErrors() will be TRUE and + * If any processing step fails, then info.hasErrors() will be true and * the result might not be an ASCII string. * The label might be modified according to the types of errors. * Labels with severe errors will be left in (or turned into) their Unicode form. @@ -119,7 +119,7 @@ public: /** * Converts a single domain name label into its Unicode form for human-readable display. - * If any processing step fails, then info.hasErrors() will be TRUE. + * If any processing step fails, then info.hasErrors() will be true. * The label might be modified according to the types of errors. * * The UErrorCode indicates an error only in exceptional cases, @@ -141,7 +141,7 @@ public: /** * Converts a whole domain name into its ASCII form for DNS lookup. - * If any processing step fails, then info.hasErrors() will be TRUE and + * If any processing step fails, then info.hasErrors() will be true and * the result might not be an ASCII string. * The domain name might be modified according to the types of errors. * Labels with severe errors will be left in (or turned into) their Unicode form. @@ -165,7 +165,7 @@ public: /** * Converts a whole domain name into its Unicode form for human-readable display. - * If any processing step fails, then info.hasErrors() will be TRUE. + * If any processing step fails, then info.hasErrors() will be true. * The domain name might be modified according to the types of errors. * * The UErrorCode indicates an error only in exceptional cases, @@ -273,10 +273,10 @@ public: * Constructor for stack allocation. * @stable ICU 4.6 */ - IDNAInfo() : errors(0), labelErrors(0), isTransDiff(FALSE), isBiDi(FALSE), isOkBiDi(TRUE) {} + IDNAInfo() : errors(0), labelErrors(0), isTransDiff(false), isBiDi(false), isOkBiDi(true) {} /** * Were there IDNA processing errors? - * @return TRUE if there were processing errors + * @return true if there were processing errors * @stable ICU 4.6 */ UBool hasErrors() const { return errors!=0; } @@ -288,7 +288,7 @@ public: */ uint32_t getErrors() const { return errors; } /** - * Returns TRUE if transitional and nontransitional processing produce different results. + * Returns true if transitional and nontransitional processing produce different results. * This is the case when the input label or domain name contains * one or more deviation characters outside a Punycode label (see UTS #46). *
    @@ -297,7 +297,7 @@ public: *
  • With transitional processing, such characters are * mapped (sharp s/sigma) or removed (joiner/nonjoiner). *
- * @return TRUE if transitional and nontransitional processing produce different results + * @return true if transitional and nontransitional processing produce different results * @stable ICU 4.6 */ UBool isTransitionalDifferent() const { return isTransDiff; } @@ -310,9 +310,9 @@ private: void reset() { errors=labelErrors=0; - isTransDiff=FALSE; - isBiDi=FALSE; - isOkBiDi=TRUE; + isTransDiff=false; + isBiDi=false; + isOkBiDi=true; } uint32_t errors, labelErrors; diff --git a/intl/icu/source/common/unicode/localebuilder.h b/intl/icu/source/common/unicode/localebuilder.h index c5836fe27021..27a894de101d 100644 --- a/intl/icu/source/common/unicode/localebuilder.h +++ b/intl/icu/source/common/unicode/localebuilder.h @@ -1,5 +1,5 @@ // © 2018 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html #ifndef __LOCALEBUILDER_H__ #define __LOCALEBUILDER_H__ @@ -92,11 +92,12 @@ public: /** * Resets the LocaleBuilder to match the provided * [Unicode Locale Identifier](http://www.unicode.org/reports/tr35/tr35.html#unicode_locale_id) . - * Discards the existing state. the empty string cause the builder to be - * reset, like {@link #clear}. Grandfathered tags are converted to their - * canonical form before being processed. Otherwise, the language - * tag must be well-formed, or else the build() method will later - * report an U_ILLEGAL_ARGUMENT_ERROR. + * Discards the existing state. + * The empty string causes the builder to be reset, like {@link #clear}. + * Legacy language tags (marked as “Type: grandfathered” in BCP 47) + * are converted to their canonical form before being processed. + * Otherwise, the language tag must be well-formed, + * or else the build() method will later report an U_ILLEGAL_ARGUMENT_ERROR. * *

This method clears the internal UErrorCode. * @@ -278,18 +279,16 @@ public: */ Locale build(UErrorCode& status); -#ifndef U_HIDE_DRAFT_API /** * Sets the UErrorCode if an error occurred while recording sets. * Preserves older error codes in the outErrorCode. * @param outErrorCode Set to an error code that occurred while setting subtags. * Unchanged if there is no such error or if outErrorCode * already contained an error. - * @return TRUE if U_FAILURE(outErrorCode) - * @draft ICU 65 + * @return true if U_FAILURE(outErrorCode) + * @stable ICU 65 */ UBool copyErrorTo(UErrorCode &outErrorCode) const; -#endif /* U_HIDE_DRAFT_API */ private: friend class LocaleMatcher::Result; diff --git a/intl/icu/source/common/unicode/localematcher.h b/intl/icu/source/common/unicode/localematcher.h index 2e1a7a349f39..63a68b0b7fb3 100644 --- a/intl/icu/source/common/unicode/localematcher.h +++ b/intl/icu/source/common/unicode/localematcher.h @@ -1,5 +1,5 @@ // © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html // localematcher.h // created: 2019may08 Markus W. Scherer @@ -20,26 +20,24 @@ * \brief C++ API: Locale matcher: User's desired locales vs. application's supported locales. */ -#ifndef U_FORCE_HIDE_DRAFT_API - /** * Builder option for whether the language subtag or the script subtag is most important. * - * @see Builder#setFavorSubtag(ULocMatchFavorSubtag) - * @draft ICU 65 + * @see LocaleMatcher::Builder#setFavorSubtag(ULocMatchFavorSubtag) + * @stable ICU 65 */ enum ULocMatchFavorSubtag { /** * Language differences are most important, then script differences, then region differences. * (This is the default behavior.) * - * @draft ICU 65 + * @stable ICU 65 */ ULOCMATCH_FAVOR_LANGUAGE, /** * Makes script differences matter relatively more than language differences. * - * @draft ICU 65 + * @stable ICU 65 */ ULOCMATCH_FAVOR_SCRIPT }; @@ -51,14 +49,14 @@ typedef enum ULocMatchFavorSubtag ULocMatchFavorSubtag; * Builder option for whether all desired locales are treated equally or * earlier ones are preferred. * - * @see Builder#setDemotionPerDesiredLocale(ULocMatchDemotion) - * @draft ICU 65 + * @see LocaleMatcher::Builder#setDemotionPerDesiredLocale(ULocMatchDemotion) + * @stable ICU 65 */ enum ULocMatchDemotion { /** * All desired locales are treated equally. * - * @draft ICU 65 + * @stable ICU 65 */ ULOCMATCH_DEMOTION_NONE, /** @@ -85,7 +83,7 @@ enum ULocMatchDemotion { * this is possible in future versions of the data.) * * - * @draft ICU 65 + * @stable ICU 65 */ ULOCMATCH_DEMOTION_REGION }; @@ -93,6 +91,8 @@ enum ULocMatchDemotion { typedef enum ULocMatchDemotion ULocMatchDemotion; #endif +#ifndef U_FORCE_HIDE_DRAFT_API + /** * Builder option for whether to include or ignore one-way (fallback) match data. * The LocaleMatcher uses CLDR languageMatch data which includes fallback (oneway=true) entries. @@ -107,7 +107,7 @@ typedef enum ULocMatchDemotion ULocMatchDemotion; * if there is a decent match for the original UI language, we want to use it, * but not if it is merely a fallback. * - * @see Builder#setDirection(ULocMatchDirection) + * @see LocaleMatcher::Builder#setDirection(ULocMatchDirection) * @draft ICU 67 */ enum ULocMatchDirection { @@ -129,6 +129,8 @@ enum ULocMatchDirection { typedef enum ULocMatchDirection ULocMatchDirection; #endif +#endif // U_FORCE_HIDE_DRAFT_API + struct UHashtable; U_NAMESPACE_BEGIN @@ -181,7 +183,7 @@ class XLikelySubtags; * *

This class is not intended for public subclassing. * - * @draft ICU 65 + * @stable ICU 65 */ class U_COMMON_API LocaleMatcher : public UMemory { public: @@ -189,7 +191,7 @@ public: * Data for the best-matching pair of a desired and a supported locale. * Movable but not copyable. * - * @draft ICU 65 + * @stable ICU 65 */ class U_COMMON_API Result : public UMemory { public: @@ -198,14 +200,14 @@ public: * This object will have the same contents that the source object had. * * @param src Result to move contents from. - * @draft ICU 65 + * @stable ICU 65 */ Result(Result &&src) U_NOEXCEPT; /** * Destructor. * - * @draft ICU 65 + * @stable ICU 65 */ ~Result(); @@ -214,28 +216,27 @@ public: * This object will have the same contents that the source object had. * * @param src Result to move contents from. - * @draft ICU 65 + * @stable ICU 65 */ Result &operator=(Result &&src) U_NOEXCEPT; -#ifndef U_HIDE_DRAFT_API /** * Returns the best-matching desired locale. * nullptr if the list of desired locales is empty or if none matched well enough. * * @return the best-matching desired locale, or nullptr. - * @draft ICU 65 + * @stable ICU 65 */ inline const Locale *getDesiredLocale() const { return desiredLocale; } /** * Returns the best-matching supported locale. * If none matched well enough, this is the default locale. - * The default locale is nullptr if the list of supported locales is empty and - * no explicit default locale is set. + * The default locale is nullptr if Builder::setNoDefaultLocale() was called, + * or if the list of supported locales is empty and no explicit default locale is set. * * @return the best-matching supported locale, or nullptr. - * @draft ICU 65 + * @stable ICU 65 */ inline const Locale *getSupportedLocale() const { return supportedLocale; } @@ -244,7 +245,7 @@ public: * -1 if the list of desired locales is empty or if none matched well enough. * * @return the index of the best-matching desired locale, or -1. - * @draft ICU 65 + * @stable ICU 65 */ inline int32_t getDesiredIndex() const { return desiredIndex; } @@ -256,7 +257,7 @@ public: * -1 if the list of supported locales is empty or if none matched well enough. * * @return the index of the best-matching supported locale, or -1. - * @draft ICU 65 + * @stable ICU 65 */ inline int32_t getSupportedIndex() const { return supportedIndex; } @@ -270,10 +271,9 @@ public: *

Example: desired=ar-SA-u-nu-latn, supported=ar-EG, resolved locale=ar-SA-u-nu-latn * * @return a locale combining the best-matching desired and supported locales. - * @draft ICU 65 + * @stable ICU 65 */ Locale makeResolvedLocale(UErrorCode &errorCode) const; -#endif // U_HIDE_DRAFT_API private: Result(const Locale *desired, const Locale *supported, @@ -298,8 +298,7 @@ public: * LocaleMatcher builder. * Movable but not copyable. * - * @see LocaleMatcher#builder() - * @draft ICU 65 + * @stable ICU 65 */ class U_COMMON_API Builder : public UMemory { public: @@ -307,7 +306,7 @@ public: * Constructs a builder used in chaining parameters for building a LocaleMatcher. * * @return a new Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder() {} @@ -316,14 +315,14 @@ public: * This builder will have the same contents that the source builder had. * * @param src Builder to move contents from. - * @draft ICU 65 + * @stable ICU 65 */ Builder(Builder &&src) U_NOEXCEPT; /** * Destructor. * - * @draft ICU 65 + * @stable ICU 65 */ ~Builder(); @@ -332,11 +331,10 @@ public: * This builder will have the same contents that the source builder had. * * @param src Builder to move contents from. - * @draft ICU 65 + * @stable ICU 65 */ Builder &operator=(Builder &&src) U_NOEXCEPT; -#ifndef U_HIDE_DRAFT_API /** * Parses an Accept-Language string * (RFC 2616 Section 14.4), @@ -346,7 +344,7 @@ public: * * @param locales the Accept-Language string of locales to set * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder &setSupportedLocalesFromListString(StringPiece locales); @@ -357,7 +355,7 @@ public: * * @param locales the list of locale * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder &setSupportedLocales(Locale::Iterator &locales); @@ -372,7 +370,7 @@ public: * @param begin Start of range. * @param end Exclusive end of range. * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ template Builder &setSupportedLocales(Iter begin, Iter end) { @@ -397,7 +395,7 @@ public: * @param end Exclusive end of range. * @param converter Converter from *begin to const Locale & or compatible. * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ template Builder &setSupportedLocalesViaConverter(Iter begin, Iter end, Conv converter) { @@ -415,17 +413,31 @@ public: * * @param locale another locale * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder &addSupportedLocale(const Locale &locale); +#ifndef U_HIDE_DRAFT_API + /** + * Sets no default locale. + * There will be no explicit or implicit default locale. + * If there is no good match, then the matcher will return nullptr for the + * best supported locale. + * + * @draft ICU 68 + */ + Builder &setNoDefaultLocale(); +#endif // U_HIDE_DRAFT_API + /** * Sets the default locale; if nullptr, or if it is not set explicitly, * then the first supported locale is used as the default locale. + * There is no default locale at all (nullptr will be returned instead) + * if setNoDefaultLocale() is called. * * @param defaultLocale the default locale (will be copied) * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder &setDefaultLocale(const Locale *defaultLocale); @@ -437,7 +449,7 @@ public: * * @param subtag the subtag to favor * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder &setFavorSubtag(ULocMatchFavorSubtag subtag); @@ -447,10 +459,11 @@ public: * * @param demotion the demotion per desired locale to set. * @return this Builder object - * @draft ICU 65 + * @stable ICU 65 */ Builder &setDemotionPerDesiredLocale(ULocMatchDemotion demotion); +#ifndef U_HIDE_DRAFT_API /** * Option for whether to include or ignore one-way (fallback) match data. * By default, they are included. @@ -465,6 +478,32 @@ public: } return *this; } +#endif // U_HIDE_DRAFT_API + +#ifndef U_HIDE_DRAFT_API + /** + * Sets the maximum distance for an acceptable match. + * The matcher will return a match for a pair of locales only if + * they match at least as well as the pair given here. + * + * For example, setMaxDistance(en-US, en-GB) limits matches to ones where the + * (desired, support) locales have a distance no greater than a region subtag difference. + * This is much stricter than the CLDR default. + * + * The details of locale matching are subject to changes in + * CLDR data and in the algorithm. + * Specifying a maximum distance in relative terms via a sample pair of locales + * insulates from changes that affect all distance metrics similarly, + * but some changes will necessarily affect relative distances between + * different pairs of locales. + * + * @param desired the desired locale for distance comparison. + * @param supported the supported locale for distance comparison. + * @return this Builder object + * @draft ICU 68 + */ + Builder &setMaxDistance(const Locale &desired, const Locale &supported); +#endif // U_HIDE_DRAFT_API /** * Sets the UErrorCode if an error occurred while setting parameters. @@ -473,8 +512,8 @@ public: * @param outErrorCode Set to an error code if it does not contain one already * and an error occurred while setting parameters. * Otherwise unchanged. - * @return TRUE if U_FAILURE(outErrorCode) - * @draft ICU 65 + * @return true if U_FAILURE(outErrorCode) + * @stable ICU 65 */ UBool copyErrorTo(UErrorCode &outErrorCode) const; @@ -485,11 +524,10 @@ public: * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) - * @return new LocaleMatcher. - * @draft ICU 65 + * @return LocaleMatcher + * @stable ICU 65 */ LocaleMatcher build(UErrorCode &errorCode) const; -#endif // U_HIDE_DRAFT_API private: friend class LocaleMatcher; @@ -505,8 +543,11 @@ public: int32_t thresholdDistance_ = -1; ULocMatchDemotion demotion_ = ULOCMATCH_DEMOTION_REGION; Locale *defaultLocale_ = nullptr; + bool withDefault_ = true; ULocMatchFavorSubtag favor_ = ULOCMATCH_FAVOR_LANGUAGE; ULocMatchDirection direction_ = ULOCMATCH_DIRECTION_WITH_ONE_WAY; + Locale *maxDistanceDesired_ = nullptr; + Locale *maxDistanceSupported_ = nullptr; }; // FYI No public LocaleMatcher constructors in C++; use the Builder. @@ -515,13 +556,13 @@ public: * Move copy constructor; might modify the source. * This matcher will have the same settings that the source matcher had. * @param src source matcher - * @draft ICU 65 + * @stable ICU 65 */ LocaleMatcher(LocaleMatcher &&src) U_NOEXCEPT; /** * Destructor. - * @draft ICU 65 + * @stable ICU 65 */ ~LocaleMatcher(); @@ -531,11 +572,10 @@ public: * The behavior is undefined if *this and src are the same object. * @param src source matcher * @return *this - * @draft ICU 65 + * @stable ICU 65 */ LocaleMatcher &operator=(LocaleMatcher &&src) U_NOEXCEPT; -#ifndef U_HIDE_DRAFT_API /** * Returns the supported locale which best matches the desired locale. * @@ -544,7 +584,7 @@ public: * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) * @return the best-matching supported locale. - * @draft ICU 65 + * @stable ICU 65 */ const Locale *getBestMatch(const Locale &desiredLocale, UErrorCode &errorCode) const; @@ -556,7 +596,7 @@ public: * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) * @return the best-matching supported locale. - * @draft ICU 65 + * @stable ICU 65 */ const Locale *getBestMatch(Locale::Iterator &desiredLocales, UErrorCode &errorCode) const; @@ -572,7 +612,7 @@ public: * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) * @return the best-matching supported locale. - * @draft ICU 65 + * @stable ICU 65 */ const Locale *getBestMatchForListString(StringPiece desiredLocaleList, UErrorCode &errorCode) const; @@ -586,7 +626,7 @@ public: * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) * @return the best-matching pair of the desired and a supported locale. - * @draft ICU 65 + * @stable ICU 65 */ Result getBestMatchResult(const Locale &desiredLocale, UErrorCode &errorCode) const; @@ -600,9 +640,25 @@ public: * or else the function returns immediately. Check for U_FAILURE() * on output or use with function chaining. (See User Guide for details.) * @return the best-matching pair of a desired and a supported locale. - * @draft ICU 65 + * @stable ICU 65 */ Result getBestMatchResult(Locale::Iterator &desiredLocales, UErrorCode &errorCode) const; + +#ifndef U_HIDE_DRAFT_API + /** + * Returns true if the pair of locales matches acceptably. + * This is influenced by Builder options such as setDirection(), setFavorSubtag(), + * and setMaxDistance(). + * + * @param desired The desired locale. + * @param supported The supported locale. + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return true if the pair of locales matches acceptably. + * @draft ICU 68 + */ + UBool isMatch(const Locale &desired, const Locale &supported, UErrorCode &errorCode) const; #endif // U_HIDE_DRAFT_API #ifndef U_HIDE_INTERNAL_API @@ -660,6 +716,5 @@ private: U_NAMESPACE_END -#endif // U_FORCE_HIDE_DRAFT_API #endif // U_SHOW_CPLUSPLUS_API #endif // __LOCALEMATCHER_H__ diff --git a/intl/icu/source/common/unicode/localpointer.h b/intl/icu/source/common/unicode/localpointer.h index 61c3020918e5..2a65f2d382d2 100644 --- a/intl/icu/source/common/unicode/localpointer.h +++ b/intl/icu/source/common/unicode/localpointer.h @@ -88,13 +88,13 @@ public: ~LocalPointerBase() { /* delete ptr; */ } /** * NULL check. - * @return TRUE if ==NULL + * @return true if ==NULL * @stable ICU 4.4 */ UBool isNull() const { return ptr==NULL; } /** * NULL check. - * @return TRUE if !=NULL + * @return true if !=NULL * @stable ICU 4.4 */ UBool isValid() const { return ptr!=NULL; } diff --git a/intl/icu/source/common/unicode/locid.h b/intl/icu/source/common/unicode/locid.h index 1d031daabc5f..ba858d702af9 100644 --- a/intl/icu/source/common/unicode/locid.h +++ b/intl/icu/source/common/unicode/locid.h @@ -253,7 +253,7 @@ public: /** * Construct a locale from language, country, variant. * If an error occurs, then the constructed object will be "bogus" - * (isBogus() will return TRUE). + * (isBogus() will return true). * * @param language Lowercase two-letter or three-letter ISO-639 code. * This parameter can instead be an ICU style C locale (e.g. "en_US"), @@ -393,13 +393,17 @@ public: * If the specified language tag contains any ill-formed subtags, * the first such subtag and all following subtags are ignored. *

- * This implements the 'Language-Tag' production of BCP47, and so - * supports grandfathered (regular and irregular) as well as private - * use language tags. Private use tags are represented as 'x-whatever', - * and grandfathered tags are converted to their canonical replacements - * where they exist. Note that a few grandfathered tags have no modern - * replacement, these will be converted using the fallback described in + * This implements the 'Language-Tag' production of BCP 47, and so + * supports legacy language tags (marked as “Type: grandfathered” in BCP 47) + * (regular and irregular) as well as private use language tags. + * + * Private use tags are represented as 'x-whatever', + * and legacy tags are converted to their canonical replacements where they exist. + * + * Note that a few legacy tags have no modern replacement; + * these will be converted using the fallback described in * the first paragraph, so some information might be lost. + * * @param tag the input BCP47 language tag. * @param status error information if creating the Locale failed. * @return the Locale for the specified BCP47 language tag. @@ -795,14 +799,14 @@ public: /** * Returns whether this locale's script is written right-to-left. * If there is no script subtag, then the likely script is used, see uloc_addLikelySubtags(). - * If no likely script is known, then FALSE is returned. + * If no likely script is known, then false is returned. * * A script is right-to-left according to the CLDR script metadata * which corresponds to whether the script's letters have Bidi_Class=R or AL. * - * Returns TRUE for "ar" and "en-Hebr", FALSE for "zh" and "fa-Cyrl". + * Returns true for "ar" and "en-Hebr", false for "zh" and "fa-Cyrl". * - * @return TRUE if the locale's script is written right-to-left + * @return true if the locale's script is written right-to-left * @stable ICU 54 */ UBool isRightToLeft() const; @@ -956,7 +960,7 @@ public: /** * Gets the bogus state. Locale object can be bogus if it doesn't exist - * @return FALSE if it is a real locale, TRUE if it is a bogus locale + * @return false if it is a real locale, true if it is a bogus locale * @stable ICU 2.1 */ inline UBool isBogus(void) const; @@ -1005,32 +1009,31 @@ public: */ virtual UClassID getDynamicClassID() const; -#ifndef U_HIDE_DRAFT_API /** * A Locale iterator interface similar to a Java Iterator. - * @draft ICU 65 + * @stable ICU 65 */ class U_COMMON_API Iterator /* not : public UObject because this is an interface/mixin class */ { public: - /** @draft ICU 65 */ + /** @stable ICU 65 */ virtual ~Iterator(); /** - * @return TRUE if next() can be called again. - * @draft ICU 65 + * @return true if next() can be called again. + * @stable ICU 65 */ virtual UBool hasNext() const = 0; /** * @return the next locale. - * @draft ICU 65 + * @stable ICU 65 */ virtual const Locale &next() = 0; }; /** * A generic Locale iterator implementation over Locale input iterators. - * @draft ICU 65 + * @stable ICU 65 */ template class RangeIterator : public Iterator, public UMemory { @@ -1042,19 +1045,19 @@ public: * * @param begin Start of range. * @param end Exclusive end of range. - * @draft ICU 65 + * @stable ICU 65 */ RangeIterator(Iter begin, Iter end) : it_(begin), end_(end) {} /** - * @return TRUE if next() can be called again. - * @draft ICU 65 + * @return true if next() can be called again. + * @stable ICU 65 */ UBool hasNext() const override { return it_ != end_; } /** * @return the next locale. - * @draft ICU 65 + * @stable ICU 65 */ const Locale &next() override { return *it_++; } @@ -1066,7 +1069,7 @@ public: /** * A generic Locale iterator implementation over Locale input iterators. * Calls the converter to convert each *begin to a const Locale &. - * @draft ICU 65 + * @stable ICU 65 */ template class ConvertingIterator : public Iterator, public UMemory { @@ -1079,20 +1082,20 @@ public: * @param begin Start of range. * @param end Exclusive end of range. * @param converter Converter from *begin to const Locale & or compatible. - * @draft ICU 65 + * @stable ICU 65 */ ConvertingIterator(Iter begin, Iter end, Conv converter) : it_(begin), end_(end), converter_(converter) {} /** - * @return TRUE if next() can be called again. - * @draft ICU 65 + * @return true if next() can be called again. + * @stable ICU 65 */ UBool hasNext() const override { return it_ != end_; } /** * @return the next locale. - * @draft ICU 65 + * @stable ICU 65 */ const Locale &next() override { return converter_(*it_++); } @@ -1101,7 +1104,6 @@ public: const Iter end_; Conv converter_; }; -#endif // U_HIDE_DRAFT_API protected: /* only protected for testing purposes. DO NOT USE. */ #ifndef U_HIDE_INTERNAL_API diff --git a/intl/icu/source/common/unicode/messagepattern.h b/intl/icu/source/common/unicode/messagepattern.h index 04f00a8757d7..98e7b70b1fcc 100644 --- a/intl/icu/source/common/unicode/messagepattern.h +++ b/intl/icu/source/common/unicode/messagepattern.h @@ -265,7 +265,7 @@ typedef enum UMessagePatternArgType UMessagePatternArgType; /** * \def UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE - * Returns TRUE if the argument type has a plural style part sequence and semantics, + * 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. * @stable ICU 50 */ @@ -523,14 +523,14 @@ public: /** * @param other another object to compare with. - * @return TRUE if this object is equivalent to the other one. + * @return true if this object is equivalent to the other one. * @stable ICU 4.8 */ UBool operator==(const MessagePattern &other) const; /** * @param other another object to compare with. - * @return FALSE if this object is equivalent to the other one. + * @return false if this object is equivalent to the other one. * @stable ICU 4.8 */ inline UBool operator!=(const MessagePattern &other) const { @@ -564,7 +564,7 @@ public: /** * Does the parsed pattern have named arguments like {first_name}? - * @return TRUE if the parsed pattern has at least one named argument. + * @return true if the parsed pattern has at least one named argument. * @stable ICU 4.8 */ UBool hasNamedArguments() const { @@ -573,7 +573,7 @@ public: /** * Does the parsed pattern have numbered arguments like {2}? - * @return TRUE if the parsed pattern has at least one numbered argument. + * @return true if the parsed pattern has at least one numbered argument. * @stable ICU 4.8 */ UBool hasNumberedArguments() const { @@ -664,7 +664,7 @@ public: * Compares the part's substring with the input string s. * @param part a part of this MessagePattern. * @param s a string. - * @return TRUE if getSubstring(part).equals(s). + * @return true if getSubstring(part).equals(s). * @stable ICU 4.8 */ UBool partSubstringMatches(const Part &part, const UnicodeString &s) const { @@ -785,7 +785,7 @@ public: * Indicates whether the Part type has a numeric value. * If so, then that numeric value can be retrieved via MessagePattern.getNumericValue(). * @param type The Part type to be tested. - * @return TRUE if the Part type has a numeric value. + * @return true if the Part type has a numeric value. * @stable ICU 4.8 */ static UBool hasNumericValue(UMessagePatternPartType type) { @@ -794,14 +794,14 @@ public: /** * @param other another object to compare with. - * @return TRUE if this object is equivalent to the other one. + * @return true if this object is equivalent to the other one. * @stable ICU 4.8 */ UBool operator==(const Part &other) const; /** * @param other another object to compare with. - * @return FALSE if this object is equivalent to the other one. + * @return false if this object is equivalent to the other one. * @stable ICU 4.8 */ inline UBool operator!=(const Part &other) const { @@ -869,7 +869,7 @@ private: * Parses a number from the specified message substring. * @param start start index into the message string * @param limit limit index into the message string, must be startFALSE, only canonical + * If this argument is false, only canonical * decomposition will be performed. * @param options the optional features to be enabled (0 for no options) * @param result The composed string (on output). @@ -256,7 +256,7 @@ public: * * @param source the string to be decomposed. * @param compat Perform compatibility decomposition. - * If this argument is FALSE, only canonical + * If this argument is false, only canonical * decomposition will be performed. * @param options the optional features to be enabled (0 for no options) * @param result The decomposed string (on output). @@ -315,7 +315,7 @@ public: * never a "maybe". * For NFD, NFKD, and FCD, both functions work exactly the same. * For NFC and NFKC where quickCheck may return "maybe", this function will - * perform further tests to arrive at a TRUE/FALSE result. + * perform further tests to arrive at a true/false result. * * @param src String that is to be tested if it is in a normalization format. * @param mode Which normalization form to test for. @@ -577,7 +577,7 @@ public: int32_t endIndex(void) const; /** - * Returns TRUE when both iterators refer to the same character in the same + * Returns true when both iterators refer to the same character in the same * input text. * * @param that a Normalizer object to compare this one to @@ -587,7 +587,7 @@ public: UBool operator==(const Normalizer& that) const; /** - * Returns FALSE when both iterators refer to the same character in the same + * Returns false when both iterators refer to the same character in the same * input text. * * @param that a Normalizer object to compare this one to @@ -655,8 +655,8 @@ public: * It is possible to specify multiple options that are all turned on or off. * * @param option the option(s) whose value is/are to be set. - * @param value the new setting for the option. Use TRUE to - * turn the option(s) on and FALSE to turn it/them off. + * @param value the new setting for the option. Use true to + * turn the option(s) on and false to turn it/them off. * * @see #getOption * @deprecated ICU 56 Use Normalizer2 instead. @@ -666,11 +666,11 @@ public: /** * Determine whether an option is turned on or off. - * If multiple options are specified, then the result is TRUE if any + * If multiple options are specified, then the result is true if any * of them are set. *

* @param option the option(s) that are to be checked - * @return TRUE if any of the option(s) are set + * @return true if any of the option(s) are set * @see #setOption * @deprecated ICU 56 Use Normalizer2 instead. */ diff --git a/intl/icu/source/common/unicode/parsepos.h b/intl/icu/source/common/unicode/parsepos.h index 909d288d48d0..260ed4cbb86e 100644 --- a/intl/icu/source/common/unicode/parsepos.h +++ b/intl/icu/source/common/unicode/parsepos.h @@ -97,14 +97,14 @@ public: /** * Equality operator. - * @return TRUE if the two parse positions are equal, FALSE otherwise. + * @return true if the two parse positions are equal, false otherwise. * @stable ICU 2.0 */ inline UBool operator==(const ParsePosition& that) const; /** * Equality operator. - * @return TRUE if the two parse positions are not equal, FALSE otherwise. + * @return true if the two parse positions are not equal, false otherwise. * @stable ICU 2.0 */ inline UBool operator!=(const ParsePosition& that) const; @@ -196,9 +196,9 @@ inline UBool ParsePosition::operator==(const ParsePosition& copy) const { if(index != copy.index || errorIndex != copy.errorIndex) - return FALSE; + return false; else - return TRUE; + return true; } inline UBool diff --git a/intl/icu/source/common/unicode/putil.h b/intl/icu/source/common/unicode/putil.h index 759b136c13e4..500c21252fc2 100644 --- a/intl/icu/source/common/unicode/putil.h +++ b/intl/icu/source/common/unicode/putil.h @@ -66,7 +66,7 @@ * * @stable ICU 2.0 */ -U_STABLE const char* U_EXPORT2 u_getDataDirectory(void); +U_CAPI const char* U_EXPORT2 u_getDataDirectory(void); /** @@ -88,7 +88,7 @@ U_STABLE const char* U_EXPORT2 u_getDataDirectory(void); * @see u_init * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory); +U_CAPI void U_EXPORT2 u_setDataDirectory(const char *directory); #ifndef U_HIDE_INTERNAL_API /** @@ -99,7 +99,7 @@ U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory); * @return the time zone data override directory. * @internal */ -U_INTERNAL const char * U_EXPORT2 u_getTimeZoneFilesDirectory(UErrorCode *status); +U_CAPI const char * U_EXPORT2 u_getTimeZoneFilesDirectory(UErrorCode *status); /** * Set the time zone files override directory. @@ -109,7 +109,7 @@ U_INTERNAL const char * U_EXPORT2 u_getTimeZoneFilesDirectory(UErrorCode *status * will access the time zone data. * @internal */ -U_INTERNAL void U_EXPORT2 u_setTimeZoneFilesDirectory(const char *path, UErrorCode *status); +U_CAPI void U_EXPORT2 u_setTimeZoneFilesDirectory(const char *path, UErrorCode *status); #endif /* U_HIDE_INTERNAL_API */ @@ -155,7 +155,7 @@ U_INTERNAL void U_EXPORT2 u_setTimeZoneFilesDirectory(const char *path, UErrorCo * @see U_CHARSET_FAMILY * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_charsToUChars(const char *cs, UChar *us, int32_t length); /** @@ -177,7 +177,7 @@ u_charsToUChars(const char *cs, UChar *us, int32_t length); * @see U_CHARSET_FAMILY * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_UCharsToChars(const UChar *us, char *cs, int32_t length); #endif diff --git a/intl/icu/source/common/unicode/rbbi.h b/intl/icu/source/common/unicode/rbbi.h index 7825f603a51c..65117f616cdf 100644 --- a/intl/icu/source/common/unicode/rbbi.h +++ b/intl/icu/source/common/unicode/rbbi.h @@ -32,6 +32,8 @@ #include "unicode/parseerr.h" #include "unicode/schriter.h" +struct UCPTrie; + U_NAMESPACE_BEGIN /** @internal */ @@ -140,6 +142,11 @@ private: */ UBool fDone; + /** + * Array of look-ahead tentative results. + */ + int32_t *fLookAheadMatches; + //======================================================================= // constructors //======================================================================= @@ -246,20 +253,20 @@ public: RuleBasedBreakIterator& operator=(const RuleBasedBreakIterator& that); /** - * Equality operator. Returns TRUE if both BreakIterators are of the + * Equality operator. Returns true if both BreakIterators are of the * same class, have the same behavior, and iterate over the same text. * @param that The BreakIterator to be compared for equality - * @return TRUE if both BreakIterators are of the + * @return true if both BreakIterators are of the * same class, have the same behavior, and iterate over the same text. * @stable ICU 2.0 */ virtual UBool operator==(const BreakIterator& that) const; /** - * Not-equal operator. If operator== returns TRUE, this returns FALSE, + * Not-equal operator. If operator== returns true, this returns false, * and vice versa. * @param that The BreakIterator to be compared for inequality - * @return TRUE if both BreakIterators are not same. + * @return true if both BreakIterators are not same. * @stable ICU 2.0 */ inline UBool operator!=(const BreakIterator& that) const; @@ -659,6 +666,28 @@ private: */ int32_t handleNext(); + /* + * Templatized version of handleNext() and handleSafePrevious(). + * + * There will be exactly four instantiations, two each for 8 and 16 bit tables, + * two each for 8 and 16 bit trie. + * Having separate instantiations for the table types keeps conditional tests of + * the table type out of the inner loops, at the expense of replicated code. + * + * The template parameter for the Trie access function is a value, not a type. + * Doing it this way, the compiler will inline the Trie function in the + * expanded functions. (Both the 8 and 16 bit access functions have the same type + * signature) + */ + + typedef uint16_t (*PTrieFunc)(const UCPTrie *, UChar32); + + template + int32_t handleSafePrevious(int32_t fromPosition); + + template + int32_t handleNext(); + /** * This function returns the appropriate LanguageBreakEngine for a @@ -681,7 +710,6 @@ private: * @internal */ void dumpTables(); - #endif /* U_HIDE_INTERNAL_API */ }; diff --git a/intl/icu/source/common/unicode/resbund.h b/intl/icu/source/common/unicode/resbund.h index 289406752872..37738e277b56 100644 --- a/intl/icu/source/common/unicode/resbund.h +++ b/intl/icu/source/common/unicode/resbund.h @@ -286,7 +286,7 @@ public: /** * Checks whether the resource has another element to iterate over. * - * @return TRUE if there are more elements, FALSE if there is no more elements + * @return true if there are more elements, false if there is no more elements * @stable ICU 2.0 */ UBool diff --git a/intl/icu/source/common/unicode/simpleformatter.h b/intl/icu/source/common/unicode/simpleformatter.h index 9414bca3085a..6d9c04ace235 100644 --- a/intl/icu/source/common/unicode/simpleformatter.h +++ b/intl/icu/source/common/unicode/simpleformatter.h @@ -125,7 +125,7 @@ public: * @param errorCode ICU error code in/out parameter. * Must fulfill U_SUCCESS before the function call. * Set to U_ILLEGAL_ARGUMENT_ERROR for bad argument syntax. - * @return TRUE if U_SUCCESS(errorCode). + * @return true if U_SUCCESS(errorCode). * @stable ICU 57 */ UBool applyPattern(const UnicodeString &pattern, UErrorCode &errorCode) { @@ -144,7 +144,7 @@ public: * Must fulfill U_SUCCESS before the function call. * Set to U_ILLEGAL_ARGUMENT_ERROR for bad argument syntax and * too few or too many arguments. - * @return TRUE if U_SUCCESS(errorCode). + * @return true if U_SUCCESS(errorCode). * @stable ICU 57 */ UBool applyPatternMinMaxArguments(const UnicodeString &pattern, diff --git a/intl/icu/source/common/unicode/strenum.h b/intl/icu/source/common/unicode/strenum.h index 8601f1f7c401..df72b4b7e849 100644 --- a/intl/icu/source/common/unicode/strenum.h +++ b/intl/icu/source/common/unicode/strenum.h @@ -196,7 +196,7 @@ public: * Compares this enumeration to other to check if both are equal * * @param that The other string enumeration to compare this object to - * @return TRUE if the enumerations are equal. FALSE if not. + * @return true if the enumerations are equal. false if not. * @stable ICU 3.6 */ virtual UBool operator==(const StringEnumeration& that)const; @@ -204,7 +204,7 @@ public: * Compares this enumeration to other to check if both are not equal * * @param that The other string enumeration to compare this object to - * @return TRUE if the enumerations are equal. FALSE if not. + * @return true if the enumerations are equal. false if not. * @stable ICU 3.6 */ virtual UBool operator!=(const StringEnumeration& that)const; diff --git a/intl/icu/source/common/unicode/stringpiece.h b/intl/icu/source/common/unicode/stringpiece.h index 52c1e9ebd241..7d7d871e1f78 100644 --- a/intl/icu/source/common/unicode/stringpiece.h +++ b/intl/icu/source/common/unicode/stringpiece.h @@ -111,7 +111,6 @@ class U_COMMON_API StringPiece : public UMemory { #endif #endif // U_HIDE_DRAFT_API -#ifndef U_HIDE_DRAFT_API /** * Constructs from some other implementation of a string piece class, from any * C++ record type that has these two methods: @@ -132,7 +131,7 @@ class U_COMMON_API StringPiece : public UMemory { * as from std::u8string_view. * * @param str the other string piece - * @draft ICU 65 + * @stable ICU 65 */ template (str.data())), length_(static_cast(str.size())) {} -#endif // U_HIDE_DRAFT_API /** * Constructs from a const char * pointer and a specified length. @@ -209,7 +207,7 @@ class U_COMMON_API StringPiece : public UMemory { int32_t length() const { return length_; } /** * Returns whether the string is empty. - * @return TRUE if the string is empty + * @return true if the string is empty * @stable ICU 4.2 */ UBool empty() const { return length_ == 0; } @@ -331,7 +329,7 @@ class U_COMMON_API StringPiece : public UMemory { * Global operator == for StringPiece * @param x The first StringPiece to compare. * @param y The second StringPiece to compare. - * @return TRUE if the string data is equal + * @return true if the string data is equal * @stable ICU 4.8 */ U_EXPORT UBool U_EXPORT2 @@ -341,7 +339,7 @@ operator==(const StringPiece& x, const StringPiece& y); * Global operator != for StringPiece * @param x The first StringPiece to compare. * @param y The second StringPiece to compare. - * @return TRUE if the string data is not equal + * @return true if the string data is not equal * @stable ICU 4.8 */ inline UBool operator!=(const StringPiece& x, const StringPiece& y) { diff --git a/intl/icu/source/common/unicode/stringtriebuilder.h b/intl/icu/source/common/unicode/stringtriebuilder.h index 2c47dd415b18..fe471bbbf9c7 100644 --- a/intl/icu/source/common/unicode/stringtriebuilder.h +++ b/intl/icu/source/common/unicode/stringtriebuilder.h @@ -279,10 +279,10 @@ protected: */ class ValueNode : public Node { public: - ValueNode(int32_t initialHash) : Node(initialHash), hasValue(FALSE), value(0) {} + ValueNode(int32_t initialHash) : Node(initialHash), hasValue(false), value(0) {} virtual UBool operator==(const Node &other) const; void setValue(int32_t v) { - hasValue=TRUE; + hasValue=true; value=v; hash=hash*37u+v; } diff --git a/intl/icu/source/common/unicode/ubidi.h b/intl/icu/source/common/unicode/ubidi.h index f4875c8801ef..63d0e45cb7f3 100644 --- a/intl/icu/source/common/unicode/ubidi.h +++ b/intl/icu/source/common/unicode/ubidi.h @@ -21,7 +21,10 @@ #include "unicode/utypes.h" #include "unicode/uchar.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API /** *\file @@ -496,7 +499,7 @@ typedef struct UBiDi UBiDi; * @return An empty UBiDi object. * @stable ICU 2.0 */ -U_STABLE UBiDi * U_EXPORT2 +U_CAPI UBiDi * U_EXPORT2 ubidi_open(void); /** @@ -533,7 +536,7 @@ ubidi_open(void); * @return An empty UBiDi object with preallocated memory. * @stable ICU 2.0 */ -U_STABLE UBiDi * U_EXPORT2 +U_CAPI UBiDi * U_EXPORT2 ubidi_openSized(int32_t maxLength, int32_t maxRunCount, UErrorCode *pErrorCode); /** @@ -556,7 +559,7 @@ ubidi_openSized(int32_t maxLength, int32_t maxRunCount, UErrorCode *pErrorCode); * @see ubidi_setLine * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_close(UBiDi *pBiDi); #if U_SHOW_CPLUSPLUS_API @@ -594,7 +597,7 @@ U_NAMESPACE_END * this "inverse Bidi" and that the current implementation provides only an * approximation of "inverse Bidi".

* - *

With isInverse set to TRUE, + *

With isInverse set to true, * this function changes the behavior of some of the subsequent functions * in a way that they can be used for the inverse Bidi algorithm. * Specifically, runs of text with numeric characters will be treated in a @@ -607,12 +610,12 @@ U_NAMESPACE_END * the runs of the logically ordered output.

* *

Calling this function with argument isInverse set to - * TRUE is equivalent to calling + * true is equivalent to calling * ubidi_setReorderingMode with argument * reorderingMode * set to #UBIDI_REORDER_INVERSE_NUMBERS_AS_L.
* Calling this function with argument isInverse set to - * FALSE is equivalent to calling + * false is equivalent to calling * ubidi_setReorderingMode with argument * reorderingMode * set to #UBIDI_REORDER_DEFAULT. @@ -626,18 +629,18 @@ U_NAMESPACE_END * @see ubidi_setReorderingMode * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setInverse(UBiDi *pBiDi, UBool isInverse); /** * Is this Bidi object set to perform the inverse Bidi algorithm? *

Note: calling this function after setting the reordering mode with - * ubidi_setReorderingMode will return TRUE if the + * ubidi_setReorderingMode will return true if the * reordering mode was set to #UBIDI_REORDER_INVERSE_NUMBERS_AS_L, - * FALSE for all other values.

+ * false for all other values.

* * @param pBiDi is a UBiDi object. - * @return TRUE if the Bidi object is set to perform the inverse Bidi algorithm + * @return true if the Bidi object is set to perform the inverse Bidi algorithm * by handling numbers as L. * * @see ubidi_setInverse @@ -645,7 +648,7 @@ ubidi_setInverse(UBiDi *pBiDi, UBool isInverse); * @stable ICU 2.0 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ubidi_isInverse(UBiDi *pBiDi); /** @@ -668,7 +671,7 @@ ubidi_isInverse(UBiDi *pBiDi); * @see ubidi_setPara * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_orderParagraphsLTR(UBiDi *pBiDi, UBool orderParagraphsLTR); /** @@ -676,13 +679,13 @@ ubidi_orderParagraphsLTR(UBiDi *pBiDi, UBool orderParagraphsLTR); * successive paragraphs progress from left to right? * * @param pBiDi is a UBiDi object. - * @return TRUE if the Bidi object is set to allocate level 0 to block + * @return true if the Bidi object is set to allocate level 0 to block * separators. * * @see ubidi_orderParagraphsLTR * @stable ICU 3.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ubidi_isOrderParagraphsLTR(UBiDi *pBiDi); /** @@ -714,7 +717,7 @@ typedef enum UBiDiReorderingMode { * @stable ICU 3.6 */ UBIDI_REORDER_RUNS_ONLY, /** Visual to Logical algorithm which handles numbers like L - * (same algorithm as selected by ubidi_setInverse(TRUE). + * (same algorithm as selected by ubidi_setInverse(true). * @see ubidi_setInverse * @stable ICU 3.6 */ UBIDI_REORDER_INVERSE_NUMBERS_AS_L, @@ -833,7 +836,7 @@ typedef enum UBiDiReorderingMode { * reordered sequence (the option #UBIDI_INSERT_LRM_FOR_NUMERIC can * be used with function ubidi_writeReordered to this end. This * mode is equivalent to calling ubidi_setInverse() with - * argument isInverse set to TRUE. + * argument isInverse set to true. * *
  • When the reordering mode is set to * #UBIDI_REORDER_INVERSE_LIKE_DIRECT, the "direct" Logical to Visual @@ -886,7 +889,7 @@ typedef enum UBiDiReorderingMode { * @see ubidi_writeReordered * @stable ICU 3.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode); /** @@ -897,7 +900,7 @@ ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode); * @see ubidi_setReorderingMode * @stable ICU 3.6 */ -U_STABLE UBiDiReorderingMode U_EXPORT2 +U_CAPI UBiDiReorderingMode U_EXPORT2 ubidi_getReorderingMode(UBiDi *pBiDi); /** @@ -935,7 +938,7 @@ typedef enum UBiDiReorderingOption { * *

    If this option is set in conjunction with reordering mode * #UBIDI_REORDER_INVERSE_NUMBERS_AS_L or with calling - * ubidi_setInverse(TRUE), it implies + * ubidi_setInverse(true), it implies * option #UBIDI_INSERT_LRM_FOR_NUMERIC * in calls to function ubidi_writeReordered().

    * @@ -1016,7 +1019,7 @@ typedef enum UBiDiReorderingOption { * *

    When the UBIDI_OPTION_STREAMING option is used, * it is recommended to call ubidi_orderParagraphsLTR() with - * argument orderParagraphsLTR set to TRUE before + * argument orderParagraphsLTR set to true before * calling ubidi_setPara so that later paragraphs may be * concatenated to previous paragraphs on the right.

    * @@ -1042,7 +1045,7 @@ typedef enum UBiDiReorderingOption { * @see ubidi_getReorderingOptions * @stable ICU 3.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions); /** @@ -1053,7 +1056,7 @@ ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions); * @see ubidi_setReorderingOptions * @stable ICU 3.6 */ -U_STABLE uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 ubidi_getReorderingOptions(UBiDi *pBiDi); /** @@ -1140,7 +1143,7 @@ ubidi_getReorderingOptions(UBiDi *pBiDi); * @see ubidi_setPara * @stable ICU 4.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setContext(UBiDi *pBiDi, const UChar *prologue, int32_t proLength, const UChar *epilogue, int32_t epiLength, @@ -1228,7 +1231,7 @@ ubidi_setContext(UBiDi *pBiDi, * @param pErrorCode must be a valid pointer to an error code value. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels, UErrorCode *pErrorCode); @@ -1279,7 +1282,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, * @see ubidi_getProcessedLength * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setLine(const UBiDi *pParaBiDi, int32_t start, int32_t limit, UBiDi *pLineBiDi, @@ -1300,7 +1303,7 @@ ubidi_setLine(const UBiDi *pParaBiDi, * @see UBiDiDirection * @stable ICU 2.0 */ -U_STABLE UBiDiDirection U_EXPORT2 +U_CAPI UBiDiDirection U_EXPORT2 ubidi_getDirection(const UBiDi *pBiDi); /** @@ -1330,7 +1333,7 @@ ubidi_getDirection(const UBiDi *pBiDi); * @see UBiDiDirection * @stable ICU 4.6 */ -U_STABLE UBiDiDirection U_EXPORT2 +U_CAPI UBiDiDirection U_EXPORT2 ubidi_getBaseDirection(const UChar *text, int32_t length ); /** @@ -1344,7 +1347,7 @@ ubidi_getBaseDirection(const UChar *text, int32_t length ); * @see ubidi_setLine * @stable ICU 2.0 */ -U_STABLE const UChar * U_EXPORT2 +U_CAPI const UChar * U_EXPORT2 ubidi_getText(const UBiDi *pBiDi); /** @@ -1355,7 +1358,7 @@ ubidi_getText(const UBiDi *pBiDi); * @return The length of the text that the UBiDi object was created for. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getLength(const UBiDi *pBiDi); /** @@ -1373,7 +1376,7 @@ ubidi_getLength(const UBiDi *pBiDi); * @see ubidi_getParagraphByIndex * @stable ICU 2.0 */ -U_STABLE UBiDiLevel U_EXPORT2 +U_CAPI UBiDiLevel U_EXPORT2 ubidi_getParaLevel(const UBiDi *pBiDi); /** @@ -1384,7 +1387,7 @@ ubidi_getParaLevel(const UBiDi *pBiDi); * @return The number of paragraphs. * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_countParagraphs(UBiDi *pBiDi); /** @@ -1421,7 +1424,7 @@ ubidi_countParagraphs(UBiDi *pBiDi); * @see ubidi_getProcessedLength * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getParagraph(const UBiDi *pBiDi, int32_t charIndex, int32_t *pParaStart, int32_t *pParaLimit, UBiDiLevel *pParaLevel, UErrorCode *pErrorCode); @@ -1453,7 +1456,7 @@ ubidi_getParagraph(const UBiDi *pBiDi, int32_t charIndex, int32_t *pParaStart, * * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_getParagraphByIndex(const UBiDi *pBiDi, int32_t paraIndex, int32_t *pParaStart, int32_t *pParaLimit, UBiDiLevel *pParaLevel, UErrorCode *pErrorCode); @@ -1473,7 +1476,7 @@ ubidi_getParagraphByIndex(const UBiDi *pBiDi, int32_t paraIndex, * @see ubidi_getProcessedLength * @stable ICU 2.0 */ -U_STABLE UBiDiLevel U_EXPORT2 +U_CAPI UBiDiLevel U_EXPORT2 ubidi_getLevelAt(const UBiDi *pBiDi, int32_t charIndex); /** @@ -1494,7 +1497,7 @@ ubidi_getLevelAt(const UBiDi *pBiDi, int32_t charIndex); * @see ubidi_getProcessedLength * @stable ICU 2.0 */ -U_STABLE const UBiDiLevel * U_EXPORT2 +U_CAPI const UBiDiLevel * U_EXPORT2 ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode); /** @@ -1521,7 +1524,7 @@ ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode); * @see ubidi_getProcessedLength * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_getLogicalRun(const UBiDi *pBiDi, int32_t logicalPosition, int32_t *pLogicalLimit, UBiDiLevel *pLevel); @@ -1540,7 +1543,7 @@ ubidi_getLogicalRun(const UBiDi *pBiDi, int32_t logicalPosition, * @return The number of runs. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode); /** @@ -1599,7 +1602,7 @@ ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode); * to avoid these issues. * @stable ICU 2.0 */ -U_STABLE UBiDiDirection U_EXPORT2 +U_CAPI UBiDiDirection U_EXPORT2 ubidi_getVisualRun(UBiDi *pBiDi, int32_t runIndex, int32_t *pLogicalStart, int32_t *pLength); @@ -1640,7 +1643,7 @@ ubidi_getVisualRun(UBiDi *pBiDi, int32_t runIndex, * @see ubidi_getProcessedLength * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getVisualIndex(UBiDi *pBiDi, int32_t logicalIndex, UErrorCode *pErrorCode); /** @@ -1675,7 +1678,7 @@ ubidi_getVisualIndex(UBiDi *pBiDi, int32_t logicalIndex, UErrorCode *pErrorCode) * @see ubidi_getResultLength * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getLogicalIndex(UBiDi *pBiDi, int32_t visualIndex, UErrorCode *pErrorCode); /** @@ -1718,7 +1721,7 @@ ubidi_getLogicalIndex(UBiDi *pBiDi, int32_t visualIndex, UErrorCode *pErrorCode) * @see ubidi_getResultLength * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_getLogicalMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode); /** @@ -1754,7 +1757,7 @@ ubidi_getLogicalMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode); * @see ubidi_getResultLength * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_getVisualMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode); /** @@ -1777,7 +1780,7 @@ ubidi_getVisualMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode); * The index map will result in indexMap[logicalIndex]==visualIndex. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_reorderLogical(const UBiDiLevel *levels, int32_t length, int32_t *indexMap); /** @@ -1800,7 +1803,7 @@ ubidi_reorderLogical(const UBiDiLevel *levels, int32_t length, int32_t *indexMap * The index map will result in indexMap[visualIndex]==logicalIndex. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_reorderVisual(const UBiDiLevel *levels, int32_t length, int32_t *indexMap); /** @@ -1835,7 +1838,7 @@ ubidi_reorderVisual(const UBiDiLevel *levels, int32_t length, int32_t *indexMap) * @see UBIDI_MAP_NOWHERE * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length); /** option flags for ubidi_writeReordered() */ @@ -1940,7 +1943,7 @@ ubidi_invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length); * @see UBIDI_OPTION_STREAMING * @stable ICU 3.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getProcessedLength(const UBiDi *pBiDi); /** @@ -1970,7 +1973,7 @@ ubidi_getProcessedLength(const UBiDi *pBiDi); * @see UBIDI_OPTION_REMOVE_CONTROLS * @stable ICU 3.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getResultLength(const UBiDi *pBiDi); U_CDECL_BEGIN @@ -2028,7 +2031,7 @@ U_CDECL_END * @see UBiDiClassCallback * @stable ICU 3.6 */ -U_STABLE UCharDirection U_EXPORT2 +U_CAPI UCharDirection U_EXPORT2 ubidi_getCustomizedClass(UBiDi *pBiDi, UChar32 c); /** @@ -2058,7 +2061,7 @@ ubidi_getCustomizedClass(UBiDi *pBiDi, UChar32 c); * @see ubidi_getClassCallback * @stable ICU 3.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn, const void *newContext, UBiDiClassCallback **oldFn, const void **oldContext, UErrorCode *pErrorCode); @@ -2075,7 +2078,7 @@ ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn, * @see ubidi_setClassCallback * @stable ICU 3.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubidi_getClassCallback(UBiDi *pBiDi, UBiDiClassCallback **fn, const void **context); /** @@ -2143,7 +2146,7 @@ ubidi_getClassCallback(UBiDi *pBiDi, UBiDiClassCallback **fn, const void **conte * @see ubidi_getProcessedLength * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_writeReordered(UBiDi *pBiDi, UChar *dest, int32_t destSize, uint16_t options, @@ -2195,7 +2198,7 @@ ubidi_writeReordered(UBiDi *pBiDi, * @return The length of the output string. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_writeReverse(const UChar *src, int32_t srcLength, UChar *dest, int32_t destSize, uint16_t options, diff --git a/intl/icu/source/common/unicode/ubiditransform.h b/intl/icu/source/common/unicode/ubiditransform.h index 5c08ed5df0fd..2dd7564010de 100644 --- a/intl/icu/source/common/unicode/ubiditransform.h +++ b/intl/icu/source/common/unicode/ubiditransform.h @@ -21,7 +21,10 @@ #include "unicode/utypes.h" #include "unicode/ubidi.h" #include "unicode/uchar.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API /** * \file @@ -147,10 +150,10 @@ typedef struct UBiDiTransform UBiDiTransform; * calling ubidi_setPara with * paraLevel == UBIDI_DEFAULT_RTL,
  • *
  • : this is equivalent to - * calling ubidi_setInverse(UBiDi*, TRUE) and then + * calling ubidi_setInverse(UBiDi*, true) and then * ubidi_setPara with paraLevel == UBIDI_LTR,
  • *
  • : this is equivalent to - * calling ubidi_setInverse(UBiDi*, TRUE) and then + * calling ubidi_setInverse(UBiDi*, true) and then * ubidi_setPara with paraLevel == UBIDI_RTL.
  • * * All combinations that involve the Visual RTL scheme are unsupported by @@ -245,7 +248,7 @@ typedef struct UBiDiTransform UBiDiTransform; * @see u_shapeArabic * @stable ICU 58 */ -U_STABLE uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 ubiditransform_transform(UBiDiTransform *pBiDiTransform, const UChar *src, int32_t srcLength, UChar *dest, int32_t destSize, @@ -291,14 +294,14 @@ ubiditransform_transform(UBiDiTransform *pBiDiTransform, * @return An empty UBiDiTransform object. * @stable ICU 58 */ -U_STABLE UBiDiTransform* U_EXPORT2 +U_CAPI UBiDiTransform* U_EXPORT2 ubiditransform_open(UErrorCode *pErrorCode); /** * Deallocates the given UBiDiTransform object. * @stable ICU 58 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubiditransform_close(UBiDiTransform *pBidiTransform); #if U_SHOW_CPLUSPLUS_API diff --git a/intl/icu/source/common/unicode/ubrk.h b/intl/icu/source/common/unicode/ubrk.h index 73c1553b2439..37189a85984b 100644 --- a/intl/icu/source/common/unicode/ubrk.h +++ b/intl/icu/source/common/unicode/ubrk.h @@ -13,7 +13,10 @@ #include "unicode/utypes.h" #include "unicode/uloc.h" #include "unicode/utext.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API /** * A text-break iterator. @@ -238,7 +241,7 @@ typedef enum USentenceBreakTag { * @see ubrk_openRules * @stable ICU 2.0 */ -U_STABLE UBreakIterator* U_EXPORT2 +U_CAPI UBreakIterator* U_EXPORT2 ubrk_open(UBreakIteratorType type, const char *locale, const UChar *text, @@ -260,7 +263,7 @@ ubrk_open(UBreakIteratorType type, * @see ubrk_open * @stable ICU 2.2 */ -U_STABLE UBreakIterator* U_EXPORT2 +U_CAPI UBreakIterator* U_EXPORT2 ubrk_openRules(const UChar *rules, int32_t rulesLength, const UChar *text, @@ -288,7 +291,7 @@ ubrk_openRules(const UChar *rules, * @see ubrk_getBinaryRules * @stable ICU 59 */ -U_STABLE UBreakIterator* U_EXPORT2 +U_CAPI UBreakIterator* U_EXPORT2 ubrk_openBinaryRules(const uint8_t *binaryRules, int32_t rulesLength, const UChar * text, int32_t textLength, UErrorCode * status); @@ -311,7 +314,7 @@ ubrk_openBinaryRules(const uint8_t *binaryRules, int32_t rulesLength, * @return pointer to the new clone * @stable ICU 2.0 */ -U_STABLE UBreakIterator * U_EXPORT2 +U_CAPI UBreakIterator * U_EXPORT2 ubrk_safeClone( const UBreakIterator *bi, void *stackBuffer, @@ -334,7 +337,7 @@ ubrk_safeClone( * @param bi The break iterator to close. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubrk_close(UBreakIterator *bi); #if U_SHOW_CPLUSPLUS_API @@ -368,7 +371,7 @@ U_NAMESPACE_END * @param status The error code * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubrk_setText(UBreakIterator* bi, const UChar* text, int32_t textLength, @@ -392,7 +395,7 @@ ubrk_setText(UBreakIterator* bi, * @param status The error code * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubrk_setUText(UBreakIterator* bi, UText* text, UErrorCode* status); @@ -407,7 +410,7 @@ ubrk_setUText(UBreakIterator* bi, * \ref ubrk_first, or \ref ubrk_last. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_current(const UBreakIterator *bi); /** @@ -419,7 +422,7 @@ ubrk_current(const UBreakIterator *bi); * @see ubrk_previous * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_next(UBreakIterator *bi); /** @@ -431,7 +434,7 @@ ubrk_next(UBreakIterator *bi); * @see ubrk_next * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_previous(UBreakIterator *bi); /** @@ -441,7 +444,7 @@ ubrk_previous(UBreakIterator *bi); * @see ubrk_last * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_first(UBreakIterator *bi); /** @@ -453,7 +456,7 @@ ubrk_first(UBreakIterator *bi); * @see ubrk_first * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_last(UBreakIterator *bi); /** @@ -465,7 +468,7 @@ ubrk_last(UBreakIterator *bi); * @see ubrk_following * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_preceding(UBreakIterator *bi, int32_t offset); @@ -478,7 +481,7 @@ ubrk_preceding(UBreakIterator *bi, * @see ubrk_preceding * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_following(UBreakIterator *bi, int32_t offset); @@ -491,7 +494,7 @@ ubrk_following(UBreakIterator *bi, * @see ubrk_countAvailable * @stable ICU 2.0 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 ubrk_getAvailable(int32_t index); /** @@ -502,7 +505,7 @@ ubrk_getAvailable(int32_t index); * @see ubrk_getAvailable * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_countAvailable(void); @@ -515,7 +518,7 @@ ubrk_countAvailable(void); * @return True if "offset" is a boundary position. * @stable ICU 2.0 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ubrk_isBoundary(UBreakIterator *bi, int32_t offset); /** @@ -527,7 +530,7 @@ ubrk_isBoundary(UBreakIterator *bi, int32_t offset); * For word break iterators, the possible values are defined in enum UWordBreak. * @stable ICU 2.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_getRuleStatus(UBreakIterator *bi); /** @@ -547,7 +550,7 @@ ubrk_getRuleStatus(UBreakIterator *bi); * the most recent boundary returned by the break iterator. * @stable ICU 3.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_getRuleStatusVec(UBreakIterator *bi, int32_t *fillInVec, int32_t capacity, UErrorCode *status); /** @@ -559,7 +562,7 @@ ubrk_getRuleStatusVec(UBreakIterator *bi, int32_t *fillInVec, int32_t capacity, * @return locale string * @stable ICU 2.8 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCode* status); /** @@ -587,7 +590,7 @@ ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCo * * @stable ICU 49 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ubrk_refreshUText(UBreakIterator *bi, UText *text, UErrorCode *status); @@ -618,7 +621,7 @@ ubrk_refreshUText(UBreakIterator *bi, * @see ubrk_openBinaryRules * @stable ICU 59 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_getBinaryRules(UBreakIterator *bi, uint8_t * binaryRules, int32_t rulesCapacity, UErrorCode * status); diff --git a/intl/icu/source/common/unicode/ucasemap.h b/intl/icu/source/common/unicode/ucasemap.h index 6b253e3d6384..d1c1b483ab33 100644 --- a/intl/icu/source/common/unicode/ucasemap.h +++ b/intl/icu/source/common/unicode/ucasemap.h @@ -22,10 +22,13 @@ #define __UCASEMAP_H__ #include "unicode/utypes.h" -#include "unicode/localpointer.h" #include "unicode/stringoptions.h" #include "unicode/ustring.h" +#if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API + /** * \file * \brief C API: Unicode case mapping functions using a UCaseMap service object. @@ -69,7 +72,7 @@ typedef struct UCaseMap UCaseMap; /**< C typedef for struct UCaseMap. @stable IC * @see U_TITLECASE_NO_BREAK_ADJUSTMENT * @stable ICU 3.4 */ -U_STABLE UCaseMap * U_EXPORT2 +U_CAPI UCaseMap * U_EXPORT2 ucasemap_open(const char *locale, uint32_t options, UErrorCode *pErrorCode); /** @@ -77,7 +80,7 @@ ucasemap_open(const char *locale, uint32_t options, UErrorCode *pErrorCode); * @param csm Object to be closed. * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucasemap_close(UCaseMap *csm); #if U_SHOW_CPLUSPLUS_API @@ -105,7 +108,7 @@ U_NAMESPACE_END * @return locale ID * @stable ICU 3.4 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ucasemap_getLocale(const UCaseMap *csm); /** @@ -114,7 +117,7 @@ ucasemap_getLocale(const UCaseMap *csm); * @return options bit set * @stable ICU 3.4 */ -U_STABLE uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 ucasemap_getOptions(const UCaseMap *csm); /** @@ -128,7 +131,7 @@ ucasemap_getOptions(const UCaseMap *csm); * @see ucasemap_open * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode); /** @@ -142,7 +145,7 @@ ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode); * @see ucasemap_open * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucasemap_setOptions(UCaseMap *csm, uint32_t options, UErrorCode *pErrorCode); #if !UCONFIG_NO_BREAK_ITERATION @@ -154,7 +157,7 @@ ucasemap_setOptions(UCaseMap *csm, uint32_t options, UErrorCode *pErrorCode); * @return titlecasing break iterator * @stable ICU 3.8 */ -U_STABLE const UBreakIterator * U_EXPORT2 +U_CAPI const UBreakIterator * U_EXPORT2 ucasemap_getBreakIterator(const UCaseMap *csm); /** @@ -177,7 +180,7 @@ ucasemap_getBreakIterator(const UCaseMap *csm); * @see ucasemap_utf8ToTitle * @stable ICU 3.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucasemap_setBreakIterator(UCaseMap *csm, UBreakIterator *iterToAdopt, UErrorCode *pErrorCode); /** @@ -226,7 +229,7 @@ ucasemap_setBreakIterator(UCaseMap *csm, UBreakIterator *iterToAdopt, UErrorCode * @see u_strToTitle * @stable ICU 3.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucasemap_toTitle(UCaseMap *csm, UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, @@ -257,7 +260,7 @@ ucasemap_toTitle(UCaseMap *csm, * @see u_strToLower * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucasemap_utf8ToLower(const UCaseMap *csm, char *dest, int32_t destCapacity, const char *src, int32_t srcLength, @@ -286,7 +289,7 @@ ucasemap_utf8ToLower(const UCaseMap *csm, * @see u_strToUpper * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucasemap_utf8ToUpper(const UCaseMap *csm, char *dest, int32_t destCapacity, const char *src, int32_t srcLength, @@ -338,7 +341,7 @@ ucasemap_utf8ToUpper(const UCaseMap *csm, * @see U_TITLECASE_NO_BREAK_ADJUSTMENT * @stable ICU 3.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucasemap_utf8ToTitle(UCaseMap *csm, char *dest, int32_t destCapacity, const char *src, int32_t srcLength, @@ -376,7 +379,7 @@ ucasemap_utf8ToTitle(UCaseMap *csm, * @see U_FOLD_CASE_EXCLUDE_SPECIAL_I * @stable ICU 3.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucasemap_utf8FoldCase(const UCaseMap *csm, char *dest, int32_t destCapacity, const char *src, int32_t srcLength, diff --git a/intl/icu/source/common/unicode/ucat.h b/intl/icu/source/common/unicode/ucat.h index 4d1ff3f6b28d..93850348fff3 100644 --- a/intl/icu/source/common/unicode/ucat.h +++ b/intl/icu/source/common/unicode/ucat.h @@ -103,7 +103,7 @@ typedef UResourceBundle* u_nl_catd; * * @stable ICU 2.6 */ -U_STABLE u_nl_catd U_EXPORT2 +U_CAPI u_nl_catd U_EXPORT2 u_catopen(const char* name, const char* locale, UErrorCode* ec); /** @@ -114,7 +114,7 @@ u_catopen(const char* name, const char* locale, UErrorCode* ec); * * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_catclose(u_nl_catd catd); /** @@ -149,7 +149,7 @@ u_catclose(u_nl_catd catd); * * @stable ICU 2.6 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num, const UChar* s, int32_t* len, UErrorCode* ec); diff --git a/intl/icu/source/common/unicode/uchar.h b/intl/icu/source/common/unicode/uchar.h index 3b55b2326dfc..1e0f82e706c4 100644 --- a/intl/icu/source/common/unicode/uchar.h +++ b/intl/icu/source/common/unicode/uchar.h @@ -80,7 +80,7 @@ U_CDECL_BEGIN * and the ICU User Guide chapter on Properties (http://icu-project.org/userguide/properties.html). * * Many properties are accessible via generic functions that take a UProperty selector. - * - u_hasBinaryProperty() returns a binary value (TRUE/FALSE) per property and code point. + * - u_hasBinaryProperty() returns a binary value (true/false) per property and code point. * - u_getIntPropertyValue() returns an integer value per property and code point. * For each supported enumerated or catalog property, there is * an enum type for all of the property's values, and @@ -2586,8 +2586,8 @@ typedef enum UVerticalOrientation { * @param c Code point to test. * @param which UProperty selector constant, identifies which binary property to check. * Must be UCHAR_BINARY_START<=which(remainingMatchLength_ + 2) << kState64RemainingShift) | @@ -123,14 +122,13 @@ public: * @see getState64 * @see resetToState * @see reset - * @draft ICU 65 + * @stable ICU 65 */ UCharsTrie &resetToState64(uint64_t state) { remainingMatchLength_ = static_cast(state >> kState64RemainingShift) - 2; pos_ = uchars_ + (state & kState64PosMask); return *this; } -#endif /* U_HIDE_DRAFT_API */ /** * UCharsTrie state object, for saving a trie's current state @@ -268,16 +266,16 @@ public: /** * Determines whether all strings reachable from the current state * map to the same value. - * @param uniqueValue Receives the unique value, if this function returns TRUE. + * @param uniqueValue Receives the unique value, if this function returns true. * (output-only) - * @return TRUE if all strings reachable from the current state + * @return true if all strings reachable from the current state * map to the same value. * @stable ICU 4.8 */ inline UBool hasUniqueValue(int32_t &uniqueValue) const { const char16_t *pos=pos_; // Skip the rest of a pending linear-match node. - return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, FALSE, uniqueValue); + return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue); } /** @@ -335,7 +333,7 @@ public: Iterator &reset(); /** - * @return TRUE if there are more elements. + * @return true if there are more elements. * @stable ICU 4.8 */ UBool hasNext() const; @@ -351,7 +349,7 @@ public: * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with * function chaining. (See User Guide for details.) - * @return TRUE if there is another element. + * @return true if there is another element. * @stable ICU 4.8 */ UBool next(UErrorCode &errorCode); @@ -371,7 +369,7 @@ public: UBool truncateAndStop() { pos_=NULL; value_=-1; // no real value for str - return TRUE; + return true; } const char16_t *branchNext(const char16_t *pos, int32_t length, UErrorCode &errorCode); diff --git a/intl/icu/source/common/unicode/ucharstriebuilder.h b/intl/icu/source/common/unicode/ucharstriebuilder.h index 540dcc047fd5..15657702f9d0 100644 --- a/intl/icu/source/common/unicode/ucharstriebuilder.h +++ b/intl/icu/source/common/unicode/ucharstriebuilder.h @@ -101,9 +101,10 @@ public: * Multiple calls to buildUnicodeString() set the UnicodeStrings to the * builder's same char16_t array, without rebuilding. * If buildUnicodeString() is called after build(), the trie will be - * re-serialized into a new array. - * If build() is called after buildUnicodeString(), the trie object will become - * the owner of the previously returned array. + * re-serialized into a new array (because build() passes on ownership). + * If build() is called after buildUnicodeString(), the trie object returned + * by build() will become the owner of the underlying data for the + * previously returned UnicodeString. * After clear() has been called, a new array will be used as well. * @param buildOption Build option, see UStringTrieBuildOption. * @param result A UnicodeString which will be set to the char16_t-serialized @@ -147,7 +148,7 @@ private: virtual int32_t skipElementsBySomeUnits(int32_t i, int32_t unitIndex, int32_t count) const; virtual int32_t indexOfElementWithNextUnit(int32_t i, int32_t unitIndex, char16_t unit) const; - virtual UBool matchNodesCanHaveValues() const { return TRUE; } + virtual UBool matchNodesCanHaveValues() const { return true; } virtual int32_t getMaxBranchLinearSubNodeLength() const { return UCharsTrie::kMaxBranchLinearSubNodeLength; } virtual int32_t getMinLinearMatch() const { return UCharsTrie::kMinLinearMatch; } diff --git a/intl/icu/source/common/unicode/uchriter.h b/intl/icu/source/common/unicode/uchriter.h index a485259b808f..f5083561a865 100644 --- a/intl/icu/source/common/unicode/uchriter.h +++ b/intl/icu/source/common/unicode/uchriter.h @@ -274,11 +274,11 @@ public: virtual UChar32 next32PostInc(void); /** - * Returns FALSE if there are no more code units or code points + * Returns false if there are no more code units or code points * at or after the current position in the iteration range. * This is used with nextPostInc() or next32PostInc() in forward * iteration. - * @return FALSE if there are no more code units or code points + * @return false if there are no more code units or code points * at or after the current position in the iteration range. * @stable ICU 2.0 */ @@ -303,11 +303,11 @@ public: virtual UChar32 previous32(void); /** - * Returns FALSE if there are no more code units or code points + * Returns false if there are no more code units or code points * before the current position in the iteration range. * This is used with previous() or previous32() in backward * iteration. - * @return FALSE if there are no more code units or code points + * @return false if there are no more code units or code points * before the current position in the iteration range. * @stable ICU 2.0 */ diff --git a/intl/icu/source/common/unicode/uclean.h b/intl/icu/source/common/unicode/uclean.h index 7cef6dba68b8..c2d920a16ef4 100644 --- a/intl/icu/source/common/unicode/uclean.h +++ b/intl/icu/source/common/unicode/uclean.h @@ -49,7 +49,7 @@ * * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_init(UErrorCode *status); #ifndef U_HIDE_SYSTEM_API @@ -98,7 +98,7 @@ u_init(UErrorCode *status); * @stable ICU 2.0 * @system */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_cleanup(void); U_CDECL_BEGIN @@ -148,7 +148,7 @@ typedef void U_CALLCONV UMemFreeFn (const void *context, void *mem); * @stable ICU 2.8 * @system */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_setMemoryFunctions(const void *context, UMemAllocFn * U_CALLCONV_FPTR a, UMemReallocFn * U_CALLCONV_FPTR r, UMemFreeFn * U_CALLCONV_FPTR f, UErrorCode *status); diff --git a/intl/icu/source/common/unicode/ucnv.h b/intl/icu/source/common/unicode/ucnv.h index ec7c5f350b49..58f271cfb5ad 100644 --- a/intl/icu/source/common/unicode/ucnv.h +++ b/intl/icu/source/common/unicode/ucnv.h @@ -51,7 +51,10 @@ #include "unicode/ucnv_err.h" #include "unicode/uenum.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API #if !defined(USET_DEFINED) && !defined(U_IN_DOXYGEN) @@ -308,7 +311,7 @@ U_CDECL_END * lexically follows name2. * @stable ICU 2.0 */ -U_STABLE int U_EXPORT2 +U_CAPI int U_EXPORT2 ucnv_compareNames(const char *name1, const char *name2); @@ -362,7 +365,7 @@ ucnv_compareNames(const char *name1, const char *name2); * @see ucnv_compareNames * @stable ICU 2.0 */ -U_STABLE UConverter* U_EXPORT2 +U_CAPI UConverter* U_EXPORT2 ucnv_open(const char *converterName, UErrorCode *err); @@ -392,7 +395,7 @@ ucnv_open(const char *converterName, UErrorCode *err); * @see ucnv_compareNames * @stable ICU 2.0 */ -U_STABLE UConverter* U_EXPORT2 +U_CAPI UConverter* U_EXPORT2 ucnv_openU(const UChar *name, UErrorCode *err); @@ -460,7 +463,7 @@ ucnv_openU(const UChar *name, * @see UConverterPlatform * @stable ICU 2.0 */ -U_STABLE UConverter* U_EXPORT2 +U_CAPI UConverter* U_EXPORT2 ucnv_openCCSID(int32_t codepage, UConverterPlatform platform, UErrorCode * err); @@ -476,7 +479,7 @@ ucnv_openCCSID(int32_t codepage, *

    The name will NOT be looked up in the alias mechanism, nor will the converter be * stored in the converter cache or the alias table. The only way to open further converters * is call this function multiple times, or use the ucnv_safeClone() function to clone a - * 'master' converter.

    + * 'primary' converter.

    * *

    A future version of ICU may add alias table lookups and/or caching * to this function.

    @@ -495,7 +498,7 @@ ucnv_openCCSID(int32_t codepage, * @see ucnv_close * @stable ICU 2.2 */ -U_STABLE UConverter* U_EXPORT2 +U_CAPI UConverter* U_EXPORT2 ucnv_openPackage(const char *packageName, const char *converterName, UErrorCode *err); /** @@ -537,7 +540,7 @@ ucnv_openPackage(const char *packageName, const char *converterName, UErrorCode * @return pointer to the new clone * @stable ICU 2.0 */ -U_STABLE UConverter * U_EXPORT2 +U_CAPI UConverter * U_EXPORT2 ucnv_safeClone(const UConverter *cnv, void *stackBuffer, int32_t *pBufferSize, @@ -566,7 +569,7 @@ ucnv_safeClone(const UConverter *cnv, * @see ucnv_openCCSID * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_close(UConverter * converter); #if U_SHOW_CPLUSPLUS_API @@ -605,7 +608,7 @@ U_NAMESPACE_END * @see ucnv_setSubstChars * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getSubstChars(const UConverter *converter, char *subChars, int8_t *len, @@ -630,7 +633,7 @@ ucnv_getSubstChars(const UConverter *converter, * @see ucnv_getSubstChars * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_setSubstChars(UConverter *converter, const char *subChars, int8_t len, @@ -663,7 +666,7 @@ ucnv_setSubstChars(UConverter *converter, * @see ucnv_getSubstChars * @stable ICU 3.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_setSubstString(UConverter *cnv, const UChar *s, int32_t length, @@ -682,7 +685,7 @@ ucnv_setSubstString(UConverter *cnv, * U_INDEX_OUTOFBOUNDS_ERROR will be returned. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getInvalidChars(const UConverter *converter, char *errBytes, int8_t *len, @@ -701,7 +704,7 @@ ucnv_getInvalidChars(const UConverter *converter, * U_INDEX_OUTOFBOUNDS_ERROR will be returned. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getInvalidUChars(const UConverter *converter, UChar *errUChars, int8_t *len, @@ -714,7 +717,7 @@ ucnv_getInvalidUChars(const UConverter *converter, * @param converter the Unicode converter * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_reset(UConverter *converter); /** @@ -725,7 +728,7 @@ ucnv_reset(UConverter *converter); * @param converter the Unicode converter * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_resetToUnicode(UConverter *converter); /** @@ -736,7 +739,7 @@ ucnv_resetToUnicode(UConverter *converter); * @param converter the Unicode converter * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_resetFromUnicode(UConverter *converter); /** @@ -789,7 +792,7 @@ ucnv_resetFromUnicode(UConverter *converter); * @see ucnv_getMinCharSize * @stable ICU 2.0 */ -U_STABLE int8_t U_EXPORT2 +U_CAPI int8_t U_EXPORT2 ucnv_getMaxCharSize(const UConverter *converter); /** @@ -822,7 +825,7 @@ ucnv_getMaxCharSize(const UConverter *converter); * @see ucnv_getMaxCharSize * @stable ICU 2.0 */ -U_STABLE int8_t U_EXPORT2 +U_CAPI int8_t U_EXPORT2 ucnv_getMinCharSize(const UConverter *converter); /** @@ -839,7 +842,7 @@ ucnv_getMinCharSize(const UConverter *converter); * @see ucnv_getName * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnv_getDisplayName(const UConverter *converter, const char *displayLocale, UChar *displayName, @@ -856,7 +859,7 @@ ucnv_getDisplayName(const UConverter *converter, * @see ucnv_getDisplayName * @stable ICU 2.0 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ucnv_getName(const UConverter *converter, UErrorCode *err); /** @@ -882,7 +885,7 @@ ucnv_getName(const UConverter *converter, UErrorCode *err); * @see ucnv_getPlatform * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnv_getCCSID(const UConverter *converter, UErrorCode *err); @@ -896,7 +899,7 @@ ucnv_getCCSID(const UConverter *converter, * @return The codepage platform * @stable ICU 2.0 */ -U_STABLE UConverterPlatform U_EXPORT2 +U_CAPI UConverterPlatform U_EXPORT2 ucnv_getPlatform(const UConverter *converter, UErrorCode *err); @@ -908,14 +911,14 @@ ucnv_getPlatform(const UConverter *converter, * @return the type of the converter * @stable ICU 2.0 */ -U_STABLE UConverterType U_EXPORT2 +U_CAPI UConverterType U_EXPORT2 ucnv_getType(const UConverter * converter); /** * Gets the "starter" (lead) bytes for converters of type MBCS. * Will fill in an U_ILLEGAL_ARGUMENT_ERROR if converter passed in * is not MBCS. Fills in an array of type UBool, with the value of the byte - * as offset to the array. For example, if (starters[0x20] == TRUE) at return, + * as offset to the array. For example, if (starters[0x20] == true) at return, * it means that the byte 0x20 is a starter byte in this converter. * Context pointers are always owned by the caller. * @@ -926,7 +929,7 @@ ucnv_getType(const UConverter * converter); * @see ucnv_getType * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getStarters(const UConverter* converter, UBool starters[256], UErrorCode* err); @@ -997,7 +1000,7 @@ typedef enum UConverterUnicodeSet { * @see uset_close * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getUnicodeSet(const UConverter *cnv, USet *setFillIn, UConverterUnicodeSet whichSet, @@ -1014,7 +1017,7 @@ ucnv_getUnicodeSet(const UConverter *cnv, * @see ucnv_setToUCallBack * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getToUCallBack (const UConverter * converter, UConverterToUCallback *action, const void **context); @@ -1030,7 +1033,7 @@ ucnv_getToUCallBack (const UConverter * converter, * @see ucnv_setFromUCallBack * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_getFromUCallBack (const UConverter * converter, UConverterFromUCallback *action, const void **context); @@ -1050,7 +1053,7 @@ ucnv_getFromUCallBack (const UConverter * converter, * @see ucnv_getToUCallBack * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_setToUCallBack (UConverter * converter, UConverterToUCallback newAction, const void* newContext, @@ -1073,7 +1076,7 @@ ucnv_setToUCallBack (UConverter * converter, * @see ucnv_getFromUCallBack * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_setFromUCallBack (UConverter * converter, UConverterFromUCallback newAction, const void *newContext, @@ -1100,7 +1103,7 @@ ucnv_setFromUCallBack (UConverter * converter, * consumed. At that point, the caller should reset the source and * sourceLimit pointers to point to the next chunk. * - * At the end of the stream (flush==TRUE), the input is completely consumed + * At the end of the stream (flush==true), the input is completely consumed * when *source==sourceLimit and no error code is set. * The converter object is then automatically reset by this function. * (This means that a converter need not be reset explicitly between data @@ -1125,9 +1128,9 @@ ucnv_setFromUCallBack (UConverter * converter, * e.g: offsets[3] is equal to 6, it means that the target[3] was a result of transcoding source[6] * For output data carried across calls, and other data without a specific source character * (such as from escape sequences or callbacks) -1 will be placed for offsets. - * @param flush set to TRUE if the current source buffer is the last available - * chunk of the source, FALSE otherwise. Note that if a failing status is returned, - * this function may have to be called multiple times with flush set to TRUE until + * @param flush set to true if the current source buffer is the last available + * chunk of the source, false otherwise. Note that if a failing status is returned, + * this function may have to be called multiple times with flush set to true until * the source buffer is consumed. * @param err the error status. U_ILLEGAL_ARGUMENT_ERROR will be set if the * converter is NULL. @@ -1139,7 +1142,7 @@ ucnv_setFromUCallBack (UConverter * converter, * @see ucnv_setToUCallBack * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_fromUnicode (UConverter * converter, char **target, const char *targetLimit, @@ -1169,7 +1172,7 @@ ucnv_fromUnicode (UConverter * converter, * consumed. At that point, the caller should reset the source and * sourceLimit pointers to point to the next chunk. * - * At the end of the stream (flush==TRUE), the input is completely consumed + * At the end of the stream (flush==true), the input is completely consumed * when *source==sourceLimit and no error code is set * The converter object is then automatically reset by this function. * (This means that a converter need not be reset explicitly between data @@ -1193,9 +1196,9 @@ ucnv_fromUnicode (UConverter * converter, * e.g: offsets[3] is equal to 6, it means that the target[3] was a result of transcoding source[6] * For output data carried across calls, and other data without a specific source character * (such as from escape sequences or callbacks) -1 will be placed for offsets. - * @param flush set to TRUE if the current source buffer is the last available - * chunk of the source, FALSE otherwise. Note that if a failing status is returned, - * this function may have to be called multiple times with flush set to TRUE until + * @param flush set to true if the current source buffer is the last available + * chunk of the source, false otherwise. Note that if a failing status is returned, + * this function may have to be called multiple times with flush set to true until * the source buffer is consumed. * @param err the error status. U_ILLEGAL_ARGUMENT_ERROR will be set if the * converter is NULL. @@ -1208,7 +1211,7 @@ ucnv_fromUnicode (UConverter * converter, * @see ucnv_getNextUChar * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_toUnicode(UConverter *converter, UChar **target, const UChar *targetLimit, @@ -1245,7 +1248,7 @@ ucnv_toUnicode(UConverter *converter, * @see UCNV_GET_MAX_BYTES_FOR_STRING * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnv_fromUChars(UConverter *cnv, char *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, @@ -1277,7 +1280,7 @@ ucnv_fromUChars(UConverter *cnv, * @see ucnv_convert * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnv_toUChars(UConverter *cnv, UChar *dest, int32_t destCapacity, const char *src, int32_t srcLength, @@ -1295,7 +1298,7 @@ ucnv_toUChars(UConverter *cnv, * - Convenient. * * Limitations compared to ucnv_toUnicode(): - * - Always assumes flush=TRUE. + * - Always assumes flush=true. * This makes ucnv_getNextUChar() unsuitable for "streaming" conversion, * that is, for where the input is supplied in multiple buffers, * because ucnv_getNextUChar() will assume the end of the input at the end @@ -1306,7 +1309,7 @@ ucnv_toUChars(UConverter *cnv, * ucnv_getNextUChar() uses the current state of the converter * (unlike ucnv_toUChars() which always resets first). * However, if ucnv_getNextUChar() is called after ucnv_toUnicode() - * stopped in the middle of a character sequence (with flush=FALSE), + * stopped in the middle of a character sequence (with flush=false), * then ucnv_getNextUChar() will always use the slower ucnv_toUnicode() * internally until the next character boundary. * (This is new in ICU 2.6. In earlier releases, ucnv_getNextUChar() had to @@ -1353,7 +1356,7 @@ ucnv_toUChars(UConverter *cnv, * @see ucnv_convert * @stable ICU 2.0 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 ucnv_getNextUChar(UConverter * converter, const char **source, const char * sourceLimit, @@ -1385,7 +1388,7 @@ ucnv_getNextUChar(UConverter * converter, * * ucnv_convertEx() also provides further convenience: * - an option to reset the converters at the beginning - * (if reset==TRUE, see parameters; + * (if reset==true, see parameters; * also sets *pivotTarget=*pivotSource=pivotStart) * - allow NUL-terminated input * (only a single NUL byte, will not work for charsets with multi-byte NULs) @@ -1442,7 +1445,7 @@ ucnv_getNextUChar(UConverter * converter, * &target, u8+capacity, * &s, s+length, * NULL, NULL, NULL, NULL, - * TRUE, TRUE, + * true, true, * pErrorCode); * * myReleaseCachedUTF8Converter(utf8Cnv); @@ -1474,7 +1477,7 @@ ucnv_getNextUChar(UConverter * converter, * It must be pivotStart<=*pivotSource<=*pivotTarget<=pivotLimit * and pivotStartNULL is returned. Owned by the library. * @stable ICU 2.0 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ucnv_getStandardName(const char *name, const char *standard, UErrorCode *pErrorCode); /** @@ -1853,7 +1856,7 @@ ucnv_getStandardName(const char *name, const char *standard, UErrorCode *pErrorC * @see ucnv_getStandardName * @stable ICU 2.4 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ucnv_getCanonicalName(const char *alias, const char *standard, UErrorCode *pErrorCode); /** @@ -1870,7 +1873,7 @@ ucnv_getCanonicalName(const char *alias, const char *standard, UErrorCode *pErro * @see ucnv_setDefaultName * @stable ICU 2.0 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ucnv_getDefaultName(void); #ifndef U_HIDE_SYSTEM_API @@ -1890,7 +1893,7 @@ ucnv_getDefaultName(void); * @system * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_setDefaultName(const char *name); #endif /* U_HIDE_SYSTEM_API */ @@ -1911,18 +1914,18 @@ ucnv_setDefaultName(const char *name); * @see ucnv_isAmbiguous * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_fixFileSeparator(const UConverter *cnv, UChar *source, int32_t sourceLen); /** * Determines if the converter contains ambiguous mappings of the same * character or not. * @param cnv the converter to be tested - * @return TRUE if the converter contains ambiguous mapping of the same - * character, FALSE otherwise. + * @return true if the converter contains ambiguous mapping of the same + * character, false otherwise. * @stable ICU 2.0 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucnv_isAmbiguous(const UConverter *cnv); /** @@ -1935,12 +1938,12 @@ ucnv_isAmbiguous(const UConverter *cnv); * http://www.icu-project.org/userguide/conversion-data.html#ucmformat * * @param cnv The converter to set the fallback mapping usage on. - * @param usesFallback TRUE if the user wants the converter to take advantage of the fallback - * mapping, FALSE otherwise. + * @param usesFallback true if the user wants the converter to take advantage of the fallback + * mapping, false otherwise. * @stable ICU 2.0 * @see ucnv_usesFallback */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_setFallback(UConverter *cnv, UBool usesFallback); /** @@ -1948,11 +1951,11 @@ ucnv_setFallback(UConverter *cnv, UBool usesFallback); * This flag has restrictions, see ucnv_setFallback(). * * @param cnv The converter to be tested - * @return TRUE if the converter uses fallback, FALSE otherwise. + * @return true if the converter uses fallback, false otherwise. * @stable ICU 2.0 * @see ucnv_setFallback */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucnv_usesFallback(const UConverter *cnv); /** @@ -1984,7 +1987,7 @@ ucnv_usesFallback(const UConverter *cnv); * @return The name of the encoding detected. NULL if encoding is not detected. * @stable ICU 2.4 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 ucnv_detectUnicodeSignature(const char* source, int32_t sourceLength, int32_t *signatureLength, @@ -2001,7 +2004,7 @@ ucnv_detectUnicodeSignature(const char* source, * @return The number of UChars in the state. -1 if an error is encountered. * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status); /** @@ -2015,7 +2018,7 @@ ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status); * @return The number of chars in the state. -1 if an error is encountered. * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnv_toUCountPending(const UConverter* cnv, UErrorCode* status); /** @@ -2027,13 +2030,13 @@ ucnv_toUCountPending(const UConverter* cnv, UErrorCode* status); * but a UTF-32 converter encodes each code point with 4 bytes. * Note: This method is not intended to be used to determine whether the charset has a * fixed ratio of bytes to Unicode codes units for any particular Unicode encoding form. - * FALSE is returned with the UErrorCode if error occurs or cnv is NULL. + * false is returned with the UErrorCode if error occurs or cnv is NULL. * @param cnv The converter to be tested * @param status ICU error code in/out paramter - * @return TRUE if the converter is fixed-width + * @return true if the converter is fixed-width * @stable ICU 4.8 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status); #endif diff --git a/intl/icu/source/common/unicode/ucnv_cb.h b/intl/icu/source/common/unicode/ucnv_cb.h index 14169ed61c14..41845d1bcaea 100644 --- a/intl/icu/source/common/unicode/ucnv_cb.h +++ b/intl/icu/source/common/unicode/ucnv_cb.h @@ -84,7 +84,7 @@ * @see ucnv_cbFromUWriteSub * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_cbFromUWriteBytes (UConverterFromUnicodeArgs *args, const char* source, int32_t length, @@ -104,7 +104,7 @@ ucnv_cbFromUWriteBytes (UConverterFromUnicodeArgs *args, * @see ucnv_cbFromUWriteBytes * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnv_cbFromUWriteSub (UConverterFromUnicodeArgs *args, int32_t offsetIndex, UErrorCode * err); @@ -121,7 +121,7 @@ ucnv_cbFromUWriteSub (UConverterFromUnicodeArgs *args, * @see ucnv_cbToUWriteSub * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 ucnv_cbFromUWriteUChars(UConverterFromUnicodeArgs *args, +U_CAPI void U_EXPORT2 ucnv_cbFromUWriteUChars(UConverterFromUnicodeArgs *args, const UChar** source, const UChar* sourceLimit, int32_t offsetIndex, @@ -140,7 +140,7 @@ U_STABLE void U_EXPORT2 ucnv_cbFromUWriteUChars(UConverterFromUnicodeArgs *args, * @see ucnv_cbToUWriteSub * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 ucnv_cbToUWriteUChars (UConverterToUnicodeArgs *args, +U_CAPI void U_EXPORT2 ucnv_cbToUWriteUChars (UConverterToUnicodeArgs *args, const UChar* source, int32_t length, int32_t offsetIndex, @@ -156,7 +156,7 @@ U_STABLE void U_EXPORT2 ucnv_cbToUWriteUChars (UConverterToUnicodeArgs *args, * @see ucnv_cbToUWriteUChars * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 ucnv_cbToUWriteSub (UConverterToUnicodeArgs *args, +U_CAPI void U_EXPORT2 ucnv_cbToUWriteSub (UConverterToUnicodeArgs *args, int32_t offsetIndex, UErrorCode * err); #endif diff --git a/intl/icu/source/common/unicode/ucnv_err.h b/intl/icu/source/common/unicode/ucnv_err.h index d234710a8b18..7209ba5f7b85 100644 --- a/intl/icu/source/common/unicode/ucnv_err.h +++ b/intl/icu/source/common/unicode/ucnv_err.h @@ -193,7 +193,7 @@ typedef enum { */ typedef struct { uint16_t size; /**< The size of this struct. @stable ICU 2.0 */ - UBool flush; /**< The internal state of converter will be reset and data flushed if set to TRUE. @stable ICU 2.0 */ + UBool flush; /**< The internal state of converter will be reset and data flushed if set to true. @stable ICU 2.0 */ UConverter *converter; /**< Pointer to the converter that is opened and to which this struct is passed as an argument. @stable ICU 2.0 */ const UChar *source; /**< Pointer to the source source buffer. @stable ICU 2.0 */ const UChar *sourceLimit; /**< Pointer to the limit (end + 1) of source buffer. @stable ICU 2.0 */ @@ -209,7 +209,7 @@ typedef struct { */ typedef struct { uint16_t size; /**< The size of this struct @stable ICU 2.0 */ - UBool flush; /**< The internal state of converter will be reset and data flushed if set to TRUE. @stable ICU 2.0 */ + UBool flush; /**< The internal state of converter will be reset and data flushed if set to true. @stable ICU 2.0 */ UConverter *converter; /**< Pointer to the converter that is opened and to which this struct is passed as an argument. @stable ICU 2.0 */ const char *source; /**< Pointer to the source source buffer. @stable ICU 2.0 */ const char *sourceLimit; /**< Pointer to the limit (end + 1) of source buffer. @stable ICU 2.0 */ @@ -233,7 +233,7 @@ typedef struct { * @param err This should always be set to a failure status prior to calling. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_STOP ( +U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_STOP ( const void *context, UConverterFromUnicodeArgs *fromUArgs, const UChar* codeUnits, @@ -257,7 +257,7 @@ U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_STOP ( * @param err This should always be set to a failure status prior to calling. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP ( +U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP ( const void *context, UConverterToUnicodeArgs *toUArgs, const char* codeUnits, @@ -284,7 +284,7 @@ U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP ( * otherwise this value will be set to a failure status. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_SKIP ( +U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_SKIP ( const void *context, UConverterFromUnicodeArgs *fromUArgs, const UChar* codeUnits, @@ -314,7 +314,7 @@ U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_SKIP ( * @see ucnv_setSubstChars * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_SUBSTITUTE ( +U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_SUBSTITUTE ( const void *context, UConverterFromUnicodeArgs *fromUArgs, const UChar* codeUnits, @@ -370,7 +370,7 @@ U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_SUBSTITUTE ( * otherwise this value will be set to a failure status. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_ESCAPE ( +U_CAPI void U_EXPORT2 UCNV_FROM_U_CALLBACK_ESCAPE ( const void *context, UConverterFromUnicodeArgs *fromUArgs, const UChar* codeUnits, @@ -398,7 +398,7 @@ U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_ESCAPE ( * otherwise this value will be set to a failure status. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_SKIP ( +U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_SKIP ( const void *context, UConverterToUnicodeArgs *toUArgs, const char* codeUnits, @@ -424,7 +424,7 @@ U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_SKIP ( * otherwise this value will be set to a failure status. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_SUBSTITUTE ( +U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_SUBSTITUTE ( const void *context, UConverterToUnicodeArgs *toUArgs, const char* codeUnits, @@ -450,7 +450,7 @@ U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_SUBSTITUTE ( * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_ESCAPE ( +U_CAPI void U_EXPORT2 UCNV_TO_U_CALLBACK_ESCAPE ( const void *context, UConverterToUnicodeArgs *toUArgs, const char* codeUnits, diff --git a/intl/icu/source/common/unicode/ucnvsel.h b/intl/icu/source/common/unicode/ucnvsel.h index d423845ceb62..5e0a71cf3513 100644 --- a/intl/icu/source/common/unicode/ucnvsel.h +++ b/intl/icu/source/common/unicode/ucnvsel.h @@ -29,7 +29,10 @@ #include "unicode/utf16.h" #include "unicode/uenum.h" #include "unicode/ucnv.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API /** * \file @@ -72,7 +75,7 @@ typedef struct UConverterSelector UConverterSelector; * * @stable ICU 4.2 */ -U_STABLE UConverterSelector* U_EXPORT2 +U_CAPI UConverterSelector* U_EXPORT2 ucnvsel_open(const char* const* converterList, int32_t converterListSize, const USet* excludedCodePoints, const UConverterUnicodeSet whichSet, UErrorCode* status); @@ -90,7 +93,7 @@ ucnvsel_open(const char* const* converterList, int32_t converterListSize, * * @stable ICU 4.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ucnvsel_close(UConverterSelector *sel); #if U_SHOW_CPLUSPLUS_API @@ -127,7 +130,7 @@ U_NAMESPACE_END * * @stable ICU 4.2 */ -U_STABLE UConverterSelector* U_EXPORT2 +U_CAPI UConverterSelector* U_EXPORT2 ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* status); /** @@ -144,7 +147,7 @@ ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* statu * * @stable ICU 4.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucnvsel_serialize(const UConverterSelector* sel, void* buffer, int32_t bufferCapacity, UErrorCode* status); @@ -162,7 +165,7 @@ ucnvsel_serialize(const UConverterSelector* sel, * * @stable ICU 4.2 */ -U_STABLE UEnumeration * U_EXPORT2 +U_CAPI UEnumeration * U_EXPORT2 ucnvsel_selectForString(const UConverterSelector* sel, const UChar *s, int32_t length, UErrorCode *status); @@ -180,7 +183,7 @@ ucnvsel_selectForString(const UConverterSelector* sel, * * @stable ICU 4.2 */ -U_STABLE UEnumeration * U_EXPORT2 +U_CAPI UEnumeration * U_EXPORT2 ucnvsel_selectForUTF8(const UConverterSelector* sel, const char *s, int32_t length, UErrorCode *status); diff --git a/intl/icu/source/common/unicode/ucptrie.h b/intl/icu/source/common/unicode/ucptrie.h index be06a2279282..b95491b183e9 100644 --- a/intl/icu/source/common/unicode/ucptrie.h +++ b/intl/icu/source/common/unicode/ucptrie.h @@ -8,11 +8,13 @@ #define __UCPTRIE_H__ #include "unicode/utypes.h" - -#include "unicode/localpointer.h" #include "unicode/ucpmap.h" #include "unicode/utf8.h" +#if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API + U_CDECL_BEGIN /** @@ -580,11 +582,11 @@ enum { // Do not conditionalize with #ifndef U_HIDE_INTERNAL_API, needed for public API /** @internal */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucptrie_internalSmallIndex(const UCPTrie *trie, UChar32 c); /** @internal */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucptrie_internalSmallU8Index(const UCPTrie *trie, int32_t lt1, uint8_t t2, uint8_t t3); /** @@ -592,7 +594,7 @@ ucptrie_internalSmallU8Index(const UCPTrie *trie, int32_t lt1, uint8_t t2, uint8 * Do not call directly. * @internal */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucptrie_internalU8PrevIndex(const UCPTrie *trie, UChar32 c, const uint8_t *start, const uint8_t *src); diff --git a/intl/icu/source/common/unicode/ucurr.h b/intl/icu/source/common/unicode/ucurr.h index f91cc0df7c61..35c2a393897b 100644 --- a/intl/icu/source/common/unicode/ucurr.h +++ b/intl/icu/source/common/unicode/ucurr.h @@ -78,7 +78,7 @@ typedef enum UCurrencyUsage UCurrencyUsage; * invalid. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_forLocale(const char* locale, UChar* buff, int32_t buffCapacity, @@ -113,7 +113,29 @@ typedef enum UCurrNameStyle { * * @stable ICU 61 */ - UCURR_NARROW_SYMBOL_NAME + UCURR_NARROW_SYMBOL_NAME, + +#ifndef U_HIDE_DRAFT_API + /** + * Selector for getName() indicating the formal currency symbol. + * The formal currency symbol is similar to the regular currency + * symbol, but it always takes the form used in formal settings + * such as banking; for example, "NT$" instead of "$" for TWD in zh-TW. + * + * @draft ICU 68 + */ + UCURR_FORMAL_SYMBOL_NAME, + + /** + * Selector for getName() indicating the variant currency symbol. + * The variant symbol for a currency is an alternative symbol + * that is not necessarily as widely used as the regular symbol. + * + * @draft ICU 68 + */ + UCURR_VARIANT_SYMBOL_NAME +#endif // U_HIDE_DRAFT_API + } UCurrNameStyle; #if !UCONFIG_NO_SERVICE @@ -133,7 +155,7 @@ typedef const void* UCurrRegistryKey; * if there was an error. * @stable ICU 2.6 */ -U_STABLE UCurrRegistryKey U_EXPORT2 +U_CAPI UCurrRegistryKey U_EXPORT2 ucurr_register(const UChar* isoCode, const char* locale, UErrorCode* status); @@ -145,10 +167,10 @@ ucurr_register(const UChar* isoCode, * restored. * @param key the registry key returned by a previous call to ucurr_register * @param status the in/out status code, no special meanings are assigned - * @return TRUE if the currency for this key was successfully unregistered + * @return true if the currency for this key was successfully unregistered * @stable ICU 2.6 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucurr_unregister(UCurrRegistryKey key, UErrorCode* status); #endif /* UCONFIG_NO_SERVICE */ @@ -159,7 +181,7 @@ ucurr_unregister(UCurrRegistryKey key, UErrorCode* status); * @param currency null-terminated 3-letter ISO 4217 code * @param locale locale in which to display currency * @param nameStyle selector for which kind of name to return - * @param isChoiceFormat always set to FALSE, or can be NULL; + * @param isChoiceFormat always set to false, or can be NULL; * display names are static strings; * since ICU 4.4, ChoiceFormat patterns are no longer supported * @param len fill-in parameter to receive length of result @@ -169,7 +191,7 @@ ucurr_unregister(UCurrRegistryKey key, UErrorCode* status); * returned. * @stable ICU 2.6 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ucurr_getName(const UChar* currency, const char* locale, UCurrNameStyle nameStyle, @@ -183,7 +205,7 @@ ucurr_getName(const UChar* currency, * currency object in the en_US locale is "US dollar" or "US dollars". * @param currency null-terminated 3-letter ISO 4217 code * @param locale locale in which to display currency - * @param isChoiceFormat always set to FALSE, or can be NULL; + * @param isChoiceFormat always set to false, or can be NULL; * display names are static strings; * since ICU 4.4, ChoiceFormat patterns are no longer supported * @param pluralCount plural count @@ -194,7 +216,7 @@ ucurr_getName(const UChar* currency, * returned. * @stable ICU 4.2 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ucurr_getPluralName(const UChar* currency, const char* locale, UBool* isChoiceFormat, @@ -219,7 +241,7 @@ ucurr_getPluralName(const UChar* currency, * displayed, or 0 if there is an error * @stable ICU 3.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_getDefaultFractionDigits(const UChar* currency, UErrorCode* ec); @@ -240,7 +262,7 @@ ucurr_getDefaultFractionDigits(const UChar* currency, * displayed, or 0 if there is an error * @stable ICU 54 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_getDefaultFractionDigitsForUsage(const UChar* currency, const UCurrencyUsage usage, UErrorCode* ec); @@ -255,7 +277,7 @@ ucurr_getDefaultFractionDigitsForUsage(const UChar* currency, * or 0.0 if there is an error * @stable ICU 3.0 */ -U_STABLE double U_EXPORT2 +U_CAPI double U_EXPORT2 ucurr_getRoundingIncrement(const UChar* currency, UErrorCode* ec); @@ -269,7 +291,7 @@ ucurr_getRoundingIncrement(const UChar* currency, * or 0.0 if there is an error * @stable ICU 54 */ -U_STABLE double U_EXPORT2 +U_CAPI double U_EXPORT2 ucurr_getRoundingIncrementForUsage(const UChar* currency, const UCurrencyUsage usage, UErrorCode* ec); @@ -326,7 +348,7 @@ typedef enum UCurrCurrencyType { * @param pErrorCode Error code * @stable ICU 3.2 */ -U_STABLE UEnumeration * U_EXPORT2 +U_CAPI UEnumeration * U_EXPORT2 ucurr_openISOCurrencies(uint32_t currType, UErrorCode *pErrorCode); /** @@ -351,11 +373,11 @@ ucurr_openISOCurrencies(uint32_t currType, UErrorCode *pErrorCode); * @param errorCode * ICU error code * - * @return TRUE if the given ISO 4217 3-letter code is supported on the specified date range. + * @return true if the given ISO 4217 3-letter code is supported on the specified date range. * * @stable ICU 4.8 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucurr_isAvailable(const UChar* isoCode, UDate from, UDate to, @@ -375,7 +397,7 @@ ucurr_isAvailable(const UChar* isoCode, * values are invalid. * @stable ICU 4.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_countCurrencies(const char* locale, UDate date, UErrorCode* ec); @@ -399,7 +421,7 @@ ucurr_countCurrencies(const char* locale, * invalid. * @stable ICU 4.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_forLocaleAndDate(const char* locale, UDate date, int32_t index, @@ -423,7 +445,7 @@ ucurr_forLocaleAndDate(const char* locale, * @return a string enumeration over keyword values for the given key and the locale. * @stable ICU 4.2 */ -U_STABLE UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 ucurr_getKeywordValuesForLocale(const char* key, const char* locale, UBool commonlyUsed, @@ -438,7 +460,7 @@ ucurr_getKeywordValuesForLocale(const char* key, * @return The ISO 4217 numeric code of the currency * @stable ICU 49 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucurr_getNumericCode(const UChar* currency); #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/common/unicode/udata.h b/intl/icu/source/common/unicode/udata.h index 325ffcf17db0..6caa849c42f5 100644 --- a/intl/icu/source/common/unicode/udata.h +++ b/intl/icu/source/common/unicode/udata.h @@ -20,7 +20,10 @@ #define __UDATA_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API U_CDECL_BEGIN @@ -166,8 +169,8 @@ typedef struct UDataMemory UDataMemory; * @param pInfo A pointer to the UDataInfo structure * of data that has been loaded and will be returned * by udata_openChoice() if this function - * returns TRUE. - * @return TRUE if the current data memory is acceptable + * returns true. + * @return true if the current data memory is acceptable * @stable ICU 2.0 */ typedef UBool U_CALLCONV @@ -197,7 +200,7 @@ UDataMemoryIsAcceptable(void *context, * @see udata_openChoice * @stable ICU 2.0 */ -U_STABLE UDataMemory * U_EXPORT2 +U_CAPI UDataMemory * U_EXPORT2 udata_open(const char *path, const char *type, const char *name, UErrorCode *pErrorCode); @@ -239,7 +242,7 @@ udata_open(const char *path, const char *type, const char *name, * This may be NULL or empty. * @param name A string that specifies the name of the data. * @param isAcceptable This function is called to verify that loaded data - * is useful for the client code. If it returns FALSE + * is useful for the client code. If it returns false * for all data items, then udata_openChoice() * will return with an error. * @param context Arbitrary parameter to be passed into isAcceptable. @@ -249,7 +252,7 @@ udata_open(const char *path, const char *type, const char *name, * to get a pointer to the actual data. * @stable ICU 2.0 */ -U_STABLE UDataMemory * U_EXPORT2 +U_CAPI UDataMemory * U_EXPORT2 udata_openChoice(const char *path, const char *type, const char *name, UDataMemoryIsAcceptable *isAcceptable, void *context, UErrorCode *pErrorCode); @@ -261,7 +264,7 @@ udata_openChoice(const char *path, const char *type, const char *name, * @param pData The pointer to data memory object * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 udata_close(UDataMemory *pData); /** @@ -273,7 +276,7 @@ udata_close(UDataMemory *pData); * @param pData The pointer to data memory object * @stable ICU 2.0 */ -U_STABLE const void * U_EXPORT2 +U_CAPI const void * U_EXPORT2 udata_getMemory(UDataMemory *pData); /** @@ -294,7 +297,7 @@ udata_getMemory(UDataMemory *pData); * adjusted and only part of the structure will be filled. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 udata_getInfo(UDataMemory *pData, UDataInfo *pInfo); /** @@ -303,7 +306,7 @@ udata_getInfo(UDataMemory *pData, UDataInfo *pInfo); * area in memory. * * ICU data must be at least 8-aligned, and should be 16-aligned. - * See http://userguide.icu-project.org/icudata + * See https://unicode-org.github.io/icu/userguide/icudata * * The format of this data is that of the icu common data file, as is * generated by the pkgdata tool with mode=common or mode=dll. @@ -340,7 +343,7 @@ udata_getInfo(UDataMemory *pData, UDataInfo *pInfo); * @param err outgoing error status U_USING_DEFAULT_WARNING, U_UNSUPPORTED_ERROR * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 udata_setCommonData(const void *data, UErrorCode *err); @@ -350,7 +353,7 @@ udata_setCommonData(const void *data, UErrorCode *err); * pointer. * * ICU data must be at least 8-aligned, and should be 16-aligned. - * See http://userguide.icu-project.org/icudata + * See https://unicode-org.github.io/icu/userguide/icudata * * The format of this data is that of the icu common data file, like 'icudt26l.dat' * or the corresponding shared library (DLL) file. @@ -371,7 +374,7 @@ udata_setCommonData(const void *data, UErrorCode *err); * @see udata_setCommonData * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 udata_setAppData(const char *packageName, const void *data, UErrorCode *err); /** @@ -410,7 +413,7 @@ typedef enum UDataFileAccess { * @see UDataFileAccess * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 udata_setFileAccess(UDataFileAccess access, UErrorCode *status); U_CDECL_END diff --git a/intl/icu/source/common/unicode/udisplaycontext.h b/intl/icu/source/common/unicode/udisplaycontext.h index 398481c68122..6e1421798054 100644 --- a/intl/icu/source/common/unicode/udisplaycontext.h +++ b/intl/icu/source/common/unicode/udisplaycontext.h @@ -156,7 +156,8 @@ enum UDisplayContext { UDISPCTX_SUBSTITUTE = (UDISPCTX_TYPE_SUBSTITUTE_HANDLING<<8) + 0, /** * A possible setting for SUBSTITUTE_HANDLING: - * Returns a null value when no data is available. + * Returns a null value with error code set to U_ILLEGAL_ARGUMENT_ERROR when no + * data is available. * @stable ICU 58 */ UDISPCTX_NO_SUBSTITUTE = (UDISPCTX_TYPE_SUBSTITUTE_HANDLING<<8) + 1 diff --git a/intl/icu/source/common/unicode/uenum.h b/intl/icu/source/common/unicode/uenum.h index c670eeafb162..d9c893e06d92 100644 --- a/intl/icu/source/common/unicode/uenum.h +++ b/intl/icu/source/common/unicode/uenum.h @@ -20,13 +20,14 @@ #define __UENUM_H #include "unicode/utypes.h" -#include "unicode/localpointer.h" #if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" + U_NAMESPACE_BEGIN class StringEnumeration; U_NAMESPACE_END -#endif +#endif // U_SHOW_CPLUSPLUS_API /** * \file @@ -49,7 +50,7 @@ typedef struct UEnumeration UEnumeration; * @param en UEnumeration structure pointer * @stable ICU 2.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uenum_close(UEnumeration* en); #if U_SHOW_CPLUSPLUS_API @@ -85,7 +86,7 @@ U_NAMESPACE_END * @return number of elements in the iterator * @stable ICU 2.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uenum_count(UEnumeration* en, UErrorCode* status); /** @@ -109,7 +110,7 @@ uenum_count(UEnumeration* en, UErrorCode* status); * traversed, returns NULL. * @stable ICU 2.2 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 uenum_unext(UEnumeration* en, int32_t* resultLength, UErrorCode* status); @@ -142,7 +143,7 @@ uenum_unext(UEnumeration* en, * traversed, returns NULL. * @stable ICU 2.2 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uenum_next(UEnumeration* en, int32_t* resultLength, UErrorCode* status); @@ -156,7 +157,7 @@ uenum_next(UEnumeration* en, * the iterator is out of sync with its service. * @stable ICU 2.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uenum_reset(UEnumeration* en, UErrorCode* status); #if U_SHOW_CPLUSPLUS_API @@ -170,7 +171,7 @@ uenum_reset(UEnumeration* en, UErrorCode* status); * @return a UEnumeration wrapping the adopted StringEnumeration. * @stable ICU 4.2 */ -U_STABLE UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec); #endif @@ -186,7 +187,7 @@ uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec) * @see uenum_close * @stable ICU 50 */ -U_STABLE UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 uenum_openUCharStringsEnumeration(const UChar* const strings[], int32_t count, UErrorCode* ec); @@ -201,7 +202,7 @@ uenum_openUCharStringsEnumeration(const UChar* const strings[], int32_t count, * @see uenum_close * @stable ICU 50 */ -U_STABLE UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 uenum_openCharStringsEnumeration(const char* const strings[], int32_t count, UErrorCode* ec); diff --git a/intl/icu/source/common/unicode/uidna.h b/intl/icu/source/common/unicode/uidna.h index 0dafb7620174..24a81ceaddf5 100644 --- a/intl/icu/source/common/unicode/uidna.h +++ b/intl/icu/source/common/unicode/uidna.h @@ -23,9 +23,13 @@ #if !UCONFIG_NO_IDNA -#include "unicode/localpointer.h" +#include #include "unicode/parseerr.h" +#if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API + /** * \file * \brief C API: Internationalizing Domain Names in Applications (IDNA) @@ -138,7 +142,7 @@ typedef struct UIDNA UIDNA; /**< C typedef for struct UIDNA. @stable ICU 4.6 */ * @return the UTS #46 UIDNA instance, if successful * @stable ICU 4.6 */ -U_STABLE UIDNA * U_EXPORT2 +U_CAPI UIDNA * U_EXPORT2 uidna_openUTS46(uint32_t options, UErrorCode *pErrorCode); /** @@ -146,7 +150,7 @@ uidna_openUTS46(uint32_t options, UErrorCode *pErrorCode); * @param idna UIDNA instance to be closed * @stable ICU 4.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uidna_close(UIDNA *idna); #if U_SHOW_CPLUSPLUS_API @@ -182,7 +186,7 @@ typedef struct UIDNAInfo { /** sizeof(UIDNAInfo) @stable ICU 4.6 */ int16_t size; /** - * Set to TRUE if transitional and nontransitional processing produce different results. + * Set to true if transitional and nontransitional processing produce different results. * For details see C++ IDNAInfo::isTransitionalDifferent(). * @stable ICU 4.6 */ @@ -204,7 +208,7 @@ typedef struct UIDNAInfo { */ #define UIDNA_INFO_INITIALIZER { \ (int16_t)sizeof(UIDNAInfo), \ - FALSE, FALSE, \ + false, false, \ 0, 0, 0 } /** @@ -230,7 +234,7 @@ typedef struct UIDNAInfo { * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_labelToASCII(const UIDNA *idna, const UChar *label, int32_t length, UChar *dest, int32_t capacity, @@ -257,7 +261,7 @@ uidna_labelToASCII(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_labelToUnicode(const UIDNA *idna, const UChar *label, int32_t length, UChar *dest, int32_t capacity, @@ -286,7 +290,7 @@ uidna_labelToUnicode(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_nameToASCII(const UIDNA *idna, const UChar *name, int32_t length, UChar *dest, int32_t capacity, @@ -313,7 +317,7 @@ uidna_nameToASCII(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_nameToUnicode(const UIDNA *idna, const UChar *name, int32_t length, UChar *dest, int32_t capacity, @@ -338,7 +342,7 @@ uidna_nameToUnicode(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_labelToASCII_UTF8(const UIDNA *idna, const char *label, int32_t length, char *dest, int32_t capacity, @@ -361,7 +365,7 @@ uidna_labelToASCII_UTF8(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_labelToUnicodeUTF8(const UIDNA *idna, const char *label, int32_t length, char *dest, int32_t capacity, @@ -384,7 +388,7 @@ uidna_labelToUnicodeUTF8(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_nameToASCII_UTF8(const UIDNA *idna, const char *name, int32_t length, char *dest, int32_t capacity, @@ -407,7 +411,7 @@ uidna_nameToASCII_UTF8(const UIDNA *idna, * @return destination string length * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uidna_nameToUnicodeUTF8(const UIDNA *idna, const char *name, int32_t length, char *dest, int32_t capacity, diff --git a/intl/icu/source/common/unicode/uiter.h b/intl/icu/source/common/unicode/uiter.h index 11ad75acd515..be232c774dc6 100644 --- a/intl/icu/source/common/unicode/uiter.h +++ b/intl/icu/source/common/unicode/uiter.h @@ -492,7 +492,7 @@ struct UCharIterator { * @see UnicodeString::char32At() * @stable ICU 2.1 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 uiter_current32(UCharIterator *iter); /** @@ -509,7 +509,7 @@ uiter_current32(UCharIterator *iter); * @see U16_NEXT * @stable ICU 2.1 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 uiter_next32(UCharIterator *iter); /** @@ -526,7 +526,7 @@ uiter_next32(UCharIterator *iter); * @see U16_PREV * @stable ICU 2.1 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 uiter_previous32(UCharIterator *iter); /** @@ -547,7 +547,7 @@ uiter_previous32(UCharIterator *iter); * @see UITER_NO_STATE * @stable ICU 2.6 */ -U_STABLE uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 uiter_getState(const UCharIterator *iter); /** @@ -565,7 +565,7 @@ uiter_getState(const UCharIterator *iter); * @see UCharIteratorSetState * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uiter_setState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode); /** @@ -590,7 +590,7 @@ uiter_setState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode); * @see UCharIterator * @stable ICU 2.1 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uiter_setString(UCharIterator *iter, const UChar *s, int32_t length); /** @@ -613,7 +613,7 @@ uiter_setString(UCharIterator *iter, const UChar *s, int32_t length); * @see uiter_setString * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uiter_setUTF16BE(UCharIterator *iter, const char *s, int32_t length); /** @@ -649,7 +649,7 @@ uiter_setUTF16BE(UCharIterator *iter, const char *s, int32_t length); * @see UCharIterator * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uiter_setUTF8(UCharIterator *iter, const char *s, int32_t length); #if U_SHOW_CPLUSPLUS_API @@ -674,7 +674,7 @@ uiter_setUTF8(UCharIterator *iter, const char *s, int32_t length); * @see UCharIterator * @stable ICU 2.1 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uiter_setCharacterIterator(UCharIterator *iter, icu::CharacterIterator *charIter); /** @@ -699,7 +699,7 @@ uiter_setCharacterIterator(UCharIterator *iter, icu::CharacterIterator *charIter * @see UCharIterator * @stable ICU 2.1 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uiter_setReplaceable(UCharIterator *iter, const icu::Replaceable *rep); #endif diff --git a/intl/icu/source/common/unicode/uldnames.h b/intl/icu/source/common/unicode/uldnames.h index 3ebffa23db5f..47b047ece97b 100644 --- a/intl/icu/source/common/unicode/uldnames.h +++ b/intl/icu/source/common/unicode/uldnames.h @@ -16,10 +16,13 @@ */ #include "unicode/utypes.h" -#include "unicode/localpointer.h" #include "unicode/uscript.h" #include "unicode/udisplaycontext.h" +#if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API + /** * Enum used in LocaleDisplayNames::createInstance. * @stable ICU 4.4 @@ -65,7 +68,7 @@ typedef struct ULocaleDisplayNames ULocaleDisplayNames; * @param pErrorCode the status code * @stable ICU 4.4 */ -U_STABLE ULocaleDisplayNames * U_EXPORT2 +U_CAPI ULocaleDisplayNames * U_EXPORT2 uldn_open(const char * locale, UDialectHandling dialectHandling, UErrorCode *pErrorCode); @@ -75,7 +78,7 @@ uldn_open(const char * locale, * @param ldn the ULocaleDisplayNames instance to be closed * @stable ICU 4.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uldn_close(ULocaleDisplayNames *ldn); #if U_SHOW_CPLUSPLUS_API @@ -106,7 +109,7 @@ U_NAMESPACE_END * @return the display locale * @stable ICU 4.4 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 uldn_getLocale(const ULocaleDisplayNames *ldn); /** @@ -115,7 +118,7 @@ uldn_getLocale(const ULocaleDisplayNames *ldn); * @return the dialect handling enum * @stable ICU 4.4 */ -U_STABLE UDialectHandling U_EXPORT2 +U_CAPI UDialectHandling U_EXPORT2 uldn_getDialectHandling(const ULocaleDisplayNames *ldn); /* names for entire locales */ @@ -131,7 +134,7 @@ uldn_getDialectHandling(const ULocaleDisplayNames *ldn); * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_localeDisplayName(const ULocaleDisplayNames *ldn, const char *locale, UChar *result, @@ -151,7 +154,7 @@ uldn_localeDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_languageDisplayName(const ULocaleDisplayNames *ldn, const char *lang, UChar *result, @@ -169,7 +172,7 @@ uldn_languageDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_scriptDisplayName(const ULocaleDisplayNames *ldn, const char *script, UChar *result, @@ -187,7 +190,7 @@ uldn_scriptDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_scriptCodeDisplayName(const ULocaleDisplayNames *ldn, UScriptCode scriptCode, UChar *result, @@ -205,7 +208,7 @@ uldn_scriptCodeDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_regionDisplayName(const ULocaleDisplayNames *ldn, const char *region, UChar *result, @@ -223,7 +226,7 @@ uldn_regionDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_variantDisplayName(const ULocaleDisplayNames *ldn, const char *variant, UChar *result, @@ -241,7 +244,7 @@ uldn_variantDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_keyDisplayName(const ULocaleDisplayNames *ldn, const char *key, UChar *result, @@ -260,7 +263,7 @@ uldn_keyDisplayName(const ULocaleDisplayNames *ldn, * greater than maxResultSize, the returned name will be truncated. * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uldn_keyValueDisplayName(const ULocaleDisplayNames *ldn, const char *key, const char *value, @@ -282,7 +285,7 @@ uldn_keyValueDisplayName(const ULocaleDisplayNames *ldn, * @return a ULocaleDisplayNames instance * @stable ICU 51 */ -U_STABLE ULocaleDisplayNames * U_EXPORT2 +U_CAPI ULocaleDisplayNames * U_EXPORT2 uldn_openForContext(const char * locale, UDisplayContext *contexts, int32_t length, UErrorCode *pErrorCode); @@ -296,7 +299,7 @@ uldn_openForContext(const char * locale, UDisplayContext *contexts, * @return the UDisplayContextValue for the specified type. * @stable ICU 51 */ -U_STABLE UDisplayContext U_EXPORT2 +U_CAPI UDisplayContext U_EXPORT2 uldn_getContext(const ULocaleDisplayNames *ldn, UDisplayContextType type, UErrorCode *pErrorCode); diff --git a/intl/icu/source/common/unicode/uloc.h b/intl/icu/source/common/unicode/uloc.h index d877ce49af52..3addb847e7fe 100644 --- a/intl/icu/source/common/unicode/uloc.h +++ b/intl/icu/source/common/unicode/uloc.h @@ -371,7 +371,7 @@ typedef enum { * @system * @stable ICU 2.0 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_getDefault(void); /** @@ -391,7 +391,7 @@ uloc_getDefault(void); * @system * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uloc_setDefault(const char* localeID, UErrorCode* status); #endif /* U_HIDE_SYSTEM_API */ @@ -408,7 +408,7 @@ uloc_setDefault(const char* localeID, * than languageCapacity, the returned language code will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getLanguage(const char* localeID, char* language, int32_t languageCapacity, @@ -426,7 +426,7 @@ uloc_getLanguage(const char* localeID, * than scriptCapacity, the returned language code will be truncated. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getScript(const char* localeID, char* script, int32_t scriptCapacity, @@ -444,7 +444,7 @@ uloc_getScript(const char* localeID, * than countryCapacity, the returned country code will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getCountry(const char* localeID, char* country, int32_t countryCapacity, @@ -462,7 +462,7 @@ uloc_getCountry(const char* localeID, * than variantCapacity, the returned variant code will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getVariant(const char* localeID, char* variant, int32_t variantCapacity, @@ -485,7 +485,7 @@ uloc_getVariant(const char* localeID, * than nameCapacity, the returned full name will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getName(const char* localeID, char* name, int32_t nameCapacity, @@ -508,7 +508,7 @@ uloc_getName(const char* localeID, * than nameCapacity, the returned full name will be truncated. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_canonicalize(const char* localeID, char* name, int32_t nameCapacity, @@ -521,7 +521,7 @@ uloc_canonicalize(const char* localeID, * @return language the ISO language code for localeID * @stable ICU 2.0 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_getISO3Language(const char* localeID); @@ -532,7 +532,7 @@ uloc_getISO3Language(const char* localeID); * @return country the ISO country code for localeID * @stable ICU 2.0 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_getISO3Country(const char* localeID); /** @@ -546,26 +546,31 @@ uloc_getISO3Country(const char* localeID); * @return country the Win32 LCID for localeID * @stable ICU 2.0 */ -U_STABLE uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 uloc_getLCID(const char* localeID); /** * Gets the language name suitable for display for the specified locale. * * @param locale the locale to get the ISO language code with - * @param displayLocale Specifies the locale to be used to display the name. In other words, - * if the locale's language code is "en", passing Locale::getFrench() for - * inLocale would result in "Anglais", while passing Locale::getGerman() - * for inLocale would result in "Englisch". + * @param displayLocale Specifies the locale to be used to display the name. In + * other words, if the locale's language code is "en", passing + * Locale::getFrench() for inLocale would result in "Anglais", + * while passing Locale::getGerman() for inLocale would result + * in "Englisch". * @param language the displayable language code for localeID - * @param languageCapacity the size of the language buffer to store the - * displayable language code with - * @param status error information if retrieving the displayable language code failed - * @return the actual buffer size needed for the displayable language code. If it's greater - * than languageCapacity, the returned language code will be truncated. + * @param languageCapacity the size of the language buffer to store the + * displayable language code with. + * @param status error information if retrieving the displayable language code + * failed. U_USING_DEFAULT_WARNING indicates that no data was + * found from the locale resources and a case canonicalized + * language code is placed into language as fallback. + * @return the actual buffer size needed for the displayable language code. If + * it's greater than languageCapacity, the returned language + * code will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayLanguage(const char* locale, const char* displayLocale, UChar* language, @@ -575,20 +580,26 @@ uloc_getDisplayLanguage(const char* locale, /** * Gets the script name suitable for display for the specified locale. * - * @param locale the locale to get the displayable script code with. NULL may be used to specify the default. - * @param displayLocale Specifies the locale to be used to display the name. In other words, - * if the locale's language code is "en", passing Locale::getFrench() for - * inLocale would result in "", while passing Locale::getGerman() - * for inLocale would result in "". NULL may be used to specify the default. - * @param script the displayable script for the localeID - * @param scriptCapacity the size of the script buffer to store the - * displayable script code with - * @param status error information if retrieving the displayable script code failed - * @return the actual buffer size needed for the displayable script code. If it's greater - * than scriptCapacity, the returned displayable script code will be truncated. + * @param locale the locale to get the displayable script code with. NULL may be + * used to specify the default. + * @param displayLocale Specifies the locale to be used to display the name. In + * other words, if the locale's language code is "en", passing + * Locale::getFrench() for inLocale would result in "", while + * passing Locale::getGerman() for inLocale would result in "". + * NULL may be used to specify the default. + * @param script the displayable script for the localeID. + * @param scriptCapacity the size of the script buffer to store the displayable + * script code with. + * @param status error information if retrieving the displayable script code + * failed. U_USING_DEFAULT_WARNING indicates that no data was + * found from the locale resources and a case canonicalized + * script code is placed into script as fallback. + * @return the actual buffer size needed for the displayable script code. If + * it's greater than scriptCapacity, the returned displayable + * script code will be truncated. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayScript(const char* locale, const char* displayLocale, UChar* script, @@ -597,23 +608,30 @@ uloc_getDisplayScript(const char* locale, /** * Gets the country name suitable for display for the specified locale. - * Warning: this is for the region part of a valid locale ID; it cannot just be the region code (like "FR"). - * To get the display name for a region alone, or for other options, use ULocaleDisplayNames instead. + * Warning: this is for the region part of a valid locale ID; it cannot just be + * the region code (like "FR"). To get the display name for a region alone, or + * for other options, use ULocaleDisplayNames instead. * - * @param locale the locale to get the displayable country code with. NULL may be used to specify the default. - * @param displayLocale Specifies the locale to be used to display the name. In other words, - * if the locale's language code is "en", passing Locale::getFrench() for - * inLocale would result in "Anglais", while passing Locale::getGerman() - * for inLocale would result in "Englisch". NULL may be used to specify the default. - * @param country the displayable country code for localeID - * @param countryCapacity the size of the country buffer to store the - * displayable country code with - * @param status error information if retrieving the displayable country code failed - * @return the actual buffer size needed for the displayable country code. If it's greater - * than countryCapacity, the returned displayable country code will be truncated. + * @param locale the locale to get the displayable country code with. NULL may + * be used to specify the default. + * @param displayLocale Specifies the locale to be used to display the name. In + * other words, if the locale's language code is "en", passing + * Locale::getFrench() for inLocale would result in "Anglais", + * while passing Locale::getGerman() for inLocale would result + * in "Englisch". NULL may be used to specify the default. + * @param country the displayable country code for localeID. + * @param countryCapacity the size of the country buffer to store the + * displayable country code with. + * @param status error information if retrieving the displayable country code + * failed. U_USING_DEFAULT_WARNING indicates that no data was + * found from the locale resources and a case canonicalized + * country code is placed into country as fallback. + * @return the actual buffer size needed for the displayable country code. If + * it's greater than countryCapacity, the returned displayable + * country code will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayCountry(const char* locale, const char* displayLocale, UChar* country, @@ -624,20 +642,26 @@ uloc_getDisplayCountry(const char* locale, /** * Gets the variant name suitable for display for the specified locale. * - * @param locale the locale to get the displayable variant code with. NULL may be used to specify the default. - * @param displayLocale Specifies the locale to be used to display the name. In other words, - * if the locale's language code is "en", passing Locale::getFrench() for - * inLocale would result in "Anglais", while passing Locale::getGerman() - * for inLocale would result in "Englisch". NULL may be used to specify the default. - * @param variant the displayable variant code for localeID - * @param variantCapacity the size of the variant buffer to store the - * displayable variant code with - * @param status error information if retrieving the displayable variant code failed - * @return the actual buffer size needed for the displayable variant code. If it's greater - * than variantCapacity, the returned displayable variant code will be truncated. + * @param locale the locale to get the displayable variant code with. NULL may + * be used to specify the default. + * @param displayLocale Specifies the locale to be used to display the name. In + * other words, if the locale's language code is "en", passing + * Locale::getFrench() for inLocale would result in "Anglais", + * while passing Locale::getGerman() for inLocale would result + * in "Englisch". NULL may be used to specify the default. + * @param variant the displayable variant code for localeID. + * @param variantCapacity the size of the variant buffer to store the + * displayable variant code with. + * @param status error information if retrieving the displayable variant code + * failed. U_USING_DEFAULT_WARNING indicates that no data was + * found from the locale resources and a case canonicalized + * variant code is placed into variant as fallback. + * @return the actual buffer size needed for the displayable variant code. If + * it's greater than variantCapacity, the returned displayable + * variant code will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayVariant(const char* locale, const char* displayLocale, UChar* variant, @@ -645,9 +669,9 @@ uloc_getDisplayVariant(const char* locale, UErrorCode* status); /** - * Gets the keyword name suitable for display for the specified locale. - * E.g: for the locale string de_DE\@collation=PHONEBOOK, this API gets the display - * string for the keyword collation. + * Gets the keyword name suitable for display for the specified locale. E.g: + * for the locale string de_DE\@collation=PHONEBOOK, this API gets the display + * string for the keyword collation. * Usage: * * UErrorCode status = U_ZERO_ERROR; @@ -676,15 +700,17 @@ uloc_getDisplayVariant(const char* locale, * for inLocale would result in "Englisch". NULL may be used to specify the default. * @param dest the buffer to which the displayable keyword should be written. * @param destCapacity The size of the buffer (number of UChars). If it is 0, then - * dest may be NULL and the function will only return the length of the + * dest may be NULL and the function will only return the length of the * result without writing any of the result string (pre-flighting). - * @param status error information if retrieving the displayable string failed. + * @param status error information if retrieving the displayable string failed. * Should not be NULL and should not indicate failure on entry. - * @return the actual buffer size needed for the displayable variant code. + * U_USING_DEFAULT_WARNING indicates that no data was found from the locale + * resources and the keyword is placed into dest as fallback. + * @return the actual buffer size needed for the displayable variant code. * @see #uloc_openKeywords * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayKeyword(const char* keyword, const char* displayLocale, UChar* dest, @@ -692,7 +718,7 @@ uloc_getDisplayKeyword(const char* keyword, UErrorCode* status); /** * Gets the value of the keyword suitable for display for the specified locale. - * E.g: for the locale string de_DE\@collation=PHONEBOOK, this API gets the display + * E.g: for the locale string de_DE\@collation=PHONEBOOK, this API gets the display * string for PHONEBOOK, in the display locale, when "collation" is specified as the keyword. * * @param locale The locale to get the displayable variant code with. NULL may be used to specify the default. @@ -703,14 +729,16 @@ uloc_getDisplayKeyword(const char* keyword, * for inLocale would result in "Englisch". NULL may be used to specify the default. * @param dest the buffer to which the displayable keyword should be written. * @param destCapacity The size of the buffer (number of UChars). If it is 0, then - * dest may be NULL and the function will only return the length of the + * dest may be NULL and the function will only return the length of the * result without writing any of the result string (pre-flighting). - * @param status error information if retrieving the displayable string failed. + * @param status error information if retrieving the displayable string failed. * Should not be NULL and must not indicate failure on entry. - * @return the actual buffer size needed for the displayable variant code. + * U_USING_DEFAULT_WARNING indicates that no data was found from the locale + * resources and the value of the keyword is placed into dest as fallback. + * @return the actual buffer size needed for the displayable variant code. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayKeywordValue( const char* locale, const char* keyword, const char* displayLocale, @@ -733,7 +761,7 @@ uloc_getDisplayKeywordValue( const char* locale, * than maxResultSize, the returned displayable name will be truncated. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getDisplayName(const char* localeID, const char* inLocaleID, UChar* result, @@ -757,7 +785,7 @@ uloc_getDisplayName(const char* localeID, * @return a specified locale name of all available locales * @stable ICU 2.0 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_getAvailable(int32_t n); /** @@ -766,21 +794,19 @@ uloc_getAvailable(int32_t n); * @return the size of the locale list * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 uloc_countAvailable(void); - -#ifndef U_HIDE_DRAFT_API +U_CAPI int32_t U_EXPORT2 uloc_countAvailable(void); /** * Types for uloc_getAvailableByType and uloc_countAvailableByType. * - * @draft ICU 65 + * @stable ICU 65 */ typedef enum ULocAvailableType { /** * Locales that return data when passed to ICU APIs, * but not including legacy or alias locales. * - * @draft ICU 65 + * @stable ICU 65 */ ULOC_AVAILABLE_DEFAULT, @@ -798,7 +824,7 @@ typedef enum ULocAvailableType { * ULOC_AVAILABLE_DEFAULT. To get both sets at the same time, use * ULOC_AVAILABLE_WITH_LEGACY_ALIASES. * - * @draft ICU 65 + * @stable ICU 65 */ ULOC_AVAILABLE_ONLY_LEGACY_ALIASES, @@ -806,7 +832,7 @@ typedef enum ULocAvailableType { * The union of the locales in ULOC_AVAILABLE_DEFAULT and * ULOC_AVAILABLE_ONLY_LEGACY_ALIAS. * - * @draft ICU 65 + * @stable ICU 65 */ ULOC_AVAILABLE_WITH_LEGACY_ALIASES, @@ -827,13 +853,11 @@ typedef enum ULocAvailableType { * @param type Type choice from ULocAvailableType. * @param status Set if an error occurred. * @return a UEnumeration owned by the caller, or nullptr on failure. - * @draft ICU 65 + * @stable ICU 65 */ -U_DRAFT UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 uloc_openAvailableByType(ULocAvailableType type, UErrorCode* status); -#endif // U_HIDE_DRAFT_API - /** * * Gets a list of all available 2-letter language codes defined in ISO 639, @@ -845,7 +869,7 @@ uloc_openAvailableByType(ULocAvailableType type, UErrorCode* status); * @return a list of all available language codes * @stable ICU 2.0 */ -U_STABLE const char* const* U_EXPORT2 +U_CAPI const char* const* U_EXPORT2 uloc_getISOLanguages(void); /** @@ -857,7 +881,7 @@ uloc_getISOLanguages(void); * @return a list of all available country codes * @stable ICU 2.0 */ -U_STABLE const char* const* U_EXPORT2 +U_CAPI const char* const* U_EXPORT2 uloc_getISOCountries(void); /** @@ -873,7 +897,7 @@ uloc_getISOCountries(void); * @return The length of the parent locale ID. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getParent(const char* localeID, char* parent, int32_t parentCapacity, @@ -904,7 +928,7 @@ uloc_getParent(const char* localeID, * than nameCapacity, the returned full name will be truncated. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getBaseName(const char* localeID, char* name, int32_t nameCapacity, @@ -919,7 +943,7 @@ uloc_getBaseName(const char* localeID, * @return enumeration of keywords or NULL if there are no keywords. * @stable ICU 2.8 */ -U_STABLE UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 uloc_openKeywords(const char* localeID, UErrorCode* status); @@ -936,7 +960,7 @@ uloc_openKeywords(const char* localeID, * @return the length of keyword value * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getKeywordValue(const char* localeID, const char* keywordName, char* buffer, int32_t bufferCapacity, @@ -973,7 +997,7 @@ uloc_getKeywordValue(const char* localeID, * @see uloc_getKeywordValue * @stable ICU 3.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_setKeywordValue(const char* keywordName, const char* keywordValue, char* buffer, int32_t bufferCapacity, @@ -982,18 +1006,18 @@ uloc_setKeywordValue(const char* keywordName, /** * Returns whether the locale's script is written right-to-left. * If there is no script subtag, then the likely script is used, see uloc_addLikelySubtags(). - * If no likely script is known, then FALSE is returned. + * If no likely script is known, then false is returned. * * A script is right-to-left according to the CLDR script metadata * which corresponds to whether the script's letters have Bidi_Class=R or AL. * - * Returns TRUE for "ar" and "en-Hebr", FALSE for "zh" and "fa-Cyrl". + * Returns true for "ar" and "en-Hebr", false for "zh" and "fa-Cyrl". * * @param locale input locale ID - * @return TRUE if the locale's script is written right-to-left + * @return true if the locale's script is written right-to-left * @stable ICU 54 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uloc_isRightToLeft(const char *locale); /** @@ -1017,7 +1041,7 @@ typedef enum { * @return an enum indicating the layout orientation for characters. * @stable ICU 4.0 */ -U_STABLE ULayoutType U_EXPORT2 +U_CAPI ULayoutType U_EXPORT2 uloc_getCharacterOrientation(const char* localeId, UErrorCode *status); @@ -1029,7 +1053,7 @@ uloc_getCharacterOrientation(const char* localeId, * @return an enum indicating the layout orientation for lines. * @stable ICU 4.0 */ -U_STABLE ULayoutType U_EXPORT2 +U_CAPI ULayoutType U_EXPORT2 uloc_getLineOrientation(const char* localeId, UErrorCode *status); @@ -1076,7 +1100,7 @@ typedef enum { * @return length needed for the locale. * @stable ICU 3.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_acceptLanguageFromHTTP(char *result, int32_t resultAvailable, UAcceptResult *outResult, const char *httpAcceptLanguage, @@ -1101,7 +1125,7 @@ uloc_acceptLanguageFromHTTP(char *result, int32_t resultAvailable, * @return length needed for the locale. * @stable ICU 3.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_acceptLanguage(char *result, int32_t resultAvailable, UAcceptResult *outResult, const char **acceptList, int32_t acceptListCount, @@ -1121,7 +1145,7 @@ uloc_acceptLanguage(char *result, int32_t resultAvailable, * @return actual the actual size of the locale ID, not including NUL-termination * @stable ICU 3.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_getLocaleForLCID(uint32_t hostID, char *locale, int32_t localeCapacity, UErrorCode *status); @@ -1159,7 +1183,7 @@ uloc_getLocaleForLCID(uint32_t hostID, char *locale, int32_t localeCapacity, * On error, the return value is -1. * @stable ICU 4.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_addLikelySubtags(const char* localeID, char* maximizedLocaleID, int32_t maximizedLocaleIDCapacity, @@ -1199,7 +1223,7 @@ uloc_addLikelySubtags(const char* localeID, * On error, the return value is -1. * @stable ICU 4.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_minimizeSubtags(const char* localeID, char* minimizedLocaleID, int32_t minimizedLocaleIDCapacity, @@ -1209,14 +1233,18 @@ uloc_minimizeSubtags(const char* localeID, * Returns a locale ID for the specified BCP47 language tag string. * If the specified language tag contains any ill-formed subtags, * the first such subtag and all following subtags are ignored. - *

    - * This implements the 'Language-Tag' production of BCP47, and so - * supports grandfathered (regular and irregular) as well as private - * use language tags. Private use tags are represented as 'x-whatever', - * and grandfathered tags are converted to their canonical replacements - * where they exist. Note that a few grandfathered tags have no modern - * replacement, these will be converted using the fallback described in + *

    + * This implements the 'Language-Tag' production of BCP 47, and so + * supports legacy language tags (marked as “Type: grandfathered” in BCP 47) + * (regular and irregular) as well as private use language tags. + * + * Private use tags are represented as 'x-whatever', + * and legacy tags are converted to their canonical replacements where they exist. + * + * Note that a few legacy tags have no modern replacement; + * these will be converted using the fallback described in * the first paragraph, so some information might be lost. + * * @param langtag the input BCP47 language tag. * @param localeID the output buffer receiving a locale ID for the * specified BCP47 language tag. @@ -1228,7 +1256,7 @@ uloc_minimizeSubtags(const char* localeID, * @return the length of the locale ID. * @stable ICU 4.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_forLanguageTag(const char* langtag, char* localeID, int32_t localeIDCapacity, @@ -1238,10 +1266,10 @@ uloc_forLanguageTag(const char* langtag, /** * Returns a well-formed language tag for this locale ID. *

    - * Note: When strict is FALSE, any locale + * Note: When strict is false, any locale * fields which do not satisfy the BCP47 syntax requirement will * be omitted from the result. When strict is - * TRUE, this function sets U_ILLEGAL_ARGUMENT_ERROR to the + * true, this function sets U_ILLEGAL_ARGUMENT_ERROR to the * err if any locale fields do not satisfy the * BCP47 syntax requirement. * @param localeID the input locale ID @@ -1256,7 +1284,7 @@ uloc_forLanguageTag(const char* langtag, * @return The length of the BCP47 language tag. * @stable ICU 4.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uloc_toLanguageTag(const char* localeID, char* langtag, int32_t langtagCapacity, @@ -1284,7 +1312,7 @@ uloc_toLanguageTag(const char* localeID, * @see uloc_toLegacyKey * @stable ICU 54 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_toUnicodeLocaleKey(const char* keyword); /** @@ -1315,7 +1343,7 @@ uloc_toUnicodeLocaleKey(const char* keyword); * @see uloc_toLegacyType * @stable ICU 54 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_toUnicodeLocaleType(const char* keyword, const char* value); /** @@ -1330,7 +1358,7 @@ uloc_toUnicodeLocaleType(const char* keyword, const char* value); * @see toUnicodeLocaleKey * @stable ICU 54 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_toLegacyKey(const char* keyword); /** @@ -1359,7 +1387,7 @@ uloc_toLegacyKey(const char* keyword); * @see toUnicodeLocaleType * @stable ICU 54 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uloc_toLegacyType(const char* keyword, const char* value); #endif /*_ULOC*/ diff --git a/intl/icu/source/common/unicode/umachine.h b/intl/icu/source/common/unicode/umachine.h index 1d85855ac9dd..09c887c80efd 100644 --- a/intl/icu/source/common/unicode/umachine.h +++ b/intl/icu/source/common/unicode/umachine.h @@ -49,12 +49,13 @@ * ANSI C headers: * stddef.h defines wchar_t */ +#include #include /*==========================================================================*/ -/* For C wrappers, we use the symbol U_STABLE. */ +/* For C wrappers, we use the symbol U_CAPI. */ /* This works properly if the includer is C or C++. */ -/* Functions are declared U_STABLE return-type U_EXPORT2 function-name()... */ +/* Functions are declared U_CAPI return-type U_EXPORT2 function-name()... */ /*==========================================================================*/ /** @@ -107,15 +108,15 @@ /** This is used to declare a function as a public ICU C API @stable ICU 2.0*/ #define U_CAPI U_CFUNC U_EXPORT -/** This is used to declare a function as a stable public ICU C API*/ +/** Obsolete/same as U_CAPI; was used to declare a function as a stable public ICU C API*/ #define U_STABLE U_CAPI -/** This is used to declare a function as a draft public ICU C API */ +/** Obsolete/same as U_CAPI; was used to declare a function as a draft public ICU C API */ #define U_DRAFT U_CAPI /** This is used to declare a function as a deprecated public ICU C API */ #define U_DEPRECATED U_CAPI U_ATTRIBUTE_DEPRECATED -/** This is used to declare a function as an obsolete public ICU C API */ +/** Obsolete/same as U_CAPI; was used to declare a function as an obsolete public ICU C API */ #define U_OBSOLETE U_CAPI -/** This is used to declare a function as an internal ICU C API */ +/** Obsolete/same as U_CAPI; was used to declare a function as an internal ICU C API */ #define U_INTERNAL U_CAPI /** @@ -170,11 +171,11 @@ /** * \def UPRV_BLOCK_MACRO_END - * Defined as "while (FALSE)" by default. + * Defined as "while (false)" by default. * @internal */ #ifndef UPRV_BLOCK_MACRO_END -#define UPRV_BLOCK_MACRO_END while (FALSE) +#define UPRV_BLOCK_MACRO_END while (false) #endif /*==========================================================================*/ @@ -257,18 +258,59 @@ /* Boolean data type */ /*==========================================================================*/ -/** The ICU boolean type @stable ICU 2.0 */ +/** + * The ICU boolean type, a signed-byte integer. + * ICU-specific for historical reasons: The C and C++ standards used to not define type bool. + * Also provides a fixed type definition, as opposed to + * type bool whose details (e.g., sizeof) may vary by compiler and between C and C++. + * + * @stable ICU 2.0 + */ typedef int8_t UBool; +/** + * \def U_DEFINE_FALSE_AND_TRUE + * Normally turns off defining macros FALSE=0 & TRUE=1 in public ICU headers. + * These obsolete macros sometimes break compilation of other code that + * defines enum constants or similar with these names. + * C++ has long defined bool/false/true. + * C99 also added definitions for these, although as macros; see stdbool.h. + * + * You may transitionally define U_DEFINE_FALSE_AND_TRUE=1 if you need time to migrate code. + * + * @internal ICU 68 + */ +#ifdef U_DEFINE_FALSE_AND_TRUE + // Use the predefined value. +#elif defined(U_COMBINED_IMPLEMENTATION) || \ + defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || \ + defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION) || \ + defined(U_TOOLUTIL_IMPLEMENTATION) + // Inside ICU: Keep FALSE & TRUE available. +# define U_DEFINE_FALSE_AND_TRUE 1 +#else + // Outside ICU: Avoid collision with non-macro definitions of FALSE & TRUE. +# define U_DEFINE_FALSE_AND_TRUE 0 +#endif + +#if U_DEFINE_FALSE_AND_TRUE || defined(U_IN_DOXYGEN) #ifndef TRUE -/** The TRUE value of a UBool @stable ICU 2.0 */ +/** + * The TRUE value of a UBool. + * + * @deprecated ICU 68 Use standard "true" instead. + */ # define TRUE 1 #endif #ifndef FALSE -/** The FALSE value of a UBool @stable ICU 2.0 */ +/** + * The FALSE value of a UBool. + * + * @deprecated ICU 68 Use standard "false" instead. + */ # define FALSE 0 #endif - +#endif // U_DEFINE_FALSE_AND_TRUE /*==========================================================================*/ /* Unicode data types */ diff --git a/intl/icu/source/common/unicode/umutablecptrie.h b/intl/icu/source/common/unicode/umutablecptrie.h index f2af36477d53..5325d58147ab 100644 --- a/intl/icu/source/common/unicode/umutablecptrie.h +++ b/intl/icu/source/common/unicode/umutablecptrie.h @@ -9,11 +9,14 @@ #include "unicode/utypes.h" -#include "unicode/localpointer.h" #include "unicode/ucpmap.h" #include "unicode/ucptrie.h" #include "unicode/utf8.h" +#if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API + U_CDECL_BEGIN /** diff --git a/intl/icu/source/common/unicode/unimatch.h b/intl/icu/source/common/unicode/unimatch.h index 5a192b1b427d..302332f4558c 100644 --- a/intl/icu/source/common/unicode/unimatch.h +++ b/intl/icu/source/common/unicode/unimatch.h @@ -115,11 +115,11 @@ public: * considered for matching will be text.charAt(limit-1) in the * forward direction or text.charAt(limit+1) in the backward * direction. - * @param incremental if TRUE, then assume further characters may + * @param incremental if true, then assume further characters may * be inserted at limit and check for partial matching. Otherwise * assume the text as given is complete. * @return a match degree value indicating a full match, a partial - * match, or a mismatch. If incremental is FALSE then + * match, or a mismatch. If incremental is false then * U_PARTIAL_MATCH should never be returned. * @stable ICU 2.4 */ @@ -134,17 +134,17 @@ public: * will produce another matcher that is equal to this one. * @param result the string to receive the pattern. Previous * contents will be deleted. - * @param escapeUnprintable if TRUE then convert unprintable + * @param escapeUnprintable if true then convert unprintable * character to their hex escape representations, \\uxxxx or * \\Uxxxxxxxx. Unprintable characters are those other than * U+000A, U+0020..U+007E. * @stable ICU 2.4 */ virtual UnicodeString& toPattern(UnicodeString& result, - UBool escapeUnprintable = FALSE) const = 0; + UBool escapeUnprintable = false) const = 0; /** - * Returns TRUE if this matcher will match a character c, where c + * Returns true if this matcher will match a character c, where c * & 0xFF == v, at offset, in the forward direction (with limit > * offset). This is used by RuleBasedTransliterator for * indexing. diff --git a/intl/icu/source/common/unicode/uniset.h b/intl/icu/source/common/unicode/uniset.h index 974231100353..50b6360f3a79 100644 --- a/intl/icu/source/common/unicode/uniset.h +++ b/intl/icu/source/common/unicode/uniset.h @@ -325,7 +325,7 @@ public: * A bogus set has no value. It is different from an empty set. * It can be used to indicate that no set value is available. * - * @return TRUE if the set is bogus/invalid, FALSE otherwise + * @return true if the set is bogus/invalid, false otherwise * @see setToBogus() * @stable ICU 4.0 */ @@ -333,7 +333,7 @@ public: /** * Make this UnicodeSet object invalid. - * The string will test TRUE with isBogus(). + * The string will test true with isBogus(). * * A bogus set has no value. It is different from an empty set. * It can be used to indicate that no set value is available. @@ -563,7 +563,7 @@ public: /** * Determines whether the set has been frozen (made immutable) or not. * See the ICU4J Freezable interface for details. - * @return TRUE/FALSE for whether the set has been frozen + * @return true/false for whether the set has been frozen * @see freeze * @see cloneAsThawed * @stable ICU 3.8 @@ -700,14 +700,14 @@ public: * A frozen set will not be modified. * @param result the string to receive the rules. Previous * contents will be deleted. - * @param escapeUnprintable if TRUE then convert unprintable + * @param escapeUnprintable if true then convert unprintable * character to their hex escape representations, \\uxxxx or * \\Uxxxxxxxx. Unprintable characters are those other than * U+000A, U+0020..U+007E. * @stable ICU 2.0 */ virtual UnicodeString& toPattern(UnicodeString& result, - UBool escapeUnprintable = FALSE) const; + UBool escapeUnprintable = false) const; /** * Modifies this set to contain those code points which have the given value @@ -1636,7 +1636,7 @@ private: static const UnicodeSet* getInclusions(int32_t src, UErrorCode &status); /** - * A filter that returns TRUE if the given code point should be + * A filter that returns true if the given code point should be * included in the UnicodeSet being constructed. */ typedef UBool (*Filter)(UChar32 codePoint, void* context); diff --git a/intl/icu/source/common/unicode/unistr.h b/intl/icu/source/common/unicode/unistr.h index da79053765ac..456389f265fe 100644 --- a/intl/icu/source/common/unicode/unistr.h +++ b/intl/icu/source/common/unicode/unistr.h @@ -45,7 +45,7 @@ struct UConverter; // unicode/ucnv.h /** * \ingroup ustring_ustrlen */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strlen(const UChar *s); #endif @@ -113,9 +113,9 @@ class UnicodeStringAppendable; // unicode/appendable.h * @stable ICU 2.0 */ #if !U_CHAR16_IS_TYPEDEF -# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, u ## cs, _length) +# define UNICODE_STRING(cs, _length) icu::UnicodeString(true, u ## cs, _length) #else -# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t*)u ## cs, _length) +# define UNICODE_STRING(cs, _length) icu::UnicodeString(true, (const char16_t*)u ## cs, _length) #endif /** @@ -227,7 +227,7 @@ class UnicodeStringAppendable; // unicode/appendable.h * The UnicodeString class is not suitable for subclassing. * * For an overview of Unicode strings in C and C++ see the - * [User Guide Strings chapter](http://userguide.icu-project.org/strings#TOC-Strings-in-C-C-). + * [User Guide Strings chapter](https://unicode-org.github.io/icu/userguide/strings#strings-in-cc). * * In ICU, a Unicode string consists of 16-bit Unicode *code units*. * A Unicode character may be stored with either one code unit @@ -285,7 +285,7 @@ class UnicodeStringAppendable; // unicode/appendable.h * significant performance improvements. * Also, the internal buffer is accessible via special functions. * For details see the - * [User Guide Strings chapter](http://userguide.icu-project.org/strings#TOC-Maximizing-Performance-with-the-UnicodeString-Storage-Model). + * [User Guide Strings chapter](https://unicode-org.github.io/icu/userguide/strings#maximizing-performance-with-the-unicodestring-storage-model). * * @see utf.h * @see CharacterIterator @@ -320,8 +320,8 @@ public: /** * Equality operator. Performs only bitwise comparison. * @param text The UnicodeString to compare to this one. - * @return TRUE if `text` contains the same characters as this one, - * FALSE otherwise. + * @return true if `text` contains the same characters as this one, + * false otherwise. * @stable ICU 2.0 */ inline UBool operator== (const UnicodeString& text) const; @@ -329,8 +329,8 @@ public: /** * Inequality operator. Performs only bitwise comparison. * @param text The UnicodeString to compare to this one. - * @return FALSE if `text` contains the same characters as this one, - * TRUE otherwise. + * @return false if `text` contains the same characters as this one, + * true otherwise. * @stable ICU 2.0 */ inline UBool operator!= (const UnicodeString& text) const; @@ -338,8 +338,8 @@ public: /** * Greater than operator. Performs only bitwise comparison. * @param text The UnicodeString to compare to this one. - * @return TRUE if the characters in this are bitwise - * greater than the characters in `text`, FALSE otherwise + * @return true if the characters in this are bitwise + * greater than the characters in `text`, false otherwise * @stable ICU 2.0 */ inline UBool operator> (const UnicodeString& text) const; @@ -347,8 +347,8 @@ public: /** * Less than operator. Performs only bitwise comparison. * @param text The UnicodeString to compare to this one. - * @return TRUE if the characters in this are bitwise - * less than the characters in `text`, FALSE otherwise + * @return true if the characters in this are bitwise + * less than the characters in `text`, false otherwise * @stable ICU 2.0 */ inline UBool operator< (const UnicodeString& text) const; @@ -356,8 +356,8 @@ public: /** * Greater than or equal operator. Performs only bitwise comparison. * @param text The UnicodeString to compare to this one. - * @return TRUE if the characters in this are bitwise - * greater than or equal to the characters in `text`, FALSE otherwise + * @return true if the characters in this are bitwise + * greater than or equal to the characters in `text`, false otherwise * @stable ICU 2.0 */ inline UBool operator>= (const UnicodeString& text) const; @@ -365,8 +365,8 @@ public: /** * Less than or equal operator. Performs only bitwise comparison. * @param text The UnicodeString to compare to this one. - * @return TRUE if the characters in this are bitwise - * less than or equal to the characters in `text`, FALSE otherwise + * @return true if the characters in this are bitwise + * less than or equal to the characters in `text`, false otherwise * @stable ICU 2.0 */ inline UBool operator<= (const UnicodeString& text) const; @@ -855,8 +855,8 @@ public: /** * Determine if this starts with the characters in `text` * @param text The text to match. - * @return TRUE if this starts with the characters in `text`, - * FALSE otherwise + * @return true if this starts with the characters in `text`, + * false otherwise * @stable ICU 2.0 */ inline UBool startsWith(const UnicodeString& text) const; @@ -867,8 +867,8 @@ public: * @param srcText The text to match. * @param srcStart the offset into `srcText` to start matching * @param srcLength the number of characters in `srcText` to match - * @return TRUE if this starts with the characters in `text`, - * FALSE otherwise + * @return true if this starts with the characters in `text`, + * false otherwise * @stable ICU 2.0 */ inline UBool startsWith(const UnicodeString& srcText, @@ -879,8 +879,8 @@ public: * Determine if this starts with the characters in `srcChars` * @param srcChars The characters to match. * @param srcLength the number of characters in `srcChars` - * @return TRUE if this starts with the characters in `srcChars`, - * FALSE otherwise + * @return true if this starts with the characters in `srcChars`, + * false otherwise * @stable ICU 2.0 */ inline UBool startsWith(ConstChar16Ptr srcChars, @@ -892,7 +892,7 @@ public: * @param srcChars The characters to match. * @param srcStart the offset into `srcText` to start matching * @param srcLength the number of characters in `srcChars` to match - * @return TRUE if this ends with the characters in `srcChars`, FALSE otherwise + * @return true if this ends with the characters in `srcChars`, false otherwise * @stable ICU 2.0 */ inline UBool startsWith(const char16_t *srcChars, @@ -902,8 +902,8 @@ public: /** * Determine if this ends with the characters in `text` * @param text The text to match. - * @return TRUE if this ends with the characters in `text`, - * FALSE otherwise + * @return true if this ends with the characters in `text`, + * false otherwise * @stable ICU 2.0 */ inline UBool endsWith(const UnicodeString& text) const; @@ -914,8 +914,8 @@ public: * @param srcText The text to match. * @param srcStart the offset into `srcText` to start matching * @param srcLength the number of characters in `srcText` to match - * @return TRUE if this ends with the characters in `text`, - * FALSE otherwise + * @return true if this ends with the characters in `text`, + * false otherwise * @stable ICU 2.0 */ inline UBool endsWith(const UnicodeString& srcText, @@ -926,8 +926,8 @@ public: * Determine if this ends with the characters in `srcChars` * @param srcChars The characters to match. * @param srcLength the number of characters in `srcChars` - * @return TRUE if this ends with the characters in `srcChars`, - * FALSE otherwise + * @return true if this ends with the characters in `srcChars`, + * false otherwise * @stable ICU 2.0 */ inline UBool endsWith(ConstChar16Ptr srcChars, @@ -939,8 +939,8 @@ public: * @param srcChars The characters to match. * @param srcStart the offset into `srcText` to start matching * @param srcLength the number of characters in `srcChars` to match - * @return TRUE if this ends with the characters in `srcChars`, - * FALSE otherwise + * @return true if this ends with the characters in `srcChars`, + * false otherwise * @stable ICU 2.0 */ inline UBool endsWith(const char16_t *srcChars, @@ -1804,7 +1804,7 @@ public: /** * Determine if this string is empty. - * @return TRUE if this string contains 0 characters, FALSE otherwise. + * @return true if this string contains 0 characters, false otherwise. * @stable ICU 2.0 */ inline UBool isEmpty(void) const; @@ -1832,12 +1832,12 @@ public: /** * Determine if this object contains a valid string. * A bogus string has no value. It is different from an empty string, - * although in both cases isEmpty() returns TRUE and length() returns 0. + * although in both cases isEmpty() returns true and length() returns 0. * setToBogus() and isBogus() can be used to indicate that no string value is available. * For a bogus string, getBuffer() and getTerminatedBuffer() return NULL, and * length() returns 0. * - * @return TRUE if the string is bogus/invalid, FALSE otherwise + * @return true if the string is bogus/invalid, false otherwise * @see setToBogus() * @stable ICU 2.0 */ @@ -2067,7 +2067,7 @@ public: /** * Make this UnicodeString object invalid. - * The string will test TRUE with isBogus(). + * The string will test true with isBogus(). * * A bogus string has no value. It is different from an empty string. * It can be used to indicate that no string value is available. @@ -2459,7 +2459,7 @@ public: /** * Replaceable API - * @return TRUE if it has MetaData + * @return true if it has MetaData * @stable ICU 2.4 */ virtual UBool hasMetaData() const; @@ -2590,7 +2590,7 @@ public: * @param targetLength the desired length of the string * @param padChar the character to use for padding. Defaults to * space (U+0020) - * @return TRUE if the text was padded, FALSE otherwise. + * @return true if the text was padded, false otherwise. * @stable ICU 2.0 */ UBool padLeading(int32_t targetLength, @@ -2604,7 +2604,7 @@ public: * @param targetLength the desired length of the string * @param padChar the character to use for padding. Defaults to * space (U+0020) - * @return TRUE if the text was padded, FALSE otherwise. + * @return true if the text was padded, false otherwise. * @stable ICU 2.0 */ UBool padTrailing(int32_t targetLength, @@ -2613,7 +2613,7 @@ public: /** * Truncate this UnicodeString to the `targetLength`. * @param targetLength the desired length of this UnicodeString. - * @return TRUE if the text was truncated, FALSE otherwise + * @return true if the text was truncated, false otherwise * @stable ICU 2.0 */ inline UBool truncate(int32_t targetLength); @@ -3615,7 +3615,7 @@ private: void unBogus(); // implements assigment operator, copy constructor, and fastCopyFrom() - UnicodeString ©From(const UnicodeString &src, UBool fastCopy=FALSE); + UnicodeString ©From(const UnicodeString &src, UBool fastCopy=false); // Copies just the fields without memory management. void copyFieldsFrom(UnicodeString &src, UBool setSrcToBogus) U_NOEXCEPT; @@ -3668,13 +3668,13 @@ private: * the buffer is refCounted (shared), and refCount>1, or * the buffer is too small. * - * Return FALSE if memory could not be allocated. + * Return false if memory could not be allocated. */ UBool cloneArrayIfNeeded(int32_t newCapacity = -1, int32_t growCapacity = -1, - UBool doCopyArray = TRUE, + UBool doCopyArray = true, int32_t **pBufferToDelete = 0, - UBool forceClone = FALSE); + UBool forceClone = false); /** * Common function for UnicodeString case mappings. @@ -4732,12 +4732,12 @@ UnicodeString::truncate(int32_t targetLength) if(isBogus() && targetLength == 0) { // truncate(0) of a bogus string makes the string empty and non-bogus unBogus(); - return FALSE; + return false; } else if((uint32_t)targetLength < (uint32_t)length()) { setLength(targetLength); - return TRUE; + return true; } else { - return FALSE; + return false; } } diff --git a/intl/icu/source/common/unicode/unorm.h b/intl/icu/source/common/unicode/unorm.h index 09dd366a968c..c3c57582d449 100644 --- a/intl/icu/source/common/unicode/unorm.h +++ b/intl/icu/source/common/unicode/unorm.h @@ -274,7 +274,7 @@ unorm_quickCheckWithOptions(const UChar *src, int32_t srcLength, * never a "maybe". * For NFD, NFKD, and FCD, both functions work exactly the same. * For NFC and NFKC where quickCheck may return "maybe", this function will - * perform further tests to arrive at a TRUE/FALSE result. + * perform further tests to arrive at a true/false result. * * @param src String that is to be tested if it is in a normalization format. * @param srcLength Length of source to test, or -1 if NUL-terminated. @@ -358,10 +358,10 @@ unorm_isNormalizedWithOptions(const UChar *src, int32_t srcLength, * It is useful for operations like a normalizing transliterator, where one would * not want to replace a piece of text if it is not modified. * - * If doNormalize==TRUE and pNeededToNormalize!=NULL then *pNeeded... is set TRUE + * If doNormalize==true and pNeededToNormalize!=NULL then *pNeeded... is set true * if the normalization was necessary. * - * If doNormalize==FALSE then *pNeededToNormalize will be set to FALSE. + * If doNormalize==false then *pNeededToNormalize will be set to false. * * If the buffer overflows, then *pNeededToNormalize will be undefined; * essentially, whenever U_FAILURE is true (like in buffer overflows), this result @@ -373,11 +373,11 @@ unorm_isNormalizedWithOptions(const UChar *src, int32_t srcLength, * @param mode The normalization mode. * @param options The normalization options, ORed together (0 for no options). * @param doNormalize Indicates if the source text up to the next boundary - * is to be normalized (TRUE) or just copied (FALSE). + * is to be normalized (true) or just copied (false). * @param pNeededToNormalize Output flag indicating if the normalization resulted in * different text from the input. * Not defined if an error occurs including buffer overflow. - * Always FALSE if !doNormalize. + * Always false if !doNormalize. * @param pErrorCode ICU error code in/out parameter. * Must fulfill U_SUCCESS before the function call. * @return Length of output (number of UChars) when successful or buffer overflow. @@ -406,11 +406,11 @@ unorm_next(UCharIterator *src, * @param mode The normalization mode. * @param options The normalization options, ORed together (0 for no options). * @param doNormalize Indicates if the source text up to the next boundary - * is to be normalized (TRUE) or just copied (FALSE). + * is to be normalized (true) or just copied (false). * @param pNeededToNormalize Output flag indicating if the normalization resulted in * different text from the input. * Not defined if an error occurs including buffer overflow. - * Always FALSE if !doNormalize. + * Always false if !doNormalize. * @param pErrorCode ICU error code in/out parameter. * Must fulfill U_SUCCESS before the function call. * @return Length of output (number of UChars) when successful or buffer overflow. diff --git a/intl/icu/source/common/unicode/unorm2.h b/intl/icu/source/common/unicode/unorm2.h index a9bd02f25636..24417b7103c1 100644 --- a/intl/icu/source/common/unicode/unorm2.h +++ b/intl/icu/source/common/unicode/unorm2.h @@ -31,10 +31,13 @@ */ #include "unicode/utypes.h" -#include "unicode/localpointer.h" #include "unicode/stringoptions.h" #include "unicode/uset.h" +#if U_SHOW_CPLUSPLUS_API +#include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API + /** * Constants for normalization modes. * For details about standard Unicode normalization forms @@ -132,7 +135,7 @@ typedef struct UNormalizer2 UNormalizer2; /**< C typedef for struct UNormalizer * @return the requested Normalizer2, if successful * @stable ICU 49 */ -U_STABLE const UNormalizer2 * U_EXPORT2 +U_CAPI const UNormalizer2 * U_EXPORT2 unorm2_getNFCInstance(UErrorCode *pErrorCode); /** @@ -146,7 +149,7 @@ unorm2_getNFCInstance(UErrorCode *pErrorCode); * @return the requested Normalizer2, if successful * @stable ICU 49 */ -U_STABLE const UNormalizer2 * U_EXPORT2 +U_CAPI const UNormalizer2 * U_EXPORT2 unorm2_getNFDInstance(UErrorCode *pErrorCode); /** @@ -160,7 +163,7 @@ unorm2_getNFDInstance(UErrorCode *pErrorCode); * @return the requested Normalizer2, if successful * @stable ICU 49 */ -U_STABLE const UNormalizer2 * U_EXPORT2 +U_CAPI const UNormalizer2 * U_EXPORT2 unorm2_getNFKCInstance(UErrorCode *pErrorCode); /** @@ -174,7 +177,7 @@ unorm2_getNFKCInstance(UErrorCode *pErrorCode); * @return the requested Normalizer2, if successful * @stable ICU 49 */ -U_STABLE const UNormalizer2 * U_EXPORT2 +U_CAPI const UNormalizer2 * U_EXPORT2 unorm2_getNFKDInstance(UErrorCode *pErrorCode); /** @@ -188,7 +191,7 @@ unorm2_getNFKDInstance(UErrorCode *pErrorCode); * @return the requested Normalizer2, if successful * @stable ICU 49 */ -U_STABLE const UNormalizer2 * U_EXPORT2 +U_CAPI const UNormalizer2 * U_EXPORT2 unorm2_getNFKCCasefoldInstance(UErrorCode *pErrorCode); /** @@ -212,7 +215,7 @@ unorm2_getNFKCCasefoldInstance(UErrorCode *pErrorCode); * @return the requested UNormalizer2, if successful * @stable ICU 4.4 */ -U_STABLE const UNormalizer2 * U_EXPORT2 +U_CAPI const UNormalizer2 * U_EXPORT2 unorm2_getInstance(const char *packageName, const char *name, UNormalization2Mode mode, @@ -233,7 +236,7 @@ unorm2_getInstance(const char *packageName, * @return the requested UNormalizer2, if successful * @stable ICU 4.4 */ -U_STABLE UNormalizer2 * U_EXPORT2 +U_CAPI UNormalizer2 * U_EXPORT2 unorm2_openFiltered(const UNormalizer2 *norm2, const USet *filterSet, UErrorCode *pErrorCode); /** @@ -242,7 +245,7 @@ unorm2_openFiltered(const UNormalizer2 *norm2, const USet *filterSet, UErrorCode * @param norm2 UNormalizer2 instance to be closed * @stable ICU 4.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 unorm2_close(UNormalizer2 *norm2); #if U_SHOW_CPLUSPLUS_API @@ -280,7 +283,7 @@ U_NAMESPACE_END * @return dest * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm2_normalize(const UNormalizer2 *norm2, const UChar *src, int32_t length, UChar *dest, int32_t capacity, @@ -303,7 +306,7 @@ unorm2_normalize(const UNormalizer2 *norm2, * @return first * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm2_normalizeSecondAndAppend(const UNormalizer2 *norm2, UChar *first, int32_t firstLength, int32_t firstCapacity, const UChar *second, int32_t secondLength, @@ -326,7 +329,7 @@ unorm2_normalizeSecondAndAppend(const UNormalizer2 *norm2, * @return first * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm2_append(const UNormalizer2 *norm2, UChar *first, int32_t firstLength, int32_t firstCapacity, const UChar *second, int32_t secondLength, @@ -351,7 +354,7 @@ unorm2_append(const UNormalizer2 *norm2, * @return the non-negative length of c's decomposition, if there is one; otherwise a negative value * @stable ICU 4.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm2_getDecomposition(const UNormalizer2 *norm2, UChar32 c, UChar *decomposition, int32_t capacity, UErrorCode *pErrorCode); @@ -385,7 +388,7 @@ unorm2_getDecomposition(const UNormalizer2 *norm2, * @return the non-negative length of c's raw decomposition, if there is one; otherwise a negative value * @stable ICU 49 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm2_getRawDecomposition(const UNormalizer2 *norm2, UChar32 c, UChar *decomposition, int32_t capacity, UErrorCode *pErrorCode); @@ -405,7 +408,7 @@ unorm2_getRawDecomposition(const UNormalizer2 *norm2, * @return The non-negative composite code point if there is one; otherwise a negative value. * @stable ICU 49 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b); /** @@ -417,7 +420,7 @@ unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b); * @return c's combining class * @stable ICU 49 */ -U_STABLE uint8_t U_EXPORT2 +U_CAPI uint8_t U_EXPORT2 unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c); /** @@ -433,10 +436,10 @@ unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c); * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with * function chaining. (See User Guide for details.) - * @return TRUE if s is normalized + * @return true if s is normalized * @stable ICU 4.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 unorm2_isNormalized(const UNormalizer2 *norm2, const UChar *s, int32_t length, UErrorCode *pErrorCode); @@ -458,7 +461,7 @@ unorm2_isNormalized(const UNormalizer2 *norm2, * @return UNormalizationCheckResult * @stable ICU 4.4 */ -U_STABLE UNormalizationCheckResult U_EXPORT2 +U_CAPI UNormalizationCheckResult U_EXPORT2 unorm2_quickCheck(const UNormalizer2 *norm2, const UChar *s, int32_t length, UErrorCode *pErrorCode); @@ -487,7 +490,7 @@ unorm2_quickCheck(const UNormalizer2 *norm2, * @return "yes" span end index * @stable ICU 4.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm2_spanQuickCheckYes(const UNormalizer2 *norm2, const UChar *s, int32_t length, UErrorCode *pErrorCode); @@ -498,10 +501,10 @@ unorm2_spanQuickCheckYes(const UNormalizer2 *norm2, * For details see the Normalizer2 base class documentation. * @param norm2 UNormalizer2 instance * @param c character to test - * @return TRUE if c has a normalization boundary before it + * @return true if c has a normalization boundary before it * @stable ICU 4.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 unorm2_hasBoundaryBefore(const UNormalizer2 *norm2, UChar32 c); /** @@ -510,10 +513,10 @@ unorm2_hasBoundaryBefore(const UNormalizer2 *norm2, UChar32 c); * For details see the Normalizer2 base class documentation. * @param norm2 UNormalizer2 instance * @param c character to test - * @return TRUE if c has a normalization boundary after it + * @return true if c has a normalization boundary after it * @stable ICU 4.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 unorm2_hasBoundaryAfter(const UNormalizer2 *norm2, UChar32 c); /** @@ -521,10 +524,10 @@ unorm2_hasBoundaryAfter(const UNormalizer2 *norm2, UChar32 c); * For details see the Normalizer2 base class documentation. * @param norm2 UNormalizer2 instance * @param c character to test - * @return TRUE if c is normalization-inert + * @return true if c is normalization-inert * @stable ICU 4.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 unorm2_isInert(const UNormalizer2 *norm2, UChar32 c); /** @@ -593,7 +596,7 @@ unorm2_isInert(const UNormalizer2 *norm2, UChar32 c); * * @stable ICU 2.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 unorm_compare(const UChar *s1, int32_t length1, const UChar *s2, int32_t length2, uint32_t options, diff --git a/intl/icu/source/common/unicode/urename.h b/intl/icu/source/common/unicode/urename.h index 30f4b7af39ad..fe59fdd893d9 100644 --- a/intl/icu/source/common/unicode/urename.h +++ b/intl/icu/source/common/unicode/urename.h @@ -130,7 +130,6 @@ #define izrule_getStaticClassID U_ICU_ENTRY_POINT_RENAME(izrule_getStaticClassID) #define izrule_isEquivalentTo U_ICU_ENTRY_POINT_RENAME(izrule_isEquivalentTo) #define izrule_open U_ICU_ENTRY_POINT_RENAME(izrule_open) -#define locale_getKeywords U_ICU_ENTRY_POINT_RENAME(locale_getKeywords) #define locale_getKeywordsStart U_ICU_ENTRY_POINT_RENAME(locale_getKeywordsStart) #define locale_get_default U_ICU_ENTRY_POINT_RENAME(locale_get_default) #define locale_set_default U_ICU_ENTRY_POINT_RENAME(locale_set_default) @@ -918,9 +917,11 @@ #define udtitvfmt_format U_ICU_ENTRY_POINT_RENAME(udtitvfmt_format) #define udtitvfmt_formatCalendarToResult U_ICU_ENTRY_POINT_RENAME(udtitvfmt_formatCalendarToResult) #define udtitvfmt_formatToResult U_ICU_ENTRY_POINT_RENAME(udtitvfmt_formatToResult) +#define udtitvfmt_getContext U_ICU_ENTRY_POINT_RENAME(udtitvfmt_getContext) #define udtitvfmt_open U_ICU_ENTRY_POINT_RENAME(udtitvfmt_open) #define udtitvfmt_openResult U_ICU_ENTRY_POINT_RENAME(udtitvfmt_openResult) #define udtitvfmt_resultAsValue U_ICU_ENTRY_POINT_RENAME(udtitvfmt_resultAsValue) +#define udtitvfmt_setContext U_ICU_ENTRY_POINT_RENAME(udtitvfmt_setContext) #define uenum_close U_ICU_ENTRY_POINT_RENAME(uenum_close) #define uenum_count U_ICU_ENTRY_POINT_RENAME(uenum_count) #define uenum_next U_ICU_ENTRY_POINT_RENAME(uenum_next) @@ -1079,7 +1080,6 @@ #define uloc_getDisplayLanguage U_ICU_ENTRY_POINT_RENAME(uloc_getDisplayLanguage) #define uloc_getDisplayName U_ICU_ENTRY_POINT_RENAME(uloc_getDisplayName) #define uloc_getDisplayScript U_ICU_ENTRY_POINT_RENAME(uloc_getDisplayScript) -#define uloc_getDisplayScriptInContext U_ICU_ENTRY_POINT_RENAME(uloc_getDisplayScriptInContext) #define uloc_getDisplayVariant U_ICU_ENTRY_POINT_RENAME(uloc_getDisplayVariant) #define uloc_getISO3Country U_ICU_ENTRY_POINT_RENAME(uloc_getISO3Country) #define uloc_getISO3Language U_ICU_ENTRY_POINT_RENAME(uloc_getISO3Language) @@ -1123,16 +1123,21 @@ #define ulocimp_forLanguageTag U_ICU_ENTRY_POINT_RENAME(ulocimp_forLanguageTag) #define ulocimp_getBaseName U_ICU_ENTRY_POINT_RENAME(ulocimp_getBaseName) #define ulocimp_getCountry U_ICU_ENTRY_POINT_RENAME(ulocimp_getCountry) +#define ulocimp_getKeywordValue U_ICU_ENTRY_POINT_RENAME(ulocimp_getKeywordValue) +#define ulocimp_getKeywords U_ICU_ENTRY_POINT_RENAME(ulocimp_getKeywords) +#define ulocimp_getKnownCanonicalizedLocaleForTest U_ICU_ENTRY_POINT_RENAME(ulocimp_getKnownCanonicalizedLocaleForTest) #define ulocimp_getLanguage U_ICU_ENTRY_POINT_RENAME(ulocimp_getLanguage) #define ulocimp_getName U_ICU_ENTRY_POINT_RENAME(ulocimp_getName) #define ulocimp_getRegionForSupplementalData U_ICU_ENTRY_POINT_RENAME(ulocimp_getRegionForSupplementalData) #define ulocimp_getScript U_ICU_ENTRY_POINT_RENAME(ulocimp_getScript) +#define ulocimp_isCanonicalizedLocaleForTest U_ICU_ENTRY_POINT_RENAME(ulocimp_isCanonicalizedLocaleForTest) #define ulocimp_minimizeSubtags U_ICU_ENTRY_POINT_RENAME(ulocimp_minimizeSubtags) #define ulocimp_toBcpKey U_ICU_ENTRY_POINT_RENAME(ulocimp_toBcpKey) #define ulocimp_toBcpType U_ICU_ENTRY_POINT_RENAME(ulocimp_toBcpType) #define ulocimp_toLanguageTag U_ICU_ENTRY_POINT_RENAME(ulocimp_toLanguageTag) #define ulocimp_toLegacyKey U_ICU_ENTRY_POINT_RENAME(ulocimp_toLegacyKey) #define ulocimp_toLegacyType U_ICU_ENTRY_POINT_RENAME(ulocimp_toLegacyType) +#define ultag_getTKeyStart U_ICU_ENTRY_POINT_RENAME(ultag_getTKeyStart) #define ultag_isExtensionSubtags U_ICU_ENTRY_POINT_RENAME(ultag_isExtensionSubtags) #define ultag_isLanguageSubtag U_ICU_ENTRY_POINT_RENAME(ultag_isLanguageSubtag) #define ultag_isPrivateuseValueSubtags U_ICU_ENTRY_POINT_RENAME(ultag_isPrivateuseValueSubtags) @@ -1245,7 +1250,18 @@ #define unumf_resultAsValue U_ICU_ENTRY_POINT_RENAME(unumf_resultAsValue) #define unumf_resultGetAllFieldPositions U_ICU_ENTRY_POINT_RENAME(unumf_resultGetAllFieldPositions) #define unumf_resultNextFieldPosition U_ICU_ENTRY_POINT_RENAME(unumf_resultNextFieldPosition) +#define unumf_resultToDecimalNumber U_ICU_ENTRY_POINT_RENAME(unumf_resultToDecimalNumber) #define unumf_resultToString U_ICU_ENTRY_POINT_RENAME(unumf_resultToString) +#define unumrf_close U_ICU_ENTRY_POINT_RENAME(unumrf_close) +#define unumrf_closeResult U_ICU_ENTRY_POINT_RENAME(unumrf_closeResult) +#define unumrf_formatDecimalRange U_ICU_ENTRY_POINT_RENAME(unumrf_formatDecimalRange) +#define unumrf_formatDoubleRange U_ICU_ENTRY_POINT_RENAME(unumrf_formatDoubleRange) +#define unumrf_openForSkeletonWithCollapseAndIdentityFallback U_ICU_ENTRY_POINT_RENAME(unumrf_openForSkeletonWithCollapseAndIdentityFallback) +#define unumrf_openResult U_ICU_ENTRY_POINT_RENAME(unumrf_openResult) +#define unumrf_resultAsValue U_ICU_ENTRY_POINT_RENAME(unumrf_resultAsValue) +#define unumrf_resultGetFirstDecimalNumber U_ICU_ENTRY_POINT_RENAME(unumrf_resultGetFirstDecimalNumber) +#define unumrf_resultGetIdentityResult U_ICU_ENTRY_POINT_RENAME(unumrf_resultGetIdentityResult) +#define unumrf_resultGetSecondDecimalNumber U_ICU_ENTRY_POINT_RENAME(unumrf_resultGetSecondDecimalNumber) #define unumsys_close U_ICU_ENTRY_POINT_RENAME(unumsys_close) #define unumsys_getDescription U_ICU_ENTRY_POINT_RENAME(unumsys_getDescription) #define unumsys_getName U_ICU_ENTRY_POINT_RENAME(unumsys_getName) @@ -1259,6 +1275,7 @@ #define uplrules_open U_ICU_ENTRY_POINT_RENAME(uplrules_open) #define uplrules_openForType U_ICU_ENTRY_POINT_RENAME(uplrules_openForType) #define uplrules_select U_ICU_ENTRY_POINT_RENAME(uplrules_select) +#define uplrules_selectForRange U_ICU_ENTRY_POINT_RENAME(uplrules_selectForRange) #define uplrules_selectFormatted U_ICU_ENTRY_POINT_RENAME(uplrules_selectFormatted) #define uplrules_selectWithFormat U_ICU_ENTRY_POINT_RENAME(uplrules_selectWithFormat) #define uplug_closeLibrary U_ICU_ENTRY_POINT_RENAME(uplug_closeLibrary) diff --git a/intl/icu/source/common/unicode/ures.h b/intl/icu/source/common/unicode/ures.h index 839779fada80..fff84043e847 100644 --- a/intl/icu/source/common/unicode/ures.h +++ b/intl/icu/source/common/unicode/ures.h @@ -27,7 +27,10 @@ #include "unicode/utypes.h" #include "unicode/uloc.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API /** * \file @@ -163,7 +166,7 @@ typedef enum { * @see ures_close * @stable ICU 2.0 */ -U_STABLE UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_open(const char* packageName, const char* locale, UErrorCode* status); @@ -186,7 +189,7 @@ ures_open(const char* packageName, * @see ures_close * @stable ICU 2.0 */ -U_STABLE UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_openDirect(const char* packageName, const char* locale, UErrorCode* status); @@ -209,7 +212,7 @@ ures_openDirect(const char* packageName, * @see ures_open * @stable ICU 2.0 */ -U_STABLE UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_openU(const UChar* packageName, const char* locale, UErrorCode* status); @@ -245,7 +248,7 @@ ures_countArrayItems(const UResourceBundle* resourceBundle, * @see ures_open * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_close(UResourceBundle* resourceBundle); #if U_SHOW_CPLUSPLUS_API @@ -291,7 +294,7 @@ ures_getVersionNumber(const UResourceBundle* resourceBundle); * as specified in the resource bundle or its parent. * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_getVersion(const UResourceBundle* resB, UVersionInfo versionInfo); @@ -325,7 +328,7 @@ ures_getLocale(const UResourceBundle* resourceBundle, * @return A Locale name * @stable ICU 2.8 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 ures_getLocaleByType(const UResourceBundle* resourceBundle, ULocDataLocaleType type, UErrorCode* status); @@ -348,7 +351,7 @@ ures_getLocaleByType(const UResourceBundle* resourceBundle, * @param status The error code. * @internal */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_openFillIn(UResourceBundle *r, const char* packageName, const char* localeID, @@ -372,7 +375,7 @@ ures_openFillIn(UResourceBundle *r, * @see ures_getUInt * @stable ICU 2.0 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ures_getString(const UResourceBundle* resourceBundle, int32_t* len, UErrorCode* status); @@ -383,10 +386,10 @@ ures_getString(const UResourceBundle* resourceBundle, * it may need to be copied, or transformed from UTF-16 using u_strToUTF8() * or equivalent. * - * If forceCopy==TRUE, then the string is always written to the dest buffer + * If forceCopy==true, then the string is always written to the dest buffer * and dest is returned. * - * If forceCopy==FALSE, then the string is returned as a pointer if possible, + * If forceCopy==false, then the string is returned as a pointer if possible, * without needing a dest buffer (it can be NULL). If the string needs to be * copied or transformed, then it may be placed into dest at an arbitrary offset. * @@ -404,10 +407,10 @@ ures_getString(const UResourceBundle* resourceBundle, * terminating NUL, even in case of U_BUFFER_OVERFLOW_ERROR. * Can be NULL, meaning capacity=0 and the string length is not * returned to the caller. - * @param forceCopy If TRUE, then the output string will always be written to + * @param forceCopy If true, then the output string will always be written to * dest, with U_BUFFER_OVERFLOW_ERROR and * U_STRING_NOT_TERMINATED_WARNING set if appropriate. - * If FALSE, then the dest buffer may or may not contain a + * If false, then the dest buffer may or may not contain a * copy of the string. dest may or may not be modified. * If a copy needs to be written, then the UErrorCode parameter * indicates overflow etc. as usual. @@ -424,7 +427,7 @@ ures_getString(const UResourceBundle* resourceBundle, * @see u_strToUTF8 * @stable ICU 3.6 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ures_getUTF8String(const UResourceBundle *resB, char *dest, int32_t *length, UBool forceCopy, @@ -447,7 +450,7 @@ ures_getUTF8String(const UResourceBundle *resB, * @see ures_getUInt * @stable ICU 2.0 */ -U_STABLE const uint8_t* U_EXPORT2 +U_CAPI const uint8_t* U_EXPORT2 ures_getBinary(const UResourceBundle* resourceBundle, int32_t* len, UErrorCode* status); @@ -469,7 +472,7 @@ ures_getBinary(const UResourceBundle* resourceBundle, * @see ures_getUInt * @stable ICU 2.0 */ -U_STABLE const int32_t* U_EXPORT2 +U_CAPI const int32_t* U_EXPORT2 ures_getIntVector(const UResourceBundle* resourceBundle, int32_t* len, UErrorCode* status); @@ -490,7 +493,7 @@ ures_getIntVector(const UResourceBundle* resourceBundle, * @see ures_getString * @stable ICU 2.0 */ -U_STABLE uint32_t U_EXPORT2 +U_CAPI uint32_t U_EXPORT2 ures_getUInt(const UResourceBundle* resourceBundle, UErrorCode *status); @@ -510,7 +513,7 @@ ures_getUInt(const UResourceBundle* resourceBundle, * @see ures_getString * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ures_getInt(const UResourceBundle* resourceBundle, UErrorCode *status); @@ -524,7 +527,7 @@ ures_getInt(const UResourceBundle* resourceBundle, * @return number of resources in a given resource. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ures_getSize(const UResourceBundle *resourceBundle); /** @@ -535,7 +538,7 @@ ures_getSize(const UResourceBundle *resourceBundle); * @see UResType * @stable ICU 2.0 */ -U_STABLE UResType U_EXPORT2 +U_CAPI UResType U_EXPORT2 ures_getType(const UResourceBundle *resourceBundle); /** @@ -546,7 +549,7 @@ ures_getType(const UResourceBundle *resourceBundle); * @return a key associated to this resource, or NULL if it doesn't have a key * @stable ICU 2.0 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ures_getKey(const UResourceBundle *resourceBundle); /* ITERATION API @@ -559,17 +562,17 @@ ures_getKey(const UResourceBundle *resourceBundle); * @param resourceBundle a resource * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_resetIterator(UResourceBundle *resourceBundle); /** * Checks whether the given resource has another element to iterate over. * * @param resourceBundle a resource - * @return TRUE if there are more elements, FALSE if there is no more elements + * @return true if there are more elements, false if there is no more elements * @stable ICU 2.0 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ures_hasNext(const UResourceBundle *resourceBundle); /** @@ -584,7 +587,7 @@ ures_hasNext(const UResourceBundle *resourceBundle); * @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must close it * @stable ICU 2.0 */ -U_STABLE UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_getNextResource(UResourceBundle *resourceBundle, UResourceBundle *fillIn, UErrorCode *status); @@ -601,7 +604,7 @@ ures_getNextResource(UResourceBundle *resourceBundle, * @return a pointer to a zero-terminated UChar array which lives in a memory mapped/DLL file. * @stable ICU 2.0 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ures_getNextString(UResourceBundle *resourceBundle, int32_t* len, const char ** key, @@ -619,7 +622,7 @@ ures_getNextString(UResourceBundle *resourceBundle, * @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must close it * @stable ICU 2.0 */ -U_STABLE UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_getByIndex(const UResourceBundle *resourceBundle, int32_t indexR, UResourceBundle *fillIn, @@ -636,7 +639,7 @@ ures_getByIndex(const UResourceBundle *resourceBundle, * @return a pointer to a zero-terminated UChar array which lives in a memory mapped/DLL file. * @stable ICU 2.0 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ures_getStringByIndex(const UResourceBundle *resourceBundle, int32_t indexS, int32_t* len, @@ -648,10 +651,10 @@ ures_getStringByIndex(const UResourceBundle *resourceBundle, * it may need to be copied, or transformed from UTF-16 using u_strToUTF8() * or equivalent. * - * If forceCopy==TRUE, then the string is always written to the dest buffer + * If forceCopy==true, then the string is always written to the dest buffer * and dest is returned. * - * If forceCopy==FALSE, then the string is returned as a pointer if possible, + * If forceCopy==false, then the string is returned as a pointer if possible, * without needing a dest buffer (it can be NULL). If the string needs to be * copied or transformed, then it may be placed into dest at an arbitrary offset. * @@ -670,10 +673,10 @@ ures_getStringByIndex(const UResourceBundle *resourceBundle, * terminating NUL, even in case of U_BUFFER_OVERFLOW_ERROR. * Can be NULL, meaning capacity=0 and the string length is not * returned to the caller. - * @param forceCopy If TRUE, then the output string will always be written to + * @param forceCopy If true, then the output string will always be written to * dest, with U_BUFFER_OVERFLOW_ERROR and * U_STRING_NOT_TERMINATED_WARNING set if appropriate. - * If FALSE, then the dest buffer may or may not contain a + * If false, then the dest buffer may or may not contain a * copy of the string. dest may or may not be modified. * If a copy needs to be written, then the UErrorCode parameter * indicates overflow etc. as usual. @@ -690,7 +693,7 @@ ures_getStringByIndex(const UResourceBundle *resourceBundle, * @see u_strToUTF8 * @stable ICU 3.6 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ures_getUTF8StringByIndex(const UResourceBundle *resB, int32_t stringIndex, char *dest, int32_t *pLength, @@ -709,7 +712,7 @@ ures_getUTF8StringByIndex(const UResourceBundle *resB, * @return a pointer to a UResourceBundle struct. If fill in param was NULL, caller must close it * @stable ICU 2.0 */ -U_STABLE UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_getByKey(const UResourceBundle *resourceBundle, const char* key, UResourceBundle *fillIn, @@ -727,7 +730,7 @@ ures_getByKey(const UResourceBundle *resourceBundle, * @return a pointer to a zero-terminated UChar array which lives in a memory mapped/DLL file. * @stable ICU 2.0 */ -U_STABLE const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, const char* key, int32_t* len, @@ -741,10 +744,10 @@ ures_getStringByKey(const UResourceBundle *resB, * it may need to be copied, or transformed from UTF-16 using u_strToUTF8() * or equivalent. * - * If forceCopy==TRUE, then the string is always written to the dest buffer + * If forceCopy==true, then the string is always written to the dest buffer * and dest is returned. * - * If forceCopy==FALSE, then the string is returned as a pointer if possible, + * If forceCopy==false, then the string is returned as a pointer if possible, * without needing a dest buffer (it can be NULL). If the string needs to be * copied or transformed, then it may be placed into dest at an arbitrary offset. * @@ -763,10 +766,10 @@ ures_getStringByKey(const UResourceBundle *resB, * terminating NUL, even in case of U_BUFFER_OVERFLOW_ERROR. * Can be NULL, meaning capacity=0 and the string length is not * returned to the caller. - * @param forceCopy If TRUE, then the output string will always be written to + * @param forceCopy If true, then the output string will always be written to * dest, with U_BUFFER_OVERFLOW_ERROR and * U_STRING_NOT_TERMINATED_WARNING set if appropriate. - * If FALSE, then the dest buffer may or may not contain a + * If false, then the dest buffer may or may not contain a * copy of the string. dest may or may not be modified. * If a copy needs to be written, then the UErrorCode parameter * indicates overflow etc. as usual. @@ -783,7 +786,7 @@ ures_getStringByKey(const UResourceBundle *resB, * @see u_strToUTF8 * @stable ICU 3.6 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ures_getUTF8StringByKey(const UResourceBundle *resB, const char *key, char *dest, int32_t *pLength, @@ -811,7 +814,7 @@ ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { int32_t len = 0; const UChar *r = ures_getString(resB, &len, status); if(U_SUCCESS(*status)) { - result.setTo(TRUE, r, len); + result.setTo(true, r, len); } else { result.setToBogus(); } @@ -836,7 +839,7 @@ ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* int32_t len = 0; const UChar* r = ures_getNextString(resB, &len, key, status); if(U_SUCCESS(*status)) { - result.setTo(TRUE, r, len); + result.setTo(true, r, len); } else { result.setToBogus(); } @@ -858,7 +861,7 @@ ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UError int32_t len = 0; const UChar* r = ures_getStringByIndex(resB, indexS, &len, status); if(U_SUCCESS(*status)) { - result.setTo(TRUE, r, len); + result.setTo(true, r, len); } else { result.setToBogus(); } @@ -881,7 +884,7 @@ ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorC int32_t len = 0; const UChar* r = ures_getStringByKey(resB, key, &len, status); if(U_SUCCESS(*status)) { - result.setTo(TRUE, r, len); + result.setTo(true, r, len); } else { result.setToBogus(); } @@ -900,7 +903,7 @@ U_NAMESPACE_END * @param status error code * @stable ICU 3.2 */ -U_STABLE UEnumeration* U_EXPORT2 +U_CAPI UEnumeration* U_EXPORT2 ures_openAvailableLocales(const char *packageName, UErrorCode *status); diff --git a/intl/icu/source/common/unicode/uscript.h b/intl/icu/source/common/unicode/uscript.h index 53d57abed14c..8448afda7615 100644 --- a/intl/icu/source/common/unicode/uscript.h +++ b/intl/icu/source/common/unicode/uscript.h @@ -514,7 +514,7 @@ typedef enum UScriptCode { * @return The number of script codes filled in the buffer passed in * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uscript_getCode(const char* nameOrAbbrOrLocale,UScriptCode* fillIn,int32_t capacity,UErrorCode *err); /** @@ -527,7 +527,7 @@ uscript_getCode(const char* nameOrAbbrOrLocale,UScriptCode* fillIn,int32_t capac * or NULL if scriptCode is invalid * @stable ICU 2.4 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uscript_getName(UScriptCode scriptCode); /** @@ -539,7 +539,7 @@ uscript_getName(UScriptCode scriptCode); * @return short script name (4-letter code), or NULL if scriptCode is invalid * @stable ICU 2.4 */ -U_STABLE const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uscript_getShortName(UScriptCode scriptCode); /** @@ -550,7 +550,7 @@ uscript_getShortName(UScriptCode scriptCode); * @return The UScriptCode, or 0 if codepoint is invalid * @stable ICU 2.4 */ -U_STABLE UScriptCode U_EXPORT2 +U_CAPI UScriptCode U_EXPORT2 uscript_getScript(UChar32 codepoint, UErrorCode *err); /** @@ -562,10 +562,10 @@ uscript_getScript(UChar32 codepoint, UErrorCode *err); * For more information, see UAX #24: http://www.unicode.org/reports/tr24/. * @param c code point * @param sc script code - * @return TRUE if sc is in Script_Extensions(c) + * @return true if sc is in Script_Extensions(c) * @stable ICU 49 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uscript_hasScript(UChar32 c, UScriptCode sc); /** @@ -597,7 +597,7 @@ uscript_hasScript(UChar32 c, UScriptCode sc); * written to scripts unless U_BUFFER_OVERFLOW_ERROR indicates insufficient capacity * @stable ICU 49 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uscript_getScriptExtensions(UChar32 c, UScriptCode *scripts, int32_t capacity, UErrorCode *errorCode); @@ -636,7 +636,7 @@ typedef enum UScriptUsage { * @return the string length, even if U_BUFFER_OVERFLOW_ERROR * @stable ICU 51 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uscript_getSampleString(UScriptCode script, UChar *dest, int32_t capacity, UErrorCode *pErrorCode); #if U_SHOW_CPLUSPLUS_API @@ -668,41 +668,41 @@ uscript_getSampleUnicodeString(UScriptCode script); * @see UScriptUsage * @stable ICU 51 */ -U_STABLE UScriptUsage U_EXPORT2 +U_CAPI UScriptUsage U_EXPORT2 uscript_getUsage(UScriptCode script); /** - * Returns TRUE if the script is written right-to-left. + * 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 + * @return true if the script is right-to-left * @stable ICU 51 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uscript_isRightToLeft(UScriptCode script); /** - * Returns TRUE if the script allows line breaks between letters (excluding hyphenation). + * 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 + * @return true if the script allows line breaks between letters * @stable ICU 51 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uscript_breaksBetweenLetters(UScriptCode script); /** - * Returns TRUE if in modern (or most recent) usage of the script case distinctions are customary. + * 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 + * @return true if the script is cased * @stable ICU 51 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uscript_isCased(UScriptCode script); #endif diff --git a/intl/icu/source/common/unicode/uset.h b/intl/icu/source/common/unicode/uset.h index 18482c10e738..502ea8dc147a 100644 --- a/intl/icu/source/common/unicode/uset.h +++ b/intl/icu/source/common/unicode/uset.h @@ -31,7 +31,10 @@ #include "unicode/utypes.h" #include "unicode/uchar.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API #ifndef USET_DEFINED @@ -158,7 +161,7 @@ typedef enum USetSpanCondition { * Continues a span() while there is no set element at the current position. * Increments by one code point at a time. * Stops before the first set element (character or string). - * (For code points only, this is like while contains(current)==FALSE). + * (For code points only, this is like while contains(current)==false). * * When span() returns, the substring between where it started and the position * it returned consists only of characters that are not in the set, @@ -169,7 +172,7 @@ typedef enum USetSpanCondition { USET_SPAN_NOT_CONTAINED = 0, /** * Spans the longest substring that is a concatenation of set elements (characters or strings). - * (For characters only, this is like while contains(current)==TRUE). + * (For characters only, this is like while contains(current)==true). * * When span() returns, the substring between where it started and the position * it returned consists only of set elements (characters or strings) that are in the set. @@ -185,7 +188,7 @@ typedef enum USetSpanCondition { /** * Continues a span() while there is a set element at the current position. * Increments by the longest matching element at each position. - * (For characters only, this is like while contains(current)==TRUE). + * (For characters only, this is like while contains(current)==true). * * When span() returns, the substring between where it started and the position * it returned consists only of set elements (characters or strings) that are in the set. @@ -260,7 +263,7 @@ typedef struct USerializedSet { * it when done. * @stable ICU 4.2 */ -U_STABLE USet* U_EXPORT2 +U_CAPI USet* U_EXPORT2 uset_openEmpty(void); /** @@ -273,7 +276,7 @@ uset_openEmpty(void); * it when done. * @stable ICU 2.4 */ -U_STABLE USet* U_EXPORT2 +U_CAPI USet* U_EXPORT2 uset_open(UChar32 start, UChar32 end); /** @@ -285,7 +288,7 @@ uset_open(UChar32 start, UChar32 end); * @param ec the error code * @stable ICU 2.4 */ -U_STABLE USet* U_EXPORT2 +U_CAPI USet* U_EXPORT2 uset_openPattern(const UChar* pattern, int32_t patternLength, UErrorCode* ec); @@ -300,7 +303,7 @@ uset_openPattern(const UChar* pattern, int32_t patternLength, * @param ec the error code * @stable ICU 2.4 */ -U_STABLE USet* U_EXPORT2 +U_CAPI USet* U_EXPORT2 uset_openPatternOptions(const UChar* pattern, int32_t patternLength, uint32_t options, UErrorCode* ec); @@ -311,7 +314,7 @@ uset_openPatternOptions(const UChar* pattern, int32_t patternLength, * @param set the object to dispose of * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_close(USet* set); #if U_SHOW_CPLUSPLUS_API @@ -342,19 +345,19 @@ U_NAMESPACE_END * @see uset_cloneAsThawed * @stable ICU 3.8 */ -U_STABLE USet * U_EXPORT2 +U_CAPI USet * U_EXPORT2 uset_clone(const USet *set); /** * Determines whether the set has been frozen (made immutable) or not. * See the ICU4J Freezable interface for details. * @param set the set - * @return TRUE/FALSE for whether the set has been frozen + * @return true/false for whether the set has been frozen * @see uset_freeze * @see uset_cloneAsThawed * @stable ICU 3.8 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_isFrozen(const USet *set); /** @@ -371,7 +374,7 @@ uset_isFrozen(const USet *set); * @see uset_cloneAsThawed * @stable ICU 3.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_freeze(USet *set); /** @@ -384,7 +387,7 @@ uset_freeze(USet *set); * @see uset_clone * @stable ICU 3.8 */ -U_STABLE USet * U_EXPORT2 +U_CAPI USet * U_EXPORT2 uset_cloneAsThawed(const USet *set); /** @@ -396,7 +399,7 @@ uset_cloneAsThawed(const USet *set); * @param end last character in the set, inclusive * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_set(USet* set, UChar32 start, UChar32 end); @@ -421,7 +424,7 @@ uset_set(USet* set, * * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_applyPattern(USet *set, const UChar *pattern, int32_t patternLength, uint32_t options, @@ -449,7 +452,7 @@ uset_applyPattern(USet *set, * * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_applyIntPropertyValue(USet* set, UProperty prop, int32_t value, UErrorCode* ec); @@ -488,7 +491,7 @@ uset_applyIntPropertyValue(USet* set, * * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_applyPropertyAlias(USet* set, const UChar *prop, int32_t propLength, const UChar *value, int32_t valueLength, @@ -503,7 +506,7 @@ uset_applyPropertyAlias(USet* set, * @param pos the given position * @stable ICU 3.2 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_resemblesPattern(const UChar *pattern, int32_t patternLength, int32_t pos); @@ -514,7 +517,7 @@ uset_resemblesPattern(const UChar *pattern, int32_t patternLength, * @param set the set * @param result the string to receive the rules, may be NULL * @param resultCapacity the capacity of result, may be 0 if result is NULL - * @param escapeUnprintable if TRUE then convert unprintable + * @param escapeUnprintable if true then convert unprintable * character to their hex escape representations, \\uxxxx or * \\Uxxxxxxxx. Unprintable characters are those other than * U+000A, U+0020..U+007E. @@ -522,7 +525,7 @@ uset_resemblesPattern(const UChar *pattern, int32_t patternLength, * @return length of string, possibly larger than resultCapacity * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_toPattern(const USet* set, UChar* result, int32_t resultCapacity, UBool escapeUnprintable, @@ -530,13 +533,13 @@ uset_toPattern(const USet* set, /** * Adds the given character to the given USet. After this call, - * uset_contains(set, c) will return TRUE. + * uset_contains(set, c) will return true. * A frozen set will not be modified. * @param set the object to which to add the character * @param c the character to add * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_add(USet* set, UChar32 c); /** @@ -551,31 +554,31 @@ uset_add(USet* set, UChar32 c); * @param additionalSet the source set whose elements are to be added to this set. * @stable ICU 2.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_addAll(USet* set, const USet *additionalSet); /** * Adds the given range of characters to the given USet. After this call, - * uset_contains(set, start, end) will return TRUE. + * uset_contains(set, start, end) will return true. * A frozen set will not be modified. * @param set the object to which to add the character * @param start the first character of the range to add, inclusive * @param end the last character of the range to add, inclusive * @stable ICU 2.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_addRange(USet* set, UChar32 start, UChar32 end); /** * Adds the given string to the given USet. After this call, - * uset_containsString(set, str, strLen) will return TRUE. + * uset_containsString(set, str, strLen) will return true. * A frozen set will not be modified. * @param set the object to which to add the character * @param str the string to add * @param strLen the length of the string or -1 if null terminated. * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_addString(USet* set, const UChar* str, int32_t strLen); /** @@ -587,42 +590,42 @@ uset_addString(USet* set, const UChar* str, int32_t strLen); * @param strLen the length of the string or -1 if null terminated. * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_addAllCodePoints(USet* set, const UChar *str, int32_t strLen); /** * Removes the given character from the given USet. After this call, - * uset_contains(set, c) will return FALSE. + * uset_contains(set, c) will return false. * A frozen set will not be modified. * @param set the object from which to remove the character * @param c the character to remove * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_remove(USet* set, UChar32 c); /** * Removes the given range of characters from the given USet. After this call, - * uset_contains(set, start, end) will return FALSE. + * uset_contains(set, start, end) will return false. * A frozen set will not be modified. * @param set the object to which to add the character * @param start the first character of the range to remove, inclusive * @param end the last character of the range to remove, inclusive * @stable ICU 2.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_removeRange(USet* set, UChar32 start, UChar32 end); /** * Removes the given string to the given USet. After this call, - * uset_containsString(set, str, strLen) will return FALSE. + * uset_containsString(set, str, strLen) will return false. * A frozen set will not be modified. * @param set the object to which to add the character * @param str the string to remove * @param strLen the length of the string or -1 if null terminated. * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_removeString(USet* set, const UChar* str, int32_t strLen); /** @@ -636,7 +639,7 @@ uset_removeString(USet* set, const UChar* str, int32_t strLen); * removed from this set * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_removeAll(USet* set, const USet* removeSet); /** @@ -653,7 +656,7 @@ uset_removeAll(USet* set, const USet* removeSet); * to this set. * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_retain(USet* set, UChar32 start, UChar32 end); /** @@ -668,7 +671,7 @@ uset_retain(USet* set, UChar32 start, UChar32 end); * @param retain set that defines which elements this set will retain * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_retainAll(USet* set, const USet* retain); /** @@ -679,7 +682,7 @@ uset_retainAll(USet* set, const USet* retain); * @param set the object on which to perfrom the compact * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_compact(USet* set); /** @@ -690,7 +693,7 @@ uset_compact(USet* set); * @param set the set * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_complement(USet* set); /** @@ -704,7 +707,7 @@ uset_complement(USet* set); * from this set. * @stable ICU 3.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_complementAll(USet* set, const USet* complement); /** @@ -714,7 +717,7 @@ uset_complementAll(USet* set, const USet* complement); * @param set the set * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_clear(USet* set); /** @@ -743,7 +746,7 @@ uset_clear(USet* set); * are ignored. * @stable ICU 4.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_closeOver(USet* set, int32_t attributes); /** @@ -752,51 +755,51 @@ uset_closeOver(USet* set, int32_t attributes); * @param set the set * @stable ICU 4.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_removeAllStrings(USet* set); /** - * Returns TRUE if the given USet contains no characters and no + * Returns true if the given USet contains no characters and no * strings. * @param set the set * @return true if set is empty * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_isEmpty(const USet* set); /** - * Returns TRUE if the given USet contains the given character. + * Returns true if the given USet contains the given character. * This function works faster with a frozen set. * @param set the set * @param c The codepoint to check for within the set * @return true if set contains c * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_contains(const USet* set, UChar32 c); /** - * Returns TRUE if the given USet contains all characters c + * Returns true if the given USet contains all characters c * where start <= c && c <= end. * @param set the set * @param start the first character of the range to test, inclusive * @param end the last character of the range to test, inclusive - * @return TRUE if set contains the range + * @return true if set contains the range * @stable ICU 2.2 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_containsRange(const USet* set, UChar32 start, UChar32 end); /** - * Returns TRUE if the given USet contains the given string. + * Returns true if the given USet contains the given string. * @param set the set * @param str the string * @param strLen the length of the string or -1 if null terminated. * @return true if set contains str * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_containsString(const USet* set, const UChar* str, int32_t strLen); /** @@ -809,7 +812,7 @@ uset_containsString(const USet* set, const UChar* str, int32_t strLen); * @return an index from 0..size()-1, or -1 * @stable ICU 3.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_indexOf(const USet* set, UChar32 c); /** @@ -822,7 +825,7 @@ uset_indexOf(const USet* set, UChar32 c); * @return the character at the given index, or (UChar32)-1. * @stable ICU 3.2 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 uset_charAt(const USet* set, int32_t charIndex); /** @@ -833,7 +836,7 @@ uset_charAt(const USet* set, int32_t charIndex); * contained in set * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_size(const USet* set); /** @@ -844,7 +847,7 @@ uset_size(const USet* set); * and/or strings contained in set * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_getItemCount(const USet* set); /** @@ -865,7 +868,7 @@ uset_getItemCount(const USet* set); * itemIndex is out of range * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_getItem(const USet* set, int32_t itemIndex, UChar32* start, UChar32* end, UChar* str, int32_t strCapacity, @@ -879,7 +882,7 @@ uset_getItem(const USet* set, int32_t itemIndex, * @return true if the test condition is met * @stable ICU 3.2 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_containsAll(const USet* set1, const USet* set2); /** @@ -892,7 +895,7 @@ uset_containsAll(const USet* set1, const USet* set2); * @return true if the test condition is met * @stable ICU 3.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_containsAllCodePoints(const USet* set, const UChar *str, int32_t strLen); /** @@ -903,7 +906,7 @@ uset_containsAllCodePoints(const USet* set, const UChar *str, int32_t strLen); * @return true if the test condition is met * @stable ICU 3.2 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_containsNone(const USet* set1, const USet* set2); /** @@ -914,7 +917,7 @@ uset_containsNone(const USet* set1, const USet* set2); * @return true if the test condition is met * @stable ICU 3.2 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_containsSome(const USet* set1, const USet* set2); /** @@ -936,7 +939,7 @@ uset_containsSome(const USet* set1, const USet* set2); * @stable ICU 3.8 * @see USetSpanCondition */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_span(const USet *set, const UChar *s, int32_t length, USetSpanCondition spanCondition); /** @@ -957,7 +960,7 @@ uset_span(const USet *set, const UChar *s, int32_t length, USetSpanCondition spa * @stable ICU 3.8 * @see USetSpanCondition */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_spanBack(const USet *set, const UChar *s, int32_t length, USetSpanCondition spanCondition); /** @@ -979,7 +982,7 @@ uset_spanBack(const USet *set, const UChar *s, int32_t length, USetSpanCondition * @stable ICU 3.8 * @see USetSpanCondition */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_spanUTF8(const USet *set, const char *s, int32_t length, USetSpanCondition spanCondition); /** @@ -1000,7 +1003,7 @@ uset_spanUTF8(const USet *set, const char *s, int32_t length, USetSpanCondition * @stable ICU 3.8 * @see USetSpanCondition */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_spanBackUTF8(const USet *set, const char *s, int32_t length, USetSpanCondition spanCondition); /** @@ -1011,7 +1014,7 @@ uset_spanBackUTF8(const USet *set, const char *s, int32_t length, USetSpanCondit * @return true if the test condition is met * @stable ICU 3.2 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_equals(const USet* set1, const USet* set2); /********************************************************************* @@ -1067,7 +1070,7 @@ uset_equals(const USet* set1, const USet* set2); * than U_BUFFER_OVERFLOW_ERROR. * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_serialize(const USet* set, uint16_t* dest, int32_t destCapacity, UErrorCode* pErrorCode); /** @@ -1078,7 +1081,7 @@ uset_serialize(const USet* set, uint16_t* dest, int32_t destCapacity, UErrorCode * @return true if the given array is valid, otherwise false * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_getSerializedSet(USerializedSet* fillSet, const uint16_t* src, int32_t srcLength); /** @@ -1088,18 +1091,18 @@ uset_getSerializedSet(USerializedSet* fillSet, const uint16_t* src, int32_t srcL * @param c The codepoint to set * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 uset_setSerializedToOne(USerializedSet* fillSet, UChar32 c); /** - * Returns TRUE if the given USerializedSet contains the given + * Returns true if the given USerializedSet contains the given * character. * @param set the serialized set * @param c The codepoint to check for within the set * @return true if set contains c * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_serializedContains(const USerializedSet* set, UChar32 c); /** @@ -1111,7 +1114,7 @@ uset_serializedContains(const USerializedSet* set, UChar32 c); * contained in set * @stable ICU 2.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 uset_getSerializedRangeCount(const USerializedSet* set); /** @@ -1127,7 +1130,7 @@ uset_getSerializedRangeCount(const USerializedSet* set); * @return true if rangeIndex is valid, otherwise false * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex, UChar32* pStart, UChar32* pEnd); diff --git a/intl/icu/source/common/unicode/usetiter.h b/intl/icu/source/common/unicode/usetiter.h index c6396fd76c7f..a817ef72b3ae 100644 --- a/intl/icu/source/common/unicode/usetiter.h +++ b/intl/icu/source/common/unicode/usetiter.h @@ -176,7 +176,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject { * If there are no more elements in the set, return false. * *

    - * If isString() == TRUE, the value is a + * If isString() == true, the value is a * string, otherwise the value is a * single code point. Elements of either type can be retrieved * with the function getString(), while elements of @@ -197,7 +197,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject { /** * Returns the next element in the set, either a code point range * or a string. If there are no more elements in the set, return - * false. If isString() == TRUE, the value is a + * false. If isString() == true, the value is a * string and can be accessed with getString(). Otherwise the value is a * range of one or more code points from getCodepoint() to * getCodepointeEnd() inclusive. @@ -205,7 +205,7 @@ class U_COMMON_API UnicodeSetIterator : public UObject { *

    The order of iteration is all code points ranges in sorted * order, followed by all strings sorted order. Ranges are * disjoint and non-contiguous. The value returned from getString() - * is undefined unless isString() == TRUE. Do not mix calls to + * is undefined unless isString() == true. Do not mix calls to * next() and nextRange() without calling * reset() between them. The results of doing so are * undefined. diff --git a/intl/icu/source/common/unicode/ushape.h b/intl/icu/source/common/unicode/ushape.h index 78b4d027a83f..fed4869abdb1 100644 --- a/intl/icu/source/common/unicode/ushape.h +++ b/intl/icu/source/common/unicode/ushape.h @@ -98,7 +98,7 @@ * the return value indicates the necessary destination buffer size. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_shapeArabic(const UChar *source, int32_t sourceLength, UChar *dest, int32_t destSize, uint32_t options, diff --git a/intl/icu/source/common/unicode/usprep.h b/intl/icu/source/common/unicode/usprep.h index 914eb84871b4..f8a0f58e0de2 100644 --- a/intl/icu/source/common/unicode/usprep.h +++ b/intl/icu/source/common/unicode/usprep.h @@ -25,7 +25,10 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/localpointer.h" +#endif // U_SHOW_CPLUSPLUS_API /** * @@ -181,7 +184,7 @@ typedef enum UStringPrepProfileType { * @see usprep_close() * @stable ICU 2.8 */ -U_STABLE UStringPrepProfile* U_EXPORT2 +U_CAPI UStringPrepProfile* U_EXPORT2 usprep_open(const char* path, const char* fileName, UErrorCode* status); @@ -197,7 +200,7 @@ usprep_open(const char* path, * @see usprep_close() * @stable ICU 4.2 */ -U_STABLE UStringPrepProfile* U_EXPORT2 +U_CAPI UStringPrepProfile* U_EXPORT2 usprep_openByType(UStringPrepProfileType type, UErrorCode* status); @@ -206,7 +209,7 @@ usprep_openByType(UStringPrepProfileType type, * @param profile The profile to close * @stable ICU 2.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 usprep_close(UStringPrepProfile* profile); #if U_SHOW_CPLUSPLUS_API @@ -257,7 +260,7 @@ U_NAMESPACE_END * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 usprep_prepare( const UStringPrepProfile* prep, const UChar* src, int32_t srcLength, UChar* dest, int32_t destCapacity, diff --git a/intl/icu/source/common/unicode/ustring.h b/intl/icu/source/common/unicode/ustring.h index 245b766545ab..10ea45ead1d3 100644 --- a/intl/icu/source/common/unicode/ustring.h +++ b/intl/icu/source/common/unicode/ustring.h @@ -89,7 +89,7 @@ * @return The number of UChars in chars, minus the terminator. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strlen(const UChar *s); /*@}*/ @@ -106,7 +106,7 @@ u_strlen(const UChar *s); * @return The number of code points in the specified code units. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_countChar32(const UChar *s, int32_t length); /** @@ -127,7 +127,7 @@ u_countChar32(const UChar *s, int32_t length); * than 'number'. Same as (u_countChar32(s, length)>number). * @stable ICU 2.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 u_strHasMoreChar32Than(const UChar *s, int32_t length, int32_t number); /** @@ -140,7 +140,7 @@ u_strHasMoreChar32Than(const UChar *s, int32_t length, int32_t number); * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strcat(UChar *dst, const UChar *src); @@ -158,7 +158,7 @@ u_strcat(UChar *dst, * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strncat(UChar *dst, const UChar *src, int32_t n); @@ -183,7 +183,7 @@ u_strncat(UChar *dst, * @see u_strFindFirst * @see u_strFindLast */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strstr(const UChar *s, const UChar *substring); /** @@ -207,7 +207,7 @@ u_strstr(const UChar *s, const UChar *substring); * @see u_strstr * @see u_strFindLast */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strFindFirst(const UChar *s, int32_t length, const UChar *substring, int32_t subLength); /** @@ -227,7 +227,7 @@ u_strFindFirst(const UChar *s, int32_t length, const UChar *substring, int32_t s * @see u_strstr * @see u_strFindFirst */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strchr(const UChar *s, UChar c); /** @@ -247,7 +247,7 @@ u_strchr(const UChar *s, UChar c); * @see u_strstr * @see u_strFindFirst */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strchr32(const UChar *s, UChar32 c); /** @@ -270,7 +270,7 @@ u_strchr32(const UChar *s, UChar32 c); * @see u_strFindFirst * @see u_strFindLast */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strrstr(const UChar *s, const UChar *substring); /** @@ -294,7 +294,7 @@ u_strrstr(const UChar *s, const UChar *substring); * @see u_strstr * @see u_strFindLast */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strFindLast(const UChar *s, int32_t length, const UChar *substring, int32_t subLength); /** @@ -314,7 +314,7 @@ u_strFindLast(const UChar *s, int32_t length, const UChar *substring, int32_t su * @see u_strrstr * @see u_strFindLast */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strrchr(const UChar *s, UChar c); /** @@ -334,7 +334,7 @@ u_strrchr(const UChar *s, UChar c); * @see u_strrstr * @see u_strFindLast */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strrchr32(const UChar *s, UChar32 c); /** @@ -349,7 +349,7 @@ u_strrchr32(const UChar *s, UChar32 c); * characters in matchSet, or NULL if no such character is found. * @stable ICU 2.0 */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strpbrk(const UChar *string, const UChar *matchSet); /** @@ -365,7 +365,7 @@ u_strpbrk(const UChar *string, const UChar *matchSet); * @see u_strspn * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strcspn(const UChar *string, const UChar *matchSet); /** @@ -381,7 +381,7 @@ u_strcspn(const UChar *string, const UChar *matchSet); * @see u_strcspn * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strspn(const UChar *string, const UChar *matchSet); /** @@ -409,7 +409,7 @@ u_strspn(const UChar *string, const UChar *matchSet); * when there are no more tokens. * @stable ICU 2.0 */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strtok_r(UChar *src, const UChar *delim, UChar **saveState); @@ -424,7 +424,7 @@ u_strtok_r(UChar *src, * value if s1 is bitwise greater than s2. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strcmp(const UChar *s1, const UChar *s2); @@ -439,7 +439,7 @@ u_strcmp(const UChar *s1, * in code point order * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strcmpCodePointOrder(const UChar *s1, const UChar *s2); /** @@ -462,14 +462,14 @@ u_strcmpCodePointOrder(const UChar *s1, const UChar *s2); * @param s2 Second source string. * @param length2 Length of second source string, or -1 if NUL-terminated. * - * @param codePointOrder Choose between code unit order (FALSE) - * and code point order (TRUE). + * @param codePointOrder Choose between code unit order (false) + * and code point order (true). * * @return <0 or 0 or >0 as usual for string comparisons * * @stable ICU 2.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strCompare(const UChar *s1, int32_t length1, const UChar *s2, int32_t length2, UBool codePointOrder); @@ -485,8 +485,8 @@ u_strCompare(const UChar *s1, int32_t length1, * * @param iter1 First source string iterator. * @param iter2 Second source string iterator. - * @param codePointOrder Choose between code unit order (FALSE) - * and code point order (TRUE). + * @param codePointOrder Choose between code unit order (false) + * and code point order (true). * * @return <0 or 0 or >0 as usual for string comparisons * @@ -494,7 +494,7 @@ u_strCompare(const UChar *s1, int32_t length1, * * @stable ICU 2.6 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2, UBool codePointOrder); /** @@ -537,7 +537,7 @@ u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2, UBool codePointOrde * * @stable ICU 2.2 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strCaseCompare(const UChar *s1, int32_t length1, const UChar *s2, int32_t length2, uint32_t options, @@ -555,7 +555,7 @@ u_strCaseCompare(const UChar *s1, int32_t length1, * value if s1 is bitwise greater than s2. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strncmp(const UChar *ucs1, const UChar *ucs2, int32_t n); @@ -573,7 +573,7 @@ u_strncmp(const UChar *ucs1, * in code point order * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strncmpCodePointOrder(const UChar *s1, const UChar *s2, int32_t n); /** @@ -595,7 +595,7 @@ u_strncmpCodePointOrder(const UChar *s1, const UChar *s2, int32_t n); * @return A negative, zero, or positive integer indicating the comparison result. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strcasecmp(const UChar *s1, const UChar *s2, uint32_t options); /** @@ -619,7 +619,7 @@ u_strcasecmp(const UChar *s1, const UChar *s2, uint32_t options); * @return A negative, zero, or positive integer indicating the comparison result. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strncasecmp(const UChar *s1, const UChar *s2, int32_t n, uint32_t options); /** @@ -643,7 +643,7 @@ u_strncasecmp(const UChar *s1, const UChar *s2, int32_t n, uint32_t options); * @return A negative, zero, or positive integer indicating the comparison result. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_memcasecmp(const UChar *s1, const UChar *s2, int32_t length, uint32_t options); /** @@ -654,7 +654,7 @@ u_memcasecmp(const UChar *s1, const UChar *s2, int32_t length, uint32_t options) * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strcpy(UChar *dst, const UChar *src); @@ -669,7 +669,7 @@ u_strcpy(UChar *dst, * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strncpy(UChar *dst, const UChar *src, int32_t n); @@ -686,7 +686,7 @@ u_strncpy(UChar *dst, * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 u_uastrcpy(UChar *dst, +U_CAPI UChar* U_EXPORT2 u_uastrcpy(UChar *dst, const char *src ); /** @@ -701,7 +701,7 @@ U_STABLE UChar* U_EXPORT2 u_uastrcpy(UChar *dst, * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 u_uastrncpy(UChar *dst, +U_CAPI UChar* U_EXPORT2 u_uastrncpy(UChar *dst, const char *src, int32_t n); @@ -715,7 +715,7 @@ U_STABLE UChar* U_EXPORT2 u_uastrncpy(UChar *dst, * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE char* U_EXPORT2 u_austrcpy(char *dst, +U_CAPI char* U_EXPORT2 u_austrcpy(char *dst, const UChar *src ); /** @@ -730,7 +730,7 @@ U_STABLE char* U_EXPORT2 u_austrcpy(char *dst, * @return A pointer to dst. * @stable ICU 2.0 */ -U_STABLE char* U_EXPORT2 u_austrncpy(char *dst, +U_CAPI char* U_EXPORT2 u_austrncpy(char *dst, const UChar *src, int32_t n ); @@ -744,7 +744,7 @@ U_STABLE char* U_EXPORT2 u_austrncpy(char *dst, * @return A pointer to dest * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memcpy(UChar *dest, const UChar *src, int32_t count); /** @@ -755,7 +755,7 @@ u_memcpy(UChar *dest, const UChar *src, int32_t count); * @return A pointer to dest * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memmove(UChar *dest, const UChar *src, int32_t count); /** @@ -767,7 +767,7 @@ u_memmove(UChar *dest, const UChar *src, int32_t count); * @return A pointer to dest. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memset(UChar *dest, UChar c, int32_t count); /** @@ -781,7 +781,7 @@ u_memset(UChar *dest, UChar c, int32_t count); * When buf1 > buf2, a positive number is returned. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_memcmp(const UChar *buf1, const UChar *buf2, int32_t count); /** @@ -797,7 +797,7 @@ u_memcmp(const UChar *buf1, const UChar *buf2, int32_t count); * in code point order * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_memcmpCodePointOrder(const UChar *s1, const UChar *s2, int32_t count); /** @@ -817,7 +817,7 @@ u_memcmpCodePointOrder(const UChar *s1, const UChar *s2, int32_t count); * @see u_memchr32 * @see u_strFindFirst */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memchr(const UChar *s, UChar c, int32_t count); /** @@ -837,7 +837,7 @@ u_memchr(const UChar *s, UChar c, int32_t count); * @see u_memchr * @see u_strFindFirst */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memchr32(const UChar *s, UChar32 c, int32_t count); /** @@ -857,7 +857,7 @@ u_memchr32(const UChar *s, UChar32 c, int32_t count); * @see u_memrchr32 * @see u_strFindLast */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memrchr(const UChar *s, UChar c, int32_t count); /** @@ -877,7 +877,7 @@ u_memrchr(const UChar *s, UChar c, int32_t count); * @see u_memrchr * @see u_strFindLast */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_memrchr32(const UChar *s, UChar32 c, int32_t count); /** @@ -903,13 +903,13 @@ u_memrchr32(const UChar *s, UChar32 c, int32_t count); * * U_STRING_DECL(ustringVar1, "Quick-Fox 2", 11); * U_STRING_DECL(ustringVar2, "jumps 5%", 8); - * static UBool didInit=FALSE; + * static UBool didInit=false; * * int32_t function() { * if(!didInit) { * U_STRING_INIT(ustringVar1, "Quick-Fox 2", 11); * U_STRING_INIT(ustringVar2, "jumps 5%", 8); - * didInit=TRUE; + * didInit=true; * } * return u_strcmp(ustringVar1, ustringVar2); * } @@ -992,7 +992,7 @@ u_memrchr32(const UChar *s, UChar32 c, int32_t count); * @see UnicodeString#unescapeAt() * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_unescape(const char *src, UChar *dest, int32_t destCapacity); @@ -1040,7 +1040,7 @@ U_CDECL_END * @see UnicodeString#unescapeAt() * @stable ICU 2.0 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 u_unescapeAt(UNESCAPE_CHAR_AT charAt, int32_t *offset, int32_t length, @@ -1066,7 +1066,7 @@ u_unescapeAt(UNESCAPE_CHAR_AT charAt, * only some of the result was written to the destination buffer. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strToUpper(UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, const char *locale, @@ -1092,7 +1092,7 @@ u_strToUpper(UChar *dest, int32_t destCapacity, * only some of the result was written to the destination buffer. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strToLower(UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, const char *locale, @@ -1138,7 +1138,7 @@ u_strToLower(UChar *dest, int32_t destCapacity, * only some of the result was written to the destination buffer. * @stable ICU 2.1 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strToTitle(UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, UBreakIterator *titleIter, @@ -1171,7 +1171,7 @@ u_strToTitle(UChar *dest, int32_t destCapacity, * only some of the result was written to the destination buffer. * @stable ICU 2.0 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_strFoldCase(UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, uint32_t options, @@ -1200,7 +1200,7 @@ u_strFoldCase(UChar *dest, int32_t destCapacity, * @return The pointer to destination buffer. * @stable ICU 2.0 */ -U_STABLE wchar_t* U_EXPORT2 +U_CAPI wchar_t* U_EXPORT2 u_strToWCS(wchar_t *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1229,7 +1229,7 @@ u_strToWCS(wchar_t *dest, * @return The pointer to destination buffer. * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strFromWCS(UChar *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1260,7 +1260,7 @@ u_strFromWCS(UChar *dest, * @see u_strToUTF8WithSub * @see u_strFromUTF8 */ -U_STABLE char* U_EXPORT2 +U_CAPI char* U_EXPORT2 u_strToUTF8(char *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1290,7 +1290,7 @@ u_strToUTF8(char *dest, * @see u_strFromUTF8WithSub * @see u_strFromUTF8Lenient */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strFromUTF8(UChar *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1333,7 +1333,7 @@ u_strFromUTF8(UChar *dest, * @see u_strFromUTF8WithSub * @stable ICU 3.6 */ -U_STABLE char* U_EXPORT2 +U_CAPI char* U_EXPORT2 u_strToUTF8WithSub(char *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1378,7 +1378,7 @@ u_strToUTF8WithSub(char *dest, * @see u_strToUTF8WithSub * @stable ICU 3.6 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strFromUTF8WithSub(UChar *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1438,7 +1438,7 @@ u_strFromUTF8WithSub(UChar *dest, * @see u_strToUTF8WithSub * @stable ICU 3.6 */ -U_STABLE UChar * U_EXPORT2 +U_CAPI UChar * U_EXPORT2 u_strFromUTF8Lenient(UChar *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1468,7 +1468,7 @@ u_strFromUTF8Lenient(UChar *dest, * @see u_strFromUTF32 * @stable ICU 2.0 */ -U_STABLE UChar32* U_EXPORT2 +U_CAPI UChar32* U_EXPORT2 u_strToUTF32(UChar32 *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1498,7 +1498,7 @@ u_strToUTF32(UChar32 *dest, * @see u_strToUTF32 * @stable ICU 2.0 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strFromUTF32(UChar *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1541,7 +1541,7 @@ u_strFromUTF32(UChar *dest, * @see u_strFromUTF32WithSub * @stable ICU 4.2 */ -U_STABLE UChar32* U_EXPORT2 +U_CAPI UChar32* U_EXPORT2 u_strToUTF32WithSub(UChar32 *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1585,7 +1585,7 @@ u_strToUTF32WithSub(UChar32 *dest, * @see u_strToUTF32WithSub * @stable ICU 4.2 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strFromUTF32WithSub(UChar *dest, int32_t destCapacity, int32_t *pDestLength, @@ -1626,7 +1626,7 @@ u_strFromUTF32WithSub(UChar *dest, * @see u_strToUTF8WithSub * @see u_strFromJavaModifiedUTF8WithSub */ -U_STABLE char* U_EXPORT2 +U_CAPI char* U_EXPORT2 u_strToJavaModifiedUTF8( char *dest, int32_t destCapacity, @@ -1676,7 +1676,7 @@ u_strToJavaModifiedUTF8( * @see u_strToJavaModifiedUTF8 * @stable ICU 4.4 */ -U_STABLE UChar* U_EXPORT2 +U_CAPI UChar* U_EXPORT2 u_strFromJavaModifiedUTF8WithSub( UChar *dest, int32_t destCapacity, diff --git a/intl/icu/source/common/unicode/utext.h b/intl/icu/source/common/unicode/utext.h index 37d71a317286..c6d1e53a8cef 100644 --- a/intl/icu/source/common/unicode/utext.h +++ b/intl/icu/source/common/unicode/utext.h @@ -180,7 +180,7 @@ typedef struct UText UText; /**< C typedef for struct UText. @stable ICU 3.6 */ * * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_close(UText *ut); /** @@ -204,7 +204,7 @@ utext_close(UText *ut); * will always be used and returned. * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_openUTF8(UText *ut, const char *s, int64_t length, UErrorCode *status); @@ -222,7 +222,7 @@ utext_openUTF8(UText *ut, const char *s, int64_t length, UErrorCode *status); * will always be used and returned. * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status); @@ -239,7 +239,7 @@ utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status); * will always be used and returned. * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_openUnicodeString(UText *ut, icu::UnicodeString *s, UErrorCode *status); @@ -255,7 +255,7 @@ utext_openUnicodeString(UText *ut, icu::UnicodeString *s, UErrorCode *status); * will always be used and returned. * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_openConstUnicodeString(UText *ut, const icu::UnicodeString *s, UErrorCode *status); @@ -271,7 +271,7 @@ utext_openConstUnicodeString(UText *ut, const icu::UnicodeString *s, UErrorCode * @see Replaceable * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_openReplaceable(UText *ut, icu::Replaceable *rep, UErrorCode *status); /** @@ -286,7 +286,7 @@ utext_openReplaceable(UText *ut, icu::Replaceable *rep, UErrorCode *status); * @see Replaceable * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_openCharacterIterator(UText *ut, icu::CharacterIterator *ci, UErrorCode *status); #endif @@ -323,7 +323,7 @@ utext_openCharacterIterator(UText *ut, icu::CharacterIterator *ci, UErrorCode *s * shallow clones provide some protection against errors of this type by * disabling text modification via the cloned UText. * - * A shallow clone made with the readOnly parameter == FALSE will preserve the + * A shallow clone made with the readOnly parameter == false will preserve the * utext_isWritable() state of the source object. Note, however, that * write operations must be avoided while more than one UText exists that refer * to the same underlying text. @@ -339,8 +339,8 @@ utext_openCharacterIterator(UText *ut, icu::CharacterIterator *ci, UErrorCode *s * If non-NULL, must refer to an already existing UText, which will then * be reset to become the clone. * @param src The UText to be cloned. - * @param deep TRUE to request a deep clone, FALSE for a shallow clone. - * @param readOnly TRUE to request that the cloned UText have read only access to the + * @param deep true to request a deep clone, false for a shallow clone. + * @param readOnly true to request that the cloned UText have read only access to the * underlying text. * @param status Errors are returned here. For deep clones, U_UNSUPPORTED_ERROR @@ -349,7 +349,7 @@ utext_openCharacterIterator(UText *ut, icu::CharacterIterator *ci, UErrorCode *s * @return The newly created clone, or NULL if the clone operation failed. * @stable ICU 3.4 */ -U_STABLE UText * U_EXPORT2 +U_CAPI UText * U_EXPORT2 utext_clone(UText *dest, const UText *src, UBool deep, UBool readOnly, UErrorCode *status); @@ -357,14 +357,14 @@ utext_clone(UText *dest, const UText *src, UBool deep, UBool readOnly, UErrorCod * Compare two UText objects for equality. * UTexts are equal if they are iterating over the same text, and * have the same iteration position within the text. - * If either or both of the parameters are NULL, the comparison is FALSE. + * If either or both of the parameters are NULL, the comparison is false. * * @param a The first of the two UTexts to compare. * @param b The other UText to be compared. - * @return TRUE if the two UTexts are equal. + * @return true if the two UTexts are equal. * @stable ICU 3.6 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 utext_equals(const UText *a, const UText *b); @@ -385,11 +385,11 @@ utext_equals(const UText *a, const UText *b); * * @stable ICU 3.4 */ -U_STABLE int64_t U_EXPORT2 +U_CAPI int64_t U_EXPORT2 utext_nativeLength(UText *ut); /** - * Return TRUE if calculating the length of the text could be expensive. + * Return true if calculating the length of the text could be expensive. * Finding the length of NUL terminated strings is considered to be expensive. * * Note that the value of this function may change @@ -398,10 +398,10 @@ utext_nativeLength(UText *ut); * be expensive to report it. * * @param ut the text to be accessed. - * @return TRUE if determining the length of the text could be time consuming. + * @return true if determining the length of the text could be time consuming. * @stable ICU 3.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 utext_isLengthExpensive(const UText *ut); /** @@ -429,7 +429,7 @@ utext_isLengthExpensive(const UText *ut); * @return the code point at the specified index. * @stable ICU 3.4 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utext_char32At(UText *ut, int64_t nativeIndex); @@ -443,7 +443,7 @@ utext_char32At(UText *ut, int64_t nativeIndex); * @return the Unicode code point at the current iterator position. * @stable ICU 3.4 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utext_current32(UText *ut); @@ -465,7 +465,7 @@ utext_current32(UText *ut); * @see UTEXT_NEXT32 * @stable ICU 3.4 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utext_next32(UText *ut); @@ -486,7 +486,7 @@ utext_next32(UText *ut); * @see UTEXT_PREVIOUS32 * @stable ICU 3.4 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utext_previous32(UText *ut); @@ -508,7 +508,7 @@ utext_previous32(UText *ut); * or U_SENTINEL (-1) if it is out of bounds. * @stable ICU 3.4 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utext_next32From(UText *ut, int64_t nativeIndex); @@ -528,7 +528,7 @@ utext_next32From(UText *ut, int64_t nativeIndex); * * @stable ICU 3.4 */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utext_previous32From(UText *ut, int64_t nativeIndex); /** @@ -543,7 +543,7 @@ utext_previous32From(UText *ut, int64_t nativeIndex); * @return the current index position, in the native units of the text provider. * @stable ICU 3.4 */ -U_STABLE int64_t U_EXPORT2 +U_CAPI int64_t U_EXPORT2 utext_getNativeIndex(const UText *ut); /** @@ -569,7 +569,7 @@ utext_getNativeIndex(const UText *ut); * @param nativeIndex the native unit index of the new iteration position. * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 utext_setNativeIndex(UText *ut, int64_t nativeIndex); /** @@ -584,11 +584,11 @@ utext_setNativeIndex(UText *ut, int64_t nativeIndex); * * @param ut the text to be accessed. * @param delta the signed number of code points to move the iteration position. - * @return TRUE if the position could be moved the requested number of positions while + * @return true if the position could be moved the requested number of positions while * staying within the range [0 - text length]. * @stable ICU 3.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 utext_moveIndex32(UText *ut, int32_t delta); /** @@ -613,7 +613,7 @@ utext_moveIndex32(UText *ut, int32_t delta); * or zero if the current position is at the start of the text. * @stable ICU 3.6 */ -U_STABLE int64_t U_EXPORT2 +U_CAPI int64_t U_EXPORT2 utext_getPreviousNativeIndex(UText *ut); @@ -651,7 +651,7 @@ utext_getPreviousNativeIndex(UText *ut); * * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utext_extract(UText *ut, int64_t nativeStart, int64_t nativeLimit, UChar *dest, int32_t destCapacity, @@ -768,16 +768,16 @@ utext_extract(UText *ut, /** - * Return TRUE if the text can be written (modified) with utext_replace() or + * Return true if the text can be written (modified) with utext_replace() or * utext_copy(). For the text to be writable, the text provider must * be of a type that supports writing and the UText must not be frozen. * - * Attempting to modify text when utext_isWriteable() is FALSE will fail - + * Attempting to modify text when utext_isWriteable() is false will fail - * the text will not be modified, and an error will be returned from the function * that attempted the modification. * * @param ut the UText to be tested. - * @return TRUE if the text is modifiable. + * @return true if the text is modifiable. * * @see utext_freeze() * @see utext_replace() @@ -785,7 +785,7 @@ utext_extract(UText *ut, * @stable ICU 3.4 * */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 utext_isWritable(const UText *ut); @@ -794,10 +794,10 @@ utext_isWritable(const UText *ut); * @see Replaceable::hasMetaData() * * @param ut The UText to be tested - * @return TRUE if the underlying text includes meta data. + * @return true if the underlying text includes meta data. * @stable ICU 3.4 */ -U_STABLE UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 utext_hasMetaData(const UText *ut); @@ -808,7 +808,7 @@ utext_hasMetaData(const UText *ut); * newly inserted replacement text. * * This function is only available on UText types that support writing, - * that is, ones where utext_isWritable() returns TRUE. + * that is, ones where utext_isWritable() returns true. * * When using this function, there should be only a single UText opened onto the * underlying native text string. Behavior after a replace operation @@ -828,7 +828,7 @@ utext_hasMetaData(const UText *ut); * * @stable ICU 3.4 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utext_replace(UText *ut, int64_t nativeStart, int64_t nativeLimit, const UChar *replacementText, int32_t replacementLength, @@ -850,7 +850,7 @@ utext_replace(UText *ut, * at the destination position. * * This function is only available on UText types that support writing, - * that is, ones where utext_isWritable() returns TRUE. + * that is, ones where utext_isWritable() returns true. * * When using this function, there should be only a single UText opened onto the * underlying native text string. Behavior after a copy operation @@ -863,12 +863,12 @@ utext_replace(UText *ut, * to be copied. * @param destIndex The native destination index to which the source substring is * copied or moved. - * @param move If TRUE, then the substring is moved, not copied/duplicated. + * @param move If true, then the substring is moved, not copied/duplicated. * @param status receives any error status. Possible errors include U_NO_WRITE_PERMISSION * * @stable ICU 3.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 utext_copy(UText *ut, int64_t nativeStart, int64_t nativeLimit, int64_t destIndex, @@ -897,7 +897,7 @@ utext_copy(UText *ut, * @see utext_isWritable() * @stable ICU 3.6 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 utext_freeze(UText *ut); @@ -972,7 +972,7 @@ enum { * @param dest A UText struct to be filled in with the result of the clone operation, * or NULL if the clone function should heap-allocate a new UText struct. * @param src The UText to be cloned. - * @param deep TRUE to request a deep clone, FALSE for a shallow clone. + * @param deep true to request a deep clone, false for a shallow clone. * @param status Errors are returned here. For deep clones, U_UNSUPPORTED_ERROR * should be returned if the text provider is unable to clone the * original text. @@ -1008,9 +1008,9 @@ UTextNativeLength(UText *ut); * * @param ut the UText being accessed. * @param nativeIndex Requested index of the text to be accessed. - * @param forward If TRUE, then the returned chunk must contain text + * @param forward If true, then the returned chunk must contain text * starting from the index, so that start<=indexUsage: * ICU coding guidelines for if() statements should be followed when using these macros. @@ -124,7 +124,7 @@ /** * Is this code point a Unicode noncharacter? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U_IS_UNICODE_NONCHAR(c) \ @@ -145,7 +145,7 @@ * and that boundary is tested first for performance. * * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U_IS_UNICODE_CHAR(c) \ @@ -155,7 +155,7 @@ /** * Is this code point a BMP code point (U+0000..U+ffff)? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.8 */ #define U_IS_BMP(c) ((uint32_t)(c)<=0xffff) @@ -163,7 +163,7 @@ /** * Is this code point a supplementary code point (U+10000..U+10ffff)? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.8 */ #define U_IS_SUPPLEMENTARY(c) ((uint32_t)((c)-0x10000)<=0xfffff) @@ -171,7 +171,7 @@ /** * Is this code point a lead surrogate (U+d800..U+dbff)? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U_IS_LEAD(c) (((c)&0xfffffc00)==0xd800) @@ -179,7 +179,7 @@ /** * Is this code point a trail surrogate (U+dc00..U+dfff)? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U_IS_TRAIL(c) (((c)&0xfffffc00)==0xdc00) @@ -187,7 +187,7 @@ /** * Is this code point a surrogate (U+d800..U+dfff)? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U_IS_SURROGATE(c) (((c)&0xfffff800)==0xd800) @@ -196,7 +196,7 @@ * Assuming c is a surrogate code point (U_IS_SURROGATE(c)), * is it a lead surrogate? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U_IS_SURROGATE_LEAD(c) (((c)&0x400)==0) @@ -205,7 +205,7 @@ * Assuming c is a surrogate code point (U_IS_SURROGATE(c)), * is it a trail surrogate? * @param c 32-bit code point - * @return TRUE or FALSE + * @return true or false * @stable ICU 4.2 */ #define U_IS_SURROGATE_TRAIL(c) (((c)&0x400)!=0) diff --git a/intl/icu/source/common/unicode/utf16.h b/intl/icu/source/common/unicode/utf16.h index 9fd7d5c8a772..3902c60e95e7 100644 --- a/intl/icu/source/common/unicode/utf16.h +++ b/intl/icu/source/common/unicode/utf16.h @@ -23,7 +23,7 @@ * This file defines macros to deal with 16-bit Unicode (UTF-16) code units and strings. * * For more information see utf.h and the ICU User Guide Strings chapter - * (http://userguide.icu-project.org/strings). + * (https://unicode-org.github.io/icu/userguide/strings). * * Usage: * ICU coding guidelines for if() statements should be followed when using these macros. @@ -34,6 +34,7 @@ #ifndef __UTF16_H__ #define __UTF16_H__ +#include #include "unicode/umachine.h" #ifndef __UTF_H__ # include "unicode/utf.h" @@ -44,7 +45,7 @@ /** * Does this code unit alone encode a code point (BMP, not a surrogate)? * @param c 16-bit code unit - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U16_IS_SINGLE(c) !U_IS_SURROGATE(c) @@ -52,7 +53,7 @@ /** * Is this code unit a lead surrogate (U+d800..U+dbff)? * @param c 16-bit code unit - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U16_IS_LEAD(c) (((c)&0xfffffc00)==0xd800) @@ -60,7 +61,7 @@ /** * Is this code unit a trail surrogate (U+dc00..U+dfff)? * @param c 16-bit code unit - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U16_IS_TRAIL(c) (((c)&0xfffffc00)==0xdc00) @@ -68,7 +69,7 @@ /** * Is this code unit a surrogate (U+d800..U+dfff)? * @param c 16-bit code unit - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U16_IS_SURROGATE(c) U_IS_SURROGATE(c) @@ -77,7 +78,7 @@ * Assuming c is a surrogate code point (U16_IS_SURROGATE(c)), * is it a lead surrogate? * @param c 16-bit code unit - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U16_IS_SURROGATE_LEAD(c) (((c)&0x400)==0) @@ -86,7 +87,7 @@ * Assuming c is a surrogate code point (U16_IS_SURROGATE(c)), * is it a trail surrogate? * @param c 16-bit code unit - * @return TRUE or FALSE + * @return true or false * @stable ICU 4.2 */ #define U16_IS_SURROGATE_TRAIL(c) (((c)&0x400)!=0) @@ -379,13 +380,13 @@ * "Safe" macro, checks for a valid code point. * If a surrogate pair is written, checks for sufficient space in the string. * If the code point is not valid or a trail surrogate does not fit, - * then isError is set to TRUE. + * then isError is set to true. * * @param s const UChar * string buffer * @param i string offset, must be i>10)+0xd7c0); \ (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \ } else /* c>0x10ffff or not enough space */ { \ - (isError)=TRUE; \ + (isError)=true; \ } \ } UPRV_BLOCK_MACRO_END diff --git a/intl/icu/source/common/unicode/utf8.h b/intl/icu/source/common/unicode/utf8.h index 4987a00e8e08..5a07435fcf60 100644 --- a/intl/icu/source/common/unicode/utf8.h +++ b/intl/icu/source/common/unicode/utf8.h @@ -23,7 +23,7 @@ * This file defines macros to deal with 8-bit Unicode (UTF-8) code units (bytes) and strings. * * For more information see utf.h and the ICU User Guide Strings chapter - * (http://userguide.icu-project.org/strings). + * (https://unicode-org.github.io/icu/userguide/strings). * * Usage: * ICU coding guidelines for if() statements should be followed when using these macros. @@ -34,6 +34,7 @@ #ifndef __UTF8_H__ #define __UTF8_H__ +#include #include "unicode/umachine.h" #ifndef __UTF_H__ # include "unicode/utf.h" @@ -117,48 +118,48 @@ * Function for handling "next code point" with error-checking. * * This is internal since it is not meant to be called directly by external clients; - * however it is U_STABLE (not U_INTERNAL) since it is called by public macros in this + * however it is called by public macros in this * file and thus must remain stable, and should not be hidden when other internal * functions are hidden (otherwise public macros would fail to compile). * @internal */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict); /** * Function for handling "append code point" with error-checking. * * This is internal since it is not meant to be called directly by external clients; - * however it is U_STABLE (not U_INTERNAL) since it is called by public macros in this + * however it is called by public macros in this * file and thus must remain stable, and should not be hidden when other internal * functions are hidden (otherwise public macros would fail to compile). * @internal */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool *pIsError); /** * Function for handling "previous code point" with error-checking. * * This is internal since it is not meant to be called directly by external clients; - * however it is U_STABLE (not U_INTERNAL) since it is called by public macros in this + * however it is called by public macros in this * file and thus must remain stable, and should not be hidden when other internal * functions are hidden (otherwise public macros would fail to compile). * @internal */ -U_STABLE UChar32 U_EXPORT2 +U_CAPI UChar32 U_EXPORT2 utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict); /** * Function for handling "skip backward one code point" with error-checking. * * This is internal since it is not meant to be called directly by external clients; - * however it is U_STABLE (not U_INTERNAL) since it is called by public macros in this + * however it is called by public macros in this * file and thus must remain stable, and should not be hidden when other internal * functions are hidden (otherwise public macros would fail to compile). * @internal */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); /* single-code point definitions -------------------------------------------- */ @@ -166,7 +167,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); /** * Does this code unit (byte) encode a code point by itself (US-ASCII 0..0x7f)? * @param c 8-bit code unit (byte) - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U8_IS_SINGLE(c) (((c)&0x80)==0) @@ -174,7 +175,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); /** * Is this code unit (byte) a UTF-8 lead byte? (0xC2..0xF4) * @param c 8-bit code unit (byte) - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U8_IS_LEAD(c) ((uint8_t)((c)-0xc2)<=0x32) @@ -183,7 +184,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); /** * Is this code unit (byte) a UTF-8 trail byte? (0x80..0xBF) * @param c 8-bit code unit (byte) - * @return TRUE or FALSE + * @return true or false * @stable ICU 2.4 */ #define U8_IS_TRAIL(c) ((int8_t)(c)<-0x40) @@ -445,13 +446,13 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * "Safe" macro, checks for a valid code point. * If a non-ASCII code point is written, checks for sufficient space in the string. * If the code point is not valid or trail bytes do not fit, - * then isError is set to TRUE. + * then isError is set to true. * * @param s const uint8_t * string buffer * @param i int32_t string offset, must be i>6)&0x3f)|0x80); \ (s)[(i)++]=(uint8_t)((__uc&0x3f)|0x80); \ } else { \ - (isError)=TRUE; \ + (isError)=true; \ } \ } UPRV_BLOCK_MACRO_END diff --git a/intl/icu/source/common/unicode/utf_old.h b/intl/icu/source/common/unicode/utf_old.h index b2428e6b31e2..160f5ad0a9f2 100644 --- a/intl/icu/source/common/unicode/utf_old.h +++ b/intl/icu/source/common/unicode/utf_old.h @@ -109,7 +109,7 @@ * Where such a distinction is useful, there are two versions of the macros, "unsafe" and "safe" * ones with ..._UNSAFE and ..._SAFE suffixes. The unsafe macros are fast but may cause * program failures if the strings are not well-formed. The safe macros have an additional, boolean - * parameter "strict". If strict is FALSE, then only illegal sequences are detected. + * parameter "strict". If strict is false, then only illegal sequences are detected. * Otherwise, irregular sequences and non-characters are detected as well (like single surrogates). * Safe macros return special error code points for illegal/irregular sequences: * Typically, U+ffff, or values that would result in a code unit sequence of the same length @@ -181,7 +181,7 @@ typedef int32_t UTextOffset; /** * The default choice for general Unicode string macros is to use the ..._SAFE macro implementations - * with strict=FALSE. + * with strict=false. * * @deprecated ICU 2.4. Obsolete, see utf_old.h. */ diff --git a/intl/icu/source/common/unicode/utrace.h b/intl/icu/source/common/unicode/utrace.h index 5b4a0497bf15..28c313c582f8 100644 --- a/intl/icu/source/common/unicode/utrace.h +++ b/intl/icu/source/common/unicode/utrace.h @@ -112,11 +112,9 @@ typedef enum UTraceFunctionNumber { UTRACE_COLLATION_LIMIT, #endif // U_HIDE_DEPRECATED_API -#ifndef U_HIDE_DRAFT_API - /** * The lowest resource/data location. - * @draft ICU 65 + * @stable ICU 65 */ UTRACE_UDATA_START=0x3000, @@ -133,7 +131,7 @@ typedef enum UTraceFunctionNumber { * - "get" (a path was loaded, but the value was not accessed) * - "getalias" (a path was loaded, and an alias was resolved) * - * @draft ICU 65 + * @stable ICU 65 */ UTRACE_UDATA_RESOURCE=UTRACE_UDATA_START, @@ -141,7 +139,7 @@ typedef enum UTraceFunctionNumber { * Indicates that a resource bundle was opened. * * Provides one C-style string to UTraceData: file name. - * @draft ICU 65 + * @stable ICU 65 */ UTRACE_UDATA_BUNDLE, @@ -150,7 +148,7 @@ typedef enum UTraceFunctionNumber { * * Provides one C-style string to UTraceData: file name. * - * @draft ICU 65 + * @stable ICU 65 */ UTRACE_UDATA_DATA_FILE, @@ -163,12 +161,10 @@ typedef enum UTraceFunctionNumber { * * Provides one C-style string to UTraceData: file name. * - * @draft ICU 65 + * @stable ICU 65 */ UTRACE_UDATA_RES_FILE, -#endif // U_HIDE_DRAFT_API - #ifndef U_HIDE_INTERNAL_API /** * One more than the highest normal resource/data trace location. @@ -249,7 +245,7 @@ typedef enum UTraceFunctionNumber { * @param traceLevel A UTraceLevel value. * @stable ICU 2.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 utrace_setLevel(int32_t traceLevel); /** @@ -257,7 +253,7 @@ utrace_setLevel(int32_t traceLevel); * @return The UTraceLevel value being used by ICU. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utrace_getLevel(void); /* Trace function pointers types ----------------------------- */ @@ -331,7 +327,7 @@ UTraceData(const void *context, int32_t fnNumber, int32_t level, * * @stable ICU 2.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 utrace_setFunctions(const void *context, UTraceEntry *e, UTraceExit *x, UTraceData *d); @@ -345,7 +341,7 @@ utrace_setFunctions(const void *context, * @param d The currently installed UTraceData function. * @stable ICU 2.8 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 utrace_getFunctions(const void **context, UTraceEntry **e, UTraceExit **x, UTraceData **d); @@ -467,7 +463,7 @@ utrace_getFunctions(const void **context, * If buffer capacity is insufficient, the required capacity is returned. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt, va_list args); @@ -488,7 +484,7 @@ utrace_vformat(char *outBuf, int32_t capacity, * If buffer capacity is insufficient, the required capacity is returned. * @stable ICU 2.8 */ -U_STABLE int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 utrace_format(char *outBuf, int32_t capacity, int32_t indent, const char *fmt, ...); @@ -505,7 +501,7 @@ utrace_format(char *outBuf, int32_t capacity, * @see UTraceFunctionNumber * @stable ICU 2.8 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 utrace_functionName(int32_t fnNumber); U_CDECL_END diff --git a/intl/icu/source/common/unicode/utypes.h b/intl/icu/source/common/unicode/utypes.h index 8d8f54764e08..7c4ea7ac28dc 100644 --- a/intl/icu/source/common/unicode/utypes.h +++ b/intl/icu/source/common/unicode/utypes.h @@ -479,13 +479,23 @@ typedef enum UErrorCode { U_COLLATOR_VERSION_MISMATCH = 28, /**< Collator version is not compatible with the base version */ U_USELESS_COLLATOR_ERROR = 29, /**< Collator is options only and no base is specified */ U_NO_WRITE_PERMISSION = 30, /**< Attempt to modify read-only or constant data. */ +#ifndef U_HIDE_DRAFT_API + /** + * The input is impractically long for an operation. + * It is rejected because it may lead to problems such as excessive + * processing time, stack depth, or heap memory requirements. + * + * @draft ICU 68 + */ + U_INPUT_TOO_LONG_ERROR = 31, +#endif // U_HIDE_DRAFT_API #ifndef U_HIDE_DEPRECATED_API /** * One more than the highest standard error code. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ - U_STANDARD_ERROR_LIMIT, + U_STANDARD_ERROR_LIMIT = 32, #endif // U_HIDE_DEPRECATED_API /* @@ -715,7 +725,7 @@ typedef enum UErrorCode { * in the UErrorCode enum above. * @stable ICU 2.0 */ -U_STABLE const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 u_errorName(UErrorCode code); diff --git a/intl/icu/source/common/unicode/uvernum.h b/intl/icu/source/common/unicode/uvernum.h index c66776d10b58..a46481a3fe61 100644 --- a/intl/icu/source/common/unicode/uvernum.h +++ b/intl/icu/source/common/unicode/uvernum.h @@ -60,13 +60,13 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 67 +#define U_ICU_VERSION_MAJOR_NUM 68 /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 1 +#define U_ICU_VERSION_MINOR_NUM 2 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU @@ -86,7 +86,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _67 +#define U_ICU_VERSION_SUFFIX _68 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -139,7 +139,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "67.1" +#define U_ICU_VERSION "68.2" /** * The current ICU library major version number as a string, for library name suffixes. @@ -148,17 +148,17 @@ * Until ICU 4.8, this was the combination of the single-digit major and minor ICU version numbers * into one string without dots ("48"). * Since ICU 49, it is the double-digit major ICU version number. - * See http://userguide.icu-project.org/design#TOC-Version-Numbers-in-ICU + * See https://unicode-org.github.io/icu/userguide/design#version-numbers-in-icu * * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "67" +#define U_ICU_VERSION_SHORT "68" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "67.1" +#define U_ICU_DATA_VERSION "68.2" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/intl/icu/source/common/unicode/uversion.h b/intl/icu/source/common/unicode/uversion.h index 5700f62cbff3..113568df8c12 100644 --- a/intl/icu/source/common/unicode/uversion.h +++ b/intl/icu/source/common/unicode/uversion.h @@ -141,7 +141,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH]; * values of up to 255 each. * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_versionFromString(UVersionInfo versionArray, const char *versionString); /** @@ -155,7 +155,7 @@ u_versionFromString(UVersionInfo versionArray, const char *versionString); * fields with values of up to 255 each. * @stable ICU 4.2 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_versionFromUString(UVersionInfo versionArray, const UChar *versionString); @@ -171,7 +171,7 @@ u_versionFromUString(UVersionInfo versionArray, const UChar *versionString); * The buffer size must be at least U_MAX_VERSION_STRING_LENGTH. * @stable ICU 2.4 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_versionToString(const UVersionInfo versionArray, char *versionString); /** @@ -182,6 +182,6 @@ u_versionToString(const UVersionInfo versionArray, char *versionString); * @param versionArray the version # information, the result will be filled in * @stable ICU 2.0 */ -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 u_getVersion(UVersionInfo versionArray); #endif diff --git a/intl/icu/source/common/unifiedcache.cpp b/intl/icu/source/common/unifiedcache.cpp index c483ce143cd3..a13eed8fd39e 100644 --- a/intl/icu/source/common/unifiedcache.cpp +++ b/intl/icu/source/common/unifiedcache.cpp @@ -335,7 +335,7 @@ void UnifiedCache::_putNew( } keyToAdopt->fCreationStatus = creationStatus; if (value->softRefCount == 0) { - _registerMaster(keyToAdopt, value); + _registerPrimary(keyToAdopt, value); } void *oldValue = uhash_put(fHashtable, keyToAdopt, (void *) value, &status); U_ASSERT(oldValue == nullptr); @@ -364,7 +364,7 @@ void UnifiedCache::_putIfAbsentAndGet( } else { _put(element, value, status); } - // Run an eviction slice. This will run even if we added a master entry + // Run an eviction slice. This will run even if we added a primary entry // which doesn't increase the unused count, but that is still o.k _runEvictionSlice(); } @@ -433,9 +433,9 @@ void UnifiedCache::_get( } } -void UnifiedCache::_registerMaster( +void UnifiedCache::_registerPrimary( const CacheKeyBase *theKey, const SharedObject *value) const { - theKey->fIsMaster = true; + theKey->fIsPrimary = true; value->cachePtr = this; ++fNumValuesTotal; ++fNumValuesInUse; @@ -450,7 +450,7 @@ void UnifiedCache::_put( const SharedObject *oldValue = (const SharedObject *) element->value.pointer; theKey->fCreationStatus = status; if (value->softRefCount == 0) { - _registerMaster(theKey, value); + _registerPrimary(theKey, value); } value->softRefCount++; UHashElement *ptr = const_cast(element); @@ -506,9 +506,9 @@ UBool UnifiedCache::_isEvictable(const UHashElement *element) const return FALSE; } - // We can evict entries that are either not a master or have just + // We can evict entries that are either not a primary or have just // one reference (The one reference being from the cache itself). - return (!theKey->fIsMaster || (theValue->softRefCount == 1 && theValue->noHardReferences())); + return (!theKey->fIsPrimary || (theValue->softRefCount == 1 && theValue->noHardReferences())); } void UnifiedCache::removeSoftRef(const SharedObject *value) const { diff --git a/intl/icu/source/common/unifiedcache.h b/intl/icu/source/common/unifiedcache.h index d6c9945126c2..a31998db206a 100644 --- a/intl/icu/source/common/unifiedcache.h +++ b/intl/icu/source/common/unifiedcache.h @@ -34,13 +34,13 @@ class UnifiedCache; */ class U_COMMON_API CacheKeyBase : public UObject { public: - CacheKeyBase() : fCreationStatus(U_ZERO_ERROR), fIsMaster(FALSE) {} + CacheKeyBase() : fCreationStatus(U_ZERO_ERROR), fIsPrimary(false) {} /** * Copy constructor. Needed to support cloning. */ CacheKeyBase(const CacheKeyBase &other) - : UObject(other), fCreationStatus(other.fCreationStatus), fIsMaster(FALSE) { } + : UObject(other), fCreationStatus(other.fCreationStatus), fIsPrimary(false) { } virtual ~CacheKeyBase(); /** @@ -88,7 +88,7 @@ class U_COMMON_API CacheKeyBase : public UObject { } private: mutable UErrorCode fCreationStatus; - mutable UBool fIsMaster; + mutable UBool fIsPrimary; friend class UnifiedCache; }; @@ -147,10 +147,10 @@ class LocaleCacheKey : public CacheKey { virtual UBool operator == (const CacheKeyBase &other) const { // reflexive if (this == &other) { - return TRUE; + return true; } if (!CacheKey::operator == (other)) { - return FALSE; + return false; } // We know this and other are of same class because operator== on // CacheKey returned true. @@ -359,7 +359,7 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Flushes the contents of the cache. If cache values hold references to other - * cache values then _flush should be called in a loop until it returns FALSE. + * cache values then _flush should be called in a loop until it returns false. * * On entry, gCacheMutex must be held. * On exit, those values with are evictable are flushed. @@ -370,7 +370,7 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { * hard (external) references are not deleted, but are detached from * the cache, so that a subsequent removeRefs can delete them. * _flush is not thread safe when all is true. - * @return TRUE if any value in cache was flushed or FALSE otherwise. + * @return true if any value in cache was flushed or false otherwise. */ UBool _flush(UBool all) const; @@ -395,11 +395,11 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { * Attempts to fetch value and status for key from cache. * On entry, gCacheMutex must not be held value must be NULL and status must * be U_ZERO_ERROR. - * On exit, either returns FALSE (In this - * case caller should try to create the object) or returns TRUE with value + * On exit, either returns false (In this + * case caller should try to create the object) or returns true with value * pointing to the fetched value and status set to fetched status. When - * FALSE is returned status may be set to failure if an in progress hash - * entry could not be made but value will remain unchanged. When TRUE is + * false is returned status may be set to failure if an in progress hash + * entry could not be made but value will remain unchanged. When true is * returned, caller must call removeRef() on value. */ UBool _poll( @@ -463,17 +463,17 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { void _runEvictionSlice() const; /** - * Register a master cache entry. A master key is the first key to create + * Register a primary cache entry. A primary key is the first key to create * a given SharedObject value. Subsequent keys whose create function - * produce referneces to an already existing SharedObject are not masters - + * produce referneces to an already existing SharedObject are not primary - * they can be evicted and subsequently recreated. * * On entry, gCacheMutex must be held. - * On exit, items in use count incremented, entry is marked as a master + * On exit, items in use count incremented, entry is marked as a primary * entry, and value registered with cache so that subsequent calls to * addRef() and removeRef() on it correctly interact with the cache. */ - void _registerMaster(const CacheKeyBase *theKey, const SharedObject *value) const; + void _registerPrimary(const CacheKeyBase *theKey, const SharedObject *value) const; /** * Store a value and creation error status in given hash entry. diff --git a/intl/icu/source/common/uniquecharstr.h b/intl/icu/source/common/uniquecharstr.h new file mode 100644 index 000000000000..10cc924f7f9e --- /dev/null +++ b/intl/icu/source/common/uniquecharstr.h @@ -0,0 +1,98 @@ +// © 2020 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +// uniquecharstr.h +// created: 2020sep01 Frank Yung-Fong Tang + +#ifndef __UNIQUECHARSTR_H__ +#define __UNIQUECHARSTR_H__ + +#include "charstr.h" +#include "uassert.h" +#include "uhash.h" + +U_NAMESPACE_BEGIN + +/** + * Stores NUL-terminated strings with duplicate elimination. + * Checks for unique UTF-16 string pointers and converts to invariant characters. + * + * Intended to be stack-allocated. Add strings, get a unique number for each, + * freeze the object, get a char * pointer for each string, + * call orphanCharStrings() to capture the string storage, and let this object go out of scope. + */ +class UniqueCharStrings { +public: + UniqueCharStrings(UErrorCode &errorCode) : strings(nullptr) { + // Note: We hash on string contents but store stable char16_t * pointers. + // If the strings are stored in resource bundles which should be built with + // duplicate elimination, then we should be able to hash on just the pointer values. + uhash_init(&map, uhash_hashUChars, uhash_compareUChars, uhash_compareLong, &errorCode); + if (U_FAILURE(errorCode)) { return; } + strings = new CharString(); + if (strings == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + } + } + ~UniqueCharStrings() { + uhash_close(&map); + delete strings; + } + + /** Returns/orphans the CharString that contains all strings. */ + CharString *orphanCharStrings() { + CharString *result = strings; + strings = nullptr; + return result; + } + + /** + * Adds a string and returns a unique number for it. + * The string's buffer contents must not change, nor move around in memory, + * while this UniqueCharStrings is in use. + * The string contents must be NUL-terminated exactly at s.length(). + * + * Best used with read-only-alias UnicodeString objects that point to + * stable storage, such as strings returned by resource bundle functions. + */ + int32_t add(const UnicodeString &s, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return 0; } + if (isFrozen) { + errorCode = U_NO_WRITE_PERMISSION; + return 0; + } + // The string points into the resource bundle. + const char16_t *p = s.getBuffer(); + int32_t oldIndex = uhash_geti(&map, p); + if (oldIndex != 0) { // found duplicate + return oldIndex; + } + // Explicit NUL terminator for the previous string. + // The strings object is also terminated with one implicit NUL. + strings->append(0, errorCode); + int32_t newIndex = strings->length(); + strings->appendInvariantChars(s, errorCode); + uhash_puti(&map, const_cast(p), newIndex, &errorCode); + return newIndex; + } + + void freeze() { isFrozen = true; } + + /** + * Returns a string pointer for its unique number, if this object is frozen. + * Otherwise nullptr. + */ + const char *get(int32_t i) const { + U_ASSERT(isFrozen); + return isFrozen && i > 0 ? strings->data() + i : nullptr; + } + +private: + UHashtable map; + CharString *strings; + bool isFrozen = false; +}; + +U_NAMESPACE_END + +#endif // __UNIQUECHARSTR_H__ diff --git a/intl/icu/source/common/unisetspan.h b/intl/icu/source/common/unisetspan.h index f1e78ff3ee2b..9a1307a9078a 100644 --- a/intl/icu/source/common/unisetspan.h +++ b/intl/icu/source/common/unisetspan.h @@ -65,8 +65,8 @@ public: /* * Do the strings need to be checked in span() etc.? - * @return TRUE if strings need to be checked (call span() here), - * FALSE if not (use a BMPSet for best performance). + * @return true if strings need to be checked (call span() here), + * false if not (use a BMPSet for best performance). */ inline UBool needsStringSpanUTF16(); inline UBool needsStringSpanUTF8(); diff --git a/intl/icu/source/common/unormimp.h b/intl/icu/source/common/unormimp.h index 88c7975cc4e7..d2604adb4a91 100644 --- a/intl/icu/source/common/unormimp.h +++ b/intl/icu/source/common/unormimp.h @@ -418,7 +418,7 @@ enum { * The same bit is used for NFC and NFKC; (c) differs for them. * As usual, we build the "not skippable" flags so that unassigned * code points get a 0 bit. - * This bit is only valid after (a)..(e) test FALSE; test NFD_NO before (f) as well. + * This bit is only valid after (a)..(e) test false; test NFD_NO before (f) as well. * Test Hangul LV syllables entirely in code. * * diff --git a/intl/icu/source/common/uresbund.cpp b/intl/icu/source/common/uresbund.cpp index 97df4a85ebe1..2ece87897d7c 100644 --- a/intl/icu/source/common/uresbund.cpp +++ b/intl/icu/source/common/uresbund.cpp @@ -1792,7 +1792,7 @@ ures_findSubResource(const UResourceBundle *resB, char* path, UResourceBundle *f return result; } -U_INTERNAL const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ures_getStringByKeyWithFallback(const UResourceBundle *resB, const char* inKey, int32_t* len, @@ -2210,7 +2210,7 @@ ures_getUTF8StringByKey(const UResourceBundle *resB, * INTERNAL: Get the name of the first real locale (not placeholder) * that has resource bundle data. */ -U_INTERNAL const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 ures_getLocaleInternal(const UResourceBundle* resourceBundle, UErrorCode* status) { if (status==NULL || U_FAILURE(*status)) { @@ -2357,7 +2357,7 @@ ures_openDirect(const char* path, const char* localeID, UErrorCode* status) { * * Same as ures_open(), but uses the fill-in parameter and does not allocate a new bundle. */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_openFillIn(UResourceBundle *r, const char* path, const char* localeID, UErrorCode* status) { if(U_SUCCESS(*status) && r == NULL) { @@ -2370,7 +2370,7 @@ ures_openFillIn(UResourceBundle *r, const char* path, /** * Same as ures_openDirect(), but uses the fill-in parameter and does not allocate a new bundle. */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_openDirectFillIn(UResourceBundle *r, const char* path, const char* localeID, UErrorCode* status) { if(U_SUCCESS(*status) && r == NULL) { *status = U_ILLEGAL_ARGUMENT_ERROR; @@ -2420,7 +2420,7 @@ ures_countArrayItems(const UResourceBundle* resourceBundle, * @see ures_getVersion * @internal */ -U_INTERNAL const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 ures_getVersionNumberInternal(const UResourceBundle *resourceBundle) { if (!resourceBundle) return NULL; @@ -3016,7 +3016,7 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) } #if 0 /* This code isn't needed, and given the documentation warnings the implementation is suspect */ -U_INTERNAL UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ures_equal(const UResourceBundle* res1, const UResourceBundle* res2){ if(res1==NULL || res2==NULL){ return res1==res2; /* pointer comparision */ @@ -3052,7 +3052,7 @@ ures_equal(const UResourceBundle* res1, const UResourceBundle* res2){ } return TRUE; } -U_INTERNAL UResourceBundle* U_EXPORT2 +U_CAPI UResourceBundle* U_EXPORT2 ures_clone(const UResourceBundle* res, UErrorCode* status){ UResourceBundle* bundle = NULL; UResourceBundle* ret = NULL; @@ -3068,7 +3068,7 @@ ures_clone(const UResourceBundle* res, UErrorCode* status){ } return ret; } -U_INTERNAL const UResourceBundle* U_EXPORT2 +U_CAPI const UResourceBundle* U_EXPORT2 ures_getParentBundle(const UResourceBundle* res){ if(res==NULL){ return NULL; @@ -3077,7 +3077,7 @@ ures_getParentBundle(const UResourceBundle* res){ } #endif -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 ures_getVersionByKey(const UResourceBundle* res, const char *key, UVersionInfo ver, UErrorCode *status) { const UChar *str; int32_t len; diff --git a/intl/icu/source/common/uresdata.cpp b/intl/icu/source/common/uresdata.cpp index b3c2e2e27ccf..ae731e454428 100644 --- a/intl/icu/source/common/uresdata.cpp +++ b/intl/icu/source/common/uresdata.cpp @@ -963,7 +963,7 @@ res_findResource(const ResourceData *pResData, Resource r, char** path, const ch if(t2 == RES_BOGUS) { /* if we fail to get the resource by key, maybe we got an index */ indexR = uprv_strtol(pathP, &closeIndex, 10); - if(indexR >= 0 && *closeIndex == 0) { + if(indexR >= 0 && *closeIndex == 0 && (*pathP != '0' || closeIndex - pathP == 1)) { /* if we indeed have an index, try to get the item by index */ t2 = res_getTableItemByIndex(pResData, t1, indexR, key); } // else t2 is already RES_BOGUS diff --git a/intl/icu/source/common/uresdata.h b/intl/icu/source/common/uresdata.h index d1b67babf290..7c2152e57b50 100644 --- a/intl/icu/source/common/uresdata.h +++ b/intl/icu/source/common/uresdata.h @@ -402,7 +402,7 @@ typedef struct ResourceData { /* * Read a resource bundle from memory. */ -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 res_read(ResourceData *pResData, const UDataInfo *pInfo, const void *inBytes, int32_t length, UErrorCode *errorCode); @@ -422,7 +422,7 @@ res_load(ResourceData *pResData, U_CFUNC void res_unload(ResourceData *pResData); -U_INTERNAL UResType U_EXPORT2 +U_CAPI UResType U_EXPORT2 res_getPublicType(Resource res); /////////////////////////////////////////////////////////////////////////// @@ -434,31 +434,31 @@ res_getPublicType(Resource res); * and set its length in *pLength. * Returns NULL if not found. */ -U_INTERNAL const UChar * U_EXPORT2 +U_CAPI const UChar * U_EXPORT2 res_getStringNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength); -U_INTERNAL const uint8_t * U_EXPORT2 +U_CAPI const uint8_t * U_EXPORT2 res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength); -U_INTERNAL const int32_t * U_EXPORT2 +U_CAPI const int32_t * U_EXPORT2 res_getIntVectorNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength); -U_INTERNAL const UChar * U_EXPORT2 +U_CAPI const UChar * U_EXPORT2 res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength); -U_INTERNAL Resource U_EXPORT2 +U_CAPI Resource U_EXPORT2 res_getResource(const ResourceData *pResData, const char *key); -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 res_countArrayItems(const ResourceData *pResData, Resource res); -U_INTERNAL Resource U_EXPORT2 +U_CAPI Resource U_EXPORT2 res_getArrayItem(const ResourceData *pResData, Resource array, int32_t indexS); -U_INTERNAL Resource U_EXPORT2 +U_CAPI Resource U_EXPORT2 res_getTableItemByIndex(const ResourceData *pResData, Resource table, int32_t indexS, const char ** key); -U_INTERNAL Resource U_EXPORT2 +U_CAPI Resource U_EXPORT2 res_getTableItemByKey(const ResourceData *pResData, Resource table, int32_t *indexS, const char* * key); /** diff --git a/intl/icu/source/common/uresimp.h b/intl/icu/source/common/uresimp.h index f453ddc004a9..69d82566fe02 100644 --- a/intl/icu/source/common/uresimp.h +++ b/intl/icu/source/common/uresimp.h @@ -157,7 +157,7 @@ U_CFUNC const char* ures_getName(const UResourceBundle* resB); U_CFUNC const char* ures_getPath(const UResourceBundle* resB); /** * If anything was in the RB cache, dump it to the screen. - * @return TRUE if there was anything into the cache + * @return true if there was anything into the cache */ U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void); #endif @@ -218,7 +218,7 @@ ures_findSubResource(const UResourceBundle *resB, * @param isAvailable If non-null, pointer to fillin parameter that indicates whether the * requested locale was available. The locale is defined as 'available' if it physically * exists within the specified tree. - * @param omitDefault if TRUE, omit keyword and value if default. 'de_DE\@collation=standard' -> 'de_DE' + * @param omitDefault if true, omit keyword and value if default. 'de_DE\@collation=standard' -> 'de_DE' * @param status error code * @return the actual buffer size needed for the full locale. If it's greater * than resultCapacity, the returned full name will be truncated and an error code will be returned. diff --git a/intl/icu/source/common/ustr_imp.h b/intl/icu/source/common/ustr_imp.h index 07170922d20b..3c4b9cc2a539 100644 --- a/intl/icu/source/common/ustr_imp.h +++ b/intl/icu/source/common/ustr_imp.h @@ -29,7 +29,7 @@ /** * Compare two strings in code point order or code unit order. * Works in strcmp style (both lengths -1), - * strncmp style (lengths equal and >=0, flag TRUE), + * strncmp style (lengths equal and >=0, flag true), * and memcmp/UnicodeString style (at least one length >=0). */ U_CFUNC int32_t U_EXPORT2 @@ -37,13 +37,13 @@ uprv_strCompare(const UChar *s1, int32_t length1, const UChar *s2, int32_t length2, UBool strncmpStyle, UBool codePointOrder); -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ustr_hashUCharsN(const UChar *str, int32_t length); -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ustr_hashCharsN(const char *str, int32_t length); -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ustr_hashICharsN(const char *str, int32_t length); /** @@ -53,7 +53,7 @@ ustr_hashICharsN(const char *str, int32_t length); * @return If UChar is a lowercase ASCII character, returns the uppercase version. * Otherwise, returns the input character. */ -U_INTERNAL UChar U_EXPORT2 +U_CAPI UChar U_EXPORT2 u_asciiToUpper(UChar c); // TODO: Add u_asciiToLower if/when there is a need for it. @@ -70,28 +70,28 @@ u_asciiToUpper(UChar c); * @param pErrorCode ICU error code. * @return length */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_terminateUChars(UChar *dest, int32_t destCapacity, int32_t length, UErrorCode *pErrorCode); /** * NUL-terminate a char * string if possible. * Same as u_terminateUChars() but for a different string type. */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_terminateChars(char *dest, int32_t destCapacity, int32_t length, UErrorCode *pErrorCode); /** * NUL-terminate a UChar32 * string if possible. * Same as u_terminateUChars() but for a different string type. */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_terminateUChar32s(UChar32 *dest, int32_t destCapacity, int32_t length, UErrorCode *pErrorCode); /** * NUL-terminate a wchar_t * string if possible. * Same as u_terminateUChars() but for a different string type. */ -U_INTERNAL int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_terminateWChars(wchar_t *dest, int32_t destCapacity, int32_t length, UErrorCode *pErrorCode); /** @@ -133,7 +133,7 @@ public: * @param t The i-th byte following the lead byte. * @param i The index (1..3) of byte t in the byte sequence. 0 length) { + tailLimit = length; + } + c = (UChar) u_unescapeAt(charAt, &ahead, tailLimit, + context); } if (U16_IS_TRAIL(c)) { *offset = ahead; diff --git a/intl/icu/source/common/util.h b/intl/icu/source/common/util.h index f3f71dce458e..9c3b76d9ed5f 100644 --- a/intl/icu/source/common/util.h +++ b/intl/icu/source/common/util.h @@ -64,8 +64,8 @@ class U_COMMON_API ICU_Utility /* not : public UObject because all methods are s /** * Escape unprintable characters using \uxxxx notation for U+0000 to * U+FFFF and \Uxxxxxxxx for U+10000 and above. If the character is - * printable ASCII, then do nothing and return FALSE. Otherwise, - * append the escaped notation and return TRUE. + * printable ASCII, then do nothing and return false. Otherwise, + * append the escaped notation and return true. */ static UBool escapeUnprintable(UnicodeString& result, UChar32 c); @@ -95,7 +95,7 @@ class U_COMMON_API ICU_Utility /* not : public UObject because all methods are s * after pos, or str.length(), if there is none. */ static int32_t skipWhitespace(const UnicodeString& str, int32_t& pos, - UBool advance = FALSE); + UBool advance = false); /** * Skip over Pattern_White_Space in a Replaceable. diff --git a/intl/icu/source/common/utrie.h b/intl/icu/source/common/utrie.h index 532ba778eb6e..2fd2c461ffb2 100644 --- a/intl/icu/source/common/utrie.h +++ b/intl/icu/source/common/utrie.h @@ -460,13 +460,13 @@ UTrieEnumValue(const void *context, uint32_t value); * of code points with the same value as retrieved from the trie and * transformed by the UTrieEnumValue function. * - * The callback function can stop the enumeration by returning FALSE. + * The callback function can stop the enumeration by returning false. * * @param context an opaque pointer, as passed into utrie_enum() * @param start the first code point in a contiguous range with value * @param limit one past the last code point in a contiguous range with value * @param value the value that is set for all code points in [start..limit[ - * @return FALSE to stop the enumeration + * @return false to stop the enumeration */ typedef UBool U_CALLCONV UTrieEnumRange(const void *context, UChar32 start, UChar32 limit, uint32_t value); @@ -667,7 +667,7 @@ utrie_getData(UNewTrie *trie, int32_t *pLength); * @param trie the build-time trie * @param c the code point * @param value the value - * @return FALSE if a failure occurred (illegal argument or data array overrun) + * @return false if a failure occurred (illegal argument or data array overrun) */ U_CAPI UBool U_EXPORT2 utrie_set32(UNewTrie *trie, UChar32 c, uint32_t value); @@ -677,7 +677,7 @@ utrie_set32(UNewTrie *trie, UChar32 c, uint32_t value); * * @param trie the build-time trie * @param c the code point - * @param pInBlockZero if not NULL, then *pInBlockZero is set to TRUE + * @param pInBlockZero if not NULL, then *pInBlockZero is set to true * iff the value is retrieved from block 0; * block 0 is the all-initial-value initial block * @return the value @@ -688,14 +688,14 @@ utrie_get32(UNewTrie *trie, UChar32 c, UBool *pInBlockZero); /** * Set a value in a range of code points [start..limit[. * All code points c with start<=cswapArray32(ds, &inTrie->signature, 4, &outTrie->signature, pErrorCode); ds->swapArray16(ds, &inTrie->options, 12, &outTrie->options, pErrorCode); - /* swap the index and the data */ + /* swap the index */ + const uint16_t *inIndex=reinterpret_cast(inTrie+1); + uint16_t *outIndex=reinterpret_cast(outTrie+1); + ds->swapArray16(ds, inIndex, trie.indexLength*2, outIndex, pErrorCode); + + /* swap the data */ + const uint16_t *inData=inIndex+trie.indexLength; + uint16_t *outData=outIndex+trie.indexLength; switch(valueWidth) { case UCPTRIE_VALUE_BITS_16: - ds->swapArray16(ds, inTrie+1, (trie.indexLength+dataLength)*2, outTrie+1, pErrorCode); + ds->swapArray16(ds, inData, dataLength*2, outData, pErrorCode); break; case UCPTRIE_VALUE_BITS_32: - ds->swapArray16(ds, inTrie+1, trie.indexLength*2, outTrie+1, pErrorCode); - ds->swapArray32(ds, (const uint16_t *)(inTrie+1)+trie.indexLength, dataLength*4, - (uint16_t *)(outTrie+1)+trie.indexLength, pErrorCode); + ds->swapArray32(ds, inData, dataLength*4, outData, pErrorCode); break; case UCPTRIE_VALUE_BITS_8: - ds->swapArray16(ds, inTrie+1, trie.indexLength*2, outTrie+1, pErrorCode); if(inTrie!=outTrie) { - uprv_memmove((outTrie+1)+trie.indexLength, (inTrie+1)+trie.indexLength, dataLength); + uprv_memmove(outData, inData, dataLength); } break; default: diff --git a/intl/icu/source/common/uts46.cpp b/intl/icu/source/common/uts46.cpp index b9e6cb023bb3..f25b4e12f124 100644 --- a/intl/icu/source/common/uts46.cpp +++ b/intl/icu/source/common/uts46.cpp @@ -714,6 +714,16 @@ UTS46::processLabel(UnicodeString &dest, UBool wasPunycode; if(labelLength>=4 && label[0]==0x78 && label[1]==0x6e && label[2]==0x2d && label[3]==0x2d) { // Label starts with "xn--", try to un-Punycode it. + // In IDNA2008, labels like "xn--" (decodes to an empty string) and + // "xn--ASCII-" (decodes to just "ASCII") fail the round-trip validation from + // comparing the ToUnicode input with the back-to-ToASCII output. + // They are alternate encodings of the respective ASCII labels. + // Ignore "xn---" here: It will fail Punycode.decode() which logically comes before + // the round-trip verification. + if(labelLength==4 || (labelLength>5 && label[labelLength-1]==u'-')) { + info.labelErrors|=UIDNA_ERROR_INVALID_ACE_LABEL; + return markBadACELabel(dest, labelStart, labelLength, toASCII, info, errorCode); + } wasPunycode=TRUE; UChar *unicodeBuffer=fromPunycode.getBuffer(-1); // capacity==-1: most labels should fit if(unicodeBuffer==NULL) { @@ -925,10 +935,10 @@ UTS46::markBadACELabel(UnicodeString &dest, UBool isASCII=TRUE; UBool onlyLDH=TRUE; const UChar *label=dest.getBuffer()+labelStart; - // Ok to cast away const because we own the UnicodeString. - UChar *s=(UChar *)label+4; // After the initial "xn--". const UChar *limit=label+labelLength; - do { + // Start after the initial "xn--". + // Ok to cast away const because we own the UnicodeString. + for(UChar *s=const_cast(label+4); sTo do * diff --git a/intl/icu/source/common/uvectr32.h b/intl/icu/source/common/uvectr32.h index ba47daa75f16..0d81dfb5c1c5 100644 --- a/intl/icu/source/common/uvectr32.h +++ b/intl/icu/source/common/uvectr32.h @@ -214,7 +214,7 @@ public: inline UBool UVector32::ensureCapacity(int32_t minimumCapacity, UErrorCode &status) { if ((minimumCapacity >= 0) && (capacity >= minimumCapacity)) { - return TRUE; + return true; } else { return expandCapacity(minimumCapacity, status); } @@ -233,7 +233,7 @@ inline void UVector32::addElement(int32_t elem, UErrorCode &status) { } inline int32_t *UVector32::reserveBlock(int32_t size, UErrorCode &status) { - if (ensureCapacity(count+size, status) == FALSE) { + if (ensureCapacity(count+size, status) == false) { return NULL; } int32_t *rp = elements+count; diff --git a/intl/icu/source/common/uvectr64.h b/intl/icu/source/common/uvectr64.h index 1cc9a501917f..15c9b3f830c9 100644 --- a/intl/icu/source/common/uvectr64.h +++ b/intl/icu/source/common/uvectr64.h @@ -203,7 +203,7 @@ public: inline UBool UVector64::ensureCapacity(int32_t minimumCapacity, UErrorCode &status) { if ((minimumCapacity >= 0) && (capacity >= minimumCapacity)) { - return TRUE; + return true; } else { return expandCapacity(minimumCapacity, status); } @@ -222,7 +222,7 @@ inline void UVector64::addElement(int64_t elem, UErrorCode &status) { } inline int64_t *UVector64::reserveBlock(int32_t size, UErrorCode &status) { - if (ensureCapacity(count+size, status) == FALSE) { + if (ensureCapacity(count+size, status) == false) { return NULL; } int64_t *rp = elements+count; diff --git a/intl/icu/source/common/wintz.cpp b/intl/icu/source/common/wintz.cpp index 115512e704cc..ebf31650c2fa 100644 --- a/intl/icu/source/common/wintz.cpp +++ b/intl/icu/source/common/wintz.cpp @@ -16,11 +16,12 @@ #if U_PLATFORM_USES_ONLY_WIN32_API #include "wintz.h" +#include "charstr.h" #include "cmemory.h" #include "cstring.h" #include "unicode/ures.h" -#include "unicode/ustring.h" +#include "unicode/unistr.h" #include "uresimp.h" #ifndef WIN32_LEAN_AND_MEAN @@ -35,89 +36,295 @@ U_NAMESPACE_BEGIN -// The max size of TimeZoneKeyName is 128, defined in DYNAMIC_TIME_ZONE_INFORMATION -#define MAX_TIMEZONE_ID_LENGTH 128 +// Note these constants and the struct are only used when dealing with the fallback path for RDP sesssions. + +// This is the location of the time zones in the registry on Vista+ systems. +// See: https://docs.microsoft.com/windows/win32/api/timezoneapi/ns-timezoneapi-dynamic_time_zone_information +#define WINDOWS_TIMEZONES_REG_KEY_PATH L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones" + +// Max length for a registry key is 255. +1 for null. +// See: https://docs.microsoft.com/windows/win32/sysinfo/registry-element-size-limits +#define WINDOWS_MAX_REG_KEY_LENGTH 256 + +#if U_PLATFORM_HAS_WINUWP_API == 0 + +// This is the layout of the TZI binary value in the registry. +// See: https://docs.microsoft.com/windows/win32/api/timezoneapi/ns-timezoneapi-time_zone_information +typedef struct _REG_TZI_FORMAT { + LONG Bias; + LONG StandardBias; + LONG DaylightBias; + SYSTEMTIME StandardDate; + SYSTEMTIME DaylightDate; +} REG_TZI_FORMAT; + +#endif // U_PLATFORM_HAS_WINUWP_API /** -* Main Windows time zone detection function. -* Returns the Windows time zone converted to an ICU time zone as a heap-allocated buffer, or nullptr upon failure. -* Note: We use the Win32 API GetDynamicTimeZoneInformation to get the current time zone info. -* This API returns a non-localized time zone name, which we can then map to an ICU time zone name. +* This is main Windows time zone detection function. +* +* It returns the Windows time zone converted to an ICU time zone as a heap-allocated buffer, or nullptr upon failure. +* +* We use the Win32 API GetDynamicTimeZoneInformation (which is available since Vista) to get the current time zone info, +* as this API returns a non-localized time zone name which can be then mapped to an ICU time zone. +* +* However, in some RDP/terminal services situations, this struct isn't always fully complete, and the TimeZoneKeyName +* field of the struct might be NULL. This can happen with some 3rd party RDP clients, and also when using older versions +* of the RDP protocol, which don't send the newer TimeZoneKeyNamei information and only send the StandardName and DaylightName. +* +* Since these 3rd party clients and older RDP clients only send the pre-Vista time zone information to the server, this means that we +* need to fallback on using the pre-Vista methods to determine the time zone. This unfortunately requires examining the registry directly +* in order to try and determine the current time zone. +* +* Note that this can however still fail in some cases though if the client and server are using different languages, as the StandardName +* that is sent by client is localized in the client's language. However, we must compare this to the names that are on the server, which +* are localized in registry using the server's language. Despite that, this is the best we can do. +* +* Note: This fallback method won't work for the UWP version though, as we can't use the registry APIs in UWP. +* +* Once we have the current Windows time zone, then we can then map it to an ICU time zone ID (~ Olsen ID). */ -U_INTERNAL const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uprv_detectWindowsTimeZone() { - UErrorCode status = U_ZERO_ERROR; - char* icuid = nullptr; - char dynamicTZKeyName[MAX_TIMEZONE_ID_LENGTH]; - char tmpid[MAX_TIMEZONE_ID_LENGTH]; - int32_t len; - int id = GEOID_NOT_AVAILABLE; - int errorCode; - wchar_t ISOcodeW[3] = {}; /* 2 letter ISO code in UTF-16 */ - char ISOcode[3] = {}; /* 2 letter ISO code in UTF-8 */ - + // We first try to obtain the time zone directly by using the TimeZoneKeyName field of the DYNAMIC_TIME_ZONE_INFORMATION struct. DYNAMIC_TIME_ZONE_INFORMATION dynamicTZI; uprv_memset(&dynamicTZI, 0, sizeof(dynamicTZI)); - uprv_memset(dynamicTZKeyName, 0, sizeof(dynamicTZKeyName)); - uprv_memset(tmpid, 0, sizeof(tmpid)); + SYSTEMTIME systemTimeAllZero; + uprv_memset(&systemTimeAllZero, 0, sizeof(systemTimeAllZero)); - /* Obtain TIME_ZONE_INFORMATION from the API and get the non-localized time zone name. */ - if (TIME_ZONE_ID_INVALID == GetDynamicTimeZoneInformation(&dynamicTZI)) { + if (GetDynamicTimeZoneInformation(&dynamicTZI) == TIME_ZONE_ID_INVALID) { return nullptr; } - id = GetUserGeoID(GEOCLASS_NATION); - errorCode = GetGeoInfoW(id, GEO_ISO2, ISOcodeW, 3, 0); + // If the DST setting has been turned off in the Control Panel, then return "Etc/GMT". + // + // Note: This logic is based on how the Control Panel itself determines if DST is 'off' on Windows. + // The code is somewhat convoluted; in a sort of pseudo-code it looks like this: + // + // IF (GetDynamicTimeZoneInformation != TIME_ZONE_ID_INVALID) && (DynamicDaylightTimeDisabled != 0) && + // (StandardDate == DaylightDate) && + // ( + // (TimeZoneKeyName != Empty && StandardDate == 0) || + // (TimeZoneKeyName == Empty && StandardDate != 0) + // ) + // THEN + // DST setting is "Disabled". + // + if (dynamicTZI.DynamicDaylightTimeDisabled != 0 && + uprv_memcmp(&dynamicTZI.StandardDate, &dynamicTZI.DaylightDate, sizeof(dynamicTZI.StandardDate)) == 0 && + ((dynamicTZI.TimeZoneKeyName[0] != L'\0' && uprv_memcmp(&dynamicTZI.StandardDate, &systemTimeAllZero, sizeof(systemTimeAllZero)) == 0) || + (dynamicTZI.TimeZoneKeyName[0] == L'\0' && uprv_memcmp(&dynamicTZI.StandardDate, &systemTimeAllZero, sizeof(systemTimeAllZero)) != 0))) + { + LONG utcOffsetMins = dynamicTZI.Bias; + if (utcOffsetMins == 0) { + return uprv_strdup("Etc/UTC"); + } - // convert from wchar_t* (UTF-16 on Windows) to char* (UTF-8). - u_strToUTF8(ISOcode, UPRV_LENGTHOF(ISOcode), nullptr, - reinterpret_cast(ISOcodeW), UPRV_LENGTHOF(ISOcodeW), &status); - - LocalUResourceBundlePointer bundle(ures_openDirect(nullptr, "windowsZones", &status)); - ures_getByKey(bundle.getAlias(), "mapTimezones", bundle.getAlias(), &status); - - // convert from wchar_t* (UTF-16 on Windows) to char* (UTF-8). - u_strToUTF8(dynamicTZKeyName, UPRV_LENGTHOF(dynamicTZKeyName), nullptr, - reinterpret_cast(dynamicTZI.TimeZoneKeyName), -1, &status); - - if (U_FAILURE(status)) { - return nullptr; - } - - if (dynamicTZI.TimeZoneKeyName[0] != 0) { - StackUResourceBundle winTZ; - ures_getByKey(bundle.getAlias(), dynamicTZKeyName, winTZ.getAlias(), &status); - - if (U_SUCCESS(status)) { - const UChar* icuTZ = nullptr; - if (errorCode != 0) { - icuTZ = ures_getStringByKey(winTZ.getAlias(), ISOcode, &len, &status); - } - if (errorCode == 0 || icuTZ == nullptr) { - /* fallback to default "001" and reset status */ - status = U_ZERO_ERROR; - icuTZ = ures_getStringByKey(winTZ.getAlias(), "001", &len, &status); - } - - if (U_SUCCESS(status)) { - int index = 0; - - while (!(*icuTZ == '\0' || *icuTZ == ' ')) { - // time zone IDs only contain ASCII invariant characters. - tmpid[index++] = (char)(*icuTZ++); - } - tmpid[index] = '\0'; + // No way to support when DST is turned off and the offset in minutes is not a multiple of 60. + if (utcOffsetMins % 60 == 0) { + char gmtOffsetTz[11] = {}; // "Etc/GMT+dd" is 11-char long with a terminal null. + // Important note on the sign convention for zones: + // + // From https://en.wikipedia.org/wiki/Tz_database#Area + // "In order to conform with the POSIX style, those zone names beginning with "Etc/GMT" have their sign reversed + // from the standard ISO 8601 convention. In the "Etc" area, zones west of GMT have a positive sign and those + // east have a negative sign in their name (e.g "Etc/GMT-14" is 14 hours ahead of GMT)." + // + // Regarding the POSIX style, from https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html + // "The offset specifies the time value you must add to the local time to get a Coordinated Universal Time value." + // + // However, the Bias value in DYNAMIC_TIME_ZONE_INFORMATION *already* follows the POSIX convention. + // + // From https://docs.microsoft.com/en-us/windows/win32/api/timezoneapi/ns-timezoneapi-dynamic_time_zone_information + // "The bias is the difference, in minutes, between Coordinated Universal Time (UTC) and + // local time. All translations between UTC and local time are based on the following formula: + // UTC = local time + bias" + // + // For example, a time zone that is 3 hours ahead of UTC (UTC+03:00) would have a Bias value of -180, and the + // corresponding time zone ID would be "Etc/GMT-3". (So there is no need to negate utcOffsetMins below.) + int ret = snprintf(gmtOffsetTz, UPRV_LENGTHOF(gmtOffsetTz), "Etc/GMT%+ld", utcOffsetMins / 60); + if (ret > 0 && ret < UPRV_LENGTHOF(gmtOffsetTz)) { + return uprv_strdup(gmtOffsetTz); } } } - // Copy the timezone ID to icuid to be returned. - if (tmpid[0] != 0) { - icuid = uprv_strdup(tmpid); + // If DST is NOT disabled, but the TimeZoneKeyName field of the struct is NULL, then we may be dealing with a + // RDP/terminal services session where the 'Time Zone Redirection' feature is enabled. However, either the RDP + // client sent the server incomplete info (some 3rd party RDP clients only send the StandardName and DaylightName, + // but do not send the important TimeZoneKeyName), or if the RDP server has not appropriately populated the struct correctly. + // + // In this case we unfortunately have no choice but to fallback to using the pre-Vista method of determining the + // time zone, which requires examining the registry directly. + // + // Note that this can however still fail though if the client and server are using different languages, as the StandardName + // that is sent by client is *localized* in the client's language. However, we must compare this to the names that are + // on the server, which are *localized* in registry using the server's language. + // + // One other note is that this fallback method doesn't work for the UWP version, as we can't use the registry APIs. + + // windowsTimeZoneName will point at timezoneSubKeyName if we had to fallback to using the registry, and we found a match. + WCHAR timezoneSubKeyName[WINDOWS_MAX_REG_KEY_LENGTH]; + WCHAR *windowsTimeZoneName = dynamicTZI.TimeZoneKeyName; + + if (dynamicTZI.TimeZoneKeyName[0] == 0) { + +// We can't use the registry APIs in the UWP version. +#if U_PLATFORM_HAS_WINUWP_API == 1 + (void)timezoneSubKeyName; // suppress unused variable warnings. + return nullptr; +#else + // Open the path to the time zones in the Windows registry. + LONG ret; + HKEY hKeyAllTimeZones = nullptr; + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, WINDOWS_TIMEZONES_REG_KEY_PATH, 0, KEY_READ, + reinterpret_cast(&hKeyAllTimeZones)); + + if (ret != ERROR_SUCCESS) { + // If we can't open the key, then we can't do much, so fail. + return nullptr; + } + + // Read the number of subkeys under the time zone registry path. + DWORD numTimeZoneSubKeys; + ret = RegQueryInfoKeyW(hKeyAllTimeZones, nullptr, nullptr, nullptr, &numTimeZoneSubKeys, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr); + + if (ret != ERROR_SUCCESS) { + RegCloseKey(hKeyAllTimeZones); + return nullptr; + } + + // Examine each of the subkeys to try and find a match for the localized standard name ("Std"). + // + // Note: The name of the time zone subkey itself is not localized, but the "Std" name is localized. This means + // that we could fail to find a match if the RDP client and RDP server are using different languages, but unfortunately + // there isn't much we can do about it. + HKEY hKeyTimeZoneSubKey = nullptr; + ULONG registryValueType; + WCHAR registryStandardName[WINDOWS_MAX_REG_KEY_LENGTH]; + + for (DWORD i = 0; i < numTimeZoneSubKeys; i++) { + // Note: RegEnumKeyExW wants the size of the buffer in characters. + DWORD size = UPRV_LENGTHOF(timezoneSubKeyName); + ret = RegEnumKeyExW(hKeyAllTimeZones, i, timezoneSubKeyName, &size, nullptr, nullptr, nullptr, nullptr); + + if (ret != ERROR_SUCCESS) { + RegCloseKey(hKeyAllTimeZones); + return nullptr; + } + + ret = RegOpenKeyExW(hKeyAllTimeZones, timezoneSubKeyName, 0, KEY_READ, + reinterpret_cast(&hKeyTimeZoneSubKey)); + + if (ret != ERROR_SUCCESS) { + RegCloseKey(hKeyAllTimeZones); + return nullptr; + } + + // Note: RegQueryValueExW wants the size of the buffer in bytes. + size = sizeof(registryStandardName); + ret = RegQueryValueExW(hKeyTimeZoneSubKey, L"Std", nullptr, ®istryValueType, + reinterpret_cast(registryStandardName), &size); + + if (ret != ERROR_SUCCESS || registryValueType != REG_SZ) { + RegCloseKey(hKeyTimeZoneSubKey); + RegCloseKey(hKeyAllTimeZones); + return nullptr; + } + + // Note: wcscmp does an ordinal (byte) comparison. + if (wcscmp(reinterpret_cast(registryStandardName), dynamicTZI.StandardName) == 0) { + // Since we are comparing the *localized* time zone name, it's possible that some languages might use + // the same string for more than one time zone. Thus we need to examine the TZI data in the registry to + // compare the GMT offset (the bias), and the DST transition dates, to ensure it's the same time zone + // as the currently reported one. + REG_TZI_FORMAT registryTziValue; + uprv_memset(®istryTziValue, 0, sizeof(registryTziValue)); + + // Note: RegQueryValueExW wants the size of the buffer in bytes. + DWORD timezoneTziValueSize = sizeof(registryTziValue); + ret = RegQueryValueExW(hKeyTimeZoneSubKey, L"TZI", nullptr, ®istryValueType, + reinterpret_cast(®istryTziValue), &timezoneTziValueSize); + + if (ret == ERROR_SUCCESS) { + if ((dynamicTZI.Bias == registryTziValue.Bias) && + (memcmp((const void *)&dynamicTZI.StandardDate, (const void *)®istryTziValue.StandardDate, sizeof(SYSTEMTIME)) == 0) && + (memcmp((const void *)&dynamicTZI.DaylightDate, (const void *)®istryTziValue.DaylightDate, sizeof(SYSTEMTIME)) == 0)) + { + // We found a matching time zone. + windowsTimeZoneName = timezoneSubKeyName; + break; + } + } + } + RegCloseKey(hKeyTimeZoneSubKey); + hKeyTimeZoneSubKey = nullptr; + } + + if (hKeyTimeZoneSubKey != nullptr) { + RegCloseKey(hKeyTimeZoneSubKey); + } + if (hKeyAllTimeZones != nullptr) { + RegCloseKey(hKeyAllTimeZones); + } +#endif // U_PLATFORM_HAS_WINUWP_API } - return icuid; + CharString winTZ; + UErrorCode status = U_ZERO_ERROR; + winTZ.appendInvariantChars(UnicodeString(TRUE, windowsTimeZoneName, -1), status); + + // Map Windows Timezone name (non-localized) to ICU timezone ID (~ Olson timezone id). + StackUResourceBundle winTZBundle; + ures_openDirectFillIn(winTZBundle.getAlias(), nullptr, "windowsZones", &status); + ures_getByKey(winTZBundle.getAlias(), "mapTimezones", winTZBundle.getAlias(), &status); + ures_getByKey(winTZBundle.getAlias(), winTZ.data(), winTZBundle.getAlias(), &status); + + if (U_FAILURE(status)) { + return nullptr; + } + + // Note: Since the ISO 3166 country/region codes are all invariant ASCII chars, we can + // directly downcast from wchar_t to do the conversion. + // We could call the A version of the GetGeoInfo API, but that would be slightly slower than calling the W API, + // as the A version of the API will end up calling MultiByteToWideChar anyways internally. + wchar_t regionCodeW[3] = {}; + char regionCode[3] = {}; // 2 letter ISO 3166 country/region code made entirely of invariant chars. + int geoId = GetUserGeoID(GEOCLASS_NATION); + int regionCodeLen = GetGeoInfoW(geoId, GEO_ISO2, regionCodeW, UPRV_LENGTHOF(regionCodeW), 0); + + const UChar *icuTZ16 = nullptr; + int32_t tzListLen = 0; + + if (regionCodeLen != 0) { + for (int i = 0; i < UPRV_LENGTHOF(regionCodeW); i++) { + regionCode[i] = static_cast(regionCodeW[i]); + } + icuTZ16 = ures_getStringByKey(winTZBundle.getAlias(), regionCode, &tzListLen, &status); + } + if (regionCodeLen == 0 || U_FAILURE(status)) { + // fallback to default "001" (world) + status = U_ZERO_ERROR; + icuTZ16 = ures_getStringByKey(winTZBundle.getAlias(), "001", &tzListLen, &status); + } + + // Note: We want the first entry in the string returned by ures_getStringByKey. + // However this string can be a space delimited list of timezones: + // Ex: "America/New_York America/Detroit America/Indiana/Petersburg ..." + // We need to stop at the first space, so we pass tzLen (instead of tzListLen) to appendInvariantChars below. + int32_t tzLen = 0; + if (tzListLen > 0) { + while (!(icuTZ16[tzLen] == u'\0' || icuTZ16[tzLen] == u' ')) { + tzLen++; + } + } + + // Note: cloneData returns nullptr if the status is a failure, so this + // will return nullptr if the above look-up fails. + CharString icuTZStr; + return icuTZStr.appendInvariantChars(icuTZ16, tzLen, status).cloneData(status); } U_NAMESPACE_END diff --git a/intl/icu/source/common/wintz.h b/intl/icu/source/common/wintz.h index cd8565eef1ed..ce9c1e901928 100644 --- a/intl/icu/source/common/wintz.h +++ b/intl/icu/source/common/wintz.h @@ -28,7 +28,7 @@ U_CDECL_BEGIN typedef struct _TIME_ZONE_INFORMATION TIME_ZONE_INFORMATION; U_CDECL_END -U_INTERNAL const char* U_EXPORT2 +U_CAPI const char* U_EXPORT2 uprv_detectWindowsTimeZone(); #endif /* U_PLATFORM_USES_ONLY_WIN32_API */ diff --git a/intl/icu/source/config/icu-config-bottom b/intl/icu/source/config/icu-config-bottom index ddba5b3f1fe6..b0e55af6e85e 100644 --- a/intl/icu/source/config/icu-config-bottom +++ b/intl/icu/source/config/icu-config-bottom @@ -98,7 +98,7 @@ usage() echo "Copyright (c) 2002-2013, International Business Machines Corporation and others. All Rights Reserved." echo echo "NOTE: Please consider using the pkg-config (.pc) files instead of icu-config." - echo " See: " + echo " See: " } ## Check the sanity of current variables diff --git a/intl/icu/source/configure b/intl/icu/source/configure index e87e7736a8b3..ac730b01ad4d 100755 --- a/intl/icu/source/configure +++ b/intl/icu/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ICU 67.1. +# Generated by GNU Autoconf 2.69 for ICU 68.2. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='67.1' -PACKAGE_STRING='ICU 67.1' +PACKAGE_VERSION='68.2' +PACKAGE_STRING='ICU 68.2' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ICU 67.1 to adapt to many kinds of systems. +\`configure' configures ICU 68.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 67.1:";; + short | recursive ) echo "Configuration of ICU 68.2:";; esac cat <<\_ACEOF @@ -1477,7 +1477,7 @@ Optional Packages: library shared library (.dll/.so/etc.) static static library (.a/.lib/etc.) auto build shared if possible (default) - See http://userguide.icu-project.org/icudata for more info. + See https://unicode-org.github.io/icu/userguide/icudata for more info. --with-library-suffix=suffix tag a suffix to the library names default= Some influential environment variables: @@ -1568,7 +1568,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 67.1 +ICU configure 68.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2314,7 +2314,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ICU $as_me 67.1, which was +It was created by ICU $as_me 68.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8005,7 +8005,7 @@ echo "CXXFLAGS=$CXXFLAGS" # output the Makefiles -ac_config_files="$ac_config_files icudefs.mk Makefile data/pkgdataMakefile config/Makefile.inc config/icu.pc config/pkgdataMakefile data/Makefile stubdata/Makefile common/Makefile i18n/Makefile layoutex/Makefile io/Makefile extra/Makefile extra/uconv/Makefile extra/uconv/pkgdataMakefile extra/scrptrun/Makefile tools/Makefile tools/ctestfw/Makefile tools/toolutil/Makefile tools/makeconv/Makefile tools/genrb/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gendict/Makefile tools/gentest/Makefile tools/gennorm2/Makefile tools/genbrk/Makefile tools/gensprep/Makefile tools/icuinfo/Makefile tools/icupkg/Makefile tools/icuswap/Makefile tools/pkgdata/Makefile tools/tzcode/Makefile tools/gencfu/Makefile tools/escapesrc/Makefile test/Makefile test/compat/Makefile test/testdata/Makefile test/testdata/pkgdataMakefile test/hdrtst/Makefile test/intltest/Makefile test/cintltst/Makefile test/iotest/Makefile test/letest/Makefile test/perf/Makefile test/perf/collationperf/Makefile test/perf/collperf/Makefile test/perf/collperf2/Makefile test/perf/dicttrieperf/Makefile test/perf/ubrkperf/Makefile test/perf/charperf/Makefile test/perf/convperf/Makefile test/perf/normperf/Makefile test/perf/DateFmtPerf/Makefile test/perf/howExpensiveIs/Makefile test/perf/strsrchperf/Makefile test/perf/unisetperf/Makefile test/perf/usetperf/Makefile test/perf/ustrperf/Makefile test/perf/utfperf/Makefile test/perf/utrie2perf/Makefile test/perf/leperf/Makefile test/fuzzer/Makefile samples/Makefile samples/date/Makefile samples/cal/Makefile samples/layout/Makefile" +ac_config_files="$ac_config_files icudefs.mk Makefile data/pkgdataMakefile config/Makefile.inc config/icu.pc config/pkgdataMakefile data/Makefile stubdata/Makefile common/Makefile i18n/Makefile layoutex/Makefile io/Makefile extra/Makefile extra/uconv/Makefile extra/uconv/pkgdataMakefile extra/scrptrun/Makefile tools/Makefile tools/ctestfw/Makefile tools/toolutil/Makefile tools/makeconv/Makefile tools/genrb/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gendict/Makefile tools/gentest/Makefile tools/gennorm2/Makefile tools/genbrk/Makefile tools/gensprep/Makefile tools/icuinfo/Makefile tools/icupkg/Makefile tools/icuswap/Makefile tools/pkgdata/Makefile tools/tzcode/Makefile tools/gencfu/Makefile tools/escapesrc/Makefile test/Makefile test/compat/Makefile test/testdata/Makefile test/testdata/pkgdataMakefile test/hdrtst/Makefile test/intltest/Makefile test/cintltst/Makefile test/iotest/Makefile test/letest/Makefile test/perf/Makefile test/perf/collationperf/Makefile test/perf/collperf/Makefile test/perf/collperf2/Makefile test/perf/dicttrieperf/Makefile test/perf/ubrkperf/Makefile test/perf/charperf/Makefile test/perf/convperf/Makefile test/perf/localecanperf/Makefile test/perf/normperf/Makefile test/perf/DateFmtPerf/Makefile test/perf/howExpensiveIs/Makefile test/perf/strsrchperf/Makefile test/perf/unisetperf/Makefile test/perf/usetperf/Makefile test/perf/ustrperf/Makefile test/perf/utfperf/Makefile test/perf/utrie2perf/Makefile test/perf/leperf/Makefile test/fuzzer/Makefile samples/Makefile samples/date/Makefile samples/cal/Makefile samples/layout/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -8550,7 +8550,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ICU $as_me 67.1, which was +This file was extended by ICU $as_me 68.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8604,7 +8604,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ICU config.status 67.1 +ICU config.status 68.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -8768,6 +8768,7 @@ do "test/perf/ubrkperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/ubrkperf/Makefile" ;; "test/perf/charperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/charperf/Makefile" ;; "test/perf/convperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/convperf/Makefile" ;; + "test/perf/localecanperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/localecanperf/Makefile" ;; "test/perf/normperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/normperf/Makefile" ;; "test/perf/DateFmtPerf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/DateFmtPerf/Makefile" ;; "test/perf/howExpensiveIs/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/howExpensiveIs/Makefile" ;; diff --git a/intl/icu/source/configure.ac b/intl/icu/source/configure.ac index 531dee17d1b6..1796ca07555b 100644 --- a/intl/icu/source/configure.ac +++ b/intl/icu/source/configure.ac @@ -1152,7 +1152,7 @@ AC_ARG_WITH(data-packaging, library shared library (.dll/.so/etc.) static static library (.a/.lib/etc.) auto build shared if possible (default) - See http://userguide.icu-project.org/icudata for more info.], + See https://unicode-org.github.io/icu/userguide/icudata for more info.], [case "${withval}" in files|archive|library) datapackaging=$withval ;; auto) datapackaging=$withval ;; diff --git a/intl/icu/source/data/BUILDRULES.py b/intl/icu/source/data/BUILDRULES.py index e6ddea95c473..063de7cd88ec 100644 --- a/intl/icu/source/data/BUILDRULES.py +++ b/intl/icu/source/data/BUILDRULES.py @@ -362,7 +362,7 @@ def generate_misc(config, io, common_vars): RepeatedExecutionRequest( name = "misc_res", category = "misc", - dep_targets = [], + dep_targets = [DepTarget("cnvalias")], # ICU-21175 input_files = input_files, output_files = output_files, tool = IcuTool("genrb"), diff --git a/intl/icu/source/data/Makefile.in b/intl/icu/source/data/Makefile.in index 8f52551cce78..f020bc82a881 100644 --- a/intl/icu/source/data/Makefile.in +++ b/intl/icu/source/data/Makefile.in @@ -240,7 +240,7 @@ include $(top_builddir)/$(subdir)/rules.mk ifeq ($(ENABLE_SO_VERSION_DATA),1) ifeq ($(PKGDATA_MODE),dll) SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res -$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc +$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp ifeq ($(MSYS_RC_MODE),1) rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $< else diff --git a/intl/icu/source/data/brkitr/LOCALE_DEPS.json b/intl/icu/source/data/brkitr/LOCALE_DEPS.json index 191040baaabe..32123c83de99 100644 --- a/intl/icu/source/data/brkitr/LOCALE_DEPS.json +++ b/intl/icu/source/data/brkitr/LOCALE_DEPS.json @@ -1,6 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37" + "cldrVersion": "38.1" } diff --git a/intl/icu/source/data/brkitr/de.txt b/intl/icu/source/data/brkitr/de.txt index b2b577906239..b69ff4bcc604 100644 --- a/intl/icu/source/data/brkitr/de.txt +++ b/intl/icu/source/data/brkitr/de.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ - Version{"37"} exceptions{ SentenceBreak:array{ "Port.", diff --git a/intl/icu/source/data/brkitr/el.txt b/intl/icu/source/data/brkitr/el.txt index 0b73b0d5e352..3fe9f80ca3e4 100644 --- a/intl/icu/source/data/brkitr/el.txt +++ b/intl/icu/source/data/brkitr/el.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ - Version{"37"} boundaries{ sentence:process(dependency){"sent_el.brk"} } diff --git a/intl/icu/source/data/brkitr/en.txt b/intl/icu/source/data/brkitr/en.txt index abaf03a3dde0..5e19636ced7d 100644 --- a/intl/icu/source/data/brkitr/en.txt +++ b/intl/icu/source/data/brkitr/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ - Version{"37"} exceptions{ SentenceBreak:array{ "L.P.", diff --git a/intl/icu/source/data/brkitr/en_US.txt b/intl/icu/source/data/brkitr/en_US.txt index 0d911e60ef8b..3d196d77c5e1 100644 --- a/intl/icu/source/data/brkitr/en_US.txt +++ b/intl/icu/source/data/brkitr/en_US.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_US{ - Version{"37"} } diff --git a/intl/icu/source/data/brkitr/en_US_POSIX.txt b/intl/icu/source/data/brkitr/en_US_POSIX.txt index 8fc8bd24ae45..e6c43eff7167 100644 --- a/intl/icu/source/data/brkitr/en_US_POSIX.txt +++ b/intl/icu/source/data/brkitr/en_US_POSIX.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_US_POSIX{ - Version{"37"} boundaries{ word:process(dependency){"word_POSIX.brk"} } diff --git a/intl/icu/source/data/brkitr/es.txt b/intl/icu/source/data/brkitr/es.txt index 876fb230e678..994a6efc75ce 100644 --- a/intl/icu/source/data/brkitr/es.txt +++ b/intl/icu/source/data/brkitr/es.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ - Version{"37"} exceptions{ SentenceBreak:array{ "Rdos.", diff --git a/intl/icu/source/data/brkitr/fr.txt b/intl/icu/source/data/brkitr/fr.txt index 76ec2b25da17..f29164f42bab 100644 --- a/intl/icu/source/data/brkitr/fr.txt +++ b/intl/icu/source/data/brkitr/fr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ - Version{"37"} exceptions{ SentenceBreak:array{ "aux.", diff --git a/intl/icu/source/data/brkitr/it.txt b/intl/icu/source/data/brkitr/it.txt index 732411726e06..142837329e45 100644 --- a/intl/icu/source/data/brkitr/it.txt +++ b/intl/icu/source/data/brkitr/it.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ - Version{"37"} exceptions{ SentenceBreak:array{ "N.B.", diff --git a/intl/icu/source/data/brkitr/ja.txt b/intl/icu/source/data/brkitr/ja.txt index 3eb1c9e71acc..1c135aa0c6ee 100644 --- a/intl/icu/source/data/brkitr/ja.txt +++ b/intl/icu/source/data/brkitr/ja.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ - Version{"37"} boundaries{ line:process(dependency){"line_normal.brk"} line_loose:process(dependency){"line_loose_cj.brk"} diff --git a/intl/icu/source/data/brkitr/pt.txt b/intl/icu/source/data/brkitr/pt.txt index a72c013ccdd9..d6f4d0719a78 100644 --- a/intl/icu/source/data/brkitr/pt.txt +++ b/intl/icu/source/data/brkitr/pt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ - Version{"37"} exceptions{ SentenceBreak:array{ "psicol.", diff --git a/intl/icu/source/data/brkitr/root.txt b/intl/icu/source/data/brkitr/root.txt index 564541efb9e3..c5c81857a063 100644 --- a/intl/icu/source/data/brkitr/root.txt +++ b/intl/icu/source/data/brkitr/root.txt @@ -1,7 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"37"} + Version{"38.1"} boundaries{ grapheme:process(dependency){"char.brk"} line:process(dependency){"line.brk"} diff --git a/intl/icu/source/data/brkitr/ru.txt b/intl/icu/source/data/brkitr/ru.txt index d50382d0e220..2a5a96e9dc10 100644 --- a/intl/icu/source/data/brkitr/ru.txt +++ b/intl/icu/source/data/brkitr/ru.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ - Version{"37"} exceptions{ SentenceBreak:array{ "\u0440\u0443\u0431.", diff --git a/intl/icu/source/data/brkitr/rules/README.md b/intl/icu/source/data/brkitr/rules/README.md index 6e9955ed3ea4..31eaed6d8e59 100644 --- a/intl/icu/source/data/brkitr/rules/README.md +++ b/intl/icu/source/data/brkitr/rules/README.md @@ -1,6 +1,6 @@ ## Break Iterator Rule Source Data diff --git a/intl/icu/source/data/brkitr/zh.txt b/intl/icu/source/data/brkitr/zh.txt index 15a66fc69ecb..18d3e559b15b 100644 --- a/intl/icu/source/data/brkitr/zh.txt +++ b/intl/icu/source/data/brkitr/zh.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ - Version{"37"} boundaries{ line:process(dependency){"line_cj.brk"} line_loose:process(dependency){"line_loose_cj.brk"} diff --git a/intl/icu/source/data/brkitr/zh_Hant.txt b/intl/icu/source/data/brkitr/zh_Hant.txt index f6decb19d9a5..8e407985b6e0 100644 --- a/intl/icu/source/data/brkitr/zh_Hant.txt +++ b/intl/icu/source/data/brkitr/zh_Hant.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ - Version{"37"} boundaries{ line:process(dependency){"line_cj.brk"} line_loose:process(dependency){"line_loose_cj.brk"} diff --git a/intl/icu/source/data/build.xml b/intl/icu/source/data/build.xml index 4b6f092900e1..ffee73d34b8d 100644 --- a/intl/icu/source/data/build.xml +++ b/intl/icu/source/data/build.xml @@ -56,14 +56,6 @@ - - - - - - - - @@ -84,393 +76,4 @@ could set '-s' / '-d' for explicit source/dest --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &icu-config; - &icu-locale-deprecates; - - - - - - - - - - - - - - &icu-config; - &icu-coll-deprecates; - - - - - - - - - - - - - - &icu-config; - &icu-rbnf-deprecates; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intl/icu/source/data/cldr-icu-readme.txt b/intl/icu/source/data/cldr-icu-readme.txt index 1e8b1491452e..93b9ef391a72 100644 --- a/intl/icu/source/data/cldr-icu-readme.txt +++ b/intl/icu/source/data/cldr-icu-readme.txt @@ -55,12 +55,9 @@ # # b) CLDR-related variables # -# CLDR_DIR: For most of the process, this is the path to the to root of -# standard CLDR sources, below which are the common and -# tools directories. For running LdmlConverter, this needs to be -# temporarily reset to the parallel root for the production data, -# corresponding to $CLDR_TMP_DIR/production (see description of -# CLDR_TMP_DIR below). +# CLDR_DIR: This is the path to the to root of standard CLDR sources, below +# which are the common and tools directories. +# # CLDR_CLASSES: Path to the CLDR Tools classes directory. If not set, defaults # to $CLDR_DIR/tools/java/classes # @@ -97,34 +94,6 @@ # # $TOOLS_ROOT/cldr/cldr-to-icu/build-icu-data.xml # -# The files used in previous versions are the following. These are not used in -# the ICU-67-and-later process, but for now they should be kept up to date to -# enable parallel use of the older build process for verification. -# -# $ICU4C_DIR/source/data/icu-config.xml - Update to add or remove -# CLDR locales for inclusion in ICU. Update to prefer -# alt forms for certain paths, or to exclude certain paths; note -# that items can only have draft or alt attributes. -# -# Note that if a language-only locale (e.g. "de") is included in -# , then all region sublocales for that language that -# are present in CLDR data (e.g. "de_AT", "de_BE", "de_CH", etc.) -# should also be included in , per PMC policy decision -# 2012-05-02 (see http://bugs.icu-project.org/trac/ticket/9298). -# -# $ICU4C_DIR/source/data/build.xml - If you are adding or removing break -# iterators, you need to update under -# to clean the correct set of files. -# -# If there are new CLDR resource bundle types, you may need to -# updated the sections to put these in the correct -# data subfolder for ICU. -# -# $ICU4C_DIR/source/data/xml/ - If you are adding a new locale, break -# iterator, collation tailoring, or rule-based number formatter, -# you may need to add a corresponding xml file in (respectively) -# the main/, brkitr/, collation/, or rbnf/ subdirectory here. -# #---- # # For an official CLDR data integration into ICU, there are some additional @@ -153,7 +122,7 @@ # 1a. Java and ant variables, adjust for your system export JAVA_HOME=`/usr/libexec/java_home` -export ANT_OPTS="-Xmx4096m +export ANT_OPTS="-Xmx4096m" # 1b. CLDR variables, adjust for your setup; with cygwin it might be e.g. # CLDR_DIR=`cygpath -wp /build/cldr` @@ -166,39 +135,13 @@ export ICU4C_DIR=$HOME/icu-myfork/icu4c export ICU4J_ROOT=$HOME/icu-myfork/icu4j export TOOLS_ROOT=$HOME/icu-myfork/tools +# 2. Build and install the CLDR jar -# 2. Build the CLDR Java tools and jar +cd $TOOLS_ROOT/cldr +ant install-cldr-libs -cd $CLDR_DIR/tools/java -ant clean -ant all -ant jar - -# 2a. Copy the CLDR jars into $TOOLS_ROOT/cldr/cldr-to-icu/lib/ maven repository; -# see $TOOLS_ROOT/cldr/cldr-to-icu/lib/README.txt - -cd $TOOLS_ROOT/cldr/cldr-to-icu/lib/ -mvn install:install-file \ - -DgroupId=org.unicode.cldr \ - -DartifactId=cldr-api \ - -Dversion=0.1-SNAPSHOT \ - -Dpackaging=jar \ - -DgeneratePom=true \ - -DlocalRepositoryPath=. \ - -Dfile=$CLDR_DIR/tools/java/cldr.jar - -cd $TOOLS_ROOT/cldr/cldr-to-icu/lib/ -mvn install:install-file \ - -DgroupId=com.ibm.icu \ - -DartifactId=icu-utilities \ - -Dversion=0.1-SNAPSHOT \ - -Dpackaging=jar \ - -DgeneratePom=true \ - -DlocalRepositoryPath=. \ - -Dfile=$CLDR_DIR/tools/java/libs/utilities.jar - -cd $TOOLS_ROOT/cldr/cldr-to-icu/ -mvn dependency:purge-local-repository -DsnapshotsOnly=true +See the $TOOLS_ROOT/cldr/lib/README.txt file for more information on the CLDR +jar and the install-cldr-jars.sh script. # 3. Configure ICU4C, build and test without new data first, to verify that # there are no pre-existing errors. Here is the runConfigureICU @@ -232,18 +175,28 @@ ant proddata 2>&1 | tee /tmp/cldr-newData-proddataLog.txt # output (so do not assume nothing is happening). Keep a log so you can investigate # anything that looks suspicious. # -# This also requires temporarily redefining CLDR_DIR. -# # Note that "ant clean" should not be run before this. The build-icu-data.xml process # will automatically run its own "clean" step to delete files it cannot determine to # be ones that it would generate, except for pasts listed in elements such as # coll/de__PHONEBOOK.txt, coll/de_.txt, etc. # -# Before this step, make any necessary changes to -# build-icu-data.xml$TOOLS_ROOT/cldr/cldr-to-icu/ to add new locales, etc. +# Before running Ant to regenerate the data, make any necessary changes to the +# build-icu-data.xml file, such as adding new locales etc. -cd $TOOLS_ROOT/cldr/cldr-to-icu/ -CLDR_DIR=$CLDR_TMP_DIR/production ant -f build-icu-data.xml | tee /tmp/cldr-newData-builddataLog.txt +cd $TOOLS_ROOT/cldr/cldr-to-icu +ant -f build-icu-data.xml -DcldrDataDir="$CLDR_TMP_DIR/production" | tee /tmp/cldr-newData-builddataLog.txt + +# 4c. Update the CLDR testData files needed by ICU4C and ICU4J tests, ensuring +# they're representative of the newest CLDR data. + +cd $TOOLS_ROOT/cldr +ant copy-cldr-testdata + +# 4d. Copy from CLDR common/testData/localeIdentifiers/localeCanonicalization.txt +# into icu4c/source/test/testdata/localeCanonicalization.txt +# and icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt +# and add the following line to the begginning of these two files +# # File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt # 5. Check which data files have modifications, which have been added or removed # (if there are no changes, you may not need to proceed further). Make sure the @@ -285,9 +238,11 @@ make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt # may fail. # Repeat steps 4-7 until there are no errors. -# 9. You can also run the make check tests in exhaustive mode (these will also -# be run automatically on the master branch after the merge resulting from this -# integration): +# 9. You can also run the make check tests in exhaustive mode. As an alternative +# you can run them as part of the pre-merge tests by adding the following as a +# comment in the pull request: "/azp run CI-Exhaustive". You should do one or the +# other; the exhaustive tests are *not* run automatically on each pull request, +# and are only run occasionally on the default branch. cd $ICU4C_DIR/source export INTLTEST_OPTS="-e" @@ -302,7 +257,6 @@ make check 2>&1 | tee /tmp/icu4c-newData-makeCheckEx.txt # as a base for comparison): cd $ICU4J_ROOT -ant all 2>&1 | tee /tmp/icu4j-oldData-antAll.txt ant check 2>&1 | tee /tmp/icu4j-oldData-antCheck.txt # 12. Transfer the data to ICU4J: diff --git a/intl/icu/source/data/coll/LOCALE_DEPS.json b/intl/icu/source/data/coll/LOCALE_DEPS.json index 7bc635bdbfae..0eae52d3062b 100644 --- a/intl/icu/source/data/coll/LOCALE_DEPS.json +++ b/intl/icu/source/data/coll/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "in": "id", diff --git a/intl/icu/source/data/coll/af.txt b/intl/icu/source/data/coll/af.txt index 585150c2ca51..1b079b68505e 100644 --- a/intl/icu/source/data/coll/af.txt +++ b/intl/icu/source/data/coll/af.txt @@ -1,11 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ - Version{"37"} collations{ standard{ Sequence{"&N<<<ʼn"} - Version{"37"} + Version{"38.1"} } } } diff --git a/intl/icu/source/data/coll/am.txt b/intl/icu/source/data/coll/am.txt index c1bb20d02e35..345df9ed5f45 100644 --- a/intl/icu/source/data/coll/am.txt +++ b/intl/icu/source/data/coll/am.txt @@ -1,11 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ - Version{"37"} collations{ standard{ Sequence{"[reorder Ethi]"} - Version{"37"} + Version{"38.1"} } } } diff --git a/intl/icu/source/data/coll/ar.txt b/intl/icu/source/data/coll/ar.txt index bf741247d921..9332232757bd 100644 --- a/intl/icu/source/data/coll/ar.txt +++ b/intl/icu/source/data/coll/ar.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ - Version{"37"} collations{ compat{ Sequence{ @@ -9,7 +9,7 @@ ar{ "&ت<<ة<<<ﺔ<<<ﺓ" "&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ" } - Version{"37"} + Version{"38.1"} } standard{ Sequence{ @@ -397,7 +397,7 @@ ar{ "‎&ۓ‎=ﮰ‎=ﮱ" "‎&ۀ‎=ﮤ‎=ﮥ" } - Version{"37"} + Version{"38.1"} } } } diff --git a/intl/icu/source/data/coll/ar_SA.txt b/intl/icu/source/data/coll/ar_SA.txt index d65944bd1360..a848e8bc9ce7 100644 --- a/intl/icu/source/data/coll/ar_SA.txt +++ b/intl/icu/source/data/coll/ar_SA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/coll/ars.txt b/intl/icu/source/data/coll/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/coll/ars.txt +++ b/intl/icu/source/data/coll/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/coll/as.txt b/intl/icu/source/data/coll/as.txt index 7b638569ad7f..771fa0b2620a 100644 --- a/intl/icu/source/data/coll/as.txt +++ b/intl/icu/source/data/coll/as.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as{ - Version{"37"} collations{ standard{ Sequence{ @@ -11,7 +11,7 @@ as{ "&[before 1]ত<ৎ=ত্\u200D" "&হ<ক্ষ" } - Version{"37"} + Version{"38.1"} } } } diff --git a/intl/icu/source/data/coll/az.txt b/intl/icu/source/data/coll/az.txt index b662b8d67850..d42360921eae 100644 --- a/intl/icu/source/data/coll/az.txt +++ b/intl/icu/source/data/coll/az.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ - Version{"37"} collations{ search{ Sequence{ @@ -9,7 +9,7 @@ az{ "[import az-u-co-standard]" "[reorder others]" } - Version{"37"} + Version{"38.1"} } standard{ Sequence{ @@ -26,7 +26,7 @@ az{ "&H - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intl/icu/source/data/icu-config.xml b/intl/icu/source/data/icu-config.xml deleted file mode 100644 index 0bb8a8714480..000000000000 --- a/intl/icu/source/data/icu-config.xml +++ /dev/null @@ -1,799 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intl/icu/source/data/icu-locale-deprecates.xml b/intl/icu/source/data/icu-locale-deprecates.xml deleted file mode 100644 index b702dbae234c..000000000000 --- a/intl/icu/source/data/icu-locale-deprecates.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intl/icu/source/data/icu-rbnf-deprecates.xml b/intl/icu/source/data/icu-rbnf-deprecates.xml deleted file mode 100644 index d933a2d4906d..000000000000 --- a/intl/icu/source/data/icu-rbnf-deprecates.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/intl/icu/source/data/in/ucase.icu b/intl/icu/source/data/in/ucase.icu index cf2465004dac..011e6053f796 100644 Binary files a/intl/icu/source/data/in/ucase.icu and b/intl/icu/source/data/in/ucase.icu differ diff --git a/intl/icu/source/data/lang/LOCALE_DEPS.json b/intl/icu/source/data/lang/LOCALE_DEPS.json index 681e78cf5870..2508537d097a 100644 --- a/intl/icu/source/data/lang/LOCALE_DEPS.json +++ b/intl/icu/source/data/lang/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -33,7 +34,7 @@ "sh_YU": "sr_Latn_RS", "shi_MA": "shi_Tfng_MA", "sr_BA": "sr_Cyrl_BA", - "sr_CS": "sr_Cyrl_RS", + "sr_CS": "sr_RS", "sr_Cyrl_CS": "sr_Cyrl_RS", "sr_Cyrl_YU": "sr_Cyrl_RS", "sr_Latn_CS": "sr_Latn_RS", @@ -41,7 +42,7 @@ "sr_ME": "sr_Latn_ME", "sr_RS": "sr_Cyrl_RS", "sr_XK": "sr_Cyrl_XK", - "sr_YU": "sr_Cyrl_RS", + "sr_YU": "sr_RS", "su_ID": "su_Latn_ID", "tl": "fil", "tl_PH": "fil_PH", diff --git a/intl/icu/source/data/lang/af.txt b/intl/icu/source/data/lang/af.txt index b50a961bd0e9..f80e856924e3 100644 --- a/intl/icu/source/data/lang/af.txt +++ b/intl/icu/source/data/lang/af.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ Keys{ calendar{"Kalender"} @@ -171,7 +172,7 @@ af{ io{"Ido"} is{"Yslands"} it{"Italiaans"} - iu{"Inuïties"} + iu{"Inoektitoet"} ja{"Japannees"} jbo{"Lojban"} jgo{"Ngomba"} @@ -436,6 +437,7 @@ af{ az{"Azeri"} } Languages%variant{ + ckb{"Koerdies Sorani"} ps{"Pushto"} } Scripts{ @@ -629,7 +631,6 @@ af{ vaii{"Vai-syfers"} } } - Version{"37"} characterLabelPattern{ all{"{0} – alle"} category-list{"{0}: {1}"} @@ -644,6 +645,8 @@ af{ one{"{0} haal"} other{"{0} hale"} } + subscript{"onderskrif {0}"} + superscript{"boskrif {0}"} } codePatterns{ language{"Taal: {0}"} diff --git a/intl/icu/source/data/lang/agq.txt b/intl/icu/source/data/lang/agq.txt index 9cb1a80af277..4f078165d98c 100644 --- a/intl/icu/source/data/lang/agq.txt +++ b/intl/icu/source/data/lang/agq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml agq{ Languages{ agq{"Aghem"} @@ -48,5 +49,4 @@ agq{ zh{"Chàenê"} zu{"Zulù"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ak.txt b/intl/icu/source/data/lang/ak.txt index 012bda2b847c..a5f3d9c1c905 100644 --- a/intl/icu/source/data/lang/ak.txt +++ b/intl/icu/source/data/lang/ak.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak{ Languages{ ak{"Akan"} @@ -47,5 +48,4 @@ ak{ zh{"Kyaena kasa"} zu{"Zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/am.txt b/intl/icu/source/data/lang/am.txt index 4d7b135a5144..d16a2e806b8b 100644 --- a/intl/icu/source/data/lang/am.txt +++ b/intl/icu/source/data/lang/am.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ Keys{ calendar{"የቀን አቆጣጠር"} @@ -698,7 +699,6 @@ am{ vaii{"የቫይ አሃዞች"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ሁሉም"} category-list{"{0}: {1}"} @@ -713,6 +713,8 @@ am{ one{"{0} ምች"} other{"{0} ምች"} } + subscript{"ግርጌ ምልክት {0}"} + superscript{"ራስጌ ምልክት {0}"} } codePatterns{ language{"{0}"} diff --git a/intl/icu/source/data/lang/ar.txt b/intl/icu/source/data/lang/ar.txt index ad569a5d0c3a..bb32aafd4b43 100644 --- a/intl/icu/source/data/lang/ar.txt +++ b/intl/icu/source/data/lang/ar.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ Keys{ calendar{"التقويم"} @@ -795,9 +796,9 @@ ar{ ungegn{"يو إن جي إي جي إن"} } ms{ - metric{"نظام متري"} - uksystem{"نظام المملكة المتحدة"} - ussystem{"نظام الولايات المتحدة"} + metric{"النظام المتري"} + uksystem{"نظام القياس البريطاني"} + ussystem{"نظام القياس الأمريكي"} } numbers{ arab{"الأرقام العربية الهندية"} @@ -862,7 +863,6 @@ ar{ VALENCIA{"بلنسية"} WADEGILE{"المندرين باللاتينية - ويد–جيلز"} } - Version{"37"} characterLabelPattern{ all{"{0} - الكل"} category-list{"{0}: {1}"} @@ -881,6 +881,8 @@ ar{ two{"ضغطتان ({0})"} zero{"{0} ضغطة"} } + subscript{"نظام الكتابة تحت السطر {0}"} + superscript{"نظام الكتابة فوق السطر {0}"} } codePatterns{ language{"اللغة: {0}"} diff --git a/intl/icu/source/data/lang/ar_EG.txt b/intl/icu/source/data/lang/ar_EG.txt index f33f1ffaf5a9..e4fbc9cce521 100644 --- a/intl/icu/source/data/lang/ar_EG.txt +++ b/intl/icu/source/data/lang/ar_EG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_EG{ Languages{ da{"الدنماركية"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ar_LY.txt b/intl/icu/source/data/lang/ar_LY.txt index 31a1d6a64a34..45d878c64e58 100644 --- a/intl/icu/source/data/lang/ar_LY.txt +++ b/intl/icu/source/data/lang/ar_LY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_LY{ Languages{ arn{"المابودونجونية"} @@ -12,5 +13,4 @@ ar_LY{ sw_CD{"السواحيلية الكونغولية"} ti{"التيغرينية"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ar_SA.txt b/intl/icu/source/data/lang/ar_SA.txt index 8540adbe30ab..3f43463b2ca9 100644 --- a/intl/icu/source/data/lang/ar_SA.txt +++ b/intl/icu/source/data/lang/ar_SA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SA{ Languages{ ar_001{"العربية الرسمية الحديثة"} @@ -35,5 +36,4 @@ ar_SA{ en_GB{"الإنجليزية المملكة المتحدة"} en_US{"الإنجليزية الولايات المتحدة"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ars.txt b/intl/icu/source/data/lang/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/lang/ars.txt +++ b/intl/icu/source/data/lang/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/lang/as.txt b/intl/icu/source/data/lang/as.txt index 792b5724ecc3..ca5c8c3ab90f 100644 --- a/intl/icu/source/data/lang/as.txt +++ b/intl/icu/source/data/lang/as.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as{ Keys{ calendar{"কেলেণ্ডাৰ"} @@ -553,7 +554,6 @@ as{ tibt{"তিব্বতী অংক"} } } - Version{"37"} characterLabelPattern{ all{"{0} — সকলো"} category-list{"{0}: {1}"} @@ -568,6 +568,8 @@ as{ one{"{0} ষ্ট্ৰ’ক"} other{"{0} ষ্ট্ৰ’ক"} } + subscript{"ছাবস্ক্ৰিপ্ট {0}"} + superscript{"ছুপাৰস্ক্ৰিপ্ট {0}"} } codePatterns{ language{"ভাষা: {0}"} diff --git a/intl/icu/source/data/lang/asa.txt b/intl/icu/source/data/lang/asa.txt index 8e23456aeb43..4f41154254cb 100644 --- a/intl/icu/source/data/lang/asa.txt +++ b/intl/icu/source/data/lang/asa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml asa{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ asa{ zh{"Kichina"} zu{"Kidhulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ast.txt b/intl/icu/source/data/lang/ast.txt index 455d2d95017f..5b5b60949864 100644 --- a/intl/icu/source/data/lang/ast.txt +++ b/intl/icu/source/data/lang/ast.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ast{ Keys{ calendar{"calendariu"} @@ -1005,7 +1006,6 @@ ast{ VALENCIA{"valencianu"} WADEGILE{"romanización de Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — too"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/az.txt b/intl/icu/source/data/lang/az.txt index 8e270e352ccd..aea521b837f2 100644 --- a/intl/icu/source/data/lang/az.txt +++ b/intl/icu/source/data/lang/az.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ Keys{ calendar{"Təqvim"} @@ -532,12 +533,16 @@ az{ zh_Hant{"ənənəvi mandarin çincəsi"} } Languages%menu{ + ckb{"Kürdcə, mərkəzi"} yue{"Çin, kanton"} zh{"Çin, mandarin"} } Languages%short{ az{"azəri"} } + Languages%variant{ + ckb{"Kürdcə, sorani"} + } Scripts{ Arab{"ərəb"} Armi{"armi"} @@ -752,7 +757,6 @@ az{ tibt{"Tibet Rəqəmləri"} } } - Version{"37"} characterLabelPattern{ all{"{0} — Bütün"} category-list{"{0}: {1}"} @@ -767,6 +771,8 @@ az{ one{"{0} Vurğu"} other{"{0} Vurğu"} } + subscript{"indeks {0}"} + superscript{"üst indeks {0}"} } codePatterns{ language{"Dil: {0}"} diff --git a/intl/icu/source/data/lang/az_AZ.txt b/intl/icu/source/data/lang/az_AZ.txt index caf84c09534a..8932e86db2ee 100644 --- a/intl/icu/source/data/lang/az_AZ.txt +++ b/intl/icu/source/data/lang/az_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_AZ{ "%%ALIAS"{"az_Latn_AZ"} } diff --git a/intl/icu/source/data/lang/az_Cyrl.txt b/intl/icu/source/data/lang/az_Cyrl.txt index b4167314377b..d2ec82aec3a3 100644 --- a/intl/icu/source/data/lang/az_Cyrl.txt +++ b/intl/icu/source/data/lang/az_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Cyrl{ %%Parent{"root"} Languages{ @@ -398,7 +399,6 @@ az_Cyrl{ Scripts{ Cyrl{"Кирил"} } - Version{"37"} codePatterns{ language{"Дил: {0}"} script{"Скрипт: {0}"} diff --git a/intl/icu/source/data/lang/az_Latn.txt b/intl/icu/source/data/lang/az_Latn.txt index 6022c58dbe02..6464d2e841f3 100644 --- a/intl/icu/source/data/lang/az_Latn.txt +++ b/intl/icu/source/data/lang/az_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/az_Latn_AZ.txt b/intl/icu/source/data/lang/az_Latn_AZ.txt index 36c6e61ba045..3963c91e61c2 100644 --- a/intl/icu/source/data/lang/az_Latn_AZ.txt +++ b/intl/icu/source/data/lang/az_Latn_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/bas.txt b/intl/icu/source/data/lang/bas.txt index 0aa64026aee9..89d1f246f78a 100644 --- a/intl/icu/source/data/lang/bas.txt +++ b/intl/icu/source/data/lang/bas.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bas{ Languages{ ak{"Hɔp u akan"} @@ -48,5 +49,4 @@ bas{ zh{"Hɔp u kinà"} zu{"Hɔp u zulù"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/be.txt b/intl/icu/source/data/lang/be.txt index 50ff12ed0e25..abef02ab91c8 100644 --- a/intl/icu/source/data/lang/be.txt +++ b/intl/icu/source/data/lang/be.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be{ Keys{ calendar{"каляндар"} @@ -439,12 +440,16 @@ be{ zh_Hant{"паўночнакітайская (традыцыйныя іерогліфы)"} } Languages%menu{ + ckb{"курдская, сарані"} yue{"кітайская, кантонскі дыялект"} zh{"кітайская, паўночныя дыялекты"} } Languages%short{ en_GB{"вялікабрытанская англійская"} } + Languages%variant{ + ckb{"сарані"} + } Scripts{ Arab{"арабскае"} Armn{"армянскае"} @@ -573,7 +578,6 @@ be{ tibt{"тыбецкія лічбы"} } } - Version{"37"} characterLabelPattern{ all{"{0} — Усё"} category-list{"{0}: {1}"} @@ -590,6 +594,8 @@ be{ one{"{0} штрых"} other{"{0} штрыха"} } + subscript{"{0} - ніжні індэкс"} + superscript{"{0} - верхні індэкс"} } codePatterns{ language{"Мова: {0}"} diff --git a/intl/icu/source/data/lang/bem.txt b/intl/icu/source/data/lang/bem.txt index 60a5a8165860..a5f8b6e24e6a 100644 --- a/intl/icu/source/data/lang/bem.txt +++ b/intl/icu/source/data/lang/bem.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bem{ Languages{ ak{"Ichi Akan"} @@ -48,5 +49,4 @@ bem{ zh{"Ichi Chainisi"} zu{"Ichi Zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/bez.txt b/intl/icu/source/data/lang/bez.txt index ee9d47cea05b..dc62a856d397 100644 --- a/intl/icu/source/data/lang/bez.txt +++ b/intl/icu/source/data/lang/bez.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bez{ Languages{ ak{"Hiakan"} @@ -48,5 +49,4 @@ bez{ zh{"Hichina"} zu{"Hizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/bg.txt b/intl/icu/source/data/lang/bg.txt index c453f25849c6..48a0dfa76ca9 100644 --- a/intl/icu/source/data/lang/bg.txt +++ b/intl/icu/source/data/lang/bg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ Keys{ calendar{"календар"} @@ -135,8 +136,10 @@ bg{ el{"гръцки"} elx{"еламитски"} en{"английски"} - en_GB{"английски (Обединено кралство)"} - en_US{"английски (САЩ)"} + en_AU{"австралийски английски"} + en_CA{"канадски английски"} + en_GB{"британски английски"} + en_US{"американски английски"} enm{"средновековен английски"} eo{"есперанто"} es{"испански"} @@ -396,7 +399,7 @@ bg{ rwk{"рва"} sa{"санскрит"} sad{"сандаве"} - sah{"сакха"} + sah{"саха"} sam{"самаритански арамейски"} saq{"самбуру"} sas{"сасак"} @@ -485,7 +488,7 @@ bg{ uga{"угаритски"} uk{"украински"} umb{"умбунду"} - und{"неопределен"} + und{"непознат език"} ur{"урду"} uz{"узбекски"} vai{"ваи"} @@ -502,7 +505,7 @@ bg{ wbp{"валпири"} wo{"волоф"} xal{"калмик"} - xh{"ксоса"} + xh{"кхоса"} xog{"сога"} yao{"яо"} yap{"япезе"} @@ -529,6 +532,7 @@ bg{ zh_Hant{"китайски, мандарин (традиционен)"} } Languages%menu{ + yue{"китайски, кантонски"} zh{"китайски, мандарин"} } Languages%short{ @@ -537,6 +541,7 @@ bg{ en_US{"английски (US)"} } Languages%variant{ + ckb{"кюрдски (Сорани)"} ps{"пущунски"} } Scripts{ @@ -839,7 +844,6 @@ bg{ VALENCIA{"Валенсиански"} WADEGILE{"Уейд-Джайлс романизация"} } - Version{"37"} characterLabelPattern{ all{"{0} – всички"} category-list{"{0}: {1}"} @@ -854,6 +858,8 @@ bg{ one{"{0} черта"} other{"{0} черти"} } + subscript{"долен индекс {0}"} + superscript{"горен индекс {0}"} } codePatterns{ language{"Език: {0}"} diff --git a/intl/icu/source/data/lang/bm.txt b/intl/icu/source/data/lang/bm.txt index b3be720b87cf..1d7e143f2fa0 100644 --- a/intl/icu/source/data/lang/bm.txt +++ b/intl/icu/source/data/lang/bm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bm{ Languages{ ak{"akankan"} @@ -48,5 +49,4 @@ bm{ zh{"siniwakan"} zu{"zulukan"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/bn.txt b/intl/icu/source/data/lang/bn.txt index 218e67dc10cb..7d9225267ed8 100644 --- a/intl/icu/source/data/lang/bn.txt +++ b/intl/icu/source/data/lang/bn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn{ Keys{ calendar{"ক্যালেন্ডার"} @@ -352,7 +353,7 @@ bn{ nl{"ওলন্দাজ"} nl_BE{"ফ্লেমিশ"} nmg{"কোয়াসিও"} - nn{"নরওয়েজীয়ান নিনর্স্ক"} + nn{"নরওয়েজিয়ান নিনর্স্ক"} nnh{"নিঙ্গেম্বুন"} no{"নরওয়েজীয়"} nog{"নোগাই"} @@ -554,6 +555,7 @@ bn{ en_US{"যুক্তরাষ্ট্রের ইংরেজি"} } Languages%variant{ + ckb{"কুর্দিশ, সোরানি"} ps{"পুশতো"} } Scripts{ @@ -880,7 +882,6 @@ bn{ wara{"ওয়ারেং সিটি সংখ্যা"} } } - Version{"37"} characterLabelPattern{ all{"{0} — সমস্ত"} category-list{"{0}: {1}"} @@ -895,6 +896,8 @@ bn{ one{"{0} স্ট্রোক"} other{"{0} স্ট্রোক"} } + subscript{"সাবস্ক্রিপ্ট {0}"} + superscript{"সুপারস্ক্রিপ্ট {0}"} } codePatterns{ language{"ভাষা: {0}"} diff --git a/intl/icu/source/data/lang/bn_IN.txt b/intl/icu/source/data/lang/bn_IN.txt index 2eae9cf1b7c6..b55418b52e0e 100644 --- a/intl/icu/source/data/lang/bn_IN.txt +++ b/intl/icu/source/data/lang/bn_IN.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn_IN{ Languages{ ksh{"কোলোনিয়ান"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/bo.txt b/intl/icu/source/data/lang/bo.txt index 6604c5344c1b..52e3c1c53a58 100644 --- a/intl/icu/source/data/lang/bo.txt +++ b/intl/icu/source/data/lang/bo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo{ Languages{ bo{"བོད་སྐད་"} @@ -21,5 +22,4 @@ bo{ Tibt{"བོད་ཡིག་"} Zxxx{"སྙན་བརྒྱུད། ཡིག་རིགས་སུ་མ་བཀོད་པའི་ཟིན་ཐོ།"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/br.txt b/intl/icu/source/data/lang/br.txt index 248a28d79fda..135d4355ff6f 100644 --- a/intl/icu/source/data/lang/br.txt +++ b/intl/icu/source/data/lang/br.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml br{ Keys{ calendar{"deiziadur"} @@ -7,6 +8,7 @@ br{ collation{"doare rummañ"} currency{"moneiz"} hc{"kelcʼhiad eurioù"} + lb{"stil torr linenn"} ms{"reizhiad vuzuliañ"} numbers{"niveroù"} } @@ -148,6 +150,7 @@ br{ eu{"euskareg"} ewo{"ewondo"} fa{"perseg"} + fa_AF{"dareg"} fan{"fang"} fat{"fanti"} ff{"fula"} @@ -542,7 +545,7 @@ br{ yue{"kantoneg"} za{"zhuang"} zap{"zapoteg"} - zbl{"Bliss"} + zbl{"arouezioù Bliss"} zea{"zelandeg"} zen{"zenaga"} zgh{"tamacheg Maroko standart"} @@ -559,6 +562,7 @@ br{ zh_Hant{"sinaeg mandarinek hengounel"} } Languages%menu{ + ckb{"kurdeg kreiz"} yue{"sinaeg, kantoneg"} zh{"sinaeg, mandarineg"} } @@ -683,6 +687,7 @@ br{ roc{"deiziadur Republik Sina"} } cf{ + account{"furmad unanenn jediñ"} standard{"furmad moneiz standart"} } collation{ @@ -708,6 +713,11 @@ br{ h23{"reizhiad 24 eurvezh (0–23)"} h24{"reizhiad 24 eurvezh (1–24)"} } + lb{ + loose{"stil torr linenn lezober"} + normal{"stil torr linenn boas"} + strict{"stil torr linenn strizh"} + } ms{ metric{"reizhiad vetrek"} uksystem{"reizhiad vuzuliañ RU"} @@ -800,6 +810,7 @@ br{ BISKE{"rannyezh San Giorgio/Bila"} BOHORIC{"lizherenneg Bohorič"} BOONT{"boontling"} + BORNHOLM{"rannyezh Bornholm"} CISAUP{"kizalpeg"} COLB1945{"emglev 1945 war reizhskrivadur portugaleg Brazil"} CORNU{"saozneg Kerne-Veur"} @@ -878,14 +889,25 @@ br{ WADEGILE{"romanekadur Wade-Giles"} XSISTEMO{"esperanteg sistem X"} } - Version{"37"} characterLabelPattern{ + all{"{0} — holl"} + category-list{"{0} : {1}"} + compatibility{"{0} — kenglotusted"} enclosed{"{0} — kelcʼhiet"} extended{"{0} — astennet"} historic{"{0} — istorel"} miscellaneous{"{0} — liesseurt"} other{"{0} — all"} scripts{"skriturioù — {0}"} + strokes{ + few{"{0} linenn"} + many{"{0} a linennoù"} + one{"{0} linenn"} + other{"{0} linenn"} + two{"{0} linenn"} + } + subscript{"isskridad {0}"} + superscript{"usskridad {0}"} } codePatterns{ language{"yezh : {0}"} diff --git a/intl/icu/source/data/lang/brx.txt b/intl/icu/source/data/lang/brx.txt index cc529d88e5d1..17a1ce93aded 100644 --- a/intl/icu/source/data/lang/brx.txt +++ b/intl/icu/source/data/lang/brx.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml brx{ Keys{ calendar{"पंचाग"} @@ -609,7 +610,6 @@ brx{ SOLBA{"श्टोलविज़्ज़ा या सोलबीका डायलेक्ट"} TARASK{"तारास्कीएवीचा वर्तनी"} } - Version{"37"} codePatterns{ script{"देवनागरी: {0}"} territory{"क्षेत्र:भारत {0}"} diff --git a/intl/icu/source/data/lang/bs.txt b/intl/icu/source/data/lang/bs.txt index f683c1f132c5..51bcdaeaf94b 100644 --- a/intl/icu/source/data/lang/bs.txt +++ b/intl/icu/source/data/lang/bs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs{ Keys{ calendar{"Kalendar"} @@ -552,11 +553,14 @@ bs{ ps{"pušto"} } Scripts{ + Afak{"afaka pismo"} Arab{"arapsko pismo"} Armi{"imperijsko aramejsko pismo"} Armn{"armensko pismo"} Avst{"avestansko pismo"} Bali{"balijsko pismo"} + Bamu{"bamum pismo"} + Bass{"bassa vah pismo"} Batk{"batak pismo"} Beng{"bengalsko pismo"} Blis{"blisimbolično pismo"} @@ -585,6 +589,7 @@ bs{ Geor{"gruzijsko pismo"} Glag{"glagoljica"} Goth{"gotika"} + Gran{"grantha pismo"} Grek{"grčko pismo"} Gujr{"pismo gudžarati"} Guru{"pismo gurmuki"} @@ -596,6 +601,7 @@ bs{ Hant{"tradicionalno"} Hebr{"hebrejsko pismo"} Hira{"pismo hiragana"} + Hluw{"anatolijski hijeroglifi"} Hmng{"pahawh hmong pismo"} Hrkt{"katakana ili hiragana"} Hung{"Staromađarsko pismo"} @@ -604,12 +610,15 @@ bs{ Jamo{"pismo jamo"} Java{"javansko pismo"} Jpan{"japansko pismo"} + Jurc{"jurchen pismo"} Kali{"kajah li pismo"} Kana{"pismo katakana"} Khar{"karošti pismo"} Khmr{"kmersko pismo"} + Khoj{"khojki pismo"} Knda{"pismo kanada"} Kore{"korejsko pismo"} + Kpel{"kpelle pismo"} Kthi{"kaićansko pismo"} Lana{"lanna pismo"} Laoo{"laosko pismo"} @@ -620,23 +629,33 @@ bs{ Limb{"limbu pismo"} Lina{"linearno A pismo"} Linb{"linearno B pismo"} + Lisu{"fraser pismo"} + Loma{"loma pismo"} Lyci{"lisijsko pismo"} Lydi{"lidijsko pismo"} Mand{"mandeansko pismo"} Mani{"manihejsko pismo"} Maya{"majanski hijeroglifi"} + Mend{"mende pismo"} + Merc{"meroitski kurziv"} Mero{"meroitik pismo"} Mlym{"malajalamsko pismo"} Mong{"mongolsko pismo"} Moon{"mesečevo pismo"} + Mroo{"mro pismo"} Mtei{"meitei majek pismo"} Mymr{"mijanmarsko pismo"} + Narb{"staro sjevernoarapsko pismo"} + Nbat{"nabatejsko pismo"} + Nkgb{"naxi geba pismo"} Nkoo{"n’ko pismo"} + Nshu{"nushu pismo"} Ogam{"ogham pismo"} Olck{"ol čiki pismo"} Orkh{"orkhon pismo"} Orya{"pismo orija"} Osma{"osmanja pismo"} + Palm{"palmyrene pismo"} Perm{"staro permiksko pismo"} Phag{"phags-pa pismo"} Phli{"pisani pahlavi"} @@ -650,19 +669,25 @@ bs{ Runr{"runsko pismo"} Samr{"samaritansko pismo"} Sara{"sarati pismo"} + Sarb{"staro južnoarapsko pismo"} Saur{"sauraštra pismo"} Sgnw{"znakovno pismo"} Shaw{"šavian pismo"} + Shrd{"sharada pismo"} + Sind{"khudawadi pismo"} Sinh{"pismo sinhala"} + Sora{"sora sompeng pismo"} Sylo{"siloti nagri pismo"} Syrc{"sirijsko pismo"} Syre{"sirijsko estrangelo pismo"} Syrj{"zapadnosirijsko pismo"} Syrn{"pismo istočne Sirije"} Tagb{"tagbanva pismo"} + Takr{"takri pismo"} Tale{"tai le pismo"} Talu{"novo tai lue pismo"} Taml{"tamilsko pismo"} + Tang{"tangut pismo"} Tavt{"tai viet pismo"} Telu{"pismo telugu"} Teng{"tengvar pismo"} @@ -671,9 +696,12 @@ bs{ Thaa{"pismo tana"} Thai{"tajlandsko pismo"} Tibt{"tibetansko pismo"} + Tirh{"tirhuta pismo"} Ugar{"ugaritsko pismo"} Vaii{"vai pismo"} Visp{"vidljivi govor"} + Wara{"varang kshiti pismo"} + Wole{"woleai pismo"} Xpeo{"staropersijsko pismo"} Xsux{"sumersko-akadsko kuneiform pismo"} Yiii{"ji pismo"} @@ -696,8 +724,10 @@ bs{ calendar{ buddhist{"budistički kalendar"} chinese{"kineski kalendar"} + coptic{"Koptski kalendar"} dangi{"dangi kalendar"} ethiopic{"etiopski kalendar"} + ethiopic-amete-alem{"Etiopski kalendar \u0022Amete Alem\u0022"} gregorian{"gregorijanski kalendar"} hebrew{"hebrejski kalendar"} indian{"Indijski nacionalni kalendar"} @@ -712,6 +742,34 @@ bs{ account{"računovodstveni format valute"} standard{"standardni format valute"} } + colAlternate{ + non-ignorable{"Poredaj simbole"} + shifted{"Poredaj zanemarujući simbole"} + } + colBackwards{ + no{"Poredaj naglaske normalno"} + yes{"Poredaj naglaske obrnuto"} + } + colCaseFirst{ + lower{"Prvo poredaj mala slova"} + no{"Poredaj po normalnom poretku veličine slova"} + upper{"Poredaj prvo velika slova"} + } + colCaseLevel{ + no{"Poredaj zanemarujući veličinu"} + yes{"Poredaj u skladu s veličinom slova"} + } + colNormalization{ + no{"Poredaj bez normalizacije"} + yes{"Poredaj unikod normalizirano"} + } + colStrength{ + identical{"Poredaj sve"} + primary{"Poredaj samo po osnovnim slovima"} + quaternary{"Poredaj po naglascima/veličini/širini/pismu kana"} + secondary{"Poredaj po naglasku"} + tertiary{"Poredaj po naglascima/veličini/širini"} + } collation{ big5han{"Tradicionalno kinesko sortiranje"} ducet{"standardno Unicode sortiranje"} @@ -719,6 +777,7 @@ bs{ phonebook{"Sortiranje kao telefonski imenik"} pinyin{"Pinjin sortiranje"} search{"općenito pretraživanje"} + searchjl{"Pretraživanje po početnom suglasniku hangula"} standard{"standardno sortiranje"} stroke{"Sortiranje po broju crta"} traditional{"Tradicionalno sortiranje"} @@ -726,6 +785,7 @@ bs{ d0{ fwidth{"Široki"} hwidth{"Uski"} + npinyin{"Numerički"} } hc{ h11{"12-satni format (0-11)"} @@ -783,26 +843,36 @@ bs{ telu{"brojevi pisma telugu"} thai{"tajlandski brojevi"} tibt{"tibetanski brojevi"} + traditional{"Tradicionalni brojevi"} } } Variants{ 1606NICT{"Francuski iz kasnog srednjeg veka do 1606."} 1694ACAD{"Rani moderni francuski"} 1901{"Tradicionalna nemačka ortografija"} + 1959ACAD{"Akademski"} 1994{"Standardizovana rezijanska ortografija"} 1996{"Nemačka ortografija 1996"} + ALUKU{"Aluku dijalekt"} AREVELA{"Istočni jermenski"} AREVMDA{"Zapadno-jermenski"} BAKU1926{"Ujedinjeni turski latinični alfabet"} BISKE{"San Đorđijo/Bila dijalekt"} BOONT{"Buntling"} + EMODENG{"Rani moderni engleski"} FONIPA{"IPA fonetika"} FONUPA{"UPA fonetika"} + KKCOR{"Uobičajena ortografija"} + KSCOR{"Standardna ortografija"} LIPAW{"Lipovac dijalekt rezijanski"} + METELKO{"Metelčica"} MONOTON{"Monotonik"} NEDIS{"Natison dijalekt"} NJIVA{"Gnjiva/Njiva dijalekt"} + NULIK{"Moderni volapuk"} OSOJS{"Oseako/Osojane dijalekt"} + PAMAKA{"Pamaka dijalekt"} + PINYIN{"Pinjinska romanizacija"} POLYTON{"Politonik"} POSIX{"Kompjuter"} REVISED{"Revidirana ortigrafija"} @@ -812,24 +882,28 @@ bs{ SCOUSE{"Skauz"} SOLBA{"Stolvica/Solbica dijalekt"} TARASK{"Taraskijevica ortografija"} + UCCOR{"Ujedinjena ortografija"} + UCRCOR{"Ujedinjena revidirana ortografija"} VALENCIA{"Valencijski"} + WADEGILE{"Vejd-Žajl romanizacija"} } - Version{"37"} characterLabelPattern{ - all{"{0} — sve"} + all{"{0} – sve"} category-list{"{0}: {1}"} - compatibility{"{0} — kompatibilno"} - enclosed{"{0} — okruženo"} - extended{"{0} — produženo"} - historic{"{0} — staro"} - miscellaneous{"{0} — razno"} - other{"{0} — ostalo"} - scripts{"Pisma — {0}"} + compatibility{"{0} – kompatibilno"} + enclosed{"{0} – priloženo"} + extended{"{0} – produženo"} + historic{"{0} – staro"} + miscellaneous{"{0} – razno"} + other{"{0} – ostalo"} + scripts{"pisma – {0}"} strokes{ - few{"{0} potezi"} + few{"{0} poteza"} one{"{0} potez"} - other{"{0} potezi"} + other{"{0} poteza"} } + subscript{"indeks {0}"} + superscript{"eksponent {0}"} } codePatterns{ language{"Jezik: {0}"} diff --git a/intl/icu/source/data/lang/bs_BA.txt b/intl/icu/source/data/lang/bs_BA.txt index e5e3a465740d..70619a1bff37 100644 --- a/intl/icu/source/data/lang/bs_BA.txt +++ b/intl/icu/source/data/lang/bs_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_BA{ "%%ALIAS"{"bs_Latn_BA"} } diff --git a/intl/icu/source/data/lang/bs_Cyrl.txt b/intl/icu/source/data/lang/bs_Cyrl.txt index cc6915e99132..7603cfc426dc 100644 --- a/intl/icu/source/data/lang/bs_Cyrl.txt +++ b/intl/icu/source/data/lang/bs_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Cyrl{ %%Parent{"root"} Keys{ @@ -777,7 +778,6 @@ bs_Cyrl{ TARASK{"Тараскијевичка ортографија"} VALENCIA{"Валенцијска"} } - Version{"37"} characterLabelPattern{ all{"{0} — све"} strokes{ diff --git a/intl/icu/source/data/lang/bs_Latn.txt b/intl/icu/source/data/lang/bs_Latn.txt index d1a6b5e7fa79..f2561126b44d 100644 --- a/intl/icu/source/data/lang/bs_Latn.txt +++ b/intl/icu/source/data/lang/bs_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/bs_Latn_BA.txt b/intl/icu/source/data/lang/bs_Latn_BA.txt index 3ef1cc4058e9..04342dc0ad7c 100644 --- a/intl/icu/source/data/lang/bs_Latn_BA.txt +++ b/intl/icu/source/data/lang/bs_Latn_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ca.txt b/intl/icu/source/data/lang/ca.txt index b5c2934a33a2..8a4f313c562a 100644 --- a/intl/icu/source/data/lang/ca.txt +++ b/intl/icu/source/data/lang/ca.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca{ Keys{ calendar{"calendari"} @@ -279,7 +280,7 @@ ca{ kj{"kuanyama"} kk{"kazakh"} kkj{"kako"} - kl{"grenlandès"} + kl{"groenlandès"} kln{"kalenjin"} km{"khmer"} kmb{"kimbundu"} @@ -602,6 +603,7 @@ ca{ zh_Hant{"xinès mandarí (tradicional)"} } Languages%menu{ + ckb{"sorani"} yue{"xinès, cantonès"} zh{"xinès, mandarí"} } @@ -671,7 +673,7 @@ ca{ Hira{"hiragana"} Hluw{"jeroglífic anatoli"} Hmng{"pahawh hmong"} - Hrkt{"katakana o hiragana"} + Hrkt{"sil·labaris japonesos"} Hung{"hongarès antic"} Inds{"escriptura de la vall de l’Indus"} Ital{"cursiva antiga"} @@ -1011,7 +1013,6 @@ ca{ VALLADER{"baix engiadinès"} WADEGILE{"romanització Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — tot"} category-list{"{0}: {1}"} @@ -1026,6 +1027,8 @@ ca{ one{"{0} traç"} other{"{0} traços"} } + subscript{"subíndex {0}"} + superscript{"superíndex {0}"} } codePatterns{ language{"Idioma: {0}"} diff --git a/intl/icu/source/data/lang/ccp.txt b/intl/icu/source/data/lang/ccp.txt index a78c62c31194..4ce7dd9f7e83 100644 --- a/intl/icu/source/data/lang/ccp.txt +++ b/intl/icu/source/data/lang/ccp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp{ Keys{ calendar{"𑄇𑄳𑄠𑄣𑄬𑄚𑄴𑄓𑄢𑄴"} @@ -833,7 +834,6 @@ ccp{ vaii{"𑄞𑄭 𑄚𑄘"} } } - Version{"37"} characterLabelPattern{ all{"{0} — 𑄗𑄪𑄟𑄴"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/ce.txt b/intl/icu/source/data/lang/ce.txt index 0b2bdf0a4b8f..bf4cf5a31280 100644 --- a/intl/icu/source/data/lang/ce.txt +++ b/intl/icu/source/data/lang/ce.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ce{ Keys{ calendar{"Календарь"} @@ -459,7 +460,6 @@ ce{ persian{"гӀажарийн"} } } - Version{"37"} codePatterns{ language{"Мотт: {0}"} script{"Скрипт: {0}"} diff --git a/intl/icu/source/data/lang/ceb.txt b/intl/icu/source/data/lang/ceb.txt index 8cf7e629d448..eb216efc2c12 100644 --- a/intl/icu/source/data/lang/ceb.txt +++ b/intl/icu/source/data/lang/ceb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ceb{ Languages{ ar{"Arabic"} @@ -8,7 +9,7 @@ ceb{ ceb{"Binisaya"} de{"Aleman"} de_AT{"Austriano nga Aleman"} - de_CH{"Swiss nga Taas nga Aleman"} + de_CH{"Taas nga Aleman sa Switzerland"} en{"Ingles"} en_AU{"Ingles sa Australia"} en_CA{"Ingles sa Canada"} @@ -20,7 +21,7 @@ ceb{ es_MX{"Espanyol sa Mexico"} fr{"Pranses"} fr_CA{"Pranses sa Canada"} - fr_CH{"Swiss nga Pranses"} + fr_CH{"Pranses sa Switzerland"} hi{"Hindi"} id{"Indonesian"} it{"Italiano"} @@ -78,7 +79,6 @@ ceb{ latn{"Mga Western Digit"} } } - Version{"37"} codePatterns{ language{"Lengguwahe: {0}"} script{"Script: {0}"} diff --git a/intl/icu/source/data/lang/cgg.txt b/intl/icu/source/data/lang/cgg.txt index 980bfbdcf2cc..761852071532 100644 --- a/intl/icu/source/data/lang/cgg.txt +++ b/intl/icu/source/data/lang/cgg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cgg{ Languages{ ak{"Orukani"} @@ -48,5 +49,4 @@ cgg{ zh{"Oruchaina"} zu{"Oruzuru"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/chr.txt b/intl/icu/source/data/lang/chr.txt index 7298c38b092c..ca584a3289d3 100644 --- a/intl/icu/source/data/lang/chr.txt +++ b/intl/icu/source/data/lang/chr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr{ Keys{ calendar{"ᏅᏙ ᏗᏎᏍᏗ"} @@ -549,7 +550,6 @@ chr{ tibt{"ᏘᏇᏔᏂ ᏗᏎᏍᏗ"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ᏂᎦᏓ"} category-list{"{0}: {1}"} @@ -563,6 +563,8 @@ chr{ one{"{0} ᏗᎬᏂᎸᎯ"} other{"{0} ᏗᎬᏂᎸᎯ"} } + subscript{"ᎡᎳᏗ ᎤᏍᏗ ᎪᏪᎳ {0}"} + superscript{"ᎦᎸᎳᏗ ᎤᏍᏗ ᎪᏪᎳ {0}"} } codePatterns{ language{"ᎦᏬᏂᎯᏍᏗ: {0}"} diff --git a/intl/icu/source/data/lang/ckb.txt b/intl/icu/source/data/lang/ckb.txt index e31d76904554..24b739ec6ae4 100644 --- a/intl/icu/source/data/lang/ckb.txt +++ b/intl/icu/source/data/lang/ckb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb{ Languages{ aa{"ئەفار"} @@ -440,5 +441,4 @@ ckb{ Hans{"هانی ئاسانکراو"} Hant{"هانی دێرین"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/cs.txt b/intl/icu/source/data/lang/cs.txt index 0d3e46f96a5c..67407a4754a9 100644 --- a/intl/icu/source/data/lang/cs.txt +++ b/intl/icu/source/data/lang/cs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs{ Keys{ calendar{"Kalendář"} @@ -637,7 +638,7 @@ cs{ zh_Hant{"standardní čínština (tradiční)"} } Languages%menu{ - yue{"jüe"} + yue{"čínština (kantonština)"} zh{"standardní čínština"} } Languages%short{ @@ -971,7 +972,6 @@ cs{ SCOTLAND{"angličtina (Skotsko)"} WADEGILE{"Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} – vše"} category-list{"{0}: {1}"} @@ -988,6 +988,8 @@ cs{ one{"{0} tah"} other{"{0} tahů"} } + subscript{"{0} v dolním indexu"} + superscript{"{0} v horním indexu"} } codePatterns{ language{"Jazyk: {0}"} diff --git a/intl/icu/source/data/lang/cy.txt b/intl/icu/source/data/lang/cy.txt index 19554148c0a2..41552d517bc4 100644 --- a/intl/icu/source/data/lang/cy.txt +++ b/intl/icu/source/data/lang/cy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy{ Keys{ calendar{"Calendr"} @@ -388,9 +389,9 @@ cy{ prg{"Prwseg"} pro{"Hen Brofensaleg"} ps{"Pashto"} - pt{"Portiwgeeg"} - pt_BR{"Portiwgeeg Brasil"} - pt_PT{"Portiwgeeg Ewrop"} + pt{"Portiwgaleg"} + pt_BR{"Portiwgaleg Brasil"} + pt_PT{"Portiwgaleg Ewrop"} qu{"Quechua"} quc{"K’iche’"} raj{"Rajasthaneg"} @@ -539,7 +540,7 @@ cy{ zap{"Zapoteceg"} zbl{"Blisssymbols"} zea{"Zêlandeg"} - zgh{"Tamaseit Safonol"} + zgh{"Tamaseit Moroco Safonol"} zh{"Tsieinëeg"} zh_Hans{"Tsieinëeg Symledig"} zh_Hant{"Tsieinëeg Traddodiadol"} @@ -611,14 +612,14 @@ cy{ } Types{ calendar{ - buddhist{"Calendr y Bwdiaid"} + buddhist{"Calendr Bwdaidd"} chinese{"Calendr Tseina"} coptic{"Calendr y Coptiaid"} dangi{"Calendr Dangi"} ethiopic{"Calendr Ethiopia"} ethiopic-amete-alem{"Calendr Amete Alem Ethiopia"} gregorian{"Calendr Gregori"} - hebrew{"Calendr yr Hebraed"} + hebrew{"Calendr Hebreaidd"} indian{"Calendr Cenedlaethol India"} islamic{"Calendr Islam"} iso8601{"Calendr ISO-8601"} @@ -724,7 +725,6 @@ cy{ POSIX{"Cyfrifiadur"} SCOTLAND{"Saesneg Safonol yr Alban"} } - Version{"37"} characterLabelPattern{ all{"{0} — y cwbl"} category-list{"{0}: {1}"} @@ -743,6 +743,8 @@ cy{ two{"{0} strôc"} zero{"{0} strôc"} } + subscript{"is-sgript {0}"} + superscript{"uwch-sgript {0}"} } codePatterns{ language{"Iaith: {0}"} diff --git a/intl/icu/source/data/lang/da.txt b/intl/icu/source/data/lang/da.txt index 3681e784b469..b857577ef701 100644 --- a/intl/icu/source/data/lang/da.txt +++ b/intl/icu/source/data/lang/da.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da{ Keys{ calendar{"kalender"} @@ -177,7 +178,7 @@ da{ fro{"oldfransk"} frr{"nordfrisisk"} frs{"østfrisisk"} - fur{"friulian"} + fur{"friulisk"} fy{"vestfrisisk"} ga{"irsk"} gaa{"ga"} @@ -355,7 +356,7 @@ da{ nan{"min-kinesisk"} nap{"napolitansk"} naq{"nama"} - nb{"norsk bokmål"} + nb{"bokmål"} nd{"nordndebele"} nds{"nedertysk"} ne{"nepalesisk"} @@ -425,7 +426,7 @@ da{ rwk{"rwa"} sa{"sanskrit"} sad{"sandawe"} - sah{"yakut"} + sah{"jakutisk"} sam{"samaritansk aramæisk"} saq{"samburu"} sas{"sasak"} @@ -534,7 +535,7 @@ da{ wo{"wolof"} wuu{"wu-kinesisk"} xal{"kalmyk"} - xh{"isiXhosa"} + xh{"xhosa"} xog{"soga"} yao{"yao"} yap{"yapese"} @@ -564,9 +565,11 @@ da{ } Languages%short{ az{"azeri"} + en_GB{"britisk engelsk"} en_US{"amerikansk engelsk"} } Languages%variant{ + ckb{"centralkurdisk"} ps{"pushto"} ug{"uighurisk"} } @@ -967,7 +970,6 @@ da{ VALLADER{"vallader"} WADEGILE{"Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} – alle"} category-list{"{0}: {1}"} @@ -982,6 +984,8 @@ da{ one{"{0} streg"} other{"{0} streger"} } + subscript{"sænket skrift {0}"} + superscript{"hævet skrift {0}"} } codePatterns{ language{"Sprog: {0}"} diff --git a/intl/icu/source/data/lang/dav.txt b/intl/icu/source/data/lang/dav.txt index 8757987d7aed..f69d25faf37a 100644 --- a/intl/icu/source/data/lang/dav.txt +++ b/intl/icu/source/data/lang/dav.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dav{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ dav{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/de.txt b/intl/icu/source/data/lang/de.txt index 9e0bcf530986..57d9fffe6de9 100644 --- a/intl/icu/source/data/lang/de.txt +++ b/intl/icu/source/data/lang/de.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ Keys{ calendar{"Kalender"} @@ -58,7 +59,7 @@ de{ as{"Assamesisch"} asa{"Asu"} ase{"Amerikanische Gebärdensprache"} - ast{"Asturianisch"} + ast{"Asturisch"} av{"Awarisch"} avk{"Kotava"} awa{"Awadhi"} @@ -68,11 +69,11 @@ de{ bal{"Belutschisch"} ban{"Balinesisch"} bar{"Bairisch"} - bas{"Basaa"} + bas{"Bassa"} bax{"Bamun"} bbc{"Batak Toba"} bbj{"Ghomala"} - be{"Weißrussisch"} + be{"Belarussisch"} bej{"Bedauye"} bem{"Bemba"} bew{"Betawi"} @@ -201,7 +202,7 @@ de{ gay{"Gayo"} gba{"Gbaya"} gbz{"Gabri"} - gd{"Schottisches Gälisch"} + gd{"Gälisch (Schottland)"} gez{"Geez"} gil{"Kiribatisch"} gl{"Galicisch"} @@ -361,7 +362,7 @@ de{ men{"Mende"} mer{"Meru"} mfe{"Morisyen"} - mg{"Madagassisch"} + mg{"Malagasy"} mga{"Mittelirisch"} mgh{"Makhuwa-Meetto"} mgo{"Meta’"} @@ -394,7 +395,7 @@ de{ nan{"Min Nan"} nap{"Neapolitanisch"} naq{"Nama"} - nb{"Norwegisch Bokmål"} + nb{"Norwegisch (Bokmål)"} nd{"Nord-Ndebele"} nds{"Niederdeutsch"} nds_NL{"Niedersächsisch"} @@ -407,7 +408,7 @@ de{ nl{"Niederländisch"} nl_BE{"Flämisch"} nmg{"Kwasio"} - nn{"Norwegisch Nynorsk"} + nn{"Norwegisch (Nynorsk)"} nnh{"Ngiemboon"} no{"Norwegisch"} nog{"Nogai"} @@ -639,6 +640,9 @@ de{ yue{"Chinesisch (Kantonesisch)"} zh{"Chinesisch (Mandarin)"} } + Languages%short{ + en_GB{"Englisch (GB)"} + } Scripts{ Afak{"Afaka"} Aghb{"Kaukasisch-Albanisch"} @@ -1013,21 +1017,22 @@ de{ VALENCIA{"Valencianisch"} WADEGILE{"Wade-Giles"} } - Version{"37"} characterLabelPattern{ - all{"{0} — Alle"} + all{"{0} — alle"} category-list{"{0}: {1}"} compatibility{"{0} — Kompatibilität"} - enclosed{"{0} — Verschachtelt"} - extended{"{0} — Erweitert"} - historic{"{0} — Historisch"} - miscellaneous{"{0} — Verschiedene"} - other{"{0} — Andere"} + enclosed{"{0} — verschachtelt"} + extended{"{0} — erweitert"} + historic{"{0} — historisch"} + miscellaneous{"{0} — verschiedene"} + other{"{0} — sonstige"} scripts{"Schriften — {0}"} strokes{ one{"{0} Strich"} other{"{0} Striche"} } + subscript{"tiefgestellt {0}"} + superscript{"hochgestellt {0}"} } codePatterns{ language{"Sprache: {0}"} diff --git a/intl/icu/source/data/lang/de_AT.txt b/intl/icu/source/data/lang/de_AT.txt index 6e2b27aea23c..a1581672371a 100644 --- a/intl/icu/source/data/lang/de_AT.txt +++ b/intl/icu/source/data/lang/de_AT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_AT{ Languages{ ar_001{"modernes Hocharabisch"} @@ -16,5 +17,4 @@ de_AT{ sh{"Serbokroatisch"} szl{"Schlesisch"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/de_CH.txt b/intl/icu/source/data/lang/de_CH.txt index 66d00b964469..63fa4af81bf2 100644 --- a/intl/icu/source/data/lang/de_CH.txt +++ b/intl/icu/source/data/lang/de_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_CH{ Keys{ colCaseFirst{"Sortierung nach Gross- bzw. Kleinbuchstaben"} @@ -12,7 +13,6 @@ de_CH{ ar_001{"Modernes Hocharabisch"} ars{"Nadschd-Arabisch"} bas{"Basaa-Sprache"} - be{"Weissrussisch"} bik{"Bikol-Sprache"} bin{"Bini-Sprache"} chb{"Chibcha-Sprache"} @@ -27,6 +27,10 @@ de_CH{ zh_Hans{"Chinesisch (vereinfacht)"} zh_Hant{"Chinesisch (traditionell)"} } + Languages%long{ + zh_Hans{"Hochchinesisch (vereinfacht)"} + zh_Hant{"Hochchinesisch (traditionell)"} + } Types{ colCaseFirst{ upper{"Grossbuchstaben zuerst aufführen"} @@ -40,5 +44,4 @@ de_CH{ ussystem{"US Mass-System"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/de_LU.txt b/intl/icu/source/data/lang/de_LU.txt deleted file mode 100644 index e44d597d4d9b..000000000000 --- a/intl/icu/source/data/lang/de_LU.txt +++ /dev/null @@ -1,8 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -de_LU{ - Languages{ - be{"Belarussisch"} - } - Version{"37"} -} diff --git a/intl/icu/source/data/lang/dje.txt b/intl/icu/source/data/lang/dje.txt index c9fa3fd9cde2..ad78c1918832 100644 --- a/intl/icu/source/data/lang/dje.txt +++ b/intl/icu/source/data/lang/dje.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dje{ Languages{ ak{"Akan senni"} @@ -48,5 +49,4 @@ dje{ zh{"Sinuwa senni"} zu{"Zulu senni"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/doi.txt b/intl/icu/source/data/lang/doi.txt new file mode 100644 index 000000000000..cd5661cf294a --- /dev/null +++ b/intl/icu/source/data/lang/doi.txt @@ -0,0 +1,81 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +doi{ + Languages{ + de{"जर्मन"} + de_AT{"आस्ट्रियाई जर्मन"} + de_CH{"स्विस हाई जर्मन"} + doi{"डोगरी"} + en{"अंगरेजी"} + en_AU{"आस्ट्रेलियाई अंगरेजी"} + en_CA{"कैनेडियन अंगरेजी"} + en_GB{"ब्रिटिश अंगरेजी"} + en_US{"अमरीकी अंगरेजी"} + es{"स्पैनिश"} + es_419{"लैटिन अमरीकी स्पैनिश"} + es_ES{"यूरोपी स्पैनिश"} + es_MX{"मैक्सिन स्पैनिश"} + fr{"फ्रेंच"} + fr_CA{"कैनेडियन फ्रेंच"} + fr_CH{"स्विस फ्रेंच"} + it{"इटालियन"} + ja{"जापानी"} + pt{"पुर्तगाली"} + pt_BR{"ब्राजीली पुर्तगाली"} + pt_PT{"यूरोपी पुर्तगाली"} + ru{"रूसी"} + und{"अनजांती भाशा"} + zh{"चीनी"} + zh_Hans{"सरलीकृत चीनी"} + zh_Hant{"रवायती चीनी"} + } + Languages%long{ + zh_Hans{"सरलीकृत मंदारिन चीनी"} + zh_Hant{"रवायती मंदारिन चीनी"} + } + Languages%menu{ + zh{"चीनी, मंदारिन"} + } + Languages%short{ + en_GB{"यूके अंगरेजी"} + en_US{"यूएस अंगरेजी"} + } + Scripts{ + Arab{"अरबी"} + Cyrl{"सिरिलिक"} + Deva{"देवनागरी"} + Hans{"सरलीकृत"} + Hant{"रवायती"} + Latn{"लैटिन"} + Zxxx{"अनलिखत"} + Zzzz{"अनजांती लिपि"} + } + Scripts%stand-alone{ + Hans{"सरलीकृत हान"} + Hant{"रवायती हान"} + } + Types{ + calendar{ + gregorian{"ग्रेगोरी कैलेन्डर"} + } + collation{ + standard{"मानक ताल तरतीब"} + } + numbers{ + arab{"अरबी-इंडिक अंक"} + deva{"देवनागरी अंक"} + latn{"पच्छमी अंक"} + } + } + codePatterns{ + language{"भाशा: {0}"} + script{"लिपि: {0}"} + territory{"खेत्तर: {0}"} + } + localeDisplayPattern{ + keyTypePattern{"{0}: {1}"} + pattern{"{0} ({1})"} + separator{"{0}, {1}"} + } +} diff --git a/intl/icu/source/data/lang/dsb.txt b/intl/icu/source/data/lang/dsb.txt index 1a4d43069d89..cab89a3a7a5e 100644 --- a/intl/icu/source/data/lang/dsb.txt +++ b/intl/icu/source/data/lang/dsb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dsb{ Keys{ calendar{"kalender"} @@ -378,7 +379,6 @@ dsb{ tibt{"tibetske cyfry"} } } - Version{"37"} codePatterns{ language{"Rěc: {0}"} script{"Pismo: {0}"} diff --git a/intl/icu/source/data/lang/dua.txt b/intl/icu/source/data/lang/dua.txt index 6baeb935109d..fc604740ccc4 100644 --- a/intl/icu/source/data/lang/dua.txt +++ b/intl/icu/source/data/lang/dua.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dua{ Languages{ dua{"duálá"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/dyo.txt b/intl/icu/source/data/lang/dyo.txt index 89191b22997a..b923b71d78bb 100644 --- a/intl/icu/source/data/lang/dyo.txt +++ b/intl/icu/source/data/lang/dyo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dyo{ Languages{ ak{"akan"} @@ -48,5 +49,4 @@ dyo{ zh{"sinua"} zu{"sulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/dz.txt b/intl/icu/source/data/lang/dz.txt index eb230e110ce7..ef2053a7d266 100644 --- a/intl/icu/source/data/lang/dz.txt +++ b/intl/icu/source/data/lang/dz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dz{ Keys{ calendar{"ཟླ་ཐོ"} @@ -234,7 +235,6 @@ dz{ tibt{"ང་བཅས་ཀྱི་ཨང་ཡིག"} } } - Version{"37"} codePatterns{ language{"ཁ་སྐད་: {0}"} script{"ཡིག་གཟུགས་: {0}"} diff --git a/intl/icu/source/data/lang/ebu.txt b/intl/icu/source/data/lang/ebu.txt index 6acbc068f86c..7431d43adc86 100644 --- a/intl/icu/source/data/lang/ebu.txt +++ b/intl/icu/source/data/lang/ebu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ebu{ Languages{ ak{"Kĩakan"} @@ -48,5 +49,4 @@ ebu{ zh{"Kĩchina"} zu{"Kĩzulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ee.txt b/intl/icu/source/data/lang/ee.txt index 30744617e651..843ebdf936a5 100644 --- a/intl/icu/source/data/lang/ee.txt +++ b/intl/icu/source/data/lang/ee.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee{ Keys{ calendar{"kalenda"} @@ -299,7 +300,6 @@ ee{ tibt{"tibet digitwo"} } } - Version{"37"} codePatterns{ language{"gbegbɔgblɔ {0}"} script{"gbeŋɔŋlɔ {0}"} diff --git a/intl/icu/source/data/lang/el.txt b/intl/icu/source/data/lang/el.txt index 6738ce67648b..d59cb8bf8315 100644 --- a/intl/icu/source/data/lang/el.txt +++ b/intl/icu/source/data/lang/el.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ Keys{ calendar{"Ημερολόγιο"} @@ -329,7 +330,7 @@ el{ mi{"Μαορί"} mic{"Μικμάκ"} min{"Μινανγκαμπάου"} - mk{"Μακεδονικά"} + mk{"Σλαβομακεδονικά"} ml{"Μαλαγιαλαμικά"} mn{"Μογγολικά"} mnc{"Μαντσού"} @@ -509,7 +510,7 @@ el{ tyv{"Τουβινικά"} tzm{"Ταμαζίτ Κεντρικού Μαρόκο"} udm{"Ουντμούρτ"} - ug{"Ουιγκουρικά"} + ug{"Ουιγουρικά"} uga{"Ουγκαριτικά"} uk{"Ουκρανικά"} umb{"Ουμπούντου"} @@ -893,7 +894,6 @@ el{ VALENCIA{"Βαλενθιανά"} WADEGILE{"Εκλατινισμένα Γουάντ-Γκιλς"} } - Version{"37"} characterLabelPattern{ all{"{0} — όλα"} category-list{"{0}: {1}"} @@ -908,6 +908,8 @@ el{ one{"{0} γραμμή"} other{"{0} γραμμές"} } + subscript{"δείκτης {0}"} + superscript{"εκθέτης {0}"} } codePatterns{ language{"Γλώσσα: {0}"} diff --git a/intl/icu/source/data/lang/en.txt b/intl/icu/source/data/lang/en.txt index faa1dffb5a5c..eaf62d0a4b99 100644 --- a/intl/icu/source/data/lang/en.txt +++ b/intl/icu/source/data/lang/en.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ Keys{ calendar{"Calendar"} @@ -15,6 +16,7 @@ en{ collation{"Sort Order"} currency{"Currency"} d0{"Transform Destination"} + dx{"Dictionary Break Exclusions"} em{"Emoji Presentation Style"} fw{"First day of week"} h0{"Mixed-in"} @@ -1275,7 +1277,6 @@ en{ VALENCIA{"Valencian"} WADEGILE{"Wade-Giles Romanization"} } - Version{"37"} characterLabelPattern{ all{"{0} — all"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/en_001.txt b/intl/icu/source/data/lang/en_001.txt index 03b2424f3a6c..592d261db8db 100644 --- a/intl/icu/source/data/lang/en_001.txt +++ b/intl/icu/source/data/lang/en_001.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ Keys{ colCaseLevel{"Case-Sensitive Sorting"} @@ -8,6 +9,7 @@ en_001{ Languages{ mus{"Creek"} nds_NL{"West Low German"} + sah{"Yakut"} } Types{ colNormalization{ @@ -21,7 +23,6 @@ en_001{ h24{"24-Hour System (1–24)"} } } - Version{"37"} characterLabelPattern{ all{"{0} – all"} compatibility{"{0} – compatibility"} diff --git a/intl/icu/source/data/lang/en_150.txt b/intl/icu/source/data/lang/en_150.txt index 5a9d0dde62b1..a616e2470fb7 100644 --- a/intl/icu/source/data/lang/en_150.txt +++ b/intl/icu/source/data/lang/en_150.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_150{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_AG.txt b/intl/icu/source/data/lang/en_AG.txt index 15f4f3b2f146..95a979e89b03 100644 --- a/intl/icu/source/data/lang/en_AG.txt +++ b/intl/icu/source/data/lang/en_AG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_AI.txt b/intl/icu/source/data/lang/en_AI.txt index ec4deb24332a..e1cf7517e8af 100644 --- a/intl/icu/source/data/lang/en_AI.txt +++ b/intl/icu/source/data/lang/en_AI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_AT.txt b/intl/icu/source/data/lang/en_AT.txt index e4a6465fadcf..075c742b8e80 100644 --- a/intl/icu/source/data/lang/en_AT.txt +++ b/intl/icu/source/data/lang/en_AT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AT{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_AU.txt b/intl/icu/source/data/lang/en_AU.txt index 90e9dc76f699..2d13d53901f7 100644 --- a/intl/icu/source/data/lang/en_AU.txt +++ b/intl/icu/source/data/lang/en_AU.txt @@ -1,9 +1,12 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AU{ %%Parent{"en_001"} Keys{ colCaseFirst{"Upper case / Lower case Ordering"} + x{"Private Use"} + x0{"Private Use Transform"} } Languages{ ar_001{"Modern Standard Arabic"} @@ -47,5 +50,4 @@ en_AU{ ethiopic{"Ethiopian Calendar"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_BB.txt b/intl/icu/source/data/lang/en_BB.txt index 814000f3539c..d62d19252e08 100644 --- a/intl/icu/source/data/lang/en_BB.txt +++ b/intl/icu/source/data/lang/en_BB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_BE.txt b/intl/icu/source/data/lang/en_BE.txt index ded640548a45..0e5fffa332ea 100644 --- a/intl/icu/source/data/lang/en_BE.txt +++ b/intl/icu/source/data/lang/en_BE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_BM.txt b/intl/icu/source/data/lang/en_BM.txt index 1f9a62c1ac63..d45a1f99e2f1 100644 --- a/intl/icu/source/data/lang/en_BM.txt +++ b/intl/icu/source/data/lang/en_BM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_BS.txt b/intl/icu/source/data/lang/en_BS.txt index 115d86885a11..fa71936df178 100644 --- a/intl/icu/source/data/lang/en_BS.txt +++ b/intl/icu/source/data/lang/en_BS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_BW.txt b/intl/icu/source/data/lang/en_BW.txt index 611516b83c07..ab8bf0919f95 100644 --- a/intl/icu/source/data/lang/en_BW.txt +++ b/intl/icu/source/data/lang/en_BW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_BZ.txt b/intl/icu/source/data/lang/en_BZ.txt index 226183af7d00..fbf69779811b 100644 --- a/intl/icu/source/data/lang/en_BZ.txt +++ b/intl/icu/source/data/lang/en_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CA.txt b/intl/icu/source/data/lang/en_CA.txt index 0843739cd123..92d57bf7dacf 100644 --- a/intl/icu/source/data/lang/en_CA.txt +++ b/intl/icu/source/data/lang/en_CA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CA{ %%Parent{"en_001"} Keys{ @@ -52,5 +53,4 @@ en_CA{ upper{"To Upper Case"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CC.txt b/intl/icu/source/data/lang/en_CC.txt index bce9886347ba..906cf1e9307e 100644 --- a/intl/icu/source/data/lang/en_CC.txt +++ b/intl/icu/source/data/lang/en_CC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CH.txt b/intl/icu/source/data/lang/en_CH.txt index 244edf251572..23629216bb2e 100644 --- a/intl/icu/source/data/lang/en_CH.txt +++ b/intl/icu/source/data/lang/en_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CH{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CK.txt b/intl/icu/source/data/lang/en_CK.txt index ad52b0e60e4d..dc1c0652a0aa 100644 --- a/intl/icu/source/data/lang/en_CK.txt +++ b/intl/icu/source/data/lang/en_CK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CM.txt b/intl/icu/source/data/lang/en_CM.txt index bf63213a9c6b..b7fdf6d9851c 100644 --- a/intl/icu/source/data/lang/en_CM.txt +++ b/intl/icu/source/data/lang/en_CM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CX.txt b/intl/icu/source/data/lang/en_CX.txt index 702f22b69973..58ff41550186 100644 --- a/intl/icu/source/data/lang/en_CX.txt +++ b/intl/icu/source/data/lang/en_CX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_CY.txt b/intl/icu/source/data/lang/en_CY.txt index 21b11b75693b..d4e75c0ad7c6 100644 --- a/intl/icu/source/data/lang/en_CY.txt +++ b/intl/icu/source/data/lang/en_CY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_DE.txt b/intl/icu/source/data/lang/en_DE.txt index 262361402a19..0147e016a82c 100644 --- a/intl/icu/source/data/lang/en_DE.txt +++ b/intl/icu/source/data/lang/en_DE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_DG.txt b/intl/icu/source/data/lang/en_DG.txt index 95b8e88b2410..10bd8d9f5c7b 100644 --- a/intl/icu/source/data/lang/en_DG.txt +++ b/intl/icu/source/data/lang/en_DG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_DK.txt b/intl/icu/source/data/lang/en_DK.txt index d98349b1211f..d694bb01d391 100644 --- a/intl/icu/source/data/lang/en_DK.txt +++ b/intl/icu/source/data/lang/en_DK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DK{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_DM.txt b/intl/icu/source/data/lang/en_DM.txt index 5bfedb7bc574..224df76b66c2 100644 --- a/intl/icu/source/data/lang/en_DM.txt +++ b/intl/icu/source/data/lang/en_DM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_ER.txt b/intl/icu/source/data/lang/en_ER.txt index afd82fc80845..a39df789c0b7 100644 --- a/intl/icu/source/data/lang/en_ER.txt +++ b/intl/icu/source/data/lang/en_ER.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ER{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_FI.txt b/intl/icu/source/data/lang/en_FI.txt index ae4b5178a0fa..0b93a7e23208 100644 --- a/intl/icu/source/data/lang/en_FI.txt +++ b/intl/icu/source/data/lang/en_FI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_FJ.txt b/intl/icu/source/data/lang/en_FJ.txt index 0c4ca01ddb12..65b19ac752d1 100644 --- a/intl/icu/source/data/lang/en_FJ.txt +++ b/intl/icu/source/data/lang/en_FJ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FJ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_FK.txt b/intl/icu/source/data/lang/en_FK.txt index 9c92bfddf150..1fca5161ce21 100644 --- a/intl/icu/source/data/lang/en_FK.txt +++ b/intl/icu/source/data/lang/en_FK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_FM.txt b/intl/icu/source/data/lang/en_FM.txt index 352f324e9718..ad38147c27bf 100644 --- a/intl/icu/source/data/lang/en_FM.txt +++ b/intl/icu/source/data/lang/en_FM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GB.txt b/intl/icu/source/data/lang/en_GB.txt index 7ea8728334b2..4f375f8077b9 100644 --- a/intl/icu/source/data/lang/en_GB.txt +++ b/intl/icu/source/data/lang/en_GB.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GB{ %%Parent{"en_001"} Languages{ @@ -33,5 +34,4 @@ en_GB{ en_GB{"UK English"} en_US{"US English"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GD.txt b/intl/icu/source/data/lang/en_GD.txt index 98ca5e43fb1e..5aadd228902a 100644 --- a/intl/icu/source/data/lang/en_GD.txt +++ b/intl/icu/source/data/lang/en_GD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GG.txt b/intl/icu/source/data/lang/en_GG.txt index 8bee533ca6ed..6d63e5509c60 100644 --- a/intl/icu/source/data/lang/en_GG.txt +++ b/intl/icu/source/data/lang/en_GG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GH.txt b/intl/icu/source/data/lang/en_GH.txt index de3715085046..8d0f240339d5 100644 --- a/intl/icu/source/data/lang/en_GH.txt +++ b/intl/icu/source/data/lang/en_GH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GI.txt b/intl/icu/source/data/lang/en_GI.txt index 5afa54f0b21a..809590db2c12 100644 --- a/intl/icu/source/data/lang/en_GI.txt +++ b/intl/icu/source/data/lang/en_GI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GM.txt b/intl/icu/source/data/lang/en_GM.txt index bbf424ce80b4..0f9710e3cfe0 100644 --- a/intl/icu/source/data/lang/en_GM.txt +++ b/intl/icu/source/data/lang/en_GM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_GY.txt b/intl/icu/source/data/lang/en_GY.txt index 905d5bef1647..0e53543e03e5 100644 --- a/intl/icu/source/data/lang/en_GY.txt +++ b/intl/icu/source/data/lang/en_GY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_HK.txt b/intl/icu/source/data/lang/en_HK.txt index 3eec8fe6d580..f074e0c27571 100644 --- a/intl/icu/source/data/lang/en_HK.txt +++ b/intl/icu/source/data/lang/en_HK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_HK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_IE.txt b/intl/icu/source/data/lang/en_IE.txt index 96feab56fd02..1426a90d3ea6 100644 --- a/intl/icu/source/data/lang/en_IE.txt +++ b/intl/icu/source/data/lang/en_IE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_IL.txt b/intl/icu/source/data/lang/en_IL.txt index 2d329190ae66..39fe76349fde 100644 --- a/intl/icu/source/data/lang/en_IL.txt +++ b/intl/icu/source/data/lang/en_IL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_IM.txt b/intl/icu/source/data/lang/en_IM.txt index 15a218b34593..d6e869d81edb 100644 --- a/intl/icu/source/data/lang/en_IM.txt +++ b/intl/icu/source/data/lang/en_IM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_IN.txt b/intl/icu/source/data/lang/en_IN.txt index 6f9be66fe484..de216704d069 100644 --- a/intl/icu/source/data/lang/en_IN.txt +++ b/intl/icu/source/data/lang/en_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IN{ %%Parent{"en_001"} Languages{ @@ -16,5 +17,4 @@ en_IN{ orya{"Oriya Digits"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_IO.txt b/intl/icu/source/data/lang/en_IO.txt index 5cd721054613..5b70c5ab66ad 100644 --- a/intl/icu/source/data/lang/en_IO.txt +++ b/intl/icu/source/data/lang/en_IO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_JE.txt b/intl/icu/source/data/lang/en_JE.txt index d8e0823c1652..715ff18d66ba 100644 --- a/intl/icu/source/data/lang/en_JE.txt +++ b/intl/icu/source/data/lang/en_JE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_JM.txt b/intl/icu/source/data/lang/en_JM.txt index 695ae1a18125..08a51274d409 100644 --- a/intl/icu/source/data/lang/en_JM.txt +++ b/intl/icu/source/data/lang/en_JM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_KE.txt b/intl/icu/source/data/lang/en_KE.txt index eecdd357a018..01411a3aabe7 100644 --- a/intl/icu/source/data/lang/en_KE.txt +++ b/intl/icu/source/data/lang/en_KE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_KI.txt b/intl/icu/source/data/lang/en_KI.txt index 6c68a9fa83d5..8cd023d08082 100644 --- a/intl/icu/source/data/lang/en_KI.txt +++ b/intl/icu/source/data/lang/en_KI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_KN.txt b/intl/icu/source/data/lang/en_KN.txt index 35ebc91eb17e..092c41e9eb64 100644 --- a/intl/icu/source/data/lang/en_KN.txt +++ b/intl/icu/source/data/lang/en_KN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_KY.txt b/intl/icu/source/data/lang/en_KY.txt index 71fa196b611a..a0c571e78e8b 100644 --- a/intl/icu/source/data/lang/en_KY.txt +++ b/intl/icu/source/data/lang/en_KY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_LC.txt b/intl/icu/source/data/lang/en_LC.txt index 5e248adcff89..ce2445292795 100644 --- a/intl/icu/source/data/lang/en_LC.txt +++ b/intl/icu/source/data/lang/en_LC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_LR.txt b/intl/icu/source/data/lang/en_LR.txt index 0a77adc8b4fc..979fa999139a 100644 --- a/intl/icu/source/data/lang/en_LR.txt +++ b/intl/icu/source/data/lang/en_LR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_LS.txt b/intl/icu/source/data/lang/en_LS.txt index 14848c9fef04..bd1380cb3de1 100644 --- a/intl/icu/source/data/lang/en_LS.txt +++ b/intl/icu/source/data/lang/en_LS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MG.txt b/intl/icu/source/data/lang/en_MG.txt index 2f24348d2b73..8799b5bcb3bd 100644 --- a/intl/icu/source/data/lang/en_MG.txt +++ b/intl/icu/source/data/lang/en_MG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MO.txt b/intl/icu/source/data/lang/en_MO.txt index 2cd5c0a8f383..769b2ea19989 100644 --- a/intl/icu/source/data/lang/en_MO.txt +++ b/intl/icu/source/data/lang/en_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MS.txt b/intl/icu/source/data/lang/en_MS.txt index fbedac5bdeff..e0028aa3cb1b 100644 --- a/intl/icu/source/data/lang/en_MS.txt +++ b/intl/icu/source/data/lang/en_MS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MT.txt b/intl/icu/source/data/lang/en_MT.txt index a3af9271389a..a21782743294 100644 --- a/intl/icu/source/data/lang/en_MT.txt +++ b/intl/icu/source/data/lang/en_MT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MU.txt b/intl/icu/source/data/lang/en_MU.txt index 1e672406bf18..1a4260b7206b 100644 --- a/intl/icu/source/data/lang/en_MU.txt +++ b/intl/icu/source/data/lang/en_MU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MW.txt b/intl/icu/source/data/lang/en_MW.txt index 06244544e9de..1920911dc756 100644 --- a/intl/icu/source/data/lang/en_MW.txt +++ b/intl/icu/source/data/lang/en_MW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_MY.txt b/intl/icu/source/data/lang/en_MY.txt index ffd93f8e315a..891c100c2873 100644 --- a/intl/icu/source/data/lang/en_MY.txt +++ b/intl/icu/source/data/lang/en_MY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NA.txt b/intl/icu/source/data/lang/en_NA.txt index 0b019a8d650f..c1a4e58564fe 100644 --- a/intl/icu/source/data/lang/en_NA.txt +++ b/intl/icu/source/data/lang/en_NA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NF.txt b/intl/icu/source/data/lang/en_NF.txt index e264ade967b9..514d0d9c3ea2 100644 --- a/intl/icu/source/data/lang/en_NF.txt +++ b/intl/icu/source/data/lang/en_NF.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NF{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NG.txt b/intl/icu/source/data/lang/en_NG.txt index 70db1dbe8f90..c047e030fcdb 100644 --- a/intl/icu/source/data/lang/en_NG.txt +++ b/intl/icu/source/data/lang/en_NG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NH.txt b/intl/icu/source/data/lang/en_NH.txt index 958b96bdad8e..5dc995b2118b 100644 --- a/intl/icu/source/data/lang/en_NH.txt +++ b/intl/icu/source/data/lang/en_NH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NH{ "%%ALIAS"{"en_VU"} } diff --git a/intl/icu/source/data/lang/en_NL.txt b/intl/icu/source/data/lang/en_NL.txt index 5b5436b9dc60..0b352bd44db3 100644 --- a/intl/icu/source/data/lang/en_NL.txt +++ b/intl/icu/source/data/lang/en_NL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NL{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NR.txt b/intl/icu/source/data/lang/en_NR.txt index 4377e15a6568..89304ca9b0da 100644 --- a/intl/icu/source/data/lang/en_NR.txt +++ b/intl/icu/source/data/lang/en_NR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NU.txt b/intl/icu/source/data/lang/en_NU.txt index 56d9b22ea29c..830320b281b0 100644 --- a/intl/icu/source/data/lang/en_NU.txt +++ b/intl/icu/source/data/lang/en_NU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_NZ.txt b/intl/icu/source/data/lang/en_NZ.txt index 9dc7f2c0b583..e533cf952166 100644 --- a/intl/icu/source/data/lang/en_NZ.txt +++ b/intl/icu/source/data/lang/en_NZ.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NZ{ %%Parent{"en_001"} Languages{ mi{"Māori"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_PG.txt b/intl/icu/source/data/lang/en_PG.txt index ffddbf48a87f..217c90f4dd6b 100644 --- a/intl/icu/source/data/lang/en_PG.txt +++ b/intl/icu/source/data/lang/en_PG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_PH.txt b/intl/icu/source/data/lang/en_PH.txt index 96578848ab80..1b59777cecbf 100644 --- a/intl/icu/source/data/lang/en_PH.txt +++ b/intl/icu/source/data/lang/en_PH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_PK.txt b/intl/icu/source/data/lang/en_PK.txt index 874a3eeda131..909315766bb5 100644 --- a/intl/icu/source/data/lang/en_PK.txt +++ b/intl/icu/source/data/lang/en_PK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_PN.txt b/intl/icu/source/data/lang/en_PN.txt index 7f93228000e3..975dcb4418f7 100644 --- a/intl/icu/source/data/lang/en_PN.txt +++ b/intl/icu/source/data/lang/en_PN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_PW.txt b/intl/icu/source/data/lang/en_PW.txt index ed60f26fed87..89ef3e6c9463 100644 --- a/intl/icu/source/data/lang/en_PW.txt +++ b/intl/icu/source/data/lang/en_PW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_RH.txt b/intl/icu/source/data/lang/en_RH.txt index b60f708fb284..24bad293f695 100644 --- a/intl/icu/source/data/lang/en_RH.txt +++ b/intl/icu/source/data/lang/en_RH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RH{ "%%ALIAS"{"en_ZW"} } diff --git a/intl/icu/source/data/lang/en_RW.txt b/intl/icu/source/data/lang/en_RW.txt index bc329328e290..ea92ac1dead5 100644 --- a/intl/icu/source/data/lang/en_RW.txt +++ b/intl/icu/source/data/lang/en_RW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SB.txt b/intl/icu/source/data/lang/en_SB.txt index 7e736c28dae8..99071572dc6c 100644 --- a/intl/icu/source/data/lang/en_SB.txt +++ b/intl/icu/source/data/lang/en_SB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SC.txt b/intl/icu/source/data/lang/en_SC.txt index df04930ee040..9d503c4f86b8 100644 --- a/intl/icu/source/data/lang/en_SC.txt +++ b/intl/icu/source/data/lang/en_SC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SD.txt b/intl/icu/source/data/lang/en_SD.txt index f2110fab60c4..ef3c460dae03 100644 --- a/intl/icu/source/data/lang/en_SD.txt +++ b/intl/icu/source/data/lang/en_SD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SE.txt b/intl/icu/source/data/lang/en_SE.txt index c2a72c0820b6..ec7d34ecf478 100644 --- a/intl/icu/source/data/lang/en_SE.txt +++ b/intl/icu/source/data/lang/en_SE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SG.txt b/intl/icu/source/data/lang/en_SG.txt index ddf857dc6401..1f25c8634c6a 100644 --- a/intl/icu/source/data/lang/en_SG.txt +++ b/intl/icu/source/data/lang/en_SG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SH.txt b/intl/icu/source/data/lang/en_SH.txt index 0e6c3dc082d3..09e4765ae382 100644 --- a/intl/icu/source/data/lang/en_SH.txt +++ b/intl/icu/source/data/lang/en_SH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SI.txt b/intl/icu/source/data/lang/en_SI.txt index a69030ee8795..6fb107aec3d0 100644 --- a/intl/icu/source/data/lang/en_SI.txt +++ b/intl/icu/source/data/lang/en_SI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SL.txt b/intl/icu/source/data/lang/en_SL.txt index b956002c8c65..c79ccc50137a 100644 --- a/intl/icu/source/data/lang/en_SL.txt +++ b/intl/icu/source/data/lang/en_SL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SS.txt b/intl/icu/source/data/lang/en_SS.txt index 80fb80078f97..390a313b3ff7 100644 --- a/intl/icu/source/data/lang/en_SS.txt +++ b/intl/icu/source/data/lang/en_SS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SX.txt b/intl/icu/source/data/lang/en_SX.txt index 28da271484bb..11fa700ebcd0 100644 --- a/intl/icu/source/data/lang/en_SX.txt +++ b/intl/icu/source/data/lang/en_SX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_SZ.txt b/intl/icu/source/data/lang/en_SZ.txt index 431d63a6eaf2..7e9c97d0d227 100644 --- a/intl/icu/source/data/lang/en_SZ.txt +++ b/intl/icu/source/data/lang/en_SZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_TC.txt b/intl/icu/source/data/lang/en_TC.txt index 4129b99aedf9..181633bb547b 100644 --- a/intl/icu/source/data/lang/en_TC.txt +++ b/intl/icu/source/data/lang/en_TC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_TK.txt b/intl/icu/source/data/lang/en_TK.txt index 11010f35ad4c..e50d57245622 100644 --- a/intl/icu/source/data/lang/en_TK.txt +++ b/intl/icu/source/data/lang/en_TK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_TO.txt b/intl/icu/source/data/lang/en_TO.txt index 6b63ad24fc11..d21d084e934f 100644 --- a/intl/icu/source/data/lang/en_TO.txt +++ b/intl/icu/source/data/lang/en_TO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_TT.txt b/intl/icu/source/data/lang/en_TT.txt index d91ebb5a6aa4..d375378a8bf3 100644 --- a/intl/icu/source/data/lang/en_TT.txt +++ b/intl/icu/source/data/lang/en_TT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_TV.txt b/intl/icu/source/data/lang/en_TV.txt index 2d0ae8f9f059..62477529f574 100644 --- a/intl/icu/source/data/lang/en_TV.txt +++ b/intl/icu/source/data/lang/en_TV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TV{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_TZ.txt b/intl/icu/source/data/lang/en_TZ.txt index 2ff0cbd9517f..2aa8e46e6255 100644 --- a/intl/icu/source/data/lang/en_TZ.txt +++ b/intl/icu/source/data/lang/en_TZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_UG.txt b/intl/icu/source/data/lang/en_UG.txt index 7ad0d876d3d0..26ed28e6b2df 100644 --- a/intl/icu/source/data/lang/en_UG.txt +++ b/intl/icu/source/data/lang/en_UG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_UG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_VC.txt b/intl/icu/source/data/lang/en_VC.txt index 45b455da495d..a0187543234c 100644 --- a/intl/icu/source/data/lang/en_VC.txt +++ b/intl/icu/source/data/lang/en_VC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_VG.txt b/intl/icu/source/data/lang/en_VG.txt index 3e84e3013cc5..1a001d05daa8 100644 --- a/intl/icu/source/data/lang/en_VG.txt +++ b/intl/icu/source/data/lang/en_VG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_VU.txt b/intl/icu/source/data/lang/en_VU.txt index 6229365b1f91..91d6b819ccf7 100644 --- a/intl/icu/source/data/lang/en_VU.txt +++ b/intl/icu/source/data/lang/en_VU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_WS.txt b/intl/icu/source/data/lang/en_WS.txt index 5d2f739b8e3e..f197bb1f1507 100644 --- a/intl/icu/source/data/lang/en_WS.txt +++ b/intl/icu/source/data/lang/en_WS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_WS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_ZA.txt b/intl/icu/source/data/lang/en_ZA.txt index 942751ed3d33..13468e262d33 100644 --- a/intl/icu/source/data/lang/en_ZA.txt +++ b/intl/icu/source/data/lang/en_ZA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_ZM.txt b/intl/icu/source/data/lang/en_ZM.txt index 32588ce8afff..f61c471a8de3 100644 --- a/intl/icu/source/data/lang/en_ZM.txt +++ b/intl/icu/source/data/lang/en_ZM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/en_ZW.txt b/intl/icu/source/data/lang/en_ZW.txt index 05fb790dbc5f..60eaea8a1863 100644 --- a/intl/icu/source/data/lang/en_ZW.txt +++ b/intl/icu/source/data/lang/en_ZW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/eo.txt b/intl/icu/source/data/lang/eo.txt index 47b4c1dc2af1..3ca00e2fab33 100644 --- a/intl/icu/source/data/lang/eo.txt +++ b/intl/icu/source/data/lang/eo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo{ Languages{ aa{"afara"} @@ -155,5 +156,4 @@ eo{ zu{"zulua"} zxx{"nelingvaĵo"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es.txt b/intl/icu/source/data/lang/es.txt index 33eda14e73c7..7d4ee01f641a 100644 --- a/intl/icu/source/data/lang/es.txt +++ b/intl/icu/source/data/lang/es.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ Keys{ calendar{"calendario"} @@ -569,6 +570,7 @@ es{ az{"azerí"} } Languages%variant{ + ckb{"kurdo central"} ps{"pastú"} ug{"uygur"} } @@ -861,7 +863,6 @@ es{ VALENCIA{"Valenciano"} WADEGILE{"Romanización Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — Todo"} category-list{"{0}: {1}"} @@ -876,6 +877,8 @@ es{ one{"{0} trazo"} other{"{0} trazos"} } + subscript{"Subíndice {0}"} + superscript{"Superíndice {0}"} } codePatterns{ language{"Idioma: {0}"} diff --git a/intl/icu/source/data/lang/es_419.txt b/intl/icu/source/data/lang/es_419.txt index b6de50f6395e..438bd2baf14a 100644 --- a/intl/icu/source/data/lang/es_419.txt +++ b/intl/icu/source/data/lang/es_419.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_419{ Keys{ colNormalization{"orden normalizado"} @@ -105,7 +106,6 @@ es_419{ wara{"dígitos en Warang Citi"} } } - Version{"37"} characterLabelPattern{ enclosed{"{0} — Adjunto"} extended{"{0} — Extendido"} diff --git a/intl/icu/source/data/lang/es_AR.txt b/intl/icu/source/data/lang/es_AR.txt index 478a09987b18..cb3ebbeda00f 100644 --- a/intl/icu/source/data/lang/es_AR.txt +++ b/intl/icu/source/data/lang/es_AR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_AR{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_AR{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_BO.txt b/intl/icu/source/data/lang/es_BO.txt index 49b14732c181..57c8d0d03af2 100644 --- a/intl/icu/source/data/lang/es_BO.txt +++ b/intl/icu/source/data/lang/es_BO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BO{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_BO{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_BR.txt b/intl/icu/source/data/lang/es_BR.txt index a8d655c2c505..a18c09fbb9ad 100644 --- a/intl/icu/source/data/lang/es_BR.txt +++ b/intl/icu/source/data/lang/es_BR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_BZ.txt b/intl/icu/source/data/lang/es_BZ.txt index f7034128e3b6..471108e8d7a7 100644 --- a/intl/icu/source/data/lang/es_BZ.txt +++ b/intl/icu/source/data/lang/es_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BZ{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_CL.txt b/intl/icu/source/data/lang/es_CL.txt index 4dc8923e5c24..258d8da5c073 100644 --- a/intl/icu/source/data/lang/es_CL.txt +++ b/intl/icu/source/data/lang/es_CL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CL{ %%Parent{"es_419"} Languages{ @@ -23,5 +24,4 @@ es_CL{ phonebook{"orden de directorio telefónico"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_CO.txt b/intl/icu/source/data/lang/es_CO.txt index 0a0cf6bf5c24..de93af637830 100644 --- a/intl/icu/source/data/lang/es_CO.txt +++ b/intl/icu/source/data/lang/es_CO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CO{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_CO{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_CR.txt b/intl/icu/source/data/lang/es_CR.txt index 98001a3df3a6..318f75332d1f 100644 --- a/intl/icu/source/data/lang/es_CR.txt +++ b/intl/icu/source/data/lang/es_CR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CR{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_CR{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_CU.txt b/intl/icu/source/data/lang/es_CU.txt index a316a0d43e0b..1a3a70a76b8d 100644 --- a/intl/icu/source/data/lang/es_CU.txt +++ b/intl/icu/source/data/lang/es_CU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CU{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_DO.txt b/intl/icu/source/data/lang/es_DO.txt index ec76a661aef0..d95a77fc6cbf 100644 --- a/intl/icu/source/data/lang/es_DO.txt +++ b/intl/icu/source/data/lang/es_DO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_DO{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_DO{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_EC.txt b/intl/icu/source/data/lang/es_EC.txt index f87849b0e32f..a66da5fe6cc7 100644 --- a/intl/icu/source/data/lang/es_EC.txt +++ b/intl/icu/source/data/lang/es_EC.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_EC{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_EC{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_GT.txt b/intl/icu/source/data/lang/es_GT.txt index 65578702d273..fddb07a80083 100644 --- a/intl/icu/source/data/lang/es_GT.txt +++ b/intl/icu/source/data/lang/es_GT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GT{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_GT{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_HN.txt b/intl/icu/source/data/lang/es_HN.txt index f72c0853834c..d668a31d69a4 100644 --- a/intl/icu/source/data/lang/es_HN.txt +++ b/intl/icu/source/data/lang/es_HN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_HN{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_HN{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_MX.txt b/intl/icu/source/data/lang/es_MX.txt index 94be2b10a387..563fc4e81a7e 100644 --- a/intl/icu/source/data/lang/es_MX.txt +++ b/intl/icu/source/data/lang/es_MX.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_MX{ %%Parent{"es_419"} Languages{ @@ -11,7 +12,6 @@ es_MX{ bho{"bhoshpuri"} bla{"siksika"} bua{"buriat"} - de_AT{"alemán austriaco"} dum{"neerlandés medieval"} enm{"inglés medieval"} eu{"euskera"} @@ -52,6 +52,9 @@ es_MX{ zh_Hans{"chino mandarín simplificado"} zh_Hant{"chino mandarín tradicional"} } + Languages%menu{ + ckb{"kurdo del centro"} + } Languages%short{ en_GB{"inglés (R. U.)"} } @@ -69,14 +72,10 @@ es_MX{ collation{ ducet{"orden de clasificación de Unicode predeterminado"} } - lb{ - normal{"salto de línea normal"} - } numbers{ gujr{"dígitos en gujarati"} } } - Version{"37"} characterLabelPattern{ historic{"{0} — Históricos"} miscellaneous{"{0} — Varios"} diff --git a/intl/icu/source/data/lang/es_NI.txt b/intl/icu/source/data/lang/es_NI.txt index ff83a7c12fd4..2faa61b68c88 100644 --- a/intl/icu/source/data/lang/es_NI.txt +++ b/intl/icu/source/data/lang/es_NI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_NI{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_NI{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_PA.txt b/intl/icu/source/data/lang/es_PA.txt index 1832d25a0ae6..e7e3a227f625 100644 --- a/intl/icu/source/data/lang/es_PA.txt +++ b/intl/icu/source/data/lang/es_PA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PA{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_PA{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_PE.txt b/intl/icu/source/data/lang/es_PE.txt index 995cf847d2f8..68f8b837ffeb 100644 --- a/intl/icu/source/data/lang/es_PE.txt +++ b/intl/icu/source/data/lang/es_PE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PE{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_PE{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_PR.txt b/intl/icu/source/data/lang/es_PR.txt index 8416246ae425..755366f0cb31 100644 --- a/intl/icu/source/data/lang/es_PR.txt +++ b/intl/icu/source/data/lang/es_PR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PR{ %%Parent{"es_419"} Languages{ @@ -11,5 +12,4 @@ es_PR{ ss{"siswati"} wo{"wolof"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_PY.txt b/intl/icu/source/data/lang/es_PY.txt index 33fde07fa564..5e8bf5b48f04 100644 --- a/intl/icu/source/data/lang/es_PY.txt +++ b/intl/icu/source/data/lang/es_PY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PY{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_PY{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_SV.txt b/intl/icu/source/data/lang/es_SV.txt index 783b1aeebd5c..0d7d5873b90b 100644 --- a/intl/icu/source/data/lang/es_SV.txt +++ b/intl/icu/source/data/lang/es_SV.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_SV{ %%Parent{"es_419"} Languages{ @@ -11,5 +12,4 @@ es_SV{ ss{"siswati"} wo{"wolof"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_US.txt b/intl/icu/source/data/lang/es_US.txt index 35cd7fed84a1..d2e2584da039 100644 --- a/intl/icu/source/data/lang/es_US.txt +++ b/intl/icu/source/data/lang/es_US.txt @@ -1,12 +1,13 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_US{ %%Parent{"es_419"} Languages{ ace{"acehnés"} alt{"altái meridional"} arp{"arapaho"} - bas{"basa"} + ars{"árabe najdi"} bax{"bamun"} bho{"bhojpuri"} bla{"siksika"} @@ -26,13 +27,13 @@ es_US{ kbd{"kabardiano"} krc{"karachay-balkar"} lo{"lao"} + lou{"creole de Luisiana"} lus{"lushai"} mga{"irlandés medieval"} nl_BE{"flamenco"} nr{"ndebele meridional"} nso{"sotho septentrional"} rm{"romanche"} - rn{"kiroundi"} shu{"árabe chadiano"} sma{"sami meridional"} ss{"siswati"} @@ -42,35 +43,23 @@ es_US{ tet{"tetún"} tn{"setchwana"} tyv{"tuviniano"} - wo{"wolof"} xal{"kalmyk"} zh_Hans{"chino simplificado"} zh_Hant{"chino tradicional"} } + Languages%variant{ + ug{"uigur variante"} + } Scripts{ - Hanb{"hanb"} - Mlym{"malayálam"} - Telu{"telegu"} + Hrkt{"silabarios del japonés"} + Zzzz{"letra desconocida"} } Types{ - calendar{ - roc{"calendario minguo"} - } - collation{ - ducet{"orden de clasificación de Unicode predeterminado"} - } - lb{ - normal{"salto de línea normal"} - } numbers{ gujr{"dígitos en gujarati"} - knda{"números en kannada"} - laoo{"números en lao"} } } - Version{"37"} characterLabelPattern{ - historic{"{0} — Históricos"} miscellaneous{"{0} — Varios"} } } diff --git a/intl/icu/source/data/lang/es_UY.txt b/intl/icu/source/data/lang/es_UY.txt index 41fc7c05d55e..143b9b3fbe7a 100644 --- a/intl/icu/source/data/lang/es_UY.txt +++ b/intl/icu/source/data/lang/es_UY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_UY{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/es_VE.txt b/intl/icu/source/data/lang/es_VE.txt index dfeabe2b5973..390938aa096a 100644 --- a/intl/icu/source/data/lang/es_VE.txt +++ b/intl/icu/source/data/lang/es_VE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_VE{ %%Parent{"es_419"} Languages{ @@ -18,5 +19,4 @@ es_VE{ wo{"wolof"} zgh{"tamazight marroquí estándar"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/et.txt b/intl/icu/source/data/lang/et.txt index c05ffc33b0b1..029cade90c0f 100644 --- a/intl/icu/source/data/lang/et.txt +++ b/intl/icu/source/data/lang/et.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et{ Keys{ calendar{"kalender"} @@ -45,7 +46,7 @@ et{ ang{"vanainglise"} anp{"angika"} ar{"araabia"} - ar_001{"araabia (tänapäevane)"} + ar_001{"tänapäeva araabia kirjakeel"} arc{"aramea"} arn{"mapudunguni"} aro{"araona"} @@ -413,7 +414,7 @@ et{ nnh{"ngiembooni"} no{"norra"} nog{"nogai"} - non{"vanapõhjala"} + non{"vanapõhja"} nov{"noviaal"} nqo{"nkoo"} nr{"lõunandebele"} @@ -568,7 +569,7 @@ et{ trv{"taroko"} ts{"tsonga"} tsd{"tsakoonia"} - tsi{"tšimši"} + tsi{"tsimši"} tt{"tatari"} ttt{"lõunataadi"} tum{"tumbuka"} @@ -636,19 +637,24 @@ et{ zh_Hant{"traditsiooniline mandariinihiina"} } Languages%menu{ - yue{"kantoni hiina"} - zh{"mandariinihiina"} + ckb{"kurdi (keskkurdi)"} + yue{"hiina (kantoni)"} + zh{"hiina (mandariinihiina)"} } Languages%short{ az{"aseri"} en_GB{"Briti inglise"} en_US{"USA inglise"} } + Languages%variant{ + ckb{"keskkurdi"} + } Scripts{ Afak{"afaka"} Aghb{"albaani"} Ahom{"ahomi"} Arab{"araabia"} + Aran{"nastaliik"} Armi{"vanaaramea"} Armn{"armeenia"} Avst{"avesta"} @@ -668,12 +674,14 @@ et{ Cari{"kaaria"} Cham{"tšaami"} Cher{"tšerokii"} + Chrs{"horezmi"} Cirt{"Cirthi"} Copt{"kopti"} Cprt{"Küprose silpkiri"} Cyrl{"kirillitsa"} Cyrs{"kürilliline kirikuslaavi"} Deva{"devanaagari"} + Diak{"divehi"} Dsrt{"desereti"} Dupl{"Duployé kiirkiri"} Egyd{"egiptuse demootiline"} @@ -684,6 +692,7 @@ et{ Geok{"hutsuri"} Geor{"gruusia"} Glag{"glagoolitsa"} + Gong{"Gūnjāla gondi"} Gonm{"Masarami gondi"} Goth{"gooti"} Gran{"grantha"} @@ -714,6 +723,7 @@ et{ Khar{"kharoshthi"} Khmr{"khmeeri"} Khoj{"hodžki"} + Kits{"kitani väike kiri"} Knda{"kannada"} Kore{"korea segakiri"} Kpel{"kpelle"} @@ -732,6 +742,7 @@ et{ Lyci{"lüükia"} Lydi{"lüüdia"} Mahj{"mahaadžani"} + Maka{"makassari"} Mand{"mandea"} Mani{"mani"} Maya{"maaja hieroglüüfkiri"} @@ -768,6 +779,7 @@ et{ Plrd{"Pollardi miao"} Prti{"partia raidkiri"} Rjng{"redžangi"} + Rohg{"rohingja"} Roro{"rongorongo"} Runr{"ruunikiri"} Samr{"Samaaria"} @@ -780,6 +792,8 @@ et{ Sidd{"siddhami"} Sind{"hudavadi"} Sinh{"singali"} + Sogd{"sogdi"} + Sogo{"vanasogdi"} Sora{"sora"} Soyo{"sojombo"} Sund{"sunda"} @@ -943,11 +957,13 @@ et{ cham{"tšaami numbrid"} cyrl{"kirillitsa numbrid"} deva{"devanaagari numbrid"} + diak{"divehi numbrid"} ethi{"etioopia numbrid"} finance{"finantsnumbrid"} fullwide{"täislaiusega numbrid"} geor{"gruusia numbrid"} - gonm{"masaram gondi numbrid"} + gong{"Gūnjāla gondi numbrid"} + gonm{"Masarami gondi numbrid"} grek{"kreeka numbrid"} greklow{"väiketähelised kreeka numbrid"} gujr{"gudžarati numbrid"} @@ -984,6 +1000,7 @@ et{ olck{"santali numbrid"} orya{"oria numbrid"} osma{"osmani numbrid"} + rohg{"rohingja numbrid"} roman{"Rooma numbrid"} romanlow{"väiketähelised Rooma numbrid"} saur{"sauraštra numbrid"} @@ -1046,7 +1063,6 @@ et{ VALENCIA{"valentsia"} WADEGILE{"Wade’i-Gilesi latinisatsioon"} } - Version{"37"} characterLabelPattern{ all{"{0} – kõik"} category-list{"{0}: {1}"} @@ -1061,6 +1077,8 @@ et{ one{"{0} kriips"} other{"{0} kriipsu"} } + subscript{"{0} alaindeksina"} + superscript{"{0} ülaindeksina"} } codePatterns{ language{"Keel: {0}"} diff --git a/intl/icu/source/data/lang/eu.txt b/intl/icu/source/data/lang/eu.txt index 1c865683e377..c535e75959c4 100644 --- a/intl/icu/source/data/lang/eu.txt +++ b/intl/icu/source/data/lang/eu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eu{ Keys{ calendar{"Egutegia"} @@ -418,7 +419,7 @@ eu{ yue{"kantonera"} zgh{"amazigera estandarra"} zh{"txinera"} - zh_Hans{"txinera soildua"} + zh_Hans{"txinera sinplifikatu"} zh_Hant{"txinera tradizionala"} zu{"zuluera"} zun{"zuñia"} @@ -635,7 +636,6 @@ eu{ SCOTLAND{"ESKOZIAR INGELESA"} VALENCIA{"VALENTZIERA"} } - Version{"37"} characterLabelPattern{ all{"{0} — Guztiak"} category-list{"{0}: {1}"} @@ -647,9 +647,11 @@ eu{ other{"{0} — Bestelakoak"} scripts{"Scriptak — {0}"} strokes{ - one{"{0} trazuak"} - other{"{0} trazuak"} + one{"{0} trazu"} + other{"{0} trazu"} } + subscript{"{0} azpi-indizea"} + superscript{"{0} goi-indizea"} } codePatterns{ language{"{0}"} diff --git a/intl/icu/source/data/lang/ewo.txt b/intl/icu/source/data/lang/ewo.txt index 5696ff8cbe98..9740e8723c9f 100644 --- a/intl/icu/source/data/lang/ewo.txt +++ b/intl/icu/source/data/lang/ewo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ewo{ Languages{ ak{"Ǹkɔ́bɔ akán"} @@ -48,5 +49,4 @@ ewo{ zh{"Ǹkɔ́bɔ tsainís"} zu{"ǹkɔ́bɔ zulú"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/fa.txt b/intl/icu/source/data/lang/fa.txt index 50ed5e7f55fe..8d5730c6fd13 100644 --- a/intl/icu/source/data/lang/fa.txt +++ b/intl/icu/source/data/lang/fa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa{ Keys{ calendar{"تقویم"} @@ -103,7 +104,7 @@ fa{ chm{"ماریایی"} cho{"چوکتویی"} chp{"چیپه‌ویه‌ای"} - chr{"چروکیایی"} + chr{"چروکی"} chy{"شایانی"} ckb{"کردی مرکزی"} co{"کورسی"} @@ -176,7 +177,7 @@ fa{ frr{"فریزی شمالی"} frs{"فریزی شرقی"} fur{"فریولیایی"} - fy{"فریزی غربی"} + fy{"فریسی غربی"} ga{"ایرلندی"} gaa{"گایی"} gag{"گاگائوزیایی"} @@ -201,9 +202,9 @@ fa{ guz{"گوسی"} gv{"مانی"} gwi{"گویچ این"} - ha{"هوسیایی"} + ha{"هوسایی"} hai{"هایدایی"} - haw{"هاوائیایی"} + haw{"هاوایی"} he{"عبری"} hi{"هندی"} hif{"هندی فیجیایی"} @@ -218,7 +219,7 @@ fa{ hup{"هوپا"} hy{"ارمنی"} hz{"هریرویی"} - ia{"میان‌زبان"} + ia{"اینترلینگوا"} iba{"ایبانی"} ibb{"ایبیبیو"} id{"اندونزیایی"} @@ -277,12 +278,12 @@ fa{ ks{"کشمیری"} ksb{"شامبالا"} ksf{"بافیایی"} - ksh{"ریپواری"} + ksh{"کولش"} ku{"کردی"} kum{"کومیکی"} kut{"کوتنی"} kv{"کومیایی"} - kw{"کرنوالی"} + kw{"کورنی"} ky{"قرقیزی"} la{"لاتین"} lad{"لادینو"} @@ -321,19 +322,19 @@ fa{ men{"منده‌ای"} mer{"مرویی"} mfe{"موریسین"} - mg{"مالاگاسیایی"} + mg{"مالاگاسی"} mga{"ایرلندی میانه"} mgh{"ماکوا متو"} mgo{"متایی"} mh{"مارشالی"} - mi{"مائوریایی"} + mi{"مائوری"} mic{"میکماکی"} min{"مینانگ‌کابویی"} mk{"مقدونی"} ml{"مالایالامی"} mn{"مغولی"} mnc{"مانچویی"} - mni{"میته‌ای"} + mni{"مانیپوری"} moh{"موهاکی"} mos{"ماسیایی"} mr{"مراتی"} @@ -464,7 +465,7 @@ fa{ srr{"سریری"} ss{"سوازیایی"} ssy{"ساهو"} - st{"سوتویی جنوبی"} + st{"سوتوی جنوبی"} su{"سوندایی"} suk{"سوکومایی"} sus{"سوسویی"} @@ -569,6 +570,7 @@ fa{ } Languages%variant{ az{"آذربایجانی"} + ckb{"کردی سورانی"} ps{"پختو"} } Scripts{ @@ -615,7 +617,7 @@ fa{ Hebr{"عبری"} Hira{"هیراگانا"} Hluw{"هیروگلیف آناتولی"} - Hrkt{"سیلابی‌های ژاپنی"} + Hrkt{"هجانگاری ژاپنی"} Hung{"مجاری باستان"} Inds{"ایندوس"} Ital{"ایتالی باستان"} @@ -633,7 +635,7 @@ fa{ Laoo{"لائوسی"} Latf{"لاتینی فراکتور"} Latg{"لاتینی گیلی"} - Latn{"لاتینی"} + Latn{"لاتین"} Limb{"لیمبایی"} Lina{"خطی الف"} Linb{"خطی ب"} @@ -652,7 +654,7 @@ fa{ Nbat{"نبطی"} Ogam{"اوگامی"} Orkh{"اورخونی"} - Orya{"اوریه‌ای"} + Orya{"اودیه"} Palm{"پالمیرایی"} Perm{"پرمی باستان"} Phli{"پهلوی کتیبه‌ای"} @@ -679,7 +681,7 @@ fa{ Teng{"تنگوار"} Tfng{"تیفیناغی"} Tglg{"تاگالوگی"} - Thaa{"تانه‌ای"} + Thaa{"تانا"} Thai{"تایلندی"} Tibt{"تبتی"} Ugar{"اوگاریتی"} @@ -802,8 +804,8 @@ fa{ } ms{ metric{"دستگاه متریک"} - uksystem{"دستگاه اندازه‌گیری بریتانیایی"} - ussystem{"دستگاه اندازه‌گیری امریکایی"} + uksystem{"سیستم اندازه‌گیری انگلیسی"} + ussystem{"سیستم اندازه‌گیری امریکایی"} } numbers{ arab{"ارقام عربی"} @@ -844,7 +846,7 @@ fa{ mymr{"ارقام میانماری"} mymrshan{"ارقام شان میانماری"} native{"ارقام بومی"} - orya{"ارقام اوریه‌ای"} + orya{"ارقام اودیه"} roman{"اعداد رومی"} romanlow{"اعداد رومی با حروف کوچک"} taml{"اعداد سنتی تامیلی"} @@ -872,7 +874,6 @@ fa{ SAAHO{"ساهویی"} SCOTLAND{"انگلیسی معیار اسکاتلند"} } - Version{"37"} characterLabelPattern{ all{"{0} — همه"} category-list{"{0}: {1}"} @@ -887,6 +888,8 @@ fa{ one{"{0} ضربه"} other{"{0} ضربه"} } + subscript{"زیرنگاشت {0}"} + superscript{"بالانگاشت {0}"} } codePatterns{ language{"زبان: {0}"} diff --git a/intl/icu/source/data/lang/fa_AF.txt b/intl/icu/source/data/lang/fa_AF.txt index 7b7221187640..a4c9784aa841 100644 --- a/intl/icu/source/data/lang/fa_AF.txt +++ b/intl/icu/source/data/lang/fa_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa_AF{ Languages{ ab{"افریکانس"} @@ -19,7 +20,6 @@ fa_AF{ ja{"جاپانی"} ko{"کوریایی"} ksh{"کلنی"} - kw{"کورنی"} ky{"قرغزی"} lus{"میزویی"} mai{"مایتیلی"} @@ -46,5 +46,4 @@ fa_AF{ Scripts{ Mong{"مغلی"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ff.txt b/intl/icu/source/data/lang/ff.txt index 8de486fc5401..c7983add35fc 100644 --- a/intl/icu/source/data/lang/ff.txt +++ b/intl/icu/source/data/lang/ff.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff{ Languages{ ak{"Akaan"} @@ -48,5 +49,4 @@ ff{ zh{"Sinuwaare"} zu{"Suluŋkoore"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ff_Adlm.txt b/intl/icu/source/data/lang/ff_Adlm.txt index 4ca7bd56d69b..618a60c0b4bf 100644 --- a/intl/icu/source/data/lang/ff_Adlm.txt +++ b/intl/icu/source/data/lang/ff_Adlm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm{ %%Parent{"root"} Keys{ @@ -13,13 +14,14 @@ ff_Adlm{ numbers{"𞤈𞤢𞤽𞤢𞤥𞤫"} } Languages{ - aa{"𞤢𞤬𞤢𞥄𞤪𞤫"} + aa{"𞤀𞤬𞤢𞥄𞤪𞤫"} af{"𞤀𞤬𞤪𞤭𞤳𞤢𞤲𞤪𞤫"} ak{"𞤀𞤳𞤢𞤲𞤪𞤫"} am{"𞤀𞤥𞤸𞤢𞤪𞤭𞥅𞤪𞤫"} an{"𞤀𞤪𞤢𞤺𞤮𞤲𞤪𞤫"} anp{"𞤀𞤲𞤺𞤭𞤳𞤢𞥄𞤪𞤫"} - ar{"𞤀𞥄𞤪𞤫𞤦𞤫𞥅𞤪𞤫"} + ar{"𞤀𞥄𞤪𞤢𞤦𞤫𞥅𞤪𞤫"} + ar_001{"𞤀𞥄𞤪𞤢𞤦𞤫𞥅𞤪𞤫 𞤊𞤵𞤧𞤸𞤢 𞤒𞤫𞤲𞤯𞤵𞤳𞤢"} arp{"𞤀𞤪𞤢𞤨𞤢𞤸𞤮𞥅𞤪𞤫"} as{"𞤀𞤧𞤢𞤥𞤫𞥅𞤪𞤫"} asa{"𞤀𞤧𞤵𞥅𞤪𞤫"} @@ -61,9 +63,9 @@ ff_Adlm{ da{"𞤁𞤢𞥄𞤲𞤭𞤧𞤳𞤮𞥅𞤪𞤫"} dak{"𞤁𞤢𞤳𞤮𞤼𞤢𞥄𞤪𞤫"} dar{"𞤁𞤢𞤪𞤺𞤭𞤲𞤢𞥄𞤪𞤫"} - de{"𞤘𞤫𞤪𞤥𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - de_AT{"𞤘𞤫𞤪𞤥𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤐𞤢𞤥𞤧𞤭𞤱𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - de_CH{"𞤘𞤫𞤪𞤥𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤅𞤵𞤱𞤭𞤧𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤚𞤮𞥅𞤱𞤵𞤲𞥋𞤣𞤫"} + de{"𞤔𞤫𞤪𞤥𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫"} + de_AT{"𞤔𞤫𞤪𞤥𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤌𞤼𞤭𞤪𞤧𞤢"} + de_CH{"𞤔𞤫𞤪𞤥𞤢𞤲𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤅𞤵𞤱𞤭𞥅𞤧"} dje{"𞤔𞤢𞤪𞤥𞤢𞥄𞤪𞤫"} dua{"𞤁𞤵𞤱𞤢𞤤𞤢𞥄𞤪𞤫"} dv{"𞤁𞤭𞥅𞤬𞤫𞤸𞤭𞥅𞤪𞤫"} @@ -71,10 +73,10 @@ ff_Adlm{ dz{"𞤄𞤵𞥅𞤼𞤢𞤲𞤪𞤫"} dzg{"𞤁𞤢𞤶𞤢𞤺𞤢𞥄𞤪𞤫"} en{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫"} - en_AU{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - en_CA{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤑𞤢𞤲𞤢𞤣𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - en_GB{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - en_US{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤀𞤥𞤭𞤪𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + en_AU{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + en_CA{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤑𞤢𞤲𞤢𞤣𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + en_GB{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤄𞤭𞤪𞤼𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + en_US{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞤲𞤳𞤮𞤪𞤫"} es{"𞤅𞤭𞤨𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} es_419{"𞤅𞤭𞤨𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤥𞤭𞤪𞤭𞤳 𞤂𞤢𞤼𞤭𞤲𞤭𞤴𞤢"} es_ES{"𞤅𞤭𞤨𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤀𞤪𞤮𞤦𞤢"} @@ -82,20 +84,20 @@ ff_Adlm{ eu{"𞤄𞤢𞤧𞤳𞤢𞤪𞤢𞥄𞤪𞤫"} ff{"𞤆𞤵𞤤𞤢𞤪"} fr{"𞤊𞤢𞤪𞤢𞤲𞤧𞤭𞥅𞤪𞤫"} - fr_CA{"𞤊𞤢𞤪𞤢𞤲𞤧𞤭𞥅𞤪𞤫 𞤑𞤢𞤲𞤢𞤣𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - fr_CH{"𞤊𞤢𞤪𞤢𞤲𞤧𞤭𞥅𞤪𞤫 𞤅𞤵𞤱𞤭𞤧𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + fr_CA{"𞤊𞤢𞤪𞤢𞤲𞤧𞤭𞥅𞤪𞤫 𞤑𞤢𞤲𞤢𞤣𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + fr_CH{"𞤊𞤢𞤪𞤢𞤲𞤧𞤭𞥅𞤪𞤫 𞤅𞤵𞤱𞤭𞥅𞤧"} fy{"𞤊𞤭𞤪𞤭𞥅𞤧𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤖𞤭𞤪𞤲𞤢"} ga{"𞤋𞤪𞤤𞤢𞤲𞤣𞤫𞥅𞤪𞤫"} - hi{"𞤖𞤭𞤲𞤣𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + hi{"𞤖𞤭𞤲𞤣𞤭𞥅𞤪𞤫"} hr{"𞤑𞤮𞤪𞤮𞤱𞤢𞤧𞤭𞥅𞤪𞤫"} hy{"𞤀𞤪𞤥𞤫𞤲𞤭𞥅𞤪𞤫"} ia{"𞤉𞤲𞤼𞤫𞤪𞤤𞤭𞤺𞤢𞥄𞤪𞤫"} - id{"𞤉𞤲𞤣𞤮𞤲𞤮𞥅𞤧𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + id{"𞤋𞤲𞤣𞤮𞤲𞤭𞥅𞤧𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} ilo{"𞤋𞤤𞤮𞤳𞤮𞥅𞤪𞤫"} inh{"𞤋𞤲𞤺𞤮𞤧𞤫𞥅𞤪𞤫"} it{"𞤋𞤼𞤢𞤤𞤭𞤲𞤳𞤮𞥅𞤪𞤫"} iu{"𞤋𞤲𞤵𞤳𞤼𞤫𞥅𞤪𞤫"} - ja{"𞤔𞤢𞤨𞤮𞤲𞤫𞥅𞤪𞤫"} + ja{"𞤐𞤭𞤨𞤮𞤲𞤪𞤫"} jgo{"𞤐𞤺𞤮𞤥𞤦𞤢𞥄𞤪𞤫"} jmc{"𞤃𞤢𞤳𞤢𞤥𞤫𞥅𞤪𞤫"} jv{"𞤔𞤢𞥄𞤱𞤢𞤫𞥅𞤪𞤫"} @@ -138,7 +140,7 @@ ff_Adlm{ new{"𞤐𞤫𞤱𞤢𞤪𞤭𞥅𞤪𞤫"} ng{"𞤐𞤣𞤮𞤲𞤺𞤢𞥄𞤪𞤫"} nia{"𞤙𞤢𞤧𞤭𞤲𞤳𞤮𞥅𞤪𞤫"} - nl{"𞤁𞤮𞥅𞤷𞤪𞤫"} + nl{"𞤁𞤮𞥅𞤷𞤵𞤪𞤫"} nl_BE{"𞤊𞤭𞤤𞤢𞤥𞤢𞤲𞤪𞤫"} nnh{"𞤐𞤶𞤢𞤥𞤦𞤵𞥅𞤪𞤫"} nqo{"𞤐𞤳𞤮𞥅𞤪𞤫"} @@ -147,7 +149,7 @@ ff_Adlm{ pt{"𞤆𞤮𞤪𞤼𞤮𞤳𞤫𞥅𞤧𞤭𞥅𞤪𞤫"} pt_BR{"𞤆𞤮𞤪𞤼𞤮𞤳𞤫𞥅𞤧𞤭𞥅𞤪𞤫 𞤄𞤪𞤫𞥁𞤭𞤤"} pt_PT{"𞤆𞤮𞤪𞤼𞤮𞤳𞤫𞥅𞤧𞤭𞥅𞤪𞤫 𞤆𞤮𞤪𞤼𞤭𞤺𞤢𞥄𞤤"} - ru{"𞤈𞤭𞥅𞤧𞤭𞤲𞤳𞤮𞥅𞤪𞤫"} + ru{"𞤈𞤮𞥅𞤧𞤭𞤴𞤢𞤲𞤪𞤫"} rup{"𞤀𞤪𞤮𞤥𞤢𞤲𞤭𞥅𞤪𞤫"} smn{"𞤋𞤲𞤢𞤪𞤭𞤧𞤳𞤢𞤤𞤭𞥅𞤪𞤫"} sq{"𞤀𞤤𞤦𞤢𞤲𞤭𞥅𞤪𞤫"} @@ -174,11 +176,18 @@ ff_Adlm{ yi{"𞤒𞤭𞤣𞤭𞤧𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} yo{"𞤒𞤮𞥅𞤪𞤵𞤦𞤢𞥄𞤪𞤫"} yue{"𞤑𞤢𞤲𞤼𞤮𞤲𞤫𞥅𞤪𞤫"} - zh{"𞤅𞤭𞥅𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} - zh_Hans{"𞤅𞤭𞥅𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤐𞤫𞤱𞤭𞥅𞤲𞥋𞤣𞤫"} - zh_Hant{"𞤅𞤭𞥅𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤚𞤢𞤱𞤢𞥄𞤲𞥋𞤣𞤫"} + zh{"𞤕𞤢𞤴𞤲𞤢𞤲𞤳𞤮𞥅𞤪𞤫"} + zh_Hans{"𞤕𞤢𞤴𞤲𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤖𞤮𞤴𞤬𞤭𞤲𞤢𞥄𞤲𞤣𞤫"} + zh_Hant{"𞤕𞤢𞤴𞤲𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤒𞤫𞤷𞥆𞤵𞤲𞥋𞤣𞤫"} zu{"𞥁𞤵𞤤𞤵𞥅𞤪𞤫"} } + Languages%long{ + zh_Hans{"𞤃𞤢𞤲𞤣𞤢𞤪𞤫𞤲𞤪𞤫 𞤖𞤮𞤴𞤬𞤭𞤲𞤢𞥄𞤲𞤣𞤫"} + zh_Hant{"𞤃𞤢𞤲𞤣𞤢𞤪𞤫𞤲𞤪𞤫 𞤀𞤪𞤣𞤭𞥅𞤲𞤣𞤫"} + } + Languages%menu{ + zh{"𞤕𞤢𞤴𞤲𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤃𞤢𞤲𞤣𞤢𞤪𞤫𞤲𞤪𞤫"} + } Languages%short{ az{"𞤀𞤶𞤢𞤪𞤭𞥅𞤪𞤫"} en_GB{"𞤉𞤲𞤺𞤭𞤤𞤫𞥅𞤪𞤫 𞤁𞤘"} @@ -186,6 +195,19 @@ ff_Adlm{ } Scripts{ Adlm{"𞤀𞤁𞤂𞤢𞤃"} + Arab{"𞤀𞥄𞤪𞤢𞤦𞤵"} + Cyrl{"𞤅𞤭𞤪𞤤𞤭𞤳"} + Hans{"𞤖𞤮𞤴𞤲𞤢𞥄𞤲𞤣𞤫"} + Hant{"𞤚𞤢𞤱𞤢𞥄𞤲𞤣𞤫"} + Jpan{"𞤐𞤭𞤨𞤮𞤲𞤶𞤭"} + Kore{"𞤑𞤮𞥅𞤪𞤫𞤴𞤢𞤲𞤶𞤭"} + Latn{"𞤂𞤢𞤼𞤫𞤲"} + Zxxx{"𞤀𞤧𞤱𞤭𞤲𞤣𞤢𞥄𞤯𞤵𞤲"} + Zzzz{"𞤄𞤭𞤲𞤣𞤭 𞤀𞤧-𞤢𞤲𞤣𞤢𞥄𞤯𞤭"} + } + Scripts%stand-alone{ + Hans{"𞤖𞤢𞥄𞤲𞤪𞤫 𞤖𞤮𞤴𞤲𞤢𞥄𞤲𞤣𞤫"} + Hant{"𞤖𞤢𞥄𞤲𞤪𞤫 𞤚𞤢𞤱𞤢𞥄𞤲𞤣𞤫"} } Types{ calendar{ @@ -272,7 +294,6 @@ ff_Adlm{ tibt{"𞤂𞤭𞤥𞤫 𞤚𞤭𞤦𞤫𞤼𞤭𞤲𞤳𞤮"} } } - Version{"37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/ff_CM.txt b/intl/icu/source/data/lang/ff_CM.txt index c381f6cd740d..0bf68ef91987 100644 --- a/intl/icu/source/data/lang/ff_CM.txt +++ b/intl/icu/source/data/lang/ff_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_CM{ "%%ALIAS"{"ff_Latn_CM"} } diff --git a/intl/icu/source/data/lang/ff_GN.txt b/intl/icu/source/data/lang/ff_GN.txt index c3a0bf3d7bf3..433db4db3d8d 100644 --- a/intl/icu/source/data/lang/ff_GN.txt +++ b/intl/icu/source/data/lang/ff_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_GN{ "%%ALIAS"{"ff_Latn_GN"} } diff --git a/intl/icu/source/data/lang/ff_Latn.txt b/intl/icu/source/data/lang/ff_Latn.txt index 3d8715b562c7..d30cb6250832 100644 --- a/intl/icu/source/data/lang/ff_Latn.txt +++ b/intl/icu/source/data/lang/ff_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/ff_Latn_CM.txt b/intl/icu/source/data/lang/ff_Latn_CM.txt index a141c2f858f1..123bc57aeef0 100644 --- a/intl/icu/source/data/lang/ff_Latn_CM.txt +++ b/intl/icu/source/data/lang/ff_Latn_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ff_Latn_GN.txt b/intl/icu/source/data/lang/ff_Latn_GN.txt index b37284e2b028..54b7546ef6ba 100644 --- a/intl/icu/source/data/lang/ff_Latn_GN.txt +++ b/intl/icu/source/data/lang/ff_Latn_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ff_Latn_MR.txt b/intl/icu/source/data/lang/ff_Latn_MR.txt index 9b83c9511093..dd6364bc3bdf 100644 --- a/intl/icu/source/data/lang/ff_Latn_MR.txt +++ b/intl/icu/source/data/lang/ff_Latn_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ff_Latn_SN.txt b/intl/icu/source/data/lang/ff_Latn_SN.txt index 6112f6fdf109..33ed4073beb5 100644 --- a/intl/icu/source/data/lang/ff_Latn_SN.txt +++ b/intl/icu/source/data/lang/ff_Latn_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ff_MR.txt b/intl/icu/source/data/lang/ff_MR.txt index 17a887321fa0..1da6e5116ae4 100644 --- a/intl/icu/source/data/lang/ff_MR.txt +++ b/intl/icu/source/data/lang/ff_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_MR{ "%%ALIAS"{"ff_Latn_MR"} } diff --git a/intl/icu/source/data/lang/ff_SN.txt b/intl/icu/source/data/lang/ff_SN.txt index c6908546784d..ca2f4ec58333 100644 --- a/intl/icu/source/data/lang/ff_SN.txt +++ b/intl/icu/source/data/lang/ff_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_SN{ "%%ALIAS"{"ff_Latn_SN"} } diff --git a/intl/icu/source/data/lang/fi.txt b/intl/icu/source/data/lang/fi.txt index bf239beabe9c..423722923584 100644 --- a/intl/icu/source/data/lang/fi.txt +++ b/intl/icu/source/data/lang/fi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi{ Keys{ calendar{"kalenteri"} @@ -123,7 +124,7 @@ fi{ chp{"chipewyan"} chr{"cherokee"} chy{"cheyenne"} - ckb{"sorani"} + ckb{"soranî"} co{"korsika"} cop{"kopti"} cps{"capiznon"} @@ -634,13 +635,15 @@ fi{ zen{"zenaga"} zgh{"vakioitu tamazight"} zh{"kiina"} - zh_Hans{"yksinkertaistettu kiina"} - zh_Hant{"perinteinen kiina"} zu{"zulu"} zun{"zuni"} zxx{"ei kielellistä sisältöä"} zza{"zaza"} } + Languages%long{ + zh_Hans{"mandariinikiina (yksinkertaistettu)"} + zh_Hant{"mandariinikiina (perinteinen)"} + } Languages%menu{ ckb{"kurdi – soranî"} yue{"kiina (kantonin)"} @@ -905,7 +908,7 @@ fi{ yes{"isojen ja pienten kirjainten lajittelu erikseen"} } colNormalization{ - no{"lajittelu ilman normalisoinrtia"} + no{"lajittelu ilman normalisointia"} yes{"lajittelu Unicode-normalisoituna"} } colNumeric{ @@ -1160,7 +1163,6 @@ fi{ Variants%secondary{ FONUPA{"suomalais-ugrilainen tarkekirjoitus"} } - Version{"37"} characterLabelPattern{ all{"{0} – kaikki"} category-list{"{0}: {1}"} @@ -1175,6 +1177,8 @@ fi{ one{"{0} piirtoviiva"} other{"{0} piirtoviivaa"} } + subscript{"alaindeksi {0}"} + superscript{"yläindeksi {0}"} } codePatterns{ language{"kieli: {0}"} diff --git a/intl/icu/source/data/lang/fil.txt b/intl/icu/source/data/lang/fil.txt index 985892fe9a7f..6dfa024d265b 100644 --- a/intl/icu/source/data/lang/fil.txt +++ b/intl/icu/source/data/lang/fil.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil{ Keys{ calendar{"Kalendaryo"} @@ -107,7 +108,7 @@ fil{ eka{"Ekajuk"} el{"Greek"} en{"Ingles"} - en_AU{"Ingles ng Australya"} + en_AU{"Ingles ng Australia"} en_CA{"Ingles sa Canada"} en_GB{"Ingles na British"} en_US{"Ingles na American"} @@ -674,7 +675,6 @@ fil{ PINYIN{"Pinyin Romanization"} WADEGILE{"Wade-Giles Romanization"} } - Version{"37"} characterLabelPattern{ all{"{0} — lahat"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/fil_PH.txt b/intl/icu/source/data/lang/fil_PH.txt index 5b83d8215fcb..481c955f9053 100644 --- a/intl/icu/source/data/lang/fil_PH.txt +++ b/intl/icu/source/data/lang/fil_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/fo.txt b/intl/icu/source/data/lang/fo.txt index 4a4b28412ef5..8b63fd3c2226 100644 --- a/intl/icu/source/data/lang/fo.txt +++ b/intl/icu/source/data/lang/fo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo{ Keys{ calendar{"kalendari"} @@ -102,6 +103,7 @@ fo{ eu{"baskiskt"} ewo{"ewondo"} fa{"persiskt"} + fa_AF{"dari"} ff{"fulah"} fi{"finskt"} fil{"filipiniskt"} @@ -416,12 +418,16 @@ fo{ zh_Hant{"mandarin kinesiskt (vanligt)"} } Languages%menu{ + ckb{"kurdiskt, mið"} yue{"kinesiskt, kantonesiskt"} zh{"kinesiskt, mandarin"} } Languages%short{ az{"azeri"} } + Languages%variant{ + ckb{"kurdiskt, sorani"} + } Scripts{ Arab{"arabisk"} Armn{"armenskt"} @@ -556,7 +562,6 @@ fo{ POLYTON{"polytonísk"} WADEGILE{"Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — Alt"} category-list{"{0}: {1}"} @@ -571,6 +576,8 @@ fo{ one{"{0} strok"} other{"{0} strok"} } + subscript{"lágskrift {0}"} + superscript{"háskrift {0}"} } codePatterns{ language{"Mál: {0}"} diff --git a/intl/icu/source/data/lang/fr.txt b/intl/icu/source/data/lang/fr.txt index 2a32cd09e2c4..ee5bf909ff43 100644 --- a/intl/icu/source/data/lang/fr.txt +++ b/intl/icu/source/data/lang/fr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ Keys{ calendar{"calendrier"} @@ -63,7 +64,7 @@ fr{ avk{"kotava"} awa{"awadhi"} ay{"aymara"} - az{"azéri"} + az{"azerbaïdjanais"} ba{"bachkir"} bal{"baloutchi"} ban{"balinais"} @@ -76,7 +77,7 @@ fr{ bej{"bedja"} bem{"bemba"} bew{"betawi"} - bez{"béna"} + bez{"bena"} bfd{"bafut"} bfq{"badaga"} bg{"bulgare"} @@ -157,7 +158,7 @@ fr{ dyu{"dioula"} dz{"dzongkha"} dzg{"dazaga"} - ebu{"embou"} + ebu{"embu"} ee{"éwé"} efi{"éfik"} egl{"émilien"} @@ -225,7 +226,7 @@ fr{ grb{"grebo"} grc{"grec ancien"} gsw{"suisse allemand"} - gu{"goudjerati"} + gu{"goudjarati"} guc{"wayuu"} gur{"gurenne"} guz{"gusii"} @@ -318,7 +319,7 @@ fr{ ks{"cachemiri"} ksb{"shambala"} ksf{"bafia"} - ksh{"francique ripuaire"} + ksh{"kölsch"} ku{"kurde"} kum{"koumyk"} kut{"kutenai"} @@ -650,6 +651,9 @@ fr{ yue{"chinois cantonais"} zh{"chinois mandarin"} } + Languages%short{ + az{"azéri"} + } Languages%variant{ ps{"pashto"} ug{"ouïgour"} @@ -984,7 +988,6 @@ fr{ VALENCIA{"valencien"} WADEGILE{"Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — tout"} category-list{"{0} : {1}"} @@ -999,6 +1002,8 @@ fr{ one{"{0} trait"} other{"{0} traits"} } + subscript{"indice {0}"} + superscript{"exposant {0}"} } codePatterns{ language{"langue : {0}"} diff --git a/intl/icu/source/data/lang/fr_BE.txt b/intl/icu/source/data/lang/fr_BE.txt index 04f506f8d44e..7f711e262eb7 100644 --- a/intl/icu/source/data/lang/fr_BE.txt +++ b/intl/icu/source/data/lang/fr_BE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BE{ Languages{ frp{"franco-provençal"} @@ -7,5 +8,4 @@ fr_BE{ gu{"gujarati"} njo{"ao"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/fr_CA.txt b/intl/icu/source/data/lang/fr_CA.txt index 32bbc7d9ef49..a574a2f366d7 100644 --- a/intl/icu/source/data/lang/fr_CA.txt +++ b/intl/icu/source/data/lang/fr_CA.txt @@ -1,14 +1,13 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CA{ Languages{ ady{"adygué"} ang{"vieil anglais"} ar_001{"arabe standard moderne"} - asa{"assou"} - az{"azerbaïdjanais"} + asa{"asou"} bbj{"ghomala"} - bez{"bena"} bik{"bicol"} byn{"bilen"} byv{"medumba"} @@ -20,6 +19,7 @@ fr_CA{ de_CH{"allemand suisse"} den{"slave"} dgr{"tlicho"} + ebu{"embou"} en_AU{"anglais australien"} en_CA{"anglais canadien"} en_GB{"anglais britannique"} @@ -30,7 +30,6 @@ fr_CA{ fr_CH{"français suisse"} frc{"cajun"} frp{"franco-provençal"} - gbz{"dari"} goh{"vieux haut-allemand"} gu{"gujarati"} ii{"yi de Sichuan"} @@ -39,7 +38,6 @@ fr_CA{ kl{"kalaallisut"} ks{"kashmiri"} ksb{"chambala"} - ksh{"kölsch"} liv{"live"} lu{"luba-katanga"} lzh{"chinois classique"} @@ -99,7 +97,7 @@ fr_CA{ Hant{"idéogrammes han traditionnels"} Hrkt{"syllabaires japonais"} Olck{"ol chiki"} - Zsye{"zsye"} + Zsye{"émoji"} } Scripts%stand-alone{ Hans{"caractères chinois simplifiés"} @@ -129,7 +127,6 @@ fr_CA{ mong{"Chiffres mongols"} } } - Version{"37"} characterLabelPattern{ category-list{"{0} : {1}"} } diff --git a/intl/icu/source/data/lang/fr_CH.txt b/intl/icu/source/data/lang/fr_CH.txt index 5ebe7260525b..a1644811199b 100644 --- a/intl/icu/source/data/lang/fr_CH.txt +++ b/intl/icu/source/data/lang/fr_CH.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CH{ Languages{ gu{"goudjrati"} pdc{"allemand de Pennsylvanie"} sdh{"kurde méridional"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/fur.txt b/intl/icu/source/data/lang/fur.txt index c32b934189eb..a3c5807f044c 100644 --- a/intl/icu/source/data/lang/fur.txt +++ b/intl/icu/source/data/lang/fur.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fur{ Keys{ calendar{"calendari"} @@ -299,7 +300,6 @@ fur{ SOLBA{"dialet di Stolvize"} VALENCIA{"valenzian"} } - Version{"37"} codePatterns{ language{"Lenghe: {0}"} script{"Scriture: {0}"} diff --git a/intl/icu/source/data/lang/fy.txt b/intl/icu/source/data/lang/fy.txt index 92238a7724c7..4eb4066a757d 100644 --- a/intl/icu/source/data/lang/fy.txt +++ b/intl/icu/source/data/lang/fy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fy{ Keys{ calendar{"Kalender"} @@ -886,7 +887,6 @@ fy{ VALLADER{"Vallader"} WADEGILE{"Wade-Giles-romanisering"} } - Version{"37"} codePatterns{ language{"Taal: {0}"} script{"Skrift: {0}"} diff --git a/intl/icu/source/data/lang/ga.txt b/intl/icu/source/data/lang/ga.txt index 6b0910889d33..d903584467d1 100644 --- a/intl/icu/source/data/lang/ga.txt +++ b/intl/icu/source/data/lang/ga.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga{ Keys{ calendar{"Féilire"} @@ -35,14 +36,17 @@ ga{ ba{"Baiscíris"} ban{"Bailís"} bar{"Baváiris"} + bas{"Basáis"} be{"Bealarúisis"} bem{"Beimbis"} + bez{"Béinis"} bg{"Bulgáiris"} bi{"Bioslaimis"} bm{"Bambairis"} bn{"Beangáilis"} bo{"Tibéidis"} br{"Briotáinis"} + brx{"Bódóis"} bs{"Boisnis"} bua{"Buiriáitis"} bug{"Buiginis"} @@ -50,6 +54,7 @@ ga{ ccp{"Chakma"} ce{"Seisnis"} ceb{"Seabúáinis"} + cgg{"Cígis"} ch{"Seamóiris"} chm{"Mairis"} chr{"Seiricis"} @@ -73,7 +78,9 @@ ga{ dua{"Duailis"} dum{"Meán-Ollainnis"} dv{"Divéihis"} + dyo{"Ióla-Fainís"} dz{"Seoinicis"} + ebu{"Eambúis"} ee{"Éabhais"} egy{"Sean-Éigiptis"} el{"Gréigis"} @@ -120,6 +127,7 @@ ga{ gsw{"Gearmáinis Eilvéiseach"} gu{"Gúisearáitis"} guc{"Uaúis"} + guz{"Gúisis"} gv{"Manainnis"} ha{"Hásais"} hak{"Haicéis"} @@ -144,6 +152,7 @@ ga{ id{"Indinéisis"} ie{"Interlingue"} ig{"Íogbóis"} + ii{"Ís Shichuan"} ik{"Iniúipiaicis"} inh{"Iongúis"} io{"Ido"} @@ -161,13 +170,13 @@ ga{ kab{"Caibílis"} kam{"Cambais"} kde{"Makonde"} - kea{"Kabuverdianu"} + kea{"Criól Cabo Verde"} kg{"Congóis"} - khq{"Koyra Chiini"} + khq{"Songais Iartharach"} ki{"Ciocúis"} kj{"Cuainiáimis"} kk{"Casaicis"} - kkj{"Kako"} + kkj{"Cacóis"} kl{"Kalaallisut"} kln{"Kalenjin"} km{"Ciméiris"} @@ -178,20 +187,23 @@ ga{ krl{"Cairéilis"} kru{"Curúicis"} ks{"Caismíris"} + ksb{"Shambala"} + ksf{"Baifiais"} + ksh{"Coilsis"} ku{"Coirdis"} kv{"Coimis"} kw{"Coirnis"} ky{"Cirgisis"} la{"Laidin"} lad{"Laidínis"} - lag{"Langi"} + lag{"Láingis"} lah{"Puinseáibis Iartharach"} lb{"Lucsambuirgis"} lg{"Lugandais"} li{"Liombuirgis"} lij{"Liogúiris"} liv{"Liovóinis"} - lkt{"Lakota"} + lkt{"Lacótais"} lmo{"Lombairdis"} ln{"Liongáilis"} lo{"Laoisis"} @@ -226,7 +238,7 @@ ga{ mwl{"Mioraindéis"} mwr{"Marmhairis"} my{"Burmais"} - mzn{"Mazanderani"} + mzn{"Mázandaráinis"} na{"Nárúis"} nan{"Sínis Min Nan"} nap{"Napóilis"} @@ -240,14 +252,14 @@ ga{ niu{"Níobhais"} nl{"Ollainnis"} nl_BE{"Pléimeannais"} - nmg{"Kwasio"} + nmg{"Cuaiseois"} nn{"Nua-Ioruais"} nnh{"Ngiemboon"} no{"Ioruais"} non{"Sean-Lochlainnis"} nr{"Ndeibéilis an Deiscirt"} nso{"Sútúis an Tuaiscirt"} - nus{"Nuer"} + nus{"Nuairis"} nv{"Navachóis"} ny{"Siséivis"} nyn{"Niancóilis"} @@ -257,6 +269,7 @@ ga{ or{"Oirísis"} os{"Oiséitis"} pa{"Puinseáibis"} + pcm{"pidsean na Nigéire"} peo{"Sean-Pheirsis"} pi{"Páilis"} pl{"Polainnis"} @@ -271,21 +284,26 @@ ga{ rn{"Rúindis"} ro{"Rómáinis"} ro_MD{"Moldáivis"} + rof{"Rombo"} rom{"Romainis"} root{"Root"} ru{"Rúisis"} rup{"Arómáinis"} rw{"Ciniaruaindis"} + rwk{"Rwa"} sa{"Sanscrait"} sah{"Sachais"} sam{"Aramais Shamárach"} + saq{"Samburu"} sat{"Santáilis"} + sbp{"Sangu"} sc{"Sairdínis"} scn{"Sicilis"} sco{"Albainis"} sd{"Sindis"} se{"Sáimis Thuaidh"} - ses{"Koyraboro Senni"} + seh{"Sena"} + ses{"Songais Oirthearach"} sg{"Sangóis"} sga{"Sean-Ghaeilge"} sh{"Seirbea-Chróitis"} @@ -350,13 +368,14 @@ ga{ wo{"Volaifis"} xal{"Cailmícis"} xh{"Cóisis"} + xog{"Soga"} yav{"Yangben"} yi{"Giúdais"} yo{"Iarúibis"} yue{"Cantainis"} za{"Siuáingis"} zea{"Séalainnis"} - zgh{"Tamazight Caighdeánach Mharacó"} + zgh{"Tamaisis Chaighdeánach Mharacó"} zh{"Sínis"} zh_Hans{"Sínis Shimplithe"} zh_Hant{"Sínis Thraidisiúnta"} @@ -364,14 +383,21 @@ ga{ zun{"Zúinis"} zxx{"Gan ábhar teangeolaíoch"} } + Languages%long{ + zh_Hans{"Mandairínis Shimplithe"} + } Languages%menu{ yue{"Sínis, Cantainis"} + zh{"Mandairínis"} } Languages%short{ az{"Asairis"} en_GB{"Béarla na R.A."} en_US{"Béarla S.A.M."} } + Languages%variant{ + ckb{"Coirdis, Sóráinis"} + } Scripts{ Adlm{"Adlam"} Aghb{"Albánach Cugasach"} @@ -407,6 +433,7 @@ ga{ Hanb{"Han agus Bopomofo"} Hang{"Hangalach"} Hani{"Han"} + Hano{"Hananúis"} Hans{"Simplithe"} Hant{"Traidisiúnta"} Hebr{"Eabhrach"} @@ -441,8 +468,10 @@ ga{ Mymr{"Maenmarach"} Narb{"Sean-Arabach Thuaidh"} Newa{"Newa"} + Nkoo{"N-cóis"} Ogam{"Ogham"} Orya{"Oiríseach"} + Osge{"Ósáis"} Perm{"Sean-Pheirmeach"} Phnx{"Féiníceach"} Plrd{"Pollard Foghrach"} @@ -450,10 +479,13 @@ ga{ Runr{"Rúnach"} Samr{"Samárach"} Sarb{"Sean-Arabach Theas"} + Sgnw{"Litritheoireacht Comharthaí"} Shaw{"Shawach"} Sinh{"Siolónach"} Sund{"Sundainéis"} Syrc{"Siriceach"} + Tale{"Deiheoingis"} + Talu{"Tai Lue Nua"} Taml{"Tamalach"} Telu{"Teileagúch"} Tfng{"Tifinagh"} @@ -462,6 +494,7 @@ ga{ Thai{"Téalannach"} Tibt{"Tibéadach"} Ugar{"Úgairíteach"} + Vaii{"Vadhais"} Xpeo{"Sean-Pheirseach"} Xsux{"Dingchruthach Suiméar-Acádach"} Yiii{"Ís"} @@ -489,6 +522,10 @@ ga{ hebrew{"Féilire na nEabhrach"} indian{"Féilire Náisiúnta na hIndia"} islamic{"Féilire Ioslamach"} + islamic-civil{"Féilire Ioslamach (táblach, seanré shibhialta)"} + islamic-rgsa{"Féilire Ioslamach (an Araib Shádach, dearcadh)"} + islamic-tbla{"Féilire Ioslamach (táblach, seanré réalteolaíoch)"} + islamic-umalqura{"Féilire Ioslamach (Umm al-Qura)"} iso8601{"Féilire ISO-8601"} japanese{"Féilire Seapánach"} persian{"Féilire Peirseach"} @@ -500,16 +537,22 @@ ga{ } collation{ big5han{"Ord sórtála Síneach traidisiúnta - Big5"} + compat{"Ord Sórtála Roimhe Seo, ar son na comhoiriúnachta"} dictionary{"Ord Sórtála Foclóirí"} ducet{"Ord Sórtála Réamhshocraithe Unicode"} emoji{"Ord Sórtála Emoji"} + eor{"Rialacha Ordaithe Eorpacha"} gb2312han{"Ord sórtála Síneach simplithe - GB 2312"} phonebook{"Ord sórtála an eolaire teileafóin"} pinyin{"Ord sórtála pinyin"} + reformed{"Ord Sórtála Athfhoirmithe"} search{"Cuardach Ilfhóinteach"} + searchjl{"Cuardach de réir Consan Tosaigh Hangul"} standard{"Ord Sórtála Caighdeánach"} stroke{"Ord sórtála stríce"} traditional{"Ord sórtála traidisiúnta"} + unihan{"Ord Sórtála Stríce Radacaí"} + zhuyin{"Ord Sórtála Zhuyin"} } hc{ h11{"Córas 12 Uair (0–11)"} @@ -543,6 +586,7 @@ ga{ ethi{"Uimhreacha Aetóipice"} fullwide{"Digití Lánleithid"} geor{"Uimhreacha Seoirseacha"} + gonm{"Digití Masaram Gondi"} grek{"Uimhreacha Gréagacha"} greklow{"Uimhreacha Cás Íochtair Gréagacha"} gujr{"Digití Gúisearátacha"} @@ -553,41 +597,82 @@ ga{ hant{"Uimhreacha sa tSínis Thraidisiúnta"} hantfin{"Uimhreacha Airgeadúla sa tSínis Thraidisiúnta"} hebr{"Uimhreacha Eabhracha"} + hmng{"Digití Pahawh Hmong"} java{"Digití Iávacha"} jpan{"Uimhreacha Seapánacha"} jpanfin{"Uimhreacha Airgeadúla Seapánacha"} + kali{"Digití Kayah Li"} khmr{"Digití Ciméaracha"} knda{"Digití Cannadacha"} + lana{"Digití Tai Tham Hora"} + lanatham{"Digití Tai Tham Tham"} laoo{"Digití Laosacha"} latn{"Digití Iartharacha"} + lepc{"Digití Lepcha"} + limb{"Digití Limbu"} + mathbold{"Digití Troma Matamaiticiúla"} + mathdbl{"Digití Stríce Dúbailte Matamaiticiúla"} + mathmono{"Digití Aonspáis Matamaiticiúla"} + mathsanb{"Digití Troma Sans-Serif Matamaiticiúla"} + mathsans{"Digití Sans-Serif Matamaiticiúla"} mlym{"Digití Mailéalamacha"} + modi{"Digití Modi"} mong{"Digití Mongólacha"} + mroo{"Digití Mro"} + mtei{"Digití Meetei Mayek"} mymr{"Digití Maenmaracha"} + mymrshan{"Digití Myanmar Shan"} + mymrtlng{"Digití Myanmar Tai Laing"} + nkoo{"Digití N’ko"} + olck{"Digití Ol Chiki"} orya{"Digití Oiríseacha"} + osma{"Digití Osmanya"} roman{"Uimhreacha Rómhánacha"} romanlow{"Uimhreacha Cás Íochtair Rómhánacha"} + saur{"Digití Saurashtra"} + shrd{"Digití Sharada"} + sind{"Digití Khudawadi"} + sinh{"Digití Sinhala Lith"} + sora{"Digití Sora Sompeng"} + sund{"Digití Sundainéise"} + takr{"Digití Takri"} + talu{"Digití Tai Lue Nua"} taml{"Uimhreacha Traidisiúnta Tamalacha"} tamldec{"Digití Tamalacha"} telu{"Digití Teileagúcha"} thai{"Digití Téalannacha"} tibt{"Digití Tibéadacha"} + tirh{"Digití Tirhuta"} + vaii{"Digití Vai"} + wara{"Digití Warang Citi"} } } Variants{ + 1606NICT{"Fraincis Dhéanach Mheánach go 1606"} 1694ACAD{"Nua-Fhraincis Mhoch"} 1901{"Litriú Traidisiúnta na Gearmáinise"} 1959ACAD{"Acadúil"} + 1994{"Ortagrafaíocht Resian Chaighdeánaithe"} + 1996{"Ortagrafaíocht na Gearmáinise in 1996"} + ABL1943{"Foirmiú ortagrafaíochta in 1943"} ALALC97{"Rómhánú ALA-LC, eagrán 1997"} + ALUKU{"Canúint Aluku"} + AO1990{"Comhaontú Ortagrafaíochta Theanga na Portaingéilise, 1990"} AREVELA{"Airméinis an Oirthir"} AREVMDA{"Airméinis an Iarthair"} + BAKU1926{"Abítir Laidine Tuircice Aontaithe"} + BALANKA{"Canúint Balanka de Anii"} + BARLA{"Grúpa canúna Barlavento de Kabuverdianu"} BASICENG{"Bun-Bhéarla"} BAUDDHA{"Bauddha"} BISCAYAN{"BIOSCÁNACH"} BISKE{"Canúint San Giorgo/Bila"} BOHORIC{"Aibítir Bohorič"} BOONT{"Boontling"} + COLB1945{"Coinbhinsiún Ortagrafaíochta na Portaingéilise na Brasaíle, 1945"} CORNU{"Béarla an Choirn"} DAJNKO{"Aibítir Dajnko"} + EKAVSK{"Seirbis le fuaimniú Ekavian"} EMODENG{"Nua-Bhéarla Moch"} FONIPA{"Fogharscríobh IPA"} FONNAPA{"Fonnapa"} @@ -596,6 +681,7 @@ ga{ HEPBURN{"Rómhánú Hepburn"} HOGNORSK{"Hognorsk"} HSISTEMO{"Hsistemo"} + IJEKAVSK{"Seirbis le fuaimniú Ijekavach"} ITIHASA{"Itihasa"} JAUER{"Jauer"} JYUTPING{"Jyutping"} @@ -603,16 +689,21 @@ ga{ KOCIEWIE{"Kociewie"} KSCOR{"Litriú Caighdeánach"} LAUKIKA{"Laukika"} + LIPAW{"Canúint Lipovaz de Resian"} LUNA1918{"Luna1918"} METELKO{"Aibítir Metelko"} MONOTON{"Aontonach"} + NDYUKA{"Canúint Ndyuka"} + NEDIS{"Canúint Natisone"} NEWFOUND{"Talamh an Éisc"} NJIVA{"Canúint Gniva/Njiva"} NULIK{"Volapük Nua-Aimseartha"} + OSOJS{"Canúint Oseacco/Osojane"} OXENDICT{"Litriú OED"} PAHAWH2{"Pahawh2"} PAHAWH3{"Pahawh3"} PAHAWH4{"Pahawh4"} + PAMAKA{"Canúint Pamaka"} PETR1708{"Petr1708"} PINYIN{"Rómhánú Pinyin"} POLYTON{"Iltonach"} @@ -626,10 +717,13 @@ ga{ SCOTLAND{"Béarla Caighdeánach na hAlban"} SCOUSE{"Béarla Learphoill"} SIMPLE{"Simplí"} + SOLBA{"Canúint Stolvizza/Solbica"} + SOTAV{"Grúpa canúna Sotavento de Kabuverdianu"} SPANGLIS{"Spainglis"} SURMIRAN{"Surmiran"} SURSILV{"Sursilvan"} SUTSILV{"Sutsilv"} + TARASK{"Ortografaíocht Taraskievica"} UCCOR{"Litriú Comhaontaithe"} UCRCOR{"Litriú Comhaontaithe Athbhreithnithe"} ULSTER{"Cúige Uladh"} @@ -640,7 +734,6 @@ ga{ WADEGILE{"Rómhánú Wade-Giles"} XSISTEMO{"Xsistemo"} } - Version{"37"} characterLabelPattern{ all{"{0} — Uile"} category-list{"{0}: {1}"} @@ -658,6 +751,8 @@ ga{ other{"{0} Stríoc"} two{"{0} Stríoc"} } + subscript{"foscript {0}"} + superscript{"forscript {0}"} } codePatterns{ language{"Teanga: {0}"} diff --git a/intl/icu/source/data/lang/gd.txt b/intl/icu/source/data/lang/gd.txt index c0619836ebf6..700fdec8ff09 100644 --- a/intl/icu/source/data/lang/gd.txt +++ b/intl/icu/source/data/lang/gd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gd{ Keys{ calendar{"Mìosachan"} @@ -621,12 +622,16 @@ gd{ en_GB{"Beurla na RA"} en_US{"Beurla nan SA"} } + Languages%variant{ + ckb{"Cùrdais Sorani"} + } Scripts{ Adlm{"Adlam"} Afak{"Afaka"} Aghb{"Albàinis Chabhcasach"} Ahom{"Ahom"} Arab{"Arabais"} + Aran{"Nastaliq"} Armi{"Aramais impireil"} Armn{"Airmeinis"} Avst{"Avestanais"} @@ -647,12 +652,14 @@ gd{ Cari{"Carian"} Cham{"Cham"} Cher{"Cherokee"} + Chrs{"Khwarazm"} Cirt{"Cirth"} Copt{"Coptais"} Cprt{"Cìoprasais"} Cyrl{"Cirilis"} Cyrs{"Cirilis Seann-Slàbhais na h-Eaglaise"} Deva{"Devanagari"} + Diak{"Dives Akuru"} Dogr{"Dogra"} Dsrt{"Deseret"} Dupl{"Gearr-sgrìobhadh Duployé"} @@ -693,6 +700,7 @@ gd{ Khar{"Kharoshthi"} Khmr{"Cmèar"} Khoj{"Khojki"} + Kits{"Litrichean beaga na Khitan"} Knda{"Kannada"} Kore{"Coirèanais"} Kpel{"Kpelle"} @@ -795,6 +803,7 @@ gd{ Wole{"Woleai"} Xpeo{"Seann-Pheirsis"} Xsux{"Gèinn-sgrìobhadh Sumer is Akkad"} + Yezi{"Yezidis"} Yiii{"Yi"} Zanb{"Zanabazar ceàrnagach"} Zinh{"Dìleab"} @@ -891,6 +900,7 @@ gd{ cham{"Àireamhan Cham"} cyrl{"Àireamhan na Cirilise"} deva{"Àireamhan Devanagari"} + diak{"Àireamhan Dives Akuru"} ethi{"Àireamhan Itiopach"} fullwide{"Àireamhan làn-leud"} geor{"Àireamhan na Cairtbheilise"} @@ -971,9 +981,11 @@ gd{ ALALC97{"Ròmanachadh ALA-LC 1997"} ALUKU{"Dual-chainnt Aluku"} AO1990{"Aonta litreachadh na Portagailise 1990"} + ARANES{"Aranais"} AREVELA{"Airmeinis an Ear"} AREVMDA{"Airmeinis an Iar"} ASANTE{"Asante"} + AUVERN{"Auvernhat"} BAKU1926{"Abidil Laideann aonaichte na Turcaise"} BALANKA{"Dual-chainnt Balanka de Anii"} BARLA{"Dual-chainntean Barlavento de Kabuverdianu"} @@ -983,15 +995,23 @@ gd{ BISKE{"Dual-chainnt San Giorgio/Bila"} BOHORIC{"Aibidil Bohorič"} BOONT{"Boontling"} + BORNHOLM{"Bornholmsk"} + CISAUP{"Ogsatanais cios-Ailpeach"} COLB1945{"Aonta litreachaidh eadar a’ Phortagail is Braisil 1945"} CORNU{"Beurla na Còirne"} + CREISS{"Ogsatanais Chroissant"} DAJNKO{"Aibidil Dajnko"} EKAVSK{"Sèirbhis le fuaimneachadh iarach"} EMODENG{"Nua-Bheurla thràth"} FONIPA{"Comharran fuaim-eòlais an IPA"} + FONKIRSH{"Còdachadh Kirshenbaum na h-Aibidil Fuaim-eòlaiche"} FONNAPA{"Aibidil Fhuaim-eòlach Aimeireaga a Tuath"} FONUPA{"Comharran fuaim-eòlais an UPA"} FONXSAMP{"Tar-sgrìobhadh X-SAMPA"} + GASCON{"Ogsatanais Ghascogne"} + GRCLASS{"Nòs-sgrìobhaidh clasaigeach na h-Ogsatanaise"} + GRITAL{"Nòs-sgrìobhaidh Eadailteach na h-Ogsatanaise"} + GRMISTR{"Nòs-sgrìobhaidh Mhistral na h-Ogsatanaise"} HEPBURN{"Ròmanachadh Hepburn"} HOGNORSK{"Høgnorsk"} HSISTEMO{"Roghainn-èiginn stannardach litreachadh na h-Esperanto le h"} @@ -1007,6 +1027,8 @@ gd{ KOCIEWIE{"Kociewie"} KSCOR{"Litreachadh stannardach"} LAUKIKA{"Laukika"} + LEMOSIN{"Ogsatanais Lemosin"} + LENGADOC{"Ogsatanais Lengadoc"} LIPAW{"Dual-chainnt Lipovaz Resia"} LUNA1918{"Litreachadh na Ruisise às dèidh 1917"} METELKO{"Aibidil Metelko"} @@ -1014,6 +1036,7 @@ gd{ NDYUKA{"Dual-chainnt Ndyuka"} NEDIS{"Dual-chainnt Natisone"} NEWFOUND{"Beurla Talamh an Èisg"} + NICARD{"Ogsatanais Nice"} NJIVA{"Dual-chainnt Gniva/Njiva"} NULIK{"Nua-Volapük"} OSOJS{"Dual-chainnt Oseacco/Osojane"} @@ -1026,6 +1049,7 @@ gd{ PINYIN{"Ròmanachadh Pinyin"} POLYTON{"Greugais phoiliotonach"} POSIX{"Coimpiutair"} + PROVENC{"Ogsatanais Phrovence"} PUTER{"Puter"} REVISED{"Litreachadh lèirmheasaichte"} RIGIK{"Volapük chlasaigeach"} @@ -1049,10 +1073,10 @@ gd{ VAIDIKA{"Vaidika"} VALENCIA{"Valencià"} VALLADER{"Vallader"} + VIVARAUP{"Ogsatanais Vivaro-Ailpeach"} WADEGILE{"Ròmanachadh Wade-Giles"} XSISTEMO{"Roghainn-èiginn stannardach litreachadh na h-Esperanto le x"} } - Version{"37"} characterLabelPattern{ all{"{0} – na h-uile"} category-list{"{0}: {1}"} @@ -1069,6 +1093,8 @@ gd{ other{"{0} stràc"} two{"{0} stràc"} } + subscript{"{0} (fo-sgrìobhte)"} + superscript{"{0} os-sgrìobhte"} } codePatterns{ language{"Cànan: {0}"} diff --git a/intl/icu/source/data/lang/gl.txt b/intl/icu/source/data/lang/gl.txt index ec4101f2b236..70b6a5cf606a 100644 --- a/intl/icu/source/data/lang/gl.txt +++ b/intl/icu/source/data/lang/gl.txt @@ -1,16 +1,17 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gl{ Keys{ calendar{"calendario"} cf{"formato de moeda"} - colAlternate{"Ignorar clasificación de símbolos"} - colBackwards{"Clasificación de acentos invertida"} - colCaseFirst{"Orde de maiúsculas/minúsculas"} - colCaseLevel{"Clasificación que distingue entre maiúsculas e minúsculas"} - colNormalization{"Clasificación normalizada"} - colNumeric{"Clasificación numérica"} - colStrength{"Forza de clasificación"} + colAlternate{"ignorar ordenación de símbolos"} + colBackwards{"ordenación de acentos invertida"} + colCaseFirst{"orde de maiúsculas/minúsculas"} + colCaseLevel{"ordenación que distingue entre maiúsculas e minúsculas"} + colNormalization{"ordenación normalizada"} + colNumeric{"ordenación numérica"} + colStrength{"forza de ordenación"} collation{"criterio de ordenación"} currency{"moeda"} hc{"ciclo horario (12 ou 24)"} @@ -441,6 +442,9 @@ gl{ Languages%short{ az{"azerí"} } + Languages%variant{ + ckb{"sorani"} + } Scripts{ Arab{"árabe"} Armn{"armenio"} @@ -634,7 +638,6 @@ gl{ vaii{"Díxitos Vai"} } } - Version{"37"} characterLabelPattern{ all{"{0} (todo)"} category-list{"{0}: {1}"} @@ -649,6 +652,8 @@ gl{ one{"{0} trazo"} other{"{0} trazos"} } + subscript{"{0} subíndice"} + superscript{"{0} superíndice"} } codePatterns{ language{"Idioma: {0}"} diff --git a/intl/icu/source/data/lang/gsw.txt b/intl/icu/source/data/lang/gsw.txt index 01e35d55690b..624e5f4975a7 100644 --- a/intl/icu/source/data/lang/gsw.txt +++ b/intl/icu/source/data/lang/gsw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw{ Keys{ calendar{"Kaländer"} @@ -617,7 +618,6 @@ gsw{ SOLBA{"Solbica-Mundart"} TARASK{"Taraskievica-Rächtschriibig"} } - Version{"37"} codePatterns{ language{"Schpraach: {0}"} script{"Schrift: {0}"} diff --git a/intl/icu/source/data/lang/gu.txt b/intl/icu/source/data/lang/gu.txt index a47263da9027..a1724b79af31 100644 --- a/intl/icu/source/data/lang/gu.txt +++ b/intl/icu/source/data/lang/gu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gu{ Keys{ calendar{"કેલેન્ડર"} @@ -800,8 +801,8 @@ gu{ strict{"ચુસ્ત રેખા વિરામ પ્રકાર"} } m0{ - bgn{"BGN"} - ungegn{"UNGEGN"} + bgn{"US BGN"} + ungegn{"UN GEGN"} } ms{ metric{"દશાંશ પદ્ધતિ"} @@ -855,7 +856,6 @@ gu{ PINYIN{"પિનયિન રોમનાઇઝેશન"} WADEGILE{"વેડ-ગિલ્સ રોમનાઇઝેશન"} } - Version{"37"} characterLabelPattern{ all{"{0} — તમામ"} category-list{"{0}: {1}"} @@ -870,6 +870,8 @@ gu{ one{"{0} સ્ટ્રોક્સ"} other{"{0} સ્ટ્રોક્સ"} } + subscript{"સબસ્ક્રિપ્ટ {0}"} + superscript{"સુપરસ્ક્રિપ્ટ {0}"} } codePatterns{ language{"ભાષા: {0}"} diff --git a/intl/icu/source/data/lang/guz.txt b/intl/icu/source/data/lang/guz.txt index 2f6273103d81..990c7308518b 100644 --- a/intl/icu/source/data/lang/guz.txt +++ b/intl/icu/source/data/lang/guz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml guz{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ guz{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/gv.txt b/intl/icu/source/data/lang/gv.txt index 6aca43bd93d0..64c78db81183 100644 --- a/intl/icu/source/data/lang/gv.txt +++ b/intl/icu/source/data/lang/gv.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gv{ Languages{ gv{"Gaelg"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ha.txt b/intl/icu/source/data/lang/ha.txt index 9e727ef91a60..74c01c777403 100644 --- a/intl/icu/source/data/lang/ha.txt +++ b/intl/icu/source/data/lang/ha.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha{ Keys{ calendar{"Kalanda"} @@ -20,13 +21,13 @@ ha{ ar_001{"Larabci Asali Na Zamani"} as{"Asamisanci"} asa{"Asu"} - ast{"Asturian"} + ast{"Asturia"} az{"Azerbaijanci"} bas{"Basaa"} be{"Belarusanci"} bem{"Bemba"} bez{"Bena"} - bg{"Bulgaranci"} + bg{"Bulgariyanci"} bm{"Bambara"} bn{"Bengali"} bo{"Tibetan"} @@ -39,18 +40,18 @@ ha{ ceb{"Cebuano"} cgg{"Chiga"} chr{"Cherokee"} - ckb{"Kurdish na Tsaka"} + ckb{"Kurdawa ta Tsakiya"} co{"Corsican"} - cs{"Harshen Cak"} + cs{"Cek"} cu{"Church Slavic"} - cy{"Kabilar Welsh"} + cy{"Welsh"} da{"Danish"} dav{"Taita"} de{"Jamusanci"} de_AT{"Jamusanci Ostiriya"} de_CH{"Jamusanci Suwizalan"} dje{"Zarma"} - dsb{"Lower Sorbian"} + dsb{"Sorbianci ta kasa"} dua{"Duala"} dyo{"Jola-Fonyi"} dz{"Dzongkha"} @@ -62,7 +63,7 @@ ha{ en_CA{"Turanci Kanada"} en_GB{"Turanci Biritaniya"} en_US{"Turanci Amirka"} - eo{"Dʼan/ʼYar Kabilar Andalus"} + eo{"Esperanto"} es{"Sifaniyanci"} es_419{"Sifaniyancin Latin Amirka"} es_ES{"Sifaniyanci Turai"} @@ -70,7 +71,7 @@ ha{ et{"Istoniyanci"} eu{"Basque"} ewo{"Ewondo"} - fa{"Parisanci"} + fa{"Farisa"} ff{"Fulah"} fi{"Yaren mutanen Finland"} fil{"Dan Filifin"} @@ -79,8 +80,8 @@ ha{ fr_CA{"Farasanci Kanada"} fr_CH{"Farasanci Suwizalan"} fur{"Friulian"} - fy{"Kʼabilan Firsi"} - ga{"Dan Ailan"} + fy{"Frisian ta Yamma"} + ga{"Dan Irish"} gd{"Kʼabilan Scots Gaelic"} gl{"Bagalike"} gsw{"Jamusanci Swiss"} @@ -88,7 +89,7 @@ ha{ guz{"Gusii"} gv{"Manx"} ha{"Hausa"} - haw{"Hawaiian"} + haw{"Hawaiianci"} he{"Ibrananci"} hi{"Harshen Hindi"} hmn{"Hmong"} @@ -99,14 +100,14 @@ ha{ hy{"Armeniyanci"} ia{"Yare Tsakanin Kasashe"} id{"Harshen Indunusiya"} - ig{"Inyamuranci"} + ig{"Igbo"} ii{"Sichuan Yi"} is{"Yaren mutanen Iceland"} it{"Italiyanci"} ja{"Japananci"} jgo{"Ngomba"} jmc{"Machame"} - jv{"Jabananci"} + jv{"Jafananci"} ka{"Jojiyanci"} kab{"Kabyle"} kam{"Kamba"} @@ -121,7 +122,7 @@ ha{ km{"Harshen Kimar"} kn{"Kannada"} ko{"Harshen Koreya"} - kok{"Konkani"} + kok{"Konkananci"} ks{"Kashmiri"} ksb{"Shambala"} ksf{"Bafia"} @@ -135,24 +136,26 @@ ha{ lg{"Ganda"} lkt{"Lakota"} ln{"Lingala"} - lo{"Laothian"} - lrc{"Northern Luri"} + lo{"Lao"} + lrc{"Arewacin Luri"} lt{"Lituweniyanci"} lu{"Luba-Katanga"} luo{"Luo"} luy{"Luyia"} lv{"Latbiyanci"} + mai{"Maithili"} mas{"Harshen Masai"} mer{"Meru"} mfe{"Morisyen"} - mg{"Malagasy"} + mg{"Malagasi"} mgh{"Makhuwa-Meetto"} mgo{"Metaʼ"} mi{"Maori"} mk{"Dan Masedoniya"} - ml{"Kabilar Maleyalam"} - mn{"Mongolian"} - mr{"Kʼabilan Marathi"} + ml{"Malayalamci"} + mn{"Mongoliyanci"} + mni{"Manipuri"} + mr{"Maratinci"} ms{"Harshen Malai"} mt{"Harshen Maltis"} mua{"Mundang"} @@ -172,28 +175,31 @@ ha{ ny{"Nyanja"} nyn{"Nyankole"} om{"Oromo"} - or{"Oriyanci"} + or{"Odiya"} os{"Ossetic"} pa{"Punjabi"} + pcm{"Pidgin na Najeriya"} pl{"Harshen Polan"} prg{"Ferusawa"} ps{"Pashtanci"} - pt{"Harshen Fotugis"} - pt_PT{"Fotugis kasashen Turai"} + pt{"Harshen Potugis"} + pt_BR{"Harshen Potugis na Birazil"} + pt_PT{"Potugis Ƙasashen Turai"} qu{"Quechua"} rm{"Romansh"} rn{"Rundi"} ro{"Romaniyanci"} rof{"Rombo"} ru{"Rashanci"} - rw{"Kiniyaruwanda"} - rwk{"yaren Rwa"} + rw{"Kinyarwanda"} + rwk{"Rwa"} sa{"Sanskrit"} sah{"Sakha"} saq{"Samburu"} + sat{"Santali"} sbp{"Sangu"} sd{"Sindiyanci"} - se{"Northern Sami"} + se{"Sami ta Arewa"} seh{"Sena"} ses{"Koyraboro Senni"} sg{"Sango"} @@ -205,28 +211,28 @@ ha{ smn{"Inari Sami"} sn{"Shona"} so{"Somalianci"} - sq{"Albanian"} + sq{"Albaniyanci"} sr{"Sabiyan"} st{"Sesotanci"} - su{"Sudananci"} + su{"Harshen Sundanese"} sv{"Harshen Suwedan"} sw{"Harshen Suwahili"} ta{"Tamil"} - te{"Dʼan/ʼYar Kabilar Telug"} + te{"Telugu"} teo{"Teso"} tg{"Tajik"} th{"Thai"} - ti{"Tigriyanci"} + ti{"Tigrinyanci"} tk{"Tukmenistanci"} - to{"Tongan"} + to{"Tonganci"} tr{"Harshen Turkiyya"} tt{"Tatar"} - twq{"Tasawaq"} + twq{"Tasawak"} tzm{"Tamazight na Atlas Tsaka"} ug{"Ugiranci"} uk{"Harshen Yukuren"} und{"Harshen da ba a sani ba"} - ur{"Urdawa"} + ur{"Urdanci"} uz{"Uzbek"} vai{"Vai"} vi{"Harshen Biyetinam"} @@ -237,24 +243,24 @@ ha{ xh{"Bazosa"} xog{"Soga"} yav{"Yangben"} - yi{"Yiddish"} + yi{"Yaren Yiddish"} yo{"Yarbanci"} - yue{"Cantonese"} - zgh{"Standard Moroccan Tamazight"} + yue{"Harshen Cantonese"} + zgh{"Daidaitaccen Moroccan Tamazight"} zh{"Harshen Sinanci"} zh_Hans{"Sauƙaƙaƙƙen Sinanci"} zh_Hant{"Sinanci na gargajiya"} zu{"Harshen Zulu"} - zxx{"Babu abun-ciki na yare"} + zxx{"Babu abun cikin yare"} } Languages%menu{ - yue{"Sinanci"} + yue{"Sinanci, Cantonese"} zh{"Harshen, Sinanci"} } Languages%short{ az{"Azeri"} - en_GB{"Turanci Ingila"} - en_US{"Amirka Turanci"} + en_GB{"Turancin Ingila"} + en_US{"Turancin Amurka"} } Scripts{ Arab{"Larabci"} @@ -269,7 +275,7 @@ ha{ Grek{"Girka"} Gujr{"Gujarati"} Guru{"Gurmukhi"} - Hanb{"Han with Bopomofo"} + Hanb{"Han tare da Bopomofo"} Hang{"Yaren Hangul"} Hani{"Mutanen Han na ƙasar Sin"} Hans{"Sauƙaƙaƙƙen"} @@ -281,8 +287,8 @@ ha{ Kana{"Tsarin Rubutun Katakana"} Khmr{"Yaren Khmer"} Knda{"Yaren Kannada"} - Kore{"Koriya"} - Laoo{"Mutanen Laos"} + Kore{"Rubutun Koriya"} + Laoo{"Yan lao"} Latn{"Latin"} Mlym{"Yaren Malayalam"} Mong{"Na kasar Mongolia"} @@ -292,6 +298,7 @@ ha{ Taml{"Yaren Tamil"} Telu{"Yaren Telugu"} Thaa{"Yaren Thaana"} + Thai{"Thai"} Tibt{"Yaren Tibet"} Zmth{"Alamar Lissafi"} Zsye{"Alama ta hoto"} @@ -306,16 +313,16 @@ ha{ } Types{ calendar{ - buddhist{"Kalanda Buddist"} - chinese{"Kalanda Sin"} - dangi{"Kalanda Dangi"} - ethiopic{"Kalanda Etiofic"} - gregorian{"Gregorian Kalanda"} - hebrew{"Kalanda Ibrananci"} + buddhist{"Kalandar Buddist"} + chinese{"Kalandar Sin"} + dangi{"Kalandar Dangi"} + ethiopic{"Kalandar Etiofic"} + gregorian{"Kalandar Gregoria"} + hebrew{"Kalandar Ibrananci"} islamic{"Kalandar Musulunci"} - iso8601{"Kalanda ISO-8601"} - japanese{"Kalanda Jafan"} - persian{"Kalanda Farisa"} + iso8601{"Kalandar ISO-8601"} + japanese{"Kalandar Jafan"} + persian{"Kalandar Farisa"} roc{"Kalandar kasar Sin"} } cf{ @@ -325,7 +332,7 @@ ha{ collation{ ducet{"Tsarin Rabewa na Dan-maƙalu na Asali"} search{"Bincike na Dalilai-Gamagari"} - standard{"Daidai ta ce Kasà"} + standard{"Daidaitaccen Kasawa"} } hc{ h11{"Tsarin Awowi 12(0–11)"} @@ -344,7 +351,7 @@ ha{ ussystem{"Tsarin Awo na Amurka"} } numbers{ - arab{"Lambobi na larabawan a gabas"} + arab{"Lambobi na Larabawan a Gabas"} arabext{"Fitattun lambobin lissafi na Larabci"} armn{"Lambobin ƙirga na Armenia"} armnlow{"Kananan Haruffan Armenia"} @@ -368,7 +375,7 @@ ha{ khmr{"Lambobin Yaren Khmer"} knda{"Lambobin Yaren Kannada"} laoo{"Lambobin Yaren Lao"} - latn{"Lambobi na yammacin"} + latn{"Lambobi na Yammaci"} mlym{"Lambobin Yaren Malayalam"} mymr{"Lambobin Myanmar"} orya{"Lambobin Yaren Odia"} @@ -381,10 +388,9 @@ ha{ tibt{"Lambobin yaren Tibet"} } } - Version{"37"} codePatterns{ language{"Harshe: {0}"} script{"Rubutu: {0}"} - territory{"Yanki/Sashe: {0}"} + territory{"Yanki: {0}"} } } diff --git a/intl/icu/source/data/lang/ha_NE.txt b/intl/icu/source/data/lang/ha_NE.txt index bb4456b5d39e..4f659101dd13 100644 --- a/intl/icu/source/data/lang/ha_NE.txt +++ b/intl/icu/source/data/lang/ha_NE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha_NE{ Languages{ ar_001{"Larabci Asali Na Zamani"} @@ -9,20 +10,18 @@ ha_NE{ en_CA{"Turanci Kanada"} en_GB{"Turanci Biritaniya"} en_US{"Turanci Amirka"} - eo{"Dʼan/Ƴar Kabilar Andalus"} es_419{"Sifaniyancin Latin Amirka"} es_ES{"Sifaniyanci Turai"} es_MX{"Sifaniyanci Mesiko"} fr_CA{"Farasanci Kanada"} fr_CH{"Farasanci Suwizalan"} - pt_PT{"Fotugis kasashen Turai"} - te{"Dʼan/Ƴar Kabilar Telug"} + pt_BR{"Harshen Potugis na Birazil"} + pt_PT{"Potugis Ƙasashen Turai"} zh_Hans{"Sauƙaƙaƙƙen Sinanci"} zh_Hant{"Sinanci na gargajiya"} } Languages%short{ - en_GB{"Turanci Ingila"} - en_US{"Amirka Turanci"} + en_GB{"Turancin Ingila"} + en_US{"Turancin Amurka"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/haw.txt b/intl/icu/source/data/lang/haw.txt index 9a9168842c8f..33ca3053810a 100644 --- a/intl/icu/source/data/lang/haw.txt +++ b/intl/icu/source/data/lang/haw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml haw{ Languages{ ar{"ʻAlapia"} @@ -40,5 +41,4 @@ haw{ zh_Hans{"Pākē Hoʻomaʻalahi ʻia"} zh_Hant{"Pākē Kuʻuna"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/he.txt b/intl/icu/source/data/lang/he.txt index e73b124be539..fb4ab0543d99 100644 --- a/intl/icu/source/data/lang/he.txt +++ b/intl/icu/source/data/lang/he.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he{ Keys{ calendar{"לוח שנה"} @@ -189,7 +190,7 @@ he{ got{"גותית"} grb{"גרבו"} grc{"יוונית עתיקה"} - gsw{"גרמנית (בשוויץ)"} + gsw{"גרמנית שוויצרית"} gu{"גוג׳ארטי"} guz{"גוסי"} gv{"מאנית"} @@ -793,7 +794,6 @@ he{ SCOTLAND{"אנגלית סקוטית סטנדרטית"} WADEGILE{"ווייד-גיילס, שיטה לתעתוק סינית לאותיות לטיניות"} } - Version{"37"} characterLabelPattern{ all{"{0} - הכל"} category-list{"{0}: {1}"} @@ -810,6 +810,8 @@ he{ other{"{0} משיכות מכחול"} two{"{0} משיכות מכחול"} } + subscript{"כתב תחתי {0}"} + superscript{"כתב עילי {0}"} } codePatterns{ language{"שפה:‏ {0}"} diff --git a/intl/icu/source/data/lang/he_IL.txt b/intl/icu/source/data/lang/he_IL.txt index 71039533a130..21ee915c5e3d 100644 --- a/intl/icu/source/data/lang/he_IL.txt +++ b/intl/icu/source/data/lang/he_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/hi.txt b/intl/icu/source/data/lang/hi.txt index 5a5354349a8f..9c8820a91a76 100644 --- a/intl/icu/source/data/lang/hi.txt +++ b/intl/icu/source/data/lang/hi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi{ Keys{ calendar{"कैलेंडर"} @@ -850,11 +851,12 @@ hi{ AREVELA{"पूर्वी अर्मेनियाई"} MONOTON{"एकस्वरीय"} NJIVA{"जीवा बोली"} + PINYIN{"पिनयिन रोमनाइज़ेशन"} POLYTON{"बहुस्वरीय"} POSIX{"कम्प्यूटर"} REVISED{"संशोधित वर्तनी"} + WADEGILE{"वेड-जाइल्स रोमनाइज़ेशन"} } - Version{"37"} characterLabelPattern{ all{"{0} — सभी"} category-list{"{0}: {1}"} @@ -869,6 +871,8 @@ hi{ one{"{0} स्ट्रोक"} other{"{0} स्ट्रोक"} } + subscript{"सबस्क्रिप्ट {0}"} + superscript{"सुपरस्क्रिप्ट {0}"} } codePatterns{ language{"भाषा: {0}"} diff --git a/intl/icu/source/data/lang/hr.txt b/intl/icu/source/data/lang/hr.txt index 802e3f769949..eeb0b0f40c10 100644 --- a/intl/icu/source/data/lang/hr.txt +++ b/intl/icu/source/data/lang/hr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr{ Keys{ calendar{"kalendar"} @@ -572,6 +573,7 @@ hr{ az{"azerski"} } Languages%variant{ + ckb{"kurdski, soranski"} ps{"puštu"} } Scripts{ @@ -825,10 +827,10 @@ hr{ npinyin{"Numerički"} } hc{ - h11{"12-satni format (0-11)"} - h12{"12-satni format (1-12)"} - h23{"24-satni format (0-23)"} - h24{"24-satni format (1-24)"} + h11{"12-satni format (0 – 11)"} + h12{"12-satni format (0 – 12)"} + h23{"24-satni format (0 – 23)"} + h24{"24-satni format (1 – 24)"} } lb{ loose{"slobodni stil prijeloma retka"} @@ -928,7 +930,6 @@ hr{ VALENCIA{"valencijski"} WADEGILE{"Wade-Giles romanizacija"} } - Version{"37"} characterLabelPattern{ all{"{0} – sve"} category-list{"{0}: {1}"} @@ -944,6 +945,8 @@ hr{ one{"{0} potez"} other{"{0} poteza"} } + subscript{"indeks {0}"} + superscript{"eksponent {0}"} } codePatterns{ language{"Jezik: {0}"} diff --git a/intl/icu/source/data/lang/hsb.txt b/intl/icu/source/data/lang/hsb.txt index 20e538b1740f..84ca59258f4f 100644 --- a/intl/icu/source/data/lang/hsb.txt +++ b/intl/icu/source/data/lang/hsb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hsb{ Keys{ calendar{"protyka"} @@ -374,7 +375,6 @@ hsb{ tibt{"tibetske cyfry"} } } - Version{"37"} codePatterns{ language{"rěč: {0}"} script{"pismo: {0}"} diff --git a/intl/icu/source/data/lang/hu.txt b/intl/icu/source/data/lang/hu.txt index f60495a01125..34409ea9bfa2 100644 --- a/intl/icu/source/data/lang/hu.txt +++ b/intl/icu/source/data/lang/hu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu{ Keys{ calendar{"Naptár"} @@ -42,7 +43,7 @@ hu{ ang{"óangol"} anp{"angika"} ar{"arab"} - ar_001{"modern szabányos arab"} + ar_001{"modern szabványos arab"} arc{"arámi"} arn{"mapucse"} arp{"arapaho"} @@ -563,13 +564,15 @@ hu{ } Languages%menu{ ars{"arab, nedzsdi"} - ckb{"kurd, szoráni"} yue{"kantoni kínai"} zh{"mandarin"} } Languages%short{ az{"azeri"} } + Languages%variant{ + ckb{"kurd, szoráni"} + } Scripts{ Arab{"Arab"} Aran{"Nasztalik"} @@ -916,7 +919,6 @@ hu{ VALLADER{"Vallader"} WADEGILE{"Wade-Giles átírás"} } - Version{"37"} characterLabelPattern{ all{"{0} – összes"} category-list{"{0}: {1}"} @@ -931,6 +933,8 @@ hu{ one{"{0} vonás"} other{"{0} vonás"} } + subscript{"alsó index {0}"} + superscript{"felső index {0}"} } codePatterns{ language{"Nyelv: {0}"} diff --git a/intl/icu/source/data/lang/hy.txt b/intl/icu/source/data/lang/hy.txt index 6149290264a4..751167e337cf 100644 --- a/intl/icu/source/data/lang/hy.txt +++ b/intl/icu/source/data/lang/hy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy{ Keys{ calendar{"օրացույց"} @@ -491,11 +492,15 @@ hy{ zh_Hant{"չինարեն (ավանդական չինարեն)"} } Languages%menu{ + ckb{"քրդերեն (սորանի)"} yue{"չինարեն, կանտոներեն"} } Languages%short{ en_GB{"անգլերեն (Բրիտանիա)"} } + Languages%variant{ + ckb{"սորանի"} + } Scripts{ Arab{"արաբական"} Armn{"հայկական"} @@ -623,7 +628,6 @@ hy{ AREVELA{"արևելահայերեն"} AREVMDA{"արեւմտահայերէն"} } - Version{"37"} characterLabelPattern{ all{"{0} — բոլորը"} category-list{"{0}․ {1}"} @@ -638,6 +642,7 @@ hy{ one{"{0} — Գծեր"} other{"{0} — Գծեր"} } + subscript{"ենթատողային {0}"} } codePatterns{ language{"Լեզու՝ {0}"} diff --git a/intl/icu/source/data/lang/ia.txt b/intl/icu/source/data/lang/ia.txt index 5ab314ac7d48..4afe74d2c127 100644 --- a/intl/icu/source/data/lang/ia.txt +++ b/intl/icu/source/data/lang/ia.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ia{ Keys{ calendar{"calendario"} @@ -532,7 +533,6 @@ ia{ tibt{"cifras tibetan"} } } - Version{"37"} characterLabelPattern{ all{"{0} — toto"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/id.txt b/intl/icu/source/data/lang/id.txt index 9f99464d8800..63489e0e511a 100644 --- a/intl/icu/source/data/lang/id.txt +++ b/intl/icu/source/data/lang/id.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id{ Keys{ calendar{"Kalender"} @@ -174,8 +175,6 @@ id{ fo{"Faroe"} fon{"Fon"} fr{"Prancis"} - fr_CA{"Perancis (Kanada)"} - fr_CH{"Perancis (Swiss)"} frc{"Prancis Cajun"} frm{"Prancis Abad Pertengahan"} fro{"Prancis Kuno"} @@ -564,20 +563,21 @@ id{ zen{"Zenaga"} zgh{"Tamazight Maroko Standar"} zh{"Tionghoa"} - zh_Hans{"Tionghoa (Aksara Sederhana)"} - zh_Hant{"Tionghoa (Aksara Tradisional)"} zu{"Zulu"} zun{"Zuni"} zxx{"Tidak ada konten linguistik"} zza{"Zaza"} } + Languages%long{ + zh_Hans{"Tionghoa Mandarin (Sederhana)"} + zh_Hant{"Tionghoa Mandarin (Tradisional)"} + } Languages%menu{ yue{"Tionghoa, Kanton"} zh{"Tionghoa, Mandarin"} } Languages%short{ az{"Azeri"} - en_GB{"Inggris (U.K.)"} } Languages%variant{ ps{"Pushto"} @@ -610,7 +610,7 @@ id{ Cprt{"Siprus"} Cyrl{"Sirilik"} Cyrs{"Gereja Slavonia Sirilik Lama"} - Deva{"Devanagari"} + Deva{"Dewanagari"} Dsrt{"Deseret"} Dupl{"Stenografi Duployan"} Egyd{"Demotik Mesir"} @@ -745,7 +745,7 @@ id{ Zsym{"Simbol"} Zxxx{"Tidak Tertulis"} Zyyy{"Umum"} - Zzzz{"Skrip Tak Dikenal"} + Zzzz{"Skrip Tidak Dikenal"} } Scripts%stand-alone{ Hans{"Han Sederhana"} @@ -852,7 +852,7 @@ id{ ms{ metric{"Sistem Metrik"} uksystem{"Sistem Pengukuran Imperial"} - ussystem{"Sistem Pengukuran A.S."} + ussystem{"Sistem Pengukuran AS"} } numbers{ arab{"Angka Arab Timur"} @@ -862,7 +862,7 @@ id{ bali{"Angka Bali"} beng{"Angka Bengali"} cham{"Angka Cham"} - deva{"Angka Devanagari"} + deva{"Angka Dewanagari"} ethi{"Angka Etiopia"} finance{"Angka Finansial"} fullwide{"Angka Lebar Penuh"} @@ -954,20 +954,21 @@ id{ VALENCIA{"Valencia"} WADEGILE{"Wade-Giles Latin"} } - Version{"37"} characterLabelPattern{ - all{"{0} — Semua"} + all{"{0} — semua"} category-list{"{0}: {1}"} - compatibility{"{0} — Kompatibilitas"} - enclosed{"{0} — Terlampir"} + compatibility{"{0} — kompatibilitas"} + enclosed{"{0} — terlampir"} extended{"{0} — diperluas"} - historic{"{0} — Historis"} - miscellaneous{"{0} — Lain-lain"} - other{"{0} — Lainnya"} + historic{"{0} — historis"} + miscellaneous{"{0} — lain-lain"} + other{"{0} — lainnya"} scripts{"skrip — {0}"} strokes{ - other{"{0} Goresan"} + other{"{0} goresan"} } + subscript{"subskrip {0}"} + superscript{"superskrip {0}"} } codePatterns{ language{"Bahasa: {0}"} diff --git a/intl/icu/source/data/lang/id_ID.txt b/intl/icu/source/data/lang/id_ID.txt index 20daa236ee75..63f19a21aa60 100644 --- a/intl/icu/source/data/lang/id_ID.txt +++ b/intl/icu/source/data/lang/id_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ig.txt b/intl/icu/source/data/lang/ig.txt index ebea4ecefab4..12ddd25d90c3 100644 --- a/intl/icu/source/data/lang/ig.txt +++ b/intl/icu/source/data/lang/ig.txt @@ -1,81 +1,299 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ig{ + Keys{ + calendar{"Kalịnda"} + cf{"Ụsọrọ egọ"} + collation{"Ụsọrọ Nhazị"} + currency{"Egọ"} + hc{"Ọge ọkịrịkịrị"} + lb{"Akara akanka nkwụsị"} + ms{"Ụsọrọ Mmeshọ"} + numbers{"Nọmba"} + } Languages{ + af{"Afrikaans"} + agq{"Aghem"} ak{"Akan"} am{"Amariikị"} ar{"Arabiikị"} ar_001{"Ụdị Arabiikị nke oge a"} - be{"Belaruusu"} + asa{"Asụ"} + az{"Azerbajanị"} + be{"Belarusianụ"} + bez{"Bena"} bg{"Bọlụgarịa"} + bm{"Bambara"} bn{"Bengali"} + bo{"Tibetan"} + br{"Breton"} + brx{"Bọdọ"} + bs{"Bosnia"} + ca{"Catalan"} + ccp{"Chakma"} + ce{"Chechen"} + ceb{"Cebụanọ"} + chr{"Cheroke"} + co{"Kọsịan"} cs{"Cheekị"} - de{"Asụsụ Jaman"} + cu{"Church slavic"} + cy{"Wesh"} + da{"Danịsh"} + dav{"Taịta"} + de{"Jamanị"} de_AT{"Jaman ndị Austria"} de_CH{"Jaman Izugbe ndị Switzerland"} + dje{"Zarma"} + dsb{"Lowa Sorbịan"} + dua{"Dụala"} + dyo{"Jọla-Fọnyị"} + dz{"Dọzngọka"} + ebu{"Ebụm"} + ee{"Ewe"} el{"Giriikị"} - en{"Asụsụ Bekee"} + en{"Bekee"} en_AU{"Bekee ndị Australia"} en_CA{"Bekee ndị Canada"} + en_GB{"Bekee ndị United Kingdom"} en_US{"Bekee ndị America"} - es{"Asụsụ Spanish"} - es_419{"Asụsụ Spanish ndị Latin America"} - es_ES{"Asụsụ Spanish ndị Europe"} - es_MX{"Asụsụ Spanish ndị Mexico"} - fa{"Peshan"} - fr{"Asụsụ Fụrench"} + eo{"Ndị Esperantọ"} + es{"Spanishi"} + es_419{"Spanishi ndị Latin America"} + es_ES{"Spanishi ndị Europe"} + es_MX{"Spanishi ndị Mexico"} + et{"Ndị Estọnịa"} + eu{"Baskwe"} + ewo{"Ewọndọ"} + fa{"Peshianụ"} + ff{"Fula"} + fi{"Fịnịsh"} + fil{"Fịlịpịnọ"} + fo{"Farọse"} + fr{"Fụrenchị"} fr_CA{"Fụrench ndị Canada"} fr_CH{"Fụrench ndị Switzerland"} - ha{"Awụsa"} - hi{"Hindi"} - hu{"Magịya"} + fur{"Frụlịan"} + fy{"Westan Frịsịan"} + ga{"Ịrịsh"} + gd{"Sụkọtịs Gelị"} + gl{"Galịcịan"} + gsw{"German Swiss"} + gu{"Gụaratị"} + guz{"Gụshị"} + gv{"Mansị"} + ha{"Hausa"} + haw{"Hawaịlịan"} + he{"Hebrew"} + hi{"Hindị"} + hmn{"Hmong"} + hr{"Kọrọtịan"} + hsb{"Ụpa Sọrbịa"} + ht{"Haịtịan ndị Cerọle"} + hu{"Hụngarian"} + ia{"Intalịgụa"} id{"Indonisia"} - ig{"Asụsụ Igbo"} - it{"Asụsụ Italian"} - ja{"Asụsụ Japanese"} + ig{"Igbo"} + ii{"Sịchụayị"} + is{"Icịlandịk"} + it{"Italịanu"} + ja{"Japaniisi"} + jgo{"Ngọmba"} + jmc{"Machame"} jv{"Java"} - km{"Keme, Etiti"} - ko{"Koria"} + ka{"Geọjịan"} + kab{"Kabyle"} + kam{"Kamba"} + kde{"Makọnde"} + kea{"Kabụverdịanụ"} + khq{"Kọyra Chịnị"} + ki{"Kịkụyụ"} + kk{"Kazak"} + kkj{"Kakọ"} + kl{"Kalaalịsụt"} + kln{"Kalenjịn"} + km{"Keme"} + kn{"Kanhada"} + ko{"Korịa"} + kok{"Kọnkanị"} + ks{"Kashmịrị"} + ksb{"Shabala"} + ksf{"Bafịa"} + ksh{"Colognịan"} + ku{"Ndị Kụrdịsh"} + kw{"Kọnịsh"} + ky{"Kyrayz"} + la{"Latịn"} + lag{"Langị"} + lb{"Lụxenbọụgịsh"} + lg{"Ganda"} + ln{"Lịngala"} + lo{"Laọ"} + lrc{"Nọrtụ Lụrị"} + lt{"Lituanian"} + lu{"Lịba-Katanga"} + luy{"Lụyịa"} + lv{"Latviani"} + mai{"Maịtịlị"} + mas{"Masaị"} + mer{"Merụ"} + mfe{"Mọrịsye"} + mg{"Malagasị"} + mgh{"Makụwa Metọ"} + mgo{"Meta"} + mi{"Maọrị"} + mk{"Masedọnịa"} + ml{"Malayalam"} + mn{"Mọngolịan"} + mni{"Manịpụrị"} + mr{"Maratị"} ms{"Maleyi"} - my{"Mịanma"} + mt{"Matịse"} + mua{"Mụdang"} + mul{"Ọtụtụ asụsụ"} + my{"Bụrmese"} + mzn{"Mazandaranị"} + naq{"Nama"} + nb{"Nọrweyịan Bọkmal"} + nd{"Nọrtụ Ndabede"} + nds{"Lowa German"} ne{"Nepali"} - nl{"Dọọch"} + nl{"Dọchị"} + nmg{"Kwasịọ"} + nn{"Nọrweyịan Nynersk"} + nnh{"Nglembọn"} + nus{"Nụer"} + ny{"Nyanja"} + nyn{"Nyakọle"} + om{"Ọromo"} + or{"Ọdịa"} + os{"Osetik"} pa{"Punjabi"} + pcm{"Pidgịn"} pl{"Poliishi"} - pt{"Asụsụ Portuguese"} - pt_BR{"Asụsụ Portuguese ndị Brazil"} + prg{"Prụssịan"} + ps{"Pashọ"} + pt{"Pọrtụgụese"} + pt_BR{"Pọrtụgụese ndị Brazil"} pt_PT{"Asụsụ Portuguese ndị Europe"} - ro{"Rumenia"} - ru{"Asụsụ Russian"} - rw{"Rụwanda"} + qu{"Qụechụa"} + rm{"Rọmansị"} + rn{"Rụndị"} + ro{"Romania"} + rof{"Rọmbọ"} + ru{"Rọshian"} + rw{"Kinyarwanda"} + rwk{"Rwa"} + sa{"Sansịkịt"} + sah{"Saka"} + saq{"Sambụrụ"} + sat{"Santalị"} + sbp{"Sangụ"} + sd{"Sịndh"} + se{"Nọrtan Samị"} + seh{"Sena"} + ses{"Kọyraboro Senị"} + sg{"Sangọ"} + shi{"Tachịkịt"} + si{"Sinhala"} + sk{"Slova"} + sl{"Slovịan"} + sm{"Samọa"} + smn{"Inarị Samị"} + sn{"Shọna"} so{"Somali"} + sr{"Sebịan"} + st{"Sọụth Soto"} sv{"Sụwidiishi"} - ta{"Tamụlụ"} + ta{"Tamil"} + te{"Telụgụ"} + teo{"Tesọ"} + tg{"Tajịk"} th{"Taị"} + ti{"Tịgrịnya"} + tk{"Turkịs"} + to{"Tọngan"} tr{"Tọkiishi"} + tt{"Tata"} + twq{"Tasawa"} + ug{"Ụyghụr"} uk{"Ukureenị"} und{"Asụsụ amaghị"} - ur{"Urudu"} - vi{"Viyetịnaamụ"} + ur{"Urdụ"} + uz{"Ụzbek"} + vai{"Val"} + vi{"Vietnamisi"} + vo{"Volapụ"} + vun{"Vụnjọ"} + wae{"Wasa"} + wo{"Wolọf"} + xh{"Xhọsa"} + xog{"Sọga"} + yav{"Yangben"} + yi{"Yịdịsh"} yo{"Yoruba"} - zh{"Mandarịịnị"} + yue{"Katọnịse"} + zh{"Chainisi"} zh_Hans{"Asụsụ Chinese dị mfe"} zh_Hant{"Asụsụ Chinese Izugbe"} zu{"Zulu"} + zxx{"Ndị ọzọ abụghị asụsụ"} + } + Languages%menu{ + ckb{"Kurdish ọsote"} + yue{"Chinese,Cantonese"} } Languages%short{ + az{"Azeri"} en_GB{"Bekee ndị UK"} en_US{"Bekee ndị US"} } + Languages%variant{ + ckb{"Kurdish ọzọ"} + } Scripts{ Arab{"Mkpụrụ Okwu Arabic"} + Armn{"Mkpụrụ ọkwụ Armenịan"} + Beng{"Mkpụrụ ọkwụ Bangla"} + Bopo{"Mkpụrụ ọkwụ Bopomofo"} + Brai{"Braịlle"} Cyrl{"Mkpụrụ Okwu Cyrillic"} + Deva{"Mkpụrụ ọkwụ Devangarị"} + Ethi{"Mkpụrụ ọkwụ Etọpịa"} + Geor{"Mkpụrụ ọkwụ Geọjịan"} + Grek{"Mkpụrụ ọkwụ grịk"} + Gujr{"Mkpụrụ ọkwụ Gụjaratị"} + Guru{"Mkpụrụ ọkwụ Gụrmụkị"} + Hanb{"Han na Bopomofo"} + Hang{"Mkpụrụ ọkwụ Hangụl"} + Hani{"Mkpụrụ ọkwụ Han"} Hans{"Nke dị mfe"} Hant{"Izugbe"} + Hebr{"Mkpụrụ ọkwụ Hebrew"} + Hira{"Mkpụrụ okwụ Hịragana"} + Hrkt{"mkpụrụ ọkwụ Japanịsị"} + Jamo{"Jamọ"} Jpan{"Japanese"} + Kana{"Katakana"} + Khmr{"Khmer"} + Knda{"Kannaada"} Kore{"Korea"} + Laoo{"Laọ"} Latn{"Latin"} + Mlym{"Malayala"} + Mong{"Mọngọlịan"} + Mymr{"Myanmar"} + Orya{"Ọdịa"} + Sinh{"Sinhala"} + Taml{"Tamịl"} + Telu{"Telụgụ"} + Thaa{"Taa"} + Tibt{"Tịbeta"} + Zmth{"Mkpụrụ ọkwụ Mgbakọ"} + Zsye{"Emojị"} + Zsym{"Akara"} Zxxx{"Edeghị ede"} + Zyyy{"kọmọn"} Zzzz{"Mkpụrụ okwu amaghị"} } Scripts%stand-alone{ @@ -84,17 +302,80 @@ ig{ } Types{ calendar{ + buddhist{"Kalịnda Bụddịst"} + chinese{"Kalịnda Chinese"} + dangi{"Kalịnda Dang"} + ethiopic{"Kalịnda Etopịa"} gregorian{"Kalenda Gregory"} + hebrew{"Kalịnda Hebrew"} + islamic{"Kalịnda Islam"} iso8601{"Kalenda ISO-8601"} + japanese{"Kalịnda Japanese"} + persian{"Kalịnda Persian"} + roc{"Kalịnda repụblic nke China"} + } + cf{ + account{"Ụsọrọ akantụ egọ"} + standard{"Ụsọrọ egọ nzụgbe"} } collation{ + search{"Ọchụchụ nịle"} standard{"Usoro Nhazi"} } + hc{ + h11{"Ụsọrọ Ọge ọkịrịkịri 12"} + h12{"Ụsọrọ Oge okịrịkịri 12"} + h23{"Ụsọrọ Oge okịrịkịrị 24"} + h24{"Ụsọrọ Ọge okịrịkịrị 24"} + } + lb{ + loose{"Akara akanka nkwụsị esịghị ịke"} + normal{"Akara akanka nkwụsị kwesịrị"} + strict{"Akara akanka nkwụsị sịrị ịke"} + } + ms{ + metric{"Ụsọrọ Metịrịk"} + uksystem{"Ụsọrọ Mmeshọ ịmperịa"} + ussystem{"Ụsọrọ Mmeshọ US"} + } numbers{ + arab{"Ọnụ ọgụgụ Arab na Indị"} + arabext{"Ọnụ ọgụgụ Arab na Indị agbatịrị"} + armn{"Ọnụ ọgụgụ Armenịan"} + armnlow{"ọbere ọnụ ọgụgụ Armenịan"} + beng{"Ọnụ ọgụgụ Bang"} + deva{"Ọnụ ọgụgụ Devanagarị"} + ethi{"Ọnụ ọgụgụ Etọpịa"} + fullwide{"Ọnụ ọgụgụ ọbọsara"} + geor{"Ọnụ ọgụgụ Geọjịan"} + grek{"Ọnụ ọgụgụ Greek"} + greklow{"Ọbere ọnụ ọgụgụ Greek"} + gujr{"Ọnụ ọgụgụ Gụjaratị"} + guru{"Onụ ọgụgụ Gụmụkh"} + hanidec{"Ọnụ ọgụgụ ntụpọ Chịnese"} + hans{"Ọnụ ọgụgụ mfe Chịnese"} + hansfin{"Ọnụ ọgụgụ akantụ mfe nke Chinese"} + hant{"Ọnụ ọgụgụ ọdinala chinese"} + hantfin{"Ọnụ ọgụgụ akantụ ọdịnala Chinese"} + hebr{"Ọnụ ọgụgụ Hebrew"} + jpan{"Ọnụ ọgụgụ Japanese"} + jpanfin{"Ọnụ ọgụgụ akantụ Japanese"} + khmr{"Ọnụ ọgụgụ Khmer"} + knda{"Ọnụ ọgụgụ Kanada"} + laoo{"Ọnụ ọgụgụ Laọ"} latn{"Ọnụ Ọgụgụ Mpaghara Ọdịda Anyanwụ"} + mlym{"Ọnụ ọgụgụ Malayala"} + mymr{"Ọnụ ọgụgụ Myamar"} + orya{"Ọnụ ọgụgụ Ọdịa"} + roman{"Ọnụ ọgụgụ Roman"} + romanlow{"Ọbere Ọnụ ọgụgụ Roman"} + taml{"Ọnụ ọgụgụ ọdịnala Tamịl"} + tamldec{"Ọnụ ọgụgụ Tamị"} + telu{"Ọnụ ọgụgụ Telụgụ"} + thai{"Ọnụ ọgụgụ Taị"} + tibt{"Ọnụ ọgụgụ Tịbeta"} } } - Version{"37"} codePatterns{ language{"Asụsụ: {0}"} script{"Mkpụrụ Okwu: {0}"} diff --git a/intl/icu/source/data/lang/ii.txt b/intl/icu/source/data/lang/ii.txt index fdabae7696f5..ecf8c46d8522 100644 --- a/intl/icu/source/data/lang/ii.txt +++ b/intl/icu/source/data/lang/ii.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ii{ Languages{ de{"ꄓꇩꉙ"} @@ -33,7 +34,6 @@ ii{ islamic{"ꑳꌦꇂꑍꉖ"} } } - Version{"37"} codePatterns{ language{"ꅇꉙ: {0}"} script{"ꇇꁱ: {0}"} diff --git a/intl/icu/source/data/lang/in.txt b/intl/icu/source/data/lang/in.txt index 02335238ad02..e2df1690e399 100644 --- a/intl/icu/source/data/lang/in.txt +++ b/intl/icu/source/data/lang/in.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in{ "%%ALIAS"{"id"} } diff --git a/intl/icu/source/data/lang/in_ID.txt b/intl/icu/source/data/lang/in_ID.txt index acec72c6e987..03f238793675 100644 --- a/intl/icu/source/data/lang/in_ID.txt +++ b/intl/icu/source/data/lang/in_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in_ID{ "%%ALIAS"{"id_ID"} } diff --git a/intl/icu/source/data/lang/is.txt b/intl/icu/source/data/lang/is.txt index 1887c3485150..6eb2dccc71e1 100644 --- a/intl/icu/source/data/lang/is.txt +++ b/intl/icu/source/data/lang/is.txt @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is{ Keys{ - calendar{"Dagatal"} + calendar{"Tímatal"} cf{"Gjaldmiðilssnið"} colAlternate{"Röðun óháð táknum"} colBackwards{"Röðun með viðsnúnum áherslum"} @@ -182,7 +183,7 @@ is{ gd{"skosk gelíska"} gez{"gís"} gil{"gilberska"} - gl{"galíanska"} + gl{"galisíska"} gmh{"miðháþýska"} gn{"gvaraní"} goh{"fornháþýska"} @@ -212,7 +213,7 @@ is{ hup{"húpa"} hy{"armenska"} hz{"hereró"} - ia{"alþjóðatunga"} + ia{"interlingua"} iba{"íban"} ibb{"ibibio"} id{"indónesíska"} @@ -336,7 +337,7 @@ is{ mus{"krík"} mwl{"mirandesíska"} mwr{"marvarí"} - my{"burmneska"} + my{"búrmneska"} myv{"ersja"} mzn{"masanderaní"} na{"nárúska"} @@ -615,22 +616,22 @@ is{ } Types{ calendar{ - buddhist{"Búddískt dagatal"} - chinese{"Kínverskt dagatal"} + buddhist{"Búddískt tímatal"} + chinese{"Kínversk tímatal"} coptic{"Koptískt tímatal"} - dangi{"Dangi dagatal"} - ethiopic{"Eþíópískt dagatal"} + dangi{"Dangi tímatal"} + ethiopic{"Eþíópískt tímatal"} ethiopic-amete-alem{"Eþíópískt ‘amete alem’ tímatal"} - gregorian{"Gregorískt dagatal"} - hebrew{"Hebreskt dagatal"} + gregorian{"Gregorískt tímatal"} + hebrew{"Hebreskt tímatal"} indian{"indverskt dagatal"} - islamic{"Íslamskt dagatal"} + islamic{"Íslamskt tímatal"} islamic-civil{"Íslamskt borgaradagatal"} islamic-umalqura{"Íslamskt dagatal (Umm al-Qura)"} - iso8601{"ISO-8601 dagatal"} - japanese{"Japanskt dagatal"} - persian{"Persneskt dagatal"} - roc{"Minguo dagatal"} + iso8601{"ISO-8601 tímatal"} + japanese{"Japanskt tímatal"} + persian{"Persneskt tímatal"} + roc{"Minguo tímatal"} } cf{ account{"Bókhaldsgjaldmiðill"} @@ -755,7 +756,6 @@ is{ vaii{"Vai-tölustafir"} } } - Version{"37"} characterLabelPattern{ all{"{0} — allt"} category-list{"{0}: {1}"} @@ -770,6 +770,8 @@ is{ one{"{0} slag"} other{"{0} slög"} } + subscript{"hnéletur {0}"} + superscript{"brjóstletur {0}"} } codePatterns{ language{"tungumál: {0}"} diff --git a/intl/icu/source/data/lang/it.txt b/intl/icu/source/data/lang/it.txt index 488ab932ad06..9b5163e1feb6 100644 --- a/intl/icu/source/data/lang/it.txt +++ b/intl/icu/source/data/lang/it.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ Keys{ calendar{"Calendario"} @@ -132,7 +133,7 @@ it{ crs{"creolo delle Seychelles"} cs{"ceco"} csb{"kashubian"} - cu{"slavo della Chiesa"} + cu{"slavo ecclesiastico"} cv{"ciuvascio"} cy{"gallese"} da{"danese"} @@ -244,7 +245,7 @@ it{ hr{"croato"} hsb{"alto sorabo"} hsn{"xiang"} - ht{"haitiano"} + ht{"creolo haitiano"} hu{"ungherese"} hup{"hupa"} hy{"armeno"} @@ -482,7 +483,7 @@ it{ rwk{"rwa"} sa{"sanscrito"} sad{"sandawe"} - sah{"yakut"} + sah{"sacha"} sam{"aramaico samaritano"} saq{"samburu"} sas{"sasak"} @@ -639,6 +640,8 @@ it{ zh_Hant{"cinese mandarino tradizionale"} } Languages%menu{ + ckb{"curdo centrale"} + yue{"cinese (cantonese)"} zh{"cinese (mandarino)"} } Languages%short{ @@ -647,6 +650,7 @@ it{ } Scripts{ Afak{"afaka"} + Aghb{"albanese caucasico"} Arab{"arabo"} Aran{"nastaliq"} Armi{"aramaico imperiale"} @@ -688,7 +692,7 @@ it{ Grek{"greco"} Gujr{"gujarati"} Guru{"gurmukhi"} - Hanb{"hanb"} + Hanb{"han, bopomofo"} Hang{"hangul"} Hani{"han"} Hano{"hanunoo"} @@ -1028,7 +1032,6 @@ it{ VALENCIA{"valenziano"} WADEGILE{"romanizzazione Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — Tutto"} category-list{"{0}: {1}"} @@ -1043,6 +1046,8 @@ it{ one{"{0} tratto"} other{"{0} tratti"} } + subscript{"pedice {0}"} + superscript{"apice {0}"} } codePatterns{ language{"Lingua: {0}"} diff --git a/intl/icu/source/data/lang/iw.txt b/intl/icu/source/data/lang/iw.txt index d59865d1cdb7..4aa2f62d2681 100644 --- a/intl/icu/source/data/lang/iw.txt +++ b/intl/icu/source/data/lang/iw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw{ "%%ALIAS"{"he"} } diff --git a/intl/icu/source/data/lang/iw_IL.txt b/intl/icu/source/data/lang/iw_IL.txt index cf1666a681ee..984aefd0f82d 100644 --- a/intl/icu/source/data/lang/iw_IL.txt +++ b/intl/icu/source/data/lang/iw_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw_IL{ "%%ALIAS"{"he_IL"} } diff --git a/intl/icu/source/data/lang/ja.txt b/intl/icu/source/data/lang/ja.txt index d4b098109323..39f3df7c7c5c 100644 --- a/intl/icu/source/data/lang/ja.txt +++ b/intl/icu/source/data/lang/ja.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ Keys{ calendar{"暦法"} @@ -408,7 +409,7 @@ ja{ niu{"ニウーエイ語"} njo{"アオ・ナガ語"} nl{"オランダ語"} - nl_BE{"フレミッシュ語"} + nl_BE{"フラマン語"} nmg{"クワシオ語"} nn{"ノルウェー語(ニーノシュク)"} nnh{"ンジエムブーン語"} @@ -1058,7 +1059,6 @@ ja{ VALLADER{"ヴァラダー"} WADEGILE{"ウェード式ローマ字表記法"} } - Version{"37"} characterLabelPattern{ all{"{0} — すべて"} category-list{"{0}: {1}"} @@ -1072,6 +1072,8 @@ ja{ strokes{ other{"{0} 画"} } + subscript{"下付き文字 {0}"} + superscript{"上付き文字 {0}"} } codePatterns{ language{"言語: {0}"} diff --git a/intl/icu/source/data/lang/jgo.txt b/intl/icu/source/data/lang/jgo.txt index c371a2e169be..61b43a87e7a6 100644 --- a/intl/icu/source/data/lang/jgo.txt +++ b/intl/icu/source/data/lang/jgo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jgo{ Keys{ currency{"Ŋkáp"} @@ -28,5 +29,4 @@ jgo{ latn{"pɛnɔ́mba"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/jmc.txt b/intl/icu/source/data/lang/jmc.txt index 5014fa3b00b2..7b6081ac212d 100644 --- a/intl/icu/source/data/lang/jmc.txt +++ b/intl/icu/source/data/lang/jmc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jmc{ Languages{ ak{"Kiakanyi"} @@ -48,5 +49,4 @@ jmc{ zh{"Kyichina"} zu{"Kyizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/jv.txt b/intl/icu/source/data/lang/jv.txt index ac1298525f3e..4a7f24cc17ea 100644 --- a/intl/icu/source/data/lang/jv.txt +++ b/intl/icu/source/data/lang/jv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jv{ Keys{ calendar{"Tanggalan"} @@ -134,6 +135,7 @@ jv{ luo{"Luo"} luy{"Luyia"} lv{"Latvia"} + mai{"Maithili"} mas{"Masai"} mer{"Meru"} mfe{"Morisyen"} @@ -144,6 +146,7 @@ jv{ mk{"Makedonia"} ml{"Malayalam"} mn{"Mongolia"} + mni{"Manipuri"} mr{"Marathi"} ms{"Melayu"} mt{"Malta"} @@ -168,6 +171,7 @@ jv{ or{"Odia"} os{"Ossetia"} pa{"Punjab"} + pcm{"Nigeria Pidgin"} pl{"Polandia"} prg{"Prusia"} ps{"Pashto"} @@ -183,6 +187,7 @@ jv{ sa{"Sanskerta"} sah{"Sakha"} saq{"Samburu"} + sat{"Santali"} sbp{"Sangu"} sd{"Sindhi"} se{"Sami Sisih Lor"} @@ -234,6 +239,7 @@ jv{ yue{"Kanton"} zgh{"Tamazight Moroko Standar"} zh{"Tyonghwa"} + zh_Hans{"Tyonghwa (Ringkes)"} zh_Hant{"Tyonghwa (Tradisional)"} zu{"Zulu"} zxx{"Konten tanpa linguistik"} @@ -376,7 +382,6 @@ jv{ tibt{"Digit Tibet"} } } - Version{"37"} characterLabelPattern{ all{"{0} — kabeh"} compatibility{"{0} — kompatibilitas"} @@ -389,6 +394,8 @@ jv{ strokes{ other{"{0} tunyuk"} } + subscript{"tika ngisor {0}"} + superscript{"tika dhuwur {0}"} } codePatterns{ language{"Basa: {0}"} diff --git a/intl/icu/source/data/lang/ka.txt b/intl/icu/source/data/lang/ka.txt index 4c1086b87a68..27bcf301dfa8 100644 --- a/intl/icu/source/data/lang/ka.txt +++ b/intl/icu/source/data/lang/ka.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka{ Keys{ calendar{"კალენდარი"} @@ -48,7 +49,7 @@ ka{ ban{"ბალინური"} bas{"ბასა"} bax{"ბამუნი"} - be{"ბელორუსული"} + be{"ბელარუსული"} bej{"ბეჯა"} bem{"ბემბა"} bez{"ბენა"} @@ -501,7 +502,7 @@ ka{ zh{"ჩინური, მანდარინი"} } Languages%short{ - en_GB{"გართ. სამ. ინგლისური"} + en_GB{"ინგლისური (გაერთ. სამეფო)"} en_US{"აშშ ინგლისური"} } Scripts{ @@ -743,7 +744,6 @@ ka{ tibt{"ტიბეტური ციფრები"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ყველა"} category-list{"{0}: {1}"} @@ -758,6 +758,8 @@ ka{ one{"{0} შტრიხი"} other{"{0} შტრიხი"} } + subscript{"ქვედა ინდექსი {0}"} + superscript{"ზედა ინდექსი {0}"} } codePatterns{ language{"ენა: {0}"} diff --git a/intl/icu/source/data/lang/kab.txt b/intl/icu/source/data/lang/kab.txt index d227c5890586..1239f64fda47 100644 --- a/intl/icu/source/data/lang/kab.txt +++ b/intl/icu/source/data/lang/kab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kab{ Languages{ ak{"Takanit"} @@ -48,5 +49,4 @@ kab{ zh{"Tacinwat, Tamundarint"} zu{"Tazulut"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/kam.txt b/intl/icu/source/data/lang/kam.txt index 368d8094f774..03202bc978c3 100644 --- a/intl/icu/source/data/lang/kam.txt +++ b/intl/icu/source/data/lang/kam.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kam{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ kam{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/kde.txt b/intl/icu/source/data/lang/kde.txt index b2358b9fbd9a..25c586fe02aa 100644 --- a/intl/icu/source/data/lang/kde.txt +++ b/intl/icu/source/data/lang/kde.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kde{ Languages{ ak{"Chakan"} @@ -48,5 +49,4 @@ kde{ zh{"Chichina"} zu{"Chizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/kea.txt b/intl/icu/source/data/lang/kea.txt index 65e8aa20c44c..25403be41253 100644 --- a/intl/icu/source/data/lang/kea.txt +++ b/intl/icu/source/data/lang/kea.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kea{ Keys{ calendar{"Kalendáriu"} @@ -91,7 +92,7 @@ kea{ gag{"gagauz"} gl{"galegu"} gn{"guarani"} - gsw{"alemon suísu"} + gsw{"alemon suisu"} gu{"gujarati"} guz{"gusii"} gv{"manks"} @@ -209,7 +210,7 @@ kea{ to{"tonganes"} tr{"turku"} tt{"tatar"} - tzm{"tamazait di Atlas Sentral"} + tzm{"tamaziti di Atlas Sentral"} ug{"uigur"} uk{"ukranianu"} und{"língua diskonxedu"} @@ -290,11 +291,17 @@ kea{ calendar{ buddhist{"Kalendáriu budista"} chinese{"Kalendáriu xines"} + coptic{"Kalendáriu kopta"} dangi{"Kalendáriu dangi"} ethiopic{"Kalendáriu etiópiku"} + ethiopic-amete-alem{"Kalendáriu etíopi ameti alem"} gregorian{"Kalendáriu Gregorianu"} hebrew{"Kalendáriu ebraiku"} + indian{"Kalendáriu nasional indianu"} islamic{"Kalendáriu islámiku"} + islamic-civil{"Kalendáriu islámiku (sivil)"} + islamic-tbla{"Kalendáriu islámiku (astronómiku)"} + islamic-umalqura{"Kalendáriu islámiku (Umm al-Qura)"} iso8601{"Kalendáriu ISO-8601"} japanese{"Kalendáriu japones"} persian{"Kalendáriu persa"} @@ -329,7 +336,6 @@ kea{ latn{"Nunbru osidental"} } } - Version{"37"} codePatterns{ language{"Lingua: {0}"} script{"Skrita: {0}"} diff --git a/intl/icu/source/data/lang/khq.txt b/intl/icu/source/data/lang/khq.txt index 3c15c0d9682f..0efad2242923 100644 --- a/intl/icu/source/data/lang/khq.txt +++ b/intl/icu/source/data/lang/khq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml khq{ Languages{ ak{"Akan senni"} @@ -48,5 +49,4 @@ khq{ zh{"Sinuwa senni, Mandareŋ"} zu{"Julu senni"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ki.txt b/intl/icu/source/data/lang/ki.txt index 536d4a6eb3ff..c0307f192021 100644 --- a/intl/icu/source/data/lang/ki.txt +++ b/intl/icu/source/data/lang/ki.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ki{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ ki{ zh{"Kĩcaina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/kk.txt b/intl/icu/source/data/lang/kk.txt index 8b633a175023..afdff08d9dde 100644 --- a/intl/icu/source/data/lang/kk.txt +++ b/intl/icu/source/data/lang/kk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kk{ Keys{ calendar{"Күнтізбе"} @@ -550,7 +551,6 @@ kk{ tibt{"Тибет сандары"} } } - Version{"37"} characterLabelPattern{ all{"{0} — барлығы"} category-list{"{0}: {1}"} @@ -565,6 +565,8 @@ kk{ one{"{0} сызық"} other{"{0} сызық"} } + subscript{"жол асты таңба {0}"} + superscript{"жол үсті таңба {0}"} } codePatterns{ language{"Тіл: {0}"} diff --git a/intl/icu/source/data/lang/kkj.txt b/intl/icu/source/data/lang/kkj.txt index 9c1344a43812..b0c551f18bd1 100644 --- a/intl/icu/source/data/lang/kkj.txt +++ b/intl/icu/source/data/lang/kkj.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kkj{ Languages{ en{"yaman"} fr{"numbu buy"} kkj{"kakɔ"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/kl.txt b/intl/icu/source/data/lang/kl.txt index 73127a9a8b73..fe2425055dc5 100644 --- a/intl/icu/source/data/lang/kl.txt +++ b/intl/icu/source/data/lang/kl.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl{ Languages{ kl{"kalaallisut"} } - Version{"37"} localeDisplayPattern{ keyTypePattern{"{0}: {1}"} pattern{"{0} ({1})"} diff --git a/intl/icu/source/data/lang/kln.txt b/intl/icu/source/data/lang/kln.txt index 001124d58f27..622f20f7a3eb 100644 --- a/intl/icu/source/data/lang/kln.txt +++ b/intl/icu/source/data/lang/kln.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kln{ Languages{ ak{"kutitab Aka"} @@ -48,5 +49,4 @@ kln{ zh{"kutitab China"} zu{"kutitab Zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/km.txt b/intl/icu/source/data/lang/km.txt index ce2cc279cfae..75758369b3f9 100644 --- a/intl/icu/source/data/lang/km.txt +++ b/intl/icu/source/data/lang/km.txt @@ -1,11 +1,12 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km{ Keys{ calendar{"ប្រតិទិន"} - cf{"ទម្រង់រូបិយប័ណ្ណ"} + cf{"ទម្រង់រូបិយបណ្ណ"} collation{"លំដាប់​តម្រៀប"} - currency{"រូបិយប័ណ្ណ"} + currency{"រូបិយបណ្ណ"} hc{"វដ្តម៉ោង (12 vs 24)"} lb{"របៀបចុះបន្ទាត់"} ms{"ប្រព័ន្ធវាស់វែង"} @@ -44,7 +45,7 @@ km{ be{"បេឡារុស"} bem{"បេមបា"} bez{"បេណា"} - bg{"ប៊ុលហ្គារី"} + bg{"ប៊ុលហ្ការី"} bgn{"បាឡូជីខាងលិច"} bho{"បូចពូរី"} bi{"ប៊ីស្លាម៉ា"} @@ -53,7 +54,7 @@ km{ bm{"បាម្បារា"} bn{"បង់ក្លាដែស"} bo{"ទីបេ"} - br{"ប្រីស្តុន"} + br{"ប្រ៊ីស្តុន"} brx{"បូដូ"} bs{"បូស្នី"} bug{"ប៊ុកហ្គី"} @@ -62,7 +63,7 @@ km{ ccp{"ចាក់ម៉ា"} ce{"ឈីឆេន"} ceb{"ស៊ីប៊ូអាណូ"} - cgg{"ឈីហ្គា"} + cgg{"ឈីហ្កា"} ch{"ឈីម៉ូរ៉ូ"} chk{"ឈូគី"} chm{"ម៉ារី"} @@ -73,7 +74,7 @@ km{ co{"កូស៊ីខាន"} crs{"សេសេលវ៉ាគ្រីអូល (បារាំង)"} cs{"ឆែក"} - cu{"ឈឺជស្លាវិក"} + cu{"ឈើជស្លាវិក"} cv{"ឈូវ៉ាស"} cy{"វេល"} da{"ដាណឺម៉ាក"} @@ -81,7 +82,6 @@ km{ dar{"ដាចវ៉ា"} dav{"តៃតា"} de{"អាល្លឺម៉ង់"} - de_CH{"អាល្លឺម៉ង់ (ស្វ៊ីស)"} dgr{"ដូគ្រីប"} dje{"ហ្សាម៉ា"} dsb{"សូប៊ីក្រោម"} @@ -106,12 +106,11 @@ km{ fa_AF{"ដារី"} ff{"ហ្វ៊ូឡា"} fi{"ហ្វាំងឡង់"} - fil{"ហ្វីលីពីន"} + fil{"ហ្វ៊ីលីពីន"} fj{"ហ៊្វីជី"} fo{"ហ្វារូស"} fon{"ហ្វ៊ុន"} fr{"បារាំង"} - fr_CH{"បារាំង (ស្វ៊ីស)"} fur{"ហ៊្វ្រូលាន"} fy{"ហ្វ្រីស៊ានខាងលិច"} ga{"អៀរឡង់"} @@ -120,16 +119,16 @@ km{ gd{"ស្កុតហ្កែលិគ"} gez{"ជីស"} gil{"ហ្គីលបឺទ"} - gl{"ហ្គាលីស្យាន"} + gl{"ហ្កាលីស្យាន"} gn{"ហ្គូរ៉ានី"} gor{"ហ្គូរុនតាឡូ"} gsw{"អាល្លឺម៉ង (ស្វីស)"} - gu{"ហ្កុយ៉ារាទី"} + gu{"ហ្គុយ៉ារ៉ាទី"} guz{"ហ្គូស៊ី"} gv{"មេន"} gwi{"ហ្គីចឈីន"} ha{"ហូសា"} - haw{"ហាវៃ"} + haw{"ហាវ៉ៃ"} he{"ហេប្រឺ"} hi{"ហិណ្ឌី"} hil{"ហ៊ីលីហ្គេណុន"} @@ -141,7 +140,7 @@ km{ hup{"ហ៊ូប៉ា"} hy{"អាមេនី"} hz{"ហឺរីរ៉ូ"} - ia{"អីនធើលីង"} + ia{"អ៊ីនធើលីង"} iba{"អ៊ីបាន"} ibb{"អាយប៊ីប៊ីអូ"} id{"ឥណ្ឌូណេស៊ី"} @@ -201,7 +200,7 @@ km{ lag{"ឡានហ្គី"} lb{"លុចសំបួ"} lez{"ឡេសហ្គី"} - lg{"ហ្គាន់ដា"} + lg{"ហ្កាន់ដា"} li{"លីមប៊ូស"} lkt{"ឡាកូតា"} ln{"លីនកាឡា"} @@ -288,6 +287,7 @@ km{ prg{"ព្រូស៊ាន"} ps{"បាស្តូ"} pt{"ព័រទុយហ្គាល់"} + pt_BR{"ព័រទុយហ្កាល់ (ប្រេស៊ីល)"} pt_PT{"ព័រទុយហ្គាល់ (អឺរ៉ុប)"} qu{"ហ្គិកឈួ"} quc{"គីចឈី"} @@ -328,7 +328,7 @@ km{ sm{"សាម័រ"} sma{"សាមីខាងត្បូង"} smj{"លូលីសាមី"} - smn{"អ៊ីណារីសាម៉ី"} + smn{"អ៊ីណារីសាមី"} sms{"ស្កុលសាមី"} sn{"សូណា"} snk{"សូនីនគេ"} @@ -417,6 +417,7 @@ km{ } Languages%short{ az{"អាហ្សេរី"} + en_US{"អង់គ្លេស (ស.រ.អ.)"} } Scripts{ Arab{"អារ៉ាប់"} @@ -447,7 +448,7 @@ km{ Kore{"កូរ៉េ"} Laoo{"ឡាវ"} Latn{"ឡាតាំង"} - Mlym{"មលយាល័ម"} + Mlym{"ម៉ាឡាយ៉ាឡាម"} Mong{"ម៉ុងហ្គោលី"} Mymr{"ភូមា"} Orya{"អូឌៀ"} @@ -483,8 +484,8 @@ km{ roc{"ប្រតិទិនមីងគ័រ"} } cf{ - account{"ទម្រង់រូបិយប័ណ្ណគណនី"} - standard{"ទម្រង់រូបិយប័ណ្ណបទដ្ឋាន"} + account{"ទម្រង់រូបិយបណ្ណគណនី"} + standard{"ទម្រង់រូបិយបណ្ណបទដ្ឋាន"} } collation{ ducet{"លំដាប់​តម្រៀប​យូនីកូដ​លំនាំដើម"} @@ -545,7 +546,6 @@ km{ tibt{"លេខទីបេ"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ទាំងអស់"} category-list{"{0}: {1}"} @@ -559,6 +559,8 @@ km{ strokes{ other{"{0} វាស"} } + subscript{"តួអក្សរតូចក្រោម {0}"} + superscript{"តួអក្សរតូចលើ {0}"} } codePatterns{ language{"ភាសា៖ {0}"} diff --git a/intl/icu/source/data/lang/kn.txt b/intl/icu/source/data/lang/kn.txt index 3ca5c2a5b329..c4c8026b3fa3 100644 --- a/intl/icu/source/data/lang/kn.txt +++ b/intl/icu/source/data/lang/kn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kn{ Keys{ calendar{"ಕ್ಯಾಲೆಂಡರ್"} @@ -84,7 +85,7 @@ kn{ car{"ಕಾರಿಬ್"} cch{"ಅಟ್ಸಮ್"} ccp{"ಚಕ್ಮಾ"} - ce{"ಚೆಚನ್"} + ce{"ಚಚೆನ್"} ceb{"ಸೆಬುವಾನೊ"} cgg{"ಚಿಗಾ"} ch{"ಕಮೊರೊ"} @@ -543,11 +544,12 @@ kn{ zza{"ಜಾಝಾ"} } Languages%long{ + zh_Hans{"ಸರಳೀಕೃತ ಮ್ಯಾಂಡರಿನ್ ಚೈನೀಸ್"} zh_Hant{"ಸಾಂಪ್ರದಾಯಿಕ ಮ್ಯಾಂಡರಿನ್ ಚೈನೀಸ್"} } Languages%menu{ yue{"ಚೈನೀಸ್, ಕ್ಯಾಂಟೊನೀಸ್"} - zh{"ಚೈನೀಸ್, ಮಂಡಾರಿನ್"} + zh{"ಚೈನೀಸ್, ಮ್ಯಾಂಡರಿನ್"} } Languages%short{ az{"ಅಝೆರಿ"} @@ -686,7 +688,7 @@ kn{ Xsux{"ಸುಮೇರೋ-ಅಕ್ಕಾಡಿಯನ್ ಕ್ಯೂನಿಫಾರ್ಮ್"} Yiii{"ಯಿ"} Zinh{"ಇನ್‍ಹೆರಿಟೆಡ್"} - Zmth{"ಗಣೀತ ಸಂಕೇತಲಿಪಿ"} + Zmth{"ಗಣಿತ ಸಂಕೇತಲಿಪಿ"} Zsye{"ಎಮೋಜಿ"} Zsym{"ಸಂಕೇತಗಳು"} Zxxx{"ಅಲಿಖಿತ"} @@ -842,7 +844,10 @@ kn{ vaii{"ವಾಯ್ ಅಂಕೆಗಳು"} } } - Version{"37"} + Variants{ + PINYIN{"ಪಿನ್‌ಯಿನ್ ರೋಮನೈಸೇಶನ್"} + WADEGILE{"ವೇಡ್-ಗೈಲ್ಸ್ ರೋಮನೈಸೇಶನ್"} + } characterLabelPattern{ all{"{0} — ಎಲ್ಲ"} category-list{"{0}: {1}"} @@ -857,6 +862,8 @@ kn{ one{"{0} ಸ್ಟ್ರೋಕ್"} other{"{0} ಸ್ಟ್ರೋಕ್‌ಗಳು"} } + subscript{"ಅಡಿಬರಹ {0}"} + superscript{"ತಲೆಬರಹ {0}"} } codePatterns{ language{"ಭಾಷೆ: {0}"} diff --git a/intl/icu/source/data/lang/ko.txt b/intl/icu/source/data/lang/ko.txt index c3f0d8d6ccb4..8372351655ae 100644 --- a/intl/icu/source/data/lang/ko.txt +++ b/intl/icu/source/data/lang/ko.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko{ Keys{ calendar{"달력"} @@ -150,7 +151,6 @@ ko{ el{"그리스어"} elx{"엘람어"} en{"영어"} - en_AU{"영어(호주)"} enm{"중세 영어"} eo{"에스페란토어"} es{"스페인어"} @@ -454,7 +454,7 @@ ko{ shi{"타셸히트어"} shn{"샨어"} shu{"차디언 아라비아어"} - si{"스리랑카어"} + si{"싱할라어"} sid{"시다모어"} sk{"슬로바키아어"} sl{"슬로베니아어"} @@ -574,6 +574,9 @@ ko{ Languages%short{ az{"아제리어"} } + Languages%variant{ + ckb{"쿠르드어(소라니)"} + } Scripts{ Afak{"아파카 문자"} Aghb{"코카시안 알바니아 문자"} @@ -643,7 +646,7 @@ ko{ Khmr{"크메르 문자"} Khoj{"코즈키 문자"} Knda{"칸나다 문자"} - Kore{"한국어"} + Kore{"한국 문자"} Kpel{"크펠레 문자"} Kthi{"카이시 문자"} Lana{"란나 문자"} @@ -934,7 +937,6 @@ ko{ VAIDIKA{"바이디카"} VALLADER{"발라더"} } - Version{"37"} characterLabelPattern{ all{"{0} — 전체"} category-list{"{0}: {1}"} @@ -948,6 +950,8 @@ ko{ strokes{ other{"{0}획"} } + subscript{"아래 첨자 {0}"} + superscript{"위 첨자 {0}"} } codePatterns{ language{"언어: {0}"} diff --git a/intl/icu/source/data/lang/kok.txt b/intl/icu/source/data/lang/kok.txt index 07403c4d753a..e59631793e63 100644 --- a/intl/icu/source/data/lang/kok.txt +++ b/intl/icu/source/data/lang/kok.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kok{ Keys{ calendar{"दिनदर्शिका"} @@ -257,7 +258,7 @@ kok{ na{"नौरो"} nap{"नेपोलिटन"} naq{"नामा"} - nb{"नोर्वेजियन बोकमाल"} + nb{"नॉर्वेजियन बोकमाल"} nd{"उत्तर न्डेबेले"} nds{"निम्न जर्मन"} ne{"नेपाळी"} @@ -268,7 +269,7 @@ kok{ nl{"डच्"} nl_BE{"फ्लेमिश"} nmg{"ख्वासी"} - nn{"नोर्वोजियन नायनोर्स्क"} + nn{"नॉर्वेजियन नायनोर्स्क"} nnh{"न्गेबून"} no{"नोर्वेजियन"} nog{"नोगाय"} @@ -417,6 +418,7 @@ kok{ zh_Hant{"पारंपारीक मंडारीन चिनी"} } Languages%menu{ + ckb{"खुर्दीश, मध्य"} yue{"चिनी, कॅण्टोनीस"} zh{"चिनी, मंडारीन"} } @@ -425,6 +427,9 @@ kok{ en_GB{"यूके इंग्लीश"} en_US{"यूएस इंग्लीश"} } + Languages%variant{ + ckb{"खुर्दीश, सोरानी"} + } Scripts{ Arab{"आरबी"} Armn{"आर्मेनियन"} @@ -457,7 +462,7 @@ kok{ Mlym{"मलयाळम"} Mong{"मोंगोलियन"} Mymr{"म्यानमार"} - Orya{"ओरिया"} + Orya{"ओडिया"} Sinh{"सिन्हाला"} Taml{"तमीळ"} Telu{"तेलगू"} @@ -465,7 +470,7 @@ kok{ Thai{"थाई"} Tibt{"तिबेटन"} Zmth{"गणिताची चिन्नां"} - Zsye{"Emoji"} + Zsye{"ईमोजी"} Zsym{"चिन्नां"} Zxxx{"अलिखीत"} Zyyy{"सामान्य"} @@ -481,7 +486,7 @@ kok{ chinese{"चीनी दिनदर्शिका"} dangi{"डांगी दिनदर्शिका"} ethiopic{"इथियोपिक दिनदर्शिका"} - gregorian{"ग्रेगोरियन कॅलेन्डर"} + gregorian{"ग्रेगोरियन कॅलॅण्डर"} hebrew{"हिब्रू दिनदर्शिका"} islamic{"ईस्लामीक दिनदर्शिका"} iso8601{"आयएसओ-8601 दिनदर्शिका"} @@ -555,9 +560,9 @@ kok{ tibt{"तिबेतियन अंक"} } } - Version{"37"} characterLabelPattern{ all{"{0} — सगळें"} + category-list{"{0}: {1}"} compatibility{"{0} — अनुरुपताय"} enclosed{"{0} — जोडलां"} extended{"{0} — विस्तारायलां"} @@ -568,6 +573,8 @@ kok{ strokes{ other{"{0} आघात"} } + subscript{"सबस्क्रिप्ट {0}"} + superscript{"सुपरस्क्रिप्ट {0}"} } codePatterns{ language{"भासः{0}"} diff --git a/intl/icu/source/data/lang/ks.txt b/intl/icu/source/data/lang/ks.txt index cb4c490de885..99518e67cc2d 100644 --- a/intl/icu/source/data/lang/ks.txt +++ b/intl/icu/source/data/lang/ks.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks{ Keys{ calendar{"کیلنڑر"} @@ -610,7 +611,6 @@ ks{ SOLBA{"ثٹولوِزا/سولبِکا بوٗلۍ"} TARASK{"تاراسکیٖوِکا علمہ ہِجاِ"} } - Version{"37"} codePatterns{ language{"زَبان: {0}"} script{"رَسم الخط: {0}"} diff --git a/intl/icu/source/data/lang/ks_Arab.txt b/intl/icu/source/data/lang/ks_Arab.txt index aafa093f1849..f3d2206e1162 100644 --- a/intl/icu/source/data/lang/ks_Arab.txt +++ b/intl/icu/source/data/lang/ks_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/ks_Arab_IN.txt b/intl/icu/source/data/lang/ks_Arab_IN.txt index a13c0c960582..2d29f4c5e86f 100644 --- a/intl/icu/source/data/lang/ks_Arab_IN.txt +++ b/intl/icu/source/data/lang/ks_Arab_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/ks_IN.txt b/intl/icu/source/data/lang/ks_IN.txt index fd8b52d9b4a2..bd1a22537a8f 100644 --- a/intl/icu/source/data/lang/ks_IN.txt +++ b/intl/icu/source/data/lang/ks_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_IN{ "%%ALIAS"{"ks_Arab_IN"} } diff --git a/intl/icu/source/data/lang/ksb.txt b/intl/icu/source/data/lang/ksb.txt index e026dc9f34e5..01964b48e83b 100644 --- a/intl/icu/source/data/lang/ksb.txt +++ b/intl/icu/source/data/lang/ksb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksb{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ ksb{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ksf.txt b/intl/icu/source/data/lang/ksf.txt index c244f6527337..e0566c4d3b2a 100644 --- a/intl/icu/source/data/lang/ksf.txt +++ b/intl/icu/source/data/lang/ksf.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksf{ Languages{ ak{"riakan"} @@ -48,5 +49,4 @@ ksf{ zh{"ricinɔá"} zu{"rizúlu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ksh.txt b/intl/icu/source/data/lang/ksh.txt index bf78a00dfe78..9c1008f284c1 100644 --- a/intl/icu/source/data/lang/ksh.txt +++ b/intl/icu/source/data/lang/ksh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksh{ Keys{ calendar{"dä Kalländer"} @@ -512,7 +513,6 @@ ksh{ VALENCIA{"valenzijaanesche Dijaläk"} WADEGILE{"lateijnesche Ömschreff noh Wade-Giles"} } - Version{"37"} codePatterns{ language{"de Schprohch afjekööz met „{0}“"} script{"de Schreff afjekööz met „{0}“"} diff --git a/intl/icu/source/data/lang/ku.txt b/intl/icu/source/data/lang/ku.txt index d9deb1868cc9..5e20816b3210 100644 --- a/intl/icu/source/data/lang/ku.txt +++ b/intl/icu/source/data/lang/ku.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ku{ Keys{ calendar{"salname"} @@ -268,7 +269,6 @@ ku{ roman{"hejmarên romî"} } } - Version{"37"} codePatterns{ language{"ziman: {0}"} script{"nivîs: {0}"} diff --git a/intl/icu/source/data/lang/kw.txt b/intl/icu/source/data/lang/kw.txt index 878a8b9f984c..3c83e2f05ab9 100644 --- a/intl/icu/source/data/lang/kw.txt +++ b/intl/icu/source/data/lang/kw.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kw{ Languages{ kw{"kernewek"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ky.txt b/intl/icu/source/data/lang/ky.txt index fbf28b1b3723..9105cbcbe62f 100644 --- a/intl/icu/source/data/lang/ky.txt +++ b/intl/icu/source/data/lang/ky.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky{ Keys{ calendar{"Жылнаама"} @@ -57,8 +58,8 @@ ky{ bs{"боснийче"} bug{"бугийче"} byn{"блинче"} - ca{"каталонча"} - ccp{"Чакма"} + ca{"каталончо"} + ccp{"чакма"} ce{"чеченче"} ceb{"себуанча"} cgg{"чигача"} @@ -290,7 +291,6 @@ ky{ prg{"пруссча"} ps{"пуштуча"} pt{"португалча"} - pt_BR{"Бразилиялык Португал тили"} pt_PT{"португалча (Европа)"} qu{"кечуача"} quc{"кичече"} @@ -410,8 +410,8 @@ ky{ zza{"зазача"} } Languages%menu{ - yue{"Кытайча, Кантондук"} - zh{"Кытайча,Мандарин"} + yue{"кытайча (кантончо)"} + zh{"кытайча (мандарин)"} } Languages%short{ az{"азерче"} @@ -489,6 +489,10 @@ ky{ search{"Жалпы издөө"} standard{"Стандарттык иргөө тартиби"} } + d0{ + fwidth{"Кең формат"} + hwidth{"Кыска формат"} + } hc{ h11{"12 сааттык тутум (0–11)"} h12{"12 сааттык тутум (1–12)"} @@ -509,14 +513,14 @@ ky{ arab{"Араб-индус сандары"} arabext{"Кеңейтилген араб-индус сандары"} armn{"Армян сандары"} - armnlow{"Армян сандары (кичинекей арип менен)"} + armnlow{"Армян сандары (кичинекей тамга менен))"} beng{"Бенгали сандары"} deva{"Деванагари сандары"} ethi{"Эфиоп сандары"} fullwide{"Толук эндүү сандар"} geor{"Грузин сандары"} grek{"Грек сандары"} - greklow{"Грек сандары (кичинекей арип менен)"} + greklow{"Грек сандары (кичинекей тамга менен))"} gujr{"Гужарати сандары"} guru{"Гужарати сандары"} hanidec{"Кытай ондук сандары"} @@ -535,7 +539,7 @@ ky{ mymr{"Мйанмар сандары"} orya{"Ория сандары"} roman{"Роман сандары"} - romanlow{"Роман сандары (кичинекей арип менен)"} + romanlow{"Роман сандары (кичинекей тамга менен)"} taml{"Салттуу тамил сандары"} tamldec{"Тамил сандары"} telu{"Телугу сандары"} @@ -543,7 +547,6 @@ ky{ tibt{"Тибет сандары"} } } - Version{"37"} characterLabelPattern{ all{"{0} — баары"} category-list{"{0}: {1}"} @@ -558,6 +561,8 @@ ky{ one{"{0} штрих"} other{"{0} штрих"} } + subscript{"{0} саптын асты"} + superscript{"{0} саптын үстү"} } codePatterns{ language{"Тили: {0}"} diff --git a/intl/icu/source/data/lang/lag.txt b/intl/icu/source/data/lang/lag.txt index 5ddd3db8112b..650ff7eadb79 100644 --- a/intl/icu/source/data/lang/lag.txt +++ b/intl/icu/source/data/lang/lag.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lag{ Languages{ ak{"Kɨakáani"} @@ -48,5 +49,4 @@ lag{ zh{"Kɨchíina"} zu{"Kɨzúulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/lb.txt b/intl/icu/source/data/lang/lb.txt index e401861c86ea..7df9f4d43dac 100644 --- a/intl/icu/source/data/lang/lb.txt +++ b/intl/icu/source/data/lang/lb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb{ Keys{ calendar{"Kalenner"} @@ -872,7 +873,6 @@ lb{ VALENCIA{"Valencianesch"} WADEGILE{"Wade-Giles"} } - Version{"37"} codePatterns{ language{"Sprooch: {0}"} script{"Schrëft: {0}"} diff --git a/intl/icu/source/data/lang/lg.txt b/intl/icu/source/data/lang/lg.txt index dacf4b9661b7..2b7028ea2064 100644 --- a/intl/icu/source/data/lang/lg.txt +++ b/intl/icu/source/data/lang/lg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lg{ Languages{ ak{"Lu-akaani"} @@ -48,5 +49,4 @@ lg{ zh{"Lucayina"} zu{"Luzzulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/lkt.txt b/intl/icu/source/data/lang/lkt.txt index c5ec803ee7b3..d15730bf4a47 100644 --- a/intl/icu/source/data/lang/lkt.txt +++ b/intl/icu/source/data/lang/lkt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lkt{ Languages{ ab{"Abkhaz Iyápi"} @@ -152,5 +153,4 @@ lkt{ zu{"Zulu Iyápi"} zza{"Zaza Iyápi"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ln.txt b/intl/icu/source/data/lang/ln.txt index daed1346606b..ed3e24d5751d 100644 --- a/intl/icu/source/data/lang/ln.txt +++ b/intl/icu/source/data/lang/ln.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln{ Languages{ ak{"akan"} @@ -48,5 +49,4 @@ ln{ zh{"lisinwa"} zu{"zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/lo.txt b/intl/icu/source/data/lang/lo.txt index 8dc7b18711b3..50f826200133 100644 --- a/intl/icu/source/data/lang/lo.txt +++ b/intl/icu/source/data/lang/lo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo{ Keys{ calendar{"ປະຕິທິນ"} @@ -211,7 +212,7 @@ lo{ id{"ອິນໂດເນຊຽນ"} ie{"ອິນເຕີລິງກຣີ"} ig{"ອິກໂບ"} - ii{"ເຊສວຍຢີ"} + ii{"ເສສວນ ອີ"} ik{"ອິນນູປຽກ"} ilo{"ໄອໂລໂກ"} inh{"ອິນກັຊ"} @@ -887,7 +888,6 @@ lo{ VALLADER{"ວັລລາເດີ"} WADEGILE{"ການຖອດອັກສອນແບບເວດ-ໄຈລ໌"} } - Version{"37"} characterLabelPattern{ all{"{0} — ທັງໝົດ"} category-list{"{0}: {1}"} @@ -901,6 +901,8 @@ lo{ strokes{ other{"{0} ຈັງຫວະ"} } + subscript{"ໂຕຫ້ອຍ {0}"} + superscript{"ໂຕຍົກກໍາລັງ {0}"} } codePatterns{ language{"{0}"} diff --git a/intl/icu/source/data/lang/lrc.txt b/intl/icu/source/data/lang/lrc.txt index 3b4ff92726fe..875a0deb391f 100644 --- a/intl/icu/source/data/lang/lrc.txt +++ b/intl/icu/source/data/lang/lrc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc{ Languages{ ab{"آذأربایئجانی"} @@ -296,7 +297,6 @@ lrc{ latn{"عأدأدیا لاتین"} } } - Version{"37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/lt.txt b/intl/icu/source/data/lang/lt.txt index 2896fde693b4..7ee85ee14540 100644 --- a/intl/icu/source/data/lang/lt.txt +++ b/intl/icu/source/data/lang/lt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt{ Keys{ calendar{"kalendorius"} @@ -1029,7 +1030,6 @@ lt{ VALENCIA{"Valenciečiai"} WADEGILE{"Wade-Giles Romanization"} } - Version{"37"} characterLabelPattern{ all{"{0} – visi"} category-list{"{0}: {1}"} @@ -1046,6 +1046,8 @@ lt{ one{"{0} brūkšnys"} other{"{0} brūkšnių"} } + subscript{"apatinis indeksas {0}"} + superscript{"viršutinis indeksas {0}"} } codePatterns{ language{"Kalba: {0}"} diff --git a/intl/icu/source/data/lang/lu.txt b/intl/icu/source/data/lang/lu.txt index 6d99bc915c61..efc7f20ac192 100644 --- a/intl/icu/source/data/lang/lu.txt +++ b/intl/icu/source/data/lang/lu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lu{ Languages{ ak{"Liakan"} @@ -46,5 +47,4 @@ lu{ zh{"shinɛ"} zu{"Nzulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/luo.txt b/intl/icu/source/data/lang/luo.txt index 2a1cac29522e..d7d1cdc818f7 100644 --- a/intl/icu/source/data/lang/luo.txt +++ b/intl/icu/source/data/lang/luo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luo{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ luo{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/luy.txt b/intl/icu/source/data/lang/luy.txt index 9b159aab1fa1..92632f258fa9 100644 --- a/intl/icu/source/data/lang/luy.txt +++ b/intl/icu/source/data/lang/luy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luy{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ luy{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/lv.txt b/intl/icu/source/data/lang/lv.txt index 75f96c7eefab..b3602bd7f263 100644 --- a/intl/icu/source/data/lang/lv.txt +++ b/intl/icu/source/data/lang/lv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv{ Keys{ calendar{"Kalendārs"} @@ -552,6 +553,9 @@ lv{ Languages%short{ en_GB{"angļu (Lielbritānija)"} } + Languages%variant{ + ckb{"sorani kurdu"} + } Scripts{ Arab{"arābu"} Armi{"aramiešu"} @@ -806,13 +810,12 @@ lv{ VALENCIA{"valensiešu"} WADEGILE{"Veida-Džailza romanizācija"} } - Version{"37"} characterLabelPattern{ all{"{0} — visas"} category-list{"{0}: {1}"} compatibility{"{0} — saderība"} enclosed{"{0} — noslēgtās"} - extended{"{0} — paplašinātās"} + extended{"{0} — speciālās"} historic{"{0} — vēsturiskās"} miscellaneous{"{0} — dažādi"} other{"{0} — citas"} @@ -822,6 +825,8 @@ lv{ other{"{0} vilkumi"} zero{"{0} vilkumu"} } + subscript{"apakšraksts {0}"} + superscript{"augšraksts {0}"} } codePatterns{ language{"Valoda: {0}"} diff --git a/intl/icu/source/data/lang/mai.txt b/intl/icu/source/data/lang/mai.txt index bcef418cde06..04b2e7c0eea6 100644 --- a/intl/icu/source/data/lang/mai.txt +++ b/intl/icu/source/data/lang/mai.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mai{ Languages{ de{"जर्मन"} @@ -66,7 +67,6 @@ mai{ latn{"पश्चिमी अंक"} } } - Version{"37"} codePatterns{ language{"भाषा: {0}"} script{"लिपि: {0}"} diff --git a/intl/icu/source/data/lang/mas.txt b/intl/icu/source/data/lang/mas.txt index 1b76c5bb530c..f2d47ba8e6ae 100644 --- a/intl/icu/source/data/lang/mas.txt +++ b/intl/icu/source/data/lang/mas.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas{ Languages{ ak{"nkʉtʉ́k ɔ́ɔ̄ lAkan"} @@ -48,5 +49,4 @@ mas{ zh{"nkʉtʉ́k ɔ́ɔ̄ lchina"} zu{"nkʉtʉ́k ɔ́ɔ̄ lzulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/mer.txt b/intl/icu/source/data/lang/mer.txt index 1b26f655395f..00e78fa730bc 100644 --- a/intl/icu/source/data/lang/mer.txt +++ b/intl/icu/source/data/lang/mer.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mer{ Languages{ ak{"Kĩakani"} @@ -48,5 +49,4 @@ mer{ zh{"Kĩchina"} zu{"Kĩzulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/mfe.txt b/intl/icu/source/data/lang/mfe.txt index d5dededb918a..cbb73c6ba4b7 100644 --- a/intl/icu/source/data/lang/mfe.txt +++ b/intl/icu/source/data/lang/mfe.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mfe{ Languages{ ak{"akan"} @@ -48,5 +49,4 @@ mfe{ zh{"sinwa, mandarin"} zu{"zoulou"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/mg.txt b/intl/icu/source/data/lang/mg.txt index ee10f708a9d5..454149842ea9 100644 --- a/intl/icu/source/data/lang/mg.txt +++ b/intl/icu/source/data/lang/mg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mg{ Languages{ ak{"Akan"} @@ -48,5 +49,4 @@ mg{ zh{"Sinoa, Mandarin"} zu{"Zolò"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/mgh.txt b/intl/icu/source/data/lang/mgh.txt index 57b23d1f46fd..53e0ae097d9a 100644 --- a/intl/icu/source/data/lang/mgh.txt +++ b/intl/icu/source/data/lang/mgh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgh{ Languages{ ak{"Ikan"} @@ -47,5 +48,4 @@ mgh{ zh{"Ichina"} zu{"Izulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/mgo.txt b/intl/icu/source/data/lang/mgo.txt index f110d01cffec..1d89b5c0a975 100644 --- a/intl/icu/source/data/lang/mgo.txt +++ b/intl/icu/source/data/lang/mgo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgo{ Languages{ mgo{"metaʼ"} @@ -18,7 +19,6 @@ mgo{ latn{"inu"} } } - Version{"37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/mi.txt b/intl/icu/source/data/lang/mi.txt index 63f90d7b6237..c95577166af4 100644 --- a/intl/icu/source/data/lang/mi.txt +++ b/intl/icu/source/data/lang/mi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mi{ Languages{ de{"Tiamana"} @@ -19,7 +20,7 @@ mi{ fr_CH{"Wīwī Huiterangi"} it{"Ītariana"} ja{"Hapanihi"} - mi{"Māori"} + mi{"te reo Māori"} pt{"Pōtikī"} pt_BR{"Pōtikī Parahi"} pt_PT{"Pōtikī Uropi"} @@ -60,7 +61,6 @@ mi{ latn{"Ngā Mati Pākehā"} } } - Version{"37"} codePatterns{ language{"Reo: {0}"} script{"Momotuhi: {0}"} diff --git a/intl/icu/source/data/lang/mk.txt b/intl/icu/source/data/lang/mk.txt index ab6eb23965e9..9b1e2b1d5ea2 100644 --- a/intl/icu/source/data/lang/mk.txt +++ b/intl/icu/source/data/lang/mk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk{ Keys{ calendar{"Календар"} @@ -35,7 +36,7 @@ mk{ ang{"староанглиски"} anp{"ангика"} ar{"арапски"} - ar_001{"литературен арапски"} + ar_001{"современ стандардизиран арапски"} arc{"арамејски"} arn{"мапучки"} aro{"араона"} @@ -110,7 +111,7 @@ mk{ chn{"чинучки жаргон"} cho{"чоктавски"} chp{"чипевјански"} - chr{"черокиски"} + chr{"чероки"} chy{"чејенски"} ckb{"централнокурдски"} co{"корзикански"} @@ -130,7 +131,7 @@ mk{ dav{"таита"} de{"германски"} de_AT{"австриски германски"} - de_CH{"швајцарски високо-германски"} + de_CH{"швајцарски горногермански"} del{"делавер"} den{"слејви"} dgr{"догрипски"} @@ -163,7 +164,7 @@ mk{ eo{"есперанто"} es{"шпански"} es_419{"латиноамерикански шпански"} - es_ES{"шпански (во Европа)"} + es_ES{"шпански (Европа)"} es_MX{"мексикански шпански"} esu{"централнојупички"} et{"естонски"} @@ -451,7 +452,7 @@ mk{ ps{"паштунски"} pt{"португалски"} pt_BR{"бразилски португалски"} - pt_PT{"португалски (во Европа)"} + pt_PT{"португалски (Европа)"} qu{"кечуански"} quc{"киче"} qug{"кичвански"} @@ -512,7 +513,7 @@ mk{ sm{"самоански"} sma{"јужен сами"} smj{"луле сами"} - smn{"инари сами"} + smn{"инариски сами"} sms{"сколт сами"} sn{"шона"} snk{"сонинке"} @@ -634,12 +635,15 @@ mk{ zh_Hant{"традиционален мандарински"} } Languages%menu{ - yue{"кинески, кантонски"} - zh{"кинески, мандарински"} + ckb{"курдски, централен"} + yue{"кантонски кинески"} + zh{"мандарински кинески"} } Languages%short{ az{"азерски"} - en_GB{"англиски (во ОК)"} + } + Languages%variant{ + ckb{"курдски, сорани"} } Scripts{ Afak{"афака"} @@ -917,7 +921,6 @@ mk{ PINYIN{"Пинјин романизација"} WADEGILE{"Вејд-Џајлс романизација"} } - Version{"37"} characterLabelPattern{ all{"{0} - сите"} category-list{"{0}: {1}"} @@ -932,6 +935,8 @@ mk{ one{"{0} црта"} other{"{0} црти"} } + subscript{"долен индекс {0}"} + superscript{"горен индекс {0}"} } codePatterns{ language{"Јазик: {0}"} diff --git a/intl/icu/source/data/lang/ml.txt b/intl/icu/source/data/lang/ml.txt index d75b468f41d6..3fa906593d27 100644 --- a/intl/icu/source/data/lang/ml.txt +++ b/intl/icu/source/data/lang/ml.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ml{ Keys{ calendar{"കലണ്ടർ"} @@ -159,6 +160,7 @@ ml{ eu{"ബാസ്‌ക്"} ewo{"എവോൻഡോ"} fa{"പേർഷ്യൻ"} + fa_AF{"ഡാരി"} fan{"ഫങ്"} fat{"ഫാന്റി"} ff{"ഫുല"} @@ -238,7 +240,7 @@ ml{ jmc{"മചേം"} jpr{"ജൂഡിയോ-പേർഷ്യൻ"} jrb{"ജൂഡിയോ-അറബിക്"} - jv{"ജാവാനീസ്"} + jv{"ജാവനീസ്"} ka{"ജോർജിയൻ"} kaa{"കര-കാൽപ്പക്"} kab{"കബൈൽ"} @@ -555,6 +557,9 @@ ml{ zxx{"ഭാഷാപരമായ ഉള്ളടക്കമൊന്നുമില്ല"} zza{"സാസാ"} } + Languages%long{ + zh_Hans{"ലളിതവൽകൃത മാൻഡറിൻ ചൈനീസ്"} + } Languages%menu{ yue{"ചൈനീസ്, കാന്റണീസ്"} zh{"ചൈനീസ്, മാൻഡറിൻ"} @@ -565,6 +570,7 @@ ml{ en_US{"യു.എസ്. ഇംഗ്ലീഷ്"} } Languages%variant{ + ckb{"സൊറാനി കുർദിഷ്"} ps{"പുഷ്തോ"} ug{"ഉയ്ഗൂർ"} } @@ -904,7 +910,6 @@ ml{ POSIX{"കമ്പ്യൂട്ടർ"} REVISED{"പരിഷ്ക്കരിച്ച ലിപി"} } - Version{"37"} characterLabelPattern{ all{"{0} — എല്ലാം"} category-list{"{0}: {1}"} @@ -919,6 +924,8 @@ ml{ one{"{0} സ്‌ട്രോക്ക്"} other{"{0} സ്‌ട്രോക്കുകൾ"} } + subscript{"സബ്‌സ്ക്രിപ്റ്റ് {0}"} + superscript{"സൂപ്പർസ്ക്രിപ്റ്റ് {0}"} } codePatterns{ language{"ഭാഷ: {0}"} diff --git a/intl/icu/source/data/lang/mn.txt b/intl/icu/source/data/lang/mn.txt index 6e83e0ea55fb..a5b9bd52f84d 100644 --- a/intl/icu/source/data/lang/mn.txt +++ b/intl/icu/source/data/lang/mn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mn{ Keys{ calendar{"цаглавар"} @@ -416,6 +417,7 @@ mn{ zh_Hant{"уламжлалт мандарин хятад"} } Languages%menu{ + ckb{"Курд, Төв"} yue{"хятад, кантон"} zh{"хятад, мандарин"} } @@ -424,6 +426,9 @@ mn{ en_GB{"британи-англи"} en_US{"америк-англи"} } + Languages%variant{ + ckb{"Курд, Сорани"} + } Scripts{ Arab{"араб"} Armn{"армени"} @@ -552,21 +557,22 @@ mn{ tibt{"төвд тоо"} } } - Version{"37"} characterLabelPattern{ - all{"{0} - Бүгд"} + all{"{0} — бүгд"} category-list{"{0}: {1}"} compatibility{"{0} - нийцэл"} - enclosed{"{0} — Хавсарсан"} - extended{"{0} — Өргөтгөсөн"} - historic{"{0} — Түүхэн"} - miscellaneous{"{0} — Бусад"} + enclosed{"{0} — хавсаргасан"} + extended{"{0} — өргөтгөсөн"} + historic{"{0} — түүхэн"} + miscellaneous{"{0} — янз бүр"} other{"{0} — бусад"} - scripts{"Бичвэрүүд — {0}"} + scripts{"скрипт — {0}"} strokes{ one{"{0} цохилт"} other{"{0} цохилт"} } + subscript{"дэд скрипт {0}"} + superscript{"супер скрипт {0}"} } codePatterns{ language{"{0}"} diff --git a/intl/icu/source/data/lang/mni.txt b/intl/icu/source/data/lang/mni.txt index e61899778cd4..15d857797867 100644 --- a/intl/icu/source/data/lang/mni.txt +++ b/intl/icu/source/data/lang/mni.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni{ Languages{ de{"জর্মন"} @@ -12,6 +13,8 @@ mni{ en_US{"অমেরিকান ইংলিস"} es{"স্পেনিস"} es_419{"লেটিন অমেরিকান স্পেনিস"} + es_ES{"য়ুরোপিয়ান স্পেনিস"} + es_MX{"মেক্সিকান স্পেনিস"} fr{"ফ্রেঞ্চ"} fr_CA{"কানাদিয়ান ফ্রেঞ্চ"} fr_CH{"স্বিজ ফ্রেঞ্চ"} @@ -42,7 +45,7 @@ mni{ Arab{"আরবিক"} Beng{"বাংলা"} Cyrl{"সিরিলিক"} - Hans{"সিমপ্লিফাইদ"} + Hans{"লাইথোকহল্লবা"} Hant{"ত্রেদিস্নেল"} Latn{"লেটিন"} Mtei{"মেইটেই মায়েক"} @@ -50,7 +53,7 @@ mni{ Zzzz{"মশকখংদবা স্ক্রিপ্ট"} } Scripts%stand-alone{ - Hans{"সিমপ্লিফাইদ চাইনিজ"} + Hans{"লাইথোকহল্লবা চাইনিজ"} Hant{"ত্রেদিস্নেল চাইনিজ"} } Types{ @@ -65,7 +68,6 @@ mni{ latn{"ৱেস্তর্ন দিজিট"} } } - Version{"37"} codePatterns{ language{"লোল: {0}"} script{"স্ক্রিপ্ট: {0}"} diff --git a/intl/icu/source/data/lang/mni_Beng.txt b/intl/icu/source/data/lang/mni_Beng.txt index e861947a77ff..08de0f17e1f1 100644 --- a/intl/icu/source/data/lang/mni_Beng.txt +++ b/intl/icu/source/data/lang/mni_Beng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_Beng{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/mni_Beng_IN.txt b/intl/icu/source/data/lang/mni_Beng_IN.txt index fee698999256..c896779f2ba3 100644 --- a/intl/icu/source/data/lang/mni_Beng_IN.txt +++ b/intl/icu/source/data/lang/mni_Beng_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/mni_IN.txt b/intl/icu/source/data/lang/mni_IN.txt index 00d8c00a15b3..99173b141555 100644 --- a/intl/icu/source/data/lang/mni_IN.txt +++ b/intl/icu/source/data/lang/mni_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_IN{ "%%ALIAS"{"mni_Beng_IN"} } diff --git a/intl/icu/source/data/lang/mo.txt b/intl/icu/source/data/lang/mo.txt index 01049c8f3c89..6ef831378395 100644 --- a/intl/icu/source/data/lang/mo.txt +++ b/intl/icu/source/data/lang/mo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mo{ "%%ALIAS"{"ro"} } diff --git a/intl/icu/source/data/lang/mr.txt b/intl/icu/source/data/lang/mr.txt index 407a9979396d..755df5b1a692 100644 --- a/intl/icu/source/data/lang/mr.txt +++ b/intl/icu/source/data/lang/mr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mr{ Keys{ calendar{"दिनदर्शिका"} @@ -125,7 +126,7 @@ mr{ dua{"दुआला"} dum{"मिडल डच"} dv{"दिवेही"} - dyo{"जोला-फोंयी"} + dyo{"जोला-फॉन्यी"} dyu{"ड्युला"} dz{"झोंगखा"} dzg{"दाझागा"} @@ -151,6 +152,7 @@ mr{ eu{"बास्क"} ewo{"इवोन्डो"} fa{"फारसी"} + fa_AF{"दारी"} fan{"फँग"} fat{"फन्टी"} ff{"फुलाह"} @@ -175,7 +177,7 @@ mr{ gan{"गॅन चिनी"} gay{"गायो"} gba{"बाया"} - gd{"स्कॉट्स गेलिक"} + gd{"स्कॉटिश गेलिक"} gez{"गीझ"} gil{"जिल्बरटीज"} gl{"गॅलिशियन"} @@ -205,7 +207,7 @@ mr{ hr{"क्रोएशियन"} hsb{"अप्पर सॉर्बियन"} hsn{"शियांग चिनी"} - ht{"हैतीयन"} + ht{"हैतीयन क्रेओल"} hu{"हंगेरियन"} hup{"हूपा"} hy{"आर्मेनियन"} @@ -452,7 +454,7 @@ mr{ srr{"सेरेर"} ss{"स्वाती"} ssy{"साहो"} - st{"सेसोथो"} + st{"दक्षिणी सोथो"} su{"सुंदानीज"} suk{"सुकुमा"} sus{"सुसु"} @@ -495,7 +497,7 @@ mr{ twq{"तासाव्हाक"} ty{"ताहितीयन"} tyv{"टुवीनियन"} - tzm{"मध्य ऍटलास तॅमॅझायट"} + tzm{"मध्य अ‍ॅटलास तॅमाझाइट"} udm{"उदमुर्त"} ug{"उइगुर"} uga{"युगॅरिटिक"} @@ -546,6 +548,7 @@ mr{ zh_Hant{"पारंपारिक मँडेरिन चीनी"} } Languages%menu{ + ckb{"कुर्दिश, मध्य"} yue{"चीनी, कँटोनीज"} zh{"चीनी, मँडेरिन"} } @@ -555,6 +558,7 @@ mr{ en_US{"यू.एस. इंग्रजी"} } Languages%variant{ + ckb{"कुर्दिश, सोरानी"} ps{"पुश्तो"} } Scripts{ @@ -594,7 +598,7 @@ mr{ Grek{"ग्रीक"} Gujr{"गुजराती"} Guru{"गुरुमुखी"} - Hanb{"हान्ब"} + Hanb{"बोपोमोफोसह हान"} Hang{"हंगुल"} Hani{"हान"} Hano{"हनुनू"} @@ -844,7 +848,6 @@ mr{ PINYIN{"पिनयिन रोमनायझेशन"} WADEGILE{"वादे-गिलेस रोमनायझेशन"} } - Version{"37"} characterLabelPattern{ all{"{0} — सर्व"} category-list{"{0}: {1}"} @@ -859,6 +862,8 @@ mr{ one{"{0} स्ट्रोक"} other{"{0} स्ट्रोक"} } + subscript{"सबस्क्रिप्ट {0}"} + superscript{"सुपरस्क्रिप्ट {0}"} } codePatterns{ language{"भाषा: {0}"} diff --git a/intl/icu/source/data/lang/ms.txt b/intl/icu/source/data/lang/ms.txt index 6313fefa20d5..403b9d9df404 100644 --- a/intl/icu/source/data/lang/ms.txt +++ b/intl/icu/source/data/lang/ms.txt @@ -1,9 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms{ Keys{ calendar{"Kalendar"} - cf{"Format Mata wang"} + cf{"Format Mata Wang"} colAlternate{"Abaikan Pengisihan Simbol"} colBackwards{"Pengisihan Aksen Terbalik"} colCaseFirst{"Penyusunan Huruf Besar/Huruf Kecil"} @@ -73,7 +74,7 @@ ms{ bkm{"Kom"} bla{"Siksika"} bm{"Bambara"} - bn{"Benggala"} + bn{"Benggali"} bo{"Tibet"} bpy{"Bishnupriya"} br{"Breton"} @@ -474,6 +475,7 @@ ms{ zh_Hant{"Cina Mandarin Tradisional"} } Languages%menu{ + ckb{"Kurdi, Tengah"} yue{"Cina, Kantonis"} zh{"Cina, Mandarin"} } @@ -899,7 +901,6 @@ ms{ VALENCIA{"Valencia"} WADEGILE{"Perumian Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — Semua"} category-list{"{0}: {1}"} @@ -913,6 +914,8 @@ ms{ strokes{ other{"{0} Lejang"} } + subscript{"subskrip {0}"} + superscript{"superskrip {0}"} } codePatterns{ language{"Bahasa: {0}"} diff --git a/intl/icu/source/data/lang/mt.txt b/intl/icu/source/data/lang/mt.txt index 8fb6567252a9..af075be19428 100644 --- a/intl/icu/source/data/lang/mt.txt +++ b/intl/icu/source/data/lang/mt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt{ Keys{ calendar{"Kalendarju"} @@ -557,7 +558,6 @@ mt{ Variants{ REVISED{"Ortografija Irriveda"} } - Version{"37"} codePatterns{ language{"Lingwa: {0}"} script{"Skript: {0}"} diff --git a/intl/icu/source/data/lang/mua.txt b/intl/icu/source/data/lang/mua.txt index 06133d8f6651..d6039865f8f5 100644 --- a/intl/icu/source/data/lang/mua.txt +++ b/intl/icu/source/data/lang/mua.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mua{ Languages{ ak{"akaŋ"} @@ -47,5 +48,4 @@ mua{ zh{"zah Syiŋ"} zu{"Zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/my.txt b/intl/icu/source/data/lang/my.txt index b53791cae283..92ba5df81d07 100644 --- a/intl/icu/source/data/lang/my.txt +++ b/intl/icu/source/data/lang/my.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my{ Keys{ calendar{"ပြက္ခဒိန်"} @@ -33,7 +34,7 @@ my{ arp{"အာရာပါဟို"} as{"အာသံ"} asa{"အာစု"} - ast{"အက်စတူရီယန်း"} + ast{"အက်စ်တိုးရီးယား"} av{"အာဗာရစ်ခ်"} awa{"အာဝါဒီ"} ay{"အိုင်မာရ"} @@ -101,7 +102,7 @@ my{ eka{"အီကာဂျုခ်"} el{"ဂရိ"} en{"အင်္ဂလိပ်"} - en_AU{"ဩစတြေးလျှ အင်္ဂလိပ်"} + en_AU{"ဩစတြေးလျ အင်္ဂလိပ်"} en_CA{"ကနေဒါ အင်္ဂလိပ်"} en_GB{"ဗြိတိသျှ အင်္ဂလိပ်"} en_US{"အမေရိကန် အင်္ဂလိပ်"} @@ -420,7 +421,7 @@ my{ ybb{"ရမ်ဘာ"} yi{"ဂျူး"} yo{"ယိုရူဘာ"} - yue{"ကွမ်တုံ"} + yue{"ကွမ်းတုံ"} zgh{"မိုရိုကို တမဇိုက်"} zh{"တရုတ်"} zu{"ဇူးလူး"} @@ -592,7 +593,6 @@ my{ REVISED{"ပြန်လည်စီစစ်ထားသော ရေးထုံး"} SCOTLAND{"စကော့ စံ အင်္ဂလိပ်"} } - Version{"37"} characterLabelPattern{ all{"{0} — အားလုံး"} category-list{"{0} − {1}"} @@ -606,6 +606,8 @@ my{ strokes{ other{"ရေးချက် {0} ခု"} } + subscript{"စာတန်းအောက်မှ အညွှန်းစာလုံးသေး {0}"} + superscript{"စာတန်းအပေါ်မှ အညွှန်းစာလုံးသေး {0}"} } codePatterns{ language{"ဘာသာစကား - {0}"} @@ -613,7 +615,7 @@ my{ territory{"နယ်ပယ်ဒေသ - {0}"} } localeDisplayPattern{ - keyTypePattern{"{0}၊ {1}"} + keyTypePattern{"{0}- {1}"} pattern{"{0} ({1})"} separator{"{0}၊ {1}"} } diff --git a/intl/icu/source/data/lang/mzn.txt b/intl/icu/source/data/lang/mzn.txt index a29bb8887b7c..c38fb85b6139 100644 --- a/intl/icu/source/data/lang/mzn.txt +++ b/intl/icu/source/data/lang/mzn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mzn{ Languages{ ab{"آبخازی"} @@ -264,7 +265,6 @@ mzn{ Scripts%stand-alone{ Hant{"استاندارد ِسنتی هانت"} } - Version{"37"} codePatterns{ language{"زوون: {0}"} script{"اسکریپت: {0}"} diff --git a/intl/icu/source/data/lang/naq.txt b/intl/icu/source/data/lang/naq.txt index e9004120f086..0ebf1e429428 100644 --- a/intl/icu/source/data/lang/naq.txt +++ b/intl/icu/source/data/lang/naq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml naq{ Languages{ ak{"Akangowab"} @@ -48,5 +49,4 @@ naq{ zh{"Chineesǁî gowab, Mandarinni"} zu{"Zulub"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/nb.txt b/intl/icu/source/data/lang/nb.txt index eb8d89a77252..8073dd0ef0ab 100644 --- a/intl/icu/source/data/lang/nb.txt +++ b/intl/icu/source/data/lang/nb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ Keys{ calendar{"kalender"} @@ -634,6 +635,7 @@ nb{ } Languages%menu{ ars{"arabisk (najd)"} + ckb{"kurdisk (sentral)"} zh{"kinesisk, mandarin"} } Languages%short{ @@ -688,7 +690,7 @@ nb{ Grek{"gresk"} Gujr{"gujarati"} Guru{"gurmukhi"} - Hanb{"hanb"} + Hanb{"han-kinesisk med bopomofo"} Hang{"hangul"} Hani{"han"} Hano{"hanunoo"} @@ -945,10 +947,10 @@ nb{ gujr{"gujarati-sifre"} guru{"gurmukhi-sifre"} hanidec{"kinesiske desimaltall"} - hans{"forenklede kinesiske tall"} - hansfin{"forenklede kinesiske finanstall"} - hant{"tradisjonelle kinesiske tall"} - hantfin{"tradisjonelle kinesiske finanstall"} + hans{"forenklet kinesisk-tall"} + hansfin{"forenklet kinesisk-finanstall"} + hant{"tradisjonell kinesisk-tall"} + hantfin{"tradisjonell kinesisk-finanstall"} hebr{"hebraiske tall"} java{"java-tall"} jpan{"japanske tall"} @@ -1057,7 +1059,6 @@ nb{ VALLADER{"vallader"} WADEGILE{"Wade-Giles-romanisering"} } - Version{"37"} characterLabelPattern{ all{"{0} – alt"} category-list{"{0}: {1}"} @@ -1072,6 +1073,8 @@ nb{ one{"{0} strek"} other{"{0} streker"} } + subscript{"senket {0}"} + superscript{"hevet {0}"} } codePatterns{ language{"Språk: {0}"} diff --git a/intl/icu/source/data/lang/nb_NO.txt b/intl/icu/source/data/lang/nb_NO.txt index fdac28bf658d..15a33c3396f5 100644 --- a/intl/icu/source/data/lang/nb_NO.txt +++ b/intl/icu/source/data/lang/nb_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/nd.txt b/intl/icu/source/data/lang/nd.txt index c50427b35bdf..f218ffa1a73e 100644 --- a/intl/icu/source/data/lang/nd.txt +++ b/intl/icu/source/data/lang/nd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nd{ Languages{ ak{"isi-Akhani"} @@ -48,5 +49,4 @@ nd{ zh{"isi-China"} zu{"isi-Zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ne.txt b/intl/icu/source/data/lang/ne.txt index c602c669ec5c..eb3b51a14fc5 100644 --- a/intl/icu/source/data/lang/ne.txt +++ b/intl/icu/source/data/lang/ne.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne{ Keys{ calendar{"पात्रो"} @@ -419,7 +420,7 @@ ne{ oj{"ओजिब्वा"} om{"ओरोमो"} or{"उडिया"} - os{"अोस्सेटिक"} + os{"ओस्सेटिक"} osa{"ओसागे"} ota{"अटोमन तुर्की"} pa{"पंजाबी"} @@ -715,6 +716,9 @@ ne{ Zyyy{"साझा"} Zzzz{"अज्ञात लिपि"} } + Scripts%stand-alone{ + Hans{"सरलीकृत चिनियाँ"} + } Types{ calendar{ buddhist{"बुद्धिष्ट पात्रो"} @@ -726,7 +730,7 @@ ne{ indian{"भारतीय राष्ट्रिय पात्रो"} islamic{"इस्लामी पात्रो"} islamic-civil{"इस्लामी नागरिक पात्रो"} - iso8601{"ISO-8601 Calendar"} + iso8601{"ISO-8601 पात्रो"} japanese{"जापानी पात्रो"} persian{"फारसी पात्रो"} roc{"चिनियाँ गणतन्त्रको पात्रो"} @@ -804,7 +808,6 @@ ne{ AREVELA{"पूर्वी आर्मेनियाली"} POSIX{"कम्प्युटर"} } - Version{"37"} characterLabelPattern{ all{"{0}-सबै"} category-list{"{0}: {1}"} @@ -819,6 +822,8 @@ ne{ one{"{0}स्ट्रोक"} other{"{0}स्ट्रोक"} } + subscript{"{0} को तल रेखा कोर्नुहोस्"} + superscript{"{0} को तल धर्का कोर्नुहोस्"} } codePatterns{ language{"भाषा: {0}"} diff --git a/intl/icu/source/data/lang/nl.txt b/intl/icu/source/data/lang/nl.txt index 374b57b852da..cc9abeb2f7fd 100644 --- a/intl/icu/source/data/lang/nl.txt +++ b/intl/icu/source/data/lang/nl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl{ Keys{ calendar{"kalender"} @@ -71,7 +72,7 @@ nl{ bax{"Bamoun"} bbc{"Batak Toba"} bbj{"Ghomala’"} - be{"Wit-Russisch"} + be{"Belarussisch"} bej{"Beja"} bem{"Bemba"} bew{"Betawi"} @@ -378,7 +379,7 @@ nl{ ms{"Maleis"} mt{"Maltees"} mua{"Mundang"} - mul{"Meerdere talen"} + mul{"meerdere talen"} mus{"Creek"} mwl{"Mirandees"} mwr{"Marwari"} @@ -635,6 +636,7 @@ nl{ az{"Azeri"} } Languages%variant{ + ckb{"Koerdisch, Soranî"} ps{"Pashto"} } Scripts{ @@ -656,7 +658,7 @@ nl{ Blis{"Blissymbolen"} Bopo{"Bopomofo"} Brah{"Brahmi"} - Brai{"Braille"} + Brai{"braille"} Bugi{"Buginees"} Buhd{"Buhid"} Cakm{"Chakma"} @@ -827,9 +829,9 @@ nl{ Yiii{"Yi"} Zanb{"vierkant Zanabazar"} Zinh{"Overgeërfd"} - Zmth{"Wiskundige notatie"} + Zmth{"wiskundige notatie"} Zsye{"emoji"} - Zsym{"Symbolen"} + Zsym{"symbolen"} Zxxx{"ongeschreven"} Zyyy{"algemeen"} Zzzz{"onbekend schriftsysteem"} @@ -1133,7 +1135,6 @@ nl{ WADEGILE{"Wade-Giles-romanisering"} XSISTEMO{"X-sistemo"} } - Version{"37"} characterLabelPattern{ all{"{0} — alle"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/nmg.txt b/intl/icu/source/data/lang/nmg.txt index ce2f822836ab..faa605fadd16 100644 --- a/intl/icu/source/data/lang/nmg.txt +++ b/intl/icu/source/data/lang/nmg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nmg{ Languages{ ak{"Kiɛl akan"} @@ -47,5 +48,4 @@ nmg{ zh{"Kiɛl bó chinois"} zu{"Zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/nn.txt b/intl/icu/source/data/lang/nn.txt index 5900606df8db..c6582b3c8593 100644 --- a/intl/icu/source/data/lang/nn.txt +++ b/intl/icu/source/data/lang/nn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ Keys{ calendar{"kalender"} @@ -74,6 +75,7 @@ nn{ cad{"caddo"} car{"carib"} cch{"atsam"} + ccp{"chakma"} ce{"tsjetsjensk"} ceb{"cebuano"} cgg{"kiga"} @@ -125,7 +127,6 @@ nn{ el{"gresk"} elx{"elamite"} en{"engelsk"} - en_GB{"britisk engelsk"} enm{"mellomengelsk"} eo{"esperanto"} es{"spansk"} @@ -133,6 +134,7 @@ nn{ eu{"baskisk"} ewo{"ewondo"} fa{"persisk"} + fa_AF{"dari"} fan{"fang"} fat{"fanti"} ff{"fulfulde"} @@ -155,7 +157,7 @@ nn{ gd{"skotsk-gælisk"} gez{"geez"} gil{"gilbertese"} - gl{"galicisk"} + gl{"galisisk"} gmh{"mellomhøgtysk"} gn{"guarani"} goh{"gammalhøgtysk"} @@ -286,7 +288,7 @@ nn{ mfe{"morisyen"} mg{"madagassisk"} mga{"mellomirsk"} - mgh{"Makhuwa-Meetto"} + mgh{"makhuwa-meetto"} mgo{"meta’"} mh{"marshallesisk"} mi{"maori"} @@ -313,7 +315,7 @@ nn{ na{"nauru"} nap{"napolitansk"} naq{"nama"} - nb{"bokmål"} + nb{"norsk bokmål"} nd{"nord-ndebele"} nds{"lågtysk"} nds_NL{"lågsaksisk"} @@ -325,7 +327,7 @@ nn{ nl{"nederlandsk"} nl_BE{"flamsk"} nmg{"kwasio"} - nn{"nynorsk"} + nn{"norsk nynorsk"} nnh{"ngiemboon"} no{"norsk"} nog{"nogai"} @@ -396,7 +398,7 @@ nn{ se{"nordsamisk"} seh{"sena"} sel{"selkupisk"} - ses{"Koyraboro Senni"} + ses{"koyraboro senni"} sg{"sango"} sga{"gammalirsk"} sh{"serbokroatisk"} @@ -507,6 +509,17 @@ nn{ zxx{"utan språkleg innhald"} zza{"zaza"} } + Languages%long{ + zh_Hans{"forenkla mandarinkinesisk"} + zh_Hant{"tradisjonell mandarinkinesisk"} + } + Languages%menu{ + ckb{"kurdisk (sentral)"} + zh{"kinesisk, mandarin"} + } + Languages%variant{ + ckb{"kurdisk (sorani)"} + } Scripts{ Arab{"arabisk"} Armi{"armisk"} @@ -544,7 +557,7 @@ nn{ Grek{"gresk"} Gujr{"gujarati"} Guru{"gurmukhi"} - Hanb{"han med bopomofo"} + Hanb{"hanb"} Hang{"hangul"} Hani{"han"} Hano{"hanunoo"} @@ -661,7 +674,7 @@ nn{ iso8601{"ISO 8601-kalender"} japanese{"japansk kalender"} persian{"persisk kalender"} - roc{"kalender for Republikken Kina"} + roc{"minguo-kalender"} } cf{ account{"valutaformat for rekneskapsføring"} @@ -761,7 +774,6 @@ nn{ TARASK{"taraskievica-ortografi"} VALENCIA{"valensisk dialekt"} } - Version{"37"} characterLabelPattern{ all{"{0} – alt"} category-list{"{0}: {1}"} @@ -776,6 +788,8 @@ nn{ one{"{0} strek"} other{"{0} strekar"} } + subscript{"senka {0}"} + superscript{"heva {0}"} } codePatterns{ language{"Språk: {0}"} diff --git a/intl/icu/source/data/lang/nn_NO.txt b/intl/icu/source/data/lang/nn_NO.txt index 4e8a5f78d9b5..9eaa33990d32 100644 --- a/intl/icu/source/data/lang/nn_NO.txt +++ b/intl/icu/source/data/lang/nn_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/nnh.txt b/intl/icu/source/data/lang/nnh.txt index b569b1bdc9ce..0d2e00e56a33 100644 --- a/intl/icu/source/data/lang/nnh.txt +++ b/intl/icu/source/data/lang/nnh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nnh{ Keys{ calendar{"fʉ̀ʼ njÿó"} @@ -24,5 +25,4 @@ nnh{ yav{"Shwóŋò pʉa shÿó Mbafìa"} ybb{"Shwóŋò Tsaŋ"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/no.txt b/intl/icu/source/data/lang/no.txt index 097a923cd101..474d0b21b0d9 100644 --- a/intl/icu/source/data/lang/no.txt +++ b/intl/icu/source/data/lang/no.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ "%%ALIAS"{"nb"} } diff --git a/intl/icu/source/data/lang/no_NO.txt b/intl/icu/source/data/lang/no_NO.txt index 188a8a4a680a..5d7f8599c0e5 100644 --- a/intl/icu/source/data/lang/no_NO.txt +++ b/intl/icu/source/data/lang/no_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ "%%ALIAS"{"nb_NO"} } diff --git a/intl/icu/source/data/lang/no_NO_NY.txt b/intl/icu/source/data/lang/no_NO_NY.txt index aa897fe6f515..c900df7fea21 100644 --- a/intl/icu/source/data/lang/no_NO_NY.txt +++ b/intl/icu/source/data/lang/no_NO_NY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO_NY{ "%%ALIAS"{"nn_NO"} } diff --git a/intl/icu/source/data/lang/nus.txt b/intl/icu/source/data/lang/nus.txt index 38c0d7ac7f22..505cbe03cf94 100644 --- a/intl/icu/source/data/lang/nus.txt +++ b/intl/icu/source/data/lang/nus.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nus{ Languages{ ak{"Thok aka̱ni"} @@ -48,5 +49,4 @@ nus{ zh{"Thok cayna"} zu{"Thok dhuluni"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/nyn.txt b/intl/icu/source/data/lang/nyn.txt index 824e45b4899a..e87b23dd2b61 100644 --- a/intl/icu/source/data/lang/nyn.txt +++ b/intl/icu/source/data/lang/nyn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nyn{ Languages{ ak{"Orukani"} @@ -48,5 +49,4 @@ nyn{ zh{"Oruchaina"} zu{"Oruzuru"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/om.txt b/intl/icu/source/data/lang/om.txt index 242d0fce2091..b45a5f1dd0c2 100644 --- a/intl/icu/source/data/lang/om.txt +++ b/intl/icu/source/data/lang/om.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om{ Languages{ af{"Afrikoota"} @@ -92,5 +93,4 @@ om{ Scripts{ Latn{"Latin"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/or.txt b/intl/icu/source/data/lang/or.txt index 0dfdf00636aa..b4d71c7bb169 100644 --- a/intl/icu/source/data/lang/or.txt +++ b/intl/icu/source/data/lang/or.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml or{ Keys{ calendar{"କ୍ୟାଲେଣ୍ଡର୍"} @@ -759,7 +760,6 @@ or{ VAIDIKA{"ବୈଦିକ"} VALENCIA{"ଭେଲେନସିଆନ୍"} } - Version{"37"} characterLabelPattern{ all{"{0} — ସମସ୍ତ"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/lang/os.txt b/intl/icu/source/data/lang/os.txt index e37f739f0d74..fa62cbd42af7 100644 --- a/intl/icu/source/data/lang/os.txt +++ b/intl/icu/source/data/lang/os.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os{ Keys{ calendar{"Къӕлиндар"} @@ -96,7 +97,6 @@ os{ latn{"Нырыккон цифрӕтӕ"} } } - Version{"37"} codePatterns{ language{"Ӕвзаг: {0}"} script{"Скрипт: {0}"} diff --git a/intl/icu/source/data/lang/pa.txt b/intl/icu/source/data/lang/pa.txt index b6baffff6c35..e448f3a643b8 100644 --- a/intl/icu/source/data/lang/pa.txt +++ b/intl/icu/source/data/lang/pa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa{ Keys{ calendar{"ਕੈਲੰਡਰ"} @@ -203,7 +204,7 @@ pa{ ks{"ਕਸ਼ਮੀਰੀ"} ksb{"ਸ਼ੰਬਾਲਾ"} ksf{"ਬਫ਼ੀਆ"} - ksh{"ਕਲੋਗਨੀਅਨ"} + ksh{"ਕਲੋਨੀਅਨ"} ku{"ਕੁਰਦਿਸ਼"} kum{"ਕੁਮੀਕ"} kv{"ਕੋਮੀ"} @@ -416,9 +417,7 @@ pa{ yo{"ਯੋਰੂਬਾ"} yue{"ਕੈਂਟੋਨੀਜ਼"} zgh{"ਮਿਆਰੀ ਮੋਰੋਕੇਨ ਟਾਮਾਜ਼ਿਕ"} - zh{"ਚੀਨੀ (ਮੈਂਡਰਿਨ)"} - zh_Hans{"ਚੀਨੀ (ਸਰਲ)"} - zh_Hant{"ਚੀਨੀ (ਰਵਾਇਤੀ)"} + zh{"ਚੀਨੀ"} zu{"ਜ਼ੁਲੂ"} zun{"ਜ਼ੂਨੀ"} zxx{"ਬੋਲੀ ਸੰਬੰਧੀ ਕੋਈ ਸਮੱਗਰੀ ਨਹੀਂ"} @@ -429,12 +428,16 @@ pa{ zh_Hant{"ਚੀਨੀ ਮੈਂਡਰਿਨ (ਰਵਾਇਤੀ)"} } Languages%menu{ + ckb{"ਕੁਰਦਿਸ਼, ਕੇਂਦਰੀ"} yue{"ਚੀਨੀ, ਕੈਂਟੋਨੀਜ਼"} zh{"ਚੀਨੀ, ਮੈਂਡਰਿਨ"} } Languages%short{ az{"ਅਜ਼ੇਰੀ"} } + Languages%variant{ + ckb{"ਕੁਰਦਿਸ਼, ਸੋਰਾਨੀ"} + } Scripts{ Arab{"ਅਰਬੀ"} Aran{"ਨਸਤਾਲੀਕ"} @@ -442,7 +445,7 @@ pa{ Beng{"ਬੰਗਾਲੀ"} Bopo{"ਬੋਪੋਮੋਫੋ"} Brai{"ਬਰੇਲ"} - Cyrl{"ਸਿਰੀਲਿਕ"} + Cyrl{"ਸਿਰਿਲਿਕ"} Deva{"ਦੇਵਨਾਗਰੀ"} Ethi{"ਇਥੀਓਪਿਕ"} Geor{"ਜਾਰਜੀਆਈ"} @@ -575,7 +578,6 @@ pa{ tibt{"ਤਿੱਬਤੀ ਅੰਕ"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ਸਭ"} category-list{"{0}: {1}"} @@ -590,6 +592,8 @@ pa{ one{"{0} ਸਟਰੋਕ"} other{"{0} ਸਟਰੋਕ"} } + subscript{"ਹੇਠ-ਲਿਖਿਆ {0}"} + superscript{"ਉੱਪਰ-ਲਿਖਿਆ {0}"} } codePatterns{ language{"ਬੋਲੀ: {0}"} diff --git a/intl/icu/source/data/lang/pa_Arab.txt b/intl/icu/source/data/lang/pa_Arab.txt index 3362b2de1691..540d2450b74b 100644 --- a/intl/icu/source/data/lang/pa_Arab.txt +++ b/intl/icu/source/data/lang/pa_Arab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Arab{ %%Parent{"root"} Languages{ @@ -10,5 +11,4 @@ pa_Arab{ Aran{"نستعلیق"} Guru{"گُرمُکھی"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/pa_Arab_PK.txt b/intl/icu/source/data/lang/pa_Arab_PK.txt index e6b58610aed6..3b1bc420fabe 100644 --- a/intl/icu/source/data/lang/pa_Arab_PK.txt +++ b/intl/icu/source/data/lang/pa_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/pa_Guru.txt b/intl/icu/source/data/lang/pa_Guru.txt index a0ee56949a68..f10658f06f81 100644 --- a/intl/icu/source/data/lang/pa_Guru.txt +++ b/intl/icu/source/data/lang/pa_Guru.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Guru{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/pa_Guru_IN.txt b/intl/icu/source/data/lang/pa_Guru_IN.txt index adeae3fecc4e..f67b7c32236f 100644 --- a/intl/icu/source/data/lang/pa_Guru_IN.txt +++ b/intl/icu/source/data/lang/pa_Guru_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/pa_IN.txt b/intl/icu/source/data/lang/pa_IN.txt index b18bba68dc7f..0c963d73dff9 100644 --- a/intl/icu/source/data/lang/pa_IN.txt +++ b/intl/icu/source/data/lang/pa_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_IN{ "%%ALIAS"{"pa_Guru_IN"} } diff --git a/intl/icu/source/data/lang/pa_PK.txt b/intl/icu/source/data/lang/pa_PK.txt index 1c66c7b37a41..29612addf4c1 100644 --- a/intl/icu/source/data/lang/pa_PK.txt +++ b/intl/icu/source/data/lang/pa_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_PK{ "%%ALIAS"{"pa_Arab_PK"} } diff --git a/intl/icu/source/data/lang/pcm.txt b/intl/icu/source/data/lang/pcm.txt index 47d7dfd35451..95a081c2c985 100644 --- a/intl/icu/source/data/lang/pcm.txt +++ b/intl/icu/source/data/lang/pcm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pcm{ Keys{ calendar{"Kalẹ́nda"} @@ -143,6 +144,7 @@ pcm{ luo{"Luó Lángwej"} luy{"Luyia Lángwej"} lv{"Látvián Lángwej"} + mai{"Maítíli"} mas{"Masaí Lángwej"} mer{"Mẹ́rú Lángwej"} mfe{"Morísiẹ́n Lángwej"} @@ -153,6 +155,7 @@ pcm{ mk{"Masẹdóniá Lángwej"} ml{"Maléyálám Lángwej"} mn{"Mọngóliá Lángwej"} + mni{"Manípuri"} mr{"Marátí Lángwej"} ms{"Malé Lángwej"} mt{"Mọ́ltá Lángwej"} @@ -195,6 +198,7 @@ pcm{ sa{"Sánskrit"} sah{"Sakhá"} saq{"Sambúru"} + sat{"Sántáli"} sbp{"Sangu"} sd{"Síndí"} se{"Nọ́tán Sámí Lángwej"} @@ -256,6 +260,7 @@ pcm{ zh_Hant{"Tradíshọ́nál Mandarín Chainíz Lángwej"} } Languages%menu{ + ckb{"Sẹ́ntrál Kọ́dísh Lángwej"} yue{"Chainiz Kántọniz"} zh{"Chainiz, Mandarin"} } @@ -263,6 +268,9 @@ pcm{ en_GB{"UK Ínglish"} en_US{"US Ínglish"} } + Languages%variant{ + ckb{"Sorání Kọ́dísh Lángwej"} + } Scripts{ Arab{"Arábík"} Armn{"Armẹ́nia"} @@ -390,7 +398,6 @@ pcm{ tibt{"Tíbẹt Nọ́mba-dẹm"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ọl"} category-list{"{0}: {1}"} @@ -405,6 +412,8 @@ pcm{ one{"{0}Strok"} other{"{0}Strok"} } + subscript{"sọ́bskript {0}"} + superscript{"Súpáskript {0}"} } codePatterns{ language{"Lángwej: {0}"} diff --git a/intl/icu/source/data/lang/pl.txt b/intl/icu/source/data/lang/pl.txt index 7ca8ef742433..6b836c18debc 100644 --- a/intl/icu/source/data/lang/pl.txt +++ b/intl/icu/source/data/lang/pl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl{ Keys{ calendar{"kalendarz"} @@ -8,18 +9,18 @@ pl{ colBackwards{"Odwrotne sortowanie ze znakami akcentowanymi"} colCaseFirst{"Kolejność wielkie/małe litery"} colCaseLevel{"Sortowanie uwzględniające wielkość liter"} - colNormalization{"Sortowanie znormalizowane"} - colNumeric{"Sortowanie numeryczne"} - colStrength{"Siła sortowania"} + colNormalization{"sortowanie znormalizowane"} + colNumeric{"sortowanie numeryczne"} + colStrength{"siła sortowania"} collation{"kolejność sortowania"} currency{"waluta"} hc{"cykl (12- lub 24-godzinny)"} lb{"styl podziału wiersza"} ms{"system miar"} numbers{"cyfry"} - timezone{"Strefa czasowa"} - va{"Wariant regionalny"} - x{"Do prywatnego użytku"} + timezone{"strefa czasowa"} + va{"wariant regionalny"} + x{"do użytku prywatnego"} } Languages{ aa{"afar"} @@ -111,7 +112,7 @@ pl{ cch{"atsam"} ccp{"czakma"} ce{"czeczeński"} - ceb{"cebuano"} + ceb{"cebuański"} cgg{"chiga"} ch{"czamorro"} chb{"czibcza"} @@ -140,8 +141,8 @@ pl{ dar{"dargwijski"} dav{"taita"} de{"niemiecki"} - de_AT{"austriacki niemiecki"} - de_CH{"szwajcarski wysokoniemiecki"} + de_AT{"niemiecki austriacki"} + de_CH{"wysokoniemiecki szwajcarski"} del{"delaware"} den{"slave"} dgr{"dogrib"} @@ -166,10 +167,10 @@ pl{ el{"grecki"} elx{"elamicki"} en{"angielski"} - en_AU{"australijski angielski"} - en_CA{"kanadyjski angielski"} - en_GB{"brytyjski angielski"} - en_US{"amerykański angielski"} + en_AU{"angielski australijski"} + en_CA{"angielski kanadyjski"} + en_GB{"angielski brytyjski"} + en_US{"angielski amerykański"} enm{"średnioangielski"} eo{"esperanto"} es{"hiszpański"} @@ -187,14 +188,14 @@ pl{ fat{"fanti"} ff{"fulani"} fi{"fiński"} - fil{"filipino"} + fil{"filipiński"} fit{"meänkieli"} fj{"fidżijski"} fo{"farerski"} fon{"fon"} fr{"francuski"} - fr_CA{"kanadyjski francuski"} - fr_CH{"szwajcarski francuski"} + fr_CA{"francuski kanadyjski"} + fr_CH{"francuski szwajcarski"} frc{"cajuński"} frm{"średniofrancuski"} fro{"starofrancuski"} @@ -647,7 +648,8 @@ pl{ } Languages%menu{ ckb{"kurdyjski sorani"} - zh{"chiński, mandaryński"} + yue{"chiński kantoński"} + zh{"chiński mandaryński"} } Languages%short{ az{"azerski"} @@ -976,7 +978,6 @@ pl{ VALENCIA{"walencki"} WADEGILE{"latynizacja Wade’a i Gilesa"} } - Version{"37"} characterLabelPattern{ all{"{0} — wszystko"} category-list{"{0}: {1}"} @@ -993,6 +994,8 @@ pl{ one{"{0} kreska"} other{"{0} kreski"} } + subscript{"indeks dolny {0}"} + superscript{"indeks górny {0}"} } codePatterns{ language{"Język: {0}"} diff --git a/intl/icu/source/data/lang/ps.txt b/intl/icu/source/data/lang/ps.txt index 67bae6bfa8bc..d8040ef2c7a9 100644 --- a/intl/icu/source/data/lang/ps.txt +++ b/intl/icu/source/data/lang/ps.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps{ Keys{ calendar{"جنتري"} @@ -81,7 +82,7 @@ ps{ dav{"ټایټا"} de{"الماني"} de_AT{"اتريشي آلماني"} - de_CH{"سوئس لوی جرمن"} + de_CH{"سویس های جرمن"} dgr{"داگرب"} dje{"زرما"} dsb{"کښته سربيايي"} @@ -141,7 +142,7 @@ ps{ hr{"کروايشيايي"} hsb{"پورته سربيايي"} ht{"هيټي کريول"} - hu{"هنگري"} + hu{"هنګري"} hup{"ھوپا"} hy{"آرمينيايي"} hz{"هیرورو"} @@ -254,7 +255,7 @@ ps{ na{"نایرو"} nap{"نيپالين"} naq{"ناما"} - nb{"ناروې بوکمال"} + nb{"ناروېئي (بوکمال)"} nd{"شمالي نديبل"} nds{"کښته آلماني"} ne{"نېپالي"} @@ -267,6 +268,7 @@ ps{ nmg{"کواسیو"} nn{"ناروېئي (نائنورسک)"} nnh{"نایجیمون"} + no{"ناروېئي"} nog{"نوګی"} nqo{"نکو"} nr{"سويلي نديبيل"} @@ -414,7 +416,7 @@ ps{ } Languages%short{ az{"اذري"} - en_GB{"انګليسي (GB)"} + en_GB{"یو کي انګلیسي"} en_US{"د متحده آيالاتو انګليسي"} } Scripts{ @@ -490,7 +492,7 @@ ps{ collation{ ducet{"ډيفالټ يونيکوډ ترتيب"} search{"د عمومي موخي لټون"} - standard{"معياري د لټې ترتيب"} + standard{"د معیاري لټي ترتیب"} } hc{ h11{"د ۱۲ ساعتو نظام (۰ـ۱۱)"} @@ -505,6 +507,7 @@ ps{ } ms{ metric{"ميټرک نظام"} + uksystem{"امپيريل د ناپ نظام"} ussystem{"د متحده آيالاتو د ناپ نظام"} } numbers{ @@ -545,7 +548,6 @@ ps{ tibt{"تبتي اعداد"} } } - Version{"37"} characterLabelPattern{ all{"{0} - ټول"} compatibility{"{0} - مطابقت"} @@ -559,6 +561,8 @@ ps{ one{"{0} استروک"} other{"{0} استروکس"} } + subscript{"فرعی سکرپټ {0}"} + superscript{"فرعی سکرپټ {0}"} } codePatterns{ language{"ژبه: {0}"} diff --git a/intl/icu/source/data/lang/ps_PK.txt b/intl/icu/source/data/lang/ps_PK.txt index 3409a981818c..eda65fd400d1 100644 --- a/intl/icu/source/data/lang/ps_PK.txt +++ b/intl/icu/source/data/lang/ps_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps_PK{ Languages{ ar_001{"نوے معياري عربي"} @@ -16,5 +17,4 @@ ps_PK{ arabext{"غځېدلے عربي ۔ اينډيک عدد"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt.txt b/intl/icu/source/data/lang/pt.txt index 9eb22103593e..fd1e22bda0ea 100644 --- a/intl/icu/source/data/lang/pt.txt +++ b/intl/icu/source/data/lang/pt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ Keys{ calendar{"Calendário"} @@ -139,7 +140,7 @@ pt{ dz{"dzonga"} dzg{"dazaga"} ebu{"embu"} - ee{"eve"} + ee{"ewe"} efi{"efique"} egy{"egípcio arcaico"} eka{"ekajuk"} @@ -445,7 +446,7 @@ pt{ sm{"samoano"} sma{"sami meridional"} smj{"sami de Lule"} - smn{"sami de Inari"} + smn{"lapão de Inari"} sms{"sami de Skolt"} sn{"xona"} snk{"soninquê"} @@ -500,7 +501,7 @@ pt{ twq{"tasawaq"} ty{"taitiano"} tyv{"tuviniano"} - tzm{"tamazirte do Atlas Central"} + tzm{"tamazight do Atlas Central"} udm{"udmurte"} ug{"uigur"} uga{"ugarítico"} @@ -817,7 +818,7 @@ pt{ grek{"Algarismos gregos"} greklow{"Algarismos gregos minúsculos"} gujr{"Algarismos guzerate"} - guru{"Algarismos gurmukhi"} + guru{"Algarismos gurmuqui"} hanidec{"Algarismos decimais chineses"} hans{"Algarismos chineses simplificados"} hansfin{"Algarismos financeiros chineses simplificados"} @@ -832,7 +833,7 @@ pt{ latn{"Algarismos ocidentais"} mlym{"Algarismos malaialos"} mong{"Algarismos mongóis"} - mymr{"Algarismos de Myanmar"} + mymr{"Algarismos mianmarenses"} native{"Dígitos nativos"} orya{"Algarismos oriá"} roman{"Algarismos romanos"} @@ -889,7 +890,6 @@ pt{ VALENCIA{"valenciano"} WADEGILE{"romanização Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — todos"} category-list{"{0}: {1}"} @@ -904,6 +904,8 @@ pt{ one{"{0} traço"} other{"{0} traços"} } + subscript{"{0} subscrito"} + superscript{"{0} sobrescrito"} } codePatterns{ language{"Idioma: {0}"} diff --git a/intl/icu/source/data/lang/pt_AO.txt b/intl/icu/source/data/lang/pt_AO.txt index 95cf1c6eeb25..c6fcc6bfab1f 100644 --- a/intl/icu/source/data/lang/pt_AO.txt +++ b/intl/icu/source/data/lang/pt_AO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_AO{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_CH.txt b/intl/icu/source/data/lang/pt_CH.txt index 3a679be16d07..67d661e786be 100644 --- a/intl/icu/source/data/lang/pt_CH.txt +++ b/intl/icu/source/data/lang/pt_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CH{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_CV.txt b/intl/icu/source/data/lang/pt_CV.txt index 6d4dd3a184a5..ebaaea839bb3 100644 --- a/intl/icu/source/data/lang/pt_CV.txt +++ b/intl/icu/source/data/lang/pt_CV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CV{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_GQ.txt b/intl/icu/source/data/lang/pt_GQ.txt index 7cbf7717a1ea..9364da966374 100644 --- a/intl/icu/source/data/lang/pt_GQ.txt +++ b/intl/icu/source/data/lang/pt_GQ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GQ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_GW.txt b/intl/icu/source/data/lang/pt_GW.txt index da37fbe5cb59..e28e46c16b08 100644 --- a/intl/icu/source/data/lang/pt_GW.txt +++ b/intl/icu/source/data/lang/pt_GW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GW{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_LU.txt b/intl/icu/source/data/lang/pt_LU.txt index ebead8d520fb..c402ea2ae5ed 100644 --- a/intl/icu/source/data/lang/pt_LU.txt +++ b/intl/icu/source/data/lang/pt_LU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_LU{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_MO.txt b/intl/icu/source/data/lang/pt_MO.txt index cf54f6259212..293d10b8cd3a 100644 --- a/intl/icu/source/data/lang/pt_MO.txt +++ b/intl/icu/source/data/lang/pt_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MO{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_MZ.txt b/intl/icu/source/data/lang/pt_MZ.txt index b99439ce7700..a8cc01a1b6e1 100644 --- a/intl/icu/source/data/lang/pt_MZ.txt +++ b/intl/icu/source/data/lang/pt_MZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MZ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_PT.txt b/intl/icu/source/data/lang/pt_PT.txt index 85a4e21a46d9..49813b831203 100644 --- a/intl/icu/source/data/lang/pt_PT.txt +++ b/intl/icu/source/data/lang/pt_PT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_PT{ Keys{ cf{"Formato monetário"} @@ -31,14 +32,12 @@ pt_PT{ chn{"jargão chinook"} chr{"cherokee"} chy{"cheyenne"} - ckb{"sorani curdo"} co{"córsico"} crs{"francês crioulo seselwa"} cs{"checo"} cv{"chuvash"} de_AT{"alemão austríaco"} de_CH{"alto alemão suíço"} - ee{"ewe"} efi{"efik"} egy{"egípcio clássico"} en_AU{"inglês australiano"} @@ -71,6 +70,7 @@ pt_PT{ lou{"crioulo de Louisiana"} lrc{"luri do norte"} mak{"makassarês"} + mfe{"crioulo mauriciano"} mk{"macedónio"} moh{"mohawk"} mr{"marata"} @@ -83,7 +83,6 @@ pt_PT{ nn{"norueguês nynorsk"} non{"nórdico antigo"} oc{"occitano"} - or{"oriya"} os{"ossético"} pag{"língua pangasinesa"} pam{"pampango"} @@ -102,13 +101,14 @@ pt_PT{ sma{"sami do sul"} smn{"inari sami"} sn{"shona"} + st{"sesoto"} te{"telugu"} tem{"temne"} tg{"tajique"} tk{"turcomano"} to{"tonga"} tt{"tatar"} - tzm{"tamazight do Atlas Central"} + tzm{"tamazigue do Atlas Central"} uz{"usbeque"} wo{"uólofe"} xh{"xosa"} @@ -132,6 +132,9 @@ pt_PT{ az{"azeri"} en_GB{"inglês (RU)"} } + Languages%variant{ + ckb{"sorani (curdo)"} + } Scripts{ Aran{"nasta’liq"} Armn{"arménio"} @@ -271,7 +274,6 @@ pt_PT{ MONOTON{"monotónico"} POLYTON{"politónico"} } - Version{"37"} characterLabelPattern{ all{"{0} – tudo"} compatibility{"{0} – compatibilidade"} diff --git a/intl/icu/source/data/lang/pt_ST.txt b/intl/icu/source/data/lang/pt_ST.txt index e4321678d60b..ba0c09e92c58 100644 --- a/intl/icu/source/data/lang/pt_ST.txt +++ b/intl/icu/source/data/lang/pt_ST.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_ST{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/pt_TL.txt b/intl/icu/source/data/lang/pt_TL.txt index b3777b6af6af..0dafd096f317 100644 --- a/intl/icu/source/data/lang/pt_TL.txt +++ b/intl/icu/source/data/lang/pt_TL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_TL{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/qu.txt b/intl/icu/source/data/lang/qu.txt index cdad01a0c575..cb8afb39dacf 100644 --- a/intl/icu/source/data/lang/qu.txt +++ b/intl/icu/source/data/lang/qu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu{ Keys{ calendar{"Intiwatana"} @@ -66,6 +67,7 @@ qu{ eu{"Euskera Simi"} ewo{"Ewondo Simi"} fa{"Persa Simi"} + fa_AF{"Dari Simi"} ff{"Fulah Simi"} fi{"Fines Simi"} fil{"Filipino Simi"} @@ -136,6 +138,7 @@ qu{ luo{"Luo Simi"} luy{"Luyia Simi"} lv{"Leton Simi"} + mai{"Maithili Simi"} mas{"Masai Simi"} mer{"Meru Simi"} mfe{"Mauriciano Simi"} @@ -146,6 +149,7 @@ qu{ mk{"Macedonio Simi"} ml{"Malayalam Simi"} mn{"Mongol Simi"} + mni{"Manipuri Simi"} moh{"Mohawk Simi"} mr{"Marathi Simi"} ms{"Malayo Simi"} @@ -175,6 +179,7 @@ qu{ os{"Osetio Simi"} pa{"Punyabi Simi"} pap{"Papiamento Simi"} + pcm{"Pidgin Nigeriano Simi"} pl{"Polaco Simi"} prg{"Prusiano Simi"} ps{"Pashto Simi"} @@ -191,6 +196,7 @@ qu{ sa{"Sanscrito Simi"} sah{"Sakha Simi"} saq{"Samburu Simi"} + sat{"Santali Simi"} sbp{"Sangu Simi"} sd{"Sindhi Simi"} se{"Chincha Sami Simi"} @@ -251,13 +257,14 @@ qu{ zh_Hans{"Chino Simplificado Simi"} zh_Hant{"Chino Tradicional Simi"} zu{"Isizulu Simi"} - zxx{"Sin contenido linguístico"} + zxx{"Manaraq simi yachana"} } Languages%long{ zh_Hans{"Chino Mandarín Simplificado Simi"} zh_Hant{"Chino Mandarín Tradicional Simi"} } Languages%menu{ + ckb{"Kurdo Simi, Chawpi"} yue{"Chino Cantonés Simi"} zh{"Chino Mandarín Simi"} } @@ -266,6 +273,59 @@ qu{ en_GB{"Ingles Simi (GB)"} en_US{"Ingles Simi (US)"} } + Languages%variant{ + ckb{"Kurdo Simi, Sorani"} + } + Scripts{ + Arab{"Arabe Simi"} + Armn{"Armenio Simi"} + Beng{"Bangla Simi"} + Bopo{"Bopomofo Simi"} + Brai{"Braile"} + Cyrl{"Cirilico"} + Deva{"Devanagari"} + Ethi{"Etiope"} + Geor{"Georgiano"} + Grek{"Griego Simi"} + Gujr{"Gujarati Simi"} + Guru{"Gurmukhi Simi"} + Hanb{"Han with Bopomofo"} + Hang{"Hangul"} + Hani{"Han"} + Hans{"Simplificado"} + Hant{"Tradicional"} + Hebr{"Hebreo Simi"} + Hira{"Hiragana"} + Hrkt{"Japones silabico sananpakuna"} + Jamo{"Jamo"} + Jpan{"Japones Simi"} + Kana{"Katakana"} + Khmr{"Khmer"} + Knda{"Kannada Simi"} + Kore{"Coreano Simi"} + Laoo{"Lao Simi"} + Latn{"Latin Simi"} + Mlym{"Malayalam Simi"} + Mong{"Mongol Simi"} + Mymr{"Myanmar"} + Orya{"Odia Simi"} + Sinh{"Cingales Simi"} + Taml{"Tamil Simi"} + Telu{"Tegulu Simi"} + Thaa{"Thaana Simi"} + Thai{"Tailandes Simi"} + Tibt{"Tibetano Simi"} + Zmth{"Matimatica Willay"} + Zsye{"Emoji"} + Zsym{"Unanchakuna"} + Zxxx{"Mana qillqasqa"} + Zyyy{"Common Simi"} + Zzzz{"Mana yachasqa Qillqa"} + } + Scripts%stand-alone{ + Hans{"Simplificado Han"} + Hant{"Tradicional Han"} + } Types{ calendar{ buddhist{"Budista Intiwatana"} @@ -343,5 +403,4 @@ qu{ tibt{"Tibetano Sananpakuna"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/rm.txt b/intl/icu/source/data/lang/rm.txt index c77fd9e8f504..801d59873121 100644 --- a/intl/icu/source/data/lang/rm.txt +++ b/intl/icu/source/data/lang/rm.txt @@ -1,10 +1,15 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rm{ Keys{ calendar{"chalender"} + cf{"format da valuta"} collation{"zavrada"} - currency{"munaida"} + currency{"valuta"} + hc{"ciclus da las uras"} + lb{"stil da sigl da lingia"} + ms{"sistem da mesira"} } Languages{ aa{"afar"} @@ -16,6 +21,7 @@ rm{ ae{"avestic"} af{"afrikaans"} afh{"afrihili"} + agq{"aghem"} ain{"ainu"} ak{"akan"} akk{"accadic"} @@ -26,11 +32,13 @@ rm{ ang{"englais vegl"} anp{"angika"} ar{"arab"} + ar_001{"arab modern standardisà"} arc{"arameic"} arn{"araucanic"} arp{"arapaho"} arw{"arawak"} as{"assami"} + asa{"asu"} ast{"asturian"} av{"avaric"} awa{"awadhi"} @@ -43,6 +51,7 @@ rm{ be{"bieloruss"} bej{"bedscha"} bem{"bemba"} + bez{"bena"} bg{"bulgar"} bho{"bhojpuri"} bi{"bislama"} @@ -54,6 +63,7 @@ rm{ bo{"tibetan"} br{"breton"} bra{"braj"} + brx{"bodo"} bs{"bosniac"} bua{"buriat"} bug{"bugi"} @@ -62,8 +72,10 @@ rm{ cad{"caddo"} car{"caribic"} cch{"atsam"} + ccp{"chakma"} ce{"tschetschen"} ceb{"cebuano"} + cgg{"chiga"} ch{"chamorro"} chb{"chibcha"} chg{"tschagataic"} @@ -74,6 +86,7 @@ rm{ chp{"chipewyan"} chr{"cherokee"} chy{"cheyenne"} + ckb{"curd central"} co{"cors"} cop{"coptic"} cr{"cree"} @@ -86,19 +99,24 @@ rm{ da{"danais"} dak{"dakota"} dar{"dargwa"} + dav{"taita"} de{"tudestg"} de_AT{"tudestg austriac"} + de_CH{"tudestg da scrittira svizzer"} del{"delaware"} den{"slavey"} dgr{"dogrib"} din{"dinka"} + dje{"zarma"} doi{"dogri"} dsb{"bass sorb"} dua{"duala"} dum{"ollandais mesaun"} dv{"maledivic"} + dyo{"jola-fonyi"} dyu{"diula"} dz{"dzongkha"} + ebu{"embu"} ee{"ewe"} efi{"efik"} egy{"egipzian vegl"} @@ -114,18 +132,20 @@ rm{ eo{"esperanto"} es{"spagnol"} es_419{"spagnol latinamerican"} - es_ES{"spagnol iberic"} + es_ES{"spagnol europeic"} + es_MX{"spagnol mexican"} et{"eston"} eu{"basc"} ewo{"ewondo"} fa{"persian"} + fa_AF{"dari"} fan{"fang"} fat{"fanti"} ff{"fulah"} fi{"finlandais"} fil{"filippino"} fj{"fidschian"} - fo{"ferrais"} + fo{"feroais"} fon{"fon"} fr{"franzos"} fr_CA{"franzos canadais"} @@ -154,6 +174,7 @@ rm{ grc{"grec vegl"} gsw{"tudestg svizzer"} gu{"gujarati"} + guz{"gusii"} gv{"manx"} gwi{"gwichʼin"} ha{"haussa"} @@ -167,7 +188,7 @@ rm{ ho{"hiri motu"} hr{"croat"} hsb{"aut sorb"} - ht{"haitian"} + ht{"creol haitian"} hu{"ungarais"} hup{"hupa"} hy{"armen"} @@ -187,6 +208,8 @@ rm{ iu{"inuktitut"} ja{"giapunais"} jbo{"lojban"} + jgo{"ngomba"} + jmc{"machame"} jpr{"giudaic-persian"} jrb{"giudaic-arab"} jv{"javanais"} @@ -199,14 +222,19 @@ rm{ kaw{"kawi"} kbd{"kabardic"} kcg{"tyap"} + kde{"makonde"} + kea{"cabverdian"} kfo{"koro"} kg{"kongo"} kha{"khasi"} kho{"khotanais"} + khq{"koyra chiini"} ki{"kikuyu"} kj{"kuanyama"} kk{"casac"} + kkj{"kako"} kl{"grönlandais"} + kln{"kalenjin"} km{"cambodschan"} kmb{"kimbundu"} kn{"kannada"} @@ -219,6 +247,9 @@ rm{ krl{"carelian"} kru{"kurukh"} ks{"kashmiri"} + ksb{"shambala"} + ksf{"bafia"} + ksh{"colognais"} ku{"curd"} kum{"kumuk"} kut{"kutenai"} @@ -227,16 +258,19 @@ rm{ ky{"kirghis"} la{"latin"} lad{"ladino"} + lag{"langi"} lah{"lahnda"} lam{"lamba"} lb{"luxemburgais"} lez{"lezghian"} lg{"ganda"} li{"limburgais"} + lkt{"lakota"} ln{"lingala"} lo{"laot"} lol{"lomongo"} loz{"lozi"} + lrc{"luri dal nord"} lt{"lituan"} lu{"luba-katanga"} lua{"luba-lulua"} @@ -244,6 +278,7 @@ rm{ lun{"lunda"} luo{"luo"} lus{"lushai"} + luy{"luyia"} lv{"letton"} mad{"madurais"} mag{"magahi"} @@ -254,8 +289,12 @@ rm{ mdf{"moksha"} mdr{"mandar"} men{"mende"} + mer{"meru"} + mfe{"morisyen"} mg{"malagassi"} mga{"irlandais mesaun"} + mgh{"makhuwa-meetto"} + mgo{"meta’"} mh{"marschallais"} mi{"maori"} mic{"micmac"} @@ -270,14 +309,17 @@ rm{ mr{"marathi"} ms{"malaic"} mt{"maltais"} + mua{"mundang"} mul{"pluriling"} mus{"creek"} mwl{"mirandais"} mwr{"marwari"} my{"birman"} myv{"erzya"} + mzn{"mazanderani"} na{"nauru"} nap{"neapolitan"} + naq{"nama"} nb{"norvegais bokmål"} nd{"ndebele dal nord"} nds{"bass tudestg"} @@ -288,13 +330,16 @@ rm{ niu{"niue"} nl{"ollandais"} nl_BE{"flam"} + nmg{"kwasio"} nn{"norvegiais nynorsk"} + nnh{"ngienboon"} no{"norvegiais"} nog{"nogai"} non{"nordic vegl"} nqo{"n’ko"} nr{"ndebele dal sid"} nso{"sotho dal nord"} + nus{"nuer"} nv{"navajo"} nwc{"newari classic"} ny{"nyanja"} @@ -315,16 +360,18 @@ rm{ pam{"pampanga"} pap{"papiamento"} pau{"palau"} + pcm{"pidgin nigerian"} peo{"persian vegl"} phn{"fenizian"} pi{"pali"} pl{"polac"} pon{"ponapean"} + prg{"prussian"} pro{"provenzal vegl"} ps{"paschto"} pt{"portugais"} pt_BR{"portugais brasilian"} - pt_PT{"portugais iberian"} + pt_PT{"portugais europeic"} qu{"quechua"} raj{"rajasthani"} rap{"rapanui"} @@ -333,25 +380,32 @@ rm{ rn{"rundi"} ro{"rumen"} ro_MD{"moldav"} + rof{"rombo"} rom{"romani"} ru{"russ"} rup{"aromunic"} rw{"kinyarwanda"} + rwk{"rwa"} sa{"sanscrit"} sad{"sandawe"} sah{"jakut"} sam{"arameic samaritan"} + saq{"samburu"} sas{"sasak"} sat{"santali"} + sbp{"sangu"} sc{"sard"} scn{"sicilian"} sco{"scot"} sd{"sindhi"} se{"sami dal nord"} + seh{"sena"} sel{"selkup"} + ses{"koyraboro senni"} sg{"sango"} sga{"irlandais vegl"} sh{"serbo-croat"} + shi{"tachelit"} shn{"shan"} si{"singalais"} sid{"sidamo"} @@ -383,6 +437,7 @@ rm{ ta{"tamil"} te{"telugu"} tem{"temne"} + teo{"teso"} ter{"tereno"} tet{"tetum"} tg{"tadjik"} @@ -407,14 +462,16 @@ rm{ tum{"tumbuka"} tvl{"tuvalu"} tw{"twi"} + twq{"tasawaq"} ty{"tahitian"} tyv{"tuvinian"} + tzm{"tamazight"} udm{"udmurt"} ug{"uiguric"} uga{"ugaritic"} uk{"ucranais"} umb{"mbundu"} - und{"linguas betg determinadas"} + und{"lingua nunenconuschenta"} ur{"urdu"} uz{"usbec"} vai{"vai"} @@ -422,21 +479,27 @@ rm{ vi{"vietnamais"} vo{"volapuk"} vot{"votic"} + vun{"vunjo"} wa{"vallon"} + wae{"gualser"} wal{"walamo"} war{"waray"} was{"washo"} wo{"wolof"} xal{"kalmuk"} xh{"xhosa"} + xog{"soga"} yao{"yao"} yap{"yapais"} + yav{"yangben"} yi{"jiddic"} yo{"yoruba"} + yue{"cantonais"} za{"zhuang"} zap{"zapotec"} zbl{"simbols da Bliss"} zen{"zenaga"} + zgh{"marocan tamazight standardisà"} zh{"chinais"} zh_Hans{"chinais simplifitgà"} zh_Hant{"chinais tradiziunal"} @@ -445,7 +508,25 @@ rm{ zxx{"nagins cuntegns linguistics"} zza{"zaza"} } + Languages%long{ + zh_Hans{"chinais mandarin simplifitgà"} + zh_Hant{"chinais mandarin tradiziunal"} + } + Languages%menu{ + ckb{"curd, central"} + yue{"chinais, cantonais"} + zh{"chinais, mandarin"} + } + Languages%short{ + en_GB{"englais GB"} + en_US{"englais USA"} + } + Languages%variant{ + ckb{"curd, sorani"} + } Scripts{ + Aghb{"albanais dal Caucasus"} + Ahom{"ahom"} Arab{"arab"} Armi{"arameic imperial"} Armn{"armen"} @@ -482,18 +563,20 @@ rm{ Grek{"grec"} Gujr{"gujarati"} Guru{"gurmukhi"} + Hanb{"han cun bopomofo"} Hang{"hangul"} Hani{"han"} Hano{"hanunoo"} - Hans{"scrittira chinaisa simplifitgada"} - Hant{"scrittira chinaisa tradiziunala"} + Hans{"simplifitgà"} + Hant{"tradiziunal"} Hebr{"ebraic"} Hira{"hiragana"} Hmng{"pahawn hmong"} - Hrkt{"katanaka u hiragana"} + Hrkt{"scrittira da silbas giapunaisa"} Hung{"ungarais vegl"} Inds{"indus"} Ital{"italic vegl"} + Jamo{"jamo"} Java{"javanais"} Jpan{"giapunais"} Kali{"kayah li"} @@ -523,6 +606,7 @@ rm{ Moon{"moon"} Mtei{"meetei mayek"} Mymr{"burmais"} + Narb{"arab vegl dal nord"} Nkoo{"n’ko"} Ogam{"ogham"} Olck{"ol chiki"} @@ -542,9 +626,11 @@ rm{ Runr{"runic"} Samr{"samaritan"} Sara{"sarati"} + Sarb{"arab vegl dal sid"} Saur{"saurashtra"} Sgnw{"lingua da segns"} Shaw{"shavian"} + Shrd{"sharada"} Sinh{"singalais"} Sund{"sundanais"} Sylo{"syloti nagri"} @@ -572,31 +658,67 @@ rm{ Yiii{"yi"} Zinh{"ertà"} Zmth{"notaziun matematica"} + Zsye{"emojis"} Zsym{"simbols"} - Zxxx{"linguas na scrittas"} + Zxxx{"betg scrit"} Zyyy{"betg determinà"} - Zzzz{"scrittira nunenconuschenta u nunvalaivla"} + Zzzz{"scrittira nunenconuschenta"} + } + Scripts%stand-alone{ + Hans{"han simplifitgà"} + Hant{"han tradiziunal"} } Types{ calendar{ buddhist{"chalender budistic"} chinese{"chalender chinais"} + dangi{"chalender dangi"} + ethiopic{"chalender etiopic"} gregorian{"chalender gregorian"} hebrew{"chalender ebraic"} indian{"chalender naziunal indic"} islamic{"chalender islamic"} islamic-civil{"chalender islamic civil"} + iso8601{"chalender tenor ISO 8601"} japanese{"chalender giapunais"} - roc{"chalendar da la republica chinaisa"} + persian{"chalender persian"} + roc{"chalender da la Republica Chinaisa"} + } + cf{ + account{"format da valuta per la contabilitad"} + standard{"format da valuta da standard"} } collation{ big5han{"chinaisa tradiziunala - Big5"} + ducet{"zavrada unicode standard"} gb2312han{"chinaisa simplifitgada - GB2312"} phonebook{"cudesch da telefon"} pinyin{"Pinyin"} + search{"tschertga generala"} + standard{"zavrada da standard"} stroke{"urden dals stritgs"} traditional{"reglas tradiziunalas"} } + hc{ + h11{"sistem da 12 uras (0–11)"} + h12{"sistem da 12 uras (1–12)"} + h23{"sistem da 24 uras (0–23)"} + h24{"sistem da 24 uras (1–24)"} + } + lb{ + loose{"stil da sigl da lingia liber"} + normal{"stil da sigl da lingia normal"} + strict{"stil da sigl da lingia strict"} + } + ms{ + metric{"sistem metric"} + uksystem{"sistem da mesira imperial"} + ussystem{"sistem da mesira US"} + } + numbers{ + arab{"cifras indic-arabas"} + latn{"cifras occidentalas"} + } } Variants{ 1606NICT{"franzos mesaun tardiv (fin 1606)"} @@ -627,7 +749,6 @@ rm{ TARASK{"ortografia taraskievica"} VALENCIA{"valencian"} } - Version{"37"} codePatterns{ language{"Lingua: {0}"} script{"Scrittira: {0}"} diff --git a/intl/icu/source/data/lang/rn.txt b/intl/icu/source/data/lang/rn.txt index a704a57fafbb..85b66600f998 100644 --- a/intl/icu/source/data/lang/rn.txt +++ b/intl/icu/source/data/lang/rn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rn{ Languages{ ak{"Igikani"} @@ -48,5 +49,4 @@ rn{ zh{"Igishinwa"} zu{"Ikizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ro.txt b/intl/icu/source/data/lang/ro.txt index e1631bb24e97..80e36d3d1c9f 100644 --- a/intl/icu/source/data/lang/ro.txt +++ b/intl/icu/source/data/lang/ro.txt @@ -1,9 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro{ Keys{ + calendar{"tip calendar"} cf{"Format monedă"} - colAlternate{"sortare cu ignorarea simbolurilo"} + colAlternate{"sortare cu ignorarea simbolurilor"} colBackwards{"sortare inversă după accent"} colCaseFirst{"sortare după majuscule/minuscule"} colCaseLevel{"sortare care ține seama de majuscule/minuscule"} @@ -159,7 +161,7 @@ ro{ fi{"finlandeză"} fil{"filipineză"} fj{"fijiană"} - fo{"faroeză"} + fo{"feroeză"} fon{"fon"} fr{"franceză"} frc{"franceză cajun"} @@ -407,6 +409,7 @@ ro{ ro{"română"} rof{"rombo"} rom{"romani"} + root{"rădăcină"} ru{"rusă"} rup{"aromână"} rw{"kinyarwanda"} @@ -498,7 +501,7 @@ ro{ twq{"tasawaq"} ty{"tahitiană"} tyv{"tuvană"} - tzm{"tamazight din Altasul Central"} + tzm{"tamazight din Atlasul Central"} udm{"udmurt"} ug{"uigură"} uga{"ugaritică"} @@ -789,11 +792,40 @@ ro{ } } Variants{ + 1606NICT{"franceză medievală târzie până la 1606"} + 1694ACAD{"franceză modernă veche"} + 1901{"ortografie germană tradițională"} + 1959ACAD{"belarusă academică"} + 1994{"ortografie resiană standardizată"} + 1996{"ortografie germană de la 1996"} + AREVELA{"armeană orientală"} + AREVMDA{"armeană occidentală"} + BAKU1926{"alfabet latin altaic unificat"} + BISKE{"dialect San Giorgio/Bila"} + BOONT{"boontling"} + FONIPA{"alfabet fonetic internațional"} + FONUPA{"alfabet fonetic uralic"} + KKCOR{"ortografie comuna cornish"} + LIPAW{"dialect lipovaz din resiană"} + MONOTON{"monotonică"} + NEDIS{"dialect Natisone"} + NJIVA{"dialect Gniva/Njiva"} + OSOJS{"dialect Oseacco/Osojane"} PINYIN{"pinyin"} + POLYTON{"politonică"} + POSIX{"informatică"} + REVISED{"ortografie revizuită"} + ROZAJ{"dialect resian"} + SAAHO{"dialect saho"} SCOTLAND{"engleză standard scoțiană"} + SCOUSE{"dialect scouse"} + SOLBA{"dialect Stolvizza/Solbica"} + TARASK{"ortografie taraskievica"} + UCCOR{"ortografie unificată cornish"} + UCRCOR{"ortografie revizuită unificată cornish"} + VALENCIA{"valenciană"} WADEGILE{"Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} – toate"} category-list{"{0}: {1}"} @@ -809,6 +841,8 @@ ro{ one{"{0} trasare"} other{"{0} de trasări"} } + subscript{"indice {0}"} + superscript{"exponent {0}"} } codePatterns{ language{"Limbă: {0}"} diff --git a/intl/icu/source/data/lang/ro_MD.txt b/intl/icu/source/data/lang/ro_MD.txt index 4545ad5c2b6d..515bc89c7158 100644 --- a/intl/icu/source/data/lang/ro_MD.txt +++ b/intl/icu/source/data/lang/ro_MD.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro_MD{ Languages{ sw_CD{"swahili (R. D. Congo)"} wal{"wolaytta"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/rof.txt b/intl/icu/source/data/lang/rof.txt index 5c6554087552..623f909f5c72 100644 --- a/intl/icu/source/data/lang/rof.txt +++ b/intl/icu/source/data/lang/rof.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rof{ Languages{ ak{"Kiakani"} @@ -48,5 +49,4 @@ rof{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/root.txt b/intl/icu/source/data/lang/root.txt index 63466ad19516..fa374c359604 100644 --- a/intl/icu/source/data/lang/root.txt +++ b/intl/icu/source/data/lang/root.txt @@ -1,7 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"37"} + Version{"38.1"} characterLabelPattern{ all{"{0} — all"} category-list{"{0}: {1}"} @@ -15,6 +16,8 @@ root{ strokes{ other{"{0} strokes"} } + subscript{"subscript {0}"} + superscript{"superscript {0}"} } codePatterns{ language{"{0}"} diff --git a/intl/icu/source/data/lang/ru.txt b/intl/icu/source/data/lang/ru.txt index 7aebf448a3a1..3a582f58a500 100644 --- a/intl/icu/source/data/lang/ru.txt +++ b/intl/icu/source/data/lang/ru.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ Keys{ calendar{"календарь"} @@ -564,7 +565,7 @@ ru{ } Languages%menu{ ars{"арабская (недждийский)"} - ckb{"курдская (сорани)"} + ckb{"курдский (сорани)"} yue{"юэ"} zh{"севернокитайский"} } @@ -915,6 +916,7 @@ ru{ AREVMDA{"Западно-армянский"} BAKU1926{"Унифицированный тюрско-латинский алфавит"} FONIPA{"Международный фонетический алфавит"} + KKCOR{"Общая орфография"} MONOTON{"Монотонный"} PINYIN{"Пиньинь"} POLYTON{"Многотональный"} @@ -926,7 +928,6 @@ ru{ VALENCIA{"Валенсийский"} WADEGILE{"Система Уэйда – Джайлза"} } - Version{"37"} characterLabelPattern{ all{"{0} — все"} category-list{"{0}: {1}"} @@ -943,6 +944,8 @@ ru{ one{"{0} черта"} other{"{0} черты"} } + subscript{"подстрочные {0}"} + superscript{"надстрочные {0}"} } codePatterns{ language{"Язык: {0}"} diff --git a/intl/icu/source/data/lang/rw.txt b/intl/icu/source/data/lang/rw.txt index 5802e94b0105..d0eeffb25353 100644 --- a/intl/icu/source/data/lang/rw.txt +++ b/intl/icu/source/data/lang/rw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rw{ Languages{ af{"Ikinyafurikaneri"} @@ -108,5 +109,4 @@ rw{ yi{"Inyeyidishi"} zu{"Inyezulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/rwk.txt b/intl/icu/source/data/lang/rwk.txt index 99718f9ff65a..922ae45a6934 100644 --- a/intl/icu/source/data/lang/rwk.txt +++ b/intl/icu/source/data/lang/rwk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rwk{ Languages{ ak{"Kiakanyi"} @@ -48,5 +49,4 @@ rwk{ zh{"Kyichina"} zu{"Kyizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sa.txt b/intl/icu/source/data/lang/sa.txt new file mode 100644 index 000000000000..e8ca1050e825 --- /dev/null +++ b/intl/icu/source/data/lang/sa.txt @@ -0,0 +1,77 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +sa{ + Languages{ + ace{"अचिनीस्"} + ach{"अचोलि"} + anp{"अङ्गिक"} + de{"जर्मनभाषा:"} + de_AT{"ऑस्ट्रियाई जर्मनभाषा:"} + de_CH{"स्विस उच्च जर्मनभाषा:"} + en{"आङ्ग्लभाषा"} + en_AU{"ऑस्ट्रेलियादेशः आङ्ग्लभाषा"} + en_CA{"कनाडादेशः आङ्ग्लभाषा"} + en_GB{"आङ्ग्लदेशीय आङ्ग्लभाषा:"} + en_US{"अमेरिकादेशीय आङ्ग्लभाषा:"} + es{"स्पेनीय भाषा:"} + es_419{"लैटिन अमेरिकादेशीय स्पेनीय भाषा:"} + es_ES{"फिरङ्गिन् स्पेनीय भाषा:"} + es_MX{"मैक्सिकन स्पेनीय भाषा:"} + fr{"फ़्रांसदेशीय भाषा:"} + fr_CA{"कनाडादेशः फ़्रांसदेशीय भाषा:"} + fr_CH{"स्विस फ़्रांसदेशीय भाषा:"} + it{"इटलीदेशीय भाषा:"} + ja{"सूर्यमूलीय भाषा:"} + pt{"पुर्तगालदेशीय भाषा:"} + pt_BR{"ब्राज़ीली पुर्तगालदेशीय भाषा:"} + pt_PT{"फिरङ्गिन् पुर्तगालदेशीय भाषा:"} + ru{"रष्यदेशीय भाषा:"} + sa{"संस्कृत भाषा"} + und{"अज्ञात भाषा:"} + zh{"चीनी"} + zh_Hans{"सरलीकृत चीनी"} + zh_Hant{"परम्परागत चीनी"} + } + Languages%long{ + zh_Hans{"सरलीकृत मैंडेरिन चीनी"} + zh_Hant{"परम्परागत मैंडेरिन चीनी"} + } + Languages%menu{ + zh{"चीनी, मैंडेरिन"} + } + Languages%short{ + en_GB{"यूके आङ्ग्लभाषा:"} + en_US{"यूएस आङ्ग्लभाषा:"} + } + Scripts{ + Arab{"अरबी"} + Cyrl{"सिरिलिक:"} + Hans{"सरलीकृत"} + Hant{"परम्परागत"} + Latn{"लैटिन:"} + Zxxx{"अलिखित:"} + Zzzz{"अज्ञात लिपि:"} + } + Scripts%stand-alone{ + Hans{"सरलीकृत हान"} + Hant{"परम्परागत हान"} + } + Types{ + calendar{ + gregorian{"ग्रेगोरियन पञ्चाङ्ग"} + } + collation{ + standard{"मानक न्यूनतम क्रम"} + traditional{"परम्परागत न्यूनतम क्रम"} + } + numbers{ + latn{"पाश्चात्य अङ्कः"} + } + } + codePatterns{ + language{"भाषा: {0}"} + script{"लिपि: {0}"} + territory{"क्षेत्र: {0}"} + } +} diff --git a/intl/icu/source/data/lang/sah.txt b/intl/icu/source/data/lang/sah.txt index 01916f04d113..5dd1b836671e 100644 --- a/intl/icu/source/data/lang/sah.txt +++ b/intl/icu/source/data/lang/sah.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sah{ Keys{ calendar{"Халандаар"} @@ -91,7 +92,6 @@ sah{ h24{"24 чаастаах тиһик (0–24)"} } } - Version{"37"} characterLabelPattern{ strokes{ other{"{0} Strokes"} diff --git a/intl/icu/source/data/lang/saq.txt b/intl/icu/source/data/lang/saq.txt index ffff0707fdd4..b058f02da71d 100644 --- a/intl/icu/source/data/lang/saq.txt +++ b/intl/icu/source/data/lang/saq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml saq{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ saq{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sat.txt b/intl/icu/source/data/lang/sat.txt index 32ee8b9f6be9..8cde4acff65e 100644 --- a/intl/icu/source/data/lang/sat.txt +++ b/intl/icu/source/data/lang/sat.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat{ Languages{ de{"ᱡᱟᱨᱢᱟᱱ"} @@ -66,7 +67,6 @@ sat{ latn{"ᱣᱮᱥᱴᱟᱨᱱ ᱮᱞ"} } } - Version{"37"} codePatterns{ language{"ᱯᱟᱹᱨᱥᱤ: {0}"} script{"ᱪᱤᱠᱤ/ᱦᱟᱨᱚᱯᱺ {0}"} diff --git a/intl/icu/source/data/lang/sat_IN.txt b/intl/icu/source/data/lang/sat_IN.txt index c4976b4d7f96..15af3290b576 100644 --- a/intl/icu/source/data/lang/sat_IN.txt +++ b/intl/icu/source/data/lang/sat_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_IN{ "%%ALIAS"{"sat_Olck_IN"} } diff --git a/intl/icu/source/data/lang/sat_Olck.txt b/intl/icu/source/data/lang/sat_Olck.txt index 0d7225f984f0..f09b6a0014dd 100644 --- a/intl/icu/source/data/lang/sat_Olck.txt +++ b/intl/icu/source/data/lang/sat_Olck.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_Olck{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/sat_Olck_IN.txt b/intl/icu/source/data/lang/sat_Olck_IN.txt index 8bda43c4ea7c..0a44bdb50245 100644 --- a/intl/icu/source/data/lang/sat_Olck_IN.txt +++ b/intl/icu/source/data/lang/sat_Olck_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/sbp.txt b/intl/icu/source/data/lang/sbp.txt index 0ab2a07388ca..b0fe10cef234 100644 --- a/intl/icu/source/data/lang/sbp.txt +++ b/intl/icu/source/data/lang/sbp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sbp{ Languages{ ak{"Ishiyakani"} @@ -48,5 +49,4 @@ sbp{ zh{"Ishishina"} zu{"Ishisulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sd.txt b/intl/icu/source/data/lang/sd.txt index fa91adcce0c8..e0724ede3bb4 100644 --- a/intl/icu/source/data/lang/sd.txt +++ b/intl/icu/source/data/lang/sd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd{ Keys{ calendar{"ڪئلينڊر"} @@ -37,8 +38,8 @@ sd{ awa{"اواڌي"} ay{"ایمارا"} az{"آزربائيجاني"} - ba{"بشڪر"} - ban{"بالي"} + ba{"ڪينيڊا"} + ban{"بالينيس"} bas{"باسا"} be{"بيلاروسي"} bem{"بيمبا"} @@ -100,12 +101,12 @@ sd{ en_GB{"برطانوي انگريزي"} en_US{"آمريڪي انگريزي"} eo{"ايسپرانٽو"} - es{"اسپيني"} + es{"هسپانوي"} es_419{"لاطيني آمريڪي اسپينش"} es_ES{"يورپي اسپيني"} es_MX{"ميڪسيڪين اسپيني"} et{"ايستونائي"} - eu{"باسڪي"} + eu{"باسق"} ewo{"اوانڊو"} fa{"فارسي"} fa_AF{"دري"} @@ -115,7 +116,7 @@ sd{ fj{"فجي"} fo{"فيروايس"} fon{"فون"} - fr{"فرانسي"} + fr{"فرانسيسي"} fr_CA{"ڪينيڊيائي فرانسيسي"} fr_CH{"سوئس فرانسيسي"} fur{"فرائي لئين"} @@ -163,7 +164,7 @@ sd{ jgo{"نغومبا"} jmc{"ميڪم"} jv{"جاونيز"} - ka{"جارجين"} + ka{"جارجيائي"} kab{"ڪبائل"} kac{"ڪچن"} kaj{"پوڪيپسي"} @@ -326,7 +327,7 @@ sd{ si{"سنهالا"} sk{"سلواڪي"} sl{"سلوويني"} - sm{"ساموآن"} + sm{"سموئا"} sma{"ڏکڻ سامي"} smj{"لولي سامي"} smn{"اناري سامي"} @@ -342,7 +343,7 @@ sd{ st{"ڏکڻ سوٿي"} su{"سوڊاني"} suk{"سڪوما"} - sv{"سويڊني"} + sv{"سويڊش"} sw{"سواحيلي"} sw_CD{"ڪونگو سواحيلي"} swb{"ڪمورين"} @@ -352,19 +353,19 @@ sd{ tem{"تمني"} teo{"تيسو"} tet{"تيتم"} - tg{"تاجڪي"} + tg{"تاجڪ"} th{"ٿائي"} ti{"تگرينيائي"} tig{"تگري"} - tk{"ترڪماني"} + tk{"ترڪمين"} tlh{"ڪلون"} tn{"تسوانا"} to{"تونگن"} tpi{"تاڪ پسن"} - tr{"ترڪ"} + tr{"ترڪش"} trv{"تاروڪو"} ts{"سونگا"} - tt{"تاتري"} + tt{"تاتار"} tum{"تمبوڪا"} tvl{"توالو"} twq{"تساوڪي"} @@ -387,7 +388,7 @@ sd{ wae{"والسر"} wal{"وولايٽا"} war{"واري"} - wo{"وولف"} + wo{"وولوف"} xal{"ڪيلمڪ"} xh{"زھوسا"} xog{"سوگا"} @@ -449,7 +450,7 @@ sd{ Kore{"ڪوريائي"} Laoo{"لائو"} Latn{"لاطيني"} - Mlym{"مليالم"} + Mlym{"ملايالم"} Mong{"منگولي"} Mult{"ملتاني"} Mymr{"ميانمر"} @@ -550,7 +551,9 @@ sd{ tibt{"تبتي عدد"} } } - Version{"37"} + Variants{ + POSIX{"ڪمپيوٽر"} + } characterLabelPattern{ all{"{0} — سڀئي"} category-list{"{0}: {1}"} @@ -565,6 +568,8 @@ sd{ one{"{0} اسٽروڪ"} other{"{0} اسٽروڪَ"} } + subscript{"سب اسڪرپٽ {0}"} + superscript{"سپر اسڪرپٽ {0}"} } codePatterns{ language{"زبان: {0}"} diff --git a/intl/icu/source/data/lang/sd_Arab.txt b/intl/icu/source/data/lang/sd_Arab.txt index 52a97c862438..c089e06d8ec5 100644 --- a/intl/icu/source/data/lang/sd_Arab.txt +++ b/intl/icu/source/data/lang/sd_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/sd_Arab_PK.txt b/intl/icu/source/data/lang/sd_Arab_PK.txt index 4a9803a3c859..2e57dba96af5 100644 --- a/intl/icu/source/data/lang/sd_Arab_PK.txt +++ b/intl/icu/source/data/lang/sd_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/sd_Deva.txt b/intl/icu/source/data/lang/sd_Deva.txt index fe3c3509cd0f..b14ebee5f38e 100644 --- a/intl/icu/source/data/lang/sd_Deva.txt +++ b/intl/icu/source/data/lang/sd_Deva.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Deva{ %%Parent{"root"} Languages{ @@ -74,7 +75,6 @@ sd_Deva{ latn{"मग़रबी डिजिट"} } } - Version{"37"} codePatterns{ language{"भाषा: {0}"} script{"लिपि: {0}"} diff --git a/intl/icu/source/data/lang/sd_PK.txt b/intl/icu/source/data/lang/sd_PK.txt index 766360070b4e..b7def87808ea 100644 --- a/intl/icu/source/data/lang/sd_PK.txt +++ b/intl/icu/source/data/lang/sd_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_PK{ "%%ALIAS"{"sd_Arab_PK"} } diff --git a/intl/icu/source/data/lang/se.txt b/intl/icu/source/data/lang/se.txt index 4dc3544cd87e..0bdb3c5c3aaf 100644 --- a/intl/icu/source/data/lang/se.txt +++ b/intl/icu/source/data/lang/se.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se{ Keys{ calendar{"kaleandar"} @@ -154,7 +155,6 @@ se{ PINYIN{"pinyin"} WADEGILE{"Wade-Giles"} } - Version{"37"} codePatterns{ language{"giella: {0}"} script{"chállin: {0}"} diff --git a/intl/icu/source/data/lang/se_FI.txt b/intl/icu/source/data/lang/se_FI.txt index 3b6a899f11e1..3cc8fd5e5661 100644 --- a/intl/icu/source/data/lang/se_FI.txt +++ b/intl/icu/source/data/lang/se_FI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se_FI{ Languages{ ace{"ačehgiella"} @@ -56,7 +57,6 @@ se_FI{ gregorian{"gregorialaš kalendar"} } } - Version{"37"} codePatterns{ script{"čállin: {0}"} } diff --git a/intl/icu/source/data/lang/seh.txt b/intl/icu/source/data/lang/seh.txt index cd0d1ae42dd7..ea0baa7b67c7 100644 --- a/intl/icu/source/data/lang/seh.txt +++ b/intl/icu/source/data/lang/seh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml seh{ Languages{ ak{"akan"} @@ -48,5 +49,4 @@ seh{ zh{"chinês"} zu{"zulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ses.txt b/intl/icu/source/data/lang/ses.txt index 025c44742673..c35619a6d1db 100644 --- a/intl/icu/source/data/lang/ses.txt +++ b/intl/icu/source/data/lang/ses.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ses{ Languages{ ak{"Akan senni"} @@ -48,5 +49,4 @@ ses{ zh{"Sinuwa senni, Mandareŋ"} zu{"Zulu senni"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sg.txt b/intl/icu/source/data/lang/sg.txt index 2468611dc137..1f76ddb3f0b1 100644 --- a/intl/icu/source/data/lang/sg.txt +++ b/intl/icu/source/data/lang/sg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sg{ Languages{ ak{"Akâan"} @@ -48,5 +49,4 @@ sg{ zh{"Shinuäa"} zu{"Zûlu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sh.txt b/intl/icu/source/data/lang/sh.txt index 74b646a22923..83091b2d0a58 100644 --- a/intl/icu/source/data/lang/sh.txt +++ b/intl/icu/source/data/lang/sh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh{ "%%ALIAS"{"sr_Latn"} } diff --git a/intl/icu/source/data/lang/sh_BA.txt b/intl/icu/source/data/lang/sh_BA.txt index 93bdac63f042..7f73cd515f1a 100644 --- a/intl/icu/source/data/lang/sh_BA.txt +++ b/intl/icu/source/data/lang/sh_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_BA{ "%%ALIAS"{"sr_Latn_BA"} } diff --git a/intl/icu/source/data/lang/sh_CS.txt b/intl/icu/source/data/lang/sh_CS.txt index 224568a08c08..3b2f92bbf46c 100644 --- a/intl/icu/source/data/lang/sh_CS.txt +++ b/intl/icu/source/data/lang/sh_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/lang/sh_YU.txt b/intl/icu/source/data/lang/sh_YU.txt index 8a7d4609802f..dc5a35beadb0 100644 --- a/intl/icu/source/data/lang/sh_YU.txt +++ b/intl/icu/source/data/lang/sh_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/lang/shi.txt b/intl/icu/source/data/lang/shi.txt index 75fb26f9b8c3..727be6ec4cc7 100644 --- a/intl/icu/source/data/lang/shi.txt +++ b/intl/icu/source/data/lang/shi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi{ Languages{ ak{"ⵜⴰⴽⴰⵏⵜ"} @@ -48,5 +49,4 @@ shi{ zh{"ⵜⴰⵛⵉⵏⵡⵉⵜ"} zu{"ⵜⴰⵣⵓⵍⵓⵜ"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/shi_Latn.txt b/intl/icu/source/data/lang/shi_Latn.txt index a6501d3db7f9..eab861db9eef 100644 --- a/intl/icu/source/data/lang/shi_Latn.txt +++ b/intl/icu/source/data/lang/shi_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Latn{ %%Parent{"root"} Languages{ @@ -49,5 +50,4 @@ shi_Latn{ zh{"Tacinwit"} zu{"Tazulut"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/shi_MA.txt b/intl/icu/source/data/lang/shi_MA.txt index 00de1b1b27a7..c96251db2b7c 100644 --- a/intl/icu/source/data/lang/shi_MA.txt +++ b/intl/icu/source/data/lang/shi_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_MA{ "%%ALIAS"{"shi_Tfng_MA"} } diff --git a/intl/icu/source/data/lang/shi_Tfng.txt b/intl/icu/source/data/lang/shi_Tfng.txt index 397f53f49446..723cdf148de1 100644 --- a/intl/icu/source/data/lang/shi_Tfng.txt +++ b/intl/icu/source/data/lang/shi_Tfng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Tfng{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/shi_Tfng_MA.txt b/intl/icu/source/data/lang/shi_Tfng_MA.txt index 978cd5cab856..3ec81a4f824a 100644 --- a/intl/icu/source/data/lang/shi_Tfng_MA.txt +++ b/intl/icu/source/data/lang/shi_Tfng_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/si.txt b/intl/icu/source/data/lang/si.txt index 9daaa9e6e257..9587b4e123a0 100644 --- a/intl/icu/source/data/lang/si.txt +++ b/intl/icu/source/data/lang/si.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml si{ Keys{ calendar{"දින දර්ශනය"} @@ -18,7 +19,7 @@ si{ ada{"අඩන්ග්මෙ"} ady{"අඩිඝෙ"} aeb{"ටියුනිසියනු අරාබි"} - af{"අෆ්රිකාන්ස්"} + af{"අෆ්‍රිකාන්ස්"} agq{"ඇගම්"} ain{"අයිනු"} ak{"අකාන්"} @@ -422,6 +423,7 @@ si{ zh_Hant{"සාම්ප්‍රදායික මැන්ඩරීන් චීන"} } Languages%menu{ + ckb{"කුර්දිෂ්, මධ්‍යම"} yue{"චීන, කැන්ටොනීස්"} zh{"චීන, මැන්ඩරීන්"} } @@ -430,6 +432,9 @@ si{ en_GB{"එ.රා ඉංග්‍රීසි"} en_US{"එ.ජ ඉංග්‍රීසි"} } + Languages%variant{ + ckb{"කුර්දිෂ්, සොරානි"} + } Scripts{ Arab{"අරාබි"} Armn{"ආර්මේනියානු"} @@ -558,7 +563,6 @@ si{ tibt{"ටිබෙට ඉලක්කම්"} } } - Version{"37"} characterLabelPattern{ all{"{0} — සියල්ල"} category-list{"{0}: {1}"} @@ -573,6 +577,8 @@ si{ one{"{0} පහර"} other{"{0} පහර"} } + subscript{"යටකුර {0}"} + superscript{"උඩකුර {0}"} } codePatterns{ language{"{0} භාෂාව: සිංහල"} diff --git a/intl/icu/source/data/lang/sk.txt b/intl/icu/source/data/lang/sk.txt index 711f0d6bc090..9d2719da17b4 100644 --- a/intl/icu/source/data/lang/sk.txt +++ b/intl/icu/source/data/lang/sk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk{ Keys{ calendar{"kalendár"} @@ -507,7 +508,7 @@ sk{ twq{"tasawaq"} ty{"tahitčina"} tyv{"tuviančina"} - tzm{"tuaregčina (stredomarocká)"} + tzm{"tamazight (stredomarocký)"} udm{"udmurtčina"} ug{"ujgurčina"} uga{"ugaritčina"} @@ -774,7 +775,6 @@ sk{ Variants{ SCOTLAND{"škótska štandardná angličtina"} } - Version{"37"} characterLabelPattern{ all{"{0} – všetko"} category-list{"{0}: {1}"} @@ -791,6 +791,8 @@ sk{ one{"{0} ťah"} other{"{0} ťahov"} } + subscript{"{0} – dolný index"} + superscript{"{0} – horný index"} } codePatterns{ language{"Jazyk: {0}"} diff --git a/intl/icu/source/data/lang/sl.txt b/intl/icu/source/data/lang/sl.txt index 9f3cc49eaaf6..4314ccf5d099 100644 --- a/intl/icu/source/data/lang/sl.txt +++ b/intl/icu/source/data/lang/sl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl{ Keys{ calendar{"koledar"} @@ -138,11 +139,12 @@ sl{ en{"angleščina"} en_AU{"avstralska angleščina"} en_CA{"kanadska angleščina"} - en_GB{"angleščina (VB)"} - en_US{"angleščina (ZDA)"} + en_GB{"britanska angleščina"} + en_US{"ameriška angleščina"} enm{"srednja angleščina"} eo{"esperanto"} es{"španščina"} + es_419{"latinskoameriška španščina"} es_ES{"evropska španščina"} es_MX{"mehiška španščina"} et{"estonščina"} @@ -194,7 +196,7 @@ sl{ hai{"haidščina"} haw{"havajščina"} he{"hebrejščina"} - hi{"hindujščina"} + hi{"hindijščina"} hil{"hiligajnonščina"} hit{"hetitščina"} hmn{"hmonščina"} @@ -307,7 +309,7 @@ sl{ men{"mende"} mer{"meru"} mfe{"morisjenščina"} - mg{"malagaščina"} + mg{"malgaščina"} mga{"srednja irščina"} mgh{"makuva-meto"} mgo{"meta"} @@ -500,7 +502,7 @@ sl{ vai{"vajščina"} ve{"venda"} vi{"vietnamščina"} - vo{"volapuk"} + vo{"volapik"} vot{"votjaščina"} vun{"vunjo"} wa{"valonščina"} @@ -573,12 +575,12 @@ sl{ Grek{"grški"} Gujr{"gudžaratski"} Guru{"gurmuki"} - Hanb{"Han + Bopomofo"} + Hanb{"han + bopomofo"} Hang{"hangul"} Hani{"kanji"} Hano{"hanunski"} - Hans{"poenostavljena pisava han"} - Hant{"tradicionalna pisava han"} + Hans{"poenostavljena pisava"} + Hant{"tradicionalna pisava"} Hebr{"hebrejski"} Hira{"hiragana"} Hmng{"pahavhmonska zlogovna pisava"} @@ -586,7 +588,7 @@ sl{ Hung{"staroogrski"} Inds{"induški"} Ital{"staroitalski"} - Jamo{"Jamo"} + Jamo{"jamo"} Java{"javanski"} Jpan{"japonski"} Kali{"karenski"} @@ -663,6 +665,10 @@ sl{ Zyyy{"splošno"} Zzzz{"neznan ali neveljaven zapis"} } + Scripts%stand-alone{ + Hans{"poenostavljena pisava han"} + Hant{"tradicionalna pisava han"} + } Scripts%variant{ Arab{"perzijskoarabski"} } @@ -878,7 +884,6 @@ sl{ VALENCIA{"valencijski pravopis"} WADEGILE{"romanizacija Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} – vse"} category-list{"{0}: {1}"} @@ -890,11 +895,13 @@ sl{ other{"{0} – drugo"} scripts{"pisave – {0}"} strokes{ - few{"{0} potez"} + few{"{0} poteze"} one{"{0} poteza"} other{"{0} potez"} two{"{0} potezi"} } + subscript{"podpisano {0}"} + superscript{"nadpisano {0}"} } codePatterns{ language{"Jezik: {0}"} diff --git a/intl/icu/source/data/lang/smn.txt b/intl/icu/source/data/lang/smn.txt index 7f17a56f8693..4da0d92776cc 100644 --- a/intl/icu/source/data/lang/smn.txt +++ b/intl/icu/source/data/lang/smn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml smn{ Languages{ aa{"afar"} @@ -397,7 +398,6 @@ smn{ zxx{"ij kielâlâš siskáldâs"} zza{"zazakielâ"} } - Version{"37"} codePatterns{ language{"kielâ: {0}"} script{"čäällimvuáhádâh: {0}"} diff --git a/intl/icu/source/data/lang/sn.txt b/intl/icu/source/data/lang/sn.txt index f2b9c984f5c1..fa296044075b 100644 --- a/intl/icu/source/data/lang/sn.txt +++ b/intl/icu/source/data/lang/sn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sn{ Languages{ ak{"chiAkani"} @@ -48,5 +49,4 @@ sn{ zh{"chiChinese"} zu{"chiZulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/so.txt b/intl/icu/source/data/lang/so.txt index ddaecdcbfc7e..5759afc97732 100644 --- a/intl/icu/source/data/lang/so.txt +++ b/intl/icu/source/data/lang/so.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so{ Keys{ calendar{"Habeentiris"} @@ -72,7 +73,7 @@ so{ fa_AF{"Faarsi"} ff{"Fuulah"} fi{"Finishka"} - fil{"Tagalog"} + fil{"Filibiino"} fo{"Farowsi"} fr{"Faransiis"} fr_CA{"Faransiiska Kanada"} @@ -154,6 +155,7 @@ so{ mk{"Masadooniyaan"} ml{"Malayalam"} mn{"Mangooli"} + mni{"Maniburi"} mr{"Maarati"} ms{"Malaay"} mt{"Maltiis"} @@ -178,6 +180,7 @@ so{ or{"Oodhiya"} os{"Oseetic"} pa{"Bunjaabi"} + pcm{"Bidjinka Nayjeeriya"} pl{"Boolish"} prg{"Brashiyaanki Hore"} ps{"Bashtuu"} @@ -196,6 +199,7 @@ so{ sa{"Sanskrit"} sah{"Saaqa"} saq{"Sambuuru"} + sat{"Santali"} sbp{"Sangu"} sd{"Siindhi"} se{"Koonfurta Saami"} @@ -443,7 +447,7 @@ so{ ethiopic-amete-alem{"Taariikhda Itoobiya ee Amete Alem"} gregorian{"Habeetiriska Geregoriyaan"} hebrew{"Habeentiriska yuhuudda"} - indian{"Taariikhda Qaranka Hindiya"} + indian{"Habeentiris Qarameedka Hindiya"} islamic{"Habeentiriska islaamka"} islamic-civil{"Taariikhda Islaamiga (tabular, civil epoch)"} islamic-rgsa{"Habeentiriska Islaamka (Sacuudiga, aragtida)"} @@ -624,7 +628,6 @@ so{ UCRCOR{"orthographyga mideeysan ee hadana ladul maray"} VALENCIA{"Faleensiyaawi"} } - Version{"37"} characterLabelPattern{ all{"{0} dhamaan"} compatibility{"{0} — waafaqsanaanta"} @@ -638,6 +641,8 @@ so{ one{"{0} garaaca"} other{"{0} graacis"} } + subscript{"kordhig{0}"} + superscript{"kordhig {0}"} } codePatterns{ language{"Luuqad : {0}"} diff --git a/intl/icu/source/data/lang/sq.txt b/intl/icu/source/data/lang/sq.txt index 2e07ac691a9d..383b66faed2a 100644 --- a/intl/icu/source/data/lang/sq.txt +++ b/intl/icu/source/data/lang/sq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq{ Keys{ calendar{"Kalendari"} @@ -496,7 +497,7 @@ sq{ iso8601{"kalendar ISO-8601"} japanese{"kalendar japonez"} persian{"kalendar persian"} - roc{"kalendar minguo (i Republikës së Kinës)"} + roc{"kalendar minguo"} } cf{ account{"format valutor llogaritës"} @@ -567,7 +568,6 @@ sq{ tibt{"shifra tibetiane"} } } - Version{"37"} characterLabelPattern{ all{"{0} — Të gjitha"} category-list{"{0}: {1}"} @@ -582,6 +582,8 @@ sq{ one{"{0} vijëzim drejtshkrimor"} other{"{0} vijëzime drejtshkrimore"} } + subscript{"nënshënim {0}"} + superscript{"mbishënim {0}"} } codePatterns{ language{"Gjuha: {0}"} diff --git a/intl/icu/source/data/lang/sr.txt b/intl/icu/source/data/lang/sr.txt index 7a6e735f2212..e2e9532d66e1 100644 --- a/intl/icu/source/data/lang/sr.txt +++ b/intl/icu/source/data/lang/sr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr{ Keys{ calendar{"календар"} @@ -113,6 +114,7 @@ sr{ dar{"даргински"} dav{"таита"} de{"немачки"} + de_AT{"аустријски немачки"} de_CH{"швајцарски високи немачки"} del{"делаверски"} den{"слејви"} @@ -530,6 +532,10 @@ sr{ zxx{"без лингвистичког садржаја"} zza{"заза"} } + Languages%long{ + zh_Hans{"поједностављени мандарински кинески"} + zh_Hant{"традиционални мандарински кинески"} + } Languages%menu{ yue{"кантонски кинески"} zh{"мандарински кинески"} @@ -852,7 +858,6 @@ sr{ TARASK{"Тараскијевичка ортографија"} VALENCIA{"Валенцијска"} } - Version{"37"} characterLabelPattern{ all{"{0} — све"} category-list{"{0}: {1}"} @@ -868,6 +873,8 @@ sr{ one{"{0} потез"} other{"{0} потеза"} } + subscript{"написано испод {0}"} + superscript{"написано изнад {0}"} } codePatterns{ language{"Језик: {0}"} diff --git a/intl/icu/source/data/lang/sr_BA.txt b/intl/icu/source/data/lang/sr_BA.txt index edad17f703fe..04f2efd1a7a2 100644 --- a/intl/icu/source/data/lang/sr_BA.txt +++ b/intl/icu/source/data/lang/sr_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_BA{ "%%ALIAS"{"sr_Cyrl_BA"} } diff --git a/intl/icu/source/data/lang/sr_CS.txt b/intl/icu/source/data/lang/sr_CS.txt index 5f8becfab3ed..6a32f49e2a6f 100644 --- a/intl/icu/source/data/lang/sr_CS.txt +++ b/intl/icu/source/data/lang/sr_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_CS{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/lang/sr_Cyrl.txt b/intl/icu/source/data/lang/sr_Cyrl.txt index df3a287587cf..772d8b3da519 100644 --- a/intl/icu/source/data/lang/sr_Cyrl.txt +++ b/intl/icu/source/data/lang/sr_Cyrl.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/sr_Cyrl_BA.txt b/intl/icu/source/data/lang/sr_Cyrl_BA.txt index 9b37c8c12a72..31f76ee12697 100644 --- a/intl/icu/source/data/lang/sr_Cyrl_BA.txt +++ b/intl/icu/source/data/lang/sr_Cyrl_BA.txt @@ -1,16 +1,31 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_BA{ + Keys{ + collation{"редослијед сортирања"} + ms{"систем мјерних јединица"} + } Languages{ + ar_001{"савремени стандардни арапски"} arn{"мапудунгун"} be{"бјелоруски"} bm{"бамананкан"} bn{"бангла"} - gsw{"швајцарски немачки"} + de{"њемачки"} + en_GB{"енглески (Велика Британија)"} + es_ES{"шпански (Европа)"} + fa_AF{"дари"} + gsw{"њемачки (Швајцарска)"} ht{"хаићански креолски"} lo{"лаошки"} + lrc{"сјеверни лури"} moh{"мохок"} + nd{"сјеверни ндебеле"} + nds{"нискоњемачки"} nqo{"н’ко"} + pt_PT{"португалски (Португал)"} + se{"сјеверни сами"} shi{"јужни шилха"} si{"синхалски"} sw_CD{"кисвахили"} @@ -21,5 +36,14 @@ sr_Cyrl_BA{ zh_Hant{"традиционални кинески"} zu{"исизулу"} } - Version{"37"} + Types{ + collation{ + ducet{"подразумијевани Unicode редослијед сортирања"} + search{"претрага опште намјене"} + standard{"стандардни редослијед сортирања"} + } + numbers{ + mymr{"мјанмарске цифре"} + } + } } diff --git a/intl/icu/source/data/lang/sr_Cyrl_CS.txt b/intl/icu/source/data/lang/sr_Cyrl_CS.txt index 9325e5a76a14..2da82d2d35e0 100644 --- a/intl/icu/source/data/lang/sr_Cyrl_CS.txt +++ b/intl/icu/source/data/lang/sr_Cyrl_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_CS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/lang/sr_Cyrl_ME.txt b/intl/icu/source/data/lang/sr_Cyrl_ME.txt index 5fcfd9a7596e..bd509f81fca2 100644 --- a/intl/icu/source/data/lang/sr_Cyrl_ME.txt +++ b/intl/icu/source/data/lang/sr_Cyrl_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_ME{ Languages{ arn{"мапудунгун"} @@ -17,5 +18,4 @@ sr_Cyrl_ME{ zgh{"стандардни марокански тамашек"} zu{"исизулу"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sr_Cyrl_RS.txt b/intl/icu/source/data/lang/sr_Cyrl_RS.txt index 7ef8fabce652..c74b8608c8e9 100644 --- a/intl/icu/source/data/lang/sr_Cyrl_RS.txt +++ b/intl/icu/source/data/lang/sr_Cyrl_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/sr_Cyrl_XK.txt b/intl/icu/source/data/lang/sr_Cyrl_XK.txt index 49c86001c6ee..a9c3bb5071fc 100644 --- a/intl/icu/source/data/lang/sr_Cyrl_XK.txt +++ b/intl/icu/source/data/lang/sr_Cyrl_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_XK{ Languages{ bm{"бамананкан"} @@ -17,5 +18,4 @@ sr_Cyrl_XK{ zgh{"стандардни марокански тамашек"} zu{"исизулу"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sr_Cyrl_YU.txt b/intl/icu/source/data/lang/sr_Cyrl_YU.txt index 806d42c439fb..5874f8cb4091 100644 --- a/intl/icu/source/data/lang/sr_Cyrl_YU.txt +++ b/intl/icu/source/data/lang/sr_Cyrl_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_YU{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/lang/sr_Latn.txt b/intl/icu/source/data/lang/sr_Latn.txt index 21c8b3cce3df..b6c811c3357a 100644 --- a/intl/icu/source/data/lang/sr_Latn.txt +++ b/intl/icu/source/data/lang/sr_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn{ %%Parent{"root"} Keys{ @@ -114,6 +115,7 @@ sr_Latn{ dar{"darginski"} dav{"taita"} de{"nemački"} + de_AT{"austrijski nemački"} de_CH{"švajcarski visoki nemački"} del{"delaverski"} den{"slejvi"} @@ -531,6 +533,10 @@ sr_Latn{ zxx{"bez lingvističkog sadržaja"} zza{"zaza"} } + Languages%long{ + zh_Hans{"pojednostavljeni mandarinski kineski"} + zh_Hant{"tradicionalni mandarinski kineski"} + } Languages%menu{ yue{"kantonski kineski"} zh{"mandarinski kineski"} @@ -853,7 +859,6 @@ sr_Latn{ TARASK{"Taraskijevička ortografija"} VALENCIA{"Valencijska"} } - Version{"37"} characterLabelPattern{ all{"{0} — sve"} category-list{"{0}: {1}"} @@ -869,6 +874,8 @@ sr_Latn{ one{"{0} potez"} other{"{0} poteza"} } + subscript{"napisano ispod {0}"} + superscript{"napisano iznad {0}"} } codePatterns{ language{"Jezik: {0}"} diff --git a/intl/icu/source/data/lang/sr_Latn_BA.txt b/intl/icu/source/data/lang/sr_Latn_BA.txt index 4540f09a8b4b..f28f61dd51ed 100644 --- a/intl/icu/source/data/lang/sr_Latn_BA.txt +++ b/intl/icu/source/data/lang/sr_Latn_BA.txt @@ -1,16 +1,31 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_BA{ + Keys{ + collation{"redoslijed sortiranja"} + ms{"sistem mjernih jedinica"} + } Languages{ + ar_001{"savremeni standardni arapski"} arn{"mapudungun"} be{"bjeloruski"} bm{"bamanankan"} bn{"bangla"} - gsw{"švajcarski nemački"} + de{"njemački"} + en_GB{"engleski (Velika Britanija)"} + es_ES{"španski (Evropa)"} + fa_AF{"dari"} + gsw{"njemački (Švajcarska)"} ht{"haićanski kreolski"} lo{"laoški"} + lrc{"sjeverni luri"} moh{"mohok"} + nd{"sjeverni ndebele"} + nds{"niskonjemački"} nqo{"n’ko"} + pt_PT{"portugalski (Portugal)"} + se{"sjeverni sami"} shi{"južni šilha"} si{"sinhalski"} sw_CD{"kisvahili"} @@ -21,5 +36,14 @@ sr_Latn_BA{ zh_Hant{"tradicionalni kineski"} zu{"isizulu"} } - Version{"37"} + Types{ + collation{ + ducet{"podrazumijevani Unicode redoslijed sortiranja"} + search{"pretraga opšte namjene"} + standard{"standardni redoslijed sortiranja"} + } + numbers{ + mymr{"mjanmarske cifre"} + } + } } diff --git a/intl/icu/source/data/lang/sr_Latn_CS.txt b/intl/icu/source/data/lang/sr_Latn_CS.txt index 0952735a9c87..7204cfd29a04 100644 --- a/intl/icu/source/data/lang/sr_Latn_CS.txt +++ b/intl/icu/source/data/lang/sr_Latn_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/lang/sr_Latn_ME.txt b/intl/icu/source/data/lang/sr_Latn_ME.txt index b461ec93419d..bddd9fe7f1e5 100644 --- a/intl/icu/source/data/lang/sr_Latn_ME.txt +++ b/intl/icu/source/data/lang/sr_Latn_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_ME{ Languages{ arn{"mapudungun"} @@ -17,5 +18,4 @@ sr_Latn_ME{ zgh{"standardni marokanski tamašek"} zu{"isizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sr_Latn_RS.txt b/intl/icu/source/data/lang/sr_Latn_RS.txt index 76d38f8b734b..8d63da618417 100644 --- a/intl/icu/source/data/lang/sr_Latn_RS.txt +++ b/intl/icu/source/data/lang/sr_Latn_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/sr_Latn_XK.txt b/intl/icu/source/data/lang/sr_Latn_XK.txt index 55eaab64db47..9d674cdca695 100644 --- a/intl/icu/source/data/lang/sr_Latn_XK.txt +++ b/intl/icu/source/data/lang/sr_Latn_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_XK{ Languages{ bm{"bamanankan"} @@ -17,5 +18,4 @@ sr_Latn_XK{ zgh{"standardni marokanski tamašek"} zu{"isizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sr_Latn_YU.txt b/intl/icu/source/data/lang/sr_Latn_YU.txt index 2747ab210a4c..415a4d892a22 100644 --- a/intl/icu/source/data/lang/sr_Latn_YU.txt +++ b/intl/icu/source/data/lang/sr_Latn_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/lang/sr_ME.txt b/intl/icu/source/data/lang/sr_ME.txt index 32dc91046bc8..aa5162679c6b 100644 --- a/intl/icu/source/data/lang/sr_ME.txt +++ b/intl/icu/source/data/lang/sr_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_ME{ "%%ALIAS"{"sr_Latn_ME"} } diff --git a/intl/icu/source/data/lang/sr_RS.txt b/intl/icu/source/data/lang/sr_RS.txt index 674ff77554b8..84db46919eb6 100644 --- a/intl/icu/source/data/lang/sr_RS.txt +++ b/intl/icu/source/data/lang/sr_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_RS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/lang/sr_XK.txt b/intl/icu/source/data/lang/sr_XK.txt index 9628a2763e54..0d3aa53999a4 100644 --- a/intl/icu/source/data/lang/sr_XK.txt +++ b/intl/icu/source/data/lang/sr_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_XK{ "%%ALIAS"{"sr_Cyrl_XK"} } diff --git a/intl/icu/source/data/lang/sr_YU.txt b/intl/icu/source/data/lang/sr_YU.txt index 26563d041d43..2d67778ecbdc 100644 --- a/intl/icu/source/data/lang/sr_YU.txt +++ b/intl/icu/source/data/lang/sr_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_YU{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/lang/su.txt b/intl/icu/source/data/lang/su.txt index 3cd56a31692e..63be473f380b 100644 --- a/intl/icu/source/data/lang/su.txt +++ b/intl/icu/source/data/lang/su.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su{ Languages{ de{"Jérman"} @@ -8,7 +9,6 @@ su{ en{"Inggris"} en_AU{"Inggris Australia"} en_CA{"Inggris Kanada"} - en_GB{"Inggris Inggris"} en_US{"Inggris Amerika"} es{"Spanyol"} es_419{"Spanyol Amérika Latin"} @@ -24,7 +24,7 @@ su{ pt_PT{"Portugis Éropa"} ru{"Rusia"} su{"Basa Sunda"} - und{"Teu Dipikaterang"} + und{"Basa teu dikenal"} zh{"Tiongkok"} zh_Hans{"Tiongkok Sederhana"} zh_Hant{"Tiongkok Tradisional"} @@ -41,13 +41,12 @@ su{ en_US{"Inggris AS"} } Scripts{ - Arab{"Basa Arab"} Cyrl{"Sirilik"} Hans{"Sederhana"} Hant{"Tradisional"} Latn{"Latin"} Zxxx{"Non-tulisan"} - Zzzz{"Skrip Teu Dipikaterang"} + Zzzz{"Tulisan Teu Dikenal"} } Scripts%stand-alone{ Hans{"Han Sederhana"} @@ -55,7 +54,7 @@ su{ } Types{ calendar{ - gregorian{"Kalender Grégorian"} + gregorian{"Kalénder Grégorian"} } collation{ standard{"Aturan Runtuyan Standar"} @@ -64,7 +63,6 @@ su{ latn{"Digit Barat"} } } - Version{"37"} codePatterns{ language{"Basa: {0}"} script{"Skrip: {0}"} diff --git a/intl/icu/source/data/lang/su_ID.txt b/intl/icu/source/data/lang/su_ID.txt index 67dde384e09b..8da0f567d041 100644 --- a/intl/icu/source/data/lang/su_ID.txt +++ b/intl/icu/source/data/lang/su_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_ID{ "%%ALIAS"{"su_Latn_ID"} } diff --git a/intl/icu/source/data/lang/su_Latn.txt b/intl/icu/source/data/lang/su_Latn.txt index 008b42355f21..87ca4fa76d0b 100644 --- a/intl/icu/source/data/lang/su_Latn.txt +++ b/intl/icu/source/data/lang/su_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/su_Latn_ID.txt b/intl/icu/source/data/lang/su_Latn_ID.txt index 462983284c53..d6b42f358c4b 100644 --- a/intl/icu/source/data/lang/su_Latn_ID.txt +++ b/intl/icu/source/data/lang/su_Latn_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/sv.txt b/intl/icu/source/data/lang/sv.txt index f0800b1ec5e6..0399eafa3857 100644 --- a/intl/icu/source/data/lang/sv.txt +++ b/intl/icu/source/data/lang/sv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv{ Keys{ calendar{"kalender"} @@ -447,7 +448,7 @@ sv{ pap{"papiamento"} pau{"palau"} pcd{"pikardiska"} - pcm{"Nigeria-pidgin"} + pcm{"nigeriansk pidgin"} pdc{"Pennsylvaniatyska"} pdt{"mennonitisk lågtyska"} peo{"fornpersiska"} @@ -507,7 +508,7 @@ sv{ seh{"sena"} sei{"seri"} sel{"selkup"} - ses{"Gao-songhai"} + ses{"songhai"} sg{"sango"} sga{"forniriska"} sgs{"samogitiska"} @@ -652,6 +653,8 @@ sv{ } Languages%short{ az{"azeriska"} + en_GB{"brittisk engelska"} + en_US{"amerikansk engelska"} } Languages%variant{ ps{"pashto"} @@ -684,12 +687,14 @@ sv{ Cari{"kariska"} Cham{"cham"} Cher{"cherokee"} + Chrs{"khwarezmiska"} Cirt{"cirt"} Copt{"koptiska"} Cprt{"cypriotiska"} Cyrl{"kyrilliska"} Cyrs{"fornkyrkoslavisk kyrilliska"} Deva{"devanagari"} + Diak{"dives akuru"} Dogr{"dogriska"} Dsrt{"deseret"} Dupl{"Duployéstenografiska"} @@ -713,8 +718,8 @@ sv{ Hang{"hangul"} Hani{"han"} Hano{"hanunó’o"} - Hans{"förenklade"} - Hant{"traditionella"} + Hans{"förenklad"} + Hant{"traditionell"} Hatr{"hatran"} Hebr{"hebreiska"} Hira{"hiragana"} @@ -734,6 +739,7 @@ sv{ Khar{"kharoshti"} Khmr{"khmeriska"} Khoj{"khojkiska"} + Kits{"khitanska"} Knda{"kanaresiska"} Kore{"koreanska"} Kpel{"kpellé"} @@ -840,6 +846,7 @@ sv{ Wole{"woleai"} Xpeo{"fornpersiska"} Xsux{"sumero-akkadisk kilskrift"} + Yezi{"yazidiska"} Yiii{"yi"} Zanb{"zanabazar kvadratisk skrift"} Zinh{"ärvda"} @@ -952,7 +959,7 @@ sv{ ungegn{"enligt FN:s geografiska namnkommitté"} } ms{ - metric{"SI-enheter"} + metric{"metersystem"} uksystem{"brittiskt måttsystem"} ussystem{"USA:s måttsystem"} } @@ -969,6 +976,7 @@ sv{ cham{"chamiska siffror"} cyrl{"kyrilliska taltecken"} deva{"devanagariska siffror"} + diak{"dives akuru-siffror"} ethi{"etiopiska taltecken"} finance{"finansiella siffror"} fullwide{"fullbreddssiffror"} @@ -1066,6 +1074,7 @@ sv{ BISKE{"Bila-dialekt"} BOHORIC{"Bohorič-alfabetet"} BOONT{"boontling"} + BORNHOLM{"Bornholm"} CISAUP{"cisalpinska (occitanska)"} COLB1945{"stavning enligt 1945 års konvention mellan Portugal och Brasilien"} CORNU{"kornisk engelska"} @@ -1144,7 +1153,6 @@ sv{ WADEGILE{"Wade-Giles"} XSISTEMO{"x-system"} } - Version{"37"} characterLabelPattern{ all{"{0} – alla"} category-list{"{0}: {1}"} @@ -1159,6 +1167,8 @@ sv{ one{"{0} streck"} other{"{0} streck"} } + subscript{"nedsänkt {0}"} + superscript{"upphöjt {0}"} } codePatterns{ language{"språk: {0}"} diff --git a/intl/icu/source/data/lang/sv_FI.txt b/intl/icu/source/data/lang/sv_FI.txt index 8f9784fdfc2c..1e9375f78b1d 100644 --- a/intl/icu/source/data/lang/sv_FI.txt +++ b/intl/icu/source/data/lang/sv_FI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv_FI{ Keys{ timezone{"tidszon"} @@ -7,5 +8,4 @@ sv_FI{ Scripts%variant{ Arab{"persisk-arabiska"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sw.txt b/intl/icu/source/data/lang/sw.txt index 5073a135ab54..df3b9145f2b2 100644 --- a/intl/icu/source/data/lang/sw.txt +++ b/intl/icu/source/data/lang/sw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw{ Keys{ calendar{"Kalenda"} @@ -7,9 +8,9 @@ sw{ colAlternate{"Puuza Upangaji Alama"} colBackwards{"Upangaji Uliogeuzwa wa Kiinitoni"} colCaseFirst{"Upangaji wa Herufi kubwa/Herufi ndogo"} - colCaseLevel{"Upangaji Unaoathiriwa na Herufi"} + colCaseLevel{"Upangaji Kulingana na Ukubwa wa Herufi"} colNormalization{"Upangaji wa Kawaida"} - colNumeric{"Upangaji wa Namba"} + colNumeric{"Upangaji kwa Nambari"} colStrength{"Nguvu ya Upangaji"} collation{"Mpangilio"} currency{"Sarafu"} @@ -129,6 +130,7 @@ sw{ eu{"Kibaski"} ewo{"Kiewondo"} fa{"Kiajemi"} + fa_AF{"Kiajemi (Afganistani)"} ff{"Kifulani"} fi{"Kifini"} fil{"Kifilipino"} @@ -165,7 +167,7 @@ sw{ hil{"Kihiligaynon"} hit{"Kihiti"} hmn{"Kihmong"} - hr{"Kikroeshia"} + hr{"Kikorasia"} hsb{"Kisobia cha Ukanda wa Juu"} ht{"Kihaiti"} hu{"Kihungaria"} @@ -203,7 +205,7 @@ sw{ kfo{"Kikoro"} kg{"Kikongo"} kha{"Kikhasi"} - khq{"Koyra Chiini"} + khq{"Kikoyra Chiini"} ki{"Kikikuyu"} kj{"Kikwanyama"} kk{"Kikazakh"} @@ -280,7 +282,7 @@ sw{ ms{"Kimalei"} mt{"Kimalta"} mua{"Kimundang"} - mul{"Lugha Nyingi"} + mul{"Lugha nyingi"} mus{"Kikriki"} mwl{"Kimirandi"} my{"Kiburma"} @@ -330,6 +332,7 @@ sw{ prg{"Kiprussia"} ps{"Kipashto"} pt{"Kireno"} + pt_BR{"Kireno (Brazili)"} pt_PT{"Kireno (Ulaya)"} qu{"Kikechua"} quc{"Kʼicheʼ"} @@ -360,7 +363,7 @@ sw{ sdh{"Kikurdi cha Kusini"} se{"Kisami cha Kaskazini"} seh{"Kisena"} - ses{"Koyraboro Senni"} + ses{"Kikoyraboro Senni"} sg{"Kisango"} sh{"Kiserbia-kroeshia"} shi{"Kitachelhit"} @@ -411,7 +414,7 @@ sw{ tum{"Kitumbuka"} tvl{"Kituvalu"} tw{"Twi"} - twq{"Kitasawaq"} + twq{"Kitasawak"} ty{"Kitahiti"} tyv{"Kituva"} tzm{"Kitamazighati cha Atlasi ya Kati"} @@ -419,7 +422,7 @@ sw{ ug{"Kiuyghur"} uk{"Kiukraini"} umb{"Umbundu"} - und{"Lugha Isiyojulikana"} + und{"Lugha isiyojulikana"} ur{"Kiurdu"} uz{"Kiuzbeki"} vai{"Kivai"} @@ -452,6 +455,7 @@ sw{ zza{"Kizaza"} } Languages%long{ + zh_Hans{"Kichina (Kilichorahisishwa)"} zh_Hant{"Kichina (cha jadi)"} } Languages%menu{ @@ -470,7 +474,7 @@ sw{ Armn{"Kiarmenia"} Beng{"Kibengali"} Bopo{"Kibopomofo"} - Brai{"Braille"} + Brai{"Nukta nundu"} Cyrl{"Kisiriliki"} Deva{"Kidevanagari"} Ethi{"Kiethiopia"} @@ -534,7 +538,7 @@ sw{ iso8601{"Kalenda ya ISO-8601"} japanese{"Kalenda ya Kijapani"} persian{"Kalenda ya Kiajemi"} - roc{"Kalenda ya Minguo"} + roc{"Kalenda ya Jamhuri ya Uchina"} } cf{ account{"Mpangilio wa Kihasibu wa Sarafu"} @@ -610,8 +614,8 @@ sw{ } ms{ metric{"Mfumo wa Metriki"} - uksystem{"Mfumo wa UK"} - ussystem{"Mfumo wa US"} + uksystem{"Mfumo wa Vipimo wa Uingereza"} + ussystem{"Mfumo wa Vipimo wa Marekani"} } numbers{ arab{"Nambari za Kiarabu/Kihindi"} @@ -636,10 +640,10 @@ sw{ hebr{"Nambari za Kiebrania"} jpan{"Nambari za Kijapani"} jpanfin{"Nambari za Kifedha za Kijapani"} - khmr{"Nambari za Kikhmer"} + khmr{"Nambari za Kikambodia"} knda{"Nambari za Kikannada"} laoo{"Nambari za Kilao"} - latn{"Nambari za Magharibi"} + latn{"Nambari za Nchi za Magharibi"} mlym{"Nambari za Malayalam"} mong{"Nambari za Kimongolia"} mymr{"Nambari za Myanmar"} @@ -656,7 +660,6 @@ sw{ vaii{"Dijiti za Vai"} } } - Version{"37"} characterLabelPattern{ all{"{0} — zote"} category-list{"{0}: {1}"} @@ -671,6 +674,8 @@ sw{ one{"mshazari {0}"} other{"mishazari {0}"} } + subscript{"herufichini {0}"} + superscript{"herufijuu {0}"} } codePatterns{ language{"Lugha: {0}"} diff --git a/intl/icu/source/data/lang/sw_CD.txt b/intl/icu/source/data/lang/sw_CD.txt index 02722e7dd106..49cfb594fc3e 100644 --- a/intl/icu/source/data/lang/sw_CD.txt +++ b/intl/icu/source/data/lang/sw_CD.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_CD{ Languages{ ak{"Kiakan"} @@ -11,7 +12,6 @@ sw_CD{ hup{"Kihupa"} jbo{"Kilojban"} kac{"Kikachin"} - khq{"Kikoyra Chiini"} kkj{"Kikako"} koi{"Kikomipermyak"} kru{"Kikurukh"} @@ -35,5 +35,4 @@ sw_CD{ udm{"Kiudumurti"} yi{"Kiyidi"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/sw_KE.txt b/intl/icu/source/data/lang/sw_KE.txt index 2de86006f1f6..3b83f6c06a90 100644 --- a/intl/icu/source/data/lang/sw_KE.txt +++ b/intl/icu/source/data/lang/sw_KE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_KE{ Keys{ hc{"Kipindi cha saa (12 dhidi ya 24)"} @@ -45,7 +46,6 @@ sw_KE{ swb{"Kikomoro"} syr{"Kisiria"} tw{"Kitwi"} - twq{"Kitasawak"} udm{"Kiudumurti"} ug{"Kiuiguri"} zgh{"Kitamazighati Sanifu cha Moroko"} @@ -82,5 +82,4 @@ sw_KE{ tamldec{"Nambari za Kitamili"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ta.txt b/intl/icu/source/data/lang/ta.txt index c891dc0e3866..916c71ee9ca3 100644 --- a/intl/icu/source/data/lang/ta.txt +++ b/intl/icu/source/data/lang/ta.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta{ Keys{ calendar{"நாள்காட்டி"} @@ -849,7 +850,6 @@ ta{ PINYIN{"பின்யின் ரோமானைசெஷன்"} WADEGILE{"வேட்-கைல்ஸ் ரோமனைஷேசன்"} } - Version{"37"} characterLabelPattern{ all{"{0} — அனைத்தும்"} category-list{"{0}: {1}"} @@ -864,6 +864,8 @@ ta{ one{"{0} கோடு"} other{"{0} கோடுகள்"} } + subscript{"துணைஸ்கிரிப்ட் {0}"} + superscript{"சூப்பர்ஸ்கிரிப்ட் {0}"} } codePatterns{ language{"மொழி: {0}"} diff --git a/intl/icu/source/data/lang/te.txt b/intl/icu/source/data/lang/te.txt index 30fbbe317287..4130b9859edb 100644 --- a/intl/icu/source/data/lang/te.txt +++ b/intl/icu/source/data/lang/te.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml te{ Keys{ calendar{"క్యాలెండర్"} @@ -89,7 +90,7 @@ te{ ccp{"చక్మా"} ce{"చెచెన్"} ceb{"సెబువానో"} - cgg{"ఛిగా"} + cgg{"చిగా"} ch{"చమర్రో"} chb{"చిబ్చా"} chg{"చాగటై"} @@ -139,7 +140,7 @@ te{ eka{"ఏకాజక్"} el{"గ్రీక్"} elx{"ఎలామైట్"} - en{"ఆంగ్లం"} + en{"ఇంగ్లీష్"} en_AU{"ఆస్ట్రేలియన్ ఇంగ్లీష్"} en_CA{"కెనడియన్ ఇంగ్లీష్"} en_GB{"బ్రిటిష్ ఇంగ్లీష్"} @@ -854,7 +855,6 @@ te{ REVISED{"సవరించబడిన వర్ణక్రమం"} WADEGILE{"వేడ్-గైల్స్ రోమనైజేషన్"} } - Version{"37"} characterLabelPattern{ all{"{0} — అన్ని"} category-list{"{0}: {1}"} @@ -869,6 +869,8 @@ te{ one{"{0} స్ట్రోక్"} other{"{0} స్ట్రోకులు"} } + subscript{"సబ్‌స్క్రిప్ట్ {0}"} + superscript{"సూపర్‌స్క్రిప్ట్ {0}"} } codePatterns{ language{"భాష: {0}"} diff --git a/intl/icu/source/data/lang/teo.txt b/intl/icu/source/data/lang/teo.txt index b3dfa48b82ae..ba66e356bede 100644 --- a/intl/icu/source/data/lang/teo.txt +++ b/intl/icu/source/data/lang/teo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo{ Languages{ ak{"Kiakan"} @@ -48,5 +49,4 @@ teo{ zh{"Kichina"} zu{"Kizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/tg.txt b/intl/icu/source/data/lang/tg.txt index 0439b66b0a50..d3277f0f71ea 100644 --- a/intl/icu/source/data/lang/tg.txt +++ b/intl/icu/source/data/lang/tg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tg{ Languages{ af{"африкаанс"} @@ -151,7 +152,7 @@ tg{ to{"тонганӣ"} tr{"туркӣ"} tt{"тоторӣ"} - tzm{"тамазайти атласи марказӣ"} + tzm{"тамазайти Атласи Марказӣ"} ug{"ӯйғурӣ"} uk{"украинӣ"} und{"забони номаълум"} @@ -201,7 +202,6 @@ tg{ latn{"Рақамҳои ғарбӣ"} } } - Version{"37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/th.txt b/intl/icu/source/data/lang/th.txt index ff0ab02af98b..2ce127533534 100644 --- a/intl/icu/source/data/lang/th.txt +++ b/intl/icu/source/data/lang/th.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th{ Keys{ calendar{"ปฏิทิน"} @@ -169,7 +170,7 @@ th{ en_AU{"อังกฤษ - ออสเตรเลีย"} en_CA{"อังกฤษ - แคนาดา"} en_GB{"อังกฤษ - สหราชอาณาจักร"} - en_US{"อังกฤษ - อเมริกัน"} + en_US{"อังกฤษ - สหรัฐอเมริกา"} enm{"อังกฤษกลาง"} eo{"เอสเปรันโต"} es{"สเปน"} @@ -634,13 +635,17 @@ th{ zen{"เซนากา"} zgh{"ทามาไซต์โมร็อกโกมาตรฐาน"} zh{"จีน"} - zh_Hans{"จีนประยุกต์"} - zh_Hant{"จีนดั้งเดิม"} + zh_Hans{"จีนตัวย่อ"} + zh_Hant{"จีนตัวเต็ม"} zu{"ซูลู"} zun{"ซูนิ"} zxx{"ไม่มีข้อมูลภาษา"} zza{"ซาซา"} } + Languages%long{ + zh_Hans{"จีนกลาง (ตัวย่อ)"} + zh_Hant{"จีนกลาง (ตัวเต็ม)"} + } Languages%menu{ yue{"จีน (กวางตุ้ง)"} zh{"จีนกลาง"} @@ -648,7 +653,7 @@ th{ Languages%short{ az{"อะเซอรี"} en_GB{"อังกฤษ - อังกฤษ"} - en_US{"อังกฤษ - อเมริกัน"} + en_US{"อังกฤษ - สหรัฐฯ"} } Languages%variant{ ckb{"เคิร์ดโซรานี"} @@ -1062,7 +1067,6 @@ th{ VALLADER{"วัลลาเดอร์"} WADEGILE{"การถอดอักษรแบบเวด-ไจลส์"} } - Version{"37"} characterLabelPattern{ all{"{0} — ทั้งหมด"} category-list{"{0}: {1}"} @@ -1072,10 +1076,12 @@ th{ historic{"{0} — โบราณ"} miscellaneous{"{0} — อื่นๆ"} other{"{0} — อื่นๆ"} - scripts{"สคริปต์ — {0}"} + scripts{"ตัวอักษร — {0}"} strokes{ other{"{0} ขีด"} } + subscript{"ตัวห้อย {0}"} + superscript{"ตัวยก {0}"} } codePatterns{ language{"ภาษา: {0}"} diff --git a/intl/icu/source/data/lang/ti.txt b/intl/icu/source/data/lang/ti.txt index 7aaf10bbf9e0..e15d3b2a20bd 100644 --- a/intl/icu/source/data/lang/ti.txt +++ b/intl/icu/source/data/lang/ti.txt @@ -1,110 +1,111 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti{ Languages{ - af{"አፍሪቃንሰኛ"} - am{"አምሐረኛ"} - ar{"ዓረበኛ"} - az{"አዜርባይጃንኛ"} - be{"ቤላራሻኛ"} + af{"ኣፍሪከንስ"} + am{"ኣምሓርኛ"} + ar{"ዓረብ"} + az{"ኣዘርባጃን"} + be{"ቤላሩስ"} bg{"ቡልጋሪኛ"} - bn{"በንጋሊኛ"} + bn{"ባንጋላ"} br{"ብሬቶን"} bs{"ቦስኒያን"} ca{"ካታላን"} - cs{"ቼክኛ"} + cs{"ቼክ"} cy{"ወልሽ"} - da{"ዴኒሽ"} + da{"ዳኒሽ"} de{"ጀርመን"} - el{"ግሪከኛ"} - en{"እንግሊዝኛ"} + el{"ግሪክ"} + en{"እንግሊዝ"} eo{"ኤስፐራንቶ"} es{"ስፓኒሽ"} + es_419{"ስፓኒሽ (የላቲን አሜሪካ)"} et{"ኤስቶኒአን"} - eu{"ባስክኛ"} - fa{"ፐርሲያኛ"} + eu{"ባስክ"} + fa{"ፋርስ"} fi{"ፊኒሽ"} - fil{"ታጋሎገኛ"} - fo{"ፋሮኛ"} - fr{"ፈረንሳይኛ"} - fy{"ፍሪሰኛ"} + fil{"ፊሊፕን"} + fo{"ፋሮስ"} + fr{"ፈረንሳይን"} + fy{"ምዕራባዊ ፍሪሰኛ"} ga{"አይሪሽ"} - gd{"እስኮትስ ጌልክኛ"} - gl{"ጋለቪኛ"} + gd{"ስኮቲሽ ጋአሊክ"} + gl{"ጋሊሻን"} gn{"ጓራኒ"} - gu{"ጉጃራቲኛ"} - he{"ዕብራስጥ"} - hi{"ሕንደኛ"} - hr{"ክሮሽያንኛ"} - hu{"ሀንጋሪኛ"} + gu{"ጉጃራቲ"} + he{"እብራይስጥ"} + hi{"ህንዲ"} + hr{"ሮኤሽያን"} + hu{"ሃንጋሪ"} ia{"ኢንቴር ቋንቋ"} - id{"እንዶኑሲኛ"} - is{"አይስላንደኛ"} - it{"ጣሊያንኛ"} - ja{"ጃፓንኛ"} - jv{"ጃቫንኛ"} - ka{"ጊዮርጊያኛ"} + id{"ኢንዶኔዥያን"} + is{"ኣይስላንዲክ"} + it{"ጥልያን"} + ja{"ጃፓን"} + jv{"ጃቫን"} + ka{"ጆርጅየን"} kn{"ካማደኛ"} ko{"ኮሪያኛ"} ku{"ኩርድሽ"} ky{"ኪሩጋዚ"} la{"ላቲንኛ"} - lt{"ሊቱአኒየን"} + lt{"ሊቱወኒየን"} lv{"ላቲቪያን"} - mk{"ማክዶኒኛ"} - ml{"ማላያላምኛ"} + mk{"መቆዶኒኛ"} + ml{"ማላይያላም"} mr{"ማራቲኛ"} - ms{"ማላይኛ"} - mt{"ማልቲስኛ"} - ne{"ኔፖሊኛ"} + ms{"ማላይ"} + mt{"ማልተዘ"} + ne{"ኔፓሊ"} nl{"ደች"} - nn{"ኖርዌይኛ (ናይ ኝኖርስክ)"} - no{"ኖርዌጂያን"} + nn{"ርዌጂያን (ናይ ኝኖርስክ)"} + no{"ርዌጂያን"} oc{"ኦኪታንኛ"} - or{"ኦሪያ"} - pa{"ፑንጃቢኛ"} + or{"ኦዲያ"} + pa{"ፑንጃቢ"} pl{"ፖሊሽ"} ps{"ፓሽቶ"} - pt{"ፖርቱጋሊኛ"} - pt_BR{"ፖርቱጋልኛ (ናይ ብራዚል)"} - pt_PT{"ፖርቱጋልኛ (ናይ ፖርቱጋል)"} + pt{"ፖርቹጋል"} + pt_BR{"ፖርቹጋል (ናይ ብራዚል)"} + pt_PT{"ፖርቹጋል (ናይ ፖርቱጋል)"} ro{"ሮማኒያን"} - ru{"ራሽኛ"} + ru{"ሩስያ"} sh{"ሰርቦ- ክሮዊታን"} - si{"ስንሃልኛ"} - sk{"ስሎቨክኛ"} - sl{"ስቁቪኛ"} - sq{"አልቤኒኛ"} - sr{"ሰርቢኛ"} + si{"ሲንሃላ"} + sk{"ስሎቫክ"} + sl{"ስሎቪኒያ"} + sq{"ኣልበንየን"} + sr{"ሰርብያኛ"} st{"ሰሴቶ"} - su{"ሱዳንኛ"} + su{"ሱዳን"} sv{"ስዊድንኛ"} - sw{"ሰዋሂሊኛ"} + sw{"ስዋሂሊ"} ta{"ታሚልኛ"} te{"ተሉጉኛ"} th{"ታይኛ"} - ti{"ትግርኛ"} - tk{"ናይ ቱርኪ ሰብዓይ (ቱርካዊ)"} + ti{"ትግር"} + tk{"ቱርክሜን"} tlh{"ክሊንግኦንኛ"} - tr{"ቱርከኛ"} + tr{"ቱርክ"} tw{"ትዊ"} - uk{"ዩክረኒኛ"} - ur{"ኡርዱኛ"} - uz{"ኡዝበክኛ"} - vi{"ቪትናምኛ"} - xh{"ዞሳኛ"} + uk{"ዩክሬን"} + ur{"ኡርዱ"} + uz{"ኡዝቤክ"} + vi{"ቬትናም"} + xh{"ኢሲቆሳ"} yi{"ዪዲሽ"} zu{"ዙሉኛ"} } Languages%short{ - en_GB{"እንግሊዝኛ (GB)"} - en_US{"እንግሊዝኛ (US)"} + en_GB{"እንግሊዝ (GB)"} + en_US{"እንግሊዝ (US)"} } Scripts{ Ethi{"ፊደል"} Latn{"ላቲን"} } - Version{"37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/tk.txt b/intl/icu/source/data/lang/tk.txt index e8713fc371c0..68c20009f701 100644 --- a/intl/icu/source/data/lang/tk.txt +++ b/intl/icu/source/data/lang/tk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tk{ Keys{ calendar{"Senenama"} @@ -53,7 +54,7 @@ tk{ bo{"tibet dili"} br{"breton dili"} brx{"bodo dili"} - bs{"boşnak dili"} + bs{"bosniýa dili"} bug{"bugiý dili"} byn{"blin dili"} ca{"katalan dili"} @@ -167,7 +168,7 @@ tk{ kea{"kabuwerdianu dili"} kfo{"koro dili"} kha{"khasi dili"} - khq{"koýra-Çini dili"} + khq{"koýra-çini dili"} ki{"kikuýu dili"} kj{"kwanýama dili"} kk{"gazak dili"} @@ -278,7 +279,7 @@ tk{ pam{"kapampangan dili"} pap{"papýamento dili"} pau{"palau dili"} - pcm{"nigeriý-pijin dili"} + pcm{"nigeriýa-pijin dili"} pl{"polýak dili"} prg{"prussiýa dili"} ps{"peştun dili"} @@ -535,7 +536,6 @@ tk{ tibt{"Tibet sanlary"} } } - Version{"37"} characterLabelPattern{ all{"{0} — ähli"} category-list{"{0}: {1}"} @@ -550,6 +550,8 @@ tk{ one{"{0} ştrih"} other{"{0} ştrih"} } + subscript{"aşaky indeks {0}"} + superscript{"ýokarky indeks {0}"} } codePatterns{ language{"Dil: {0}"} diff --git a/intl/icu/source/data/lang/tl.txt b/intl/icu/source/data/lang/tl.txt index 4e521f927601..8c39518018d6 100644 --- a/intl/icu/source/data/lang/tl.txt +++ b/intl/icu/source/data/lang/tl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl{ "%%ALIAS"{"fil"} } diff --git a/intl/icu/source/data/lang/tl_PH.txt b/intl/icu/source/data/lang/tl_PH.txt index 07c9f9047edf..59af39479e02 100644 --- a/intl/icu/source/data/lang/tl_PH.txt +++ b/intl/icu/source/data/lang/tl_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl_PH{ "%%ALIAS"{"fil_PH"} } diff --git a/intl/icu/source/data/lang/to.txt b/intl/icu/source/data/lang/to.txt index 7a1967f42a9e..68779570e8f7 100644 --- a/intl/icu/source/data/lang/to.txt +++ b/intl/icu/source/data/lang/to.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml to{ Keys{ calendar{"tohi māhina"} @@ -162,9 +163,9 @@ to{ enm{"lea fakapālangi-lotoloto"} eo{"lea fakaʻesipulanito"} es{"lea fakasipēnisi"} - es_419{"lea fakasipēnisi lātini-ʻamelika"} - es_ES{"lea fakasipēnisi-‘iulope"} - es_MX{"lea fakasipēnisi-mekisikou"} + es_419{"lea fakasipeini-lātini-ʻamelika"} + es_ES{"lea fakasipeini-ʻeulope"} + es_MX{"lea fakasipeini-mekisikou"} esu{"lea fakaiūpiki-loloto"} et{"lea fakaʻesitōnia"} eu{"lea fakapāsiki"} @@ -891,7 +892,6 @@ to{ tibt{"fika fakatipeti"} } } - Version{"37"} characterLabelPattern{ all{"{0} — kotoa"} category-list{"{0}: {1}"} @@ -905,6 +905,8 @@ to{ strokes{ other{"kohi ʻe {0}"} } + subscript{"tohi ʻi lalo {0}"} + superscript{"tohi ʻi ʻolunga {0}"} } codePatterns{ language{"Lea: {0}"} diff --git a/intl/icu/source/data/lang/tr.txt b/intl/icu/source/data/lang/tr.txt index 7b83094005d2..b97d0aa4eaca 100644 --- a/intl/icu/source/data/lang/tr.txt +++ b/intl/icu/source/data/lang/tr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr{ Keys{ calendar{"Takvim"} @@ -437,7 +438,7 @@ tr{ oc{"Oksitan dili"} oj{"Ojibva dili"} om{"Oromo dili"} - or{"Oriya Dili"} + or{"Oriya dili"} os{"Osetçe"} osa{"Osage"} ota{"Osmanlı Türkçesi"} @@ -648,7 +649,7 @@ tr{ } Languages%menu{ ars{"Arapça, Necd"} - ckb{"Kürtçe, Sorani"} + ckb{"Kürtçe, Orta"} yue{"Çince, Kantonca"} zh{"Çince, Mandarin"} } @@ -657,6 +658,9 @@ tr{ en_GB{"Birleşik Krallık İngilizcesi"} en_US{"ABD İngilizcesi"} } + Languages%variant{ + ckb{"Kürtçe, Sorani"} + } Scripts{ Afak{"Afaka"} Aghb{"Kafkas Albanyası"} @@ -1051,7 +1055,6 @@ tr{ VALENCIA{"Valensiyaca"} WADEGILE{"Wade-Giles (Latin Alfabesinde Yazımı)"} } - Version{"37"} characterLabelPattern{ all{"{0} — tümü"} category-list{"{0}: {1}"} @@ -1066,6 +1069,8 @@ tr{ one{"{0} çizgi"} other{"{0} çizgi"} } + subscript{"alt simge {0}"} + superscript{"üst simge {0}"} } codePatterns{ language{"Dil: {0}"} diff --git a/intl/icu/source/data/lang/tt.txt b/intl/icu/source/data/lang/tt.txt index 0fbbbdee2546..22f6a1443b1f 100644 --- a/intl/icu/source/data/lang/tt.txt +++ b/intl/icu/source/data/lang/tt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tt{ Languages{ af{"африкаанс"} @@ -154,7 +155,7 @@ tt{ wo{"волоф"} yi{"идиш"} yo{"йоруба"} - zh{"кытай (тәрҗемә киңәше: аерым алганда, мандарин кытайчасы)"} + zh{"кытай"} zh_Hans{"гадиләштерелгән кытай"} zh_Hant{"традицион кытай"} } @@ -189,7 +190,6 @@ tt{ latn{"көнбатыш цифрлары"} } } - Version{"37"} codePatterns{ language{"Тел: {0}"} script{"Язу: {0}"} diff --git a/intl/icu/source/data/lang/twq.txt b/intl/icu/source/data/lang/twq.txt index fdf028c2221c..edf71f1eb3bd 100644 --- a/intl/icu/source/data/lang/twq.txt +++ b/intl/icu/source/data/lang/twq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml twq{ Languages{ ak{"Akan senni"} @@ -48,5 +49,4 @@ twq{ zh{"Sinuwa senni, Mandareŋ"} zu{"Zulu senni"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/tzm.txt b/intl/icu/source/data/lang/tzm.txt index a02cfff4ca81..ec891b0870c9 100644 --- a/intl/icu/source/data/lang/tzm.txt +++ b/intl/icu/source/data/lang/tzm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tzm{ Languages{ ak{"Takanit"} @@ -48,5 +49,4 @@ tzm{ zh{"Tacinwit,Mandarin"} zu{"tazulut"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/ug.txt b/intl/icu/source/data/lang/ug.txt index 8fe4f139453c..671e0af8e6c1 100644 --- a/intl/icu/source/data/lang/ug.txt +++ b/intl/icu/source/data/lang/ug.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ug{ Keys{ calendar{"يىلنامە"} @@ -826,7 +827,6 @@ ug{ VALENCIA{"ۋالېنسىيە"} WADEGILE{"ۋېي ئائىلىسى پىنيىن لاتىنلاشتۇرۇش"} } - Version{"37"} codePatterns{ language{"تىل: {0}"} script{"يېزىق: {0}"} diff --git a/intl/icu/source/data/lang/uk.txt b/intl/icu/source/data/lang/uk.txt index a0017f1fef0e..55d6c91c48cd 100644 --- a/intl/icu/source/data/lang/uk.txt +++ b/intl/icu/source/data/lang/uk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk{ Keys{ calendar{"календар"} @@ -54,7 +55,7 @@ uk{ as{"асамська"} asa{"асу"} ase{"американська мова рухів"} - ast{"астурська"} + ast{"астурійська"} av{"аварська"} awa{"авадхі"} ay{"аймара"} @@ -85,7 +86,7 @@ uk{ bkm{"ком"} bla{"сіксіка"} bm{"бамбара"} - bn{"банґла"} + bn{"бенгальська"} bo{"тибетська"} bqi{"бахтіарі"} br{"бретонська"} @@ -134,7 +135,7 @@ uk{ dav{"таіта"} de{"німецька"} de_AT{"австрійська німецька"} - de_CH{"верхньонімецька (Швейцарія)"} + de_CH{"швейцарська верхньонімецька"} del{"делаварська"} den{"слейв"} dgr{"догрибська"} @@ -160,12 +161,12 @@ uk{ en_AU{"австралійська англійська"} en_CA{"канадська англійська"} en_GB{"британська англійська"} - en_US{"англійська (США)"} + en_US{"американська англійська"} enm{"середньоанглійська"} eo{"есперанто"} es{"іспанська"} es_419{"латиноамериканська іспанська"} - es_ES{"іспанська (Європа)"} + es_ES{"європейська іспанська"} es_MX{"мексиканська іспанська"} et{"естонська"} eu{"баскська"} @@ -197,7 +198,7 @@ uk{ gan{"ґань"} gay{"гайо"} gba{"гбайя"} - gd{"гаельська"} + gd{"шотландська гельська"} gez{"гєез"} gil{"гільбертська"} gl{"галісійська"} @@ -209,7 +210,7 @@ uk{ got{"готська"} grb{"гребо"} grc{"давньогрецька"} - gsw{"німецька (Швейцарія)"} + gsw{"швейцарська німецька"} gu{"гуджараті"} guz{"гусії"} gv{"менкська"} @@ -227,7 +228,7 @@ uk{ hr{"хорватська"} hsb{"верхньолужицька"} hsn{"сянська китайська"} - ht{"гаїтянська"} + ht{"гаїтянська креольська"} hu{"угорська"} hup{"хупа"} hy{"вірменська"} @@ -238,7 +239,7 @@ uk{ id{"індонезійська"} ie{"інтерлінгве"} ig{"ігбо"} - ii{"сичуань"} + ii{"сичуаньська ї"} ik{"інупіак"} ilo{"ілоканська"} inh{"інгуська"} @@ -291,12 +292,12 @@ uk{ ks{"кашмірська"} ksb{"шамбала"} ksf{"бафіа"} - ksh{"колоніан"} + ksh{"кельнська"} ku{"курдська"} kum{"кумицька"} kut{"кутенаї"} kv{"комі"} - kw{"корнійська"} + kw{"корнська"} ky{"киргизька"} la{"латинська"} lad{"ладіно"} @@ -322,7 +323,7 @@ uk{ luo{"луо"} lus{"мізо"} luy{"луйя"} - lv{"латвійська"} + lv{"латиська"} mad{"мадурська"} maf{"мафа"} mag{"магадхі"} @@ -415,12 +416,12 @@ uk{ pi{"палі"} pl{"польська"} pon{"понапе"} - prg{"пруська"} + prg{"прусська"} pro{"давньопровансальська"} ps{"пушту"} - pt{"портуґальська"} - pt_BR{"португальська (Бразилія)"} - pt_PT{"європейська портуґальська"} + pt{"португальська"} + pt_BR{"бразильська португальська"} + pt_PT{"європейська португальська"} qu{"кечуа"} quc{"кіче"} raj{"раджастхані"} @@ -439,7 +440,7 @@ uk{ rwk{"рва"} sa{"санскрит"} sad{"сандаве"} - sah{"якутська"} + sah{"саха"} sam{"самаритянська арамейська"} saq{"самбуру"} sas{"сасакська"} @@ -449,7 +450,7 @@ uk{ sc{"сардинська"} scn{"сицилійська"} sco{"шотландська"} - sd{"сіндхі"} + sd{"синдхі"} sdh{"південнокурдська"} se{"північносаамська"} see{"сенека"} @@ -481,7 +482,7 @@ uk{ srr{"серер"} ss{"сісваті"} ssy{"сахо"} - st{"сото південна"} + st{"південна сото"} su{"сунданська"} suk{"сукума"} sus{"сусу"} @@ -510,7 +511,7 @@ uk{ tli{"тлінгіт"} tmh{"тамашек"} tn{"тсвана"} - to{"тонґанська"} + to{"тонганська"} tog{"ньяса тонга"} tpi{"ток-пісін"} tr{"турецька"} @@ -536,11 +537,11 @@ uk{ vai{"ваї"} ve{"венда"} vi{"вʼєтнамська"} - vo{"волапʼюк"} + vo{"волапюк"} vot{"водська"} vun{"вуньо"} wa{"валлонська"} - wae{"валзерська"} + wae{"вальзерська"} wal{"волайтта"} war{"варай"} was{"вашо"} @@ -584,6 +585,9 @@ uk{ az{"азері"} en_GB{"англійська (Брит.)"} } + Languages%variant{ + ckb{"сорані"} + } Scripts{ Adlm{"адлам"} Afak{"афака"} @@ -915,7 +919,6 @@ uk{ VALENCIA{"Валенсійська"} WADEGILE{"Романізація Вейда-Джайлза"} } - Version{"37"} characterLabelPattern{ all{"{0} — усі"} category-list{"{0}: {1}"} @@ -932,6 +935,8 @@ uk{ one{"{0} риска"} other{"{0} риски"} } + subscript{"нижній індекс {0}"} + superscript{"верхній індекс {0}"} } codePatterns{ language{"Мова: {0}"} diff --git a/intl/icu/source/data/lang/ur.txt b/intl/icu/source/data/lang/ur.txt index 00a17e9eab4e..eeb92438c739 100644 --- a/intl/icu/source/data/lang/ur.txt +++ b/intl/icu/source/data/lang/ur.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur{ Keys{ calendar{"کیلنڈر"} @@ -134,7 +135,7 @@ ur{ frc{"کاجن فرانسیسی"} fur{"فریولیائی"} fy{"مغربی فریسیئن"} - ga{"آئیرِش"} + ga{"آئرش"} gaa{"گا"} gag{"غاغاوز"} gan{"gan"} @@ -563,7 +564,7 @@ ur{ phonetic{"صوتی چھٹائی کی ترتیب"} pinyin{"پن ین کی چھٹنی کی ترتیب"} reformed{"دوبارہ تشکیل شدہ چھٹنی کی ترتیب"} - search{"عام-مقصد کی تلاش"} + search{"عمومی تلاش"} searchjl{"Hangul Initial Consonant کے لحاظ سے تلاش کریں"} standard{"معیاری چھانٹی کی ترتیب"} stroke{"سٹروک کی چھٹنی کی ترتیب"} @@ -638,7 +639,6 @@ ur{ vaii{"وائی ہندسے"} } } - Version{"37"} characterLabelPattern{ all{"{0} — تمام"} category-list{"{0}: {1}"} @@ -653,6 +653,8 @@ ur{ one{"{0} اسٹروک"} other{"{0} اسٹروک"} } + subscript{"سب اسکرپٹ {0}"} + superscript{"سپر اسکرپٹ {0}"} } codePatterns{ language{"زبان:{0}"} diff --git a/intl/icu/source/data/lang/ur_IN.txt b/intl/icu/source/data/lang/ur_IN.txt index a582dda057b2..d40b0a776daa 100644 --- a/intl/icu/source/data/lang/ur_IN.txt +++ b/intl/icu/source/data/lang/ur_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur_IN{ Languages{ ar_001{"جدید معیاری عربی"} @@ -23,5 +24,4 @@ ur_IN{ tibt{"تبتی ہندسے"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/uz.txt b/intl/icu/source/data/lang/uz.txt index 3c879ff66d39..21df76aa51a3 100644 --- a/intl/icu/source/data/lang/uz.txt +++ b/intl/icu/source/data/lang/uz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz{ Keys{ calendar{"taqvim"} @@ -548,7 +549,6 @@ uz{ tibt{"tibet raqamlari"} } } - Version{"37"} characterLabelPattern{ all{"{0} — hammasi"} category-list{"{0}: {1}"} @@ -563,6 +563,8 @@ uz{ one{"{0} ta chiziq"} other{"{0} ta chiziq"} } + subscript{"{0} pastki yozuv"} + superscript{"{0} ustki yozuv"} } codePatterns{ language{"Til: {0}"} diff --git a/intl/icu/source/data/lang/uz_AF.txt b/intl/icu/source/data/lang/uz_AF.txt index 24ca294580df..0e8d20c4cf48 100644 --- a/intl/icu/source/data/lang/uz_AF.txt +++ b/intl/icu/source/data/lang/uz_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_AF{ "%%ALIAS"{"uz_Arab_AF"} } diff --git a/intl/icu/source/data/lang/uz_Arab.txt b/intl/icu/source/data/lang/uz_Arab.txt index 7f9b7fb12926..33772f4025c5 100644 --- a/intl/icu/source/data/lang/uz_Arab.txt +++ b/intl/icu/source/data/lang/uz_Arab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Arab{ %%Parent{"root"} Languages{ @@ -10,5 +11,4 @@ uz_Arab{ Scripts{ Arab{"عربی"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/uz_Arab_AF.txt b/intl/icu/source/data/lang/uz_Arab_AF.txt index e45d70894be0..e2978bbe125b 100644 --- a/intl/icu/source/data/lang/uz_Arab_AF.txt +++ b/intl/icu/source/data/lang/uz_Arab_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/uz_Cyrl.txt b/intl/icu/source/data/lang/uz_Cyrl.txt index 43a5d98c8684..1dc113b7da4e 100644 --- a/intl/icu/source/data/lang/uz_Cyrl.txt +++ b/intl/icu/source/data/lang/uz_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Cyrl{ %%Parent{"root"} Keys{ @@ -402,7 +403,6 @@ uz_Cyrl{ tibt{"Тибет рақамлари"} } } - Version{"37"} codePatterns{ language{"Тил: {0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/uz_Latn.txt b/intl/icu/source/data/lang/uz_Latn.txt index f6035b73d6e3..1ae52daa8f8c 100644 --- a/intl/icu/source/data/lang/uz_Latn.txt +++ b/intl/icu/source/data/lang/uz_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/uz_Latn_UZ.txt b/intl/icu/source/data/lang/uz_Latn_UZ.txt index 2d34effafec3..356e549792c6 100644 --- a/intl/icu/source/data/lang/uz_Latn_UZ.txt +++ b/intl/icu/source/data/lang/uz_Latn_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/uz_UZ.txt b/intl/icu/source/data/lang/uz_UZ.txt index ffac5329b1b6..3a6a14d8072a 100644 --- a/intl/icu/source/data/lang/uz_UZ.txt +++ b/intl/icu/source/data/lang/uz_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_UZ{ "%%ALIAS"{"uz_Latn_UZ"} } diff --git a/intl/icu/source/data/lang/vai.txt b/intl/icu/source/data/lang/vai.txt index 3df3fd5a26d0..8109f46382fa 100644 --- a/intl/icu/source/data/lang/vai.txt +++ b/intl/icu/source/data/lang/vai.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai{ Languages{ ak{"ꕉꕪꘋ"} @@ -48,5 +49,4 @@ vai{ zh{"ꕦꕇꔧ"} zu{"ꖮꖨ"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/vai_LR.txt b/intl/icu/source/data/lang/vai_LR.txt index 27d42387f34b..f682350b1193 100644 --- a/intl/icu/source/data/lang/vai_LR.txt +++ b/intl/icu/source/data/lang/vai_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_LR{ "%%ALIAS"{"vai_Vaii_LR"} } diff --git a/intl/icu/source/data/lang/vai_Latn.txt b/intl/icu/source/data/lang/vai_Latn.txt index f6dc0bd33033..6e6836192fc0 100644 --- a/intl/icu/source/data/lang/vai_Latn.txt +++ b/intl/icu/source/data/lang/vai_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Latn{ %%Parent{"root"} Languages{ @@ -49,5 +50,4 @@ vai_Latn{ zh{"Chaniĩ"} zu{"Zúlu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/vai_Vaii.txt b/intl/icu/source/data/lang/vai_Vaii.txt index cffa5917afbb..6dc5e995dac4 100644 --- a/intl/icu/source/data/lang/vai_Vaii.txt +++ b/intl/icu/source/data/lang/vai_Vaii.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Vaii{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/vai_Vaii_LR.txt b/intl/icu/source/data/lang/vai_Vaii_LR.txt index a17bc11e00e8..d2845ca31a01 100644 --- a/intl/icu/source/data/lang/vai_Vaii_LR.txt +++ b/intl/icu/source/data/lang/vai_Vaii_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/vi.txt b/intl/icu/source/data/lang/vi.txt index 88e6bfdfaf71..0948fa8bfef9 100644 --- a/intl/icu/source/data/lang/vi.txt +++ b/intl/icu/source/data/lang/vi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi{ Keys{ calendar{"Lịch"} @@ -228,7 +229,7 @@ vi{ hif{"Tiếng Fiji Hindi"} hil{"Tiếng Hiligaynon"} hit{"Tiếng Hittite"} - hmn{"Tiếng Hmông"} + hmn{"Tiếng H’Mông"} ho{"Tiếng Hiri Motu"} hr{"Tiếng Croatia"} hsb{"Tiếng Thượng Sorbia"} @@ -999,7 +1000,6 @@ vi{ VALENCIA{"Tiếng Valencia"} WADEGILE{"La Mã hóa Wade-Giles"} } - Version{"37"} characterLabelPattern{ all{"{0} — tất cả"} category-list{"{0}: {1}"} @@ -1013,6 +1013,8 @@ vi{ strokes{ other{"{0} nét"} } + subscript{"chỉ số dưới {0}"} + superscript{"chỉ số trên {0}"} } codePatterns{ language{"Ngôn ngữ: {0}"} diff --git a/intl/icu/source/data/lang/vun.txt b/intl/icu/source/data/lang/vun.txt index f9c05f19fb78..23848e2804b2 100644 --- a/intl/icu/source/data/lang/vun.txt +++ b/intl/icu/source/data/lang/vun.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vun{ Languages{ ak{"Kiakanyi"} @@ -48,5 +49,4 @@ vun{ zh{"Kyichina"} zu{"Kyizulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/wae.txt b/intl/icu/source/data/lang/wae.txt index 0539e3d1843b..03bfad84205a 100644 --- a/intl/icu/source/data/lang/wae.txt +++ b/intl/icu/source/data/lang/wae.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wae{ Languages{ ab{"Abčasiš"} @@ -193,7 +194,6 @@ wae{ latn{"Arabiši Zálä"} } } - Version{"37"} codePatterns{ language{"Sprač: {0}"} script{"Alfabét: {0}"} diff --git a/intl/icu/source/data/lang/wo.txt b/intl/icu/source/data/lang/wo.txt index 4201163ceb3f..90a6f27dc969 100644 --- a/intl/icu/source/data/lang/wo.txt +++ b/intl/icu/source/data/lang/wo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wo{ Languages{ af{"Afrikaans"} @@ -26,14 +27,22 @@ wo{ cy{"Wels"} da{"Danuwa"} de{"Almaa"} + de_AT{"Almaa bu Ótiriis"} + de_CH{"Almaa bu Kawe bu Swis"} dsb{"Sorab-Suuf"} dv{"Diweyi"} dz{"Dsongkaa"} el{"Gereg"} en{"Àngale"} + en_AU{"Àngale bu Óstraali"} + en_CA{"Àngale bu Kanadaa"} + en_GB{"Àngale bu Grànd Brëtaañ"} + en_US{"Àngale bu Amerik"} eo{"Esperantoo"} es{"Español"} - es_419{"Español (Amerik Latin)"} + es_419{"Español bu Amerik Latin"} + es_ES{"Español bu Tugël"} + es_MX{"Español bu Meksik"} et{"Estoñiye"} eu{"Bask"} fa{"Pers"} @@ -42,6 +51,8 @@ wo{ fil{"Filipiye"} fo{"Feroos"} fr{"Farañse"} + fr_CA{"Frañse bu Kanadaa"} + fr_CH{"Frañse bu Swis"} ga{"Irlànde"} gd{"Galuwaa bu Ekos"} gl{"Galisiye"} @@ -106,6 +117,8 @@ wo{ pl{"Polone"} ps{"Pasto"} pt{"Purtugees"} + pt_BR{"Purtugees bu Bresil"} + pt_PT{"Portugees bu Tugël"} qu{"Kesuwa"} quc{"Kishe"} rm{"Romaas"} @@ -153,6 +166,10 @@ wo{ zh_Hans{"Sinuwaa buñ woyofal"} zh_Hant{"Sinuwaa bu cosaan"} } + Languages%long{ + zh_Hans{"Sinuwaa buñ woyofal"} + zh_Hant{"Sinuwaa bu cosaan"} + } Languages%short{ en_GB{"Àngale (RI)"} en_US{"Àngale (ES)"} @@ -181,7 +198,6 @@ wo{ latn{"Siifari Tugal"} } } - Version{"37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/intl/icu/source/data/lang/xh.txt b/intl/icu/source/data/lang/xh.txt index 623c18e34936..806fd1f1f6ff 100644 --- a/intl/icu/source/data/lang/xh.txt +++ b/intl/icu/source/data/lang/xh.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xh{ Languages{ xh{"isiXhosa"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/xog.txt b/intl/icu/source/data/lang/xog.txt index 1c98c50b227f..927cd2079c05 100644 --- a/intl/icu/source/data/lang/xog.txt +++ b/intl/icu/source/data/lang/xog.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xog{ Languages{ ak{"Oluakaani"} @@ -48,5 +49,4 @@ xog{ zh{"Olucayina"} zu{"Oluzzulu"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/yav.txt b/intl/icu/source/data/lang/yav.txt index 5190f01e983f..45d0fcd6406b 100644 --- a/intl/icu/source/data/lang/yav.txt +++ b/intl/icu/source/data/lang/yav.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yav{ Languages{ ak{"akánɛ"} @@ -48,5 +49,4 @@ yav{ zh{"sinúɛ"} zu{"nusulú"} } - Version{"37"} } diff --git a/intl/icu/source/data/lang/yi.txt b/intl/icu/source/data/lang/yi.txt index 85d1aaeeb166..e7445ab7152f 100644 --- a/intl/icu/source/data/lang/yi.txt +++ b/intl/icu/source/data/lang/yi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yi{ Keys{ numbers{"נומערן"} @@ -170,7 +171,6 @@ yi{ gregorian{"גרעגארישער קאַלענדאַר"} } } - Version{"37"} codePatterns{ language{"שפראַך: {0}"} script{"שריפֿט: {0}"} diff --git a/intl/icu/source/data/lang/yo.txt b/intl/icu/source/data/lang/yo.txt index 688db7be67fd..17f9bc551531 100644 --- a/intl/icu/source/data/lang/yo.txt +++ b/intl/icu/source/data/lang/yo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo{ Keys{ calendar{"Kàlẹ́ńdà"} @@ -13,35 +14,35 @@ yo{ } Languages{ af{"Èdè Afrikani"} - agq{"Ágẹ̀ẹ̀mù"} + agq{"Èdè Ágẹ̀ẹ̀mù"} ak{"Èdè Akani"} am{"Èdè Amariki"} ar{"Èdè Árábìkì"} - as{"Ti Assam"} - asa{"Asu"} - ast{"Asturian"} + as{"Èdè Ti Assam"} + asa{"Èdè Asu"} + ast{"Èdè Asturian"} az{"Èdè Azerbaijani"} - bas{"Basaa"} + bas{"Èdè Basaa"} be{"Èdè Belarusi"} - bem{"Béḿbà"} - bez{"Bẹ́nà"} + bem{"Èdè Béḿbà"} + bez{"Èdè Bẹ́nà"} bg{"Èdè Bugaria"} - bm{"Báḿbàrà"} + bm{"Èdè Báḿbàrà"} bn{"Èdè Bengali"} bo{"Tibetán"} br{"Èdè Bretoni"} - brx{"Bódò"} + brx{"Èdè Bódò"} bs{"Èdè Bosnia"} ca{"Èdè Catala"} - ccp{"Chakma"} - ce{"Chechen"} - ceb{"Cebuano"} - cgg{"Chiga"} - chr{"Shẹ́rókiì"} + ccp{"Èdè Chakma"} + ce{"Èdè Chechen"} + ceb{"Èdè Cebuano"} + cgg{"Èdè Chiga"} + chr{"Èdè Shẹ́rókiì"} ckb{"Ààrin Gbùngbùn Kurdish"} - co{"Corsican"} - cs{"Èdè seeki"} - cu{"Síláfííkì Ilé Ìjọ́sìn"} + co{"Èdè Corsican"} + cs{"Èdè Seeki"} + cu{"Èdè Síláfííkì Ilé Ìjọ́sìn"} cy{"Èdè Welshi"} da{"Èdè Ilẹ̀ Denmark"} dav{"Táítà"} @@ -49,12 +50,12 @@ yo{ de_AT{"Èdè Jámánì (Ọ́síríà )"} de_CH{"Èdè Ilẹ̀ Jámánì (Orílẹ́ède swítsàlandì)"} dje{"Ṣárúmà"} - dsb{"Ṣobíànù Ìpìlẹ̀"} - dua{"Duala"} + dsb{"Ṣóbíánù Apá Ìṣàlẹ̀"} + dua{"Èdè Duala"} dyo{"Jola-Fonyi"} - dz{"Dzongkha"} - ebu{"Ẹmbù"} - ee{"Ewè"} + dz{"Èdè Dzongkha"} + ebu{"Èdè Ẹmbù"} + ee{"Èdè Ewè"} el{"Èdè Giriki"} en{"Èdè Gẹ̀ẹ́sì"} en_AU{"Èdè Gẹ̀ẹ́sì (órílẹ̀-èdè Ọsirélíà)"} @@ -70,7 +71,7 @@ yo{ es_MX{"Èdè Sípáníìṣì (orílẹ̀-èdè Mẹ́síkò)"} et{"Èdè Estonia"} eu{"Èdè Baski"} - ewo{"Èwóǹdò"} + ewo{"Èdè Èwóǹdò"} fa{"Èdè Pasia"} ff{"Èdè Fúlàní"} fi{"Èdè Finisi"} @@ -127,10 +128,10 @@ yo{ kok{"Kónkánì"} ks{"Kaṣímirì"} ksb{"Ṣáńbálà"} - ksf{"Báfíà"} - ksh{"Colognian"} + ksf{"Èdè Báfíà"} + ksh{"Èdè Colognian"} ku{"Kọdiṣì"} - kw{"Kọ́nììṣì"} + kw{"Èdè Kọ́nììṣì"} ky{"Kírígíìsì"} la{"Èdè Latini"} lag{"Láńgì"} @@ -214,7 +215,7 @@ yo{ sq{"Èdè Albania"} sr{"Èdè Serbia"} st{"Èdè Sesoto"} - su{"Èdè Sudani"} + su{"Èdè Sudanísì"} sv{"Èdè Suwidiisi"} sw{"Èdè Swahili"} ta{"Èdè Tamili"} @@ -245,15 +246,20 @@ yo{ yav{"Yangbẹn"} yi{"Èdè Yiddishi"} yo{"Èdè Yorùbá"} - yue{"Cantonese"} + yue{"Èdè Cantonese"} zgh{"Àfẹnùkò Támásáìtì ti Mòrókò"} - zh{"Èdè Mandarin tí wọ́n ń sọ lórílẹ̀-èdè Ṣáínà"} - zh_Hant{"Èdè Ìbílẹ̀ Ṣáínà"} + zh{"Edè Ṣáínà"} + zh_Hans{"Ẹdè Ṣáínà Onírọ̀rùn"} + zh_Hant{"Èdè Ṣáínà Ìbílẹ̀"} zu{"Èdè Ṣulu"} zxx{"Kò sí àkóònú elédè"} } + Languages%long{ + zh_Hans{"Èdè Mandárínì Ṣáínà Onírọ̀rùn"} + zh_Hant{"Èdè Mandárínì Ṣáínà Ìbílẹ̀"} + } Languages%menu{ - zh{"Ṣáídà, Mandrínì"} + zh{"Edè Ṣáínà, Mandárínì"} } Languages%short{ en_GB{"Èdè Gẹ̀ẹ́sì (GB)"} @@ -308,17 +314,17 @@ yo{ } Types{ calendar{ - buddhist{"Kàlẹ̀ńdà Buddhist"} - chinese{"Kàlẹ̀ńdà ti Ṣáìnà"} - dangi{"Kàlẹ̀ńdà dangi"} - ethiopic{"Kàlẹ̀ńdà Ẹtíópíìkì"} + buddhist{"Kàlẹ́ńdà Buddhist"} + chinese{"Kàlẹ́ńdà ti Ṣáìnà"} + dangi{"Kàlẹ́ńdà dangi"} + ethiopic{"Kàlẹ́ńdà Ẹtíópíìkì"} gregorian{"Kàlẹ́ńdà Gregory"} - hebrew{"Kàlẹ̀ńdà Hébérù"} - islamic{"Kàlẹ̀ńdà Lárúbáwá"} + hebrew{"Kàlẹ́ńdà Hébérù"} + islamic{"Kàlẹ́ńdà Lárúbáwá"} iso8601{"Kàlẹ́ńdà ISO-8601"} - japanese{"Kàlẹ̀ńdà ti Jàpánù"} - persian{"Kàlẹ̀ńdà Pásíànù"} - roc{"Kàlẹ̀ńdà Minguo"} + japanese{"Kàlẹ́ńdà ti Jàpánù"} + persian{"Kàlẹ́ńdà Pásíànù"} + roc{"Kàlẹ́ńdà Minguo"} } cf{ account{"Ìgúnrégé Ìṣirò Owó Kọ́rẹ́ńsì"} @@ -383,7 +389,6 @@ yo{ tibt{"Àwọn díjíìtì Tibetán"} } } - Version{"37"} codePatterns{ language{"Èdè: {0}"} script{"Ìṣọwọ́kọ̀wé: {0}"} diff --git a/intl/icu/source/data/lang/yo_BJ.txt b/intl/icu/source/data/lang/yo_BJ.txt index cd07bc76f914..e8a0c0a69fe6 100644 --- a/intl/icu/source/data/lang/yo_BJ.txt +++ b/intl/icu/source/data/lang/yo_BJ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo_BJ{ Keys{ calendar{"Kàlɛ́ńdà"} @@ -10,16 +11,16 @@ yo_BJ{ numbers{"Àwɔn nɔ́ńbà"} } Languages{ - agq{"Ágɛ̀ɛ̀mù"} - bez{"Bɛ́nà"} - chr{"Shɛ́rókiì"} - cu{"Síláfííkì Ilé Ìjɔ́sìn"} + agq{"Èdè Ágɛ̀ɛ̀mù"} + bez{"Èdè Bɛ́nà"} + chr{"Èdè Shɛ́rókiì"} + cu{"Èdè Síláfííkì Ilé Ìjɔ́sìn"} da{"Èdè Ilɛ̀ Denmark"} de_AT{"Èdè Jámánì (Ɔ́síríà )"} de_CH{"Èdè Ilɛ̀ Jámánì (Orílɛ́ède swítsàlandì)"} dje{"Shárúmà"} - dsb{"Shobíànù Ìpìlɛ̀"} - ebu{"Ɛmbù"} + dsb{"Shóbíánù Apá Ìshàlɛ̀"} + ebu{"Èdè Ɛmbù"} en{"Èdè Gɛ̀ɛ́sì"} en_AU{"Èdè Gɛ̀ɛ́sì (órílɛ̀-èdè Ɔsirélíà)"} en_CA{"Èdè Gɛ̀ɛ́sì (Orílɛ̀-èdè Kánádà)"} @@ -42,7 +43,7 @@ yo_BJ{ ks{"Kashímirì"} ksb{"Sháńbálà"} ku{"Kɔdishì"} - kw{"Kɔ́nììshì"} + kw{"Èdè Kɔ́nììshì"} lb{"Lùshɛ́mbɔ́ɔ̀gì"} mul{"Ɔlɔ́pɔ̀ èdè"} nb{"Nɔ́ɔ́wè Bokímàl"} @@ -74,12 +75,17 @@ yo_BJ{ xog{"Shógà"} yav{"Yangbɛn"} zgh{"Àfɛnùkò Támásáìtì ti Mòrókò"} - zh{"Èdè Mandarin tí wɔ́n ń sɔ lórílɛ̀-èdè Sháínà"} - zh_Hant{"Èdè Ìbílɛ̀ Sháínà"} + zh{"Edè Sháínà"} + zh_Hans{"Ɛdè Sháínà Onírɔ̀rùn"} + zh_Hant{"Èdè Sháínà Ìbílɛ̀"} zu{"Èdè Shulu"} } + Languages%long{ + zh_Hans{"Èdè Mandárínì Sháínà Onírɔ̀rùn"} + zh_Hant{"Èdè Mandárínì Sháínà Ìbílɛ̀"} + } Languages%menu{ - zh{"Sháídà, Mandrínì"} + zh{"Edè Sháínà, Mandárínì"} } Languages%short{ en_GB{"Èdè Gɛ̀ɛ́sì (GB)"} @@ -109,17 +115,17 @@ yo_BJ{ } Types{ calendar{ - buddhist{"Kàlɛ̀ńdà Buddhist"} - chinese{"Kàlɛ̀ńdà ti Sháìnà"} - dangi{"Kàlɛ̀ńdà dangi"} - ethiopic{"Kàlɛ̀ńdà Ɛtíópíìkì"} + buddhist{"Kàlɛ́ńdà Buddhist"} + chinese{"Kàlɛ́ńdà ti Sháìnà"} + dangi{"Kàlɛ́ńdà dangi"} + ethiopic{"Kàlɛ́ńdà Ɛtíópíìkì"} gregorian{"Kàlɛ́ńdà Gregory"} - hebrew{"Kàlɛ̀ńdà Hébérù"} - islamic{"Kàlɛ̀ńdà Lárúbáwá"} + hebrew{"Kàlɛ́ńdà Hébérù"} + islamic{"Kàlɛ́ńdà Lárúbáwá"} iso8601{"Kàlɛ́ńdà ISO-8601"} - japanese{"Kàlɛ̀ńdà ti Jàpánù"} - persian{"Kàlɛ̀ńdà Pásíànù"} - roc{"Kàlɛ̀ńdà Minguo"} + japanese{"Kàlɛ́ńdà ti Jàpánù"} + persian{"Kàlɛ́ńdà Pásíànù"} + roc{"Kàlɛ́ńdà Minguo"} } cf{ account{"Ìgúnrégé Ìshirò Owó Kɔ́rɛ́ńsì"} @@ -172,7 +178,6 @@ yo_BJ{ tibt{"Àwɔn díjíìtì Tibetán"} } } - Version{"37"} codePatterns{ script{"Ìshɔwɔ́kɔ̀wé: {0}"} } diff --git a/intl/icu/source/data/lang/yue.txt b/intl/icu/source/data/lang/yue.txt index 85f7ecead8d8..aa52f8c7d1f7 100644 --- a/intl/icu/source/data/lang/yue.txt +++ b/intl/icu/source/data/lang/yue.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue{ Keys{ calendar{"曆法"} @@ -1031,7 +1032,6 @@ yue{ VALLADER{"瑞士瓦勒德方言"} WADEGILE{"威妥瑪式拼音"} } - Version{"37"} characterLabelPattern{ all{"{0} — 全部"} category-list{"{0}: {1}"} @@ -1045,6 +1045,8 @@ yue{ strokes{ other{"{0}斜線"} } + subscript{"下標 {0}"} + superscript{"上標 {0}"} } codePatterns{ language{"語言:{0}"} diff --git a/intl/icu/source/data/lang/yue_CN.txt b/intl/icu/source/data/lang/yue_CN.txt index 26d4356a9eeb..2a3cc8af71ba 100644 --- a/intl/icu/source/data/lang/yue_CN.txt +++ b/intl/icu/source/data/lang/yue_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_CN{ "%%ALIAS"{"yue_Hans_CN"} } diff --git a/intl/icu/source/data/lang/yue_HK.txt b/intl/icu/source/data/lang/yue_HK.txt index 29a7459ef3d9..7bce3c57365e 100644 --- a/intl/icu/source/data/lang/yue_HK.txt +++ b/intl/icu/source/data/lang/yue_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_HK{ "%%ALIAS"{"yue_Hant_HK"} } diff --git a/intl/icu/source/data/lang/yue_Hans.txt b/intl/icu/source/data/lang/yue_Hans.txt index 5025f7424cdf..5b81d9cb7f5b 100644 --- a/intl/icu/source/data/lang/yue_Hans.txt +++ b/intl/icu/source/data/lang/yue_Hans.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans{ %%Parent{"root"} Keys{ @@ -1032,7 +1033,6 @@ yue_Hans{ VALLADER{"瑞士瓦勒德方言"} WADEGILE{"威妥玛式拼音"} } - Version{"37"} characterLabelPattern{ all{"{0} — 全部"} category-list{"{0}: {1}"} @@ -1046,6 +1046,8 @@ yue_Hans{ strokes{ other{"{0}斜线"} } + subscript{"下标 {0}"} + superscript{"上标 {0}"} } codePatterns{ language{"语言:{0}"} diff --git a/intl/icu/source/data/lang/yue_Hans_CN.txt b/intl/icu/source/data/lang/yue_Hans_CN.txt index 479d1253cc95..07edcb8320b7 100644 --- a/intl/icu/source/data/lang/yue_Hans_CN.txt +++ b/intl/icu/source/data/lang/yue_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/yue_Hant.txt b/intl/icu/source/data/lang/yue_Hant.txt index 8f398126c061..f1fb01c3f546 100644 --- a/intl/icu/source/data/lang/yue_Hant.txt +++ b/intl/icu/source/data/lang/yue_Hant.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hant{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/yue_Hant_HK.txt b/intl/icu/source/data/lang/yue_Hant_HK.txt index 9adeba7275b4..e2bb01d90d09 100644 --- a/intl/icu/source/data/lang/yue_Hant_HK.txt +++ b/intl/icu/source/data/lang/yue_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/zgh.txt b/intl/icu/source/data/lang/zgh.txt index d375da777ee8..f7e69dc65830 100644 --- a/intl/icu/source/data/lang/zgh.txt +++ b/intl/icu/source/data/lang/zgh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zgh{ Keys{ calendar{"ⴰⵙⵎⵍⵓⵙⵙⴰⵏ"} @@ -61,5 +62,4 @@ zgh{ islamic{"ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⵏ ⵍⵉⵙⵍⴰⵎ"} } } - Version{"37"} } diff --git a/intl/icu/source/data/lang/zh.txt b/intl/icu/source/data/lang/zh.txt index 223df4ce23e8..ed153e3905bc 100644 --- a/intl/icu/source/data/lang/zh.txt +++ b/intl/icu/source/data/lang/zh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ Keys{ calendar{"日历"} @@ -132,7 +133,7 @@ zh{ dje{"哲尔马语"} doi{"多格拉语"} dsb{"下索布语"} - dua{"都阿拉语"} + dua{"杜阿拉语"} dum{"中古荷兰语"} dv{"迪维希语"} dyo{"朱拉语"} @@ -159,7 +160,7 @@ zh{ es_MX{"墨西哥西班牙语"} et{"爱沙尼亚语"} eu{"巴斯克语"} - ewo{"旺杜语"} + ewo{"埃翁多语"} fa{"波斯语"} fa_AF{"达里语"} fan{"芳格语"} @@ -565,7 +566,6 @@ zh{ } Languages%menu{ ars{"阿拉伯语(纳吉迪)"} - ckb{"库尔德语(索拉尼)"} yue{"广东话"} zh{"普通话"} } @@ -1070,7 +1070,6 @@ zh{ WADEGILE{"WG 威氏拼音法"} XSISTEMO{"西西斯特莫方言"} } - Version{"37"} characterLabelPattern{ all{"{0} — 全部"} category-list{"{0}: {1}"} @@ -1084,6 +1083,8 @@ zh{ strokes{ other{"{0}笔"} } + subscript{"下标{0}"} + superscript{"上标{0}"} } codePatterns{ language{"语言:{0}"} diff --git a/intl/icu/source/data/lang/zh_CN.txt b/intl/icu/source/data/lang/zh_CN.txt index c9151613a23b..0136d26fa140 100644 --- a/intl/icu/source/data/lang/zh_CN.txt +++ b/intl/icu/source/data/lang/zh_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_CN{ "%%ALIAS"{"zh_Hans_CN"} } diff --git a/intl/icu/source/data/lang/zh_HK.txt b/intl/icu/source/data/lang/zh_HK.txt index fe72a0ea43cd..c34c98fdd21b 100644 --- a/intl/icu/source/data/lang/zh_HK.txt +++ b/intl/icu/source/data/lang/zh_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_HK{ "%%ALIAS"{"zh_Hant_HK"} } diff --git a/intl/icu/source/data/lang/zh_Hans.txt b/intl/icu/source/data/lang/zh_Hans.txt index 72c418ec6990..58a5386534ef 100644 --- a/intl/icu/source/data/lang/zh_Hans.txt +++ b/intl/icu/source/data/lang/zh_Hans.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans{ - Version{"37"} } diff --git a/intl/icu/source/data/lang/zh_Hans_CN.txt b/intl/icu/source/data/lang/zh_Hans_CN.txt index 70a6a77b3aa7..333ba54a7fec 100644 --- a/intl/icu/source/data/lang/zh_Hans_CN.txt +++ b/intl/icu/source/data/lang/zh_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/zh_Hans_SG.txt b/intl/icu/source/data/lang/zh_Hans_SG.txt index 498813bb8d04..5e0fabf0bf96 100644 --- a/intl/icu/source/data/lang/zh_Hans_SG.txt +++ b/intl/icu/source/data/lang/zh_Hans_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/zh_Hant.txt b/intl/icu/source/data/lang/zh_Hant.txt index 9967d0874f28..4cc4381e7220 100644 --- a/intl/icu/source/data/lang/zh_Hant.txt +++ b/intl/icu/source/data/lang/zh_Hant.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ %%Parent{"root"} Keys{ @@ -631,6 +632,8 @@ zh_Hant{ } Languages%menu{ ars{"阿拉伯文(納吉迪)"} + } + Languages%variant{ ckb{"庫德文(索拉尼)"} } Scripts{ @@ -748,7 +751,7 @@ zh_Hant{ Ogam{"歐甘文"} Olck{"桑塔利文"} Orkh{"鄂爾渾文"} - Orya{"歐利亞文"} + Orya{"歐迪亞文"} Osge{"歐塞奇文"} Osma{"歐斯曼亞文"} Palm{"帕米瑞拉文字"} @@ -841,7 +844,7 @@ zh_Hant{ iso8601{"ISO 8601 國際曆法"} japanese{"日本曆"} persian{"波斯曆"} - roc{"民國曆"} + roc{"國曆"} } cf{ account{"會計貨幣格式"} @@ -981,7 +984,7 @@ zh_Hant{ native{"原始數字"} nkoo{"曼德數字"} olck{"桑塔利文數字"} - orya{"歐利亞數字"} + orya{"歐迪亞數字"} osma{"奧斯曼亞數字"} roman{"羅馬數字"} romanlow{"小寫羅馬數字"} @@ -1078,7 +1081,6 @@ zh_Hant{ VALLADER{"瑞士瓦勒德方言"} WADEGILE{"威妥瑪式拼音"} } - Version{"37"} characterLabelPattern{ all{"{0} — 全部"} category-list{"{0}: {1}"} @@ -1092,6 +1094,8 @@ zh_Hant{ strokes{ other{"{0} 畫"} } + subscript{"下標 {0}"} + superscript{"上標 {0}"} } codePatterns{ language{"語言:{0}"} diff --git a/intl/icu/source/data/lang/zh_Hant_HK.txt b/intl/icu/source/data/lang/zh_Hant_HK.txt index 7e17da2a9bc2..042bcf1958ec 100644 --- a/intl/icu/source/data/lang/zh_Hant_HK.txt +++ b/intl/icu/source/data/lang/zh_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_HK{ Keys{ ms{"度量衡系統"} @@ -127,7 +128,6 @@ zh_Hant_HK{ REVISED{"已修訂拼字法"} SCOTLAND{"蘇格蘭標準英語"} } - Version{"37"} characterLabelPattern{ enclosed{"{0} — 包含"} historic{"{0} — 舊式"} diff --git a/intl/icu/source/data/lang/zh_Hant_MO.txt b/intl/icu/source/data/lang/zh_Hant_MO.txt index 670cffc3f25d..1f5fac879191 100644 --- a/intl/icu/source/data/lang/zh_Hant_MO.txt +++ b/intl/icu/source/data/lang/zh_Hant_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_MO{ %%Parent{"zh_Hant_HK"} - Version{"37"} } diff --git a/intl/icu/source/data/lang/zh_Hant_TW.txt b/intl/icu/source/data/lang/zh_Hant_TW.txt index b62ad6927771..b079f20e1385 100644 --- a/intl/icu/source/data/lang/zh_Hant_TW.txt +++ b/intl/icu/source/data/lang/zh_Hant_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/lang/zh_MO.txt b/intl/icu/source/data/lang/zh_MO.txt index 6565bf7c3fc3..c6b2148478d5 100644 --- a/intl/icu/source/data/lang/zh_MO.txt +++ b/intl/icu/source/data/lang/zh_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_MO{ "%%ALIAS"{"zh_Hant_MO"} } diff --git a/intl/icu/source/data/lang/zh_SG.txt b/intl/icu/source/data/lang/zh_SG.txt index bf277736bf8b..14136c339a80 100644 --- a/intl/icu/source/data/lang/zh_SG.txt +++ b/intl/icu/source/data/lang/zh_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_SG{ "%%ALIAS"{"zh_Hans_SG"} } diff --git a/intl/icu/source/data/lang/zh_TW.txt b/intl/icu/source/data/lang/zh_TW.txt index 9372c5067ad4..c54ccbfe8920 100644 --- a/intl/icu/source/data/lang/zh_TW.txt +++ b/intl/icu/source/data/lang/zh_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_TW{ "%%ALIAS"{"zh_Hant_TW"} } diff --git a/intl/icu/source/data/lang/zu.txt b/intl/icu/source/data/lang/zu.txt index faadd1e85dd0..ab3604120087 100644 --- a/intl/icu/source/data/lang/zu.txt +++ b/intl/icu/source/data/lang/zu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zu{ Keys{ calendar{"Ikhalenda"} @@ -95,6 +96,7 @@ zu{ de_CH{"Isi-Swiss High German"} dgr{"isi-Dogrib"} dje{"isi-Zarma"} + doi{"isi-Dogri"} dsb{"isi-Lower Sorbian"} dua{"isi-Duala"} dv{"isi-Divehi"} @@ -115,7 +117,7 @@ zu{ es{"isi-Spanish"} es_419{"isi-Latin American Spanish"} es_ES{"isi-European Spanish"} - es_MX{"Isi-Mexican Spanish"} + es_MX{"isi-Mexican Spanish"} et{"isi-Estonia"} eu{"isi-Basque"} ewo{"isi-Ewondo"} @@ -130,6 +132,7 @@ zu{ fr{"isi-French"} fr_CA{"isi-Canadian French"} fr_CH{"isi-Swiss French"} + frc{"isi-Cajun French"} fur{"isi-Friulian"} fy{"isi-Western Frisian"} ga{"isi-Irish"} @@ -229,6 +232,7 @@ zu{ lkt{"isi-Lakota"} ln{"isi-Lingala"} lo{"isi-Lao"} + lou{"isi-Louisiana Creole"} loz{"isi-Lozi"} lrc{"isi-Northern Luri"} lt{"isi-Lithuanian"} @@ -426,12 +430,15 @@ zu{ zgh{"isi-Moroccan Tamazight esivamile"} zh{"isi-Chinese"} zh_Hans{"isi-Chinese (esenziwe-lula)"} - zh_Hant{"isi-Chinese (Okosiko)"} + zh_Hant{"isi-Chinese (Sasendulo)"} zu{"isiZulu"} zun{"isi-Zuni"} zxx{"akukho okuqukethwe kolimi"} zza{"isi-Zaza"} } + Languages%long{ + zh_Hant{"isi-Chinese (sasendulo)"} + } Languages%menu{ yue{"isi-Chinese, Cantonese"} zh{"isi-Chinese, Mandarin"} @@ -445,44 +452,169 @@ zu{ ps{"isi-Pushto"} } Scripts{ + Adlm{"isi-Adlam"} + Aghb{"isi-Caucasian Albanian"} + Ahom{"isi-Ahom"} Arab{"isi-Arabic"} + Aran{"i-Nastaliq"} + Armi{"isi-Imperial Aramaic"} Armn{"isi-Armenian"} + Avst{"isi-Avestan"} + Bali{"isi-Balinese"} + Bamu{"isi-Bamum"} + Bass{"isi-Bassa Vah"} + Batk{"isi-Batak"} Beng{"isi-Bangla"} + Bhks{"isi-Bhaiksuki"} Bopo{"isi-Bopomofo"} + Brah{"isi-Brahmi"} Brai{"i-Braille"} + Bugi{"isi-Buginese"} + Buhd{"isi-Buhid"} + Cakm{"isi-Chakma"} + Cans{"i-Unified Canadian Aboriginal Syllabics"} + Cari{"isi-Carian"} + Cham{"isi-Cham"} + Cher{"isi-Cherokee"} + Chrs{"isi-Chorasmian"} + Copt{"isi-Coptic"} + Cprt{"isi-Cypriot"} Cyrl{"isi-Cyrillic"} Deva{"isi-Devanagari"} + Diak{"isi-Dives Akuru"} + Dogr{"isi-Dogra"} + Dsrt{"isi-Deseret"} + Dupl{"isi-Duployan shorthand"} + Egyp{"i-Egyptian hieroglyphs"} + Elba{"isi-Elbasan"} + Elym{"isi-Elymaic"} Ethi{"isi-Ethiopic"} Geor{"isi-Georgian"} + Glag{"isi-Glagolitic"} + Gong{"isi-Gunjala Gondi"} + Gonm{"isi-Masaram Gondi"} + Goth{"isi-Gothic"} + Gran{"isi-Grantha"} Grek{"isi-Greek"} Gujr{"isi-Gujarati"} Guru{"isi-Gurmukhi"} Hanb{"isi-Hanb"} Hang{"isi-Hangul"} Hani{"isi-Han"} + Hano{"isi-Hanunoo"} Hans{"enziwe lula"} Hant{"okosiko"} + Hatr{"isi-Hatran"} Hebr{"isi-Hebrew"} Hira{"isi-Hiragana"} + Hluw{"isi-Anatolian Hieroglyphs"} + Hmng{"isi-Pahawh Hmong"} + Hmnp{"i-Nyiakeng Puachue Hmong"} Hrkt{"i-Japanese syllabaries"} + Hung{"isi-Old Hungarian"} + Ital{"i-Old Italic"} Jamo{"isi-Jamo"} + Java{"isi-Javanese"} Jpan{"isi-Japanese"} + Kali{"isi-Kayah Li"} Kana{"isi-Katakana"} + Khar{"isi-Kharoshthi"} Khmr{"isi-Khmer"} + Khoj{"isi-Khojki"} + Kits{"i-Khitan small script"} Knda{"isi-Kannada"} Kore{"isi-Korean"} + Kthi{"isi-Kaithi"} + Lana{"isi-Lanna"} Laoo{"isi-Lao"} Latn{"isi-Latin"} + Lepc{"isi-Lepcha"} + Limb{"isi-Limbu"} + Lina{"i-Linear A"} + Linb{"i-Linear B"} + Lisu{"isi-Fraser"} + Lyci{"i-Lycian"} + Lydi{"i-Lydian"} + Mahj{"i-Mahajani"} + Maka{"i-Makasar"} + Mand{"isi-Mandaean"} + Mani{"i-Manichaean"} + Marc{"i-Marchen"} + Medf{"i-Medefaidrin"} + Mend{"i-Mende"} + Merc{"i-Meroitic Cursive"} + Mero{"i-Meroitic"} Mlym{"isi-Malayalam"} + Modi{"i-Modi"} Mong{"isi-Mongolian"} + Mroo{"i-Mro"} + Mtei{"isi-Meitei Mayek"} + Mult{"i-Multani"} Mymr{"isi-Myanmar"} + Nand{"i-Nandinagari"} + Narb{"i-Old North Arabian"} + Nbat{"i-Nabataean"} + Nkoo{"isi-N’Ko"} + Nshu{"i-Nüshu"} + Ogam{"i-Ogham"} + Olck{"isi-Ol Chiki"} + Orkh{"i-Orkhon"} Orya{"isi-Odia"} + Osge{"isi-Osage"} + Osma{"i-Osmanya"} + Palm{"i-Palmyrene"} + Pauc{"i-Pau Cin Hau"} + Perm{"i-Old Permic"} + Phag{"i-Phags-pa"} + Phli{"i-Inscriptional Pahlavi"} + Phlp{"i-Psalter Pahlavi"} + Phnx{"i-Phoenician"} + Plrd{"isi-Pollard Phonetic"} + Prti{"i-Inscriptional Parthian"} + Qaag{"i-Zawgyi"} + Rjng{"i-Rejang"} + Rohg{"isi-Hanifi Rohingya"} + Runr{"i-Runic"} + Samr{"i-Samaritan"} + Sarb{"i-Old South Arabian"} + Saur{"isi-Saurashtra"} + Sgnw{"i-SignWriting"} + Shaw{"i-Shavian"} + Shrd{"i-Sharada"} + Sidd{"i-Siddham"} + Sind{"i-Khudawadi"} Sinh{"isi-Sinhala"} + Sogd{"i-Sogdian"} + Sogo{"i-Old Sogdian"} + Sora{"i-Sora Sompeng"} + Soyo{"i-Soyombo"} + Sund{"isi-Sundanese"} + Sylo{"isi-Syloti Nagri"} + Syrc{"isi-Syriac"} + Tagb{"i-Tagbanwa"} + Takr{"i-Takri"} + Tale{"isi-Tai Le"} + Talu{"isi-New Tai Lue"} Taml{"isi-Tamil"} + Tang{"i-Tangut"} + Tavt{"isi-Tai Viet"} Telu{"isi-Telugu"} + Tfng{"isi-Tifinagh"} + Tglg{"i-Tagalog"} Thaa{"isi-Thaana"} Thai{"isi-Thai"} Tibt{"i-Tibetan"} + Tirh{"i-Tirhuta"} + Ugar{"i-Ugaritic"} + Vaii{"isi-Vai"} + Wara{"i-Varang Kshiti"} + Wcho{"isi-Wancho"} + Xpeo{"i-Old Persian"} + Xsux{"i-Sumero-Akkadian Cuneiform"} + Yezi{"i-Yezidi"} + Yiii{"isi-Yi"} + Zanb{"i-Zanabazar Square"} + Zinh{"Okuthethwe"} Zmth{"i-Mathematical Notation"} Zsye{"i-Emoji"} Zsym{"amasimbuli"} @@ -510,6 +642,9 @@ zu{ indian{"i-Indian National Calender"} islamic{"Ikhalenda lesi-Islamic"} islamic-civil{"i-Islamic-Civil Calendar"} + islamic-rgsa{"Ikhalenda yesi-Islamic (Saudi Arabia, sighting)"} + islamic-tbla{"Ikhalenda yesi-Islamic (tabular, astronomical epoch)"} + islamic-umalqura{"Ikhalenda yesi-Islamic (Umm al-Qura)"} iso8601{"Ikhalenda le-ISO-8601"} japanese{"Ikhalenda lesi-Japanese"} persian{"Ikhalenda lesi-Persian"} @@ -553,8 +688,11 @@ zu{ } collation{ big5han{"Ukuhlunga kwe-Traditional Chinese - Big5"} - dictionary{"Ukuhlunga kwesichazimazwi"} + compat{"Ukuhlunga Kwangaphambilini, ngokusebenzisana"} + dictionary{"Uhlelo Lokuhlunga Lesichazamazwi"} ducet{"Ukuhlunga okuzenzakalelayo kwe-Unicode"} + emoji{"Uhlelo Lokuhlunga le-Emoji"} + eor{"Imithetho Yokuhlunga ye-European"} gb2312han{"Ukuhlunga kwe-Simplified Chinese - GB2312"} phonebook{"Ukuhlunga kwebhuku lefoni"} phonetic{"Hlela Ngokwefonetiki"} @@ -566,6 +704,7 @@ zu{ stroke{"Ukuhlunga kwe-Stroke"} traditional{"Ukuhlunga ngokisiko"} unihan{"Ukuhlunga kwe-Radical-Stroke"} + zhuyin{"Ukuhlunga kwe-Zhuyin"} } d0{ fwidth{"i-Fullwidth"} @@ -593,16 +732,25 @@ zu{ ussystem{"isistimu yokulinganisa yase-US"} } numbers{ + ahom{"Izinombolo ze-Ahom"} arab{"amadijithi esi-Arabic-Indic"} arabext{"amadijithi esi-Arabic-Indic eluliwe"} armn{"izinombolo zesi-Armenian"} armnlow{"izinombolo ezincane zesi-Armenian"} + bali{"Izinombolo ze-Balinese"} beng{"izinombolo zesi-Bengali"} + brah{"Izinombolo ze-Brahmi"} + cakm{"Izinombolo ze-Chakma"} + cham{"Izinombolo ze-Cham"} + cyrl{"Izinombolo ze-Cyrillic"} deva{"izinombolo zesi-Devanagari"} + diak{"Izinombolo ze-Dives Akuru"} ethi{"izinombolo zesi-Ethiopic"} finance{"Izinombolo Zezomnotho"} fullwide{"ububanzi obugcwele bamadijithi"} geor{"izinombolo zesi-Georgian"} + gong{"Izinombolo ze-Gunjala Gondi"} + gonm{"Izinombolo ze-Masaram Gondi"} grek{"izinombolo zesi-Greek"} greklow{"izinombolo ezincane zesi-Greek"} gujr{"amadijithi esi-Gujarati"} @@ -613,29 +761,166 @@ zu{ hant{"izinombolo zosiko zesi-Chinese"} hantfin{"izinombolo zosiko zezezimali zesi-Chinese"} hebr{"izinombolo zesi-Hebrew"} + hmng{"Izinombolo ze-Pahawh Hmong"} + hmnp{"Izinombolo ze-Nyiakeng Puachue Hmong"} + java{"Izinombolo ze-Javanese"} jpan{"izinombolo zesi-Japanese"} jpanfin{"izinombolo zezezimali zesi-Japanese"} + kali{"Izinombolo ze-Kayah Li"} khmr{"amadijithi esi-Khmer"} knda{"amadijithi esi-Kannada"} + lana{"Izinombolo ze-Tai Tham Hora"} + lanatham{"Izinombolo ze-Tai Tham Tham"} laoo{"amadijithi esi-Lao"} latn{"amadijithi ase-Western"} + lepc{"Izinombolo ze-Lepcha"} + limb{"Izinombolo ze-Limbu"} + mathbold{"Izinombolo ze-Mathematical Bold"} + mathdbl{"Izinombolo ze-Mathematical Double-Struck"} + mathmono{"Izinombolo ze-Mathematical Monospace"} + mathsanb{"Izinombolo ze-Mathematical Sans-Serif Bold"} + mathsans{"Izinombolo ze-Mathematical Sans-Serif"} mlym{"amadijithi esi-Malayalam"} + modi{"Izinombolo ze-Modi"} mong{"i-Mongolian Digits"} + mroo{"Izinombolo ze-Mro"} + mtei{"Izinombolo ze-Meetei Mayek"} mymr{"amadijithi esi-Maynmar"} + mymrshan{"Izinombolo ze-Myanmar Shan"} + mymrtlng{"Izinombolo ze-Myanmar Tai Laing"} native{"Izinkinobho Zasendaweni"} + nkoo{"Izinombolo ze-N’Ko"} + olck{"Izinombolo ze-Ol Chiki"} orya{"Amadijithi ase-Odia"} + osma{"Izinombolo ze-Osmanya"} + rohg{"Izinombolo ze-Hanifi Rohingya"} roman{"izinombolo zesi-Roman"} romanlow{"izinombolo zesi-Tamil"} + saur{"Izinombolo ze-Saurashtra"} + shrd{"Izinombolo ze-Sharada"} + sind{"Izinombolo ze-Khudawadi"} + sinh{"Izinombolo ze-Sinhala Lith"} + sora{"Izinombolo ze-Sora Sompeng"} + sund{"Izinombolo ze-Sundanese"} + takr{"Izinombolo ze-Takri"} + talu{"Izinombolo ze-New Tai Lue"} taml{"izinombolo zesi-Tamil"} tamldec{"amadijithi esi-Tamil"} telu{"amadijithi esi-Telegu"} thai{"amadijithi esi-Thai"} tibt{"amadijithi esi-Tibetan"} + tirh{"Izinombolo ze-Tirhuta"} traditional{"Izinombolo Ezijwayelekile"} vaii{"Izinhlazu Zezinombolo ze-Vai"} + wara{"Izinombolo ze-Warang Citi"} + wcho{"Izinombolo ze-Wancho"} } } - Version{"37"} + Variants{ + 1606NICT{"Isi-French esimaphakathi kuya ku-1606"} + 1694ACAD{"isi-French Samanje"} + 1901{"Ubhalomagama lwase-German losiko"} + 1959ACAD{"Okwemfundo"} + 1994{"Ubhalomagama lwase-Russia olusezingeni"} + 1996{"Ubhalomagama lwase-German lwango-1996"} + ABL1943{"Ukwakhiwa kobhalomagama kwango-1943"} + AKUAPEM{"i-AKUAPEM"} + ALALC97{"i-ALA-LC Romanization, i-edishini yango-1997"} + ALUKU{"Ulwimi lwesi-Aluku"} + AO1990{"Isivumelwano Sobhalomagama Lolwimi lesi-Portuguese sango-1990"} + ARANES{"i-ARANES"} + ASANTE{"i-ASANTE"} + AUVERN{"i-AUVERN"} + BAKU1926{"Uhlamvu lwesi-Turkic Latin oluhlanganisiwe"} + BALANKA{"Ulwimi lwe-Balank lwe-Anii"} + BARLA{"Iqembu lolwomi lwesi-Barlavento lwe-Kabuverdianu"} + BASICENG{"i-BASICENG"} + BAUDDHA{"i-BAUDDHA"} + BISCAYAN{"i-BISCAYAN"} + BISKE{"Ulwimi lwe-San Giorgio/Bila"} + BOHORIC{"Uhlambu lwe-Bohorič"} + BOONT{"i-Boontling"} + BORNHOLM{"i-BORNHOLM"} + CISAUP{"i-CISAUP"} + COLB1945{"Ubhalomagama lwe-Portuguese-Brazilian lwango-1945"} + CORNU{"i-CORNU"} + CREISS{"i-CREISS"} + DAJNKO{"Uhlamvu lwe-Dajnko"} + EKAVSK{"isi-Serbian esinokuphimisa kwe-Ekavian"} + EMODENG{"i-English Yesimanje"} + FONIPA{"Ifonotiki ye-IPA"} + FONKIRSH{"i-FONKIRSH"} + FONNAPA{"i-FONNAPA"} + FONUPA{"Ifonotiki ye-UPA"} + FONXSAMP{"i-FONXSAMP"} + GASCON{"i-GASCON"} + GRCLASS{"i-GRCLASS"} + GRITAL{"i-GRITAL"} + GRMISTR{"i-GRMISTR"} + HEPBURN{"i-Hepburn romanization"} + HOGNORSK{"i-HOGNORSK"} + HSISTEMO{"i-HSISTEMO"} + IJEKAVSK{"Isi-Serbian esinokuphimisa kwe-Ijekavian"} + ITIHASA{"i-ITIHASA"} + IVANCHOV{"i-IVANCHOV"} + JAUER{"i-JAUER"} + JYUTPING{"i-JYUTPING"} + KKCOR{"Ubhalomagama oluvamile"} + KOCIEWIE{"i-KOCIEWIE"} + KSCOR{"Ubhalomagama olusezingeni"} + LAUKIKA{"i-LAUKIKA"} + LEMOSIN{"i-LEMOSIN"} + LENGADOC{"i-LENGADOC"} + LIPAW{"Ulwimi lwesi-Lipovaz lase-Resian"} + LUNA1918{"i-LUNA1918"} + METELKO{"Uhlambu lwe-Metelko"} + MONOTON{"i-Monotonic"} + NDYUKA{"Ulwimi lwesi-Ndyuka"} + NEDIS{"Ulwimi lwesi-Natisone"} + NEWFOUND{"i-NEWFOUND"} + NICARD{"i-NICARD"} + NJIVA{"Ulwimi lwesi-Gniva/Njiva"} + NULIK{"i-Volapük yesimanje"} + OSOJS{"Ulwimi lwesi-Oseacco/Osojane"} + OXENDICT{ + "Ukupela Kwesichazamazwi se-Oxford EnglishOxford English Dictionary spell" + "ing" + } + PAHAWH2{"i-PAHAWH2"} + PAHAWH3{"i-PAHAWH3"} + PAHAWH4{"i-PAHAWH4"} + PAMAKA{"ulwimi lwesi-Pamaka"} + PETR1708{"i-PETR1708"} + PINYIN{"i-Pinyin Romanization"} + POLYTON{"i-Polytonic"} + POSIX{"Ikhompyutha"} + PROVENC{"i-PROVENC"} + PUTER{"i-PUTER"} + REVISED{"Ubhalomagama Olubuyekeziwe"} + RIGIK{"I-Volapük Yakudala"} + ROZAJ{"i-Resian"} + RUMGR{"i-RUMGR"} + SAAHO{"i-Saho"} + SCOTLAND{"i-English Esezingeni ye-Scotish"} + SCOUSE{"i-Scouse"} + SIMPLE{"OKULULA"} + SOLBA{"Ulwimi lwesi-Stolvizza/Solbica"} + SOTAV{"Iqembu lolwimi lwesi-Sotavento lwe-Kabuverdianu"} + SPANGLIS{"i-SPANGLIS"} + SURMIRAN{"i-SURMIRAN"} + SURSILV{"i-SURSILV"} + SUTSILV{"i-SUTSILV"} + TARASK{"Ubhalomagama lwesi-Taraskievica"} + UCCOR{"Ubhalomagama Oluhlanganisiwe"} + ULSTER{"i-ULSTER"} + UNIFON{"Uhlamvu lwefonotiki lwe-Unifon"} + VAIDIKA{"i-VAIDIKA"} + VALENCIA{"i-Valencian"} + VALLADER{"i-VALLADER"} + VIVARAUP{"i-VIVARAUP"} + WADEGILE{"i-Wade-Giles Romanization"} + XSISTEMO{"i-XSISTEMO"} + } characterLabelPattern{ all{"{0} — All"} category-list{"{0}: {1}"} diff --git a/intl/icu/source/data/locales/LOCALE_DEPS.json b/intl/icu/source/data/locales/LOCALE_DEPS.json index 681e78cf5870..2508537d097a 100644 --- a/intl/icu/source/data/locales/LOCALE_DEPS.json +++ b/intl/icu/source/data/locales/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -33,7 +34,7 @@ "sh_YU": "sr_Latn_RS", "shi_MA": "shi_Tfng_MA", "sr_BA": "sr_Cyrl_BA", - "sr_CS": "sr_Cyrl_RS", + "sr_CS": "sr_RS", "sr_Cyrl_CS": "sr_Cyrl_RS", "sr_Cyrl_YU": "sr_Cyrl_RS", "sr_Latn_CS": "sr_Latn_RS", @@ -41,7 +42,7 @@ "sr_ME": "sr_Latn_ME", "sr_RS": "sr_Cyrl_RS", "sr_XK": "sr_Cyrl_XK", - "sr_YU": "sr_Cyrl_RS", + "sr_YU": "sr_RS", "su_ID": "su_Latn_ID", "tl": "fil", "tl_PH": "fil_PH", diff --git a/intl/icu/source/data/locales/af.txt b/intl/icu/source/data/locales/af.txt index 01dc5698bcbc..26b64db085a7 100644 --- a/intl/icu/source/data/locales/af.txt +++ b/intl/icu/source/data/locales/af.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ AuxExemplarCharacters{"[à å ä ã æ ç í ì ó ò ú ù ü ý]"} Ellipsis{ @@ -215,7 +216,6 @@ af{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/af_NA.txt b/intl/icu/source/data/locales/af_NA.txt index 84fd2ba9ba15..c94650b28744 100644 --- a/intl/icu/source/data/locales/af_NA.txt +++ b/intl/icu/source/data/locales/af_NA.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af_NA{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/af_ZA.txt b/intl/icu/source/data/locales/af_ZA.txt index 2c5651825ef8..4e6de4d3b1a3 100644 --- a/intl/icu/source/data/locales/af_ZA.txt +++ b/intl/icu/source/data/locales/af_ZA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af_ZA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/agq.txt b/intl/icu/source/data/locales/agq.txt index 7639af71a036..b84e018db3cb 100644 --- a/intl/icu/source/data/locales/agq.txt +++ b/intl/icu/source/data/locales/agq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml agq{ AuxExemplarCharacters{"[q r x]"} ExemplarCharacters{ @@ -23,7 +24,6 @@ agq{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/agq_CM.txt b/intl/icu/source/data/locales/agq_CM.txt index bce92cb97d24..cd2777e1b7c8 100644 --- a/intl/icu/source/data/locales/agq_CM.txt +++ b/intl/icu/source/data/locales/agq_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml agq_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ak.txt b/intl/icu/source/data/locales/ak.txt index 7f11f6a2526a..e81431efe28e 100644 --- a/intl/icu/source/data/locales/ak.txt +++ b/intl/icu/source/data/locales/ak.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak{ AuxExemplarCharacters{"[c j q v z]"} ExemplarCharacters{"[a b d e ɛ f g h i k l m n o ɔ p r s t u w y]"} @@ -25,7 +26,6 @@ ak{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ak_GH.txt b/intl/icu/source/data/locales/ak_GH.txt index 6256b7f1b442..ca46f3f8f16c 100644 --- a/intl/icu/source/data/locales/ak_GH.txt +++ b/intl/icu/source/data/locales/ak_GH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak_GH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/am.txt b/intl/icu/source/data/locales/am.txt index 23823f3c8d31..617db53d8319 100644 --- a/intl/icu/source/data/locales/am.txt +++ b/intl/icu/source/data/locales/am.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ Ellipsis{ final{"{0}…"} @@ -108,16 +109,16 @@ am{ other{"¤000 ሺ"} } 1000000{ - one{"¤0 ሜትር"} - other{"¤0 ሜትር"} + one{"¤0 ሚ"} + other{"¤0 ሚ"} } 10000000{ - one{"¤00 ሜትር"} - other{"¤00 ሜትር"} + one{"¤00 ሚ"} + other{"¤00 ሚ"} } 100000000{ - one{"¤000 ሜትር"} - other{"¤000 ሜትር"} + one{"¤000 ሚ"} + other{"¤000 ሚ"} } 1000000000{ one{"¤0 ቢ"} @@ -158,16 +159,16 @@ am{ other{"000 ሺ"} } 1000000{ - one{"0 ሜትር"} - other{"0 ሜትር"} + one{"0 ሚ"} + other{"0 ሚ"} } 10000000{ - one{"00 ሜትር"} - other{"00 ሜትር"} + one{"00 ሚ"} + other{"00 ሚ"} } 100000000{ - one{"000ሜ"} - other{"000ሜ"} + one{"000 ሚ"} + other{"000 ሚ"} } 1000000000{ one{"0 ቢ"} @@ -222,7 +223,6 @@ am{ minimumGroupingDigits{"1"} traditional{"ethi"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -876,6 +876,10 @@ am{ MMM{"LLL"} MMMEd{"E፣ MMM d"} MMMMEd{"E፣ MMMM d"} + MMMMW{ + one{"ሳምንት W የ MMMM"} + other{"ሳምንት W የ MMMM"} + } MMMMd{"MMMM d"} MMMd{"MMM d"} Md{"M/d"} @@ -2258,10 +2262,13 @@ am{ listPattern{ or{ 2{"{0} ወይም {1}"} - end{"{0} ወይም {1}"} + end{"{0}፣ ወይም {1}"} middle{"{0}፣ {1}"} start{"{0}፣ {1}"} } + or-narrow{ + end{"{0}፣ ወይም {1}"} + } standard{ 2{"{0} እና {1}"} end{"{0}, እና {1}"} diff --git a/intl/icu/source/data/locales/am_ET.txt b/intl/icu/source/data/locales/am_ET.txt index 856f6b35c865..e9ea74724cb2 100644 --- a/intl/icu/source/data/locales/am_ET.txt +++ b/intl/icu/source/data/locales/am_ET.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am_ET{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar.txt b/intl/icu/source/data/locales/ar.txt index f0db400ff084..39413c55d59b 100644 --- a/intl/icu/source/data/locales/ar.txt +++ b/intl/icu/source/data/locales/ar.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ AuxExemplarCharacters{"[ـ\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]"} Ellipsis{ @@ -160,100 +161,100 @@ ar{ patternsShort{ currencyFormat{ 1000{ - few{"¤ 0 ألف"} - many{"¤ 0 ألف"} - one{"¤ 0 ألف"} - other{"¤ 0 ألف"} - two{"¤ 0 ألف"} - zero{"¤ 0 ألف"} + few{"0 ألف ¤"} + many{"0 ألف ¤"} + one{"0 ألف ¤"} + other{"0 ألف ¤"} + two{"0 ألف ¤"} + zero{"0 ألف ¤"} } 10000{ - few{"¤ 00 ألف"} - many{"¤ 00 ألف"} - one{"¤ 00 ألف"} - other{"¤ 00 ألف"} - two{"¤ 00 ألف"} - zero{"¤ 00 ألف"} + few{"00 ألف ¤"} + many{"00 ألف ¤"} + one{"00 ألف ¤"} + other{"00 ألف ¤"} + two{"00 ألف ¤"} + zero{"00 ألف ¤"} } 100000{ - few{"¤ 000 ألف"} - many{"¤ 000 ألف"} - one{"¤ 000 ألف"} - other{"¤ 000 ألف"} - two{"¤ 000 ألف"} - zero{"¤ 000 ألف"} + few{"000 ألف ¤"} + many{"000 ألف ¤"} + one{"000 ألف ¤"} + other{"000 ألف ¤"} + two{"000 ألف ¤"} + zero{"000 ألف ¤"} } 1000000{ - few{"¤ 0 مليون"} - many{"¤ 0 مليون"} - one{"¤ 0 مليون"} - other{"¤ 0 مليون"} - two{"¤ 0 مليون"} - zero{"¤ 0 مليون"} + few{"0 مليون ¤"} + many{"0 مليون ¤"} + one{"0 مليون ¤"} + other{"0 مليون ¤"} + two{"0 مليون ¤"} + zero{"0 مليون ¤"} } 10000000{ - few{"¤ 00 مليون"} - many{"¤ 00 مليون"} - one{"¤ 00 مليون"} - other{"¤ 00 مليون"} - two{"¤ 00 مليون"} - zero{"¤ 00 مليون"} + few{"00 مليون ¤"} + many{"00 مليون ¤"} + one{"00 مليون ¤"} + other{"00 مليون ¤"} + two{"00 مليون ¤"} + zero{"00 مليون ¤"} } 100000000{ - few{"¤ 000 مليون"} - many{"¤ 000 مليون"} - one{"¤ 000 مليون"} - other{"¤ 000 مليون"} - two{"¤ 000 مليون"} - zero{"¤ 000 مليون"} + few{"000 مليون ¤"} + many{"000 مليون ¤"} + one{"000 مليون ¤"} + other{"000 مليون ¤"} + two{"000 مليون ¤"} + zero{"000 مليون ¤"} } 1000000000{ - few{"¤ 0 مليار"} - many{"¤ 0 مليار"} - one{"¤ 0 مليار"} - other{"¤ 0 مليار"} - two{"¤ 0 مليار"} - zero{"¤ 0 مليار"} + few{"0 مليار ¤"} + many{"0 مليار ¤"} + one{"0 مليار ¤"} + other{"0 مليار ¤"} + two{"0 مليار ¤"} + zero{"0 مليار ¤"} } 10000000000{ - few{"¤ 00 مليار"} - many{"¤ 00 مليار"} - one{"¤ 00 مليار"} - other{"¤ 00 مليار"} - two{"¤ 00 مليار"} - zero{"¤ 00 مليار"} + few{"00 مليار ¤"} + many{"00 مليار ¤"} + one{"00 مليار ¤"} + other{"00 مليار ¤"} + two{"00 مليار ¤"} + zero{"00 مليار ¤"} } 100000000000{ - few{"¤ 000 مليار"} - many{"¤ 000 مليار"} - one{"¤ 000 مليار"} - other{"¤ 000 مليار"} - two{"¤ 000 مليار"} - zero{"¤ 000 مليار"} + few{"000 مليار ¤"} + many{"000 مليار ¤"} + one{"000 مليار ¤"} + other{"000 مليار ¤"} + two{"000 مليار ¤"} + zero{"000 مليار ¤"} } 1000000000000{ - few{"¤ 0 ترليون"} - many{"¤ 0 ترليون"} - one{"¤ 0 ترليون"} - other{"¤ 0 ترليون"} - two{"¤ 0 ترليون"} - zero{"¤ 0 ترليون"} + few{"0 ترليون ¤"} + many{"0 ترليون ¤"} + one{"0 ترليون ¤"} + other{"0 ترليون ¤"} + two{"0 ترليون ¤"} + zero{"0 ترليون ¤"} } 10000000000000{ - few{"¤ 00 ترليون"} - many{"¤ 00 ترليون"} - one{"¤ 00 ترليون"} - other{"¤ 00 ترليون"} - two{"¤ 00 ترليون"} - zero{"¤ 00 ترليون"} + few{"00 ترليون ¤"} + many{"00 ترليون ¤"} + one{"00 ترليون ¤"} + other{"00 ترليون ¤"} + two{"00 ترليون ¤"} + zero{"00 ترليون ¤"} } 100000000000000{ - few{"¤ 000 ترليون"} - many{"¤ 000 ترليون"} - one{"¤ 000 ترليون"} - other{"¤ 000 ترليون"} - two{"¤ 000 ترليون"} - zero{"¤ 000 ترليون"} + few{"000 ترليون ¤"} + many{"000 ترليون ¤"} + one{"000 ترليون ¤"} + other{"000 ترليون ¤"} + two{"000 ترليون ¤"} + zero{"000 ترليون ¤"} } } decimalFormat{ @@ -385,7 +386,6 @@ ar{ minimumGroupingDigits{"1"} native{"arab"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -529,11 +529,11 @@ ar{ "d MMMM y G", "dd‏/MM‏/y G", "d‏/M‏/y GGGGG", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", } availableFormats{ Bh{"h B"} @@ -555,7 +555,7 @@ ar{ Hm{"HH:mm"} Hms{"HH:mm:ss"} M{"L"} - MEd{"E، d/M"} + MEd{"E، d/‏M"} MMM{"LLL"} MMMEd{"E، d MMM"} MMMMd{"d MMMM"} @@ -579,6 +579,44 @@ ar{ yyyyQQQQ{"QQQQ y G"} } intervalFormats{ + Gy{ + G{"y G – y G"} + y{"y–y G"} + } + GyM{ + G{"MM-y GGGG – MM-y GGGG"} + M{"MM-y – MM-y GGGG"} + y{"MM-y – MM-y GGGG"} + } + GyMEd{ + G{"E, dd-MM-y GGGG – E, dd-MM-y GGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGG"} + y{"E, dd-MM-y – E,dd-MM-y GGGG"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, d MMM y G – E, d MMM y G"} + 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"} + } + GyMMMd{ + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d–d MMM y G"} + y{"d MMM y – d MMM y G"} + } + GyMd{ + G{"dd-MM-y GGGG – dd-MM-y GGGG"} + M{"dd-MM-y – dd-MM-y GGGG"} + d{"dd-MM-y – dd-MM-y GGGG"} + y{"dd-MM-y – dd-MM-y GGGG"} + } H{ H{"HH–HH"} } @@ -612,11 +650,11 @@ ar{ } MMMd{ M{"d MMM – d MMM"} - d{"MMM d–d"} + d{"d–d MMM"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"d-M – d-M"} + d{"d-M – d-M"} } d{ d{"d–d"} @@ -699,11 +737,11 @@ ar{ "d MMMM y", "dd‏/MM‏/y", "d‏/M‏/y", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, {0}", + "{1} في {0}", + "{1} في {0}", + "{1}, {0}", + "{1}, {0}", } appendItems{ Timezone{"{0} {1}"} @@ -730,7 +768,7 @@ ar{ Hmsv{"HH:mm:ss v"} Hmv{"HH:mm v"} M{"L"} - MEd{"E، d/M"} + MEd{"E، d/‏M"} MMM{"LLL"} MMMEd{"E، d MMM"} MMMMEd{"E، d MMMM"} @@ -859,7 +897,7 @@ ar{ evening1{"مساءً"} morning1{"فجرًا"} morning2{"ص"} - night1{"منتصف الليل"} + night1{"في المساء"} night2{"ليلاً"} } narrow{ @@ -875,9 +913,9 @@ ar{ afternoon1{"ظهرًا"} afternoon2{"بعد الظهر"} evening1{"مساءً"} - morning1{"فجرًا"} + morning1{"في الصباح"} morning2{"صباحًا"} - night1{"منتصف الليل"} + night1{"في المساء"} night2{"ليلاً"} } } @@ -936,6 +974,44 @@ ar{ } } intervalFormats{ + Gy{ + G{"y G – y G"} + y{"y – y G"} + } + GyM{ + G{"MM-y GGGG – MM-y GGGG"} + M{"MM-y – MM-y GGGG"} + y{"MM-y – MM-y GGGG"} + } + GyMEd{ + G{"E, dd-MM-y GGGG – E, dd-MM-y GGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGG"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, d MMM y G – E, d MMM y G"} + 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"} + } + GyMMMd{ + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d–d MMM y G"} + y{"d MMM y – d MMM y G"} + } + GyMd{ + G{"dd-MM-y GGGG – dd-MM-y GGGG"} + M{"dd-MM-y – dd-MM-y GGGG"} + d{"d-MM-y – d-MM-y GGGG"} + y{"dd-MM-y – dd-MM-y GGGG"} + } H{ H{"HH–HH"} } @@ -973,7 +1049,7 @@ ar{ } Md{ M{"M/d – M/d"} - d{"M/d – M/d"} + d{"d-M – d-M"} } d{ d{"d–d"} @@ -1176,11 +1252,11 @@ ar{ "d MMMM y G", "dd‏/MM‏/y G", "d‏/M‏/y GGGGG", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", } eras{ abbreviated{ @@ -1268,11 +1344,11 @@ ar{ "d MMMM y G", "d MMM y G", "d‏/M‏/y GGGGG", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", + "{1} في {0}", } availableFormats{ Bh{"h B"} @@ -1294,7 +1370,7 @@ ar{ Hm{"HH:mm"} Hms{"HH:mm:ss"} M{"L"} - MEd{"E، d/M"} + MEd{"E، d/‏M"} MMM{"LLL"} MMMEd{"E، d MMM"} MMMMd{"d MMMM"} @@ -2992,7 +3068,7 @@ ar{ } } measurementSystemNames{ - UK{"المملكة المتحدة"} + UK{"النظام البريطاني"} US{"النظام الأمريكي"} metric{"النظام المتري"} } @@ -3019,7 +3095,7 @@ ar{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/ar_001.txt b/intl/icu/source/data/locales/ar_001.txt index 17417fee7c51..5a1bf2a4c338 100644 --- a/intl/icu/source/data/locales/ar_001.txt +++ b/intl/icu/source/data/locales/ar_001.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_001{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_AE.txt b/intl/icu/source/data/locales/ar_AE.txt index 8ce37eadf722..d7c67364ff8e 100644 --- a/intl/icu/source/data/locales/ar_AE.txt +++ b/intl/icu/source/data/locales/ar_AE.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_AE{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ eras{ diff --git a/intl/icu/source/data/locales/ar_BH.txt b/intl/icu/source/data/locales/ar_BH.txt index ecf88a671a08..d99a10bf17d1 100644 --- a/intl/icu/source/data/locales/ar_BH.txt +++ b/intl/icu/source/data/locales/ar_BH.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_BH{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_DJ.txt b/intl/icu/source/data/locales/ar_DJ.txt index c0678e3e8f30..cb18edc92697 100644 --- a/intl/icu/source/data/locales/ar_DJ.txt +++ b/intl/icu/source/data/locales/ar_DJ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_DJ{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_DZ.txt b/intl/icu/source/data/locales/ar_DZ.txt index d93bf908dc57..d758bd3a68a1 100644 --- a/intl/icu/source/data/locales/ar_DZ.txt +++ b/intl/icu/source/data/locales/ar_DZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_DZ{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -11,7 +12,6 @@ ar_DZ{ } } } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_EG.txt b/intl/icu/source/data/locales/ar_EG.txt index e78fd2efa3c2..d41137686b7d 100644 --- a/intl/icu/source/data/locales/ar_EG.txt +++ b/intl/icu/source/data/locales/ar_EG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_EG{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_EH.txt b/intl/icu/source/data/locales/ar_EH.txt index a2281d07722a..e0fb5a12ee53 100644 --- a/intl/icu/source/data/locales/ar_EH.txt +++ b/intl/icu/source/data/locales/ar_EH.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_EH{ NumberElements{ default{"latn"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_ER.txt b/intl/icu/source/data/locales/ar_ER.txt index 7c831ee9bfa7..95a4426bbbe3 100644 --- a/intl/icu/source/data/locales/ar_ER.txt +++ b/intl/icu/source/data/locales/ar_ER.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_ER{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_IL.txt b/intl/icu/source/data/locales/ar_IL.txt index a56baf041170..aa072184d979 100644 --- a/intl/icu/source/data/locales/ar_IL.txt +++ b/intl/icu/source/data/locales/ar_IL.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_IL{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -16,11 +16,11 @@ ar_IL{ "d MMMM y", "dd‏/MM‏/y", "d‏/M‏/y", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, {0}", + "{1} في {0}", + "{1} في {0}", + "{1}, {0}", + "{1}, {0}", } } } diff --git a/intl/icu/source/data/locales/ar_IQ.txt b/intl/icu/source/data/locales/ar_IQ.txt index 2c843b0be60c..75c6e6deedc6 100644 --- a/intl/icu/source/data/locales/ar_IQ.txt +++ b/intl/icu/source/data/locales/ar_IQ.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_IQ{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_JO.txt b/intl/icu/source/data/locales/ar_JO.txt index e3a82f58f037..405d8b30f28b 100644 --- a/intl/icu/source/data/locales/ar_JO.txt +++ b/intl/icu/source/data/locales/ar_JO.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_JO{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_KM.txt b/intl/icu/source/data/locales/ar_KM.txt index 81e3f253fbd4..c9fb51ee161e 100644 --- a/intl/icu/source/data/locales/ar_KM.txt +++ b/intl/icu/source/data/locales/ar_KM.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_KM{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -16,11 +16,11 @@ ar_KM{ "d MMMM y", "dd‏/MM‏/y", "d‏/M‏/y", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, {0}", + "{1} في {0}", + "{1} في {0}", + "{1}, {0}", + "{1}, {0}", } } } diff --git a/intl/icu/source/data/locales/ar_KW.txt b/intl/icu/source/data/locales/ar_KW.txt index 0fc909279fde..b83b5a0bd1cd 100644 --- a/intl/icu/source/data/locales/ar_KW.txt +++ b/intl/icu/source/data/locales/ar_KW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_KW{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_LB.txt b/intl/icu/source/data/locales/ar_LB.txt index a5cce3309a6c..4a0e6df6874e 100644 --- a/intl/icu/source/data/locales/ar_LB.txt +++ b/intl/icu/source/data/locales/ar_LB.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_LB{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -11,7 +12,6 @@ ar_LB{ } } } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_LY.txt b/intl/icu/source/data/locales/ar_LY.txt index 93893e19bb8c..a3d15c25e99c 100644 --- a/intl/icu/source/data/locales/ar_LY.txt +++ b/intl/icu/source/data/locales/ar_LY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_LY{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -11,7 +12,6 @@ ar_LY{ } } } - Version{"37"} calendar{ gregorian{ dayPeriod{ @@ -22,7 +22,7 @@ ar_LY{ evening1{"مساءً"} morning1{"فجرًا"} morning2{"ص"} - night1{"منتصف الليل"} + night1{"في المساء"} night2{"ل"} } } diff --git a/intl/icu/source/data/locales/ar_MA.txt b/intl/icu/source/data/locales/ar_MA.txt index c0b3e071940d..de23d2db4b73 100644 --- a/intl/icu/source/data/locales/ar_MA.txt +++ b/intl/icu/source/data/locales/ar_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_MA{ AuxExemplarCharacters{"[\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک ڭ گ ݣ ی]"} ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -12,7 +13,6 @@ ar_MA{ } } } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -24,11 +24,11 @@ ar_MA{ "d MMMM y", "dd‏/MM‏/y", "d‏/M‏/y", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, {0}", + "{1} في {0}", + "{1} في {0}", + "{1}, {0}", + "{1}, {0}", } monthNames{ format{ diff --git a/intl/icu/source/data/locales/ar_MR.txt b/intl/icu/source/data/locales/ar_MR.txt index adf143682b8b..0df5513efff5 100644 --- a/intl/icu/source/data/locales/ar_MR.txt +++ b/intl/icu/source/data/locales/ar_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_MR{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -11,7 +12,6 @@ ar_MR{ } } } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_OM.txt b/intl/icu/source/data/locales/ar_OM.txt index cff68711fe45..e0b0ccf0ec6f 100644 --- a/intl/icu/source/data/locales/ar_OM.txt +++ b/intl/icu/source/data/locales/ar_OM.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_OM{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_PS.txt b/intl/icu/source/data/locales/ar_PS.txt index 9212f40c6baa..9d9d37a168e6 100644 --- a/intl/icu/source/data/locales/ar_PS.txt +++ b/intl/icu/source/data/locales/ar_PS.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_PS{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_QA.txt b/intl/icu/source/data/locales/ar_QA.txt index c35aa7ba118c..6af35ae61938 100644 --- a/intl/icu/source/data/locales/ar_QA.txt +++ b/intl/icu/source/data/locales/ar_QA.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_QA{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_SA.txt b/intl/icu/source/data/locales/ar_SA.txt index c24d8dce17b7..b37e1f5f80af 100644 --- a/intl/icu/source/data/locales/ar_SA.txt +++ b/intl/icu/source/data/locales/ar_SA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SA{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -10,7 +11,6 @@ ar_SA{ } } } - Version{"37"} calendar{ default{"islamic-umalqura"} gregorian{ @@ -22,7 +22,7 @@ ar_SA{ evening1{"مساءً"} morning1{"فجرًا"} morning2{"ص"} - night1{"منتصف الليل"} + night1{"في المساء"} night2{"ل"} } } diff --git a/intl/icu/source/data/locales/ar_SD.txt b/intl/icu/source/data/locales/ar_SD.txt index e5af261aa581..c3a48b373df0 100644 --- a/intl/icu/source/data/locales/ar_SD.txt +++ b/intl/icu/source/data/locales/ar_SD.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SD{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_SO.txt b/intl/icu/source/data/locales/ar_SO.txt index 1037e6383880..b190461431be 100644 --- a/intl/icu/source/data/locales/ar_SO.txt +++ b/intl/icu/source/data/locales/ar_SO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SO{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -10,5 +11,4 @@ ar_SO{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_SS.txt b/intl/icu/source/data/locales/ar_SS.txt index e9bfe1e79f4a..2ca1519980de 100644 --- a/intl/icu/source/data/locales/ar_SS.txt +++ b/intl/icu/source/data/locales/ar_SS.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SS{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_SY.txt b/intl/icu/source/data/locales/ar_SY.txt index 1bc8f85ea20f..9233d9211a6a 100644 --- a/intl/icu/source/data/locales/ar_SY.txt +++ b/intl/icu/source/data/locales/ar_SY.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SY{ NumberElements{ default{"arab"} } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_TD.txt b/intl/icu/source/data/locales/ar_TD.txt index 922ecea2d43f..d2583feafa37 100644 --- a/intl/icu/source/data/locales/ar_TD.txt +++ b/intl/icu/source/data/locales/ar_TD.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_TD{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ar_TN.txt b/intl/icu/source/data/locales/ar_TN.txt index d64e49a9f51f..9bec1cd47115 100644 --- a/intl/icu/source/data/locales/ar_TN.txt +++ b/intl/icu/source/data/locales/ar_TN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_TN{ ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -11,7 +12,6 @@ ar_TN{ } } } - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/ar_YE.txt b/intl/icu/source/data/locales/ar_YE.txt index 28e660fe0d32..8331eb67104a 100644 --- a/intl/icu/source/data/locales/ar_YE.txt +++ b/intl/icu/source/data/locales/ar_YE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_YE{ NumberElements{ default{"arab"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ars.txt b/intl/icu/source/data/locales/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/locales/ars.txt +++ b/intl/icu/source/data/locales/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/locales/as.txt b/intl/icu/source/data/locales/as.txt index d78914e821c5..5853c3d689aa 100644 --- a/intl/icu/source/data/locales/as.txt +++ b/intl/icu/source/data/locales/as.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as{ AuxExemplarCharacters{"[\u200C\u200D ৲ ৎ র]"} Ellipsis{ @@ -239,7 +240,6 @@ as{ } native{"beng"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/as_IN.txt b/intl/icu/source/data/locales/as_IN.txt index c41b07276175..e75bd8aff6d5 100644 --- a/intl/icu/source/data/locales/as_IN.txt +++ b/intl/icu/source/data/locales/as_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/asa.txt b/intl/icu/source/data/locales/asa.txt index 44e7f2e96a0d..2caeeb5c4f47 100644 --- a/intl/icu/source/data/locales/asa.txt +++ b/intl/icu/source/data/locales/asa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml asa{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -11,7 +12,6 @@ asa{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/asa_TZ.txt b/intl/icu/source/data/locales/asa_TZ.txt index e5363aeae00f..a0b2148dca11 100644 --- a/intl/icu/source/data/locales/asa_TZ.txt +++ b/intl/icu/source/data/locales/asa_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml asa_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ast.txt b/intl/icu/source/data/locales/ast.txt index b8b43a8721a3..995c66b15038 100644 --- a/intl/icu/source/data/locales/ast.txt +++ b/intl/icu/source/data/locales/ast.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ast{ AuxExemplarCharacters{"[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ]"} Ellipsis{ @@ -236,7 +237,6 @@ ast{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ast_ES.txt b/intl/icu/source/data/locales/ast_ES.txt index d2d5219f4d7f..c1cf4f1b58e3 100644 --- a/intl/icu/source/data/locales/ast_ES.txt +++ b/intl/icu/source/data/locales/ast_ES.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ast_ES{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/az.txt b/intl/icu/source/data/locales/az.txt index 8e8fe0a77893..478d0d347dce 100644 --- a/intl/icu/source/data/locales/az.txt +++ b/intl/icu/source/data/locales/az.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ AuxExemplarCharacters{"[w]"} Ellipsis{ @@ -189,6 +190,7 @@ az{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{"."} @@ -218,7 +220,6 @@ az{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -867,16 +868,16 @@ az{ } wide{ "yanvar", - "Fevral", + "fevral", "mart", - "Aprel", - "May", - "İyun", - "İyul", - "Avqust", - "Sentyabr", - "Oktyabr", - "Noyabr", + "aprel", + "may", + "iyun", + "iyul", + "avqust", + "sentyabr", + "oktyabr", + "noyabr", "dekabr", } } diff --git a/intl/icu/source/data/locales/az_AZ.txt b/intl/icu/source/data/locales/az_AZ.txt index caf84c09534a..8932e86db2ee 100644 --- a/intl/icu/source/data/locales/az_AZ.txt +++ b/intl/icu/source/data/locales/az_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_AZ{ "%%ALIAS"{"az_Latn_AZ"} } diff --git a/intl/icu/source/data/locales/az_Cyrl.txt b/intl/icu/source/data/locales/az_Cyrl.txt index 5a7b2a012cee..acf2c56811de 100644 --- a/intl/icu/source/data/locales/az_Cyrl.txt +++ b/intl/icu/source/data/locales/az_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Cyrl{ %%Parent{"root"} AuxExemplarCharacters{"[ц щ ъ ь э ю я]"} @@ -27,7 +28,6 @@ az_Cyrl{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/az_Cyrl_AZ.txt b/intl/icu/source/data/locales/az_Cyrl_AZ.txt index 2e74f2a30c0a..749a2cc7f4a0 100644 --- a/intl/icu/source/data/locales/az_Cyrl_AZ.txt +++ b/intl/icu/source/data/locales/az_Cyrl_AZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Cyrl_AZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/az_Latn.txt b/intl/icu/source/data/locales/az_Latn.txt index 6022c58dbe02..6464d2e841f3 100644 --- a/intl/icu/source/data/locales/az_Latn.txt +++ b/intl/icu/source/data/locales/az_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/az_Latn_AZ.txt b/intl/icu/source/data/locales/az_Latn_AZ.txt index 0abea63cfe38..6c53b509780c 100644 --- a/intl/icu/source/data/locales/az_Latn_AZ.txt +++ b/intl/icu/source/data/locales/az_Latn_AZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Latn_AZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bas.txt b/intl/icu/source/data/locales/bas.txt index c17c824237c9..03153ac6d8c0 100644 --- a/intl/icu/source/data/locales/bas.txt +++ b/intl/icu/source/data/locales/bas.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bas{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{ @@ -24,7 +25,6 @@ bas{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/bas_CM.txt b/intl/icu/source/data/locales/bas_CM.txt index 634bcdc464cb..c45fd9ae036f 100644 --- a/intl/icu/source/data/locales/bas_CM.txt +++ b/intl/icu/source/data/locales/bas_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bas_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/be.txt b/intl/icu/source/data/locales/be.txt index 0c5ccb7c5732..2d30eb8ba33b 100644 --- a/intl/icu/source/data/locales/be.txt +++ b/intl/icu/source/data/locales/be.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be{ AuxExemplarCharacters{ "[{а\u0301} {е\u0301} {ё\u0301} {і\u0301} {о\u0301} {у\u0301} {ы\u0301} {э" @@ -14,7 +15,7 @@ be{ word-medial{"{0} … {1}"} } ExemplarCharacters{"[а б в г д {дж} {дз} е ё ж з і й к л м н о п р с т у ў ф х ц ч ш ы ь э ю я]"} - ExemplarCharactersIndex{"[А Б В Г Д Е Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Э Ю Я]"} + ExemplarCharactersIndex{"[А Б В Г Д Е Ё Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Ь Э Ю Я]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . « » ( ) \\[ \\] \\{ \\}]"} MoreInformation{"?"} @@ -261,6 +262,7 @@ be{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{" "} @@ -289,7 +291,6 @@ be{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/be_BY.txt b/intl/icu/source/data/locales/be_BY.txt index fa47e0770f04..970036cdd2ee 100644 --- a/intl/icu/source/data/locales/be_BY.txt +++ b/intl/icu/source/data/locales/be_BY.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be_BY{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bem.txt b/intl/icu/source/data/locales/bem.txt index c0d5ec64eb07..5d7dbcb18a88 100644 --- a/intl/icu/source/data/locales/bem.txt +++ b/intl/icu/source/data/locales/bem.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bem{ AuxExemplarCharacters{"[d h q r v x z]"} ExemplarCharacters{"[a b c e f g i j k l m n o p s {sh} t u w y]"} @@ -12,7 +13,6 @@ bem{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/bem_ZM.txt b/intl/icu/source/data/locales/bem_ZM.txt index 9f100ab5aafa..48fcb0934d2e 100644 --- a/intl/icu/source/data/locales/bem_ZM.txt +++ b/intl/icu/source/data/locales/bem_ZM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bem_ZM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bez.txt b/intl/icu/source/data/locales/bez.txt index d33348a087a2..2eac73295161 100644 --- a/intl/icu/source/data/locales/bez.txt +++ b/intl/icu/source/data/locales/bez.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bez{ AuxExemplarCharacters{"[x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p q r s t u v w y z]"} @@ -11,7 +12,6 @@ bez{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/bez_TZ.txt b/intl/icu/source/data/locales/bez_TZ.txt index a5385b813c0e..e19fa2bb79b0 100644 --- a/intl/icu/source/data/locales/bez_TZ.txt +++ b/intl/icu/source/data/locales/bez_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bez_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bg.txt b/intl/icu/source/data/locales/bg.txt index 48c80f817925..b062e1460a03 100644 --- a/intl/icu/source/data/locales/bg.txt +++ b/intl/icu/source/data/locales/bg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ AuxExemplarCharacters{"[{а\u0300} ѐ ё ѝ {о\u0300} {у\u0300} {ъ\u0300} ы ѣ э {ю\u0300} {я\u0300} ѫ]"} Ellipsis{ @@ -13,7 +14,7 @@ bg{ ExemplarCharacters{"[а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ь ю я]"} ExemplarCharactersIndex{"[А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} - ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ‚ \u0022 “ „ ( ) \\[ \\] § * / ″ №]"} + ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ‚ \u0022 “ „ ( ) \\[ \\] § @ * / ″ №]"} MoreInformation{"?"} NumberElements{ default{"latn"} @@ -212,14 +213,13 @@ bg{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", + "H:mm:ss 'ч'. zzzz", + "H:mm:ss 'ч'. z", + "H:mm:ss 'ч'.", + "H:mm 'ч'.", "EEEE, d MMMM y 'г'. G", "d MMMM y 'г'. G", "d.MM.y 'г'. G", @@ -249,9 +249,9 @@ bg{ GyMMMMEd{"E, d MMMM y 'г'. G"} GyMMMMd{"d MMMM y 'г'. G"} GyMMMd{"d.MM.y 'г'. G"} - H{"HH"} - Hm{"HH:mm"} - Hms{"HH:mm:ss"} + H{"HH 'ч'."} + Hm{"HH:mm 'ч'."} + Hms{"HH:mm:ss 'ч'."} M{"M"} MEd{"E, d.MM"} MMM{"MM"} @@ -262,7 +262,7 @@ bg{ MMMd{"d.MM"} Md{"d.MM"} d{"d"} - h{"h a"} + h{"h 'ч'. a"} hm{"h:mm 'ч'. a"} hms{"h:mm:ss 'ч'. a"} ms{"mm:ss"} @@ -457,10 +457,10 @@ bg{ "pm", } DateTimePatterns{ - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", + "H:mm:ss 'ч'. zzzz", + "H:mm:ss 'ч'. z", + "H:mm:ss 'ч'.", + "H:mm 'ч'.", "EEEE, d MMMM y 'г'.", "d MMMM y 'г'.", "d.MM.y 'г'.", @@ -475,17 +475,17 @@ bg{ Timezone{"{0} {1}"} } availableFormats{ - Bh{"h B"} - Bhm{"h:mm B"} - Bhms{"h:mm:ss B"} + Bh{"h 'ч'. B"} + Bhm{"h:mm 'ч'. B"} + Bhms{"h:mm:ss 'ч'. B"} E{"ccc"} - EBhm{"E, h:mm B"} - EBhms{"E, h:mm:ss B"} - EHm{"E, HH:mm"} - EHms{"E, H:mm:ss"} + EBhm{"E, h:mm 'ч'. B"} + EBhms{"E, h:mm:ss 'ч'. B"} + EHm{"E, HH:mm 'ч'."} + EHms{"E, HH:mm:ss 'ч'."} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm 'ч'. a"} + Ehms{"E, h:mm:ss 'ч'. a"} Gy{"y 'г'. G"} GyMMM{"MM.y 'г'. G"} GyMMMEd{"E, d.MM.y 'г'. G"} @@ -493,11 +493,11 @@ bg{ GyMMMMEd{"E, d MMMM y 'г'. G"} GyMMMMd{"d MMMM y 'г'. G"} GyMMMd{"d.MM.y 'г'. G"} - H{"H"} - Hm{"H:mm"} - Hms{"H:mm:ss"} - Hmsv{"HH:mm:ss v"} - Hmv{"HH:mm v"} + H{"HH 'ч'."} + Hm{"HH:mm 'ч'."} + Hms{"HH:mm:ss 'ч'."} + Hmsv{"HH:mm:ss 'ч'. v"} + Hmv{"HH:mm 'ч'. v"} M{"L"} MEd{"E, d.MM"} MMM{"MM"} @@ -513,11 +513,11 @@ bg{ MMMd{"d.MM"} Md{"d.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h 'ч'. a"} + hm{"h:mm 'ч'. a"} + hms{"h:mm:ss 'ч'. a"} + hmsv{"h:mm:ss 'ч'. a v"} + hmv{"h:mm 'ч'. a v"} ms{"m:ss"} y{"y 'г'."} yM{"MM.y 'г'."} @@ -739,18 +739,18 @@ bg{ y{"dd.MM.y – dd.MM.y GGGGG"} } H{ - H{"H – H"} + H{"H – H 'ч'."} } Hm{ - H{"H:mm – H:mm"} - m{"H:mm – H:mm"} + H{"H:mm 'ч'. – H:mm 'ч'."} + m{"H:mm 'ч'. – H:mm 'ч'."} } Hmv{ - H{"H:mm – H:mm v"} - m{"H:mm – H:mm v"} + H{"H:mm 'ч'. – H:mm 'ч'. v"} + m{"H:mm 'ч'. – H:mm 'ч'. v"} } Hv{ - H{"H – H v"} + H{"H – H 'ч'. v"} } M{ M{"M – M"} @@ -790,22 +790,22 @@ bg{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + 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"} + 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 a – h:mm a v"} - m{"h:mm a – h:mm a v"} + a{"h:mm 'ч'. a – h:mm 'ч'. a v"} + h{"h:mm 'ч'. a – h:mm 'ч'. a v"} + m{"h:mm 'ч'. a – h:mm 'ч'. a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h 'ч'. a – h 'ч'. a v"} + h{"h 'ч'. – h 'ч'. a v"} } y{ y{"y – y 'г'."} @@ -1745,12 +1745,12 @@ bg{ } relativeTime{ future{ - one{"сл. {0} вт."} - other{"сл. {0} вт."} + one{"сл. {0} вт"} + other{"сл. {0} вт"} } past{ - one{"пр. {0} вт."} - other{"пр. {0} вт."} + one{"пр. {0} вт"} + other{"пр. {0} вт"} } } } diff --git a/intl/icu/source/data/locales/bg_BG.txt b/intl/icu/source/data/locales/bg_BG.txt index 5f0fc67b7947..21007c1fe8b1 100644 --- a/intl/icu/source/data/locales/bg_BG.txt +++ b/intl/icu/source/data/locales/bg_BG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg_BG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bm.txt b/intl/icu/source/data/locales/bm.txt index fa9663c8228c..305f9e263a99 100644 --- a/intl/icu/source/data/locales/bm.txt +++ b/intl/icu/source/data/locales/bm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bm{ AuxExemplarCharacters{"[q v x]"} ExemplarCharacters{"[a b c d e ɛ f g h i j k l m n ɲ ŋ o ɔ p r s t u w y z]"} @@ -12,7 +13,6 @@ bm{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/bm_ML.txt b/intl/icu/source/data/locales/bm_ML.txt index 1e98a9706268..38962a69ff60 100644 --- a/intl/icu/source/data/locales/bm_ML.txt +++ b/intl/icu/source/data/locales/bm_ML.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bm_ML{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bn.txt b/intl/icu/source/data/locales/bn.txt index 752ac95857fc..fe325af9c2ec 100644 --- a/intl/icu/source/data/locales/bn.txt +++ b/intl/icu/source/data/locales/bn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn{ AuxExemplarCharacters{"[\u200C\u200D ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ]"} Ellipsis{ @@ -199,8 +200,8 @@ bn{ other{"00শত কো"} } 100000000000{ - one{"00000 কো"} - other{"00000 কো"} + one{"000কো"} + other{"000কো"} } 1000000000000{ one{"0 লা'.'কো'.'"} @@ -247,7 +248,6 @@ bn{ minimumGroupingDigits{"1"} native{"beng"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -2102,7 +2102,7 @@ bn{ other{"{0} সোমবারেতে"} } past{ - one{"{0} সোমবারেতে"} + one{"{0} সোমবার আগে"} other{"{0} সোমবার আগে"} } } diff --git a/intl/icu/source/data/locales/bn_BD.txt b/intl/icu/source/data/locales/bn_BD.txt index ca48e9f3c125..51ef8327c23a 100644 --- a/intl/icu/source/data/locales/bn_BD.txt +++ b/intl/icu/source/data/locales/bn_BD.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn_BD{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bn_IN.txt b/intl/icu/source/data/locales/bn_IN.txt index 0a55ed7016e6..480b917cfa34 100644 --- a/intl/icu/source/data/locales/bn_IN.txt +++ b/intl/icu/source/data/locales/bn_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bo.txt b/intl/icu/source/data/locales/bo.txt index 232310807724..46d4f538b1db 100644 --- a/intl/icu/source/data/locales/bo.txt +++ b/intl/icu/source/data/locales/bo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo{ AuxExemplarCharacters{"[ༀ]"} ExemplarCharacters{ @@ -33,7 +34,6 @@ bo{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/bo_CN.txt b/intl/icu/source/data/locales/bo_CN.txt index da587629194a..5dbddadb913d 100644 --- a/intl/icu/source/data/locales/bo_CN.txt +++ b/intl/icu/source/data/locales/bo_CN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo_CN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bo_IN.txt b/intl/icu/source/data/locales/bo_IN.txt index f4c90ba76e47..98d2ef6e1d25 100644 --- a/intl/icu/source/data/locales/bo_IN.txt +++ b/intl/icu/source/data/locales/bo_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/br.txt b/intl/icu/source/data/locales/br.txt index 0d982e9a2c62..f278fe79e942 100644 --- a/intl/icu/source/data/locales/br.txt +++ b/intl/icu/source/data/locales/br.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml br{ AuxExemplarCharacters{"[á à ă â å ä ã ā æ c ç é è ĕ ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ q ú ŭ û ü ū ÿ]"} Ellipsis{ @@ -10,7 +11,7 @@ br{ word-initial{"… {0}"} word-medial{"{0} … {1}"} } - ExemplarCharacters{"[a b {ch} {cʼh} d e ê f g h i j k l m n ñ o p r s t u ù v w x y z]"} + ExemplarCharacters{"[a b {cʼh} {ch} d e ê f g h i j k l m n ñ o p 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 R S T U V W X Y Z]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"} @@ -23,6 +24,7 @@ br{ percentFormat{"#,##0 %"} } symbols{ + approximatelySign{"~"} decimal{"٫"} exponential{"اس"} group{"٬"} @@ -419,6 +421,7 @@ br{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{" "} @@ -558,7 +561,6 @@ br{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -1418,18 +1420,18 @@ br{ monthNames{ format{ abbreviated{ - "kentañ miz", - "eil miz", - "trede miz", - "pevare miz", - "pempvet miz", - "cʼhwecʼhvet miz", - "seizhvet miz", - "eizhvet miz", - "navet miz", - "dekvet miz", - "unnekvet miz", - "daouzekvet miz", + "miz 1", + "miz 2", + "miz 3", + "miz 4", + "miz 5", + "miz 6", + "miz 7", + "miz 8", + "miz 9", + "miz 10", + "miz 11", + "miz 12", } narrow{ "1", @@ -1462,18 +1464,18 @@ br{ } stand-alone{ abbreviated{ - "kentañ miz", - "eil miz", - "trede miz", - "pevare miz", - "pempvet miz", - "cʼhwecʼhvet miz", - "seizhvet miz", - "eizhvet miz", - "navet miz", - "dekvet miz", - "unnekvet miz", - "daouzekvet miz", + "miz 1", + "miz 2", + "miz 3", + "miz 4", + "miz 5", + "miz 6", + "miz 7", + "miz 8", + "miz 9", + "miz 10", + "miz 11", + "miz 12", } narrow{ "1", @@ -5106,37 +5108,63 @@ br{ animals_nature{"loened pe natur"} arrows{"biroù"} body{"korf"} + box_drawing{"rizennoù"} braille{"skritur Braille"} building{"savadur"} bullets_stars{"krug pe steredenn"} + consonantal_jamo{"kensonennoù jamo"} currency_symbols{"arouez moneiz"} + dash_connector{"barrennig pe kennasker"} digits{"sifr"} + dingbats{"arouez Dingbat"} divination_symbols{"arouez divinouriezh"} + east_asian_scripts{"skriturioù Azia ar Reter"} european_scripts{"skritur europat"} female{"benel"} flag{"banniel"} flags{"bannieloù"} food_drink{"boued hag evaj"} format{"furmad"} + format_whitespace{"furmad hag esaouennoù"} + han_characters{"arouezennoù han"} han_radicals{"gwrizienn han"} + hanja{"arouezenn hanja"} + hanzi_simplified{"arouezennoù han (eeunaet)"} + hanzi_traditional{"arouezennoù han (hengounel)"} + heart{"kalon"} historic_scripts{"skritur istorel"} + male{"gourel"} + math_symbols{"arouez matematikel"} + middle_eastern_scripts{"skriturioù Reter-Kreiz"} + miscellaneous{"liesseurt"} modern_scripts{"skritur modern"} modifier{"kemmañ"} nature{"natur"} numbers{"niveroù"} objects{"tra"} + other{"all"} person{"den"} phonetic_alphabet{"lizherenneg soniadel"} pictographs{"piktogramm"} place{"lecʼh"} plant{"plant"} punctuation{"poentadur"} + sign_standard_symbols{"sin pe arouez"} + small_form_variant{"adstummoù bihan"} smiley{"fromlun"} + smileys_people{"fromlun pe den"} + south_asian_scripts{"skriturioù Azia ar Su"} + southeast_asian_scripts{"skriturioù Azia ar Gevred"} sport{"sport"} symbols{"arouez"} + technical_symbols{"arouez teknikel"} travel{"beaj"} - travel_places{"beaj ha lecʼhioù"} + travel_places{"beaj pe lecʼh"} + variant_forms{"adstumm"} + vocalic_jamo{"bogalennoù jamo"} weather{"amzer"} + western_asian_scripts{"skriturioù Azia ar Cʼhonôg"} + whitespace{"esaouenn"} } delimiters{ alternateQuotationEnd{"”"} @@ -5349,6 +5377,9 @@ br{ } minute{ dn{"munut"} + relative{ + "0"{"ar munut-mañ"} + } relativeTime{ future{ few{"a-benn {0} munut"} diff --git a/intl/icu/source/data/locales/br_FR.txt b/intl/icu/source/data/locales/br_FR.txt index 92068fd9021f..1bebd36093d3 100644 --- a/intl/icu/source/data/locales/br_FR.txt +++ b/intl/icu/source/data/locales/br_FR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml br_FR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/brx.txt b/intl/icu/source/data/locales/brx.txt index 1febec3e9aec..a9e71238bc41 100644 --- a/intl/icu/source/data/locales/brx.txt +++ b/intl/icu/source/data/locales/brx.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml brx{ AuxExemplarCharacters{"[\u200C\u200D]"} ExemplarCharacters{ @@ -36,7 +37,6 @@ brx{ } native{"deva"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/brx_IN.txt b/intl/icu/source/data/locales/brx_IN.txt index b370b21b5ca9..01d08fef5a30 100644 --- a/intl/icu/source/data/locales/brx_IN.txt +++ b/intl/icu/source/data/locales/brx_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml brx_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bs.txt b/intl/icu/source/data/locales/bs.txt index 11c1d2d0d433..f1794c11d930 100644 --- a/intl/icu/source/data/locales/bs.txt +++ b/intl/icu/source/data/locales/bs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs{ AuxExemplarCharacters{"[q w x y]"} Ellipsis{ @@ -222,6 +223,7 @@ bs{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{"."} @@ -240,16 +242,22 @@ bs{ other{"Skrenite na {0}. križanju desno."} } plural{ - few{"{0} sata"} - one{"{0} sat"} - other{"{0} sati"} + few{"{0} dana"} + one{"{0} dan"} + other{"{0} drugih"} } } minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ + buddhist{ + eras{ + abbreviated{ + "BE", + } + } + } generic{ DateTimePatterns{ "HH:mm:ss zzzz", @@ -358,6 +366,14 @@ bs{ d{"GGGGG y-MM-dd – y-MM-dd"} y{"GGGGG y-MM-dd – y-MM-dd"} } + 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."} } @@ -384,6 +400,22 @@ bs{ d{"d. – d."} } fallback{"{0} – {1}"} + h{ + a{"h a – 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"} + } y{ y{"y. – y. G"} } @@ -655,7 +687,7 @@ bs{ "n. e.", } abbreviated%variant{ - "p.n.e.", + "p. n. e.", "n.e.", } narrow{ @@ -946,6 +978,13 @@ bs{ } } } + hebrew{ + eras{ + abbreviated{ + "AM", + } + } + } islamic{ DateTimePatterns{ "HH:mm:ss zzzz", @@ -991,95 +1030,142 @@ bs{ "AH", } } + monthNames{ + format{ + abbreviated{ + "muh.", + "saf.", + "Rab. I", + "rab. ii", + "džum. i", + "džum. ii", + "redž.", + "ša.", + "ram.", + "še.", + "zul-k.", + "zul-h.", + } + wide{ + "muharem", + "safer", + "rabiʻ i", + "rabiʻ ii", + "džumade i", + "džumade ii", + "redžeb", + "Shaʻban", + "ramazan", + "ševal", + "zul-kade", + "zul-hidže", + } + } + } + } + roc{ + availableFormats{ + M{"L."} + MMM{"LLL"} + MMMEd{"E, d. MMM"} + MMMd{"d. MMM"} + d{"d."} + } + eras{ + abbreviated{ + "prije R.O.C.", + "R.O.C.", + } + } } } characterLabel{ - activities{"Aktivnosti"} - african_scripts{"Afrička pisma"} - american_scripts{"Američka pisma"} - animal{"Životinja"} - animals_nature{"Životinje ili priroda"} - arrows{"Strjelice"} - body{"Tijelo"} + activities{"aktivnost"} + african_scripts{"afričko pismo"} + american_scripts{"američko pismo"} + animal{"životinja"} + animals_nature{"životinja ili priroda"} + arrows{"strelica"} + body{"tijelo"} box_drawing{"Linije"} braille{"Brajevo pismo"} - building{"Zgrada"} - bullets_stars{"Znakovi/zvjezdice za isticanje"} + building{"zgrada"} + bullets_stars{"znak za nabrajanje ili zvjezdica"} consonantal_jamo{"Konsonantski jamo"} - currency_symbols{"Simboli valuta"} - dash_connector{"Crtica/poveznik"} - digits{"Cifre"} - dingbats{"Dingbati"} - divination_symbols{"Simboli za predviđanje"} - downwards_arrows{"Strjelice nadolje"} - downwards_upwards_arrows{"Strjelice nadolje nagore"} - east_asian_scripts{"Istočnoazijska pisma"} + currency_symbols{"simbol valute"} + dash_connector{"crtica ili poveznica"} + digits{"cifra"} + dingbats{"dingbati"} + divination_symbols{"simbol za predviđanje"} + downwards_arrows{"strelica nadolje"} + downwards_upwards_arrows{"strelica nadolje-nagore"} + east_asian_scripts{"istočnoazijsko pismo"} emoji{"Emoji sličice"} - european_scripts{"Evropska pisma"} + european_scripts{"evropsko pismo"} female{"Žensko"} - flag{"Zastava"} - flags{"Zastave"} + flag{"zastava"} + flags{"zastave"} food_drink{"Hrana i piće"} - format{"Format"} - format_whitespace{"Format i prazan prostor"} - full_width_form_variant{"Varijante oblika pune širine"} - geometric_shapes{"Geometrijski oblici"} - half_width_form_variant{"Varijante oblika polovične širine"} - han_characters{"Han znakovi"} - han_radicals{"Han ključevi"} - hanja{"Hanja"} + format{"format"} + format_whitespace{"format i bjelina"} + full_width_form_variant{"varijanta pune širine"} + geometric_shapes{"geometrijski oblik"} + half_width_form_variant{"varijanta polovične širine"} + han_characters{"Han znak"} + han_radicals{"Han ključ"} + hanja{"hanja"} hanzi_simplified{"Hanzi (pojednostavljeni)"} hanzi_traditional{"Hanzi (tradicionalni)"} - heart{"Srce"} - historic_scripts{"Stara pisma"} - ideographic_desc_characters{"Znakovi za ideografski opis"} + heart{"srce"} + historic_scripts{"historijsko pismo"} + ideographic_desc_characters{"ideografski opisni znak"} japanese_kana{"Japanski kana"} kanbun{"Kanbun"} kanji{"Kanji"} keycap{"Kapica za tipku"} - leftwards_arrows{"Strjelice ulijevo"} - leftwards_rightwards_arrows{"Strjelice ulijevo udesno"} - letterlike_symbols{"Simboli nalik slovima"} - limited_use{"Ograničena upotreba"} + leftwards_arrows{"strelica ulijevo"} + leftwards_rightwards_arrows{"strelica ulijevo udesno"} + letterlike_symbols{"simbol nalik slovu"} + limited_use{"ograničena upotreba"} male{"Muško"} - math_symbols{"Matematički simboli"} - middle_eastern_scripts{"Bliskoistočna pisma"} - miscellaneous{"Razno"} - modern_scripts{"Moderna pisma"} - modifier{"Modifikator"} - musical_symbols{"Muzički simboli"} - nature{"Priroda"} - nonspacing{"Nerazdvajajući znakovi"} - numbers{"Brojevi"} - objects{"Objekti"} - other{"Ostalo"} - paired{"Upareno"} - person{"Osoba"} - phonetic_alphabet{"Fonetska abeceda"} - pictographs{"Piktogrami"} - place{"Mjesto"} - plant{"Biljka"} - punctuation{"Interpunkcija"} - rightwards_arrows{"Strjelice udesno"} - sign_standard_symbols{"Znakovni/standardni simboli"} - small_form_variant{"Varijante malih oblika"} - smiley{"Smajli"} - smileys_people{"Nasmiješena lica i ljudi"} - south_asian_scripts{"Južnoazijska pisma"} - southeast_asian_scripts{"Jugoistočnoazijska pisma"} - spacing{"Razmak"} - sport{"Sport"} - symbols{"Simboli"} - technical_symbols{"Tehnički simboli"} - tone_marks{"Tonske oznake"} - travel{"Putovanja"} - travel_places{"Putovanja i mjesta"} - upwards_arrows{"Strjelica nagore"} - variant_forms{"Varijante oblika"} - vocalic_jamo{"Vokalni jamo"} - weather{"Vrijeme"} - western_asian_scripts{"Zapadnoazijska pisma"} - whitespace{"Prazan prostor"} + math_symbols{"matematički simbol"} + middle_eastern_scripts{"bliskoistočno pismo"} + miscellaneous{"razno"} + modern_scripts{"moderno pismo"} + modifier{"modifikator"} + musical_symbols{"muzički simbol"} + nature{"priroda"} + nonspacing{"nerazdvajajući znak"} + numbers{"brojevi"} + objects{"objekt"} + other{"ostalo"} + paired{"upareno"} + person{"osoba"} + phonetic_alphabet{"fonetska abeceda"} + pictographs{"piktogram"} + place{"mjesto"} + plant{"biljka"} + punctuation{"interpunkcija"} + rightwards_arrows{"strelica udesno"} + sign_standard_symbols{"znak ili simbol"} + small_form_variant{"varijante male veličine"} + smiley{"smajli"} + smileys_people{"smajli ili osoba"} + south_asian_scripts{"južnoazijsko pismo"} + southeast_asian_scripts{"jugoistočno azijsko pismo"} + spacing{"razmak"} + sport{"sport"} + symbols{"simbol"} + technical_symbols{"tehnički simbol"} + tone_marks{"tonska oznaka"} + travel{"putovanje"} + travel_places{"putovanje ili mjesto"} + upwards_arrows{"strelice nagore"} + variant_forms{"varijanta"} + vocalic_jamo{"vokalni jamo"} + weather{"vrijeme"} + western_asian_scripts{"zapadnoazijsko pismo"} + whitespace{"bjelina"} } delimiters{ alternateQuotationEnd{"’"} diff --git a/intl/icu/source/data/locales/bs_BA.txt b/intl/icu/source/data/locales/bs_BA.txt index e5e3a465740d..70619a1bff37 100644 --- a/intl/icu/source/data/locales/bs_BA.txt +++ b/intl/icu/source/data/locales/bs_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_BA{ "%%ALIAS"{"bs_Latn_BA"} } diff --git a/intl/icu/source/data/locales/bs_Cyrl.txt b/intl/icu/source/data/locales/bs_Cyrl.txt index ce7523560d7b..1f67db2f7bc8 100644 --- a/intl/icu/source/data/locales/bs_Cyrl.txt +++ b/intl/icu/source/data/locales/bs_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Cyrl{ %%Parent{"root"} AuxExemplarCharacters{"[]"} @@ -233,7 +234,6 @@ bs_Cyrl{ } } } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/bs_Cyrl_BA.txt b/intl/icu/source/data/locales/bs_Cyrl_BA.txt index bfd5afbb2d88..8482cc0cc4d9 100644 --- a/intl/icu/source/data/locales/bs_Cyrl_BA.txt +++ b/intl/icu/source/data/locales/bs_Cyrl_BA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Cyrl_BA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bs_Latn.txt b/intl/icu/source/data/locales/bs_Latn.txt index d1a6b5e7fa79..f2561126b44d 100644 --- a/intl/icu/source/data/locales/bs_Latn.txt +++ b/intl/icu/source/data/locales/bs_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/bs_Latn_BA.txt b/intl/icu/source/data/locales/bs_Latn_BA.txt index 64237e38bc7a..c9ab9363af48 100644 --- a/intl/icu/source/data/locales/bs_Latn_BA.txt +++ b/intl/icu/source/data/locales/bs_Latn_BA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Latn_BA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ca.txt b/intl/icu/source/data/locales/ca.txt index 182e1b34b938..a2a1ff3e6deb 100644 --- a/intl/icu/source/data/locales/ca.txt +++ b/intl/icu/source/data/locales/ca.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca{ AuxExemplarCharacters{"[á ă â å ä ã ā æ ĕ ê ë ē ì ĭ î ī ŀ ñ º ŏ ô ö ø ō œ ù ŭ û ū ÿ]"} Ellipsis{ @@ -218,11 +219,10 @@ ca{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ - "H:mm:ss zzzz", + "H:mm:ss (zzzz)", "H:mm:ss z", "H:mm:ss", "H:mm", @@ -257,7 +257,7 @@ ca{ } chinese{ DateTimePatterns{ - "H:mm:ss zzzz", + "H:mm:ss (zzzz)", "H:mm:ss z", "H:mm:ss", "H:mm", @@ -336,7 +336,7 @@ ca{ } generic{ DateTimePatterns{ - "H:mm:ss zzzz", + "H:mm:ss (zzzz)", "H:mm:ss z", "H:mm:ss", "H:mm", @@ -558,7 +558,7 @@ ca{ "p. m.", } DateTimePatterns{ - "H:mm:ss zzzz", + "H:mm:ss (zzzz)", "H:mm:ss z", "H:mm:ss", "H:mm", @@ -567,8 +567,8 @@ ca{ "d MMM y", "d/M/yy", "{1}, {0}", - "{1} 'a' 'les' {0}", - "{1} 'a' 'les' {0}", + "{1}, 'a' 'les' {0}", + "{1}, 'a' 'les' {0}", "{1}, {0}", "{1} {0}", } @@ -598,7 +598,9 @@ ca{ Hm{"H:mm"} Hms{"H:mm:ss"} Hmsv{"H:mm:ss v"} + Hmsvvvv{"H:mm:ss (vvvv)"} Hmv{"H:mm v"} + Hmvvvv{"H:mm (vvvv)"} M{"L"} MEd{"E d/M"} MMM{"LLL"} @@ -616,7 +618,9 @@ ca{ hm{"h:mm a"} hms{"h:mm:ss a"} hmsv{"h:mm:ss a v"} + hmsvvvv{"h:mm:ss a (vvvv)"} hmv{"h:mm a v"} + hmvvvv{"h:mm a (vvvv)"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -1083,7 +1087,7 @@ ca{ } roc{ DateTimePatterns{ - "H:mm:ss zzzz", + "H:mm:ss (zzzz)", "H:mm:ss z", "H:mm:ss", "H:mm", diff --git a/intl/icu/source/data/locales/ca_AD.txt b/intl/icu/source/data/locales/ca_AD.txt index 72f91026d74f..46a907146180 100644 --- a/intl/icu/source/data/locales/ca_AD.txt +++ b/intl/icu/source/data/locales/ca_AD.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca_AD{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ca_ES.txt b/intl/icu/source/data/locales/ca_ES.txt index 7bcefbb3b213..2ab7b8dff6d0 100644 --- a/intl/icu/source/data/locales/ca_ES.txt +++ b/intl/icu/source/data/locales/ca_ES.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca_ES{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ca_FR.txt b/intl/icu/source/data/locales/ca_FR.txt index c7e5ee53b678..3473d7cf6f0e 100644 --- a/intl/icu/source/data/locales/ca_FR.txt +++ b/intl/icu/source/data/locales/ca_FR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca_FR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ca_IT.txt b/intl/icu/source/data/locales/ca_IT.txt index 28c8f6757b70..adefabf8c729 100644 --- a/intl/icu/source/data/locales/ca_IT.txt +++ b/intl/icu/source/data/locales/ca_IT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca_IT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ccp.txt b/intl/icu/source/data/locales/ccp.txt index d3c41e8c2ddf..643e28fd13af 100644 --- a/intl/icu/source/data/locales/ccp.txt +++ b/intl/icu/source/data/locales/ccp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp{ AuxExemplarCharacters{"[]"} ExemplarCharacters{ @@ -83,7 +84,6 @@ ccp{ minimumGroupingDigits{"1"} native{"cakm"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ccp_BD.txt b/intl/icu/source/data/locales/ccp_BD.txt index 5a6fbb32e65e..154ef6640cee 100644 --- a/intl/icu/source/data/locales/ccp_BD.txt +++ b/intl/icu/source/data/locales/ccp_BD.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp_BD{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ccp_IN.txt b/intl/icu/source/data/locales/ccp_IN.txt index c8591572f827..358dbec03e37 100644 --- a/intl/icu/source/data/locales/ccp_IN.txt +++ b/intl/icu/source/data/locales/ccp_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ce.txt b/intl/icu/source/data/locales/ce.txt index f7315cb4a670..5248791e45ac 100644 --- a/intl/icu/source/data/locales/ce.txt +++ b/intl/icu/source/data/locales/ce.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ce{ ExemplarCharacters{ "[а {аь} б в г {гӏ} д е ё ж з и {ий} й к {кк} {ккх} {кх} {кь} {кӏ} л м н о {о" @@ -193,7 +194,6 @@ ce{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1018,7 +1018,7 @@ ce{ } week-short{ dn{"кӀир."} - relativePeriod{"кӀирнахь"} + relativePeriod{"кӀирнахь {0}"} relativeTime{ future{ one{"{0} кӀир. даьлча"} diff --git a/intl/icu/source/data/locales/ce_RU.txt b/intl/icu/source/data/locales/ce_RU.txt index 4e20db36eb21..379485d89b6b 100644 --- a/intl/icu/source/data/locales/ce_RU.txt +++ b/intl/icu/source/data/locales/ce_RU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ce_RU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ceb.txt b/intl/icu/source/data/locales/ceb.txt index 9a3c2c03e5f6..7539f8dd2344 100644 --- a/intl/icu/source/data/locales/ceb.txt +++ b/intl/icu/source/data/locales/ceb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ceb{ AuxExemplarCharacters{"[c f j ñ q v x z]"} ExemplarCharacters{"[a b d e g h i k l m n o p r s t u w y]"} @@ -14,7 +15,6 @@ ceb{ accountingFormat{"¤#,##0.00;(¤#,##0.00)"} currencyFormat{"¤#,##0.00"} decimalFormat{"#,##0.###"} - percentFormat{"#,#0%"} scientificFormat{"#E0"} } symbols{ @@ -35,7 +35,6 @@ ceb{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -214,7 +213,7 @@ ceb{ Ed{"d E"} Ehm{"E h:mm a"} Ehms{"E h:mm:ss a"} - Gy{"G y"} + Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} GyMMMd{"MMM d, y G"} @@ -319,7 +318,7 @@ ceb{ eras{ abbreviated{ "BC", - "KP", + "AD", } abbreviated%variant{ "BCE", @@ -330,8 +329,8 @@ ceb{ "Anno Domini", } wide%variant{ - "Sa Wala Pa ang Common Era", - "Common Era", + "Wala Pa ang Komong Panahon", + "Komong Panahon", } } intervalFormats{ @@ -465,14 +464,14 @@ ceb{ monthNames{ format{ abbreviated{ - "En", + "Ene", "Peb", "Mar", - "Apr", + "Abr", "May", "Hun", "Hul", - "Ag", + "Ago", "Set", "Okt", "Nob", @@ -619,7 +618,7 @@ ceb{ dn{"AM/PM"} } era{ - dn{"era"} + dn{"panahon"} } hour{ dn{"oras"} diff --git a/intl/icu/source/data/locales/ceb_PH.txt b/intl/icu/source/data/locales/ceb_PH.txt index 74765e54623b..84581ff49460 100644 --- a/intl/icu/source/data/locales/ceb_PH.txt +++ b/intl/icu/source/data/locales/ceb_PH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ceb_PH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/cgg.txt b/intl/icu/source/data/locales/cgg.txt index cbf8fd50b96c..78cc66177232 100644 --- a/intl/icu/source/data/locales/cgg.txt +++ b/intl/icu/source/data/locales/cgg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cgg{ 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]"} @@ -10,7 +11,6 @@ cgg{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/cgg_UG.txt b/intl/icu/source/data/locales/cgg_UG.txt index 33b04e7bdf55..dcec25781bb9 100644 --- a/intl/icu/source/data/locales/cgg_UG.txt +++ b/intl/icu/source/data/locales/cgg_UG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cgg_UG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/chr.txt b/intl/icu/source/data/locales/chr.txt index efd096edd900..02199f19ead5 100644 --- a/intl/icu/source/data/locales/chr.txt +++ b/intl/icu/source/data/locales/chr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr{ AuxExemplarCharacters{"[]"} Ellipsis{ @@ -219,7 +220,6 @@ chr{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/chr_US.txt b/intl/icu/source/data/locales/chr_US.txt index 4fc78e0b322a..ce48ecb9c1fb 100644 --- a/intl/icu/source/data/locales/chr_US.txt +++ b/intl/icu/source/data/locales/chr_US.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr_US{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ckb.txt b/intl/icu/source/data/locales/ckb.txt index d25a136884af..8e79118fdad3 100644 --- a/intl/icu/source/data/locales/ckb.txt +++ b/intl/icu/source/data/locales/ckb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb{ AuxExemplarCharacters{ "[\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 ء آ أ " @@ -57,7 +58,6 @@ ckb{ minimumGroupingDigits{"1"} native{"arab"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ckb_IQ.txt b/intl/icu/source/data/locales/ckb_IQ.txt index acf6ae5419cb..949243bb0c1b 100644 --- a/intl/icu/source/data/locales/ckb_IQ.txt +++ b/intl/icu/source/data/locales/ckb_IQ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb_IQ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ckb_IR.txt b/intl/icu/source/data/locales/ckb_IR.txt index df2b5a605d00..544ec7945bd4 100644 --- a/intl/icu/source/data/locales/ckb_IR.txt +++ b/intl/icu/source/data/locales/ckb_IR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb_IR{ - Version{"37"} calendar{ default{"persian"} gregorian{ diff --git a/intl/icu/source/data/locales/cs.txt b/intl/icu/source/data/locales/cs.txt index 69ec9ca5f250..936e2d069bc7 100644 --- a/intl/icu/source/data/locales/cs.txt +++ b/intl/icu/source/data/locales/cs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs{ AuxExemplarCharacters{"[à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ľ ł ñ ò ŏ ô ö ø ō œ ŕ ù ŭ û ü ū ÿ]"} Ellipsis{ @@ -381,6 +382,7 @@ cs{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{" "} @@ -519,7 +521,6 @@ cs{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -6465,6 +6466,18 @@ cs{ middle{"{0}, {1}"} start{"{0}, {1}"} } + or-narrow{ + 2{"{0} nebo {1}"} + end{"{0} nebo {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } + or-short{ + 2{"{0} nebo {1}"} + end{"{0} nebo {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } standard{ 2{"{0} a {1}"} end{"{0} a {1}"} @@ -6505,36 +6518,4 @@ cs{ US{"USA"} metric{"metrický"} } - parse{ - date{ - lenient{ - "[\\--/]", - "[\\:∶]", - } - } - general{ - lenient{ - "[.․。︒﹒.。]", - "['ʼ՚᾽᾿’']", - "[%٪﹪%]", - "[؉‰]", - "[\$﹩$$]", - "[£₤]", - "[¥¥]", - "[₩₩]", - "[₨₹{Rp}{Rs}]", - } - } - number{ - lenient{ - "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", - "[+⁺₊➕﬩﹢+]", - } - stricter{ - "[,٫︐﹐,]", - "[.․﹒.。]", - } - } - } } diff --git a/intl/icu/source/data/locales/cs_CZ.txt b/intl/icu/source/data/locales/cs_CZ.txt index 03fd33b1d828..63eb4ffa7928 100644 --- a/intl/icu/source/data/locales/cs_CZ.txt +++ b/intl/icu/source/data/locales/cs_CZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs_CZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/cy.txt b/intl/icu/source/data/locales/cy.txt index e4753af199e6..0415a23390f4 100644 --- a/intl/icu/source/data/locales/cy.txt +++ b/intl/icu/source/data/locales/cy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy{ AuxExemplarCharacters{"[ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z]"} Ellipsis{ @@ -395,7 +396,6 @@ cy{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1174,7 +1174,6 @@ cy{ } } day-short{ - dn{"diwrnod"} relative{ "-1"{"ddoe"} "-2"{"echdoe"} @@ -1257,22 +1256,22 @@ cy{ relative{ "-1"{"Gwener diwethaf"} "0"{"Gwener yma"} - "1"{"Gwener nesaf"} + "1"{"Gwen. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Gwener"} many{"ymhen {0} dydd Gwener"} - one{"ymhen {0} dydd Gwener"} - other{"ymhen {0} dydd Gwener"} + one{"ymhen {0} G"} + other{"ymhen {0} G"} two{"ymhen {0} dydd Gwener"} zero{"ymhen {0} dydd Gwener"} } past{ few{"{0} dydd Gwener yn ôl"} many{"{0} dydd Gwener yn ôl"} - one{"{0} dydd Gwener yn ôl"} - other{"{0} dydd Gwener yn ôl"} + one{"{0} G yn ôl"} + other{"{0} G yn ôl"} two{"{0} dydd Gwener yn ôl"} zero{"{0} dydd Gwener yn ôl"} } @@ -1281,23 +1280,23 @@ cy{ fri-short{ relative{ "-1"{"Gwener diwethaf"} - "0"{"Gwener yma"} - "1"{"Gwener nesaf"} + "0"{"Gwen. yma"} + "1"{"Gwen. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Gwener"} many{"ymhen {0} dydd Gwener"} - one{"ymhen {0} dydd Gwener"} - other{"ymhen {0} dydd Gwener"} + one{"ymhen {0} Gwen."} + other{"ymhen {0} Gwen"} two{"ymhen {0} dydd Gwener"} zero{"ymhen {0} dydd Gwener"} } past{ few{"{0} dydd Gwener yn ôl"} many{"{0} dydd Gwener yn ôl"} - one{"{0} dydd Gwener yn ôl"} - other{"{0} dydd Gwener yn ôl"} + one{"{0} Gwen. yn ôl"} + other{"{0} Gwen. yn ôl"} two{"{0} dydd Gwener yn ôl"} zero{"{0} dydd Gwener yn ôl"} } @@ -1397,20 +1396,20 @@ cy{ dn{"mun."} relativeTime{ future{ - few{"ymhen {0} mun."} - many{"ymhen {0} mun."} + few{"ymhen {0} munud"} + many{"ymhen {0} munud"} one{"ymhen {0} mun."} other{"ymhen {0} mun."} two{"ymhen {0} mun."} - zero{"ymhen {0} mun."} + zero{"ymhen {0} munud"} } past{ few{"{0} mun. yn ôl"} - many{"{0} mun. yn ôl"} + many{"{0} munud yn ôl"} one{"{0} mun. yn ôl"} other{"{0} mun. yn ôl"} two{"{0} mun. yn ôl"} - zero{"{0} mun. yn ôl"} + zero{"{0} munud yn ôl"} } } } @@ -1421,16 +1420,16 @@ cy{ few{"ymhen {0} munud"} many{"ymhen {0} munud"} one{"ymhen {0} mun."} - other{"ymhen {0} munud"} + other{"ymhen {0} mun."} two{"ymhen {0} fun."} zero{"ymhen {0} munud"} } past{ few{"{0} munud yn ôl"} many{"{0} munud yn ôl"} - one{"{0} munud yn ôl"} - other{"{0} munud yn ôl"} - two{"{0} fun. yn ôl"} + one{"{0} mun. yn ôl"} + other{"{0} mun. yn ôl"} + two{"{0} funud yn ôl"} zero{"{0} munud yn ôl"} } } @@ -1470,16 +1469,16 @@ cy{ future{ few{"ymhen {0} Dydd Llun"} many{"ymhen {0} Dydd Llun"} - one{"ymhen {0} Dydd Llun"} - other{"ymhen {0} Dydd Llun"} + one{"ymhen {0} Ll"} + other{"ymhen {0} Ll"} two{"ymhen {0} Dydd Llun"} zero{"ymhen {0} Dydd Llun"} } past{ few{"{0} dydd Llun yn ôl"} many{"{0} dydd Llun yn ôl"} - one{"{0} dydd Llun yn ôl"} - other{"{0} dydd Llun yn ôl"} + one{"{0} Ll yn ôl"} + other{"{0} Ll yn ôl"} two{"{0} dydd Llun yn ôl"} zero{"{0} dydd Llun yn ôl"} } @@ -1495,16 +1494,16 @@ cy{ future{ few{"ymhen {0} Dydd Llun"} many{"ymhen {0} Dydd Llun"} - one{"ymhen {0} Dydd Llun"} - other{"ymhen {0} Dydd Llun"} + one{"ymhen {0} Llun"} + other{"ymhen {0} Llun"} two{"ymhen {0} Dydd Llun"} zero{"ymhen {0} Dydd Llun"} } past{ few{"{0} dydd Llun yn ôl"} many{"{0} dydd Llun yn ôl"} - one{"{0} dydd Llun yn ôl"} - other{"{0} dydd Llun yn ôl"} + one{"{0} Llun yn ôl"} + other{"{0} Llun yn ôl"} two{"{0} dydd Llun yn ôl"} zero{"{0} dydd Llun yn ôl"} } @@ -1610,37 +1609,37 @@ cy{ future{ few{"ymhen {0} chwarter"} many{"ymhen {0} chwarter"} - one{"ymhen {0} chwarter"} - other{"ymhen {0} chwarter"} + one{"ymhen {0} chw."} + other{"ymhen {0} chw."} two{"ymhen {0} chwarter"} zero{"ymhen {0} chwarter"} } past{ few{"{0} chwarter yn ôl"} many{"{0} chwarter yn ôl"} - one{"{0} chwarter yn ôl"} - other{"{0} o chwarteri yn ôl"} + one{"{0} chw. yn ôl"} + other{"{0} chw. yn ôl"} two{"{0} chwarter yn ôl"} zero{"{0} o chwarteri yn ôl"} } } } quarter-short{ - dn{"chwarter"} + dn{"chw."} relativeTime{ future{ few{"ymhen {0} chwarter"} many{"ymhen {0} chwarter"} - one{"ymhen {0} chwarter"} - other{"ymhen {0} chwarter"} + one{"ymhen {0} chw."} + other{"ymhen {0} chw."} two{"ymhen {0} chwarter"} zero{"ymhen {0} chwarter"} } past{ few{"{0} chwarter yn ôl"} many{"{0} chwarter yn ôl"} - one{"{0} chwarter yn ôl"} - other{"{0} o chwarteri yn ôl"} + one{"{0} chw. yn ôl"} + other{"{0} chw. yn ôl"} two{"{0} chwarter yn ôl"} zero{"{0} o chwarteri yn ôl"} } @@ -1672,25 +1671,20 @@ cy{ } } sat-narrow{ - relative{ - "-1"{"Sadwrn diwethaf"} - "0"{"Sadwrn yma"} - "1"{"Sadwrn nesaf"} - } relativeTime{ future{ few{"ymhen {0} dydd Sadwrn"} many{"ymhen {0} dydd Sadwrn"} - one{"ymhen {0} dydd Sadwrn"} - other{"ymhen {0} dydd Sadwrn"} + one{"ymhen {0} Sad."} + other{"ymhen {0} Sad."} two{"ymhen {0} dydd Sadwrn"} zero{"ymhen {0} dydd Sadwrn"} } past{ few{"{0} dydd Sadwrn yn ôl"} many{"{0} dydd Sadwrn yn ôl"} - one{"{0} dydd Sadwrn yn ôl"} - other{"{0} dydd Sadwrn yn ôl"} + one{"{0} Sad. yn ôl"} + other{"{0} Sad. yn ôl"} two{"{0} dydd Sadwrn yn ôl"} zero{"{0} dydd Sadwrn yn ôl"} } @@ -1698,24 +1692,24 @@ cy{ } sat-short{ relative{ - "-1"{"Sadwrn diwethaf"} - "0"{"Sadwrn yma"} - "1"{"Sadwrn nesaf"} + "-1"{"Sad. diwethaf"} + "0"{"Sad. yma"} + "1"{"Sad. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Sadwrn"} many{"ymhen {0} dydd Sadwrn"} - one{"ymhen {0} dydd Sadwrn"} - other{"ymhen {0} dydd Sadwrn"} + one{"ymhen {0} Sad."} + other{"ymhen {0} Sad."} two{"ymhen {0} dydd Sadwrn"} zero{"ymhen {0} dydd Sadwrn"} } past{ few{"{0} dydd Sadwrn yn ôl"} many{"{0} dydd Sadwrn yn ôl"} - one{"{0} dydd Sadwrn yn ôl"} - other{"{0} dydd Sadwrn yn ôl"} + one{"{0} Sad. yn ôl"} + other{"{0} Sad. yn ôl"} two{"{0} dydd Sadwrn yn ôl"} zero{"{0} dydd Sadwrn yn ôl"} } @@ -1772,16 +1766,16 @@ cy{ future{ few{"ymhen {0} eiliad"} many{"ymhen {0} eiliad"} - one{"ymhen {0} eiliad"} - other{"ymhen {0} eiliad"} + one{"ymhen {0} eil."} + other{"ymhen {0} eil."} two{"ymhen {0} eiliad"} zero{"ymhen {0} eiliad"} } past{ few{"{0} eiliad yn ôl"} many{"{0} eiliad yn ôl"} - one{"{0} eiliad yn ôl"} - other{"{0} eiliad yn ôl"} + one{"{0} eil. yn ôl"} + other{"{0} eil. yn ôl"} two{"{0} eiliad yn ôl"} zero{"{0} eiliad yn ôl"} } @@ -1822,16 +1816,16 @@ cy{ future{ few{"ymhen {0} Dydd Sul"} many{"ymhen {0} Dydd Sul"} - one{"ymhen {0} Dydd Sul"} - other{"ymhen {0} Dydd Sul"} + one{"ymhen {0} Sul"} + other{"ymhen {0} Sul"} two{"ymhen {0} Dydd Sul"} zero{"ymhen {0} Dydd Sul"} } past{ few{"{0} Dydd Sul yn ôl"} many{"{0} Dydd Sul yn ôl"} - one{"{0} Dydd Sul yn ôl"} - other{"{0} Dydd Sul yn ôl"} + one{"{0} Sul yn ôl"} + other{"{0} Sul yn ôl"} two{"{0} Dydd Sul yn ôl"} zero{"{0} Dydd Sul yn ôl"} } @@ -1847,16 +1841,16 @@ cy{ future{ few{"ymhen {0} Dydd Sul"} many{"ymhen {0} Dydd Sul"} - one{"ymhen {0} Dydd Sul"} - other{"ymhen {0} Dydd Sul"} + one{"ymhen {0} Sul"} + other{"ymhen {0} Sul"} two{"ymhen {0} Dydd Sul"} zero{"ymhen {0} Dydd Sul"} } past{ few{"{0} Dydd Sul yn ôl"} many{"{0} Dydd Sul yn ôl"} - one{"{0} Dydd Sul yn ôl"} - other{"{0} Dydd Sul yn ôl"} + one{"{0} Sul yn ôl"} + other{"{0} Sul yn ôl"} two{"{0} Dydd Sul yn ôl"} zero{"{0} Dydd Sul yn ôl"} } @@ -1888,25 +1882,20 @@ cy{ } } thu-narrow{ - relative{ - "-1"{"Iau diwethaf"} - "0"{"Iau yma"} - "1"{"Iau nesaf"} - } relativeTime{ future{ few{"ymhen {0} dydd Iau"} many{"ymhen {0} dydd Iau"} - one{"ymhen {0} dydd Iau"} - other{"ymhen {0} dydd Iau"} + one{"ymhen {0} Iau"} + other{"ymhen {0} Iau"} two{"ymhen {0} dydd Iau"} zero{"ymhen {0} dydd Iau"} } past{ few{"{0} dydd Iau yn ôl"} many{"{0} dydd Iau yn ôl"} - one{"{0} dydd Iau yn ôl"} - other{"{0} dydd Iau yn ôl"} + one{"{0} Iau yn ôl"} + other{"{0} Iau yn ôl"} two{"{0} dydd Iau yn ôl"} zero{"{0} dydd Iau yn ôl"} } @@ -1922,16 +1911,16 @@ cy{ future{ few{"ymhen {0} dydd Iau"} many{"ymhen {0} dydd Iau"} - one{"ymhen {0} dydd Iau"} - other{"ymhen {0} dydd Iau"} + one{"ymhen {0} Iau"} + other{"ymhen {0} Iau"} two{"ymhen {0} dydd Iau"} zero{"ymhen {0} dydd Iau"} } past{ few{"{0} dydd Iau yn ôl"} many{"{0} dydd Iau yn ôl"} - one{"{0} dydd Iau yn ôl"} - other{"{0} dydd Iau yn ôl"} + one{"{0} Iau yn ôl"} + other{"{0} Iau yn ôl"} two{"{0} dydd Iau yn ôl"} zero{"{0} dydd Iau yn ôl"} } @@ -1964,24 +1953,24 @@ cy{ } tue-narrow{ relative{ - "-1"{"Mawrth diwethaf"} - "0"{"Mawrth yma"} - "1"{"Mawrth nesaf"} + "-1"{"Maw. diwethaf"} + "0"{"Maw. yma"} + "1"{"Maw. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Mawrth"} many{"ymhen {0} dydd Mawrth"} - one{"ymhen {0} dydd Mawrth"} - other{"ymhen {0} dydd Mawrth"} + one{"ymhen {0} Maw."} + other{"ymhen {0} Maw."} two{"ymhen {0} dydd Mawrth"} zero{"ymhen {0} dydd Mawrth"} } past{ few{"{0} dydd Mawrth yn ôl"} many{"{0} dydd Mawrth yn ôl"} - one{"{0} dydd Mawrth yn ôl"} - other{"{0} dydd Mawrth yn ôl"} + one{"{0} Maw. yn ôl"} + other{"{0} Maw. yn ôl"} two{"{0} dydd Mawrth yn ôl"} zero{"{0} dydd Mawrth yn ôl"} } @@ -1989,24 +1978,24 @@ cy{ } tue-short{ relative{ - "-1"{"Mawrth diwethaf"} - "0"{"Mawrth yma"} - "1"{"Mawrth nesaf"} + "-1"{"Maw. diwethaf"} + "0"{"Maw. yma"} + "1"{"Maw. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Mawrth"} many{"ymhen {0} dydd Mawrth"} - one{"ymhen {0} dydd Mawrth"} - other{"ymhen {0} dydd Mawrth"} + one{"ymhen {0} Maw."} + other{"ymhen {0} Maw."} two{"ymhen {0} dydd Mawrth"} zero{"ymhen {0} dydd Mawrth"} } past{ few{"{0} dydd Mawrth yn ôl"} many{"{0} dydd Mawrth yn ôl"} - one{"{0} dydd Mawrth yn ôl"} - other{"{0} dydd Mawrth yn ôl"} + one{"{0} Maw. yn ôl"} + other{"{0} Maw. yn ôl"} two{"{0} dydd Mawrth yn ôl"} zero{"{0} dydd Mawrth yn ôl"} } @@ -2039,24 +2028,24 @@ cy{ } wed-narrow{ relative{ - "-1"{"Mercher diwethaf"} - "0"{"Mercher yma"} - "1"{"Mercher nesaf"} + "-1"{"Me. diwethaf"} + "0"{"Me. yma"} + "1"{"Me. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Mercher"} many{"ymhen {0} dydd Mercher"} - one{"ymhen {0} dydd Mercher"} - other{"ymhen {0} dydd Mercher"} + one{"ymhen {0} Me."} + other{"ymhen {0} Me."} two{"ymhen {0} dydd Mercher"} zero{"ymhen {0} dydd Mercher"} } past{ few{"{0} dydd Mercher yn ôl"} many{"{0} dydd Mercher yn ôl"} - one{"{0} dydd Mercher yn ôl"} - other{"{0} dydd Mercher yn ôl"} + one{"{0} Me. yn ôl"} + other{"{0} Me. yn ôl"} two{"{0} dydd Mercher yn ôl"} zero{"{0} dydd Mercher yn ôl"} } @@ -2064,24 +2053,24 @@ cy{ } wed-short{ relative{ - "-1"{"Mercher diwethaf"} - "0"{"Mercher yma"} - "1"{"Mercher nesaf"} + "-1"{"Mer. diwethaf"} + "0"{"Mer. yma"} + "1"{"Mer. nesaf"} } relativeTime{ future{ few{"ymhen {0} dydd Mercher"} many{"ymhen {0} dydd Mercher"} - one{"ymhen {0} dydd Mercher"} - other{"ymhen {0} dydd Mercher"} + one{"ymhen {0} Mer."} + other{"ymhen {0} Mer."} two{"ymhen {0} dydd Mercher"} zero{"ymhen {0} dydd Mercher"} } past{ few{"{0} dydd Mercher yn ôl"} many{"{0} dydd Mercher yn ôl"} - one{"{0} dydd Mercher yn ôl"} - other{"{0} dydd Mercher yn ôl"} + one{"{0} Mer. yn ôl"} + other{"{0} Mer. yn ôl"} two{"{0} dydd Mercher yn ôl"} zero{"{0} dydd Mercher yn ôl"} } @@ -2116,21 +2105,26 @@ cy{ } week-narrow{ dn{"wythnos"} + relative{ + "-1"{"ws. ddiwethaf"} + "0"{"yr ws. hon"} + "1"{"ws. nesaf"} + } relativePeriod{"wythnos {0}"} relativeTime{ future{ few{"ymhen {0} wythnos"} many{"ymhen {0} wythnos"} - one{"ymhen {0} wythnos"} - other{"ymhen {0} wythnos"} + one{"ymhen {0} ws."} + other{"ymhen {0} ws."} two{"ymhen {0} wythnos"} zero{"ymhen {0} wythnos"} } past{ few{"{0} wythnos yn ôl"} many{"{0} wythnos yn ôl"} - one{"{0} wythnos yn ôl"} - other{"{0} wythnos yn ôl"} + one{"{0} ws. yn ôl"} + other{"{0} ws. yn ôl"} two{"pythefnos yn ôl"} zero{"{0} wythnos yn ôl"} } @@ -2138,21 +2132,26 @@ cy{ } week-short{ dn{"wythnos"} + relative{ + "-1"{"ws. ddiwethaf"} + "0"{"yr ws. hon"} + "1"{"ws. nesaf"} + } relativePeriod{"wythnos {0}"} relativeTime{ future{ few{"ymhen {0} wythnos"} many{"ymhen {0} wythnos"} - one{"ymhen wythnos"} - other{"ymhen {0} wythnos"} + one{"ymhen ws."} + other{"ymhen {0} ws."} two{"ymhen pythefnos"} zero{"ymhen {0} wythnos"} } past{ few{"{0} wythnos yn ôl"} many{"{0} wythnos yn ôl"} - one{"{0} wythnos yn ôl"} - other{"{0} wythnos yn ôl"} + one{"{0} ws. yn ôl"} + other{"{0} ws yn ôl."} two{"pythefnos yn ôl"} zero{"{0} wythnos yn ôl"} } @@ -2213,11 +2212,16 @@ cy{ } year-narrow{ dn{"bl."} + relative{ + "-1"{"llynedd"} + "0"{"eleni"} + "1"{"bl. nesaf"} + } relativeTime{ future{ few{"ymhen {0} blynedd"} many{"ymhen {0} blynedd"} - one{"ymhen blwyddyn"} + one{"ymhen bl."} other{"ymhen {0} mlynedd"} two{"ymhen {0} flynedd"} zero{"ymhen {0} mlynedd"} @@ -2226,7 +2230,7 @@ cy{ few{"{0} blynedd yn ôl"} many{"{0} blynedd yn ôl"} one{"blwyddyn yn ôl"} - other{"{0} o flynyddoedd yn ôl"} + other{"{0} bl. yn ôl"} two{"{0} flynedd yn ôl"} zero{"{0} o flynyddoedd yn ôl"} } @@ -2246,8 +2250,8 @@ cy{ past{ few{"{0} blynedd yn ôl"} many{"{0} blynedd yn ôl"} - one{"blwyddyn yn ôl"} - other{"{0} o flynyddoedd yn ôl"} + one{"{0} bl. yn ôl"} + other{"{0} bl. yn ôl"} two{"{0} flynedd yn ôl"} zero{"{0} o flynyddoedd yn ôl"} } diff --git a/intl/icu/source/data/locales/cy_GB.txt b/intl/icu/source/data/locales/cy_GB.txt index 4907fd713902..0aeaae581be3 100644 --- a/intl/icu/source/data/locales/cy_GB.txt +++ b/intl/icu/source/data/locales/cy_GB.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy_GB{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/da.txt b/intl/icu/source/data/locales/da.txt index 26b2d1fd9e44..6c4ab0ddef7c 100644 --- a/intl/icu/source/data/locales/da.txt +++ b/intl/icu/source/data/locales/da.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da{ AuxExemplarCharacters{"[á à â ç é è ê ë í î ï ñ ó ô œ ú ù û ÿ ü ä ǿ ö]"} Ellipsis{ @@ -212,7 +213,6 @@ da{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -363,21 +363,23 @@ da{ } Bhm{ B{"h.mm B–h.mm B"} + h{"h.mm–h.mm B"} + m{"h.mm–h.mm B"} } Gy{ G{"y G–y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG–M/y GGGGG"} - M{"M/y–M/y GGGGG"} - y{"M/y–M/y GGGGG"} + G{"MM.y GGGGG–MM.y GGGGG"} + M{"MM.y–MM.y GGGGG"} + y{"MM.y–MM.y GGGGG"} } GyMEd{ - G{"E 'den' d/M/y GGGGG–E 'den' d/M/y GGGGG"} - M{"E 'den' d/M/y–E 'den' d/M/y GGGGG"} - d{"E 'den' d/M/y–E 'den' d/M/y GGGGG"} - y{"E 'den' d/M/y–E 'den' d/M/y GGGGG"} + G{"E 'den' dd.MM.y GGGGG–E 'den' dd.MM.y GGGGG"} + M{"E 'den' dd.MM.y–E 'den' dd.MM.y GGGGG"} + d{"E 'den' dd.MM.y–E 'den' dd.MM.y GGGGG"} + y{"E 'den' dd.MM.y–E 'den' dd.MM.y GGGGG"} } GyMMM{ G{"MMM y G–MMM y G"} @@ -397,10 +399,10 @@ da{ y{"d. MMM y–d. MMM y G"} } GyMd{ - G{"d/M/y GGGGG–d/M/y GGGGG"} - M{"d/M/y–d/M/y GGGGG"} - d{"d/M/y–d/M/y GGGGG"} - y{"d/M/y–d/M/y GGGGG"} + G{"dd.MM.y GGGGG–dd.MM.y GGGGG"} + M{"dd.MM.y–dd.MM.y GGGGG"} + d{"dd.MM.y–dd.MM.y GGGGG"} + y{"dd.MM.y–dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -420,8 +422,8 @@ da{ M{"M–M"} } MEd{ - M{"E dd/MM–E dd/MM"} - d{"E dd/MM–E dd/MM"} + M{"E dd.MM–E dd.MM"} + d{"E dd.MM–E dd.MM"} } MMM{ M{"MMM–MMM"} @@ -435,8 +437,8 @@ da{ d{"d.–d. MMM"} } Md{ - M{"dd/MM–dd/MM"} - d{"dd/MM–dd/MM"} + M{"dd.MM–dd.MM"} + d{"dd.MM–dd.MM"} } d{ d{"d.–d."} @@ -464,13 +466,13 @@ da{ y{"y–y G"} } yM{ - M{"MM/y–MM/y G"} - y{"MM/y–MM/y G"} + 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"} + 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"} @@ -491,9 +493,9 @@ da{ 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"} + M{"dd.MM.y–dd.MM.y G"} + d{"dd.MM.y–dd.MM.y G"} + y{"dd.MM.y–dd.MM.y G"} } } } @@ -792,12 +794,12 @@ da{ GyMMMEd{ G{"E d. MMM y G–E d. MMM y G"} M{"E d. MMM–E d. MMM y G"} - d{"E d. MMM y–E d. MMM G"} + d{"E d. MMM–E d. MMM y G"} y{"E d. MMM y–E d. MMM y G"} } GyMMMd{ G{"d. MMM y G–d. MMM y G"} - M{"d. MMM y–d. MMM G"} + M{"d. MMM–d. MMM y G"} d{"d.–d. MMM y G"} y{"d. MMM y–d. MMM y G"} } @@ -1334,8 +1336,8 @@ da{ other{"om {0} dage"} } past{ - one{"for {0} dag siden"} - other{"for {0} dage siden"} + one{"{0} dag siden"} + other{"{0} dage siden"} } } } @@ -1354,8 +1356,8 @@ da{ other{"om {0} dage"} } past{ - one{"for {0} dag siden"} - other{"for {0} dage siden"} + one{"{0} dag siden"} + other{"{0} dage siden"} } } } @@ -1390,7 +1392,7 @@ da{ relative{ "-1"{"sidste fredag"} "0"{"på fredag"} - "1"{"næste fredag"} + "1"{"på fredag"} } relativeTime{ future{ @@ -1407,16 +1409,16 @@ da{ relative{ "-1"{"sidste fr."} "0"{"på fr."} - "1"{"næste fr."} + "1"{"på fr."} } relativeTime{ future{ - one{"om {0} fredag"} - other{"om {0} fredage"} + one{"om {0} fr."} + other{"om {0} fr."} } past{ - one{"for {0} fredag siden"} - other{"for {0} fredage siden"} + one{"{0} fr. siden"} + other{"{0} fr. siden"} } } } @@ -1424,23 +1426,23 @@ da{ relative{ "-1"{"sidste fre."} "0"{"på fre."} - "1"{"næste fre."} + "1"{"på fre."} } relativeTime{ future{ - one{"om {0} fredag"} - other{"om {0} fredage"} + one{"om {0} fre."} + other{"om {0} fre."} } past{ - one{"for {0} fredag siden"} - other{"for {0} fredage siden"} + one{"{0} fre. siden"} + other{"{0} fre. siden"} } } } hour{ dn{"time"} relative{ - "0"{"i den kommende time"} + "0"{"denne time"} } relativeTime{ future{ @@ -1461,8 +1463,8 @@ da{ other{"om {0} timer"} } past{ - one{"for {0} time siden"} - other{"for {0} timer siden"} + one{"{0} time siden"} + other{"{0} timer siden"} } } } @@ -1474,15 +1476,15 @@ da{ other{"om {0} timer"} } past{ - one{"for {0} time siden"} - other{"for {0} timer siden"} + one{"{0} time siden"} + other{"{0} timer siden"} } } } minute{ dn{"minut"} relative{ - "0"{"i det kommende minut"} + "0"{"dette minut"} } relativeTime{ future{ @@ -1503,8 +1505,8 @@ da{ other{"om {0} min."} } past{ - one{"for {0} min. siden"} - other{"for {0} min. siden"} + one{"{0} min. siden"} + other{"{0} min. siden"} } } } @@ -1516,8 +1518,8 @@ da{ other{"om {0} min."} } past{ - one{"for {0} min. siden"} - other{"for {0} min. siden"} + one{"{0} min. siden"} + other{"{0} min. siden"} } } } @@ -1525,7 +1527,7 @@ da{ relative{ "-1"{"sidste mandag"} "0"{"på mandag"} - "1"{"næste mandag"} + "1"{"på mandag"} } relativeTime{ future{ @@ -1542,16 +1544,16 @@ da{ relative{ "-1"{"sidste ma."} "0"{"på ma."} - "1"{"næste ma."} + "1"{"på ma."} } relativeTime{ future{ - one{"om {0} mandag"} - other{"om {0} mandage"} + one{"om {0} ma."} + other{"om {0} ma."} } past{ - one{"for {0} mandag siden"} - other{"for {0} mandage siden"} + one{"{0} ma. siden"} + other{"{0} ma. siden"} } } } @@ -1559,16 +1561,16 @@ da{ relative{ "-1"{"sidste man."} "0"{"på man."} - "1"{"næste man."} + "1"{"på man."} } relativeTime{ future{ - one{"om {0} mandag"} - other{"om {0} mandage"} + one{"om {0} man."} + other{"om {0} man."} } past{ - one{"for {0} mandag siden"} - other{"for {0} mandage siden"} + one{"{0} man. siden"} + other{"{0} man. siden"} } } } @@ -1603,8 +1605,8 @@ da{ other{"om {0} mdr."} } past{ - one{"for {0} md. siden"} - other{"for {0} mdr. siden"} + one{"{0} md. siden"} + other{"{0} mdr. siden"} } } } @@ -1621,8 +1623,8 @@ da{ other{"om {0} mdr."} } past{ - one{"for {0} md. siden"} - other{"for {0} mdr. siden"} + one{"{0} md. siden"} + other{"{0} mdr. siden"} } } } @@ -1657,8 +1659,8 @@ da{ other{"om {0} kvt."} } past{ - one{"for {0} kvt. siden"} - other{"for {0} kvt. siden"} + one{"{0} kvt. siden"} + other{"{0} kvt. siden"} } } } @@ -1675,8 +1677,8 @@ da{ other{"om {0} kvt."} } past{ - one{"for {0} kvt. siden"} - other{"for {0} kvt. siden"} + one{"{0} kvt. siden"} + other{"{0} kvt. siden"} } } } @@ -1684,7 +1686,7 @@ da{ relative{ "-1"{"sidste lørdag"} "0"{"på lørdag"} - "1"{"næste lørdag"} + "1"{"på lørdag"} } relativeTime{ future{ @@ -1701,16 +1703,16 @@ da{ relative{ "-1"{"sidste lø."} "0"{"på lø."} - "1"{"næste lø."} + "1"{"på lø."} } relativeTime{ future{ - one{"om {0} lørdag"} - other{"om {0} lørdage"} + one{"om {0} lø."} + other{"om {0} lø."} } past{ - one{"for {0} lørdag siden"} - other{"for {0} lørdage siden"} + one{"{0} lø. siden"} + other{"{0} lø. siden"} } } } @@ -1718,16 +1720,16 @@ da{ relative{ "-1"{"sidste lør."} "0"{"på lør."} - "1"{"næste lør."} + "1"{"på lør."} } relativeTime{ future{ - one{"om {0} lørdag"} - other{"om {0} lørdage"} + one{"om {0} lør."} + other{"om {0} lør."} } past{ - one{"for {0} lørdag siden"} - other{"for {0} lørdage siden"} + one{"{0} lør. siden"} + other{"{0} lør. siden"} } } } @@ -1755,8 +1757,8 @@ da{ other{"om {0} sek."} } past{ - one{"for {0} sek. siden"} - other{"for {0} sek. siden"} + one{"{0} sek. siden"} + other{"{0} sek. siden"} } } } @@ -1768,8 +1770,8 @@ da{ other{"om {0} sek."} } past{ - one{"for {0} sek. siden"} - other{"for {0} sek. siden"} + one{"{0} sek. siden"} + other{"{0} sek. siden"} } } } @@ -1777,7 +1779,7 @@ da{ relative{ "-1"{"sidste søndag"} "0"{"på søndag"} - "1"{"næste søndag"} + "1"{"på søndag"} } relativeTime{ future{ @@ -1794,16 +1796,16 @@ da{ relative{ "-1"{"sidste sø."} "0"{"på sø."} - "1"{"næste sø."} + "1"{"på sø."} } relativeTime{ future{ - one{"om {0} søndag"} - other{"om {0} søndage"} + one{"om {0} sø."} + other{"om {0} sø."} } past{ - one{"for {0} søndag siden"} - other{"for {0} søndage siden"} + one{"{0} sø. siden"} + other{"{0} sø. siden"} } } } @@ -1811,16 +1813,16 @@ da{ relative{ "-1"{"sidste søn."} "0"{"på søn."} - "1"{"næste søn."} + "1"{"på søn."} } relativeTime{ future{ - one{"om {0} søndag"} - other{"om {0} søndage"} + one{"om {0} søn."} + other{"om {0} søn."} } past{ - one{"for {0} søndag siden"} - other{"for {0} søndage siden"} + one{"{0} søn. siden"} + other{"{0} søn. siden"} } } } @@ -1828,7 +1830,7 @@ da{ relative{ "-1"{"sidste torsdag"} "0"{"på torsdag"} - "1"{"næste torsdag"} + "1"{"på torsdag"} } relativeTime{ future{ @@ -1845,16 +1847,16 @@ da{ relative{ "-1"{"sidste to."} "0"{"på to."} - "1"{"næste to."} + "1"{"på to."} } relativeTime{ future{ - one{"om {0} torsdag"} - other{"om {0} torsdage"} + one{"om {0} to."} + other{"om {0} to."} } past{ - one{"for {0} torsdag siden"} - other{"for {0} torsdage siden"} + one{"{0} to. siden"} + other{"{0} to. siden"} } } } @@ -1862,16 +1864,16 @@ da{ relative{ "-1"{"sidste tor."} "0"{"på tor."} - "1"{"næste tor."} + "1"{"på tor."} } relativeTime{ future{ - one{"om {0} torsdag"} - other{"om {0} torsdage"} + one{"om {0} tor."} + other{"om {0} tor."} } past{ - one{"for {0} torsdag siden"} - other{"for {0} torsdage siden"} + one{"{0} tor. siden"} + other{"{0} tor. siden"} } } } @@ -1879,7 +1881,7 @@ da{ relative{ "-1"{"sidste tirsdag"} "0"{"på tirsdag"} - "1"{"næste tirsdag"} + "1"{"på tirsdag"} } relativeTime{ future{ @@ -1896,16 +1898,16 @@ da{ relative{ "-1"{"sidste ti."} "0"{"på ti."} - "1"{"næste ti."} + "1"{"på ti."} } relativeTime{ future{ - one{"om {0} tirsdag"} - other{"om {0} tirsdage"} + one{"om {0} ti."} + other{"om {0} ti."} } past{ - one{"for {0} tirsdag siden"} - other{"for {0} tirsdage siden"} + one{"{0} ti. siden"} + other{"{0} ti. siden"} } } } @@ -1913,16 +1915,16 @@ da{ relative{ "-1"{"sidste tir."} "0"{"på tir."} - "1"{"næste tir."} + "1"{"på tir."} } relativeTime{ future{ - one{"om {0} tirsdag"} - other{"om {0} tirsdage"} + one{"om {0} tir."} + other{"om {0} tir."} } past{ - one{"for {0} tirsdag siden"} - other{"for {0} tirsdage siden"} + one{"{0} tir. siden"} + other{"{0} tir. siden"} } } } @@ -1930,7 +1932,7 @@ da{ relative{ "-1"{"sidste onsdag"} "0"{"på onsdag"} - "1"{"næste onsdag"} + "1"{"på onsdag"} } relativeTime{ future{ @@ -1947,16 +1949,16 @@ da{ relative{ "-1"{"sidste on."} "0"{"på on."} - "1"{"næste on."} + "1"{"på on."} } relativeTime{ future{ - one{"om {0} onsdag"} - other{"om {0} onsdage"} + one{"om {0} on."} + other{"om {0} on."} } past{ - one{"for {0} onsdag siden"} - other{"for {0} onsdage siden"} + one{"{0} on. siden"} + other{"{0} on. siden"} } } } @@ -1964,16 +1966,16 @@ da{ relative{ "-1"{"sidste ons."} "0"{"på ons."} - "1"{"næste ons."} + "1"{"på ons."} } relativeTime{ future{ - one{"om {0} onsdag"} - other{"om {0} onsdage"} + one{"om {0} ons."} + other{"om {0} ons."} } past{ - one{"for {0} onsdag siden"} - other{"for {0} onsdage siden"} + one{"{0} ons. siden"} + other{"{0} ons. siden"} } } } @@ -2010,8 +2012,8 @@ da{ other{"om {0} uger"} } past{ - one{"for {0} uge siden"} - other{"for {0} uger siden"} + one{"{0} uge siden"} + other{"{0} uger siden"} } } } @@ -2029,8 +2031,8 @@ da{ other{"om {0} uger"} } past{ - one{"for {0} uge siden"} - other{"for {0} uger siden"} + one{"{0} uge siden"} + other{"{0} uger siden"} } } } @@ -2092,8 +2094,8 @@ da{ other{"om {0} år"} } past{ - one{"for {0} år siden"} - other{"for {0} år siden"} + one{"{0} år siden"} + other{"{0} år siden"} } } } @@ -2110,8 +2112,8 @@ da{ other{"om {0} år"} } past{ - one{"for {0} år siden"} - other{"for {0} år siden"} + one{"{0} år siden"} + other{"{0} år siden"} } } } diff --git a/intl/icu/source/data/locales/da_DK.txt b/intl/icu/source/data/locales/da_DK.txt index 198eb2ba6502..5ff73b086c04 100644 --- a/intl/icu/source/data/locales/da_DK.txt +++ b/intl/icu/source/data/locales/da_DK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da_DK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/da_GL.txt b/intl/icu/source/data/locales/da_GL.txt index faca33ca3931..f700ffcaa1da 100644 --- a/intl/icu/source/data/locales/da_GL.txt +++ b/intl/icu/source/data/locales/da_GL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da_GL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/dav.txt b/intl/icu/source/data/locales/dav.txt index 2ace6572e717..ed4857488aaf 100644 --- a/intl/icu/source/data/locales/dav.txt +++ b/intl/icu/source/data/locales/dav.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dav{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -12,7 +13,6 @@ dav{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/dav_KE.txt b/intl/icu/source/data/locales/dav_KE.txt index 27cdca9be209..c51dc6cc239e 100644 --- a/intl/icu/source/data/locales/dav_KE.txt +++ b/intl/icu/source/data/locales/dav_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dav_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/de.txt b/intl/icu/source/data/locales/de.txt index ad9f14352850..c3186c96d940 100644 --- a/intl/icu/source/data/locales/de.txt +++ b/intl/icu/source/data/locales/de.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ AuxExemplarCharacters{ "[á à ă â å ã ā æ ç é è ĕ ê ë ē ğ í ì ĭ î ï İ ī ı ñ ó ò ŏ ô ø ō œ ş ú ù ŭ û ū" @@ -192,6 +193,7 @@ de{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{"."} @@ -218,7 +220,6 @@ de{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -1755,7 +1756,7 @@ de{ consonantal_jamo{"Jamo-Konsonanten"} currency_symbols{"Währungssymbole"} dash_connector{"Gedankenstrich/Bindestrich"} - digits{"Stellen"} + digits{"Ziffern"} dingbats{"Zierrat"} divination_symbols{"Wahrsagezeichen"} downwards_arrows{"Abwärtspfeile"} @@ -1800,7 +1801,7 @@ de{ numbers{"Ziffern"} objects{"Objekte"} other{"Andere"} - paired{"Gepaart"} + paired{"Paarig"} person{"Person"} phonetic_alphabet{"Phonetisches Alphabet"} pictographs{"Piktogramme"} diff --git a/intl/icu/source/data/locales/de_AT.txt b/intl/icu/source/data/locales/de_AT.txt index 16e7cfbba96a..17c4769d3eb1 100644 --- a/intl/icu/source/data/locales/de_AT.txt +++ b/intl/icu/source/data/locales/de_AT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_AT{ 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]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -14,7 +15,6 @@ de_AT{ } } } - Version{"37"} calendar{ gregorian{ dayPeriod{ diff --git a/intl/icu/source/data/locales/de_BE.txt b/intl/icu/source/data/locales/de_BE.txt index 28146c04eccb..70e2c107c034 100644 --- a/intl/icu/source/data/locales/de_BE.txt +++ b/intl/icu/source/data/locales/de_BE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_BE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/de_CH.txt b/intl/icu/source/data/locales/de_CH.txt index 3f88f1c3166f..f9acb7666d5e 100644 --- a/intl/icu/source/data/locales/de_CH.txt +++ b/intl/icu/source/data/locales/de_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_CH{ 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]"} ExemplarCharactersNumbers{"[\\- ‑ . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -15,7 +16,6 @@ de_CH{ } } } - Version{"37"} calendar{ gregorian{ dayNames{ diff --git a/intl/icu/source/data/locales/de_DE.txt b/intl/icu/source/data/locales/de_DE.txt index 4581f04d616f..f1ba8c9d5813 100644 --- a/intl/icu/source/data/locales/de_DE.txt +++ b/intl/icu/source/data/locales/de_DE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_DE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/de_IT.txt b/intl/icu/source/data/locales/de_IT.txt index 92d0fb0d48b1..50a381625a02 100644 --- a/intl/icu/source/data/locales/de_IT.txt +++ b/intl/icu/source/data/locales/de_IT.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_IT{ - Version{"37"} calendar{ gregorian{ monthNames{ diff --git a/intl/icu/source/data/locales/de_LI.txt b/intl/icu/source/data/locales/de_LI.txt index d15340584831..dff0678369f6 100644 --- a/intl/icu/source/data/locales/de_LI.txt +++ b/intl/icu/source/data/locales/de_LI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_LI{ ExemplarCharactersNumbers{"[\\- ‑ . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -14,7 +15,6 @@ de_LI{ } } } - Version{"37"} calendar{ gregorian{ dayPeriod{ diff --git a/intl/icu/source/data/locales/de_LU.txt b/intl/icu/source/data/locales/de_LU.txt index 1128dfb22dc5..12bf52d8c0d1 100644 --- a/intl/icu/source/data/locales/de_LU.txt +++ b/intl/icu/source/data/locales/de_LU.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_LU{ - Version{"37"} calendar{ gregorian{ AmPmMarkersNarrow{ diff --git a/intl/icu/source/data/locales/dje.txt b/intl/icu/source/data/locales/dje.txt index 7932f24d4f6f..c8ecaaf5267f 100644 --- a/intl/icu/source/data/locales/dje.txt +++ b/intl/icu/source/data/locales/dje.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dje{ AuxExemplarCharacters{"[v]"} ExemplarCharacters{"[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]"} @@ -18,7 +19,6 @@ dje{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/dje_NE.txt b/intl/icu/source/data/locales/dje_NE.txt index e450537e90fc..c4d484f18881 100644 --- a/intl/icu/source/data/locales/dje_NE.txt +++ b/intl/icu/source/data/locales/dje_NE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dje_NE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/doi.txt b/intl/icu/source/data/locales/doi.txt new file mode 100644 index 000000000000..f23b4487c8b9 --- /dev/null +++ b/intl/icu/source/data/locales/doi.txt @@ -0,0 +1,647 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +doi{ + AuxExemplarCharacters{"[\u200C\u200D ऍ ऑ \u0945]"} + ExemplarCharacters{ + "[\u0951\u0952 \u093C \u0901 \u0902 ः ॐ अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क {क" + "\u094Dष} ख ग घ ङ च छ ज झ ञ ट ठ ड {ड\u093C} ढ {ढ\u093C} ण त थ द ध न प फ ब भ म" + " य र ल ळ व श ष स ह ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0962 \u0963 \u0947 " + "\u0948 ो ौ \u094D]" + } + ExemplarCharactersIndex{ + "[अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ" + " म य र ल ळ व श ष स ह]" + } + ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersPunctuation{"[_ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) § @ * / \\& # † ‡ ′ ″]"} + NumberElements{ + default{"latn"} + latn{ + patterns{ + currencyFormat{"¤#,##0.00"} + decimalFormat{"#,##0.###"} + percentFormat{"#,##0%"} + scientificFormat{"#E0"} + } + symbols{ + decimal{"."} + group{","} + minusSign{"-"} + percentSign{"%"} + plusSign{"+"} + } + } + native{"deva"} + } + 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/y GGGGG", + "{1}, {0}", + "{1} गी {0}", + "{1} गी {0}", + "{1}, {0}", + "{1}, {0}", + } + intervalFormats{ + fallback{"{0} – {1}"} + } + } + gregorian{ + AmPmMarkers{ + "सवेर", + "बाद दपैहर", + } + AmPmMarkersAbbr{ + "सवेर", + "स’ञ", + } + AmPmMarkersNarrow{ + "सवेर", + "स’ञ", + } + 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", + "d/M/yy", + "{1}, {0}", + "{1} गी {0}", + "{1} गी {0}", + "{1}, {0}", + "{1}, {0}", + } + appendItems{ + Timezone{"{0} {1}"} + } + availableFormats{ + Bh{"h B"} + Bhm{"h:mm B"} + Bhms{"h:mm:ss B"} + E{"ccc"} + EBhm{"E h:mm B"} + EBhms{"E h:mm:ss B"} + EHm{"E HH:mm"} + EHms{"E HH:mm:ss"} + Ed{"E d"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"G y"} + GyMMM{"G y MMM"} + GyMMMEd{"E, d, MMM G y"} + GyMMMd{"d, MMM G y"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} + Hmsv{"HH:mm:ss v"} + Hmv{"HH:mm v"} + M{"L"} + MEd{"E, d/M"} + MMM{"LLL"} + MMMEd{"E, d MMM"} + MMMMW{ + one{"MMMM दा हफ्ता W"} + other{"MMMM दा हफ्ता W"} + } + MMMMd{"d MMMM"} + MMMd{"d MMM"} + Md{"d/M"} + d{"d"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} + 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"} + yw{ + one{"Y दा हफ्ता w"} + other{"Y दा हफ्ता w"} + } + } + dayNames{ + format{ + abbreviated{ + "ऐत", + "सोम", + "मंगल", + "बुध", + "बीर", + "शुक्र", + "शनि", + } + narrow{ + "ऐ.", + "सो.", + "म.", + "बु.", + "बी.", + "शु.", + "श.", + } + short{ + "ऐत", + "सोम", + "मंगल", + "बुध", + "बीर", + "शुक्र", + "शनि", + } + wide{ + "ऐतबार", + "सोमबार", + "मंगलबार", + "बुधबार", + "बीरबार", + "शुक्रबार", + "शनीबार", + } + } + stand-alone{ + abbreviated{ + "ऐत", + "सोम", + "मंगल", + "बुध", + "बीर", + "शुक्र", + "शनि", + } + narrow{ + "ऐ", + "सो", + "म.", + "बु.", + "बी.", + "शु.", + "श.", + } + short{ + "ऐत", + "सोम", + "मंगल", + "बुध", + "बीर", + "शुक्र", + "शनि", + } + wide{ + "ऐतबार", + "सोमबार", + "मंगलबार", + "बुधबार", + "बीरबार", + "शुक्रबार", + "शनिबार", + } + } + } + dayPeriod{ + stand-alone{ + abbreviated{ + am{"सवेर"} + pm{"स’ञ"} + } + narrow{ + am{"सवेर"} + pm{"स’ञ"} + } + wide{ + am{"सवेर"} + pm{"स’ञ"} + } + } + } + eras{ + abbreviated{ + "ई.पू.", + "ईसवी", + } + abbreviated%variant{ + "ई.पू.", + "सन्", + } + wide{ + "ई.पू.", + "ई. सन्", + } + } + intervalFormats{ + Bh{ + B{"h B – h B"} + h{"h – h B"} + } + Bhm{ + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} + } + Gy{ + G{"y G – y G"} + y{"y – y G"} + } + GyM{ + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} + } + GyMEd{ + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + 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"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, MMM d, y G – E, MMM d, y G"} + 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"} + } + GyMMMd{ + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} + } + GyMd{ + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} + } + 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"} + } + } + monthNames{ + format{ + abbreviated{ + "जन.", + "फर.", + "मार्च", + "अप्रैल", + "मेई", + "जून", + "जुलाई", + "अग.", + "सित.", + "अक्तू.", + "नव.", + "दिस.", + } + narrow{ + "ज", + "फ", + "मा", + "अ", + "मे", + "जू", + "जु", + "अ", + "सि", + "अ", + "न", + "दि", + } + wide{ + "जनवरी", + "फरवरी", + "मार्च", + "अप्रैल", + "मेई", + "जून", + "जुलाई", + "अगस्त", + "सितंबर", + "अत्तूबर", + "नवंबर", + "दिसंबर", + } + } + stand-alone{ + abbreviated{ + "जन.", + "फर.", + "मार्च", + "अप्रैल", + "मेई", + "जून", + "जुलाई", + "अग.", + "सित.", + "अक्तू.", + "नव.", + "दिस.", + } + narrow{ + "ज", + "फ", + "मा", + "अ", + "मे", + "जू", + "जु", + "अ", + "सि", + "अ", + "न", + "दि", + } + wide{ + "जनवरी", + "फरवरी", + "मार्च", + "अप्रैल", + "मेई", + "जून", + "जुलाई", + "अगस्त", + "सितंबर", + "अक्तूबर", + "नवंबर", + "दिसंबर", + } + } + } + quarters{ + format{ + abbreviated{ + "त्र.1", + "त्र.2", + "त्र.3", + "त्र.4", + } + narrow{ + "1", + "2", + "3", + "4", + } + wide{ + "पैहली त्रमाही", + "दूई त्रमाही", + "त्री त्रमाही", + "चौथी त्रमाही", + } + } + stand-alone{ + abbreviated{ + "त्र.1", + "त्र.2", + "त्र.3", + "त्र.4", + } + narrow{ + "1", + "2", + "3", + "4", + } + wide{ + "पैहली त्रमाही", + "दूई त्रमाही", + "त्री त्रमाही", + "चौथी त्रमाही", + } + } + } + } + } + delimiters{ + alternateQuotationEnd{"’"} + alternateQuotationStart{"‘"} + quotationEnd{"”"} + quotationStart{"“"} + } + fields{ + day{ + dn{"दिन"} + relative{ + "-1"{"जंदा कल"} + "0"{"अज्ज"} + "1"{"औंदा कल"} + } + } + day-narrow{ + dn{"दिन"} + relative{ + "-1"{"जंदा कल"} + "0"{"अज्ज"} + "1"{"औंदा कल"} + } + } + day-short{ + dn{"दिन"} + relative{ + "-1"{"जंदा कल"} + "0"{"अज्ज"} + "1"{"औंदा कल"} + } + } + dayperiod{ + dn{"सवेर/बा.दपै."} + } + era{ + dn{"जुग"} + } + hour{ + dn{"घैंटा"} + } + hour-narrow{ + dn{"घैं."} + } + hour-short{ + dn{"घैं."} + } + minute{ + dn{"मिंट्‌ट"} + } + minute-narrow{ + dn{"मिं."} + } + minute-short{ + dn{"मिं."} + } + month{ + dn{"म्हीना"} + } + month-narrow{ + dn{"म्ही."} + } + month-short{ + dn{"म्ही."} + } + quarter{ + dn{"त्रमाही"} + } + quarter-narrow{ + dn{"त्रमा."} + } + quarter-short{ + dn{"त्रमा."} + } + second{ + dn{"सकैंट"} + } + second-narrow{ + dn{"सकैं."} + } + second-short{ + dn{"सकैं."} + } + week{ + dn{"हफ्ता"} + } + week-narrow{ + dn{"ह."} + } + week-short{ + dn{"ह."} + } + weekday{ + dn{"हफ्ते दा दिन"} + } + year{ + dn{"ब’रा"} + } + year-narrow{ + dn{"ब."} + } + year-short{ + dn{"ब."} + } + zone{ + dn{"समां खेत्तर"} + } + } + listPattern{ + standard{ + 2{"{0} ते {1}"} + end{"{0}, ते {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } + } + measurementSystemNames{ + UK{"यूके"} + US{"यूएस"} + metric{"मीट्रिक"} + } +} diff --git a/intl/icu/source/data/locales/nds_DE.txt b/intl/icu/source/data/locales/doi_IN.txt similarity index 62% rename from intl/icu/source/data/locales/nds_DE.txt rename to intl/icu/source/data/locales/doi_IN.txt index 514b86aa496a..0ca58e2a8a2f 100644 --- a/intl/icu/source/data/locales/nds_DE.txt +++ b/intl/icu/source/data/locales/doi_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds_DE{ - Version{"37"} +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +doi_IN{ } diff --git a/intl/icu/source/data/locales/dsb.txt b/intl/icu/source/data/locales/dsb.txt index 4892c17ae422..5eba9f31dfe8 100644 --- a/intl/icu/source/data/locales/dsb.txt +++ b/intl/icu/source/data/locales/dsb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dsb{ AuxExemplarCharacters{ "[á à ă â å ä ã ą ā æ ç ď đ é è ĕ ê ë ė ę ē ğ í ì ĭ î ï İ ī ı ĺ ľ ň ñ ò ŏ ô ö" @@ -196,7 +197,6 @@ dsb{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -367,7 +367,7 @@ dsb{ yMM{"MM y"} yMMM{"MMM y"} yMMMEd{"E, d. MMM y"} - yMMMM{"MMMM y"} + yMMMM{"LLLL y"} yMMMd{"d. MMM y"} yMMdd{"dd. MM y"} yMd{"d.M.y"} diff --git a/intl/icu/source/data/locales/dsb_DE.txt b/intl/icu/source/data/locales/dsb_DE.txt index 5954457e60c9..f692ce200db5 100644 --- a/intl/icu/source/data/locales/dsb_DE.txt +++ b/intl/icu/source/data/locales/dsb_DE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dsb_DE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/dua.txt b/intl/icu/source/data/locales/dua.txt index 2086dd2b46cc..bb2bbcb9551d 100644 --- a/intl/icu/source/data/locales/dua.txt +++ b/intl/icu/source/data/locales/dua.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dua{ AuxExemplarCharacters{"[h q v x z]"} ExemplarCharacters{ @@ -21,7 +22,6 @@ dua{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/dua_CM.txt b/intl/icu/source/data/locales/dua_CM.txt index bc38a2114159..d9549ef6a785 100644 --- a/intl/icu/source/data/locales/dua_CM.txt +++ b/intl/icu/source/data/locales/dua_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dua_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/dyo.txt b/intl/icu/source/data/locales/dyo.txt index 3cc601012a73..9dd95f92110b 100644 --- a/intl/icu/source/data/locales/dyo.txt +++ b/intl/icu/source/data/locales/dyo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dyo{ AuxExemplarCharacters{"[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]"} @@ -18,7 +19,6 @@ dyo{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/dyo_SN.txt b/intl/icu/source/data/locales/dyo_SN.txt index 71e2096ca33f..8328af7806b5 100644 --- a/intl/icu/source/data/locales/dyo_SN.txt +++ b/intl/icu/source/data/locales/dyo_SN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dyo_SN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/dz.txt b/intl/icu/source/data/locales/dz.txt index ac56ed4eb7d5..197ebf024053 100644 --- a/intl/icu/source/data/locales/dz.txt +++ b/intl/icu/source/data/locales/dz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dz{ AuxExemplarCharacters{ "[\u0F84 ཊ ཋ ཌ ཎ \u0F7E ཥ \u0F80 \u0F7B \u0F7D \u0F9A \u0F9B \u0F9C \u0F9E " @@ -106,7 +107,6 @@ dz{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/dz_BT.txt b/intl/icu/source/data/locales/dz_BT.txt index c87b406b3082..b66ceabb3c88 100644 --- a/intl/icu/source/data/locales/dz_BT.txt +++ b/intl/icu/source/data/locales/dz_BT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dz_BT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ebu.txt b/intl/icu/source/data/locales/ebu.txt index bf3b50ed8dc7..ba6c72ff7f01 100644 --- a/intl/icu/source/data/locales/ebu.txt +++ b/intl/icu/source/data/locales/ebu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ebu{ 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]"} @@ -11,7 +12,6 @@ ebu{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ebu_KE.txt b/intl/icu/source/data/locales/ebu_KE.txt index a7e199477b87..db3d222459d9 100644 --- a/intl/icu/source/data/locales/ebu_KE.txt +++ b/intl/icu/source/data/locales/ebu_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ebu_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ee.txt b/intl/icu/source/data/locales/ee.txt index 3ae6fb75d846..fe56fbd229d7 100644 --- a/intl/icu/source/data/locales/ee.txt +++ b/intl/icu/source/data/locales/ee.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee{ AuxExemplarCharacters{"[ă â å ä ā æ c ç ĕ ê ë ĭ î ï j ñ ŏ ô ö ø œ q ŭ û ü ÿ]"} ExemplarCharacters{ @@ -200,7 +201,6 @@ ee{ } minimumGroupingDigits{"3"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ee_GH.txt b/intl/icu/source/data/locales/ee_GH.txt index c153dd694056..7ad393558854 100644 --- a/intl/icu/source/data/locales/ee_GH.txt +++ b/intl/icu/source/data/locales/ee_GH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee_GH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ee_TG.txt b/intl/icu/source/data/locales/ee_TG.txt index 2e66ae35ba5b..5e03a3cbf297 100644 --- a/intl/icu/source/data/locales/ee_TG.txt +++ b/intl/icu/source/data/locales/ee_TG.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee_TG{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/el.txt b/intl/icu/source/data/locales/el.txt index 54a6167a8eeb..4e8dad1274d3 100644 --- a/intl/icu/source/data/locales/el.txt +++ b/intl/icu/source/data/locales/el.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ AuxExemplarCharacters{ "[ἀ ἄ ἂ ἆ ἁ ἅ ἃ ἇ ὰ ᾶ ἐ ἔ ἒ ἑ ἕ ἓ ὲ ἠ ἤ ἢ ἦ ἡ ἥ ἣ ἧ ὴ ῆ ἰ ἴ ἲ ἶ ἱ ἵ ἳ ἷ ὶ ῖ ῒ" @@ -216,7 +217,6 @@ el{ native{"latn"} traditional{"grek"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/el_CY.txt b/intl/icu/source/data/locales/el_CY.txt index 555b8c546e49..055f23ca8df0 100644 --- a/intl/icu/source/data/locales/el_CY.txt +++ b/intl/icu/source/data/locales/el_CY.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el_CY{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/el_GR.txt b/intl/icu/source/data/locales/el_GR.txt index a87677f5d790..27e3caba3adf 100644 --- a/intl/icu/source/data/locales/el_GR.txt +++ b/intl/icu/source/data/locales/el_GR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el_GR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en.txt b/intl/icu/source/data/locales/en.txt index f4572a4a4ca6..5ccfa72ea5ed 100644 --- a/intl/icu/source/data/locales/en.txt +++ b/intl/icu/source/data/locales/en.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ AuxExemplarCharacters{ "[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ" @@ -205,7 +206,6 @@ en{ } } } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/en_001.txt b/intl/icu/source/data/locales/en_001.txt index 990738f0dd38..28f3b136ed30 100644 --- a/intl/icu/source/data/locales/en_001.txt +++ b/intl/icu/source/data/locales/en_001.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ - Version{"37"} calendar{ chinese{ DateTimePatterns{ @@ -98,7 +98,6 @@ en_001{ "{1}, {0}", } availableFormats{ - Bhms{"h:mm.ss B"} EBhm{"E, h:mm B"} EBhms{"E, h:mm:ss B"} EHm{"E, HH:mm"} diff --git a/intl/icu/source/data/locales/en_150.txt b/intl/icu/source/data/locales/en_150.txt index b2e49e41f49a..ae8748394123 100644 --- a/intl/icu/source/data/locales/en_150.txt +++ b/intl/icu/source/data/locales/en_150.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_150{ %%Parent{"en_001"} NumberElements{ @@ -10,7 +11,6 @@ en_150{ } } } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_AE.txt b/intl/icu/source/data/locales/en_AE.txt index 70ed24942724..5fae06da09b4 100644 --- a/intl/icu/source/data/locales/en_AE.txt +++ b/intl/icu/source/data/locales/en_AE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AE{ - Version{"37"} calendar{ chinese{ DateTimePatterns{ @@ -98,7 +98,6 @@ en_AE{ "{1}, {0}", } availableFormats{ - Bhms{"h:mm.ss B"} EBhm{"E, h:mm B"} EBhms{"E, h:mm:ss B"} EHm{"E, HH:mm"} diff --git a/intl/icu/source/data/locales/en_AG.txt b/intl/icu/source/data/locales/en_AG.txt index 15f4f3b2f146..95a979e89b03 100644 --- a/intl/icu/source/data/locales/en_AG.txt +++ b/intl/icu/source/data/locales/en_AG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_AI.txt b/intl/icu/source/data/locales/en_AI.txt index 40e897725124..7bf3f7ffe708 100644 --- a/intl/icu/source/data/locales/en_AI.txt +++ b/intl/icu/source/data/locales/en_AI.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AI{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_AS.txt b/intl/icu/source/data/locales/en_AS.txt index 3600aa70d7df..a744f6e3fc96 100644 --- a/intl/icu/source/data/locales/en_AS.txt +++ b/intl/icu/source/data/locales/en_AS.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AS{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_AT.txt b/intl/icu/source/data/locales/en_AT.txt index 48f6116f636a..0f1db9f0541c 100644 --- a/intl/icu/source/data/locales/en_AT.txt +++ b/intl/icu/source/data/locales/en_AT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AT{ %%Parent{"en_150"} NumberElements{ @@ -16,5 +17,4 @@ en_AT{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_AU.txt b/intl/icu/source/data/locales/en_AU.txt index 87f527649773..ec6eb750e4c8 100644 --- a/intl/icu/source/data/locales/en_AU.txt +++ b/intl/icu/source/data/locales/en_AU.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AU{ %%Parent{"en_001"} - ExemplarCharactersNumbers{"[↑]"} NumberElements{ latn{ miscPatterns{ @@ -13,7 +13,6 @@ en_AU{ } } } - Version{"37"} calendar{ chinese{ monthNames{ @@ -271,6 +270,20 @@ en_AU{ } monthNames{ format{ + abbreviated{ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "June", + "July", + "Aug", + "Sept", + "Oct", + "Nov", + "Dec", + } narrow{ "J", "F", diff --git a/intl/icu/source/data/locales/en_BB.txt b/intl/icu/source/data/locales/en_BB.txt index 814000f3539c..d62d19252e08 100644 --- a/intl/icu/source/data/locales/en_BB.txt +++ b/intl/icu/source/data/locales/en_BB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_BE.txt b/intl/icu/source/data/locales/en_BE.txt index a09e9f00e2a3..3d0104f56325 100644 --- a/intl/icu/source/data/locales/en_BE.txt +++ b/intl/icu/source/data/locales/en_BE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BE{ %%Parent{"en_150"} NumberElements{ @@ -10,7 +11,6 @@ en_BE{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_BI.txt b/intl/icu/source/data/locales/en_BI.txt index 1c33a6be9e22..e4f823f1c566 100644 --- a/intl/icu/source/data/locales/en_BI.txt +++ b/intl/icu/source/data/locales/en_BI.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BI{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_BM.txt b/intl/icu/source/data/locales/en_BM.txt index 1f9a62c1ac63..d45a1f99e2f1 100644 --- a/intl/icu/source/data/locales/en_BM.txt +++ b/intl/icu/source/data/locales/en_BM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_BS.txt b/intl/icu/source/data/locales/en_BS.txt index 115d86885a11..fa71936df178 100644 --- a/intl/icu/source/data/locales/en_BS.txt +++ b/intl/icu/source/data/locales/en_BS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_BW.txt b/intl/icu/source/data/locales/en_BW.txt index b3b8e08f165d..5f3a00a20bba 100644 --- a/intl/icu/source/data/locales/en_BW.txt +++ b/intl/icu/source/data/locales/en_BW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BW{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_BZ.txt b/intl/icu/source/data/locales/en_BZ.txt index 991e9d0bc8e2..87bddc643e9d 100644 --- a/intl/icu/source/data/locales/en_BZ.txt +++ b/intl/icu/source/data/locales/en_BZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BZ{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_CA.txt b/intl/icu/source/data/locales/en_CA.txt index 669b01460bea..06afc444e154 100644 --- a/intl/icu/source/data/locales/en_CA.txt +++ b/intl/icu/source/data/locales/en_CA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CA{ %%Parent{"en_001"} NumberElements{ @@ -9,7 +10,6 @@ en_CA{ } } } - Version{"37"} calendar{ chinese{ DateTimePatterns{ @@ -440,6 +440,18 @@ en_CA{ } } } + mon-narrow{ + relativeTime{ + future{ + one{"in {0} M"} + other{"in {0} Mo’s"} + } + past{ + one{"{0} M ago"} + other{"{0} Mo’s ago"} + } + } + } mon-short{ relativeTime{ future{ @@ -710,13 +722,4 @@ en_CA{ } } } - listPattern{ - standard-narrow{ - 2{"{0} and {1}"} - end{"{0}, and {1}"} - } - standard-short{ - end{"{0}, and {1}"} - } - } } diff --git a/intl/icu/source/data/locales/en_CC.txt b/intl/icu/source/data/locales/en_CC.txt index 7c53982a2cf1..24d672afa7ac 100644 --- a/intl/icu/source/data/locales/en_CC.txt +++ b/intl/icu/source/data/locales/en_CC.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CC{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_CH.txt b/intl/icu/source/data/locales/en_CH.txt index 2f720671e3ef..cbc74e6208d5 100644 --- a/intl/icu/source/data/locales/en_CH.txt +++ b/intl/icu/source/data/locales/en_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CH{ %%Parent{"en_150"} NumberElements{ @@ -14,5 +15,4 @@ en_CH{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_CK.txt b/intl/icu/source/data/locales/en_CK.txt index d268aa3b7568..08077ab317ff 100644 --- a/intl/icu/source/data/locales/en_CK.txt +++ b/intl/icu/source/data/locales/en_CK.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CK{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_CM.txt b/intl/icu/source/data/locales/en_CM.txt index 07a99a914514..099fcdcc7680 100644 --- a/intl/icu/source/data/locales/en_CM.txt +++ b/intl/icu/source/data/locales/en_CM.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CM{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_CX.txt b/intl/icu/source/data/locales/en_CX.txt index 275cdb09a13d..8749bf13cd2c 100644 --- a/intl/icu/source/data/locales/en_CX.txt +++ b/intl/icu/source/data/locales/en_CX.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CX{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_CY.txt b/intl/icu/source/data/locales/en_CY.txt index 21b11b75693b..d4e75c0ad7c6 100644 --- a/intl/icu/source/data/locales/en_CY.txt +++ b/intl/icu/source/data/locales/en_CY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_DE.txt b/intl/icu/source/data/locales/en_DE.txt index 0b4b6631d3fa..070cf16cbe4a 100644 --- a/intl/icu/source/data/locales/en_DE.txt +++ b/intl/icu/source/data/locales/en_DE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DE{ %%Parent{"en_150"} NumberElements{ @@ -14,5 +15,4 @@ en_DE{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_DG.txt b/intl/icu/source/data/locales/en_DG.txt index 513a5bf06c13..32747b417de5 100644 --- a/intl/icu/source/data/locales/en_DG.txt +++ b/intl/icu/source/data/locales/en_DG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DG{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_DK.txt b/intl/icu/source/data/locales/en_DK.txt index a62de9c3ce76..2734d64d5de8 100644 --- a/intl/icu/source/data/locales/en_DK.txt +++ b/intl/icu/source/data/locales/en_DK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DK{ %%Parent{"en_150"} NumberElements{ @@ -15,7 +16,6 @@ en_DK{ } } } - Version{"37"} calendar{ generic{ availableFormats{ diff --git a/intl/icu/source/data/locales/en_DM.txt b/intl/icu/source/data/locales/en_DM.txt index 5bfedb7bc574..224df76b66c2 100644 --- a/intl/icu/source/data/locales/en_DM.txt +++ b/intl/icu/source/data/locales/en_DM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_ER.txt b/intl/icu/source/data/locales/en_ER.txt index afd82fc80845..a39df789c0b7 100644 --- a/intl/icu/source/data/locales/en_ER.txt +++ b/intl/icu/source/data/locales/en_ER.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ER{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_FI.txt b/intl/icu/source/data/locales/en_FI.txt index c44a91606f1c..40955b549919 100644 --- a/intl/icu/source/data/locales/en_FI.txt +++ b/intl/icu/source/data/locales/en_FI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FI{ %%Parent{"en_150"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -15,7 +16,6 @@ en_FI{ } } } - Version{"37"} calendar{ generic{ availableFormats{ diff --git a/intl/icu/source/data/locales/en_FJ.txt b/intl/icu/source/data/locales/en_FJ.txt index 0c4ca01ddb12..65b19ac752d1 100644 --- a/intl/icu/source/data/locales/en_FJ.txt +++ b/intl/icu/source/data/locales/en_FJ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FJ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_FK.txt b/intl/icu/source/data/locales/en_FK.txt index 25415ea0b2ce..c27a1f2eea51 100644 --- a/intl/icu/source/data/locales/en_FK.txt +++ b/intl/icu/source/data/locales/en_FK.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FK{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_FM.txt b/intl/icu/source/data/locales/en_FM.txt index 352f324e9718..ad38147c27bf 100644 --- a/intl/icu/source/data/locales/en_FM.txt +++ b/intl/icu/source/data/locales/en_FM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_GB.txt b/intl/icu/source/data/locales/en_GB.txt index b3a321aae53a..91b06105f4e8 100644 --- a/intl/icu/source/data/locales/en_GB.txt +++ b/intl/icu/source/data/locales/en_GB.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GB{ %%Parent{"en_001"} NumberElements{ @@ -10,7 +11,6 @@ en_GB{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ availableFormats{ @@ -110,6 +110,20 @@ en_GB{ } monthNames{ format{ + abbreviated{ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sept", + "Oct", + "Nov", + "Dec", + } narrow{ "J", "F", @@ -135,7 +149,7 @@ en_GB{ "Jun", "Jul", "Aug", - "Sep", + "Sept", "Oct", "Nov", "Dec", diff --git a/intl/icu/source/data/locales/en_GD.txt b/intl/icu/source/data/locales/en_GD.txt index 98ca5e43fb1e..5aadd228902a 100644 --- a/intl/icu/source/data/locales/en_GD.txt +++ b/intl/icu/source/data/locales/en_GD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_GG.txt b/intl/icu/source/data/locales/en_GG.txt index 2fe340893a27..08ab5d947e1a 100644 --- a/intl/icu/source/data/locales/en_GG.txt +++ b/intl/icu/source/data/locales/en_GG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GG{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_GH.txt b/intl/icu/source/data/locales/en_GH.txt index de3715085046..8d0f240339d5 100644 --- a/intl/icu/source/data/locales/en_GH.txt +++ b/intl/icu/source/data/locales/en_GH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_GI.txt b/intl/icu/source/data/locales/en_GI.txt index 54c7839d0fa1..58882692de2a 100644 --- a/intl/icu/source/data/locales/en_GI.txt +++ b/intl/icu/source/data/locales/en_GI.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GI{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_GM.txt b/intl/icu/source/data/locales/en_GM.txt index bbf424ce80b4..0f9710e3cfe0 100644 --- a/intl/icu/source/data/locales/en_GM.txt +++ b/intl/icu/source/data/locales/en_GM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_GU.txt b/intl/icu/source/data/locales/en_GU.txt index cbdb866074f9..17c45f6f3ad9 100644 --- a/intl/icu/source/data/locales/en_GU.txt +++ b/intl/icu/source/data/locales/en_GU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_GY.txt b/intl/icu/source/data/locales/en_GY.txt index 905d5bef1647..0e53543e03e5 100644 --- a/intl/icu/source/data/locales/en_GY.txt +++ b/intl/icu/source/data/locales/en_GY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_HK.txt b/intl/icu/source/data/locales/en_HK.txt index e5a97613573d..9dd2f81ac9d1 100644 --- a/intl/icu/source/data/locales/en_HK.txt +++ b/intl/icu/source/data/locales/en_HK.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_HK{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_IE.txt b/intl/icu/source/data/locales/en_IE.txt index c8239cc8391b..f1c7054b35cb 100644 --- a/intl/icu/source/data/locales/en_IE.txt +++ b/intl/icu/source/data/locales/en_IE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IE{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_IL.txt b/intl/icu/source/data/locales/en_IL.txt index 8abcfef88cef..a6beec8d64b8 100644 --- a/intl/icu/source/data/locales/en_IL.txt +++ b/intl/icu/source/data/locales/en_IL.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IL{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ availableFormats{ diff --git a/intl/icu/source/data/locales/en_IM.txt b/intl/icu/source/data/locales/en_IM.txt index 2c4dfaaa3828..b6bcfdd34fdd 100644 --- a/intl/icu/source/data/locales/en_IM.txt +++ b/intl/icu/source/data/locales/en_IM.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IM{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_IN.txt b/intl/icu/source/data/locales/en_IN.txt index 95c12789b6de..e63979b2c0f5 100644 --- a/intl/icu/source/data/locales/en_IN.txt +++ b/intl/icu/source/data/locales/en_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IN{ %%Parent{"en_001"} NumberElements{ @@ -66,7 +67,6 @@ en_IN{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_IO.txt b/intl/icu/source/data/locales/en_IO.txt index ac8170c8957f..d765e028a5bb 100644 --- a/intl/icu/source/data/locales/en_IO.txt +++ b/intl/icu/source/data/locales/en_IO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IO{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_JE.txt b/intl/icu/source/data/locales/en_JE.txt index f04e15a884b2..e41a36343781 100644 --- a/intl/icu/source/data/locales/en_JE.txt +++ b/intl/icu/source/data/locales/en_JE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JE{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_JM.txt b/intl/icu/source/data/locales/en_JM.txt index 695ae1a18125..08a51274d409 100644 --- a/intl/icu/source/data/locales/en_JM.txt +++ b/intl/icu/source/data/locales/en_JM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_KE.txt b/intl/icu/source/data/locales/en_KE.txt index 2ebad3eb9676..1fcb728d8b6c 100644 --- a/intl/icu/source/data/locales/en_KE.txt +++ b/intl/icu/source/data/locales/en_KE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KE{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_KI.txt b/intl/icu/source/data/locales/en_KI.txt index 6c68a9fa83d5..8cd023d08082 100644 --- a/intl/icu/source/data/locales/en_KI.txt +++ b/intl/icu/source/data/locales/en_KI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_KN.txt b/intl/icu/source/data/locales/en_KN.txt index 35ebc91eb17e..092c41e9eb64 100644 --- a/intl/icu/source/data/locales/en_KN.txt +++ b/intl/icu/source/data/locales/en_KN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_KY.txt b/intl/icu/source/data/locales/en_KY.txt index 71fa196b611a..a0c571e78e8b 100644 --- a/intl/icu/source/data/locales/en_KY.txt +++ b/intl/icu/source/data/locales/en_KY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_LC.txt b/intl/icu/source/data/locales/en_LC.txt index 5e248adcff89..ce2445292795 100644 --- a/intl/icu/source/data/locales/en_LC.txt +++ b/intl/icu/source/data/locales/en_LC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_LR.txt b/intl/icu/source/data/locales/en_LR.txt index 0a77adc8b4fc..979fa999139a 100644 --- a/intl/icu/source/data/locales/en_LR.txt +++ b/intl/icu/source/data/locales/en_LR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_LS.txt b/intl/icu/source/data/locales/en_LS.txt index 14848c9fef04..bd1380cb3de1 100644 --- a/intl/icu/source/data/locales/en_LS.txt +++ b/intl/icu/source/data/locales/en_LS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_MG.txt b/intl/icu/source/data/locales/en_MG.txt index d8a8effd68ba..5769746469a9 100644 --- a/intl/icu/source/data/locales/en_MG.txt +++ b/intl/icu/source/data/locales/en_MG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MG{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_MH.txt b/intl/icu/source/data/locales/en_MH.txt index 35a53e320798..c35d50526e84 100644 --- a/intl/icu/source/data/locales/en_MH.txt +++ b/intl/icu/source/data/locales/en_MH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_MO.txt b/intl/icu/source/data/locales/en_MO.txt index 2cd5c0a8f383..769b2ea19989 100644 --- a/intl/icu/source/data/locales/en_MO.txt +++ b/intl/icu/source/data/locales/en_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_MP.txt b/intl/icu/source/data/locales/en_MP.txt index d3ae815a6465..0f6b5c443601 100644 --- a/intl/icu/source/data/locales/en_MP.txt +++ b/intl/icu/source/data/locales/en_MP.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MP{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_MS.txt b/intl/icu/source/data/locales/en_MS.txt index 619cbc2e6edd..79e874a1d469 100644 --- a/intl/icu/source/data/locales/en_MS.txt +++ b/intl/icu/source/data/locales/en_MS.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MS{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_MT.txt b/intl/icu/source/data/locales/en_MT.txt index 46a9632474aa..fdc6f5318df3 100644 --- a/intl/icu/source/data/locales/en_MT.txt +++ b/intl/icu/source/data/locales/en_MT.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MT{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_MU.txt b/intl/icu/source/data/locales/en_MU.txt index 1945c9279174..6d170277b91d 100644 --- a/intl/icu/source/data/locales/en_MU.txt +++ b/intl/icu/source/data/locales/en_MU.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MU{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_MW.txt b/intl/icu/source/data/locales/en_MW.txt index 06244544e9de..1920911dc756 100644 --- a/intl/icu/source/data/locales/en_MW.txt +++ b/intl/icu/source/data/locales/en_MW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_MY.txt b/intl/icu/source/data/locales/en_MY.txt index ffd93f8e315a..891c100c2873 100644 --- a/intl/icu/source/data/locales/en_MY.txt +++ b/intl/icu/source/data/locales/en_MY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_NA.txt b/intl/icu/source/data/locales/en_NA.txt index 0b019a8d650f..c1a4e58564fe 100644 --- a/intl/icu/source/data/locales/en_NA.txt +++ b/intl/icu/source/data/locales/en_NA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_NF.txt b/intl/icu/source/data/locales/en_NF.txt index e2426fefa6b5..acd5a55760b8 100644 --- a/intl/icu/source/data/locales/en_NF.txt +++ b/intl/icu/source/data/locales/en_NF.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NF{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_NG.txt b/intl/icu/source/data/locales/en_NG.txt index eafed4e8afae..06b8863426ea 100644 --- a/intl/icu/source/data/locales/en_NG.txt +++ b/intl/icu/source/data/locales/en_NG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NG{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_NH.txt b/intl/icu/source/data/locales/en_NH.txt index 958b96bdad8e..5dc995b2118b 100644 --- a/intl/icu/source/data/locales/en_NH.txt +++ b/intl/icu/source/data/locales/en_NH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NH{ "%%ALIAS"{"en_VU"} } diff --git a/intl/icu/source/data/locales/en_NL.txt b/intl/icu/source/data/locales/en_NL.txt index 81e609d1a255..06bb9803d5a5 100644 --- a/intl/icu/source/data/locales/en_NL.txt +++ b/intl/icu/source/data/locales/en_NL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NL{ %%Parent{"en_150"} NumberElements{ @@ -14,5 +15,4 @@ en_NL{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_NR.txt b/intl/icu/source/data/locales/en_NR.txt index 66fac69a3f67..2f2c2e1d293d 100644 --- a/intl/icu/source/data/locales/en_NR.txt +++ b/intl/icu/source/data/locales/en_NR.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NR{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_NU.txt b/intl/icu/source/data/locales/en_NU.txt index ccbeedcc2b8b..17f337199386 100644 --- a/intl/icu/source/data/locales/en_NU.txt +++ b/intl/icu/source/data/locales/en_NU.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NU{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_NZ.txt b/intl/icu/source/data/locales/en_NZ.txt index 165be8e59b3f..07e76e2ac987 100644 --- a/intl/icu/source/data/locales/en_NZ.txt +++ b/intl/icu/source/data/locales/en_NZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NZ{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_PG.txt b/intl/icu/source/data/locales/en_PG.txt index ffddbf48a87f..217c90f4dd6b 100644 --- a/intl/icu/source/data/locales/en_PG.txt +++ b/intl/icu/source/data/locales/en_PG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_PH.txt b/intl/icu/source/data/locales/en_PH.txt index 96578848ab80..1b59777cecbf 100644 --- a/intl/icu/source/data/locales/en_PH.txt +++ b/intl/icu/source/data/locales/en_PH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_PK.txt b/intl/icu/source/data/locales/en_PK.txt index 5b7527033656..3c0c2261613f 100644 --- a/intl/icu/source/data/locales/en_PK.txt +++ b/intl/icu/source/data/locales/en_PK.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PK{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_PN.txt b/intl/icu/source/data/locales/en_PN.txt index edc09abbd94b..bc2dca37f673 100644 --- a/intl/icu/source/data/locales/en_PN.txt +++ b/intl/icu/source/data/locales/en_PN.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PN{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_PR.txt b/intl/icu/source/data/locales/en_PR.txt index 52899cb543db..f08e6de8105e 100644 --- a/intl/icu/source/data/locales/en_PR.txt +++ b/intl/icu/source/data/locales/en_PR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_PW.txt b/intl/icu/source/data/locales/en_PW.txt index ed60f26fed87..89ef3e6c9463 100644 --- a/intl/icu/source/data/locales/en_PW.txt +++ b/intl/icu/source/data/locales/en_PW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_RH.txt b/intl/icu/source/data/locales/en_RH.txt index b60f708fb284..24bad293f695 100644 --- a/intl/icu/source/data/locales/en_RH.txt +++ b/intl/icu/source/data/locales/en_RH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RH{ "%%ALIAS"{"en_ZW"} } diff --git a/intl/icu/source/data/locales/en_RW.txt b/intl/icu/source/data/locales/en_RW.txt index 11d49910e4b6..a7a3a92b1a27 100644 --- a/intl/icu/source/data/locales/en_RW.txt +++ b/intl/icu/source/data/locales/en_RW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RW{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_SB.txt b/intl/icu/source/data/locales/en_SB.txt index 7e736c28dae8..99071572dc6c 100644 --- a/intl/icu/source/data/locales/en_SB.txt +++ b/intl/icu/source/data/locales/en_SB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_SC.txt b/intl/icu/source/data/locales/en_SC.txt index 1e81cb48c68d..e6e08b28d5d4 100644 --- a/intl/icu/source/data/locales/en_SC.txt +++ b/intl/icu/source/data/locales/en_SC.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SC{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_SD.txt b/intl/icu/source/data/locales/en_SD.txt index f2110fab60c4..ef3c460dae03 100644 --- a/intl/icu/source/data/locales/en_SD.txt +++ b/intl/icu/source/data/locales/en_SD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_SE.txt b/intl/icu/source/data/locales/en_SE.txt index de6914a3388e..9f286a54b35a 100644 --- a/intl/icu/source/data/locales/en_SE.txt +++ b/intl/icu/source/data/locales/en_SE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SE{ %%Parent{"en_150"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -15,7 +16,6 @@ en_SE{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_SG.txt b/intl/icu/source/data/locales/en_SG.txt index faa9d2ca6312..0600b6b94932 100644 --- a/intl/icu/source/data/locales/en_SG.txt +++ b/intl/icu/source/data/locales/en_SG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SG{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_SH.txt b/intl/icu/source/data/locales/en_SH.txt index d11f12802144..44738736a522 100644 --- a/intl/icu/source/data/locales/en_SH.txt +++ b/intl/icu/source/data/locales/en_SH.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SH{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_SI.txt b/intl/icu/source/data/locales/en_SI.txt index 7ba5f11bfc7b..266885db3fb7 100644 --- a/intl/icu/source/data/locales/en_SI.txt +++ b/intl/icu/source/data/locales/en_SI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SI{ %%Parent{"en_150"} NumberElements{ @@ -14,5 +15,4 @@ en_SI{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_SL.txt b/intl/icu/source/data/locales/en_SL.txt index b956002c8c65..c79ccc50137a 100644 --- a/intl/icu/source/data/locales/en_SL.txt +++ b/intl/icu/source/data/locales/en_SL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_SS.txt b/intl/icu/source/data/locales/en_SS.txt index 80fb80078f97..390a313b3ff7 100644 --- a/intl/icu/source/data/locales/en_SS.txt +++ b/intl/icu/source/data/locales/en_SS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_SX.txt b/intl/icu/source/data/locales/en_SX.txt index 4c9565e8cfe9..77170f84a49f 100644 --- a/intl/icu/source/data/locales/en_SX.txt +++ b/intl/icu/source/data/locales/en_SX.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SX{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_SZ.txt b/intl/icu/source/data/locales/en_SZ.txt index 431d63a6eaf2..7e9c97d0d227 100644 --- a/intl/icu/source/data/locales/en_SZ.txt +++ b/intl/icu/source/data/locales/en_SZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_TC.txt b/intl/icu/source/data/locales/en_TC.txt index 4129b99aedf9..181633bb547b 100644 --- a/intl/icu/source/data/locales/en_TC.txt +++ b/intl/icu/source/data/locales/en_TC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_TK.txt b/intl/icu/source/data/locales/en_TK.txt index 8de60cd93298..b5b55f6ea079 100644 --- a/intl/icu/source/data/locales/en_TK.txt +++ b/intl/icu/source/data/locales/en_TK.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TK{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_TO.txt b/intl/icu/source/data/locales/en_TO.txt index 6b63ad24fc11..d21d084e934f 100644 --- a/intl/icu/source/data/locales/en_TO.txt +++ b/intl/icu/source/data/locales/en_TO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_TT.txt b/intl/icu/source/data/locales/en_TT.txt index d91ebb5a6aa4..d375378a8bf3 100644 --- a/intl/icu/source/data/locales/en_TT.txt +++ b/intl/icu/source/data/locales/en_TT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_TV.txt b/intl/icu/source/data/locales/en_TV.txt index e2c1c5ae36dc..7cbabca0019e 100644 --- a/intl/icu/source/data/locales/en_TV.txt +++ b/intl/icu/source/data/locales/en_TV.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TV{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_TZ.txt b/intl/icu/source/data/locales/en_TZ.txt index 12d215130d19..9f5dee363cea 100644 --- a/intl/icu/source/data/locales/en_TZ.txt +++ b/intl/icu/source/data/locales/en_TZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TZ{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_UG.txt b/intl/icu/source/data/locales/en_UG.txt index f169ad696cdf..063fe72cd7d5 100644 --- a/intl/icu/source/data/locales/en_UG.txt +++ b/intl/icu/source/data/locales/en_UG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_UG{ %%Parent{"en_001"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_UM.txt b/intl/icu/source/data/locales/en_UM.txt index b994e1268099..d43fb11816d5 100644 --- a/intl/icu/source/data/locales/en_UM.txt +++ b/intl/icu/source/data/locales/en_UM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_UM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_US.txt b/intl/icu/source/data/locales/en_US.txt index 0d911e60ef8b..3d196d77c5e1 100644 --- a/intl/icu/source/data/locales/en_US.txt +++ b/intl/icu/source/data/locales/en_US.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_US{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_US_POSIX.txt b/intl/icu/source/data/locales/en_US_POSIX.txt index 5e1648967835..4dbe27eaa46d 100644 --- a/intl/icu/source/data/locales/en_US_POSIX.txt +++ b/intl/icu/source/data/locales/en_US_POSIX.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_US_POSIX{ ExemplarCharactersNumbers{"[\\- ‑ , . / % + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -16,5 +17,4 @@ en_US_POSIX{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_VC.txt b/intl/icu/source/data/locales/en_VC.txt index 45b455da495d..a0187543234c 100644 --- a/intl/icu/source/data/locales/en_VC.txt +++ b/intl/icu/source/data/locales/en_VC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_VG.txt b/intl/icu/source/data/locales/en_VG.txt index 3e84e3013cc5..1a001d05daa8 100644 --- a/intl/icu/source/data/locales/en_VG.txt +++ b/intl/icu/source/data/locales/en_VG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_VI.txt b/intl/icu/source/data/locales/en_VI.txt index 0c41c0d839df..8d1e7695b869 100644 --- a/intl/icu/source/data/locales/en_VI.txt +++ b/intl/icu/source/data/locales/en_VI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_VU.txt b/intl/icu/source/data/locales/en_VU.txt index 6229365b1f91..91d6b819ccf7 100644 --- a/intl/icu/source/data/locales/en_VU.txt +++ b/intl/icu/source/data/locales/en_VU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_WS.txt b/intl/icu/source/data/locales/en_WS.txt index 5d2f739b8e3e..f197bb1f1507 100644 --- a/intl/icu/source/data/locales/en_WS.txt +++ b/intl/icu/source/data/locales/en_WS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_WS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_ZA.txt b/intl/icu/source/data/locales/en_ZA.txt index 4fc74b6ea199..37335d8fbc25 100644 --- a/intl/icu/source/data/locales/en_ZA.txt +++ b/intl/icu/source/data/locales/en_ZA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZA{ %%Parent{"en_001"} AuxExemplarCharacters{ @@ -15,7 +16,6 @@ en_ZA{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/en_ZM.txt b/intl/icu/source/data/locales/en_ZM.txt index 32588ce8afff..f61c471a8de3 100644 --- a/intl/icu/source/data/locales/en_ZM.txt +++ b/intl/icu/source/data/locales/en_ZM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/en_ZW.txt b/intl/icu/source/data/locales/en_ZW.txt index f3960de48f85..a296474e7163 100644 --- a/intl/icu/source/data/locales/en_ZW.txt +++ b/intl/icu/source/data/locales/en_ZW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZW{ %%Parent{"en_001"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/eo.txt b/intl/icu/source/data/locales/eo.txt index 85663ad71ce8..532a5d0ca6af 100644 --- a/intl/icu/source/data/locales/eo.txt +++ b/intl/icu/source/data/locales/eo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo{ 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]"} @@ -14,7 +15,6 @@ eo{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/eo_001.txt b/intl/icu/source/data/locales/eo_001.txt index c0a4de11bbfb..26ad20daeeea 100644 --- a/intl/icu/source/data/locales/eo_001.txt +++ b/intl/icu/source/data/locales/eo_001.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo_001{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/es.txt b/intl/icu/source/data/locales/es.txt index 593a1e104433..3688a8c9efc7 100644 --- a/intl/icu/source/data/locales/es.txt +++ b/intl/icu/source/data/locales/es.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ AuxExemplarCharacters{"[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī º ò ŏ ô ö ø ō œ ù ŭ û ū ý ÿ]"} Ellipsis{ @@ -215,7 +216,6 @@ es{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -798,13 +798,13 @@ es{ dayNames{ format{ abbreviated{ - "dom.", - "lun.", - "mar.", - "mié.", - "jue.", - "vie.", - "sáb.", + "dom", + "lun", + "mar", + "mié", + "jue", + "vie", + "sáb", } narrow{ "D", @@ -836,13 +836,13 @@ es{ } stand-alone{ abbreviated{ - "dom.", - "lun.", - "mar.", - "mié.", - "jue.", - "vie.", - "sáb.", + "dom", + "lun", + "mar", + "mié", + "jue", + "vie", + "sáb", } narrow{ "D", @@ -1099,18 +1099,18 @@ es{ monthNames{ format{ abbreviated{ - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sept.", - "oct.", - "nov.", - "dic.", + "ene", + "feb", + "mar", + "abr", + "may", + "jun", + "jul", + "ago", + "sept", + "oct", + "nov", + "dic", } narrow{ "E", @@ -1143,18 +1143,18 @@ es{ } stand-alone{ abbreviated{ - "ene.", - "feb.", - "mar.", - "abr.", - "may.", - "jun.", - "jul.", - "ago.", - "sept.", - "oct.", - "nov.", - "dic.", + "ene", + "feb", + "mar", + "abr", + "may", + "jun", + "jul", + "ago", + "sept", + "oct", + "nov", + "dic", } narrow{ "E", diff --git a/intl/icu/source/data/locales/es_419.txt b/intl/icu/source/data/locales/es_419.txt index d76be69e837d..e156d125e910 100644 --- a/intl/icu/source/data/locales/es_419.txt +++ b/intl/icu/source/data/locales/es_419.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_419{ NumberElements{ latn{ @@ -90,12 +91,12 @@ es_419{ } } symbols{ + approximatelySign{"~"} decimal{"."} group{","} } } } - Version{"37"} calendar{ coptic{ monthNames{ @@ -243,14 +244,6 @@ es_419{ } } gregorian{ - AmPmMarkers{ - "a.m.", - "p.m.", - } - AmPmMarkersAbbr{ - "a.m.", - "p.m.", - } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -261,8 +254,8 @@ es_419{ "d MMM y", "d/M/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -275,9 +268,9 @@ es_419{ Hms{"HH:mm:ss"} MMMdd{"dd-MMM"} yMEd{"E d/M/y"} - yMMM{"MMMM 'de' y"} + yMMM{"MMM 'de' y"} yMMMEd{"E, d 'de' MMM 'de' y"} - yMMMd{"d 'de' MMMM 'de' y"} + yMMMd{"d 'de' MMM 'de' y"} yQQQ{"QQQ 'de' y"} } dayNames{ @@ -293,6 +286,15 @@ es_419{ } } stand-alone{ + abbreviated{ + "dom.", + "lun.", + "mar.", + "mié.", + "jue.", + "vie.", + "sáb.", + } narrow{ "D", "L", @@ -304,18 +306,6 @@ es_419{ } } } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a.m."} - pm{"p.m."} - } - wide{ - am{"a.m."} - pm{"p.m."} - } - } - } intervalFormats{ GyM{ G{"MM/y GGGGG – MM/y GGGGG"} @@ -745,9 +735,6 @@ es_419{ dayOfYear-short{ dn{"día del año"} } - dayperiod{ - dn{"a.m./p.m."} - } dayperiod-narrow{ dn{"a.m./p.m."} } diff --git a/intl/icu/source/data/locales/es_AR.txt b/intl/icu/source/data/locales/es_AR.txt index 37161f49b79a..700cac3e15d7 100644 --- a/intl/icu/source/data/locales/es_AR.txt +++ b/intl/icu/source/data/locales/es_AR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_AR{ %%Parent{"es_419"} NumberElements{ @@ -14,7 +15,6 @@ es_AR{ } } } - Version{"37"} calendar{ generic{ availableFormats{ @@ -23,14 +23,6 @@ es_AR{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } availableFormats{ GyMMMEd{"E, d 'de' MMM 'de' y G"} GyMMMd{"d MMM y G"} @@ -43,7 +35,6 @@ es_AR{ yMEd{"E, d/M/y"} yMMM{"MMM y"} yMMMEd{"E, d MMM y"} - yMMMd{"d 'de' MMM 'de' y"} } dayNames{ format{ @@ -76,17 +67,9 @@ es_AR{ } } stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } narrow{ noon{"m."} } - wide{ - am{"a. m."} - pm{"p. m."} - } } } intervalFormats{ @@ -210,9 +193,6 @@ es_AR{ } } } - dayperiod{ - dn{"a. m./p. m."} - } second-narrow{ dn{"seg."} relativeTime{ diff --git a/intl/icu/source/data/locales/es_BO.txt b/intl/icu/source/data/locales/es_BO.txt index ae585b363551..bfb570966ffc 100644 --- a/intl/icu/source/data/locales/es_BO.txt +++ b/intl/icu/source/data/locales/es_BO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BO{ %%Parent{"es_419"} NumberElements{ @@ -10,17 +11,8 @@ es_BO{ } } } - Version{"37"} calendar{ gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -31,28 +23,11 @@ es_BO{ "d MMM 'de' y", "d/M/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } - } - } - fields{ - dayperiod{ - dn{"a. m./p. m."} } } } diff --git a/intl/icu/source/data/locales/es_BR.txt b/intl/icu/source/data/locales/es_BR.txt index a8d655c2c505..a18c09fbb9ad 100644 --- a/intl/icu/source/data/locales/es_BR.txt +++ b/intl/icu/source/data/locales/es_BR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_BZ.txt b/intl/icu/source/data/locales/es_BZ.txt index f7034128e3b6..471108e8d7a7 100644 --- a/intl/icu/source/data/locales/es_BZ.txt +++ b/intl/icu/source/data/locales/es_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BZ{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_CL.txt b/intl/icu/source/data/locales/es_CL.txt index 187cf30f4f95..97ba59e13eb6 100644 --- a/intl/icu/source/data/locales/es_CL.txt +++ b/intl/icu/source/data/locales/es_CL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CL{ %%Parent{"es_419"} NumberElements{ @@ -13,7 +14,6 @@ es_CL{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -84,14 +84,6 @@ es_CL{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -102,8 +94,8 @@ es_CL{ "dd-MM-y", "dd-MM-yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -128,18 +120,6 @@ es_CL{ } } } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } intervalFormats{ MEd{ M{"E dd-MM – E dd-MM"} @@ -217,9 +197,4 @@ es_CL{ } } } - fields{ - dayperiod{ - dn{"a. m./p. m."} - } - } } diff --git a/intl/icu/source/data/locales/es_CO.txt b/intl/icu/source/data/locales/es_CO.txt index f6f35817e74b..f574cf528816 100644 --- a/intl/icu/source/data/locales/es_CO.txt +++ b/intl/icu/source/data/locales/es_CO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CO{ %%Parent{"es_419"} NumberElements{ @@ -13,7 +14,6 @@ es_CO{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -99,14 +99,6 @@ es_CO{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "h:mm:ss a zzzz", "h:mm:ss a z", @@ -117,8 +109,8 @@ es_CO{ "d/MM/y", "d/MM/yy", "{1}, {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -132,8 +124,6 @@ es_CO{ MMMd{"d 'de' MMM"} MMMdd{"d 'de' MMM"} yMEd{"EEE, d/M/y"} - yMMM{"MMM 'de' y"} - yMMMd{"d 'de' MMM 'de' y"} } dayNames{ format{ @@ -170,17 +160,11 @@ es_CO{ } stand-alone{ abbreviated{ - am{"a. m."} noon{"m."} - pm{"p. m."} } narrow{ noon{"m."} } - wide{ - am{"a. m."} - pm{"p. m."} - } } } intervalFormats{ @@ -298,9 +282,4 @@ es_CO{ } } } - fields{ - dayperiod{ - dn{"a. m./p. m."} - } - } } diff --git a/intl/icu/source/data/locales/es_CR.txt b/intl/icu/source/data/locales/es_CR.txt index c6f22f6d928d..c4897be04cdf 100644 --- a/intl/icu/source/data/locales/es_CR.txt +++ b/intl/icu/source/data/locales/es_CR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CR{ %%Parent{"es_419"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -11,34 +12,4 @@ es_CR{ } } } - Version{"37"} - calendar{ - gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } - } - } - fields{ - dayperiod{ - dn{"a. m./p. m."} - } - } } diff --git a/intl/icu/source/data/locales/es_CU.txt b/intl/icu/source/data/locales/es_CU.txt index a316a0d43e0b..1a3a70a76b8d 100644 --- a/intl/icu/source/data/locales/es_CU.txt +++ b/intl/icu/source/data/locales/es_CU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CU{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_DO.txt b/intl/icu/source/data/locales/es_DO.txt index 8acc430509bb..156b76475c2e 100644 --- a/intl/icu/source/data/locales/es_DO.txt +++ b/intl/icu/source/data/locales/es_DO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_DO{ %%Parent{"es_419"} NumberElements{ @@ -9,7 +10,6 @@ es_DO{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -29,14 +29,6 @@ es_DO{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "h:mm:ss a zzzz", "h:mm:ss a z", @@ -47,8 +39,8 @@ es_DO{ "d MMM y", "d/M/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -79,17 +71,9 @@ es_DO{ } } stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } narrow{ noon{"m."} } - wide{ - am{"a. m."} - pm{"p. m."} - } } } eras{ @@ -122,9 +106,6 @@ es_DO{ day{ dn{"Día"} } - dayperiod{ - dn{"a. m./p. m."} - } era{ dn{"Era"} } diff --git a/intl/icu/source/data/locales/es_EA.txt b/intl/icu/source/data/locales/es_EA.txt index 53e207c3edd4..34f2778a2218 100644 --- a/intl/icu/source/data/locales/es_EA.txt +++ b/intl/icu/source/data/locales/es_EA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_EA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_EC.txt b/intl/icu/source/data/locales/es_EC.txt index 8f428ba99e8b..1525a3c7a374 100644 --- a/intl/icu/source/data/locales/es_EC.txt +++ b/intl/icu/source/data/locales/es_EC.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_EC{ %%Parent{"es_419"} NumberElements{ @@ -13,34 +14,4 @@ es_EC{ } } } - Version{"37"} - calendar{ - gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } - } - } - fields{ - dayperiod{ - dn{"a. m./p. m."} - } - } } diff --git a/intl/icu/source/data/locales/es_ES.txt b/intl/icu/source/data/locales/es_ES.txt index cabce7e0d92a..2236eb5eaeb1 100644 --- a/intl/icu/source/data/locales/es_ES.txt +++ b/intl/icu/source/data/locales/es_ES.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_ES{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_GQ.txt b/intl/icu/source/data/locales/es_GQ.txt index 65ebf74e784e..92901b57c3d6 100644 --- a/intl/icu/source/data/locales/es_GQ.txt +++ b/intl/icu/source/data/locales/es_GQ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GQ{ NumberElements{ latn{ @@ -8,5 +9,4 @@ es_GQ{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_GT.txt b/intl/icu/source/data/locales/es_GT.txt index 8bb4b5433e48..8fca3c4038a2 100644 --- a/intl/icu/source/data/locales/es_GT.txt +++ b/intl/icu/source/data/locales/es_GT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GT{ %%Parent{"es_419"} NumberElements{ @@ -46,7 +47,6 @@ es_GT{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -112,14 +112,6 @@ es_GT{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -130,23 +122,11 @@ es_GT{ "d/MM/y", "d/MM/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } intervalFormats{ MEd{ M{"E d/MM – E d/MM"} @@ -199,9 +179,4 @@ es_GT{ } } } - fields{ - dayperiod{ - dn{"a. m./p. m."} - } - } } diff --git a/intl/icu/source/data/locales/es_HN.txt b/intl/icu/source/data/locales/es_HN.txt index 80a5a0d51e29..102f17909667 100644 --- a/intl/icu/source/data/locales/es_HN.txt +++ b/intl/icu/source/data/locales/es_HN.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_HN{ %%Parent{"es_419"} - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -22,14 +22,6 @@ es_HN{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -40,23 +32,11 @@ es_HN{ "d MMM y", "d/M/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } } } } diff --git a/intl/icu/source/data/locales/es_IC.txt b/intl/icu/source/data/locales/es_IC.txt index 2a17a7bb7d2a..09df937a2142 100644 --- a/intl/icu/source/data/locales/es_IC.txt +++ b/intl/icu/source/data/locales/es_IC.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_IC{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/es_MX.txt b/intl/icu/source/data/locales/es_MX.txt index 98c9c509fae5..858df4b9560f 100644 --- a/intl/icu/source/data/locales/es_MX.txt +++ b/intl/icu/source/data/locales/es_MX.txt @@ -1,7 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_MX{ %%Parent{"es_419"} + AuxExemplarCharacters{"[à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ò ŏ ô ö ø ō œ ù ŭ û ū ÿ]"} MoreInformation{"[...]"} NumberElements{ latn{ @@ -89,14 +91,13 @@ es_MX{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", + "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 MMM, y G", @@ -108,11 +109,7 @@ es_MX{ "{1} {0}", } availableFormats{ - GyMMM{"MMM y G"} - GyMMMEd{"E, d MMM y G"} - GyMMMd{"d MMM y G"} MMMEd{"E d MMM"} - MMMd{"d MMM"} h{"hh a"} hm{"hh:mm a"} hms{"hh:mm:ss a"} @@ -145,26 +142,18 @@ es_MX{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ - "H:mm:ss zzzz", - "H:mm:ss z", - "H:mm:ss", - "H:mm", + "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 MMM y", "dd/MM/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -174,8 +163,6 @@ es_MX{ Ehm{"E h:mm a"} Ehms{"E h:mm:ss a"} GyMMMd{"d MMM y G"} - Hm{"H:mm"} - Hms{"H:mm:ss"} Hmsv{"HH:mm:ss v"} Hmsvvvv{"HH:mm:ss (vvvv)"} Hmv{"HH:mm v"} @@ -184,7 +171,7 @@ es_MX{ MMdd{"dd/MM"} yMEd{"E, d/M/y"} yMM{"MM/y"} - yMMMEd{"EEE, d 'de' MMMM 'de' y"} + yMMMEd{"EEE, d 'de' MMM 'de' y"} yQQQ{"QQQ y"} } dayNames{ @@ -210,16 +197,6 @@ es_MX{ noon{"del mediodía"} } } - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } } intervalFormats{ GyMMM{ @@ -350,7 +327,6 @@ es_MX{ phonetic_alphabet{"Alfabeto fonético"} sign_standard_symbols{"Símbolos de señales/estándar"} smiley{"cara sonriente"} - south_asian_scripts{"Sistemas de escritura de Asia Meridional"} southeast_asian_scripts{"Sistemas de escritura de Asia Sudoriental"} symbols{"Símbolos"} tone_marks{"Marcas tonales"} @@ -364,7 +340,7 @@ es_MX{ day-narrow{ relativeTime{ future{ - one{"+{0} día"} + one{"dentro de {0} día"} other{"en {0} días"} } } @@ -383,9 +359,6 @@ es_MX{ dayOfYear-short{ dn{"día del a"} } - dayperiod{ - dn{"a. m./p. m."} - } dayperiod-narrow{ dn{"a. m./p. m."} } @@ -428,22 +401,6 @@ es_MX{ } } } - minute-narrow{ - relativeTime{ - future{ - one{"en {0} min"} - other{"en {0} min"} - } - } - } - minute-short{ - relativeTime{ - future{ - one{"en {0} min"} - other{"en {0} min"} - } - } - } mon{ relative{ "-1"{"el lunes pasado"} @@ -464,18 +421,6 @@ es_MX{ } } } - month-narrow{ - relativeTime{ - future{ - one{"+{0} m"} - other{"+{0} m"} - } - past{ - one{"-{0} m"} - other{"-{0} m"} - } - } - } month-short{ relativeTime{ future{ @@ -498,10 +443,6 @@ es_MX{ one{"en {0} trim."} other{"en {0} trim."} } - past{ - one{"-{0} T"} - other{"-{0} T"} - } } } quarter-short{ @@ -527,14 +468,6 @@ es_MX{ } } } - second-narrow{ - relativeTime{ - future{ - one{"+{0} s"} - other{"+{0} s"} - } - } - } second-short{ relativeTime{ future{ @@ -624,10 +557,6 @@ es_MX{ one{"en {0} a"} other{"en {0} a"} } - past{ - one{"-{0} a"} - other{"-{0} a"} - } } } year-short{ diff --git a/intl/icu/source/data/locales/es_NI.txt b/intl/icu/source/data/locales/es_NI.txt index 429e24af5b61..a58e4ec5bd74 100644 --- a/intl/icu/source/data/locales/es_NI.txt +++ b/intl/icu/source/data/locales/es_NI.txt @@ -1,30 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_NI{ %%Parent{"es_419"} - Version{"37"} - calendar{ - gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } - } - } } diff --git a/intl/icu/source/data/locales/es_PA.txt b/intl/icu/source/data/locales/es_PA.txt index 6bac72203edb..8a19ea81953b 100644 --- a/intl/icu/source/data/locales/es_PA.txt +++ b/intl/icu/source/data/locales/es_PA.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PA{ %%Parent{"es_419"} - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -56,14 +56,6 @@ es_PA{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "h:mm:ss a zzzz", "h:mm:ss a z", @@ -74,8 +66,8 @@ es_PA{ "MM/dd/y", "MM/dd/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -105,16 +97,6 @@ es_PA{ noon{"mediodía"} } } - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } } intervalFormats{ MMMEd{ diff --git a/intl/icu/source/data/locales/es_PE.txt b/intl/icu/source/data/locales/es_PE.txt index 1f363b9a01b9..b8452b76fa0b 100644 --- a/intl/icu/source/data/locales/es_PE.txt +++ b/intl/icu/source/data/locales/es_PE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PE{ %%Parent{"es_419"} NumberElements{ @@ -61,7 +62,6 @@ es_PE{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -81,14 +81,6 @@ es_PE{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -99,23 +91,11 @@ es_PE{ "d MMM y", "d/MM/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } monthNames{ format{ abbreviated{ diff --git a/intl/icu/source/data/locales/es_PH.txt b/intl/icu/source/data/locales/es_PH.txt index 5ce4f00073ba..b34220f4f373 100644 --- a/intl/icu/source/data/locales/es_PH.txt +++ b/intl/icu/source/data/locales/es_PH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PH{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/es_PR.txt b/intl/icu/source/data/locales/es_PR.txt index 08e25dc3ea9f..f74be27eee1a 100644 --- a/intl/icu/source/data/locales/es_PR.txt +++ b/intl/icu/source/data/locales/es_PR.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PR{ %%Parent{"es_419"} - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -29,14 +29,6 @@ es_PR{ } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "h:mm:ss a zzzz", "h:mm:ss a z", @@ -47,8 +39,8 @@ es_PR{ "MM/dd/y", "MM/dd/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -59,18 +51,6 @@ es_PR{ yMEd{"E MM/dd/y"} yMd{"MM/dd/y"} } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } } } } diff --git a/intl/icu/source/data/locales/es_PY.txt b/intl/icu/source/data/locales/es_PY.txt index 1ad021095303..f537082056b2 100644 --- a/intl/icu/source/data/locales/es_PY.txt +++ b/intl/icu/source/data/locales/es_PY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PY{ %%Parent{"es_419"} NumberElements{ @@ -13,17 +14,8 @@ es_PY{ } } } - Version{"37"} calendar{ gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } dayNames{ format{ short{ @@ -50,17 +42,9 @@ es_PY{ } dayPeriod{ stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } narrow{ noon{"m."} } - wide{ - am{"a. m."} - pm{"p. m."} - } } } intervalFormats{ diff --git a/intl/icu/source/data/locales/es_SV.txt b/intl/icu/source/data/locales/es_SV.txt index a9c55cf13bb9..79e0c65f40f0 100644 --- a/intl/icu/source/data/locales/es_SV.txt +++ b/intl/icu/source/data/locales/es_SV.txt @@ -1,40 +1,13 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_SV{ %%Parent{"es_419"} - Version{"37"} - calendar{ - gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } - } - } fields{ day{ relative{ "-2"{"antier"} } } - dayperiod{ - dn{"a. m./p. m."} - } } } diff --git a/intl/icu/source/data/locales/es_US.txt b/intl/icu/source/data/locales/es_US.txt index f562d9c30cb3..39fbf713ef48 100644 --- a/intl/icu/source/data/locales/es_US.txt +++ b/intl/icu/source/data/locales/es_US.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_US{ %%Parent{"es_419"} MoreInformation{"[...]"} @@ -35,34 +36,6 @@ es_US{ } patternsShort{ currencyFormat{ - 1000{ - one{"0 K ¤"} - other{"0 K ¤"} - } - 10000{ - one{"00 K ¤"} - other{"00 K ¤"} - } - 100000{ - one{"000 K ¤"} - other{"000 K ¤"} - } - 1000000{ - one{"0 M ¤"} - other{"0 M ¤"} - } - 10000000{ - one{"00 M ¤"} - other{"00 M ¤"} - } - 100000000{ - one{"000 M ¤"} - other{"000 M ¤"} - } - 1000000000{ - one{"0000 M ¤"} - other{"0000 M ¤"} - } 10000000000{ one{"¤00 B"} other{"¤00 B"} @@ -125,70 +98,29 @@ es_US{ } } } - Version{"37"} 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", - "d MMM, y G", - "dd/MM/yy GGGGG", - "{1} {0}", - "{1}, {0}", - "{1}, {0}", - "{1} {0}", - "{1} {0}", - } availableFormats{ - GyMMM{"MMM y G"} - GyMMMEd{"E, d MMM y G"} - GyMMMd{"d MMM y G"} - MMMEd{"E d MMM"} - MMMd{"d MMM"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} yyyyMEd{"E, d/M/y GGGGG"} - yyyyMMM{"MMM y G"} - yyyyMMMEd{"EEE, d MMM y G"} - yyyyMMMd{"d MMM y G"} - yyyyQQQ{"QQQ y G"} } intervalFormats{ + GyMEd{ + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + 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"} + } Md{ M{"d/M – d/M"} d{"d/M – d/M"} } fallback{"{0} – {1}"} - 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"} - } - 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"} + yMMMd{ + M{"d 'de' MMM – d 'de' MMM 'de' y G"} } } } gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "h:mm:ss a zzzz", "h:mm:ss a z", @@ -199,8 +131,8 @@ es_US{ "d MMM y", "d/M/y", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -218,7 +150,7 @@ es_US{ MMdd{"dd/MM"} yMEd{"E, d/M/y"} yMM{"MM/y"} - yMMMEd{"EEE, d 'de' MMMM 'de' y"} + yMMMEd{"EEE, d 'de' MMM 'de' y"} yQQQ{"QQQ y"} } dayNames{ @@ -234,27 +166,6 @@ es_US{ } } } - dayPeriod{ - format{ - narrow{ - evening1{"de la tarde"} - morning1{"de la madrugada"} - morning2{"mañana"} - night1{"de la noche"} - noon{"del mediodía"} - } - } - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } intervalFormats{ H{ H{"HH–HH"} @@ -274,10 +185,6 @@ es_US{ M{"E, d/M – E, d/M"} d{"E, d/M – E, d/M"} } - MMMEd{ - M{"E d 'de' MMM – E d 'de' MMM"} - d{"E d 'de' MMM – E d 'de' MMM"} - } MMMd{ d{"d–d 'de' MMM"} } @@ -313,71 +220,38 @@ es_US{ } quarters{ format{ - abbreviated{ - "1er. trim.", - "2º. trim.", - "3er. trim.", - "4º trim.", - } - narrow{ - "1T", - "2T", - "3T", - "4T", - } wide{ "1.er trimestre", - "2º. trimestre", + "2.º trimestre", "3.er trimestre", - "4o. trimestre", + "4.º trimestre", } } stand-alone{ - abbreviated{ - "1er. trim.", - "2º. trim.", - "3er. trim.", - "4º trim.", - } - narrow{ - "1T", - "2T", - "3T", - "4T", - } wide{ "1.er trimestre", "2º. trimestre", "3.er trimestre", - "4º trimestre", + "4.º trimestre", } } } } } characterLabel{ - arrows{"Flechas"} + activities{"actividades"} + african_scripts{"símbolos de escritura de África"} + american_scripts{"símbolos de escritura de América"} + arrows{"flechas"} female{"mujer"} - format_whitespace{"Formato y espacio duro"} + format{"formato"} keycap{"tecla"} - letterlike_symbols{"Símbolos con letras"} - limited_use{"Uso limitado"} male{"hombre"} + miscellaneous{"varios"} modern_scripts{"Sistemas de escritura modernos"} - nonspacing{"Sin espaciado"} other{"Otros"} - phonetic_alphabet{"Alfabeto fonético"} - sign_standard_symbols{"Símbolos de señales/estándar"} smiley{"cara sonriente"} - south_asian_scripts{"Sistemas de escritura de Asia Meridional"} - southeast_asian_scripts{"Sistemas de escritura de Asia Sudoriental"} - symbols{"Símbolos"} - tone_marks{"Marcas tonales"} - travel_places{"Viajes y destinos"} - variant_forms{"Variantes"} - weather{"tiempo"} western_asian_scripts{"Sistemas de escritura de Asia Occidental"} - whitespace{"Espacio duro"} } delimiters{ alternateQuotationEnd{"”"} @@ -392,22 +266,12 @@ es_US{ dayOfYear-short{ dn{"día del a"} } - dayperiod{ - dn{"a. m./p. m."} - } dayperiod-narrow{ dn{"a. m./p. m."} } dayperiod-short{ dn{"a. m./p. m."} } - fri{ - relative{ - "-1"{"el viernes pasado"} - "0"{"este viernes"} - "1"{"el viernes próximo"} - } - } fri-narrow{ relativeTime{ past{ @@ -416,20 +280,6 @@ es_US{ } } } - fri-short{ - relative{ - "-1"{"el vier. pasado"} - "0"{"este vier."} - "1"{"el próximo vier."} - } - } - mon{ - relative{ - "-1"{"el lunes pasado"} - "0"{"este lunes"} - "1"{"el lunes próximo"} - } - } month{ relative{ "-1"{"el mes pasado"} @@ -437,21 +287,6 @@ es_US{ "1"{"el mes próximo"} } } - quarter{ - relativeTime{ - future{ - one{"dentro de {0} trimetre"} - other{"dentro de {0} trimetres"} - } - } - } - sat{ - relative{ - "-1"{"el sábado pasado"} - "0"{"este sábado"} - "1"{"el sábado próximo"} - } - } sat-narrow{ relativeTime{ past{ @@ -461,11 +296,6 @@ es_US{ } } sun{ - relative{ - "-1"{"el domingo pasado"} - "0"{"este domingo"} - "1"{"el domingo próximo"} - } relativeTime{ future{ one{"dentro de {0} domingo"} @@ -473,19 +303,7 @@ es_US{ } } } - thu{ - relative{ - "-1"{"el jueves pasado"} - "0"{"este jueves"} - "1"{"el jueves próximo"} - } - } tue{ - relative{ - "-1"{"el martes pasado"} - "0"{"este martes"} - "1"{"el martes próximo"} - } relativeTime{ future{ one{"dentro de {0} martes"} @@ -493,18 +311,11 @@ es_US{ } } } - wed{ - relative{ - "-1"{"el miércoles pasado"} - "0"{"este miércoles"} - "1"{"el miércoles próximo"} - } - } wed-short{ relative{ "-1"{"el mie. pasado"} - "0"{"este miér."} - "1"{"el próximo miér."} + "0"{"este mié."} + "1"{"el próximo mié."} } } week{ @@ -514,6 +325,20 @@ es_US{ "1"{"la semana próxima"} } } + week-narrow{ + relative{ + "-1"{"sem. pasada"} + "0"{"esta sem."} + "1"{"próxima sem."} + } + } + week-short{ + relative{ + "-1"{"sem. pasada"} + "0"{"esta sem."} + "1"{"próxima sem."} + } + } weekOfMonth-narrow{ dn{"sem. de m"} } @@ -524,10 +349,10 @@ es_US{ dn{"día de la semana del mes"} } weekdayOfMonth-narrow{ - dn{"día de sem. de mes"} + dn{"día sem. de m"} } weekdayOfMonth-short{ - dn{"día de sem. de mes"} + dn{"día sem. de m"} } year{ relative{ @@ -537,6 +362,11 @@ es_US{ } } } + listPattern{ + unit-short{ + end{"{0} y {1}"} + } + } measurementSystemNames{ UK{"imperial"} } diff --git a/intl/icu/source/data/locales/es_UY.txt b/intl/icu/source/data/locales/es_UY.txt index 921cf52fd145..6d430402aecc 100644 --- a/intl/icu/source/data/locales/es_UY.txt +++ b/intl/icu/source/data/locales/es_UY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_UY{ %%Parent{"es_419"} NumberElements{ @@ -14,29 +15,8 @@ es_UY{ } } } - Version{"37"} calendar{ gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } - wide{ - am{"a. m."} - pm{"p. m."} - } - } - } monthNames{ format{ abbreviated{ diff --git a/intl/icu/source/data/locales/es_VE.txt b/intl/icu/source/data/locales/es_VE.txt index bb792c88a71b..a2199a133afb 100644 --- a/intl/icu/source/data/locales/es_VE.txt +++ b/intl/icu/source/data/locales/es_VE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_VE{ %%Parent{"es_419"} NumberElements{ @@ -13,17 +14,8 @@ es_VE{ } } } - Version{"37"} calendar{ gregorian{ - AmPmMarkers{ - "a. m.", - "p. m.", - } - AmPmMarkersAbbr{ - "a. m.", - "p. m.", - } DateTimePatterns{ "h:mm:ss a zzzz", "h:mm:ss a z", @@ -34,8 +26,8 @@ es_VE{ "d MMM y", "d/M/yy", "{1} {0}", - "{1} 'a' 'las' {0}", - "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", "{1} {0}", "{1} {0}", } @@ -68,17 +60,9 @@ es_VE{ } dayPeriod{ stand-alone{ - abbreviated{ - am{"a. m."} - pm{"p. m."} - } narrow{ noon{"m."} } - wide{ - am{"a. m."} - pm{"p. m."} - } } } monthNames{ diff --git a/intl/icu/source/data/locales/et.txt b/intl/icu/source/data/locales/et.txt index cbbc28c3a270..adc8b88bdbc7 100644 --- a/intl/icu/source/data/locales/et.txt +++ b/intl/icu/source/data/locales/et.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et{ AuxExemplarCharacters{"[á à â å ã ā æ ç é è ê ë ē í ì î ï ī ñ ó ò ŏ ô ø ō œ ú ù û ū]"} Ellipsis{ @@ -186,6 +187,7 @@ et{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"×10^"} group{" "} @@ -211,7 +213,6 @@ et{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -314,7 +315,7 @@ et{ GyMMMd{"d. MMM y G"} H{"HH"} Hm{"HH:mm"} - Hms{"H:mm.ss"} + Hms{"H:mm:ss"} M{"M"} MEd{"E, d.M"} MMM{"MMMM"} @@ -326,9 +327,9 @@ et{ d{"d"} h{"h a"} hm{"h:mm a"} - hms{"h:mm.ss a"} - mmss{"mm.ss"} - ms{"mm.ss"} + hms{"h:mm:ss a"} + mmss{"mm:ss"} + ms{"mm:ss"} y{"y G"} yyyy{"y G"} yyyyM{"M.y G"} @@ -1929,7 +1930,7 @@ et{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/et_EE.txt b/intl/icu/source/data/locales/et_EE.txt index 5736fc87cfde..778212b6c241 100644 --- a/intl/icu/source/data/locales/et_EE.txt +++ b/intl/icu/source/data/locales/et_EE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et_EE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/eu.txt b/intl/icu/source/data/locales/eu.txt index f43a4674e71e..dc9c8e901983 100644 --- a/intl/icu/source/data/locales/eu.txt +++ b/intl/icu/source/data/locales/eu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eu{ AuxExemplarCharacters{"[á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ]"} Ellipsis{ @@ -19,6 +20,19 @@ eu{ } MoreInformation{"?"} NumberElements{ + arab{ + symbols{ + minusSign{"-"} + percentSign{"٪؜"} + plusSign{"+"} + } + } + arabext{ + symbols{ + minusSign{"‎-‎"} + plusSign{"‎+‎"} + } + } latn{ miscPatterns{ approximately{"~{0}"} @@ -36,16 +50,16 @@ eu{ patternsLong{ decimalFormat{ 1000{ - one{"0000"} - other{"0000"} + one{"0"} + other{"0"} } 10000{ - one{"00000"} - other{"00000"} + one{"0"} + other{"0"} } 100000{ - one{"000000"} - other{"000000"} + one{"0"} + other{"0"} } 1000000{ one{"0 milioi"} @@ -88,16 +102,16 @@ eu{ patternsShort{ currencyFormat{ 1000{ - one{"0000 ¤"} - other{"0000 ¤"} + one{"0"} + other{"0"} } 10000{ - one{"00000 ¤"} - other{"00000 ¤"} + one{"0"} + other{"0"} } 100000{ - one{"000000 ¤"} - other{"000000 ¤"} + one{"0"} + other{"0"} } 1000000{ one{"0 M ¤"} @@ -138,16 +152,16 @@ eu{ } decimalFormat{ 1000{ - one{"0000"} - other{"0000"} + one{"0"} + other{"0"} } 10000{ - one{"00000"} - other{"00000"} + one{"0"} + other{"0"} } 100000{ - one{"000000"} - other{"000000"} + one{"0"} + other{"0"} } 1000000{ one{"0 M"} @@ -205,12 +219,11 @@ eu{ other{"{0}. bira eskuinetara"} } plural{ - one{"Nire {0} lagunarekin nago"} - other{"Nire {0} lagunekin nago"} + one{"{0} lagun etorri da"} + other{"{0} lagun etorri dira"} } } } - Version{"37"} calendar{ buddhist{ eras{ @@ -924,15 +937,15 @@ eu{ } characterLabel{ activities{"Jarduerak"} - african_scripts{"Script afrikarrak"} - american_scripts{"Script amerikarrak"} - animal{"animalia"} + african_scripts{"Idazkera afrikarrak"} + american_scripts{"Idazkera amerikarrak"} + animal{"Animalia"} animals_nature{"Animaliak eta natura"} arrows{"Geziak"} - body{"gorputza"} + body{"Gorputza"} box_drawing{"Koadro-marrazketa"} - braille{"Braille"} - building{"eraikina"} + braille{"Braillea"} + building{"Eraikinak"} bullets_stars{"Buletak/Izarrak"} consonantal_jamo{"Jamo kontsonantea"} currency_symbols{"Moneten ikurrak"} @@ -942,11 +955,11 @@ eu{ divination_symbols{"Astrologia-ikurrak"} downwards_arrows{"Behera-geziak"} downwards_upwards_arrows{"Behera-/Gora-geziak"} - east_asian_scripts{"Asiako ekialdeko scriptak"} + east_asian_scripts{"Asiako ekialdeko idazkerak"} emoji{"Emotikonoa"} - european_scripts{"Script europearrak"} - female{"emakumea"} - flag{"bandera"} + european_scripts{"Idazkera europarrak"} + female{"Emakumea"} + flag{"Bandera"} flags{"Banderak"} food_drink{"Jan-edariak"} format{"Formatua"} @@ -959,55 +972,55 @@ eu{ hanja{"Hanja"} hanzi_simplified{"Hanzi (sinplifikatua)"} hanzi_traditional{"Hanzi (tradizionala)"} - heart{"bihotza"} - historic_scripts{"Script historikoak"} + heart{"Bihotza"} + historic_scripts{"Idazkera historikoak"} ideographic_desc_characters{"Karaktere ideografiko deskribatzaileak"} japanese_kana{"Japonierako kana"} kanbun{"Kanbuna"} kanji{"Kanjia"} - keycap{"tekla"} + keycap{"Tekla"} leftwards_arrows{"Ezker-geziak"} leftwards_rightwards_arrows{"Ezker-/Eskuin-geziak"} letterlike_symbols{"Hizkien antzeko ikurrak"} limited_use{"Erabilera mugatua"} male{"gizona"} math_symbols{"Matematikako ikurrak"} - middle_eastern_scripts{"Ekialde Ertaineko scriptak"} + middle_eastern_scripts{"Ekialde Ertaineko idazkerak"} miscellaneous{"Askotarikoak"} - modern_scripts{"Script modernoak"} + modern_scripts{"Idazkera modernoak"} modifier{"Aldatzailea"} musical_symbols{"Musika-ikurrak"} - nature{"natura"} - nonspacing{"Tarterik gabeko"} + nature{"Natura"} + nonspacing{"Tarterik gabekoak"} numbers{"Zenbakiak"} objects{"Objektuak"} other{"Bestelakoak"} paired{"Parekatuta"} - person{"pertsona"} + person{"Pertsona"} phonetic_alphabet{"Alfabeto fonetikoa"} pictographs{"Piktogramak"} - place{"tokia"} - plant{"landarea"} + place{"Tokia"} + plant{"Landarea"} punctuation{"Puntuazioa"} rightwards_arrows{"Eskuin-geziak"} sign_standard_symbols{"Zeinuak / Ikur estandarrak"} small_form_variant{"Forma-aldaera txikiak"} smiley{"emotikonoa"} smileys_people{"Emotikonoak eta jendea"} - south_asian_scripts{"Asiako hegoaldeko scriptak"} + south_asian_scripts{"Asiako hegoaldeko idazkerak"} southeast_asian_scripts{"Asiako hego-ekialdeko scriptak"} spacing{"Tartea"} - sport{"kirola"} + sport{"Kirola"} symbols{"Ikurrak"} technical_symbols{"Ikur teknikoak"} tone_marks{"Tonu-markak"} - travel{"bidaiak"} + travel{"Bidaiak"} travel_places{"Bidaiak eta tokiak"} upwards_arrows{"Gora-geziak"} variant_forms{"Aldaeren formak"} vocalic_jamo{"Jamo bokala"} - weather{"eguraldia"} - western_asian_scripts{"Asiako mendebaldeko scriptak"} + weather{"Eguraldia"} + western_asian_scripts{"Asiako mendebaldeko idazkerak"} whitespace{"Zuriunea"} } delimiters{ diff --git a/intl/icu/source/data/locales/eu_ES.txt b/intl/icu/source/data/locales/eu_ES.txt index a5a195d62d07..cf7597d2c404 100644 --- a/intl/icu/source/data/locales/eu_ES.txt +++ b/intl/icu/source/data/locales/eu_ES.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eu_ES{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ewo.txt b/intl/icu/source/data/locales/ewo.txt index 679114708e62..b5fc883c2693 100644 --- a/intl/icu/source/data/locales/ewo.txt +++ b/intl/icu/source/data/locales/ewo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ewo{ AuxExemplarCharacters{"[c j q x]"} ExemplarCharacters{ @@ -23,7 +24,6 @@ ewo{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ewo_CM.txt b/intl/icu/source/data/locales/ewo_CM.txt index 42a9f4743ccf..81b8a77342e7 100644 --- a/intl/icu/source/data/locales/ewo_CM.txt +++ b/intl/icu/source/data/locales/ewo_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ewo_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fa.txt b/intl/icu/source/data/locales/fa.txt index ff0ff394d1f5..46db907095da 100644 --- a/intl/icu/source/data/locales/fa.txt +++ b/intl/icu/source/data/locales/fa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa{ AuxExemplarCharacters{ "[ـ\u200C\u200D\u200E\u200F \u064E \u0650 \u064F \u0652 \u0656 \u0670 إ ك ى ي" @@ -61,6 +62,7 @@ fa{ patterns{ accountingFormat{"‎¤ #,##0.00;‎(¤ #,##0.00)"} currencyFormat{"‎¤ #,##0.00"} + decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} scientificFormat{"#E0"} } @@ -202,7 +204,7 @@ fa{ } 100000000000{ one{"000 ب"} - other{"000 میلیارد"} + other{"000B"} } 1000000000000{ one{"0 ت"} @@ -243,7 +245,6 @@ fa{ minimumGroupingDigits{"1"} native{"arabext"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -2703,13 +2704,13 @@ fa{ dn{"روز سال"} } dayperiod{ - dn{"قبل/بعدازظهر"} + dn{"ق.ظ/ب.ظ"} } dayperiod-narrow{ - dn{"قبل/بعدازظهر"} + dn{"ق.ظ/ب.ظ"} } dayperiod-short{ - dn{"قبل/بعدازظهر"} + dn{"ق.ظ/ب.ظ"} } era{ dn{"دوره"} @@ -3527,7 +3528,7 @@ fa{ } unit-short{ 2{"{0}،‏ {1}"} - end{"{0}،‏ {1}"} + end{"{0}، و {1}"} middle{"{0}،‏ {1}"} start{"{0}،‏ {1}"} } diff --git a/intl/icu/source/data/locales/fa_AF.txt b/intl/icu/source/data/locales/fa_AF.txt index 9dce99c581ca..94a28978a531 100644 --- a/intl/icu/source/data/locales/fa_AF.txt +++ b/intl/icu/source/data/locales/fa_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa_AF{ AuxExemplarCharacters{ "[\u200E\u200F \u064E \u0650 \u064F \u0652 \u0656 \u0670 \u200C \u200D إ ټ ځ " @@ -18,7 +19,6 @@ fa_AF{ } } } - Version{"37"} calendar{ gregorian{ appendItems{ diff --git a/intl/icu/source/data/locales/fa_IR.txt b/intl/icu/source/data/locales/fa_IR.txt index 825bab1772dd..e572a6f5b21e 100644 --- a/intl/icu/source/data/locales/fa_IR.txt +++ b/intl/icu/source/data/locales/fa_IR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa_IR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff.txt b/intl/icu/source/data/locales/ff.txt index 82f46708f80f..48e02ce368b1 100644 --- a/intl/icu/source/data/locales/ff.txt +++ b/intl/icu/source/data/locales/ff.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff{ AuxExemplarCharacters{"[q v x z]"} ExemplarCharacters{"[a b ɓ c d ɗ e f g h i j k l m n ñ ŋ o p r s t u w y ƴ]"} @@ -16,7 +17,6 @@ ff{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Adlm.txt b/intl/icu/source/data/locales/ff_Adlm.txt index c8a824933a62..e4a590ba84ad 100644 --- a/intl/icu/source/data/locales/ff_Adlm.txt +++ b/intl/icu/source/data/locales/ff_Adlm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm{ %%Parent{"root"} AuxExemplarCharacters{"[𞤾 𞤿 𞥀 𞥁 𞥂 𞥃]"} @@ -54,7 +55,12 @@ ff_Adlm{ } } symbols{ + decimal{"."} + group{"⹁"} + minusSign{"-"} nan{"𞤏𞤮𞤈"} + percentSign{"%"} + plusSign{"+"} } } minimalPairs{ @@ -69,7 +75,6 @@ ff_Adlm{ minimumGroupingDigits{"1"} native{"adlm"} } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ @@ -142,9 +147,9 @@ ff_Adlm{ "𞤈𞤫𞤬𞤦𞤭𞤪𞥆𞤫", "𞤀𞥄𞤩𞤵𞤲𞥋𞤣𞤫", "𞤃𞤢𞤱𞤦𞤢𞥄𞤪𞤫", - "𞤐𞥋𞤔𞤫𞤧𞤤𞤢𞥄𞤪𞤫", - "𞤐𞤢𞥄𞤧𞤢𞥄𞤲𞥋𞤣𞤫", - "𞤃𞤢𞤱𞤲𞥋𞤣𞤫", + "𞤐𞤶𞤫𞤧𞤤𞤢𞥄𞤪𞤫", + "𞤐𞤢𞥄𞤧𞤢𞥄𞤲𞤣𞤫", + "𞤃𞤢𞤱𞤲𞤣𞤫", "𞤖𞤮𞤪𞤦𞤭𞤪𞥆𞤫", } } @@ -180,9 +185,9 @@ ff_Adlm{ "𞤈𞤫𞤬𞤦𞤭𞤪𞥆𞤫", "𞤀𞥄𞤩𞤵𞤲𞥋𞤣𞤫", "𞤃𞤢𞤱𞤦𞤢𞥄𞤪𞤫", - "𞤐𞥋𞤔𞤫𞤧𞤤𞤢𞥄𞤪𞤫", - "𞤐𞤢𞥄𞤧𞤢𞥄𞤲𞥋𞤣𞤫", - "𞤃𞤢𞤱𞤲𞥋𞤣𞤫", + "𞤐𞤶𞤫𞤧𞤤𞤢𞥄𞤪𞤫", + "𞤐𞤢𞥄𞤧𞤢𞥄𞤲𞤣𞤫", + "𞤃𞤢𞤱𞤲𞤣𞤫", "𞤖𞤮𞤪𞤦𞤭𞤪𞥆𞤫", } } @@ -209,16 +214,16 @@ ff_Adlm{ "𞤇𞤀𞤋", } abbreviated%variant{ - "𞤀𞤘𞤖", - "𞤀𞤖", + "𞤀𞤘𞤑", + "𞤘𞤑", } wide{ "𞤀𞤣𞤮 𞤀𞤲𞥆𞤢𞤦𞤭 𞤋𞥅𞤧𞤢𞥄", "𞤇𞤢𞥄𞤱𞤮 𞤀𞤲𞥆𞤢𞤦𞤭 𞤋𞥅𞤧𞤢𞥄", } wide%variant{ - "𞤀𞤣𞤮 𞤘𞤭𞤪𞤢𞤤 𞤖𞤢𞤲𞤣𞤫", - "𞤘𞤭𞤪𞤢𞤤 𞤖𞤢𞤲𞤣𞤫", + "𞤀𞤣𞤮 𞤘𞤭𞤪𞤢𞤤 𞤑𞤢𞤬𞤢𞥄𞤲𞤺𞤢𞤤", + "𞤘𞤭𞤪𞤢𞤤 𞤑𞤢𞤬𞤢𞥄𞤲𞤺𞤢𞤤", } } monthNames{ @@ -226,7 +231,7 @@ ff_Adlm{ abbreviated{ "𞤅𞤭𞥅𞤤𞤮", "𞤕𞤮𞤤𞤼𞤮", - "𞤐𞥋𞤄𞤮𞥅𞤴𞤮", + "𞤐𞤦𞤮𞥅𞤴𞤮", "𞤅𞤫𞥅𞤼𞤮", "𞤁𞤵𞥅𞤶𞤮", "𞤑𞤮𞤪𞤧𞤮", @@ -235,7 +240,7 @@ ff_Adlm{ "𞤅𞤭𞤤𞤼𞤮", "𞤒𞤢𞤪𞤳𞤮", "𞤔𞤮𞤤𞤮", - "𞤐𞥋𞤄𞤮𞤱𞤼𞤮", + "𞤐𞤦𞤮𞤱𞤼𞤮", } narrow{ "𞤅", @@ -254,7 +259,7 @@ ff_Adlm{ wide{ "𞤅𞤭𞥅𞤤𞤮", "𞤕𞤮𞤤𞤼𞤮", - "𞤐𞥋𞤄𞤮𞥅𞤴𞤮", + "𞤐𞤦𞤮𞥅𞤴𞤮", "𞤅𞤫𞥅𞤼𞤮", "𞤁𞤵𞥅𞤶𞤮", "𞤑𞤮𞤪𞤧𞤮", @@ -263,7 +268,7 @@ ff_Adlm{ "𞤅𞤭𞤤𞤼𞤮", "𞤒𞤢𞤪𞤳𞤮", "𞤔𞤮𞤤𞤮", - "𞤐𞥋𞤄𞤮𞤱𞤼𞤮", + "𞤐𞤦𞤮𞤱𞤼𞤮", } } stand-alone{ @@ -298,7 +303,7 @@ ff_Adlm{ wide{ "𞤅𞤭𞥅𞤤𞤮", "𞤕𞤮𞤤𞤼𞤮", - "𞤐𞥋𞤄𞤮𞥅𞤴𞤮", + "𞤐𞤦𞤮𞥅𞤴𞤮", "𞤅𞤫𞥅𞤼𞤮", "𞤁𞤵𞥅𞤶𞤮", "𞤑𞤮𞤪𞤧𞤮", @@ -307,14 +312,14 @@ ff_Adlm{ "𞤅𞤭𞤤𞤼𞤮", "𞤒𞤢𞤪𞤳𞤮", "𞤔𞤮𞤤𞤮", - "𞤐𞥋𞤄𞤮𞤱𞤼𞤮", + "𞤐𞤦𞤮𞤱𞤼𞤮", } } } quarters{ format{ abbreviated{ - "𞤒𞥑", + "𞤐𞥑", "𞤐𞥒", "𞤐𞥓", "𞤐𞥔", @@ -326,7 +331,7 @@ ff_Adlm{ "𞥔", } wide{ - "𞤒𞥑", + "𞤐𞥑", "𞤐𞥒", "𞤐𞥓", "𞤐𞥔", @@ -634,7 +639,7 @@ ff_Adlm{ } } minute{ - dn{"𞤸𞤮𞤶𞤮𞤥𞤪𞤫"} + dn{"𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤪𞤫"} relative{ "0"{"𞤲𞥋𞤣𞤫𞥅 𞤯𞤮𞤮 𞤸𞤮𞤶𞤮𞤥𞤪𞤫"} } @@ -876,7 +881,7 @@ ff_Adlm{ } } second{ - dn{"𞤸𞤭𞤲𞤰𞤫𞤪𞤫"} + dn{"𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} relative{ "0"{"𞤶𞤮𞥅𞤲𞤭"} } @@ -892,7 +897,7 @@ ff_Adlm{ } } second-narrow{ - dn{"𞤸𞤭𞤲."} + dn{"𞤳𞤭𞤲."} relativeTime{ future{ one{"𞤲𞥋𞤣𞤫𞤪 {0} 𞤳𞤭𞤲."} @@ -905,7 +910,7 @@ ff_Adlm{ } } second-short{ - dn{"𞤸𞤭𞤲."} + dn{"𞤳𞤭𞤲."} relativeTime{ future{ one{"𞤲𞥋𞤣𞤫𞤪 {0} 𞤳𞤭𞤲."} @@ -1330,9 +1335,9 @@ ff_Adlm{ } } measurementSystemNames{ - UK{"𞤁𞤫𞤲𞤼𞤢𞤤 𞤐𞤁𞤫𞤱𞤲𞤺𞤵𞥅𞤶𞤭 𞤁𞤘"} - US{"𞤁𞤫𞤲𞤼𞤢𞤤 𞤂𞤢𞤪𞤫 𞤀𞤥𞤫𞤪𞤭𞤳 𞤁𞤂𞤀"} - metric{"𞤃𞤫𞤼𞤭𞤪𞤭𞤲𞤳𞤮"} + UK{"𞤑𞤵𞥅𞤰𞤫 𞤁𞤘"} + US{"𞤑𞤵𞥅𞤰𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄 𞤁𞤂𞤀"} + metric{"𞤑𞤵𞥅𞤰𞤫 𞤃𞤫𞤼𞤭𞤪𞤳𞤵"} } parse{ date{ diff --git a/intl/icu/source/data/locales/ff_Adlm_BF.txt b/intl/icu/source/data/locales/ff_Adlm_BF.txt index 8cb790b34aee..1fb8a426bbef 100644 --- a/intl/icu/source/data/locales/ff_Adlm_BF.txt +++ b/intl/icu/source/data/locales/ff_Adlm_BF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_BF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Adlm_CM.txt b/intl/icu/source/data/locales/ff_Adlm_CM.txt index 690e1c762350..aa078fd7d31f 100644 --- a/intl/icu/source/data/locales/ff_Adlm_CM.txt +++ b/intl/icu/source/data/locales/ff_Adlm_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Adlm_GH.txt b/intl/icu/source/data/locales/ff_Adlm_GH.txt index 18b53e6931a6..4d354ccff30a 100644 --- a/intl/icu/source/data/locales/ff_Adlm_GH.txt +++ b/intl/icu/source/data/locales/ff_Adlm_GH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_GH{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Adlm_GM.txt b/intl/icu/source/data/locales/ff_Adlm_GM.txt index a3f8982af446..bf14a198bc7e 100644 --- a/intl/icu/source/data/locales/ff_Adlm_GM.txt +++ b/intl/icu/source/data/locales/ff_Adlm_GM.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_GM{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Adlm_GN.txt b/intl/icu/source/data/locales/ff_Adlm_GN.txt index 7c3f67b676ce..47cbdd97e38a 100644 --- a/intl/icu/source/data/locales/ff_Adlm_GN.txt +++ b/intl/icu/source/data/locales/ff_Adlm_GN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_GN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Adlm_GW.txt b/intl/icu/source/data/locales/ff_Adlm_GW.txt index 453b08bc7032..ed5e92a67a83 100644 --- a/intl/icu/source/data/locales/ff_Adlm_GW.txt +++ b/intl/icu/source/data/locales/ff_Adlm_GW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_GW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Adlm_LR.txt b/intl/icu/source/data/locales/ff_Adlm_LR.txt index 8d3c37781f95..3ba2d414fa8a 100644 --- a/intl/icu/source/data/locales/ff_Adlm_LR.txt +++ b/intl/icu/source/data/locales/ff_Adlm_LR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_LR{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Adlm_MR.txt b/intl/icu/source/data/locales/ff_Adlm_MR.txt index 44e67195b8db..d8d86fb66908 100644 --- a/intl/icu/source/data/locales/ff_Adlm_MR.txt +++ b/intl/icu/source/data/locales/ff_Adlm_MR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_MR{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Adlm_NE.txt b/intl/icu/source/data/locales/ff_Adlm_NE.txt index 681d27d176af..b6d3424d91fb 100644 --- a/intl/icu/source/data/locales/ff_Adlm_NE.txt +++ b/intl/icu/source/data/locales/ff_Adlm_NE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_NE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Adlm_NG.txt b/intl/icu/source/data/locales/ff_Adlm_NG.txt index 34283aa201c3..2513877c9a85 100644 --- a/intl/icu/source/data/locales/ff_Adlm_NG.txt +++ b/intl/icu/source/data/locales/ff_Adlm_NG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_NG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Adlm_SL.txt b/intl/icu/source/data/locales/ff_Adlm_SL.txt index 84914222f728..584abf5b0f22 100644 --- a/intl/icu/source/data/locales/ff_Adlm_SL.txt +++ b/intl/icu/source/data/locales/ff_Adlm_SL.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_SL{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Adlm_SN.txt b/intl/icu/source/data/locales/ff_Adlm_SN.txt index 246f4651b59c..c071f39d077a 100644 --- a/intl/icu/source/data/locales/ff_Adlm_SN.txt +++ b/intl/icu/source/data/locales/ff_Adlm_SN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm_SN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_CM.txt b/intl/icu/source/data/locales/ff_CM.txt index c381f6cd740d..0bf68ef91987 100644 --- a/intl/icu/source/data/locales/ff_CM.txt +++ b/intl/icu/source/data/locales/ff_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_CM{ "%%ALIAS"{"ff_Latn_CM"} } diff --git a/intl/icu/source/data/locales/ff_GN.txt b/intl/icu/source/data/locales/ff_GN.txt index c3a0bf3d7bf3..433db4db3d8d 100644 --- a/intl/icu/source/data/locales/ff_GN.txt +++ b/intl/icu/source/data/locales/ff_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_GN{ "%%ALIAS"{"ff_Latn_GN"} } diff --git a/intl/icu/source/data/locales/ff_Latn.txt b/intl/icu/source/data/locales/ff_Latn.txt index 3d8715b562c7..d30cb6250832 100644 --- a/intl/icu/source/data/locales/ff_Latn.txt +++ b/intl/icu/source/data/locales/ff_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_BF.txt b/intl/icu/source/data/locales/ff_Latn_BF.txt index f20f10ce2890..d542683bbf65 100644 --- a/intl/icu/source/data/locales/ff_Latn_BF.txt +++ b/intl/icu/source/data/locales/ff_Latn_BF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_BF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_CM.txt b/intl/icu/source/data/locales/ff_Latn_CM.txt index 930200d05748..1fd08a42e0e0 100644 --- a/intl/icu/source/data/locales/ff_Latn_CM.txt +++ b/intl/icu/source/data/locales/ff_Latn_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_GH.txt b/intl/icu/source/data/locales/ff_Latn_GH.txt index f6d25c504c33..71ef51724020 100644 --- a/intl/icu/source/data/locales/ff_Latn_GH.txt +++ b/intl/icu/source/data/locales/ff_Latn_GH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_GH{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Latn_GM.txt b/intl/icu/source/data/locales/ff_Latn_GM.txt index 503bc29bd8f6..7442f51f0c94 100644 --- a/intl/icu/source/data/locales/ff_Latn_GM.txt +++ b/intl/icu/source/data/locales/ff_Latn_GM.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_GM{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Latn_GN.txt b/intl/icu/source/data/locales/ff_Latn_GN.txt index 7ae7a94e094f..ac936be49f61 100644 --- a/intl/icu/source/data/locales/ff_Latn_GN.txt +++ b/intl/icu/source/data/locales/ff_Latn_GN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_GN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_GW.txt b/intl/icu/source/data/locales/ff_Latn_GW.txt index 6a7e0a8928d1..755a132b9268 100644 --- a/intl/icu/source/data/locales/ff_Latn_GW.txt +++ b/intl/icu/source/data/locales/ff_Latn_GW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_GW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_LR.txt b/intl/icu/source/data/locales/ff_Latn_LR.txt index 2d3cc9111e64..2a8a3a4445f1 100644 --- a/intl/icu/source/data/locales/ff_Latn_LR.txt +++ b/intl/icu/source/data/locales/ff_Latn_LR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_LR{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Latn_MR.txt b/intl/icu/source/data/locales/ff_Latn_MR.txt index f8b0b0d88802..f35b101fab4e 100644 --- a/intl/icu/source/data/locales/ff_Latn_MR.txt +++ b/intl/icu/source/data/locales/ff_Latn_MR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_MR{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Latn_NE.txt b/intl/icu/source/data/locales/ff_Latn_NE.txt index 5bd23f3f1fff..204f7e751bb4 100644 --- a/intl/icu/source/data/locales/ff_Latn_NE.txt +++ b/intl/icu/source/data/locales/ff_Latn_NE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_NE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_NG.txt b/intl/icu/source/data/locales/ff_Latn_NG.txt index ff19638aa870..34ae55f7f379 100644 --- a/intl/icu/source/data/locales/ff_Latn_NG.txt +++ b/intl/icu/source/data/locales/ff_Latn_NG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_NG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_Latn_SL.txt b/intl/icu/source/data/locales/ff_Latn_SL.txt index dc0419621992..7b2dc8b894b9 100644 --- a/intl/icu/source/data/locales/ff_Latn_SL.txt +++ b/intl/icu/source/data/locales/ff_Latn_SL.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_SL{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ff_Latn_SN.txt b/intl/icu/source/data/locales/ff_Latn_SN.txt index 9de51240fb05..a21be07f96d2 100644 --- a/intl/icu/source/data/locales/ff_Latn_SN.txt +++ b/intl/icu/source/data/locales/ff_Latn_SN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn_SN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ff_MR.txt b/intl/icu/source/data/locales/ff_MR.txt index 17a887321fa0..1da6e5116ae4 100644 --- a/intl/icu/source/data/locales/ff_MR.txt +++ b/intl/icu/source/data/locales/ff_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_MR{ "%%ALIAS"{"ff_Latn_MR"} } diff --git a/intl/icu/source/data/locales/ff_SN.txt b/intl/icu/source/data/locales/ff_SN.txt index c6908546784d..ca2f4ec58333 100644 --- a/intl/icu/source/data/locales/ff_SN.txt +++ b/intl/icu/source/data/locales/ff_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_SN{ "%%ALIAS"{"ff_Latn_SN"} } diff --git a/intl/icu/source/data/locales/fi.txt b/intl/icu/source/data/locales/fi.txt index 141669da6860..24f623413fa7 100644 --- a/intl/icu/source/data/locales/fi.txt +++ b/intl/icu/source/data/locales/fi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi{ AuxExemplarCharacters{ "[á à ă â ã ą ā ć č ċ ç ď ð đ é è ê ě ë ė ę ē ğ ǧ ģ ǥ ȟ ħ í î ï İ į ī ı ǩ ķ ĺ" @@ -190,6 +191,7 @@ fi{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{" "} @@ -216,7 +218,6 @@ fi{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/fi_FI.txt b/intl/icu/source/data/locales/fi_FI.txt index 41aaae1cf1bc..1e59d8d5e976 100644 --- a/intl/icu/source/data/locales/fi_FI.txt +++ b/intl/icu/source/data/locales/fi_FI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi_FI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fil.txt b/intl/icu/source/data/locales/fil.txt index 0db4abe28e17..43218a515481 100644 --- a/intl/icu/source/data/locales/fil.txt +++ b/intl/icu/source/data/locales/fil.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil{ AuxExemplarCharacters{"[á à â é è ê í ì î ó ò ô ú ù û]"} Ellipsis{ @@ -199,10 +200,6 @@ fil{ } } minimalPairs{ - ordinal{ - one{"Lumiko sa unang kanan."} - other{"Lumiko sa ika-{0} kanan."} - } plural{ one{"{0} mansanas"} other{"{0} na mansanas"} @@ -211,7 +208,6 @@ fil{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -929,6 +925,13 @@ fil{ yyyyQQQQ{"QQQQ y G"} } intervalFormats{ + Bh{ + h{"h – h B"} + } + Bhm{ + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} + } Gy{ G{"y G – y G"} y{"y – y G"} @@ -1312,6 +1315,13 @@ fil{ } } intervalFormats{ + Bh{ + h{"h – h B"} + } + Bhm{ + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} + } Gy{ G{"y G – y G"} y{"y – y G"} @@ -3135,7 +3145,7 @@ fil{ } } quarter{ - dn{"Quarter"} + dn{"quarter"} relative{ "-1"{"nakaraang quarter"} "0"{"ngayong quarter"} diff --git a/intl/icu/source/data/locales/fil_PH.txt b/intl/icu/source/data/locales/fil_PH.txt index 05ef612534ee..8e629d8a8a21 100644 --- a/intl/icu/source/data/locales/fil_PH.txt +++ b/intl/icu/source/data/locales/fil_PH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil_PH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fo.txt b/intl/icu/source/data/locales/fo.txt index 9192584ad8ff..1518c45647c0 100644 --- a/intl/icu/source/data/locales/fo.txt +++ b/intl/icu/source/data/locales/fo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo{ AuxExemplarCharacters{"[c q w x z]"} Ellipsis{ @@ -21,6 +22,7 @@ fo{ miscPatterns{ approximately{"~{0}"} atLeast{"{0}+"} + atMost{"≤{0}"} range{"{0}–{1}"} } patterns{ @@ -211,7 +213,6 @@ fo{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/fo_DK.txt b/intl/icu/source/data/locales/fo_DK.txt index 698401cc8c66..5bdec2c8fa04 100644 --- a/intl/icu/source/data/locales/fo_DK.txt +++ b/intl/icu/source/data/locales/fo_DK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo_DK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fo_FO.txt b/intl/icu/source/data/locales/fo_FO.txt index e267550a662e..4a398ee36ce2 100644 --- a/intl/icu/source/data/locales/fo_FO.txt +++ b/intl/icu/source/data/locales/fo_FO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo_FO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr.txt b/intl/icu/source/data/locales/fr.txt index ea5f402e30bf..9607cb5115d7 100644 --- a/intl/icu/source/data/locales/fr.txt +++ b/intl/icu/source/data/locales/fr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ AuxExemplarCharacters{"[á å ä ã ā ć ē í ì ī ij ñ ó ò ö õ ø ř š ſ ß ú ǔ]"} Ellipsis{ @@ -42,6 +43,7 @@ fr{ patternsLong{ decimalFormat{ 1000{ + 1{"mille"} one{"0 millier"} other{"0 mille"} } @@ -194,6 +196,7 @@ fr{ } } symbols{ + approximatelySign{"≃"} decimal{","} exponential{"E"} group{" "} @@ -214,6 +217,7 @@ fr{ other{"Prenez la {0}e à droite."} } plural{ + many{"{0} de jours"} one{"{0} jour"} other{"{0} jours"} } @@ -221,7 +225,6 @@ fr{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -893,10 +896,10 @@ fr{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } appendItems{ diff --git a/intl/icu/source/data/locales/fr_BE.txt b/intl/icu/source/data/locales/fr_BE.txt index d2f0d6b5414f..a98493f4c417 100644 --- a/intl/icu/source/data/locales/fr_BE.txt +++ b/intl/icu/source/data/locales/fr_BE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BE{ - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -30,10 +30,10 @@ fr_BE{ "d MMMM y", "d MMM y", "d/MM/yy", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_BF.txt b/intl/icu/source/data/locales/fr_BF.txt index ed281eee4066..317d476f3532 100644 --- a/intl/icu/source/data/locales/fr_BF.txt +++ b/intl/icu/source/data/locales/fr_BF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_BI.txt b/intl/icu/source/data/locales/fr_BI.txt index fdafea974aa9..28eca27eb25f 100644 --- a/intl/icu/source/data/locales/fr_BI.txt +++ b/intl/icu/source/data/locales/fr_BI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_BJ.txt b/intl/icu/source/data/locales/fr_BJ.txt index e3f6bf0205fd..ce0e8a996096 100644 --- a/intl/icu/source/data/locales/fr_BJ.txt +++ b/intl/icu/source/data/locales/fr_BJ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BJ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_BL.txt b/intl/icu/source/data/locales/fr_BL.txt index 8759a0444208..9e1bb01cb496 100644 --- a/intl/icu/source/data/locales/fr_BL.txt +++ b/intl/icu/source/data/locales/fr_BL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_CA.txt b/intl/icu/source/data/locales/fr_CA.txt index d00612c42e77..68086923b274 100644 --- a/intl/icu/source/data/locales/fr_CA.txt +++ b/intl/icu/source/data/locales/fr_CA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CA{ AuxExemplarCharacters{"[á å ä ã ā ē í ì ī ñ ó ò ö ø ú ǔ]"} NumberElements{ @@ -7,6 +8,7 @@ fr_CA{ patternsLong{ decimalFormat{ 1000{ + 1{"0 mille"} one{"0 mille"} other{"0 mille"} } @@ -99,11 +101,11 @@ fr_CA{ } } symbols{ + approximatelySign{"≈"} group{" "} } } } - Version{"37"} calendar{ coptic{ monthNames{ @@ -348,10 +350,10 @@ fr_CA{ "d MMMM y", "d MMM y", "y-MM-dd", - "{1} {0}", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} {0}", + "{1}, {0}", "{1} {0}", } availableFormats{ diff --git a/intl/icu/source/data/locales/fr_CD.txt b/intl/icu/source/data/locales/fr_CD.txt index 46b752848d20..f00521d6d57e 100644 --- a/intl/icu/source/data/locales/fr_CD.txt +++ b/intl/icu/source/data/locales/fr_CD.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CD{ NumberElements{ latn{ @@ -8,7 +9,6 @@ fr_CD{ } } } - Version{"37"} calendar{ gregorian{ dayPeriod{ diff --git a/intl/icu/source/data/locales/fr_CF.txt b/intl/icu/source/data/locales/fr_CF.txt index e6fbfd12e5b1..43e65d9d3ba4 100644 --- a/intl/icu/source/data/locales/fr_CF.txt +++ b/intl/icu/source/data/locales/fr_CF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_CG.txt b/intl/icu/source/data/locales/fr_CG.txt index 301f59e2144f..a6a82ed6f159 100644 --- a/intl/icu/source/data/locales/fr_CG.txt +++ b/intl/icu/source/data/locales/fr_CG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_CH.txt b/intl/icu/source/data/locales/fr_CH.txt index a849e9e12f7b..90f8d3a75c5f 100644 --- a/intl/icu/source/data/locales/fr_CH.txt +++ b/intl/icu/source/data/locales/fr_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CH{ NumberElements{ latn{ @@ -11,7 +12,6 @@ fr_CH{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -95,10 +95,10 @@ fr_CH{ "d MMMM y", "d MMM y", "dd.MM.yy", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } availableFormats{ diff --git a/intl/icu/source/data/locales/fr_CI.txt b/intl/icu/source/data/locales/fr_CI.txt index 0dd1f9cbaacc..a51e42148e88 100644 --- a/intl/icu/source/data/locales/fr_CI.txt +++ b/intl/icu/source/data/locales/fr_CI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CI{ NumberElements{ latn{ @@ -8,5 +9,4 @@ fr_CI{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_CM.txt b/intl/icu/source/data/locales/fr_CM.txt index 32c8e8783fd8..960bcbf1136b 100644 --- a/intl/icu/source/data/locales/fr_CM.txt +++ b/intl/icu/source/data/locales/fr_CM.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CM{ - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/fr_DJ.txt b/intl/icu/source/data/locales/fr_DJ.txt index a0559ea1e4eb..045c3c114233 100644 --- a/intl/icu/source/data/locales/fr_DJ.txt +++ b/intl/icu/source/data/locales/fr_DJ.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_DJ{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_DJ{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_DZ.txt b/intl/icu/source/data/locales/fr_DZ.txt index 6322d4fbc4ff..191262bd6e9d 100644 --- a/intl/icu/source/data/locales/fr_DZ.txt +++ b/intl/icu/source/data/locales/fr_DZ.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_DZ{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_DZ{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_FR.txt b/intl/icu/source/data/locales/fr_FR.txt index ab1c69f37614..4cb75958fd1d 100644 --- a/intl/icu/source/data/locales/fr_FR.txt +++ b/intl/icu/source/data/locales/fr_FR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_FR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_GA.txt b/intl/icu/source/data/locales/fr_GA.txt index 6f7e2f60bbef..a9f87471dc88 100644 --- a/intl/icu/source/data/locales/fr_GA.txt +++ b/intl/icu/source/data/locales/fr_GA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_GA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_GF.txt b/intl/icu/source/data/locales/fr_GF.txt index 03236b4de1b1..b55566cc9c9f 100644 --- a/intl/icu/source/data/locales/fr_GF.txt +++ b/intl/icu/source/data/locales/fr_GF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_GF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_GN.txt b/intl/icu/source/data/locales/fr_GN.txt index 45e0b5c4e85f..d832ae3459cf 100644 --- a/intl/icu/source/data/locales/fr_GN.txt +++ b/intl/icu/source/data/locales/fr_GN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_GN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_GP.txt b/intl/icu/source/data/locales/fr_GP.txt index 6c05615327d0..d7326116444e 100644 --- a/intl/icu/source/data/locales/fr_GP.txt +++ b/intl/icu/source/data/locales/fr_GP.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_GP{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_GQ.txt b/intl/icu/source/data/locales/fr_GQ.txt index 2ca337eb601b..412bfaedf862 100644 --- a/intl/icu/source/data/locales/fr_GQ.txt +++ b/intl/icu/source/data/locales/fr_GQ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_GQ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_HT.txt b/intl/icu/source/data/locales/fr_HT.txt index fc1b1bf9d741..0cf8cb6d2003 100644 --- a/intl/icu/source/data/locales/fr_HT.txt +++ b/intl/icu/source/data/locales/fr_HT.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_HT{ - Version{"37"} calendar{ gregorian{ dayPeriod{ diff --git a/intl/icu/source/data/locales/fr_KM.txt b/intl/icu/source/data/locales/fr_KM.txt index 04a10632bde5..a416e1979bb2 100644 --- a/intl/icu/source/data/locales/fr_KM.txt +++ b/intl/icu/source/data/locales/fr_KM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_KM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_LU.txt b/intl/icu/source/data/locales/fr_LU.txt index 5aa49f3f0cc5..513176b4d796 100644 --- a/intl/icu/source/data/locales/fr_LU.txt +++ b/intl/icu/source/data/locales/fr_LU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_LU{ ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -9,5 +10,4 @@ fr_LU{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_MA.txt b/intl/icu/source/data/locales/fr_MA.txt index 7a4288094a16..79726c5e4699 100644 --- a/intl/icu/source/data/locales/fr_MA.txt +++ b/intl/icu/source/data/locales/fr_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MA{ ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -9,7 +10,6 @@ fr_MA{ } } } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/fr_MC.txt b/intl/icu/source/data/locales/fr_MC.txt index ab996b31d308..2df96d5db43c 100644 --- a/intl/icu/source/data/locales/fr_MC.txt +++ b/intl/icu/source/data/locales/fr_MC.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MC{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_MF.txt b/intl/icu/source/data/locales/fr_MF.txt index f924aec184d8..fcd7183e827d 100644 --- a/intl/icu/source/data/locales/fr_MF.txt +++ b/intl/icu/source/data/locales/fr_MF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_MG.txt b/intl/icu/source/data/locales/fr_MG.txt index ee494602e71e..80ace68b3c67 100644 --- a/intl/icu/source/data/locales/fr_MG.txt +++ b/intl/icu/source/data/locales/fr_MG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_ML.txt b/intl/icu/source/data/locales/fr_ML.txt index c58601486f2e..841867e06b39 100644 --- a/intl/icu/source/data/locales/fr_ML.txt +++ b/intl/icu/source/data/locales/fr_ML.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_ML{ NumberElements{ latn{ @@ -8,7 +9,6 @@ fr_ML{ } } } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/fr_MQ.txt b/intl/icu/source/data/locales/fr_MQ.txt index b5bae136db6c..f2fd46b59868 100644 --- a/intl/icu/source/data/locales/fr_MQ.txt +++ b/intl/icu/source/data/locales/fr_MQ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MQ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_MR.txt b/intl/icu/source/data/locales/fr_MR.txt index fe140b27161c..b513e6e777dd 100644 --- a/intl/icu/source/data/locales/fr_MR.txt +++ b/intl/icu/source/data/locales/fr_MR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MR{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_MR{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_MU.txt b/intl/icu/source/data/locales/fr_MU.txt index 732051dd5d05..66054e77df57 100644 --- a/intl/icu/source/data/locales/fr_MU.txt +++ b/intl/icu/source/data/locales/fr_MU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_MU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_NC.txt b/intl/icu/source/data/locales/fr_NC.txt index 489cabfa48fe..0abc741c6b59 100644 --- a/intl/icu/source/data/locales/fr_NC.txt +++ b/intl/icu/source/data/locales/fr_NC.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_NC{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_NE.txt b/intl/icu/source/data/locales/fr_NE.txt index 78d0201481ee..bfa5788d7ec8 100644 --- a/intl/icu/source/data/locales/fr_NE.txt +++ b/intl/icu/source/data/locales/fr_NE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_NE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_PF.txt b/intl/icu/source/data/locales/fr_PF.txt index 80823860c2f9..1b4ea6b24270 100644 --- a/intl/icu/source/data/locales/fr_PF.txt +++ b/intl/icu/source/data/locales/fr_PF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_PF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_PM.txt b/intl/icu/source/data/locales/fr_PM.txt index 040ce05324e5..6520f695354c 100644 --- a/intl/icu/source/data/locales/fr_PM.txt +++ b/intl/icu/source/data/locales/fr_PM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_PM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_RE.txt b/intl/icu/source/data/locales/fr_RE.txt index ed78b2966a6f..bee69154ebca 100644 --- a/intl/icu/source/data/locales/fr_RE.txt +++ b/intl/icu/source/data/locales/fr_RE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_RE{ NumberElements{ latn{ @@ -8,7 +9,6 @@ fr_RE{ } } } - Version{"37"} calendar{ gregorian{ dayPeriod{ diff --git a/intl/icu/source/data/locales/fr_RW.txt b/intl/icu/source/data/locales/fr_RW.txt index 5c10997e15b2..a7cd3b7f0414 100644 --- a/intl/icu/source/data/locales/fr_RW.txt +++ b/intl/icu/source/data/locales/fr_RW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_RW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_SC.txt b/intl/icu/source/data/locales/fr_SC.txt index 4cd6fd712793..0f410927e5ba 100644 --- a/intl/icu/source/data/locales/fr_SC.txt +++ b/intl/icu/source/data/locales/fr_SC.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_SC{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_SN.txt b/intl/icu/source/data/locales/fr_SN.txt index 68c5c1321294..625cc905f99f 100644 --- a/intl/icu/source/data/locales/fr_SN.txt +++ b/intl/icu/source/data/locales/fr_SN.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_SN{ - Version{"37"} calendar{ gregorian{ dayPeriod{ diff --git a/intl/icu/source/data/locales/fr_SY.txt b/intl/icu/source/data/locales/fr_SY.txt index 822ecfcf3b21..32cb08fa1123 100644 --- a/intl/icu/source/data/locales/fr_SY.txt +++ b/intl/icu/source/data/locales/fr_SY.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_SY{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_SY{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_TD.txt b/intl/icu/source/data/locales/fr_TD.txt index b402e14d7ab2..c387ba424090 100644 --- a/intl/icu/source/data/locales/fr_TD.txt +++ b/intl/icu/source/data/locales/fr_TD.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_TD{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_TD{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_TG.txt b/intl/icu/source/data/locales/fr_TG.txt index 6ee8207d4bf7..a97371aaa3c6 100644 --- a/intl/icu/source/data/locales/fr_TG.txt +++ b/intl/icu/source/data/locales/fr_TG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_TG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_TN.txt b/intl/icu/source/data/locales/fr_TN.txt index e0a695eb051d..a69c62a69074 100644 --- a/intl/icu/source/data/locales/fr_TN.txt +++ b/intl/icu/source/data/locales/fr_TN.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_TN{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_TN{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_VU.txt b/intl/icu/source/data/locales/fr_VU.txt index 206bf0150be3..dca9c90a6529 100644 --- a/intl/icu/source/data/locales/fr_VU.txt +++ b/intl/icu/source/data/locales/fr_VU.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_VU{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,10 +13,10 @@ fr_VU{ "d MMMM y", "d MMM y", "dd/MM/y", + "{1}, {0}", "{1} 'à' {0}", "{1} 'à' {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", "{1} {0}", } } diff --git a/intl/icu/source/data/locales/fr_WF.txt b/intl/icu/source/data/locales/fr_WF.txt index 1fc2c21cfc67..cb800fba493b 100644 --- a/intl/icu/source/data/locales/fr_WF.txt +++ b/intl/icu/source/data/locales/fr_WF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_WF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fr_YT.txt b/intl/icu/source/data/locales/fr_YT.txt index 0bd9b806bd9b..ca364727ad24 100644 --- a/intl/icu/source/data/locales/fr_YT.txt +++ b/intl/icu/source/data/locales/fr_YT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_YT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fur.txt b/intl/icu/source/data/locales/fur.txt index 17701afa6106..d2a2409eb687 100644 --- a/intl/icu/source/data/locales/fur.txt +++ b/intl/icu/source/data/locales/fur.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fur{ 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]"} @@ -27,7 +28,6 @@ fur{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/fur_IT.txt b/intl/icu/source/data/locales/fur_IT.txt index c35b497461b0..b237a8440b0b 100644 --- a/intl/icu/source/data/locales/fur_IT.txt +++ b/intl/icu/source/data/locales/fur_IT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fur_IT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/fy.txt b/intl/icu/source/data/locales/fy.txt index f573c088c203..5cbe7361a88b 100644 --- a/intl/icu/source/data/locales/fy.txt +++ b/intl/icu/source/data/locales/fy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fy{ AuxExemplarCharacters{"[æ ò ù]"} Ellipsis{ @@ -155,7 +156,6 @@ fy{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/fy_NL.txt b/intl/icu/source/data/locales/fy_NL.txt index a13415bfa493..856974e081b8 100644 --- a/intl/icu/source/data/locales/fy_NL.txt +++ b/intl/icu/source/data/locales/fy_NL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fy_NL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ga.txt b/intl/icu/source/data/locales/ga.txt index caef40e2a134..15bed1007a94 100644 --- a/intl/icu/source/data/locales/ga.txt +++ b/intl/icu/source/data/locales/ga.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga{ AuxExemplarCharacters{"[å ḃ ċ ḋ ḟ ġ j k ṁ ṗ q ṡ ṫ v w x y z]"} ExemplarCharacters{"[a á b c d e é f g h i í l m n o ó p r s t u ú]"} @@ -287,10 +288,11 @@ ga{ } } symbols{ + approximatelySign{"≈"} exponential{"E"} group{","} infinity{"∞"} - nan{"NaN"} + nan{"Nuimh"} perMille{"‰"} percentSign{"%"} superscriptingExponent{"×"} @@ -303,17 +305,16 @@ ga{ other{"Glac an {0}ú casadh ar dheis."} } plural{ - few{"{0} chi, {0} cath"} - many{"{0} chi, {0} chath"} - one{"{0} ci, {0} gath"} - other{"{0} ci, {0} cath"} - two{"{0} gi, {0} gath"} + few{"{0} cinn, {0} huaire, {0} chat, {0} éan, {0} bhróg"} + many{"{0} gcinn, {0} n-uaire, {0} gcat, {0} n-éan, {0} mbróg"} + one{"{0} cheann, {0} uair, {0} chat, {0} éan, {0} bhróg"} + other{"{0} ceann, {0} uair, {0} cat, {0} éan, {0} bróg"} + two{"{0} cheann, {0} uair, {0} chat, {0} éan, {0} bhróig"} } } minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -534,6 +535,18 @@ ga{ h{"h:mm – h:mm B"} m{"h:mm – h:mm B"} } + Gy{ + G{"y G – y G"} + y{"y – y G"} + } + GyM{ + G{"MM/y GGGGG – MM/y GGGGG"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } H{ H{"HH – HH"} } @@ -709,11 +722,11 @@ ga{ yQQQ{"QQQ y"} yQQQQ{"QQQQ y"} yw{ - few{"'seachtain' 'a' w 'i' Y"} - many{"'seachtain' 'a' w 'i' Y"} - one{"'seachtain' 'a' w 'i' Y"} - other{"'seachtain' 'a' w 'i' Y"} - two{"'seachtain' 'a' w 'i' Y"} + few{"'seachtain' 'a' w 'in' Y"} + many{"'seachtain' 'a' w 'in' Y"} + one{"'seachtain' 'a' w 'in' Y"} + other{"'seachtain' 'a' w 'in' Y"} + two{"'seachtain' 'a' w 'in' Y"} } } dayNames{ @@ -1099,9 +1112,9 @@ ga{ food_drink{"Bia agus Deoch"} format{"Formáid"} format_whitespace{"Formáid agus Spás Bán"} - full_width_form_variant{"athraitheach leithid iomláin"} + full_width_form_variant{"leagan lánleithid"} geometric_shapes{"Cruthanna Geoiméadracha"} - half_width_form_variant{"athraitheach leathleithid"} + half_width_form_variant{"leagan leathleithid"} han_characters{"Carachtair Han"} han_radicals{"Fréamhacha Han"} hanja{"Hanaí"} @@ -1139,7 +1152,7 @@ ga{ punctuation{"Poncaíocht"} rightwards_arrows{"Saighead Dheas"} sign_standard_symbols{"Comharthaí/Siombailí Coitianta"} - small_form_variant{"athraithigh bheaga"} + small_form_variant{"leaganacha beaga"} smiley{"straoiseog"} smileys_people{"Straoiseoga nó Daoine"} south_asian_scripts{"Scripteanna na hÁise Theas"} @@ -1151,7 +1164,7 @@ ga{ tone_marks{"Comharthaí Toin"} travel{"taisteal"} travel_places{"Taisteal nó Áiteanna"} - upwards_arrows{"Saighead suas"} + upwards_arrows{"saigheada suas"} variant_forms{"Foirmeacha Malartacha"} vocalic_jamo{"Seamó Guthach"} weather{"aimsir"} @@ -1340,14 +1353,14 @@ ga{ } relativeTime{ future{ - few{"i gceann {0} huaire an chloig"} + few{"i gceann {0} uair an chloig"} many{"i gceann {0} n-uaire an chloig"} one{"i gceann {0} uair an chloig"} other{"i gceann {0} uair an chloig"} two{"i gceann {0} uair an chloig"} } past{ - few{"{0} huaire an chloig ó shin"} + few{"{0} uair an chloig ó shin"} many{"{0} n-uaire an chloig ó shin"} one{"{0} uair an chloig ó shin"} other{"{0} uair an chloig ó shin"} @@ -2195,7 +2208,7 @@ ga{ dn{"Bliain"} relative{ "-1"{"anuraidh"} - "0"{"an bhliain seo"} + "0"{"i mbliana"} "1"{"an bhliain seo chugainn"} } relativeTime{ @@ -2219,7 +2232,7 @@ ga{ dn{"bl."} relative{ "-1"{"anuraidh"} - "0"{"an bhl. seo"} + "0"{"i mbl."} "1"{"an bhl. seo chugainn"} } relativeTime{ @@ -2243,7 +2256,7 @@ ga{ dn{"bl."} relative{ "-1"{"anuraidh"} - "0"{"an bhl. seo"} + "0"{"i mbl."} "1"{"an bhl. seo chugainn"} } relativeTime{ @@ -2280,9 +2293,15 @@ ga{ middle{"{0}, {1}"} start{"{0}, {1}"} } + or-narrow{ + end{"{0} nó {1}"} + } + or-short{ + end{"{0} nó {1}"} + } standard{ 2{"{0} agus {1}"} - end{"{0}, agus {1}"} + end{"{0} agus {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } @@ -2294,13 +2313,13 @@ ga{ } standard-short{ 2{"{0} agus {1}"} - end{"{0}, agus {1}"} + end{"{0} agus {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } unit{ 2{"{0} agus {1}"} - end{"{0}, agus {1}"} + end{"{0} agus {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } diff --git a/intl/icu/source/data/locales/ga_GB.txt b/intl/icu/source/data/locales/ga_GB.txt index a69b26b9801d..5b6dcaa9edb1 100644 --- a/intl/icu/source/data/locales/ga_GB.txt +++ b/intl/icu/source/data/locales/ga_GB.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga_GB{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ga_IE.txt b/intl/icu/source/data/locales/ga_IE.txt index 0e5c282eddbc..ca70f289b0c9 100644 --- a/intl/icu/source/data/locales/ga_IE.txt +++ b/intl/icu/source/data/locales/ga_IE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga_IE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gd.txt b/intl/icu/source/data/locales/gd.txt index 1d993b4906ed..25673966d046 100644 --- a/intl/icu/source/data/locales/gd.txt +++ b/intl/icu/source/data/locales/gd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gd{ AuxExemplarCharacters{ "[á ă â å ä ã ā æ ċ ç ḋ é ĕ ê ë ē ḟ ġ í ĭ î ï ī ı j k ł ṁ ñ ó ŏ ô ö ø ō œ ṗ q" @@ -22,8 +23,26 @@ gd{ } MoreInformation{"?"} NumberElements{ + adlm{ + symbols{ + approximatelySign{"~"} + decimal{"."} + exponential{"E"} + group{","} + infinity{"∞"} + list{";"} + minusSign{"-"} + nan{"NaN"} + perMille{"‰"} + percentSign{"%"} + plusSign{"+"} + superscriptingExponent{"×"} + timeSeparator{":"} + } + } arab{ symbols{ + approximatelySign{"~"} decimal{"٫"} exponential{"اس"} group{"٬"} @@ -40,6 +59,7 @@ gd{ } arabext{ symbols{ + approximatelySign{"~"} decimal{"٫"} exponential{"×۱۰^"} group{"٬"} @@ -56,6 +76,7 @@ gd{ } bali{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -72,6 +93,7 @@ gd{ } beng{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -88,6 +110,7 @@ gd{ } brah{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -104,6 +127,7 @@ gd{ } cakm{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -120,6 +144,7 @@ gd{ } cham{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -137,6 +162,7 @@ gd{ default{"latn"} deva{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -316,6 +342,7 @@ gd{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -332,6 +359,7 @@ gd{ } gong{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -348,6 +376,7 @@ gd{ } gonm{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -364,6 +393,7 @@ gd{ } gujr{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -380,6 +410,7 @@ gd{ } guru{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -396,6 +427,7 @@ gd{ } hanidec{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -412,6 +444,7 @@ gd{ } java{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -428,6 +461,7 @@ gd{ } kali{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -444,6 +478,7 @@ gd{ } khmr{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -460,6 +495,7 @@ gd{ } knda{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -476,6 +512,7 @@ gd{ } lana{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -492,6 +529,7 @@ gd{ } lanatham{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -508,6 +546,7 @@ gd{ } laoo{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -779,6 +818,7 @@ gd{ } lepc{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -795,6 +835,7 @@ gd{ } limb{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -820,6 +861,7 @@ gd{ minimumGroupingDigits{"1"} mlym{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -836,6 +878,7 @@ gd{ } mong{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -852,6 +895,7 @@ gd{ } mtei{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -868,6 +912,7 @@ gd{ } mymr{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -884,6 +929,7 @@ gd{ } mymrshan{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -901,6 +947,7 @@ gd{ native{"latn"} nkoo{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -917,6 +964,7 @@ gd{ } olck{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -933,6 +981,7 @@ gd{ } orya{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -949,6 +998,7 @@ gd{ } osma{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -965,6 +1015,7 @@ gd{ } rohg{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -981,6 +1032,7 @@ gd{ } saur{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -997,6 +1049,7 @@ gd{ } shrd{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1013,6 +1066,7 @@ gd{ } sora{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1029,6 +1083,7 @@ gd{ } sund{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1045,6 +1100,7 @@ gd{ } takr{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1061,6 +1117,7 @@ gd{ } talu{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1077,6 +1134,7 @@ gd{ } tamldec{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1093,6 +1151,7 @@ gd{ } telu{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1109,6 +1168,7 @@ gd{ } thai{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1125,6 +1185,7 @@ gd{ } tibt{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1141,6 +1202,7 @@ gd{ } vaii{ symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -1156,7 +1218,6 @@ gd{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -3077,10 +3138,10 @@ gd{ two{"an ceann {0} DhihAoine"} } past{ - few{"o chionn {0} DihAoine"} - one{"o chionn {0} DihAoine"} - other{"o chionn {0} DihAoine"} - two{"o chionn {0} DhihAoine"} + few{"{0} DihAoine air ais"} + one{"{0} DihAoine air ais"} + other{"{0} DihAoine air ais"} + two{"{0} DhihAoine air ais"} } } } @@ -3119,10 +3180,10 @@ gd{ two{"an ceann {0} Dhih."} } past{ - few{"o chionn {0} Dih."} - one{"o chionn {0} Dih."} - other{"o chionn {0} Dih."} - two{"o chionn {0} Dhih."} + few{"{0} Dih. air ais"} + one{"{0} Dih. air ais"} + other{"{0} Dih. air ais"} + two{"{0} Dhih. air ais"} } } } @@ -3260,10 +3321,10 @@ gd{ two{"an ceann {0} DhiLuain"} } past{ - few{"o chionn {0} DiLuain"} - one{"o chionn {0} DiLuain"} - other{"o chionn {0} DiLuain"} - two{"o chionn {0} DhiLuain"} + few{"{0} DiLuain air ais"} + one{"{0} DiLuain air ais"} + other{"{0} DiLuain air ais"} + two{"{0} DhiLuain air ais"} } } } @@ -3302,10 +3363,10 @@ gd{ two{"an ceann {0} DhiL."} } past{ - few{"o chionn {0} DiL."} - one{"o chionn {0} DiL."} - other{"o chionn {0} DiL."} - two{"o chionn {0} DhiL."} + few{"{0} DiL. air ais"} + one{"{0} DiL. air ais"} + other{"{0} DiL. air ais"} + two{"{0} DhiL. air ais"} } } } @@ -3390,10 +3451,10 @@ gd{ two{"an ceann {0} chairteil"} } past{ - few{"o chionn {0} cairtealan"} - one{"o chionn {0} chairteil"} - other{"o chionn {0} cairteil"} - two{"o chionn {0} chairteil"} + few{"{0} cairtealan air ais"} + one{"{0} chairteal air ais"} + other{"{0} cairteal air ais"} + two{"{0} chairteal air ais"} } } } @@ -3455,10 +3516,10 @@ gd{ two{"an ceann {0} DhiSathairne"} } past{ - few{"o chionn {0} DiSathairne"} - one{"o chionn {0} DiSathairne"} - other{"o chionn {0} DiSathairne"} - two{"o chionn {0} DhiSathairne"} + few{"{0} DiSathairne air ais"} + one{"{0} DiSathairne air ais"} + other{"{0} DiSathairne air ais"} + two{"{0} DhiSathairne air ais"} } } } @@ -3497,10 +3558,10 @@ gd{ two{"an ceann {0} DhiS."} } past{ - few{"o chionn {0} DiS."} - one{"o chionn {0} DiS."} - other{"o chionn {0} DiS."} - two{"o chionn {0} DhiS."} + few{"{0} DiS. air ais"} + one{"{0} DiS. air ais"} + other{"{0} DiS. air ais"} + two{"{0} DhiS. air ais"} } } } @@ -3578,10 +3639,10 @@ gd{ two{"an ceann {0} DhiDòmhnaich"} } past{ - few{"o chionn {0} DiDòmhnaich"} - one{"o chionn {0} DiDòmhnaich"} - other{"o chionn {0} DiDòmhnaich"} - two{"o chionn {0} DhiDòmhnaich"} + few{"{0} DiDòmhnaich air ais"} + one{"{0} DiDòmhnaich air ais"} + other{"{0} DiDòmhnaich air ais"} + two{"{0} DhiDòmhnaich air ais"} } } } @@ -3620,10 +3681,10 @@ gd{ two{"an ceann {0} DhiD."} } past{ - few{"o chionn {0} DiDòmhnaich"} - one{"o chionn {0} DiD."} - other{"o chionn {0} DiDòmhnaich"} - two{"o chionn {0} DhiD."} + few{"{0} DiD. air ais"} + one{"{0} DiD. air ais"} + other{"{0} DiD. air ais"} + two{"{0} DhiD. air ais"} } } } @@ -3641,10 +3702,10 @@ gd{ two{"an ceann {0} DhiarDaoin"} } past{ - few{"o chionn {0} DiarDaoin"} - one{"o chionn {0} DiarDaoin"} - other{"o chionn {0} DiarDaoin"} - two{"o chionn {0} DhiarDaoin"} + few{"{0} DiarDaoin air ais"} + one{"{0} DiarDaoin air ais"} + other{"{0} DiarDaoin air ais"} + two{"{0} DhiarDaoin air ais"} } } } @@ -3683,10 +3744,10 @@ gd{ two{"an ceann {0} Dhia."} } past{ - few{"o chionn {0} Dia."} - one{"o chionn {0} Dia."} - other{"o chionn {0} Dia."} - two{"o chionn {0} Dhia."} + few{"{0} Dia. air ais"} + one{"{0} Dia. air ais"} + other{"{0} Dia. air ais"} + two{"{0} Dhia. air ais"} } } } @@ -3704,10 +3765,10 @@ gd{ two{"an ceann {0} DhiMàirt"} } past{ - few{"o chionn {0} DiMàirt"} - one{"o chionn {0} DiMàirt"} - other{"o chionn {0} DiMàirt"} - two{"o chionn {0} DhiMàirt"} + few{"{0} DiMàirt air ais"} + one{"{0} DiMàirt air ais"} + other{"{0} DiMàirt air ais"} + two{"{0} DhiMàirt air ais"} } } } @@ -3746,10 +3807,10 @@ gd{ two{"an ceann {0} DhiM."} } past{ - few{"o chionn {0} DiM."} - one{"o chionn {0} DiM."} - other{"o chionn {0} DiM."} - two{"o chionn {0} DhiM."} + few{"{0} DiM. air ais"} + one{"{0} DiM. air ais"} + other{"{0} DiM. air ais"} + two{"{0} DhiM. air ais"} } } } @@ -3767,10 +3828,10 @@ gd{ two{"an ceann {0} DhiCiadain"} } past{ - few{"o chionn {0} DiCiadain"} - one{"o chionn {0} DiCiadain"} - other{"o chionn {0} DiCiadain"} - two{"o chionn {0} DhiCiadain"} + few{"{0} DiCiadain air ais"} + one{"{0} DiCiadain air ais"} + other{"{0} DiCiadain air ais"} + two{"{0} DhiCiadain air ais"} } } } @@ -3809,10 +3870,10 @@ gd{ two{"an ceann {0} DhiC."} } past{ - few{"o chionn {0} DiC."} - one{"o chionn {0} DiC."} - other{"o chionn {0} DiC."} - two{"o chionn {0} DhiC."} + few{"{0} DiC. air ais"} + one{"{0} DiC. air ais"} + other{"{0} DiC. air ais"} + two{"{0} DhiC. air ais"} } } } diff --git a/intl/icu/source/data/locales/gd_GB.txt b/intl/icu/source/data/locales/gd_GB.txt index 856216f920cd..ad5f2d8b3bbb 100644 --- a/intl/icu/source/data/locales/gd_GB.txt +++ b/intl/icu/source/data/locales/gd_GB.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gd_GB{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gl.txt b/intl/icu/source/data/locales/gl.txt index 82b6cea91e7b..3c0f728b4fe3 100644 --- a/intl/icu/source/data/locales/gl.txt +++ b/intl/icu/source/data/locales/gl.txt @@ -1,7 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gl{ - AuxExemplarCharacters{"[ª à â å ä ã ç è ê ë ì î ï º ò ô ö õ ù û]"} + AuxExemplarCharacters{"[ª à ă â å ä ã ā æ ɑ ç è ĕ ê ë ē ì ĭ î ī º ò ŏ ô ö õ ø ō œ ù ŭ û ū]"} Ellipsis{ final{"{0}…"} initial{"…{0}"} @@ -10,12 +11,12 @@ gl{ word-initial{"…{0}"} word-medial{"{0}… {1}"} } - 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]"} + 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]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{ - "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " - "′ ″]" + "[\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … ' ‘ ’ \u0022 “ ” « » ( ) \\[ \\] § @ * / " + "\\\\ \\& # † ‡ ′ ″]" } MoreInformation{"?"} NumberElements{ @@ -61,16 +62,16 @@ gl{ other{"000 millóns"} } 1000000000{ - one{"0"} - other{"0"} + one{"0000 millóns"} + other{"0000 millóns"} } 10000000000{ - one{"0"} - other{"0"} + one{"00000 millóns"} + other{"00000 millóns"} } 100000000000{ - one{"0"} - other{"0"} + one{"000000 millóns"} + other{"000000 millóns"} } 1000000000000{ one{"0 billón"} @@ -89,16 +90,16 @@ gl{ patternsShort{ currencyFormat{ 1000{ - one{"0 ¤"} - other{"0 ¤"} + one{"0"} + other{"0"} } 10000{ - one{"0 ¤"} - other{"0 ¤"} + one{"0"} + other{"0"} } 100000{ - one{"0 ¤"} - other{"0 ¤"} + one{"0"} + other{"0"} } 1000000{ one{"0 M¤"} @@ -113,16 +114,16 @@ gl{ other{"000 M¤"} } 1000000000{ - one{"0 ¤"} - other{"0 ¤"} + one{"0000 M¤"} + other{"0000 M¤"} } 10000000000{ - one{"0 ¤"} - other{"0 ¤"} + one{"00000 M¤"} + other{"00000 M¤"} } 100000000000{ - one{"0 ¤"} - other{"0 ¤"} + one{"00000 M¤"} + other{"00000 M¤"} } 1000000000000{ one{"0 B¤"} @@ -163,16 +164,16 @@ gl{ other{"000 M"} } 1000000000{ - one{"0"} - other{"0"} + one{"0000 M"} + other{"0000 M"} } 10000000000{ - one{"0"} - other{"0"} + one{"00000 M"} + other{"00000 M"} } 100000000000{ - one{"0"} - other{"0"} + one{"000000 M"} + other{"000000 M"} } 1000000000000{ one{"0 B"} @@ -189,6 +190,7 @@ gl{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{"."} @@ -215,7 +217,6 @@ gl{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/gl_ES.txt b/intl/icu/source/data/locales/gl_ES.txt index 1e2f992bd81f..d1afa19bdb95 100644 --- a/intl/icu/source/data/locales/gl_ES.txt +++ b/intl/icu/source/data/locales/gl_ES.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gl_ES{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gsw.txt b/intl/icu/source/data/locales/gsw.txt index 1cf1665a3823..ae57c1725e07 100644 --- a/intl/icu/source/data/locales/gsw.txt +++ b/intl/icu/source/data/locales/gsw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw{ 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]"} @@ -180,7 +181,6 @@ gsw{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/gsw_CH.txt b/intl/icu/source/data/locales/gsw_CH.txt index 6af0cc6f9939..356235e96b10 100644 --- a/intl/icu/source/data/locales/gsw_CH.txt +++ b/intl/icu/source/data/locales/gsw_CH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw_CH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gsw_FR.txt b/intl/icu/source/data/locales/gsw_FR.txt index f7e0a78d85de..32fc1855bb7d 100644 --- a/intl/icu/source/data/locales/gsw_FR.txt +++ b/intl/icu/source/data/locales/gsw_FR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw_FR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gsw_LI.txt b/intl/icu/source/data/locales/gsw_LI.txt index 6fa128d63358..eb879eb4d073 100644 --- a/intl/icu/source/data/locales/gsw_LI.txt +++ b/intl/icu/source/data/locales/gsw_LI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw_LI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gu.txt b/intl/icu/source/data/locales/gu.txt index 8ecd4cc6f197..fca753370967 100644 --- a/intl/icu/source/data/locales/gu.txt +++ b/intl/icu/source/data/locales/gu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gu{ AuxExemplarCharacters{"[\u200C\u200D ૰]"} Ellipsis{ @@ -252,7 +253,6 @@ gu{ minimumGroupingDigits{"1"} native{"gujr"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -2585,12 +2585,6 @@ gu{ metric{"મેટ્રિક"} } parse{ - date{ - lenient{ - "[\\--/]", - "[\\:∶]", - } - } general{ lenient{ "[.․。︒﹒.。]", @@ -2598,22 +2592,11 @@ gu{ "[%٪﹪%]", "[؉‰]", "[\$﹩$$]", - "[£₤]", + "[£₤£]", "[¥¥]", "[₩₩]", "[₨₹{Rp}{Rs}]", } } - number{ - lenient{ - "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", - "[+⁺₊➕﬩﹢+]", - } - stricter{ - "[,٫︐﹐,]", - "[.․﹒.。]", - } - } } } diff --git a/intl/icu/source/data/locales/gu_IN.txt b/intl/icu/source/data/locales/gu_IN.txt index 7ad13984ab6d..4ed21472166c 100644 --- a/intl/icu/source/data/locales/gu_IN.txt +++ b/intl/icu/source/data/locales/gu_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gu_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/guz.txt b/intl/icu/source/data/locales/guz.txt index 902c56b91d9c..cf017586dfbe 100644 --- a/intl/icu/source/data/locales/guz.txt +++ b/intl/icu/source/data/locales/guz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml guz{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -12,7 +13,6 @@ guz{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/guz_KE.txt b/intl/icu/source/data/locales/guz_KE.txt index 0637fccadde6..73ed9862fa10 100644 --- a/intl/icu/source/data/locales/guz_KE.txt +++ b/intl/icu/source/data/locales/guz_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml guz_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/gv.txt b/intl/icu/source/data/locales/gv.txt index df96dcc291dc..4aafea48e564 100644 --- a/intl/icu/source/data/locales/gv.txt +++ b/intl/icu/source/data/locales/gv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gv{ 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]"} @@ -23,7 +24,6 @@ gv{ } } } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/gv_IM.txt b/intl/icu/source/data/locales/gv_IM.txt index b02085f014ee..baee652ff1f2 100644 --- a/intl/icu/source/data/locales/gv_IM.txt +++ b/intl/icu/source/data/locales/gv_IM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gv_IM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ha.txt b/intl/icu/source/data/locales/ha.txt index 2ee120891738..08b52e33aa76 100644 --- a/intl/icu/source/data/locales/ha.txt +++ b/intl/icu/source/data/locales/ha.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha{ AuxExemplarCharacters{"[á à â é è ê í ì î ó ò ô p q {r\u0303} ú ù û v x]"} ExemplarCharacters{"[a b ɓ c d ɗ e f g h i j k ƙ l m n o r s {sh} t {ts} u w y ƴ z ʼ]"} @@ -7,6 +8,9 @@ ha{ ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} ′ ″]"} NumberElements{ latn{ + miscPatterns{ + atLeast{"{0}+"} + } patternsLong{ decimalFormat{ 1000{ @@ -162,8 +166,13 @@ ha{ } } } + minimalPairs{ + plural{ + one{"rana {0}"} + other{"ranaku {0}"} + } + } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -175,11 +184,11 @@ ha{ "d MMMM, y G", "d MMM, y G", "d/M/yy GGGGG", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{0}, {1}", + "{0} 'da' {1}", + "{0} 'da' {1}", + "{0}, {1}", + "{0}, {1}", } availableFormats{ MEd{"E, M/d"} @@ -202,8 +211,8 @@ ha{ "Yamma", } AmPmMarkersAbbr{ - "AM", - "PM", + "SF", + "YM", } DateTimePatterns{ "HH:mm:ss zzzz", @@ -214,11 +223,11 @@ ha{ "d MMMM, y", "d MMM, y", "d/M/yy", + "{1}, {0}", "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1} 'da' {0}", + "{1}, {0}", + "{1}, {0}", } availableFormats{ Ed{"E, d"} @@ -229,6 +238,10 @@ ha{ MMM{"LLL"} MMMEd{"E, MMM d"} MMMMEd{"E, MMMM d"} + MMMMW{ + one{"'satin' W 'cikin' MMMM"} + other{"'satin' W 'cikin' MMMM"} + } MMMMd{"MMMM d"} MMMd{"MMM d"} Md{"M/d"} @@ -246,6 +259,10 @@ ha{ yMd{"y-MM-dd"} yQQQ{"QQQ y"} yQQQQ{"QQQQ y"} + yw{ + one{"'sati' w 'cikin' Y"} + other{"'sati' w 'cikin' Y"} + } } dayNames{ format{ @@ -328,16 +345,16 @@ ha{ dayPeriod{ stand-alone{ abbreviated{ - am{"AM"} - pm{"PM"} + am{"SF"} + pm{"YM"} } narrow{ - am{"AM"} - pm{"PM"} + am{"SF"} + pm{"YM"} } wide{ - am{"AM"} - pm{"PM"} + am{"SF"} + pm{"YM"} } } } @@ -356,7 +373,7 @@ ha{ } wide%variant{ "K.H.Y", - "sananne Zamani", + "Sanannen Zamani", } } intervalFormats{ @@ -537,12 +554,48 @@ ha{ } fields{ day{ - dn{"Kwana"} + dn{"kwana"} relative{ "-1"{"jiya"} "0"{"yau"} "1"{"gobe"} } + relativeTime{ + future{ + one{"a cikin rana {0}"} + other{"a cikin kwanaki {0}"} + } + past{ + one{"rana da ya gabata {0}"} + other{"kwanaki da suka gabata {0}"} + } + } + } + day-narrow{ + dn{"kwana"} + relativeTime{ + future{ + one{"a cikin rana {0}"} + other{"a cikin kwanaki {0}"} + } + past{ + one{"rana da ya gabata {0}"} + other{"kwanaki da suka gabata {0}"} + } + } + } + day-short{ + dn{"kwana"} + relativeTime{ + future{ + one{"a cikin rana {0}"} + other{"a cikin kwanaki {0}"} + } + past{ + one{"rana da ya gabata {0}"} + other{"kwanaki da suka gabata {0}"} + } + } } dayOfYear{ dn{"Kwanan Shekara"} @@ -554,10 +607,10 @@ ha{ dn{"Kwanan Shekara"} } dayperiod{ - dn{"Lokuttan rana"} + dn{"SF/YM"} } era{ - dn{"Zamani"} + dn{"zamani"} } fri{ relative{ @@ -611,7 +664,7 @@ ha{ } } hour{ - dn{"Awa"} + dn{"awa"} relative{ "0"{"wannan awa"} } @@ -627,6 +680,7 @@ ha{ } } hour-narrow{ + dn{"awa"} relativeTime{ future{ one{"cikin {0} awa"} @@ -639,6 +693,7 @@ ha{ } } hour-short{ + dn{"awa"} relativeTime{ future{ one{"cikin {0} awa"} @@ -651,7 +706,7 @@ ha{ } } minute{ - dn{"Minti"} + dn{"minti"} relative{ "0"{"wannan mintin"} } @@ -667,6 +722,7 @@ ha{ } } minute-narrow{ + dn{"minti"} relativeTime{ future{ one{"cikin {0} minti"} @@ -679,6 +735,7 @@ ha{ } } minute-short{ + dn{"minti"} relativeTime{ future{ one{"cikin {0} minti"} @@ -742,34 +799,102 @@ ha{ } } month{ - dn{"Wata"} + dn{"wata"} relative{ - "-1"{"watan daya gabata"} + "-1"{"watan da ya gabata"} "0"{"wannan watan"} "1"{"wata na gaba"} } + relativeTime{ + future{ + one{"a cikin watan {0}"} + other{"a cikin watanni {0}"} + } + past{ + one{"watan da ya gabata"} + other{"watanni da suka gabata {0}}"} + } + } } month-narrow{ + dn{"wata"} relative{ "-1"{"watan da ya gabata"} "0"{"wannan watan"} "1"{"wata na gaba"} } + relativeTime{ + future{ + one{"a cikin watan {0}"} + other{"a cikin watan {0}"} + } + past{ + one{"watan da ya gabata {0}"} + other{"watan da ya gabata {0}"} + } + } } month-short{ + dn{"wata"} relative{ "-1"{"watan da ya gabata"} "0"{"wannan watan"} "1"{"wata na gaba"} } + relativeTime{ + future{ + one{"a cikin watan {0}"} + other{"a cikin watan {0}"} + } + past{ + one{"watan da ya gabata"} + other{"watan da ya gabata {0}"} + } + } } quarter{ - dn{"Kwata"} + dn{"kwata"} relative{ "-1"{"kwatan karshe"} "0"{"wannan kwatan"} "1"{"kwata na gaba"} } + relativeTime{ + future{ + one{"a cikin kwata {0}"} + other{"a cikin kwatas {0}"} + } + past{ + one{"kwata da suka gabata {0}"} + other{"kwatas da suka gabata {0}"} + } + } + } + quarter-narrow{ + dn{"kwata"} + relativeTime{ + future{ + one{"a cikin kwata {0}"} + other{"a cikin kwatas {0}"} + } + past{ + one{"kwata da suka gabata {0}"} + other{"kwatas da suka gabata {0}"} + } + } + } + quarter-short{ + dn{"kwata"} + relativeTime{ + future{ + one{"a cikin kwata {0}"} + other{"a cikin kwatas {0}"} + } + past{ + one{"kwata da suka gabata {0}"} + other{"kwatas da suka gabata {0}"} + } + } } sat{ relative{ @@ -823,7 +948,7 @@ ha{ } } second{ - dn{"Daƙiƙa"} + dn{"daƙiƙa"} relative{ "0"{"yanzu"} } @@ -1067,27 +1192,61 @@ ha{ } } week{ - dn{"Mako"} - relative{ - "-1"{"satin da ya gabata"} - "0"{"wannan satin"} - "1"{"sati na gaba"} - } - } - week-narrow{ + dn{"mako"} relative{ "-1"{"satin da ya gabata"} "0"{"wannan satin"} "1"{"sati na gaba"} } relativePeriod{"sati na {0}"} + relativeTime{ + future{ + one{"a cikin mako {0}"} + other{"a cikin makonni {0}"} + } + past{ + one{"mako da ya gabata {0}"} + other{"makonni da suka gabata {0}"} + } + } } - week-short{ + week-narrow{ + dn{"mako"} relative{ "-1"{"satin da ya gabata"} "0"{"wannan satin"} "1"{"sati na gaba"} } + relativePeriod{"sati na {0}"} + relativeTime{ + future{ + one{"a cikin mako {0}"} + other{"a cikin mako {0}"} + } + past{ + one{"mako da suka gabata {0}"} + other{"mako da ya gabata {0}"} + } + } + } + week-short{ + dn{"mako"} + relative{ + "-1"{"satin da ya gabata"} + "0"{"wannan satin"} + "1"{"sati na gaba"} + } + relativePeriod{"sati na {0}"} + relativeTime{ + future{ + one{"a cikin mako {0}"} + other{"a cikin mako {0}"} + } + past{ + one{"mako da ya gabata {0}"} + other{"mako da ya gabata {0}"} + } + } } weekOfMonth{ dn{"Makon Wata"} @@ -1099,7 +1258,7 @@ ha{ dn{"Makon Wata"} } weekday{ - dn{"Rana mako"} + dn{"ranar mako"} } weekdayOfMonth{ dn{"Ranar Aikin Wata"} @@ -1111,26 +1270,50 @@ ha{ dn{"Ranar Aikin Wata"} } year{ - dn{"Shekara"} + dn{"shekara"} relative{ "-1"{"bara"} "0"{"bana"} "1"{"badi"} } + relativeTime{ + future{ + one{"a shekarar {0}"} + other{"a shekaru {0}"} + } + past{ + one{"shekara da suka gabata {0}"} + other{"shekara da suka gabata {0}"} + } + } } year-narrow{ + dn{"shekara"} relative{ "-1"{"bara"} "0"{"bana"} "1"{"badi"} } + relativeTime{ + past{ + one{"shekara da suka gabata {0}"} + other{"shekara da suka gabata {0}"} + } + } } year-short{ + dn{"shekara"} relative{ "-1"{"bara"} "0"{"bana"} "1"{"badi"} } + relativeTime{ + past{ + one{"shekara da suka gabata {0}"} + other{"shekara da suka gabata {0}"} + } + } } zone{ dn{"Lokacin yanki"} @@ -1151,7 +1334,7 @@ ha{ } standard{ 2{"{0} da {1}"} - end{"{0} da {1}"} + end{"{0}, da {1}"} } unit{ 2{"{0}, {1}"} diff --git a/intl/icu/source/data/locales/ha_GH.txt b/intl/icu/source/data/locales/ha_GH.txt index 8aab6ade81df..5d5392305431 100644 --- a/intl/icu/source/data/locales/ha_GH.txt +++ b/intl/icu/source/data/locales/ha_GH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha_GH{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ @@ -13,11 +13,11 @@ ha_GH{ "d MMMM, y", "d MMM, y", "d/M/yy", + "{1}, {0}", "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1} 'da' {0}", + "{1}, {0}", + "{1}, {0}", } } } diff --git a/intl/icu/source/data/locales/ha_NE.txt b/intl/icu/source/data/locales/ha_NE.txt index ab3ebc21e893..3010a5cd7457 100644 --- a/intl/icu/source/data/locales/ha_NE.txt +++ b/intl/icu/source/data/locales/ha_NE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha_NE{ AuxExemplarCharacters{"[á à â é è ê í ì î ó ò ô p q {r\u0303} ú ù û v x {ʼy}]"} 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]"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/ha_NG.txt b/intl/icu/source/data/locales/ha_NG.txt index 5a15deef460c..13b863e91366 100644 --- a/intl/icu/source/data/locales/ha_NG.txt +++ b/intl/icu/source/data/locales/ha_NG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha_NG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/haw.txt b/intl/icu/source/data/locales/haw.txt index bfac6e11a4f1..25fcc39337b3 100644 --- a/intl/icu/source/data/locales/haw.txt +++ b/intl/icu/source/data/locales/haw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml haw{ AuxExemplarCharacters{"[b c d f g j q r s t v x y z]"} ExemplarCharacters{"[a ā e ē i ī o ō u ū h k l m n p w ʻ]"} @@ -32,7 +33,6 @@ haw{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/haw_US.txt b/intl/icu/source/data/locales/haw_US.txt index d6450d874b1c..f1cc6a4dc042 100644 --- a/intl/icu/source/data/locales/haw_US.txt +++ b/intl/icu/source/data/locales/haw_US.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml haw_US{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/he.txt b/intl/icu/source/data/locales/he.txt index e726fa0ba6d1..07527125483a 100644 --- a/intl/icu/source/data/locales/he.txt +++ b/intl/icu/source/data/locales/he.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he{ AuxExemplarCharacters{ "[\u05BD\u05C4\u200E\u200F \u05B0 \u05B1 \u05B2 \u05B3 \u05B4 \u05B5 \u05B6 " @@ -124,150 +125,150 @@ he{ patternsShort{ currencyFormat{ 1000{ - many{"¤0K"} - one{"¤ 0K"} - other{"¤ 0K"} - two{"¤ 0K"} + many{"¤0K‏"} + one{"¤0K‏"} + other{"¤0K‏"} + two{"¤0K‏"} } 10000{ - many{"¤00K"} - one{"¤00K"} - other{"¤ 00K"} - two{"¤00K"} + many{"¤00K‏"} + one{"¤00K‏"} + other{"¤00K‏"} + two{"¤00K‏"} } 100000{ - many{"¤000K"} - one{"¤000K"} - other{"¤000K"} - two{"¤000K"} + many{"¤000K‏"} + one{"¤000K‏"} + other{"¤000K‏"} + two{"¤000K‏"} } 1000000{ - many{"¤0M"} - one{"¤0M"} - other{"¤0M"} - two{"¤0M"} + many{"¤0M‏"} + one{"¤0M‏"} + other{"¤0M‏"} + two{"¤0M‏"} } 10000000{ - many{"¤00M"} - one{"¤00M"} - other{"¤00M"} - two{"¤00M"} + many{"¤00M‏"} + one{"¤00M‏"} + other{"¤00M‏"} + two{"¤00M‏"} } 100000000{ - many{"¤000M"} - one{"¤000M"} - other{"¤000M"} - two{"¤000M"} + many{"¤000M‏"} + one{"¤000M‏"} + other{"¤000M‏"} + two{"¤000M‏"} } 1000000000{ - many{"¤0B"} - one{"¤0B"} - other{"¤0B"} - two{"¤0B"} + many{"¤0B‏"} + one{"¤0B‏"} + other{"¤0B‏"} + two{"¤0B‏"} } 10000000000{ - many{"¤00B"} - one{"¤00B"} - other{"¤00B"} - two{"¤00B"} + many{"¤00B‏"} + one{"¤00B‏"} + other{"¤00B‏"} + two{"¤00B‏"} } 100000000000{ - many{"¤000B"} - one{"¤000B"} - other{"¤000B"} - two{"¤000B"} + many{"¤000B‏"} + one{"¤000B‏"} + other{"¤000B‏"} + two{"¤000B‏"} } 1000000000000{ - many{"¤0T"} - one{"¤0T"} - other{"¤0T"} - two{"¤0T"} + many{"¤0T‏"} + one{"¤0T‏"} + other{"¤0T‏"} + two{"¤0T‏"} } 10000000000000{ - many{"¤00T"} - one{"¤00T"} - other{"¤00T"} - two{"¤00T"} + many{"¤00T‏"} + one{"¤00T‏"} + other{"¤00T‏"} + two{"¤00T‏"} } 100000000000000{ - many{"¤000T"} - one{"¤000T"} - other{"¤000T"} - two{"¤000T"} + many{"¤000T‏"} + one{"¤000T‏"} + other{"¤000T‏"} + two{"¤000T‏"} } } decimalFormat{ 1000{ - many{"0K"} - one{"0K"} - other{"0K"} - two{"0K"} + many{"0K‏"} + one{"0K‏"} + other{"0K‏"} + two{"0K‏"} } 10000{ - many{"00K"} - one{"00K"} - other{"00K"} - two{"00K"} + many{"00K‏"} + one{"00K‏"} + other{"00K‏"} + two{"00K‏"} } 100000{ - many{"000K"} - one{"000K"} - other{"000K"} - two{"000K"} + many{"000K‏"} + one{"000K‏"} + other{"000K‏"} + two{"000K‏"} } 1000000{ - many{"0M"} - one{"0M"} - other{"0M"} - two{"0M"} + many{"0M‏"} + one{"0M‏"} + other{"0M‏"} + two{"0M‏"} } 10000000{ - many{"00M"} - one{"00M"} - other{"00M"} - two{"00M"} + many{"00M‏"} + one{"00M‏"} + other{"00M‏"} + two{"00M‏"} } 100000000{ - many{"000M"} - one{"000M"} - other{"000M"} - two{"000M"} + many{"000M‏"} + one{"000M‏"} + other{"000M‏"} + two{"000M‏"} } 1000000000{ - many{"0B"} - one{"0B"} - other{"0B"} - two{"0B"} + many{"0B‏"} + one{"0B‏"} + other{"0B‏"} + two{"0B‏"} } 10000000000{ - many{"00B"} - one{"00B"} - other{"00B"} - two{"00B"} + many{"00B‏"} + one{"00B‏"} + other{"00B‏"} + two{"00B‏"} } 100000000000{ - many{"000B"} - one{"000B"} - other{"000B"} - two{"000B"} + many{"000B‏"} + one{"000B‏"} + other{"000B‏"} + two{"000B‏"} } 1000000000000{ - many{"0T"} - one{"0T"} - other{"0T"} - two{"0T"} + many{"0T‏"} + one{"0T‏"} + other{"0T‏"} + two{"0T‏"} } 10000000000000{ - many{"00T"} - one{"00T"} - other{"00T"} - two{"00T"} + many{"00T‏"} + one{"00T‏"} + other{"00T‏"} + two{"00T‏"} } 100000000000000{ - many{"000T"} - one{"000T"} - other{"000T"} - two{"000T"} + many{"000T‏"} + one{"000T‏"} + other{"000T‏"} + two{"000T‏"} } } } @@ -301,7 +302,6 @@ he{ native{"latn"} traditional{"hebr"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -2971,7 +2971,7 @@ he{ "0"{"השבוע"} "1"{"השבוע הבא"} } - relativePeriod{"השבוע של"} + relativePeriod{"השבוע של {0}"} relativeTime{ future{ many{"בעוד {0} שבועות"} diff --git a/intl/icu/source/data/locales/he_IL.txt b/intl/icu/source/data/locales/he_IL.txt index b6d20c24f2be..4c68fda7991a 100644 --- a/intl/icu/source/data/locales/he_IL.txt +++ b/intl/icu/source/data/locales/he_IL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he_IL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/hi.txt b/intl/icu/source/data/locales/hi.txt index 20ad940287d6..7262c164e168 100644 --- a/intl/icu/source/data/locales/hi.txt +++ b/intl/icu/source/data/locales/hi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi{ AuxExemplarCharacters{"[\u200C\u200D]"} Ellipsis{ @@ -224,9 +225,9 @@ hi{ } minimalPairs{ ordinal{ - few{"तीसरा दाहिना मोड़ लें."} + few{"{0} दाहिना मोड़ लें."} many{"{0}ठा दाहिना मोड़ लें."} - one{"पहला दाहिना मोड़ लें."} + one{"{0}ला दाहिना मोड़ लें."} other{"{0}वां दाहिना मोड़ लें."} two{"{0}रा दाहिना मोड़ लें."} } @@ -238,8 +239,74 @@ hi{ minimumGroupingDigits{"1"} native{"deva"} } - Version{"37"} calendar{ + buddhist{ + availableFormats{ + Gy{"y G"} + GyMMM{"MMM y G"} + GyMMMEd{"E, d MMM y G"} + GyMMMd{"d MMM y G"} + MMMMd{"d MMMM"} + y{"y G"} + yyyy{"y G"} + yyyyM{"M/y GGGGG"} + yyyyMEd{"E, d/M/y GGGGG"} + yyyyMMMEd{"E, d MMM y G"} + yyyyMMMM{"MMMM y G"} + yyyyMd{"d/M`/y GGGGG"} + } + eras{ + abbreviated{ + "बौद्ध संवत", + } + narrow{ + "बौद्ध संवत", + } + wide{ + "बौद्ध संवत", + } + } + intervalFormats{ + Gy{ + G{"G y – G y"} + y{"y – y G"} + } + GyM{ + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} + } + GyMEd{ + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, d MMM y G – E, d MMM y G"} + 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"} + } + GyMMMd{ + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} + } + GyMd{ + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} + } + } + } ethiopic{ monthNames{ format{ @@ -904,11 +971,50 @@ hi{ } } indian{ + 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{ + Gy{"y G"} + GyMMM{"MMM y G"} + GyMMMEd{"E, d MMM y G"} + GyMMMd{"d MMM y G"} + MMMMd{"d MMMM"} + y{"y G"} + yyyy{"y G"} + yyyyM{"M/y GGGGG"} + yyyyMEd{"E, d/M/y GGGGG"} + yyyyMMM{"MMM y G"} + yyyyMMMd{"d MMM y G"} + yyyyMd{"d/M/y GGGGG"} + } eras{ abbreviated{ "शक", } } + intervalFormats{ + GyM{ + G{"GGGGG M/y – GGGGG M/y"} + M{"GGGGG M/y – M/"} + y{"GGGGG M/y – M/y"} + } + GyMd{ + d{"GGGGG d/M/y – d/M/y"} + } + } monthNames{ format{ abbreviated{ diff --git a/intl/icu/source/data/locales/hi_IN.txt b/intl/icu/source/data/locales/hi_IN.txt index baedd090e09c..1844d375c4c5 100644 --- a/intl/icu/source/data/locales/hi_IN.txt +++ b/intl/icu/source/data/locales/hi_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/hr.txt b/intl/icu/source/data/locales/hr.txt index d9b31e90a4ad..d45dd5afcf02 100644 --- a/intl/icu/source/data/locales/hr.txt +++ b/intl/icu/source/data/locales/hr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr{ AuxExemplarCharacters{"[q w x y]"} Ellipsis{ @@ -101,9 +102,9 @@ hr{ patternsShort{ currencyFormat{ 1000{ - few{"0000¤"} - one{"0000¤"} - other{"0000¤"} + few{"0"} + one{"0"} + other{"0"} } 10000{ few{"00 tis'.' ¤"} @@ -225,12 +226,13 @@ hr{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{"."} infinity{"∞"} list{";"} - minusSign{"-"} + minusSign{"−"} nan{"NaN"} perMille{"‰"} percentSign{"%"} @@ -252,7 +254,6 @@ hr{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/hr_BA.txt b/intl/icu/source/data/locales/hr_BA.txt index c08a1c117fa0..3ef953cabb1e 100644 --- a/intl/icu/source/data/locales/hr_BA.txt +++ b/intl/icu/source/data/locales/hr_BA.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr_BA{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/hr_HR.txt b/intl/icu/source/data/locales/hr_HR.txt index bb568b96cbf1..b0f41a69eb14 100644 --- a/intl/icu/source/data/locales/hr_HR.txt +++ b/intl/icu/source/data/locales/hr_HR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr_HR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/hsb.txt b/intl/icu/source/data/locales/hsb.txt index 07f798dc9a2d..e2a034c005d8 100644 --- a/intl/icu/source/data/locales/hsb.txt +++ b/intl/icu/source/data/locales/hsb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hsb{ AuxExemplarCharacters{ "[á à ă â å ä ã ą ā æ ç ď đ é è ĕ ê ë ė ę ē ğ í ì ĭ î ï İ ī ı ĺ ľ ň ñ ò ŏ ô ö" @@ -196,7 +197,6 @@ hsb{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -367,7 +367,7 @@ hsb{ yMM{"MM y"} yMMM{"MMM y"} yMMMEd{"E, d. MMM y"} - yMMMM{"MMMM y"} + yMMMM{"LLLL y"} yMMMd{"d. MMM y"} yMMdd{"dd. MM y"} yMd{"d.M.y"} diff --git a/intl/icu/source/data/locales/hsb_DE.txt b/intl/icu/source/data/locales/hsb_DE.txt index 3aaa1fc074f7..7c34734b9e79 100644 --- a/intl/icu/source/data/locales/hsb_DE.txt +++ b/intl/icu/source/data/locales/hsb_DE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hsb_DE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/hu.txt b/intl/icu/source/data/locales/hu.txt index abffbe91d0a6..0918a1fc6131 100644 --- a/intl/icu/source/data/locales/hu.txt +++ b/intl/icu/source/data/locales/hu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu{ AuxExemplarCharacters{"[à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ô ø ō œ q ù ŭ û ū w x y ÿ]"} Ellipsis{ @@ -223,7 +224,6 @@ hu{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/hu_HU.txt b/intl/icu/source/data/locales/hu_HU.txt index 938db8c3b5e9..40156de62f34 100644 --- a/intl/icu/source/data/locales/hu_HU.txt +++ b/intl/icu/source/data/locales/hu_HU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu_HU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/hy.txt b/intl/icu/source/data/locales/hy.txt index 34c4adce9c46..d13827499a2e 100644 --- a/intl/icu/source/data/locales/hy.txt +++ b/intl/icu/source/data/locales/hy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy{ AuxExemplarCharacters{"[և]"} Ellipsis{ @@ -220,7 +221,6 @@ hy{ native{"latn"} traditional{"armn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/hy_AM.txt b/intl/icu/source/data/locales/hy_AM.txt index cdb89f9dfe8f..4c13490bd2f2 100644 --- a/intl/icu/source/data/locales/hy_AM.txt +++ b/intl/icu/source/data/locales/hy_AM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy_AM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ia.txt b/intl/icu/source/data/locales/ia.txt index 788cfa9ebe4f..6fd26cf0f142 100644 --- a/intl/icu/source/data/locales/ia.txt +++ b/intl/icu/source/data/locales/ia.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ia{ Ellipsis{ final{"{0}…"} @@ -193,7 +194,6 @@ ia{ } minimumGroupingDigits{"2"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ia_001.txt b/intl/icu/source/data/locales/ia_001.txt index 94a07be46a8b..541744662582 100644 --- a/intl/icu/source/data/locales/ia_001.txt +++ b/intl/icu/source/data/locales/ia_001.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ia_001{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/id.txt b/intl/icu/source/data/locales/id.txt index 1530afe1f1d5..40e1c47989a7 100644 --- a/intl/icu/source/data/locales/id.txt +++ b/intl/icu/source/data/locales/id.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id{ AuxExemplarCharacters{"[å]"} Ellipsis{ @@ -13,7 +14,10 @@ id{ 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]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} - ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ “ ” ( ) \\[ \\] /]"} + ExemplarCharactersPunctuation{ + "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " + "′ ″]" + } MoreInformation{"?"} NumberElements{ default{"latn"} @@ -150,6 +154,7 @@ id{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{"."} @@ -175,7 +180,6 @@ id{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -1712,9 +1716,9 @@ id{ } } characterLabel{ - activities{"Aktivitas"} - african_scripts{"Skrip Afrika"} - american_scripts{"Skrip Amerika"} + activities{"aktivitas"} + african_scripts{"skrip Afrika"} + american_scripts{"skrip Amerika"} animal{"hewan"} animals_nature{"satwa atau alam"} arrows{"panah"} @@ -1731,9 +1735,9 @@ id{ divination_symbols{"simbol ramalan"} downwards_arrows{"panah bawah"} downwards_upwards_arrows{"panah atas bawah"} - east_asian_scripts{"Skrip Asia Timur"} + east_asian_scripts{"skrip Asia Timur"} emoji{"emoji"} - european_scripts{"Skrip Eropa"} + european_scripts{"skrip Eropa"} female{"perempuan"} flag{"bendera"} flags{"bendera"} @@ -1743,15 +1747,15 @@ id{ full_width_form_variant{"varian lebar penuh"} geometric_shapes{"bentuk geometris"} half_width_form_variant{"varian setengah lebar"} - han_characters{"Aksara Han"} - han_radicals{"Han Radikal"} + han_characters{"aksara Han"} + han_radicals{"Han radikal"} hanja{"Hanja"} - hanzi_simplified{"Hanzi (Aksara Sederhana)"} - hanzi_traditional{"Hanzi (Aksara Tradisional)"} + hanzi_simplified{"Hanzi (sederhana)"} + hanzi_traditional{"Hanzi (tradisional)"} heart{"hati"} historic_scripts{"skrip historis"} ideographic_desc_characters{"karakter desk. ideografis"} - japanese_kana{"Huruf Kana Jepang"} + japanese_kana{"huruf Kana Jepang"} kanbun{"kanbun"} kanji{"kanji"} keycap{"keycap"} @@ -1761,7 +1765,7 @@ id{ limited_use{"penggunaan terbatas"} male{"pria"} math_symbols{"simbol matematika"} - middle_eastern_scripts{"Skrip Timur Tengah"} + middle_eastern_scripts{"skrip Timur Tengah"} miscellaneous{"lain-lain"} modern_scripts{"skrip modern"} modifier{"pengubah"} @@ -1783,8 +1787,8 @@ id{ small_form_variant{"varian kecil"} smiley{"wajah tersenyum"} smileys_people{"smiley atau orang"} - south_asian_scripts{"Skrip Asia Selatan"} - southeast_asian_scripts{"Skrip Asia Tenggara"} + south_asian_scripts{"skrip Asia Selatan"} + southeast_asian_scripts{"skrip Asia Tenggara"} spacing{"spasi"} sport{"olahraga"} symbols{"simbol"} @@ -1796,7 +1800,7 @@ id{ variant_forms{"varian"} vocalic_jamo{"jamo vokal"} weather{"cuaca"} - western_asian_scripts{"Skrip Asia Bagian Barat"} + western_asian_scripts{"skrip Asia Bagian Barat"} whitespace{"spasi kosong"} } contextTransforms{ diff --git a/intl/icu/source/data/locales/id_ID.txt b/intl/icu/source/data/locales/id_ID.txt index c91f9117ed64..727d3f755861 100644 --- a/intl/icu/source/data/locales/id_ID.txt +++ b/intl/icu/source/data/locales/id_ID.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id_ID{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ig.txt b/intl/icu/source/data/locales/ig.txt index ba83a35a187b..4b1bc5b6867d 100644 --- a/intl/icu/source/data/locales/ig.txt +++ b/intl/icu/source/data/locales/ig.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ig{ AuxExemplarCharacters{ "[á à ā c é è ē í ì ī {ị\u0301} {ị\u0300} ḿ {m\u0300} ń ǹ ó ò ō {ọ\u0301} {ọ" @@ -76,6 +77,46 @@ ig{ accountingFormat{"¤#,##0.00;(¤#,##0.00)"} currencyFormat{"¤#,##0.00"} } + patternsShort{ + currencyFormat{ + 1000{ + other{"¤0K"} + } + 10000{ + other{"¤00K"} + } + 100000{ + other{"¤000K"} + } + 1000000{ + other{"¤0M"} + } + 10000000{ + other{"¤00M"} + } + 100000000{ + other{"¤000M"} + } + 1000000000{ + other{"¤0G"} + } + 10000000000{ + other{"¤00G"} + } + 100000000000{ + other{"¤000G"} + } + 1000000000000{ + other{"¤0T"} + } + 10000000000000{ + other{"¤00T"} + } + 100000000000000{ + other{"¤000T"} + } + } + } symbols{ decimal{"."} exponential{"E"} @@ -101,7 +142,6 @@ ig{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -203,7 +243,7 @@ ig{ dayNames{ format{ abbreviated{ - "Ụka", + "Sọn", "Mọn", "Tiu", "Wen", @@ -232,7 +272,7 @@ ig{ } stand-alone{ abbreviated{ - "Ụka", + "Sọn", "Mọn", "Tiu", "Wen", @@ -530,6 +570,46 @@ ig{ } } } + characterLabel{ + animal{"anụmanụ"} + animals_nature{"anụmanụ ma ọbụ ụwa"} + arrows{"arọ"} + body{"ahụ"} + box_drawing{"ịgbe osese"} + building{"ulọ"} + currency_symbols{"akara ego"} + divination_symbols{"akara ịgba afa"} + downwards_arrows{"arọ ala"} + downwards_upwards_arrows{"arọ elụ ala"} + female{"nwanyị"} + food_drink{"nrị & ịhe ọnụnụ"} + heart{"obi"} + leftwards_arrows{"arọ aka ekpe"} + leftwards_rightwards_arrows{"arọ aka nrị aka ekpe"} + male{"nwoke"} + math_symbols{"akara matị"} + musical_symbols{"akara ụrị"} + nature{"ụwa"} + nonspacing{"enweghịọhere"} + numbers{"ọnụọgụgụ"} + objects{"ịhe"} + other{"ọzọ"} + person{"mmadụ"} + place{"ebe"} + plant{"ahịha"} + punctuation{"akara edemede"} + rightwards_arrows{"arọ aka nrị"} + sign_standard_symbols{"ịrịba ama maọbụ akara"} + spacing{"ọhere"} + sport{"egwụregwụ"} + symbols{"akara"} + technical_symbols{"akara teknịkal"} + tone_marks{"ụda akara"} + travel{"njem"} + travel_places{"njem maọbụ ebe"} + upwards_arrows{"arọ elụ"} + weather{"ụdịdịụbọchị"} + } fields{ day{ dn{"Ụbọchị"} @@ -553,17 +633,77 @@ ig{ "1"{"Echi"} } } + dayOfYear{ + dn{"ụbọchị na afọ"} + } + dayOfYear-short{ + dn{"Ụbọchị na afọ"} + } dayperiod{ dn{"N’ụtụtụ/N’abalị"} } + dayperiod-narrow{ + dn{"N’ụtụtụ/N’abalị"} + } + dayperiod-short{ + dn{"N’ụtụtụ/N’abalị"} + } era{ dn{"Agba"} } + fri{ + relative{ + "-1"{"Ụbọchị faraịde gara aga"} + "0"{"ụbọchị Faraịde a"} + "1"{"ụbọchị Faraịde na abịa"} + } + } + fri-narrow{ + relative{ + "-1"{"ụbọchị Faraịde gara aga"} + "0"{"ụbọchị Faraịde a"} + "1"{"ụọchị Faraịde na abịa"} + } + } + fri-short{ + relative{ + "-1"{"ụbọchị Faraịde gara aga"} + "0"{"ụbọchị Faraịde a"} + "1"{"ụbọchị na abịa"} + } + } hour{ dn{"Elekere"} + relative{ + "0"{"elekere a"} + } } minute{ dn{"Nkeji"} + relative{ + "0"{"nkejị a"} + } + } + mon{ + relative{ + "-1"{"ụbọchị Mọnde gara aga"} + "0"{"ụbọchị Mọnde a"} + "1"{"ụbọchị Monde a"} + } + } + mon-narrow{ + relative{ + "-1"{"ụbọchị Monde gara aga"} + "0"{"ụbọchị Monde a"} + "1"{"ụbọchị Monde na abịa"} + } + } + mon-short{ + relative{ + "-1"{"Mon gara aga"} + "0"{"ụbọchị Mọnde a"} + "1"{"ụbọchị Mọnde na abịa"} + } } month{ dn{"Ọnwa"} @@ -589,6 +729,11 @@ ig{ } quarter{ dn{"Ọnwa atọ n’afọ"} + relative{ + "-1"{"Nkejị keanọ gara aga"} + "0"{"nkejị keanọ a"} + "1"{"nkejị keanọ na abịa"} + } } quarter-narrow{ dn{"Ọnwa atọ n’afọ"} @@ -596,8 +741,32 @@ ig{ quarter-short{ dn{"Ọnwa atọ n’afọ"} } + sat{ + relative{ + "-1"{"ụbọchị Satụde gara aga"} + "0"{"ụbọchị Satụde a"} + "1"{"ụbọchị Satụde na abịa"} + } + } + sat-narrow{ + relative{ + "-1"{"ụbọchị Satụde gara aga"} + "0"{"ụbọchị Satụde a"} + "1"{"ụbọchị Satụde na abịa"} + } + } + sat-short{ + relative{ + "-1"{"Ụbọchị Satụde gara aga"} + "0"{"ụbọchị Satụde a"} + "1"{"ụbọchị Satụde na abịa"} + } + } second{ dn{"Tịm kọm"} + relative{ + "0"{"ụgbụa"} + } } second-narrow{ dn{"Tịm kọm"} @@ -605,6 +774,90 @@ ig{ second-short{ dn{"Tịm kọm"} } + sun{ + relative{ + "-1"{"Ụbọchị ụka gara aga"} + "0"{"ụbọchị ụka a"} + "1"{"ụbọchị ụka na abịa"} + } + } + sun-narrow{ + relative{ + "-1"{"ụbọchị ụka gara aga"} + "0"{"ụbọchị ụka a"} + "1"{"ụbọchị ụka na abịa"} + } + } + sun-short{ + relative{ + "-1"{"ụbọchị ụka gara aga"} + "0"{"ubochị ụka a"} + "1"{"ụbọchị ụka na abịa"} + } + } + thu{ + relative{ + "-1"{"ụbọchị Tọsdee gara aga"} + "0"{"ụbọchị Tọsdee a"} + "1"{"ụbọchị Tọsdee na abịa"} + } + } + thu-narrow{ + relative{ + "-1"{"ụbọchị Tọsdee gara aga"} + "0"{"ụbọchị Tọsdee a"} + "1"{"ụbọchị Tọsdee na abịa"} + } + } + thu-short{ + relative{ + "-1"{"Ụbọchị Tọsdee gara aga"} + "0"{"ụbọchị Tọsdee a"} + "1"{"ụbọchị Tọsdee na abịa"} + } + } + tue{ + relative{ + "-1"{"ụbọchị Tuesde gara aga"} + "0"{"ụbọchị Tuesde a"} + "1"{"ụbọchị Tuesde na abịa"} + } + } + tue-narrow{ + relative{ + "-1"{"ụbọchị Tuesde gara aga"} + "0"{"ụbọchị Tuesde a"} + "1"{"ụbọchị Tuesde na abịa"} + } + } + tue-short{ + relative{ + "-1"{"ụbọchị Tụesde gara aga"} + "0"{"ụbọchị Tuesde a"} + "1"{"ụbọchị Tuesde na abịa"} + } + } + wed{ + relative{ + "-1"{"ụbọchị wednesde gara aga"} + "0"{"ụbọchị Wednesde a"} + "1"{"ụbọchị Wednesde na abịa"} + } + } + wed-narrow{ + relative{ + "-1"{"ụbọchị Wednesde gara ag"} + "0"{"ụbọchị Wednesde a"} + "1"{"ụbọchị Wednesde a"} + } + } + wed-short{ + relative{ + "-1"{"ụbọchị Wednesde gara ag"} + "0"{"ụbọchị Wednesde a"} + "1"{"ụbọchị Wednesde na abịa"} + } + } week{ dn{"Izu"} relative{ @@ -630,9 +883,33 @@ ig{ } relativePeriod{"Izu nke{0}"} } + weekOfMonth{ + dn{"ịzụ ọnwa"} + } + weekOfMonth-narrow{ + dn{"ịzụ ọnwa"} + } + weekOfMonth-short{ + dn{"ịzụ ọnwa"} + } weekday{ dn{"Ụbọchị izu"} } + weekday-narrow{ + dn{"Ụbọchị ịzụ"} + } + weekday-short{ + dn{"Ụbọchị ịzụ"} + } + weekdayOfMonth{ + dn{"Ụbọchị ịzụ na ọnwa"} + } + weekdayOfMonth-narrow{ + dn{"Ụbọchị ịzụ na ọnwa"} + } + weekdayOfMonth-short{ + dn{"Ụbọchị ịzụ na ọnwa"} + } year{ dn{"Afọ"} relative{ diff --git a/intl/icu/source/data/locales/ig_NG.txt b/intl/icu/source/data/locales/ig_NG.txt index bb274f19990d..aeda270a4b99 100644 --- a/intl/icu/source/data/locales/ig_NG.txt +++ b/intl/icu/source/data/locales/ig_NG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ig_NG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ii.txt b/intl/icu/source/data/locales/ii.txt index 101e30fe4161..b0c62bd650f5 100644 --- a/intl/icu/source/data/locales/ii.txt +++ b/intl/icu/source/data/locales/ii.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ii{ ExemplarCharacters{"[ꀀ-ꒌ]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -20,7 +21,6 @@ ii{ } } } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/ii_CN.txt b/intl/icu/source/data/locales/ii_CN.txt index fc1ffb00364b..3344042ddee0 100644 --- a/intl/icu/source/data/locales/ii_CN.txt +++ b/intl/icu/source/data/locales/ii_CN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ii_CN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/in.txt b/intl/icu/source/data/locales/in.txt index 02335238ad02..e2df1690e399 100644 --- a/intl/icu/source/data/locales/in.txt +++ b/intl/icu/source/data/locales/in.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in{ "%%ALIAS"{"id"} } diff --git a/intl/icu/source/data/locales/in_ID.txt b/intl/icu/source/data/locales/in_ID.txt index acec72c6e987..03f238793675 100644 --- a/intl/icu/source/data/locales/in_ID.txt +++ b/intl/icu/source/data/locales/in_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in_ID{ "%%ALIAS"{"id_ID"} } diff --git a/intl/icu/source/data/locales/is.txt b/intl/icu/source/data/locales/is.txt index 3e7880c3315a..fd2e349ad445 100644 --- a/intl/icu/source/data/locales/is.txt +++ b/intl/icu/source/data/locales/is.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is{ AuxExemplarCharacters{"[c q w z]"} Ellipsis{ @@ -221,7 +222,6 @@ is{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -3911,7 +3911,7 @@ is{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/is_IS.txt b/intl/icu/source/data/locales/is_IS.txt index 33cfadf84d28..1363a5603973 100644 --- a/intl/icu/source/data/locales/is_IS.txt +++ b/intl/icu/source/data/locales/is_IS.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is_IS{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/it.txt b/intl/icu/source/data/locales/it.txt index d3ffa35d9305..d8f767704449 100644 --- a/intl/icu/source/data/locales/it.txt +++ b/intl/icu/source/data/locales/it.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ AuxExemplarCharacters{"[ª á â å ä ã æ ç ê ë í î ï ñ º ô ö õ ø œ ß ú û ü ÿ]"} Ellipsis{ @@ -34,7 +35,7 @@ it{ patternsLong{ decimalFormat{ 1000{ - one{"0 mille"} + one{"mille"} other{"0 mila"} } 10000{ @@ -212,7 +213,6 @@ it{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -688,12 +688,12 @@ it{ intervalFormats{ Bh{ B{"h B – h B"} - h{"h–h B"} + h{"h – h B"} } Bhm{ B{"h:mm B – h:mm B"} - h{"h:mm–h:mm B"} - m{"h:mm–h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ G{"y G – y G"} @@ -718,7 +718,7 @@ it{ GyMMMEd{ G{"E d MMM y G – E d MMM y G"} M{"E d MMM – E d MMM y G"} - d{"E d MMM – d E MMM y G"} + d{"E d MMM – E d MMM y G"} y{"E d MMM y – E d MMM y G"} } GyMMMd{ @@ -1138,7 +1138,7 @@ it{ } } day-narrow{ - dn{"g"} + dn{"g."} relative{ "-1"{"ieri"} "-2"{"l’altro ieri"} @@ -1158,7 +1158,7 @@ it{ } } day-short{ - dn{"g"} + dn{"g."} relative{ "-1"{"ieri"} "-2"{"l’altro ieri"} @@ -1285,7 +1285,7 @@ it{ } } hour-short{ - dn{"h."} + dn{"h"} relativeTime{ future{ one{"tra {0} h"} @@ -1582,11 +1582,11 @@ it{ dn{"s"} relativeTime{ future{ - one{"tra {0} s"} + one{"tra {0} sec."} other{"tra {0} sec."} } past{ - one{"{0} s fa"} + one{"{0} sec. fa"} other{"{0} sec. fa"} } } @@ -1817,11 +1817,11 @@ it{ week-narrow{ dn{"sett."} relative{ - "-1"{"settimana scorsa"} - "0"{"questa settimana"} - "1"{"settimana prossima"} + "-1"{"sett. scorsa"} + "0"{"questa sett."} + "1"{"sett. prossima"} } - relativePeriod{"la settimana del {0}"} + relativePeriod{"la sett. del {0}"} relativeTime{ future{ one{"tra {0} sett."} @@ -1836,11 +1836,11 @@ it{ week-short{ dn{"sett."} relative{ - "-1"{"settimana scorsa"} - "0"{"questa settimana"} - "1"{"settimana prossima"} + "-1"{"sett. scorsa"} + "0"{"questa sett."} + "1"{"sett. prossima"} } - relativePeriod{"la settimana del {0}"} + relativePeriod{"la sett. del {0}"} relativeTime{ future{ one{"tra {0} sett."} diff --git a/intl/icu/source/data/locales/it_CH.txt b/intl/icu/source/data/locales/it_CH.txt index e40ed11ef655..ecba64c72b4a 100644 --- a/intl/icu/source/data/locales/it_CH.txt +++ b/intl/icu/source/data/locales/it_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it_CH{ ExemplarCharactersNumbers{"[\\- ‑ . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ @@ -13,7 +14,6 @@ it_CH{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/it_IT.txt b/intl/icu/source/data/locales/it_IT.txt index faa85f256659..f5c2b889ec89 100644 --- a/intl/icu/source/data/locales/it_IT.txt +++ b/intl/icu/source/data/locales/it_IT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it_IT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/it_SM.txt b/intl/icu/source/data/locales/it_SM.txt index 0db8e99b117d..5b9bca75168f 100644 --- a/intl/icu/source/data/locales/it_SM.txt +++ b/intl/icu/source/data/locales/it_SM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it_SM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/it_VA.txt b/intl/icu/source/data/locales/it_VA.txt index ab0f08b7e9fe..d18d09b41045 100644 --- a/intl/icu/source/data/locales/it_VA.txt +++ b/intl/icu/source/data/locales/it_VA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it_VA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/iw.txt b/intl/icu/source/data/locales/iw.txt index d59865d1cdb7..4aa2f62d2681 100644 --- a/intl/icu/source/data/locales/iw.txt +++ b/intl/icu/source/data/locales/iw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw{ "%%ALIAS"{"he"} } diff --git a/intl/icu/source/data/locales/iw_IL.txt b/intl/icu/source/data/locales/iw_IL.txt index cf1666a681ee..984aefd0f82d 100644 --- a/intl/icu/source/data/locales/iw_IL.txt +++ b/intl/icu/source/data/locales/iw_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw_IL{ "%%ALIAS"{"he_IL"} } diff --git a/intl/icu/source/data/locales/ja.txt b/intl/icu/source/data/locales/ja.txt index 9785cefac41e..dcb9c976f4eb 100644 --- a/intl/icu/source/data/locales/ja.txt +++ b/intl/icu/source/data/locales/ja.txt @@ -1,7 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ - AuxExemplarCharacters{"[丑 亥 亨 兌 兎 卯 嘉 壬 寅 巳 庚 弘 戊 戌 拼 昌 楔 猪 癸 祚 禄 禎 辰 酉 錄 閏 雉 鳳 鼠]"} + AuxExemplarCharacters{ + "[丑 亥 亨 兌 兎 凧 剃 卯 嘉 嘔 嘘 壬 壺 嬉 寅 巳 庚 庵 弘 彗 悶 愕 戊 戌 拼 揃 斧 昌 杖 桶 梵 楔 湘 焚 燭 爬 牌 牝" + " 牡 狐 狗 狼 猪 獅 癸 瞑 碇 祚 禄 禎 秤 竿 絆 繍 罫 膏 芒 蟄 蟹 蠍 蠣 贛 蹄 辰 酉 鋲 錄 錨 閏 閩 雀 雉 鳳 鼠 龍]" + } Ellipsis{ final{"{0}…"} initial{"…{0}"} @@ -14,56 +18,61 @@ ja{ "[々 ゝヽ ゞヾ ー ぁァ あア ぃィ いイ ぅゥ うウ ヴ ぇェ えエ ぉォ おオ ヵ かカ がガ きキ ぎギ くク ぐグ ヶ けケ げゲ こコ ごゴ" " さサ ざザ しシ じジ すス ずズ せセ ぜゼ そソ ぞゾ たタ だダ ちチ ぢヂ っッ つツ づヅ てテ でデ とト どド なナ にニ ぬヌ ねネ " "のノ はハ ばバ ぱパ ひヒ びビ ぴピ ふフ ぶブ ぷプ へヘ べベ ぺペ ほホ ぼボ ぽポ まマ みミ むム めメ もモ ゃャ やヤ ゅュ ゆユ ょ" - "ョ よヨ らラ りリ るル れレ ろロ ゎヮ わワ ゐヰ ゑヱ をヲ んン 一 丁 七 万-下 不 与 且 世 丘 丙 両 並 中 丸 丹 主 久 乏 " - "乗 乙 九 乱 乳 乾 亀 了 予 争 事 二 互 五 井 亜 亡 交 享-亭 人 仁 今 介 仏 仕 他 付 仙 代-以 仮 仰 仲 件 任 企 伏-" - "休 会 伝 伯 伴 伸 伺 似 但 位-佐 体 何 余 作 佳 併 使 例 侍 供 依 価 侮 侯 侵 便 係 促 俊 俗 保 信 修 俳 俵 俸 俺 " - "倉 個 倍 倒 候 借 倣 値 倫 倹 偉 偏 停 健 側-偶 偽 傍 傑 傘 備 催 債 傷 傾 働 像 僕 僚 僧 儀 億 儒 償 優 元-兆 先 " - "光 克 免 児 党 入 全 八-六 共 兵 具 典 兼 内 円 冊 再 冒 冗 写 冠 冬 冷 准 凍 凝 凡 処 凶 凸-出 刀 刃 分-刈 刊 刑 " - "列 初 判 別 利 到 制-券 刺 刻 則 削 前 剖 剛 剣-剥 副 剰 割 創 劇 力 功 加 劣 助 努 励 労 効 劾 勅 勇 勉 動 勘 務 " - "勝 募 勢 勤 勧 勲 包 化 北 匠 匹-医 匿 十 千 升 午 半 卑-協 南 単 博 占 印 危 即-卵 卸 厄 厘 厚 原 厳 去 参 又 及-" - "収 叔 取 受 叙 口-句 叫 召 可-右 号 司 各 合 吉 同-向 君 吟 否 含 吸 吹 呈-告 周 味 呼 命 和 咲 哀 品 員 哲 唆 唇 " - "唐 唯 唱 商 問 啓 善 喚 喜 喝 喪 喫 営 嗣 嘆 嘱 器 噴 嚇 囚 四 回 因 団 困 囲 図 固 国 圏 園 土 圧 在 地 坂 均 坊 " - "坑 坪 垂 型 垣 埋 城 域 執 培 基 埼 堀 堂 堅 堕 堤 堪 報 場 塀 塁 塊 塑 塔 塗 塚 塩 填 塾 境 墓 増 墜 墨 墳 墾 壁 " - "壇 壊 壌 士 壮 声-売 変 夏 夕 外 多 夜 夢 大 天-夫 央 失 奇-奉 奏 契 奔 奥 奨 奪 奮 女 奴 好 如-妄 妊 妙 妥 妨 妹 " - "妻 姉 始 姓 委 姫 姻 姿 威 娘 娠 娯 婆 婚 婦 婿 媒 嫁 嫌 嫡 嬢 子 孔 字 存 孝 季 孤 学 孫 宅 宇-安 完 宗-定 宜 宝 " - "実 客-室 宮 宰 害-家 容 宿 寂 寄 密 富 寒 寛 寝 察 寡 寧 審 寮 寸 寺 対 寿 封 専 射 将 尉-尋 導 小 少 尚 就 尺 尼-" - "局 居 屈 届 屋 展 属 層 履 屯 山 岐 岡 岩 岬 岳 岸 峠 峡 峰 島 崇 崎 崩 川 州 巡 巣 工-巨 差 己 巻 市 布 帆 希 帝 " - "帥 師 席 帯 帰 帳 常 帽 幅 幕 幣 干-年 幸 幹 幻-幾 庁 広 床 序 底 店 府 度 座 庫 庭 庶-庸 廃 廉 廊 延 廷 建 弁 弊 " - "式 弐 弓-引 弟 弦 弧 弱 張 強 弾 当 形 彩 彫 彰 影 役 彼 往 征 径 待 律 後 徐 徒 従 得 御 復 循 微 徳 徴 徹 心 必 " - "忌 忍 志-忙 応 忠 快 念 怒 怖 思 怠 急 性 怪 恋 恐 恒 恥 恨 恩 恭 息 恵 悔 悟 悠 患 悦 悩 悪 悲 悼 情 惑 惜 惨 惰 " - "想 愁 愉 意 愚 愛 感 慈 態 慌 慎 慕 慢 慣 慨 慮 慰 慶 憂 憎 憤 憩 憲 憶 憾 懇 懐 懲 懸 成-戒 戦 戯 戸 戻 房 所 扇 " - "扉 手 才 打 払 扱 扶 批 承 技 抄 把 抑 投 抗 折 抜 択 披 抱 抵 抹 押 抽 担 拍 拐 拒 拓 拘 拙 招 拝 拠 拡 括 拷 拾 " - "持 指 挑 挙 挟 振 挿 捕 捜 捨 据 掃 授 掌 排 掘 掛 採 探 接 控 推 措 掲 描 提 揚 換 握 揮 援 揺 損 搬 搭 携 搾 摂 " - "摘 摩 撃 撤 撮 撲 擁 操 擦 擬 支 改 攻 放 政 故 敏 救 敗 教 敢 散 敬 数 整 敵 敷 文 斉 斎 斗 料 斜 斤 斥 断 新 方 " - "施 旅 旋 族 旗 既 日 旧-早 旬 昆 昇 明 易 昔 星 映 春 昨 昭 是 昼 時 晩 普 景 晴 晶 暁 暇 暑 暖 暗 暦 暫 暮 暴 曇 " - "曜 曲 更 書 曹 替 最 月 有 服 朕 朗 望 朝 期 木 未-札 朱 朴 机 朽 杉 材 村 束 条 来 杯 東 松 板 析 林 枚 果 枝 枠 " - "枢 枯 架 柄 某 染 柔 柱 柳 査 栄 栓 校 株 核 根 格 栽 桃 案 桑 桜 桟 梅 械 棄 棋 棒 棚 棟 森 棺 植 検 業 極 楼 楽 " - "概 構 様 槽 標 模 権 横 樹 橋 機 欄 欠 次 欧 欲 欺 款 歌 歓 止 正 武 歩 歯 歳 歴 死 殉-残 殖 殴 段 殺 殻 殿 母 毎 " - "毒 比 毛 氏 民 気 水 氷 永 汁 求 汎 汗 汚 江 池 決 汽 沈 沖 没 沢 河 沸 油 治 沼 沿 況 泉 泊 泌 法 泡-泣 泥 注 泰 " - "泳 洋 洗 洞 津 洪 活 派 流 浄 浅 浜 浦 浪 浮 浴 海 浸 消 涙 涯 液 涼 淑 淡 深 混 添 清 渇-渉 渋 渓 減 渡 渦 温 測 " - "港 湖 湯 湾-満 源 準 溝 溶 滅 滋 滑 滝 滞 滴 漁 漂 漆 漏 演 漠 漢 漫 漬 漸 潔 潜 潟 潤 潮 澄 激 濁 濃 濫 濯 瀬 火 " - "灯 灰 災 炉 炊 炎 炭 点 為 烈 無 焦 然 焼 煙 照 煩 煮 熟 熱 燃 燥 爆 爵 父 片 版 牙 牛 牧 物 牲 特 犠 犬 犯 状 狂 " - "狩 独 狭 猛 猟 猫 献 猶 猿 獄 獣 獲 玄 率 玉 王 珍 珠 班 現 球 理 琴 環 璽 瓶 甘 甚 生 産 用 田-申 男 町 画 界 畑 " - "畔 留 畜 畝 略 番 異 畳 疎 疑 疫 疲 疾 病 症 痘 痛 痢 痴 療 癒 癖 発 登 白 百 的 皆 皇 皮 皿 盆 益 盗 盛 盟 監 盤 " - "目 盲 直 相 盾 省 看 県 真 眠 眺 眼 着 睡 督 瞬 矛 矢 知 短 矯 石 砂 研 砕 砲 破 硝 硫 硬 碁 碑 確 磁 磨 礁 礎 示 " - "礼 社 祈 祉 祖 祝 神 祥 票 祭 禁 禅 禍 福 秀 私 秋 科 秒 秘 租 秩 称 移 程 税 稚 種 稲 稼 稿 穀 穂 積 穏 穫 穴 究 " - "空 突 窃 窒 窓 窮 窯 立 竜 章 童 端 競 竹 笑 笛 符 第 筆 等 筋 筒 答 策 箇 算 管 箱 節 範 築 篤 簡 簿 籍 米 粉 粋 " - "粒 粗 粘 粛 粧 精 糖 糧 糸 系 糾 紀 約 紅 紋 納 純 紙-紛 素-索 紫 累 細 紳 紹 紺 終 組 経 結 絞 絡 給 統 絵 絶 絹 " - "継 続 維 綱 網 綿 緊 総 緑 緒 線 締 編 緩 緯 練 縁 縄 縛 縦 縫 縮 績 繁 繊 織 繕 繭 繰 缶 罪 置 罰 署 罷 羅 羊 美 " - "群 義 羽 翁 翌 習 翻 翼 老 考 者 耐 耕 耗 耳 聖 聞 聴 職 肉 肌 肖 肝 肢 肥 肩 肪 肯 育 肺 胃 胆 背 胎 胞 胴 胸 能 " - "脂 脅 脈 脚 脱 脳 腐 腕 腰 腸 腹 膚 膜 膨 臓 臣 臨 自 臭 至 致 興 舌 舎 舗 舞 舟 航 般 舶 船 艇 艦 良 色 芋 芝 花 " - "芳 芸 芽 苗 若 苦 英 茂 茎 茶 草 荒 荘 荷 菊 菌 菓 菜 華 落 葉 著 葬 蒸 蓄 蔵 薄 薦 薪-薬 藤 藩 藻 虎 虐 虚 虜 虞 " - "虫 蚊 蚕 蛇 蛍 蛮 融 血 衆 行 術 街 衛 衝 衡 衣 表 衰 衷 袋 被 裁 裂 装 裏 裕 補 裸 製 複 褐 褒 襟 襲 西 要 覆 覇 " - "見 規 視 覚 覧 親 観 角 解 触 言 訂 計 討 訓 託 記 訟 訪 設 許 訳 訴 診 証 詐 詔 評 詞 詠 試 詩 詰-詳 誇 誉 誌 認 " - "誓 誕 誘 語 誠 誤 説 読 誰 課 調 談 請 論 諭 諮 諸 諾 謀 謁 謄 謙 講 謝 謡 謹 識 譜 警 議 譲 護 谷 豆 豊 豚 象 豪 " - "貝 貞 負-貢 貧-販 貫 責 貯 貴 買 貸 費 貿 賀 賃 賄 資 賊 賓 賛 賜 賞 賠 賢 賦 質 購 贈 赤 赦 走 赴 起 超 越 趣 足 " - "距 跡 路 跳 践 踊 踏 躍 身 車 軌 軍 軒 軟 転 軸 軽 較 載 輝 輩 輪 輸 轄 辛 辞 辱 農 辺 込 迅 迎 近 返 迫 迭 述 迷 " - "追 退 送 逃 逆 透 逐 逓 途 通 逝 速 造 連 逮 週 進 逸 遂 遅 遇 遊 運 遍 過 道-違 遠 遣 適 遭 遮 遵 遷 選 遺 避 還 " - "邦 邪 邸 郊 郎 郡 部 郭 郵 郷 都 酌 配 酒 酔 酢 酪 酬 酵 酷 酸 醜 醸 釈 里-量 金 針 釣 鈍 鈴 鉄 鉛 鉢 鉱 銀 銃 銅 " - "銘 銭 鋭 鋳 鋼 錠 錬 錯 録 鍛 鎖 鎮 鏡 鐘 鑑 長 門 閉 開 閑 間 関 閣 閥 閲 闘 阪 防 阻 附 降 限 陛 院-陥 陪 陰 陳 " - "陵 陶 陸 険 陽 隅 隆 隊 階 随 隔 際 障 隠 隣 隷 隻 雄-雇 雌 雑 離 難 雨 雪 雰 雲 零 雷 電 需 震 霊 霜 霧 露 青 静 " - "非 面 革 靴 韓 音 韻 響 頂 頃 項 順 預-頒 領 頬 頭 頻 頼 題 額 顔 顕 願 類 顧 風 飛 食 飢 飯 飲 飼-飾 養 餓 館 首 " - "香 馬 駄-駆 駐 騎 騒 験 騰 驚 骨 髄 高 髪 鬼 魂 魅 魔 魚 鮮 鯨 鳥 鳴 鶏 鹿 麗 麦 麻 黄 黒 黙 鼓 鼻 齢]" + "ョ よヨ らラ りリ るル れレ ろロ ゎヮ わワ ゐヰ ゑヱ をヲ んン 一 丁 七 万-下 不 与 且 世 丘 丙 両 並 中 串 丸 丹 主 丼 " + "久 乏 乗 乙 九 乞 乱 乳 乾 亀 了 予 争 事 二 互 五 井 亜 亡 交 享-亭 人 仁 今 介 仏 仕 他 付 仙 代-以 仮 仰 仲 件 " + "任 企 伎-休 会 伝 伯 伴 伸 伺 似 但 位-佐 体 何 余 作 佳 併 使 例 侍 供 依 価 侮 侯 侵 侶 便 係 促 俊 俗 保 信 修 " + "俳 俵 俸 俺 倉 個 倍 倒 候 借 倣 値 倫 倹 偉 偏 停 健 側-偶 偽 傍 傑 傘 備 催 傲 債 傷 傾 僅 働 像 僕 僚 僧 儀 億 " + "儒 償 優 元-兆 先 光 克 免 児 党 入 全 八-六 共 兵 具 典 兼 内 円 冊 再 冒 冗 写 冠 冥 冬 冶 冷 凄 准 凍 凝 凡 処 " + "凶 凸-出 刀 刃 分-刈 刊 刑 列 初 判 別 利 到 制-刻 則 削 前 剖 剛 剣-剥 副 剰 割 創 劇 力 功 加 劣 助 努 励 労 効 " + "劾 勃 勅 勇 勉 動 勘 務 勝 募 勢 勤 勧 勲 勾 匂 包 化 北 匠 匹-医 匿 十 千 升 午 半 卑-協 南 単 博 占 印 危 即-卵 " + "卸 厄 厘 厚 原 厳 去 参 又 及-収 叔 取 受 叙 口-句 叫 召 可-右 号 司 各 合 吉 同-向 君 吟 否 含 吸 吹 呂 呈-告 周 " + "呪 味 呼 命 和 咲 咽 哀 品 員 哲 哺 唄 唆 唇 唐 唯 唱 唾 商 問 啓 善 喉 喚 喜 喝 喩-喫 営 嗅 嗣 嘆 嘱 嘲 器 噴 嚇 " + "囚 四 回 因 団 困 囲 図 固 国 圏 園 土 圧 在 地 坂 均 坊 坑 坪 垂 型 垣 埋 城 域 執 培 基 埼 堀 堂 堅 堆 堕 堤 堪 " + "報 場 塀 塁 塊 塑 塔 塗 塚 塞 塩 填 塾 境 墓 増 墜 墨 墳 墾 壁 壇 壊 壌 士 壮 声-売 変 夏 夕 外 多 夜 夢 大 天-夫 " + "央 失 奇-奉 奏 契 奔 奥 奨 奪 奮 女 奴 好 如-妄 妊 妖 妙 妥 妨 妬 妹 妻 姉 始 姓 委 姫 姻 姿 威 娘 娠 娯 婆 婚 婦 " + "婿 媒 媛 嫁 嫉 嫌 嫡 嬢 子 孔 字 存 孝 季 孤 学 孫 宅 宇-安 完 宗-宝 実 客-室 宮 宰 害-家 容 宿 寂 寄 密 富 寒 寛 " + "寝 察 寡 寧 審 寮 寸 寺 対 寿 封 専 射 将 尉-尋 導 小 少 尚 就 尺-局 居 屈 届 屋 展 属 層 履 屯 山 岐 岡 岩 岬 岳 " + "岸 峠 峡 峰 島 崇 崎 崖 崩 嵐 川 州 巡 巣 工-巨 差 己 巻 巾 市 布 帆 希 帝 帥 師 席 帯 帰 帳 常 帽 幅 幕 幣 干-年 " + "幸 幹 幻-幾 庁 広 床 序 底 店 府 度 座 庫 庭 庶-庸 廃 廉 廊 延 廷 建 弁 弄 弊 式 弐 弓-引 弟 弥-弧 弱 張 強 弾 当 " + "彙 形 彩 彫 彰 影 役 彼 往 征 径 待 律 後 徐 徒 従 得 御 復 循 微 徳 徴 徹 心 必 忌 忍 志-忙 応 忠 快 念 怒 怖 思 " + "怠 急 性 怨 怪 恋 恐 恒 恣 恥 恨 恩 恭 息 恵 悔 悟 悠 患 悦 悩 悪 悲 悼 情 惑 惜 惧 惨 惰 想 愁 愉 意 愚 愛 感 慄 " + "慈 態 慌 慎 慕 慢 慣 慨 慮 慰 慶 憂 憎 憤 憧 憩 憬 憲 憶 憾 懇 懐 懲 懸 成-戒 戚 戦 戯 戴 戸 戻 房 所 扇 扉 手 才 " + "打 払 扱 扶 批 承 技 抄 把 抑 投 抗 折 抜 択 披 抱 抵 抹 押 抽 担 拉 拍 拐 拒 拓 拘 拙 招 拝 拠 拡 括 拭 拳 拶 拷 " + "拾 持 指 挑 挙 挟 挨 挫 振 挿 捉 捕 捗 捜 捨 据 捻 掃 授 掌 排 掘 掛 採 探 接 控 推 措 掲 描 提 揚 換 握 揮 援 揺 " + "損 搬 搭 携 搾 摂 摘 摩 摯 撃 撤 撮 撲 擁 操 擦 擬 支 改 攻 放 政 故 敏 救 敗 教 敢 散 敬 数 整 敵 敷 文 斉 斎 斑 " + "斗 料 斜 斤 斥 斬 断 新 方 施 旅 旋 族 旗 既 日-早 旬 旺 昆 昇 明 易 昔 星 映 春 昧 昨 昭 是 昼 時 晩 普 景 晴 晶 " + "暁 暇 暑 暖 暗 暦 暫 暮 暴 曇 曖 曜 曲 更 書 曹 曽 替 最 月 有 服 朕 朗 望 朝 期 木 未-札 朱 朴 机 朽 杉 材 村 束 " + "条 来 杯 東 松 板 析 枕 林 枚 果 枝 枠 枢 枯 架 柄 某 染 柔 柱 柳 柵 査 柿 栃 栄 栓 校 株 核 根 格 栽 桁 桃 案 桑 " + "桜 桟 梅 梗 梨 械 棄 棋 棒 棚 棟 森 棺 椅 植 椎 検 業 極 楷 楼 楽 概 構 様 槽 標 模 権 横 樹 橋 機 欄 欠 次 欧 欲 " + "欺 款 歌 歓 止 正 武 歩 歯 歳 歴 死 殉-残 殖 殴 段 殺 殻 殿 毀 母 毎 毒 比 毛 氏 民 気 水 氷 永 氾 汁 求 汎 汗 汚 " + "江 池 汰 決 汽 沃 沈 沖 沙 没 沢 河 沸 油 治 沼 沿 況 泉 泊 泌 法 泡-泣 泥 注 泰 泳 洋 洗 洞 津 洪 活 派 流 浄 浅 " + "浜 浦 浪 浮 浴 海 浸 消 涙 涯 液 涼 淑 淡 淫 深 混 添 清 渇-渉 渋 渓 減 渡 渦 温 測 港 湖 湧 湯 湾-満 源 準 溝 溶 " + "溺 滅 滋 滑 滝 滞 滴 漁 漂 漆 漏 演 漠 漢 漫 漬 漸 潔 潜 潟 潤 潮 潰 澄 激 濁 濃 濫 濯 瀬 火 灯 灰 災 炉 炊 炎 炭 " + "点 為 烈 無 焦 然 焼 煎 煙 照 煩 煮 熊 熟 熱 燃 燥 爆 爪 爵 父 爽 片 版 牙 牛 牧 物 牲 特 犠 犬 犯 状 狂 狙 狩 独 " + "狭 猛 猟 猫 献 猶 猿 獄 獣 獲 玄 率 玉 王 玩 珍 珠 班 現 球 理 琴 瑠 璃 璧 環 璽 瓦 瓶 甘 甚 生 産 用 田-申 男 町 " + "画 界 畏 畑 畔 留 畜 畝 略 番 異 畳 畿 疎 疑 疫 疲 疾 病 症 痕 痘 痛 痢 痩 痴 瘍 療 癒 癖 発 登 白 百 的 皆 皇 皮 " + "皿 盆 益 盗 盛 盟 監 盤 目 盲 直 相 盾 省 眉 看 県 真 眠 眺 眼 着 睡 督 睦 瞬 瞭 瞳 矛 矢 知 短 矯 石 砂 研 砕 砲 " + "破 硝 硫 硬 碁 碑 確 磁 磨 礁 礎 示 礼 社 祈 祉 祖 祝 神 祥 票 祭 禁 禅 禍 福 秀 私 秋 科 秒 秘 租 秩 称 移 程 税 " + "稚 種 稲 稼 稽 稿 穀 穂 積 穏 穫 穴 究 空 突 窃 窒 窓 窟 窮 窯 立 竜 章 童 端 競 竹 笑 笛 符 第 筆 等 筋 筒 答 策 " + "箇 箋 算 管 箱 箸 節 範 築 篤 簡 簿 籍 籠 米 粉 粋 粒 粗 粘 粛 粧 精 糖 糧 糸 系 糾 紀 約 紅 紋 納 純 紙-紛 素-索 " + "紫 累 細 紳 紹 紺 終 組 経 結 絞 絡 給 統 絵 絶 絹 継 続 維 綱 網 綻 綿 緊 総 緑 緒 線 締 編 緩 緯 練 緻 縁 縄 縛 " + "縦 縫 縮 績 繁 繊 織 繕 繭 繰 缶 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 羨 義 羽 翁 翌 習 翻 翼 老 考 者 耐 耕 耗 耳 聖 " + "聞 聴 職 肉 肌 肖 肘 肝 股 肢 肥 肩 肪 肯 育 肺 胃 胆 背 胎 胞 胴 胸 能 脂 脅 脇 脈 脊 脚 脱 脳 腎 腐 腕 腫 腰 腸-" + "腺 膚 膜 膝 膨 膳 臆 臓 臣 臨 自 臭 至 致 臼 興 舌 舎 舗 舞 舟 航 般 舶 舷 船 艇 艦 良 色 艶 芋 芝 芯 花 芳 芸 芽 " + "苗 苛 若 苦 英 茂 茎 茨 茶 草 荒 荘 荷 菊 菌 菓 菜 華 萎 落 葉 著 葛 葬 蒸 蓄 蓋 蔑 蔵 蔽 薄 薦 薪-薬 藍 藤 藩 藻 " + "虎 虐 虚 虜 虞 虫 虹 蚊 蚕 蛇 蛍 蛮 蜂 蜜 融 血 衆 行 術 街 衛 衝 衡 衣 表 衰 衷 袋 袖 被 裁 裂 装 裏 裕 補 裸 製 " + "裾 複 褐 褒 襟 襲 西 要 覆 覇 見 規 視 覚 覧 親 観 角 解 触 言 訂 訃 計 討 訓 託 記 訟 訪 設 許 訳 訴 診 証 詐 詔 " + "評 詞 詠 詣 試 詩 詮 詰-詳 誇 誉 誌 認 誓 誕 誘 語 誠 誤 説 読 誰 課 調 談 請 論 諦 諧 諭 諮 諸 諾 謀 謁 謄 謎 謙 " + "講 謝 謡 謹 識 譜 警 議 譲 護 谷 豆 豊 豚 象 豪 貌 貝 貞 負-貢 貧-責 貯 貴 買 貸 費 貼 貿 賀 賂-賄 資 賊 賓 賛 賜 " + "賞 賠 賢 賦 質 賭 購 贈 赤 赦 走 赴 起 超 越 趣 足 距 跡 路 跳 践 踊 踏 踪 蹴 躍 身 車 軌 軍 軒 軟 転 軸 軽 較 載 " + "輝 輩 輪 輸 轄 辛 辞 辣 辱 農 辺 込 迅 迎 近 返 迫 迭 述 迷 追 退 送 逃 逆 透 逐 逓 途 通 逝 速 造 連 逮 週 進 逸 " + "遂 遅 遇 遊 運 遍 過 道-違 遜 遠 遡 遣 適 遭 遮 遵 遷 選 遺 避 還 那 邦 邪 邸 郊 郎 郡 部 郭 郵 郷 都 酌-酎 酒 酔 " + "酢 酪 酬 酵 酷 酸 醒 醜 醸 采 釈 里-量 金 釜 針 釣 鈍 鈴 鉄 鉛 鉢 鉱 銀 銃 銅 銘 銭 鋭 鋳 鋼 錠 錦 錬 錮 錯 録 鍋 " + "鍛 鍵 鎌 鎖 鎮 鏡 鐘 鑑 長 門 閉 開 閑 間 関 閣 閥 閲 闇 闘 阜 阪 防 阻 附 降 限 陛 院-陥 陪 陰 陳 陵 陶 陸 険 陽 " + "隅 隆 隊 階 随 隔 隙 際 障 隠 隣 隷 隻 雄-雇 雌 雑 離 難 雨 雪 雰 雲 零 雷 電 需 震 霊 霜 霧 露 青 静 非 面 革 靴 " + "韓 音 韻 響 頂 頃 項 順 須 預-頓 領 頬 頭 頻 頼 題-顎 顔 顕 願 類 顧 風 飛 食 飢 飯 飲 飼-飾 餅 養 餌 餓 館 首 香 " + "馬 駄-駆 駐 駒 騎 騒 験 騰 驚 骨 骸 髄 高 髪 鬱 鬼 魂 魅 魔 魚 鮮 鯨 鳥 鳴 鶏 鶴 鹿 麓 麗 麦 麺 麻 黄 黒 黙 鼓 鼻 " + "齢]" } ExemplarCharactersIndex{"[あ か さ た な は ま や ら わ]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} @@ -209,6 +218,7 @@ ja{ } } symbols{ + approximatelySign{"約 "} decimal{"."} exponential{"E"} group{","} @@ -235,7 +245,6 @@ ja{ native{"latn"} traditional{"jpan"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ja_JP.txt b/intl/icu/source/data/locales/ja_JP.txt index b06492bafe96..9b745b46e1a6 100644 --- a/intl/icu/source/data/locales/ja_JP.txt +++ b/intl/icu/source/data/locales/ja_JP.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja_JP{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ja_JP_TRADITIONAL.txt b/intl/icu/source/data/locales/ja_JP_TRADITIONAL.txt index df91f49fd9ef..e5317625abd1 100644 --- a/intl/icu/source/data/locales/ja_JP_TRADITIONAL.txt +++ b/intl/icu/source/data/locales/ja_JP_TRADITIONAL.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja_JP_TRADITIONAL{ - Version{"37"} calendar{ default{"japanese"} } diff --git a/intl/icu/source/data/locales/jgo.txt b/intl/icu/source/data/locales/jgo.txt index ae9d937c31da..b1bf6ed1df18 100644 --- a/intl/icu/source/data/locales/jgo.txt +++ b/intl/icu/source/data/locales/jgo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jgo{ AuxExemplarCharacters{"[e o q r x]"} ExemplarCharacters{ @@ -39,7 +40,6 @@ jgo{ } native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/jgo_CM.txt b/intl/icu/source/data/locales/jgo_CM.txt index 03a86a4a4d6b..fa0f35e28492 100644 --- a/intl/icu/source/data/locales/jgo_CM.txt +++ b/intl/icu/source/data/locales/jgo_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jgo_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/jmc.txt b/intl/icu/source/data/locales/jmc.txt index b9acb3877429..1dd354811b02 100644 --- a/intl/icu/source/data/locales/jmc.txt +++ b/intl/icu/source/data/locales/jmc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jmc{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -11,7 +12,6 @@ jmc{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/jmc_TZ.txt b/intl/icu/source/data/locales/jmc_TZ.txt index 6f1bcafbe99f..822647eea2d4 100644 --- a/intl/icu/source/data/locales/jmc_TZ.txt +++ b/intl/icu/source/data/locales/jmc_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jmc_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/jv.txt b/intl/icu/source/data/locales/jv.txt index 116c1074887d..0346af583583 100644 --- a/intl/icu/source/data/locales/jv.txt +++ b/intl/icu/source/data/locales/jv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jv{ AuxExemplarCharacters{"[f q v x z]"} Ellipsis{ @@ -156,7 +157,6 @@ jv{ } native{"java"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -352,10 +352,9 @@ jv{ 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"} + GyMMM{"MMM G y"} + GyMMMEd{"E, d MMM G y"} + GyMMMd{"d MMM G y"} H{"HH"} Hm{"HH:mm"} Hms{"HH:mm:ss"} @@ -505,44 +504,6 @@ jv{ } } intervalFormats{ - Gy{ - G{"y G– y G"} - y{"y–y G"} - } - GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} - } - GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} - } - GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} - } - GyMMMEd{ - G{"E, d MMM, y G – E, d MMM, y G"} - 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"} - } - GyMMMd{ - G{"d MMM, y G – d MMM, y G"} - M{"d MMM – d MMM, y G"} - d{"d – d MMM, y G"} - y{"d MMM, y – d MMM, y G"} - } - GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} - } H{ H{"HH – HH"} } @@ -1469,7 +1430,7 @@ jv{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/jv_ID.txt b/intl/icu/source/data/locales/jv_ID.txt index 4f653eb18b74..a01da832739f 100644 --- a/intl/icu/source/data/locales/jv_ID.txt +++ b/intl/icu/source/data/locales/jv_ID.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jv_ID{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ka.txt b/intl/icu/source/data/locales/ka.txt index 24493c9d8231..b3503340ffd4 100644 --- a/intl/icu/source/data/locales/ka.txt +++ b/intl/icu/source/data/locales/ka.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka{ AuxExemplarCharacters{ "[ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ჱ ⴡ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ჲ ⴢ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ჳ ⴣ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ჴ" @@ -192,6 +193,7 @@ ka{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{" "} @@ -221,7 +223,6 @@ ka{ native{"latn"} traditional{"geor"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ka_GE.txt b/intl/icu/source/data/locales/ka_GE.txt index 42abc843d591..44383896ec3c 100644 --- a/intl/icu/source/data/locales/ka_GE.txt +++ b/intl/icu/source/data/locales/ka_GE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka_GE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kab.txt b/intl/icu/source/data/locales/kab.txt index 184992abf6a8..857fa52d3017 100644 --- a/intl/icu/source/data/locales/kab.txt +++ b/intl/icu/source/data/locales/kab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kab{ AuxExemplarCharacters{"[o v]"} ExemplarCharacters{"[a b c č d ḍ e ɛ f g ǧ ɣ h ḥ i j k l m n p q r ṛ s ṣ t ṭ u w x y z ẓ]"} @@ -16,7 +17,6 @@ kab{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kab_DZ.txt b/intl/icu/source/data/locales/kab_DZ.txt index 47544a88c404..986784142691 100644 --- a/intl/icu/source/data/locales/kab_DZ.txt +++ b/intl/icu/source/data/locales/kab_DZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kab_DZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kam.txt b/intl/icu/source/data/locales/kam.txt index 43335a146054..8c6b8b1c74cd 100644 --- a/intl/icu/source/data/locales/kam.txt +++ b/intl/icu/source/data/locales/kam.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kam{ ExemplarCharacters{"[a b c d e f g h i ĩ j k l m n o p q r s t u ũ v 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]"} @@ -11,7 +12,6 @@ kam{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kam_KE.txt b/intl/icu/source/data/locales/kam_KE.txt index e2fe382dde33..5e6f5b8549c2 100644 --- a/intl/icu/source/data/locales/kam_KE.txt +++ b/intl/icu/source/data/locales/kam_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kam_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kde.txt b/intl/icu/source/data/locales/kde.txt index 36639a4d0d8d..0167ea44e0ea 100644 --- a/intl/icu/source/data/locales/kde.txt +++ b/intl/icu/source/data/locales/kde.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kde{ 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]"} @@ -11,7 +12,6 @@ kde{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kde_TZ.txt b/intl/icu/source/data/locales/kde_TZ.txt index b8be8fd1e35e..c7e76bbf4792 100644 --- a/intl/icu/source/data/locales/kde_TZ.txt +++ b/intl/icu/source/data/locales/kde_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kde_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kea.txt b/intl/icu/source/data/locales/kea.txt index f47279ccc171..6917c4cbd32c 100644 --- a/intl/icu/source/data/locales/kea.txt +++ b/intl/icu/source/data/locales/kea.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kea{ AuxExemplarCharacters{ "[ª á à ă â å ä ã ā æ c ç é è ĕ ê ë ẽ ē í ì ĭ î ï ĩ ī {n\u0308} º ó ò ŏ ô ö õ" @@ -141,7 +142,6 @@ kea{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -459,7 +459,7 @@ kea{ "kuarta-fera", "kinta-fera", "sesta-fera", - "sabadu", + "sábadu", } } stand-alone{ diff --git a/intl/icu/source/data/locales/kea_CV.txt b/intl/icu/source/data/locales/kea_CV.txt index be084c8c2b58..e2dac15fb5e9 100644 --- a/intl/icu/source/data/locales/kea_CV.txt +++ b/intl/icu/source/data/locales/kea_CV.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kea_CV{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/khq.txt b/intl/icu/source/data/locales/khq.txt index a1521e774550..46bda01571eb 100644 --- a/intl/icu/source/data/locales/khq.txt +++ b/intl/icu/source/data/locales/khq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml khq{ AuxExemplarCharacters{"[v]"} ExemplarCharacters{"[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]"} @@ -15,7 +16,6 @@ khq{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/khq_ML.txt b/intl/icu/source/data/locales/khq_ML.txt index d48e656d5dbb..be5af3765f93 100644 --- a/intl/icu/source/data/locales/khq_ML.txt +++ b/intl/icu/source/data/locales/khq_ML.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml khq_ML{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ki.txt b/intl/icu/source/data/locales/ki.txt index fad316694055..0a6b303a2a17 100644 --- a/intl/icu/source/data/locales/ki.txt +++ b/intl/icu/source/data/locales/ki.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ki{ AuxExemplarCharacters{"[f l p q s v x z]"} ExemplarCharacters{"[a b c d e g h i ĩ j k m n o r t u ũ w y]"} @@ -12,7 +13,6 @@ ki{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ki_KE.txt b/intl/icu/source/data/locales/ki_KE.txt index 30a01d39c0b4..cceba400378e 100644 --- a/intl/icu/source/data/locales/ki_KE.txt +++ b/intl/icu/source/data/locales/ki_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ki_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kk.txt b/intl/icu/source/data/locales/kk.txt index 87c15231fd30..292baf23bd44 100644 --- a/intl/icu/source/data/locales/kk.txt +++ b/intl/icu/source/data/locales/kk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kk{ AuxExemplarCharacters{"[]"} Ellipsis{ @@ -221,7 +222,6 @@ kk{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kk_KZ.txt b/intl/icu/source/data/locales/kk_KZ.txt index 7f1209203d8b..2fe22750536f 100644 --- a/intl/icu/source/data/locales/kk_KZ.txt +++ b/intl/icu/source/data/locales/kk_KZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kk_KZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kkj.txt b/intl/icu/source/data/locales/kkj.txt index 79cb646bd0e0..60da6e7cc818 100644 --- a/intl/icu/source/data/locales/kkj.txt +++ b/intl/icu/source/data/locales/kkj.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kkj{ AuxExemplarCharacters{"[q x z]"} ExemplarCharacters{ @@ -24,7 +25,6 @@ kkj{ } native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kkj_CM.txt b/intl/icu/source/data/locales/kkj_CM.txt index fce1470743cc..ccd925e0a7cd 100644 --- a/intl/icu/source/data/locales/kkj_CM.txt +++ b/intl/icu/source/data/locales/kkj_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kkj_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kl.txt b/intl/icu/source/data/locales/kl.txt index 7f9badab4574..fd776f30969a 100644 --- a/intl/icu/source/data/locales/kl.txt +++ b/intl/icu/source/data/locales/kl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl{ 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 æ ø å]"} @@ -23,7 +24,6 @@ kl{ } } } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kl_GL.txt b/intl/icu/source/data/locales/kl_GL.txt index 77653d793e3e..20ea94ce8185 100644 --- a/intl/icu/source/data/locales/kl_GL.txt +++ b/intl/icu/source/data/locales/kl_GL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl_GL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kln.txt b/intl/icu/source/data/locales/kln.txt index 3d487c7c3caa..715fd96501d3 100644 --- a/intl/icu/source/data/locales/kln.txt +++ b/intl/icu/source/data/locales/kln.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kln{ AuxExemplarCharacters{"[f q v x z]"} ExemplarCharacters{"[a b c d e g h i j k l m n o p r s t u w y]"} @@ -12,7 +13,6 @@ kln{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/kln_KE.txt b/intl/icu/source/data/locales/kln_KE.txt index 831151ddc591..9cf53639d766 100644 --- a/intl/icu/source/data/locales/kln_KE.txt +++ b/intl/icu/source/data/locales/kln_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kln_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/km.txt b/intl/icu/source/data/locales/km.txt index ff6b909b2a33..6cb0048f3687 100644 --- a/intl/icu/source/data/locales/km.txt +++ b/intl/icu/source/data/locales/km.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km{ AuxExemplarCharacters{"[\u17B4\u17B5\u200B \u17CC \u17CE \u17CF \u17D1 ឝ ឞ]"} Ellipsis{ @@ -15,6 +16,10 @@ km{ "ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ {អា} ឥ ឦ ឧ {ឧក} ឩ ឪ ឯ ឰ ឱ ឲ ឳ ា \u17B7 " "\u17B8 \u17B9 \u17BA \u17BB \u17BC \u17BD ើ ឿ ៀ េ ែ ៃ ោ ៅ \u17C6 ះ \u17D2]" } + ExemplarCharactersIndex{ + "[ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ ឥ" + " ឦ ឧ ឩ ឪ ឯ ឰ ឱ ឳ]" + } ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{"[\\- ‑ , ៖ ! ? . ។ ៕ ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} ៙ ៚]"} MoreInformation{"?"} @@ -178,7 +183,6 @@ km{ minimumGroupingDigits{"1"} native{"khmr"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/km_KH.txt b/intl/icu/source/data/locales/km_KH.txt index b493f4a0add4..811ca4956de9 100644 --- a/intl/icu/source/data/locales/km_KH.txt +++ b/intl/icu/source/data/locales/km_KH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km_KH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kn.txt b/intl/icu/source/data/locales/kn.txt index e4a758e3b1f0..b6f008e03546 100644 --- a/intl/icu/source/data/locales/kn.txt +++ b/intl/icu/source/data/locales/kn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kn{ AuxExemplarCharacters{"[\u200C\u200D ೞ]"} Ellipsis{ @@ -240,7 +241,6 @@ kn{ minimumGroupingDigits{"1"} native{"knda"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/kn_IN.txt b/intl/icu/source/data/locales/kn_IN.txt index 2facaaa3861a..6e603ab64f16 100644 --- a/intl/icu/source/data/locales/kn_IN.txt +++ b/intl/icu/source/data/locales/kn_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kn_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ko.txt b/intl/icu/source/data/locales/ko.txt index 6bbb88b4c4b8..b7d03a2c6179 100644 --- a/intl/icu/source/data/locales/ko.txt +++ b/intl/icu/source/data/locales/ko.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko{ AuxExemplarCharacters{ "[ᄀ-ᄒ ᅡ-ᅵ ᆨ-ᇂ 丘 串 乃 久 乖 九 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 企 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個" @@ -207,7 +208,6 @@ ko{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ availableFormats{ @@ -301,6 +301,52 @@ ko{ yyyyQQQQ{"r년(U년) QQQQ"} } cyclicNameSets{ + dayParts{ + format{ + abbreviated{ + "자", + "축", + "인", + "묘", + "진", + "사", + "오", + "미", + "신", + "유", + "술", + "해", + } + narrow{ + "자", + "축", + "인", + "묘", + "진", + "사", + "오", + "미", + "신", + "유", + "술", + "해", + } + wide{ + "자", + "축", + "인", + "묘", + "진", + "사", + "오", + "미", + "신", + "유", + "술", + "해", + } + } + } solarTerms{ format{ abbreviated{ @@ -397,6 +443,24 @@ ko{ } } } + zodiacs{ + format{ + abbreviated{ + "쥐", + "소", + "호랑이", + "토끼", + "용", + "뱀", + "말", + "양", + "원숭이", + "닭", + "개", + "돼지", + } + } + } } monthNames{ format{ @@ -916,10 +980,10 @@ ko{ Ehm{"E a h:mm"} Ehms{"E a h:mm:ss"} Gy{"G y년"} - GyMMM{"G y년 MMM월"} - GyMMMEEEEd{"G y년 MMM월 d일 EEEE"} - GyMMMEd{"G y년 MMM월 d일 (E)"} - GyMMMd{"G y년 MMM월 d일"} + GyMMM{"G y년 M월"} + GyMMMEEEEd{"G y년 M월 d일 EEEE"} + GyMMMEd{"G y년 M월 d일 (E)"} + GyMMMd{"G y년 M월 d일"} H{"H시"} HHmmss{"HH:mm:ss"} Hm{"HH:mm"} @@ -928,10 +992,10 @@ ko{ MEEEEd{"M. d. EEEE"} MEd{"M. d. (E)"} MMM{"LLL"} - MMMEEEEd{"MMM월 d일 EEEE"} - MMMEd{"MMM월 d일 (E)"} - MMMMd{"MMMM월 d일"} - MMMd{"MMM월 d일"} + MMMEEEEd{"M월 d일 EEEE"} + MMMEd{"M월 d일 (E)"} + MMMMd{"M월 d일"} + MMMd{"M월 d일"} Md{"M. d."} d{"d일"} h{"a h시"} @@ -943,11 +1007,11 @@ ko{ 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)"} - yyyyMMMM{"G y년 MMMM월"} - yyyyMMMd{"G y년 MMM월 d일"} + yyyyMMM{"G y년 M월"} + yyyyMMMEEEEd{"G y년 M월 d일 EEEE"} + yyyyMMMEd{"G y년 M월 d일 (E)"} + yyyyMMMM{"G y년 M월"} + yyyyMMMd{"G y년 M월 d일"} yyyyMd{"G y. M. d."} yyyyQQQ{"G y년 QQQ"} yyyyQQQQ{"G y년 QQQQ"} @@ -978,21 +1042,21 @@ ko{ y{"GGGGG y년 M월 d일 E요일 ~ y년 M월 d일 E요일"} } GyMMM{ - G{"G y년 MMM ~ G y년 MMM"} - M{"G y년 MMM ~ y년 MMM"} - y{"G y년 MMM ~ y년 MMM"} + G{"G y년 M월 ~ G y년 M월"} + M{"G y년 M월 ~ y년 M월"} + y{"G y년 M월 ~ y년 M월"} } GyMMMEd{ - G{"G y년 MMM d일 E요일 ~ G y년 MMM d일 E요일"} - 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요일"} + G{"G y년 M월 d일 E요일 ~ G y년 M월 d일 E요일"} + M{"G y년 M월 d일 E요일 ~ M월 d일 E요일"} + d{"G y년 M월 d일 e요일 – M월 d일 e요일"} + y{"G y년 M월 d일 E요일 ~ y년 M월 d일 E요일"} } GyMMMd{ - G{"G y년 MMM d일 ~ y년 MMM d일"} - M{"G y년 MMM d일 ~ MMM d일"} - d{"G y년 MMM d일 ~ d일"} - y{"G y년 MMM d일 ~ MMM y년 d일"} + G{"G y년 M월 d일 ~ y년 M월 d일"} + M{"G y년 M월 d일 ~ M월 d일"} + d{"G y년 M월 d일 ~ d일"} + y{"G y년 M월 d일 ~ y년 M월 d일"} } GyMd{ G{"GGGGG y년 M월 d일 ~ GGGGG y년 M월 d일"} @@ -1022,7 +1086,7 @@ ko{ d{"M. d (E) ~ M. d (E)"} } MMM{ - M{"MMM ~ MMM"} + M{"M월 ~ M월"} } MMMEEEEd{ M{"M월 d일 EEEE ~ M월 d일 EEEE"} diff --git a/intl/icu/source/data/locales/ko_KP.txt b/intl/icu/source/data/locales/ko_KP.txt index 3accb54e2158..fff263bf25b1 100644 --- a/intl/icu/source/data/locales/ko_KP.txt +++ b/intl/icu/source/data/locales/ko_KP.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko_KP{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ko_KR.txt b/intl/icu/source/data/locales/ko_KR.txt index f146ba53664e..c8d2aeaee3d1 100644 --- a/intl/icu/source/data/locales/ko_KR.txt +++ b/intl/icu/source/data/locales/ko_KR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko_KR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kok.txt b/intl/icu/source/data/locales/kok.txt index ca2c7c75f12e..c979bcb1616b 100644 --- a/intl/icu/source/data/locales/kok.txt +++ b/intl/icu/source/data/locales/kok.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kok{ AuxExemplarCharacters{"[\u200C\u200D]"} ExemplarCharacters{ @@ -190,7 +191,6 @@ kok{ minimumGroupingDigits{"1"} native{"deva"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -200,7 +200,7 @@ kok{ "h:mm a", "EEEE d MMMM y G", "d MMMM y G", - "dd-MM-y G", + "d-M-y G", "d-M-y GGGGG", "{1} {0}", "{1} {0}", @@ -228,12 +228,12 @@ kok{ Hm{"HH:mm"} Hms{"HH:mm:ss"} M{"L"} - MEd{"E, dd-MM"} + MEd{"E, d-M"} MMM{"LLL"} MMMEd{"E d, MMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - Md{"dd-MM"} + Md{"d-M"} d{"d"} h{"h a"} hm{"h:mm a"} @@ -241,13 +241,13 @@ kok{ ms{"mm:ss"} y{"y G"} yyyy{"y G"} - yyyyM{"MM-y GGGG"} + yyyyM{"M-y GGGG"} 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"} + yyyyMd{"d-M-y GGGGG"} yyyyQQQ{"QQQ y G"} yyyyQQQQ{"QQQQ y G"} } @@ -266,14 +266,14 @@ kok{ y{"y–y G"} } GyM{ - G{"MM-yGGGG – MM-y GGGG"} - M{"MM-y GGGGG – MM y"} - y{"MM-y GGGGG – MM-y"} + G{"M-y GGGG – M-y GGGG"} + M{"M-y GGGGG – M y"} + y{"M-y GGGGG – M-y"} } GyMEd{ - G{"E, dd-MM-y GGGGG – E, dd-MM-y GGGGG"} - M{"E,dd-MM-y GGGGG – E, dd-MM-y"} - d{"E, dd-MM-Y GGGGG – E-dd-MM-y"} + G{"E, d-M-y GGGGG – E, d-M-y GGGGG"} + M{"E, d-M-y GGGGG – E, d-M-y"} + d{"E, d-M-Y GGGGG – E-d-M-y"} y{"E,dd-MM-y GGGGG – E,dd-MM-y"} } GyMMM{ @@ -294,17 +294,17 @@ kok{ y{"d MMM y G – d MMM y"} } GyMd{ - G{"dd-MM-y GGGGG – dd-MM-Y GGGGG"} - M{"dd-MM-y GGGGG – dd-MM-y"} - d{"dd-MM-y GGGGG – dd-MM-y"} + G{"d-M-y GGGGG – d-M-Y GGGGG"} + M{"d-M-y GGGGG – d-M-y"} + d{"d-M-y GGGGG – d-M-y"} y{"d-M-y – d-M-y GGGGG"} } M{ - M{"MM–MM"} + M{"M–M"} } MEd{ - M{"E, dd-MM, E dd-MM"} - d{"E, d/M – E, d/M"} + M{"E, d-M, E d-M"} + d{"E, d-M – E, d-M"} } MMM{ M{"MMM–MMM"} @@ -318,8 +318,8 @@ kok{ d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M–d/M"} + M{"d-M – d-M"} + d{"d-M – d-M"} } d{ d{"d–d"} @@ -329,7 +329,7 @@ kok{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} + M{"M-y – M-y GGGGG"} y{"M/y – M/y GGGGG"} } yMEd{ @@ -356,8 +356,8 @@ kok{ y{"d, MMM y – d, MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} + M{"d-M-y – d-M-y GGGGG"} + d{"d-M-y – d-M-y GGGGG"} y{"d/M/y – d/M/y GGGGG"} } } @@ -382,7 +382,7 @@ kok{ "h:mm a", "EEEE d MMMM y", "d MMMM y", - "dd-MM-y", + "d-MMM-y", "d-M-yy", "{1} {0}", "{1} {0}", @@ -415,15 +415,15 @@ kok{ Hmsv{"HH:mm:ss v"} Hmv{"HH:mm v"} M{"L"} - MEd{"MM-dd, E"} + MEd{"d-M, E"} MMM{"LLL"} - MMMEd{"MMM d, E"} + MMMEd{"E, d MMM"} MMMMW{ other{"'week' W 'of' MMMM"} } - MMMMd{"MMMM d"} + MMMMd{"d MMMM"} MMMd{"MMM d"} - Md{"MM-dd"} + Md{"d-M"} d{"d"} h{"h a"} hm{"h:mm a"} @@ -432,13 +432,13 @@ kok{ hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} - yM{"y-MM"} + yM{"M-y"} yMEd{"d-M-y, E"} yMMM{"y MMM"} yMMMEd{"y MMM d, E"} yMMMM{"MMMM, y"} yMMMd{"y MMM d"} - yMd{"y-MM-dd"} + yMd{"d-M-y"} yQQQ{"y QQQ"} yQQQQ{"y QQQQ"} yw{ @@ -572,15 +572,15 @@ kok{ y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG M-y – GGGGG M-y"} + M{"GGGGG M-y – M-y"} + y{"GGGGG M-y – M-y"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - 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"} + G{"GGGGG d-M-y, E – GGGGG d-M-y, E"} + M{"GGGGG d-M-y, E – d-M-y, E"} + d{"GGGGG d-M-y, E – d-M-y, E"} + y{"GGGGG d-M-y, E – d-M-y, E"} } GyMMM{ G{"G y MMM – G y MMM"} @@ -600,10 +600,10 @@ kok{ y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG d-M-y – GGGGG d-M-y"} + M{"GGGGG d-M-y – d-M-y"} + d{"GGGGG d-M-y – d-M-y"} + y{"GGGGG d-M-y – d-M-y"} } H{ H{"HH–HH"} @@ -620,11 +620,11 @@ kok{ H{"HH–HH v"} } M{ - M{"MM–MM"} + M{"M–M"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"d-M, E – d-M, E"} + d{"d-M, E – d-M, E"} } MMM{ M{"MMM – MMM"} @@ -638,8 +638,8 @@ kok{ d{"MMM d–d"} } Md{ - M{"dd-MM –dd-MM"} - d{"dd-MM –dd-MM"} + M{"d-M –d-M"} + d{"d-M –d-M"} } d{ d{"d–d"} @@ -667,13 +667,13 @@ kok{ y{"y–y"} } yM{ - M{"MM-y – MM-y"} - y{"MM-y – MM-y"} + M{"M-y – M-y"} + y{"M-y – M-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"} + 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{"MMM–MMM y"} @@ -694,9 +694,9 @@ kok{ 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"} + M{"d-M-y – d-M-y"} + d{"d-M-y – d-M-y"} + y{"d-M-y – d-M-y"} } } monthNames{ @@ -705,7 +705,7 @@ kok{ "जानेवारी", "फेब्रुवारी", "मार्च", - "एप्रिल", + "एप्रील", "मे", "जून", "जुलय", @@ -733,7 +733,7 @@ kok{ "जानेवारी", "फेब्रुवारी", "मार्च", - "एप्रिल", + "एप्रील", "मे", "जून", "जुलय", @@ -777,7 +777,7 @@ kok{ "जानेवारी", "फेब्रुवारी", "मार्च", - "एप्रिल", + "एप्रील", "मे", "जून", "जुलय", @@ -1602,10 +1602,14 @@ kok{ or-narrow{ 2{"{0} वा {1}"} end{"{0}, वा {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} } or-short{ 2{"{0} वा {1}"} end{"{0}, वा {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} } standard{ 2{"{0}, {1}"} @@ -1615,15 +1619,34 @@ kok{ } standard-narrow{ 2{"{0}, {1}"} + end{"{0}, {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} } standard-short{ 2{"{0} & {1}"} + end{"{0}, & {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } + unit{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} } unit-narrow{ + 2{"{0} {1}"} end{"{0} {1}"} middle{"{0} {1}"} start{"{0} {1}"} } + unit-short{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } } measurementSystemNames{ UK{"युके"} diff --git a/intl/icu/source/data/locales/kok_IN.txt b/intl/icu/source/data/locales/kok_IN.txt index 215e6b115f84..5f188638e4f7 100644 --- a/intl/icu/source/data/locales/kok_IN.txt +++ b/intl/icu/source/data/locales/kok_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kok_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ks.txt b/intl/icu/source/data/locales/ks.txt index d8cad3eb9e90..293d67425514 100644 --- a/intl/icu/source/data/locales/ks.txt +++ b/intl/icu/source/data/locales/ks.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks{ AuxExemplarCharacters{"[\u200E\u200F \u064E \u064F \u0650 \u0654 \u0655 \u065F \u0656 \u0657]"} ExemplarCharacters{ @@ -36,7 +37,6 @@ ks{ } native{"arabext"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ks_Arab.txt b/intl/icu/source/data/locales/ks_Arab.txt index aafa093f1849..f3d2206e1162 100644 --- a/intl/icu/source/data/locales/ks_Arab.txt +++ b/intl/icu/source/data/locales/ks_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ks_Arab_IN.txt b/intl/icu/source/data/locales/ks_Arab_IN.txt index b70e84922c1b..6e9470ecfc23 100644 --- a/intl/icu/source/data/locales/ks_Arab_IN.txt +++ b/intl/icu/source/data/locales/ks_Arab_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_Arab_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ks_IN.txt b/intl/icu/source/data/locales/ks_IN.txt index fd8b52d9b4a2..bd1a22537a8f 100644 --- a/intl/icu/source/data/locales/ks_IN.txt +++ b/intl/icu/source/data/locales/ks_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_IN{ "%%ALIAS"{"ks_Arab_IN"} } diff --git a/intl/icu/source/data/locales/ksb.txt b/intl/icu/source/data/locales/ksb.txt index 03810d2397c4..9106a6ad70c2 100644 --- a/intl/icu/source/data/locales/ksb.txt +++ b/intl/icu/source/data/locales/ksb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksb{ AuxExemplarCharacters{"[q r x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p s t u v w y z]"} @@ -11,7 +12,6 @@ ksb{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ksb_TZ.txt b/intl/icu/source/data/locales/ksb_TZ.txt index 89ccd5074655..4868041ce5ca 100644 --- a/intl/icu/source/data/locales/ksb_TZ.txt +++ b/intl/icu/source/data/locales/ksb_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksb_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ksf.txt b/intl/icu/source/data/locales/ksf.txt index 24ab9db98261..5210cccb08a3 100644 --- a/intl/icu/source/data/locales/ksf.txt +++ b/intl/icu/source/data/locales/ksf.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksf{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{ @@ -20,7 +21,6 @@ ksf{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ksf_CM.txt b/intl/icu/source/data/locales/ksf_CM.txt index dede4a0ff2d3..b424f3cf3c2f 100644 --- a/intl/icu/source/data/locales/ksf_CM.txt +++ b/intl/icu/source/data/locales/ksf_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksf_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ksh.txt b/intl/icu/source/data/locales/ksh.txt index acdc8c6a4ccc..287689d76ef1 100644 --- a/intl/icu/source/data/locales/ksh.txt +++ b/intl/icu/source/data/locales/ksh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksh{ AuxExemplarCharacters{"[á à ă â ã ā ç é è ĕ ê ē ğ í ì ĭ î ï ī ij ı ł ñ ó ò ŏ ô ø ō ú ù ŭ û ū ÿ]"} 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]"} @@ -161,7 +162,6 @@ ksh{ } native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ksh_DE.txt b/intl/icu/source/data/locales/ksh_DE.txt index 09f8ae43dc70..6240c6b57213 100644 --- a/intl/icu/source/data/locales/ksh_DE.txt +++ b/intl/icu/source/data/locales/ksh_DE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksh_DE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ku.txt b/intl/icu/source/data/locales/ku.txt index 1927899839b2..bc0ac320bd68 100644 --- a/intl/icu/source/data/locales/ku.txt +++ b/intl/icu/source/data/locales/ku.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ku{ AuxExemplarCharacters{"[á à ă â å ä ã ā æ è ĕ ë ē é ì ĭ ï ī í ñ ó ò ŏ ô ø ō œ ß ù ŭ ū ú ÿ]"} Ellipsis{ @@ -50,7 +51,6 @@ ku{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -604,7 +604,7 @@ ku{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/ku_TR.txt b/intl/icu/source/data/locales/ku_TR.txt index 9c1dad683fff..cd79183825bd 100644 --- a/intl/icu/source/data/locales/ku_TR.txt +++ b/intl/icu/source/data/locales/ku_TR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ku_TR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/kw.txt b/intl/icu/source/data/locales/kw.txt index 1a77d60777d5..4a3f43609a81 100644 --- a/intl/icu/source/data/locales/kw.txt +++ b/intl/icu/source/data/locales/kw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kw{ 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]"} NumberElements{ @@ -9,7 +10,6 @@ kw{ } } } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/kw_GB.txt b/intl/icu/source/data/locales/kw_GB.txt index 9498880dc403..9e0becb21692 100644 --- a/intl/icu/source/data/locales/kw_GB.txt +++ b/intl/icu/source/data/locales/kw_GB.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kw_GB{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ky.txt b/intl/icu/source/data/locales/ky.txt index 02bfdb1a2a00..d82c9b04c753 100644 --- a/intl/icu/source/data/locales/ky.txt +++ b/intl/icu/source/data/locales/ky.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky{ AuxExemplarCharacters{"[в ф ц щ ь]"} Ellipsis{ @@ -214,7 +215,6 @@ ky{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -841,7 +841,7 @@ ky{ } } characterLabel{ - activities{"аракеттер"} + activities{"аракет"} african_scripts{"африка жазуулары"} american_scripts{"америка жазуулары"} animal{"жаныбар"} @@ -851,10 +851,10 @@ ky{ box_drawing{"кутуча чийүү"} braille{"Брайль"} building{"имарат"} - bullets_stars{"маркерлер/жылдызчалар"} + bullets_stars{"маркер же жылдызча"} consonantal_jamo{"үнсүз жамо"} currency_symbols{"валюта белгилери"} - dash_connector{"тире/байламта"} + dash_connector{"тире же байламта"} digits{"сандар"} dingbats{"полиграфиялык белгилер"} divination_symbols{"төлгө белгиси"} @@ -869,9 +869,9 @@ ky{ food_drink{"тамак-аш жана суусундуктар"} format{"формат"} format_whitespace{"формат жана боштук"} - full_width_form_variant{"Толук жазы формасынын варианттары"} + full_width_form_variant{"толук жазы формасынын варианттары"} geometric_shapes{"геометриялык фигуралар"} - half_width_form_variant{"Жарым жазы формасынын варианттары"} + half_width_form_variant{"жарым жазы формасынын варианттары"} han_characters{"Хань белгилери"} han_radicals{"Хань уңгулары"} hanja{"Ханья"} @@ -1764,10 +1764,16 @@ ky{ listPattern{ or{ 2{"{0} же {1}"} - end{"{0}, же {1}"} + end{"{0} же {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } + or-narrow{ + end{"{0} же {1}"} + } + or-short{ + end{"{0} же {1}"} + } standard{ 2{"{0} жана {1}"} end{"{0} жана {1}"} diff --git a/intl/icu/source/data/locales/ky_KG.txt b/intl/icu/source/data/locales/ky_KG.txt index 2dd91eb8d3d7..523eec073d85 100644 --- a/intl/icu/source/data/locales/ky_KG.txt +++ b/intl/icu/source/data/locales/ky_KG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky_KG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lag.txt b/intl/icu/source/data/locales/lag.txt index 903125d1cf98..9b1a2f8dd779 100644 --- a/intl/icu/source/data/locales/lag.txt +++ b/intl/icu/source/data/locales/lag.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lag{ 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]"} - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/lag_TZ.txt b/intl/icu/source/data/locales/lag_TZ.txt index 8f46d665ac22..2fe5079f60c1 100644 --- a/intl/icu/source/data/locales/lag_TZ.txt +++ b/intl/icu/source/data/locales/lag_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lag_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lb.txt b/intl/icu/source/data/locales/lb.txt index c91831d391fa..8d38b23b7a71 100644 --- a/intl/icu/source/data/locales/lb.txt +++ b/intl/icu/source/data/locales/lb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb{ AuxExemplarCharacters{ "[á à ă â å ã ā æ ç è ĕ ê ē ğ í ì ĭ î ï İ ī ı ñ ó ò ŏ ô ö ø ō œ ş ß ú ù ŭ û ü" @@ -156,7 +157,6 @@ lb{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/lb_LU.txt b/intl/icu/source/data/locales/lb_LU.txt index f9a89f3568c1..7706eed72a7f 100644 --- a/intl/icu/source/data/locales/lb_LU.txt +++ b/intl/icu/source/data/locales/lb_LU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb_LU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lg.txt b/intl/icu/source/data/locales/lg.txt index 381f65a8675f..8afc697a76fe 100644 --- a/intl/icu/source/data/locales/lg.txt +++ b/intl/icu/source/data/locales/lg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lg{ AuxExemplarCharacters{"[h q x]"} ExemplarCharacters{"[a b c d e f g i j k l m n {ny} ŋ o p r s t u v w y z]"} @@ -11,7 +12,6 @@ lg{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/lg_UG.txt b/intl/icu/source/data/locales/lg_UG.txt index d91e4462e158..63f26f4e92b1 100644 --- a/intl/icu/source/data/locales/lg_UG.txt +++ b/intl/icu/source/data/locales/lg_UG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lg_UG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lkt.txt b/intl/icu/source/data/locales/lkt.txt index d2d0edcdbf5b..21263dab6da3 100644 --- a/intl/icu/source/data/locales/lkt.txt +++ b/intl/icu/source/data/locales/lkt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lkt{ AuxExemplarCharacters{"[c d f {ȟʼ} j q r {sʼ} {šʼ} v x]"} ExemplarCharacters{ @@ -9,7 +10,6 @@ lkt{ ExemplarCharactersIndex{"[A B Č E G Ǧ H Ȟ I K L M N Ŋ O P S Š T U W Y Z Ž]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . \u0022 “ ” ( ) \\[ \\] @ * / \\& #]"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/lkt_US.txt b/intl/icu/source/data/locales/lkt_US.txt index d4aea4a2f8f2..5a26d8595bf6 100644 --- a/intl/icu/source/data/locales/lkt_US.txt +++ b/intl/icu/source/data/locales/lkt_US.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lkt_US{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ln.txt b/intl/icu/source/data/locales/ln.txt index 4dd12bf1c78a..001f592c1f82 100644 --- a/intl/icu/source/data/locales/ln.txt +++ b/intl/icu/source/data/locales/ln.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln{ AuxExemplarCharacters{"[j q x]"} ExemplarCharacters{ @@ -24,7 +25,6 @@ ln{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ln_AO.txt b/intl/icu/source/data/locales/ln_AO.txt index 1a0486f8c200..329725ef9b3e 100644 --- a/intl/icu/source/data/locales/ln_AO.txt +++ b/intl/icu/source/data/locales/ln_AO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln_AO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ln_CD.txt b/intl/icu/source/data/locales/ln_CD.txt index f433b575c754..e4a4b8b5d77a 100644 --- a/intl/icu/source/data/locales/ln_CD.txt +++ b/intl/icu/source/data/locales/ln_CD.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln_CD{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ln_CF.txt b/intl/icu/source/data/locales/ln_CF.txt index aac62c4b4167..437ec2cea08e 100644 --- a/intl/icu/source/data/locales/ln_CF.txt +++ b/intl/icu/source/data/locales/ln_CF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln_CF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ln_CG.txt b/intl/icu/source/data/locales/ln_CG.txt index b8b83440bebe..9d07a2b446e9 100644 --- a/intl/icu/source/data/locales/ln_CG.txt +++ b/intl/icu/source/data/locales/ln_CG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln_CG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lo.txt b/intl/icu/source/data/locales/lo.txt index f4122181d559..c4d57c7fb7ef 100644 --- a/intl/icu/source/data/locales/lo.txt +++ b/intl/icu/source/data/locales/lo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo{ AuxExemplarCharacters{"[\u200B ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙]"} Ellipsis{ @@ -249,12 +250,11 @@ lo{ nan{"ບໍ່​ແມ່ນ​ໂຕ​ເລກ"} perMille{"‰"} percentSign{"%"} - superscriptingExponent{"×"} } } minimalPairs{ ordinal{ - one{"ລ້ຽວຂວາທຳອິດ."} + one{"ລ້ຽວຂວາໂຕທີ {0}."} other{"ລ້ຽວຂວາທີ {0}."} } plural{ @@ -263,8 +263,14 @@ lo{ } native{"laoo"} } - Version{"37"} calendar{ + buddhist{ + eras{ + abbreviated{ + "ພ.ສ.", + } + } + } chinese{ DateTimePatterns{ "H ໂມງ m ນາທີ ss ວິນາທີ zzzz", @@ -2088,7 +2094,7 @@ lo{ sport{"ກິລາ"} symbols{"ສັນຍາລັກ"} technical_symbols{"ສັນຍາລັກທາງເຕັກນິກ"} - tone_marks{"ັວັນນະຍຸດ"} + tone_marks{"ວັນນະຍຸດ"} travel{"ທ່ອງທ່ຽວ"} travel_places{"ທ່ອງທ່ຽວ ແລະ ສະຖານທີ່ຕ່າງໆ"} upwards_arrows{"ລູກສອນຊີ້ຂຶ້ນເທິງ"} @@ -2780,9 +2786,12 @@ lo{ end{"{0}, {1}"} start{"{0}, {1}"} } + standard-narrow{ + end{"{0}, {1}"} + } standard-short{ 2{"{0} ແລະ {1}"} - end{"{0}, {1}"} + end{"{0} ແລະ {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } diff --git a/intl/icu/source/data/locales/lo_LA.txt b/intl/icu/source/data/locales/lo_LA.txt index 3ae3c66d76ad..a9c753de59d1 100644 --- a/intl/icu/source/data/locales/lo_LA.txt +++ b/intl/icu/source/data/locales/lo_LA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo_LA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lrc.txt b/intl/icu/source/data/locales/lrc.txt index 94879ceb4137..6dc5a277a88a 100644 --- a/intl/icu/source/data/locales/lrc.txt +++ b/intl/icu/source/data/locales/lrc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc{ AuxExemplarCharacters{ "[\u200B\u200C\u200D\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 " @@ -36,7 +37,6 @@ lrc{ } native{"arabext"} } - Version{"37"} calendar{ default{"persian"} generic{ diff --git a/intl/icu/source/data/locales/lrc_IQ.txt b/intl/icu/source/data/locales/lrc_IQ.txt index f063fb584f43..552ace5835d5 100644 --- a/intl/icu/source/data/locales/lrc_IQ.txt +++ b/intl/icu/source/data/locales/lrc_IQ.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc_IQ{ - Version{"37"} calendar{ default{"gregorian"} gregorian{ diff --git a/intl/icu/source/data/locales/lrc_IR.txt b/intl/icu/source/data/locales/lrc_IR.txt index b10e358520a9..24136e017c08 100644 --- a/intl/icu/source/data/locales/lrc_IR.txt +++ b/intl/icu/source/data/locales/lrc_IR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc_IR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lt.txt b/intl/icu/source/data/locales/lt.txt index 66cda50b43fd..39c498605711 100644 --- a/intl/icu/source/data/locales/lt.txt +++ b/intl/icu/source/data/locales/lt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt{ AuxExemplarCharacters{ "[á à ã {ą\u0301} {ą\u0303} {ch} {dz} {dž} é è ẽ {ę\u0301} {ę\u0303} {ė" @@ -264,6 +265,7 @@ lt{ } } symbols{ + approximatelySign{"∼"} decimal{","} exponential{"×10^"} group{" "} @@ -292,7 +294,6 @@ lt{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/lt_LT.txt b/intl/icu/source/data/locales/lt_LT.txt index 52c3f0808180..133c8e51e3bf 100644 --- a/intl/icu/source/data/locales/lt_LT.txt +++ b/intl/icu/source/data/locales/lt_LT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt_LT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lu.txt b/intl/icu/source/data/locales/lu.txt index a0df6a0d595c..c4fb7a871f8c 100644 --- a/intl/icu/source/data/locales/lu.txt +++ b/intl/icu/source/data/locales/lu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lu{ AuxExemplarCharacters{"[g r x]"} ExemplarCharacters{ @@ -20,7 +21,6 @@ lu{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/lu_CD.txt b/intl/icu/source/data/locales/lu_CD.txt index 3973482f00a0..3be2b06003ea 100644 --- a/intl/icu/source/data/locales/lu_CD.txt +++ b/intl/icu/source/data/locales/lu_CD.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lu_CD{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/luo.txt b/intl/icu/source/data/locales/luo.txt index 3f6d317722c2..1bb88456083e 100644 --- a/intl/icu/source/data/locales/luo.txt +++ b/intl/icu/source/data/locales/luo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luo{ AuxExemplarCharacters{"[q x z]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y]"} @@ -11,7 +12,6 @@ luo{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/luo_KE.txt b/intl/icu/source/data/locales/luo_KE.txt index eb69e30d522e..5656fa70df3b 100644 --- a/intl/icu/source/data/locales/luo_KE.txt +++ b/intl/icu/source/data/locales/luo_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luo_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/luy.txt b/intl/icu/source/data/locales/luy.txt index d10739b59ae6..415e393ca386 100644 --- a/intl/icu/source/data/locales/luy.txt +++ b/intl/icu/source/data/locales/luy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luy{ 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]"} @@ -10,7 +11,6 @@ luy{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/luy_KE.txt b/intl/icu/source/data/locales/luy_KE.txt index 90cd0b33361e..fa40efe4102e 100644 --- a/intl/icu/source/data/locales/luy_KE.txt +++ b/intl/icu/source/data/locales/luy_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luy_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/lv.txt b/intl/icu/source/data/locales/lv.txt index f8cd0e9921db..05ca80f8ee54 100644 --- a/intl/icu/source/data/locales/lv.txt +++ b/intl/icu/source/data/locales/lv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv{ AuxExemplarCharacters{"[y ō q ŗ w x]"} Ellipsis{ @@ -251,7 +252,6 @@ lv{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -767,7 +767,7 @@ lv{ } stand-alone{ abbreviated{ - afternoon1{"pēcpusdiena"} + afternoon1{"pēcpusd."} am{"priekšp."} evening1{"vakars"} midnight{"pusnakts"} @@ -1351,7 +1351,7 @@ lv{ currency_symbols{"valūtu simboli"} dash_connector{"svītras un savienotāji"} digits{"cipari"} - dingbats{"drukas ornamenti"} + dingbats{"dekorzīme"} divination_symbols{"okultie simboli"} downwards_arrows{"lejupvērstās bultiņas"} downwards_upwards_arrows{"lejupvērstās un augšupvērstās bultiņas"} @@ -1647,7 +1647,7 @@ lv{ } } minute-short{ - dn{"min."} + dn{"min"} relativeTime{ future{ one{"pēc {0} min."} diff --git a/intl/icu/source/data/locales/lv_LV.txt b/intl/icu/source/data/locales/lv_LV.txt index aeafcf26727a..9a76f9ac755c 100644 --- a/intl/icu/source/data/locales/lv_LV.txt +++ b/intl/icu/source/data/locales/lv_LV.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv_LV{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mai.txt b/intl/icu/source/data/locales/mai.txt index d02242e4d859..5843b8903227 100644 --- a/intl/icu/source/data/locales/mai.txt +++ b/intl/icu/source/data/locales/mai.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mai{ AuxExemplarCharacters{"[अ {अ\u0902} {अः} आ इ ई उ ऊ ऋ ऌ ॡ ए ऐ ओ औ]"} ExemplarCharacters{ @@ -24,7 +25,6 @@ mai{ } native{"deva"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mai_IN.txt b/intl/icu/source/data/locales/mai_IN.txt index c366fd08455d..bd25db365427 100644 --- a/intl/icu/source/data/locales/mai_IN.txt +++ b/intl/icu/source/data/locales/mai_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mai_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mas.txt b/intl/icu/source/data/locales/mas.txt index b831f466b2ed..51b369dcf565 100644 --- a/intl/icu/source/data/locales/mas.txt +++ b/intl/icu/source/data/locales/mas.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas{ AuxExemplarCharacters{"[f q v x z]"} ExemplarCharacters{ @@ -15,7 +16,6 @@ mas{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mas_KE.txt b/intl/icu/source/data/locales/mas_KE.txt index 7c5d2528d9da..b1fbc0fe8e15 100644 --- a/intl/icu/source/data/locales/mas_KE.txt +++ b/intl/icu/source/data/locales/mas_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mas_TZ.txt b/intl/icu/source/data/locales/mas_TZ.txt index fab4ecfc0b5d..52459c11d0d0 100644 --- a/intl/icu/source/data/locales/mas_TZ.txt +++ b/intl/icu/source/data/locales/mas_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mer.txt b/intl/icu/source/data/locales/mer.txt index e9b459212fcc..6b47f30ae872 100644 --- a/intl/icu/source/data/locales/mer.txt +++ b/intl/icu/source/data/locales/mer.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mer{ 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]"} @@ -11,7 +12,6 @@ mer{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mer_KE.txt b/intl/icu/source/data/locales/mer_KE.txt index 7eb691953a3c..58f75f7bb73d 100644 --- a/intl/icu/source/data/locales/mer_KE.txt +++ b/intl/icu/source/data/locales/mer_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mer_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mfe.txt b/intl/icu/source/data/locales/mfe.txt index 508d7c5f7812..67c863b8080c 100644 --- a/intl/icu/source/data/locales/mfe.txt +++ b/intl/icu/source/data/locales/mfe.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mfe{ ExemplarCharacters{"[a b c d e f g h i j k l m n o p 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 R S T U V W X Y Z]"} @@ -11,7 +12,6 @@ mfe{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mfe_MU.txt b/intl/icu/source/data/locales/mfe_MU.txt index ef85ca76459f..347ef604fb5f 100644 --- a/intl/icu/source/data/locales/mfe_MU.txt +++ b/intl/icu/source/data/locales/mfe_MU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mfe_MU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mg.txt b/intl/icu/source/data/locales/mg.txt index bf7dee54d14a..3367be157392 100644 --- a/intl/icu/source/data/locales/mg.txt +++ b/intl/icu/source/data/locales/mg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mg{ AuxExemplarCharacters{"[c q u w x]"} ExemplarCharacters{"[a à â b d e é è ê ë f g h i ì î ï j k l m n ñ o ô p r s t v y z]"} @@ -33,7 +34,6 @@ mg{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mg_MG.txt b/intl/icu/source/data/locales/mg_MG.txt index 2d0c28600104..7ce09fc1ebe5 100644 --- a/intl/icu/source/data/locales/mg_MG.txt +++ b/intl/icu/source/data/locales/mg_MG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mg_MG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mgh.txt b/intl/icu/source/data/locales/mgh.txt index 808d4f214d93..b7ef4d167527 100644 --- a/intl/icu/source/data/locales/mgh.txt +++ b/intl/icu/source/data/locales/mgh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgh{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -13,7 +14,6 @@ mgh{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mgh_MZ.txt b/intl/icu/source/data/locales/mgh_MZ.txt index 69ec06578c21..f0cdaeacec0c 100644 --- a/intl/icu/source/data/locales/mgh_MZ.txt +++ b/intl/icu/source/data/locales/mgh_MZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgh_MZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mgo.txt b/intl/icu/source/data/locales/mgo.txt index 05d9d09ccbb8..7391d0bf8cf4 100644 --- a/intl/icu/source/data/locales/mgo.txt +++ b/intl/icu/source/data/locales/mgo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgo{ AuxExemplarCharacters{"[c h l q v x]"} Ellipsis{ @@ -39,7 +40,6 @@ mgo{ } native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mgo_CM.txt b/intl/icu/source/data/locales/mgo_CM.txt index dc3a1207c719..48ccfc8f6216 100644 --- a/intl/icu/source/data/locales/mgo_CM.txt +++ b/intl/icu/source/data/locales/mgo_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgo_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mi.txt b/intl/icu/source/data/locales/mi.txt index 4d2d4d9a1553..e272a434d109 100644 --- a/intl/icu/source/data/locales/mi.txt +++ b/intl/icu/source/data/locales/mi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mi{ AuxExemplarCharacters{"[b c d f g j l q s v x y z]"} ExemplarCharacters{"[a ā e ē h i ī k m n {ng} o ō p r t u ū w {wh}]"} @@ -149,7 +150,6 @@ mi{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -266,6 +266,8 @@ mi{ E{"ccc"} EBhm{"E h:mm B"} EBhms{"E h:mm:ss B"} + EHm{"E HH:mm"} + EHms{"E HH:mm:ss"} Ed{"E, d"} Ehm{"E h:mm a"} Ehms{"E h:mm:ss a"} @@ -273,6 +275,11 @@ mi{ GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} GyMMMd{"d MMM y G"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} + Hmsv{"HH:mm:ss v"} + Hmv{"HH:mm v"} M{"L"} MEd{"E, dd-MM"} MMM{"LLL"} @@ -289,6 +296,7 @@ mi{ hms{"h:mm:ss a"} hmsv{"h:mm:ss a v"} hmv{"h:mm a v"} + ms{"mm:ss"} y{"y"} yM{"MM-y"} yMEd{"E, dd-MM-y"} diff --git a/intl/icu/source/data/locales/mi_NZ.txt b/intl/icu/source/data/locales/mi_NZ.txt index dd6be2953cf1..efbb148670d6 100644 --- a/intl/icu/source/data/locales/mi_NZ.txt +++ b/intl/icu/source/data/locales/mi_NZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mi_NZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mk.txt b/intl/icu/source/data/locales/mk.txt index e600263a169b..c1866cd7ca6a 100644 --- a/intl/icu/source/data/locales/mk.txt +++ b/intl/icu/source/data/locales/mk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk{ AuxExemplarCharacters{"[ѐ ѝ]"} Ellipsis{ @@ -186,6 +187,7 @@ mk{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{"."} @@ -214,7 +216,6 @@ mk{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -728,11 +729,11 @@ mk{ "d MMMM y", "d.M.y", "d.M.yy", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, 'во' {0}", + "{1}, 'во' {0}", + "{1}, 'во' {0}", + "{1}, 'во' {0}", + "{1}, 'во' {0}", } appendItems{ Timezone{"{0} {1}"} @@ -789,8 +790,8 @@ mk{ yQQQ{"QQQ y 'г'."} yQQQQ{"QQQQ y 'г'."} yw{ - one{"w 'седмица' 'од' Y"} - other{"w 'седмица' 'од' Y"} + one{"w. 'седмица' 'од' Y"} + other{"w. 'седмица' 'од' Y"} } } dayNames{ @@ -874,11 +875,11 @@ mk{ dayPeriod{ format{ abbreviated{ - afternoon1{"попл."} + afternoon1{"попладне"} evening1{"навечер"} midnight{"полноќ"} morning1{"наутро"} - morning2{"претпл."} + morning2{"претпладне"} night1{"ноќе"} noon{"напладне"} } @@ -939,15 +940,11 @@ mk{ } eras{ abbreviated{ - "пр.н.е.", - "н.е.", - } - abbreviated%variant{ "п.н.е.", "н.е.", } narrow{ - "пр.н.е.", + "п.н.е.", "н.е.", } wide{ diff --git a/intl/icu/source/data/locales/mk_MK.txt b/intl/icu/source/data/locales/mk_MK.txt index fe579b31cad8..f1ac16669e5a 100644 --- a/intl/icu/source/data/locales/mk_MK.txt +++ b/intl/icu/source/data/locales/mk_MK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk_MK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ml.txt b/intl/icu/source/data/locales/ml.txt index 413f122e5366..dd5e36d1b835 100644 --- a/intl/icu/source/data/locales/ml.txt +++ b/intl/icu/source/data/locales/ml.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ml{ AuxExemplarCharacters{"[]"} Ellipsis{ @@ -20,7 +21,10 @@ ml{ " യ ര ല വ ശ ഷ സ ഹ ള ഴ റ]" } ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0൦ 1൧ 2൨ 3൩ 4൪ 5൫ 6൬ 7൭ 8൮ 9൯]"} - ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\}]"} + ExemplarCharactersPunctuation{ + "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " + "′ ″]" + } MoreInformation{"?"} NumberElements{ default{"latn"} @@ -241,7 +245,6 @@ ml{ } native{"mlym"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -2432,13 +2435,13 @@ ml{ dn{"ആഴ്‌ച. ദിവസം"} } weekdayOfMonth{ - dn{"മാസത്തിലെ പ്രവർത്തിദിനം"} + dn{"മാസത്തിലെ പ്രവൃത്തി ദിവസം"} } weekdayOfMonth-narrow{ - dn{"മാസ. പ്രവർത്തിദിനം"} + dn{"മാസ. പ്രവൃത്തി ദിവസം"} } weekdayOfMonth-short{ - dn{"മാസ. പ്രവർത്തിദിനം"} + dn{"മാസ. പ്രവൃത്തി ദിവസം"} } year{ dn{"വർഷം"} @@ -2498,10 +2501,10 @@ ml{ dn{"സമയ മേഖല"} } zone-narrow{ - dn{"സമയ മേഖല"} + dn{"മേഖല"} } zone-short{ - dn{"സമയ മേഖല"} + dn{"മേഖല"} } } listPattern{ @@ -2517,6 +2520,9 @@ ml{ middle{"{0}, {1}"} start{"{0}, {1}"} } + standard-narrow{ + 2{"{0}, {1} എന്നിവ"} + } standard-short{ 2{"{0} കൂടാതെ {1}"} end{"{0}, {1} എന്നിവ"} @@ -2536,7 +2542,7 @@ ml{ start{"{0} {1}"} } unit-short{ - 2{"{0} കൂടാതെ {1}"} + 2{"{0}, {1}"} end{"{0}, {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} diff --git a/intl/icu/source/data/locales/ml_IN.txt b/intl/icu/source/data/locales/ml_IN.txt index a9001ccf50cd..873b4f5a25cd 100644 --- a/intl/icu/source/data/locales/ml_IN.txt +++ b/intl/icu/source/data/locales/ml_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ml_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mn.txt b/intl/icu/source/data/locales/mn.txt index 2ed00c290416..76dbbb9d5513 100644 --- a/intl/icu/source/data/locales/mn.txt +++ b/intl/icu/source/data/locales/mn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mn{ AuxExemplarCharacters{"[ә җ ӊ һ]"} Ellipsis{ @@ -215,7 +216,6 @@ mn{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -850,92 +850,92 @@ mn{ } } characterLabel{ - activities{"Үйл ажиллагаанууд"} - african_scripts{"Африк бичвэр"} - american_scripts{"Америк бичвэр"} - animal{"амьтан"} - animals_nature{"Ан амьтан ба байгаль"} - arrows{"Сум"} + activities{"үйл ажиллагаа"} + african_scripts{"Африкан скрипт"} + american_scripts{"Американ скрипт"} + animal{"ан амьтан"} + animals_nature{"ан амьтан ба байгаль"} + arrows{"сум"} body{"бие"} - box_drawing{"Хайрцаг зурах"} - braille{"Брайль"} + box_drawing{"хайрцаг зурах"} + braille{"брайль"} building{"барилга"} - bullets_stars{"Сум/од"} - consonantal_jamo{"Жамо гийгүүлэгчийн дараалал"} - currency_symbols{"Мөнгөн тэмдэгтийн дүрс"} - dash_connector{"Зураас/холбоос"} + bullets_stars{"сум ба од"} + consonantal_jamo{"жамо гийгүүлэгчийн дараалал"} + currency_symbols{"валютын тэмдэг"} + dash_connector{"зураас ба холбоос"} digits{"орон"} - dingbats{"Дүрс тэмдгүүд"} - divination_symbols{"Мэргийн тэмдгүүд"} - downwards_arrows{"Доош заасан сум"} - downwards_upwards_arrows{"Доош, дээш заасан сум"} + dingbats{"чимэг тэмдэг"} + divination_symbols{"мэргийн тэмдэг"} + downwards_arrows{"доош заасан сум"} + downwards_upwards_arrows{"доош, дээш заасан сум"} east_asian_scripts{"Зүүн Азийн бичвэр"} - emoji{"Эможи"} - european_scripts{"Европ бичвэр"} + emoji{"эможи"} + european_scripts{"Европийн скрипт"} female{"эмэгтэй"} flag{"туг"} - flags{"Туг"} - food_drink{"Хоол, унд"} - format{"Формат"} - format_whitespace{"Формат, хоосон зай"} - full_width_form_variant{"Бүтэн өргөн загварын хувилбар"} - geometric_shapes{"Геометрийн дүрсүүд"} - half_width_form_variant{"Өргөөшөө загварын хувилбарууд"} - han_characters{"Хан ханзнууд"} + flags{"туг"} + food_drink{"хоол, унд"} + format{"формат"} + format_whitespace{"формат, хоосон зай"} + full_width_form_variant{"бүтэн өргөн хувилбар"} + geometric_shapes{"геометрийн дүрс"} + half_width_form_variant{"хагас өргөн хувилбар"} + han_characters{"Хан ханз"} han_radicals{"Хятад язгуур"} - hanja{"Ханз"} + hanja{"ханз"} hanzi_simplified{"Ханз (Хялбаршуулсан)"} hanzi_traditional{"Ханз (Уламжлалт)"} heart{"зүрх"} - historic_scripts{"Түүхэн бичвэр"} - ideographic_desc_characters{"Идеографик буурах тэмдэгтүүд"} + historic_scripts{"түүхэн скрипт"} + ideographic_desc_characters{"идеографик буурах тэмдэгт"} japanese_kana{"Япон кана"} - kanbun{"Канбун"} - kanji{"Канжи"} + kanbun{"канбун"} + kanji{"канжи"} keycap{"түлхүүрийн гэр"} - leftwards_arrows{"Зүүн харсан сум"} - leftwards_rightwards_arrows{"Зүүн, баруун харсан сум"} - letterlike_symbols{"Үсгэн тэмдэгтүүд"} - limited_use{"Хязгаарлагдмал хэрэглээ"} + leftwards_arrows{"зүүн харсан сум"} + leftwards_rightwards_arrows{"зүүн, баруун харсан сум"} + letterlike_symbols{"үсгэн тэмдэгт"} + limited_use{"хязгаарлагдмал хэрэглээ"} male{"эрэгтэй"} - math_symbols{"Математикийн тэмдэгтүүд"} + math_symbols{"математикийн тэмдэгт"} middle_eastern_scripts{"Ойрх дорнодын бичвэр"} - miscellaneous{"Бусад"} - modern_scripts{"Орчин цагийн бичвэр"} - modifier{"Өөрчлөгч"} - musical_symbols{"Хөгжмийн тэмдэгтүүд"} + miscellaneous{"янз бүрийн"} + modern_scripts{"орчин цагийн скрипт"} + modifier{"өөрчлөгч"} + musical_symbols{"хөгжмийн тэмдэг"} nature{"байгаль"} - nonspacing{"Зайгүй"} - numbers{"Тоонууд"} - objects{"Дүрснүүд"} - other{"Бусад"} - paired{"Хослосон"} + nonspacing{"зайгүй"} + numbers{"тоо"} + objects{"объект"} + other{"бусад"} + paired{"хослосон"} person{"хүн"} - phonetic_alphabet{"Дуудлагын үсэг"} - pictographs{"Пиктограм"} + phonetic_alphabet{"дуудлагын үсэг"} + pictographs{"пиктограм"} place{"газар"} plant{"ургамал"} - punctuation{"Цэг, таслал"} - rightwards_arrows{"Баруун заасан сум"} - sign_standard_symbols{"Тэмдэг/стандарт тэмдэгт"} - small_form_variant{"Жижиг загварын хувилбарууд"} + punctuation{"цэг, таслал"} + rightwards_arrows{"баруун заасан сум"} + sign_standard_symbols{"дүрс ба тэмдэг"} + small_form_variant{"жижиг загварын хувилбар"} smiley{"инээмсэглэл"} - smileys_people{"Инээмсэглэлүүд ба хүмүүс"} - south_asian_scripts{"Өмнөд Азийн бичвэр"} - southeast_asian_scripts{"Зүүн өмнөд азийн бичвэр"} - spacing{"Зай авалт"} + smileys_people{"инээмсэглэл ба хүн"} + south_asian_scripts{"Өмнөд Азийн скрипт"} + southeast_asian_scripts{"Зүүн өмнөд азийн скрипт"} + spacing{"зай авалт"} sport{"спорт"} - symbols{"Тэмдэгүүд"} - technical_symbols{"Техникийн тэмдэгүүд"} - tone_marks{"Дууны өнгөний тэмдэглэгээ"} + symbols{"тэмдэг"} + technical_symbols{"техникийн тэмдэг"} + tone_marks{"дууны өнгөний тэмдэглэгээ"} travel{"аялал"} - travel_places{"Аялал, газар нутгууд"} - upwards_arrows{"Дээш заасан сум"} - variant_forms{"Хувилбарын хэлбэрүүд"} - vocalic_jamo{"Эгшгийн Жамо"} + travel_places{"аялал ба газар нутаг"} + upwards_arrows{"дээш заасан сум"} + variant_forms{"хувилбар"} + vocalic_jamo{"эгшгийн жамо"} weather{"цаг агаар"} - western_asian_scripts{"Баруун азийн бичвэр"} - whitespace{"Хоосон зай"} + western_asian_scripts{"Баруун азийн скрипт"} + whitespace{"хоосон зай"} } delimiters{ alternateQuotationEnd{"’"} diff --git a/intl/icu/source/data/locales/mn_MN.txt b/intl/icu/source/data/locales/mn_MN.txt index 79cf0e37b290..72901f786d0b 100644 --- a/intl/icu/source/data/locales/mn_MN.txt +++ b/intl/icu/source/data/locales/mn_MN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mn_MN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mni.txt b/intl/icu/source/data/locales/mni.txt index 9e589a50ddab..b40d34475278 100644 --- a/intl/icu/source/data/locales/mni.txt +++ b/intl/icu/source/data/locales/mni.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni{ AuxExemplarCharacters{"[\u200C\u200D]"} ExemplarCharacters{ @@ -24,7 +25,6 @@ mni{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -100,7 +100,7 @@ mni{ "থাংজ", } narrow{ - "নো", + "নোং", "নিং", "লৈ", "য়ুম", @@ -240,10 +240,10 @@ mni{ "মে", "জুন", "জুলাই", - "আগস্ট", + "ওগষ্ট", "সেপ্টেম্বর", "ওক্টোবর", - "নভেম্বর", + "নবেম্বর", "ডিসেম্বর", } } diff --git a/intl/icu/source/data/locales/mni_Beng.txt b/intl/icu/source/data/locales/mni_Beng.txt index e861947a77ff..08de0f17e1f1 100644 --- a/intl/icu/source/data/locales/mni_Beng.txt +++ b/intl/icu/source/data/locales/mni_Beng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_Beng{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mni_Beng_IN.txt b/intl/icu/source/data/locales/mni_Beng_IN.txt index 311961f87f86..6d16670521d3 100644 --- a/intl/icu/source/data/locales/mni_Beng_IN.txt +++ b/intl/icu/source/data/locales/mni_Beng_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_Beng_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mni_IN.txt b/intl/icu/source/data/locales/mni_IN.txt index 00d8c00a15b3..99173b141555 100644 --- a/intl/icu/source/data/locales/mni_IN.txt +++ b/intl/icu/source/data/locales/mni_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_IN{ "%%ALIAS"{"mni_Beng_IN"} } diff --git a/intl/icu/source/data/locales/mo.txt b/intl/icu/source/data/locales/mo.txt index 01049c8f3c89..6ef831378395 100644 --- a/intl/icu/source/data/locales/mo.txt +++ b/intl/icu/source/data/locales/mo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mo{ "%%ALIAS"{"ro"} } diff --git a/intl/icu/source/data/locales/mr.txt b/intl/icu/source/data/locales/mr.txt index 86a84299c2f5..7e1d99fea176 100644 --- a/intl/icu/source/data/locales/mr.txt +++ b/intl/icu/source/data/locales/mr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mr{ AuxExemplarCharacters{"[\u200C\u200D]"} Ellipsis{ @@ -243,7 +244,6 @@ mr{ minimumGroupingDigits{"1"} native{"deva"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -641,16 +641,12 @@ mr{ } gregorian{ AmPmMarkers{ - "म.पू.", - "म.उ.", - } - AmPmMarkersAbbr{ - "म.पू.", - "म.उ.", + "AM", + "PM", } AmPmMarkersNarrow{ - "स", - "सं", + "a", + "p", } DateTimePatterns{ "h:mm:ss a zzzz", @@ -840,7 +836,7 @@ mr{ stand-alone{ abbreviated{ afternoon1{"दुपार"} - am{"म.पू."} + am{"AM"} evening1{"संध्याकाळ"} evening2{"सायंकाळ"} midnight{"मध्यरात्र"} @@ -848,11 +844,11 @@ mr{ morning2{"सकाळ"} night1{"रात्र"} noon{"मध्यान्ह"} - pm{"म.उ."} + pm{"PM"} } narrow{ afternoon1{"दु"} - am{"म.पू."} + am{"AM"} evening1{"सं"} evening2{"सा"} midnight{"म.रा."} @@ -860,11 +856,11 @@ mr{ morning2{"स"} night1{"रात्र"} noon{"म"} - pm{"म.उ."} + pm{"PM"} } wide{ afternoon1{"दुपार"} - am{"म.पू."} + am{"AM"} evening1{"संध्याकाळ"} evening2{"सायंकाळ"} midnight{"मध्यरात्र"} @@ -872,7 +868,7 @@ mr{ morning2{"सकाळ"} night1{"रात्र"} noon{"मध्यान्ह"} - pm{"म.उ."} + pm{"PM"} } } } @@ -1712,13 +1708,13 @@ mr{ dn{"वर्षातील दिवस"} } dayperiod{ - dn{"[म.पू./म.उ.]"} + dn{"AM/PM"} } dayperiod-narrow{ - dn{"[म.पू./म.उ.]"} + dn{"AM/PM"} } dayperiod-short{ - dn{"[म.पू./म.उ.]"} + dn{"AM/PM"} } era{ dn{"युग"} @@ -2475,6 +2471,9 @@ mr{ middle{"{0}, {1}"} start{"{0}, {1}"} } + or-short{ + end{"{0} किंवा {1}"} + } standard{ 2{"{0} आणि {1}"} end{"{0} आणि {1}"} diff --git a/intl/icu/source/data/locales/mr_IN.txt b/intl/icu/source/data/locales/mr_IN.txt index c0a5c7c272c7..a32588c2349f 100644 --- a/intl/icu/source/data/locales/mr_IN.txt +++ b/intl/icu/source/data/locales/mr_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mr_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ms.txt b/intl/icu/source/data/locales/ms.txt index 85d74ba19643..d4060eabfc41 100644 --- a/intl/icu/source/data/locales/ms.txt +++ b/intl/icu/source/data/locales/ms.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms{ - AuxExemplarCharacters{"[]"} Ellipsis{ final{"{0}…"} initial{"…{0}"} @@ -10,10 +10,7 @@ ms{ word-initial{"… {0}"} word-medial{"{0} … {1}"} } - ExemplarCharacters{ - "[a {ai} {au} b c d {dz} e f g h i j k {kh} l m n {ng} {ngg} {ny} o p q r s {" - "sy} t {ts} u {ua} v w x y 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]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{ @@ -22,6 +19,11 @@ ms{ } MoreInformation{"?"} NumberElements{ + arabext{ + symbols{ + decimal{"."} + } + } default{"latn"} latn{ miscPatterns{ @@ -172,7 +174,7 @@ ms{ } minimalPairs{ ordinal{ - one{"Ambil belokan kanan yang pertama."} + one{"Ambil belokan kanan {0}."} other{"Ambil belokan kanan yang ke-{0}."} } plural{ @@ -182,7 +184,6 @@ ms{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -968,7 +969,7 @@ ms{ } GyM{ G{"M/y GGGGG – M/y GGGGG"} - M{"M/y –M/y GGGGG"} + M{"M/y – M/y GGGGG"} y{"M/y – M/y GGGGG"} } GyMEd{ diff --git a/intl/icu/source/data/locales/ms_BN.txt b/intl/icu/source/data/locales/ms_BN.txt index 8859c4d3b1c0..1962acb27739 100644 --- a/intl/icu/source/data/locales/ms_BN.txt +++ b/intl/icu/source/data/locales/ms_BN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms_BN{ NumberElements{ latn{ @@ -12,7 +13,6 @@ ms_BN{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ms_ID.txt b/intl/icu/source/data/locales/ms_ID.txt index 6a60a2b53042..6b5bf813e518 100644 --- a/intl/icu/source/data/locales/ms_ID.txt +++ b/intl/icu/source/data/locales/ms_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms_ID{ NumberElements{ latn{ @@ -13,7 +14,6 @@ ms_ID{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ms_MY.txt b/intl/icu/source/data/locales/ms_MY.txt index ecddb8b92e4e..d158d072d016 100644 --- a/intl/icu/source/data/locales/ms_MY.txt +++ b/intl/icu/source/data/locales/ms_MY.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms_MY{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ms_SG.txt b/intl/icu/source/data/locales/ms_SG.txt index 05c019e1e656..45f17b0c1228 100644 --- a/intl/icu/source/data/locales/ms_SG.txt +++ b/intl/icu/source/data/locales/ms_SG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms_SG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mt.txt b/intl/icu/source/data/locales/mt.txt index 1ae796bf0215..f53c10954159 100644 --- a/intl/icu/source/data/locales/mt.txt +++ b/intl/icu/source/data/locales/mt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt{ AuxExemplarCharacters{"[c y]"} Ellipsis{ @@ -48,7 +49,6 @@ mt{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mt_MT.txt b/intl/icu/source/data/locales/mt_MT.txt index 0291b27c1f2e..071ec8c19221 100644 --- a/intl/icu/source/data/locales/mt_MT.txt +++ b/intl/icu/source/data/locales/mt_MT.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt_MT{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mua.txt b/intl/icu/source/data/locales/mua.txt index 7b3e6467cb03..6919b5cc92be 100644 --- a/intl/icu/source/data/locales/mua.txt +++ b/intl/icu/source/data/locales/mua.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mua{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a ã b ɓ c d ɗ e ë ǝ f g h i ĩ j k l m n ŋ o õ p r s t u v ṽ w y z]"} @@ -19,7 +20,6 @@ mua{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/mua_CM.txt b/intl/icu/source/data/locales/mua_CM.txt index cb6f692be507..53d84c844a84 100644 --- a/intl/icu/source/data/locales/mua_CM.txt +++ b/intl/icu/source/data/locales/mua_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mua_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/my.txt b/intl/icu/source/data/locales/my.txt index 2cb62d16e79c..9ccb6ac9bc98 100644 --- a/intl/icu/source/data/locales/my.txt +++ b/intl/icu/source/data/locales/my.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my{ AuxExemplarCharacters{ "[၀႐ ၁႑ ၂႒ ၃႓ ၄႔ ၅႕ ၆႖ ၇႗ ၈႘ ၉႙ ၵ ၚ ၽ ၾ ၐ ၑ ၥ ဨ ဢ ၒ ၓ ၔ ၕ \u1033 ၖ ၗ \u1058 " @@ -176,7 +177,7 @@ my{ other{"{0} အုပ်မြောက်"} } plural{ - other{"{0}ရက်"} + other{"{0} ရက်"} } } minimumGroupingDigits{"1"} @@ -203,7 +204,6 @@ my{ } native{"mymr"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1677,29 +1677,37 @@ my{ or{ 2{"{0} သို့မဟုတ် {1}"} end{"{0} သို့မဟုတ် {1}"} - middle{"{0} {1}"} - start{"{0} {1}"} + middle{"{0}၊ {1}"} + start{"{0}၊ {1}"} + } + or-narrow{ + middle{"{0}၊ {1}"} } or-short{ + middle{"{0}၊ {1}"} start{"{0} ၊ {1}"} } standard{ 2{"{0}နှင့် {1}"} end{"{0}နှင့် {1}"} - middle{"{0} {1}"} - start{"{0} {1}"} + middle{"{0}၊ {1}"} + start{"{0}၊ {1}"} + } + standard-narrow{ + middle{"{0}၊ {1}"} + start{"{0}၊ {1}"} } standard-short{ 2{"{0}နှင့် {1}"} end{"{0}နှင့် {1}"} - middle{"{0} {1}"} - start{"{0} {1}"} + middle{"{0}၊ {1}"} + start{"{0}၊ {1}"} } unit{ 2{"{0}နှင့်{1}"} end{"{0}နှင့် {1}"} - middle{"{0} {1}"} - start{"{0} {1}"} + middle{"{0}၊ {1}"} + start{"{0}၊ {1}"} } unit-narrow{ 2{"{0}နှင့် {1}"} @@ -1710,8 +1718,8 @@ my{ unit-short{ 2{"{0}နှင့် {1}"} end{"{0}နှင့် {1}"} - middle{"{0} {1}"} - start{"{0} {1}"} + middle{"{0}၊ {1}"} + start{"{0}၊ {1}"} } } measurementSystemNames{ diff --git a/intl/icu/source/data/locales/my_MM.txt b/intl/icu/source/data/locales/my_MM.txt index 1cc45e6d178f..b53071c255c6 100644 --- a/intl/icu/source/data/locales/my_MM.txt +++ b/intl/icu/source/data/locales/my_MM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my_MM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/mzn.txt b/intl/icu/source/data/locales/mzn.txt index 3a655895bafd..69547e63858b 100644 --- a/intl/icu/source/data/locales/mzn.txt +++ b/intl/icu/source/data/locales/mzn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mzn{ AuxExemplarCharacters{"[\u200C\u200D\u200E\u200F \u064E \u064F \u0650 \u0652 \u0656 \u0670 إ ك ى ي]"} Ellipsis{ @@ -26,7 +27,6 @@ mzn{ default{"arabext"} native{"arabext"} } - Version{"37"} calendar{ default{"persian"} gregorian{ diff --git a/intl/icu/source/data/locales/mzn_IR.txt b/intl/icu/source/data/locales/mzn_IR.txt index 93d8e07f69d9..3303c3e88d0c 100644 --- a/intl/icu/source/data/locales/mzn_IR.txt +++ b/intl/icu/source/data/locales/mzn_IR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mzn_IR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/naq.txt b/intl/icu/source/data/locales/naq.txt index 155f37db03cb..b3f219eb2964 100644 --- a/intl/icu/source/data/locales/naq.txt +++ b/intl/icu/source/data/locales/naq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml naq{ AuxExemplarCharacters{"[j l v]"} ExemplarCharacters{"[a â b c d e f g h i î k m n o ô p q r s t u û w x y z ǀ ǁ ǂ ǃ]"} @@ -11,7 +12,6 @@ naq{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/naq_NA.txt b/intl/icu/source/data/locales/naq_NA.txt index 2be7f98a2ce1..599ea64e8308 100644 --- a/intl/icu/source/data/locales/naq_NA.txt +++ b/intl/icu/source/data/locales/naq_NA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml naq_NA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nb.txt b/intl/icu/source/data/locales/nb.txt index dc4575245db2..5344769f740e 100644 --- a/intl/icu/source/data/locales/nb.txt +++ b/intl/icu/source/data/locales/nb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ AuxExemplarCharacters{"[á ǎ ã č ç đ è ê í ń ñ ŋ š ŧ ú ü ž ä ö]"} Ellipsis{ @@ -546,11 +547,11 @@ nb{ other{"0 millioner"} } 10000000{ - one{"00 million"} + one{"00 millioner"} other{"00 millioner"} } 100000000{ - one{"000 million"} + one{"000 millioner"} other{"000 millioner"} } 1000000000{ @@ -558,11 +559,11 @@ nb{ other{"0 milliarder"} } 10000000000{ - one{"00 milliard"} + one{"00 milliarder"} other{"00 milliarder"} } 100000000000{ - one{"000 milliard"} + one{"000 milliarder"} other{"000 milliarder"} } 1000000000000{ @@ -682,6 +683,7 @@ nb{ } } symbols{ + approximatelySign{"ca."} decimal{","} exponential{"E"} group{" "} @@ -1280,7 +1282,6 @@ nb{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -3908,8 +3909,8 @@ nb{ "d. MMM y G", "d.M.y G", "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1} 'kl'. {0}", + "{1} 'kl'. {0}", "{1} {0}", "{1} {0}", } @@ -4121,7 +4122,7 @@ nb{ "d. MMM y", "dd.MM.y", "{1}, {0}", - "{1} {0}", + "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", "{1}, {0}", @@ -4136,8 +4137,8 @@ nb{ E{"ccc"} EBhm{"E h:mm B"} EBhms{"E h:mm:ss B"} - EHm{"E HH:mm"} - EHms{"E HH:mm:ss"} + EHm{"E 'kl'. HH:mm"} + EHms{"E 'kl'. HH:mm:ss"} Ed{"E d."} Ehm{"E h:mm a"} Ehms{"E h:mm:ss a"} @@ -4171,7 +4172,7 @@ nb{ ms{"mm:ss"} y{"y"} yM{"M.y"} - yMEd{"E d.MM.y"} + yMEd{"E d.M.y"} yMM{"MM.y"} yMMM{"MMM y"} yMMMEd{"E d. MMM y"} @@ -4282,12 +4283,12 @@ nb{ night1{"nt."} } wide{ - afternoon1{"ettermiddagen"} - evening1{"kvelden"} + afternoon1{"på ettermiddagen"} + evening1{"på kvelden"} midnight{"midnatt"} - morning1{"morgenen"} - morning2{"formiddagen"} - night1{"natten"} + morning1{"på morgenen"} + morning2{"på formiddagen"} + night1{"på natten"} } } stand-alone{ @@ -4435,21 +4436,21 @@ nb{ } fallback{"{0}–{1}"} h{ - a{"h a – h a"} + a{"h a–h a"} 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"} } hmv{ - a{"h:mm a – h:mm a v"} + 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"} + a{"h a–h a v"} h{"h–h a v"} } y{ @@ -6541,8 +6542,8 @@ nb{ full_width_form_variant{"fullbreddeformvarianter"} geometric_shapes{"geometriske figurer"} half_width_form_variant{"halvbreddeformvarianter"} - han_characters{"Han-tegn"} - han_radicals{"Han-radikaler"} + han_characters{"han-tegn"} + han_radicals{"han-radikaler"} hanja{"hanja"} hanzi_simplified{"hanzi (forenklet)"} hanzi_traditional{"hanzi (tradisjonell)"} diff --git a/intl/icu/source/data/locales/nb_NO.txt b/intl/icu/source/data/locales/nb_NO.txt index 6f1d6eaaf9e9..61b454bf298d 100644 --- a/intl/icu/source/data/locales/nb_NO.txt +++ b/intl/icu/source/data/locales/nb_NO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb_NO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nb_SJ.txt b/intl/icu/source/data/locales/nb_SJ.txt index 6096e5321198..78d04a510682 100644 --- a/intl/icu/source/data/locales/nb_SJ.txt +++ b/intl/icu/source/data/locales/nb_SJ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb_SJ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nd.txt b/intl/icu/source/data/locales/nd.txt index d43167a04962..b47b51cea38b 100644 --- a/intl/icu/source/data/locales/nd.txt +++ b/intl/icu/source/data/locales/nd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nd{ AuxExemplarCharacters{"[r]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p q s t u v w x y z]"} @@ -12,7 +13,6 @@ nd{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/nd_ZW.txt b/intl/icu/source/data/locales/nd_ZW.txt index 0958844e493b..f8561484258d 100644 --- a/intl/icu/source/data/locales/nd_ZW.txt +++ b/intl/icu/source/data/locales/nd_ZW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nd_ZW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nds.txt b/intl/icu/source/data/locales/nds.txt deleted file mode 100644 index 927983f30260..000000000000 --- a/intl/icu/source/data/locales/nds.txt +++ /dev/null @@ -1,11 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds{ - 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]"} - ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} - ExemplarCharactersPunctuation{ - "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ‚ \u0022 “ „ « » ( ) \\[ \\] \\{ \\} § @ * " - "/ \\& #]" - } - Version{"37"} -} diff --git a/intl/icu/source/data/locales/nds_NL.txt b/intl/icu/source/data/locales/nds_NL.txt deleted file mode 100644 index acb3105c4e60..000000000000 --- a/intl/icu/source/data/locales/nds_NL.txt +++ /dev/null @@ -1,12 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds_NL{ - 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{ - "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " - "′ ″]" - } - Version{"37"} -} diff --git a/intl/icu/source/data/locales/ne.txt b/intl/icu/source/data/locales/ne.txt index 1c9a74a81157..fa5a609ea47e 100644 --- a/intl/icu/source/data/locales/ne.txt +++ b/intl/icu/source/data/locales/ne.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne{ AuxExemplarCharacters{"[\u200C\u200D]"} Ellipsis{ @@ -214,6 +215,7 @@ ne{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -241,7 +243,6 @@ ne{ minimumGroupingDigits{"1"} native{"deva"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1797,4 +1798,36 @@ ne{ US{"संयु्क्त राज्य"} metric{"मेट्रिक"} } + parse{ + date{ + lenient{ + "[\\--/]", + "[\\:∶︓﹕:]", + } + } + general{ + lenient{ + "[.․。︒﹒.。]", + "['ʼ՚᾽᾿’']", + "[%٪﹪%]", + "[؉‰]", + "[\$﹩$]", + "[£₤£]", + "[¥¥]", + "[₩₩]", + "[₨₹{Rp}{Rs}]", + } + } + number{ + lenient{ + "[\\-‐‒–⁻₋−➖﹣-]", + "[,،٫、︐︑﹐﹑,、]", + "[+⁺₊➕﬩﹢+]", + } + stricter{ + "[,٫︐﹐,]", + "[.․﹒.。]", + } + } + } } diff --git a/intl/icu/source/data/locales/ne_IN.txt b/intl/icu/source/data/locales/ne_IN.txt index ed709160c541..3a757233396f 100644 --- a/intl/icu/source/data/locales/ne_IN.txt +++ b/intl/icu/source/data/locales/ne_IN.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne_IN{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ne_NP.txt b/intl/icu/source/data/locales/ne_NP.txt index bd5cce9139b2..c1e8a2382df9 100644 --- a/intl/icu/source/data/locales/ne_NP.txt +++ b/intl/icu/source/data/locales/ne_NP.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne_NP{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nl.txt b/intl/icu/source/data/locales/nl.txt index b4ec3eb63071..baf85352590f 100644 --- a/intl/icu/source/data/locales/nl.txt +++ b/intl/icu/source/data/locales/nl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl{ AuxExemplarCharacters{"[à â å ã æ ç è ê î ñ ô ø œ ù û ÿ]"} ExemplarCharacters{ @@ -1485,7 +1486,6 @@ nl{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -7012,8 +7012,6 @@ nl{ } } delimiters{ - alternateQuotationEnd{"”"} - alternateQuotationStart{"“"} quotationEnd{"’"} quotationStart{"‘"} } @@ -7919,7 +7917,7 @@ nl{ "[%٪﹪%]", "[؉‰]", "[\$﹩$$]", - "[£₤]", + "[£₤£]", "[¥¥]", "[₩₩]", "[₨₹{Rp}{Rs}]", @@ -7928,7 +7926,7 @@ nl{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/nl_AW.txt b/intl/icu/source/data/locales/nl_AW.txt index cfff59ebbc8c..65b23d03ea2a 100644 --- a/intl/icu/source/data/locales/nl_AW.txt +++ b/intl/icu/source/data/locales/nl_AW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_AW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nl_BE.txt b/intl/icu/source/data/locales/nl_BE.txt index 6b2681938d89..6af55854f419 100644 --- a/intl/icu/source/data/locales/nl_BE.txt +++ b/intl/icu/source/data/locales/nl_BE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_BE{ - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/nl_BQ.txt b/intl/icu/source/data/locales/nl_BQ.txt index b3ca0e5d94df..6e6ade1763d1 100644 --- a/intl/icu/source/data/locales/nl_BQ.txt +++ b/intl/icu/source/data/locales/nl_BQ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_BQ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nl_CW.txt b/intl/icu/source/data/locales/nl_CW.txt index 6aea8e2ae9cd..597b6b4efbce 100644 --- a/intl/icu/source/data/locales/nl_CW.txt +++ b/intl/icu/source/data/locales/nl_CW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_CW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nl_NL.txt b/intl/icu/source/data/locales/nl_NL.txt index 886c75a0ff4a..6105f8706ca9 100644 --- a/intl/icu/source/data/locales/nl_NL.txt +++ b/intl/icu/source/data/locales/nl_NL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_NL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nl_SR.txt b/intl/icu/source/data/locales/nl_SR.txt index 018d7c4a127d..8d73af8f64cc 100644 --- a/intl/icu/source/data/locales/nl_SR.txt +++ b/intl/icu/source/data/locales/nl_SR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_SR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nl_SX.txt b/intl/icu/source/data/locales/nl_SX.txt index 84e82dc25a24..381c5f9610b5 100644 --- a/intl/icu/source/data/locales/nl_SX.txt +++ b/intl/icu/source/data/locales/nl_SX.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_SX{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nmg.txt b/intl/icu/source/data/locales/nmg.txt index c51888928b18..e3ca81c27aaa 100644 --- a/intl/icu/source/data/locales/nmg.txt +++ b/intl/icu/source/data/locales/nmg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nmg{ AuxExemplarCharacters{"[q x z]"} ExemplarCharacters{ @@ -22,7 +23,6 @@ nmg{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/nmg_CM.txt b/intl/icu/source/data/locales/nmg_CM.txt index 5c9b3341b5c2..c79349546cfd 100644 --- a/intl/icu/source/data/locales/nmg_CM.txt +++ b/intl/icu/source/data/locales/nmg_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nmg_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nn.txt b/intl/icu/source/data/locales/nn.txt index 5270fc521e4d..5c371845902e 100644 --- a/intl/icu/source/data/locales/nn.txt +++ b/intl/icu/source/data/locales/nn.txt @@ -1,14 +1,28 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ AuxExemplarCharacters{"[á ǎ č ç đ è ê ń ñ ŋ š ŧ ü ž ä ö]"} + Ellipsis{ + final{"{0}…"} + initial{"…{0}"} + medial{"{0}…{1}"} + word-final{"{0} …"} + word-initial{"… {0}"} + word-medial{"{0} … {1}"} + } 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 Æ Ø Å]"} ExemplarCharactersNumbers{"[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersPunctuation{ + "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " + "′ ″]" + } NumberElements{ default{"latn"} latn{ miscPatterns{ + approximately{"ca. {0}"} atLeast{"≥{0}"} range{"{0}‒{1}"} } @@ -72,6 +86,7 @@ nn{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{" "} @@ -98,7 +113,6 @@ nn{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -153,6 +167,44 @@ nn{ yyyyQQQQ{"QQQQ y G"} } intervalFormats{ + Gy{ + G{"y G–y G"} + y{"y–y G"} + } + GyM{ + G{"MM.y GGGGG–MM.y GGGGG"} + M{"MM.y–MM.y GGGGG"} + y{"MM.y–MM.y GGGGG"} + } + GyMEd{ + G{"E dd.MM.y GGGGG–E dd.MM.y GGGGG"} + 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"} + } + GyMMM{ + G{"MMM y G–MMM y G"} + M{"MMM–MMM y G"} + y{"MMM y–MMM y G"} + } + GyMMMEd{ + G{"E d. MMM y G–E d. MMM y G"} + 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"} + } + GyMMMd{ + G{"d. MMM y G–d. MMM y G"} + M{"d. MMM–d. MMM y G"} + d{"d.–d. MMM y G"} + y{"d. MMM y–d. MMM y G"} + } + GyMd{ + G{"dd.MM.y GGGGG–dd.MM.y GGGGG"} + M{"dd.MM.y–dd.MM.y GGGGG"} + d{"dd.MM.y–dd.MM.y GGGGG"} + y{"dd.MM.y–dd.MM.y GGGGG"} + } H{ H{"HH–HH"} } @@ -452,6 +504,44 @@ nn{ } } intervalFormats{ + Gy{ + G{"y G–y G"} + y{"y–y G"} + } + GyM{ + G{"MM.y GGGGG–MM.y GGGGG"} + M{"MM.y–MM.y GGGGG"} + y{"MM.y–MM.y GGGGG"} + } + GyMEd{ + G{"E dd.MM.y GGGGG–E dd.MM.y GGGGG"} + 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"} + } + GyMMM{ + G{"MMM y G–MMM y G"} + M{"MMM–MMM y G"} + y{"MMM y–MMM y G"} + } + GyMMMEd{ + G{"E d. MMM y G–E d. MMM y G"} + 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"} + } + GyMMMd{ + G{"d. MMM y G–d. MMM y G"} + M{"d. MMM–d. MMM y G"} + d{"d.–d. MMM y G"} + y{"d. MMM y–d. MMM y G"} + } + GyMd{ + G{"dd.MM.y GGGGG–dd.MM.y GGGGG"} + M{"dd.MM.y–dd.MM.y GGGGG"} + d{"dd.MM.y–dd.MM.y GGGGG"} + y{"dd.MM.y–dd.MM.y GGGGG"} + } H{ H{"HH–HH"} } @@ -681,7 +771,7 @@ nn{ } } characterLabel{ - activities{"aktivitet"} + activities{"aktivitetar"} african_scripts{"afrikanske skriftsystem"} american_scripts{"amerikanske skriftsystem"} animal{"dyr"} @@ -690,13 +780,13 @@ nn{ body{"kropp"} box_drawing{"ruteteikning"} braille{"punktskrift"} - building{"bygnad"} - bullets_stars{"punktteikn/stjerne"} + building{"bygning"} + bullets_stars{"punktteikn/stjerner"} consonantal_jamo{"konsonantal jamo"} currency_symbols{"valutasymbol"} dash_connector{"tankestrek/bindeteikn"} - digits{"sifre"} - dingbats{"dingbat"} + digits{"siffer"} + dingbats{"dingbats"} divination_symbols{"spådomssymbol"} downwards_arrows{"piler som peiker nedover"} downwards_upwards_arrows{"piler som peiker nedover og oppover"} @@ -746,12 +836,12 @@ nn{ pictographs{"piktogram"} place{"stad"} plant{"plante"} - punctuation{"skilleteikn"} + punctuation{"skiljeteikn"} rightwards_arrows{"piler som peiker til høgre"} sign_standard_symbols{"teikn eller symbol"} small_form_variant{"små variantar"} smiley{"smilefjes"} - smileys_people{"smilefjes eller person"} + smileys_people{"smilefjes og personar"} south_asian_scripts{"sørasiatiske skriftsystem"} southeast_asian_scripts{"søraustasiatiske skriftsystem"} spacing{"med breidd"} @@ -760,7 +850,7 @@ nn{ technical_symbols{"tekniske symbol"} tone_marks{"tonemerke"} travel{"reise"} - travel_places{"reise eller stadar"} + travel_places{"reise og stadar"} upwards_arrows{"pil som peiker oppover"} variant_forms{"variantar"} vocalic_jamo{"vokalisk jamo"} @@ -831,13 +921,13 @@ nn{ dn{"dag i året"} } dayperiod{ - dn{"f.m./e.m."} + dn{"a.m./p.m."} } dayperiod-narrow{ - dn{"f.m./e.m."} + dn{"am/pm"} } dayperiod-short{ - dn{"f.m./e.m."} + dn{"am/pm"} } era{ dn{"tidsalder"} @@ -1066,7 +1156,7 @@ nn{ } } month-short{ - dn{"mnd."} + dn{"md."} relativeTime{ future{ one{"om {0} md."} @@ -1454,7 +1544,6 @@ nn{ } week-short{ dn{"veke"} - relativePeriod{"veka med {0}"} relativeTime{ future{ one{"om {0} v."} @@ -1473,7 +1562,7 @@ nn{ dn{"veke i md."} } weekOfMonth-short{ - dn{"veke i mnd."} + dn{"veke i md."} } weekday{ dn{"vekedag"} @@ -1491,7 +1580,7 @@ nn{ dn{"veked. i md."} } weekdayOfMonth-short{ - dn{"veked. i mnd."} + dn{"veked. i md."} } year{ dn{"år"} @@ -1548,9 +1637,35 @@ nn{ } } listPattern{ + or{ + 2{"{0} eller {1}"} + end{"{0} eller {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } standard{ 2{"{0} og {1}"} end{"{0} og {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } + unit{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } + unit-narrow{ + 2{"{0} {1}"} + end{"{0} {1}"} + middle{"{0} {1}"} + start{"{0} {1}"} + } + unit-short{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} } } measurementSystemNames{ diff --git a/intl/icu/source/data/locales/nn_NO.txt b/intl/icu/source/data/locales/nn_NO.txt index fa4747ad4e52..7dc9ac4a7775 100644 --- a/intl/icu/source/data/locales/nn_NO.txt +++ b/intl/icu/source/data/locales/nn_NO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn_NO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nnh.txt b/intl/icu/source/data/locales/nnh.txt index 19b775665e96..fada41915995 100644 --- a/intl/icu/source/data/locales/nnh.txt +++ b/intl/icu/source/data/locales/nnh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nnh{ AuxExemplarCharacters{"[q r x]"} ExemplarCharacters{ @@ -28,7 +29,6 @@ nnh{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/nnh_CM.txt b/intl/icu/source/data/locales/nnh_CM.txt index e008c8f9e612..d6af22d60a38 100644 --- a/intl/icu/source/data/locales/nnh_CM.txt +++ b/intl/icu/source/data/locales/nnh_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nnh_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/no.txt b/intl/icu/source/data/locales/no.txt index 097a923cd101..474d0b21b0d9 100644 --- a/intl/icu/source/data/locales/no.txt +++ b/intl/icu/source/data/locales/no.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ "%%ALIAS"{"nb"} } diff --git a/intl/icu/source/data/locales/no_NO.txt b/intl/icu/source/data/locales/no_NO.txt index 188a8a4a680a..5d7f8599c0e5 100644 --- a/intl/icu/source/data/locales/no_NO.txt +++ b/intl/icu/source/data/locales/no_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ "%%ALIAS"{"nb_NO"} } diff --git a/intl/icu/source/data/locales/no_NO_NY.txt b/intl/icu/source/data/locales/no_NO_NY.txt index aa897fe6f515..c900df7fea21 100644 --- a/intl/icu/source/data/locales/no_NO_NY.txt +++ b/intl/icu/source/data/locales/no_NO_NY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO_NY{ "%%ALIAS"{"nn_NO"} } diff --git a/intl/icu/source/data/locales/nus.txt b/intl/icu/source/data/locales/nus.txt index 0edcc3bf7745..d95bdd6f495b 100644 --- a/intl/icu/source/data/locales/nus.txt +++ b/intl/icu/source/data/locales/nus.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nus{ ExemplarCharacters{ "[a ä {a\u0331} b c d e ë {e\u0331} ɛ {ɛ\u0308} {ɛ\u0331} {ɛ\u0331\u0308} f g" @@ -22,7 +23,6 @@ nus{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/nus_SS.txt b/intl/icu/source/data/locales/nus_SS.txt index 00d9bfae1a3b..c573ba0e24ce 100644 --- a/intl/icu/source/data/locales/nus_SS.txt +++ b/intl/icu/source/data/locales/nus_SS.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nus_SS{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/nyn.txt b/intl/icu/source/data/locales/nyn.txt index 909607ae5975..fb4a4c278246 100644 --- a/intl/icu/source/data/locales/nyn.txt +++ b/intl/icu/source/data/locales/nyn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nyn{ 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]"} @@ -10,7 +11,6 @@ nyn{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/nyn_UG.txt b/intl/icu/source/data/locales/nyn_UG.txt index 97ff192fd832..a4a96e4a2af6 100644 --- a/intl/icu/source/data/locales/nyn_UG.txt +++ b/intl/icu/source/data/locales/nyn_UG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nyn_UG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/om.txt b/intl/icu/source/data/locales/om.txt index 7e44070a726f..4918115ed6e9 100644 --- a/intl/icu/source/data/locales/om.txt +++ b/intl/icu/source/data/locales/om.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om{ 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]"} @@ -35,7 +36,6 @@ om{ native{"latn"} traditional{"ethi"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/om_ET.txt b/intl/icu/source/data/locales/om_ET.txt index b4b3663e8cbb..5ce76525a4e0 100644 --- a/intl/icu/source/data/locales/om_ET.txt +++ b/intl/icu/source/data/locales/om_ET.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om_ET{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/om_KE.txt b/intl/icu/source/data/locales/om_KE.txt index eaf2dc6891fa..5ac3cce3314b 100644 --- a/intl/icu/source/data/locales/om_KE.txt +++ b/intl/icu/source/data/locales/om_KE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om_KE{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/or.txt b/intl/icu/source/data/locales/or.txt index 404e3a7d7123..f316df944a1c 100644 --- a/intl/icu/source/data/locales/or.txt +++ b/intl/icu/source/data/locales/or.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml or{ AuxExemplarCharacters{"[\u200C\u200D]"} Ellipsis{ @@ -240,7 +241,6 @@ or{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/or_IN.txt b/intl/icu/source/data/locales/or_IN.txt index d13cadfb8829..a7561f3f03c9 100644 --- a/intl/icu/source/data/locales/or_IN.txt +++ b/intl/icu/source/data/locales/or_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml or_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/os.txt b/intl/icu/source/data/locales/os.txt index 9021d38ced24..e3e24ac46ed8 100644 --- a/intl/icu/source/data/locales/os.txt +++ b/intl/icu/source/data/locales/os.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os{ AuxExemplarCharacters{"[]"} Ellipsis{ @@ -44,7 +45,6 @@ os{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/os_GE.txt b/intl/icu/source/data/locales/os_GE.txt index 2cca8df65fac..24580861dc72 100644 --- a/intl/icu/source/data/locales/os_GE.txt +++ b/intl/icu/source/data/locales/os_GE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os_GE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/os_RU.txt b/intl/icu/source/data/locales/os_RU.txt index d33b3f376e72..3559d9d69409 100644 --- a/intl/icu/source/data/locales/os_RU.txt +++ b/intl/icu/source/data/locales/os_RU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os_RU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/pa.txt b/intl/icu/source/data/locales/pa.txt index 34c2ed5d7f8a..72bc816cbe22 100644 --- a/intl/icu/source/data/locales/pa.txt +++ b/intl/icu/source/data/locales/pa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa{ AuxExemplarCharacters{"[\u200C\u200D ਃ \u0A02 \u0A01 {ਲ\u0A3C}]"} Ellipsis{ @@ -257,7 +258,6 @@ pa{ minimumGroupingDigits{"1"} native{"guru"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -908,7 +908,7 @@ pa{ "ਸੰਨ", } abbreviated%variant{ - "ਈ. ਪੂ. ਸੰ.", + "ਈ. ਪੂ.", "ਈ. ਸੰ.", } narrow{ @@ -916,7 +916,7 @@ pa{ "ਸੰਨ", } narrow%variant{ - "ਈ.ਪੂ.ਸੰ.", + "ਈ. ਪੂ.", "ਈ.ਸੰ.", } wide{ @@ -2536,7 +2536,7 @@ pa{ listPattern{ or{ 2{"{0} ਜਾਂ {1}"} - end{"{0}, or {1}"} + end{"{0} ਜਾਂ {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} } diff --git a/intl/icu/source/data/locales/pa_Arab.txt b/intl/icu/source/data/locales/pa_Arab.txt index ad420894b9c0..611479ec4523 100644 --- a/intl/icu/source/data/locales/pa_Arab.txt +++ b/intl/icu/source/data/locales/pa_Arab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Arab{ %%Parent{"root"} AuxExemplarCharacters{"[\u200E\u200F أ ٻ ة ٺ ټ ٽ]"} @@ -23,7 +24,6 @@ pa_Arab{ } native{"arabext"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/pa_Arab_PK.txt b/intl/icu/source/data/locales/pa_Arab_PK.txt index 6d882e09a588..439674204618 100644 --- a/intl/icu/source/data/locales/pa_Arab_PK.txt +++ b/intl/icu/source/data/locales/pa_Arab_PK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Arab_PK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/pa_Guru.txt b/intl/icu/source/data/locales/pa_Guru.txt index a0ee56949a68..f10658f06f81 100644 --- a/intl/icu/source/data/locales/pa_Guru.txt +++ b/intl/icu/source/data/locales/pa_Guru.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Guru{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/pa_Guru_IN.txt b/intl/icu/source/data/locales/pa_Guru_IN.txt index a46aea4c8086..223b28f04e14 100644 --- a/intl/icu/source/data/locales/pa_Guru_IN.txt +++ b/intl/icu/source/data/locales/pa_Guru_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Guru_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/pa_IN.txt b/intl/icu/source/data/locales/pa_IN.txt index b18bba68dc7f..0c963d73dff9 100644 --- a/intl/icu/source/data/locales/pa_IN.txt +++ b/intl/icu/source/data/locales/pa_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_IN{ "%%ALIAS"{"pa_Guru_IN"} } diff --git a/intl/icu/source/data/locales/pa_PK.txt b/intl/icu/source/data/locales/pa_PK.txt index 1c66c7b37a41..29612addf4c1 100644 --- a/intl/icu/source/data/locales/pa_PK.txt +++ b/intl/icu/source/data/locales/pa_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_PK{ "%%ALIAS"{"pa_Arab_PK"} } diff --git a/intl/icu/source/data/locales/pcm.txt b/intl/icu/source/data/locales/pcm.txt index dabcaa08b957..3ab33618a8d7 100644 --- a/intl/icu/source/data/locales/pcm.txt +++ b/intl/icu/source/data/locales/pcm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pcm{ AuxExemplarCharacters{"[à c è {ẹ\u0300} ì ò {ọ\u0300} q ù x]"} Ellipsis{ @@ -214,7 +215,6 @@ pcm{ } native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -429,10 +429,10 @@ pcm{ Ed{"d E"} 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"} + 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"} @@ -468,7 +468,7 @@ pcm{ yQQQQ{"QQQQ y"} yw{ one{"'Wik' w 'fọ' Y"} - other{"'week' w 'of' Y"} + other{"'Wiik' w 'fọ' Y"} } } dayNames{ @@ -594,42 +594,42 @@ pcm{ m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} - y{"y–y G"} + G{"Gy – Gy"} + y{"G y–y"} } GyM{ - G{"MM-y GGGGG – MM-y GGGGG"} - M{"MM-y – MM-y GGGGG"} - y{"MM-y – MM-y GGGGG"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"E, dd-MM-y GGGGG – E, dd-MM-y GGGGG"} - 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"} + G{"GGGGG y-MM-dd, E – y-MM-dd, E"} + 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"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + G{"G y MMM – G y MMM"} + M{"G y MMM–MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - 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"} + G{"G y MMM d, E – G y MMM"} + 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"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} + d{"G y MMM d–d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"dd-MM-y GGGGG – dd-MM-y GGGGG"} - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"HH–HH"} diff --git a/intl/icu/source/data/locales/pcm_NG.txt b/intl/icu/source/data/locales/pcm_NG.txt index 3274685085b8..7c502880cb55 100644 --- a/intl/icu/source/data/locales/pcm_NG.txt +++ b/intl/icu/source/data/locales/pcm_NG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pcm_NG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/pl.txt b/intl/icu/source/data/locales/pl.txt index bdbe88920890..2cf86778dbc7 100644 --- a/intl/icu/source/data/locales/pl.txt +++ b/intl/icu/source/data/locales/pl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl{ AuxExemplarCharacters{"[à â å ä æ ç é è ê ë î ï ô ö œ q ß ù û ü v x ÿ]"} Ellipsis{ @@ -7,7 +8,7 @@ pl{ word-initial{"…{0}"} } 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 Ź Ż]"} + 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 Ź Ż]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{ "[\\- ‐ ‑ – — , ; \\: ! ? . … ' \u0022 ” „ « » ( ) \\[ \\] \\{ \\} § @ * / " @@ -282,7 +283,6 @@ pl{ } minimumGroupingDigits{"2"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -947,7 +947,6 @@ pl{ d{ d{"d–d"} } - fallback{"{0}–{1}"} h{ a{"h a–h a"} h{"h–h a"} @@ -2670,7 +2669,7 @@ pl{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/pl_PL.txt b/intl/icu/source/data/locales/pl_PL.txt index 7bdd4c8a1bdc..7f08b342178e 100644 --- a/intl/icu/source/data/locales/pl_PL.txt +++ b/intl/icu/source/data/locales/pl_PL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl_PL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ps.txt b/intl/icu/source/data/locales/ps.txt index 6a845993dc6f..8ac9aeabea33 100644 --- a/intl/icu/source/data/locales/ps.txt +++ b/intl/icu/source/data/locales/ps.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps{ AuxExemplarCharacters{"[\u200C \u200D \u200E\u200F ے]"} Ellipsis{ @@ -226,7 +227,6 @@ ps{ minimumGroupingDigits{"1"} native{"arabext"} } - Version{"37"} calendar{ default{"persian"} generic{ @@ -2064,6 +2064,10 @@ ps{ characters{"right-to-left"} } listPattern{ + or{ + 2{"{0} or {1}"} + end{"{0}, یا {1}"} + } standard{ 2{"{0} او {1}"} end{"{0}، او {1}"} @@ -2096,7 +2100,7 @@ ps{ } } measurementSystemNames{ - UK{"بريتاني"} + UK{"برتانوې"} US{"متحده ايالات"} metric{"مېټرک"} } @@ -2123,7 +2127,7 @@ ps{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/ps_AF.txt b/intl/icu/source/data/locales/ps_AF.txt index 3b8c84894b24..60190281ad93 100644 --- a/intl/icu/source/data/locales/ps_AF.txt +++ b/intl/icu/source/data/locales/ps_AF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps_AF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ps_PK.txt b/intl/icu/source/data/locales/ps_PK.txt index a9e139855508..5b9afb5ff28a 100644 --- a/intl/icu/source/data/locales/ps_PK.txt +++ b/intl/icu/source/data/locales/ps_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps_PK{ AuxExemplarCharacters{"[\u200C \u200D \u200E\u200F]"} ExemplarCharacters{ @@ -7,7 +8,6 @@ ps_PK{ " ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ گ ل م ن ڼ" " ه ة و ؤ ی ے ي ې ۍ ئ]" } - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/pt.txt b/intl/icu/source/data/locales/pt.txt index bda9e0dfa4d2..37b1745f5487 100644 --- a/intl/icu/source/data/locales/pt.txt +++ b/intl/icu/source/data/locales/pt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ AuxExemplarCharacters{"[ª ă å ä ā æ è ĕ ë ē ì ĭ î ï ī ñ º ŏ ö ø ō œ ù ŭ û ü ū ÿ]"} Ellipsis{ @@ -211,7 +212,6 @@ pt{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -724,42 +724,42 @@ pt{ m{"h:mm – h:mm B"} } Gy{ - G{"G y – G y"} - y{"G y – y"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"GGGGG MM/y – GGGGG MM/y"} - M{"GGGGG MM/y – MM/y"} - y{"GGGGG MM/y – MM/y"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} - M{"GGGGG E dd/MM/y – E dd/MM/y"} - d{"GGGGG E dd/MM/y – dd/MM/y"} - y{"GGGGG E dd/MM/y – E dd/MM/y"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + 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"} } GyMMM{ - G{"G MMM y – G MMM y"} - M{"G MMM y – MMM"} - y{"G MMM y – MMM y"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"G E, d 'de' MMM y – G E, d 'de' MMM y"} - M{"G E, d 'de' MMM y – E, d 'de' MMM"} - d{"G E, d 'de' MMM y – E, d 'de' MMM"} - y{"G E, d 'de' MMM y – E, d 'de' MMM y"} + G{"E, MMM d, y G – E, MMM d, y G"} + 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"} } GyMMMd{ - G{"G d 'de' MMM y – G d 'de' MMM y"} - M{"G d 'de' MMM y – d 'de' MMM"} - d{"G d – d 'de' MMM y"} - y{"G d 'de' MMM y – d 'de' MMM y"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} - M{"GGGGG dd/MM/y – dd/MM/y"} - d{"GGGGG dd/MM/y – dd/MM/y"} - y{"GGGGG dd/MM/y – dd/MM/y"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ H{"HH'h' - HH'h'"} @@ -2001,7 +2001,7 @@ pt{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/pt_AO.txt b/intl/icu/source/data/locales/pt_AO.txt index c86c8668b2d3..bf497343f6dc 100644 --- a/intl/icu/source/data/locales/pt_AO.txt +++ b/intl/icu/source/data/locales/pt_AO.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_AO{ %%Parent{"pt_PT"} NumberElements{ minimumGroupingDigits{"1"} } - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_BR.txt b/intl/icu/source/data/locales/pt_BR.txt index 6889670c0433..cca79d2ba9b4 100644 --- a/intl/icu/source/data/locales/pt_BR.txt +++ b/intl/icu/source/data/locales/pt_BR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_BR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_CH.txt b/intl/icu/source/data/locales/pt_CH.txt index 3a679be16d07..67d661e786be 100644 --- a/intl/icu/source/data/locales/pt_CH.txt +++ b/intl/icu/source/data/locales/pt_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CH{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_CV.txt b/intl/icu/source/data/locales/pt_CV.txt index 6d4dd3a184a5..ebaaea839bb3 100644 --- a/intl/icu/source/data/locales/pt_CV.txt +++ b/intl/icu/source/data/locales/pt_CV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CV{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_GQ.txt b/intl/icu/source/data/locales/pt_GQ.txt index 7cbf7717a1ea..9364da966374 100644 --- a/intl/icu/source/data/locales/pt_GQ.txt +++ b/intl/icu/source/data/locales/pt_GQ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GQ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_GW.txt b/intl/icu/source/data/locales/pt_GW.txt index da37fbe5cb59..e28e46c16b08 100644 --- a/intl/icu/source/data/locales/pt_GW.txt +++ b/intl/icu/source/data/locales/pt_GW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GW{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_LU.txt b/intl/icu/source/data/locales/pt_LU.txt index ebead8d520fb..c402ea2ae5ed 100644 --- a/intl/icu/source/data/locales/pt_LU.txt +++ b/intl/icu/source/data/locales/pt_LU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_LU{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_MO.txt b/intl/icu/source/data/locales/pt_MO.txt index 4a57d5d46379..1bc096047924 100644 --- a/intl/icu/source/data/locales/pt_MO.txt +++ b/intl/icu/source/data/locales/pt_MO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MO{ %%Parent{"pt_PT"} - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/pt_MZ.txt b/intl/icu/source/data/locales/pt_MZ.txt index b99439ce7700..a8cc01a1b6e1 100644 --- a/intl/icu/source/data/locales/pt_MZ.txt +++ b/intl/icu/source/data/locales/pt_MZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MZ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_PT.txt b/intl/icu/source/data/locales/pt_PT.txt index 32406e9c4149..0b7a51050c06 100644 --- a/intl/icu/source/data/locales/pt_PT.txt +++ b/intl/icu/source/data/locales/pt_PT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_PT{ Ellipsis{ final{"{0}…"} @@ -160,6 +161,7 @@ pt_PT{ } } symbols{ + approximatelySign{"~"} group{" "} } } @@ -171,7 +173,6 @@ pt_PT{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -274,6 +275,44 @@ pt_PT{ yyyyQQQQ{"QQQQ 'de' y G"} } intervalFormats{ + Gy{ + G{"y G – y G"} + y{"y – y G"} + } + GyM{ + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} + } + GyMEd{ + G{"E, d/MM/y GGGGG – E, d/MM/y GGGGG"} + M{"E, d/MM/y – E, d/MM/y GGGGG"} + d{"E, d/MM/y – E, d/MM/y GGGGG"} + y{"E, d/MM/y – E, d/MM/y GGGGG"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, d 'de' MMMM, y G – E, d 'de' MMMM, y G"} + M{"E, d 'de' MMMM – E, d 'de' MMMM, y G"} + d{"E, d 'de' MMMM – E, d 'de' MMMM, y G"} + y{"E, d 'de' MMMM, y – E, d 'de' MMMM, y G"} + } + GyMMMd{ + G{"d 'de' MMMM, y G – d 'de' MMMM, y G"} + M{"d 'de' MMMM – d 'de' MMMM, y G"} + d{"d – d 'de' MMMM, y G"} + y{"d 'de' MMMM, y – d 'de' MMMM, y G"} + } + GyMd{ + G{"d/MM/y GGGGG – d/MM/y GGGGG"} + M{"d/MM/y – d/MM/y GGGGG"} + d{"d/MM/y – d/MM/y GGGGG"} + y{"d/MM/y – d/MM/y GGGGG"} + } M{ M{"MM–MM"} } @@ -379,6 +418,15 @@ pt_PT{ "S", "S", } + short{ + "dom.", + "seg.", + "ter.", + "qua.", + "qui.", + "sex.", + "sáb.", + } } stand-alone{ abbreviated{ @@ -434,26 +482,12 @@ pt_PT{ } } intervalFormats{ - Gy{ - G{"y G – y G"} - y{"y – y G"} - } - GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} - } GyMEd{ G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} M{"E, d/M/y – E, d/M/y GGGGG"} d{"E, d/M/y – E, d/M/y GGGGG"} y{"E, d/M/y – E, d/M/y GGGGG"} } - GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} - } GyMMMEd{ G{"E, d MMM y G – E, d MMM y G"} M{"E, d MMM – E, d MMM y G"} @@ -673,8 +707,8 @@ pt_PT{ other{"+{0} dias"} } past{ - one{"há {0} dias"} - other{"há {0} dias"} + one{"-{0} dia"} + other{"-{0} dias"} } } } @@ -1127,12 +1161,6 @@ pt_PT{ } } } - weekday-narrow{ - dn{"dia da semana"} - } - weekday-short{ - dn{"dia da semana"} - } year{ relativeTime{ future{ diff --git a/intl/icu/source/data/locales/pt_ST.txt b/intl/icu/source/data/locales/pt_ST.txt index e4321678d60b..ba0c09e92c58 100644 --- a/intl/icu/source/data/locales/pt_ST.txt +++ b/intl/icu/source/data/locales/pt_ST.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_ST{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/pt_TL.txt b/intl/icu/source/data/locales/pt_TL.txt index b3777b6af6af..0dafd096f317 100644 --- a/intl/icu/source/data/locales/pt_TL.txt +++ b/intl/icu/source/data/locales/pt_TL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_TL{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/qu.txt b/intl/icu/source/data/locales/qu.txt index b64461fcf25a..ea79a6cda7e4 100644 --- a/intl/icu/source/data/locales/qu.txt +++ b/intl/icu/source/data/locales/qu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu{ AuxExemplarCharacters{ "[á à ă â å ä ã ā æ b c ç d e é è ĕ ê ë ē f g í ì ĭ î ï ī j o ó ò ŏ ô ö ø ō œ" @@ -8,6 +9,10 @@ qu{ ExemplarCharacters{"[a {ch} {chʼ} h i k {kʼ} l {ll} m n ñ p {pʼ} q {qʼ} s t {tʼ} u w y]"} ExemplarCharactersIndex{"[A {Ch} H I K L {Ll} M N Ñ P Q S T U W Y]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersPunctuation{ + "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " + "′ ″]" + } NumberElements{ latn{ miscPatterns{ @@ -156,7 +161,6 @@ qu{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/qu_BO.txt b/intl/icu/source/data/locales/qu_BO.txt index e7395e909ec8..2103fc5111ff 100644 --- a/intl/icu/source/data/locales/qu_BO.txt +++ b/intl/icu/source/data/locales/qu_BO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu_BO{ NumberElements{ latn{ @@ -9,5 +10,4 @@ qu_BO{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/qu_EC.txt b/intl/icu/source/data/locales/qu_EC.txt index bb240382c7fc..2be18e0e9bb8 100644 --- a/intl/icu/source/data/locales/qu_EC.txt +++ b/intl/icu/source/data/locales/qu_EC.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu_EC{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/qu_PE.txt b/intl/icu/source/data/locales/qu_PE.txt index 8319e2d1f692..49ec3dbb1c70 100644 --- a/intl/icu/source/data/locales/qu_PE.txt +++ b/intl/icu/source/data/locales/qu_PE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu_PE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/rm.txt b/intl/icu/source/data/locales/rm.txt index 396266e89387..33e07da6a6f7 100644 --- a/intl/icu/source/data/locales/rm.txt +++ b/intl/icu/source/data/locales/rm.txt @@ -1,11 +1,13 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rm{ 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]"} ExemplarCharactersNumbers{"[. ’ % ‰ + − 0 1 2 3 4 5 6 7 8 9]"} NumberElements{ + default{"latn"} latn{ miscPatterns{ atLeast{"≥{0}"} @@ -33,9 +35,15 @@ rm{ timeSeparator{":"} } } + minimalPairs{ + plural{ + one{"{0} di"} + other{"{0} dis"} + } + } minimumGroupingDigits{"1"} + native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -47,11 +55,11 @@ rm{ "d MMMM y G", "dd-MM-y G", "dd-MM-y GGGGG", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, {0}", + "{1} 'a' 'las' {0}", + "{1} 'a' 'las' {0}", + "{1}, {0}", + "{1}, {0}", } availableFormats{ E{"ccc"} @@ -656,7 +664,7 @@ rm{ } fields{ day{ - dn{"Tag"} + dn{"di"} relative{ "-1"{"ier"} "-2"{"stersas"} @@ -665,6 +673,12 @@ rm{ "2"{"puschmaun"} } } + day-narrow{ + dn{"d"} + } + day-short{ + dn{"di"} + } dayperiod{ dn{"mesadad dal di"} } @@ -680,9 +694,20 @@ rm{ month{ dn{"mais"} } + quarter{ + dn{"quartal"} + } second{ dn{"secunda"} } + sun-short{ + relativeTime{ + future{ + one{"+{0} dumengia"} + other{"en {0} du"} + } + } + } week{ dn{"emna"} } @@ -691,11 +716,42 @@ rm{ } year{ dn{"onn"} + relative{ + "-1"{"l’onn passà"} + "0"{"quest onn"} + "1"{"l’onn proxim"} + } } zone{ dn{"zona d’urari"} } } + listPattern{ + or{ + 2{"{0} u {1}"} + end{"{0} u {1}"} + } + or-narrow{ + 2{"{0} u {1}"} + end{"{0} u {1}"} + } + or-short{ + 2{"{0} u {1}"} + end{"{0} u {1}"} + } + standard{ + 2{"{0} e {1}"} + end{"{0} e {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } + unit-narrow{ + 2{"{0} {1}"} + end{"{0} {1}"} + middle{"{0} {1}"} + start{"{0} {1}"} + } + } measurementSystemNames{ UK{"englais"} US{"american"} diff --git a/intl/icu/source/data/locales/rm_CH.txt b/intl/icu/source/data/locales/rm_CH.txt index 3d1c34f4b022..218ecd17b4a1 100644 --- a/intl/icu/source/data/locales/rm_CH.txt +++ b/intl/icu/source/data/locales/rm_CH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rm_CH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/rn.txt b/intl/icu/source/data/locales/rn.txt index 161518108d4d..4f0fd6609a87 100644 --- a/intl/icu/source/data/locales/rn.txt +++ b/intl/icu/source/data/locales/rn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rn{ 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]"} @@ -17,7 +18,6 @@ rn{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/rn_BI.txt b/intl/icu/source/data/locales/rn_BI.txt index 5687a5655e63..d5068124943e 100644 --- a/intl/icu/source/data/locales/rn_BI.txt +++ b/intl/icu/source/data/locales/rn_BI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rn_BI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ro.txt b/intl/icu/source/data/locales/ro.txt index 9b90bb4fd8cd..147b9c84f8b2 100644 --- a/intl/icu/source/data/locales/ro.txt +++ b/intl/icu/source/data/locales/ro.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro{ AuxExemplarCharacters{"[á à å ä ç é è ê ë ñ ö q ş ţ ü]"} Ellipsis{ @@ -250,7 +251,6 @@ ro{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ro_MD.txt b/intl/icu/source/data/locales/ro_MD.txt index 3fb9543ac616..2ce2ad0e0e27 100644 --- a/intl/icu/source/data/locales/ro_MD.txt +++ b/intl/icu/source/data/locales/ro_MD.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro_MD{ - Version{"37"} calendar{ gregorian{ dayNames{ diff --git a/intl/icu/source/data/locales/ro_RO.txt b/intl/icu/source/data/locales/ro_RO.txt index 9fb3ea1f85f0..c682ce764a9a 100644 --- a/intl/icu/source/data/locales/ro_RO.txt +++ b/intl/icu/source/data/locales/ro_RO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro_RO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/rof.txt b/intl/icu/source/data/locales/rof.txt index 544ccc219c24..9cdbb9f9c7bd 100644 --- a/intl/icu/source/data/locales/rof.txt +++ b/intl/icu/source/data/locales/rof.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rof{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -11,7 +12,6 @@ rof{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/rof_TZ.txt b/intl/icu/source/data/locales/rof_TZ.txt index 15b900a5381e..c855e2cfe818 100644 --- a/intl/icu/source/data/locales/rof_TZ.txt +++ b/intl/icu/source/data/locales/rof_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rof_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/root.txt b/intl/icu/source/data/locales/root.txt index fd8698afb748..daa4b2169474 100644 --- a/intl/icu/source/data/locales/root.txt +++ b/intl/icu/source/data/locales/root.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ AuxExemplarCharacters{"[]"} Ellipsis{ @@ -22,6 +23,7 @@ root{ percentFormat{"#,##0%"} } symbols{ + approximatelySign{"~"} decimal{"٫"} exponential{"اس"} group{"٬"} @@ -38,6 +40,7 @@ root{ } arabext{ symbols{ + approximatelySign{"~"} decimal{"٫"} exponential{"×۱۰^"} group{"٬"} @@ -146,6 +149,7 @@ root{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -171,7 +175,7 @@ root{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} + Version{"38.1"} calendar{ buddhist{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} @@ -2629,11 +2633,11 @@ root{ number{ lenient{ "[\\-‐‒–⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } stricter{ - "[,٫︐﹐,]", + "[,٫⹁︐﹐,]", "[.․﹒.。]", } } diff --git a/intl/icu/source/data/locales/ru.txt b/intl/icu/source/data/locales/ru.txt index 6bac8fa0b09b..98764e2e6bca 100644 --- a/intl/icu/source/data/locales/ru.txt +++ b/intl/icu/source/data/locales/ru.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ AuxExemplarCharacters{ "[{а\u0301} {е\u0301} {и\u0301} {о\u0301} {у\u0301} {ы\u0301} {э\u0301} {ю" @@ -264,6 +265,7 @@ ru{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{" "} @@ -292,7 +294,6 @@ ru{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/ru_BY.txt b/intl/icu/source/data/locales/ru_BY.txt index 3dfcd5d7767e..8d9efe162385 100644 --- a/intl/icu/source/data/locales/ru_BY.txt +++ b/intl/icu/source/data/locales/ru_BY.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_BY{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ru_KG.txt b/intl/icu/source/data/locales/ru_KG.txt index 295d6fc4b793..4269c5ff1da9 100644 --- a/intl/icu/source/data/locales/ru_KG.txt +++ b/intl/icu/source/data/locales/ru_KG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_KG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ru_KZ.txt b/intl/icu/source/data/locales/ru_KZ.txt index 51f2d6d01b95..6a9e154c3185 100644 --- a/intl/icu/source/data/locales/ru_KZ.txt +++ b/intl/icu/source/data/locales/ru_KZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_KZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ru_MD.txt b/intl/icu/source/data/locales/ru_MD.txt index e6727074460f..a18e477612a5 100644 --- a/intl/icu/source/data/locales/ru_MD.txt +++ b/intl/icu/source/data/locales/ru_MD.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_MD{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ru_RU.txt b/intl/icu/source/data/locales/ru_RU.txt index 6e28eab1c5fd..a7730a1cceb9 100644 --- a/intl/icu/source/data/locales/ru_RU.txt +++ b/intl/icu/source/data/locales/ru_RU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_RU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ru_UA.txt b/intl/icu/source/data/locales/ru_UA.txt index eb82f23f738e..03848d83f8e8 100644 --- a/intl/icu/source/data/locales/ru_UA.txt +++ b/intl/icu/source/data/locales/ru_UA.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_UA{ NumberElements{ minimumGroupingDigits{"2"} } - Version{"37"} calendar{ gregorian{ availableFormats{ diff --git a/intl/icu/source/data/locales/rw.txt b/intl/icu/source/data/locales/rw.txt index cf0e1e03882a..6b3e295936b9 100644 --- a/intl/icu/source/data/locales/rw.txt +++ b/intl/icu/source/data/locales/rw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rw{ 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]"} @@ -32,7 +33,6 @@ rw{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/rw_RW.txt b/intl/icu/source/data/locales/rw_RW.txt index 392cc27cff8e..8cf09d4141aa 100644 --- a/intl/icu/source/data/locales/rw_RW.txt +++ b/intl/icu/source/data/locales/rw_RW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rw_RW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/rwk.txt b/intl/icu/source/data/locales/rwk.txt index 4718a69b1b40..44af622e7479 100644 --- a/intl/icu/source/data/locales/rwk.txt +++ b/intl/icu/source/data/locales/rwk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rwk{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -11,7 +12,6 @@ rwk{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/rwk_TZ.txt b/intl/icu/source/data/locales/rwk_TZ.txt index 3fb659e538a9..c0fb27eef13c 100644 --- a/intl/icu/source/data/locales/rwk_TZ.txt +++ b/intl/icu/source/data/locales/rwk_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rwk_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sa.txt b/intl/icu/source/data/locales/sa.txt new file mode 100644 index 000000000000..3e7d15276bec --- /dev/null +++ b/intl/icu/source/data/locales/sa.txt @@ -0,0 +1,595 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +sa{ + AuxExemplarCharacters{"[\u200C\u200D ऍ ऑ \u0945 ॉ]"} + ExemplarCharacters{ + "[\u0951\u0952 \u093C \u0901 \u0902 ः ॐ अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ" + " च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \u0941 " + "\u0942 \u0943 \u0944 \u0962 \u0963 \u0947 \u0948 ो ौ \u094D]" + } + ExemplarCharactersIndex{ + "[अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ" + " म य र ल ळ व श ष स ह]" + } + ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]"} + ExemplarCharactersPunctuation{ + "[_ \\- ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} § @ * / " + "\\\\ \\& # ′ ″ ` + | ~]" + } + NumberElements{ + default{"deva"} + latn{ + miscPatterns{ + atLeast{"≥{0}"} + range{"{0}–{1}"} + } + patterns{ + accountingFormat{"¤ #,##0.00"} + currencyFormat{"¤#,##,##0.00"} + decimalFormat{"#,##,##0.###"} + percentFormat{"#,##,##0%"} + scientificFormat{"[#E0]"} + } + symbols{ + decimal{"."} + exponential{"E"} + group{","} + infinity{"∞"} + minusSign{"-"} + nan{"NaN"} + perMille{"‰"} + percentSign{"%"} + plusSign{"+"} + superscriptingExponent{"×"} + } + } + minimumGroupingDigits{"1"} + native{"deva"} + } + calendar{ + generic{ + DateTimePatterns{ + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "G EEEE, d MMMM y", + "G d MMMM y", + "G d MMM y", + "G d/M/y", + "{1}, {0}", + "{1} तेन {0}", + "{1} तेन {0}", + "{1}, {0}", + "{1}, {0}", + } + } + gregorian{ + AmPmMarkers{ + "पूर्वाह्न", + "अपराह्न", + } + AmPmMarkersAbbr{ + "AM", + "PM", + } + AmPmMarkersNarrow{ + "AM", + "PM", + } + 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", + "d/M/yy", + "{1}, {0}", + "{1} तदा {0}", + "{1} तदा {0}", + "{1}, {0}", + "{1}, {0}", + } + appendItems{ + Timezone{"{0} {1}"} + } + availableFormats{ + Bh{"B h"} + Bhm{"B h:mm"} + Bhms{"B h:mm:ss"} + E{"ccc"} + EBhm{"E B h:mm"} + EBhms{"E B h:mm:ss"} + 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 G y"} + GyMMMEd{"E, d MMM y G"} + GyMMMd{"d MMM y G"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} + Hmsv{"HH:mm:ss v"} + Hmv{"HH:mm v"} + M{"L"} + MEd{"E, d/M"} + MMM{"LLL"} + MMMEd{"E, d MMM"} + MMMMW{ + other{"'week' W 'of' MMM"} + } + MMMMd{"d MMMM"} + MMMd{"d MMM"} + Md{"d/M"} + d{"d"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} + 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"} + yw{ + other{"'week' w 'of' Y"} + } + } + dayNames{ + format{ + abbreviated{ + "रवि", + "सोम", + "मंगल", + "बुध", + "गुरु", + "शुक्र", + "शनि", + } + narrow{ + "र", + "सो", + "मं", + "बु", + "गु", + "शु", + "श", + } + short{ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + wide{ + "रविवासरः", + "सोमवासरः", + "मंगलवासरः", + "बुधवासरः", + "गुरुवासर:", + "शुक्रवासरः", + "शनिवासरः", + } + } + stand-alone{ + abbreviated{ + "रवि", + "सोम", + "मंगल", + "बुध", + "गुरु", + "शुक्र", + "शनि", + } + narrow{ + "र", + "सो", + "मं", + "बु", + "गु", + "शु", + "श", + } + short{ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + wide{ + "रविवासरः", + "सोमवासरः", + "मंगलवासरः", + "बुधवासरः", + "गुरुवासर:", + "शुक्रवासरः", + "शनिवासरः", + } + } + } + dayPeriod{ + stand-alone{ + abbreviated{ + am{"AM"} + pm{"PM"} + } + narrow{ + am{"AM"} + pm{"PM"} + } + wide{ + am{"AM"} + pm{"PM"} + } + } + } + eras{ + abbreviated{ + "BCE", + "CE", + } + abbreviated%variant{ + "ईसवी पूर्व", + "संवत्", + } + wide{ + "BCE", + "CE", + } + } + 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"} + } + 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 – 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 MMM–MMM"} + y{"y MMM – y MMM"} + } + yMMMEd{ + 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{"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{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} + } + } + monthNames{ + format{ + abbreviated{ + "जनवरी:", + "फरवरी:", + "मार्च:", + "अप्रैल:", + "मई", + "जून:", + "जुलाई:", + "अगस्त:", + "सितंबर:", + "अक्तूबर:", + "नवंबर:", + "दिसंबर:", + } + narrow{ + "ज", + "फ", + "मा", + "अ", + "म", + "जू", + "जु", + "अ", + "सि", + "अ", + "न", + "दि", + } + 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{ + "प्रथम त्रैमासिक", + "द्वितीय त्रैमासिक", + "तृतीय त्रैमासिक", + "चतुर्थ त्रैमासिक", + } + } + stand-alone{ + abbreviated{ + "त्रैमासिक1", + "त्रैमासिक2", + "त्रैमासिक3", + "त्रैमासिक4", + } + narrow{ + "1", + "2", + "3", + "4", + } + wide{ + "प्रथम त्रैमासिक", + "द्वितीय त्रैमासिक", + "तृतीय त्रैमासिक", + "चतुर्थ त्रैमासिक", + } + } + } + } + } + fields{ + day{ + dn{"वासर:"} + relative{ + "-1"{"गतदिनम्"} + "0"{"अद्य"} + "1"{"श्वः"} + } + } + day-narrow{ + dn{"दिवा"} + } + day-short{ + dn{"अहन्"} + relative{ + "-1"{"ह्यः"} + "0"{"अद्य"} + "1"{"श्वः"} + } + } + dayperiod{ + dn{"पूर्वाह्न/अपराह्न"} + } + era{ + dn{"युग"} + } + hour{ + dn{"होरा"} + } + hour-narrow{ + dn{"होरा"} + } + hour-short{ + dn{"होरा"} + } + minute{ + dn{"निमेष"} + } + minute-narrow{ + dn{"निमेष"} + } + minute-short{ + dn{"निमेष"} + } + month{ + dn{"मास:"} + } + month-narrow{ + dn{"मास"} + } + month-short{ + dn{"मास"} + } + quarter{ + dn{"त्रेमासिक"} + } + quarter-narrow{ + dn{"त्रेमासिक"} + } + quarter-short{ + dn{"त्रेमासिक"} + } + second{ + dn{"क्षण"} + } + second-narrow{ + dn{"पल"} + } + second-short{ + dn{"पल"} + } + week{ + dn{"सप्ताह:"} + } + week-narrow{ + dn{"सप्ताह"} + } + week-short{ + dn{"सप्ताह"} + } + weekday{ + dn{"सप्ताहस्य दिनं"} + } + year{ + dn{"वर्ष:"} + } + year-narrow{ + dn{"वर्ष"} + } + year-short{ + dn{"वर्ष:"} + } + zone{ + dn{"समय मण्डल"} + } + } + listPattern{ + standard{ + 2{"{0} तथा {1}"} + end{"{0}, तथा {1}"} + } + } + measurementSystemNames{ + UK{"यूके"} + US{"यूएस"} + metric{"छन्दोमान"} + } +} diff --git a/intl/icu/source/data/lang/nds.txt b/intl/icu/source/data/locales/sa_IN.txt similarity index 62% rename from intl/icu/source/data/lang/nds.txt rename to intl/icu/source/data/locales/sa_IN.txt index ac58836f6f00..c803b9b835ed 100644 --- a/intl/icu/source/data/lang/nds.txt +++ b/intl/icu/source/data/locales/sa_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds{ - Version{"37"} +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +sa_IN{ } diff --git a/intl/icu/source/data/locales/sah.txt b/intl/icu/source/data/locales/sah.txt index 4a0bc43c64fa..9a188c13dede 100644 --- a/intl/icu/source/data/locales/sah.txt +++ b/intl/icu/source/data/locales/sah.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sah{ AuxExemplarCharacters{"[в е ё ж з ф ц ш щ ъ ь ю я]"} Ellipsis{ @@ -164,7 +165,6 @@ sah{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sah_RU.txt b/intl/icu/source/data/locales/sah_RU.txt index c8c526cf2160..b5424423d02d 100644 --- a/intl/icu/source/data/locales/sah_RU.txt +++ b/intl/icu/source/data/locales/sah_RU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sah_RU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/saq.txt b/intl/icu/source/data/locales/saq.txt index 174120df4bfd..0d064df422f4 100644 --- a/intl/icu/source/data/locales/saq.txt +++ b/intl/icu/source/data/locales/saq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml saq{ AuxExemplarCharacters{"[f q x z]"} ExemplarCharacters{"[a b c d e g h i j k l m n o p r s t u v w y]"} @@ -12,7 +13,6 @@ saq{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/saq_KE.txt b/intl/icu/source/data/locales/saq_KE.txt index 082e56ba34b6..a020ba44058d 100644 --- a/intl/icu/source/data/locales/saq_KE.txt +++ b/intl/icu/source/data/locales/saq_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml saq_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sat.txt b/intl/icu/source/data/locales/sat.txt index 402929ab081c..a2df7f2e0f14 100644 --- a/intl/icu/source/data/locales/sat.txt +++ b/intl/icu/source/data/locales/sat.txt @@ -1,12 +1,21 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat{ ExemplarCharacters{"[ᱚ ᱛ ᱜ ᱝ ᱞ ᱟ ᱠ ᱡ ᱢ ᱣ ᱤ ᱥ ᱦ ᱧ ᱨ ᱩ ᱪ ᱫ ᱬ ᱭ ᱮ ᱯ ᱰ ᱱ ᱲ ᱳ ᱴ ᱵ ᱶ ᱷ ᱸ ᱹ ᱺ ᱻ ᱼ ᱽ]"} ExemplarCharactersNumbers{"[\\- ‑ , . % + 0᱐ 1᱑ 2᱒ 3᱓ 4᱔ 5᱕ 6᱖ 7᱗ 8᱘ 9᱙]"} NumberElements{ default{"olck"} + latn{ + symbols{ + decimal{"."} + group{","} + minusSign{"-"} + percentSign{"%"} + plusSign{"+"} + } + } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -27,8 +36,8 @@ sat{ } gregorian{ AmPmMarkers{ - "ᱥᱤᱧ/ᱥᱮᱛᱟᱜ", - "ᱟᱹᱭᱩᱵ/ᱧᱤᱫᱟ", + "ᱥᱮᱛᱟᱜ", + "ᱧᱤᱫᱟᱹ", } DateTimePatterns{ "h:mm:ss a zzzz", @@ -96,6 +105,12 @@ sat{ } } } + eras{ + abbreviated{ + "ᱥᱮᱨᱢᱟ ᱞᱟᱦᱟ", + "ᱤᱥᱣᱤ", + } + } monthNames{ format{ abbreviated{ @@ -286,6 +301,6 @@ sat{ measurementSystemNames{ UK{"ᱭᱩᱠᱮ"} US{"ᱭᱩᱮᱥ"} - metric{"ᱢᱤᱴᱨᱤᱠ"} + metric{"ᱢᱮᱴᱨᱤᱠ"} } } diff --git a/intl/icu/source/data/locales/sat_IN.txt b/intl/icu/source/data/locales/sat_IN.txt index c4976b4d7f96..15af3290b576 100644 --- a/intl/icu/source/data/locales/sat_IN.txt +++ b/intl/icu/source/data/locales/sat_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_IN{ "%%ALIAS"{"sat_Olck_IN"} } diff --git a/intl/icu/source/data/locales/sat_Olck.txt b/intl/icu/source/data/locales/sat_Olck.txt index 0d7225f984f0..f09b6a0014dd 100644 --- a/intl/icu/source/data/locales/sat_Olck.txt +++ b/intl/icu/source/data/locales/sat_Olck.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_Olck{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sat_Olck_IN.txt b/intl/icu/source/data/locales/sat_Olck_IN.txt index 2511c15dc4e2..9edc79fcfe9a 100644 --- a/intl/icu/source/data/locales/sat_Olck_IN.txt +++ b/intl/icu/source/data/locales/sat_Olck_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_Olck_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sbp.txt b/intl/icu/source/data/locales/sbp.txt index 7772d300a173..105b4ea88db2 100644 --- a/intl/icu/source/data/locales/sbp.txt +++ b/intl/icu/source/data/locales/sbp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sbp{ AuxExemplarCharacters{"[q r x z]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p s t u v w y]"} @@ -18,7 +19,6 @@ sbp{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sbp_TZ.txt b/intl/icu/source/data/locales/sbp_TZ.txt index 230968743754..8f82a1ed573c 100644 --- a/intl/icu/source/data/locales/sbp_TZ.txt +++ b/intl/icu/source/data/locales/sbp_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sbp_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sd.txt b/intl/icu/source/data/locales/sd.txt index d34aa141e76a..be223a08ee43 100644 --- a/intl/icu/source/data/locales/sd.txt +++ b/intl/icu/source/data/locales/sd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd{ AuxExemplarCharacters{"[\u064E \u064F \u0650 ئ]"} Ellipsis{ @@ -91,102 +92,102 @@ sd{ patternsShort{ currencyFormat{ 1000{ - one{"¤ 0K"} - other{"¤ 0K"} + one{"¤0هزار"} + other{"¤0هزار"} } 10000{ - one{"¤ 00K"} - other{"¤ 00K"} + one{"¤00هزار"} + other{"¤00هزار"} } 100000{ - one{"¤ 000K"} - other{"¤ 000K"} + one{"¤000لک"} + other{"¤000لک"} } 1000000{ - one{"¤ 0M"} - other{"¤ 0M"} + one{"¤00لک"} + other{"¤00لک"} } 10000000{ - one{"¤ 00M"} - other{"¤ 00M"} + one{"¤0ڪروڙ"} + other{"¤0ڪروڙ"} } 100000000{ - one{"¤ 000M"} - other{"¤ 000M"} + one{"¤00ڪروڙ"} + other{"¤00ڪروڙ"} } 1000000000{ - one{"¤ 0G"} - other{"¤ 0G"} + one{"¤0ارب"} + other{"¤0ارب"} } 10000000000{ - one{"¤ 00G"} - other{"¤ 00G"} + one{"¤00ارب"} + other{"¤00ارب"} } 100000000000{ - one{"¤ 000G"} - other{"¤ 000G"} + one{"¤0کرب"} + other{"¤0کرب"} } 1000000000000{ - one{"¤ 0T"} - other{"¤ 0T"} + one{"¤0ٽرلين"} + other{"¤0ٽرلين"} } 10000000000000{ - one{"¤ 00T"} - other{"¤ 00T"} + one{"¤00ٽرلين"} + other{"¤00ٽرلين"} } 100000000000000{ - one{"¤ 000T"} - other{"¤ 000T"} + one{"¤000ٽرلين"} + other{"¤000ٽرلين"} } } decimalFormat{ 1000{ - one{"0K"} - other{"0K"} + one{"0 هزار"} + other{"0 هزار"} } 10000{ - one{"00K"} - other{"00K"} + one{"00 هزار"} + other{"00 هزار"} } 100000{ - one{"000K"} - other{"000K"} + one{"000 هزار"} + other{"000 هزار"} } 1000000{ - one{"0M"} - other{"0M"} + one{"0 ملين"} + other{"0 ملين"} } 10000000{ - one{"00M"} - other{"00M"} + one{"00 ملين"} + other{"00 ملين"} } 100000000{ - one{"000M"} - other{"000M"} + one{"000 ملين"} + other{"000 ملين"} } 1000000000{ - one{"0B"} - other{"0B"} + one{"0 بلين"} + other{"0 بلين"} } 10000000000{ - one{"00B"} - other{"00B"} + one{"00 بلين"} + other{"00 بلين"} } 100000000000{ - one{"000B"} - other{"000B"} + one{"000 بلين"} + other{"000 بلين"} } 1000000000000{ - one{"0T"} - other{"0T"} + one{"0 ٽرلين"} + other{"0 ٽرلين"} } 10000000000000{ - one{"00T"} - other{"00T"} + one{"00 ٽرلين"} + other{"00 ٽرلين"} } 100000000000000{ - one{"000T"} - other{"000T"} + one{"000 ٽرلين"} + other{"000 ٽرلين"} } } } @@ -205,7 +206,7 @@ sd{ } minimalPairs{ ordinal{ - other{"کاٻي تي {0} نمبر گهر."} + other{"{0} ساڄو پاسو وٺو"} } plural{ one{"{0} ڪتاب"} @@ -215,7 +216,6 @@ sd{ minimumGroupingDigits{"1"} native{"arab"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -538,7 +538,7 @@ sd{ "CE", } wide{ - "مسيح کان اڳ", + "قبل مسيح", "عيسوي کان پهرين", } wide%variant{ @@ -821,6 +821,56 @@ sd{ } } } + islamic{ + monthNames{ + format{ + abbreviated{ + "محرم", + "صفر", + "ربيع الاول", + "ربیع الاخر", + "جمادی الاول", + "جمادي الاخر", + "رجب", + "شعبان", + "رمضان", + "شوال", + "ذوالقعد", + "ذوالحجہ", + } + wide{ + "محرم", + "صفر", + "ربيع الاول", + "ربیع الاخر", + "جمادی الاول", + "جمادي الاخر", + "رجب", + "شعبان", + "رمضان", + "شوال", + "ذوالقعد", + "ذوالحجہ", + } + } + stand-alone{ + wide{ + "محرم", + "صفر", + "ربيع الاول", + "ربیع الاخر", + "جمادی الاول", + "جمادي الاخر", + "رجب", + "شعبان", + "رمضان", + "شوال", + "ذوالقعد", + "ذوالحجہ", + } + } + } + } } characterLabel{ activities{"سرگرمي"} @@ -884,7 +934,7 @@ sd{ other{"ٻيا"} paired{"جوڙو"} person{"شخص"} - phonetic_alphabet{"صوتياتي رسم الخط"} + phonetic_alphabet{"صوتي رسم الخط"} pictographs{"تصويري نشاني"} place{"جڳھَ"} plant{"ٻوٽو"} @@ -907,7 +957,7 @@ sd{ variant_forms{"ويريئنٽ"} vocalic_jamo{"ووڪلڪ جامو"} weather{"موسم"} - western_asian_scripts{"مغربي ايشيائي رسم الخط"} + western_asian_scripts{"اولهه ايشيائي رسم الخط"} whitespace{"خالي جڳھَ"} } delimiters{ @@ -1670,6 +1720,11 @@ sd{ } year-short{ dn{"سال"} + relative{ + "-1"{"پوئين سال"} + "0"{"هن سال"} + "1"{"اڳين سال"} + } relativeTime{ future{ one{"{0} سالن ۾"} @@ -1757,7 +1812,7 @@ sd{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } stricter{ diff --git a/intl/icu/source/data/locales/sd_Arab.txt b/intl/icu/source/data/locales/sd_Arab.txt index 52a97c862438..c089e06d8ec5 100644 --- a/intl/icu/source/data/locales/sd_Arab.txt +++ b/intl/icu/source/data/locales/sd_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sd_Arab_PK.txt b/intl/icu/source/data/locales/sd_Arab_PK.txt index 6ab03f906c4f..d8a7d7b1767d 100644 --- a/intl/icu/source/data/locales/sd_Arab_PK.txt +++ b/intl/icu/source/data/locales/sd_Arab_PK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Arab_PK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sd_Deva.txt b/intl/icu/source/data/locales/sd_Deva.txt index 2886c07d4177..19213e8e688d 100644 --- a/intl/icu/source/data/locales/sd_Deva.txt +++ b/intl/icu/source/data/locales/sd_Deva.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Deva{ %%Parent{"root"} AuxExemplarCharacters{"[\u200C\u200D]"} @@ -17,7 +18,6 @@ sd_Deva{ default{"latn"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -285,9 +285,21 @@ sd_Deva{ dayperiod{ dn{"ॾींहु/रातु"} } + era{ + dn{"दौर"} + } hour{ dn{"कलाक"} } + minute{ + dn{"मिंटु"} + } + minute-narrow{ + dn{"मिंटु"} + } + minute-short{ + dn{"मिंटु"} + } month{ dn{"महीनो"} } @@ -303,6 +315,9 @@ sd_Deva{ weekday{ dn{"हफ्ते जो ॾींहु"} } + year{ + dn{"साल"} + } year-short{ dn{"साल"} } diff --git a/intl/icu/source/data/locales/sd_Deva_IN.txt b/intl/icu/source/data/locales/sd_Deva_IN.txt index 2c1aff247663..18923a7455db 100644 --- a/intl/icu/source/data/locales/sd_Deva_IN.txt +++ b/intl/icu/source/data/locales/sd_Deva_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Deva_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sd_PK.txt b/intl/icu/source/data/locales/sd_PK.txt index 766360070b4e..b7def87808ea 100644 --- a/intl/icu/source/data/locales/sd_PK.txt +++ b/intl/icu/source/data/locales/sd_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_PK{ "%%ALIAS"{"sd_Arab_PK"} } diff --git a/intl/icu/source/data/locales/se.txt b/intl/icu/source/data/locales/se.txt index 614cc899af8d..0b1355801eb7 100644 --- a/intl/icu/source/data/locales/se.txt +++ b/intl/icu/source/data/locales/se.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se{ 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 ž]"} @@ -166,7 +167,6 @@ se{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/se_FI.txt b/intl/icu/source/data/locales/se_FI.txt index cc639f7ce575..03d988a7e581 100644 --- a/intl/icu/source/data/locales/se_FI.txt +++ b/intl/icu/source/data/locales/se_FI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se_FI{ NumberElements{ latn{ @@ -62,7 +63,6 @@ se_FI{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/se_NO.txt b/intl/icu/source/data/locales/se_NO.txt index a824ddc70e35..c79475a4b27d 100644 --- a/intl/icu/source/data/locales/se_NO.txt +++ b/intl/icu/source/data/locales/se_NO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se_NO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/se_SE.txt b/intl/icu/source/data/locales/se_SE.txt index 27fe7100f4a5..dddd188d2d6d 100644 --- a/intl/icu/source/data/locales/se_SE.txt +++ b/intl/icu/source/data/locales/se_SE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se_SE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/seh.txt b/intl/icu/source/data/locales/seh.txt index 86258a2ddd4a..b429ff7ba50a 100644 --- a/intl/icu/source/data/locales/seh.txt +++ b/intl/icu/source/data/locales/seh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml seh{ 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" @@ -18,7 +19,6 @@ seh{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/seh_MZ.txt b/intl/icu/source/data/locales/seh_MZ.txt index 3fb239ab0751..90377219e415 100644 --- a/intl/icu/source/data/locales/seh_MZ.txt +++ b/intl/icu/source/data/locales/seh_MZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml seh_MZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ses.txt b/intl/icu/source/data/locales/ses.txt index 0bf9812ce19d..3cc3c67bbf69 100644 --- a/intl/icu/source/data/locales/ses.txt +++ b/intl/icu/source/data/locales/ses.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ses{ AuxExemplarCharacters{"[v]"} ExemplarCharacters{"[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]"} @@ -15,7 +16,6 @@ ses{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ses_ML.txt b/intl/icu/source/data/locales/ses_ML.txt index 3ec2514d22b7..f82cbb93202e 100644 --- a/intl/icu/source/data/locales/ses_ML.txt +++ b/intl/icu/source/data/locales/ses_ML.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ses_ML{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sg.txt b/intl/icu/source/data/locales/sg.txt index 79219e80b1fc..5adfef3bdf68 100644 --- a/intl/icu/source/data/locales/sg.txt +++ b/intl/icu/source/data/locales/sg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sg{ AuxExemplarCharacters{"[c q x]"} ExemplarCharacters{"[a â ä b d e ê ë f g h i î ï j k l m n o ô ö p r s t u ù û ü v w y z]"} @@ -16,7 +17,6 @@ sg{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sg_CF.txt b/intl/icu/source/data/locales/sg_CF.txt index 15cfa4aabae6..3ab23c64999b 100644 --- a/intl/icu/source/data/locales/sg_CF.txt +++ b/intl/icu/source/data/locales/sg_CF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sg_CF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sh.txt b/intl/icu/source/data/locales/sh.txt index 74b646a22923..83091b2d0a58 100644 --- a/intl/icu/source/data/locales/sh.txt +++ b/intl/icu/source/data/locales/sh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh{ "%%ALIAS"{"sr_Latn"} } diff --git a/intl/icu/source/data/locales/sh_BA.txt b/intl/icu/source/data/locales/sh_BA.txt index 93bdac63f042..7f73cd515f1a 100644 --- a/intl/icu/source/data/locales/sh_BA.txt +++ b/intl/icu/source/data/locales/sh_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_BA{ "%%ALIAS"{"sr_Latn_BA"} } diff --git a/intl/icu/source/data/locales/sh_CS.txt b/intl/icu/source/data/locales/sh_CS.txt index 224568a08c08..3b2f92bbf46c 100644 --- a/intl/icu/source/data/locales/sh_CS.txt +++ b/intl/icu/source/data/locales/sh_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/locales/sh_YU.txt b/intl/icu/source/data/locales/sh_YU.txt index 8a7d4609802f..dc5a35beadb0 100644 --- a/intl/icu/source/data/locales/sh_YU.txt +++ b/intl/icu/source/data/locales/sh_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/locales/shi.txt b/intl/icu/source/data/locales/shi.txt index a58e23338c26..9e4a1a057dc8 100644 --- a/intl/icu/source/data/locales/shi.txt +++ b/intl/icu/source/data/locales/shi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi{ ExemplarCharacters{"[ⴰ ⴱ ⴳ {ⴳⵯ} ⴷ ⴹ ⴻ ⴼ ⴽ {ⴽⵯ} ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ]"} ExemplarCharactersIndex{"[ⴰ ⴱ ⴳ ⴷ ⴹ ⴻ ⴼ ⴽ ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ]"} @@ -15,7 +16,6 @@ shi{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/shi_Latn.txt b/intl/icu/source/data/locales/shi_Latn.txt index 9b99157a6bb8..aace032e3c0f 100644 --- a/intl/icu/source/data/locales/shi_Latn.txt +++ b/intl/icu/source/data/locales/shi_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Latn{ %%Parent{"root"} AuxExemplarCharacters{"[o p v]"} @@ -17,7 +18,6 @@ shi_Latn{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/shi_Latn_MA.txt b/intl/icu/source/data/locales/shi_Latn_MA.txt index 7aa89f1fb8cb..9e77f987ae85 100644 --- a/intl/icu/source/data/locales/shi_Latn_MA.txt +++ b/intl/icu/source/data/locales/shi_Latn_MA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Latn_MA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/shi_MA.txt b/intl/icu/source/data/locales/shi_MA.txt index 00de1b1b27a7..c96251db2b7c 100644 --- a/intl/icu/source/data/locales/shi_MA.txt +++ b/intl/icu/source/data/locales/shi_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_MA{ "%%ALIAS"{"shi_Tfng_MA"} } diff --git a/intl/icu/source/data/locales/shi_Tfng.txt b/intl/icu/source/data/locales/shi_Tfng.txt index 397f53f49446..723cdf148de1 100644 --- a/intl/icu/source/data/locales/shi_Tfng.txt +++ b/intl/icu/source/data/locales/shi_Tfng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Tfng{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/shi_Tfng_MA.txt b/intl/icu/source/data/locales/shi_Tfng_MA.txt index af92249c4fde..42efcb4dde65 100644 --- a/intl/icu/source/data/locales/shi_Tfng_MA.txt +++ b/intl/icu/source/data/locales/shi_Tfng_MA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Tfng_MA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/si.txt b/intl/icu/source/data/locales/si.txt index ceeaeb5a8b4a..d076955e5cf9 100644 --- a/intl/icu/source/data/locales/si.txt +++ b/intl/icu/source/data/locales/si.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml si{ AuxExemplarCharacters{"[\u200B\u200C\u200D ඎ ඏ ඐ ඦ ෳ]"} Ellipsis{ @@ -196,6 +197,7 @@ si{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -221,7 +223,6 @@ si{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1908,7 +1909,7 @@ si{ date{ lenient{ "[\\--/]", - "[\\:∶]", + "[\\:∶︓﹕:]", } } general{ @@ -1917,8 +1918,8 @@ si{ "['ʼ՚᾽᾿’']", "[%٪﹪%]", "[؉‰]", - "[\$﹩$$]", - "[£₤]", + "[\$﹩$]", + "[£₤£]", "[¥¥]", "[₩₩]", "[₨₹{Rp}{Rs}]", @@ -1926,7 +1927,7 @@ si{ } number{ lenient{ - "[\\-‒⁻₋−➖﹣-]", + "[\\-‐‒–⁻₋−➖﹣-]", "[,،٫、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } diff --git a/intl/icu/source/data/locales/si_LK.txt b/intl/icu/source/data/locales/si_LK.txt index 1a7121284514..0a9f86532086 100644 --- a/intl/icu/source/data/locales/si_LK.txt +++ b/intl/icu/source/data/locales/si_LK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml si_LK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sk.txt b/intl/icu/source/data/locales/sk.txt index b90807d6e016..4bf9b95cd7a0 100644 --- a/intl/icu/source/data/locales/sk.txt +++ b/intl/icu/source/data/locales/sk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk{ AuxExemplarCharacters{"[à ă â å ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ö ő ø ō œ ř ù ŭ û ü ű ū ÿ]"} Ellipsis{ @@ -261,6 +262,7 @@ sk{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"e"} group{" "} @@ -289,7 +291,6 @@ sk{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/sk_SK.txt b/intl/icu/source/data/locales/sk_SK.txt index 6696d9690bd9..dcb27c6f6f84 100644 --- a/intl/icu/source/data/locales/sk_SK.txt +++ b/intl/icu/source/data/locales/sk_SK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk_SK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sl.txt b/intl/icu/source/data/locales/sl.txt index 02ba488bac48..d8ac1fe64992 100644 --- a/intl/icu/source/data/locales/sl.txt +++ b/intl/icu/source/data/locales/sl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl{ AuxExemplarCharacters{ "[á à ă â å ä ā æ ç ć đ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ q ú ù ŭ û ü" @@ -279,16 +280,15 @@ sl{ other{"V {0}. križišču zavijte desno."} } plural{ - few{"{0} ure"} - one{"{0} ura"} - other{"{0} ur"} - two{"{0} uri"} + few{"{0} dnevi"} + one{"{0} dan"} + other{"{0} dni"} + two{"{0} dneva"} } } minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/sl_SI.txt b/intl/icu/source/data/locales/sl_SI.txt index f22588f9cd9d..051d2b407f88 100644 --- a/intl/icu/source/data/locales/sl_SI.txt +++ b/intl/icu/source/data/locales/sl_SI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl_SI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/smn.txt b/intl/icu/source/data/locales/smn.txt index 6e0c0d5beaa5..453ca07e526a 100644 --- a/intl/icu/source/data/locales/smn.txt +++ b/intl/icu/source/data/locales/smn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml smn{ AuxExemplarCharacters{"[à ç é è í ñ ń ó ò q ú ü w x æ ø å ã ö]"} ExemplarCharacters{"[a â b c č d đ e f g h i j k l m n ŋ o p r s š t u v y z ž ä á]"} @@ -98,7 +99,6 @@ smn{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/smn_FI.txt b/intl/icu/source/data/locales/smn_FI.txt index 6b3f55a10e9b..1bbc7d51f86c 100644 --- a/intl/icu/source/data/locales/smn_FI.txt +++ b/intl/icu/source/data/locales/smn_FI.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml smn_FI{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sn.txt b/intl/icu/source/data/locales/sn.txt index 8e482ae500f3..db248377eea1 100644 --- a/intl/icu/source/data/locales/sn.txt +++ b/intl/icu/source/data/locales/sn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sn{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -33,7 +34,6 @@ sn{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sn_ZW.txt b/intl/icu/source/data/locales/sn_ZW.txt index 3699aee480cb..c620aef41d7d 100644 --- a/intl/icu/source/data/locales/sn_ZW.txt +++ b/intl/icu/source/data/locales/sn_ZW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sn_ZW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/so.txt b/intl/icu/source/data/locales/so.txt index 769a06b40a67..c5b18424a803 100644 --- a/intl/icu/source/data/locales/so.txt +++ b/intl/icu/source/data/locales/so.txt @@ -1,7 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so{ - 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]"} + AuxExemplarCharacters{"[a e i o p u v z]"} + ExemplarCharacters{"[b c d f g h j k l m n q r s t w x y]"} ExemplarCharactersIndex{"[B C D F G H J K L M N Q R S T W X Y]"} ExemplarCharactersPunctuation{ "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " @@ -108,7 +110,7 @@ so{ patternsLong{ decimalFormat{ 1000{ - one{"0 Kun"} + one{"Kun"} other{"0 Kun"} } 10000{ @@ -224,6 +226,7 @@ so{ } } symbols{ + approximatelySign{"~"} nan{"MaL"} } } @@ -337,7 +340,6 @@ so{ } } } - Version{"37"} calendar{ chinese{ cyclicNameSets{ @@ -1941,7 +1943,7 @@ so{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/so_DJ.txt b/intl/icu/source/data/locales/so_DJ.txt index 51c43da9340b..9e363642876d 100644 --- a/intl/icu/source/data/locales/so_DJ.txt +++ b/intl/icu/source/data/locales/so_DJ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so_DJ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/so_ET.txt b/intl/icu/source/data/locales/so_ET.txt index 21cc499a2d1c..b15faa724bab 100644 --- a/intl/icu/source/data/locales/so_ET.txt +++ b/intl/icu/source/data/locales/so_ET.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so_ET{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/so_KE.txt b/intl/icu/source/data/locales/so_KE.txt index 5e0aa66ed76d..44acf9233a84 100644 --- a/intl/icu/source/data/locales/so_KE.txt +++ b/intl/icu/source/data/locales/so_KE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so_KE{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/so_SO.txt b/intl/icu/source/data/locales/so_SO.txt index 3301c49f6712..877126e42719 100644 --- a/intl/icu/source/data/locales/so_SO.txt +++ b/intl/icu/source/data/locales/so_SO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so_SO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sq.txt b/intl/icu/source/data/locales/sq.txt index 710f26b2cbf0..a01798771242 100644 --- a/intl/icu/source/data/locales/sq.txt +++ b/intl/icu/source/data/locales/sq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq{ AuxExemplarCharacters{"[w]"} Ellipsis{ @@ -195,6 +196,7 @@ sq{ } } symbols{ + approximatelySign{"≈"} decimal{","} exponential{"E"} group{" "} @@ -222,7 +224,6 @@ sq{ minimumGroupingDigits{"2"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sq_AL.txt b/intl/icu/source/data/locales/sq_AL.txt index 85916efca68e..576b87c2e81b 100644 --- a/intl/icu/source/data/locales/sq_AL.txt +++ b/intl/icu/source/data/locales/sq_AL.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq_AL{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sq_MK.txt b/intl/icu/source/data/locales/sq_MK.txt index 508a72a788ab..6bd607c08b0b 100644 --- a/intl/icu/source/data/locales/sq_MK.txt +++ b/intl/icu/source/data/locales/sq_MK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq_MK{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sq_XK.txt b/intl/icu/source/data/locales/sq_XK.txt index 2beb60a7c94e..8a28809a6cd6 100644 --- a/intl/icu/source/data/locales/sq_XK.txt +++ b/intl/icu/source/data/locales/sq_XK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq_XK{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/sr.txt b/intl/icu/source/data/locales/sr.txt index e58c6eddc868..5a3a89186761 100644 --- a/intl/icu/source/data/locales/sr.txt +++ b/intl/icu/source/data/locales/sr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr{ AuxExemplarCharacters{"[{а\u0302} {е\u0302} ё й {и\u0302} {о\u0302} {у\u0302} щ ъ ы ь э ю я]"} Ellipsis{ @@ -249,7 +250,6 @@ sr{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -703,6 +703,10 @@ sr{ "пре нове ере", "нове ере", } + wide%variant{ + "пре наше ере", + "наше ере", + } } intervalFormats{ H{ @@ -2368,7 +2372,7 @@ sr{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/sr_BA.txt b/intl/icu/source/data/locales/sr_BA.txt index edad17f703fe..04f2efd1a7a2 100644 --- a/intl/icu/source/data/locales/sr_BA.txt +++ b/intl/icu/source/data/locales/sr_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_BA{ "%%ALIAS"{"sr_Cyrl_BA"} } diff --git a/intl/icu/source/data/locales/sr_CS.txt b/intl/icu/source/data/locales/sr_CS.txt index 5f8becfab3ed..6a32f49e2a6f 100644 --- a/intl/icu/source/data/locales/sr_CS.txt +++ b/intl/icu/source/data/locales/sr_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_CS{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/locales/sr_Cyrl.txt b/intl/icu/source/data/locales/sr_Cyrl.txt index df3a287587cf..772d8b3da519 100644 --- a/intl/icu/source/data/locales/sr_Cyrl.txt +++ b/intl/icu/source/data/locales/sr_Cyrl.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sr_Cyrl_BA.txt b/intl/icu/source/data/locales/sr_Cyrl_BA.txt index eaed56568bc1..d78f16088165 100644 --- a/intl/icu/source/data/locales/sr_Cyrl_BA.txt +++ b/intl/icu/source/data/locales/sr_Cyrl_BA.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_BA{ - Version{"37"} calendar{ generic{ intervalFormats{ @@ -23,32 +23,11 @@ sr_Cyrl_BA{ "прије подне", "по подне", } - availableFormats{ - MMMMW{ - few{"W. 'сједмица' 'у' MMMM"} - one{"W. 'сједмица' 'у' MMMM"} - other{"W. 'сједмица' 'у' MMMM"} - } - yw{ - few{"w. 'сједмица' 'у' Y."} - one{"w. 'сједмица' 'у' Y."} - other{"w. 'сједмица' 'у' Y."} - } - } dayNames{ format{ - abbreviated{ - "нед", - "пон", - "ут", - "ср", - "чет", - "пет", - "суб", - } wide{ "недјеља", - "понедељак", + "понедјељак", "уторак", "сриједа", "четвртак", @@ -60,15 +39,15 @@ sr_Cyrl_BA{ abbreviated{ "нед", "пон", - "ут", - "ср", + "уто", + "сри", "чет", "пет", "суб", } wide{ "недјеља", - "понедељак", + "понедјељак", "уторак", "сриједа", "четвртак", @@ -117,7 +96,7 @@ sr_Cyrl_BA{ "нове ере", } wide%variant{ - "п. н. е.", + "пре наше ере", "нове ере", } } @@ -147,12 +126,674 @@ sr_Cyrl_BA{ } } } + characterLabel{ + body{"тијело"} + bullets_stars{"Знакови за набрајање/звјездице"} + downwards_arrows{"Стрелице надоље"} + downwards_upwards_arrows{"Стрелице надоље и нагоре"} + leftwards_arrows{"Стрелице налијево"} + leftwards_rightwards_arrows{"Стрелице налијево и надесно"} + place{"мјесто"} + travel_places{"Путовања и мјеста"} + weather{"вријеме"} + } fields{ + day{ + relativeTime{ + past{ + few{"прије {0} дана"} + one{"прије {0} дана"} + other{"прије {0} дана"} + } + } + } + day-narrow{ + relativeTime{ + past{ + few{"прије {0} д."} + one{"прије {0} д."} + other{"прије {0} д."} + } + } + } + day-short{ + relativeTime{ + past{ + few{"прије {0} д."} + one{"прије {0} д."} + other{"прије {0} д."} + } + } + } + dayperiod{ + dn{"прије подне/по подне"} + } + dayperiod-narrow{ + dn{"прије подне/по подне"} + } + dayperiod-short{ + dn{"прије подне/по подне"} + } + fri{ + relative{ + "-1"{"прошлог петка"} + "0"{"у петак"} + "1"{"сљедећег петка"} + } + relativeTime{ + past{ + few{"прије {0} петка"} + one{"прије {0} петка"} + other{"прије {0} петака"} + } + } + } + fri-narrow{ + relative{ + "-1"{"прошлог пет"} + "0"{"у пет"} + "1"{"сљедећег пет"} + } + relativeTime{ + past{ + few{"прије {0} петка"} + one{"прије {0} петка"} + other{"прије {0} петака"} + } + } + } + fri-short{ + relative{ + "-1"{"прошлог пет"} + "0"{"у пет"} + "1"{"сљедећег пет"} + } + relativeTime{ + past{ + few{"прије {0} петка"} + one{"прије {0} петка"} + other{"прије {0} петака"} + } + } + } + hour{ + relativeTime{ + past{ + few{"прије {0} сата"} + one{"прије {0} сата"} + other{"прије {0} сати"} + } + } + } + hour-narrow{ + relativeTime{ + past{ + few{"прије {0} ч."} + one{"прије {0} ч."} + other{"прије {0} ч."} + } + } + } + hour-short{ + relativeTime{ + past{ + few{"прије {0} ч."} + one{"прије {0} ч."} + other{"прије {0} ч."} + } + } + } + minute{ + relativeTime{ + past{ + few{"прије {0} минута"} + one{"прије {0} минута"} + other{"прије {0} минута"} + } + } + } + minute-narrow{ + relativeTime{ + past{ + few{"прије {0} мин."} + one{"прије {0} мин."} + other{"прије {0} мин."} + } + } + } + minute-short{ + relativeTime{ + past{ + few{"прије {0} мин."} + one{"прије {0} мин."} + other{"прије {0} мин."} + } + } + } + mon{ + relative{ + "-1"{"прошлог понедјељка"} + "0"{"у понедјељак"} + "1"{"сљедећег понедјељка"} + } + relativeTime{ + future{ + few{"за {0} понедјељка"} + one{"за {0} понедјељак"} + other{"за {0} понедјељака"} + } + past{ + few{"прије {0} понедјељка"} + one{"прије {0} понедјељка"} + other{"прије {0} понедјељака"} + } + } + } + mon-narrow{ + relative{ + "-1"{"прошлог пон"} + "0"{"у пон"} + "1"{"сљедећег пон"} + } + relativeTime{ + future{ + few{"за {0} понедјељкa"} + one{"за {0} понедјељак"} + other{"за {0} понедјељака"} + } + past{ + few{"прије {0} понедјељка"} + one{"прије {0} понедјељка"} + other{"прије {0} понедјељака"} + } + } + } + mon-short{ + relative{ + "-1"{"прошлог пон"} + "0"{"у пон"} + "1"{"сљедећег пон"} + } + relativeTime{ + future{ + few{"за {0} понедјељка"} + one{"за {0} понедјељак"} + other{"за {0} понедјељака"} + } + past{ + few{"прије {0} понедјељка"} + one{"прије {0} понедјељка"} + other{"прије {0} понедјељака"} + } + } + } + month{ + dn{"мјесец"} + relative{ + "-1"{"прошлог мјесеца"} + "0"{"овог мјесеца"} + "1"{"сљедећег мјесеца"} + } + relativeTime{ + future{ + few{"за {0} мјесеца"} + one{"за {0} мјесец"} + other{"за {0} мјесеци"} + } + past{ + few{"прије {0} мјесеца"} + one{"прије {0} мјесеца"} + other{"прије {0} мјесеци"} + } + } + } + month-narrow{ + relative{ + "-1"{"прошлог м."} + "0"{"овог м."} + "1"{"сљедећег м."} + } + relativeTime{ + past{ + few{"прије {0} м."} + one{"прије {0} м."} + other{"прије {0} м."} + } + } + } + month-short{ + dn{"мјес."} + relative{ + "-1"{"прошлог мјес."} + "0"{"овог мјес."} + "1"{"сљедећег мјес."} + } + relativeTime{ + future{ + few{"за {0} мјес."} + one{"за {0} мјес."} + other{"за {0} мјес."} + } + past{ + few{"прије {0} мјес."} + one{"прије {0} мјес."} + other{"прије {0} мјес."} + } + } + } + quarter{ + relative{ + "-1"{"прошлог квартала"} + "0"{"овог квартала"} + "1"{"сљедећег квартала"} + } + relativeTime{ + past{ + few{"прије {0} квартала"} + one{"прије {0} квартала"} + other{"прије {0} квартала"} + } + } + } + quarter-narrow{ + relativeTime{ + past{ + few{"прије {0} кв."} + one{"прије {0} кв."} + other{"прије {0} кв."} + } + } + } + quarter-short{ + relativeTime{ + past{ + few{"прије {0} кв."} + one{"прије {0} кв."} + other{"прије {0} кв."} + } + } + } + sat{ + relative{ + "-1"{"прошле суботе"} + "0"{"у суботу"} + "1"{"сљедеће суботе"} + } + relativeTime{ + past{ + few{"прије {0} суботе"} + one{"прије {0} суботе"} + other{"прије {0} субота"} + } + } + } + sat-narrow{ + relative{ + "-1"{"прошле суб"} + "0"{"у суб"} + "1"{"сљедеће суб"} + } + relativeTime{ + past{ + few{"прије {0} суботе"} + one{"прије {0} суботе"} + other{"прије {0} субота"} + } + } + } + sat-short{ + relative{ + "-1"{"прошле суб"} + "0"{"у суб"} + "1"{"сљедеће суб"} + } + relativeTime{ + past{ + few{"прије {0} суботе"} + one{"прије {0} суботе"} + other{"прије {0} субота"} + } + } + } + second{ + relativeTime{ + past{ + few{"прије {0} секунде"} + one{"прије {0} секунде"} + other{"прије {0} секунди"} + } + } + } + second-narrow{ + relativeTime{ + past{ + few{"прије {0} с."} + one{"прије {0} с."} + other{"прије {0} с."} + } + } + } + second-short{ + relativeTime{ + past{ + few{"прије {0} сек."} + one{"прије {0} сек."} + other{"прије {0} сек."} + } + } + } + sun{ + relative{ + "-1"{"прошле недјеље"} + "0"{"у недјељу"} + "1"{"сљедеће недјеље"} + } + relativeTime{ + future{ + few{"за {0} недјеље"} + one{"за {0} недјељу"} + other{"за {0} недјеља"} + } + past{ + few{"прије {0} недјеље"} + one{"прије {0} недјеље"} + other{"прије {0} недјеља"} + } + } + } + sun-narrow{ + relative{ + "-1"{"пр. нед."} + "0"{"у нед"} + "1"{"сљ. нед."} + } + relativeTime{ + future{ + few{"за {0} недјеље"} + one{"за {0} недјељу"} + other{"за {0} недјеља"} + } + past{ + few{"прије {0} недјеље"} + one{"прије {0} недјеље"} + other{"прије {0} недјеља"} + } + } + } + sun-short{ + relative{ + "-1"{"пр. нед."} + "0"{"у нед"} + "1"{"сљ. нед."} + } + relativeTime{ + future{ + few{"за {0} недјеље"} + one{"за {0} недјељу"} + other{"за {0} недјеља"} + } + past{ + few{"прије {0} недјеље"} + one{"прије {0} недјеље"} + other{"прије {0} недјеља"} + } + } + } + thu{ + relative{ + "-1"{"прошлог четвртка"} + "0"{"у четвртак"} + "1"{"сљедећег четвртка"} + } + relativeTime{ + past{ + few{"прије {0} четвртка"} + one{"прије {0} четвртка"} + other{"прије {0} четвртака"} + } + } + } + thu-narrow{ + relative{ + "-1"{"прошлог чет"} + "0"{"у чет"} + "1"{"сљедећег чет"} + } + relativeTime{ + past{ + few{"прије {0} четвртка"} + one{"прије {0} четвртка"} + other{"прије {0} четвртака"} + } + } + } + thu-short{ + relative{ + "-1"{"прошлог чет"} + "0"{"у чет"} + "1"{"сљедећег чет"} + } + relativeTime{ + past{ + few{"прије {0} четвртка"} + one{"прије {0} четвртка"} + other{"прије {0} четвртака"} + } + } + } + tue{ + relative{ + "-1"{"прошлог уторка"} + "0"{"у уторак"} + "1"{"сљедећег уторка"} + } + relativeTime{ + past{ + few{"прије {0} уторка"} + one{"прије {0} уторка"} + other{"прије {0} уторака"} + } + } + } + tue-narrow{ + relative{ + "-1"{"прошлог уто"} + "0"{"у уто"} + "1"{"сљедећег уто"} + } + relativeTime{ + past{ + few{"прије {0} уторка"} + one{"прије {0} уторка"} + other{"прије {0} уторака"} + } + } + } + tue-short{ + relative{ + "-1"{"прошлог уто"} + "0"{"у уто"} + "1"{"сљедећег уто"} + } + relativeTime{ + past{ + few{"прије {0} уторка"} + one{"прије {0} уторка"} + other{"прије {0} уторака"} + } + } + } + wed{ + relative{ + "-1"{"прошле сриједе"} + "0"{"у сриједу"} + "1"{"сљедеће сриједе"} + } + relativeTime{ + future{ + few{"за {0} сриједе"} + one{"за {0} сриједу"} + other{"за {0} сриједа"} + } + past{ + few{"прије {0} сриједе"} + one{"прије {0} сриједе"} + other{"прије {0} сриједа"} + } + } + } + wed-narrow{ + relative{ + "-1"{"прошле сри"} + "0"{"у сри"} + "1"{"сљедеће сри"} + } + relativeTime{ + future{ + few{"за {0} сриједе"} + one{"за {0} сриједу"} + other{"за {0} сриједа"} + } + past{ + few{"прије {0} сриједе"} + one{"прије {0} сриједе"} + other{"прије {0} сриједа"} + } + } + } + wed-short{ + relative{ + "-1"{"прошле сри"} + "0"{"у сри"} + "1"{"сљедеће сри"} + } + relativeTime{ + future{ + few{"за {0} сриједе"} + one{"за {0} сриједу"} + other{"за {0} сриједа"} + } + past{ + few{"прије {0} сриједе"} + one{"прије {0} сриједе"} + other{"прије {0} сриједа"} + } + } + } week{ + dn{"недјеља"} relative{ "-1"{"претходне недеље"} + "0"{"ове недјеље"} "1"{"наредне недеље"} } + relativePeriod{"недјеља која почиње {0}."} + relativeTime{ + future{ + few{"за {0} недјеље"} + one{"за {0} недјељу"} + other{"за {0} недјеља"} + } + past{ + few{"прије {0} недјеље"} + one{"прије {0} недјеље"} + other{"прије {0} недјеља"} + } + } + } + week-narrow{ + relative{ + "-1"{"прошле н."} + "0"{"ове н."} + "1"{"сљедеће н."} + } + relativePeriod{"недјеља која почиње {0}."} + relativeTime{ + past{ + few{"прије {0} н."} + one{"прије {0} н."} + other{"прије {0} н."} + } + } + } + week-short{ + relativePeriod{"недјеља која почиње {0}."} + relativeTime{ + past{ + few{"прије {0} нед."} + one{"прије {0} нед."} + other{"прије {0} нед."} + } + } + } + weekOfMonth{ + dn{"недјеља у мјесецу"} + } + weekOfMonth-narrow{ + dn{"нед. у мјес."} + } + weekOfMonth-short{ + dn{"нед. у мјес."} + } + weekday{ + dn{"дан у недјељи"} + } + weekday-narrow{ + dn{"дан у недјељи"} + } + weekday-short{ + dn{"дан у недјељи"} + } + weekdayOfMonth{ + dn{"дан у мјесецу"} + } + weekdayOfMonth-narrow{ + dn{"дан у мјесецу"} + } + weekdayOfMonth-short{ + dn{"дан у мјесецу"} + } + year{ + relative{ + "-1"{"прошле године"} + "0"{"ове године"} + "1"{"сљедеће године"} + } + relativeTime{ + past{ + few{"прије {0} године"} + one{"прије {0} године"} + other{"прије {0} година"} + } + } + } + year-narrow{ + relative{ + "-1"{"прошле г."} + "0"{"ове г."} + "1"{"сљедеће г."} + } + relativeTime{ + past{ + few{"прије {0} г."} + one{"прије {0} г."} + other{"прије {0} г."} + } + } + } + year-short{ + relative{ + "-1"{"прошле год."} + "0"{"ове год."} + "1"{"сљедеће год."} + } + relativeTime{ + past{ + few{"прије {0} год."} + one{"прије {0} год."} + other{"прије {0} год."} + } + } } } } diff --git a/intl/icu/source/data/locales/sr_Cyrl_CS.txt b/intl/icu/source/data/locales/sr_Cyrl_CS.txt index 9325e5a76a14..2da82d2d35e0 100644 --- a/intl/icu/source/data/locales/sr_Cyrl_CS.txt +++ b/intl/icu/source/data/locales/sr_Cyrl_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_CS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/locales/sr_Cyrl_ME.txt b/intl/icu/source/data/locales/sr_Cyrl_ME.txt index 479608250871..b81fecbcd3c0 100644 --- a/intl/icu/source/data/locales/sr_Cyrl_ME.txt +++ b/intl/icu/source/data/locales/sr_Cyrl_ME.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_ME{ - Version{"37"} calendar{ generic{ intervalFormats{ diff --git a/intl/icu/source/data/locales/sr_Cyrl_RS.txt b/intl/icu/source/data/locales/sr_Cyrl_RS.txt index 26ee9f3dc1df..2daf13150639 100644 --- a/intl/icu/source/data/locales/sr_Cyrl_RS.txt +++ b/intl/icu/source/data/locales/sr_Cyrl_RS.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_RS{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sr_Cyrl_XK.txt b/intl/icu/source/data/locales/sr_Cyrl_XK.txt index 4ac1f46e1e8f..2b4112e17ca8 100644 --- a/intl/icu/source/data/locales/sr_Cyrl_XK.txt +++ b/intl/icu/source/data/locales/sr_Cyrl_XK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_XK{ - Version{"37"} calendar{ generic{ intervalFormats{ diff --git a/intl/icu/source/data/locales/sr_Cyrl_YU.txt b/intl/icu/source/data/locales/sr_Cyrl_YU.txt index 806d42c439fb..5874f8cb4091 100644 --- a/intl/icu/source/data/locales/sr_Cyrl_YU.txt +++ b/intl/icu/source/data/locales/sr_Cyrl_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_YU{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/locales/sr_Latn.txt b/intl/icu/source/data/locales/sr_Latn.txt index 4de721dc6bc3..83196b9f6a10 100644 --- a/intl/icu/source/data/locales/sr_Latn.txt +++ b/intl/icu/source/data/locales/sr_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn{ %%Parent{"root"} AuxExemplarCharacters{"[å q w x y]"} @@ -250,7 +251,6 @@ sr_Latn{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -704,6 +704,10 @@ sr_Latn{ "pre nove ere", "nove ere", } + wide%variant{ + "pre naše ere", + "naše ere", + } } intervalFormats{ H{ @@ -2367,7 +2371,7 @@ sr_Latn{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/sr_Latn_BA.txt b/intl/icu/source/data/locales/sr_Latn_BA.txt index aa20a85547c6..331f1ca7deb8 100644 --- a/intl/icu/source/data/locales/sr_Latn_BA.txt +++ b/intl/icu/source/data/locales/sr_Latn_BA.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_BA{ - Version{"37"} calendar{ generic{ intervalFormats{ @@ -23,32 +23,11 @@ sr_Latn_BA{ "prije podne", "po podne", } - availableFormats{ - MMMMW{ - few{"W. 'sjedmica' 'u' MMMM"} - one{"W. 'sjedmica' 'u' MMMM"} - other{"W. 'sjedmica' 'u' MMMM"} - } - yw{ - few{"w. 'sjedmica' 'u' Y."} - one{"w. 'sjedmica' 'u' Y."} - other{"w. 'sjedmica' 'u' Y."} - } - } dayNames{ format{ - abbreviated{ - "ned", - "pon", - "ut", - "sr", - "čet", - "pet", - "sub", - } wide{ "nedjelja", - "ponedeljak", + "ponedjeljak", "utorak", "srijeda", "četvrtak", @@ -60,15 +39,15 @@ sr_Latn_BA{ abbreviated{ "ned", "pon", - "ut", - "sr", + "uto", + "sri", "čet", "pet", "sub", } wide{ "nedjelja", - "ponedeljak", + "ponedjeljak", "utorak", "srijeda", "četvrtak", @@ -116,7 +95,7 @@ sr_Latn_BA{ "nove ere", } wide%variant{ - "p. n. e.", + "pre naše ere", "nove ere", } } @@ -146,12 +125,630 @@ sr_Latn_BA{ } } } + characterLabel{ + body{"tijelo"} + bullets_stars{"Znakovi za nabrajanje/zvjezdice"} + downwards_arrows{"Strelice nadolje"} + downwards_upwards_arrows{"Strelice nadolje i nagore"} + leftwards_arrows{"Strelice nalijevo"} + leftwards_rightwards_arrows{"Strelice nalijevo i nadesno"} + place{"mjesto"} + travel_places{"Putovanja i mjesta"} + weather{"vrijeme"} + } fields{ + day{ + relativeTime{ + past{ + few{"prije {0} dana"} + one{"prije {0} dana"} + other{"prije {0} dana"} + } + } + } + day-narrow{ + relativeTime{ + past{ + few{"prije {0} d."} + one{"prije {0} d."} + other{"prije {0} d."} + } + } + } + day-short{ + relativeTime{ + past{ + few{"prije {0} d."} + one{"prije {0} d."} + other{"prije {0} d."} + } + } + } + dayperiod{ + dn{"prije podne/po podne"} + } + dayperiod-narrow{ + dn{"prije podne/po podne"} + } + dayperiod-short{ + dn{"prije podne/po podne"} + } + fri{ + relative{ + "1"{"sljedećeg petka"} + } + relativeTime{ + past{ + few{"prije {0} petka"} + one{"prije {0} petka"} + other{"prije {0} petaka"} + } + } + } + fri-narrow{ + relative{ + "1"{"sljedećeg pet"} + } + relativeTime{ + past{ + few{"prije {0} petka"} + one{"prije {0} petka"} + other{"prije {0} petaka"} + } + } + } + fri-short{ + relative{ + "1"{"sljedećeg pet"} + } + relativeTime{ + past{ + few{"prije {0} petka"} + one{"prije {0} petka"} + other{"prije {0} petaka"} + } + } + } + hour{ + relativeTime{ + past{ + few{"prije {0} sata"} + one{"prije {0} sata"} + other{"prije {0} sati"} + } + } + } + hour-narrow{ + relativeTime{ + past{ + few{"prije {0} č."} + one{"prije {0} č."} + other{"prije {0} č."} + } + } + } + hour-short{ + relativeTime{ + past{ + few{"prije {0} č."} + one{"prije {0} č."} + other{"prije {0} č."} + } + } + } + minute{ + relativeTime{ + past{ + few{"prije {0} minuta"} + one{"prije {0} minuta"} + other{"prije {0} minuta"} + } + } + } + minute-narrow{ + relativeTime{ + past{ + few{"prije {0} min."} + one{"prije {0} min."} + other{"prije {0} min."} + } + } + } + minute-short{ + relativeTime{ + past{ + few{"prije {0} min."} + one{"prije {0} min."} + other{"prije {0} min."} + } + } + } + mon{ + relative{ + "-1"{"prošlog ponedjeljka"} + "0"{"u ponedjeljak"} + "1"{"sljedećeg ponedjeljka"} + } + relativeTime{ + future{ + few{"za {0} ponedjeljka"} + one{"za {0} ponedjeljak"} + other{"za {0} ponedjeljaka"} + } + past{ + few{"prije {0} ponedjeljka"} + one{"prije {0} ponedjeljka"} + other{"prije {0} ponedjeljaka"} + } + } + } + mon-narrow{ + relative{ + "1"{"sljedećeg pon"} + } + relativeTime{ + future{ + few{"za {0} ponedjeljka"} + one{"za {0} ponedjeljak"} + other{"za {0} ponedjeljaka"} + } + past{ + few{"prije {0} ponedjeljka"} + one{"prije {0} ponedjeljka"} + other{"prije {0} ponedjeljaka"} + } + } + } + mon-short{ + relative{ + "1"{"sljedećeg pon"} + } + relativeTime{ + future{ + few{"za {0} ponedjeljka"} + one{"za {0} ponedjeljak"} + other{"za {0} ponedjeljaka"} + } + past{ + few{"prije {0} ponedjeljka"} + one{"prije {0} ponedjeljka"} + other{"prije {0} ponedjeljaka"} + } + } + } + month{ + dn{"mjesec"} + relative{ + "-1"{"prošlog mjeseca"} + "0"{"ovog mjeseca"} + "1"{"sljedećeg mjeseca"} + } + relativeTime{ + future{ + few{"za {0} mjeseca"} + one{"za {0} mjesec"} + other{"za {0} mjeseci"} + } + past{ + few{"prije {0} mjeseca"} + one{"prije {0} mjeseca"} + other{"prije {0} mjeseci"} + } + } + } + month-narrow{ + relative{ + "1"{"sljedećeg m."} + } + relativeTime{ + past{ + few{"prije {0} m."} + one{"prije {0} m."} + other{"prije {0} m."} + } + } + } + month-short{ + dn{"mjes."} + relative{ + "-1"{"prošlog mjes."} + "0"{"ovog mjes."} + "1"{"sljedećeg mjes."} + } + relativeTime{ + future{ + few{"za {0} mjes."} + one{"za {0} mjes."} + other{"za {0} mjes."} + } + past{ + few{"prije {0} mjes."} + one{"prije {0} mjes."} + other{"prije {0} mjes."} + } + } + } + quarter{ + relative{ + "1"{"sljedećeg kvartala"} + } + relativeTime{ + past{ + few{"prije {0} kvartala"} + one{"prije {0} kvartala"} + other{"prije {0} kvartala"} + } + } + } + quarter-narrow{ + relativeTime{ + past{ + few{"prije {0} kv."} + one{"prije {0} kv."} + other{"prije {0} kv."} + } + } + } + quarter-short{ + relativeTime{ + past{ + few{"prije {0} kv."} + one{"prije {0} kv."} + other{"prije {0} kv."} + } + } + } + sat{ + relative{ + "1"{"sljedeće subote"} + } + relativeTime{ + past{ + few{"prije {0} subote"} + one{"prije {0} subote"} + other{"prije {0} subota"} + } + } + } + sat-narrow{ + relative{ + "1"{"sljedeće sub"} + } + relativeTime{ + past{ + few{"prije {0} subote"} + one{"prije {0} subote"} + other{"prije {0} subota"} + } + } + } + sat-short{ + relative{ + "1"{"sljedeće sub"} + } + relativeTime{ + past{ + few{"prije {0} subote"} + one{"prije {0} subote"} + other{"prije {0} subota"} + } + } + } + second{ + relativeTime{ + past{ + few{"prije {0} sekunde"} + one{"prije {0} sekunde"} + other{"prije {0} sekundi"} + } + } + } + second-narrow{ + relativeTime{ + past{ + few{"prije {0} s."} + one{"prije {0} s."} + other{"prije {0} s."} + } + } + } + second-short{ + relativeTime{ + past{ + few{"prije {0} sek."} + one{"prije {0} sek."} + other{"prije {0} sek."} + } + } + } + sun{ + relative{ + "-1"{"prošle nedjelje"} + "0"{"u nedjelju"} + "1"{"sljedeće nedjelje"} + } + relativeTime{ + future{ + few{"za {0} nedjelje"} + one{"za {0} nedjelju"} + other{"za {0} nedjelja"} + } + past{ + few{"prije {0} nedjelje"} + one{"prije {0} nedjelje"} + other{"prije {0} nedjelja"} + } + } + } + sun-narrow{ + relative{ + "1"{"slj. ned."} + } + relativeTime{ + future{ + few{"za {0} nedjelje"} + one{"za {0} nedjelju"} + other{"za {0} nedjelja"} + } + past{ + few{"prije {0} nedjelje"} + one{"prije {0} nedjelje"} + other{"prije {0} nedjelja"} + } + } + } + sun-short{ + relative{ + "1"{"slj. ned."} + } + relativeTime{ + future{ + few{"za {0} nedjelje"} + one{"za {0} nedjelju"} + other{"za {0} nedjelja"} + } + past{ + few{"prije {0} nedjelje"} + one{"prije {0} nedjelje"} + other{"prije {0} nedjelja"} + } + } + } + thu{ + relative{ + "1"{"sljedećeg četvrtka"} + } + relativeTime{ + past{ + few{"prije {0} četvrtka"} + one{"prije {0} četvrtka"} + other{"prije {0} četvrtaka"} + } + } + } + thu-narrow{ + relative{ + "1"{"sljedećeg čet"} + } + relativeTime{ + past{ + few{"prije {0} četvrtka"} + one{"prije {0} četvrtka"} + other{"prije {0} četvrtaka"} + } + } + } + thu-short{ + relative{ + "1"{"sljedećeg čet"} + } + relativeTime{ + past{ + few{"prije {0} četvrtka"} + one{"prije {0} četvrtka"} + other{"prije {0} četvrtaka"} + } + } + } + tue{ + relative{ + "1"{"sljedećeg utorka"} + } + relativeTime{ + past{ + few{"prije {0} utorka"} + one{"prije {0} utorka"} + other{"prije {0} utoraka"} + } + } + } + tue-narrow{ + relative{ + "1"{"sljedećeg uto"} + } + relativeTime{ + past{ + few{"prije {0} utorka"} + one{"prije {0} utorka"} + other{"prije {0} utoraka"} + } + } + } + tue-short{ + relative{ + "1"{"sljedećeg uto"} + } + relativeTime{ + past{ + few{"prije {0} utorka"} + one{"prije {0} utorka"} + other{"prije {0} utoraka"} + } + } + } + wed{ + relative{ + "-1"{"prošle srijede"} + "0"{"u srijedu"} + "1"{"sljedeće srijede"} + } + relativeTime{ + future{ + few{"za {0} srijede"} + one{"za {0} srijedu"} + other{"za {0} srijeda"} + } + past{ + few{"prije {0} srijede"} + one{"prije {0} srijede"} + other{"prije {0} srijeda"} + } + } + } + wed-narrow{ + relative{ + "-1"{"prošle sri"} + "0"{"u sri"} + "1"{"sljedeće sri"} + } + relativeTime{ + future{ + few{"za {0} srijede"} + one{"za {0} srijedu"} + other{"za {0} srijeda"} + } + past{ + few{"prije {0} srijede"} + one{"prije {0} srijede"} + other{"prije {0} srijeda"} + } + } + } + wed-short{ + relative{ + "-1"{"prošle sri"} + "0"{"u sri"} + "1"{"sljedeće sri"} + } + relativeTime{ + future{ + few{"za {0} srijede"} + one{"za {0} srijedu"} + other{"za {0} srijeda"} + } + past{ + few{"prije {0} srijede"} + one{"prije {0} srijede"} + other{"prije {0} srijeda"} + } + } + } week{ + dn{"nedjelja"} relative{ "-1"{"prethodne nedelje"} + "0"{"ove nedjelje"} "1"{"naredne nedelje"} } + relativePeriod{"nedjelja koja počinje {0}."} + relativeTime{ + future{ + few{"za {0} nedjelje"} + one{"za {0} nedjelju"} + other{"za {0} nedjelja"} + } + past{ + few{"prije {0} nedjelje"} + one{"prije {0} nedjelje"} + other{"prije {0} nedjelja"} + } + } + } + week-narrow{ + relative{ + "1"{"sljedeće n."} + } + relativePeriod{"nedjelja koja počinje {0}."} + relativeTime{ + past{ + few{"prije {0} n."} + one{"prije {0} n."} + other{"prije {0} n."} + } + } + } + week-short{ + relativePeriod{"nedjelja koja počinje {0}."} + relativeTime{ + past{ + few{"prije {0} ned."} + one{"prije {0} ned."} + other{"prije {0} ned."} + } + } + } + weekOfMonth{ + dn{"nedjelja u mjesecu"} + } + weekOfMonth-narrow{ + dn{"ned. u mjes."} + } + weekOfMonth-short{ + dn{"ned. u mjes."} + } + weekday{ + dn{"dan u nedjelji"} + } + weekday-narrow{ + dn{"dan u nedjelji"} + } + weekday-short{ + dn{"dan u nedjelji"} + } + weekdayOfMonth{ + dn{"dan u mjesecu"} + } + weekdayOfMonth-narrow{ + dn{"dan u mjesecu"} + } + weekdayOfMonth-short{ + dn{"dan u mjesecu"} + } + year{ + relative{ + "1"{"sljedeće godine"} + } + relativeTime{ + past{ + few{"prije {0} godine"} + one{"prije {0} godine"} + other{"prije {0} godina"} + } + } + } + year-narrow{ + relative{ + "1"{"sljedeće g."} + } + relativeTime{ + past{ + few{"prije {0} g."} + one{"prije {0} g."} + other{"prije {0} g."} + } + } + } + year-short{ + relative{ + "1"{"sljedeće god."} + } + relativeTime{ + past{ + few{"prije {0} god."} + one{"prije {0} god."} + other{"prije {0} god."} + } + } } } } diff --git a/intl/icu/source/data/locales/sr_Latn_CS.txt b/intl/icu/source/data/locales/sr_Latn_CS.txt index 0952735a9c87..7204cfd29a04 100644 --- a/intl/icu/source/data/locales/sr_Latn_CS.txt +++ b/intl/icu/source/data/locales/sr_Latn_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/locales/sr_Latn_ME.txt b/intl/icu/source/data/locales/sr_Latn_ME.txt index b0f001751577..36853ccf416d 100644 --- a/intl/icu/source/data/locales/sr_Latn_ME.txt +++ b/intl/icu/source/data/locales/sr_Latn_ME.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_ME{ - Version{"37"} calendar{ generic{ intervalFormats{ diff --git a/intl/icu/source/data/locales/sr_Latn_RS.txt b/intl/icu/source/data/locales/sr_Latn_RS.txt index 71eab15fffcc..822d19220457 100644 --- a/intl/icu/source/data/locales/sr_Latn_RS.txt +++ b/intl/icu/source/data/locales/sr_Latn_RS.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_RS{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sr_Latn_XK.txt b/intl/icu/source/data/locales/sr_Latn_XK.txt index 86cabe984582..7006bba02100 100644 --- a/intl/icu/source/data/locales/sr_Latn_XK.txt +++ b/intl/icu/source/data/locales/sr_Latn_XK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_XK{ - Version{"37"} calendar{ generic{ intervalFormats{ diff --git a/intl/icu/source/data/locales/sr_Latn_YU.txt b/intl/icu/source/data/locales/sr_Latn_YU.txt index 2747ab210a4c..415a4d892a22 100644 --- a/intl/icu/source/data/locales/sr_Latn_YU.txt +++ b/intl/icu/source/data/locales/sr_Latn_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/locales/sr_ME.txt b/intl/icu/source/data/locales/sr_ME.txt index 32dc91046bc8..aa5162679c6b 100644 --- a/intl/icu/source/data/locales/sr_ME.txt +++ b/intl/icu/source/data/locales/sr_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_ME{ "%%ALIAS"{"sr_Latn_ME"} } diff --git a/intl/icu/source/data/locales/sr_RS.txt b/intl/icu/source/data/locales/sr_RS.txt index 674ff77554b8..84db46919eb6 100644 --- a/intl/icu/source/data/locales/sr_RS.txt +++ b/intl/icu/source/data/locales/sr_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_RS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/locales/sr_XK.txt b/intl/icu/source/data/locales/sr_XK.txt index 9628a2763e54..0d3aa53999a4 100644 --- a/intl/icu/source/data/locales/sr_XK.txt +++ b/intl/icu/source/data/locales/sr_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_XK{ "%%ALIAS"{"sr_Cyrl_XK"} } diff --git a/intl/icu/source/data/locales/sr_YU.txt b/intl/icu/source/data/locales/sr_YU.txt index 26563d041d43..2d67778ecbdc 100644 --- a/intl/icu/source/data/locales/sr_YU.txt +++ b/intl/icu/source/data/locales/sr_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_YU{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/locales/su.txt b/intl/icu/source/data/locales/su.txt index dd12573ee660..12395da2098d 100644 --- a/intl/icu/source/data/locales/su.txt +++ b/intl/icu/source/data/locales/su.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su{ 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]"} @@ -12,6 +13,7 @@ su{ NumberElements{ latn{ patterns{ + currencyFormat{"¤#,##0.00"} decimalFormat{"#,##0.###"} } symbols{ @@ -22,7 +24,6 @@ su{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -35,8 +36,8 @@ su{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", - "{1} 'pukul' {0}", - "{1} 'pukul' {0}", + "{1} 'jam' {0}", + "{1} 'jam' {0}", "{1}, {0}", "{1}, {0}", } @@ -55,8 +56,8 @@ su{ "d MMM y", "d/M/yy", "{1}, {0}", - "{1} 'pukul' {0}", - "{1} 'pukul' {0}", + "{1} 'jam' {0}", + "{1} 'jam' {0}", "{1}, {0}", "{1}, {0}", } @@ -107,7 +108,7 @@ su{ "Sen", "Sal", "Reb", - "Kam", + "Kem", "Jum", "Sap", } @@ -125,7 +126,7 @@ su{ "Senén", "Salasa", "Rebo", - "Kamis", + "Kemis", "Jumaah", "Saptu", } @@ -136,7 +137,7 @@ su{ "Sen", "Sal", "Reb", - "Kam", + "Kem", "Jum", "Sap", } @@ -154,7 +155,7 @@ su{ "Senén", "Salasa", "Rebo", - "Kamis", + "Kemis", "Jumaah", "Saptu", } @@ -356,6 +357,13 @@ su{ second-short{ dn{"dtk."} } + sun{ + relative{ + "-1"{"Minggu kamari"} + "0"{"Minggu ieu"} + "1"{"Minggu payun"} + } + } week{ dn{"minggu"} } diff --git a/intl/icu/source/data/locales/su_ID.txt b/intl/icu/source/data/locales/su_ID.txt index 67dde384e09b..8da0f567d041 100644 --- a/intl/icu/source/data/locales/su_ID.txt +++ b/intl/icu/source/data/locales/su_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_ID{ "%%ALIAS"{"su_Latn_ID"} } diff --git a/intl/icu/source/data/locales/su_Latn.txt b/intl/icu/source/data/locales/su_Latn.txt index 008b42355f21..87ca4fa76d0b 100644 --- a/intl/icu/source/data/locales/su_Latn.txt +++ b/intl/icu/source/data/locales/su_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/su_Latn_ID.txt b/intl/icu/source/data/locales/su_Latn_ID.txt index f4fd4885b22a..569e704f731b 100644 --- a/intl/icu/source/data/locales/su_Latn_ID.txt +++ b/intl/icu/source/data/locales/su_Latn_ID.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_Latn_ID{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sv.txt b/intl/icu/source/data/locales/sv.txt index 61543c0a8c7a..f1a2420879e1 100644 --- a/intl/icu/source/data/locales/sv.txt +++ b/intl/icu/source/data/locales/sv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv{ AuxExemplarCharacters{"[á â ã ā ç è ë í î ï ī ñ ó ú ÿ ü æ ø]"} Ellipsis{ @@ -251,10 +252,26 @@ sv{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} 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", + "y-MM-dd G", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } availableFormats{ + MMdd{"d/M"} + yyyyMM{"y-MM G"} yyyyMMMM{"MMMM y G"} } eras{ @@ -269,14 +286,138 @@ sv{ } } intervalFormats{ + GyM{ + G{"y-MM GGGGG – y-MM GGGGG"} + M{"y-MM – y-MM GGGGG"} + y{"y-MM – y-MM GGGGG"} + } + GyMEd{ + G{"E y-MM-dd GGGG – E y-MM-dd GGGG"} + M{"E d/M y – E d/M y GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} + } + GyMd{ + G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} + M{"y-MM-dd – y-MM-dd GGGGG"} + d{"y-MM-dd – y-MM-dd GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} + } hmv{ h{"h:mm–h:mm a v"} } + yM{ + M{"y-MM – MM GGGGG"} + y{"y-MM – y-MM GGGGG"} + } + yMEd{ + M{"E y-MM-dd – E y-MM-dd GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} + } + 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"} + } + yMd{ + M{"y-MM-dd – MM-dd GGGGG"} + d{"y-MM-d – d GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} + } } } chinese{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM r(U)", + "d MMMM r(U)", + "d MMM r", + "r-MM-dd", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + availableFormats{ + Ed{"E d"} + Gy{"r(U)"} + GyMMM{"MMM r(U)"} + GyMMMEd{"E d MMM r(U)"} + GyMMMd{"d MMM r"} + MEd{"E d/M"} + MMMEd{"E d MMM"} + MMMMd{"d MMMM"} + MMMd{"d MMM"} + Md{"d/M"} + UM{"M/U"} + UMMM{"MMM U"} + UMMMd{"d MMM U"} + UMd{"d/M U"} + yyyyMEd{"E r-MM-dd"} + yyyyMMM{"MMM r(U)"} + yyyyMMMEd{"E d MMM r(U)"} + yyyyMMMM{"MMMM r(U)"} + yyyyMMMd{"d MMM r"} + yyyyQQQ{"QQQ r(U)"} + yyyyQQQQ{"QQQQ r(U)"} + } + intervalFormats{ + MEd{ + M{"E MM-dd – E MM-dd"} + d{"E MM-dd – E MM-dd"} + } + 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 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 U"} + y{"MMM U – MMM U"} + } + yMMMEd{ + M{"E d MMM – E d MMM U"} + d{"E d MMM – E d MMM U"} + y{"E d MMM U – E d MMM U"} + } + yMMMM{ + M{"MMMM–MMMM U"} + } + yMMMd{ + M{"d MMM – d MMM U"} + d{"d–d MMM U"} + y{"d MMM U – d MMM U"} + } + } monthNames{ format{ + abbreviated{ + "1:a mån", + "2:a mån", + "3:e mån", + "4:e mån", + "5:e mån", + "6:e mån", + "7:e mån", + "8:e mån", + "9:e mån", + "10:e mån", + "11:e mån", + "12:e mån", + } wide{ "första månaden", "andra månaden", @@ -292,6 +433,22 @@ sv{ "tolfte månaden", } } + stand-alone{ + abbreviated{ + "1:a mån", + "2:a mån", + "3:e mån", + "4:e mån", + "5:e mån", + "6:e mån", + "7:e mån", + "8:e mån", + "9:e mån", + "10:e mån", + "11:e mån", + "12:e mån", + } + } } } coptic{ @@ -502,7 +659,7 @@ sv{ } generic{ DateTimePatterns{ - "'kl'. HH:mm:ss zzzz", + "HH:mm:ss zzzz", "HH:mm:ss z", "HH:mm:ss", "HH:mm", @@ -572,18 +729,24 @@ sv{ m{"h:mm – h:mm B"} } Gy{ + G{"y G–y G"} y{"y – y G"} } + GyM{ + G{"M/y GGGGG–M/y GGGGG"} + M{"M/y–M/y GGGGG"} + y{"M/y–M/y GGGGG"} + } GyMEd{ - G{"y-MM-dd, E GGGG – y-MM-dd, E GGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"y-MM-dd, E – y-MM-dd, E GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E y-MM-dd GGGG – E y-MM-dd GGGG"} + M{"E d/M y – E d/M y GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E d/M y – E d/M y GGGGG"} } GyMMM{ G{"MMM y G – MMM y G"} M{"MMM – MMM y G"} - y{"MMM y G – MMM y"} + y{"MMM y – MMM y G"} } GyMMMEd{ G{"E d MMM y G – E d MMM y G"} @@ -597,6 +760,12 @@ sv{ d{"d–d MMM y G"} y{"d MMM y G – d MMM d y"} } + GyMd{ + G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} + M{"d/M/y–d/M/y GGGGG"} + d{"d/M/y–d/M/y GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} + } H{ H{"HH–HH"} } @@ -659,22 +828,22 @@ sv{ y{"y–y G"} } yM{ - M{"G y-MM – MM"} - y{"G y-MM – y-MM"} + M{"y-MM – y-MM GGGGG"} + y{"y-MM – y-MM GGGGG"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd G"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd G"} + M{"E y-MM-dd – E y-MM-dd GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} } 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"} + 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"} @@ -686,9 +855,9 @@ sv{ 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"} + M{"d/M y – d/M y GGGGG"} + d{"d/M y – d/M y GGGGG"} + y{"d/M y – d/M y GGGGG"} } } } @@ -706,7 +875,7 @@ sv{ "em", } DateTimePatterns{ - "'kl'. HH:mm:ss zzzz", + "HH:mm:ss zzzz", "HH:mm:ss z", "HH:mm:ss", "HH:mm", @@ -947,9 +1116,10 @@ sv{ } intervalFormats{ Bh{ - h{"h – h B"} + B{"h B–h B"} } Bhm{ + B{"h:mm B–h:mm B"} h{"h:mm – h:mm B"} m{"h:mm – h:mm B"} } @@ -957,6 +1127,17 @@ sv{ G{"y G – y G"} y{"y–y G"} } + GyM{ + G{"M/y GGGGG–M/y GGGGG"} + M{"M/y–M/y GGGGG"} + y{"M/y–M/y GGGGG"} + } + GyMEd{ + G{"E, d/M/y GGGGG–E, d/M/y GGGGG"} + M{"E, d/M/y–E, d/M/y GGGGG"} + d{"E, d/M/y–E, d/M/y GGGGG"} + y{"E, d/M/y–E, d/M/y GGGGG"} + } GyMMM{ G{"MMM y G – MMM y G"} M{"MMM – MMM y G"} @@ -964,9 +1145,9 @@ sv{ } GyMMMEd{ G{"d MMM y G, E – d MMM y G, E"} - M{"d MMM y G, E – d MMM, E"} - d{"d MMM y G, E – d MMM, E"} - y{"d MMM y G, E – d MMM y, E"} + M{"E d MMM y G – E d MMM"} + d{"E d MMM y G – E d MMM"} + y{"E d MMM y G – E d MMM y"} } GyMMMd{ G{"d MMM y G – d MMM y G"} @@ -974,6 +1155,12 @@ sv{ d{"d–d MMM y G"} y{"d MMM y G – d MMM y"} } + GyMd{ + G{"d/M/y GGGGG–d/M/y GGGGG"} + M{"d/M/y–d/M/y GGGGG"} + d{"d/M/y–d/M/y GGGGG"} + y{"d/M/y–d/M/y GGGGG"} + } H{ H{"HH–HH"} } @@ -1417,7 +1604,7 @@ sv{ } japanese{ DateTimePatterns{ - "'kl'. HH:mm:ss zzzz", + "HH:mm:ss zzzz", "HH:mm:ss z", "HH:mm:ss", "HH:mm", @@ -2726,6 +2913,10 @@ sv{ middle{"{0}, {1}"} start{"{0}, {1}"} } + standard-narrow{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + } standard-short{ 2{"{0} och {1}"} end{"{0} och {1}"} diff --git a/intl/icu/source/data/locales/sv_AX.txt b/intl/icu/source/data/locales/sv_AX.txt index 001d06b3a328..02741c9825c9 100644 --- a/intl/icu/source/data/locales/sv_AX.txt +++ b/intl/icu/source/data/locales/sv_AX.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv_AX{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sv_FI.txt b/intl/icu/source/data/locales/sv_FI.txt index 0beb479363a5..05a6cc7683cc 100644 --- a/intl/icu/source/data/locales/sv_FI.txt +++ b/intl/icu/source/data/locales/sv_FI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv_FI{ NumberElements{ latn{ @@ -8,7 +9,6 @@ sv_FI{ } } } - Version{"37"} calendar{ gregorian{ availableFormats{ diff --git a/intl/icu/source/data/locales/sv_SE.txt b/intl/icu/source/data/locales/sv_SE.txt index f7b2944603dc..97b94539a1aa 100644 --- a/intl/icu/source/data/locales/sv_SE.txt +++ b/intl/icu/source/data/locales/sv_SE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv_SE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sw.txt b/intl/icu/source/data/locales/sw.txt index 892ce73bb627..4640f184808f 100644 --- a/intl/icu/source/data/locales/sw.txt +++ b/intl/icu/source/data/locales/sw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw{ AuxExemplarCharacters{"[c q x]"} Ellipsis{ @@ -11,7 +12,7 @@ sw{ word-medial{"{0} … {1}"} } ExemplarCharacters{"[a b {ch} d e f g h i j k l m n o p r s t u v w y z]"} - ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P R S T U V W Y Z]"} + ExemplarCharactersIndex{"[A B {CH} D E F G H I J K L M N O P R S T U V W Y Z]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . ' \u0022 ( ) \\[ \\] \\{ \\}]"} MoreInformation{"?"} @@ -186,6 +187,7 @@ sw{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -212,7 +214,6 @@ sw{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -932,7 +933,7 @@ sw{ arrows{"mishale"} body{"mwili"} box_drawing{"mchoro wa kisanduku"} - braille{"nukta vinundu"} + braille{"nukta nundu"} building{"jengo"} bullets_stars{"nukta au nyota"} consonantal_jamo{"alama za konsonanti"} @@ -940,7 +941,7 @@ sw{ dash_connector{"kistari au dashi"} digits{"tarakimu"} dingbats{"dingibati"} - divination_symbols{"alama za kugawa"} + divination_symbols{"alama za ubashiri"} downwards_arrows{"mishale inayoelekea chini"} downwards_upwards_arrows{"mishale ya kuwili"} east_asian_scripts{"hati za mashariki ya Asia"} @@ -973,7 +974,7 @@ sw{ limited_use{"matumizi finyu"} male{"mwanamume"} math_symbols{"alama za hesabu"} - middle_eastern_scripts{"hati za mashariki ya kati"} + middle_eastern_scripts{"hati za Mashariki ya Kati"} miscellaneous{"anuwai"} modern_scripts{"hati za kisasa"} modifier{"kibadilisha hati"} @@ -985,7 +986,7 @@ sw{ other{"nyingine"} paired{"imeoanishwa"} person{"mtu"} - phonetic_alphabet{"abjadi za fonetiki"} + phonetic_alphabet{"alfabeti za fonetiki"} pictographs{"picha"} place{"mahali"} plant{"mmea"} @@ -993,10 +994,10 @@ sw{ rightwards_arrows{"mishale inayoelekea kulia"} sign_standard_symbols{"ishara au alama"} small_form_variant{"aina za fomu ndogo"} - smiley{"tabasamu"} - smileys_people{"tabasamu au mtu"} - south_asian_scripts{"hati za kusini mwa Asia"} - southeast_asian_scripts{"hati za kusini mashariki mwa Asia"} + smiley{"kicheshi"} + smileys_people{"kicheshi au mtu"} + south_asian_scripts{"hati za Kusini mwa Asia"} + southeast_asian_scripts{"hati za Kusini Mashariki mwa Asia"} spacing{"kuacha nafasi"} sport{"michezo"} symbols{"alama"} @@ -1008,7 +1009,7 @@ sw{ variant_forms{"maumbo mbalimbali"} vocalic_jamo{"vibambo vya jamo vya sauti"} weather{"hali ya hewa"} - western_asian_scripts{"hati za magharibi mwa Asia"} + western_asian_scripts{"hati za Magharibi mwa Asia"} whitespace{"sehemu wazi"} } delimiters{ @@ -1865,7 +1866,7 @@ sw{ date{ lenient{ "[\\--/]", - "[\\:∶]", + "[\\:∶︓﹕:]", } } general{ diff --git a/intl/icu/source/data/locales/sw_CD.txt b/intl/icu/source/data/locales/sw_CD.txt index 8511f1472ed7..95e08c662084 100644 --- a/intl/icu/source/data/locales/sw_CD.txt +++ b/intl/icu/source/data/locales/sw_CD.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_CD{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -11,7 +12,6 @@ sw_CD{ } } } - Version{"37"} calendar{ generic{ availableFormats{ diff --git a/intl/icu/source/data/locales/sw_KE.txt b/intl/icu/source/data/locales/sw_KE.txt index f4275bd2d8d7..a9ef6b1867d6 100644 --- a/intl/icu/source/data/locales/sw_KE.txt +++ b/intl/icu/source/data/locales/sw_KE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_KE{ 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]"} NumberElements{ @@ -148,7 +149,6 @@ sw_KE{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -168,9 +168,6 @@ sw_KE{ } } } - characterLabel{ - middle_eastern_scripts{"hati za Mashariki ya Kati"} - } measurementSystemNames{ metric{"Kipimo"} } diff --git a/intl/icu/source/data/locales/sw_TZ.txt b/intl/icu/source/data/locales/sw_TZ.txt index 1a4b89a0bcc8..07fe6e82d8bb 100644 --- a/intl/icu/source/data/locales/sw_TZ.txt +++ b/intl/icu/source/data/locales/sw_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/sw_UG.txt b/intl/icu/source/data/locales/sw_UG.txt index b17b50498bde..3014c75093d6 100644 --- a/intl/icu/source/data/locales/sw_UG.txt +++ b/intl/icu/source/data/locales/sw_UG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_UG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ta.txt b/intl/icu/source/data/locales/ta.txt index c66436f06e91..07c731a83c87 100644 --- a/intl/icu/source/data/locales/ta.txt +++ b/intl/icu/source/data/locales/ta.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta{ AuxExemplarCharacters{"[\u200C\u200D]"} Ellipsis{ @@ -14,10 +15,7 @@ ta{ "[அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ ஃ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன ஜ ஷ ஸ ஹ ா ி " "\u0BC0 ு ூ ெ ே ை ொ ோ ௌ \u0BCD]" } - ExemplarCharactersIndex{ - "[அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன ஜ ஶ ஷ ஸ ஹ {க" - "\u0BCDஷ}]" - } + ExemplarCharactersIndex{"[அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0௦ 1௧ 2௨ 3௩ 4௪ 5௫ 6௬ 7௭ 8௮ 9௯]"} ExemplarCharactersPunctuation{ "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " @@ -242,7 +240,6 @@ ta{ } traditional{"taml"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/ta_IN.txt b/intl/icu/source/data/locales/ta_IN.txt index cf4cb6f8fc21..d4fe332e34a2 100644 --- a/intl/icu/source/data/locales/ta_IN.txt +++ b/intl/icu/source/data/locales/ta_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ta_LK.txt b/intl/icu/source/data/locales/ta_LK.txt index b7c78a3780d2..dcfe132c09b5 100644 --- a/intl/icu/source/data/locales/ta_LK.txt +++ b/intl/icu/source/data/locales/ta_LK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta_LK{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ta_MY.txt b/intl/icu/source/data/locales/ta_MY.txt index 444d1aff3fea..3101cdf89692 100644 --- a/intl/icu/source/data/locales/ta_MY.txt +++ b/intl/icu/source/data/locales/ta_MY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta_MY{ NumberElements{ latn{ @@ -10,5 +11,4 @@ ta_MY{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/ta_SG.txt b/intl/icu/source/data/locales/ta_SG.txt index affa1318a091..87e37e71843f 100644 --- a/intl/icu/source/data/locales/ta_SG.txt +++ b/intl/icu/source/data/locales/ta_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta_SG{ NumberElements{ latn{ @@ -10,5 +11,4 @@ ta_SG{ } } } - Version{"37"} } diff --git a/intl/icu/source/data/locales/te.txt b/intl/icu/source/data/locales/te.txt index 4124b5b161c8..40dcddad5523 100644 --- a/intl/icu/source/data/locales/te.txt +++ b/intl/icu/source/data/locales/te.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml te{ AuxExemplarCharacters{"[\u200C\u200D ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯]"} Ellipsis{ @@ -240,7 +241,6 @@ te{ } } } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/te_IN.txt b/intl/icu/source/data/locales/te_IN.txt index d1ed23d2d51b..c394e938eb94 100644 --- a/intl/icu/source/data/locales/te_IN.txt +++ b/intl/icu/source/data/locales/te_IN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml te_IN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/teo.txt b/intl/icu/source/data/locales/teo.txt index 13b146d68be5..2c62a8de084d 100644 --- a/intl/icu/source/data/locales/teo.txt +++ b/intl/icu/source/data/locales/teo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo{ AuxExemplarCharacters{"[f q z]"} ExemplarCharacters{"[a b c d e g h i j k l m n o p r s t u v w x y]"} @@ -12,7 +13,6 @@ teo{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/teo_KE.txt b/intl/icu/source/data/locales/teo_KE.txt index 2b93c6906f24..4a3038988e18 100644 --- a/intl/icu/source/data/locales/teo_KE.txt +++ b/intl/icu/source/data/locales/teo_KE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo_KE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/teo_UG.txt b/intl/icu/source/data/locales/teo_UG.txt index 64753ee42125..4b42e4dd8204 100644 --- a/intl/icu/source/data/locales/teo_UG.txt +++ b/intl/icu/source/data/locales/teo_UG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo_UG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/tg.txt b/intl/icu/source/data/locales/tg.txt index 80f0c30cee47..1938dc40dc7c 100644 --- a/intl/icu/source/data/locales/tg.txt +++ b/intl/icu/source/data/locales/tg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tg{ AuxExemplarCharacters{"[ц щ ы ь]"} ExemplarCharacters{"[а б в г ғ д е ё ж з и ӣ й к қ л м н о п р с т у ӯ ф х ҳ ч ҷ ш ъ э ю я]"} @@ -157,7 +158,6 @@ tg{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -176,12 +176,24 @@ tg{ "{1} {0}", } availableFormats{ + Bh{"h B"} + Bhm{"h:mm B"} + Bhms{"h:mm:ss B"} E{"ccc"} + EBhm{"E h:mm B"} + EBhms{"E h:mm:ss B"} + 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, d MMM y G"} GyMMMd{"d MMM y G"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} M{"L"} MEd{"E, dd-MM"} MMM{"LLL"} @@ -190,6 +202,10 @@ tg{ 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"} @@ -203,11 +219,114 @@ tg{ yyyyQQQQ{"QQQQ y G"} } intervalFormats{ + Bh{ + B{"h B – h B"} + h{"h – h B"} + } + Bhm{ + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} + } + Gy{ + G{"y G – y G"} + y{"y – y G"} + } + GyM{ + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} + } + GyMEd{ + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + 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"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, MMM d, y G – E, MMM d, y G"} + 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"} + } + GyMMMd{ + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} + } + GyMd{ + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} + } + 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}"} + 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"} + } } } gregorian{ @@ -369,24 +488,158 @@ tg{ "ПаМ", } abbreviated%variant{ - "BCE", - "CE", + "ТоМ", + "М", } wide{ "Пеш аз милод", - "ПаМ", + "Пас аз милод", } wide%variant{ - "BCE", - "CE", + "То милод", + "Милод", } } intervalFormats{ + Bh{ + B{"h B – h B"} + h{"h – h B"} + } + Bhm{ + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} + } + Gy{ + G{"y G – y G"} + y{"y – y G"} + } + GyM{ + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} + } + GyMEd{ + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + 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"} + } + GyMMM{ + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + GyMMMEd{ + G{"E, MMM d, y G – E, MMM d, y G"} + 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"} + } + GyMMMd{ + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} + } + GyMd{ + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} + } + 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"} + } } monthNames{ format{ @@ -530,7 +783,7 @@ tg{ "EEEE, d MMMM'и' y G", "d MMMM'и' y G", "d MMM y G", - "dd/MM/yy GGGGG", + "M/d/y GGGGG", "{1} {0}", "{1} {0}", "{1} {0}", @@ -538,8 +791,31 @@ tg{ "{1} {0}", } availableFormats{ - MMMMd{"d MMMM"} - yyyyMMMM{"MMMM'и' y G"} + E{"ccc"} + Ed{"d E"} + Gy{"y G"} + GyMMM{"MMM y G"} + GyMMMEd{"E, MMM d, y G"} + GyMMMd{"MMM d, y G"} + M{"L"} + MEd{"E, M/d"} + MMM{"LLL"} + MMMEd{"E, MMM d"} + MMMMd{"MMMM d"} + MMMd{"MMM d"} + Md{"M/d"} + d{"d"} + 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"} + yyyyMMMM{"MMMM y G"} + yyyyMMMd{"MMM d, y G"} + yyyyMd{"M/d/y GGGGG"} + yyyyQQQ{"QQQ y G"} + yyyyQQQQ{"QQQQ y G"} } eras{ abbreviated{ @@ -669,12 +945,44 @@ tg{ "0"{"имрӯз"} "1"{"фардо"} } + relativeTime{ + future{ + other{"пас аз {0} рӯз"} + } + past{ + other{"{0} рӯз пеш"} + } + } } day-narrow{ dn{"рӯз"} + relativeTime{ + future{ + other{"пас аз {0} рӯз"} + } + past{ + other{"{0} рӯз пеш"} + } + } } day-short{ - dn{"рӯз"} + relativeTime{ + future{ + other{"пас аз {0} рӯз"} + } + past{ + other{"{0} рӯз пеш"} + } + } + } + dayOfYear{ + dn{"рӯзи сол"} + } + dayOfYear-narrow{ + dn{"рӯзи с."} + } + dayOfYear-short{ + dn{"рӯзи с."} } dayperiod{ dn{"AM/PM"} @@ -682,71 +990,634 @@ tg{ era{ dn{"мабдаи таърих"} } + era-narrow{ + dn{"мабдаи таърих"} + } + fri{ + relative{ + "-1"{"ҷумъаи гузашта"} + "0"{"ҷумъаи ҷорӣ"} + "1"{"ҷумъаи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} ҷумъа"} + } + past{ + other{"{0} ҷумъа пеш"} + } + } + } + fri-narrow{ + relative{ + "-1"{"ҷмъ г."} + "0"{"ҷмъ ҷ."} + "1"{"ҷмъ о."} + } + relativeTime{ + future{ + other{"пас аз {0} ҷмъ"} + } + past{ + other{"{0} ҷмъ пеш"} + } + } + } + fri-short{ + relative{ + "-1"{"ҷумъаи г."} + "0"{"ҷумъаи ҷ."} + "1"{"ҷумъаи о."} + } + relativeTime{ + future{ + other{"пас аз {0} ҷмъ"} + } + past{ + other{"{0} ҷмъ пеш"} + } + } + } hour{ dn{"соат"} + relative{ + "0"{"соати ҷорӣ"} + } + relativeTime{ + future{ + other{"пас аз {0} соат"} + } + past{ + other{"{0} соат пеш"} + } + } } hour-narrow{ dn{"ст."} + relativeTime{ + future{ + other{"пас аз {0} ст."} + } + past{ + other{"{0} ст. пеш"} + } + } } hour-short{ dn{"ст."} + relativeTime{ + future{ + other{"пас аз {0} ст."} + } + past{ + other{"{0} ст. пеш"} + } + } } minute{ dn{"дақиқа"} + relative{ + "0"{"дақиқаи ҷорӣ"} + } + relativeTime{ + future{ + other{"пас аз {0} дақиқа"} + } + past{ + other{"{0} дақиқа пеш"} + } + } } minute-narrow{ dn{"дақ."} + relativeTime{ + future{ + other{"пас аз {0} дақ."} + } + past{ + other{"{0} дақ. пеш"} + } + } } minute-short{ dn{"дақ."} + relativeTime{ + future{ + other{"пас аз {0} дақ."} + } + past{ + other{"{0} дақ. пеш"} + } + } + } + mon{ + relative{ + "-1"{"душанбеи гузашта"} + "0"{"душанбеи ҷорӣ"} + "1"{"душанбеи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} душанбе"} + } + past{ + other{"{0} душанбе пеш"} + } + } + } + mon-narrow{ + relative{ + "-1"{"дшб г."} + "0"{"дшб ҷ."} + "1"{"дшб о."} + } + relativeTime{ + future{ + other{"пас аз {0} дшб"} + } + past{ + other{"{0} дшб пеш"} + } + } + } + mon-short{ + relative{ + "-1"{"душанбеи г."} + "0"{"душанбеи ҷ."} + "1"{"душанбеи о."} + } + relativeTime{ + future{ + other{"пас аз {0} дшб"} + } + past{ + other{"{0} дшб пеш"} + } + } } month{ dn{"моҳ"} + relative{ + "-1"{"моҳи гузашта"} + "0"{"моҳи ҷорӣ"} + "1"{"моҳи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} моҳ"} + } + past{ + other{"{0} моҳ пеш"} + } + } } month-narrow{ dn{"м."} + relative{ + "-1"{"моҳи г."} + "0"{"моҳи ҷ."} + "1"{"моҳи о."} + } + relativeTime{ + future{ + other{"пас аз {0} м."} + } + past{ + other{"{0} м. пеш"} + } + } } month-short{ dn{"м."} + relative{ + "-1"{"моҳи г."} + "0"{"моҳи ҷ."} + "1"{"моҳи о."} + } + relativeTime{ + future{ + other{"пас аз {0} м."} + } + past{ + other{"{0} м. пеш"} + } + } } quarter{ dn{"чоряк"} + relative{ + "-1"{"чоряки гузашта"} + "0"{"чоряки ҷорӣ"} + "1"{"чоряки оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} чоряк"} + } + past{ + other{"{0} чоряк пеш"} + } + } } quarter-narrow{ dn{"чр."} } quarter-short{ dn{"чр."} + relativeTime{ + future{ + other{"пас аз {0} чр."} + } + past{ + other{"{0} чр. пеш"} + } + } + } + sat{ + relative{ + "-1"{"шанбеи гузашта"} + "0"{"шанбеи ҷорӣ"} + "1"{"шанбеи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} шанбе"} + } + past{ + other{"{0} шанбе пеш"} + } + } + } + sat-narrow{ + relative{ + "-1"{"шнб г."} + "0"{"шнб ҷ."} + "1"{"шнб о."} + } + relativeTime{ + future{ + other{"пас аз {0} шнб"} + } + past{ + other{"{0} шнб пеш"} + } + } + } + sat-short{ + relative{ + "-1"{"шанбеи г."} + "0"{"шанбеи ҷ."} + "1"{"шанбеи о."} + } + relativeTime{ + future{ + other{"пас аз {0} шнб"} + } + past{ + other{"{0} шнб пеш"} + } + } } second{ dn{"сония"} + relative{ + "0"{"ҳозир"} + } + relativeTime{ + future{ + other{"пас аз {0} сония"} + } + past{ + other{"{0} сония пеш"} + } + } } second-narrow{ dn{"сон."} + relativeTime{ + future{ + other{"пас аз {0} сон."} + } + past{ + other{"{0} сон. пеш"} + } + } } second-short{ dn{"сон."} + relativeTime{ + future{ + other{"пас аз {0} сон."} + } + past{ + other{"{0} сон. пеш"} + } + } + } + sun{ + relative{ + "-1"{"якшанбеи гузашта"} + "0"{"якшанбеи ҷорӣ"} + "1"{"якшанбеи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} якшанбе"} + } + past{ + other{"{0} якшанбе пеш"} + } + } + } + sun-narrow{ + relative{ + "-1"{"яшб г."} + "0"{"яшб ҷ."} + "1"{"яшб о."} + } + relativeTime{ + future{ + other{"пас аз {0} яшб"} + } + past{ + other{"{0} ябш пеш"} + } + } + } + sun-short{ + relative{ + "-1"{"якшанбеи г."} + "0"{"якшанбеи ҷ."} + "1"{"якшанбеи о."} + } + relativeTime{ + future{ + other{"пас аз {0} яшб"} + } + past{ + other{"{0} яшб. пеш"} + } + } + } + thu{ + relative{ + "-1"{"панҷшанбеи гузашта"} + "0"{"панҷшанбеи ҷорӣ"} + "1"{"панҷшанбеи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} панҷшанбе"} + } + past{ + other{"{0} панҷшанбе пеш"} + } + } + } + thu-narrow{ + relative{ + "-1"{"пшб г."} + "0"{"пшб ҷ."} + "1"{"пшб о."} + } + relativeTime{ + future{ + other{"пас аз {0} пшб"} + } + past{ + other{"{0} пшб пеш"} + } + } + } + thu-short{ + relative{ + "-1"{"панҷшанбеи г."} + "0"{"панҷшанбеи ҷ."} + "1"{"панҷшанбеи о."} + } + relativeTime{ + future{ + other{"пас аз {0} пшб"} + } + past{ + other{"{0} пшб пеш"} + } + } + } + tue{ + relative{ + "-1"{"сешанбеи гузашта"} + "0"{"сешанбеи ҷорӣ"} + "1"{"сешанбеи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} сешанбе"} + } + past{ + other{"{0} сешанбе пеш"} + } + } + } + tue-narrow{ + relative{ + "-1"{"сшб г."} + "0"{"сшб ҷ."} + "1"{"сшб о."} + } + relativeTime{ + future{ + other{"пас аз {0} сшб"} + } + past{ + other{"{0} сшб пеш"} + } + } + } + tue-short{ + relative{ + "-1"{"сешанбеи г."} + "0"{"сешанбеи ҷ."} + "1"{"сешанбеи о."} + } + relativeTime{ + future{ + other{"пас аз {0} сшб"} + } + past{ + other{"{0} сшб пеш"} + } + } + } + wed{ + relative{ + "-1"{"чоршанбеи гузашта"} + "0"{"чоршанбеи ҷорӣ"} + "1"{"чоршанбеи оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} чоршанбе"} + } + past{ + other{"{0} чоршанбе пеш"} + } + } + } + wed-narrow{ + relative{ + "-1"{"чшб г."} + "0"{"чшб ҷ."} + "1"{"чшб о."} + } + relativeTime{ + future{ + other{"пас аз {0} чшб"} + } + past{ + other{"{0} чшб пеш"} + } + } + } + wed-short{ + relative{ + "-1"{"чоршанбеи г."} + "0"{"чоршанбеи ҷ."} + "1"{"чоршанбеи о."} + } + relativeTime{ + future{ + other{"пас аз {0} чшб"} + } + past{ + other{"{0} чшб пеш"} + } + } } week{ dn{"ҳафта"} + relative{ + "-1"{"ҳафтаи гузашта"} + "0"{"ҳафтаи ҷорӣ"} + "1"{"ҳафтаи оянда"} + } + relativePeriod{"ҳафтаи {0}"} + relativeTime{ + future{ + other{"пас аз {0} ҳафта"} + } + past{ + other{"{0} ҳафта пеш"} + } + } } week-narrow{ - dn{"ҳ."} + relative{ + "-1"{"ҳафтаи г."} + "0"{"ҳафтаи ҷ."} + "1"{"ҳафтаи о."} + } + relativePeriod{"ҳ. {0}"} + relativeTime{ + future{ + other{"пас аз {0} ҳ."} + } + past{ + other{"{0} ҳ. пеш"} + } + } } week-short{ dn{"ҳ."} + relative{ + "-1"{"ҳафтаи г."} + "0"{"ҳафтаи ҷ."} + "1"{"ҳафтаи о."} + } + relativePeriod{"ҳ. {0}"} + relativeTime{ + future{ + other{"пас аз {0} ҳ."} + } + past{ + other{"{0} ҳ. пеш"} + } + } + } + weekOfMonth{ + dn{"ҳафтаи моҳ"} + } + weekOfMonth-narrow{ + dn{"ҳ. м."} + } + weekOfMonth-short{ + dn{"ҳ. м."} } weekday{ dn{"рӯзи ҳафта"} } + weekday-narrow{ + dn{"рӯзи ҳ."} + } + weekday-short{ + dn{"рӯзи ҳ."} + } + weekdayOfMonth{ + dn{"рӯзи ҳафтаи моҳ"} + } + weekdayOfMonth-narrow{ + dn{"рӯзи ҳ. м."} + } + weekdayOfMonth-short{ + dn{"рӯзи ҳ. м."} + } year{ dn{"сол"} + relative{ + "-1"{"соли гузашта"} + "0"{"соли ҷорӣ"} + "1"{"соли оянда"} + } + relativeTime{ + future{ + other{"пас аз {0} сол"} + } + past{ + other{"{0} сол пеш"} + } + } } year-narrow{ dn{"с."} + relative{ + "-1"{"соли г."} + "0"{"соли ҷ."} + "1"{"соли о."} + } + relativeTime{ + future{ + other{"пас аз {0} с."} + } + past{ + other{"{0} с. пеш"} + } + } } year-short{ dn{"с."} + relative{ + "-1"{"соли г."} + "0"{"соли ҷ."} + "1"{"соли о."} + } + relativeTime{ + future{ + other{"пас аз {0} с."} + } + past{ + other{"{0} с. пеш"} + } + } } zone{ dn{"минтақаи вақт"} diff --git a/intl/icu/source/data/locales/tg_TJ.txt b/intl/icu/source/data/locales/tg_TJ.txt index 0be757a701c6..2803a741fe72 100644 --- a/intl/icu/source/data/locales/tg_TJ.txt +++ b/intl/icu/source/data/locales/tg_TJ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tg_TJ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/th.txt b/intl/icu/source/data/locales/th.txt index 07aa2bbf80fe..86adc5205ae3 100644 --- a/intl/icu/source/data/locales/th.txt +++ b/intl/icu/source/data/locales/th.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th{ AuxExemplarCharacters{"[\u200B]"} Ellipsis{ @@ -183,7 +184,6 @@ th{ minimumGroupingDigits{"1"} native{"thai"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -1488,14 +1488,14 @@ th{ } GyM{ G{"MM/GGGGG y – MM/GGGGG y"} - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"MM/GGGGG y – MM/GGGGG y"} + y{"MM/GGGGG y – MM/GGGGG y"} } GyMEd{ G{"E d/MM/GGGGG y – E d/MM/GGGGG y"} - 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"} + M{"E d/MM/GGGGG y – E d/MM/GGGGG y"} + d{"E d/MM/GGGGG y – E d/MM/GGGGG y"} + y{"E d/MM/GGGGG y – E d/MM/GGGGG y"} } GyMMM{ G{"MMM G y – MMM G y"} @@ -1516,9 +1516,9 @@ th{ } GyMd{ G{"d/MM/GGGGG y – d/MM/GGGGG y"} - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/MM/GGGGG y – d/MM/GGGGG y"} + d{"d/MM/GGGGG y – d/MM/GGGGG y"} + y{"d/MM/GGGGG y – d/MM/GGGGG y"} } H{ H{"HH–HH"} @@ -2573,8 +2573,8 @@ th{ } characterLabel{ activities{"กิจกรรม"} - african_scripts{"สคริปต์แอฟริกัน"} - american_scripts{"สคริปต์อเมริกัน"} + african_scripts{"ตัวอักษรแอฟริกัน"} + american_scripts{"ตัวอักษรอเมริกัน"} animal{"สัตว์"} animals_nature{"สัตว์หรือธรรมชาติ"} arrows{"ลูกศร"} @@ -2591,9 +2591,9 @@ th{ divination_symbols{"สัญลักษณ์การทำนาย"} downwards_arrows{"ลูกศรลง"} downwards_upwards_arrows{"ลูกศรชี้ขึ้นและลง"} - east_asian_scripts{"สคริปต์เอเชียตะวันออก"} - emoji{"อิโมจิ"} - european_scripts{"สคริปต์ยุโรป"} + east_asian_scripts{"ตัวอักษรเอเชียตะวันออก"} + emoji{"อีโมจิ"} + european_scripts{"ตัวอักษรยุโรป"} female{"ผู้หญิง"} flag{"ธง"} flags{"ธง"} @@ -2609,7 +2609,7 @@ th{ hanzi_simplified{"อักษรจีน (ตัวย่อ)"} hanzi_traditional{"อักษรจีน (ตัวเต็ม)"} heart{"หัวใจ"} - historic_scripts{"สคริปต์โบราณ"} + historic_scripts{"ตัวอักษรโบราณ"} ideographic_desc_characters{"อักขระเป็นภาพที่แสดงความหมาย"} japanese_kana{"คะนะญี่ปุ่น"} kanbun{"อักษรจีน"} @@ -2621,9 +2621,9 @@ th{ limited_use{"ใช้งานแบบจำกัด"} male{"ผู้ชาย"} math_symbols{"สัญลักษณ์ทางคณิตศาสตร์"} - middle_eastern_scripts{"สคริปต์ตะวันออกกลาง"} + middle_eastern_scripts{"ตัวอักษรตะวันออกกลาง"} miscellaneous{"อื่นๆ"} - modern_scripts{"สคริปต์ปัจจุบัน"} + modern_scripts{"ตัวอักษรสมัยใหม่"} modifier{"ตัวขยาย"} musical_symbols{"สัญลักษณ์ทางดนตรี"} nature{"ธรรมชาติ"} @@ -2634,7 +2634,7 @@ th{ paired{"จับคู่"} person{"คน"} phonetic_alphabet{"ตัวอักษรสัทศาสตร์"} - pictographs{"ภาพสัญลักษณ์"} + pictographs{"อักษรภาพ"} place{"สถานที่"} plant{"พืช"} punctuation{"เครื่องหมายวรรคตอน"} @@ -2643,8 +2643,8 @@ th{ small_form_variant{"รูปแบบขนาดเล็ก"} smiley{"หน้ายิ้ม"} smileys_people{"หน้ายิ้มหรือรูปคน"} - south_asian_scripts{"สคริปต์เอเชียใต้"} - southeast_asian_scripts{"สคริปต์เอเชียตะวันออกเฉียงใต้"} + south_asian_scripts{"ตัวอักษรเอเชียใต้"} + southeast_asian_scripts{"ตัวอักษรเอเชียตะวันออกเฉียงใต้"} spacing{"การเว้นวรรค"} sport{"กีฬา"} symbols{"สัญลักษณ์"} @@ -2656,7 +2656,7 @@ th{ variant_forms{"รูปแบบที่เปลี่ยนแปลง"} vocalic_jamo{"สระภาษาเกาหลี"} weather{"สภาพอากาศ"} - western_asian_scripts{"สคริปต์เอเชียตะวันตก"} + western_asian_scripts{"ตัวอักษรเอเชียตะวันตก"} whitespace{"ช่องว่าง"} } delimiters{ @@ -3272,7 +3272,7 @@ th{ "0"{"สัปดาห์นี้"} "1"{"สัปดาห์หน้า"} } - relativePeriod{"สัปดาห์ที่เริ่มต้นวันที่"} + relativePeriod{"สัปดาห์ที่เริ่มต้นวันที่ {0}"} relativeTime{ future{ other{"ในอีก {0} สัปดาห์"} @@ -3289,7 +3289,7 @@ th{ "0"{"สัปดาห์นี้"} "1"{"สัปดาห์หน้า"} } - relativePeriod{"สัปดาห์ที่เริ่มต้นวันที่"} + relativePeriod{"สัปดาห์ที่เริ่มต้นวันที่ {0}"} relativeTime{ future{ other{"ใน {0} สัปดาห์"} @@ -3306,7 +3306,7 @@ th{ "0"{"สัปดาห์นี้"} "1"{"สัปดาห์หน้า"} } - relativePeriod{"สัปดาห์ที่เริ่มต้นวันที่"} + relativePeriod{"สัปดาห์ที่เริ่มต้นวันที่ {0}"} relativeTime{ future{ other{"ใน {0} สัปดาห์"} diff --git a/intl/icu/source/data/locales/th_TH.txt b/intl/icu/source/data/locales/th_TH.txt index 4711809a490e..b2b6445ccb35 100644 --- a/intl/icu/source/data/locales/th_TH.txt +++ b/intl/icu/source/data/locales/th_TH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th_TH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/th_TH_TRADITIONAL.txt b/intl/icu/source/data/locales/th_TH_TRADITIONAL.txt index 7196d0349cf1..3afabac7ad90 100644 --- a/intl/icu/source/data/locales/th_TH_TRADITIONAL.txt +++ b/intl/icu/source/data/locales/th_TH_TRADITIONAL.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th_TH_TRADITIONAL{ - Version{"37"} calendar{ default{"buddhist"} } diff --git a/intl/icu/source/data/locales/ti.txt b/intl/icu/source/data/locales/ti.txt index e96d0bc728de..612f0824b560 100644 --- a/intl/icu/source/data/locales/ti.txt +++ b/intl/icu/source/data/locales/ti.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti{ AuxExemplarCharacters{ "[᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ" @@ -20,7 +21,9 @@ ti{ default{"latn"} latn{ miscPatterns{ - atLeast{"≥{0}"} + approximately{"~{0}"} + atLeast{"⩾{0}"} + atMost{"≤{0}"} range{"{0}–{1}"} } patterns{ @@ -185,6 +188,7 @@ ti{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -202,7 +206,6 @@ ti{ native{"latn"} traditional{"ethi"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -230,12 +233,12 @@ ti{ } gregorian{ AmPmMarkers{ - "ንጉሆ ሰዓተ", - "ድሕር ሰዓት", + "ቅድመ ፍርቂ-መዓልቲ", + "ደሕረ ፍርቀ-መዓልቲ", } AmPmMarkersAbbr{ - "ንጉሆ ሰዓተ", - "ድሕር ሰዓት", + "ቅ ፍር-መዓ", + "ደሕ ፍር-መዓ", } AmPmMarkersNarrow{ "ንጉሆ ሰዓተ", @@ -271,7 +274,7 @@ ti{ Ed{"d, E"} Ehm{"E h:mm a"} Ehms{"E h:mm:ss a"} - Gy{"G y"} + Gy{"y G"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} GyMMMd{"G y MMM d"} @@ -397,16 +400,16 @@ ti{ dayPeriod{ stand-alone{ abbreviated{ - am{"ንጉሆ ሰዓተ"} - pm{"ድሕር ሰዓት"} + am{"ቅ ፍር-መዓ"} + pm{"ደሕ ፍር-መዓ"} } narrow{ am{"ንጉሆ ሰዓተ"} pm{"ድሕር ሰዓት"} } wide{ - am{"ንጉሆ ሰዓተ"} - pm{"ድሕር ሰዓት"} + am{"ቅድመ ፍርቂ-መዓልቲ"} + pm{"ደሕረ ፍርቀ-መዓልቲ"} } } } @@ -420,7 +423,7 @@ ti{ "ድ.ል.ክ", } wide{ - "ዓ/ዓ", + "ቅድመ ክርስቶስ", "ዓመተ ምህረት", } wide%variant{ @@ -429,6 +432,15 @@ ti{ } } intervalFormats{ + Bh{ + B{"h B – h B"} + h{"h – h B"} + } + Bhm{ + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} + } H{ H{"HH–HH"} } @@ -504,13 +516,13 @@ ti{ y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} + M{"E, MMM d – E, MMM d, y"} d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + y{"E, MMM d, y – E, MMM d, y"} } yMMMM{ - M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ M{"y MMM d – MMM d"} @@ -615,12 +627,6 @@ ti{ } quarters{ format{ - abbreviated{ - "ር1", - "ር2", - "ር3", - "ር4", - } narrow{ "1", "2", @@ -712,13 +718,13 @@ ti{ dn{"መዓልቲ ናይ ዓ."} } dayperiod{ - dn{"ክፍለ መዓልቲ"} + dn{"ቅድመ ፍርቂ-መዓልቲ/ድሕሪ ፍርቂ-መዓልቲ"} } dayperiod-narrow{ - dn{"ክፍለ መዓልቲ"} + dn{"ቅድመ ፍርቂ-መዓልቲ/ድሕሪ ፍርቂ-መዓልቲ"} } dayperiod-short{ - dn{"ክፍለ መዓልቲ"} + dn{"ቅድመ ፍርቂ-መዓልቲ/ድሕሪ ፍርቂ-መዓልቲ"} } era{ dn{"ዘመን"} @@ -935,6 +941,11 @@ ti{ } month-narrow{ dn{"ወርሒ"} + relative{ + "-1"{"ዝሓለፈ ወርሒ"} + "0"{"ህሉው ወርሒ"} + "1"{"ዝመጽእ ወርሒ"} + } relativeTime{ future{ one{"ኣብ {0} ወርሒ"} @@ -948,6 +959,11 @@ ti{ } month-short{ dn{"ወርሒ"} + relative{ + "-1"{"ዝሓለፈ ወርሒ"} + "0"{"ህሉው ወርሒ"} + "1"{"ዝመጽእ ወርሒ"} + } relativeTime{ future{ one{"ኣብ {0} ወርሒ"} @@ -1301,7 +1317,6 @@ ti{ } } week{ - dn{"ሰሙን"} relative{ "-1"{"ዝሓለፈ ሰሙን"} "0"{"ህሉው ሰሙን"} @@ -1348,10 +1363,7 @@ ti{ } } weekOfMonth{ - dn{"ሰን ናይ ወርሒ"} - } - weekOfMonth-narrow{ - dn{"ሰሙ. ናይ ወር."} + dn{"ሰሙን ናይ ወርሒ"} } weekOfMonth-short{ dn{"ሰሙ. ናይ ወር."} diff --git a/intl/icu/source/data/locales/ti_ER.txt b/intl/icu/source/data/locales/ti_ER.txt index 316a1eac37d6..bdec93ecbdb0 100644 --- a/intl/icu/source/data/locales/ti_ER.txt +++ b/intl/icu/source/data/locales/ti_ER.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti_ER{ - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/ti_ET.txt b/intl/icu/source/data/locales/ti_ET.txt index 9e3608a80303..a965c124aace 100644 --- a/intl/icu/source/data/locales/ti_ET.txt +++ b/intl/icu/source/data/locales/ti_ET.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti_ET{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/tk.txt b/intl/icu/source/data/locales/tk.txt index 67a627f91160..e440fb15611f 100644 --- a/intl/icu/source/data/locales/tk.txt +++ b/intl/icu/source/data/locales/tk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tk{ AuxExemplarCharacters{"[c q v x]"} Ellipsis{ @@ -186,6 +187,7 @@ tk{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{" "} @@ -211,7 +213,6 @@ tk{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1714,7 +1715,6 @@ tk{ start{"{0}, {1}"} } standard-short{ - 2{"{0} we {1}"} end{"{0} we {1}"} middle{"{0}, {1}"} start{"{0}, {1}"} diff --git a/intl/icu/source/data/locales/tk_TM.txt b/intl/icu/source/data/locales/tk_TM.txt index 29ca5b3f7889..e96a2c16216b 100644 --- a/intl/icu/source/data/locales/tk_TM.txt +++ b/intl/icu/source/data/locales/tk_TM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tk_TM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/tl.txt b/intl/icu/source/data/locales/tl.txt index 4e521f927601..8c39518018d6 100644 --- a/intl/icu/source/data/locales/tl.txt +++ b/intl/icu/source/data/locales/tl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl{ "%%ALIAS"{"fil"} } diff --git a/intl/icu/source/data/locales/tl_PH.txt b/intl/icu/source/data/locales/tl_PH.txt index 07c9f9047edf..59af39479e02 100644 --- a/intl/icu/source/data/locales/tl_PH.txt +++ b/intl/icu/source/data/locales/tl_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl_PH{ "%%ALIAS"{"fil_PH"} } diff --git a/intl/icu/source/data/locales/to.txt b/intl/icu/source/data/locales/to.txt index 71bd87599788..22bb9d5a3ec7 100644 --- a/intl/icu/source/data/locales/to.txt +++ b/intl/icu/source/data/locales/to.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml to{ AuxExemplarCharacters{ "[à ă â å ä æ b c ç d è ĕ ê ë g ì ĭ î ï j ñ ò ŏ ô ö ø œ q r ù ŭ û ü w x y ÿ z" @@ -180,7 +181,6 @@ to{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/to_TO.txt b/intl/icu/source/data/locales/to_TO.txt index 9aa5f226675d..003fb8ca0016 100644 --- a/intl/icu/source/data/locales/to_TO.txt +++ b/intl/icu/source/data/locales/to_TO.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml to_TO{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/tr.txt b/intl/icu/source/data/locales/tr.txt index 17bcecc5bee8..a38a4d03869c 100644 --- a/intl/icu/source/data/locales/tr.txt +++ b/intl/icu/source/data/locales/tr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr{ AuxExemplarCharacters{ "[á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ q ß ú ù ŭ û ū w x" @@ -218,7 +219,6 @@ tr{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/tr_CY.txt b/intl/icu/source/data/locales/tr_CY.txt index 284edbd4417d..11065592e0c9 100644 --- a/intl/icu/source/data/locales/tr_CY.txt +++ b/intl/icu/source/data/locales/tr_CY.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr_CY{ - Version{"37"} calendar{ gregorian{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/tr_TR.txt b/intl/icu/source/data/locales/tr_TR.txt index d790551e0d88..df91387596d4 100644 --- a/intl/icu/source/data/locales/tr_TR.txt +++ b/intl/icu/source/data/locales/tr_TR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr_TR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/tt.txt b/intl/icu/source/data/locales/tt.txt index 73cd640be807..df1111d1043b 100644 --- a/intl/icu/source/data/locales/tt.txt +++ b/intl/icu/source/data/locales/tt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tt{ AuxExemplarCharacters{"[ғ қ]"} ExemplarCharacters{ @@ -41,7 +42,6 @@ tt{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -51,16 +51,130 @@ tt{ "H:mm", "d MMMM, y 'ел' (G), EEEE", "d MMMM, y 'ел' (G)", - "dd.MM.y G", - "dd.MM.y GGGGG", + "dd.MM.y (G)", + "dd.MM.y (GGGGG)", "{1}, {0}", "{1}, {0}", "{1}, {0}", "{1}, {0}", "{1}, {0}", } + availableFormats{ + Gy{"G y 'ел'"} + GyMMM{"G y 'ел', MMM"} + GyMMMEd{"G y 'ел', d MMM, E"} + GyMMMd{"G y 'ел', d MMM"} + MEd{"dd.MM, E"} + MMMEd{"d MMM, E"} + MMMMd{"d MMMM"} + MMMd{"d MMM"} + Md{"dd.MM"} + y{"G y 'ел'"} + yyyy{"G y 'ел'"} + yyyyM{"GGGGG y 'ел', MM"} + yyyyMEd{"GGGGG dd.MM.y, E"} + yyyyMMM{"G y 'ел', MMM"} + yyyyMMMEd{"G y 'ел', d MMM, E"} + yyyyMMMM{"G y 'ел', MMMM"} + yyyyMMMd{"G y 'ел', d MMM"} + yyyyMd{"GGGGG dd.MM.y"} + yyyyQQQ{"G y 'ел', QQQ"} + yyyyQQQQ{"G y 'ел', QQQQ"} + } intervalFormats{ + Gy{ + G{"G y 'ел' – G y 'ел'"} + y{"G y–y 'ел'"} + } + GyM{ + G{"GGGGG y 'ел', MM – GGGGG y 'ел', MM"} + M{"GGGGG y 'ел', MM – y 'ел', MM"} + y{"GGGGG y 'ел', MM – y 'ел', MM"} + } + GyMEd{ + G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} + M{"GGGGG dd.MM.y, E – dd.MM.y, E"} + d{"GGGGG dd.MM.y, E – dd.MM.y, E"} + y{"GGGGG dd.MM.y, E – dd.MM.y, E"} + } + GyMMM{ + G{"G y 'ел', MMM – G y 'ел', MMM"} + M{"G y 'ел', MMM–MMM"} + y{"G y 'ел', MMM – y 'ел', MMM"} + } + GyMMMEd{ + G{"G y 'ел', d MMM, E – G y 'ел', d MMM, E"} + M{"G y 'ел', d MMM, E – d MMM, E"} + d{"G y 'ел', d MMM, E – d MMM, E"} + y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} + } + GyMMMd{ + G{"G y 'ел', d MMM – G y 'ел', d MMM"} + M{"G y 'ел', d MMM – d MMM"} + d{"G y 'ел', d–d MMM"} + y{"G y 'ел', d MMM – y 'ел' d MMM"} + } + GyMd{ + G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} + } + 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"} + } fallback{"{0} – {1}"} + y{ + y{"G y–y 'ел'"} + } + yM{ + M{"GGGGG y 'ел', MM – y 'ел', MM"} + y{"GGGGG y 'ел', MM – y 'ел', MM"} + } + yMEd{ + M{"GGGGG dd.MM.y, E – dd.MM.y, E"} + d{"GGGGG dd.MM.y, E – dd.MM.y, E"} + y{"GGGGG dd.MM.y, E – dd.MM.y, E"} + } + yMMM{ + M{"G y 'ел', MMM–MMM"} + y{"G y 'ел', MMM – y 'ел', MMM"} + } + yMMMEd{ + M{"G y 'ел', d MMM, E – d MMM, E"} + d{"G y 'ел' d MMM, E – d MMM, E"} + y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} + } + yMMMM{ + M{"G y 'ел', MMMM–MMMM"} + y{"G y 'ел', MMMM – y 'ел', MMMM"} + } + yMMMd{ + M{"G y 'ел', d MMM – d MMM"} + d{"G y 'ел', d–d MMM"} + y{"G y 'ел', d MMM – y 'ел', d MMM"} + } + yMd{ + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} + } } } gregorian{ @@ -98,20 +212,19 @@ tt{ E{"ccc"} EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} - Ed{"E, d"} Gy{"G y 'ел'"} GyMMM{"G y 'ел', MMM"} - GyMMMEd{"E, G d MMM y 'ел'"} - GyMMMd{"G d MMM y 'ел'"} + GyMMMEd{"G y 'ел', d MMM, E"} + GyMMMd{"G y 'ел', d MMM"} H{"HH"} Hm{"HH:mm"} Hms{"HH:mm:ss"} Hmsv{"HH:mm:ss v"} Hmv{"HH:mm v"} M{"L"} - MEd{"E, dd.MM"} + MEd{"dd.MM, E"} MMM{"LLL"} - MMMEd{"E, d MMM"} + MMMEd{"d MMM, E"} MMMMW{ other{"MMMM 'аеның' W 'атнасы'"} } @@ -127,14 +240,14 @@ tt{ 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 'ел'"} + yMEd{"dd.MM.y, E"} + yMMM{"y 'ел', MMM"} + yMMMEd{"y 'ел', d MMM, E"} + yMMMM{"y 'ел', MMMM"} + yMMMd{"y 'ел', d MMM"} yMd{"dd.MM.y"} - yQQQ{"QQQ, y 'ел'"} - yQQQQ{"QQQQ, y 'ел'"} + yQQQ{"y 'ел', QQQ"} + yQQQQ{"y 'ел', QQQQ"} yw{ other{"Y 'елның' w 'атнасы'"} } @@ -243,11 +356,53 @@ tt{ "б.э.", } wide{ + "безнең эрага кадәр", + "милади", + } + wide%variant{ "безнең эрага кадәр", "безнең эра", } } intervalFormats{ + Gy{ + G{"G y 'ел' – G y 'ел'"} + y{"G y–y 'ел'"} + } + GyM{ + G{"GGGGG MM.y – GGGGG MM.y"} + M{"GGGGG MM.y – MM.y"} + y{"GGGGG MM.y – MM.y"} + } + GyMEd{ + G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} + M{"GGGGG dd.MM.y, E – dd.MM.y, E"} + d{"GGGGG dd.MM.y, E – dd.MM.y, E"} + y{"GGGGG dd.MM.y, E – dd.MM.y, E"} + } + GyMMM{ + G{"G y 'ел', MMM – G y 'ел', MMM"} + M{"G y 'ел', MMM–MMM"} + y{"G y 'ел', MMM – y 'ел', MMM"} + } + GyMMMEd{ + G{"G y 'ел', d MMM, E – G y 'ел', d MMM, E"} + M{"G y 'ел', d MMM, E – d MMM, E"} + d{"G y 'ел', d MMM, E – d MMM, E"} + y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} + } + GyMMMd{ + G{"G y 'ел', d MMM – G y 'ел', d MMM"} + M{"G y 'ел', d MMM – d MMM"} + d{"G y 'ел', d–d MMM"} + y{"G y 'ел', d MMM – y 'ел', d MMM"} + } + GyMd{ + G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} + } H{ H{"HH–HH"} } @@ -266,15 +421,15 @@ tt{ M{"MM–MM"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"dd.MM, E – dd.MM, E"} + d{"dd.MM, E – dd.MM, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"d MMM, E – d MMM, E"} + d{"d MMM, E – d MMM, E"} } MMMd{ M{"d MMM – d MMM"} @@ -314,27 +469,27 @@ tt{ 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"} + 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 'ел'"} + M{"y 'ел', MMM – MMM"} + y{"y 'ел', MMM – y 'ел', MMM"} } 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 'ел'"} + M{"y 'ел', d MMM, E – d MMM, E"} + d{"y 'ел', d MMM, E – d MMM, E"} + y{"y 'ел', d MMM, E – y 'ел', d MMM, E"} } yMMMM{ - M{"MMMM – MMMM, y 'ел'"} - y{"MMMM, y 'ел' – MMMM, y 'ел'"} + M{"y 'ел', MMMM – MMMM"} + y{"y 'ел', MMMM – y 'ел', MMMM"} } yMMMd{ - M{"d MMM – d MMM, y 'ел'"} - d{"d–d MMM, y 'ел'"} - y{"d MMM, y 'ел' – d MMM, y 'ел'"} + M{"y 'ел', d MMM – d MMM"} + d{"y 'ел', d–d MMM"} + y{"y 'ел', d MMM – y 'ел', d MMM"} } yMd{ M{"dd.MM.y – dd.MM.y"} @@ -490,12 +645,45 @@ tt{ "0"{"бүген"} "1"{"иртәгә"} } + relativeTime{ + future{ + other{"{0} көннән"} + } + past{ + other{"{0} көн элек"} + } + } } day-narrow{ dn{"көн"} + relativeTime{ + future{ + other{"{0} көннән"} + } + past{ + other{"{0} көн элек"} + } + } } day-short{ dn{"көн"} + relativeTime{ + future{ + other{"{0} көннән"} + } + past{ + other{"{0} көн элек"} + } + } + } + dayOfYear{ + dn{"елның көне"} + } + dayOfYear-narrow{ + dn{"елның көне"} + } + dayOfYear-short{ + dn{"елның көне"} } dayperiod{ dn{"AM/PM"} @@ -503,71 +691,631 @@ tt{ era{ dn{"эра"} } + fri{ + relative{ + "-1"{"узган җомга"} + "0"{"бу җомга"} + "1"{"киләсе җомга"} + } + relativeTime{ + future{ + other{"{0} җомга узгач"} + } + past{ + other{"{0} җомга элек"} + } + } + } + fri-narrow{ + relative{ + "-1"{"узган җом."} + "0"{"бу җом."} + "1"{"киләсе җом."} + } + relativeTime{ + future{ + other{"{0} җом. узгач"} + } + past{ + other{"{0} җом. элек"} + } + } + } + fri-short{ + relative{ + "-1"{"узган җом."} + "0"{"бу җом."} + "1"{"киләсе җом."} + } + relativeTime{ + future{ + other{"{0} җом. узгач"} + } + past{ + other{"{0} җом. элек"} + } + } + } hour{ dn{"сәгать"} + relative{ + "0"{"бу сәгатьтә"} + } + relativeTime{ + future{ + other{"{0} сәгатьтән"} + } + past{ + other{"{0} сәгать элек"} + } + } } hour-narrow{ dn{"сәг."} + relativeTime{ + future{ + other{"{0} сәг."} + } + past{ + other{"{0} сәг. элек"} + } + } } hour-short{ dn{"сәг."} + relativeTime{ + future{ + other{"{0} сәг."} + } + past{ + other{"{0} сәг. элек"} + } + } } minute{ dn{"минут"} + relative{ + "0"{"бу минутта"} + } + relativeTime{ + future{ + other{"{0} минуттан"} + } + past{ + other{"{0} минут элек"} + } + } } minute-narrow{ dn{"мин."} + relativeTime{ + future{ + other{"{0} мин."} + } + past{ + other{"{0} мин. элек"} + } + } } minute-short{ dn{"мин."} + relativeTime{ + future{ + other{"{0} мин."} + } + past{ + other{"{0} мин. элек"} + } + } + } + mon{ + relative{ + "-1"{"узган дүшәмбе"} + "0"{"бу дүшәмбе"} + "1"{"киләсе дүшәмбе"} + } + relativeTime{ + future{ + other{"{0} дүшәмбе узгач"} + } + past{ + other{"{0} дүшәмбе элек"} + } + } + } + mon-narrow{ + relative{ + "-1"{"узган дүш."} + "0"{"бу дүш."} + "1"{"киләсе дүш."} + } + relativeTime{ + future{ + other{"{0} дүш. узгач"} + } + past{ + other{"{0} дүш. элек"} + } + } + } + mon-short{ + relative{ + "-1"{"узган дүш."} + "0"{"бу дүш."} + "1"{"киләсе дүш."} + } + relativeTime{ + future{ + other{"{0} дүш. узгач"} + } + past{ + other{"{0} дүш. элек"} + } + } } month{ dn{"ай"} + relative{ + "-1"{"узган айда"} + "0"{"бу айда"} + "1"{"киләсе айда"} + } + relativeTime{ + future{ + other{"{0} айдан"} + } + past{ + other{"{0} ай элек"} + } + } } month-narrow{ dn{"ай"} + relative{ + "-1"{"узган айда"} + "0"{"бу айда"} + "1"{"киләсе айда"} + } + relativeTime{ + future{ + other{"{0} айдан"} + } + past{ + other{"{0} ай элек"} + } + } } month-short{ dn{"ай"} + relative{ + "-1"{"узган айда"} + "0"{"бу айда"} + "1"{"киләсе айда"} + } + relativeTime{ + future{ + other{"{0} айдан"} + } + past{ + other{"{0} ай элек"} + } + } } quarter{ dn{"квартал"} + relative{ + "-1"{"узган кварталда"} + "0"{"бу кварталда"} + "1"{"киләсе кварталда"} + } + relativeTime{ + future{ + other{"{0} кварталдан"} + } + past{ + other{"{0} квартал элек"} + } + } } quarter-narrow{ dn{"кв."} + relativeTime{ + future{ + other{"{0} кв."} + } + past{ + other{"{0} кв. элек"} + } + } } quarter-short{ dn{"кв."} + relativeTime{ + future{ + other{"{0} кв."} + } + past{ + other{"{0} кв. элек"} + } + } + } + sat{ + relative{ + "-1"{"узган шимбә"} + "0"{"бу шимбә"} + "1"{"киләсе шимбә"} + } + relativeTime{ + future{ + other{"{0} шимбә узгач"} + } + past{ + other{"{0} шимбә элек"} + } + } + } + sat-narrow{ + relative{ + "-1"{"узган шим."} + "0"{"бу шим."} + "1"{"киләсе шим."} + } + relativeTime{ + past{ + other{"{0} шим. элек"} + } + } + } + sat-short{ + relative{ + "-1"{"узган шим."} + "0"{"бу шим."} + "1"{"киләсе шим."} + } + relativeTime{ + future{ + other{"{0} шим. узгач"} + } + past{ + other{"{0} шим. элек"} + } + } } second{ dn{"секунд"} + relative{ + "0"{"хәзер"} + } + relativeTime{ + future{ + other{"{0} секундтан"} + } + past{ + other{"{0} секунд элек"} + } + } } second-narrow{ dn{"с."} + relativeTime{ + future{ + other{"{0} с."} + } + past{ + other{"{0} с. элек"} + } + } } second-short{ dn{"с."} + relativeTime{ + future{ + other{"{0} с."} + } + past{ + other{"{0} с. элек"} + } + } + } + sun{ + relative{ + "-1"{"узган якшәмбе"} + "0"{"бу якшәмбе"} + "1"{"киләсе якшәмбе"} + } + relativeTime{ + future{ + other{"{0} якшәмбе узгач"} + } + past{ + other{"{0} якшәмбе элек"} + } + } + } + sun-narrow{ + relative{ + "-1"{"узган якш."} + "0"{"бу якш."} + "1"{"киләсе якш."} + } + relativeTime{ + future{ + other{"{0} якш. узгач"} + } + past{ + other{"{0} якш. элек"} + } + } + } + sun-short{ + relative{ + "-1"{"узган якш."} + "0"{"бу якш."} + "1"{"киләсе якш."} + } + relativeTime{ + future{ + other{"{0} якш. узгач"} + } + past{ + other{"{0} якш. элек"} + } + } + } + thu{ + relative{ + "-1"{"узган пәнҗешәмбе"} + "0"{"бу пәнҗешәмбе"} + "1"{"киләсе пәнҗешәмбе"} + } + relativeTime{ + future{ + other{"{0} пәнҗешәмбе узгач"} + } + past{ + other{"{0} пәнҗешәмбе элек"} + } + } + } + thu-narrow{ + relative{ + "-1"{"узган пәнҗ."} + "0"{"бу пәнҗ."} + "1"{"киләсе пәнҗ."} + } + relativeTime{ + future{ + other{"{0} пәнҗ. узгач"} + } + past{ + other{"{0} пәнҗ. элек"} + } + } + } + thu-short{ + relative{ + "-1"{"узган пәнҗ."} + "0"{"бу пәнҗ."} + "1"{"киләсе пәнҗ."} + } + relativeTime{ + future{ + other{"{0} пәнҗ. узгач"} + } + past{ + other{"{0} пәнҗ. элек"} + } + } + } + tue{ + relative{ + "-1"{"узган сишәмбе"} + "0"{"бу сишәмбе"} + "1"{"киләсе сишәмбе"} + } + relativeTime{ + future{ + other{"{0} сишәмбе узгач"} + } + past{ + other{"{0} сишәмбе элек"} + } + } + } + tue-narrow{ + relative{ + "-1"{"узган сиш."} + "0"{"бу сиш."} + "1"{"киләсе сиш."} + } + relativeTime{ + future{ + other{"{0} сиш. узгач"} + } + past{ + other{"{0} сиш. элек"} + } + } + } + tue-short{ + relative{ + "-1"{"узган сиш."} + "0"{"бу сиш."} + "1"{"киләсе сиш."} + } + relativeTime{ + future{ + other{"{0} сиш. узгач"} + } + past{ + other{"{0} сиш. элек"} + } + } + } + wed{ + relative{ + "-1"{"узган чәршәмбе"} + "0"{"бу чәршәмбе"} + "1"{"киләсе чәршәмбе"} + } + relativeTime{ + future{ + other{"{0} чәршәмбе узгач"} + } + past{ + other{"{0} чәршәмбе элек"} + } + } + } + wed-narrow{ + relative{ + "-1"{"узган чәр."} + "0"{"бу чәр."} + "1"{"киләсе чәр."} + } + relativeTime{ + future{ + other{"{0} чәр. узгач"} + } + past{ + other{"{0} чәр. элек"} + } + } + } + wed-short{ + relative{ + "-1"{"узган чәр."} + "0"{"бу чәр."} + "1"{"киләсе чәр."} + } + relativeTime{ + future{ + other{"{0} чәр. узгач"} + } + past{ + other{"{0} чәр. элек"} + } + } } week{ dn{"атна"} + relative{ + "-1"{"узган атнада"} + "0"{"бу атнада"} + "1"{"киләсе атнада"} + } + relativePeriod{"{0} атнасы"} + relativeTime{ + future{ + other{"{0} атнадан"} + } + past{ + other{"{0} атна элек"} + } + } } week-narrow{ dn{"атна"} + relative{ + "-1"{"узган атнада"} + "0"{"бу атнада"} + "1"{"киләсе атнада"} + } + relativePeriod{"{0} атнасы"} + relativeTime{ + future{ + other{"{0} атнадан"} + } + past{ + other{"{0} атна элек"} + } + } } week-short{ dn{"атна"} + relative{ + "-1"{"узган атнада"} + "0"{"бу атнада"} + "1"{"киләсе атнада"} + } + relativePeriod{"{0} атнасы"} + relativeTime{ + future{ + other{"{0} атнадан"} + } + past{ + other{"{0} атна элек"} + } + } + } + weekOfMonth{ + dn{"ай атнасы"} + } + weekOfMonth-narrow{ + dn{"ай атнасы"} + } + weekOfMonth-short{ + dn{"ай атнасы"} } weekday{ dn{"атна көне"} } + weekdayOfMonth{ + dn{"айның эш көне"} + } + weekdayOfMonth-narrow{ + dn{"айның эш көне"} + } + weekdayOfMonth-short{ + dn{"айның эш көне"} + } year{ dn{"ел"} + relative{ + "-1"{"узган ел"} + "0"{"быел"} + "1"{"киләсе елда"} + } + relativeTime{ + future{ + other{"{0} елдан"} + } + past{ + other{"{0} ел элек"} + } + } } year-narrow{ dn{"ел"} + relative{ + "-1"{"узган ел"} + "0"{"быел"} + "1"{"киләсе елда"} + } + relativeTime{ + future{ + other{"{0} елдан"} + } + past{ + other{"{0} ел элек"} + } + } } year-short{ dn{"ел"} + relative{ + "-1"{"узган ел"} + "0"{"быел"} + "1"{"киләсе елда"} + } + relativeTime{ + future{ + other{"{0} елдан"} + } + past{ + other{"{0} ел элек"} + } + } } zone{ dn{"вакыт өлкәсе"} diff --git a/intl/icu/source/data/locales/tt_RU.txt b/intl/icu/source/data/locales/tt_RU.txt index 65ab8d9e180c..68f63c8a2dc6 100644 --- a/intl/icu/source/data/locales/tt_RU.txt +++ b/intl/icu/source/data/locales/tt_RU.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tt_RU{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/twq.txt b/intl/icu/source/data/locales/twq.txt index d47f6f686078..ceabf91fc69b 100644 --- a/intl/icu/source/data/locales/twq.txt +++ b/intl/icu/source/data/locales/twq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml twq{ AuxExemplarCharacters{"[v]"} ExemplarCharacters{"[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]"} @@ -17,7 +18,6 @@ twq{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/twq_NE.txt b/intl/icu/source/data/locales/twq_NE.txt index b9348f53dea8..df7da3d66345 100644 --- a/intl/icu/source/data/locales/twq_NE.txt +++ b/intl/icu/source/data/locales/twq_NE.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml twq_NE{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/tzm.txt b/intl/icu/source/data/locales/tzm.txt index 0482907b2258..017249e68b62 100644 --- a/intl/icu/source/data/locales/tzm.txt +++ b/intl/icu/source/data/locales/tzm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tzm{ AuxExemplarCharacters{"[o p v]"} ExemplarCharacters{"[a b c d ḍ e ɛ f g {gʷ} ɣ h ḥ i j k {kʷ} l m n q r ṛ s ṣ t ṭ u w x y z]"} @@ -16,7 +17,6 @@ tzm{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/tzm_MA.txt b/intl/icu/source/data/locales/tzm_MA.txt index 5be124bca9cb..2bfa56152299 100644 --- a/intl/icu/source/data/locales/tzm_MA.txt +++ b/intl/icu/source/data/locales/tzm_MA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tzm_MA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ug.txt b/intl/icu/source/data/locales/ug.txt index 34efd08c6249..24bea8064741 100644 --- a/intl/icu/source/data/locales/ug.txt +++ b/intl/icu/source/data/locales/ug.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ug{ AuxExemplarCharacters{"[\u200E\u200F ئ]"} ExemplarCharacters{ @@ -149,7 +150,6 @@ ug{ } native{"arabext"} } - Version{"37"} calendar{ buddhist{ eras{ diff --git a/intl/icu/source/data/locales/ug_CN.txt b/intl/icu/source/data/locales/ug_CN.txt index 72e939d0dd92..6a0606d2adc8 100644 --- a/intl/icu/source/data/locales/ug_CN.txt +++ b/intl/icu/source/data/locales/ug_CN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ug_CN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/uk.txt b/intl/icu/source/data/locales/uk.txt index b2e1864a58b8..20ae3bb556be 100644 --- a/intl/icu/source/data/locales/uk.txt +++ b/intl/icu/source/data/locales/uk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk{ AuxExemplarCharacters{ "[{а\u0301} {е\u0301} ё {є\u0301} {и\u0301} {і\u0301} {ї\u0301} {о\u0301} {у" @@ -293,7 +294,6 @@ uk{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -925,7 +925,6 @@ uk{ afternoon1{"день"} am{"дп"} evening1{"вечір"} - midnight{"опівніч"} morning1{"ранок"} night1{"ніч"} noon{"полудень"} @@ -1814,8 +1813,8 @@ uk{ han_characters{"китайський ієрогліф"} han_radicals{"ієрогліфічний ключ"} hanja{"ханча"} - hanzi_simplified{"ханьцзи (спрощена)"} - hanzi_traditional{"ханьцзи (традиційна)"} + hanzi_simplified{"ханьцзи (спрощене письмо)"} + hanzi_traditional{"ханьцзи (традиційне письмо)"} heart{"серце"} historic_scripts{"історичне письмо"} ideographic_desc_characters{"ідеографічний описовий знак"} @@ -2032,16 +2031,16 @@ uk{ } relativeTime{ future{ - few{"через {0} пʼятниці"} - many{"через {0} пʼятниць"} - one{"через {0} пʼятницю"} - other{"через {0} пʼятниці"} + few{"через {0} пт"} + many{"через {0} пт"} + one{"через {0} пт"} + other{"через {0} пт"} } past{ - few{"{0} пʼятниці тому"} - many{"{0} пʼятниць тому"} - one{"{0} пʼятницю тому"} - other{"{0} пʼятниці тому"} + few{"{0} пт тому"} + many{"{0} пт тому"} + one{"{0} пт тому"} + other{"{0} пт тому"} } } } diff --git a/intl/icu/source/data/locales/uk_UA.txt b/intl/icu/source/data/locales/uk_UA.txt index fdd3c8fef0ca..ebf2c13b44a7 100644 --- a/intl/icu/source/data/locales/uk_UA.txt +++ b/intl/icu/source/data/locales/uk_UA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk_UA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/ur.txt b/intl/icu/source/data/locales/ur.txt index c883b276d1ba..ff17fd122141 100644 --- a/intl/icu/source/data/locales/ur.txt +++ b/intl/icu/source/data/locales/ur.txt @@ -1,9 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur{ AuxExemplarCharacters{ "[؀؁؂؃\u200C\u200D\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 " - "\u0651 \u0652 \u0654 \u0656 \u0657 \u0658 \u0670 ۃ ٻ ٺ ټ ٽ ي]" + "\u0651 \u0652 \u0654 \u0656 \u0657 \u0658 \u0670 أ آ ں ؤ ۂ ۃ ئ ٻ ة ٺ ټ ٽ ه ي" + "]" } Ellipsis{ final{"{0}…"} @@ -14,8 +16,8 @@ ur{ word-medial{"{0} … {1}"} } ExemplarCharacters{ - "[ا أ آ ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں و ؤ ہ" - " ۂ ھ ء ی ئ ے ة ه]" + "[ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے" + "]" } ExemplarCharactersIndex{ "[ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے" @@ -33,6 +35,7 @@ ur{ scientificFormat{"#E0"} } symbols{ + approximatelySign{"~"} decimal{"٫"} exponential{"×۱۰^"} group{"٬"} @@ -216,6 +219,7 @@ ur{ } } symbols{ + approximatelySign{"~"} decimal{"."} exponential{"E"} group{","} @@ -242,7 +246,6 @@ ur{ minimumGroupingDigits{"1"} native{"arabext"} } - Version{"37"} calendar{ buddhist{ eras{ @@ -1315,9 +1318,9 @@ ur{ "محرم", "صفر", "ربیع الاوّل", - "ربیع الثّانی", + "ربیع الثانی", "جمادی الاوّل", - "جمادی الثّانی", + "جمادی الثانی", "رجب", "شعبان", "رمضان", @@ -2439,7 +2442,7 @@ ur{ "[%٪﹪%]", "[؉‰]", "[\$﹩$$]", - "[£₤]", + "[£₤£]", "[¥¥]", "[₩₩]", "[₨₹{Rp}{Rs}]", diff --git a/intl/icu/source/data/locales/ur_IN.txt b/intl/icu/source/data/locales/ur_IN.txt index 77456b8e4c4a..57a93473a6fd 100644 --- a/intl/icu/source/data/locales/ur_IN.txt +++ b/intl/icu/source/data/locales/ur_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur_IN{ NumberElements{ arabext{ @@ -14,7 +15,6 @@ ur_IN{ } } } - Version{"37"} fields{ day-narrow{ relativeTime{ diff --git a/intl/icu/source/data/locales/ur_PK.txt b/intl/icu/source/data/locales/ur_PK.txt index b51709d182f5..241ddc8a1791 100644 --- a/intl/icu/source/data/locales/ur_PK.txt +++ b/intl/icu/source/data/locales/ur_PK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur_PK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/uz.txt b/intl/icu/source/data/locales/uz.txt index 82835dbf33d6..2070133e5de2 100644 --- a/intl/icu/source/data/locales/uz.txt +++ b/intl/icu/source/data/locales/uz.txt @@ -1,7 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz{ - AuxExemplarCharacters{"[c w]"} + AuxExemplarCharacters{ + "[á à ă â å ä ã ā æ c ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū" + " w ÿ]" + } Ellipsis{ final{"{0}…"} initial{"…{0}"} @@ -14,8 +18,8 @@ uz{ ExemplarCharactersIndex{"[A B D E F G H I J K L M N O P Q R S T U V X Y Z {Oʻ} {Gʻ} {Sh} {Ch}]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{ - "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” „ « » ( ) \\[ \\] \\{ \\} § @ " - "* / \\& # ′ ″]" + "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " + "′ ″]" } MoreInformation{"?"} NumberElements{ @@ -225,7 +229,7 @@ uz{ } minimalPairs{ ordinal{ - other{"{0}chi chorraxada oʼngga buriling."} + other{"{0}-chorrahadan o‘ngga buriling"} } plural{ one{"Savatingizda {0}X bor. Uni sotib olasizmi?"} @@ -235,7 +239,6 @@ uz{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/uz_AF.txt b/intl/icu/source/data/locales/uz_AF.txt index 24ca294580df..0e8d20c4cf48 100644 --- a/intl/icu/source/data/locales/uz_AF.txt +++ b/intl/icu/source/data/locales/uz_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_AF{ "%%ALIAS"{"uz_Arab_AF"} } diff --git a/intl/icu/source/data/locales/uz_Arab.txt b/intl/icu/source/data/locales/uz_Arab.txt index 18166f456517..16a4905f657b 100644 --- a/intl/icu/source/data/locales/uz_Arab.txt +++ b/intl/icu/source/data/locales/uz_Arab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Arab{ %%Parent{"root"} AuxExemplarCharacters{"[\u200C\u200D\u200E\u200F ټ ځ څ ډ ړ ږ ښ ګ ڼ ي ۍ ې]"} @@ -29,7 +30,6 @@ uz_Arab{ } native{"arabext"} } - Version{"37"} calendar{ default{"persian"} gregorian{ diff --git a/intl/icu/source/data/locales/uz_Arab_AF.txt b/intl/icu/source/data/locales/uz_Arab_AF.txt index d20ea99d4f86..676d74c01e46 100644 --- a/intl/icu/source/data/locales/uz_Arab_AF.txt +++ b/intl/icu/source/data/locales/uz_Arab_AF.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Arab_AF{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/uz_Cyrl.txt b/intl/icu/source/data/locales/uz_Cyrl.txt index ebe6b91805cd..7766b85ff5c4 100644 --- a/intl/icu/source/data/locales/uz_Cyrl.txt +++ b/intl/icu/source/data/locales/uz_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Cyrl{ %%Parent{"root"} AuxExemplarCharacters{"[ц щ ы ь]"} @@ -165,7 +166,6 @@ uz_Cyrl{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/uz_Cyrl_UZ.txt b/intl/icu/source/data/locales/uz_Cyrl_UZ.txt index 16cb3cb8f973..abfe4b883148 100644 --- a/intl/icu/source/data/locales/uz_Cyrl_UZ.txt +++ b/intl/icu/source/data/locales/uz_Cyrl_UZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Cyrl_UZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/uz_Latn.txt b/intl/icu/source/data/locales/uz_Latn.txt index f6035b73d6e3..1ae52daa8f8c 100644 --- a/intl/icu/source/data/locales/uz_Latn.txt +++ b/intl/icu/source/data/locales/uz_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/uz_Latn_UZ.txt b/intl/icu/source/data/locales/uz_Latn_UZ.txt index efbadf59e5a4..b9b72de2de11 100644 --- a/intl/icu/source/data/locales/uz_Latn_UZ.txt +++ b/intl/icu/source/data/locales/uz_Latn_UZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Latn_UZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/uz_UZ.txt b/intl/icu/source/data/locales/uz_UZ.txt index ffac5329b1b6..3a6a14d8072a 100644 --- a/intl/icu/source/data/locales/uz_UZ.txt +++ b/intl/icu/source/data/locales/uz_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_UZ{ "%%ALIAS"{"uz_Latn_UZ"} } diff --git a/intl/icu/source/data/locales/vai.txt b/intl/icu/source/data/locales/vai.txt index 2151f3d51a30..bd93a94b2e54 100644 --- a/intl/icu/source/data/locales/vai.txt +++ b/intl/icu/source/data/locales/vai.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai{ AuxExemplarCharacters{"[ꘓ ꘔ ꘕ ꘖ ꘗ ꘘ ꘙ ꘚ ꘛ ꘜ ꘝ ꘞ ꘟ]"} ExemplarCharacters{ @@ -28,7 +29,6 @@ vai{ } native{"vaii"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/vai_LR.txt b/intl/icu/source/data/locales/vai_LR.txt index 27d42387f34b..f682350b1193 100644 --- a/intl/icu/source/data/locales/vai_LR.txt +++ b/intl/icu/source/data/locales/vai_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_LR{ "%%ALIAS"{"vai_Vaii_LR"} } diff --git a/intl/icu/source/data/locales/vai_Latn.txt b/intl/icu/source/data/locales/vai_Latn.txt index 8b6f32ee2082..e5a23881ad6c 100644 --- a/intl/icu/source/data/locales/vai_Latn.txt +++ b/intl/icu/source/data/locales/vai_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Latn{ %%Parent{"root"} ExemplarCharacters{ @@ -23,7 +24,6 @@ vai_Latn{ } native{"vaii"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/vai_Latn_LR.txt b/intl/icu/source/data/locales/vai_Latn_LR.txt index bd114e1fdcc4..7f16d028d0e6 100644 --- a/intl/icu/source/data/locales/vai_Latn_LR.txt +++ b/intl/icu/source/data/locales/vai_Latn_LR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Latn_LR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/vai_Vaii.txt b/intl/icu/source/data/locales/vai_Vaii.txt index cffa5917afbb..6dc5e995dac4 100644 --- a/intl/icu/source/data/locales/vai_Vaii.txt +++ b/intl/icu/source/data/locales/vai_Vaii.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Vaii{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/vai_Vaii_LR.txt b/intl/icu/source/data/locales/vai_Vaii_LR.txt index 5d8613b8129c..7d47d5f9e0a7 100644 --- a/intl/icu/source/data/locales/vai_Vaii_LR.txt +++ b/intl/icu/source/data/locales/vai_Vaii_LR.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Vaii_LR{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/vi.txt b/intl/icu/source/data/locales/vi.txt index d39f47a2888b..df55d86dae6d 100644 --- a/intl/icu/source/data/locales/vi.txt +++ b/intl/icu/source/data/locales/vi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi{ ExemplarCharacters{ "[a à ả ã á ạ ă ằ ẳ ẵ ắ ặ â ầ ẩ ẫ ấ ậ b c d đ e è ẻ ẽ é ẹ ê ề ể ễ ế ệ f g h i" @@ -146,6 +147,7 @@ vi{ } } symbols{ + approximatelySign{"~"} decimal{","} exponential{"E"} group{"."} @@ -159,19 +161,8 @@ vi{ superscriptingExponent{"×"} } } - minimalPairs{ - ordinal{ - one{"Rẽ vào lối rẽ thứ nhất bên phải."} - other{"Rẽ vào lối rẽ thứ {0} bên phải."} - } - plural{ - one{"Rẽ vào lối rẽ thứ nhất bên phải."} - other{"Rẽ vào lối rẽ thứ {0} bên phải."} - } - } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -1094,7 +1085,7 @@ vi{ eras{ abbreviated{ "Trước CN", - "sau CN", + "Sau CN", } abbreviated%variant{ "trước CN", @@ -1105,12 +1096,12 @@ vi{ "sau CN", } wide{ - "Trước CN", - "sau CN", + "Trước Thiên Chúa", + "Sau Công Nguyên", } wide%variant{ - "trước CN", - "CN", + "Trước Công Nguyên", + "Công Nguyên", } } intervalFormats{ @@ -1761,7 +1752,10 @@ vi{ day-short{ dn{"Ngày"} relative{ + "-1"{"hôm qua"} "-2"{"Hôm kia"} + "0"{"hôm nay"} + "1"{"ngày mai"} "2"{"Ngày kia"} } relativeTime{ @@ -2482,6 +2476,10 @@ vi{ middle{"{0} {1}"} start{"{0} {1}"} } + unit-short{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + } } measurementSystemNames{ UK{"Hệ Anh"} @@ -2511,7 +2509,7 @@ vi{ number{ lenient{ "[\\-‒⁻₋−➖﹣-]", - "[,،٫、︐︑﹐﹑,、]", + "[,،٫⹁、︐︑﹐﹑,、]", "[+⁺₊➕﬩﹢+]", } } diff --git a/intl/icu/source/data/locales/vi_VN.txt b/intl/icu/source/data/locales/vi_VN.txt index c4865e15faaa..5c8c152e98f2 100644 --- a/intl/icu/source/data/locales/vi_VN.txt +++ b/intl/icu/source/data/locales/vi_VN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi_VN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/vun.txt b/intl/icu/source/data/locales/vun.txt index 5cbecc86d106..288748e49a97 100644 --- a/intl/icu/source/data/locales/vun.txt +++ b/intl/icu/source/data/locales/vun.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vun{ AuxExemplarCharacters{"[q x]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p r s t u v w y z]"} @@ -11,7 +12,6 @@ vun{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/vun_TZ.txt b/intl/icu/source/data/locales/vun_TZ.txt index 54a2611c209a..243af6839d72 100644 --- a/intl/icu/source/data/locales/vun_TZ.txt +++ b/intl/icu/source/data/locales/vun_TZ.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vun_TZ{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/wae.txt b/intl/icu/source/data/locales/wae.txt index 3a38fa371c15..98f967ad394d 100644 --- a/intl/icu/source/data/locales/wae.txt +++ b/intl/icu/source/data/locales/wae.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wae{ AuxExemplarCharacters{"[à ă â å ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ô ø ō œ ß ù ŭ û ū ÿ]"} ExemplarCharacters{ @@ -16,7 +17,6 @@ wae{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/wae_CH.txt b/intl/icu/source/data/locales/wae_CH.txt index 48a7112a8ebe..942969f64f74 100644 --- a/intl/icu/source/data/locales/wae_CH.txt +++ b/intl/icu/source/data/locales/wae_CH.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wae_CH{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/wo.txt b/intl/icu/source/data/locales/wo.txt index 26eabf1631e9..4fd8793a7d02 100644 --- a/intl/icu/source/data/locales/wo.txt +++ b/intl/icu/source/data/locales/wo.txt @@ -1,9 +1,12 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wo{ AuxExemplarCharacters{"[ã h v z]"} ExemplarCharacters{"[a à b c d e é ë f g i j k l m n ñ ŋ o ó p q r s t u w x y]"} 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]"} + ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"} NumberElements{ default{"latn"} latn{ @@ -34,7 +37,6 @@ wo{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -414,12 +416,45 @@ wo{ "0"{"tay"} "1"{"suba"} } + relativeTime{ + future{ + other{"fileek {0} fan"} + } + past{ + other{"{0} fan ci ginaaw"} + } + } } day-narrow{ dn{"fan"} + relativeTime{ + future{ + other{"fileek {0} fan"} + } + past{ + other{"{0} fan ci ginaaw"} + } + } } day-short{ dn{"fan"} + relativeTime{ + future{ + other{"fileek {0} fan"} + } + past{ + other{"{0} fan ci ginaaw"} + } + } + } + dayOfYear{ + dn{"bisu at mi"} + } + dayOfYear-narrow{ + dn{"bisu at"} + } + dayOfYear-short{ + dn{"bisu at"} } dayperiod{ dn{"Sub/Ngo"} @@ -427,75 +462,644 @@ wo{ era{ dn{"jamono"} } + fri{ + relative{ + "-1"{"àjjuma ji weesu"} + "0"{"tay ci àjjuma ji"} + "1"{"àjjuma jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} àjjuma"} + } + past{ + other{"{0} àjjuma ci ginaaw"} + } + } + } + fri-narrow{ + relative{ + "-1"{"àj. ji weesu"} + "0"{"tay ci àj. ji"} + "1"{"àj. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} àj."} + } + past{ + other{"{0} àj. ci ginaaw"} + } + } + } + fri-short{ + relative{ + "-1"{"àjj. ji weesu"} + "0"{"tay ci àjj. ji"} + "1"{"àjj. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} àjj."} + } + past{ + other{"{0} àjj. ci ginaaw"} + } + } + } hour{ - dn{"waxtu"} + dn{"waxt"} + relative{ + "0"{"ci waxtu wii"} + } + relativeTime{ + future{ + other{"fileek {0} waxtu"} + } + past{ + other{"{0} waxtu ci ginaaw"} + } + } } hour-narrow{ dn{"wxt."} + relativeTime{ + future{ + other{"fileek {0} wax."} + } + past{ + other{"{0} wax. ci ginaaw"} + } + } } hour-short{ dn{"wxt."} + relativeTime{ + future{ + other{"fileek {0} wax."} + } + past{ + other{"{0} wax. ci ginaaw"} + } + } } minute{ dn{"simili"} + relative{ + "0"{"ci simili bii"} + } + relativeTime{ + future{ + other{"fileek {0} simili"} + } + past{ + other{"{0} simili ci ginaaw"} + } + } } minute-narrow{ dn{"sim."} + relativeTime{ + future{ + other{"fileek {0} sim."} + } + past{ + other{"{0} sim. ci ginaaw"} + } + } } minute-short{ dn{"sim."} + relativeTime{ + future{ + other{"fileek {0} sim."} + } + past{ + other{"{0} sim. ci ginaaw"} + } + } + } + mon{ + relative{ + "-1"{"altine ji weesu"} + "0"{"tay ci altine ji"} + "1"{"altine jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} altine"} + } + past{ + other{"{0} altine ci ginaaw"} + } + } + } + mon-narrow{ + relative{ + "-1"{"alt. ji weesu"} + "0"{"tay ci alt. ji"} + "1"{"alt. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} alt."} + } + past{ + other{"{0} alt. ci ginaaw"} + } + } + } + mon-short{ + relative{ + "-1"{"alti. ji weesu"} + "0"{"tay ci alti. ji"} + "1"{"alti. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} alti."} + } + past{ + other{"{0} alti. ci ginaaw"} + } + } } month{ dn{"weer"} + relative{ + "-1"{"weer wi weesu"} + "0"{"weer wii"} + "1"{"weer wiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} weer"} + } + past{ + other{"{0} weer ci ginaaw"} + } + } } month-narrow{ dn{"we."} + relative{ + "-1"{"we. wi wees"} + "0"{"we. wii"} + "1"{"we. wiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} we."} + } + past{ + other{"{0} we. ci ginaaw"} + } + } } month-short{ dn{"we."} + relative{ + "-1"{"we. wi wees"} + "0"{"we. wii"} + "1"{"we. wiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} we."} + } + past{ + other{"{0} we. ci ginaaw"} + } + } } quarter{ dn{"ñeenti-weer"} + relative{ + "-1"{"trimestre bi weesu"} + "0"{"trimestre bii"} + "1"{"trimestre biy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} trimestre"} + } + past{ + other{"{0} trimestre ci ginaaw"} + } + } } quarter-narrow{ dn{"ñw."} + relativeTime{ + future{ + other{"fileek {0} trim."} + } + past{ + other{"{0} trim. ci ginaaw"} + } + } } quarter-short{ dn{"ñw."} + relativeTime{ + future{ + other{"fileek {0} trim."} + } + past{ + other{"{0} trim. ci ginaaw"} + } + } + } + sat{ + relative{ + "-1"{"gàwwu ji weesu"} + "0"{"tay ci gàwwu ji"} + "1"{"gàwwu jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} gàwwu"} + } + past{ + other{"{0} gàwwu ci ginaaw"} + } + } + } + sat-narrow{ + relative{ + "-1"{"gà. ji weesu"} + "0"{"tay ci gà. ji"} + "1"{"gà. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} gà."} + } + past{ + other{"{0} gà. ci ginaaw"} + } + } + } + sat-short{ + relative{ + "-1"{"gàw. ji weesu"} + "0"{"tay ci gàw. ji"} + "1"{"gàw. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} gàw."} + } + past{ + other{"{0} gàw. ci ginaaw"} + } + } } second{ dn{"saa"} + relative{ + "0"{"leegi"} + } + relativeTime{ + future{ + other{"fileek {0} saa"} + } + past{ + other{"{0} saa ci ginaaw"} + } + } } second-narrow{ dn{"saa."} + relativeTime{ + future{ + other{"fileek {0} saa"} + } + past{ + other{"{0} saa ci ginaaw"} + } + } } second-short{ dn{"saa."} + relativeTime{ + future{ + other{"fileek {0} saa"} + } + past{ + other{"{0} saa ci ginaaw"} + } + } + } + sun{ + relative{ + "-1"{"dibéer bi weesu"} + "0"{"tay ci dibéer bi"} + "1"{"dibéer biy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} dibéer"} + } + past{ + other{"{0} dibéer ci ginaaw"} + } + } + } + sun-narrow{ + relative{ + "-1"{"dib. bi weesu"} + "0"{"tay ci dib. bi"} + "1"{"dib. biy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} dib."} + } + past{ + other{"{0} dib. ci ginaaw"} + } + } + } + sun-short{ + relative{ + "-1"{"dib. bi weesu"} + "0"{"tay ci dib. bi"} + "1"{"dib. biy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} dib."} + } + past{ + other{"{0} dib. ci ginaaw"} + } + } + } + thu{ + relative{ + "-1"{"alxamis ji weesu"} + "0"{"tay ci alxamis ji"} + "1"{"alxamis jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} alxamis"} + } + past{ + other{"{0} alxamis ci ginaaw"} + } + } + } + thu-narrow{ + relative{ + "-1"{"alx. ji weesu"} + "0"{"tay ci alx. ji"} + "1"{"alx. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} alx."} + } + past{ + other{"{0} alx. ci ginaaw"} + } + } + } + thu-short{ + relative{ + "-1"{"alxa. ji weesu"} + "0"{"tay ci alxa. ji"} + "1"{"alxa. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} alxa."} + } + past{ + other{"{0} alxa. ci ginaaw"} + } + } + } + tue{ + relative{ + "-1"{"talaata ji weesu"} + "0"{"tay ci talaata ji"} + "1"{"talaata jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} talaata"} + } + past{ + other{"{0} talaata ci ginaaw"} + } + } + } + tue-narrow{ + relative{ + "-1"{"ta. ji weesu"} + "0"{"tay ci ta. ji"} + "1"{"ta. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} ta."} + } + past{ + other{"{0} ta. ci ginaaw"} + } + } + } + tue-short{ + relative{ + "-1"{"tal. ji weesu"} + "0"{"tay ci tal. ji"} + "1"{"tal. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} tal."} + } + past{ + other{"{0} tal. ci ginaaw"} + } + } + } + wed{ + relative{ + "-1"{"àllarba ji weesu"} + "0"{"tay ci àllarba ji"} + "1"{"àllarba jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} àllarba"} + } + past{ + other{"{0} àllarba ci ginaaw"} + } + } + } + wed-narrow{ + relative{ + "-1"{"àla. ji weesu"} + "0"{"tay ci àla. ji"} + "1"{"àla. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} àla."} + } + past{ + other{"{0} àla. ci ginaaw"} + } + } + } + wed-short{ + relative{ + "-1"{"àlla. ji weesu"} + "0"{"tay ci àlla. ji"} + "1"{"àlla. jiy ñëw"} + } + relativeTime{ + future{ + other{"fileek {0} àlla."} + } + past{ + other{"{0} àlla. ci ginaaw"} + } + } } week{ dn{"ayu-bis"} + relative{ + "-1"{"ayu-bis bi weesu"} + "0"{"ayu-bis bii"} + "1"{"ayu-bis biy ñëw"} + } + relativePeriod{"ayu-bisu {0}"} + relativeTime{ + future{ + other{"fileek {0} ayi-bis"} + } + past{ + other{"{0} ayi-bis ci ginaaw"} + } + } } week-narrow{ dn{"ayu-b."} + relative{ + "-1"{"ayu-b bi wees"} + "0"{"ayu-b bii"} + "1"{"ayu-b. ñëw"} + } + relativePeriod{"ayu-b. {0}"} + relativeTime{ + future{ + other{"fileek {0} ayi-b."} + } + past{ + other{"{0} ayi-b. ci ginaaw"} + } + } } week-short{ dn{"ayu-b."} + relative{ + "-1"{"ayu-b bi wees"} + "0"{"ayu-b bii"} + "1"{"ayu-b. ñëw"} + } + relativePeriod{"ayu-b. {0}"} + relativeTime{ + future{ + other{"fileek {0} ayi-b."} + } + past{ + other{"{0} ayi-b. ci ginaaw"} + } + } + } + weekOfMonth{ + dn{"ayu-bisu weer"} + } + weekOfMonth-narrow{ + dn{"ayu-b. we."} + } + weekOfMonth-short{ + dn{"ayu-b. we."} } weekday{ dn{"bisu ayu-bis"} } + weekdayOfMonth{ + dn{"bisu ayu-bisu weer wi"} + } + weekdayOfMonth-narrow{ + dn{"bisu ayu-b. weer"} + } + weekdayOfMonth-short{ + dn{"bisu ayu-b. weer"} + } year{ dn{"at"} + relative{ + "-1"{"daaw"} + "0"{"ren"} + "1"{"dewen"} + } + relativeTime{ + future{ + other{"fileek {0} at"} + } + past{ + other{"{0} at ci ginaaw"} + } + } } year-narrow{ dn{"at."} + relative{ + "-1"{"daaw"} + "0"{"ren"} + "1"{"dewen"} + } + relativeTime{ + future{ + other{"fileek {0} at"} + } + past{ + other{"{0} at ci ginaaw"} + } + } } year-short{ dn{"at."} + relative{ + "-1"{"daaw"} + "0"{"ren"} + "1"{"dewen"} + } + relativeTime{ + future{ + other{"fileek {0} at"} + } + past{ + other{"{0} at ci ginaaw"} + } + } } zone{ dn{"goxu waxtu"} } + zone-narrow{ + dn{"gox"} + } + zone-short{ + dn{"goxu"} + } } listPattern{ standard{ diff --git a/intl/icu/source/data/locales/wo_SN.txt b/intl/icu/source/data/locales/wo_SN.txt index e5265ffde70e..e51b9782d882 100644 --- a/intl/icu/source/data/locales/wo_SN.txt +++ b/intl/icu/source/data/locales/wo_SN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wo_SN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/xh.txt b/intl/icu/source/data/locales/xh.txt index 443fb1fe0a52..20ea24f15013 100644 --- a/intl/icu/source/data/locales/xh.txt +++ b/intl/icu/source/data/locales/xh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xh{ 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]"} @@ -20,7 +21,6 @@ xh{ } } } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ diff --git a/intl/icu/source/data/locales/xh_ZA.txt b/intl/icu/source/data/locales/xh_ZA.txt index 14b2845e981b..7c1c4260a0de 100644 --- a/intl/icu/source/data/locales/xh_ZA.txt +++ b/intl/icu/source/data/locales/xh_ZA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xh_ZA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/xog.txt b/intl/icu/source/data/locales/xog.txt index 40389a098524..68a78110f355 100644 --- a/intl/icu/source/data/locales/xog.txt +++ b/intl/icu/source/data/locales/xog.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xog{ 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]"} @@ -10,7 +11,6 @@ xog{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/xog_UG.txt b/intl/icu/source/data/locales/xog_UG.txt index eda268aead5e..5c6d39cf67a1 100644 --- a/intl/icu/source/data/locales/xog_UG.txt +++ b/intl/icu/source/data/locales/xog_UG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xog_UG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/yav.txt b/intl/icu/source/data/locales/yav.txt index 883abc884230..c3b21629c9e7 100644 --- a/intl/icu/source/data/locales/yav.txt +++ b/intl/icu/source/data/locales/yav.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yav{ AuxExemplarCharacters{"[g j q r x z]"} ExemplarCharacters{ @@ -22,7 +23,6 @@ yav{ } } } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/yav_CM.txt b/intl/icu/source/data/locales/yav_CM.txt index 5c080867d917..e7174b5e6780 100644 --- a/intl/icu/source/data/locales/yav_CM.txt +++ b/intl/icu/source/data/locales/yav_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yav_CM{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/yi.txt b/intl/icu/source/data/locales/yi.txt index 02c024950b17..117bf24f6af1 100644 --- a/intl/icu/source/data/locales/yi.txt +++ b/intl/icu/source/data/locales/yi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yi{ AuxExemplarCharacters{"[\u200E\u200F]"} ExemplarCharacters{ @@ -29,7 +30,6 @@ yi{ native{"latn"} traditional{"hebr"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/yi_001.txt b/intl/icu/source/data/locales/yi_001.txt index 9317d460d3b5..3cb8688d4c1a 100644 --- a/intl/icu/source/data/locales/yi_001.txt +++ b/intl/icu/source/data/locales/yi_001.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yi_001{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/yo.txt b/intl/icu/source/data/locales/yo.txt index 169863864950..b5e1d9f463c8 100644 --- a/intl/icu/source/data/locales/yo.txt +++ b/intl/icu/source/data/locales/yo.txt @@ -1,10 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo{ AuxExemplarCharacters{"[c q v x z]"} ExemplarCharacters{ - "[a á à b d e é è ẹ {ẹ\u0301} {ẹ\u0300} f g {gb} h i í ì j k l m n o ó ò ọ {ọ" - "\u0301} {ọ\u0300} p r s ṣ t u ú ù w y]" + "[a á à b d e é è ẹ {ẹ\u0301} {ẹ\u0300} f g {gb} h i í ì j k l m n ń o ó ò ọ " + "{ọ\u0301} {ọ\u0300} p r s ṣ t u ú ù w y]" } ExemplarCharactersIndex{"[A B D E F G H I J K L M N O P R S T U W Y]"} ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) @ * / \\& # † ‡ ′ ″]"} @@ -62,6 +63,7 @@ yo{ } } symbols{ + approximatelySign{"dáàṣì"} decimal{"."} exponential{"E"} group{","} @@ -84,7 +86,6 @@ yo{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -222,15 +223,6 @@ yo{ "Ẹ", "À", } - short{ - "Àìkú", - "Ajé", - "Ìsẹ́gun", - "Ọjọ́rú", - "Ọjọ́bọ", - "Ẹtì", - "Àbámẹ́ta", - } wide{ "Ọjọ́ Àìkú", "Ọjọ́ Ajé", @@ -251,15 +243,6 @@ yo{ "Ẹ", "À", } - short{ - "Àìkú", - "Ajé", - "Ìsẹ́gun", - "Ọjọ́rú", - "Ọjọ́bọ", - "Ẹtì", - "Àbámẹ́ta", - } wide{ "Àìkú", "Ajé", @@ -301,7 +284,7 @@ yo{ "Lehin Kristi", } wide%variant{ - "BCE", + "Sáájú ìgbà mímọ̀", "CE", } } @@ -539,11 +522,26 @@ yo{ "2"{"òtúùnla"} } } + dayOfYear{ + dn{"Ọjọ́ inú ọdún"} + } + dayOfYear-narrow{ + dn{"Ọjọ́ inú ọd."} + } + dayOfYear-short{ + dn{"Ọjọ́ inú ọd."} + } dayperiod{ dn{"Àárọ̀/ọ̀sán"} } era{ - dn{"Ìgbà"} + dn{"sáà"} + } + era-narrow{ + dn{"Sáà"} + } + era-short{ + dn{"sáà"} } hour{ dn{"Wákàtí"} @@ -598,13 +596,32 @@ yo{ "0"{"ọ̀sẹ̀ yìí"} "1"{"ọ́sẹ̀ tó ń bọ̀"} } + relativePeriod{"ọ̀sẹ̀ ti {0}"} } week-short{ - relativePeriod{"ọ̀ṣẹ̀ {0}"} + relativePeriod{"ọ̀sẹ̀ ti {0}"} + } + weekOfMonth{ + dn{"Ọṣẹ̀ inú Oṣù"} } weekday{ dn{"Ọjọ́ tó wà láàárín ọ̀sẹ̀"} } + weekday-narrow{ + dn{"ọjọ́ inú ọṣẹ̀."} + } + weekday-short{ + dn{"ọjọ́ inú ọṣẹ̀."} + } + weekdayOfMonth{ + dn{"ọjọ́ ọṣẹ̀ inú oṣù"} + } + weekdayOfMonth-narrow{ + dn{"ọjọ́ ọṣẹ̀ inú oṣù"} + } + weekdayOfMonth-short{ + dn{"ọjọ́ ọṣẹ̀ inú oṣù"} + } year{ dn{"Ọdún"} relative{ @@ -613,6 +630,13 @@ yo{ "1"{"Àmọ́dún"} } } + year-short{ + relative{ + "-1"{"Ọdún tó kọjá"} + "0"{"Ọdún yìí"} + "1"{"Ọdún tó ńbọ̀"} + } + } zone{ dn{"Agbègbè àkókò"} } diff --git a/intl/icu/source/data/locales/yo_BJ.txt b/intl/icu/source/data/locales/yo_BJ.txt index fb4ecbfafbd1..a20235018130 100644 --- a/intl/icu/source/data/locales/yo_BJ.txt +++ b/intl/icu/source/data/locales/yo_BJ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo_BJ{ ExemplarCharacters{ "[a á à b d e é è ɛ {ɛ\u0301} {ɛ\u0300} f g {gb} h i í ì j k l m n o ó ò ɔ {ɔ" @@ -47,6 +48,9 @@ yo_BJ{ } } } + symbols{ + approximatelySign{"dáàshì"} + } } minimalPairs{ ordinal{ @@ -57,7 +61,6 @@ yo_BJ{ } } } - Version{"37"} calendar{ gregorian{ AmPmMarkers{ @@ -92,15 +95,6 @@ yo_BJ{ "Ɛ", "À", } - short{ - "Àìkú", - "Ajé", - "Ìsɛ́gun", - "Ɔjɔ́rú", - "Ɔjɔ́bɔ", - "Ɛtì", - "Àbámɛ́ta", - } wide{ "Ɔjɔ́ Àìkú", "Ɔjɔ́ Ajé", @@ -121,15 +115,6 @@ yo_BJ{ "Ɛ", "À", } - short{ - "Àìkú", - "Ajé", - "Ìsɛ́gun", - "Ɔjɔ́rú", - "Ɔjɔ́bɔ", - "Ɛtì", - "Àbámɛ́ta", - } wide{ "Àìkú", "Ajé", @@ -157,6 +142,12 @@ yo_BJ{ } } } + eras{ + wide%variant{ + "Sáájú ìgbà mímɔ̀", + "CE", + } + } monthNames{ format{ abbreviated{ @@ -289,6 +280,15 @@ yo_BJ{ "1"{"Ɔ̀la"} } } + dayOfYear{ + dn{"Ɔjɔ́ inú ɔdún"} + } + dayOfYear-narrow{ + dn{"Ɔjɔ́ inú ɔd."} + } + dayOfYear-short{ + dn{"Ɔjɔ́ inú ɔd."} + } dayperiod{ dn{"Àárɔ̀/ɔ̀sán"} } @@ -341,13 +341,32 @@ yo_BJ{ "0"{"ɔ̀sɛ̀ yìí"} "1"{"ɔ́sɛ̀ tó ń bɔ̀"} } + relativePeriod{"ɔ̀sɛ̀ ti {0}"} } week-short{ - relativePeriod{"ɔ̀shɛ̀ {0}"} + relativePeriod{"ɔ̀sɛ̀ ti {0}"} + } + weekOfMonth{ + dn{"Ɔshɛ̀ inú Oshù"} } weekday{ dn{"Ɔjɔ́ tó wà láàárín ɔ̀sɛ̀"} } + weekday-narrow{ + dn{"ɔjɔ́ inú ɔshɛ̀."} + } + weekday-short{ + dn{"ɔjɔ́ inú ɔshɛ̀."} + } + weekdayOfMonth{ + dn{"ɔjɔ́ ɔshɛ̀ inú oshù"} + } + weekdayOfMonth-narrow{ + dn{"ɔjɔ́ ɔshɛ̀ inú oshù"} + } + weekdayOfMonth-short{ + dn{"ɔjɔ́ ɔshɛ̀ inú oshù"} + } year{ dn{"Ɔdún"} relative{ @@ -356,6 +375,13 @@ yo_BJ{ "1"{"Àmɔ́dún"} } } + year-short{ + relative{ + "-1"{"Ɔdún tó kɔjá"} + "0"{"Ɔdún yìí"} + "1"{"Ɔdún tó ńbɔ̀"} + } + } } measurementSystemNames{ UK{"Ilɛ̀ Gɛ̀ɛ́sì"} diff --git a/intl/icu/source/data/locales/yo_NG.txt b/intl/icu/source/data/locales/yo_NG.txt index 59beef1512fd..48eaf8bd210e 100644 --- a/intl/icu/source/data/locales/yo_NG.txt +++ b/intl/icu/source/data/locales/yo_NG.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo_NG{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/yue.txt b/intl/icu/source/data/locales/yue.txt index 4a941b81cfe8..1f6cbcfc0ffe 100644 --- a/intl/icu/source/data/locales/yue.txt +++ b/intl/icu/source/data/locales/yue.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue{ AuxExemplarCharacters{ "[乍 仂 伏 佐 侶 僳 兆 兌 兹 凸 别 券 勳 卑 卞 占 叶 嘅 堤 墎 壤 奥 孜 峇 嶼 巽 栗 楔 涅 渾 澎 灘 燦 狄 琳 瑚 甫 碑" @@ -16,60 +17,67 @@ yue{ ExemplarCharacters{ "[一 丁 七 丈-不 丑 且 世 丘 丙 丟 並 中 串 丸 丹 主 乃 久 么 之 乎 乏 乖 乘 乙 九 也 乾 亂 了 予 事 二 于 云 互 五" " 井 些 亞 亡 交-亦 亨 享 京 亮 人 什 仁 仇 今 介 仍 仔 他 付 仙 代-以 仰 仲 件 任 份 企 伊 伍 伐 休 伙 伯 估 伴 伸" - " 似 伽 但 佈 佉 位-住 佔 何 余 佛 作 你 佩 佳 使 來 例 供 依 侯 侵 便 係-俄 俊 俗 保 俠 信 修 俱 俾 個 倍 們 倒 候" - " 倚 借 倫 值 假 偉 偏 做 停 健 側-偷 傑 備 傢 傣 傲 傳 傷 傻 傾 僅 像 僑 僧 價 儀 億 儒 儘 優 允 元-充 兇-光 克 免" - " 兒 兔 入 內-兩 八-兮 共 兵-典 兼 冊 再 冒 冠 冬 冰 冷 准 凌 凝 凡 凰 凱 出 函 刀 分 切 刊 列 初 判 別 利 刪 到 制" - " 刷 刺 刻 則 剌 前 剛 剩 剪 副 割 創 劃 劇 劉 劍 力 功 加 助-劫 勁 勇 勉 勒 動 務 勝 勞 勢 勤 勵 勸 勿 包 匈 化 北" - " 匹 區 十 千 升 午 半 卒-協 南 博 卜 卡 卯-危 即 卷 卻 厄 厘 厚 原 厭 厲 去 參 又 及 友 反 叔 取 受 口-另 只-叭 可" - " 台 史 右 司 吃 各 合-吊 同-后 吐-吒 君 吝-吠 否 吧 含 吳 吵 吸 吹 吾 呀 呂 呆 告 呢 周 味 呵 呼 命 和 咖 咦 咧 咪" - " 咬 咱 哀 品 哇-哉 哎 員 哥 哦 哩 哪 哭 哲 唉 唐 唔 唬 售 唯 唱 唷 唸 商 啊 問 啟 啡 啥 啦 啪 喀 喂 善 喇 喊 喔 喜" - " 喝 喬 單 喵 嗎 嗚 嗨 嗯 嘆 嘉 嘗 嘛 嘴 嘻 嘿 器 噴 嚇 嚴 囉 四 回 因 困 固 圈 國 圍 園 圓 圖 團 圜 土 在 圭 地 圾" - " 址 均 坎 坐 坡 坤 坦 坪 垂 垃 型 埃 城 埔 域 執 培 基 堂 堅 堆 堡 堪 報 場 塊 塔 塗 塞 填 塵 境 增 墨 墮 壁 壇 壓" - " 壘 壞 壢 士 壬 壯 壽 夏 夕 外 多 夜 夠 夢 夥 大 天-夫 央 失 夷 夸 夾 奇-奉 奎 奏 契 奔 套 奧 奪 奮 女 奴 奶 她 好" - " 如 妙 妝 妥 妨 妮 妳 妹 妻 姆 姊 始 姐 姑 姓 委 姿 威 娃 娘 娛 婁 婆 婚 婦 媒 媽 嫌 嫩 子 孔 字 存 孝 孟 季 孤 孩" - " 孫 學 它 宅 宇-安 宋 完 宏 宗-宜 客-室 宮 害 家 容 宿 寂 寄-密 富 寒 寞 察 寢 實-審 寫 寬 寮 寵 寶 封 射 將 專 尊" - " 尋 對-小 少 尖 尚 尤 就 尺 尼 尾 局 屁 居 屆 屋 屏 展 屠 層 屬 山 岡 岩 岸 峰 島 峽 崇 崙 崴 嵐 嶺 川 州 巡 工-巨" - " 巫 差 己-巴 巷 市 布 希 帕 帖 帛 帝 帥 師 席 帳 帶 常 帽 幅 幕 幣 幫 干-年 幸 幹 幻-幾 庇 床 序 底 店 庚 府 度 座" - " 庫 庭 康 庸 廉 廖 廠 廢 廣 廳 延 廷 建 弄 式 引 弗 弘 弟 弦 弱 張 強 彈 彊 彌 彎 彝 彞 形 彥 彩 彬 彭 彰 影 役 彼" - " 往 征 待 很 律 後 徐-徒 得 從 復 微 徵 德 徹 心 必 忌 忍 志-忙 忠 快 念 忽 怎 怒 怕 怖 思 怡 急 性 怨 怪 恆 恐 恢" - " 恥 恨 恩 恭 息 恰 悅 悉 悔 悟 悠 您 悲 悶 情 惑 惜 惠 惡 惱 想 惹 愁 愈 愉 意 愚 愛 感 慈 態 慕 慘 慢 慣 慧 慮 慰" - " 慶 慾 憂 憐 憑 憲 憶 憾 懂 應 懶 懷 懼 戀 戈 戊 戌 成-戒 或 截 戰 戲 戴 戶 房-扁 扇 手 才 扎 打 托 扣 扥 扭 扯 批" - " 找-技 抄 把 抓 投 抗 折 披 抬 抱 抵 抹 抽 拆 拉 拋 拍 拏 拒 拔 拖 招 拜 括 拳 拼 拾 拿 持 指 按 挑 挖 挪 振 挺 捐" - " 捕 捨 捲 捷 掃 授 掉 掌 排 掛 採 探 接 控 推 措 描 提 插 揚 換 握 揮 援 損 搖 搜 搞 搬 搭 搶 摘 摩 摸 撐 撒 撞 撣" - " 撥 播 撾 撿 擁 擇 擊 擋 操 擎 擔 據 擠 擦 擬 擴 擺 擾 攝 支 收 改 攻 放 政 故 效 敍 敏 救 敗-教 敝 敢 散 敦 敬 整" - " 敵 數 文 斐 斗 料 斯 新 斷 方 於 施 旁 旅 旋 族 旗 既 日 旦 早 旭 旺 昂 昆 昇 昌 明 昏 易 星 映 春 昨 昭 是 時 晉" - " 晒 晚 晨 普 景 晴 晶 智 暑 暖 暗 暫 暴 曆 曉 曰 曲 更 書 曼 曾-最 會 月 有 朋 服 朗 望 朝 期 木 未-札 朱 朵 杉 李" - " 材 村 杜 束 杯-東 松 板 析 林 果 枝 架 柏 某 染 柔 查 柬 柯 柳 柴 校 核 根 格 桃 案 桌 桑 梁 梅 條 梨 梯 械 梵 棄" - " 棉 棋 棒 棚 森 椅 植 椰 楊 楓 楚 業 極 概 榜 榮 構 槍 樂 樓 標 樞 模 樣 樹 橋 機 橫 檀 檔 檢 欄 權 次 欣 欲 欺 欽" - " 款 歉 歌 歐 歡-武 歲 歷 歸 死 殊 殘 段 殺 殼 毀 毅 母 每 毒 比 毛 毫 氏 民 氣 水 永 求 汗 汝 江-污 汪 汶 決 汽 沃" - " 沈 沉 沒 沖 沙 河 油 治 沿 況 泉 泊 法 泡 波 泥 注 泰 泳 洋 洗 洛 洞 洩 洪 洲 活 洽 派 流 浦 浩 浪 浮 海 涇-涉 涯" - " 液 涵 涼 淑 淚 淡 淨 深 混 淺 清 減 渡 測 港 游 湖 湯 源 準 溝 溪 溫 滄 滅 滋 滑 滴 滾 滿 漂 漏 演 漠 漢 漫 漲 漸" - " 潔 潘 潛 潮 澤 澳 激 濃 濟 濤 濫 濱 瀏 灌 灣 火 灰 災 炎 炮 炸 為 烈 烏 烤 無 焦 然 煙 煞 照 煩 熊 熟 熱 燃 燈 燒" - " 營 爆 爐 爛 爪 爬 爭 爵 父 爸 爺 爽 爾 牆-版 牌 牙 牛 牠 牧 物 牲 特 牽 犧 犯 狀 狂 狐 狗 狠 狼 猛 猜 猴 猶 獄 獅" - " 獎 獨 獲 獸 獻 玄 率 玉 王 玩 玫 玲 玻 珊 珍 珠 珥 班 現 球 理 琉 琪 琴 瑙 瑜 瑞 瑟 瑤 瑪 瑰 環 瓜 瓦 瓶 甘 甚 甜" - " 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 疏 疑 疼 病 痕 痛 痴 瘋 療 癡 癸 登-百 的 皆 皇 皮 盃 益 盛 盜 盟" - " 盡 監 盤 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睛 睡 督 瞧 瞭 矛 矣 知 短 石 砂 砍 研 砲 破 硬 碎 碗 碟 碧 碩" - " 碰 確 碼 磁 磨 磯 礎 礙 示 社 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 秀 私 秋 科 秒 秘 租 秤 秦 移 稅 程 稍 種" - " 稱 稿 穆 穌 積 穩 究 穹 空 穿 突 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 简 算 管 箭 箱" - " 節 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組" - " 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕" - " 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職" - " 聽 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 舍" - " 舒 舞 舟 航 般 船 艦 良 色 艾 芝 芬 花 芳 若 苦 英 茅 茫 茲 茶 草 荒 荷 荼 莉 莊 莎 莫 菜 菩 華 菲 萄 萊 萬 落 葉" - " 著 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 藍 藏 藝 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛇 蛋 蛙 蜂 蜜 蝶 融" - " 螢 蟲 蟹 蠍 蠻 血 行 術 街 衛 衝 衡 衣 表 袋 被 裁 裂 裕 補 裝 裡 製 複 褲 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸" - " 言 訂 計 訊 討 訓 託 記 訥 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒" - " 論 諸 諺 諾 謀 謂 講 謝 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豐 象 豪 豬 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買" - " 費 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 距 跟 跡 路" - " 跳 踏 踢 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫" - " 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選" - " 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 酉 配 酒 酷 酸 醉 醒 醜 醫 采 釋-量 金 針 釣 鈴 鉢 銀 銅" - " 銖 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 鍋 鍵 鍾 鎊 鎖 鎮 鏡 鐘 鐵 鑑 長 門 閃 閉 開 閏 閒 間 閣 閱 闆 闊 闍 闐 關 闡 防" - " 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雉 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷" - " 電 需 震 霍 霧 露 霸 霹 靂 靈 青 靖 靜 非 靠 面 革 靼 鞋 韃 韋 韓 音 韻 響 頁 頂 項 順 須 預 頑 頓 頗 領 頞 頭 頻" - " 顆 題 額 顏 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 餐 餘 館 首 香 馬 駐 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆" - " 鬥 鬧 鬱 鬼 魁 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 鵝 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 龍 龜" - "]" + " 似 伽 但 佈 佉 位-住 佔 何 余 佛 作 你 佩 佳 使 來 例 供 依 侯 侵 便 係-俄 俊 俏 俗 保 俠 信 修 俱 俾 倉 個 倍 們" + " 倒 候 倚 借 倫 值 假 偉 偏 做 停 健 側-偷 偽 傅 傑 傘 備 傢 傣 傲 傳 傷 傻 傾 僅 像 僑 僧 價 儀 億 儒 儘 優 允 元" + "-充 兇-光 克 免 兒 兔 入 內-兩 八-兮 共 兵-典 兼 冊 再 冒 冠 冬 冰 冷 准 凋-凍 凝 凡 凰 凱 出 函 刀 分 切 刊 列 初" + " 判 別 刨-刪 刮 到 制 刷 刺 刻 剃 則 剌 前 剛 剩 剪 副 割 創 劃 劇 劉 劍 力 功 加 助-劫 勁 勇 勉 勒 動 務 勝 勞 勢" + " 勤 勵 勸 勾 勿 包 匈 化 北 匯 匹 區 十 千 升 午 半 卒-協 南 博 卜 卡 卯-危 即 卷 卹 卻 厄 厘 厚 原 厭 厲 去 參 又" + " 及 友 反 叔 取 受 口-另 只-叭 可 台 史 右 司 吃 各 合-吊 同-后 吐-吒 君 吝-吠 否 吧 含 吳 吵 吸 吹 吾 呀 呂 呆 告" + " 呢 周 味 呵 呼 命 和 咖 咦 咧 咪 咬 咱 哀 品 哇-哉 哎 員 哥 哦 哩 哪 哭 哲 唇 唉 唐 唔 唬 售 唯 唱 唵 唷 唸 商 啊" + " 問 啟 啡 啤-啦 啪 喀 喂 善 喇 喊 喔 喜 喝 喪 喬 單 喲 喵 嗎 嗚 嗨 嗯 嘆 嘉 嘗 嘛 嘴 嘻 嘿 噁 噓 器 噴 嚇 嚏 嚴 囉" + " 四 回 因 困 固 圈 國 圍 園 圓 圖 團 圜 土 在 圭 地 圾 址 均 坎 坐 坑 坡 坤 坦 坪 垂 垃 型 埃 城 埔 域 執 培 基 堂" + " 堅 堆 堡 堪 報 場 塊 塔 塗 塞 填 塵 境 墅 墓 增 墟 墨 墮 墳 壁 壇 壓 壘 壞 壢 壩 士 壬 壯 壺 壽 夏 夕 外 多 夜 夠" + " 夢 夥 大 天-夫 央 失 夷 夸 夾 奇-奉 奎 奏 契 奔 套 奧 奪 奮 女 奴 奶 她 好 如 妙 妝 妥 妨 妮 妳 妹 妻 姆 姊 始 姐" + " 姑 姓 委 姿 威 娃 娘 娛 婁 婆 婚 婦 媒 媽 嫌 嫩 子 孔 孕 字 存 孝 孟 季 孤 孩 孫 孵 學 它 宅 宇-安 宋 完 宏 宗-宜" + " 客-室 宮 害 家 容 宿 寂 寄-密 富 寒 寞 察 寢 實-審 寫 寬 寮 寵 寶 寺 封 射 將 專 尊 尋 對-小 少 尖 尚 尤 就 尺 尼" + " 尾-屁 居 屆 屋 屍 屏 屑 展 屠 層 屬 山 岡 岩 岸 峰 島 峽 崇 崙 崴 嵐 嶺 川 州 巡 工-巨 巫 差 己-巴 巷 市 布 希 帕" + " 帖 帚 帛 帝 帥 師 席 帳 帶 常 帽 幅 幕 幟 幣 幫 干-年 幸 幹 幻-幾 庇 床 序 底 店 庚 府 度 座 庫 庭 康 庸 廈 廉 廖" + " 廟 廠 廢 廣 廳 延 廷 建 弄 式 引 弗 弘 弟 弦 弱 張 強 彈 彊 彌 彎 彝 彞 形 彥 彩 彬 彭 彰 影 役 彼 往 征 待 很 律" + " 後 徐-徒 得 從 復 微 徵 德 徹 心 必 忌 忍 志-忙 忠 忡 快 念 忽 怎 怒 怕 怖 思 怡 急 性 怨 怪 恆 恐 恢 恥 恨 恩 恭" + " 息 恰 悅 悉 悔 悟 悠 您 悲 悶 情 惑 惜 惠 惡 惱 想 惹 愁 愈 愉 意 愚 愛 感 慈 態 慕 慘 慢 慣 慧 慮 慰 慶 慾 憂 憊" + " 憐 憑 憲 憶 憾 懂 應 懨 懶 懷 懼 戀 戈 戊 戌 成-戒 或 截 戰 戲 戴 戶 房-扁 扇 手 才 扎 打 托 扣 扥 扭-扯 批 找-技" + " 抄 把 抓 投 抗 折 披 抬 抱 抵 抹 抽 拆 拉 拋 拍 拏 拒 拔 拖 招 拜 括 拳 拼 拾 拿 持 指 按 挑 挖 挪 振 挺 捏 捐 捕" + " 捧 捨 捲 捷 掃 授 掉 掌 排 掛 掠-探 接 控 推 措 掰 描 提 插 揚 換 握 揮 援 揹 損 搏 搖 搜 搞 搬 搭 搶 摀 摘 摩 摸" + " 撐 撒 撕 撞 撣 撥 播 撲 撾 撿 擁 擇 擊 擋 操 擎 擔 據 擠 擦 擬 擴 擺 擾 攀 攝 攤 支 收 改 攻 放 政 故 效 敍 敏 救" + " 敗-教 敝 敞 敢 散 敦 敬 整 敵 數 文 斐 斑 斗 料 斜 斧 斯 新 斷 方 於 施 旁 旅 旋 族 旗 既 日 旦 早 旭 旺 昂 昆 昇" + " 昌 明 昏 易 星 映 春 昨 昭 是 時 晉 晒 晚 晨 普 景 晴 晶 智 暑 暖 暗 暫 暮 暴 曆 曇 曉 曬 曰 曲-更 書 曼 曾-最 會" + " 月 有 朋 服 朔 朗 望 朝 期 木 未-札 朱 朵 杉 李 材 村 杖 杜 束 杯-東 松 板 析 林 果 枝 枯 架 柏 某 染 柔 查 柬 柯" + " 柳 柴 栓 校 核 根 格 栽 桃 案 桌 桑 梁 梅 條 梨 梯 械 梵 棄 棉 棋 棍 棒 棕 棚 森 棺 椅 植 椒 椰 楊 楓 楚 業 極 概" + " 榜 榮 構-槍 樂 樓 標 樞 模 樣 樹 橄 橇 橋 橘 橙 機 橫 檀 檔 檢 檬 檸 櫚 櫻 欄 權 欖 欠 次 欣 欲 欺 欽 款 歉 歌 歐" + " 歡-武 歲 歷 歸 死 殊 残 殘 殭 段 殺 殼 毀 毅 母 每 毒 比 毛 毫 氏 民 氣 水 永 汁 求 汗 汝 江-污 汪 汶 決 汽 沃 沈" + " 沉 沒 沖 沙 沫 沮 河 油 治 沿 況 泉 泊 法 泡-泣 泥 注 泰 泳 洋 洗 洛 洞 洩 洪 洲 活 洽 派 流 浣 浦 浩 浪 浮 浴 海" + " 涇-涉 涎 涮 涯 液 涵 涼 淇 淋 淑 淚 淡 淨 深 混 淺 清 減 渡 測 港 游 湖 湘 湯 源 準 溜 溝 溪 溫 滄 滅 滋 滑 滴 滾" + " 滿 漂 漏 演 漠 漢 漫 漲 漸 漿 潔 潘 潛 潮 澡 澤 澳 激 濃 濕 濟 濤 濫 濱 瀏 灌 灣 火 灰 災 炎 炮 炸 為 烈 烏 烘 烤" + " 烹 焊 焙 無 焦 焰 然 煙 煞 照 煩 煮 熊 熟 熱 燃 燈 燒 燙 營 爆 爍 爐 爛 爪 爬 爭 爵 父 爸 爺 爽 爾 牆-版 牌 牙 牛" + " 牠 牧 物 牲 特 牽 犀 犧 犬 犯 狀 狂 狐 狗 狠 狡 狸 狼 猛 猜 猩 猴 猶 猾 猿 獄 獅 獎 獨 獲 獸 獺 獻 獾 玄 率 玉 王" + " 玩 玫 玲 玻 珊 珍 珠 珥 班 現 球 理 琉 琪 琴 瑙 瑜 瑞 瑟 瑤 瑪 瑰 環 瓜 瓢 瓦 瓶 甕 甘 甚 甜 生 產 用 田-申 男 甸" + " 界 留 畢 略 番 畫 異 當 疆 疏 疑 疲 疼 疾 病 痕 痛 痴 瘋 瘦 瘧 療 癡 癸 登-百 皂 的 皆 皇 皮 皿 盃 盆 盈 益 盔 盛" + " 盜 盟 盡 監-盥 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睏 睛 睡 督 瞇 瞌 瞧 瞪 瞭 矛 矣 知 短 石 砂 砍 研 砲 破" + " 硬 碎 碗 碟 碧 碩 碰 確 碼 磁 磚 磨 磯 礎 礙 礫 示 社 祈 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 禱 禿-私 秋 科" + " 秒 秘 租 秤 秦 移 稅 程 稍 種 稱 稻 稿 穀 穆 穌 積 穩 究 穹 空 穿 突 窄 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 竿 笑" + " 笛 符 笨 第 筆 等 筋 答 策 筷 简 箏 箔 算 管 箭 箱 節 範 篇 築 篷 簡 簫 簽 簿 籃 籌 籍 籠 籤 米 粉 粗 粵 精 糊 糕" + " 糖 糟 糥 系 糾 紀 約 紅 紉 納 紐 純 紙-紛 素 索 紫 紮-細 紳 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 綽 綿 緊" + " 緒 線 緣 編 緩 緬 緯 練 縛 縣 縫 縮 縱 總 績 繁 繃 繆 織 繞 繡 繩 繪 繳 繼 續 纖 缸 缺 罈 罐 罕 罩 罪 置 罰 署 罵" + " 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 聾 肉 肌 肚" + " 股 肥 肩 肯 育 肺 背 胎 胖 胞 胡 胸 能 脆 脈 脖 脫 腐 腓 腔 腦 腰 腳 腹 腿 膚 膠 膽 臂 臉 臘 臟 臣 臥 臨 自 臭 至" + " 致 臺 與-舊 舌 舍 舒 舞 舟 航 般 船 艦 良 色 艾 芙 芝 芬 芭 花 芳 芽 苣 若 苦 英 茄 茅 茫 茲 茵 茶 茸 草 荒 荷 荼" + " 莉 莊 莎 莓 莖 莫 菇 菌 菜 菩 華 菲 萄 萊 萎 萬 萵 落 葉 著 葛 葡 葵 蒂 蒙 蒜 蒲 蒸 蒼 蓄 蓉 蓋 蓮 蔔 蔕 蔡 蔣 蔥" + " 蔬 蕉 蕭 蕾 薄 薑 薦 薩 薪 薯 藉 藍 藏 藝 藤 藥 蘆 蘇 蘋 蘑 蘭 蘿 虎 處 虛 號 虧 蚊 蚓 蚯 蛇 蛋 蛙 蜂 蜜 蜥 蜴 蝙" + " 蝟 蝠 蝦 蝶 螂 螃 融 螞 螢 螺 蟀 蟄 蟋 蟑 蟲 蟳 蟹 蟻 蠅 蠍 蠕 蠣 蠻 血 行 術 街 衛 衝 衡 衣 表 衫 袋 袍 被 裁 裂" + " 裏 裕 補 裝 裡 裱 裹 製 複 褐 褲 襪 襯 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訝 訥 訪 設" + " 許 訴 診-証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 謎 講 謝 證 識" + " 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豎 豐 豔 象 豪 豬 豹 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜" + " 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 贛 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跆 跌 跎 跑 距 跟 跡 跪 路 跳 踏 踢 踩" + " 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 軸 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轎 轟 辛 辜 辣 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪" + " 迫 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷" + " 選 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄙 鄭 鄰 酉 配 酒 酪 酷 酸 醉 醒 醜 醫 醬 采 釋-量 金 針 釣" + " 鈴 鉅 鉢 鉤 銀 銅 銖 銘 銳 銷 鋁 鋒 鋼 錄 錢 錦 錨 錫 錯 錶 鍊 鍋 鍵 鍾 鎊 鎖 鎮 鏈 鏡 鏢 鐘 鐡 鐵 鑑 鑿 長 門 閃" + " 閉 開 閏 閒 間 閣 閩 閱 闆 闊 闍 闐 關 闡 阱 防 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險" + " 隱 隻 雄-集 雉 雌 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 霍 霜 霧 露 霸 霹 靂 靈 青 靖 静 靜 非 靠 面 革 靴 靼" + " 鞋 鞭 韃 韋 韓 音 韻 響 頁 頂 項 順 須 頌 預 頑 頓 頗 領 頞 頭 頸 頻 顆 題 額 顏 願 顛 類 顧 顯 風 颱 飄 飆 飛 食" + " 飪 飯 飲 飽 飾 餃 餅 養 餌 餐 餘 餚 館 餾 首 香 馬 駐 駕 駛 駝 駱 騎 騙 騷 驅 驕 驗 驚 骨 體 高 髮 鬆 鬍 鬥 鬧 鬱" + " 鬼 魁 魂 魅 魔 魚 魯 魷 鮑 鮮 鯊 鯨 鱷 鳥 鳩 鳳 鳴 鴨 鴻 鵝 鵡 鶴 鷹 鸚 鹽 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 黛 點 黨" + " 鼓 鼠 鼬 鼻 齊 齋 齒 齡 龍 龐 龜]" } ExemplarCharactersIndex{"[一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳]"} ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]"} @@ -262,7 +270,6 @@ yue{ native{"hanidec"} traditional{"hant"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/yue_CN.txt b/intl/icu/source/data/locales/yue_CN.txt index 26d4356a9eeb..2a3cc8af71ba 100644 --- a/intl/icu/source/data/locales/yue_CN.txt +++ b/intl/icu/source/data/locales/yue_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_CN{ "%%ALIAS"{"yue_Hans_CN"} } diff --git a/intl/icu/source/data/locales/yue_HK.txt b/intl/icu/source/data/locales/yue_HK.txt index 29a7459ef3d9..7bce3c57365e 100644 --- a/intl/icu/source/data/locales/yue_HK.txt +++ b/intl/icu/source/data/locales/yue_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_HK{ "%%ALIAS"{"yue_Hant_HK"} } diff --git a/intl/icu/source/data/locales/yue_Hans.txt b/intl/icu/source/data/locales/yue_Hans.txt index b519b0ab03f0..b98ec1e67e12 100644 --- a/intl/icu/source/data/locales/yue_Hans.txt +++ b/intl/icu/source/data/locales/yue_Hans.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans{ %%Parent{"root"} AuxExemplarCharacters{ @@ -260,7 +261,6 @@ yue_Hans{ native{"hanidec"} traditional{"hans"} } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/yue_Hans_CN.txt b/intl/icu/source/data/locales/yue_Hans_CN.txt index 05356bc34c1d..6b6a2151af65 100644 --- a/intl/icu/source/data/locales/yue_Hans_CN.txt +++ b/intl/icu/source/data/locales/yue_Hans_CN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans_CN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/yue_Hant.txt b/intl/icu/source/data/locales/yue_Hant.txt index 8f398126c061..f1fb01c3f546 100644 --- a/intl/icu/source/data/locales/yue_Hant.txt +++ b/intl/icu/source/data/locales/yue_Hant.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hant{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/yue_Hant_HK.txt b/intl/icu/source/data/locales/yue_Hant_HK.txt index b49f94b54f91..bd5e48e75b8b 100644 --- a/intl/icu/source/data/locales/yue_Hant_HK.txt +++ b/intl/icu/source/data/locales/yue_Hant_HK.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hant_HK{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/zgh.txt b/intl/icu/source/data/locales/zgh.txt index ec0e3f85ca50..54907916ade1 100644 --- a/intl/icu/source/data/locales/zgh.txt +++ b/intl/icu/source/data/locales/zgh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zgh{ ExemplarCharacters{"[ⴰ ⴱ ⴳ {ⴳⵯ} ⴷ ⴹ ⴻ ⴼ ⴽ {ⴽⵯ} ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ]"} ExemplarCharactersIndex{"[ⴰ ⴱ ⴳ ⴷ ⴹ ⴻ ⴼ ⴽ ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ]"} @@ -32,7 +33,6 @@ zgh{ } minimumGroupingDigits{"1"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ diff --git a/intl/icu/source/data/locales/zgh_MA.txt b/intl/icu/source/data/locales/zgh_MA.txt index f8dc2cf57423..ba84989502af 100644 --- a/intl/icu/source/data/locales/zgh_MA.txt +++ b/intl/icu/source/data/locales/zgh_MA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zgh_MA{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/zh.txt b/intl/icu/source/data/locales/zh.txt index 0cc5d8b30f39..d81eecc8109b 100644 --- a/intl/icu/source/data/locales/zh.txt +++ b/intl/icu/source/data/locales/zh.txt @@ -1,12 +1,21 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ AuxExemplarCharacters{ - "[乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴" - " 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚" - " 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔" - " 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉" - " 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽]" + "[乒 乓 乳 仂 仓 伞 伪 侣 傈 傣 僳 僵 冥 冻 净 凉 凸 刨 刮 剃 剽 劈 勺 匕 匠 匮 卑 卜 卞 卦 厕 厘 厦 厨 叮 吕 吴 呕" + " 呣 咒 哨 哺 唇 啤 啮 喱 嗅 嘘 嘟 噘 噜 噢 嚏 坏 坝 垫 堤 堵 墅 墓 墙 墟 壳 壶 奎 奸 妆 姜 娥 婴 媚 孪 宅 宠 宫 寺" + " 尬 尴 尸 屈 屎 屑 屡 履 屿 岩 巽 巾 帆 帚 帜 帧 庇 庵 弓 彗 御 徽 怜 恒 恤 恳 悬 悯 惊 惫 愤 戟 扔 扰 扳 抖 抛 拄" + " 拇 拐 挂 挎 捂 捏 掘 掠 揭 搏 携 摇 撅 撕 撤 攀 敞 斑 斧 昙 晕 朔 杆 杖 杠 枯 柄 柑 柜 柠 柩 柱 柿 栓 栗 栽 桔 桶" + " 梨 棍 棕 棺 椒 楔 楠 榄 榈 槌 槟 槿 横 橄 橇 橘 橙 橡 檬 汁 沐 沫 泪 泵 洁 洒 浆 浣 涂 涌 涎 涕 涩 淇 渗 湘 滕 滚" + " 滩 澡 灾 炽 烘 烙 烛 烟 烹 焊 焙 焰 煎 熏 燥 犀 犄 犬 犸 狡 狸 猎 猕 猩 猫 猬 猾 猿 獭 獾 瑚 瓢 瓮 甫 畜 疟 皂 皱" + " 皿 盆 盐 盔 盗 盥 盲 眨 眩 眯 睿 瞌 瞒 瞪 矿 砖 砸 碑 祈 祭 祷 禄 禽 秃 稻 稽 窃 窄 窥 竖 竿 笆 笺 笼 筐 筒 筝 筷" + " 箸 篓 篱 篷 粑 粟 粥 粮 粽 絮 纠 纫 纬 纱 纹 绒 绣 绳 绷 缄 缆 缎 缝 罩 羹 翱 耸 聋 肌 肢 肺 脏 脚 腋 腕 腮 膀 膏" + " 舔 舵 艇 艮 艳 芙 芽 苜 苞 苣 苹 茄 莓 莴 菇 菌 菠 菱 萎 萝 葩 葫 葬 葱 葵 蒜 蒲 蒸 蓄 蓿 蔬 蔽 蕉 蕾 薯 蘑 蚂 蚊" + " 蚓 蚝 蚯 蛆 蛎 蛐 蛛 蛰 蛾 蜗 蜘 蜡 蜥 蜴 蝇 蝎 蝙 蝠 蝴 螂 螃 螺 蟀 蟋 蟑 蠕 衫 衬 袜 裙 裹 褂 讶 讽 诊 诱 谍 谎" + " 谚 谬 豚 豹 账 贷 赣 趾 跆 跛 跤 跨 跪 踪 蹄 蹈 蹦 蹬 躬 躺 轴 轿 辐 辣 迹 郁 鄙 酢 酥 酪 酱 醺 钉 钞 钥 钩 钮 钯" + " 钳 铂 铅 铛 铰 锄 锑 锚 锤 锯 镐 镑 镖 闺 闽 阱 隧 雀 雌 雕 霜 霾 靴 靶 鞠 颈 颜 颠 颤 飓 饪 饵 饺 馍 馏 驰 驼 骂" + " 骄 骆 骰 骷 骼 髅 髦 鬈 魁 鱿 鲤 鲨 鲸 鳄 鸢 鸵 鸽 鹉 鹦 黏 黛 鼬 龇]" } Ellipsis{ final{"{0}…"} @@ -705,7 +714,6 @@ zh{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -808,13 +816,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah时至ah时"} - h{"vah时至h时"} + a{"v ah时至ah时"} + h{"v ah时至h时"} } y{ y{"Gy–y年"} @@ -1074,11 +1082,11 @@ zh{ m{"HH:mm至HH:mm"} } Hmv{ - H{"HH:mm至HH:mm v"} - m{"HH:mm至HH:mm v"} + H{"v HH:mm至HH:mm"} + m{"v HH:mm至HH:mm"} } Hv{ - H{"HH–HH v"} + H{"v HH–HH"} } M{ M{"L至L"} @@ -1116,13 +1124,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah至ah时"} - h{"vah至h时"} + a{"v ah至ah时"} + h{"v ah至h时"} } y{ y{"rU至rU"} @@ -1838,6 +1846,44 @@ zh{ h{"Bh:mm至h:mm"} m{"Bh:mm至h:mm"} } + Gy{ + G{"Gy年 – Gy年"} + y{"Gy年–y年"} + } + GyM{ + G{"GGGGGy-MM – GGGGGy-MM"} + M{"GGGGGy-MM – y-MM"} + y{"GGGGGy-MM – y-MM"} + } + GyMEd{ + G{"GGGGGy-MM-ddE – GGGGGy-MM-ddE"} + M{"GGGGGy-MM-ddE – y-MM-ddE"} + d{"GGGGGy-MM-ddE – y-MM-ddE"} + y{"GGGGGy-MM-ddE – y-MM-ddE"} + } + GyMMM{ + G{"Gy年MMM – Gy年MMM"} + M{"Gy年MMM–MMM"} + y{"Gy年MMM – y年MMM"} + } + GyMMMEd{ + G{"Gy年MMMd日E – Gy年MMMd日E"} + M{"Gy年MMMd日E – MMMd日E"} + d{"Gy年MMMd日E – MMMd日E"} + y{"Gy年MMMd日E – y年MMMd日E"} + } + GyMMMd{ + G{"Gy年MMMd日 – Gy年MMMd日"} + M{"Gy年MMMd日 – MMMd日"} + d{"Gy年MMMd日–d日"} + y{"Gy年MMMd日 – y年MMMd日"} + } + GyMd{ + G{"GGGGGy-MM-dd – GGGGGy-MM-dd"} + M{"GGGGGy-MM-dd – y-MM-dd"} + d{"GGGGGy-MM-dd – y-MM-dd"} + y{"GGGGGy-MM-dd – y-MM-dd"} + } Hmv{ H{"v HH:mm – HH:mm"} m{"v HH:mm – HH:mm"} @@ -1878,13 +1924,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah时至ah时"} - h{"vah时至h时"} + a{"v ah时至ah时"} + h{"v ah时至h时"} } y{ y{"Gy–y年"} @@ -1945,10 +1991,10 @@ zh{ "y年M月d日", "y年M月d日", "y/M/d", + "{1}{0}", + "{1}{0}", "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}{0}", "{1} {0}", } appendItems{ @@ -2176,6 +2222,44 @@ zh{ h{"Bh:mm至h:mm"} m{"Bh:mm至h:mm"} } + Gy{ + G{"Gy年 – Gy年"} + y{"Gy年–y年"} + } + GyM{ + G{"GGGGGy-MM – GGGGGy-MM"} + M{"GGGGGy-MM – y-MM"} + y{"GGGGGy-MM – y-MM"} + } + GyMEd{ + G{"GGGGGy-MM-ddE – GGGGGy-MM-ddE"} + M{"GGGGGy-MM-ddE – y-MM-ddE"} + d{"GGGGGy-MM-ddE – y-MM-ddE"} + y{"GGGGGy-MM-ddE – y-MM-ddE"} + } + GyMMM{ + G{"Gy年MMM – Gy年MMM"} + M{"Gy年MMM–MMM"} + y{"Gy年MMM – y年MMM"} + } + GyMMMEd{ + G{"Gy年MMMd日E – Gy年MMMd日E"} + M{"Gy年MMMd日E – MMMd日E"} + d{"Gy年MMMd日E – MMMd日E"} + y{"Gy年MMMd日E – y年MMMd日E"} + } + GyMMMd{ + G{"Gy年MMMd日 – Gy年MMMd日"} + M{"Gy年MMMd日 – MMMd日"} + d{"Gy年MMMd–d日"} + y{"Gy年MMMd日 – y年MMMd日"} + } + GyMd{ + G{"GGGGGy-MM-dd – GGGGGy-MM-dd"} + M{"GGGGGy-MM-dd – y-MM-dd"} + d{"GGGGGy-MM-dd – y-MM-dd"} + y{"GGGGGy-MM-dd – y-MM-dd"} + } H{ H{"HH–HH"} } @@ -2226,13 +2310,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah时至ah时"} - h{"vah时至h时"} + a{"v ah时至ah时"} + h{"v ah时至h时"} } y{ y{"y–y年"} @@ -2504,13 +2588,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah时至ah时"} - h{"vah时至h时"} + a{"v ah时至ah时"} + h{"v ah时至h时"} } y{ y{"Gy–y年"} @@ -2736,13 +2820,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah时至ah时"} - h{"vah时至h时"} + a{"v ah时至ah时"} + h{"v ah时至h时"} } y{ y{"Gy–y年"} @@ -2974,7 +3058,7 @@ zh{ "Gy年M月d日EEEE", "Gy年M月d日", "Gy年M月d日", - "Gyy-MM-dd", + "Gy-MM-dd", "{1} {0}", "{1} {0}", "{1} {0}", @@ -3846,7 +3930,7 @@ zh{ "Gy年M月d日EEEE", "Gy年M月d日", "Gy年M月d日", - "Gyy/M/d", + "Gy/M/d", "{1} {0}", "{1} {0}", "{1} {0}", @@ -3943,13 +4027,13 @@ zh{ m{"ah:mm至h:mm"} } hmv{ - a{"vah:mm至ah:mm"} - h{"vah:mm至h:mm"} - m{"vah:mm至h:mm"} + a{"v ah:mm至ah:mm"} + h{"v ah:mm至h:mm"} + m{"v ah:mm至h:mm"} } hv{ - a{"vah时至ah时"} - h{"vah时至h时"} + a{"v ah时至ah时"} + h{"v ah时至h时"} } y{ y{"Gy–y年"} @@ -4031,7 +4115,7 @@ zh{ ideographic_desc_characters{"表意文字描述符"} japanese_kana{"日语假名"} kanbun{"汉文训读"} - kanji{"日文汉字"} + kanji{"日语汉字"} keycap{"按键"} leftwards_arrows{"向左箭头"} leftwards_rightwards_arrows{"左右箭头"} diff --git a/intl/icu/source/data/locales/zh_CN.txt b/intl/icu/source/data/locales/zh_CN.txt index c9151613a23b..0136d26fa140 100644 --- a/intl/icu/source/data/locales/zh_CN.txt +++ b/intl/icu/source/data/locales/zh_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_CN{ "%%ALIAS"{"zh_Hans_CN"} } diff --git a/intl/icu/source/data/locales/zh_HK.txt b/intl/icu/source/data/locales/zh_HK.txt index fe72a0ea43cd..c34c98fdd21b 100644 --- a/intl/icu/source/data/locales/zh_HK.txt +++ b/intl/icu/source/data/locales/zh_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_HK{ "%%ALIAS"{"zh_Hant_HK"} } diff --git a/intl/icu/source/data/locales/zh_Hans.txt b/intl/icu/source/data/locales/zh_Hans.txt index 72c418ec6990..58a5386534ef 100644 --- a/intl/icu/source/data/locales/zh_Hans.txt +++ b/intl/icu/source/data/locales/zh_Hans.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/zh_Hans_CN.txt b/intl/icu/source/data/locales/zh_Hans_CN.txt index b5b3a4e1ab54..0cbe0f08af98 100644 --- a/intl/icu/source/data/locales/zh_Hans_CN.txt +++ b/intl/icu/source/data/locales/zh_Hans_CN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_CN{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/zh_Hans_HK.txt b/intl/icu/source/data/locales/zh_Hans_HK.txt index 6b1a2993c463..c5fb37eee882 100644 --- a/intl/icu/source/data/locales/zh_Hans_HK.txt +++ b/intl/icu/source/data/locales/zh_Hans_HK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_HK{ - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -116,10 +116,10 @@ zh_Hans_HK{ "y年M月d日", "y年M月d日", "d/M/yy", + "{1}{0}", + "{1}{0}", "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}{0}", "{1} {0}", } availableFormats{ diff --git a/intl/icu/source/data/locales/zh_Hans_MO.txt b/intl/icu/source/data/locales/zh_Hans_MO.txt index 0bdf7a985292..8f5185a77b0b 100644 --- a/intl/icu/source/data/locales/zh_Hans_MO.txt +++ b/intl/icu/source/data/locales/zh_Hans_MO.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_MO{ - Version{"37"} calendar{ chinese{ DateTimePatterns{ @@ -101,10 +101,10 @@ zh_Hans_MO{ "y年M月d日", "y年M月d日", "d/M/yy", + "{1}{0}", + "{1}{0}", "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}{0}", "{1} {0}", } availableFormats{ diff --git a/intl/icu/source/data/locales/zh_Hans_SG.txt b/intl/icu/source/data/locales/zh_Hans_SG.txt index d6e4fefd56a7..c681f1d1d704 100644 --- a/intl/icu/source/data/locales/zh_Hans_SG.txt +++ b/intl/icu/source/data/locales/zh_Hans_SG.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_SG{ - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -115,10 +115,10 @@ zh_Hans_SG{ "y年M月d日", "y年M月d日", "dd/MM/yy", + "{1}{0}", + "{1}{0}", "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}{0}", "{1} {0}", } availableFormats{ diff --git a/intl/icu/source/data/locales/zh_Hant.txt b/intl/icu/source/data/locales/zh_Hant.txt index cce66a24ef3e..0d12259ab75c 100644 --- a/intl/icu/source/data/locales/zh_Hant.txt +++ b/intl/icu/source/data/locales/zh_Hant.txt @@ -1,12 +1,20 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ %%Parent{"root"} AuxExemplarCharacters{ - "[乍 乳 仂 伏 佐 侶 僳 兆 兌 兹 划 别 券 勳 匕 匙 匣 卑 卞 占 叉 叶 吻 哺 嘟 噘 堤 墎 壤 奥 妖 嬰 孜 峇 嶼 巽 巾 帆" - " 廁 廚 弋 弓 懸 戟 扳 捂 摔 暈 栗 框 桶 桿 楔 櫃 涅 渾 澎 煎 燕 燦 燭 牡 狄 琳 瑚 甫 疊 皺 盒 眨 眩 碑 礁 筒 簍 糰" - " 紋 紗 纏 纜 羯 聳 肖 艇 芒 苗 茨 菱 蓬 虹 蚩 蛛 蜀 蜘 蝴 蝸 蠟 裘 裙 謬 豚 跨 躬 遞 酋 釘 鈔 鈕 鉛 鎚 鎬 鐺 鑰 鑽" - " 隴 霄 鞠 餵 骰 骷 髏 鯉 鳶]" + "[乍 乳 仂 伏 佐 侶 俏 倉 偽 傅 傘 僳 兆 兌 兹 凋 凍 凸 划 刨 别 刮 券 剃 勳 勾 匕 匙 匣 匯 卑 卞 占 卹 叉 叶 吻 哺" + " 唇 唵 啤 喪 喲 嘟 噁 噓 噘 嚏 坑 堤 墅 墎 墓 墟 墳 壤 壩 壺 奥 妖 嬰 孕 孜 孵 寺 尿 屍 屑 峇 嶼 巽 巾 帆 帚 幟 廁" + " 廈 廚 廟 弋 弓 忡 憊 懨 懸 戟 扮 扳 捂 捏 捧 掠 掰 揹 搏 摀 摔 撕 撲 攀 攤 敞 斑 斜 斧 暈 暮 曇 曬 曳 朔 杖 枯 栓" + " 栗 栽 框 桶 桿 棍 棕 棺 椒 楔 槌 橄 橇 橘 橙 檬 檸 櫃 櫚 櫻 欖 欠 残 殭 汁 沫 沮 泣 浣 浴 涅 涎 涮 淇 淋 渾 湘 溜" + " 漿 澎 澡 濕 灘 烘 烹 焊 焙 焰 煎 煮 燕 燙 燦 燭 爍 牡 犀 犬 狄 狡 狸 猩 猾 猿 獺 獾 琳 瑚 瓢 甕 甫 疊 疲 疾 瘦 瘧" + " 皂 皺 皿 盆 盈 盒 盔 盥 眨 眩 睏 瞇 瞌 瞪 碑 磚 礁 礫 祈 禱 禿 稻 穀 窄 竿 筒 筷 箏 箔 篷 簍 籠 糖 糰 紉 紋 紗 紮" + " 紳 綽 綿 縫 繃 繡 繩 纏 纖 纜 罈 罐 罩 羯 聳 聾 肌 肖 肺 脈 脖 腐 腹 膚 膠 臂 臟 艇 芒 芙 芭 芽 苗 苣 茄 茨 茵 茸" + " 莓 莖 菇 菌 菱 萎 萵 葵 蒜 蒸 蓄 蓉 蓬 蔔 蔥 蔬 蕉 蕾 薑 薯 蘋 蘑 蘿 虹 蚊 蚓 蚩 蚯 蛛 蜀 蜘 蜥 蜴 蝙 蝟 蝠 蝦 蝴" + " 蝸 螂 螃 螞 螺 蟀 蟄 蟋 蟑 蟳 蟻 蠅 蠕 蠟 蠣 衫 袍 裏 裘 裙 裱 裹 褐 襪 襯 訝 診 謎 謬 豎 豔 豚 豹 贛 跆 跨 跪 踩" + " 躬 軸 轎 辜 辣 遞 鄙 酋 酪 醬 釘 鈔 鈕 鉅 鉛 鉤 鋁 錨 錶 鍊 鎚 鎬 鏈 鏢 鐺 鑰 鑽 鑿 閩 阱 隴 雀 雌 霄 霜 静 靴 鞠" + " 鞭 頌 頸 顛 颱 飆 飪 餃 餌 餚 餵 餾 駝 駱 驕 骰 骷 髏 鬍 魷 鮑 鯉 鯊 鯨 鱷 鳩 鳶 鴨 鵡 鶴 鸚 鹽 黛 鼬 龐]" } Ellipsis{ final{"{0}…"} @@ -1376,7 +1384,6 @@ zh_Hant{ } } } - Version{"37"} calendar{ buddhist{ DateTimePatterns{ @@ -4494,6 +4501,53 @@ zh_Hant{ } } intervalFormats{ + Bh{ + B{"Bh時 – Bh時"} + h{"Bh–h時"} + } + Bhm{ + B{"Bh:mm – Bh:mm"} + h{"Bh:mm–h:mm"} + m{"Bh:mm–h:mm"} + } + Gy{ + G{"Gy – Gy"} + y{"Gy–y"} + } + GyM{ + G{"GGGGGy-MM – GGGGGy-MM"} + M{"GGGGGy-MM – y-MM"} + y{"GGGGGy-MM – y-MM"} + } + GyMEd{ + G{"GGGGGy-MM-dd, E – GGGGGy-MM-dd, E"} + M{"GGGGGy-MM-dd, E – y-MM-dd, E"} + d{"GGGGGy-MM-dd, E – y-MM-dd, E"} + y{"GGGGGy-MM-dd, E – y-MM-dd, E"} + } + GyMMM{ + G{"Gy年MMM – Gy年MMM"} + M{"Gy年MMM–MMM"} + y{"Gy年MMM – y年MMM"} + } + GyMMMEd{ + G{"Gy年MMMd日, E – Gy年MMMd日, E"} + M{"Gy年MMMd日, E – MMMd日, E"} + d{"Gy年MMMd日, E – MMMd日, E"} + y{"Gy年MMMd日, E – y年MMMd日, E"} + } + GyMMMd{ + G{"Gy年MMMd日 – Gy年MMMd日"} + M{"Gy年MMMd日 – MMMd日"} + d{"Gy年MMMd–d日"} + y{"Gy年MMMd日 – y年MMMd日"} + } + GyMd{ + G{"GGGGGy-MM-dd – GGGGGy-MM-dd"} + M{"GGGGGy-MM-dd – y-MM-dd"} + d{"GGGGGy-MM-dd – y-MM-dd"} + y{"GGGGGy-MM-dd – y-MM-dd"} + } H{ H{"HH – HH"} } diff --git a/intl/icu/source/data/locales/zh_Hant_HK.txt b/intl/icu/source/data/locales/zh_Hant_HK.txt index 39e1dcb50f71..f45036174a61 100644 --- a/intl/icu/source/data/locales/zh_Hant_HK.txt +++ b/intl/icu/source/data/locales/zh_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_HK{ Ellipsis{ final{"{0}⋯"} @@ -91,7 +92,6 @@ zh_Hant_HK{ } } } - Version{"37"} calendar{ buddhist{ availableFormats{ diff --git a/intl/icu/source/data/locales/zh_Hant_MO.txt b/intl/icu/source/data/locales/zh_Hant_MO.txt index 670cffc3f25d..1f5fac879191 100644 --- a/intl/icu/source/data/locales/zh_Hant_MO.txt +++ b/intl/icu/source/data/locales/zh_Hant_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_MO{ %%Parent{"zh_Hant_HK"} - Version{"37"} } diff --git a/intl/icu/source/data/locales/zh_Hant_TW.txt b/intl/icu/source/data/locales/zh_Hant_TW.txt index 9eba0ed62531..c2d8b108fcb4 100644 --- a/intl/icu/source/data/locales/zh_Hant_TW.txt +++ b/intl/icu/source/data/locales/zh_Hant_TW.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_TW{ - Version{"37"} } diff --git a/intl/icu/source/data/locales/zh_MO.txt b/intl/icu/source/data/locales/zh_MO.txt index 6565bf7c3fc3..c6b2148478d5 100644 --- a/intl/icu/source/data/locales/zh_MO.txt +++ b/intl/icu/source/data/locales/zh_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_MO{ "%%ALIAS"{"zh_Hant_MO"} } diff --git a/intl/icu/source/data/locales/zh_SG.txt b/intl/icu/source/data/locales/zh_SG.txt index bf277736bf8b..14136c339a80 100644 --- a/intl/icu/source/data/locales/zh_SG.txt +++ b/intl/icu/source/data/locales/zh_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_SG{ "%%ALIAS"{"zh_Hans_SG"} } diff --git a/intl/icu/source/data/locales/zh_TW.txt b/intl/icu/source/data/locales/zh_TW.txt index 9372c5067ad4..c54ccbfe8920 100644 --- a/intl/icu/source/data/locales/zh_TW.txt +++ b/intl/icu/source/data/locales/zh_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_TW{ "%%ALIAS"{"zh_Hant_TW"} } diff --git a/intl/icu/source/data/locales/zu.txt b/intl/icu/source/data/locales/zu.txt index d9c87294be1e..e5d9265888a1 100644 --- a/intl/icu/source/data/locales/zu.txt +++ b/intl/icu/source/data/locales/zu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zu{ AuxExemplarCharacters{ "[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ" @@ -220,7 +221,6 @@ zu{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"37"} calendar{ generic{ DateTimePatterns{ @@ -1787,8 +1787,8 @@ zu{ "['ʼ՚᾽᾿’']", "[%٪﹪%]", "[؉‰]", - "[\$﹩$$]", - "[£₤]", + "[\$﹩$]", + "[£₤£]", "[¥¥]", "[₩₩]", "[₨₹{Rp}{Rs}]", diff --git a/intl/icu/source/data/locales/zu_ZA.txt b/intl/icu/source/data/locales/zu_ZA.txt index 4f5767c0f865..fbc46e57d296 100644 --- a/intl/icu/source/data/locales/zu_ZA.txt +++ b/intl/icu/source/data/locales/zu_ZA.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zu_ZA{ - Version{"37"} } diff --git a/intl/icu/source/data/makedata.mak b/intl/icu/source/data/makedata.mak index 0c8c52635e2f..daa66ef6c522 100644 --- a/intl/icu/source/data/makedata.mak +++ b/intl/icu/source/data/makedata.mak @@ -12,11 +12,11 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt67 +U_ICUDATA_NAME=icudt68 ############################################################################## !IF "$(UWP)" == "UWP" # Optionally change the name of the data file for the UWP version. -U_ICUDATA_NAME=icudt67 +U_ICUDATA_NAME=icudt68 !ENDIF U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=13.0 @@ -161,15 +161,22 @@ ARM_CROSSBUILD_TS=$(ICUTMP)\$(ARM_CROSS_BUILD).timestamp # # TOOLS CFG PATH # Generally the tools want to run on the same architecture as is being built. -# Thus ARM and ARM64 need to use another build of the other tools, so make sure to get an usable cfg path. +# Thus ARM and ARM64 need to use another build of the other tools, so make sure to get an usable CFG path. # Since tools, particularly pkggen, have architecture built-in, we made x64 on -# Windows be machine-independent and use those tools. +# Windows be machine-independent and use those tools for both ARM and ARM64. +# Note: If we're building ARM/ARM64 Debug, then we'll use the x64 Debug tools. +# If we're building ARM/ARM64 Release, then we'll use the x64 Release tools. # !IF "$(ARM_CROSS_BUILD)" == "" CFGTOOLS=$(CFG) !ELSE +!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM64\Release" CFGTOOLS=x64\Release !ENDIF +!IF "$(CFG)" == "ARM\Debug" || "$(CFG)" == "ARM64\Debug" +CFGTOOLS=x64\Debug +!ENDIF +!ENDIF !MESSAGE ICU tools CFG subpath is $(CFGTOOLS) @@ -248,6 +255,13 @@ ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" $(ARM_CROSSBUILD_ !ENDIF +# Verbose output when building the data for Debug builds. +!IF "$(DEBUG)" == "true" +ICU_DATA_BUILD_VERBOSE=--verbose +!ELSE +ICU_DATA_BUILD_VERBOSE= +!ENDIF + # Three main targets: tools, core data, and test data. # Keep track of whether they are built via timestamp files. @@ -277,6 +291,7 @@ $(COREDATA_TS): --out_dir "$(ICUBLD_PKG)" \ --tmp_dir "$(ICUTMP)" \ --filter_file "$(ICU_DATA_FILTER_FILE)" \ + $(ICU_DATA_BUILD_VERBOSE) \ $(ICU_DATA_BUILDTOOL_OPTS) @echo "timestamp" > $(COREDATA_TS) diff --git a/intl/icu/source/data/makedata.vcxproj b/intl/icu/source/data/makedata.vcxproj index 71ccafbc2800..4309f430ecbb 100644 --- a/intl/icu/source/data/makedata.vcxproj +++ b/intl/icu/source/data/makedata.vcxproj @@ -12,21 +12,18 @@ - - - - <_ProjectFileVersion>10.0.30319.1 .\data\tmp\$(Platform)\ .\data\build\ $(Platform)\$(Configuration) + true .\data\tmp\x86\ x86\$(Configuration) - NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) + NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) DEBUG=$(DebugBuild) NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) clean all NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) clean diff --git a/intl/icu/source/data/makedata_uwp.vcxproj b/intl/icu/source/data/makedata_uwp.vcxproj index f89bac014b7e..7b4ae4d9a4b0 100644 --- a/intl/icu/source/data/makedata_uwp.vcxproj +++ b/intl/icu/source/data/makedata_uwp.vcxproj @@ -47,10 +47,6 @@ - - - - <_ProjectFileVersion>10.0.30319.1 diff --git a/intl/icu/source/data/mappings/gb18030.ucm b/intl/icu/source/data/mappings/gb18030.ucm index 8f5eff63d7b9..62b57a93fc24 100644 --- a/intl/icu/source/data/mappings/gb18030.ucm +++ b/intl/icu/source/data/mappings/gb18030.ucm @@ -16,7 +16,7 @@ # Note that the entire block for the supplementary Unicode planes is # marked unassigned because they are handled algorithmically. # Similarly, some of the BMP mappings are marked as unassigned for the same reason. -# See http://userguide.icu-project.org/conversion/data#TOC-State-table-syntax-in-.ucm-files +# See https://unicode-org.github.io/icu/userguide/conversion/data#state-table-syntax-in-ucm-files # States 0..2: # Mostly assigned sequences, with branches in the lead bytes diff --git a/intl/icu/source/data/misc/dayPeriods.txt b/intl/icu/source/data/misc/dayPeriods.txt index 1f88c2394bcd..3d24f00d6ae9 100644 --- a/intl/icu/source/data/misc/dayPeriods.txt +++ b/intl/icu/source/data/misc/dayPeriods.txt @@ -1,167 +1,170 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dayPeriods:table(nofallback){ locales{ af{"set3"} - am{"set68"} - ar{"set66"} - az{"set62"} - bg{"set21"} - bn{"set34"} - bs{"set25"} + am{"set69"} + ar{"set67"} + az{"set63"} + bg{"set22"} + bn{"set35"} + bs{"set26"} ca{"set15"} - ccp{"set34"} - chr{"set76"} - cs{"set27"} - cy{"set78"} + ccp{"set35"} + chr{"set77"} + cs{"set28"} + cy{"set79"} da{"set7"} de{"set6"} - ee{"set77"} - el{"set40"} + ee{"set78"} + el{"set41"} en{"set2"} es{"set13"} es_CO{"set14"} - et{"set49"} - eu{"set74"} - fa{"set43"} - fi{"set48"} - fil{"set60"} - fr{"set18"} + et{"set50"} + eu{"set75"} + fa{"set44"} + fi{"set49"} + fil{"set61"} + fr{"set19"} gl{"set12"} gsw{"set5"} - gu{"set35"} - he{"set67"} - hi{"set33"} - hr{"set24"} - hu{"set50"} - hy{"set42"} - id{"set58"} + gu{"set36"} + he{"set68"} + hi{"set34"} + hr{"set25"} + hu{"set51"} + hy{"set43"} + id{"set59"} is{"set10"} it{"set16"} - ja{"set53"} - ka{"set73"} - kk{"set63"} - km{"set70"} - kn{"set47"} - ko{"set54"} - ky{"set64"} - lo{"set57"} - lt{"set30"} - lv{"set31"} - mk{"set22"} - ml{"set46"} - mn{"set75"} - mr{"set36"} - ms{"set59"} - my{"set55"} + ja{"set54"} + ka{"set74"} + kk{"set64"} + km{"set71"} + kn{"set48"} + ko{"set55"} + ky{"set65"} + lij{"set17"} + lo{"set58"} + lt{"set31"} + lv{"set32"} + mk{"set23"} + ml{"set47"} + mn{"set76"} + mr{"set37"} + ms{"set60"} + my{"set56"} nb{"set8"} - ne{"set37"} + ne{"set38"} nl{"set4"} - pa{"set38"} - pl{"set29"} + pa{"set39"} + pl{"set30"} pt{"set11"} - ro{"set17"} + ro{"set18"} root{"set1"} - ru{"set19"} - si{"set39"} - sk{"set28"} - sl{"set26"} - sq{"set41"} - sr{"set23"} + ru{"set20"} + si{"set40"} + sk{"set29"} + sl{"set27"} + sq{"set42"} + sr{"set24"} sv{"set9"} - sw{"set71"} - ta{"set44"} - te{"set45"} - th{"set56"} - tr{"set61"} - uk{"set20"} - ur{"set32"} - uz{"set65"} - vi{"set69"} - yue{"set52"} - zh{"set51"} - zu{"set72"} + sw{"set72"} + ta{"set45"} + te{"set46"} + th{"set57"} + tr{"set62"} + uk{"set21"} + ur{"set33"} + uz{"set66"} + vi{"set70"} + yue{"set53"} + zh{"set52"} + zu{"set73"} } locales_selection{ - af{"set81"} - am{"set150"} - ar{"set141"} - az{"set132"} - bg{"set104"} - bn{"set117"} - bs{"set98"} - ca{"set93"} - ccp{"set117"} - chr{"set154"} - cs{"set101"} - cy{"set156"} - da{"set85"} - de{"set84"} - ee{"set155"} - el{"set110"} - en{"set80"} - es{"set91"} - es_CO{"set92"} - et{"set136"} - eu{"set151"} - fa{"set111"} - fi{"set137"} - fil{"set145"} - fr{"set96"} - gl{"set90"} - gsw{"set83"} - gu{"set118"} - he{"set142"} - hi{"set116"} - hr{"set97"} - hu{"set138"} - hy{"set112"} - id{"set143"} - is{"set88"} - it{"set94"} - ja{"set129"} - ka{"set113"} - kk{"set133"} - km{"set147"} - kn{"set126"} - ko{"set130"} - ky{"set134"} - lo{"set140"} - lt{"set108"} - lv{"set109"} - mk{"set105"} - ml{"set125"} - mn{"set152"} - mr{"set119"} - ms{"set144"} - my{"set153"} - nb{"set86"} - ne{"set120"} - nl{"set82"} - pa{"set121"} - pl{"set103"} - pt{"set89"} - ro{"set95"} - root{"set79"} - ru{"set106"} - si{"set122"} - sk{"set102"} - sl{"set100"} - sq{"set114"} - sr{"set99"} - sv{"set87"} - sw{"set148"} - ta{"set123"} - te{"set124"} - th{"set139"} - tr{"set131"} - uk{"set107"} - ur{"set115"} - uz{"set135"} - vi{"set146"} - yue{"set128"} - zh{"set127"} - zu{"set149"} + af{"set82"} + am{"set152"} + ar{"set143"} + az{"set134"} + bg{"set106"} + bn{"set119"} + bs{"set100"} + ca{"set94"} + ccp{"set119"} + chr{"set156"} + cs{"set103"} + cy{"set158"} + da{"set86"} + de{"set85"} + ee{"set157"} + el{"set112"} + en{"set81"} + es{"set92"} + es_CO{"set93"} + et{"set138"} + eu{"set153"} + fa{"set113"} + fi{"set139"} + fil{"set147"} + fr{"set98"} + gl{"set91"} + gsw{"set84"} + gu{"set120"} + he{"set144"} + hi{"set118"} + hr{"set99"} + hu{"set140"} + hy{"set114"} + id{"set145"} + is{"set89"} + it{"set95"} + ja{"set131"} + ka{"set115"} + kk{"set135"} + km{"set149"} + kn{"set128"} + ko{"set132"} + ky{"set136"} + lij{"set96"} + lo{"set142"} + lt{"set110"} + lv{"set111"} + mk{"set107"} + ml{"set127"} + mn{"set154"} + mr{"set121"} + ms{"set146"} + my{"set155"} + nb{"set87"} + ne{"set122"} + nl{"set83"} + pa{"set123"} + pl{"set105"} + pt{"set90"} + ro{"set97"} + root{"set80"} + ru{"set108"} + si{"set124"} + sk{"set104"} + sl{"set102"} + sq{"set116"} + sr{"set101"} + sv{"set88"} + sw{"set150"} + ta{"set125"} + te{"set126"} + th{"set141"} + tr{"set133"} + uk{"set109"} + ur{"set117"} + uz{"set137"} + vi{"set148"} + yue{"set130"} + zh{"set129"} + zu{"set151"} } rules{ set1{ @@ -199,6 +202,42 @@ dayPeriods:table(nofallback){ } } set100{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"04:00"} + } + night1{ + before{"04:00"} + from{"21:00"} + } + } + set101{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"21:00"} + } + } + set102{ afternoon1{ before{"18:00"} from{"12:00"} @@ -220,51 +259,51 @@ dayPeriods:table(nofallback){ from{"22:00"} } } - set101{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"22:00"} - from{"18:00"} - } - morning1{ - before{"09:00"} - from{"04:00"} - } - morning2{ - before{"12:00"} - from{"09:00"} - } - night1{ - before{"04:00"} - from{"22:00"} - } - } - set102{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"22:00"} - from{"18:00"} - } - morning1{ - before{"09:00"} - from{"04:00"} - } - morning2{ - before{"12:00"} - from{"09:00"} - } - night1{ - before{"04:00"} - from{"22:00"} - } - } set103{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"22:00"} + from{"18:00"} + } + morning1{ + before{"09:00"} + from{"04:00"} + } + morning2{ + before{"12:00"} + from{"09:00"} + } + night1{ + before{"04:00"} + from{"22:00"} + } + } + set104{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"22:00"} + from{"18:00"} + } + morning1{ + before{"09:00"} + from{"04:00"} + } + morning2{ + before{"12:00"} + from{"09:00"} + } + night1{ + before{"04:00"} + from{"22:00"} + } + } + set105{ afternoon1{ before{"18:00"} from{"12:00"} @@ -286,7 +325,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set104{ + set106{ afternoon1{ before{"18:00"} from{"14:00"} @@ -308,7 +347,7 @@ dayPeriods:table(nofallback){ from{"22:00"} } } - set105{ + set107{ afternoon1{ before{"18:00"} from{"12:00"} @@ -330,42 +369,6 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set106{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"24:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"00:00"} - } - } - set107{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"24:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"00:00"} - } - } set108{ afternoon1{ before{"18:00"} @@ -377,10 +380,10 @@ dayPeriods:table(nofallback){ } morning1{ before{"12:00"} - from{"06:00"} + from{"04:00"} } night1{ - before{"06:00"} + before{"04:00"} from{"00:00"} } } @@ -390,16 +393,16 @@ dayPeriods:table(nofallback){ from{"12:00"} } evening1{ - before{"23:00"} + before{"24:00"} from{"18:00"} } morning1{ before{"12:00"} - from{"06:00"} + from{"04:00"} } night1{ - before{"06:00"} - from{"23:00"} + before{"04:00"} + from{"00:00"} } } set11{ @@ -427,6 +430,42 @@ dayPeriods:table(nofallback){ } } set110{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"24:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"00:00"} + } + } + set111{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"23:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"23:00"} + } + } + set112{ afternoon1{ before{"17:00"} from{"12:00"} @@ -444,7 +483,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set111{ + set113{ afternoon1{ before{"13:00"} from{"12:00"} @@ -470,7 +509,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set112{ + set114{ afternoon1{ before{"18:00"} from{"12:00"} @@ -488,7 +527,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set113{ + set115{ afternoon1{ before{"18:00"} from{"12:00"} @@ -506,7 +545,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set114{ + set116{ afternoon1{ before{"18:00"} from{"12:00"} @@ -528,46 +567,6 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set115{ - afternoon1{ - before{"16:00"} - from{"12:00"} - } - afternoon2{ - before{"18:00"} - from{"16:00"} - } - evening1{ - before{"20:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"20:00"} - } - } - set116{ - afternoon1{ - before{"16:00"} - from{"12:00"} - } - evening1{ - before{"20:00"} - from{"16:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"20:00"} - } - } set117{ afternoon1{ before{"16:00"} @@ -582,12 +581,8 @@ dayPeriods:table(nofallback){ from{"18:00"} } morning1{ - before{"06:00"} - from{"04:00"} - } - morning2{ before{"12:00"} - from{"06:00"} + from{"04:00"} } night1{ before{"04:00"} @@ -617,12 +612,12 @@ dayPeriods:table(nofallback){ before{"16:00"} from{"12:00"} } - evening1{ + afternoon2{ before{"18:00"} from{"16:00"} } - evening2{ - before{"21:00"} + evening1{ + before{"20:00"} from{"18:00"} } morning1{ @@ -635,7 +630,7 @@ dayPeriods:table(nofallback){ } night1{ before{"04:00"} - from{"21:00"} + from{"20:00"} } } set12{ @@ -664,6 +659,50 @@ dayPeriods:table(nofallback){ } } set120{ + afternoon1{ + before{"16:00"} + from{"12:00"} + } + evening1{ + before{"20:00"} + from{"16:00"} + } + morning1{ + before{"12:00"} + from{"04:00"} + } + night1{ + before{"04:00"} + from{"20:00"} + } + } + set121{ + afternoon1{ + before{"16:00"} + from{"12:00"} + } + evening1{ + before{"18:00"} + from{"16:00"} + } + evening2{ + before{"21:00"} + from{"18:00"} + } + morning1{ + before{"06:00"} + from{"04:00"} + } + morning2{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"04:00"} + from{"21:00"} + } + } + set122{ afternoon1{ before{"16:00"} from{"12:00"} @@ -685,7 +724,7 @@ dayPeriods:table(nofallback){ from{"22:00"} } } - set121{ + set123{ afternoon1{ before{"16:00"} from{"12:00"} @@ -703,7 +742,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set122{ + set124{ afternoon1{ before{"14:00"} from{"12:00"} @@ -729,7 +768,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set123{ + set125{ afternoon1{ before{"14:00"} from{"12:00"} @@ -759,7 +798,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set124{ + set126{ afternoon1{ before{"18:00"} from{"12:00"} @@ -777,7 +816,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set125{ + set127{ afternoon1{ before{"14:00"} from{"12:00"} @@ -807,7 +846,7 @@ dayPeriods:table(nofallback){ from{"19:00"} } } - set126{ + set128{ afternoon1{ before{"18:00"} from{"12:00"} @@ -825,78 +864,30 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set127{ - afternoon1{ - before{"13:00"} - from{"12:00"} - } - afternoon2{ - before{"19:00"} - from{"13:00"} - } - evening1{ - before{"24:00"} - from{"19:00"} - } - morning1{ - before{"08:00"} - from{"05:00"} - } - morning2{ - before{"12:00"} - from{"08:00"} - } - night1{ - before{"05:00"} - from{"00:00"} - } - } - set128{ - afternoon1{ - before{"13:00"} - from{"12:00"} - } - afternoon2{ - before{"19:00"} - from{"13:00"} - } - evening1{ - before{"24:00"} - from{"19:00"} - } - morning1{ - before{"08:00"} - from{"05:00"} - } - morning2{ - before{"12:00"} - from{"08:00"} - } - night1{ - before{"05:00"} - from{"00:00"} - } - } set129{ afternoon1{ - before{"16:00"} + before{"13:00"} from{"12:00"} } - evening1{ + afternoon2{ before{"19:00"} - from{"16:00"} + from{"13:00"} } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"23:00"} + evening1{ + before{"24:00"} from{"19:00"} } - night2{ - before{"04:00"} - from{"23:00"} + morning1{ + before{"08:00"} + from{"05:00"} + } + morning2{ + before{"12:00"} + from{"08:00"} + } + night1{ + before{"05:00"} + from{"00:00"} } } set13{ @@ -921,6 +912,54 @@ dayPeriods:table(nofallback){ } } set130{ + afternoon1{ + before{"13:00"} + from{"12:00"} + } + afternoon2{ + before{"19:00"} + from{"13:00"} + } + evening1{ + before{"24:00"} + from{"19:00"} + } + morning1{ + before{"08:00"} + from{"05:00"} + } + morning2{ + before{"12:00"} + from{"08:00"} + } + night1{ + before{"05:00"} + from{"00:00"} + } + } + set131{ + afternoon1{ + before{"16:00"} + from{"12:00"} + } + evening1{ + before{"19:00"} + from{"16:00"} + } + morning1{ + before{"12:00"} + from{"04:00"} + } + night1{ + before{"23:00"} + from{"19:00"} + } + night2{ + before{"04:00"} + from{"23:00"} + } + } + set132{ afternoon1{ before{"18:00"} from{"12:00"} @@ -942,7 +981,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set131{ + set133{ afternoon1{ before{"18:00"} from{"12:00"} @@ -968,7 +1007,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set132{ + set134{ afternoon1{ before{"17:00"} from{"12:00"} @@ -994,43 +1033,43 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set133{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"06:00"} - } - night1{ - before{"06:00"} - from{"21:00"} - } - } - set134{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"06:00"} - } - night1{ - before{"06:00"} - from{"21:00"} - } - } set135{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"21:00"} + } + } + set136{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"21:00"} + } + } + set137{ afternoon1{ before{"18:00"} from{"11:00"} @@ -1048,7 +1087,7 @@ dayPeriods:table(nofallback){ from{"22:00"} } } - set136{ + set138{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1066,7 +1105,7 @@ dayPeriods:table(nofallback){ from{"23:00"} } } - set137{ + set139{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1088,7 +1127,24 @@ dayPeriods:table(nofallback){ from{"23:00"} } } - set138{ + set14{ + evening1{ + before{"20:00"} + from{"12:00"} + } + morning2{ + before{"12:00"} + from{"00:00"} + } + night1{ + before{"24:00"} + from{"20:00"} + } + noon{ + at{"12:00"} + } + } + set140{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1114,7 +1170,7 @@ dayPeriods:table(nofallback){ from{"04:00"} } } - set139{ + set141{ afternoon1{ before{"13:00"} from{"12:00"} @@ -1140,24 +1196,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set14{ - evening1{ - before{"20:00"} - from{"12:00"} - } - morning2{ - before{"12:00"} - from{"00:00"} - } - night1{ - before{"24:00"} - from{"20:00"} - } - noon{ - at{"12:00"} - } - } - set140{ + set142{ afternoon1{ before{"16:00"} from{"12:00"} @@ -1175,7 +1214,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set141{ + set143{ afternoon1{ before{"13:00"} from{"12:00"} @@ -1205,7 +1244,7 @@ dayPeriods:table(nofallback){ from{"01:00"} } } - set142{ + set144{ afternoon1{ before{"16:00"} from{"12:00"} @@ -1231,7 +1270,7 @@ dayPeriods:table(nofallback){ from{"03:00"} } } - set143{ + set145{ afternoon1{ before{"15:00"} from{"10:00"} @@ -1249,7 +1288,7 @@ dayPeriods:table(nofallback){ from{"18:00"} } } - set144{ + set146{ afternoon1{ before{"14:00"} from{"12:00"} @@ -1271,7 +1310,7 @@ dayPeriods:table(nofallback){ from{"19:00"} } } - set145{ + set147{ afternoon1{ before{"16:00"} from{"12:00"} @@ -1293,84 +1332,40 @@ dayPeriods:table(nofallback){ from{"18:00"} } } - set146{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"21:00"} - } - } - set147{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"00:00"} - } - night1{ - before{"24:00"} - from{"21:00"} - } - } set148{ afternoon1{ - before{"16:00"} + before{"18:00"} from{"12:00"} } evening1{ - before{"19:00"} - from{"16:00"} + before{"21:00"} + from{"18:00"} } morning1{ - before{"07:00"} - from{"04:00"} - } - morning2{ before{"12:00"} - from{"07:00"} + from{"04:00"} } night1{ before{"04:00"} - from{"19:00"} + from{"21:00"} } } set149{ afternoon1{ - before{"13:00"} - from{"10:00"} + before{"18:00"} + from{"12:00"} } evening1{ - before{"19:00"} - from{"13:00"} + before{"21:00"} + from{"18:00"} } morning1{ - before{"06:00"} + before{"12:00"} from{"00:00"} } - morning2{ - before{"10:00"} - from{"06:00"} - } night1{ before{"24:00"} - from{"19:00"} + from{"21:00"} } } set15{ @@ -1403,6 +1398,50 @@ dayPeriods:table(nofallback){ } } set150{ + afternoon1{ + before{"16:00"} + from{"12:00"} + } + evening1{ + before{"19:00"} + from{"16:00"} + } + morning1{ + before{"07:00"} + from{"04:00"} + } + morning2{ + before{"12:00"} + from{"07:00"} + } + night1{ + before{"04:00"} + from{"19:00"} + } + } + set151{ + afternoon1{ + before{"13:00"} + from{"10:00"} + } + evening1{ + before{"19:00"} + from{"13:00"} + } + morning1{ + before{"06:00"} + from{"00:00"} + } + morning2{ + before{"10:00"} + from{"06:00"} + } + night1{ + before{"24:00"} + from{"19:00"} + } + } + set152{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1420,7 +1459,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set151{ + set153{ afternoon1{ before{"14:00"} from{"12:00"} @@ -1446,7 +1485,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set152{ + set154{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1464,7 +1503,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set153{ + set155{ afternoon1{ before{"16:00"} from{"12:00"} @@ -1482,7 +1521,7 @@ dayPeriods:table(nofallback){ from{"19:00"} } } - set154{ + set156{ afternoon1{ before{"24:00"} from{"12:00"} @@ -1492,7 +1531,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set155{ + set157{ afternoon1{ before{"14:00"} from{"12:00"} @@ -1518,7 +1557,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set156{ + set158{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1570,10 +1609,10 @@ dayPeriods:table(nofallback){ } morning1{ before{"12:00"} - from{"05:00"} + from{"06:00"} } night1{ - before{"05:00"} + before{"06:00"} from{"22:00"} } noon{ @@ -1586,7 +1625,7 @@ dayPeriods:table(nofallback){ from{"12:00"} } evening1{ - before{"24:00"} + before{"22:00"} from{"18:00"} } midnight{ @@ -1594,11 +1633,11 @@ dayPeriods:table(nofallback){ } morning1{ before{"12:00"} - from{"04:00"} + from{"05:00"} } night1{ - before{"04:00"} - from{"00:00"} + before{"05:00"} + from{"22:00"} } noon{ at{"12:00"} @@ -1677,6 +1716,30 @@ dayPeriods:table(nofallback){ } } set21{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"24:00"} + from{"18:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"12:00"} + from{"04:00"} + } + night1{ + before{"04:00"} + from{"00:00"} + } + noon{ + at{"12:00"} + } + } + set22{ afternoon1{ before{"18:00"} from{"14:00"} @@ -1701,7 +1764,7 @@ dayPeriods:table(nofallback){ from{"22:00"} } } - set22{ + set23{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1729,7 +1792,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set23{ + set24{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1753,30 +1816,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set24{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - midnight{ - at{"00:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"21:00"} - } - noon{ - at{"12:00"} - } - } set25{ afternoon1{ before{"18:00"} @@ -1807,23 +1846,19 @@ dayPeriods:table(nofallback){ from{"12:00"} } evening1{ - before{"22:00"} + before{"21:00"} from{"18:00"} } midnight{ at{"00:00"} } morning1{ - before{"10:00"} - from{"06:00"} - } - morning2{ before{"12:00"} - from{"10:00"} + from{"04:00"} } night1{ - before{"06:00"} - from{"22:00"} + before{"04:00"} + from{"21:00"} } noon{ at{"12:00"} @@ -1842,15 +1877,15 @@ dayPeriods:table(nofallback){ at{"00:00"} } morning1{ - before{"09:00"} - from{"04:00"} + before{"10:00"} + from{"06:00"} } morning2{ before{"12:00"} - from{"09:00"} + from{"10:00"} } night1{ - before{"04:00"} + before{"06:00"} from{"22:00"} } noon{ @@ -1891,23 +1926,23 @@ dayPeriods:table(nofallback){ from{"12:00"} } evening1{ - before{"21:00"} + before{"22:00"} from{"18:00"} } midnight{ at{"00:00"} } morning1{ - before{"10:00"} - from{"06:00"} + before{"09:00"} + from{"04:00"} } morning2{ before{"12:00"} - from{"10:00"} + from{"09:00"} } night1{ - before{"06:00"} - from{"21:00"} + before{"04:00"} + from{"22:00"} } noon{ at{"12:00"} @@ -1935,6 +1970,34 @@ dayPeriods:table(nofallback){ } } set30{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"10:00"} + from{"06:00"} + } + morning2{ + before{"12:00"} + from{"10:00"} + } + night1{ + before{"06:00"} + from{"21:00"} + } + noon{ + at{"12:00"} + } + } + set31{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1958,7 +2021,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set31{ + set32{ afternoon1{ before{"18:00"} from{"12:00"} @@ -1982,7 +2045,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set32{ + set33{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2007,7 +2070,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set33{ + set34{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2028,7 +2091,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set34{ + set35{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2054,7 +2117,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set35{ + set36{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2075,7 +2138,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set36{ + set37{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2107,7 +2170,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set37{ + set38{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2135,7 +2198,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set38{ + set39{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2156,7 +2219,28 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set39{ + set4{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"24:00"} + from{"18:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"00:00"} + } + } + set40{ afternoon1{ before{"14:00"} from{"12:00"} @@ -2188,28 +2272,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set4{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"24:00"} - from{"18:00"} - } - midnight{ - at{"00:00"} - } - morning1{ - before{"12:00"} - from{"06:00"} - } - night1{ - before{"06:00"} - from{"00:00"} - } - } - set40{ + set41{ afternoon1{ before{"17:00"} from{"12:00"} @@ -2227,7 +2290,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set41{ + set42{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2255,7 +2318,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set42{ + set43{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2279,7 +2342,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set43{ + set44{ afternoon1{ before{"13:00"} from{"12:00"} @@ -2305,7 +2368,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set44{ + set45{ afternoon1{ before{"14:00"} from{"12:00"} @@ -2341,7 +2404,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set45{ + set46{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2362,7 +2425,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set46{ + set47{ afternoon1{ before{"14:00"} from{"12:00"} @@ -2398,7 +2461,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set47{ + set48{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2419,7 +2482,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set48{ + set49{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2447,30 +2510,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set49{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"23:00"} - from{"18:00"} - } - midnight{ - at{"00:00"} - } - morning1{ - before{"12:00"} - from{"05:00"} - } - night1{ - before{"05:00"} - from{"23:00"} - } - noon{ - at{"12:00"} - } - } set5{ afternoon1{ before{"14:00"} @@ -2497,6 +2536,30 @@ dayPeriods:table(nofallback){ } } set50{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"23:00"} + from{"18:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"12:00"} + from{"05:00"} + } + night1{ + before{"05:00"} + from{"23:00"} + } + noon{ + at{"12:00"} + } + } + set51{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2528,35 +2591,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set51{ - afternoon1{ - before{"13:00"} - from{"12:00"} - } - afternoon2{ - before{"19:00"} - from{"13:00"} - } - evening1{ - before{"24:00"} - from{"19:00"} - } - midnight{ - at{"00:00"} - } - morning1{ - before{"08:00"} - from{"05:00"} - } - morning2{ - before{"12:00"} - from{"08:00"} - } - night1{ - before{"05:00"} - from{"00:00"} - } - } set52{ afternoon1{ before{"13:00"} @@ -2587,6 +2621,35 @@ dayPeriods:table(nofallback){ } } set53{ + afternoon1{ + before{"13:00"} + from{"12:00"} + } + afternoon2{ + before{"19:00"} + from{"13:00"} + } + evening1{ + before{"24:00"} + from{"19:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"08:00"} + from{"05:00"} + } + morning2{ + before{"12:00"} + from{"08:00"} + } + night1{ + before{"05:00"} + from{"00:00"} + } + } + set54{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2614,7 +2677,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set54{ + set55{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2642,7 +2705,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set55{ + set56{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2666,7 +2729,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set56{ + set57{ afternoon1{ before{"13:00"} from{"12:00"} @@ -2698,7 +2761,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set57{ + set58{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2722,7 +2785,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set58{ + set59{ afternoon1{ before{"15:00"} from{"10:00"} @@ -2746,28 +2809,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set59{ - afternoon1{ - before{"14:00"} - from{"12:00"} - } - evening1{ - before{"19:00"} - from{"14:00"} - } - morning1{ - before{"01:00"} - from{"00:00"} - } - morning2{ - before{"12:00"} - from{"01:00"} - } - night1{ - before{"24:00"} - from{"19:00"} - } - } set6{ afternoon1{ before{"13:00"} @@ -2798,6 +2839,28 @@ dayPeriods:table(nofallback){ } } set60{ + afternoon1{ + before{"14:00"} + from{"12:00"} + } + evening1{ + before{"19:00"} + from{"14:00"} + } + morning1{ + before{"01:00"} + from{"00:00"} + } + morning2{ + before{"12:00"} + from{"01:00"} + } + night1{ + before{"24:00"} + from{"19:00"} + } + } + set61{ afternoon1{ before{"16:00"} from{"12:00"} @@ -2825,7 +2888,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set61{ + set62{ afternoon1{ before{"18:00"} from{"12:00"} @@ -2857,7 +2920,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set62{ + set63{ afternoon1{ before{"17:00"} from{"12:00"} @@ -2889,30 +2952,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set63{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - midnight{ - at{"00:00"} - } - morning1{ - before{"12:00"} - from{"06:00"} - } - night1{ - before{"06:00"} - from{"21:00"} - } - noon{ - at{"12:00"} - } - } set64{ afternoon1{ before{"18:00"} @@ -2938,6 +2977,30 @@ dayPeriods:table(nofallback){ } } set65{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"21:00"} + } + noon{ + at{"12:00"} + } + } + set66{ afternoon1{ before{"18:00"} from{"11:00"} @@ -2961,7 +3024,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set66{ + set67{ afternoon1{ before{"13:00"} from{"12:00"} @@ -2991,7 +3054,7 @@ dayPeriods:table(nofallback){ from{"01:00"} } } - set67{ + set68{ afternoon1{ before{"16:00"} from{"12:00"} @@ -3020,7 +3083,7 @@ dayPeriods:table(nofallback){ from{"03:00"} } } - set68{ + set69{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3044,30 +3107,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set69{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - midnight{ - at{"00:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"21:00"} - } - noon{ - at{"12:00"} - } - } set7{ afternoon1{ before{"18:00"} @@ -3094,6 +3133,30 @@ dayPeriods:table(nofallback){ } } set70{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"21:00"} + from{"18:00"} + } + midnight{ + at{"00:00"} + } + morning1{ + before{"12:00"} + from{"04:00"} + } + night1{ + before{"04:00"} + from{"21:00"} + } + noon{ + at{"12:00"} + } + } + set71{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3117,7 +3180,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set71{ + set72{ afternoon1{ before{"16:00"} from{"12:00"} @@ -3145,7 +3208,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set72{ + set73{ afternoon1{ before{"13:00"} from{"10:00"} @@ -3167,7 +3230,7 @@ dayPeriods:table(nofallback){ from{"19:00"} } } - set73{ + set74{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3191,7 +3254,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set74{ + set75{ afternoon1{ before{"14:00"} from{"12:00"} @@ -3220,7 +3283,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set75{ + set76{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3244,7 +3307,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set76{ + set77{ afternoon1{ before{"24:00"} from{"12:00"} @@ -3257,7 +3320,7 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set77{ + set78{ afternoon1{ before{"14:00"} from{"12:00"} @@ -3283,7 +3346,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set78{ + set79{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3303,16 +3366,6 @@ dayPeriods:table(nofallback){ at{"12:00"} } } - set79{ - am{ - before{"12:00"} - from{"00:00"} - } - pm{ - before{"24:00"} - from{"12:00"} - } - } set8{ afternoon1{ before{"18:00"} @@ -3339,6 +3392,16 @@ dayPeriods:table(nofallback){ } } set80{ + am{ + before{"12:00"} + from{"00:00"} + } + pm{ + before{"24:00"} + from{"12:00"} + } + } + set81{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3356,7 +3419,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set81{ + set82{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3374,7 +3437,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set82{ + set83{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3392,7 +3455,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set83{ + set84{ afternoon1{ before{"14:00"} from{"12:00"} @@ -3417,7 +3480,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set84{ + set85{ afternoon1{ before{"13:00"} from{"12:00"} @@ -3443,29 +3506,29 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set85{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"24:00"} - from{"18:00"} - } - morning1{ - before{"10:00"} - from{"05:00"} - } - morning2{ - before{"12:00"} - from{"10:00"} - } - night1{ - before{"05:00"} - from{"00:00"} - } - } set86{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"24:00"} + from{"18:00"} + } + morning1{ + before{"10:00"} + from{"05:00"} + } + morning2{ + before{"12:00"} + from{"10:00"} + } + night1{ + before{"05:00"} + from{"00:00"} + } + } + set87{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3487,7 +3550,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set87{ + set88{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3509,7 +3572,7 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set88{ + set89{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3527,24 +3590,6 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set89{ - afternoon1{ - before{"19:00"} - from{"12:00"} - } - evening1{ - before{"24:00"} - from{"19:00"} - } - morning1{ - before{"12:00"} - from{"06:00"} - } - night1{ - before{"06:00"} - from{"00:00"} - } - } set9{ afternoon1{ before{"18:00"} @@ -3571,6 +3616,24 @@ dayPeriods:table(nofallback){ } } set90{ + afternoon1{ + before{"19:00"} + from{"12:00"} + } + evening1{ + before{"24:00"} + from{"19:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"00:00"} + } + } + set91{ afternoon1{ before{"13:00"} from{"12:00"} @@ -3592,7 +3655,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set91{ + set92{ evening1{ before{"20:00"} from{"12:00"} @@ -3610,7 +3673,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set92{ + set93{ evening1{ before{"20:00"} from{"12:00"} @@ -3624,7 +3687,7 @@ dayPeriods:table(nofallback){ from{"20:00"} } } - set93{ + set94{ afternoon1{ before{"13:00"} from{"12:00"} @@ -3650,7 +3713,7 @@ dayPeriods:table(nofallback){ from{"21:00"} } } - set94{ + set95{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3668,7 +3731,25 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set95{ + set96{ + afternoon1{ + before{"18:00"} + from{"12:00"} + } + evening1{ + before{"22:00"} + from{"18:00"} + } + morning1{ + before{"12:00"} + from{"06:00"} + } + night1{ + before{"06:00"} + from{"22:00"} + } + } + set97{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3686,7 +3767,7 @@ dayPeriods:table(nofallback){ from{"22:00"} } } - set96{ + set98{ afternoon1{ before{"18:00"} from{"12:00"} @@ -3704,42 +3785,6 @@ dayPeriods:table(nofallback){ from{"00:00"} } } - set97{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"21:00"} - } - } - set98{ - afternoon1{ - before{"18:00"} - from{"12:00"} - } - evening1{ - before{"21:00"} - from{"18:00"} - } - morning1{ - before{"12:00"} - from{"04:00"} - } - night1{ - before{"04:00"} - from{"21:00"} - } - } set99{ afternoon1{ before{"18:00"} @@ -3751,10 +3796,10 @@ dayPeriods:table(nofallback){ } morning1{ before{"12:00"} - from{"06:00"} + from{"04:00"} } night1{ - before{"06:00"} + before{"04:00"} from{"21:00"} } } diff --git a/intl/icu/source/data/misc/genderList.txt b/intl/icu/source/data/misc/genderList.txt index e88421b0e9b7..bd6d23894568 100644 --- a/intl/icu/source/data/misc/genderList.txt +++ b/intl/icu/source/data/misc/genderList.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml genderList:table(nofallback){ genderList{ af{"neutral"} @@ -30,6 +31,7 @@ genderList:table(nofallback){ ja{"neutral"} kn{"neutral"} ko{"neutral"} + lij{"maleTaints"} lt{"maleTaints"} lv{"maleTaints"} ml{"neutral"} diff --git a/intl/icu/source/data/misc/icuver.txt b/intl/icu/source/data/misc/icuver.txt index b113370ea94b..f5a5baca890b 100644 --- a/intl/icu/source/data/misc/icuver.txt +++ b/intl/icu/source/data/misc/icuver.txt @@ -1,13 +1,14 @@ -// Copyright (C) 2016 and later: Unicode, Inc. and others. +// © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml // *************************************************************************** // * // * Copyright (C) 2010-2016 International Business Machines // * Corporation and others. All Rights Reserved. // * // *************************************************************************** - -icuver:table(nofallback){ - DataVersion { "67.1.0.0" } - ICUVersion { "67.1.0.0" } +icuver:table(nofallback){ + CLDRVersion{"38.1"} + DataVersion{"68.2.0.0"} + ICUVersion{"68.2.0.0"} } diff --git a/intl/icu/source/data/misc/keyTypeData.txt b/intl/icu/source/data/misc/keyTypeData.txt index 33733aef0591..8caeacfab764 100644 --- a/intl/icu/source/data/misc/keyTypeData.txt +++ b/intl/icu/source/data/misc/keyTypeData.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml keyTypeData:table(nofallback){ bcpTypeAlias{ ca{ @@ -14,6 +15,7 @@ keyTypeData:table(nofallback){ } valueType{ ca{"incremental"} + dx{"multiple"} h0{"single"} kr{"multiple"} vt{"multiple"} @@ -35,6 +37,7 @@ keyTypeData:table(nofallback){ colstrength{"ks"} currency{"cu"} d0{""} + dx{""} em{""} fw{""} h0{""} @@ -492,6 +495,9 @@ keyTypeData:table(nofallback){ upper{""} zawgyi{""} } + dx{ + SCRIPT_CODE{""} + } em{ default{""} emoji{""} diff --git a/intl/icu/source/data/misc/langInfo.txt b/intl/icu/source/data/misc/langInfo.txt index 068b5e709dcc..90f1b8a3c1b5 100644 --- a/intl/icu/source/data/misc/langInfo.txt +++ b/intl/icu/source/data/misc/langInfo.txt @@ -1,11 +1,13 @@ -// © 2019 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -// Generated by ICU4J LocaleDistanceBuilder. +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml langInfo:table(nofallback){ likely{ - languageAliases{ // 169 + languageAliases{ "aam","aas", "adp","dz", + "agp","apf", + "ais","ami", "aju","jrb", "alb","sq", "als","sq", @@ -17,11 +19,16 @@ langInfo:table(nofallback){ "ayx","nun", "azj","az", "baq","eu", + "baz","nvo", "bcc","bal", "bcl","bik", "bgm","bcg", "bh","bho", + "bhk","fbl", "bjd","drl", + "bjq","bzc", + "bkb","ebk", + "btb","beb", "bur","my", "bxk","luy", "bxr","bua", @@ -36,14 +43,23 @@ langInfo:table(nofallback){ "cqu","quh", "cwd","cr", "cze","cs", + "daf","dnj", + "dap","njz", "dgo","doi", "dhd","mwr", "dik","din", "diq","zza", "dit","dif", + "djl","dze", + "dkl","aqd", "drh","mn", + "drr","kzk", + "dud","uth", + "duj","dwu", "dut","nl", + "dwl","dbt", "ekk","et", + "elp","amq", "emk","man", "esk","ik", "fat","ak", @@ -51,11 +67,16 @@ langInfo:table(nofallback){ "fuc","ff", "gav","dev", "gaz","om", + "gbc","wny", "gbo","grb", "geo","ka", "ger","de", "gfx","vaj", "ggn","gvr", + "ggo","esg", + "ggr","gtu", + "gio","aou", + "gli","kzk", "gno","gon", "gre","el", "gti","nyc", @@ -69,13 +90,18 @@ langInfo:table(nofallback){ "ibi","opa", "ice","is", "ike","iu", + "ill","ilm", "ilw","gal", "in","id", "iw","he", + "izi","eza", + "jar","jgk", "jeg","oyb", "ji","yi", "jw","jv", + "kdv","zkd", "kgc","tdf", + "kgd","ncq", "kgh","kml", "khk","mn", "kmr","ku", @@ -83,15 +109,19 @@ langInfo:table(nofallback){ "kng","kg", "knn","kok", "koj","kwv", + "kpp","jkm", "kpv","kv", "krm","bmf", "ktr","dtp", "kvs","gdj", "kwq","yam", "kxe","tvd", + "kxl","kru", + "kzh","dgl", "kzj","dtp", "kzt","dtp", "lbk","bnc", + "leg","enl", "lii","raq", "llo","ngt", "lmm","rmx", @@ -100,21 +130,31 @@ langInfo:table(nofallback){ "mao","mi", "may","ms", "meg","cir", + "mgx","jbk", "mhr","chm", "mnk","man", + "mnt","wnn", "mo","ro", + "mof","xnt", "mst","mry", "mup","raj", + "mwd","dmw", "mwj","vaj", "myd","aog", "myt","mry", "nad","xny", + "nbf","nru", + "nbx","ekc", "ncp","kdz", + "nln","azd", + "nlr","nrk", "nns","nbr", "nnx","ngv", "no","nb", + "noo","dtd", "npi","ne", "nts","pij", + "nxu","bpp", "ojg","oj", "ory","or", "oun","vaj", @@ -131,20 +171,28 @@ langInfo:table(nofallback){ "pry","prt", "puz","pub", "quz","qu", + "rmr","emx", "rmy","rom", "rum","ro", + "sap","aqt", "sca","hle", "scc","sr", "scr","hr", + "sgl","isk", "skk","oyb", "slo","sk", "spy","kln", "src","sc", + "sul","sgd", + "sum","ulw", "swh","sw", "tdu","dtp", + "tgg","bjp", "thc","tpo", + "thw","ola", "thx","oyb", "tib","bo", + "tid","itd", "tie","ras", "tkk","twm", "tl","fil", @@ -155,685 +203,34 @@ langInfo:table(nofallback){ "ttq","tmh", "tw","ak", "umu","del", + "unp","wro", "uok","ema", "uzn","uz", "wel","cy", + "wgw","wgb", + "wit","nol", + "wiw","nwo", "xba","cax", "xia","acn", "xkh","waw", "xpe","kpe", + "xrq","dmw", "xsj","suj", "xsl","den", "ybd","rki", "ydd","yi", + "yen","ynq", + "yiy","yrm", "yma","lrr", "ymt","mtm", "yos","zom", "yuu","yug", "zai","zap", + "zir","scv", "zsm","ms", "zyb","za", - } // languageAliases - regionAliases{ // 38 - "062","034", - "172","RU", - "200","CZ", - "230","ET", - "280","DE", - "532","CW", - "582","FM", - "736","SD", - "830","JE", - "886","YE", - "890","RS", - "AN","CW", - "BU","MM", - "CS","RS", - "CT","KI", - "DD","DE", - "DY","BJ", - "FQ","AQ", - "FX","FR", - "HV","BF", - "JT","UM", - "MI","UM", - "NH","VU", - "NQ","AQ", - "NT","SA", - "PC","FM", - "PU","UM", - "PZ","PA", - "QU","EU", - "RH","ZW", - "SU","RU", - "TP","TL", - "UK","GB", - "VD","VN", - "WK","UM", - "YD","YE", - "YU","RS", - "ZR","CD", - } // regionAliases - trie:bin{ // BytesTrie: 9865 bytes -001a6dcc1474c4ef77c26977a2b978a4 -5479a4c47a0f6d7f7a5b7a30e1ad9be8 -2ef5af3e10e1a53a022a3c42cc254811 -616e01e2a3fef4a3f90b4d24540e54ca -cc552a5610cea3fc10d3a3fb4dcad550 -2a5310d2a3f702c1a3f6c6a3f4c8a3f5 -47d4e2473248d81e3a4910c4a3f101c2 -a3fac6a3ef6d326e36733a7910e2ad9b -10e9af3c10e5af3d10ed22022aa90f43 -b6064910c4a9116817683269366b3a6c -10edaf3b10f8adb810e1af3a10f4ad96 -61326436653a6710e8adc710e7af3710 -eaaf3810e1af3900126d46741b743475 -387742e1adebefaf0210edaf0701f5af -08f6af0910e1af0a6d3c6e406f50725a -7301e7ad87ebaf0610efadfe02e3adff -e9af00f5af0101e2af03f3af0410f3af -0567266736683a693e6a4e6c10f3adfd -10e9adf610e7adf702e2adf8f5adf9f6 -adfa01e1adfbe9adfc61386254636465 -01eca521f2adf504e5adeceaadedecad -eeeeadeff2adf002f0adf1f1adf2f2ad -f310e9adf40c6e3d7221722e7332774e -e8af0e10e2af1404e1adbfe9af15eca5 -30edaf16f2af1710e5af186e346f3e70 -01e5a78ff2adbc01e1adb6f2af1101e7 -af12eeaf13651d653a6c3e6d02e6af10 -eeadacf2adaf10f3af0d02e1af0fe3ad -a8e4ada9613462386301efad76f2ad75 -10f6af0b10e9af0c0d6d497330733075 -34e9a735efaf2b10f3af3004e1af31e5 -32eaaf34f4af35f7af36012a2e481261 -6ef3af33012aaf324310ceaf336d3a6f -3e7202e2af2de5af2eecaf2f10ecaf2a -10eeaf2c6520653e67426b4c6c02e5af -27e7af28ecaf2910f2af2301f2af24f7 -af2510efaf26612e62606410e4a73507 -f40cf4af1cf6af1df9af1efaaf1feda7 -b9efaf19f0af1af3af1b02e1af20e2af -21f9af2274a25275a4d0760a6f1fe509 -e5addee9ad62efade66f3472387501ee -ade9f4adea10f4ade710efade8613c65 -4c69566c606d01e6ade4f7ade502e7ad -dce9adcceeaddd01e3addff0ade001e3 -ade1f6ade210f3ade300267576e91ff2 -0ef2abc8f3abccf4abd2f767f9abe2e9 -abadebabb4ecabb8eeabbeefabc07a24 -7a36e1ab8ce5ab9ee72ee8aba910edab -e5012a2e41127261e2aba5012aaba450 -10cbaba5753e7654776478ccf87901e1 -abe3f6abe403e8abd9ecabdaedabdbf1 -abdc02e4a7bcecabddf5abde01e8abdf -f1abe06b7d7049705e716e7272738274 -06f10cf1abbcf2abd6f3abd7f4abd8e4 -abd3e5abd4eaabd502e9abc4edabc5fa -abc610efabc702f5abc9f6abcaf7abcb -04e4abcde6abcee7abcfeaabd0f7abd1 -6b426c526d626e6c6f02e6abc1e7abc2 -f1abc302ecabb5f2abb6f4abb702e6ab -b9f8abbaf9abbb01e8abbcf9abbd10e8 -abbf6546655e6674677868886906eb0c -ebabb0edabb1efabb2f6abb3e2a3b1e6 -abaee7abaf03e4ab9fedaba0efaba1f4 -aba210e9aba302e3aba6efaba7f5aba8 -02ecabaaf1ababf2abac6144625a6386 -6403e4ab9ae7ab9be8ab9cf5ab9d03ea -ab8decab8eeeab8ff1ab9006e70ce7ab -94efab95f7ab96faab97e3ab91e4ab92 -e6ab9301e9ab98f9ab990f735fe72ce7 -42ebabecf2ad4afa012a8641127261e2 -adda012a2e43127972ecabe9022aabe8 -4b2a4d10ceabea10daabe97360746476 -687a10ee012a2e41127261e2adda022a -abf7412a4310ceaddb10c6adda10e1ad -d610f2add701e8add8ecadd96d326d3e -6e426f707202e9add3f4add4f7add510 -e2abee01f226f8add1012a2e44126576 -e1add0012aadcf4e10d0add010ebadd2 -62326436673a6c10e9abed10f5abe610 -edabe710e1abeb70c39570a4f971a6d7 -72a6e47300287884ec39f229f509f5ab -7bf6ab81f7ab82f22cf3ab74f4ab7822 -032aab2e4da4bf522a5410d2ab3201cf -ab31d5ab2fecab56edab5beeab62efab -68f16de429e438e5ab3ee7ab43e9ab4c -ebab52032aab3844324b3a5312696ee4 -ab3b126576e1ab3912686feaab3a7834 -793e7a48e1ab22e3ab2d01eeab88f7ab -8901ecab8af2a50d10ecab8b6cad724f -725873747484758e7705e809e8ab82f0 -ab86f6ab87e2ab83e3ab84e7ab8504e2 -ab71e3ab2deeab72f2ab73f8a5f302e4 -ab75e7ab76f9ab7701ebab79f1ab7a04 -e1ab7ce5ab7debab7ef2ab7ff3ab806c -4a6d666e8c6fa2437003e4ab6eecab6f -f3ab70f9a77604e4ab57e9ab58ecab59 -efab52f9ab5a05f009f0ab5ff1ab60f3 -ab61e1ab5ceaab5deeab5e04e3ab63eb -ab64f0ab65f8ab66f9ab6704e7ab69eb -ab6af1ab6bf5ab6cf9ab6d673e674268 -58696e6a846b02e3ab53f2ab54f3ab55 -03e1ab44f3ab45f7ab46faab4703e9ab -48ebab49eeab4af5ab4b03e4ab4de7ab -4eecab4fedab5010f2ab51614a627663 -8664a26b6503e6ab3fe8ab40e9ab41f3 -ab4206f30cf3ab26f4ab27f6ab28faab -29e6ab23e8ab24f1ab2502e1ab2ae5ab -2bf0ab2c06ee0ceeab35efab36f2a701 -f3ab37e32cebab33ecab342205521152 -2e53325410d2ab3210cfab3110d5ab2f -2aab2e312a4d10c5ab301137b2ab2f01 -e3ab3ce8ab3d00166e63752bec09eca9 -edf3a9def4a9fa754c7750e1012a2e41 -127261e2a9d6012aa9d55010cba9d610 -f5a9fc10e1a9fd7217722e733e7410f0 -a9fb02e1a9f6e4a9f7e7a9f810f3a9f9 -6e346f4a7001e1a9f4efa9f503e2a7cd -e7a9f0eea9f1f4a9f210eea9f366306b -176b2e6c386d10f3a9ef01e1a9ebefa9 -ec01e1a9eef4a930663468386901eca9 -e9f0a9ea10eca9e601eca9e7eea9e861 -4e627e638864926504e4a9e3efa9e4f2 -a571f3a571f8a9e504e7a9d7ec32eda9 -daf0a9dbf5a9dc012aa9d85012686cf0 -a9d901e9a9ddf5a9de01e4a9dfeda9e0 -01e3a9e1f4a9e2017526f5a9fe02e3a9 -ffe7ab00faa9fe00146f457917ef09ef -a94df5ab1bf7ab1e792cedab0eeeab13 -10f5ab216f3c724c745075547701ebab -1fefab2002e2ab16e6ab17efab1810ef -ab1910edab1a02e5ab1ce7ab1deda94d -6934693c6a566b5a6d5e6e01e1ab14e7 -ab1501e1ab09e622012aab0a4e10ccab -0b10f3ab0c10f4ab0d03e6ab0fefab10 -f4ab11f5ab1261366346654a675a6810 -e7ab0802e9ab01eaa962efab0210e6ab -0302eaab04ecab05f3ab0610eeab076d -a2576ea6446f0b741ded09eda5a2f2a9 -cdf3a9d0742a7a34e3a9c501e1a9d2eb -a9d310eda9d47017702e72327310e1a9 -d110eda9cc02efa9cef5a9cff9a9cd67 -3a6b3e6e02e7a9c9eea9caf3a9cb10e3 -a9c601f2a9c7f6a9c80022749fe926ef -0fefa94df2a958f3a492f4a95cf9a3ce -e9a90ceba906eca942ee012abad44d12 -6f6ee7a541783d7834793e7a64e7a930 -e8a93601e3a96beda96c05f709f7a970 -f8a971faa972eba96deda96ef6a96f05 -f009f0a976f7a977faa978eba973eda9 -74eea9757444755a76707703eba968f2 -a538f6a969f7a96a03e3a95de6a95ee9 -a95ff2a96003e1a961f0a962f2a963f3 -a96402e1a965eea966f9a96769856e44 -6e426f5e707a71907202e4a959eaa95a -efa95b04e1a949e6a94ae9a94bebb622 -f7a94c04e1a94ee5a94fe8a950f3a951 -f8a95203f0a953f3a954f4a955f8a956 -10eca957693e6b686c7e6d02efa946f5 -a947f8a94803e6a939eea93af326f7a9 -3d012aa93b4d126564e6a93c03e9a93e -eca93ff0a940f7a94102e5a943f0a944 -f3a9456549653e666a67866802e9a937 -eca938f2a50006ee0ceea927f2a928f4 -a929f5a92ae4a924e5a925eba92604e1 -a92be5a92ceea92defa92ef1a92f04e8 -a931eca932efa933f0a934f9a935615e -62a25663a2636406e80ce8a920eaa921 -f2a922f8a923e1a91de5a91ee6a91f0b -ee23f718f7a90ef926faa91222022aa9 -0f432a4910c4a91110c3a910eeb433ef -a90cf3a90de709e7a909e9a90aeba90b -e3a906e4a907e6a90804e8a913efa914 -f1a915f5a916f7a91704e9a918f0a919 -f1a91af2a91bf5a91c0021745fe41dee -0feea9a3efa9a9f2a9b0f6a9bdf9a9c1 -e4a988e5a98be7a990eca54d79157930 -7a3ae1a979e2a98101eda9c2eea9c310 -e9a9c474387542775e7801f1a9bff2a9 -c001eda9b6f2a9b704e9a9b8f0a9b9f3 -a9baf6a9bbf8a9bc10e2a9be6a5d6f32 -6f4870647168726c7303eba9b2eea9b3 -efa9b4f3a9b504e4a9aae5a9abeea9ac -f0a9adf5a9ae10e9a98b10efa9af10e2 -a9b16a4a6b4e6d586e04e6a9a4e8a9a5 -eba9a6eda9a7f0a9a810efa99e01e7a9 -9fefa9a001e7a9a1faa9a26637665a67 -5e686e6906ee0ceea99af5a99bf9a99c -faa99de6a997e9a998eaa99910f2a98f -02e1a991e2a992eca99302e2a994e5a9 -95f7a996613e636a64906502e2a98cf7 -a98df8a98e06ee0ceea97df0a97ef1a9 -7ff3a980e3a97ae6a97beba97c05e809 -e8a985efa986f5a987e1a982e5a983e6 -a98401e3a989f3a98a66c75b69c49769 -a4166aa4c46ba60e6c001b744ae717ef -0cefa7f4f4a7fcf5a7fef6a902e7a7de -e9a7e0eea7f1771577307a34e1a7c9e2 -a7d010eca90301e8a904faa905742e75 -327610f3a90210e7a7fd03e1a7ffefa9 -00f9a3d5faa9016a4a6d316d326e426f -4c7210e3a7fb02eea7eeefa7eff0a7f0 -01f3a7f2f5a7f305f209f2a7f8f3a7f9 -faa7faeaa7f5eba7f6eca7f76a346b38 -6c01e5a7eceea7ed10f0a7e901e9a7ea -f4a7eb6448646c6570679c6906e70ce7 -a7e5e8a7e6eaa7e7f3a7e8e1a7e1e4a7 -e2e6012aa7e34c12696de2a7e410e2a7 -d606f00cf0a7daf1a7dbf5a7dcfaa7dd -e4a7d7e5a7d8eda7d910e7a7df613462 -5a6301eda7d4f0a7d505e809e8a7cdea -a7cef3a7cfe2a7cae4a7cbe7a7cc02e5 -a7d1f5a7d2f7a7d300197739eb17f30c -f3a70ff4a727f5a71bf7a728eba569ee -a722efa724e409e4a711e7a716e9a719 -772a7a34e1a70801eda729f3a72a01e8 -a72be9a72c6a366d176d326e366f3a72 -10e9a72610efa72110e8a72310f5a725 -6a2e6b326c10efa72010eaa71a04e5a7 -1beba71cf4a71df7a71ef8a71f641a64 -3466446701e2a717e5a71802e4a712e9 -a713f5a71410e5a715613a62446302e1 -a70ee5a70fe8a71001eea709f2a70a02 -e1a70be2a70cf9a70d0b721ae909e9a7 -35f6a73bf7a73c722a752ee1a72d10e1 -a73910f4a73a67176734693e6d01e3a7 -37eca73801eba733efa73410e2a73661 -2e62386510eea73201e2a72eeda72f01 -efa730f5a731002875c0f1eb7ef249f6 -28f6a793f7a7b6f9022a32414c4c1261 -74eea7c3022aa7c1432a5410d2a7c310 -cea7c2127261e2a7c2f2a786f33ef502 -2aa46941a46f5912657ae9a781012aa7 -9f44126576e1a7a0eb38eca775eda77a -eea785efa78a012a2e41127261e2a770 -042aa76e41324336493a4d10cea77210 -c6a76f10cea77010d2a7717a187a38e1 -a5b1e7a759e9a765eaa76902eaa7c6f2 -a7c7f4a7c8753c766e777e788e7901e5 -a7c4f8a7c507ed0ceda7afeea7b0f0a7 -b1f3a7b2e2a7abe4a7ace5a7adeaa7ae -02e7a7b3f2a7b4f8a7b502eaa7b7efa7 -b8f1a7b906ed0ceda7bdf0a7bef7a7bf -faa7c0e1a7bae3a7bbe5a7bc6bc0d570 -63704a7170728673a2457403e2a7a7ed -a7a8efa7a9f2a7aa05f209f2a792f6a7 -93f8a794e5a78fe6a790efa79103e2a7 -95e6a796f3a797f9a79805ec09eca79c -f3a79df5a79ee3a799e9a79aeaa79b05 -e809e8a7a4eaa7a5f2a7a6e2a7a1e4a7 -a2e6a7a36b506c5a6d706ea2576f04e9 -a78beba788eca78cf3a78dfaa78e01e3 -a773eaa77403eea776f1a777f4a778f8 -a77906f226f232f3a782f5a783f7a784 -022a3241405912657ae9a781012aa77e -4c10c2a77f127261e2a780e2a77be8a7 -7cefa77d04e3a786e6a787e7a759eea7 -88f0a789665266486758686869a06a03 -e4a76ae7a76bf3a76cf9a76d02efa756 -f2a757f9a75802e5a75ae6a75bf0a75c -08f10ff1a760f3a761f4a762f7a763fa -a764e1a75de2a75eebac8deea75f02ea -a766f5a767f7a76861446276639c64a2 -486502e1a753eea754faa75507e90ce9 -a741eaa742eda743efa744e1a73de2a7 -3ee3a73fe4a74005f109f1a748f8a749 -f9a74ae4a745eda746f0a74703e7a74b -eba74ceca74df4a74e03e5a74fe8a750 -eca751f4a75266a2bf67a47468001375 -43f20ff2a701f4a704f5a705f9a342fa -a7077534e138e5a5eae95cefa5fd10e9 -a70622032aa5e0372e43345310c4a5e1 -1133b6a5e110cda5e2012aa5ec4c1261 -74eea5ed6c386c3c6d466e506f6c7301 -e2a702eea70301e1a5f4f5a5f501e4a5 -f6f4a5f704e4a5f8e5a5f9eaa5faeea5 -fbefa5fc02e3a5feeaa5fff4a7006158 -62746478687c6905e809e8a5f1eca5f2 -eda5f3e1a5eee6a5efe7a5f004e7a5e3 -eba5e4eda5e5f7a5e6faa5e710e2a5e8 -10f9a5e910f9a5eb00117553e90fe9a5 -7beaa57fefa582f2a588f9a597754276 -94e1a571e6012aa5774112646ceda578 -09e80fe8a591f1a592f2a593f6a594f9 -a595e2a58de332e4a58ee5a58fe6a590 -012aa5774112646ceda57810f2a5966d -2f6d4e6f52706271667204e3a589e5a5 -88f0a58af2a58bf3a58c10f0a58102e4 -a583eea584f2a58510e5a58610f3a587 -6132665669606c10f2a58005e908e9a5 -75eea576f467e1a572e2a573e7a57401 -e9a579eda57a02e1a57ceca57df4a57e -001a6e9f791dec0ceca5bdeea5c1f5a5 -d1f6a5d9792ce1a598e4a5aa01e1a5a3 -e9a5df733a733e754276747702e3a5dc -e9a5ddf4a5de10f7a5d007f20cf2a5d5 -f7a5d6f8a5d7faa5d8e2a5d2e3a5d3e4 -a5d4e7a5c102e6a5daf2a5b4f3a5db6e -5a6f6a7204e2a5a6e332e5a55cf4a5ce -f7a5cf012aa5cc4c12696ee2a5cd02e4 -a5c2e7a5c3efa5c407ee0ceea5c4f2a5 -c9f3a5caf4a5cbe4a5c5e6a5c6e9a5c7 -eda5c867396a236a386b486c526d01ed -a5bff6a5c002eba5b8eea5b9f5a5ba01 -eea5bbf0a5bc10eba5be673468386901 -eca5b6eda5b710eea5b410f3a5b56428 -642e653e6610eba5b302e5a5abeea5ac -f2a5ad05ef09efa5b1f2a52efaa5b2e2 -a5aeeaa5afeca5b0612e626c6310f2a5 -a909ed0feda59eeea59ff7a5a0f9a5a1 -faa5a2e1a599e6a59ae7a59be8a59cea -a59d05ef09efa5a6f9a5a7faa5a8e1a5 -a3e6a5a4eda5a563c2f263a29d64a4fc -650011772dee19ee38efa565f3a567f4 -a55af5a366012aa56153126861f7a562 -77307834e5a555eca55c10efa56f10f4 -a5706d466d486e7a728473887403f2a5 -6bf4a56cf5a56df8a56e02e1a55de9a5 -5eeb012a2e4e126b6fefa560012aa55f -4710cea56001eea563f1a56410e9a566 -02e7a568eba569f5a56a623e66426746 -6b02e1a559eba55af9a55b10f5a55410 -e9a55601eca557f9a558001b725ce821 -f316f3a51af52cf6a520f9a521012aa5 -1e47126c61e7a51fe8a3ebefa510f2a5 -13771277307a34e1a3e1e5a3e710e4a5 -1310e5a51a722e73547410e4a51d05ec -09eca517eda518f3a519e8a514eaa515 -eba51601e2a51bf7a51c69526c306c32 -6d3c6f6c7010f3a51201e1a50ce4a50d -02e5a50ee7a50fee022aa26342a2b448 -11616e01e2a3fef4a3f910f0a5116940 -6a446b03e2a508eca509efa50af9a50b -10e3a50402e1a505eda506f6a5076595 -65a28666a28767a2886805ef09efa501 -f0a502f2a503e92ceba3ffeda500022a -3c42a25f4811616e01e2a3fef4a3f90b -4d335417542e55385610c4a3fc01c8a3 -f8d7a3f901cba3fad3a3fb4d2e503853 -10d2a3f701cfa3f2d9a3f302c6a3f4c8 -a3f5daa3f6470e473048b4674910c4a3 -f110c6a3ef2aa3ec412a4210cea3ee10 -d5a3ed126f70efa3fd10e2a3e810e1a3 -e910e7a3ea6134623e6301e8a3e5f0a3 -e601e4a3e2eea3e310eaa3e40016726f -791ce508e5a52ef6a54efa45792a7a34 -e1a52201efa551f5a55210e7a553751d -752e764a7710f7a55004e1a549e3a54a -e4a54be7a54cf4a54d10e1a54f724073 -747403eda545f0a546f3a547f9a54802 -e82ce9a542f3a543012a2e4d126f6ee7 -a541012aa5404310cea54110e2a54467 -446a1a6a406e446f03e2a53de9a535f0 -a53ef7a53f10e5a53b10eaa53c673468 -606901e1a539f1a53a06ec0ceca534ef -a535f2a536faa537e1a531e8a532e9a5 -3310e4a538613c6268637264766501e4 -a52feea53006e80ce8a526eba527f2a5 -28f6a529e4a523e6a524e7a52501e4a5 -2af1a52b10e3a52c10eea52d2aa4f761 -be9d62002373a5e51ded0feda3a8eea3 -adefa3b1f2a3baf3a3bfe5a37ce7a389 -e8a38de9a39377417732783c794c7a72 -e1a36201e4a3d2f2a3d302e8a3d4eba3 -d5f2a3c705f309f3a3d9f6a3daf8a3db -e5a3d6eea3d7f2a3d804e1a3dce5a3dd -e6a3dee8a3dff7a3e073327448755876 -10e2a3d103eaa3c0f1a3c1f3a3c2f4a3 -c302efa3c4f4a3c5f6a3c609ed0feda3 -ccefa3cdf2a3cef3a3cff5a3d0e1a3c7 -e3a3c8e4a3c9e7a3caeba3cb6a7d6e3b -6e486f587068716c7203e1a3bbe8a3bc -f8a3bdfaa3be02e7a3aeeda3aff0a3b0 -02eaa3b2eda3b3eea3b410f9a3b503e3 -a3b6e9a3b7f0a3b8f6a3b96a466b786c -a4ab6d03e8a3a9eba3aaf1a3abf5a3ac -07ef0cefa39ef2a39ff4a3a0faa3a1e8 -a39ae9a39beaa39ceea39d04e3a3a2ed -a3a3f1a3a4f5a3a5f6a3a6656a656266 -9467a24468a24b6906ed0ceda396eea3 -97efa398f1a399e2a394e7a395eba375 -07f40cf4a381f7a382f8a383faa384e6 -a37de8a37eeaa37feda38003e4a385f1 -a386f4a387f9a38802e3a38aeea38bf8 -a38c05ec09eca391efa38df9a392e2a3 -8ee7a38fe9a3906132626463906410e4 -a37b07f20cf2a367f3a368f6a369f8a3 -6aeca363eea364f0a365f1a36606e40c -e4a36eeaa36ff0a370f2a371e1a36be2 -a36ce3a36d09ed0feda376eea377efa3 -78f1a379f5a37ae3a363e6a372e8a373 -e9a374eca37500184dc26554c0ca5736 -5736584e59645a12616ee2adce01612c -631168efa9a81172e1adcd01702a7311 -75f8691165efa9e401652c691169e9a7 -19117ae9a781543455a28756126169e9 -adcc056746674a68506901622a7210e8 -adcb10f4012aa3b14210d445116ce7ad -c8106101e158e9042aaba943324b364c -3a5410c8aba910cea7d510c8adc910c1 -adca012aa54e4d10d6a54e6130657c66 -116ee7adc7056d116d2e6e327610f4a3 -a710ecab8c10e7abe167346b386c01e5 -ab9af5a75e10e2adc510f2adc6116cf5 -ab9e126761f2abeb50c0c350a27252a2 -a85306694369426f6a759079016c2a72 -10e3a50d10efadc401643e6e01e4ab3b -e8012aab4c4c10cbab4c10e4adc10267 -2e72387910efa50f01e4ab69efadc210 -e1ab71116ee4adc3613e675e6801612a -7210e4adc010f7a562026d2e72327510 -f2ab2910f2ab5f10e2adbf116ef7a34b -046138654a68506c76721174e9adbc01 -6c2a7510e3a51d10eda11172edadba02 -612e6c326e10f8a9e810e7adbb01e9a9 -d8f0a9d91172e4a5f6026a306f367511 -6ef2a9ac116ee7adbd1168e7adbe4d7c -4ea2a44f0367426c48724e7301672a6d -10e1adb910e5a9d11161edab441163eb -ab27016b2a7910e1a9cd10e8a9d30772 -2e725a7460756679116df2032aa3ce49 -2e4d325410c8adb410cea76210cda3ce -116fefa95b1165e9adb2116cf4adb361 -4265746c9a6f01642a6e10e7a54110e9 -adb10368326b366e3a7210e3adad10ea -adaa10e1adab01e4a972e9adac026434 -6e387201e3adafefadb010e6a93c10e4 -adae1179eda942046138624c65506b56 -731168f5adb8016e2a7210e2adb610e4 -adb51161f49f1177e1adb7116fefa560 -47c4154ac3294aa6ba4ba6d34c036146 -65a69669a6987901632a6410e9ada910 -e9ada8026ea6736fa6747410ee001a4b -c139545b571457ac6958ac6d59305a01 -c1abf3d7ab6210d4ad66544055825603 -c1ad61c5ad63cead62d5a3930bce14d6 -09d6abddd7abcadaab82ceada6cfabc0 -d2abc8cbc5cdcbabb5ccad5dcdabb404 -c1ada7c7ad5fd3a561d9ad60daabf74e -824e8a50a24a52a26d530cce17d40cd4 -ad57d5a79cd6ad58d9ada5cead55cfab -68d2ad56ca09caad53cbab52cdad54c3 -ad52c5ab81c9ab5606c70cc7abefc9ad -45cca54dcfa981c1ad42c3ad43c5ad44 -0acc14d409d4ad4ed7a9dcd9a5c1cca9 -edcdad4bd2ad4cc1ad47c5ad48c6ad49 -c7abc4c8a57d03c5ad51cfa94dd5a79c -d7ab1e4b9e4ca2434d0010cd1dd40fd4 -a95cd5a92cd8abf1d9a90fdaad41cda7 -3fcfada3d1ad3fd2ada4c60cc6ad3ec7 -a930cbada2cca3a8c1ada1c3ad3cc4ad -3dc5ab3001c5ad31cdada004c9ad37d3 -ad38d4a7fcd5ad39d6a90243bd465f46 -4c475c48a2484904c3ad2ec4a711d2ad -9fd3a70fd4a72702c9a57bcfa582d2a5 -880cce17d30cd3ad29d4ad2ad5abf6d7 -ad2bcead26d0ad27d1ad28c608c6ad25 -c867cca775c1ad24c2abf9c5ad9e04cd -ad2ccead2dd2a701d4a704d5a7054352 -44a2424505d309d3a567d4ad98daad23 -c1ad1fc3ad20c5a55a0fcf1ad60cd6ad -1ad7abfbd9ad9cdaa51acfad17d0ad18 -d2ad19d5abf4c9c68bc9ad14ccad15cd -ad16cead9b05cb09cba522cfad1ddaad -9dc5a52ec7ad50caad1c345e34ae8641 -78420bce14d209d2a9fad5a73fd6ad10 -cead0dcfad0ed1ad0fc909c9ab13caad -0bccad0cc1a3bfc5ad08c6ad090cd217 -d50cd5abf0d7ad06d8ad07daa35ed2ad -03d3ad04d4ad05cd09cdad9acfad01d1 -ad02c4abfec6ad99cc6d2aa561312c32 -1133b0ad981137b2a79c10e1a9aa10ef -012aa7f44c10c1a7f41170e3a7da026d -2e6e327310f5a7e810e2a7e401e1a7ca -e2a5cd01613a701161ee012aa72d4a10 -d0a72d016d2a7610e1ad9410efad9305 -6e1e6e306f36741168e9ad971164e1a7 -851172e5012aa78a4b01d0ad33d2a78a -61306844691174f3ad96016c2a6e10e1 -ad9510e9a55b02612e6d326f10eaab3a -10f2a9f610f2012aa77a4b10c8a77a47 -3448a25c49127461eca56c0465466c5a -6f60727a75016a2a7210f5a9d510f2a5 -d1116ff2012aa5b14710c5a5b11161e7 -a51f016e2a7410e8a5cb01e7ad87eda5 -680161506510eb032aa55c432e473254 -10d2a38c10d9ad1b10d2a55c10eead88 -056c186c306d3675116ee7ad921175f7 -a5f5106e01e7a5faf0a96a6130659c69 -1172e1ad91016e2a7410f2a93b05ef24 -efad8bf34cf4032aa3f9482e4d325410 -d7a3f910cba3f010cfa3f2012aa3ec43 -10cea3ece2a3fee7ad89e9ad8a1162f2 -054917493a533e5502c1ad8fcbad8dd3 -ad9010cca5ea10c5ad8e2aa5ea432a47 -10c2ad8d10c1ad8c43c106437044a2bf -450267406c46741168e9012a754501d2 -ad22d4751179f0a55801622a7910edad -8610e1ad850461a26868a2776fa28670 -a288791172ec0a4d335414542e553858 -10cbad7e01caaba4d2ad7d10c1abec4d -2e523e5310cbad7c02c4ad7acba906ce -a54002cfad7bd3ab2ed5ab1b2aab1b41 -38423c474c4b01c7a7c1daad3510ccad -7702c1ad78c7a389d9a37c01c52dd2ad -79026b2e6e327210e9ad7510eda3e610 -f3a51302612e65327210f3ad7610eda5 -0610f2a5031170f4a5111172f4a5cc03 -653469866f8c751170ecad841176e106 -491749324d364e3a5010cba3c610cea5 -ec10d5ad8110d0a98b2aa5ec422a4610 -caad8010d4ad7f1161ebad821167f2ad -832aa25441aa3142056f1f6f3e724475 -01672a6810e4ad7410e9ad731170efa3 -fd106101e8a9ebe9ad726130655c6811 -6bf3ad71036c326d36733a7410ebad70 -10e9ad6f10f5a36a10f3a3c1116ee701 -2aa3ad4210c4a3ad00214ac1c052c0cc -5638563c5758586259665a01d2abf2d7 -ab6204c1ad61c4ad62c5ad63cead62d5 -a39301c6ad64d3ab5b10cbad6503c4ab -fdc5abfdd4ad66d5ab2e5246536c54a2 -575503c1abecc7ad5fd9ad60daabf705 -d309d3ab2ed5ab1bd7ab1ec5ad51c8ab -62cfa94d0ecd1ad40cd4ad57d5ab1bd6 -ad58d9ad59cdad54cead55cfab68d2ad -56c50cc5ab81c9ab56caad53cbab52c1 -abf8c3ad52c4abfc0ecd1ad20cd2abc8 -d6abddd7a3f9daab82cdabb4cead5ecf -abc0d0ad5dc80cc8aba9caaba4cbabb5 -ccad5dc4ad5ac6ad5bc7ad5c4e644e40 -4fa89650785102c1ad4fcfad50d5abf9 -09cc0fcca54dcfa981d0a98bd1ad02d4 -abf8c1ad42c3ad43c5ad44c8a393c9ad -450dcd17d40cd4ad4ed7a9dcd9a5c1da -ad47cdad4bd2ad4cd3ad4dc70cc7abc4 -c8a57dcbad4acca9edc1ad47c5ad48c6 -ad494aa2484ba24c4ca2644d0012ce20 -d50fd5a92cd6a54ed8abf1d9a90fdaad -41cea540cfa3f2d1ad3fd2ad40d4a95c -c60fc6ad3ec7a930cba906cca3a8cda3 -cec1ad3bc3ad3cc4ad3dc5ab3001cfad -30d0a72d07d00cd0ad33d2a78ad7ad34 -daad35c5ad31c7a7c1c8a77acdad3208 -d30fd3ad38d4a7fcd5ad39d6a902d9ad -3ac1a7f4c2ad36c9ad37cbab4c41c160 -4598456a46a24147a24e48a2754907d1 -0cd1ad2fd2a571d3a70fd4a727c3ad2e -c4a711cca5eacea5ec09d20ed2ad22d3 -a567d475d5abf9daad23c1ad1fc3ad20 -c5a55ac79bc8ad2104c9a57bcfa582d1 -ad02d2a588d8a5880bd014d309d3ad29 -d4ad2ad7ad2bd0ad27d1ad28d2a55cc8 -08c867cca775cead26c1ad24c5a5b1c6 -ad2506d20cd2a701d4a704d5a705d6ad -09cba3f0cdad2ccead2d415e42a24c43 -a2834406cb0ccba522cfad1dd9ad0bda -ad1ec4a52ec5a52ecaad1c0dd117d40c -d4ad05d7ad06d8ad07daa35ed1ad02d2 -ad03d3ad04cc0bcc6dcda342ceabfbcf -ad01c4abfec5abffc6ad000010cc1cd2 -0ed2a9fad445d5a3ced6ad10d9a37ccc -ad0ccead0dcfad0ed1ad0fc70cc7a389 -c8ad0ac9ab13caad0bc1a3bfc4a3adc5 -ad08c6ad090010cf1dd50fd5abf4d6ad -1ad7abfbd9ad1bdaa51acfad17d0ad18 -d2ad19d3ab2ec90cc9ad14ccad15cdad -16cea3ecc4abf2c6ad11c7ad12c8ad13 -342234423548374e3801382a3910b0ab -2e10b6abfd1131b9abfa1133b2abfb11 -33b6abfc2aa561305031a26b3202302e -33383810b0a52e01b0a51ab2abef10b0 -750533233334354a3601b1ab5bb2a5ec -03b0a3ecb4a5ecb5a711b9a72702b3ab -f0b4abf5b7abf63034314a3201b1a561 -b9abf403b2abefb3a561b5a9fab9abf0 -06b50bb59bb7abf2b8abf3b9a561b1ab -efb3abf1b4ab8202342e353e3710b2ab -1b02b2a3ecb3abf7b5abf803b0ab1bb1 -ab1bb4abf9b5a52e046436673c684272 -46761173f44b116ceda5781168e2ad67 -116fed6301613c6d01e99dee012aa342 -4110cda34210e200134c625131513c53 -405450556a5901c5abfdd4ab8310c1ad -4f02c1abf8c4abfcd9ad5904c791c8a9 -2bcaad6dcead5ed2ad6e10cbad684c3c -4d464e624f665001cbad4ad3ad4d01c2 -ad36d9ad3a04c1ad3bcdab08cea772d2 -ad40d5ad6b10c7ad6c10cdad46452e45 -42474a494e4a644b02c8a505cdad32d7 -ad3401c79bc8ad2110c2ad6803c4ad69 -cead6ad1ad2fd2a57110cfad302a9b41 -32423c43464410daad1e01c5abffc6ad -0001c8ad0ad5ab0801c3a910ceabe800 -217588e62bf221f29bf3a349f6a353f9 -a35cfa012a2e41127261e2a360022aa3 -5e498a5210d5a361e651eb67ed75ee7f -7a2d7a2ce125e22de54b10ea012a2e41 -127261e2a360032aa35e312e49345310 -d5a3611137b2a36101d1a35fd2a36075 -38763c77527901e2a35df2a35c10f9a3 -5203eca354eea355f4a356f5a35703e1 -a358e2a359efa35af8a35b6b966f696f -44704e726873a2507402e1a34fe7a350 -eaa35102ea89ed8bfa8d05f206f295f3 -97fa99e38fe491e59309ef0fefa344f1 -a345f3a346f9a347faa348e29be332e8 -a341eda342eea343022a9d4e2c501261 -6ceda1126261f49f04e1a34ae5a34be7 -a34cefa34df4a34e6b3c6c3e6d586e03 -e381eb83ee85f98710eb6905ee06ee71 -f36df473e16be26de96f03ed77ee79ef -7bf07d65256530673668506a10e76501 -e24df94f05ed06ed59ef5bf15de353e4 -55e75702e15fec61ef63614862526364 -6405f006f045f947fa49e13fe541ea43 -02e927eb29f52b04e92ff131f233f435 -f93702e439e53be83d - } // trie - lsrs{ // 1599 + } + lsrs{ "","","", "skip","script","", "aa","Latn","ET", @@ -1077,7 +474,6 @@ f93702e439e53be83d "zh","Hant","HK", "zh","Hant","ID", "zh","Hant","MO", - "zh","Hant","MY", "zh","Hant","PF", "zh","Hant","PH", "zh","Hant","PA", @@ -1126,7 +522,7 @@ f93702e439e53be83d "cy","Latn","GB", "da","Latn","DK", "dad","Latn","ZZ", - "daf","Latn","ZZ", + "dnj","Latn","CI", "dag","Latn","ZZ", "dah","Latn","ZZ", "dak","Latn","US", @@ -1143,14 +539,13 @@ f93702e439e53be83d "dgh","Latn","ZZ", "dgi","Latn","ZZ", "dgl","Arab","ZZ", - "doi","Arab","IN", + "doi","Deva","IN", "dgr","Latn","CA", "dgz","Latn","ZZ", "mwr","Deva","IN", "dia","Latn","ZZ", "zza","Latn","TR", "dje","Latn","NE", - "dnj","Latn","CI", "dob","Latn","ZZ", "dop","Latn","ZZ", "dow","Latn","ZZ", @@ -1165,7 +560,7 @@ f93702e439e53be83d "dty","Deva","NP", "dua","Latn","CM", "duc","Latn","ZZ", - "dud","Latn","ZZ", + "uth","Latn","ZZ", "dug","Latn","ZZ", "nl","Latn","NL", "dv","Thaa","MV", @@ -1203,6 +598,7 @@ f93702e439e53be83d "etx","Latn","ZZ", "ewo","Latn","CM", "ext","Latn","ES", + "eza","Latn","ZZ", "fa","Arab","IR", "faa","Latn","ZZ", "fab","Latn","ZZ", @@ -1327,7 +723,6 @@ f93702e439e53be83d "he","Hebr","IL", "hhy","Latn","ZZ", "hi","Deva","IN", - "hi","Latn","IN", "hia","Latn","ZZ", "hif","Latn","FJ", "hig","Latn","ZZ", @@ -1394,10 +789,10 @@ f93702e439e53be83d "ja","Jpan","JP", "jab","Latn","ZZ", "jam","Latn","JM", + "jgk","Latn","ZZ", "jbo","Latn","001", "jbu","Latn","ZZ", "jen","Latn","ZZ", - "jgk","Latn","ZZ", "jgo","Latn","CM", "yi","Hebr","001", "jib","Latn","ZZ", @@ -1506,7 +901,6 @@ f93702e439e53be83d "krs","Latn","ZZ", "kru","Deva","IN", "ks","Arab","IN", - "ks","Deva","IN", "ksb","Latn","TZ", "ksd","Latn","ZZ", "ksf","Latn","CM", @@ -1535,6 +929,7 @@ f93702e439e53be83d "kxa","Latn","ZZ", "kxc","Ethi","ZZ", "tvd","Latn","ZZ", + "kxl","Deva","IN", "kxm","Thai","TH", "kxp","Arab","PK", "kxw","Latn","ZZ", @@ -1544,6 +939,7 @@ f93702e439e53be83d "ky","Latn","TR", "kye","Latn","ZZ", "kyx","Latn","ZZ", + "kzh","Arab","ZZ", "kzj","Latn","MY", "kzr","Latn","ZZ", "kzt","Latn","MY", @@ -1619,7 +1015,6 @@ f93702e439e53be83d "maw","Latn","ZZ", "ms","Latn","MY", "ms","Arab","CC", - "ms","Latn","ID", "maz","Latn","MX", "mbh","Latn","ZZ", "mbo","Latn","ZZ", @@ -2061,7 +1456,7 @@ f93702e439e53be83d "tr","Latn","TR", "tru","Latn","TR", "trv","Latn","TW", - "trw","Arab","ZZ", + "trw","Arab","PK", "ts","Latn","ZA", "tsd","Grek","GR", "tsf","Deva","NP", @@ -2149,6 +1544,7 @@ f93702e439e53be83d "es","Latn","EC", "ar","Arab","EH", "ti","Ethi","ER", + "en","Latn","IE", "de","Latn","EZ", "fr","Latn","GA", "fr","Latn","GF", @@ -2433,10 +1829,807 @@ f93702e439e53be83d "zmi","Latn","MY", "zne","Latn","ZZ", "zu","Latn","ZA", - } // lsrs - } // likely + } + regionAliases{ + "062","034", + "172","RU", + "200","CZ", + "230","ET", + "280","DE", + "532","CW", + "582","FM", + "736","SD", + "830","JE", + "886","YE", + "890","RS", + "AN","CW", + "BU","MM", + "CS","RS", + "CT","KI", + "DD","DE", + "DY","BJ", + "FQ","AQ", + "FX","FR", + "HV","BF", + "JT","UM", + "MI","UM", + "NH","VU", + "NQ","AQ", + "NT","SA", + "PC","FM", + "PU","UM", + "PZ","PA", + "QU","EU", + "RH","ZW", + "SU","RU", + "TP","TL", + "UK","GB", + "VD","VN", + "WK","UM", + "YD","YE", + "YU","RS", + "ZR","CD", + } + trie:bin{ +001a6dcc0f74c4f077c26777a2b778a4 +5279a4c27a0f6d7d7a5c7a30e1ad9ae8 +2ef5af3d10e1a539022a3c42cc184811 +616e01e2a3fdf4a3f80b4d25540e54ca +c5552a5610cea3fb10d3a3fa4dd81e50 +502a5310d2a3f602c1a3f5c6a3f3c8a3 +f447d4d4473248d81e324910c4a3f101 +c2a3f9c6a3ef6d326e36733a7910e2ad +9a10e9af3b10e5af3c10ed22012aa90e +4310c3a90f6817683269366b3a6c10ed +af3a10f8adb710e1af3910f4ad956132 +6436653a6710e8adc610e7af3610eaaf +3710e1af3800126d46741b7434753877 +42e1adeaefaf0110edaf0601f5af07f6 +af0810e1af096d3c6e406f50725a7301 +e7ad86ebaf0510efadfd02e3adfee9ad +fff5af0001e2af02f3af0310f3af0467 +266736683a693e6a4e6c10f3adfc10e9 +adf510e7adf602e2adf7f5adf8f6adf9 +01e1adfae9adfb6138625463646501ec +a520f2adf404e5adebeaadececadedee +adeef2adef02f0adf0f1adf1f2adf210 +e9adf30c6e3d7221722e7332774ee8af +0d10e2af1304e1adbee9af14eca52fed +af15f2af1610e5af176e346f3e7001e5 +a78df2adbb01e1adb5f2af1001e7af11 +eeaf12651d653a6c3e6d02e6af0feead +abf2adae10f3af0c02e1af0ee3ada7e4 +ada8613462386301efad75f2ad7410f6 +af0a10e9af0b0d6d49733073307534e9 +a733efaf2a10f3af2f04e1af30e532ea +af33f4af34f7af35012a2e4812616ef3 +af32012aaf314310ceaf326d3a6f3e72 +02e2af2ce5af2decaf2e10ecaf2910ee +af2b6520653e67426b4c6c02e5af26e7 +af27ecaf2810f2af2201f2af23f7af24 +10efaf25612e62606410e4a73307f40c +f4af1bf6af1cf9af1dfaaf1eeda7b6ef +af18f0af19f3af1a02e1af1fe2af20f9 +af2174a25275a4d0760a6f1fe509e5ad +dde9ad61efade56f3472387501eeade8 +f4ade910f4ade610efade7613c654c69 +566c606d01e6ade3f7ade402e7addbe9 +adcbeeaddc01e3addef0addf01e3ade0 +f6ade110f3ade200267576e91ff20ef2 +abc6f3abcaf4abd0f767f9abe0e9abab +ebabb2ecabb6eeabbcefabbe7a247a36 +e1ab8ae5ab9ce72ee8aba710edabe301 +2a2e41127261e2aba3012aaba25010cb +aba3753e7654776478cced7901e1abe1 +f6abe203e8abd7ecabd8edabd9f1abda +02e4a7b9ecabdbf5abdc01e8abddf1ab +de6b7d7049705e716e727273827406f1 +0cf1abbaf2abd4f3abd5f4abd6e4abd1 +e5abd2eaabd302e9abc2edabc3faabc4 +10efabc502f5abc7f6abc8f7abc904e4 +abcbe6abcce7abcdeaabcef7abcf6b42 +6c526d626e6c6f02e6abbfe7abc0f1ab +c102ecabb3f2abb4f4abb502e6abb7f8 +abb8f9abb901e8abbaf9abbb10e8abbd +6546655e6674677868886906eb0cebab +aeedabafefabb0f6abb1e2a3b1e6abac +e7abad03e4ab9dedab9eefab9ff4aba0 +10e9aba102e3aba4efaba5f5aba602ec +aba8f1aba9f2abaa6144625a63866403 +e4ab98e7ab99e8ab9af5ab9b03eaab8b +ecab8ceeab8df1ab8e06e70ce7ab92ef +ab93f7ab94faab95e3ab8fe4ab90e6ab +9101e9ab96f9ab970f7362e72ce742eb +abeaf2ad49fa012a8641127261e2add9 +012a2e43127972ecabe7022aabe64b2a +4d10ceabe810daabe773607464766e7a +10ee012a2e41127261e2add9022aabf5 +412a4310ceadda10c6add910e1add501 +e8a549f2add601e8add7ecadd86d326d +3e6e426f707202e9add2f4add3f7add4 +10e2abec01f226f8add0012a2e441265 +76e1adcf012aadce4e10d0adcf10ebad +d162326436673a6c10e9abeb10f5abe4 +10edabe510e1abe970c39570a4f971a6 +d772a6e47300287884ec39f229f509f5 +ab79f6ab7ff7ab80f22cf3ab72f4ab76 +22032aab2c4da4bf522a5410d2ab3001 +cfab2fd5ab2decab54edab59eeab60ef +ab66f16de429e438e5ab3ce7ab41e9ab +4aebab50032aab3644324b3a5312696e +e4ab39126576e1ab3712686feaab3878 +34793e7a48e1ab20e3ab2b01eeab86f7 +ab8701ecab88f2a50c10ecab896cad72 +4f725873747484758e7705e809e8ab80 +f0ab84f6ab85e2ab81e3ab82e7ab8304 +e2ab6fe3ab2beeab70f2ab71f8a5f102 +e4ab73e7ab74f9ab7501ebab77f1ab78 +04e1ab7ae5ab7bebab7cf2ab7df3ab7e +6c4a6d666e8c6fa2437003e4ab6cecab +6df3ab6ef9a77404e4ab55e9ab56ecab +57efab50f9ab5805f009f0ab5df1ab5e +f3ab5fe1ab5aeaab5beeab5c04e3ab61 +ebab62f0ab63f8ab64f9ab6504e7ab67 +ebab68f1ab69f5ab6af9ab6b673e6742 +6858696e6a846b02e3ab51f2ab52f3ab +5303e1ab42f3ab43f7ab44faab4503e9 +ab46ebab47eeab48f5ab4903e4ab4be7 +ab4cecab4dedab4e10f2ab4f614a6276 +638664a26b6503e6ab3de8ab3ee9ab3f +f3ab4006f30cf3ab24f4ab25f6ab26fa +ab27e6ab21e8ab22f1ab2302e1ab28e5 +ab29f0ab2a06ee0ceeab33efab34f2a5 +fff3ab35e32cebab31ecab3222055211 +522e53325410d2ab3010cfab2f10d5ab +2d2aab2c312a4d10c5ab2e1137b2ab2d +01e3ab3ae8ab3b00166e63752bec09ec +a9ebf3a9dcf4a9f8754c7750e1012a2e +41127261e2a9d4012aa9d35010cba9d4 +10f5a9fa10e1a9fb7217722e733e7410 +f0a9f902e1a9f4e4a9f5e7a9f610f3a9 +f76e346f4a7001e1a9f2efa9f303e2a7 +cce7a9eeeea9eff4a9f010eea9f16630 +6b176b2e6c386d10f3a9ed01e1a9e9ef +a9ea01e1a9ecf4a92e663468386901ec +a9e7f0a9e810eca9e401eca9e5eea9e6 +614e627e638864926504e4a9e1efa9e2 +f2a570f3a570f8a9e304e7a9d5ec32ed +a9d8f0a9d9f5a9da012aa9d65012686c +f0a9d701e9a9dbf5a9dc01e4a9ddeda9 +de01e3a9dff4a9e0017526f5a9fc02e3 +a9fde7a9fefaa9fc00146f457917ef09 +efa94bf5ab19f7ab1c792cedab0ceeab +1110f5ab1f6f3c724c745075547701eb +ab1defab1e02e2ab14e6ab15efab1610 +efab1710edab1802e5ab1ae7ab1beda9 +4b6934693c6a566b5a6d5e6e01e1ab12 +e7ab1301e1ab07e622012aab084e10cc +ab0910f3ab0a10f4ab0b03e6ab0defab +0ef4ab0ff5ab1061366346654a675a68 +10e7ab0602e9a9ffeaa960efab0010e6 +ab0102eaab02ecab03f3ab0410eeab05 +6da2576ea63e6f0b741ded09eda5a1f2 +a9cbf3a9ce742a7a34e3a9c301e1a9d0 +eba9d110eda9d27017702e72327310e1 +a9cf10eda9ca02efa9ccf5a9cdf9a9cb +673a6b3e6e02e7a9c7eea9c8f3a9c910 +e3a9c401f2a9c5f6a9c60022749fe926 +ef0fefa94bf2a956f3a492f4a95af9a3 +cee9a90beba905eca940ee012abac64d +126f6ee7a53f783d7834793e7a64e7a9 +2ee8a93401e3a969eda96a05f709f7a9 +6ef8a96ffaa970eba96beda96cf6a96d +05f009f0a974f7a975faa976eba971ed +a972eea9737444755a76707703eba966 +f2a537f6a967f7a96803e3a95be6a95c +e9a95df2a95e03e1a95ff0a960f2a961 +f3a96202e1a963eea964f9a96569856e +446e426f5e707a71907202e4a957eaa9 +58efa95904e1a947e6a948e9a949ebb6 +1af7a94a04e1a94ce5a94de8a94ef3a9 +4ff8a95003f0a951f3a952f4a953f8a9 +5410eca955693e6b686c7e6d02efa944 +f5a945f8a94603e6a937eea938f326f7 +a93b012aa9394d126564e6a93a03e9a9 +3ceca93df0a93ef7a93f02e5a941f0a9 +42f3a9436549653e666a67866802e9a9 +35eca936f2a3ff06ee0ceea925f2a926 +f4a927f5a928e4a922e5a923eba92404 +e1a929e5a92aeea92befa92cf1a92d04 +e8a92feca930efa931f0a932f9a93361 +5e62a25063a25d6406e80ce8a91eeaa9 +1ff2a920f8a921e1a91be5a91ce6a91d +0bee1df712f7a90df926faa91022012a +a90e4310c3a90feeb431efa90bf3a90c +e709e7a908e9a909eba90ae3a905e4a9 +06e6a90704e8a911efa912f1a913f5a9 +14f7a91504e9a916f0a917f1a918f2a9 +19f5a91a0021745fe41dee0feea9a1ef +a9a7f2a9aef6a9bbf9a9bfe4a986e5a9 +89e7a98eeca54b791579307a3ae1a977 +e2a97f01eda9c0eea9c110e9a9c27438 +7542775e7801f1a9bdf2a9be01eda9b4 +f2a9b504e9a9b6f0a9b7f3a9b8f6a9b9 +f8a9ba10e2a9bc6a5d6f326f48706471 +68726c7303eba9b0eea9b1efa9b2f3a9 +b304e4a9a8e5a9a9eea9aaf0a9abf5a9 +ac10e9a98910efa9ad10e2a9af6a4a6b +4e6d586e04e6a9a2e8a9a3eba9a4eda9 +a5f0a9a610efa99c01e7a99defa99e01 +e7a99ffaa9a06637665a675e686e6906 +ee0ceea998f5a999f9a99afaa99be6a9 +95e9a996eaa99710f2a98d02e1a98fe2 +a990eca99102e2a992e5a993f7a99461 +3e636a64906502e2a98af7a98bf8a98c +06ee0ceea97bf0a97cf1a97df3a97ee3 +a978e6a979eba97a05e809e8a983efa9 +84f5a985e1a980e5a981e6a98201e3a9 +87f3a98866c75369c49669a4166aa4c4 +6ba6116c001b744ae717ef0cefa7f3f4 +a7fbf5a7fdf6a901e7a7dde9a7dfeea7 +f0771577307a34e1a7c8e2a7cf10eca9 +0201e8a903faa904742e75327610f3a9 +0110e7a7fc03e1a7feefa7fff9a3d5fa +a9006a4a6d316d326e426f4c7210e3a7 +fa02eea7edefa7eef0a7ef01f3a7f1f5 +a7f205f209f2a7f7f3a7f8faa7f9eaa7 +f4eba7f5eca7f66a346b386c01e5a7eb +eea7ec10f0a7e801e9a7e9f4a7ea6448 +646c6570679c6906e70ce7a7e4e8a7e5 +eaa7e6f3a7e7e1a7e0e4a7e1e6012aa7 +e24c12696de2a7e310e2a7d506f00cf0 +a7d9f1a7daf5a7dbfaa7dce4a7d6e5a7 +d7eda7d810e7a7de6134625a6301eda7 +d3f0a7d405e809e8a7cceaa7cdf3a7ce +e2a7c9e4a7cae7a7cb02e5a7d0f5a7d1 +f7a7d200197739eb17f30cf3a70df4a7 +25f5a719f7a726eba567eea720efa722 +e409e4a70fe7a714e9a717772a7a34e1 +a70601eda727f3a72801e8a729e9a72a +6a366d176d326e366f3a7210e9a72410 +efa71f10e8a72110f5a7236a2e6b326c +10efa71e10eaa71804e5a719eba71af4 +a71bf7a71cf8a71d641a643466446701 +e2a715e5a71602e4a710e9a711f5a712 +10e5a713613a62446302e1a70ce5a70d +e8a70e01eea707f2a70802e1a709e2a7 +0af9a70b0b721ae909e9a733f6a739f7 +a73a722a752ee1a72b10e1a73710f4a7 +3867176734693e6d01e3a735eca73601 +eba72eefa73210e2a734612e623e6510 +eea73102e2a72ceda72df2a72e01efa7 +2ff5a730002875c0edeb74f23ff628f6 +a791f7a7b3f9022a32414c4c126174ee +a7c1022aa7bf432a5410d2a7c110cea7 +c0127261e2a7c0f2a784f3a79df5022a +a46441a46a5912657ae9a77feb38eca7 +73eda778eea783efa788012a2e411272 +61e2a76e042aa76c41324336493a4d10 +cea77010c6a76d10cea76e10d2a76f7a +1b7a38e1a5b0e7a757e9a763eaa76703 +e8a7c4eaa7c5f2a7c6f4a7c7753c766e +777e788e7901e5a7c2f8a7c307ed0ced +a7aceea7adf0a7aef3a7afe2a7a8e4a7 +a9e5a7aaeaa7ab02e7a7b0f2a7b1f8a7 +b202eaa7b4efa7b5f1a7b607ed0ceda7 +bbf0a7bcf7a7bdfaa7bee1a7b7e3a7b8 +e5a7b9eca7ba6bc0d57063704a717072 +8673a2457403e2a7a4eda7a5efa7a6f2 +a7a705f209f2a790f6a791f8a792e5a7 +8de6a78eefa78f03e2a793e6a794f3a7 +95f9a79605ec09eca79af3a79bf5a79c +e3a797e9a798eaa79905e809e8a7a1ea +a7a2f2a7a3e2a79ee4a79fe6a7a06b50 +6c5a6d706ea2576f04e9a789eba786ec +a78af3a78bfaa78c01e3a771eaa77203 +eea774f1a775f4a776f8a77706f226f2 +32f3a780f5a781f7a782022a32414059 +12657ae9a77f012aa77c4c10c2a77d12 +7261e2a77ee2a779e8a77aefa77b04e3 +a784e6a785e7a757eea786f0a7876652 +66486758686869a06a03e4a768e7a769 +f3a76af9a76b02efa754f2a755f9a756 +02e5a758e6a759f0a75a08f10ff1a75e +f3a75ff4a760f7a761faa762e1a75be2 +a75cebac86eea75d02eaa764f5a765f7 +a76661446276639c64a2486502e1a751 +eea752faa75307e90ce9a73feaa740ed +a741efa742e1a73be2a73ce3a73de4a7 +3e05f109f1a746f8a747f9a748e4a743 +eda744f0a74503e7a749eba74aeca74b +f4a74c03e5a74de8a74eeca74ff4a750 +66a2b567a46a6800137539f20ff2a5ff +f4a702f5a703f9a342faa7057536e13a +e5a5e9e9a5ebefa5fb10e9a70422032a +a5df372e43345310c4a5e01133b6a5e0 +10cda5e16c386c3c6d466e506f6c7301 +e2a700eea70101e1a5f2f5a5f301e4a5 +f4f4a5f504e4a5f6e5a5f7eaa5f8eea5 +f9efa5fa02e3a5fceaa5fdf4a5fe6158 +62746478687c6905e809e8a5efeca5f0 +eda5f1e1a5ece6a5ede7a5ee04e7a5e2 +eba5e3eda5e4f7a5e5faa5e610e2a5e7 +10f9a5e810f9a5ea00117553e90fe9a5 +7aeaa57eefa581f2a587f9a596754276 +94e1a570e6012aa5764112646ceda577 +09e80fe8a590f1a591f2a592f6a593f9 +a594e2a58ce332e4a58de5a58ee6a58f +012aa5764112646ceda57710f2a5956d +2f6d4e6f52706271667204e3a588e5a5 +87f0a589f2a58af3a58b10f0a58002e4 +a582eea583f2a58410e5a58510f3a586 +6132665669606c10f2a57f05e908e9a5 +74eea575f467e1a571e2a572e7a57301 +e9a578eda57902e1a57beca57cf4a57d +001a6e9f791dec0ceca5bceea5c0f5a5 +d0f6a5d8792ce1a597e4a5a901e1a5a2 +e9a5de733a733e754276747702e3a5db +e9a5dcf4a5dd10f7a5cf07f20cf2a5d4 +f7a5d5f8a5d6faa5d7e2a5d1e3a5d2e4 +a5d3e7a5c002e6a5d9f2a5b3f3a5da6e +5a6f6a7204e2a5a5e332e5a55af4a5cd +f7a5ce012aa5cb4c12696ee2a5cc02e4 +a5c1e7a5c2efa5c307ee0ceea5c3f2a5 +c8f3a5c9f4a5cae4a5c4e6a5c5e9a5c6 +eda5c7673c6a236a386b486c526d01ed +a5bef6a5bf02eba5b7eea5b8f5a5b901 +eea5baf0a5bb10eba5bd6734683e6901 +eca5b5eda5b601eea5b3efa56610f3a5 +b46428642e653e6610eba5b202e5a5aa +eea5abf2a5ac05ef09efa5b0f2a52dfa +a5b1e2a5adeaa5aeeca5af612e626c63 +10f2a5a809ed0feda59deea59ef7a59f +f9a5a0faa5a1e1a598e6a599e7a59ae8 +a59beaa59c05ef09efa5a5f9a5a6faa5 +a7e1a5a2e6a5a3eda5a463c2f263a2a3 +64a4fc6500127733ee19ee38efa563f3 +a565f4a558f5a366012aa55f53126861 +f7a560773478387a3ce5a553eca55a10 +efa56d10f4a56e10e1a56f6d466d486e +7a728473887403f2a569f4a56af5a56b +f8a56c02e1a55be9a55ceb012a2e4e12 +6b6fefa55e012aa55d4710cea55e01ee +a561f1a56210e9a56402e7a566eba567 +f5a568623e664267466b02e1a557eba5 +58f9a55910f5a55210e9a55401eca555 +f9a556001b725ce821f316f3a519f52c +f6a51ff9a520012aa51d47126c61e7a5 +1ee8a3ebefa50ff2a512771277307a34 +e1a3e1e5a3e710e4a51210e5a519722e +73547410e4a51c05ec09eca516eda517 +f3a518e8a513eaa514eba51501e2a51a +f7a51b69526c306c326d3c6f6c7010f3 +a51101e1a50be4a50c02e5a50de7a50e +ee022aa26342a2ae4811616e01e2a3fd +f4a3f810f0a51069406a446b03e2a507 +eca508efa509f9a50a10e3a50302e1a5 +04eda505f6a506658f65a28066a28167 +a2826805ef09efa500f0a501f2a502e9 +2ceba3feeda3ff022a3c42a259481161 +6e01e2a3fdf4a3f80b4d2d5417542e55 +385610c4a3fb01c8a3f7d7a3f801cba3 +f9d3a3fa4db489502a5310d2a3f602c6 +a3f3c8a3f4daa3f5470e473048b46d49 +10c4a3f110c6a3ef2aa3ec412a4210ce +a3ee10d5a3ed126f70efa3fc10e2a3e8 +10e1a3e910e7a3ea6134623e6301e8a3 +e5f0a3e601e4a3e2eea3e310eaa3e400 +16726f791ce508e5a52df6a54cfa4579 +2a7a34e1a52101efa54ff5a55010e7a5 +51751d752e764a7710f7a54e04e1a547 +e3a548e4a549e7a54af4a54b10e1a54d +724073747403eda543f0a544f3a545f9 +a54602e82ce9a540f3a541012a2e4d12 +6f6ee7a53f012aa53e4310cea53f10e2 +a54267446a1a6a406e446f03e2a53be9 +a534f0a53cf7a53d10e5a53a10eaa523 +673468606901e1a538f1a53906ec0cec +a533efa534f2a535faa536e1a530e8a5 +31e9a53210e4a537613c626863726476 +6501e4a52eeea52f06e80ce8a525eba5 +26f2a527f6a528e4a522e6a523e7a524 +01e4a529f1a52a10e3a52b10eea52c2a +a4f761bea462002373a5e51ded0feda3 +a8eea3adefa3b1f2a3baf3a3bfe5a37c +e7a389e8a38de9a39377417732783c79 +4c7a72e1a36201e4a3d2f2a3d302e8a3 +d4eba3d5f2a3c705f309f3a3d9f6a3da +f8a3dbe5a3d6eea3d7f2a3d804e1a3dc +e5a3dde6a3dee8a3dff7a3e073327448 +75587610e2a3d103eaa3c0f1a3c1f3a3 +c2f4a3c302efa3c4f4a3c5f6a3c609ed +0feda3ccefa3cdf2a3cef3a3cff5a3d0 +e1a3c7e3a3c8e4a3c9e7a3caeba3cb6a +7d6e3b6e486f587068716c7203e1a3bb +e8a3bcf8a3bdfaa3be02e7a3aeeda3af +f0a3b002eaa3b2eda3b3eea3b410f9a3 +b503e3a3b6e9a3b7f0a3b8f6a3b96a46 +6b786ca4ab6d03e8a3a9eba3aaf1a3ab +f5a3ac07ef0cefa39ef2a39ff4a3a0fa +a3a1e8a39ae9a39beaa39ceea39d04e3 +a3a2eda3a3f1a3a4f5a3a5f6a3a6656a +6562669467a24468a24b6906ed0ceda3 +96eea397efa398f1a399e2a394e7a395 +eba37507f40cf4a381f7a382f8a383fa +a384e6a37de8a37eeaa37feda38003e4 +a385f1a386f4a387f9a38802e3a38aee +a38bf8a38c05ec09eca391efa38df9a3 +92e2a38ee7a38fe9a390613262646390 +6410e4a37b07f20cf2a367f3a368f6a3 +69f8a36aeca363eea364f0a365f1a366 +06e40ce4a36eeaa36ff0a370f2a371e1 +a36be2a36ce3a36d09ed0feda376eea3 +77efa378f1a379f5a37ae3a363e6a372 +e8a373e9a374eca37500184dc26554c0 +ca57365736584e59645a12616ee2adcd +01612c631168efa9a61172e1adcc0170 +2a731175f8691165efa9e201652c6911 +69e9a717117ae9a77f543455a2875612 +6169e9adcb056746674a68506901622a +7210e8adca10f4012aa3b14210d44511 +6ce7adc7106101e158e9042aaba74332 +4b364c3a5410c8aba710cea7d410c8ad +c810c1adc9012aa54c4d10d6a54c6130 +657c66116ee7adc6056d116d2e6e3276 +10f4a3a710ecab8a10e7abdf67346b38 +6c01e5ab98f5a75c10e2adc410f2adc5 +116cf5ab9c126761f2abe950c0c350a2 +7252a2a85306694369426f6a75907901 +6c2a7210e3a50c10efadc301643e6e01 +e4ab39e8012aab4a4c10cbab4a10e4ad +c002672e72387910efa50e01e4ab67ef +adc110e1ab6f116ee4adc2613e675e68 +01612a7210e4adbf10f7a560026d2e72 +327510f2ab2710f2ab5d10e2adbe116e +f7a34b046138654a68506c76721174e9 +adbb016c2a7510e3a51c10eda11172ed +adb902612e6c326e10f8a9e610e7adba +01e9a9d6f0a9d71172e4a5f4026a306f +3675116ef2a9aa116ee7adbc1168e7ad +bd4d7c4ea2a44f0367426c48724e7301 +672a6d10e1adb810e5a9cf1161edab42 +1163ebab25016b2a7910e1a9cb10e8a9 +d107722e725a7460756679116df2032a +a3ce492e4d325410c8adb310cea76010 +cda3ce116fefa9591165e9adb1116cf4 +adb2614265746c9a6f01642a6e10e7a5 +3f10e9adb00368326b366e3a7210e3ad +ac10eaada910e1adaa01e4a970e9adab +0264346e387201e3adaeefadaf10e6a9 +3a10e4adad1179eda940046138624c65 +506b56731168f5adb7016e2a7210e2ad +b510e4adb41161f49f1177e1adb6116f +efa55e47c41b4ac32f4aa6c04ba6d94c +03614665a69c69a69e7901632a6410e9 +ada810e9ada7026ea6796fa67a7410ee +001a4bc139545b571457ac7058ac7459 +305a01c1abf1d7ab6010d4ad65544055 +825603c1ad60c5ad62cead61d5a3930b +ce14d609d6abdbd7abc8daab80ceada5 +cfabbed2abc6cbc5d4cbabb3ccad5ccd +abb204c1ada6c7ad5ed3a55fd9ad5fda +abf54e824e8a50a24a52a26d530cce17 +d40cd4ad56d5a79ad6ad57d9ada4cead +54cfab66d2ad55ca09caad52cbab50cd +ad53c3ad51c5ab7fc9ab5406c70cc7ab +edc9ad44cca54bcfa97fc1ad41c3ad42 +c5ad430acc14d409d4ad4dd7a9dad9a5 +c0cca9ebcdad4ad2ad4bc1ad46c5ad47 +c6ad48c7abc2c8a57c03c5ad50cfa94b +d5a79ad7ab1c4b9e4ca2434d0010cd1d +d40fd4a95ad5a92ad8abefd9a90edaad +40cda73dcfada2d1ad3ed2ada3c60cc6 +ad3dc7a92ecbada1cca3a8c1ada0c3ad +3bc4ad3cc5ab2e01c5ad30cdad9f04c9 +ad36d3ad37d4a7fbd5ad38d6a90143c0 +c246644656476648a24d4905d209d2ad +9ed3a70dd4a725c3ad2dc4a70fc5ad21 +02c9a57acfa581d2a5870cce17d30cd3 +ad28d4ad29d5abf4d7ad2acead25d0ad +26d1ad27c608c6ad24c867cca773c1ad +23c2abf7c5ad9d04cdad2bcead2cd2a5 +ffd4a702d5a703435244a2424505d309 +d3a565d4ad97daad22c1ad1dc3ad1ec5 +a5580fcf1ad60cd6ad18d7abf9d9ad9b +daa519cfad15d0ad16d2ad17d5abf2c9 +c68cc9ad12ccad13cdad14cead9a05cb +09cba521cfad1bdaad9cc5a52dc7ad4f +caad1a345e34ae874178420bce14d209 +d2a9f8d5a73dd6ad0ecead0bcfad0cd1 +ad0dc909c9ab11caad09ccad0ac1a3bf +c5ad06c6ad070cd217d50cd5abeed7ad +04d8ad05daa35ed2ad01d3ad02d4ad03 +cd09cdad99cfabffd1ad00c4abfcc6ad +98cc6d2aa55f312c321133b0ad971137 +b2a79a10e1a9a810ef012aa7f34c10c1 +a7f31170e3a7d9026d2e6e327310f5a7 +e710e2a7e301e1a7c9e2a5cc01613a70 +1161ee012aa72b4a10d0a72b016d2a76 +10e1ad9310efad92056e1e6e306f3674 +1168e9ad961164e1a7831172e5012aa7 +884b01d0ad32d2a78861306844691174 +f3ad95016c2a6e10e1ad9410e9a55902 +612e6d326f10eaab3810f2a9f410f201 +2aa7784b10c8a778473448a25c491274 +61eca56a0465466c5a6f60727a75016a +2a7210f5a9d310f2a5d0116ff2012aa5 +b04710c5a5b01161e7a51e016e2a7410 +e8a5ca01e7ad86eda5660161506510eb +032aa55a432e47325410d2a38c10d9ad +1910d2a55a10eead87056c186c306d36 +75116ee7ad911175f7a5f3106e01e7a5 +f8f0a9686130659c691172e1ad90016e +2a7410f2a93905ef24efad8af34cf403 +2aa3f8482e4d325410d7a3f810cba3f0 +10cfa3f2012aa3ec4310cea3ece2a3fd +e7ad88e9ad891162f2054917493a533e +5502c1ad8ecbad8cd3ad8f10cca5e910 +c5ad8d2aa5e9432a4710c2ad8c10c1ad +8b43c107437044a2c0450267406c4674 +1168e9012a754501d2ad20d4751179f0 +a55601622a7910edad8510e1ad840461 +a26968a2786fa28770a289791172ec0a +4d335414542e55385810cbad7d01caab +a2d2ad7c10c1abea4d2e523e5310cbad +7b02c4ad79cba905cea53e02cfad7ad3 +ab2cd5ab192aab194138423c474c4b01 +c7a7bfdaad3410ccad7602c1ad77c7a3 +89d9a37c01c5a9ced2ad78026b2e6e32 +7210e9ad7410eda3e610f3a51202612e +65327210f3ad7510eda50510f2a50211 +70f4a5101172f4a5cb03653469866f8c +751170ecad831176e106491749324d36 +4e3a5010cba3c610cea5eb10d5ad8010 +d0a9892aa5eb422a4610caad7f10d4ad +7e1161ebad811167f2ad822aa25441aa +3142056f1f6f3e72447501672a6810e4 +ad7310e9ad721170efa3fc106101e8a9 +e9e9ad716130655c68116bf3ad70036c +326d36733a7410ebad6f10e9ad6e10f5 +a36a10f3a3c1116ee7012aa3ad4210c4 +a3ad00214ac1c052c0cc5638563c5758 +586259665a01d2abf0d7ab6004c1ad60 +c4ad61c5ad62cead61d5a39301c6ad63 +d3ab5910cbad6403c4abfbc5abfbd4ad +65d5ab2c5246536c54a2575503c1abea +c7ad5ed9ad5fdaabf505d309d3ab2cd5 +ab19d7ab1cc5ad50c8ab60cfa94b0ecd +1ad40cd4ad56d5ab19d6ad57d9ad58cd +ad53cead54cfab66d2ad55c50cc5ab7f +c9ab54caad52cbab50c1abf6c3ad51c4 +abfa0ecd1ad20cd2abc6d6abdbd7a3f8 +daab80cdabb2cead5dcfabbed0ad5cc8 +0cc8aba7caaba2cbabb3ccad5cc4ad59 +c6ad5ac7ad5b4e644e404fa896507851 +02c1ad4ecfad4fd5ad2109cc0fcca54b +cfa97fd0a989d1ad00d4abf6c1ad41c3 +ad42c5ad43c8a393c9ad440dcd17d40c +d4ad4dd7a9dad9a5c0daad46cdad4ad2 +ad4bd3ad4cc70cc7abc2c8a57ccbad49 +cca9ebc1ad46c5ad47c6ad484aa2484b +a24c4ca2644d0012ce20d50fd5a92ad6 +a54cd8abefd9a90edaad40cea53ecfa3 +f2d1ad3ed2ad3fd4a95ac60fc6ad3dc7 +a92ecba905cca3a8cda3cec1ad3ac3ad +3bc4ad3cc5ab2e01cfad2fd0a72b07d0 +0cd0ad32d2a788d7ad33daad34c5ad30 +c7a7bfc8a778cdad3108d30fd3ad37d4 +a7fbd5ad38d6a901d9ad39c1a7f3c2ad +35c9ad36cbab4a41c1604598456a46a2 +4147a24e48a2754907d10cd1ad2ed2a5 +70d3a70dd4a725c3ad2dc4a70fcca5e9 +cea5eb09d20ed2ad20d3a565d475d5ad +21daad22c1ad1dc3ad1ec5a558c79bc8 +ad1f04c9a57acfa581d1ad00d2a587d8 +a5870bd014d309d3ad28d4ad29d7ad2a +d0ad26d1ad27d2a55ac808c867cca773 +cead25c1ad23c5a5b0c6ad2406d20cd2 +a5ffd4a702d5a703d6ad07cba3f0cdad +2bcead2c415e42a24c43a2834406cb0c +cba521cfad1bd9ad09daad1cc4a52dc5 +a52dcaad1a0dd117d40cd4ad03d7ad04 +d8ad05daa35ed1ad00d2ad01d3ad02cc +0bcc6dcda342ceabf9cfabffc4abfcc5 +abfdc6abfe0010cc1cd20ed2a9f8d445 +d5a3ced6ad0ed9a37cccad0acead0bcf +ad0cd1ad0dc70cc7a389c8ad08c9ab11 +caad09c1a3bfc4a3adc5ad06c6ad0700 +10cf1dd50fd5abf2d6ad18d7abf9d9ad +19daa519cfad15d0ad16d2ad17d3ab2c +c90cc9ad12ccad13cdad14cea3ecc4ab +f0c6ad0fc7ad10c8ad11342234423548 +374e3801382a3910b0ab2c10b6abfb11 +31b9abf81133b2abf91133b6abfa2aa5 +5f305031a26b3202302e33383810b0a5 +2d01b0a519b2abed10b0750533233334 +354a3601b1ab59b2a5eb03b0a3ecb4a5 +ebb5a70fb9a72502b3abeeb4abf3b7ab +f43034314a3201b1a55fb9abf203b2ab +edb3a55fb5a9f8b9abee06b50bb59bb7 +abf0b8abf1b9a55fb1abedb3abefb4ab +8002342e353e3710b2ab1902b2a3ecb3 +abf5b5abf603b0ab19b1ab19b4abf7b5 +a52d046436673c68427246761173f44b +116ceda5771168e2ad66116fed630161 +3c6d01e99dee012aa3424110cda34210 +e200134c625131513c53405450556a59 +01c5abfbd4ab8110c1ad4e02c1abf6c4 +abfad9ad5804c791c8a929caad6ccead +5dd2ad6d10cbad674c3c4d464e624f66 +5001cbad49d3ad4c01c2ad35d9ad3904 +c1ad3acdab06cea770d2ad3fd5ad6a10 +c7ad6b10cdad45452e4542474a494e4a +644b02c8a504cdad31d7ad3301c79bc8 +ad1f10c2ad6703c4ad68cead69d1ad2e +d2a57010cfad2f2a9b4132423c434644 +10daad1c01c5abfdc6abfe01c8ad08d5 +ab0601c3a90fceabe600217588e62bf2 +21f29bf3a349f6a353f9a35cfa012a2e +41127261e2a360022aa35e498a5210d5 +a361e651eb67ed75ee7f7a2d7a2ce125 +e22de54b10ea012a2e41127261e2a360 +032aa35e312e49345310d5a3611137b2 +a36101d1a35fd2a3607538763c775279 +01e2a35df2a35c10f9a35203eca354ee +a355f4a356f5a35703e1a358e2a359ef +a35af8a35b6b966f696f44704e726873 +a2507402e1a34fe7a350eaa35102ea89 +ed8bfa8d05f206f295f397fa99e38fe4 +91e59309ef0fefa344f1a345f3a346f9 +a347faa348e29be332e8a341eda342ee +a343022a9d4e2c5012616ceda1126261 +f49f04e1a34ae5a34be7a34cefa34df4 +a34e6b3c6c3e6d586e03e381eb83ee85 +f98710eb6905ee06ee71f36df473e16b +e26de96f03ed77ee79ef7bf07d652565 +30673668506a10e76501e24df94f05ed +06ed59ef5bf15de353e455e75702e15f +ec61ef636148625263646405f006f045 +f947fa49e13fe541ea4302e927eb29f5 +2b04e92ff131f233f435f93702e439e5 +3be83d + } + } match{ - trie:bin{ // BytesTrie: 2629 bytes + distances:intvector{ + 80, + 50, + 4, + 3, + } + paradigms{ + "en","Latn","US", + "en","Latn","GB", + "es","Latn","ES", + "es","Latn","419", + "pt","Latn","BR", + "pt","Latn","PT", + } + partitions{ + ".", + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "0123456", + "03", + "16", + "02", + "05", + "04", + "012346", + } + regionToPartitions:bin{ +000008090a00020000000b0009000201 +090001010a000a000000000000000a0c +00000001010000000100000000000000 +000000000000010100000b0000000b00 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +0000000000000000000000000000000c +010001000000000d0100000d01000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000900000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +000000000a0000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000101010102 +00020000010102010001020301010002 +01000101020001010101010101000202 +01020002020201010201000102020001 +01000101010100010201010201000201 +00020102010101000000010100010000 +01010002000200000000000000000000 +04010002000100010400000000000000 +00000101010100000000010000000000 +00000001010200010001000001000000 +00000100000105000201020101010000 +02010100020101020203000100020000 +00000000000000000006000102000000 +01000201000000000000000101010000 +00000000010101010001010101000000 +00000000000000010000000000000002 +00010100000000000000000000000000 +00010001010100000001020001000100 +00000001000201010102000000000001 +00010000000000000101010101000004 +00040001010102010300000101010106 +03020402010101010201010100010001 +01010002000001000001010001000101 +00000000010000000000000000000000 +00010000000000000000000000000002 +00000002010101000001010201000000 +07010100000100020001000000000000 +00000000000000010000000000010000 +00000000000000010000000000000000 +00010000000100010001000000010101 +01010001010101010101010100000201 +01010200020101010002010001010100 +01010101040101000100020001010000 +01010000000000010000000000030e00 +00000007000000000002010100020002 +00020007000000000100000000000001 +00000000000000000000010000000000 +00000000000000010000000000000000 +00000000000000000001000000000000 +00000000000000000000000001010000 +00000000000000000000000001010000 +00000001000000000000000000000001 +00000000010000000001000000 + } + trie:bin{ 00196ec42074c1b077c0ca77a28078a2 8a79a29a7a036c346daa90e834f51165 ee5d12ed6df335117ae820022a854834 @@ -2602,123 +2795,6 @@ e36de7356a1b6a306d447412ea6df335 01ee2af1116de735116df33512ed6de7 35623065366812f26de73512fa61f235 12ed65ee5d - } // trie - regionToPartitions:bin{ // 1677 bytes -000008090a00020000000b0009000201 -090001010a000a000000000000000a0c -00000001010000000100000000000000 -000000000000010100000b0000000b00 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -0000000000000000000000000000000c -010001000000000d0100000d01000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000900000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -000000000a0000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000101010102 -00020000010102010001020301010002 -01000101020001010101010101000202 -01020002020201010201000102020001 -01000101010100010201010201000201 -00020102010101000000010100010000 -01010002000200000000000000000000 -04010002000100010400000000000000 -00000101010100000000010000000000 -00000001010200010001000001000000 -00000100000105000201020101010000 -02010100020101020203000100020000 -00000000000000000006000102000000 -01000201000000000000000101010000 -00000000010101010001010101000000 -00000000000000010000000000000002 -00010100000000000000000000000000 -00010001010100000001020001000100 -00000001000201010102000000000001 -00010000000000000101010101000004 -00040001010102010300000101010106 -03020402010101010201010100010001 -01010002000001000001010001000101 -00000000010000000000000000000000 -00010000000000000000000000000002 -00000002010101000001010201000000 -07010100000100020001000000000000 -00000000000000010000000000010000 -00000000000000010000000000000000 -00010000000100010001000000010101 -01010001010101010101010100000201 -01010200020101010002010001010100 -01010101040101000100020001010000 -01010000000000010000000000030e00 -00000007000000000002010100020002 -00020007000000000100000000000001 -00000000000000000000010000000000 -00000000000000010000000000000000 -00000000000000000001000000000000 -00000000000000000000000001010000 -00000000000000000000000001010000 -00000001000000000000000000000001 -00000000010000000001000000 - } // regionToPartitions - partitions{".","0","1","2","3","4","5","6","0123456","03","16","02","05","04","012346"} - paradigms{ - "en","Latn","US", - "en","Latn","GB", - "es","Latn","ES", - "es","Latn","419", - "pt","Latn","BR", - "pt","Latn","PT", } - distances:intvector{80,50,4,3} - } // match + } } diff --git a/intl/icu/source/data/misc/likelySubtags.txt b/intl/icu/source/data/misc/likelySubtags.txt index d8130927ec06..c2db5fa33074 100644 --- a/intl/icu/source/data/misc/likelySubtags.txt +++ b/intl/icu/source/data/misc/likelySubtags.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml likelySubtags:table(nofallback){ aa{"aa_Latn_ET"} aai{"aai_Latn_ZZ"} @@ -267,7 +268,7 @@ likelySubtags:table(nofallback){ cy{"cy_Latn_GB"} da{"da_Latn_DK"} dad{"dad_Latn_ZZ"} - daf{"daf_Latn_ZZ"} + daf{"daf_Latn_CI"} dag{"dag_Latn_ZZ"} dah{"dah_Latn_ZZ"} dak{"dak_Latn_US"} @@ -290,7 +291,7 @@ likelySubtags:table(nofallback){ dje{"dje_Latn_NE"} dnj{"dnj_Latn_CI"} dob{"dob_Latn_ZZ"} - doi{"doi_Arab_IN"} + doi{"doi_Deva_IN"} dop{"dop_Latn_ZZ"} dow{"dow_Latn_ZZ"} drh{"drh_Mong_CN"} @@ -339,6 +340,7 @@ likelySubtags:table(nofallback){ eu{"eu_Latn_ES"} ewo{"ewo_Latn_CM"} ext{"ext_Latn_ES"} + eza{"eza_Latn_ZZ"} fa{"fa_Arab_IR"} faa{"faa_Latn_ZZ"} fab{"fab_Latn_ZZ"} @@ -462,7 +464,6 @@ likelySubtags:table(nofallback){ he{"he_Hebr_IL"} hhy{"hhy_Latn_ZZ"} hi{"hi_Deva_IN"} - hi_Latn{"hi_Latn_IN"} hia{"hia_Latn_ZZ"} hif{"hif_Latn_FJ"} hig{"hig_Latn_ZZ"} @@ -530,6 +531,7 @@ likelySubtags:table(nofallback){ ja{"ja_Jpan_JP"} jab{"jab_Latn_ZZ"} jam{"jam_Latn_JM"} + jar{"jar_Latn_ZZ"} jbo{"jbo_Latn_001"} jbu{"jbu_Latn_ZZ"} jen{"jen_Latn_ZZ"} @@ -639,7 +641,6 @@ likelySubtags:table(nofallback){ krs{"krs_Latn_ZZ"} kru{"kru_Deva_IN"} ks{"ks_Arab_IN"} - ks_Deva{"ks_Deva_IN"} ksb{"ksb_Latn_TZ"} ksd{"ksd_Latn_ZZ"} ksf{"ksf_Latn_CM"} @@ -673,6 +674,7 @@ likelySubtags:table(nofallback){ kxa{"kxa_Latn_ZZ"} kxc{"kxc_Ethi_ZZ"} kxe{"kxe_Latn_ZZ"} + kxl{"kxl_Deva_IN"} kxm{"kxm_Thai_TH"} kxp{"kxp_Arab_PK"} kxw{"kxw_Latn_ZZ"} @@ -684,6 +686,7 @@ likelySubtags:table(nofallback){ ky_TR{"ky_Latn_TR"} kye{"kye_Latn_ZZ"} kyx{"kyx_Latn_ZZ"} + kzh{"kzh_Arab_ZZ"} kzj{"kzj_Latn_MY"} kzr{"kzr_Latn_ZZ"} kzt{"kzt_Latn_MY"} @@ -840,7 +843,6 @@ likelySubtags:table(nofallback){ mro{"mro_Mroo_BD"} ms{"ms_Latn_MY"} ms_CC{"ms_Arab_CC"} - ms_ID{"ms_Latn_ID"} mt{"mt_Latn_MT"} mtc{"mtc_Latn_ZZ"} mtf{"mtf_Latn_ZZ"} @@ -1218,7 +1220,7 @@ likelySubtags:table(nofallback){ tr{"tr_Latn_TR"} tru{"tru_Latn_TR"} trv{"trv_Latn_TW"} - trw{"trw_Arab_ZZ"} + trw{"trw_Arab_PK"} ts{"ts_Latn_ZA"} tsd{"tsd_Grek_GR"} tsf{"tsf_Deva_NP"} @@ -1377,7 +1379,7 @@ likelySubtags:table(nofallback){ 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_GE{"os_Cyrl_GE"} und_Cyrl_GR{"mk_Cyrl_GR"} und_Cyrl_MD{"uk_Cyrl_MD"} und_Cyrl_RO{"bg_Cyrl_RO"} @@ -1405,7 +1407,7 @@ likelySubtags:table(nofallback){ und_ER{"ti_Ethi_ER"} und_ES{"es_Latn_ES"} und_ET{"am_Ethi_ET"} - und_EU{"en_Latn_GB"} + und_EU{"en_Latn_IE"} und_EZ{"de_Latn_EZ"} und_Egyp{"egy_Egyp_EG"} und_Elba{"sq_Elba_AL"} @@ -1711,6 +1713,7 @@ likelySubtags:table(nofallback){ urt{"urt_Latn_ZZ"} urw{"urw_Latn_ZZ"} usa{"usa_Latn_ZZ"} + uth{"uth_Latn_ZZ"} utr{"utr_Latn_ZZ"} uvh{"uvh_Latn_ZZ"} uvl{"uvl_Latn_ZZ"} @@ -1840,7 +1843,6 @@ likelySubtags:table(nofallback){ 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"} diff --git a/intl/icu/source/data/misc/metaZones.txt b/intl/icu/source/data/misc/metaZones.txt index 2b297f77a12b..65d5e189696d 100644 --- a/intl/icu/source/data/misc/metaZones.txt +++ b/intl/icu/source/data/misc/metaZones.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml metaZones:table(nofallback){ mapTimezones{ Acre{ @@ -1554,6 +1555,11 @@ metaZones:table(nofallback){ { "America_Pacific", "1973-10-28 09:00", + "2020-11-01 07:00", + } + { + "America_Mountain", + "2020-11-01 07:00", "9999-12-31 23:59", } } @@ -2527,6 +2533,13 @@ metaZones:table(nofallback){ "America:Whitehorse"{ { "America_Pacific", + "1970-01-01 00:00", + "2020-11-01 07:00", + } + { + "America_Mountain", + "2020-11-01 07:00", + "9999-12-31 23:59", } } "America:Winnipeg"{ @@ -2585,6 +2598,31 @@ metaZones:table(nofallback){ { "Australia_Western", "2018-03-10 17:00", + "2018-10-06 20:00", + } + { + "Casey", + "2018-10-06 20:00", + "2019-03-16 16:00", + } + { + "Australia_Western", + "2019-03-16 16:00", + "2019-10-03 19:00", + } + { + "Casey", + "2019-10-03 19:00", + "2020-03-07 16:00", + } + { + "Australia_Western", + "2020-03-07 16:00", + "2020-10-03 16:01", + } + { + "Casey", + "2020-10-03 16:01", "9999-12-31 23:59", } } @@ -2601,13 +2639,6 @@ metaZones:table(nofallback){ "Antarctica:Macquarie"{ { "Australia_Eastern", - "1970-01-01 00:00", - "2010-04-03 16:00", - } - { - "Macquarie", - "2010-04-03 16:00", - "9999-12-31 23:59", } } "Antarctica:Mawson"{ diff --git a/intl/icu/source/data/misc/metadata.txt b/intl/icu/source/data/misc/metadata.txt index 4f1c3d79b752..b14427a72a07 100644 --- a/intl/icu/source/data/misc/metadata.txt +++ b/intl/icu/source/data/misc/metadata.txt @@ -1,9 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml metadata:table(nofallback){ alias{ language{ - aa_SAAHO{ + aa_saaho{ reason{"deprecated"} replacement{"ssy"} } @@ -27,6 +28,14 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"af"} } + agp{ + reason{"deprecated"} + replacement{"apf"} + } + ais{ + reason{"deprecated"} + replacement{"ami"} + } aju{ reason{"macrolanguage"} replacement{"jrb"} @@ -99,10 +108,6 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"nun"} } - az_AZ{ - reason{"legacy"} - replacement{"az_Latn_AZ"} - } aze{ reason{"overlong"} replacement{"az"} @@ -123,6 +128,10 @@ metadata:table(nofallback){ reason{"bibliographic"} replacement{"eu"} } + baz{ + reason{"deprecated"} + replacement{"nvo"} + } bcc{ reason{"macrolanguage"} replacement{"bal"} @@ -147,6 +156,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"bho"} } + bhk{ + reason{"deprecated"} + replacement{"fbl"} + } bih{ reason{"overlong"} replacement{"bho"} @@ -159,6 +172,14 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"drl"} } + bjq{ + reason{"deprecated"} + replacement{"bzc"} + } + bkb{ + reason{"deprecated"} + replacement{"ebk"} + } bod{ reason{"overlong"} replacement{"bo"} @@ -171,9 +192,9 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"br"} } - bs_BA{ - reason{"legacy"} - replacement{"bs_Latn_BA"} + btb{ + reason{"deprecated"} + replacement{"beb"} } bul{ reason{"overlong"} @@ -199,9 +220,9 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"rki"} } - cel-gaulish{ + cel_gaulish{ reason{"legacy"} - replacement{"xtg-x-cel-gaulish"} + replacement{"xtg"} } ces{ reason{"overlong"} @@ -283,10 +304,18 @@ metadata:table(nofallback){ reason{"bibliographic"} replacement{"cs"} } + daf{ + reason{"deprecated"} + replacement{"dnj"} + } dan{ reason{"overlong"} replacement{"da"} } + dap{ + reason{"deprecated"} + replacement{"njz"} + } deu{ reason{"overlong"} replacement{"de"} @@ -315,18 +344,42 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"dv"} } + djl{ + reason{"deprecated"} + replacement{"dze"} + } + dkl{ + reason{"deprecated"} + replacement{"aqd"} + } drh{ reason{"deprecated"} replacement{"mn"} } + drr{ + reason{"deprecated"} + replacement{"kzk"} + } drw{ reason{"deprecated"} - replacement{"fa_af"} + replacement{"fa_AF"} + } + dud{ + reason{"deprecated"} + replacement{"uth"} + } + duj{ + reason{"deprecated"} + replacement{"dwu"} } dut{ reason{"bibliographic"} replacement{"nl"} } + dwl{ + reason{"deprecated"} + replacement{"dbt"} + } dzo{ reason{"overlong"} replacement{"dz"} @@ -339,10 +392,18 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"el"} } + elp{ + reason{"deprecated"} + replacement{"amq"} + } emk{ reason{"macrolanguage"} replacement{"man"} } + en_GB_oed{ + reason{"deprecated"} + replacement{"en_GB_oxendict"} + } eng{ reason{"overlong"} replacement{"en"} @@ -415,6 +476,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"om"} } + gbc{ + reason{"deprecated"} + replacement{"wny"} + } gbo{ reason{"macrolanguage"} replacement{"grb"} @@ -435,6 +500,18 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"gvr"} } + ggo{ + reason{"deprecated"} + replacement{"esg"} + } + ggr{ + reason{"deprecated"} + replacement{"gtu"} + } + gio{ + reason{"deprecated"} + replacement{"aou"} + } gla{ reason{"overlong"} replacement{"gd"} @@ -447,6 +524,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"gl"} } + gli{ + reason{"deprecated"} + replacement{"kzk"} + } glv{ reason{"overlong"} replacement{"gv"} @@ -483,18 +564,6 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"gba"} } - ha_Latn_GH{ - reason{"legacy"} - replacement{"ha_GH"} - } - ha_Latn_NE{ - reason{"legacy"} - replacement{"ha_NE"} - } - ha_Latn_NG{ - reason{"legacy"} - replacement{"ha_NG"} - } hat{ reason{"overlong"} replacement{"ht"} @@ -547,22 +616,14 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"hu"} } + hy_arevmda{ + reason{"deprecated"} + replacement{"hyw"} + } hye{ reason{"overlong"} replacement{"hy"} } - i-default{ - reason{"legacy"} - replacement{"en-x-i-default"} - } - i-enochian{ - reason{"legacy"} - replacement{"und-x-i-enochian"} - } - i-mingo{ - reason{"legacy"} - replacement{"see-x-i-mingo"} - } i_ami{ reason{"deprecated"} replacement{"ami"} @@ -571,6 +632,14 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"bnn"} } + i_default{ + reason{"legacy"} + replacement{"en_x_i_default"} + } + i_enochian{ + reason{"legacy"} + replacement{"und_x_i_enochian"} + } i_hak{ reason{"deprecated"} replacement{"hak"} @@ -583,6 +652,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"lb"} } + i_mingo{ + reason{"legacy"} + replacement{"see_x_i_mingo"} + } i_navajo{ reason{"deprecated"} replacement{"nv"} @@ -635,6 +708,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"ie"} } + ill{ + reason{"deprecated"} + replacement{"ilm"} + } ilw{ reason{"deprecated"} replacement{"gal"} @@ -667,6 +744,14 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"he"} } + izi{ + reason{"deprecated"} + replacement{"eza"} + } + jar{ + reason{"deprecated"} + replacement{"jgk"} + } jav{ reason{"overlong"} replacement{"jv"} @@ -711,10 +796,18 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"kk"} } + kdv{ + reason{"deprecated"} + replacement{"zkd"} + } kgc{ reason{"deprecated"} replacement{"tdf"} } + kgd{ + reason{"deprecated"} + replacement{"ncq"} + } kgh{ reason{"deprecated"} replacement{"kml"} @@ -739,10 +832,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"ky"} } - kk_Cyrl_KZ{ - reason{"legacy"} - replacement{"kk_KZ"} - } kmr{ reason{"macrolanguage"} replacement{"ku"} @@ -775,6 +864,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"ko"} } + kpp{ + reason{"deprecated"} + replacement{"jkm"} + } kpv{ reason{"macrolanguage"} replacement{"kv"} @@ -783,10 +876,6 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"bmf"} } - ks_Arab_IN{ - reason{"legacy"} - replacement{"ks_IN"} - } ktr{ reason{"deprecated"} replacement{"dtp"} @@ -811,9 +900,13 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"tvd"} } - ky_Cyrl_KG{ - reason{"legacy"} - replacement{"ky_KG"} + kxl{ + reason{"deprecated"} + replacement{"kru"} + } + kzh{ + reason{"deprecated"} + replacement{"dgl"} } kzj{ reason{"deprecated"} @@ -839,6 +932,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"bnc"} } + leg{ + reason{"deprecated"} + replacement{"enl"} + } lii{ reason{"deprecated"} replacement{"raq"} @@ -907,6 +1004,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"cir"} } + mgx{ + reason{"deprecated"} + replacement{"jbk"} + } mhr{ reason{"macrolanguage"} replacement{"chm"} @@ -923,18 +1024,22 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"mt"} } - mn_Cyrl_MN{ - reason{"legacy"} - replacement{"mn_MN"} - } mnk{ reason{"macrolanguage"} replacement{"man"} } + mnt{ + reason{"deprecated"} + replacement{"wnn"} + } mo{ reason{"deprecated"} replacement{"ro"} } + mof{ + reason{"deprecated"} + replacement{"xnt"} + } mol{ reason{"overlong"} replacement{"ro"} @@ -947,18 +1052,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"mi"} } - ms_Latn_BN{ - reason{"legacy"} - replacement{"ms_BN"} - } - ms_Latn_MY{ - reason{"legacy"} - replacement{"ms_MY"} - } - ms_Latn_SG{ - reason{"legacy"} - replacement{"ms_SG"} - } msa{ reason{"overlong"} replacement{"ms"} @@ -971,6 +1064,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"raj"} } + mwd{ + reason{"deprecated"} + replacement{"dmw"} + } mwj{ reason{"deprecated"} replacement{"vaj"} @@ -999,10 +1096,18 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"nv"} } + nbf{ + reason{"deprecated"} + replacement{"nru"} + } nbl{ reason{"overlong"} replacement{"nr"} } + nbx{ + reason{"deprecated"} + replacement{"ekc"} + } ncp{ reason{"deprecated"} replacement{"kdz"} @@ -1023,6 +1128,14 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"nl"} } + nln{ + reason{"deprecated"} + replacement{"azd"} + } + nlr{ + reason{"deprecated"} + replacement{"nrk"} + } nno{ reason{"overlong"} replacement{"nn"} @@ -1039,15 +1152,11 @@ metadata:table(nofallback){ reason{"legacy"} replacement{"nb"} } - no_BOKMAL{ + no_bok{ reason{"deprecated"} replacement{"nb"} } - no_NYNORSK{ - reason{"deprecated"} - replacement{"nn"} - } - no_bok{ + no_bokmal{ reason{"deprecated"} replacement{"nb"} } @@ -1055,10 +1164,18 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"nn"} } + no_nynorsk{ + reason{"deprecated"} + replacement{"nn"} + } nob{ reason{"overlong"} replacement{"nb"} } + noo{ + reason{"deprecated"} + replacement{"dtd"} + } nor{ reason{"overlong"} replacement{"nb"} @@ -1071,6 +1188,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"pij"} } + nxu{ + reason{"deprecated"} + replacement{"bpp"} + } nya{ reason{"overlong"} replacement{"ny"} @@ -1107,14 +1228,6 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"vaj"} } - pa_IN{ - reason{"legacy"} - replacement{"pa_Guru_IN"} - } - pa_PK{ - reason{"legacy"} - replacement{"pa_Arab_PK"} - } pan{ reason{"overlong"} replacement{"pa"} @@ -1195,6 +1308,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"qu"} } + rmr{ + reason{"deprecated"} + replacement{"emx"} + } rmy{ reason{"macrolanguage"} replacement{"rom"} @@ -1227,6 +1344,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"sa"} } + sap{ + reason{"deprecated"} + replacement{"aqt"} + } sca{ reason{"deprecated"} replacement{"hle"} @@ -1239,6 +1360,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"hr"} } + sgl{ + reason{"deprecated"} + replacement{"isk"} + } sgn_BE_FR{ reason{"deprecated"} replacement{"sfb"} @@ -1247,18 +1372,90 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"vgt"} } + sgn_BR{ + reason{"deprecated"} + replacement{"bzs"} + } sgn_CH_DE{ reason{"deprecated"} replacement{"sgg"} } + sgn_CO{ + reason{"deprecated"} + replacement{"csn"} + } + sgn_DE{ + reason{"deprecated"} + replacement{"gsg"} + } + sgn_DK{ + reason{"deprecated"} + replacement{"dsl"} + } + sgn_ES{ + reason{"deprecated"} + replacement{"ssp"} + } + sgn_FR{ + reason{"deprecated"} + replacement{"fsl"} + } + sgn_GB{ + reason{"deprecated"} + replacement{"bfi"} + } + sgn_GR{ + reason{"deprecated"} + replacement{"gss"} + } + sgn_IE{ + reason{"deprecated"} + replacement{"isg"} + } + sgn_IT{ + reason{"deprecated"} + replacement{"ise"} + } + sgn_JP{ + reason{"deprecated"} + replacement{"jsl"} + } + sgn_MX{ + reason{"deprecated"} + replacement{"mfs"} + } + sgn_NI{ + reason{"deprecated"} + replacement{"ncs"} + } + sgn_NL{ + reason{"deprecated"} + replacement{"dse"} + } + sgn_NO{ + reason{"deprecated"} + replacement{"nsi"} + } + sgn_PT{ + reason{"deprecated"} + replacement{"psr"} + } + sgn_SE{ + reason{"deprecated"} + replacement{"swl"} + } + sgn_US{ + reason{"deprecated"} + replacement{"ase"} + } + sgn_ZA{ + reason{"deprecated"} + replacement{"sfs"} + } sh{ reason{"legacy"} replacement{"sr_Latn"} } - shi_MA{ - reason{"legacy"} - replacement{"shi_Tfng_MA"} - } sin{ reason{"overlong"} replacement{"si"} @@ -1315,22 +1512,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"sq"} } - sr_BA{ - reason{"legacy"} - replacement{"sr_Cyrl_BA"} - } - sr_ME{ - reason{"legacy"} - replacement{"sr_Latn_ME"} - } - sr_RS{ - reason{"legacy"} - replacement{"sr_Cyrl_RS"} - } - sr_XK{ - reason{"legacy"} - replacement{"sr_Cyrl_XK"} - } src{ reason{"macrolanguage"} replacement{"sc"} @@ -1347,6 +1528,14 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"ss"} } + sul{ + reason{"deprecated"} + replacement{"sgd"} + } + sum{ + reason{"deprecated"} + replacement{"ulw"} + } sun{ reason{"overlong"} replacement{"su"} @@ -1387,6 +1576,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"te"} } + tgg{ + reason{"deprecated"} + replacement{"bjp"} + } tgk{ reason{"overlong"} replacement{"tg"} @@ -1403,6 +1596,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"tpo"} } + thw{ + reason{"deprecated"} + replacement{"ola"} + } thx{ reason{"deprecated"} replacement{"oyb"} @@ -1411,6 +1608,10 @@ metadata:table(nofallback){ reason{"bibliographic"} replacement{"bo"} } + tid{ + reason{"deprecated"} + replacement{"itd"} + } tie{ reason{"deprecated"} replacement{"ras"} @@ -1441,7 +1642,7 @@ metadata:table(nofallback){ } tnf{ reason{"deprecated"} - replacement{"fa_af"} + replacement{"fa_AF"} } ton{ reason{"overlong"} @@ -1479,14 +1680,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"ak"} } - tzm_Latn_MA{ - reason{"legacy"} - replacement{"tzm_MA"} - } - ug_Arab_CN{ - reason{"legacy"} - replacement{"ug_CN"} - } uig{ reason{"overlong"} replacement{"ug"} @@ -1499,6 +1692,50 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"del"} } + und_aaland{ + reason{"deprecated"} + replacement{"und_AX"} + } + und_arevela{ + reason{"deprecated"} + replacement{"und"} + } + und_arevmda{ + reason{"deprecated"} + replacement{"und"} + } + und_bokmal{ + reason{"deprecated"} + replacement{"und"} + } + und_hakka{ + reason{"deprecated"} + replacement{"und"} + } + und_hepburn_heploc{ + reason{"deprecated"} + replacement{"und_alalc97"} + } + und_lojban{ + reason{"deprecated"} + replacement{"und"} + } + und_nynorsk{ + reason{"deprecated"} + replacement{"und"} + } + und_saaho{ + reason{"deprecated"} + replacement{"und"} + } + und_xiang{ + reason{"deprecated"} + replacement{"und"} + } + unp{ + reason{"deprecated"} + replacement{"wro"} + } uok{ reason{"deprecated"} replacement{"ema"} @@ -1507,14 +1744,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"ur"} } - uz_AF{ - reason{"legacy"} - replacement{"uz_Arab_AF"} - } - uz_UZ{ - reason{"legacy"} - replacement{"uz_Latn_UZ"} - } uzb{ reason{"overlong"} replacement{"uz"} @@ -1523,10 +1752,6 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"uz"} } - vai_LR{ - reason{"legacy"} - replacement{"vai_Vaii_LR"} - } ven{ reason{"overlong"} replacement{"ve"} @@ -1543,6 +1768,18 @@ metadata:table(nofallback){ reason{"bibliographic"} replacement{"cy"} } + wgw{ + reason{"deprecated"} + replacement{"wgb"} + } + wit{ + reason{"deprecated"} + replacement{"nol"} + } + wiw{ + reason{"deprecated"} + replacement{"nwo"} + } wln{ reason{"overlong"} replacement{"wa"} @@ -1571,6 +1808,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"kpe"} } + xrq{ + reason{"deprecated"} + replacement{"dmw"} + } xsj{ reason{"deprecated"} replacement{"suj"} @@ -1587,10 +1828,18 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"yi"} } + yen{ + reason{"deprecated"} + replacement{"ynq"} + } yid{ reason{"overlong"} replacement{"yi"} } + yiy{ + reason{"deprecated"} + replacement{"yrm"} + } yma{ reason{"deprecated"} replacement{"lrr"} @@ -1607,14 +1856,6 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"zom"} } - yue_CN{ - reason{"legacy"} - replacement{"yue_Hans_CN"} - } - yue_HK{ - reason{"legacy"} - replacement{"yue_Hant_HK"} - } yuu{ reason{"deprecated"} replacement{"yug"} @@ -1623,29 +1864,21 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"zap"} } - zh-min{ - reason{"legacy"} - replacement{"nan-x-zh-min"} + zh_cmn{ + reason{"deprecated"} + replacement{"zh"} } - zh_CN{ - reason{"legacy"} - replacement{"zh_Hans_CN"} + zh_cmn_Hans{ + reason{"deprecated"} + replacement{"zh_Hans"} } - zh_HK{ - reason{"legacy"} - replacement{"zh_Hant_HK"} + zh_cmn_Hant{ + reason{"deprecated"} + replacement{"zh_Hant"} } - zh_MO{ - reason{"legacy"} - replacement{"zh_Hant_MO"} - } - zh_SG{ - reason{"legacy"} - replacement{"zh_Hans_SG"} - } - zh_TW{ - reason{"legacy"} - replacement{"zh_Hant_TW"} + zh_gan{ + reason{"deprecated"} + replacement{"gan"} } zh_guoyu{ reason{"deprecated"} @@ -1655,14 +1888,26 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"hak"} } + zh_min{ + reason{"legacy"} + replacement{"nan_x_zh_min"} + } zh_min_nan{ reason{"deprecated"} replacement{"nan"} } + zh_wuu{ + reason{"deprecated"} + replacement{"wuu"} + } zh_xiang{ reason{"deprecated"} replacement{"hsn"} } + zh_yue{ + reason{"deprecated"} + replacement{"yue"} + } zha{ reason{"overlong"} replacement{"za"} @@ -1671,6 +1916,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"zh"} } + zir{ + reason{"deprecated"} + replacement{"scv"} + } zsm{ reason{"macrolanguage"} replacement{"ms"} @@ -4831,30 +5080,14 @@ metadata:table(nofallback){ } } variant{ - AALAND{ - reason{"deprecated"} - replacement{"AX"} - } - HEPLOC{ - reason{"deprecated"} - replacement{"ALALC97"} - } - POLYTONI{ - reason{"deprecated"} - replacement{"POLYTON"} - } - arevela{ - reason{"deprecated"} - replacement{"hy"} - } - arevmda{ - reason{"deprecated"} - replacement{"hyw"} - } heploc{ reason{"deprecated"} replacement{"alalc97"} } + polytoni{ + reason{"deprecated"} + replacement{"polyton"} + } } } defaultContent{ @@ -4911,6 +5144,7 @@ metadata:table(nofallback){ "dav_KE", "de_DE", "dje_NE", + "doi_IN", "dsb_DE", "dua_CM", "dv_MV", @@ -4979,6 +5213,7 @@ metadata:table(nofallback){ "kde_TZ", "kea_CV", "ken_CM", + "kgp_BR", "khq_ML", "ki_KE", "kk_KZ", @@ -4999,9 +5234,11 @@ metadata:table(nofallback){ "ku_TR", "kw_GB", "ky_KG", + "la_VA", "lag_TZ", "lb_LU", "lg_UG", + "lij_IT", "lkt_US", "ln_CD", "lo_LA", @@ -5049,6 +5286,7 @@ metadata:table(nofallback){ "nr_ZA", "nso_ZA", "nus_SS", + "nv_US", "ny_MW", "nyn_UG", "oc_FR", @@ -5128,6 +5366,7 @@ metadata:table(nofallback){ "to_TO", "tr_TR", "trv_TW", + "trw_PK", "ts_ZA", "tt_RU", "twq_NE", diff --git a/intl/icu/source/data/misc/miscfiles.mk b/intl/icu/source/data/misc/miscfiles.mk deleted file mode 100644 index 0c18119d47a1..000000000000 --- a/intl/icu/source/data/misc/miscfiles.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html -# * Copyright (C) 2003-2015, International Business Machines -# * Corporation and others. All Rights Reserved. -# A list of txt's to build -# Note: -# -# If you are thinking of modifying this file, READ THIS. -# -# Instead of changing this file [unless you want to check it back in], -# you should consider creating a 'misclocal.mk' file in this same directory. -# Then, you can have your local changes remain even if you upgrade or re- -# configure ICU. -# -# Example 'misclocal.mk' files: -# -# * To add an additional file to the list: -# _____________________________________________________ -# | MISC_SOURCE_LOCAL = myFile.txt ... -# -# * To REPLACE the default list and only build a subset of files: -# _____________________________________________________ -# | MISC_SOURCE = zoneinfo.txt -# -# - -MISC_SOURCE = \ -zoneinfo64.txt supplementalData.txt likelySubtags.txt plurals.txt \ -numberingSystems.txt icuver.txt icustd.txt metadata.txt metaZones.txt \ -windowsZones.txt keyTypeData.txt timezoneTypes.txt currencyNumericCodes.txt \ -genderList.txt dayPeriods.txt pluralRanges.txt diff --git a/intl/icu/source/data/misc/numberingSystems.txt b/intl/icu/source/data/misc/numberingSystems.txt index 7de1bdf92c7c..76302bc27d21 100644 --- a/intl/icu/source/data/misc/numberingSystems.txt +++ b/intl/icu/source/data/misc/numberingSystems.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml numberingSystems:table(nofallback){ numberingSystems{ adlm{ diff --git a/intl/icu/source/data/misc/pluralRanges.txt b/intl/icu/source/data/misc/pluralRanges.txt index 5e757f1a1b71..9c18ba231fd3 100644 --- a/intl/icu/source/data/misc/pluralRanges.txt +++ b/intl/icu/source/data/misc/pluralRanges.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pluralRanges:table(nofallback){ locales{ af{"set04"} @@ -48,6 +49,7 @@ pluralRanges:table(nofallback){ kn{"set01"} ko{"set00"} ky{"set03"} + lij{"set03"} lo{"set00"} lt{"set15"} lv{"set09"} diff --git a/intl/icu/source/data/misc/plurals.txt b/intl/icu/source/data/misc/plurals.txt index cf215c58d964..cf03e27b12fc 100644 --- a/intl/icu/source/data/misc/plurals.txt +++ b/intl/icu/source/data/misc/plurals.txt @@ -1,18 +1,19 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml plurals:table(nofallback){ locales{ af{"set8"} ak{"set6"} am{"set1"} an{"set8"} - ar{"set34"} - ars{"set34"} + ar{"set35"} + ars{"set35"} as{"set1"} asa{"set8"} ast{"set4"} az{"set8"} - be{"set26"} + be{"set27"} bem{"set8"} bez{"set8"} bg{"set8"} @@ -20,7 +21,7 @@ plurals:table(nofallback){ bm{"set0"} bn{"set1"} bo{"set0"} - br{"set30"} + br{"set31"} brx{"set8"} bs{"set19"} ca{"set4"} @@ -29,11 +30,12 @@ plurals:table(nofallback){ cgg{"set8"} chr{"set8"} ckb{"set8"} - cs{"set24"} - cy{"set35"} + cs{"set25"} + cy{"set36"} da{"set9"} de{"set4"} - dsb{"set22"} + doi{"set1"} + dsb{"set23"} dv{"set8"} dz{"set0"} ee{"set8"} @@ -48,22 +50,22 @@ plurals:table(nofallback){ fi{"set4"} fil{"set12"} fo{"set8"} - fr{"set2"} + fr{"set20"} fur{"set8"} fy{"set4"} - ga{"set31"} - gd{"set20"} + ga{"set32"} + gd{"set21"} gl{"set4"} gsw{"set8"} gu{"set1"} guw{"set6"} - gv{"set32"} + gv{"set33"} ha{"set8"} haw{"set8"} - he{"set23"} + he{"set24"} hi{"set1"} hr{"set19"} - hsb{"set22"} + hsb{"set23"} hu{"set8"} hy{"set2"} ia{"set4"} @@ -75,7 +77,7 @@ plurals:table(nofallback){ is{"set10"} it{"set4"} iu{"set16"} - iw{"set23"} + iw{"set24"} ja{"set0"} jbo{"set0"} jgo{"set8"} @@ -99,15 +101,16 @@ plurals:table(nofallback){ ksb{"set8"} ksh{"set15"} ku{"set8"} - kw{"set33"} + kw{"set34"} ky{"set8"} lag{"set14"} lb{"set8"} lg{"set8"} + lij{"set4"} lkt{"set0"} ln{"set6"} lo{"set0"} - lt{"set27"} + lt{"set28"} lv{"set13"} mas{"set8"} mg{"set6"} @@ -118,7 +121,7 @@ plurals:table(nofallback){ mo{"set18"} mr{"set8"} ms{"set0"} - mt{"set28"} + mt{"set29"} my{"set0"} nah{"set8"} naq{"set16"} @@ -141,7 +144,7 @@ plurals:table(nofallback){ pa{"set6"} pap{"set8"} pcm{"set1"} - pl{"set25"} + pl{"set26"} prg{"set13"} ps{"set8"} pt{"set3"} @@ -150,7 +153,7 @@ plurals:table(nofallback){ ro{"set18"} rof{"set8"} root{"set0"} - ru{"set29"} + ru{"set30"} rwk{"set8"} sah{"set0"} saq{"set8"} @@ -166,8 +169,8 @@ plurals:table(nofallback){ sh{"set19"} shi{"set17"} si{"set5"} - sk{"set24"} - sl{"set21"} + sk{"set25"} + sl{"set22"} sma{"set16"} smi{"set16"} smj{"set16"} @@ -198,7 +201,7 @@ plurals:table(nofallback){ ts{"set8"} tzm{"set7"} ug{"set8"} - uk{"set29"} + uk{"set30"} ur{"set4"} uz{"set8"} ve{"set8"} @@ -217,104 +220,105 @@ plurals:table(nofallback){ zu{"set1"} } locales_ordinals{ - af{"set36"} - am{"set36"} - an{"set36"} - ar{"set36"} - as{"set56"} - az{"set54"} - be{"set41"} - bg{"set36"} - bn{"set56"} - bs{"set36"} - ca{"set52"} - ce{"set36"} - cs{"set36"} - cy{"set58"} - da{"set36"} - de{"set36"} - dsb{"set36"} - el{"set36"} - en{"set49"} - es{"set36"} - et{"set36"} - eu{"set36"} - fa{"set36"} - fi{"set36"} - fil{"set38"} - fr{"set38"} - fy{"set36"} - ga{"set38"} - gd{"set51"} - gl{"set36"} - gsw{"set36"} - gu{"set55"} - he{"set36"} - hi{"set55"} - hr{"set36"} - hsb{"set36"} - hu{"set39"} - hy{"set38"} - ia{"set36"} - id{"set36"} - in{"set36"} - is{"set36"} - it{"set45"} - iw{"set36"} - ja{"set36"} - ka{"set46"} - kk{"set44"} - km{"set36"} - kn{"set36"} - ko{"set36"} - kw{"set48"} - ky{"set36"} - lo{"set38"} - lt{"set36"} - lv{"set36"} - mk{"set53"} - ml{"set36"} - mn{"set36"} - mo{"set38"} - mr{"set50"} - ms{"set38"} - my{"set36"} - nb{"set36"} - ne{"set40"} - nl{"set36"} - or{"set57"} - pa{"set36"} - pl{"set36"} - prg{"set36"} - ps{"set36"} - pt{"set36"} - ro{"set38"} - root{"set36"} - ru{"set36"} - sc{"set45"} - scn{"set45"} - sd{"set36"} - sh{"set36"} - si{"set36"} - sk{"set36"} - sl{"set36"} - sq{"set47"} - sr{"set36"} - sv{"set37"} - sw{"set36"} - ta{"set36"} - te{"set36"} - th{"set36"} - tk{"set43"} - tl{"set38"} - tr{"set36"} - uk{"set42"} - ur{"set36"} - uz{"set36"} - vi{"set38"} - yue{"set36"} - zh{"set36"} - zu{"set36"} + af{"set37"} + am{"set37"} + an{"set37"} + ar{"set37"} + as{"set58"} + az{"set56"} + be{"set42"} + bg{"set37"} + bn{"set58"} + bs{"set37"} + ca{"set54"} + ce{"set37"} + cs{"set37"} + cy{"set60"} + da{"set37"} + de{"set37"} + dsb{"set37"} + el{"set37"} + en{"set51"} + es{"set37"} + et{"set37"} + eu{"set37"} + fa{"set37"} + fi{"set37"} + fil{"set39"} + fr{"set39"} + fy{"set37"} + ga{"set39"} + gd{"set53"} + gl{"set37"} + gsw{"set37"} + gu{"set57"} + he{"set37"} + hi{"set57"} + hr{"set37"} + hsb{"set37"} + hu{"set40"} + hy{"set39"} + ia{"set37"} + id{"set37"} + in{"set37"} + is{"set37"} + it{"set46"} + iw{"set37"} + ja{"set37"} + ka{"set48"} + kk{"set45"} + km{"set37"} + kn{"set37"} + ko{"set37"} + kw{"set50"} + ky{"set37"} + lij{"set47"} + lo{"set39"} + lt{"set37"} + lv{"set37"} + mk{"set55"} + ml{"set37"} + mn{"set37"} + mo{"set39"} + mr{"set52"} + ms{"set39"} + my{"set37"} + nb{"set37"} + ne{"set41"} + nl{"set37"} + or{"set59"} + pa{"set37"} + pl{"set37"} + prg{"set37"} + ps{"set37"} + pt{"set37"} + ro{"set39"} + root{"set37"} + ru{"set37"} + sc{"set46"} + scn{"set46"} + sd{"set37"} + sh{"set37"} + si{"set37"} + sk{"set37"} + sl{"set37"} + sq{"set49"} + sr{"set37"} + sv{"set38"} + sw{"set37"} + ta{"set37"} + te{"set37"} + th{"set37"} + tk{"set44"} + tl{"set39"} + tr{"set37"} + uk{"set43"} + ur{"set37"} + uz{"set37"} + vi{"set39"} + yue{"set37"} + zh{"set37"} + zu{"set37"} } rules{ set0{ @@ -454,6 +458,19 @@ plurals:table(nofallback){ } } set20{ + many{ + "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer" + " 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, … @decimal 1.0000001e6, 1.1e" + "6, 2.0000001e6, 2.1e6, 3.0000001e6, 3.1e6, …" + } + one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"} + other{ + " @integer 2~17, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6" + "e3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000" + "000.0, 1.0001e3, 1.1e3, 2.0001e3, 2.1e3, 3.0001e3, 3.1e3, …" + } + } + set21{ few{ "n = 3..10,13..19 @integer 3~10, 13~19 @decimal 3.0, 4.0, 5.0, 6.0, 7" ".0, 8.0, 9.0, 10.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 3.00" @@ -471,7 +488,7 @@ plurals:table(nofallback){ "00, 2.0000" } } - set21{ + set22{ few{ "v = 0 and i % 100 = 3..4 or v != 0 @integer 3, 4, 103, 104, 203, 204" ", 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … @decimal" @@ -487,7 +504,7 @@ plurals:table(nofallback){ " 1002, …" } } - set22{ + set23{ few{ "v = 0 and i % 100 = 3..4 or f % 100 = 3..4 @integer 3, 4, 103, 104, " "203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … " @@ -510,7 +527,7 @@ plurals:table(nofallback){ "7.2, 10.2, 100.2, 1000.2, …" } } - set23{ + set24{ many{ "v = 0 and n != 0..10 and n % 10 = 0 @integer 20, 30, 40, 50, 60, 70," " 80, 90, 100, 1000, 10000, 100000, 1000000, …" @@ -522,7 +539,7 @@ plurals:table(nofallback){ } two{"i = 2 and v = 0 @integer 2"} } - set24{ + set25{ few{"i = 2..4 and v = 0 @integer 2~4"} many{ "v != 0 @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1" @@ -531,7 +548,7 @@ plurals:table(nofallback){ one{"i = 1 and v = 0 @integer 1"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} } - set25{ + set26{ few{ "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3" "2~34, 42~44, 52~54, 62, 102, 1002, …" @@ -547,7 +564,7 @@ plurals:table(nofallback){ ".0, …" } } - set26{ + set27{ few{ "n % 10 = 2..4 and n % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~4" "4, 52~54, 62, 102, 1002, … @decimal 2.0, 3.0, 4.0, 22.0, 23.0, 24.0," @@ -565,7 +582,7 @@ plurals:table(nofallback){ } other{" @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.1, 1000.1, …"} } - set27{ + set28{ few{ "n % 10 = 2..9 and n % 100 != 11..19 @integer 2~9, 22~29, 102, 1002, " "… @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 22.0, 102.0, 1002" @@ -583,7 +600,7 @@ plurals:table(nofallback){ "1000.0, 10000.0, 100000.0, 1000000.0, …" } } - set28{ + set29{ few{ "n = 0 or n % 100 = 2..10 @integer 0, 2~10, 102~107, 1002, … @decimal" " 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 102.0, 1002.0, …" @@ -598,7 +615,14 @@ plurals:table(nofallback){ ".9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" } } - set29{ + set3{ + one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"} + other{ + " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3." + "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" + } + } + set30{ few{ "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3" "2~34, 42~44, 52~54, 62, 102, 1002, …" @@ -616,14 +640,7 @@ plurals:table(nofallback){ ".0, …" } } - set3{ - one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"} - other{ - " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3." - "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" - } - } - set30{ + set31{ few{ "n % 10 = 3..4,9 and n % 100 != 10..19,70..79,90..99 @integer 3, 4, 9" ", 23, 24, 29, 33, 34, 39, 43, 44, 49, 103, 1003, … @decimal 3.0, 4.0" @@ -631,7 +648,7 @@ plurals:table(nofallback){ } many{ "n != 0 and n % 1000000 = 0 @integer 1000000, … @decimal 1000000.0, 1" - "000000.00, 1000000.000, …" + "000000.00, 1000000.000, 1000000.0000, …" } one{ "n % 10 = 1 and n % 100 != 11,71,91 @integer 1, 21, 31, 41, 51, 61, 8" @@ -648,7 +665,7 @@ plurals:table(nofallback){ "2.0, 1002.0, …" } } - set31{ + set32{ few{ "n = 3..6 @integer 3~6 @decimal 3.0, 4.0, 5.0, 6.0, 3.00, 4.00, 5.00," " 6.00, 3.000, 4.000, 5.000, 6.000, 3.0000, 4.0000, 5.0000, 6.0000" @@ -665,7 +682,7 @@ plurals:table(nofallback){ } two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"} } - set32{ + set33{ few{ "v = 0 and i % 100 = 0,20,40,60,80 @integer 0, 20, 40, 60, 80, 100, 1" "20, 140, 1000, 10000, 100000, 1000000, …" @@ -684,7 +701,7 @@ plurals:table(nofallback){ "02, …" } } - set33{ + set34{ few{ "n % 100 = 3,23,43,63,83 @integer 3, 23, 43, 63, 83, 103, 123, 143, 1" "003, … @decimal 3.0, 23.0, 43.0, 63.0, 83.0, 103.0, 123.0, 143.0, 10" @@ -709,7 +726,7 @@ plurals:table(nofallback){ } zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"} } - set34{ + set35{ few{ "n % 100 = 3..10 @integer 3~10, 103~110, 1003, … @decimal 3.0, 4.0, 5" ".0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …" @@ -727,7 +744,7 @@ plurals:table(nofallback){ two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"} zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"} } - set35{ + set36{ few{"n = 3 @integer 3 @decimal 3.0, 3.00, 3.000, 3.0000"} many{"n = 6 @integer 6 @decimal 6.0, 6.00, 6.000, 6.0000"} one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"} @@ -739,24 +756,20 @@ plurals:table(nofallback){ two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"} zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"} } - set36{ + set37{ other{" @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"} } - set37{ + set38{ one{ "n % 10 = 1,2 and n % 100 != 11,12 @integer 1, 2, 21, 22, 31, 32, 41," " 42, 51, 52, 61, 62, 71, 72, 81, 82, 101, 1001, …" } other{" @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …"} } - set38{ + set39{ one{"n = 1 @integer 1"} other{" @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"} } - set39{ - one{"n = 1,5 @integer 1, 5"} - other{" @integer 0, 2~4, 6~17, 100, 1000, 10000, 100000, 1000000, …"} - } set4{ one{"i = 1 and v = 0 @integer 1"} other{ @@ -765,24 +778,28 @@ plurals:table(nofallback){ } } set40{ + one{"n = 1,5 @integer 1, 5"} + other{" @integer 0, 2~4, 6~17, 100, 1000, 10000, 100000, 1000000, …"} + } + set41{ one{"n = 1..4 @integer 1~4"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} } - set41{ + set42{ few{ "n % 10 = 2,3 and n % 100 != 12,13 @integer 2, 3, 22, 23, 32, 33, 42," " 43, 52, 53, 62, 63, 72, 73, 82, 83, 102, 1002, …" } other{" @integer 0, 1, 4~17, 100, 1000, 10000, 100000, 1000000, …"} } - set42{ + set43{ few{ "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83," " 103, 1003, …" } other{" @integer 0~2, 4~16, 100, 1000, 10000, 100000, 1000000, …"} } - set43{ + set44{ few{ "n % 10 = 6,9 or n = 10 @integer 6, 9, 10, 16, 19, 26, 29, 36, 39, 10" "6, 1006, …" @@ -792,7 +809,7 @@ plurals:table(nofallback){ "00000, …" } } - set44{ + set45{ many{ "n % 10 = 6 or n % 10 = 9 or n % 10 = 0 and n != 0 @integer 6, 9, 10," " 16, 19, 20, 26, 29, 30, 36, 39, 40, 100, 1000, 10000, 100000, 10000" @@ -800,16 +817,20 @@ plurals:table(nofallback){ } other{" @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …"} } - set45{ + set46{ many{"n = 11,8,80,800 @integer 8, 11, 80, 800"} other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"} } - set46{ + set47{ + many{"n = 11,8,80..89,800..899 @integer 8, 11, 80~89, 800~803"} + other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"} + } + set48{ many{"i = 0 or i % 100 = 2..20,40,60,80 @integer 0, 2~16, 102, 1002, …"} one{"i = 1 @integer 1"} other{" @integer 21~36, 100, 1000, 10000, 100000, 1000000, …"} } - set47{ + set49{ many{ "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84," " 104, 1004, …" @@ -817,7 +838,17 @@ plurals:table(nofallback){ one{"n = 1 @integer 1"} other{" @integer 0, 2, 3, 5~17, 100, 1000, 10000, 100000, 1000000, …"} } - set48{ + set5{ + one{ + "n = 0,1 or i = 0 and f = 1 @integer 0, 1 @decimal 0.0, 0.1, 1.0, 0.0" + "0, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001, 1.0000" + } + other{ + " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.2~0." + "9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" + } + } + set50{ many{ "n = 5 or n % 100 = 5 @integer 5, 105, 205, 305, 405, 505, 605, 705, " "1005, …" @@ -828,7 +859,7 @@ plurals:table(nofallback){ } other{" @integer 0, 6~20, 100, 1000, 10000, 100000, 1000000, …"} } - set49{ + set51{ few{ "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83," " 103, 1003, …" @@ -843,35 +874,25 @@ plurals:table(nofallback){ " 102, 1002, …" } } - set5{ - one{ - "n = 0,1 or i = 0 and f = 1 @integer 0, 1 @decimal 0.0, 0.1, 1.0, 0.0" - "0, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001, 1.0000" - } - other{ - " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.2~0." - "9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" - } - } - set50{ + set52{ few{"n = 4 @integer 4"} one{"n = 1 @integer 1"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set51{ + set53{ few{"n = 3,13 @integer 3, 13"} one{"n = 1,11 @integer 1, 11"} other{" @integer 0, 4~10, 14~21, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,12 @integer 2, 12"} } - set52{ + set54{ few{"n = 4 @integer 4"} one{"n = 1,3 @integer 1, 3"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2 @integer 2"} } - set53{ + set55{ many{ "i % 10 = 7,8 and i % 100 != 17,18 @integer 7, 8, 27, 28, 37, 38, 47," " 48, 57, 58, 67, 68, 77, 78, 87, 88, 107, 1007, …" @@ -886,7 +907,7 @@ plurals:table(nofallback){ " 102, 1002, …" } } - set54{ + set56{ few{ "i % 10 = 3,4 or i % 1000 = 100,200,300,400,500,600,700,800,900 @inte" "ger 3, 4, 13, 14, 23, 24, 33, 34, 43, 44, 53, 54, 63, 64, 73, 74, 10" @@ -905,35 +926,27 @@ plurals:table(nofallback){ "00000, 1000000, …" } } - set55{ + set57{ few{"n = 4 @integer 4"} many{"n = 6 @integer 6"} one{"n = 1 @integer 1"} other{" @integer 0, 5, 7~20, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set56{ + set58{ few{"n = 4 @integer 4"} many{"n = 6 @integer 6"} one{"n = 1,5,7,8,9,10 @integer 1, 5, 7~10"} other{" @integer 0, 11~25, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set57{ + set59{ few{"n = 4 @integer 4"} many{"n = 6 @integer 6"} one{"n = 1,5,7..9 @integer 1, 5, 7~9"} other{" @integer 0, 10~24, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set58{ - few{"n = 3,4 @integer 3, 4"} - many{"n = 5,6 @integer 5, 6"} - one{"n = 1 @integer 1"} - other{" @integer 10~25, 100, 1000, 10000, 100000, 1000000, …"} - two{"n = 2 @integer 2"} - zero{"n = 0,7,8,9 @integer 0, 7~9"} - } set6{ one{ "n = 0..1 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 1.000, " @@ -944,6 +957,14 @@ plurals:table(nofallback){ "9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" } } + set60{ + few{"n = 3,4 @integer 3, 4"} + many{"n = 5,6 @integer 5, 6"} + one{"n = 1 @integer 1"} + other{" @integer 10~25, 100, 1000, 10000, 100000, 1000000, …"} + two{"n = 2 @integer 2"} + zero{"n = 0,7,8,9 @integer 0, 7~9"} + } set7{ one{ "n = 0..1 or n = 11..99 @integer 0, 1, 11~24 @decimal 0.0, 1.0, 11.0," diff --git a/intl/icu/source/data/misc/supplementalData.txt b/intl/icu/source/data/misc/supplementalData.txt index 4f341a775a78..f471ab661093 100644 --- a/intl/icu/source/data/misc/supplementalData.txt +++ b/intl/icu/source/data/misc/supplementalData.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml supplementalData:table(nofallback){ calendarData{ buddhist{ @@ -2104,7 +2105,7 @@ supplementalData:table(nofallback){ "islamic-tbla", } } - cldrVersion{"37"} + cldrVersion{"38.1"} codeMappings{ { "AA", @@ -4661,13 +4662,15 @@ supplementalData:table(nofallback){ "ais", "aju", "als", + "aoh", "arb", "asd", "aue", "ayr", - "ayx", + "ayx~y", "azj", "baz", + "bbz", "bcc", "bcl", "bgm", @@ -4677,6 +4680,7 @@ supplementalData:table(nofallback){ "bjq", "bkb", "bmy", + "bpb", "btb", "btl", "bxk", @@ -4685,7 +4689,9 @@ supplementalData:table(nofallback){ "byy", "cbe", "cbh", + "cca", "ccq", + "cdg", "cjr", "cka", "cld", @@ -4699,6 +4705,7 @@ supplementalData:table(nofallback){ "daf", "dap", "dgo", + "dgu", "dha", "dhd", "dik", @@ -4707,11 +4714,13 @@ supplementalData:table(nofallback){ "djl", "dkl", "drh", + "drr", "drw", "dud", "duj", "dwl", "dzd", + "ekc", "ekk", "elp", "emk", @@ -4727,6 +4736,7 @@ supplementalData:table(nofallback){ "ggn~o", "ggr", "gio", + "gli", "gno", "gti", "gug", @@ -4754,6 +4764,7 @@ supplementalData:table(nofallback){ "kgc~d", "kgh", "khk", + "kjf", "kmr", "knc", "kng", @@ -4767,6 +4778,8 @@ supplementalData:table(nofallback){ "kvs", "kwq", "kxe", + "kxl", + "kxu", "kzh", "kzj", "kzt", @@ -4776,6 +4789,7 @@ supplementalData:table(nofallback){ "lii", "llo", "lmm", + "lmz", "lsg", "lvs", "meg", @@ -4809,6 +4823,7 @@ supplementalData:table(nofallback){ "noo", "npi", "nts", + "nxu", "ojg", "ome", "ory", @@ -4818,6 +4833,7 @@ supplementalData:table(nofallback){ "pcr", "pes", "pgy", + "plp", "plt", "pmc", "pmu", @@ -4838,6 +4854,7 @@ supplementalData:table(nofallback){ "rsi", "sap", "sca", + "sdm", "sgl", "sgo", "sh", @@ -4849,10 +4866,11 @@ supplementalData:table(nofallback){ "svr", "swc", "swh", + "tbb", "tdu", "tgg", "thc", - "thx", + "thw~x", "tid~e", "tkk", "tl", @@ -4876,8 +4894,10 @@ supplementalData:table(nofallback){ "xip", "xkh", "xpe", + "xrq", "xsj", "xsl", + "xtz", "ybd", "ydd", "yds", @@ -4890,6 +4910,7 @@ supplementalData:table(nofallback){ "yri", "yuu", "zai", + "zir", "zsm", "zyb", } @@ -4975,7 +4996,8 @@ supplementalData:table(nofallback){ "ami~z", "an", "ana~z", - "aoa~n", + "aoa~g", + "aoi~n", "aor~u", "aox", "aoz", @@ -5023,7 +5045,7 @@ supplementalData:table(nofallback){ "ayk~l", "ayn~q", "ays~u", - "ayy~z", + "ayz", "az", "aza~d", "azg", @@ -5035,7 +5057,7 @@ supplementalData:table(nofallback){ "bal", "ban~p", "bar~y", - "bba~z", + "bba~y", "bca~b", "bcd~k", "bcm~w", @@ -5075,7 +5097,7 @@ supplementalData:table(nofallback){ "boa~b", "boe~r", "bot~z", - "bpa~b", + "bpa", "bpd", "bpg~z", "bqa~d", @@ -5114,14 +5136,14 @@ supplementalData:table(nofallback){ "cbn~o", "cbq~w", "cby", - "cca", "ccc~e", "ccg~h", "ccj", "ccl~p", "ccr~s", "cda", - "cdc~j", + "cdc~f", + "cdh~j", "cdm~o", "cdr~s", "cdy~z", @@ -5164,8 +5186,7 @@ supplementalData:table(nofallback){ "cjy", "ckb", "ckh", - "ckl", - "ckn~o", + "ckl~o", "ckq~v", "ckx~z", "cla", @@ -5187,7 +5208,7 @@ supplementalData:table(nofallback){ "cna~c", "cng~i", "cnk~l", - "cno", + "cno~p", "cns~u", "cnw~x", "co", @@ -5208,8 +5229,7 @@ supplementalData:table(nofallback){ "crf~t", "crv~z", "cs", - "csa~o", - "csq~w", + "csa~w", "csy~z", "cta", "ctc~e", @@ -5267,7 +5287,7 @@ supplementalData:table(nofallback){ "dgg~i", "dgk~l", "dgn", - "dgr~u", + "dgr~t", "dgw~x", "dgz", "dhg", @@ -5294,8 +5314,7 @@ supplementalData:table(nofallback){ "dlg", "dlk", "dlm~n", - "dma~e", - "dmg", + "dma~g", "dmk~o", "dmr~s", "dmu~y", @@ -5319,7 +5338,8 @@ supplementalData:table(nofallback){ "dri", "drl", "drn~o", - "drq~u", + "drq", + "drs~u", "dry", "dsb", "dse", @@ -5341,6 +5361,7 @@ supplementalData:table(nofallback){ "dv", "dva", "dwa", + "dwk", "dwr~s", "dwu", "dww", @@ -5359,6 +5380,7 @@ supplementalData:table(nofallback){ "dzl", "dzn", "eaa", + "ebc", "ebg", "ebk", "ebo", @@ -5381,7 +5403,6 @@ supplementalData:table(nofallback){ "eiv", "eja", "eka", - "ekc", "eke", "ekg", "eki", @@ -5465,7 +5486,7 @@ supplementalData:table(nofallback){ "fgr", "fi", "fia", - "fie", + "fie~f", "fil", "fip", "fir", @@ -5529,7 +5550,7 @@ supplementalData:table(nofallback){ "gdq~u", "gdx", "gea~d", - "geg~m", + "gef~m", "geq", "ges", "gev~z", @@ -5564,7 +5585,8 @@ supplementalData:table(nofallback){ "gku", "gl", "glc~d", - "glh~l", + "glh", + "glj~l", "glo", "glr", "glu", @@ -5574,7 +5596,7 @@ supplementalData:table(nofallback){ "gmd~e", "gmg~h", "gml~n", - "gmq", + "gmq~r", "gmu~z", "gn", "gna~e", @@ -5675,7 +5697,7 @@ supplementalData:table(nofallback){ "hmp~z", "hna", "hnd~e", - "hnh~j", + "hng~j", "hnn~o", "hns", "hnu", @@ -5955,7 +5977,8 @@ supplementalData:table(nofallback){ "kio~q", "kis~z", "kj", - "kja~v", + "kja~e", + "kjg~v", "kjx~z", "kk", "kka~z", @@ -6000,7 +6023,9 @@ supplementalData:table(nofallback){ "kwr~z", "kxa~d", "kxf", - "kxh~z", + "kxh~k", + "kxm~t", + "kxv~z", "ky", "kya~z", "kza~g", @@ -6065,7 +6090,7 @@ supplementalData:table(nofallback){ "llx", "lma~l", "lmn~r", - "lmu~z", + "lmu~y", "ln", "lna~b", "lnd", @@ -6296,8 +6321,7 @@ supplementalData:table(nofallback){ "nrt~u", "nrx", "nrz", - "nsa", - "nsc~i", + "nsa~i", "nsk~z", "ntd~e", "ntg", @@ -6326,7 +6350,6 @@ supplementalData:table(nofallback){ "nxi", "nxk~o", "nxq~r", - "nxu", "nxx", "ny", "nyb~y", @@ -6494,7 +6517,8 @@ supplementalData:table(nofallback){ "pl", "pla~h", "plj~l", - "pln~s", + "pln~o", + "plq~s", "plu~w", "ply~z", "pma~b", @@ -6686,8 +6710,8 @@ supplementalData:table(nofallback){ "sd", "sda~c", "sde~h", - "sdj~p", - "sdr~v", + "sdj~l", + "sdn~v", "sdx", "sdz", "se", @@ -6806,7 +6830,8 @@ supplementalData:table(nofallback){ "tai~l", "tan~s", "tau~z", - "tba~z", + "tba", + "tbc~z", "tca~i", "tck~q", "tcs~u", @@ -6831,7 +6856,7 @@ supplementalData:table(nofallback){ "thd~f", "thh~i", "thk~n", - "thp~w", + "thp~v", "thy~z", "ti", "tia", @@ -6947,12 +6972,11 @@ supplementalData:table(nofallback){ "uji", "uk", "uka", - "ukg~h", + "ukg~i", "ukk~l", "ukp~q", "uks", - "uku", - "ukw", + "uku~w", "uky", "ula~c", "ule~f", @@ -7098,8 +7122,7 @@ supplementalData:table(nofallback){ "wla", "wlc", "wle", - "wlg", - "wli", + "wlg~i", "wlk~m", "wlo", "wlr~s", @@ -7230,7 +7253,7 @@ supplementalData:table(nofallback){ "xnd", "xng~i", "xnk", - "xnn~o", + "xnm~o", "xnr~u", "xny~z", "xoc~d", @@ -7240,12 +7263,8 @@ supplementalData:table(nofallback){ "xom~p", "xor", "xow", - "xpa", - "xpc", - "xpg", - "xpi~k", - "xpm~u", - "xpy", + "xpa~d", + "xpf~z", "xqa", "xqt", "xra~b", @@ -7253,7 +7272,7 @@ supplementalData:table(nofallback){ "xrg", "xri", "xrm~n", - "xrq~r", + "xrr", "xrt~u", "xrw", "xsa~e", @@ -7264,7 +7283,7 @@ supplementalData:table(nofallback){ "xta~e", "xtg~j", "xtl~w", - "xty~z", + "xty", "xua~b", "xud", "xug", @@ -7418,6 +7437,7 @@ supplementalData:table(nofallback){ "zaa~h", "zaj~m", "zao~z", + "zba", "zbc", "zbe", "zbl", @@ -7441,7 +7461,6 @@ supplementalData:table(nofallback){ "zhw~x", "zia~b", "zik~n", - "zir", "ziw", "ziz", "zka~b", @@ -11372,9 +11391,11 @@ supplementalData:table(nofallback){ "length-earth-radius", "length-solar-radius", "light-candela", + "light-lumen", "light-lux", "light-solar-luminosity", "mass-carat", + "mass-grain", "mass-gram", "mass-kilogram", "mass-metric-ton", @@ -11428,6 +11449,13 @@ supplementalData:table(nofallback){ "volume-cup", "volume-cup-metric", "volume-deciliter", + "volume-dessert-spoon", + "volume-dessert-spoon-imperial", + "volume-drop", + "volume-dram", + "volume-jigger", + "volume-pinch", + "volume-quart-imperial", "volume-fluid-ounce", "volume-fluid-ounce-imperial", "volume-gallon", @@ -11519,6 +11547,7 @@ supplementalData:table(nofallback){ "oxendict", "pahawh2~4", "pamaka", + "peano", "petr1708", "pinyin", "polyton", @@ -11537,6 +11566,8 @@ supplementalData:table(nofallback){ "sursilv", "sutsilv", "tarask", + "tongyong", + "tunumiit", "uccor", "ucrcor", "ulster", @@ -11800,6 +11831,9 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } + secondary{ + territories{"SA"} + } } arw{ secondary{ @@ -11907,7 +11941,6 @@ supplementalData:table(nofallback){ secondary{ scripts{"Latn"} territories{ - "AF", "IR", "PK", } @@ -12071,11 +12104,6 @@ supplementalData:table(nofallback){ territories{"IN"} } } - bhk{ - secondary{ - territories{"PH"} - } - } bho{ primary{ scripts{"Deva"} @@ -12628,6 +12656,7 @@ supplementalData:table(nofallback){ "BR", "CZ", "DK", + "FI", "FR", "GB", "HU", @@ -12686,10 +12715,13 @@ supplementalData:table(nofallback){ } doi{ primary{ - scripts{"Arab"} + scripts{"Deva"} } secondary{ - scripts{"Takr"} + scripts{ + "Arab", + "Takr", + } territories{"IN"} } } @@ -13073,6 +13105,11 @@ supplementalData:table(nofallback){ territories{"GQ"} } } + fbl{ + secondary{ + territories{"PH"} + } + } ff{ primary{ scripts{"Latn"} @@ -13505,6 +13542,9 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } + secondary{ + territories{"GH"} + } } guz{ primary{ @@ -13591,6 +13631,7 @@ supplementalData:table(nofallback){ } territories{ "FJ", + "IN", "ZA", } } @@ -14559,6 +14600,9 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } + secondary{ + territories{"ZM"} + } } lrc{ primary{ @@ -15146,6 +15190,9 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } + secondary{ + territories{"NP"} + } } ng{ primary{ @@ -15720,6 +15767,9 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } + secondary{ + territories{"MZ"} + } } ro{ primary{ @@ -16560,6 +16610,9 @@ supplementalData:table(nofallback){ "Latn", } } + secondary{ + territories{"AZ"} + } } tmh{ primary{ @@ -16626,6 +16679,11 @@ supplementalData:table(nofallback){ scripts{"Latn"} } } + trw{ + primary{ + scripts{"Arab"} + } + } ts{ primary{ scripts{"Latn"} @@ -17265,940 +17323,6 @@ supplementalData:table(nofallback){ } } } - languageMatching{ - written{ - { - "no", - "nb", - "99", - "0", - } - { - "hr", - "bs", - "96", - "0", - } - { - "sh", - "bs", - "96", - "0", - } - { - "sh", - "hr", - "96", - "0", - } - { - "sh", - "sr", - "96", - "0", - } - { - "ssy", - "aa", - "96", - "0", - } - { - "gsw", - "de", - "96", - "1", - } - { - "lb", - "de", - "96", - "1", - } - { - "da", - "no", - "92", - "0", - } - { - "da", - "nb", - "92", - "0", - } - { - "ab", - "ru", - "90", - "1", - } - { - "ach", - "en", - "90", - "1", - } - { - "af", - "nl", - "90", - "1", - } - { - "ak", - "en", - "90", - "1", - } - { - "am_*_*", - "en_*_GB", - "90", - "1", - } - { - "ay", - "es", - "90", - "1", - } - { - "az", - "ru", - "90", - "1", - } - { - "az_Latn", - "ru_Cyrl", - "90", - "1", - } - { - "be", - "ru", - "90", - "1", - } - { - "bem", - "en", - "90", - "1", - } - { - "bho", - "hi", - "90", - "1", - } - { - "bn", - "en", - "90", - "1", - } - { - "bn_Beng", - "en_Latn", - "90", - "1", - } - { - "br", - "fr", - "90", - "1", - } - { - "ceb", - "fil", - "90", - "1", - } - { - "chr", - "en", - "90", - "1", - } - { - "ckb", - "ar", - "90", - "1", - } - { - "co", - "fr", - "90", - "1", - } - { - "crs", - "fr", - "90", - "1", - } - { - "cy", - "en", - "90", - "1", - } - { - "ee", - "en", - "90", - "1", - } - { - "eo", - "en", - "90", - "1", - } - { - "et", - "fi", - "90", - "1", - } - { - "eu", - "es", - "90", - "1", - } - { - "fo", - "da", - "90", - "1", - } - { - "fy", - "nl", - "90", - "1", - } - { - "ga", - "en", - "90", - "1", - } - { - "gaa", - "en", - "90", - "1", - } - { - "gd", - "en", - "90", - "1", - } - { - "gl", - "es", - "90", - "1", - } - { - "gn", - "es", - "90", - "1", - } - { - "gu", - "hi", - "90", - "1", - } - { - "ha", - "en", - "90", - "1", - } - { - "haw", - "en", - "90", - "1", - } - { - "ht", - "fr", - "90", - "1", - } - { - "hy", - "ru", - "90", - "1", - } - { - "hy_Armn", - "ru_Cyrl", - "90", - "1", - } - { - "ia", - "en", - "90", - "1", - } - { - "ig", - "en", - "90", - "1", - } - { - "is", - "en", - "90", - "1", - } - { - "jv", - "id", - "90", - "1", - } - { - "ka_Geor", - "en_Latn", - "90", - "1", - } - { - "ka", - "en", - "90", - "1", - } - { - "kg", - "fr", - "90", - "1", - } - { - "kk", - "ru", - "90", - "1", - } - { - "km", - "en", - "90", - "1", - } - { - "km_Khmr", - "en_Latn", - "90", - "1", - } - { - "kn", - "en", - "90", - "1", - } - { - "kn_Knda", - "en_Latn", - "90", - "1", - } - { - "kri", - "en", - "90", - "1", - } - { - "ku", - "tr", - "90", - "1", - } - { - "ky", - "ru", - "90", - "1", - } - { - "la", - "it", - "90", - "1", - } - { - "lg", - "en", - "90", - "1", - } - { - "ln", - "fr", - "90", - "1", - } - { - "lo", - "en", - "90", - "1", - } - { - "lo_Laoo", - "en_Latn", - "90", - "1", - } - { - "loz", - "en", - "90", - "1", - } - { - "lua", - "fr", - "90", - "1", - } - { - "mfe", - "en", - "90", - "1", - } - { - "mg", - "fr", - "90", - "1", - } - { - "mi", - "en", - "90", - "1", - } - { - "mk", - "bg", - "90", - "1", - } - { - "ml", - "en", - "90", - "1", - } - { - "ml_Mlym", - "en_Latn", - "90", - "1", - } - { - "mn", - "ru", - "90", - "1", - } - { - "mr", - "hi", - "90", - "1", - } - { - "ms", - "id", - "90", - "1", - } - { - "mt", - "en", - "90", - "1", - } - { - "my", - "en", - "90", - "1", - } - { - "my_Mymr", - "en_Latn", - "90", - "1", - } - { - "ne", - "en", - "90", - "1", - } - { - "ne_Deva", - "en_Latn", - "90", - "1", - } - { - "nn", - "nb", - "90", - "0", - } - { - "nn", - "no", - "90", - "1", - } - { - "nso", - "en", - "90", - "1", - } - { - "ny", - "en", - "90", - "1", - } - { - "nyn", - "en", - "90", - "1", - } - { - "oc", - "fr", - "90", - "1", - } - { - "om", - "en", - "90", - "1", - } - { - "or", - "en", - "90", - "1", - } - { - "or_Orya", - "en_Latn", - "90", - "1", - } - { - "pa", - "en", - "90", - "1", - } - { - "pa_Guru", - "en_Latn", - "90", - "1", - } - { - "pcm", - "en", - "90", - "1", - } - { - "ps", - "en", - "90", - "1", - } - { - "ps_Arab", - "en_Latn", - "90", - "1", - } - { - "qu", - "es", - "90", - "1", - } - { - "rm", - "de", - "90", - "1", - } - { - "rn", - "en", - "90", - "1", - } - { - "rw", - "fr", - "90", - "1", - } - { - "sa", - "hi", - "90", - "1", - } - { - "sd", - "en", - "90", - "1", - } - { - "sd_Arab", - "en_Latn", - "90", - "1", - } - { - "si", - "en", - "90", - "1", - } - { - "si_Sinh", - "en_Latn", - "90", - "1", - } - { - "sn", - "en", - "90", - "1", - } - { - "so", - "en", - "90", - "1", - } - { - "sq", - "en", - "90", - "1", - } - { - "st", - "en", - "90", - "1", - } - { - "su", - "id", - "90", - "1", - } - { - "sw", - "en", - "90", - "1", - } - { - "ta", - "en", - "90", - "1", - } - { - "ta_Taml", - "en_Latn", - "90", - "1", - } - { - "te", - "en", - "90", - "1", - } - { - "te_Telu", - "en_Latn", - "90", - "1", - } - { - "tg", - "ru", - "90", - "1", - } - { - "ti", - "en", - "90", - "1", - } - { - "ti_Ethi", - "en_Latn", - "90", - "1", - } - { - "tk", - "ru", - "90", - "1", - } - { - "tk_Latn", - "ru_Cyrl", - "90", - "1", - } - { - "tlh", - "en", - "90", - "1", - } - { - "tn", - "en", - "90", - "1", - } - { - "to", - "en", - "90", - "1", - } - { - "tt", - "ru", - "90", - "1", - } - { - "tum", - "en", - "90", - "1", - } - { - "ug", - "zh", - "90", - "1", - } - { - "ur", - "en", - "90", - "1", - } - { - "ur_Arab", - "en_Latn", - "90", - "1", - } - { - "uz", - "ru", - "90", - "1", - } - { - "uz_Latn", - "ru_Cyrl", - "90", - "1", - } - { - "wo", - "fr", - "90", - "1", - } - { - "xh", - "en", - "90", - "1", - } - { - "yi", - "en", - "90", - "1", - } - { - "yi_Hebr", - "en_Latn", - "90", - "1", - } - { - "yo", - "en", - "90", - "1", - } - { - "zu", - "en", - "90", - "1", - } - { - "sr_Latn", - "sr_Cyrl", - "95", - "0", - } - { - "zh_Hans", - "zh_Hant", - "85", - "1", - } - { - "zh_Hant", - "zh_Hans", - "81", - "1", - } - { - "zh_Hant_HK", - "zh_Hant_MO", - "97", - "0", - } - { - "pt_*_BR", - "pt_*_US", - "96", - "0", - } - { - "pt_*_US", - "pt_*_*", - "92", - "0", - } - { - "pt_*_BR", - "pt_*_*", - "92", - "0", - } - { - "pt_*_*", - "pt_*_*", - "96", - "0", - } - { - "en_*_US", - "en_*_*", - "94", - "0", - } - { - "en_*_GB", - "en_*_*", - "96", - "0", - } - { - "en_*_001", - "en_*_*", - "96", - "0", - } - { - "en_*_*", - "en_*_*", - "95", - "0", - } - { - "es_*_ES", - "es_*_*", - "92", - "0", - } - { - "es_*_419", - "es_*_*", - "96", - "0", - } - { - "es_*_*", - "es_*_*", - "95", - "0", - } - { - "*", - "*", - "20", - "0", - } - { - "*_*", - "*_*", - "60", - "0", - } - { - "*_*_*", - "*_*_*", - "96", - "0", - } - } - } languageMatchingInfo{ written{ matchVariable{ @@ -20478,7 +19602,7 @@ supplementalData:table(nofallback){ } } MM{ - MeasurementSystem:int{1} + MeasurementSystem:int{2} MeasurementSystemCategory{ temperature:int{0} } @@ -27081,7 +26205,7 @@ supplementalData:table(nofallback){ populationShareF:int{49990000} } territoryF:intvector{ - 57422300, + 57418100, 49990000, 52940000, } @@ -27095,12 +26219,12 @@ supplementalData:table(nofallback){ populationShareF:int{49430000} } fr{ - populationShareF:int{48670000} + populationShareF:int{48750000} } territoryF:intvector{ 59332700, 50100000, - 54857080, + 54770000, } } AE{ @@ -27126,14 +26250,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61696000, 49900000, - 56970132, + 56999208, } } AF{ - bal{ - officialStatus{"official_regional"} - populationShareF:int{47670000} - } bgn{ populationShareF:int{47630000} writingShareF:int{48500000} @@ -27146,7 +26266,7 @@ supplementalData:table(nofallback){ populationShareF:int{48590000} } kk_Arab{ - populationShareF:int{45570000} + populationShareF:int{45550000} } prd{ populationShareF:int{48120000} @@ -27158,14 +26278,14 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60694500, 49281000, - 57349408, + 57366438, } tk{ officialStatus{"official_regional"} populationShareF:int{48170000} } ug{ - populationShareF:int{45860000} + populationShareF:int{45820000} } uz_Arab{ officialStatus{"official_regional"} @@ -27178,12 +26298,12 @@ supplementalData:table(nofallback){ populationShareF:int{49860000} } pt{ - populationShareF:int{48170000} + populationShareF:int{48160000} } territoryF:intvector{ 59239800, 49990000, - 54958820, + 54981790, } } AI{ @@ -27194,7 +26314,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58175400, 49950000, - 54174220, + 54180900, } } AL{ @@ -27211,7 +26331,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60360100, 49968000, - 56305722, + 56307458, } } AM{ @@ -27228,7 +26348,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60283400, 49996000, - 56303822, + 56302132, } } AO{ @@ -27246,7 +26366,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61193600, 49704000, - 57303559, + 57325223, } umb{ populationShareF:int{49290000} @@ -27254,7 +26374,7 @@ supplementalData:table(nofallback){ } AQ{ territoryF:intvector{ - 57177600, + 57175800, 49990000, 52300000, } @@ -27279,7 +26399,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61922100, 49979000, - 57446942, + 57454791, } } AS{ @@ -27294,7 +26414,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58658000, 49970000, - 54508260, + 54494370, } } AT{ @@ -27329,7 +26449,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61441000, 49980000, - 56879337, + 56885945, } } AU{ @@ -27343,10 +26463,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62124800, 49990000, - 57234701, + 57254665, } wbp{ - populationShareF:int{46110000} + populationShareF:int{45980000} } zh_Hant{ populationShareF:int{48210000} @@ -27354,7 +26474,7 @@ supplementalData:table(nofallback){ } AW{ en{ - populationShareF:int{48260000} + populationShareF:int{48250000} } nl{ officialStatus{"official"} @@ -27367,7 +26487,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59415800, 49968000, - 55116576, + 55119428, } } AX{ @@ -27396,7 +26516,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61172200, 49998000, - 57100465, + 57102058, } tkr{ populationShareF:int{47160000} @@ -27437,7 +26557,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60448300, 49980000, - 56384989, + 56383559, } } BB{ @@ -27448,7 +26568,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59521800, 49997000, - 55293131, + 55294560, } } BD{ @@ -27485,7 +26605,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61690300, 49577000, - 58159453, + 58162651, } } BE{ @@ -27507,7 +26627,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61529200, 49990000, - 57115708, + 57117207, } vls{ populationShareF:int{49100000} @@ -27537,7 +26657,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60358500, 49287000, - 57197427, + 57208354, } } BG{ @@ -27557,7 +26677,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61153500, 49984000, - 56705750, + 56696690, } tr{ populationShareF:int{49110000} @@ -27574,7 +26694,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60711700, 49946000, - 56144266, + 56150500, } } BI{ @@ -27596,7 +26716,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59800700, 49672000, - 57118445, + 57118658, } } BJ{ @@ -27610,7 +26730,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60253900, 49424000, - 57113405, + 57128646, } yo{ populationShareF:int{48670000} @@ -27624,7 +26744,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58255000, 49990000, - 53716000, + 53712200, } } BM{ @@ -27635,12 +26755,12 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59612700, 49980000, - 54711760, + 54717500, } } BN{ en{ - populationShareF:int{48180000} + populationShareF:int{48170000} } ms{ officialStatus{"official"} @@ -27653,7 +26773,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60338700, 49954000, - 55450565, + 55464478, } zh_Hant{ populationShareF:int{49110000} @@ -27661,7 +26781,7 @@ supplementalData:table(nofallback){ } BO{ aro{ - populationShareF:int{45100000} + populationShareF:int{44900000} } ay{ officialStatus{"official"} @@ -27681,7 +26801,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60837200, 49912000, - 57113063, + 57116399, } } BQ{ @@ -27693,7 +26813,7 @@ supplementalData:table(nofallback){ populationShareF:int{49810000} } territoryF:intvector{ - 58416400, + 58413400, 49960000, 54200000, } @@ -27718,7 +26838,7 @@ supplementalData:table(nofallback){ populationShareF:int{47210000} } kgp{ - populationShareF:int{46100000} + populationShareF:int{46240000} } ko{ populationShareF:int{46210000} @@ -27730,10 +26850,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62324800, 49904000, - 58208847, + 58211716, } xav{ - populationShareF:int{45480000} + populationShareF:int{45470000} } yrl{ populationShareF:int{45520000} @@ -27747,7 +26867,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60120600, 49956000, - 55332634, + 55337721, } } BT{ @@ -27767,7 +26887,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59720500, 49528000, - 55766397, + 55782318, } tsj{ populationShareF:int{49150000} @@ -27775,7 +26895,7 @@ supplementalData:table(nofallback){ } BV{ territoryF:intvector{ - 54449300, + 54444800, 49990000, 50100000, } @@ -27785,7 +26905,7 @@ supplementalData:table(nofallback){ } BW{ af{ - populationShareF:int{47270000} + populationShareF:int{47260000} } en{ officialStatus{"official"} @@ -27794,7 +26914,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60390100, 49851000, - 56224910, + 56231723, } tn{ officialStatus{"official"} @@ -27813,7 +26933,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61179400, 49996000, - 56952754, + 56947792, } } BZ{ @@ -27827,42 +26947,42 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59321800, 49769000, - 55385854, + 55399598, } } CA{ atj{ - populationShareF:int{46160000} + populationShareF:int{46150000} } chp{ - populationShareF:int{45210000} + populationShareF:int{45200000} } cr{ populationShareF:int{47110000} } crj{ - populationShareF:int{46200000} + populationShareF:int{46190000} } crk{ populationShareF:int{47110000} } crl{ - populationShareF:int{46150000} + populationShareF:int{46140000} } crm{ - populationShareF:int{46130000} + populationShareF:int{46120000} } csw{ - populationShareF:int{46140000} + populationShareF:int{46130000} } de{ populationShareF:int{48190000} } den{ - populationShareF:int{45640000} + populationShareF:int{45610000} } dgr{ - populationShareF:int{45740000} + populationShareF:int{45700000} } en{ officialStatus{"official"} @@ -27873,7 +26993,7 @@ supplementalData:table(nofallback){ populationShareF:int{49220000} } gwi{ - populationShareF:int{45160000} + populationShareF:int{45150000} } ikt{ literacyShareF:int{49300000} @@ -27897,21 +27017,21 @@ supplementalData:table(nofallback){ populationShareF:int{46330000} } moh{ - populationShareF:int{45980000} + populationShareF:int{45930000} } nsk{ - populationShareF:int{45330000} + populationShareF:int{45310000} } pdt{ populationShareF:int{47240000} } scs{ - populationShareF:int{45350000} + populationShareF:int{45330000} } territoryF:intvector{ 62177400, 49990000, - 57358817, + 57376941, } yi{ populationShareF:int{46450000} @@ -27926,7 +27046,7 @@ supplementalData:table(nofallback){ populationShareF:int{49830000} } territoryF:intvector{ - 57316900, + 57292100, 49990000, 52596000, } @@ -27964,7 +27084,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60686000, 49668000, - 57852810, + 58101780, } } CF{ @@ -27982,7 +27102,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59339000, 49566000, - 56574506, + 56599086, } } CG{ @@ -27996,7 +27116,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60293900, 49838000, - 56506202, + 56529307, } } CH{ @@ -28037,7 +27157,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61523100, 49990000, - 56829281, + 56840399, } wae{ populationShareF:int{47120000} @@ -28070,18 +27190,18 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60971600, 49569000, - 57262606, + 57274811, } } CK{ en{ officialStatus{"official"} - populationShareF:int{49980000} + populationShareF:int{50100000} } territoryF:intvector{ 58299900, 49950000, - 53903800, + 53857400, } } CL{ @@ -28098,7 +27218,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61452100, 49986000, - 57179253, + 57181868, } } CM{ @@ -28186,7 +27306,7 @@ supplementalData:table(nofallback){ } nmg{ literacyShareF:int{49100000} - populationShareF:int{46350000} + populationShareF:int{46320000} } nnh{ literacyShareF:int{48800000} @@ -28195,10 +27315,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60895400, 49713000, - 57256410, + 57277450, } yav{ - populationShareF:int{45900000} + populationShareF:int{45830000} } ybb{ literacyShareF:int{48200000} @@ -28265,9 +27385,9 @@ supplementalData:table(nofallback){ populationShareF:int{46190000} } territoryF:intvector{ - 63232100, + 63253600, 49951000, - 59138469, + 59139402, } ug{ officialStatus{"official_regional"} @@ -28305,12 +27425,12 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61711600, 49936000, - 57481690, + 57490848, } } CP{ territoryF:intvector{ - 54424000, + 54420900, 49990000, 50100000, } @@ -28326,7 +27446,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60839400, 49963000, - 56498714, + 56509799, } } CU{ @@ -28337,7 +27457,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61137000, 49998000, - 57111164, + 57110591, } } CV{ @@ -28351,7 +27471,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59377700, 49849000, - 55568373, + 55583255, } } CW{ @@ -28369,7 +27489,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59312800, 49960000, - 55150241, + 55151345, } } CX{ @@ -28378,14 +27498,14 @@ supplementalData:table(nofallback){ populationShareF:int{49630000} } territoryF:intvector{ - 58117200, + 58108100, 49990000, 53220500, } } CY{ ar{ - populationShareF:int{47110000} + populationShareF:int{47100000} } el{ officialStatus{"official"} @@ -28403,7 +27523,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60317800, 49987000, - 56123709, + 56126668, } tr{ officialStatus{"official"} @@ -28430,7 +27550,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61375900, 49990000, - 57106863, + 57107025, } } DE{ @@ -28513,7 +27633,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62419900, 49990000, - 57804577, + 57801597, } tr{ populationShareF:int{48250000} @@ -28528,7 +27648,7 @@ supplementalData:table(nofallback){ populationShareF:int{49990000} } territoryF:intvector{ - 57224600, + 57222400, 49990000, 52500000, } @@ -28551,7 +27671,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59364000, 49679000, - 55884017, + 55921804, } } DK{ @@ -28582,7 +27702,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61287800, 49990000, - 56580950, + 56586941, } } DM{ @@ -28593,12 +27713,12 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58783000, 49940000, - 54740270, + 54742430, } } DO{ en{ - populationShareF:int{46780000} + populationShareF:int{46760000} } es{ officialStatus{"official"} @@ -28607,7 +27727,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61173000, 49901000, - 57102988, + 57104997, } } DZ{ @@ -28632,7 +27752,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61630000, 49726000, - 57416575, + 57429729, } } EA{ @@ -28641,7 +27761,7 @@ supplementalData:table(nofallback){ populationShareF:int{49980000} } territoryF:intvector{ - 59540600, + 59533200, 49977000, 55150000, } @@ -28661,7 +27781,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61193000, 49916000, - 57164985, + 57169049, } } EE{ @@ -28681,7 +27801,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60416500, 49998000, - 56124429, + 56122862, } vro{ populationShareF:int{48570000} @@ -28704,7 +27824,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62120400, 49739000, - 57994133, + 58104124, } } EH{ @@ -28715,7 +27835,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58906500, 49500000, - 55619551, + 55652271, } } ER{ @@ -28740,7 +27860,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59940200, 49689000, - 56597065, + 56608120, } ti{ officialStatus{"de_facto_official"} @@ -28783,7 +27903,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62177800, 49977000, - 57493311, + 57500158, } } ET{ @@ -28809,7 +27929,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61200600, 49390000, - 58108386, + 58108113, } ti{ populationShareF:int{48600000} @@ -28854,7 +27974,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61244900, 50100000, - 56553736, + 56557167, } } FJ{ @@ -28879,7 +27999,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59862900, 49937000, - 55926276, + 55935974, } } FK{ @@ -28902,7 +28022,7 @@ supplementalData:table(nofallback){ populationShareF:int{49570000} } kos{ - populationShareF:int{48770000} + populationShareF:int{48780000} } pon{ populationShareF:int{49230000} @@ -28910,7 +28030,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58348000, 49890000, - 55103643, + 55102436, } uli{ populationShareF:int{48290000} @@ -28927,7 +28047,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59200100, 49990000, - 54510180, + 54516280, } } FR{ @@ -28987,7 +28107,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62285600, 49990000, - 57673644, + 57678482, } } GA{ @@ -29001,7 +28121,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60366600, 49890000, - 56211904, + 56223091, } } GB{ @@ -29041,7 +28161,7 @@ supplementalData:table(nofallback){ populationShareF:int{47190000} } kw{ - populationShareF:int{45310000} + populationShareF:int{45300000} } ml{ populationShareF:int{46350000} @@ -29059,7 +28179,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62292500, 49990000, - 57651052, + 57657611, } yi{ populationShareF:int{46490000} @@ -29076,7 +28196,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59163400, 49960000, - 55112207, + 55113094, } } GE{ @@ -29096,7 +28216,7 @@ supplementalData:table(nofallback){ } os{ officialStatus{"official_regional"} - populationShareF:int{48220000} + populationShareF:int{48409000} } ru{ populationShareF:int{48900000} @@ -29104,7 +28224,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60398500, 49997000, - 56492609, + 56399700, } xmf{ populationShareF:int{49110000} @@ -29135,7 +28255,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59346500, 50100000, - 54666970, + 54670520, } } GH{ @@ -29182,7 +28302,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61134000, 49715000, - 57281025, + 57293402, } } GI{ @@ -29196,7 +28316,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59204400, 49800000, - 54294610, + 54295810, } } GL{ @@ -29210,7 +28330,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59241300, 50100000, - 54576910, + 54576160, } } GM{ @@ -29230,7 +28350,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59555600, 49511000, - 56209273, + 56217400, } } GN{ @@ -29259,7 +28379,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60279700, 49410000, - 57118554, + 57125274, } } GP{ @@ -29295,7 +28415,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60315200, 49942000, - 55797457, + 55836178, } } GR{ @@ -29322,12 +28442,12 @@ supplementalData:table(nofallback){ populationShareF:int{48370000} } sq{ - populationShareF:int{46930000} + populationShareF:int{46940000} } territoryF:intvector{ 61299300, 49973000, - 57107615, + 57106071, } tr{ populationShareF:int{48120000} @@ -29338,7 +28458,7 @@ supplementalData:table(nofallback){ } GS{ territoryF:intvector{ - 55898500, + 55889600, 49990000, 51200000, } @@ -29359,7 +28479,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61138100, 49759000, - 57165813, + 57171533, } } GU{ @@ -29374,7 +28494,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59579300, 49990000, - 55167772, + 55168485, } } GW{ @@ -29394,7 +28514,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59317100, 49553000, - 56183325, + 56192710, } } GY{ @@ -29405,7 +28525,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59630100, 49918000, - 55740685, + 55750204, } } HK{ @@ -29414,9 +28534,9 @@ supplementalData:table(nofallback){ populationShareF:int{49510000} } territoryF:intvector{ - 61455900, + 61480500, 49935000, - 56721334, + 56724991, } yue{ populationShareF:int{49900000} @@ -29431,7 +28551,7 @@ supplementalData:table(nofallback){ } HM{ territoryF:intvector{ - 54531700, + 54490100, 49990000, 50100000, } @@ -29451,7 +28571,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60463000, 49851000, - 56918277, + 56923534, } } HR{ @@ -29469,7 +28589,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61102100, 49989000, - 56427048, + 56422775, } } HT{ @@ -29485,7 +28605,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60199700, 49487000, - 57107884, + 57110678, } } HU{ @@ -29517,7 +28637,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61289600, 49990000, - 56982570, + 56977183, } } IC{ @@ -29526,7 +28646,7 @@ supplementalData:table(nofallback){ populationShareF:int{49980000} } territoryF:intvector{ - 60756400, + 60746000, 49977000, 56209859, } @@ -29629,7 +28749,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62325000, 49928000, - 58262787, + 58267026, } zh_Hant{ populationShareF:int{47920000} @@ -29650,7 +28770,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61353300, 49990000, - 56506805, + 56517657, } } IL{ @@ -29675,7 +28795,7 @@ supplementalData:table(nofallback){ populationShareF:int{48130000} } ml{ - populationShareF:int{46950000} + populationShareF:int{46920000} } pl{ populationShareF:int{48150000} @@ -29689,7 +28809,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61317100, 49971000, - 56842490, + 56867548, } ti{ populationShareF:int{47120000} @@ -29710,7 +28830,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59679200, 49990000, - 54894070, + 54904990, } } IN{ @@ -29778,7 +28898,7 @@ supplementalData:table(nofallback){ populationShareF:int{47200000} } dv{ - populationShareF:int{44400000} + populationShareF:int{44300000} } dz{ populationShareF:int{44200000} @@ -29807,6 +28927,9 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{49410000} } + hi_Latn{ + populationShareF:int{47100000} + } hne{ populationShareF:int{48110000} } @@ -29955,7 +29078,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62947400, 49628000, - 59129683, + 59132609, } unr{ populationShareF:int{46940000} @@ -29988,7 +29111,7 @@ supplementalData:table(nofallback){ populationShareF:int{50100000} } territoryF:intvector{ - 58157200, + 58155700, 49990000, 53350000, } @@ -30021,7 +29144,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61649300, 49785000, - 57401942, + 57388727, } } IR{ @@ -30049,7 +29172,7 @@ supplementalData:table(nofallback){ populationShareF:int{49750000} } gbz{ - populationShareF:int{45960000} + populationShareF:int{45940000} } glk{ populationShareF:int{48460000} @@ -30061,7 +29184,7 @@ supplementalData:table(nofallback){ populationShareF:int{46710000} } kk_Arab{ - populationShareF:int{45360000} + populationShareF:int{45350000} } lki{ populationShareF:int{47760000} @@ -30092,7 +29215,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62164000, 49850000, - 57830247, + 57849233, } tk{ populationShareF:int{48280000} @@ -30100,7 +29223,7 @@ supplementalData:table(nofallback){ } IS{ da{ - populationShareF:int{47650000} + populationShareF:int{47640000} } is{ officialStatus{"official"} @@ -30109,7 +29232,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60181800, 49990000, - 55343518, + 55350734, } } IT{ @@ -30175,7 +29298,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62231700, 49990000, - 57622467, + 57624027, } vec{ populationShareF:int{48130000} @@ -30189,7 +29312,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59556900, 49990000, - 54996020, + 55101073, } } JM{ @@ -30203,7 +29326,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60260600, 49870000, - 56281209, + 56280857, } } JO{ @@ -30217,7 +29340,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60890000, 49959000, - 57104584, + 57108206, } } JP{ @@ -30235,7 +29358,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62544300, 49990000, - 58126168, + 58125507, } } KE{ @@ -30255,7 +29378,7 @@ supplementalData:table(nofallback){ populationShareF:int{49190000} } gu{ - populationShareF:int{46100000} + populationShareF:int{45930000} } guz{ populationShareF:int{48490000} @@ -30286,7 +29409,7 @@ supplementalData:table(nofallback){ populationShareF:int{47470000} } pa{ - populationShareF:int{46210000} + populationShareF:int{46190000} } pko{ literacyShareF:int{48100000} @@ -30309,7 +29432,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61163700, 49874000, - 57483975, + 57535279, } } KG{ @@ -30324,7 +29447,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60231500, 49992000, - 56584930, + 56596490, } } KH{ @@ -30341,7 +29464,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60642100, 49739000, - 57164495, + 57169270, } } KI{ @@ -30356,7 +29479,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58227000, 49900000, - 55109367, + 55111796, } } KM{ @@ -30371,7 +29494,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59131900, 49755000, - 55821164, + 55846281, } wni{ officialStatus{"official"} @@ -30390,7 +29513,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59155000, 49978000, - 54530940, + 54538210, } } KP{ @@ -30401,7 +29524,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60400000, 50100000, - 57253811, + 57256435, } } KR{ @@ -30412,7 +29535,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62203500, 49979000, - 57514181, + 57518351, } } KW{ @@ -30423,7 +29546,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61289700, 49939000, - 56291647, + 56299371, } } KY{ @@ -30434,7 +29557,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59250700, 49989000, - 54596130, + 54619440, } } KZ{ @@ -30455,7 +29578,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61478600, 49997000, - 57187445, + 57190919, } ug_Cyrl{ populationShareF:int{48200000} @@ -30475,7 +29598,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60493400, 49727000, - 56723417, + 56744740, } } LB{ @@ -30498,7 +29621,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60882500, 49896000, - 56610008, + 56546961, } } LC{ @@ -30509,7 +29632,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59254200, 49901000, - 55165510, + 55166487, } } LI{ @@ -30525,10 +29648,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59497800, 50100000, - 54385470, + 54391370, } wae{ - populationShareF:int{48340000} + populationShareF:int{48330000} } } LK{ @@ -30546,7 +29669,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61275800, 49912000, - 57225766, + 57228892, } } LR{ @@ -30569,7 +29692,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59611200, 49608000, - 56480977, + 56507330, } vai{ populationShareF:int{48260000} @@ -30593,7 +29716,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59665600, 49896000, - 56196246, + 56196933, } xh{ populationShareF:int{47990000} @@ -30622,7 +29745,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60914700, 49997000, - 56279328, + 56273146, } } LU{ @@ -30648,7 +29771,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60621100, 50100000, - 55605764, + 55628381, } } LV{ @@ -30668,7 +29791,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60540200, 49998000, - 56192356, + 56188123, } } LY{ @@ -30679,7 +29802,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60619700, 49895000, - 56675451, + 56689054, } } MA{ @@ -30717,7 +29840,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61298600, 49671000, - 57343141, + 57355617, } tzm{ literacyShareF:int{49250000} @@ -30736,7 +29859,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59767200, 49990000, - 54307270, + 54390000, } } MD{ @@ -30756,7 +29879,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60237200, 49990000, - 56343772, + 56336450, } uk{ populationShareF:int{49140000} @@ -30776,7 +29899,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60110800, 49985000, - 55614249, + 55609859, } } MF{ @@ -30787,7 +29910,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58561500, 49990000, - 54322840, + 54325560, } } MG{ @@ -30806,7 +29929,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60398500, 49645000, - 57256836, + 57269557, } } MH{ @@ -30821,7 +29944,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58196000, 49937000, - 54756840, + 54779170, } } MK{ @@ -30834,9 +29957,9 @@ supplementalData:table(nofallback){ populationShareF:int{49250000} } territoryF:intvector{ - 60305900, - 49970000, - 56208296, + 60310300, + 49974000, + 56212597, } tr{ populationShareF:int{48350000} @@ -30886,7 +30009,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60412200, 49334000, - 57184299, + 57195534, } tmh{ populationShareF:int{48210000} @@ -30897,7 +30020,7 @@ supplementalData:table(nofallback){ populationShareF:int{48170000} } kht{ - populationShareF:int{45760000} + populationShareF:int{45750000} } mnw{ populationShareF:int{48150000} @@ -30912,7 +30035,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61329800, 49927000, - 57556225, + 57565901, } } MN{ @@ -30927,9 +30050,9 @@ supplementalData:table(nofallback){ populationShareF:int{47130000} } territoryF:intvector{ - 60397300, + 60435400, 49974000, - 56310343, + 56316803, } ug_Cyrl{ populationShareF:int{46320000} @@ -30947,9 +30070,9 @@ supplementalData:table(nofallback){ populationShareF:int{48500000} } territoryF:intvector{ - 60718200, + 60773300, 49956000, - 55606340, + 55614458, } zh{ populationShareF:int{48500000} @@ -30970,7 +30093,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59124200, 49970000, - 54519940, + 54514330, } } MQ{ @@ -31001,21 +30124,21 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60172800, 49586000, - 56384043, + 56400548, } wo{ - populationShareF:int{47260000} + populationShareF:int{47250000} } } MS{ en{ officialStatus{"official"} - populationShareF:int{49660000} + populationShareF:int{49650000} } territoryF:intvector{ 58167400, 49970000, - 53531500, + 53537300, } } MT{ @@ -31036,7 +30159,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60192600, 49924000, - 55449043, + 55457267, } } MU{ @@ -31060,7 +30183,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60282700, 49888000, - 56136428, + 56137937, } ur{ populationShareF:int{48520000} @@ -31074,7 +30197,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59690100, 49984000, - 55392473, + 55391904, } } MW{ @@ -31089,7 +30212,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60224200, 49748000, - 57198426, + 57211966, } tog{ populationShareF:int{47980000} @@ -31127,7 +30250,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62246300, 49935000, - 58125959, + 58128650, } yua{ populationShareF:int{47670000} @@ -31135,7 +30258,7 @@ supplementalData:table(nofallback){ } MY{ bjn{ - populationShareF:int{46160000} + populationShareF:int{46150000} } bug{ populationShareF:int{46790000} @@ -31165,9 +30288,9 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61933300, 49931000, - 57318097, + 57326521, } - zh_Hant{ + zh{ populationShareF:int{49170000} } zmi{ @@ -31198,12 +30321,12 @@ supplementalData:table(nofallback){ populationShareF:int{48460000} } sw{ - populationShareF:int{46340000} + populationShareF:int{46310000} } territoryF:intvector{ 60370900, 49561000, - 57272338, + 57300982, } ts{ populationShareF:int{48790000} @@ -31215,7 +30338,7 @@ supplementalData:table(nofallback){ populationShareF:int{48240000} } zu{ - populationShareF:int{45660000} + populationShareF:int{45600000} } } NA{ @@ -31244,7 +30367,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60266000, 49888000, - 56253322, + 56263007, } tn{ populationShareF:int{47560000} @@ -31258,7 +30381,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60111100, 49962000, - 55282754, + 55290009, } } NE{ @@ -31287,13 +30410,13 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60218600, 49287000, - 57198662, + 57227724, } tmh{ populationShareF:int{48600000} } twq{ - populationShareF:int{46400000} + populationShareF:int{46350000} } } NF{ @@ -31302,7 +30425,7 @@ supplementalData:table(nofallback){ populationShareF:int{49960000} } territoryF:intvector{ - 57929500, + 57856600, 49990000, 53174800, } @@ -31361,7 +30484,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62112100, 49613000, - 58203453, + 58214028, } tiv{ literacyShareF:int{49250000} @@ -31380,7 +30503,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60364000, 49780000, - 56608521, + 56620344, } } NL{ @@ -31423,7 +30546,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61924400, 49990000, - 57171512, + 57172804, } tr{ populationShareF:int{48120000} @@ -31448,7 +30571,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61381200, 50100000, - 56537219, + 56546744, } } NP{ @@ -31486,7 +30609,7 @@ supplementalData:table(nofallback){ populationShareF:int{48320000} } lep{ - populationShareF:int{45950000} + populationShareF:int{45930000} } lif{ populationShareF:int{48110000} @@ -31523,7 +30646,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60791900, 49574000, - 57297176, + 57303279, } thl{ populationShareF:int{48200000} @@ -31547,31 +30670,31 @@ supplementalData:table(nofallback){ NR{ en{ officialStatus{"official"} - populationShareF:int{49970000} + populationShareF:int{49850000} } na{ officialStatus{"official"} - populationShareF:int{49710000} + populationShareF:int{49630000} } territoryF:intvector{ 58160000, 49990000, - 53969200, + 54110000, } } NU{ en{ officialStatus{"official"} - populationShareF:int{49700000} + populationShareF:int{49560000} } niu{ officialStatus{"official"} - populationShareF:int{49700000} + populationShareF:int{49560000} } territoryF:intvector{ 57100100, 49950000, - 53161800, + 53200000, } } NZ{ @@ -31586,7 +30709,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61189000, 49990000, - 56454563, + 56492548, } } OM{ @@ -31603,7 +30726,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61190100, 49869000, - 56349412, + 56466484, } } PA{ @@ -31617,10 +30740,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61104100, 49941000, - 56380064, + 56389408, } zh_Hant{ - populationShareF:int{47160000} + populationShareF:int{47150000} } } PE{ @@ -31638,7 +30761,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61430300, 49896000, - 57313312, + 57319150, } } PF{ @@ -31649,7 +30772,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59549000, 49980000, - 55290373, + 55295121, } ty{ officialStatus{"official"} @@ -31672,7 +30795,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60301900, 49624000, - 56702733, + 56725946, } tpi{ literacyShareF:int{49450000} @@ -31681,14 +30804,11 @@ supplementalData:table(nofallback){ } } PH{ - bhk{ - populationShareF:int{48230000} - } bik{ populationShareF:int{48300000} } bku{ - populationShareF:int{45760000} + populationShareF:int{45730000} } bto{ populationShareF:int{47280000} @@ -31708,6 +30828,9 @@ supplementalData:table(nofallback){ es{ populationShareF:int{49310000} } + fbl{ + populationShareF:int{48230000} + } fil{ officialStatus{"official"} populationShareF:int{49600000} @@ -31741,12 +30864,12 @@ supplementalData:table(nofallback){ } tbw{ literacyShareF:int{49360000} - populationShareF:int{45940000} + populationShareF:int{45920000} } territoryF:intvector{ 61877200, 49954000, - 58105893, + 58109181, } tsg{ officialStatus{"official_regional"} @@ -31830,11 +30953,14 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62106100, 49549000, - 58207863, + 58233501, } tg_Arab{ populationShareF:int{47330000} } + trw{ + populationShareF:int{46530000} + } ur{ officialStatus{"official"} populationShareF:int{49950000} @@ -31875,7 +31001,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62112600, 49997000, - 57384207, + 57382823, } uk{ populationShareF:int{47390000} @@ -31883,27 +31009,27 @@ supplementalData:table(nofallback){ } PM{ en{ - populationShareF:int{48340000} + populationShareF:int{48350000} } fr{ officialStatus{"official"} - populationShareF:int{49930000} + populationShareF:int{49960000} } territoryF:intvector{ 58261300, 49990000, - 53547100, + 53534700, } } PN{ en{ officialStatus{"official"} - populationShareF:int{49850000} + populationShareF:int{49920000} } territoryF:intvector{ - 56242600, + 56222400, 49990000, - 51540000, + 51500000, } } PR{ @@ -31918,7 +31044,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61130000, 49903000, - 56329463, + 56318907, } } PS{ @@ -31929,7 +31055,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60212200, 49953000, - 56463521, + 56481826, } } PT{ @@ -31952,7 +31078,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61314100, 49954000, - 57103555, + 57103027, } } PW{ @@ -31967,7 +31093,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58264000, 49920000, - 54215160, + 54216850, } } PY{ @@ -31985,7 +31111,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60889100, 49939000, - 56702576, + 56719169, } } QA{ @@ -31997,12 +31123,12 @@ supplementalData:table(nofallback){ populationShareF:int{49110000} } ml{ - populationShareF:int{47280000} + populationShareF:int{47270000} } territoryF:intvector{ 61339500, 49963000, - 56236357, + 56244417, } } RE{ @@ -32024,7 +31150,7 @@ supplementalData:table(nofallback){ } RO{ bg{ - populationShareF:int{46310000} + populationShareF:int{46320000} } de{ populationShareF:int{47210000} @@ -32057,7 +31183,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61483400, 49977000, - 57214571, + 57213029, } tr{ populationShareF:int{47130000} @@ -32095,7 +31221,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61105700, 49980000, - 56707811, + 56701217, } uk{ officialStatus{"official_regional"} @@ -32217,7 +31343,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62401600, 49997000, - 58142123, + 58141722, } tt{ officialStatus{"official_regional"} @@ -32245,7 +31371,7 @@ supplementalData:table(nofallback){ } fr{ officialStatus{"official"} - populationShareF:int{46190000} + populationShareF:int{46180000} } rw{ officialStatus{"official"} @@ -32254,7 +31380,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60246800, 49711000, - 57121874, + 57127124, } } SA{ @@ -32269,7 +31395,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62177500, 49872000, - 57330911, + 57341735, } } SB{ @@ -32278,12 +31404,12 @@ supplementalData:table(nofallback){ populationShareF:int{50100000} } rug{ - populationShareF:int{48150000} + populationShareF:int{48140000} } territoryF:intvector{ 59133000, 49841000, - 55660121, + 55685097, } } SC{ @@ -32301,7 +31427,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59275000, 49918000, - 54946330, + 54959810, } } SD{ @@ -32331,7 +31457,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61177400, 49719000, - 57431208, + 57455616, } zag{ populationShareF:int{47510000} @@ -32352,14 +31478,14 @@ supplementalData:table(nofallback){ populationShareF:int{0} } rmu{ - populationShareF:int{46950000} + populationShareF:int{46930000} } se{ populationShareF:int{47330000} } sma{ literacyShareF:int{49750000} - populationShareF:int{45300000} + populationShareF:int{45290000} } smj{ populationShareF:int{46150000} @@ -32371,10 +31497,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61518000, 49990000, - 57100410, + 57102025, } yi{ - populationShareF:int{46300000} + populationShareF:int{46290000} } } SG{ @@ -32383,14 +31509,14 @@ supplementalData:table(nofallback){ populationShareF:int{49930000} } ml{ - populationShareF:int{47170000} + populationShareF:int{47160000} } ms{ officialStatus{"official"} populationShareF:int{49140000} } pa{ - populationShareF:int{47160000} + populationShareF:int{47150000} } ta{ officialStatus{"official"} @@ -32399,7 +31525,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61528100, 49959000, - 56599599, + 56620966, } zh{ officialStatus{"official"} @@ -32414,7 +31540,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 57311000, 49970000, - 53784100, + 53786200, } } SI{ @@ -32440,21 +31566,21 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60712300, 49997000, - 56210213, + 56210268, } } SJ{ nb{ officialStatus{"official"} - populationShareF:int{49580000} + populationShareF:int{49510000} } ru{ - populationShareF:int{49460000} + populationShareF:int{49410000} } territoryF:intvector{ - 58183300, + 58204000, 50100000, - 53258300, + 53292600, } } SK{ @@ -32480,7 +31606,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61179700, 49996000, - 56544504, + 56544060, } uk{ populationShareF:int{48190000} @@ -32510,12 +31636,12 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60115500, 49433000, - 56631221, + 56662493, } } SM{ eo{ - populationShareF:int{47890000} + populationShareF:int{47880000} } it{ officialStatus{"official"} @@ -32524,7 +31650,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59206400, 49960000, - 54337790, + 54342320, } } SN{ @@ -32563,7 +31689,7 @@ supplementalData:table(nofallback){ mey{ literacyShareF:int{49100000} officialStatus{"official_regional"} - populationShareF:int{46480000} + populationShareF:int{46460000} } mfv{ literacyShareF:int{49100000} @@ -32586,12 +31712,12 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60548000, 49497000, - 57150209, + 57157364, } tnr{ literacyShareF:int{49100000} officialStatus{"official_regional"} - populationShareF:int{46230000} + populationShareF:int{46210000} } wo{ officialStatus{"de_facto_official"} @@ -32617,7 +31743,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60204400, 49378000, - 57112590, + 57117571, } } SR{ @@ -32632,10 +31758,10 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59868800, 49947000, - 55597927, + 55609569, } zh_Hant{ - populationShareF:int{48120000} + populationShareF:int{48110000} } } SS{ @@ -32652,7 +31778,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60200100, 49270000, - 57102046, + 57105612, } } ST{ @@ -32663,7 +31789,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58686000, 49695000, - 55204454, + 55211122, } } SV{ @@ -32674,7 +31800,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60511700, 49845000, - 56618727, + 56648110, } } SX{ @@ -32687,15 +31813,15 @@ supplementalData:table(nofallback){ } nl{ officialStatus{"official"} - populationShareF:int{48370000} + populationShareF:int{48360000} } territoryF:intvector{ 58365800, 49990000, - 54426770, + 54438470, } vic{ - populationShareF:int{48730000} + populationShareF:int{48710000} } } SY{ @@ -32720,7 +31846,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60502800, 49841000, - 57194543, + 57193984, } } SZ{ @@ -32735,7 +31861,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60116000, 49878000, - 56108720, + 56110448, } ts{ populationShareF:int{48170000} @@ -32749,7 +31875,7 @@ supplementalData:table(nofallback){ populationShareF:int{49990000} } territoryF:intvector{ - 57123500, + 57122300, 49990000, 52275000, } @@ -32762,7 +31888,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58632000, 49980000, - 54537010, + 54559260, } } TD{ @@ -32777,7 +31903,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60286200, 49354000, - 57158331, + 57168774, } } TF{ @@ -32786,7 +31912,7 @@ supplementalData:table(nofallback){ populationShareF:int{50100000} } territoryF:intvector{ - 56593500, + 56589300, 49990000, 52140000, } @@ -32806,7 +31932,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60129700, 49604000, - 56817645, + 56860844, } } TH{ @@ -32847,7 +31973,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62123600, 49935000, - 57686159, + 57689774, } th{ literacyShareF:int{49930000} @@ -32864,7 +31990,7 @@ supplementalData:table(nofallback){ } TJ{ ar{ - populationShareF:int{46120000} + populationShareF:int{46110000} } fa{ populationShareF:int{47780000} @@ -32875,7 +32001,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60284300, 49997000, - 56860488, + 56887367, } tg{ officialStatus{"official"} @@ -32885,16 +32011,16 @@ supplementalData:table(nofallback){ TK{ en{ officialStatus{"official"} - populationShareF:int{50100000} + populationShareF:int{49780000} } territoryF:intvector{ 56150000, 49940000, - 53128500, + 53164700, } tkl{ officialStatus{"official"} - populationShareF:int{50100000} + populationShareF:int{49780000} writingShareF:int{48500000} } } @@ -32907,7 +32033,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59742600, 49583000, - 56132193, + 56138372, } tet{ officialStatus{"official"} @@ -32924,7 +32050,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61103700, 49996000, - 56541101, + 56552863, } tk{ officialStatus{"official"} @@ -32949,7 +32075,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61137700, 49791000, - 57115162, + 57117212, } } TO{ @@ -32960,7 +32086,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58591000, 49990000, - 55106398, + 55106095, } to{ officialStatus{"official"} @@ -33029,7 +32155,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 62218600, 49941000, - 57812572, + 57820175, } tr{ officialStatus{"official"} @@ -33056,29 +32182,29 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60428500, 49988000, - 56121553, + 56120879, } } TV{ en{ officialStatus{"official"} - populationShareF:int{48960000} + populationShareF:int{48940000} } territoryF:intvector{ 57420000, 49950000, - 54111470, + 54113420, } tvl{ officialStatus{"official"} - populationShareF:int{49890000} + populationShareF:int{49870000} } } TW{ territoryF:intvector{ 62118900, 49961000, - 57235460, + 57236030, } trv{ populationShareF:int{46200000} @@ -33141,7 +32267,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61162500, 49678000, - 57554513, + 57585528, } vun{ populationShareF:int{47740000} @@ -33179,7 +32305,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61369600, 49997000, - 57439523, + 57439229, } tr{ populationShareF:int{47420000} @@ -33204,7 +32330,7 @@ supplementalData:table(nofallback){ populationShareF:int{48390000} } hi{ - populationShareF:int{45540000} + populationShareF:int{45510000} } laj{ populationShareF:int{48380000} @@ -33231,7 +32357,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60891900, 49732000, - 57408537, + 57432530, } ttj{ populationShareF:int{48190000} @@ -33246,7 +32372,7 @@ supplementalData:table(nofallback){ populationShareF:int{50100000} } territoryF:intvector{ - 57187100, + 57185200, 49990000, 52316000, } @@ -33326,7 +32452,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 63194900, 49990000, - 58329256, + 58332639, } vi{ populationShareF:int{47340000} @@ -33346,7 +32472,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60781600, 49981000, - 56336930, + 56338761, } } UZ{ @@ -33359,7 +32485,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61223000, 49994000, - 57300237, + 57305654, } tr{ populationShareF:int{47760000} @@ -33382,7 +32508,7 @@ supplementalData:table(nofallback){ populationShareF:int{49820000} } territoryF:intvector{ - 57372200, + 57371300, 50100000, 53100000, } @@ -33395,7 +32521,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59126500, 49960000, - 55101844, + 55101390, } } VE{ @@ -33406,7 +32532,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61381600, 49955000, - 57316892, + 57286446, } } VG{ @@ -33417,7 +32543,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58500000, 49978000, - 54358020, + 54373810, } } VI{ @@ -33428,7 +32554,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59387200, 49990000, - 55106977, + 55106235, } } VN{ @@ -33439,7 +32565,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61648700, 49934000, - 57970403, + 57987213, } vi{ officialStatus{"official"} @@ -33465,7 +32591,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 58772000, 49832000, - 55288037, + 55298333, } } WF{ @@ -33474,12 +32600,12 @@ supplementalData:table(nofallback){ populationShareF:int{49480000} } fud{ - populationShareF:int{49310000} + populationShareF:int{49300000} } territoryF:intvector{ 57600000, 49500000, - 54157630, + 54158540, } wls{ populationShareF:int{49600000} @@ -33488,7 +32614,7 @@ supplementalData:table(nofallback){ WS{ en{ officialStatus{"official"} - populationShareF:int{48220000} + populationShareF:int{48210000} } sm{ officialStatus{"official"} @@ -33497,7 +32623,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 59113700, 49988000, - 55201316, + 55203774, } } XK{ @@ -33519,7 +32645,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60196000, 49919000, - 56190759, + 56193277, } } YE{ @@ -33533,7 +32659,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60736300, 49653000, - 57286672, + 57298844, } } YT{ @@ -33598,7 +32724,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 61767200, 49930000, - 57553802, + 57564636, } tn{ literacyShareF:int{49500000} @@ -33643,7 +32769,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60689300, 49614000, - 57164451, + 57174266, } } ZW{ @@ -33674,7 +32800,7 @@ supplementalData:table(nofallback){ territoryF:intvector{ 60342700, 49836000, - 57140304, + 57145463, } tn{ populationShareF:int{47220000} @@ -35765,525 +34891,6 @@ supplementalData:table(nofallback){ preferred{"H"} } } - unitPreferenceData{ - 001{ - area-default{ - "square-kilometer", - "hectare", - "square-meter", - "square-centimeter", - } - area-geograph{"square-kilometer"} - area-land{"hectare"} - concentration-default{"item-per-cubic-meter"} - consumption-default{"liter-per-100-kilometer"} - consumption-inverse-default{"kilometer-per-centiliter"} - consumption-inverse-vehicle-fuel{"kilometer-per-centiliter"} - consumption-vehicle-fuel{"liter-per-100-kilometer"} - duration-default{ - "day", - "hour", - "minute", - "second", - "millisecond", - "microsecond", - "nanosecond", - } - duration-media{ - "minute-and-second", - "second", - } - energy-default{"kilowatt-hour"} - energy-food{"kilocalorie"} - length-default{ - "kilometer", - "meter", - "centimeter", - } - length-person{"centimeter"} - length-person-height{"centimeter"} - length-rainfall{"millimeter"} - length-road{"meter"} - length-snowfall{"centimeter"} - length-vehicle{"meter"} - length-visiblty{"meter"} - mass-default{ - "metric-ton", - "kilogram", - "gram", - "milligram", - "microgram", - } - mass-density-blood-glucose{"milligram-per-deciliter"} - mass-density-default{"kilogram-per-cubic-meter"} - mass-person{ - "kilogram", - "gram", - } - power-default{ - "gigawatt", - "megawatt", - "kilowatt", - "watt", - "milliwatt", - } - power-engine{"kilowatt"} - pressure-baromtrc{"hectopascal"} - pressure-default{ - "megapascal", - "pascal", - } - speed-default{"kilometer-per-hour"} - speed-wind{"kilometer-per-hour"} - temperature-default{"celsius"} - temperature-weather{"celsius"} - volume-default{ - "cubic-meter", - "cubic-centimeter", - } - volume-fluid{ - "liter", - "milliliter", - } - volume-oil{"barrel"} - volume-vehicle{"liter"} - year-duration-default{ - "year", - "month", - } - year-duration-person-age{ - "year-person-and-month-person", - "month-person", - } - } - AG{ - concentration-blood-glucose{"millimole-per-liter"} - } - AI{ - concentration-blood-glucose{"millimole-per-liter"} - } - AO{ - concentration-blood-glucose{"millimole-per-liter"} - } - AT{ - length-person-height{"meter-and-centimeter"} - } - AU{ - concentration-blood-glucose{"millimole-per-liter"} - } - BA{ - concentration-blood-glucose{"millimole-per-liter"} - } - BE{ - length-person-height{"meter-and-centimeter"} - } - BG{ - concentration-blood-glucose{"millimole-per-liter"} - } - BH{ - concentration-blood-glucose{"millimole-per-liter"} - } - BM{ - concentration-blood-glucose{"millimole-per-liter"} - } - BN{ - concentration-blood-glucose{"millimole-per-liter"} - } - BR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - length-rainfall{"centimeter"} - pressure-baromtrc{"millibar"} - } - BS{ - temperature-weather{"fahrenheit"} - } - BW{ - concentration-blood-glucose{"millimole-per-liter"} - } - BY{ - concentration-blood-glucose{"millimole-per-liter"} - } - BZ{ - temperature-weather{"fahrenheit"} - } - CA{ - concentration-blood-glucose{"millimole-per-liter"} - consumption-inverse-vehicle-fuel{"mile-per-gallon-imperial"} - length-person{"inch"} - length-person-height{"inch"} - } - CH{ - concentration-blood-glucose{"millimole-per-liter"} - } - CM{ - concentration-blood-glucose{"millimole-per-liter"} - } - CN{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - } - CZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - DE{ - length-person-height{"meter-and-centimeter"} - length-visiblty{"meter"} - } - DK{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - } - DM{ - concentration-blood-glucose{"millimole-per-liter"} - } - DZ{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - EE{ - concentration-blood-glucose{"millimole-per-liter"} - } - EG{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - pressure-baromtrc{"millibar"} - } - ES{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - FI{ - concentration-blood-glucose{"millimole-per-liter"} - speed-wind{"meter-per-second"} - } - FJ{ - concentration-blood-glucose{"millimole-per-liter"} - } - FR{ - length-person-height{"meter-and-centimeter"} - } - GB{ - area-default{ - "square-mile", - "acre", - "square-foot", - "square-inch", - } - area-geograph{"square-mile"} - area-land{"acre"} - concentration-blood-glucose{"millimole-per-liter"} - consumption-inverse-vehicle-fuel{"mile-per-gallon-imperial"} - length-default{ - "mile", - "foot", - "inch", - } - length-person{"inch"} - length-person-height{"inch"} - length-road{"yard"} - length-vehicle{"foot-and-inch"} - length-visiblty{ - "mile", - "foot", - } - mass-default{ - "ton", - "pound", - "ounce", - } - mass-person{ - "stone-and-pound", - "pound-and-ounce", - } - power-engine{"horsepower"} - pressure-baromtrc{"millibar"} - pressure-default{"pound-force-per-square-inch"} - speed-default{"mile-per-hour"} - volume-default{ - "cubic-foot", - "cubic-inch", - } - volume-fluid{ - "gallon-imperial", - "fluid-ounce-imperial", - } - } - GD{ - concentration-blood-glucose{"millimole-per-liter"} - } - HK{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - mass-person{"pound-and-ounce"} - } - HR{ - concentration-blood-glucose{"millimole-per-liter"} - } - HU{ - concentration-blood-glucose{"millimole-per-liter"} - } - ID{ - length-person-height{"meter-and-centimeter"} - } - IE{ - concentration-blood-glucose{"millimole-per-liter"} - } - IL{ - length-person-height{"meter-and-centimeter"} - pressure-baromtrc{"millibar"} - } - IM{ - concentration-blood-glucose{"millimole-per-liter"} - } - IN{ - length-person{"inch"} - length-person-height{"inch"} - pressure-baromtrc{"inch-ofhg"} - } - IS{ - concentration-blood-glucose{"millimole-per-liter"} - } - IT{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - } - JO{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - JP{ - consumption-vehicle-fuel{"liter-per-kilometer"} - } - KE{ - concentration-blood-glucose{"millimole-per-liter"} - } - KN{ - concentration-blood-glucose{"millimole-per-liter"} - } - KR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - speed-wind{"meter-per-second"} - } - KW{ - concentration-blood-glucose{"millimole-per-liter"} - } - KY{ - temperature-weather{"fahrenheit"} - } - KZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - LC{ - concentration-blood-glucose{"millimole-per-liter"} - } - LI{ - concentration-blood-glucose{"millimole-per-liter"} - } - LT{ - concentration-blood-glucose{"millimole-per-liter"} - } - LU{ - concentration-blood-glucose{"millimole-per-liter"} - } - LV{ - concentration-blood-glucose{"millimole-per-liter"} - } - ME{ - concentration-blood-glucose{"millimole-per-liter"} - } - MG{ - concentration-blood-glucose{"millimole-per-liter"} - } - MK{ - concentration-blood-glucose{"millimole-per-liter"} - } - MO{ - concentration-blood-glucose{"millimole-per-liter"} - } - MS{ - concentration-blood-glucose{"millimole-per-liter"} - } - MT{ - concentration-blood-glucose{"millimole-per-liter"} - } - MU{ - concentration-blood-glucose{"millimole-per-liter"} - } - MX{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - length-vehicle{"meter-and-centimeter"} - pressure-baromtrc{"millimeter-ofhg"} - } - MY{ - concentration-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - } - MZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - NA{ - concentration-blood-glucose{"millimole-per-liter"} - } - NL{ - concentration-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - length-visiblty{"meter"} - } - NO{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - speed-wind{"meter-per-second"} - } - NZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - OM{ - concentration-blood-glucose{"millimole-per-liter"} - } - PG{ - concentration-blood-glucose{"millimole-per-liter"} - } - PL{ - length-person-height{"meter-and-centimeter"} - speed-wind{"meter-per-second"} - } - PR{ - temperature-weather{"fahrenheit"} - } - PT{ - length-person-height{"meter-and-centimeter"} - } - PW{ - temperature-weather{"fahrenheit"} - } - RS{ - concentration-blood-glucose{"millimole-per-liter"} - } - RU{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - pressure-baromtrc{"millimeter-ofhg"} - speed-wind{"meter-per-second"} - } - SA{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - SE{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - length-road{ - "mile-scandinavian", - "kilometer", - } - speed-wind{"meter-per-second"} - } - SG{ - concentration-blood-glucose{"millimole-per-liter"} - } - SI{ - concentration-blood-glucose{"millimole-per-liter"} - } - SK{ - concentration-blood-glucose{"millimole-per-liter"} - } - TC{ - concentration-blood-glucose{"millimole-per-liter"} - } - TH{ - consumption-vehicle-fuel{"liter-per-kilometer"} - pressure-baromtrc{"millibar"} - } - TO{ - concentration-blood-glucose{"millimole-per-liter"} - } - TR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - } - UA{ - concentration-blood-glucose{"millimole-per-liter"} - } - UG{ - concentration-blood-glucose{"millimole-per-liter"} - } - US{ - area-default{ - "square-mile", - "acre", - "square-foot", - "square-inch", - } - area-geograph{"square-mile"} - area-land{"acre"} - consumption-inverse-vehicle-fuel{"mile-per-gallon"} - energy-food{"foodcalorie"} - length-default{ - "mile", - "foot", - "inch", - } - length-person{"inch"} - length-person-height{"inch"} - length-rainfall{"inch"} - length-snowfall{"inch"} - length-vehicle{"foot-and-inch"} - length-visiblty{ - "mile", - "foot", - } - mass-default{ - "ton", - "pound", - "ounce", - } - mass-person{ - "pound", - "pound-and-ounce", - } - power-engine{"horsepower"} - pressure-baromtrc{"inch-ofhg"} - pressure-default{"pound-force-per-square-inch"} - speed-default{"mile-per-hour"} - speed-wind{"mile-per-hour"} - temperature-default{"fahrenheit"} - temperature-weather{"fahrenheit"} - volume-default{ - "cubic-foot", - "cubic-inch", - } - volume-fluid{ - "gallon", - "quart", - "pint", - "cup", - "fluid-ounce", - "tablespoon", - "teaspoon", - } - volume-vehicle{"gallon"} - } - VC{ - concentration-blood-glucose{"millimole-per-liter"} - } - VG{ - concentration-blood-glucose{"millimole-per-liter"} - } - VN{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - } - VU{ - concentration-blood-glucose{"millimole-per-liter"} - } - ZA{ - concentration-blood-glucose{"millimole-per-liter"} - } - } weekData{ 001:intvector{ 2, diff --git a/intl/icu/source/data/misc/timezoneTypes.txt b/intl/icu/source/data/misc/timezoneTypes.txt index 4bcf72720562..8a08adf5fb97 100644 --- a/intl/icu/source/data/misc/timezoneTypes.txt +++ b/intl/icu/source/data/misc/timezoneTypes.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml timezoneTypes:table(nofallback){ bcpTypeAlias{ tz{ @@ -27,6 +28,7 @@ timezoneTypes:table(nofallback){ "America:Indiana:Indianapolis"{"America/Indianapolis"} "America:Kentucky:Louisville"{"America/Louisville"} "America:Knox_IN"{"America/Indiana/Knox"} + "America:Nuuk"{"America/Godthab"} "America:Porto_Acre"{"America/Rio_Branco"} "America:Rosario"{"America/Cordoba"} "America:Shiprock"{"America/Denver"} diff --git a/intl/icu/source/data/misc/units.txt b/intl/icu/source/data/misc/units.txt new file mode 100644 index 000000000000..a245f7ce6696 --- /dev/null +++ b/intl/icu/source/data/misc/units.txt @@ -0,0 +1,1947 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +units:table(nofallback){ + cldrVersion{"38.1"} + convertUnits{ + 100-kilometer{ + factor{"100000"} + target{"meter"} + } + acre{ + factor{"ft2_to_m2 * 43560"} + target{"square-meter"} + } + ampere{ + factor{"1"} + target{"ampere"} + } + arc-minute{ + factor{"1/360*60"} + target{"revolution"} + } + arc-second{ + factor{"1/360*60*60"} + target{"revolution"} + } + astronomical-unit{ + factor{"149597900000"} + target{"meter"} + } + atmosphere{ + factor{"101325"} + target{"kilogram-per-meter-square-second"} + } + bar{ + factor{"100000"} + target{"kilogram-per-meter-square-second"} + } + barrel{ + factor{"42*gal_to_m3"} + target{"cubic-meter"} + } + bit{ + factor{"1"} + target{"bit"} + } + british-thermal-unit{ + factor{"4.184*2267.96185/9"} + target{"kilogram-square-meter-per-square-second"} + } + bushel{ + factor{"2150.42*in3_to_m3"} + target{"cubic-meter"} + } + byte{ + factor{"8"} + target{"bit"} + } + calorie{ + factor{"4.184"} + target{"kilogram-square-meter-per-square-second"} + } + candela{ + factor{"1"} + target{"candela"} + } + carat{ + factor{"0.0002"} + target{"kilogram"} + } + celsius{ + factor{"1"} + offset{"273.15"} + target{"kelvin"} + } + century{ + factor{"100"} + target{"year"} + } + cup{ + factor{"gal_to_m3/16"} + target{"cubic-meter"} + } + cup-metric{ + factor{"0.00025"} + target{"cubic-meter"} + } + dalton{ + factor{"1.49241808560E-10"} + target{"kilogram-square-meter-per-square-second"} + } + day{ + factor{"86400"} + target{"second"} + } + day-person{ + factor{"86400"} + target{"second"} + } + decade{ + factor{"10"} + target{"year"} + } + degree{ + factor{"1/360"} + target{"revolution"} + } + dessert-spoon{ + factor{"gal_to_m3/16*128"} + target{"cubic-meter"} + } + dessert-spoon-imperial{ + factor{"gal_imp_to_m3/16*128"} + target{"cubic-meter"} + } + dot{ + factor{"1"} + target{"pixel"} + } + dram{ + factor{"gal_to_m3/128*8"} + target{"cubic-meter"} + } + drop{ + factor{"gal_to_m3/128*576"} + target{"cubic-meter"} + } + dunam{ + factor{"1000"} + target{"square-meter"} + } + earth-mass{ + factor{"5.9722E+24"} + target{"kilogram"} + } + earth-radius{ + factor{"6.3781E6"} + target{"meter"} + } + electronvolt{ + factor{"1.602177E-19"} + target{"kilogram-square-meter-per-square-second"} + } + em{ + factor{"1"} + target{"em"} + } + fahrenheit{ + factor{"5/9"} + offset{"2298.35/9"} + target{"kelvin"} + } + fathom{ + factor{"ft_to_m * 6"} + target{"meter"} + } + fluid-ounce{ + factor{"gal_to_m3/128"} + target{"cubic-meter"} + } + fluid-ounce-imperial{ + factor{"gal_imp_to_m3/160"} + target{"cubic-meter"} + } + foodcalorie{ + factor{"4184"} + target{"kilogram-square-meter-per-square-second"} + } + foot{ + factor{"ft_to_m"} + target{"meter"} + } + furlong{ + factor{"ft_to_m*660"} + target{"meter"} + } + g-force{ + factor{"gravity"} + target{"meter-per-square-second"} + } + gallon{ + factor{"gal_to_m3"} + target{"cubic-meter"} + } + gallon-imperial{ + factor{"gal_imp_to_m3"} + target{"cubic-meter"} + } + grain{ + factor{"lb_to_kg/7000"} + target{"kilogram"} + } + gram{ + factor{"0.001"} + target{"kilogram"} + } + hectare{ + factor{"10000"} + target{"square-meter"} + } + hertz{ + factor{"1"} + target{"revolution-per-second"} + } + horsepower{ + factor{"ft_to_m * lb_to_kg * gravity * 550"} + target{"kilogram-square-meter-per-cubic-second"} + } + hour{ + factor{"3600"} + target{"second"} + } + inch{ + factor{"ft_to_m/12"} + target{"meter"} + } + item{ + factor{"1"} + target{"item"} + } + jigger{ + factor{"gal_to_m3*3/128*2"} + target{"cubic-meter"} + } + joule{ + factor{"1"} + target{"kilogram-square-meter-per-square-second"} + } + karat{ + factor{"1/24"} + target{"portion"} + } + kelvin{ + factor{"1"} + target{"kelvin"} + } + kilogram{ + factor{"1"} + target{"kilogram"} + } + knot{ + factor{"1852/3600"} + target{"meter-per-second"} + } + light-year{ + factor{"9460730000000000"} + target{"meter"} + } + liter{ + factor{"0.001"} + target{"cubic-meter"} + } + lumen{ + factor{"1"} + target{"candela-square-meter-per-square-meter"} + } + lux{ + factor{"1"} + target{"candela-per-square-meter"} + } + meter{ + factor{"1"} + target{"meter"} + } + metric-ton{ + factor{"1000"} + target{"kilogram"} + } + mile{ + factor{"ft_to_m*5280"} + target{"meter"} + } + mile-scandinavian{ + factor{"10000"} + target{"meter"} + } + minute{ + factor{"60"} + target{"second"} + } + mole{ + factor{"6.02214076E+23"} + target{"item"} + } + month{ + factor{"1/12"} + target{"year"} + } + month-person{ + factor{"1/12"} + target{"year"} + } + nautical-mile{ + factor{"1852"} + target{"meter"} + } + newton{ + factor{"1"} + target{"kilogram-meter-per-square-second"} + } + ofhg{ + factor{"13595.1*gravity"} + target{"kilogram-per-square-meter-square-second"} + } + ohm{ + factor{"1"} + target{"kilogram-square-meter-per-cubic-second-square-ampere"} + } + ounce{ + factor{"lb_to_kg/16"} + target{"kilogram"} + } + ounce-troy{ + factor{"0.03110348"} + target{"kilogram"} + } + parsec{ + factor{"30856780000000000"} + target{"meter"} + } + pascal{ + factor{"1"} + target{"kilogram-per-meter-square-second"} + } + percent{ + factor{"1/100"} + target{"portion"} + } + permille{ + factor{"1/1000"} + target{"portion"} + } + permillion{ + factor{"1/1000000"} + target{"portion"} + } + permyriad{ + factor{"1/10000"} + target{"portion"} + } + pinch{ + factor{"gal_to_m3/128*128"} + target{"cubic-meter"} + } + pint{ + factor{"gal_to_m3/8"} + target{"cubic-meter"} + } + pint-metric{ + factor{"0.0005"} + target{"cubic-meter"} + } + pixel{ + factor{"1"} + target{"pixel"} + } + point{ + factor{"ft_to_m/864"} + target{"meter"} + } + portion{ + factor{"1"} + target{"portion"} + } + pound{ + factor{"lb_to_kg"} + target{"kilogram"} + } + pound-force{ + factor{"lb_to_kg * gravity"} + target{"kilogram-meter-per-square-second"} + } + quart{ + factor{"gal_to_m3/4"} + target{"cubic-meter"} + } + quart-imperial{ + factor{"gal_imp_to_m3/4"} + target{"cubic-meter"} + } + radian{ + factor{"1/2*PI"} + target{"revolution"} + } + revolution{ + factor{"1"} + target{"revolution"} + } + second{ + factor{"1"} + target{"second"} + } + solar-luminosity{ + factor{"3.828E+26"} + target{"kilogram-square-meter-per-cubic-second"} + } + solar-mass{ + factor{"1.98847E+30"} + target{"kilogram"} + } + solar-radius{ + factor{"695700000"} + target{"meter"} + } + stone{ + factor{"lb_to_kg*14"} + target{"kilogram"} + } + tablespoon{ + factor{"gal_to_m3/256"} + target{"cubic-meter"} + } + teaspoon{ + factor{"gal_to_m3/16*48"} + target{"cubic-meter"} + } + therm-us{ + factor{"105480400"} + target{"kilogram-square-meter-per-square-second"} + } + ton{ + factor{"lb_to_kg*2000"} + target{"kilogram"} + } + volt{ + factor{"1"} + target{"kilogram-square-meter-per-cubic-second-ampere"} + } + watt{ + factor{"1"} + target{"kilogram-square-meter-per-cubic-second"} + } + week{ + factor{"604800"} + target{"second"} + } + week-person{ + factor{"604800"} + target{"second"} + } + yard{ + factor{"ft_to_m*3"} + target{"meter"} + } + year{ + factor{"1"} + target{"year"} + } + year-person{ + factor{"1"} + target{"year"} + } + } + unitConstants{ + G{"6.67408E-11"} + PI{"411557987 / 131002976"} + ft2_to_m2{"ft_to_m*ft_to_m"} + ft3_to_m3{"ft_to_m*ft_to_m*ft_to_m"} + ft_to_m{"0.3048"} + gal_imp_to_m3{"0.00454609"} + gal_to_m3{"231*in3_to_m3"} + gravity{"9.80665"} + in3_to_m3{"ft3_to_m3/12*12*12"} + lb_to_kg{"0.45359237"} + } + unitPreferenceData{ + "area"{ + "default"{ + 001{ + { + unit{"square-kilometer"} + } + { + unit{"hectare"} + } + { + unit{"square-meter"} + } + { + unit{"square-centimeter"} + } + } + GB{ + { + unit{"square-mile"} + } + { + unit{"acre"} + } + { + unit{"square-foot"} + } + { + unit{"square-inch"} + } + } + US{ + { + unit{"square-mile"} + } + { + unit{"acre"} + } + { + unit{"square-foot"} + } + { + unit{"square-inch"} + } + } + } + "geograph"{ + 001{ + { + unit{"square-kilometer"} + } + } + GB{ + { + unit{"square-mile"} + } + } + US{ + { + unit{"square-mile"} + } + } + } + "land"{ + 001{ + { + unit{"hectare"} + } + } + GB{ + { + unit{"acre"} + } + } + US{ + { + unit{"acre"} + } + } + } + } + "concentration"{ + "blood-glucose"{ + AG{ + { + unit{"millimole-per-liter"} + } + } + AI{ + { + unit{"millimole-per-liter"} + } + } + AO{ + { + unit{"millimole-per-liter"} + } + } + AU{ + { + unit{"millimole-per-liter"} + } + } + BA{ + { + unit{"millimole-per-liter"} + } + } + BG{ + { + unit{"millimole-per-liter"} + } + } + BH{ + { + unit{"millimole-per-liter"} + } + } + BM{ + { + unit{"millimole-per-liter"} + } + } + BN{ + { + unit{"millimole-per-liter"} + } + } + BW{ + { + unit{"millimole-per-liter"} + } + } + BY{ + { + unit{"millimole-per-liter"} + } + } + CA{ + { + unit{"millimole-per-liter"} + } + } + CH{ + { + unit{"millimole-per-liter"} + } + } + CM{ + { + unit{"millimole-per-liter"} + } + } + CN{ + { + unit{"millimole-per-liter"} + } + } + CZ{ + { + unit{"millimole-per-liter"} + } + } + DK{ + { + unit{"millimole-per-liter"} + } + } + DM{ + { + unit{"millimole-per-liter"} + } + } + EE{ + { + unit{"millimole-per-liter"} + } + } + FI{ + { + unit{"millimole-per-liter"} + } + } + FJ{ + { + unit{"millimole-per-liter"} + } + } + GB{ + { + unit{"millimole-per-liter"} + } + } + GD{ + { + unit{"millimole-per-liter"} + } + } + HK{ + { + unit{"millimole-per-liter"} + } + } + HR{ + { + unit{"millimole-per-liter"} + } + } + HU{ + { + unit{"millimole-per-liter"} + } + } + IE{ + { + unit{"millimole-per-liter"} + } + } + IM{ + { + unit{"millimole-per-liter"} + } + } + IS{ + { + unit{"millimole-per-liter"} + } + } + KE{ + { + unit{"millimole-per-liter"} + } + } + KN{ + { + unit{"millimole-per-liter"} + } + } + KW{ + { + unit{"millimole-per-liter"} + } + } + KZ{ + { + unit{"millimole-per-liter"} + } + } + LC{ + { + unit{"millimole-per-liter"} + } + } + LI{ + { + unit{"millimole-per-liter"} + } + } + LT{ + { + unit{"millimole-per-liter"} + } + } + LU{ + { + unit{"millimole-per-liter"} + } + } + LV{ + { + unit{"millimole-per-liter"} + } + } + ME{ + { + unit{"millimole-per-liter"} + } + } + MG{ + { + unit{"millimole-per-liter"} + } + } + MK{ + { + unit{"millimole-per-liter"} + } + } + MO{ + { + unit{"millimole-per-liter"} + } + } + MS{ + { + unit{"millimole-per-liter"} + } + } + MT{ + { + unit{"millimole-per-liter"} + } + } + MU{ + { + unit{"millimole-per-liter"} + } + } + MY{ + { + unit{"millimole-per-liter"} + } + } + MZ{ + { + unit{"millimole-per-liter"} + } + } + NA{ + { + unit{"millimole-per-liter"} + } + } + NL{ + { + unit{"millimole-per-liter"} + } + } + NO{ + { + unit{"millimole-per-liter"} + } + } + NZ{ + { + unit{"millimole-per-liter"} + } + } + OM{ + { + unit{"millimole-per-liter"} + } + } + PG{ + { + unit{"millimole-per-liter"} + } + } + RS{ + { + unit{"millimole-per-liter"} + } + } + RU{ + { + unit{"millimole-per-liter"} + } + } + SE{ + { + unit{"millimole-per-liter"} + } + } + SG{ + { + unit{"millimole-per-liter"} + } + } + SI{ + { + unit{"millimole-per-liter"} + } + } + SK{ + { + unit{"millimole-per-liter"} + } + } + TC{ + { + unit{"millimole-per-liter"} + } + } + TO{ + { + unit{"millimole-per-liter"} + } + } + UA{ + { + unit{"millimole-per-liter"} + } + } + UG{ + { + unit{"millimole-per-liter"} + } + } + VC{ + { + unit{"millimole-per-liter"} + } + } + VG{ + { + unit{"millimole-per-liter"} + } + } + VN{ + { + unit{"millimole-per-liter"} + } + } + VU{ + { + unit{"millimole-per-liter"} + } + } + ZA{ + { + unit{"millimole-per-liter"} + } + } + } + "default"{ + 001{ + { + unit{"item-per-cubic-meter"} + } + } + } + } + "consumption"{ + "default"{ + 001{ + { + unit{"liter-per-100-kilometer"} + } + } + } + "vehicle-fuel"{ + 001{ + { + unit{"liter-per-100-kilometer"} + } + } + BR{ + { + unit{"liter-per-kilometer"} + } + } + IT{ + { + unit{"liter-per-kilometer"} + } + } + JP{ + { + unit{"liter-per-kilometer"} + } + } + KR{ + { + unit{"liter-per-kilometer"} + } + } + MX{ + { + unit{"liter-per-kilometer"} + } + } + MY{ + { + unit{"liter-per-kilometer"} + } + } + NL{ + { + unit{"liter-per-kilometer"} + } + } + TH{ + { + unit{"liter-per-kilometer"} + } + } + TR{ + { + unit{"liter-per-kilometer"} + } + } + } + } + "consumption-inverse"{ + "default"{ + 001{ + { + unit{"kilometer-per-centiliter"} + } + } + } + "vehicle-fuel"{ + 001{ + { + unit{"kilometer-per-centiliter"} + } + } + CA{ + { + unit{"mile-per-gallon-imperial"} + } + } + GB{ + { + unit{"mile-per-gallon-imperial"} + } + } + US{ + { + unit{"mile-per-gallon"} + } + } + } + } + "duration"{ + "default"{ + 001{ + { + unit{"day"} + } + { + unit{"hour"} + } + { + unit{"minute"} + } + { + unit{"second"} + } + { + unit{"millisecond"} + } + { + unit{"microsecond"} + } + { + unit{"nanosecond"} + } + } + } + "media"{ + 001{ + { + unit{"minute-and-second"} + } + { + unit{"second"} + } + } + } + } + "energy"{ + "default"{ + 001{ + { + unit{"kilowatt-hour"} + } + } + } + "food"{ + 001{ + { + unit{"kilocalorie"} + } + } + US{ + { + unit{"foodcalorie"} + } + } + } + } + "length"{ + "default"{ + 001{ + { + unit{"kilometer"} + } + { + unit{"meter"} + } + { + unit{"centimeter"} + } + } + GB{ + { + unit{"mile"} + } + { + unit{"foot"} + } + { + unit{"inch"} + } + } + US{ + { + unit{"mile"} + } + { + unit{"foot"} + } + { + unit{"inch"} + } + } + } + "focal-length"{ + 001{ + { + unit{"millimeter"} + } + } + } + "person"{ + 001{ + { + unit{"centimeter"} + } + } + CA{ + { + unit{"inch"} + } + } + GB{ + { + unit{"inch"} + } + } + IN{ + { + unit{"inch"} + } + } + US{ + { + unit{"inch"} + } + } + } + "person-height"{ + 001{ + { + unit{"centimeter"} + } + } + AT{ + { + unit{"meter-and-centimeter"} + } + } + BE{ + { + unit{"meter-and-centimeter"} + } + } + BR{ + { + unit{"meter-and-centimeter"} + } + } + CA{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + CN{ + { + unit{"meter-and-centimeter"} + } + } + DE{ + { + unit{"meter-and-centimeter"} + } + } + DK{ + { + unit{"meter-and-centimeter"} + } + } + DZ{ + { + unit{"meter-and-centimeter"} + } + } + EG{ + { + unit{"meter-and-centimeter"} + } + } + ES{ + { + unit{"meter-and-centimeter"} + } + } + FR{ + { + unit{"meter-and-centimeter"} + } + } + GB{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + HK{ + { + unit{"meter-and-centimeter"} + } + } + ID{ + { + unit{"meter-and-centimeter"} + } + } + IL{ + { + unit{"meter-and-centimeter"} + } + } + IN{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + IT{ + { + unit{"meter-and-centimeter"} + } + } + JO{ + { + unit{"meter-and-centimeter"} + } + } + MX{ + { + unit{"meter-and-centimeter"} + } + } + MY{ + { + unit{"meter-and-centimeter"} + } + } + NL{ + { + unit{"meter-and-centimeter"} + } + } + NO{ + { + unit{"meter-and-centimeter"} + } + } + PL{ + { + unit{"meter-and-centimeter"} + } + } + PT{ + { + unit{"meter-and-centimeter"} + } + } + RU{ + { + unit{"meter-and-centimeter"} + } + } + SA{ + { + unit{"meter-and-centimeter"} + } + } + SE{ + { + unit{"meter-and-centimeter"} + } + } + TR{ + { + unit{"meter-and-centimeter"} + } + } + US{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + VN{ + { + unit{"meter-and-centimeter"} + } + } + } + "rainfall"{ + 001{ + { + unit{"millimeter"} + } + } + BR{ + { + unit{"centimeter"} + } + } + US{ + { + unit{"inch"} + } + } + } + "road"{ + 001{ + { + geq{"0.9"} + unit{"kilometer"} + } + { + geq{"300.0"} + skeleton{"precision-increment/50"} + unit{"meter"} + } + { + skeleton{"precision-increment/10"} + unit{"meter"} + } + { + unit{"meter"} + } + } + GB{ + { + geq{"0.5"} + unit{"mile"} + } + { + geq{"100.0"} + skeleton{"precision-increment/50"} + unit{"yard"} + } + { + unit{"yard"} + } + } + SE{ + { + unit{"mile-scandinavian"} + } + { + unit{"kilometer"} + } + { + geq{"300.0"} + skeleton{"precision-increment/50"} + unit{"meter"} + } + { + skeleton{"precision-increment/10"} + unit{"meter"} + } + } + US{ + { + geq{"0.5"} + unit{"mile"} + } + { + geq{"100.0"} + skeleton{"precision-increment/50"} + unit{"foot"} + } + { + skeleton{"precision-increment/10"} + unit{"foot"} + } + } + } + "snowfall"{ + 001{ + { + unit{"centimeter"} + } + } + US{ + { + unit{"inch"} + } + } + } + "vehicle"{ + 001{ + { + unit{"meter"} + } + } + GB{ + { + unit{"foot-and-inch"} + } + } + MX{ + { + unit{"meter-and-centimeter"} + } + } + US{ + { + unit{"foot-and-inch"} + } + } + } + "visiblty"{ + 001{ + { + geq{"0.1"} + unit{"kilometer"} + } + { + unit{"meter"} + } + } + DE{ + { + unit{"meter"} + } + } + GB{ + { + unit{"mile"} + } + { + unit{"foot"} + } + } + NL{ + { + unit{"meter"} + } + } + US{ + { + unit{"mile"} + } + { + unit{"foot"} + } + } + } + } + "mass"{ + "default"{ + 001{ + { + unit{"metric-ton"} + } + { + unit{"kilogram"} + } + { + unit{"gram"} + } + { + unit{"milligram"} + } + { + unit{"microgram"} + } + } + GB{ + { + unit{"ton"} + } + { + unit{"pound"} + } + { + unit{"ounce"} + } + } + US{ + { + unit{"ton"} + } + { + unit{"pound"} + } + { + unit{"ounce"} + } + } + } + "person"{ + 001{ + { + unit{"kilogram"} + } + { + unit{"gram"} + } + } + DZ{ + { + unit{"kilogram-and-gram"} + } + } + EG{ + { + unit{"kilogram-and-gram"} + } + } + ES{ + { + unit{"kilogram-and-gram"} + } + } + GB{ + { + unit{"stone-and-pound"} + } + { + unit{"pound-and-ounce"} + } + } + HK{ + { + unit{"pound-and-ounce"} + } + } + JO{ + { + unit{"kilogram-and-gram"} + } + } + SA{ + { + unit{"kilogram-and-gram"} + } + } + US{ + { + unit{"pound"} + } + { + unit{"pound-and-ounce"} + } + } + } + } + "mass-density"{ + "blood-glucose"{ + 001{ + { + unit{"milligram-per-deciliter"} + } + } + } + "default"{ + 001{ + { + unit{"kilogram-per-cubic-meter"} + } + } + } + } + "power"{ + "default"{ + 001{ + { + unit{"gigawatt"} + } + { + unit{"megawatt"} + } + { + unit{"kilowatt"} + } + { + unit{"watt"} + } + { + unit{"milliwatt"} + } + } + } + "engine"{ + 001{ + { + unit{"kilowatt"} + } + } + GB{ + { + unit{"horsepower"} + } + } + US{ + { + unit{"horsepower"} + } + } + } + } + "pressure"{ + "baromtrc"{ + 001{ + { + unit{"hectopascal"} + } + } + BR{ + { + unit{"millibar"} + } + } + EG{ + { + unit{"millibar"} + } + } + GB{ + { + unit{"millibar"} + } + } + IL{ + { + unit{"millibar"} + } + } + IN{ + { + unit{"inch-ofhg"} + } + } + MX{ + { + unit{"millimeter-ofhg"} + } + } + RU{ + { + unit{"millimeter-ofhg"} + } + } + TH{ + { + unit{"millibar"} + } + } + US{ + { + unit{"inch-ofhg"} + } + } + } + "default"{ + 001{ + { + unit{"megapascal"} + } + { + unit{"pascal"} + } + } + GB{ + { + unit{"pound-force-per-square-inch"} + } + } + US{ + { + unit{"pound-force-per-square-inch"} + } + } + } + } + "speed"{ + "default"{ + 001{ + { + unit{"kilometer-per-hour"} + } + } + GB{ + { + unit{"mile-per-hour"} + } + } + US{ + { + unit{"mile-per-hour"} + } + } + } + "wind"{ + 001{ + { + unit{"kilometer-per-hour"} + } + } + FI{ + { + unit{"meter-per-second"} + } + } + KR{ + { + unit{"meter-per-second"} + } + } + NO{ + { + unit{"meter-per-second"} + } + } + PL{ + { + unit{"meter-per-second"} + } + } + RU{ + { + unit{"meter-per-second"} + } + } + SE{ + { + unit{"meter-per-second"} + } + } + US{ + { + unit{"mile-per-hour"} + } + } + } + } + "temperature"{ + "default"{ + 001{ + { + unit{"celsius"} + } + } + US{ + { + unit{"fahrenheit"} + } + } + } + "weather"{ + 001{ + { + unit{"celsius"} + } + } + BS{ + { + unit{"fahrenheit"} + } + } + BZ{ + { + unit{"fahrenheit"} + } + } + KY{ + { + unit{"fahrenheit"} + } + } + PR{ + { + unit{"fahrenheit"} + } + } + PW{ + { + unit{"fahrenheit"} + } + } + US{ + { + unit{"fahrenheit"} + } + } + } + } + "volume"{ + "default"{ + 001{ + { + unit{"cubic-meter"} + } + { + unit{"cubic-centimeter"} + } + } + GB{ + { + unit{"cubic-foot"} + } + { + unit{"cubic-inch"} + } + } + US{ + { + unit{"cubic-foot"} + } + { + unit{"cubic-inch"} + } + } + } + "fluid"{ + 001{ + { + unit{"liter"} + } + { + unit{"milliliter"} + } + } + GB{ + { + unit{"gallon-imperial"} + } + { + unit{"fluid-ounce-imperial"} + } + } + US{ + { + unit{"gallon"} + } + { + unit{"quart"} + } + { + unit{"pint"} + } + { + unit{"cup"} + } + { + unit{"fluid-ounce"} + } + { + unit{"tablespoon"} + } + { + unit{"teaspoon"} + } + } + } + "oil"{ + 001{ + { + unit{"barrel"} + } + } + } + "vehicle"{ + 001{ + { + unit{"liter"} + } + } + US{ + { + unit{"gallon"} + } + } + } + } + "year-duration"{ + "default"{ + 001{ + { + unit{"year"} + } + { + unit{"month"} + } + } + } + "person-age"{ + 001{ + { + geq{"2.5"} + unit{"year-person"} + } + { + unit{"year-person-and-month-person"} + } + { + unit{"month-person"} + } + } + } + } + } + unitQuantities{ + ampere{"electric-current"} + ampere-per-meter{"magnetic-field-strength"} + ampere-per-square-meter{"current-density"} + bit{"digital"} + candela{"luminous-intensity"} + candela-per-square-meter{"illuminance"} + candela-square-meter-per-square-meter{"luminous-flux"} + cubic-meter{"volume"} + cubic-meter-per-kilogram{"specific-volume"} + cubic-meter-per-meter{"consumption"} + cubic-second-square-ampere-per-kilogram-square-meter{"electric-conductance"} + em{"typewidth"} + item{"substance-amount"} + item-per-cubic-meter{"concentration"} + kelvin{"temperature"} + kilogram{"mass"} + kilogram-meter-per-meter-square-second{"torque"} + kilogram-meter-per-square-second{"force"} + kilogram-per-cubic-meter{"mass-density"} + kilogram-per-kilogram{"mass-fraction"} + kilogram-per-meter-square-second{"pressure"} + kilogram-per-square-meter-square-second{"pressure-per-length"} + kilogram-per-square-second-ampere{"magnetic-induction"} + kilogram-square-meter-per-cubic-second{"power"} + kilogram-square-meter-per-cubic-second-ampere{"voltage"} + kilogram-square-meter-per-cubic-second-square-ampere{"electric-resistance"} + kilogram-square-meter-per-square-second{"energy"} + kilogram-square-meter-per-square-second-ampere{"magnetic-flux"} + kilogram-square-meter-per-square-second-square-ampere{"electric-inductance"} + meter{"length"} + meter-per-second{"speed"} + meter-per-square-second{"acceleration"} + pixel{"graphics"} + pixel-per-meter{"resolution"} + portion{"portion"} + pow4-second-square-ampere-per-kilogram-square-meter{"electric-capacitance"} + revolution{"angle"} + revolution-per-meter{"wave-number"} + revolution-per-second{"frequency"} + second{"duration"} + second-ampere{"electric-charge"} + square-meter{"area"} + square-meter-per-square-second{"dose"} + square-revolution{"solid-angle"} + year{"year-duration"} + } +} diff --git a/intl/icu/source/data/misc/windowsZones.txt b/intl/icu/source/data/misc/windowsZones.txt index cb139642fa10..4fe43fd3597d 100644 --- a/intl/icu/source/data/misc/windowsZones.txt +++ b/intl/icu/source/data/misc/windowsZones.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml windowsZones:table(nofallback){ mapTimezones{ "AUS Central Standard Time"{ @@ -156,7 +157,7 @@ windowsZones:table(nofallback){ } "Central Pacific Standard Time"{ 001{"Pacific/Guadalcanal"} - AU{"Antarctica/Macquarie"} + AQ{"Antarctica/Casey"} FM{"Pacific/Ponape Pacific/Kosrae"} NC{"Pacific/Noumea"} SB{"Pacific/Guadalcanal"} @@ -466,7 +467,7 @@ windowsZones:table(nofallback){ } "Pacific Standard Time"{ 001{"America/Los_Angeles"} - CA{"America/Vancouver America/Dawson America/Whitehorse"} + CA{"America/Vancouver"} US{"America/Los_Angeles"} ZZ{"PST8PDT"} } @@ -593,7 +594,6 @@ windowsZones:table(nofallback){ } "Singapore Standard Time"{ 001{"Asia/Singapore"} - AQ{"Antarctica/Casey"} BN{"Asia/Brunei"} ID{"Asia/Makassar"} MY{"Asia/Kuala_Lumpur Asia/Kuching"} @@ -634,7 +634,7 @@ windowsZones:table(nofallback){ } "Tasmania Standard Time"{ 001{"Australia/Hobart"} - AU{"Australia/Hobart Australia/Currie"} + AU{"Australia/Hobart Australia/Currie Antarctica/Macquarie"} } "Tocantins Standard Time"{ 001{"America/Araguaina"} @@ -674,7 +674,6 @@ windowsZones:table(nofallback){ } "US Mountain Standard Time"{ 001{"America/Phoenix"} - CA{"America/Dawson_Creek America/Creston America/Fort_Nelson"} MX{"America/Hermosillo"} US{"America/Phoenix"} ZZ{"Etc/GMT+7"} @@ -811,5 +810,12 @@ windowsZones:table(nofallback){ 001{"Asia/Yakutsk"} RU{"Asia/Yakutsk Asia/Khandyga"} } + "Yukon Standard Time"{ + 001{"America/Whitehorse"} + CA{ + "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre" + "ek America/Fort_Nelson" + } + } } } diff --git a/intl/icu/source/data/misc/zoneinfo64.txt b/intl/icu/source/data/misc/zoneinfo64.txt index 89b89737e335..54a2a4601d5d 100644 --- a/intl/icu/source/data/misc/zoneinfo64.txt +++ b/intl/icu/source/data/misc/zoneinfo64.txt @@ -1,22 +1,22 @@ //--------------------------------------------------------- // Copyright (C) 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Fri Sep 13 17:31:25 2019 +// Build date: Wed Oct 21 21:13:50 2020 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2019c -// ICU version: 65.1 +// tz version: 2020d +// ICU version: 68.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2019c" } + TZVersion { "2020d" } Zones:array { - /* ACT */ :int { 355 } //Z#0 - /* AET */ :int { 367 } //Z#1 + /* ACT */ :int { 356 } //Z#0 + /* AET */ :int { 368 } //Z#1 /* AGT */ :int { 64 } //Z#2 /* ART */ :int { 18 } //Z#3 /* AST */ :int { 60 } //Z#4 @@ -24,7 +24,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1830383032 } typeOffsets:intvector { -968, 0, 0, 0 } typeMap:bin { "01" } - links:intvector { 5, 11, 13, 21, 22, 27, 38, 51, 52, 55, 347 } + links:intvector { 5, 11, 13, 21, 22, 27, 38, 51, 52, 55, 348 } } //Z#5 /* Africa/Accra */ :table { trans:intvector { -1640995148, -1556841600, -1546388400, -1525305600, -1514852400, -1493769600, -1483316400, -1462233600, -1451780400, -1430611200, -1420158000, -1399075200, -1388622000, -1367539200, -1357086000, -1336003200, -1325550000, -1304380800, -1293927600, -1272844800, -1262391600, -1241308800, -1230855600, -1209772800, -1199319600, -1178150400, -1167697200, -1146614400, -1136161200, -1115078400, -1104625200, -1083542400, -1073089200, -1051920000, -1041466800, -1020384000, -1009930800, -988848000, -978394800, -957312000, -946858800, -925689600, -915236400, -894153600, -883700400, -862617600, -852164400 } @@ -33,7 +33,7 @@ zoneinfo64:table(nofallback) { } //Z#6 /* Africa/Addis_Ababa */ :int { 48 } //Z#7 /* Africa/Algiers */ :table { - transPre32:intvector { -1, 1808288224 } + transPre32:intvector { -1, 1808374564 } trans:intvector { -1855958961, -1689814800, -1680397200, -1665363600, -1648342800, -1635123600, -1616893200, -1604278800, -1585443600, -1574038800, -1552266000, -1539997200, -1531443600, -956365200, -950486400, -942012000, -812502000, -796262400, -781052400, -766630800, -733280400, -439430400, -212029200, 41468400, 54774000, 231724800, 246236400, 259545600, 275274000, 309740400, 325468800, 341802000, 357523200 } typeOffsets:intvector { 732, 0, 0, 0, 0, 3600, 561, 0, 3600, 0, 3600, 3600 } typeMap:bin { "03010201020102010201020102010201040504050401040102010204050401020104" } @@ -56,11 +56,11 @@ zoneinfo64:table(nofallback) { 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, 1400191200, 1403816400, 1406844000, 1411678800 } typeOffsets:intvector { 7509, 0, 7200, 0, 7200, 3600 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 3, 18, 401 } + links:intvector { 3, 18, 402 } } //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, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590285600, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835229600, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080173600, 2107994400, 2111018400, 2138234400, 2141863200 } - transPost32:intvector { 0, -2125888096, 0, -2122864096, 0, -2095043296, 0, -2092019296, 0, -2064803296, 0, -2061174496, 0, -2033958496, 0, -2030934496, 0, -2003718496, 0, -2000089696, 0, -1972873696, 0, -1969849696, 0, -1942028896, 0, -1939004896, 0, -1911788896, 0, -1908160096, 0, -1880944096, 0, -1877920096, 0, -1850099296, 0, -1847075296, 0, -1819859296, 0, -1816230496, 0, -1789014496, 0, -1785990496, 0, -1758774496, 0, -1755145696, 0, -1727929696, 0, -1724905696, 0, -1697084896, 0, -1694060896, 0, -1666844896, 0, -1663216096, 0, -1636000096, 0, -1632976096, 0, -1605155296, 0, -1602131296, 0, -1574915296, 0, -1571286496, 0, -1544070496, 0, -1541046496, 0, -1513830496, 0, -1510201696, 0, -1482985696, 0, -1479961696, 0, -1452140896, 0, -1449116896, 0, -1421900896, 0, -1418272096, 0, -1391056096, 0, -1388032096, 0, -1360211296, 0, -1357187296, 0, -1329971296, 0, -1326947296, 0, -1299126496, 0, -1296102496, 0, -1268886496, 0, -1265257696, 0, -1238041696, 0, -1235017696, 0, -1207196896, 0, -1204172896, 0, -1176956896, 0, -1173328096, 0, -1146112096, 0, -1143088096, 0, -1115267296, 0, -1112243296, 0, -1085027296, 0, -1082003296, 0, -1054182496, 0, -1051158496, 0, -1023942496, 0, -1020313696, 0, -993097696, 0, -990073696, 0, -962252896, 0, -959228896, 0, -932012896, 0, -928384096, 0, -901168096, 0, -898144096, 0, -870323296, 0, -867299296, 0, -840083296, 0, -837059296, 0, -809238496, 0, -806214496, 0, -778998496, 0, -775369696, 0, -748153696, 0, -745129696, 0, -717308896, 0, -714284896, 0, -687068896, 0, -683440096, 0, -656224096, 0, -653200096, 0, -625379296, 0, -622355296, 0, -595139296, 0, -592115296 } + 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, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590890400, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682820000, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835834400, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927764000, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080778400, 2107994400, 2111018400, 2138234400, 2141863200 } + transPost32:intvector { 0, -2125888096, 0, -2122259296, 0, -2095043296, 0, -2092019296, 0, -2064803296, 0, -2061174496, 0, -2033958496, 0, -2030934496, 0, -2003718496, 0, -2000089696, 0, -1972873696, 0, -1969244896, 0, -1942028896, 0, -1939004896, 0, -1911788896, 0, -1908160096, 0, -1880944096, 0, -1877315296, 0, -1850099296, 0, -1847075296, 0, -1819859296, 0, -1816230496, 0, -1789014496, 0, -1785990496, 0, -1758774496, 0, -1755145696, 0, -1727929696, 0, -1724300896, 0, -1697084896, 0, -1694060896, 0, -1666844896, 0, -1663216096, 0, -1636000096, 0, -1632371296, 0, -1605155296, 0, -1602131296, 0, -1574915296, 0, -1571286496, 0, -1544070496, 0, -1541046496, 0, -1513830496, 0, -1510201696, 0, -1482985696, 0, -1479356896, 0, -1452140896, 0, -1449116896, 0, -1421900896, 0, -1418272096, 0, -1391056096, 0, -1387427296, 0, -1360211296, 0, -1357187296, 0, -1329971296, 0, -1326342496, 0, -1299126496, 0, -1296102496, 0, -1268886496, 0, -1265257696, 0, -1238041696, 0, -1234412896, 0, -1207196896, 0, -1204172896, 0, -1176956896, 0, -1173328096, 0, -1146112096, 0, -1142483296, 0, -1115267296, 0, -1112243296, 0, -1085027296, 0, -1081398496, 0, -1054182496, 0, -1051158496, 0, -1023942496, 0, -1020313696, 0, -993097696, 0, -989468896, 0, -962252896, 0, -959228896, 0, -932012896, 0, -928384096, 0, -901168096, 0, -897539296, 0, -870323296, 0, -867299296, 0, -840083296, 0, -836454496, 0, -809238496, 0, -806214496, 0, -778998496, 0, -775369696, 0, -748153696, 0, -744524896, 0, -717308896, 0, -714284896, 0, -687068896, 0, -683440096, 0, -656224096, 0, -652595296, 0, -625379296, 0, -622355296, 0, -595139296, 0, -591510496 } typeOffsets:intvector { -1820, 0, 0, 0, 0, 3600, 3600, 0 } typeMap:bin { "01020102010201020102010201020102010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" } } //Z#19 @@ -79,8 +79,8 @@ zoneinfo64:table(nofallback) { /* Africa/Djibouti */ :int { 48 } //Z#24 /* Africa/Douala */ :int { 36 } //Z#25 /* Africa/El_Aaiun */ :table { - trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590285600, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835229600, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080173600, 2107994400, 2111018400, 2138234400, 2141863200 } - transPost32:intvector { 0, -2125888096, 0, -2122864096, 0, -2095043296, 0, -2092019296, 0, -2064803296, 0, -2061174496, 0, -2033958496, 0, -2030934496, 0, -2003718496, 0, -2000089696, 0, -1972873696, 0, -1969849696, 0, -1942028896, 0, -1939004896, 0, -1911788896, 0, -1908160096, 0, -1880944096, 0, -1877920096, 0, -1850099296, 0, -1847075296, 0, -1819859296, 0, -1816230496, 0, -1789014496, 0, -1785990496, 0, -1758774496, 0, -1755145696, 0, -1727929696, 0, -1724905696, 0, -1697084896, 0, -1694060896, 0, -1666844896, 0, -1663216096, 0, -1636000096, 0, -1632976096, 0, -1605155296, 0, -1602131296, 0, -1574915296, 0, -1571286496, 0, -1544070496, 0, -1541046496, 0, -1513830496, 0, -1510201696, 0, -1482985696, 0, -1479961696, 0, -1452140896, 0, -1449116896, 0, -1421900896, 0, -1418272096, 0, -1391056096, 0, -1388032096, 0, -1360211296, 0, -1357187296, 0, -1329971296, 0, -1326947296, 0, -1299126496, 0, -1296102496, 0, -1268886496, 0, -1265257696, 0, -1238041696, 0, -1235017696, 0, -1207196896, 0, -1204172896, 0, -1176956896, 0, -1173328096, 0, -1146112096, 0, -1143088096, 0, -1115267296, 0, -1112243296, 0, -1085027296, 0, -1082003296, 0, -1054182496, 0, -1051158496, 0, -1023942496, 0, -1020313696, 0, -993097696, 0, -990073696, 0, -962252896, 0, -959228896, 0, -932012896, 0, -928384096, 0, -901168096, 0, -898144096, 0, -870323296, 0, -867299296, 0, -840083296, 0, -837059296, 0, -809238496, 0, -806214496, 0, -778998496, 0, -775369696, 0, -748153696, 0, -745129696, 0, -717308896, 0, -714284896, 0, -687068896, 0, -683440096, 0, -656224096, 0, -653200096, 0, -625379296, 0, -622355296, 0, -595139296, 0, -592115296 } + trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590890400, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682820000, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835834400, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927764000, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080778400, 2107994400, 2111018400, 2138234400, 2141863200 } + transPost32:intvector { 0, -2125888096, 0, -2122259296, 0, -2095043296, 0, -2092019296, 0, -2064803296, 0, -2061174496, 0, -2033958496, 0, -2030934496, 0, -2003718496, 0, -2000089696, 0, -1972873696, 0, -1969244896, 0, -1942028896, 0, -1939004896, 0, -1911788896, 0, -1908160096, 0, -1880944096, 0, -1877315296, 0, -1850099296, 0, -1847075296, 0, -1819859296, 0, -1816230496, 0, -1789014496, 0, -1785990496, 0, -1758774496, 0, -1755145696, 0, -1727929696, 0, -1724300896, 0, -1697084896, 0, -1694060896, 0, -1666844896, 0, -1663216096, 0, -1636000096, 0, -1632371296, 0, -1605155296, 0, -1602131296, 0, -1574915296, 0, -1571286496, 0, -1544070496, 0, -1541046496, 0, -1513830496, 0, -1510201696, 0, -1482985696, 0, -1479356896, 0, -1452140896, 0, -1449116896, 0, -1421900896, 0, -1418272096, 0, -1391056096, 0, -1387427296, 0, -1360211296, 0, -1357187296, 0, -1329971296, 0, -1326342496, 0, -1299126496, 0, -1296102496, 0, -1268886496, 0, -1265257696, 0, -1238041696, 0, -1234412896, 0, -1207196896, 0, -1204172896, 0, -1176956896, 0, -1173328096, 0, -1146112096, 0, -1142483296, 0, -1115267296, 0, -1112243296, 0, -1085027296, 0, -1081398496, 0, -1054182496, 0, -1051158496, 0, -1023942496, 0, -1020313696, 0, -993097696, 0, -989468896, 0, -962252896, 0, -959228896, 0, -932012896, 0, -928384096, 0, -901168096, 0, -897539296, 0, -870323296, 0, -867299296, 0, -840083296, 0, -836454496, 0, -809238496, 0, -806214496, 0, -778998496, 0, -775369696, 0, -748153696, 0, -744524896, 0, -717308896, 0, -714284896, 0, -687068896, 0, -683440096, 0, -656224096, 0, -652595296, 0, -625379296, 0, -622355296, 0, -595139296, 0, -591510496 } typeOffsets:intvector { -3168, 0, -3600, 0, 0, 0, 0, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203" } } //Z#26 @@ -123,7 +123,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -2109291020 } typeOffsets:intvector { 7820, 0, 7200, 0 } typeMap:bin { "01" } - links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 378 } + links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 379 } } //Z#43 /* Africa/Maseru */ :int { 30 } //Z#44 /* Africa/Mbabane */ :int { 30 } //Z#45 @@ -137,7 +137,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1309746436, -1262314800, -946780200, -315629100 } typeOffsets:intvector { 8836, 0, 9000, 0, 9900, 0, 10800, 0 } typeMap:bin { "03010203" } - links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 396, 515, 519, 524 } + links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 397, 516, 520, 525 } } //Z#48 /* Africa/Ndjamena */ :table { trans:intvector { -1830387612, 308703600, 321314400 } @@ -159,7 +159,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1577926364, -574902000, -568087200, -512175600, -504928800, -449888400, -441856800, -347158800, 378684000, 386463600, 402271200, 417999600, 433807200, 449622000, 465429600, 481590000, 496965600, 512953200, 528674400, 544230000, 560037600, 575852400, 591660000, 607388400, 623196000, 641775600, 844034400, 860108400, 875916000, 1352505600, 1364515200, 1382659200 } typeOffsets:intvector { 3164, 0, 3600, 0, 3600, 3600, 7200, 0 } typeMap:bin { "0102010201020103010201020102010201020102010201020103010203010203" } - links:intvector { 56, 532 } + links:intvector { 56, 533 } } //Z#56 /* Africa/Tunis */ :table { transPre32:intvector { -1, 1497764852 } @@ -181,7 +181,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -36000 } finalYear:int { 2008 } - links:intvector { 59, 80, 616 } + links:intvector { 59, 80, 617 } } //Z#59 /* America/Anchorage */ :table { transPre32:intvector { -1, 1069743569, -1, 2106016072 } @@ -191,10 +191,10 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - links:intvector { 4, 60, 615 } + links:intvector { 4, 60, 616 } } //Z#60 - /* America/Anguilla */ :int { 186 } //Z#61 - /* America/Antigua */ :int { 186 } //Z#62 + /* America/Anguilla */ :int { 187 } //Z#61 + /* America/Antigua */ :int { 187 } //Z#62 /* America/Araguaina */ :table { trans:intvector { -1767214032, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 813726000, 824004000, 844570800, 856058400, 876106800, 888717600, 908074800, 919562400, 938919600, 951616800, 970974000, 982461600, 1003028400, 1013911200, 1036292400, 1045360800, 1350788400, 1361066400 } typeOffsets:intvector { -11568, 0, -10800, 0, -10800, 3600 } @@ -219,7 +219,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1567453392, -1233432000, -1222981200, -1205956800, -1194037200, -1172865600, -1162501200, -1141329600, -1130965200, -1109793600, -1099429200, -1078257600, -1067806800, -1046635200, -1036270800, -1015099200, -1004734800, -983563200, -973198800, -952027200, -941576400, -931032000, -900882000, -890337600, -833749200, -827265600, -752274000, -733780800, -197326800, -190843200, -184194000, -164491200, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 596948400, 605066400, 624423600, 636516000, 656478000, 667965600, 687931200, 699415200, 719377200, 731469600, 938919600, 952052400, 1198983600, 1205632800, 1224385200, 1237082400 } typeOffsets:intvector { -15408, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020103040304030403040104030403020304030403" } - links:intvector { 67, 101, 197 } + links:intvector { 67, 101, 198 } } //Z#67 /* America/Argentina/Jujuy */ :table { transPre32:intvector { -1, 1922870968 } @@ -378,7 +378,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -12560, 0, -14400, 0, -10800, 0 } typeMap:bin { "0102" } } //Z#96 - /* America/Cayman */ :int { 181 } //Z#97 + /* America/Cayman */ :int { 182 } //Z#97 /* America/Chicago */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -1563724800, -1551632400, -1538928000, -1520182800, -1504454400, -1491757200, -1473004800, -1459702800, -1441555200, -1428253200, -1410105600, -1396803600, -1378656000, -1365354000, -1347206400, -1333904400, -1315152000, -1301850000, -1283702400, -1270400400, -1252252800, -1238950800, -1220803200, -1207501200, -1189353600, -1176051600, -1157299200, -1144602000, -1125849600, -1112547600, -1094400000, -1081098000, -1067788800, -1045414800, -1031500800, -1018198800, -1000051200, -986749200, -967996800, -955299600, -936547200, -923245200, -905097600, -891795600, -880214400, -765392400, -747244800, -733942800, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -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, 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 } @@ -387,7 +387,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 98, 381, 618 } + links:intvector { 98, 382, 619 } } //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 } @@ -428,12 +428,9 @@ zoneinfo64:table(nofallback) { } //Z#106 /* America/Dawson */ :table { transPre32:intvector { -1, 2105970356 } - trans:intvector { -1632056400, -1615125600, -1596978000, -1583164800, -880203600, -765381600, -147884400, -131554800, 120646800, 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 { -33460, 0, -32400, 0, -32400, 3600, -32400, 7200, -28800, 0, -28800, 3600 } - typeMap:bin { "010201020102010301040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504" } - finalRule { "Canada" } - finalRaw:int { -28800 } - finalYear:int { 2008 } + trans:intvector { -1632056400, -1615125600, -1596978000, -1583164800, -880203600, -765381600, -147884400, -131554800, 120646800, 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, 1205056800, 1225616400, 1236506400, 1257066000, 1268560800, 1289120400, 1300010400, 1320570000, 1331460000, 1352019600, 1362909600, 1383469200, 1394359200, 1414918800, 1425808800, 1446368400, 1457863200, 1478422800, 1489312800, 1509872400, 1520762400, 1541322000, 1552212000, 1572771600, 1583661600, 1604214000 } + typeOffsets:intvector { -33460, 0, -32400, 0, -32400, 3600, -32400, 7200, -28800, 0, -28800, 3600, -25200, 0 } + typeMap:bin { "0102010201020103010405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } } //Z#107 /* America/Dawson_Creek */ :table { transPre32:intvector { -1, 1581085752 } @@ -449,7 +446,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -25200 } finalYear:int { 2008 } - links:intvector { 109, 204, 544, 624 } + links:intvector { 109, 205, 545, 625 } } //Z#109 /* America/Detroit */ :table { trans:intvector { -2051202469, -1724083200, -880218000, -765396000, -684349200, -671047200, -80506740, -68666400, -52938000, -37216800, 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 } @@ -458,9 +455,9 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 110, 623 } + links:intvector { 110, 624 } } //Z#110 - /* America/Dominica */ :int { 186 } //Z#111 + /* America/Dominica */ :int { 187 } //Z#111 /* America/Edmonton */ :table { trans:intvector { -1998663968, -1632063600, -1615132800, -1600614000, -1596816000, -1567954800, -1551628800, -1536505200, -1523203200, -1504450800, -1491753600, -1473001200, -1459699200, -880210800, -765388800, -715791600, -702489600, 73472400, 89193600, 104922000, 120643200, 136371600, 152092800, 167821200, 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 { -27232, 0, -25200, 0, -25200, 3600 } @@ -468,7 +465,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -25200 } finalYear:int { 2008 } - links:intvector { 112, 388 } + links:intvector { 112, 389 } } //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, 1384056000 } @@ -480,7 +477,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -21408, 0, -21600, 0, -21600, 3600 } typeMap:bin { "0102010201" } } //Z#114 - /* America/Ensenada */ :int { 216 } //Z#115 + /* America/Ensenada */ :int { 217 } //Z#115 /* America/Fort_Nelson */ :table { transPre32:intvector { -1, 1581086343 } trans:intvector { -1632060000, -1615129200, -880207200, -765385200, -715788000, -702486000, -684338400, -671036400, -652888800, -639586800, -620834400, -608137200, -589384800, -576082800, -557935200, -544633200, -526485600, -513183600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, -273679200, -260982000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 136375200, 152096400, 167824800, 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, 1205056800, 1225616400, 1236506400, 1257066000, 1268560800, 1289120400, 1300010400, 1320570000, 1331460000, 1352019600, 1362909600, 1383469200, 1394359200, 1414918800, 1425808800 } @@ -501,14 +498,7 @@ zoneinfo64:table(nofallback) { finalRaw:int { -14400 } finalYear:int { 2008 } } //Z#119 - /* America/Godthab */ :table { - trans:intvector { -1686083584, 323845200, 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 { -12416, 0, -10800, 0, -10800, 3600 } - typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201" } - finalRule { "EU" } - finalRaw:int { -10800 } - finalYear:int { 1997 } - } //Z#120 + /* America/Godthab */ :int { 180 } //Z#120 /* America/Goose_Bay */ :table { transPre32:intvector { -1, 1581071396 } trans:intvector { -1632076148, -1615145348, -1096921748, -1061670600, -1048973400, -1030221000, -1017523800, -998771400, -986074200, -966717000, -954624600, -935267400, -922570200, -903817800, -891120600, -872368200, -765401400, -746044200, -733347000, -714594600, -701897400, -683145000, -670447800, -651695400, -638998200, -619641000, -606943800, -589401000, -576099000, -557951400, -544649400, -526501800, -513199800, -495052200, -481750200, -463602600, -450300600, -431548200, -418246200, -400098600, -386796600, -368649000, -355347000, -337199400, -323897400, -305749800, -289423800, -273695400, -257974200, -242245800, -226524600, -210796200, -195075000, -179346600, -163625400, -147897000, -131571000, -119903400, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 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, 544593660, 562129260, 576043260, 594180060, 607492860, 625633260, 638942460, 657082860, 670996860, 688532460, 702446460, 719982060, 733896060, 752036460, 765345660, 783486060, 796795260, 814935660, 828849660, 846385260, 860299260, 877834860, 891748860, 909284460, 923198460, 941338860, 954648060, 972788460, 986097660, 1004238060, 1018152060, 1035687660, 1049601660, 1067137260, 1081051260, 1099191660, 1112500860, 1130641260, 1143950460, 1162090860, 1173585660, 1194145260, 1205035260, 1225594860, 1236484860, 1257044460, 1268539260, 1289098860, 1299988860, 1320555600, 1331445600, 1352005200 } @@ -527,8 +517,8 @@ zoneinfo64:table(nofallback) { finalRaw:int { -18000 } finalYear:int { 2019 } } //Z#122 - /* America/Grenada */ :int { 186 } //Z#123 - /* America/Guadeloupe */ :int { 186 } //Z#124 + /* America/Grenada */ :int { 187 } //Z#123 + /* America/Guadeloupe */ :int { 187 } //Z#124 /* America/Guatemala */ :table { trans:intvector { -1617040676, 123055200, 130914000, 422344800, 433054800, 669708000, 684219600, 1146376800, 1159678800 } typeOffsets:intvector { -21724, 0, -21600, 0, -21600, 3600 } @@ -552,7 +542,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -14400 } finalYear:int { 2008 } - links:intvector { 128, 384 } + links:intvector { 128, 385 } } //Z#128 /* America/Havana */ :table { transPre32:intvector { -1, 1770465464 } @@ -562,7 +552,7 @@ zoneinfo64:table(nofallback) { finalRule { "Cuba" } finalRaw:int { -18000 } finalYear:int { 2014 } - links:intvector { 129, 395 } + links:intvector { 129, 396 } } //Z#129 /* America/Hermosillo */ :table { trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400 } @@ -577,7 +567,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 117, 131, 139, 512, 619 } + links:intvector { 117, 131, 139, 513, 620 } } //Z#131 /* America/Indiana/Knox */ :table { transPre32:intvector { -1, 1577320096 } @@ -587,7 +577,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 132, 147, 622 } + links:intvector { 132, 147, 623 } } //Z#132 /* America/Indiana/Marengo */ :table { transPre32:intvector { -1, 1577320096 } @@ -664,7 +654,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1827687170, 126687600, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 } typeOffsets:intvector { -18430, 0, -18000, 0, -18000, 3600 } typeMap:bin { "010201020102010201020102010201020102010201" } - links:intvector { 142, 529 } + links:intvector { 142, 530 } } //Z#142 /* America/Jujuy */ :int { 68 } //Z#143 /* America/Juneau */ :table { @@ -716,7 +706,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 151, 549, 625, 626 } + links:intvector { 151, 550, 626, 627 } } //Z#151 /* America/Louisville */ :int { 145 } //Z#152 /* America/Lower_Princes */ :int { 105 } //Z#153 @@ -735,9 +725,9 @@ zoneinfo64:table(nofallback) { 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 { 156, 377 } + links:intvector { 156, 378 } } //Z#156 - /* America/Marigot */ :int { 186 } //Z#157 + /* America/Marigot */ :int { 187 } //Z#157 /* America/Martinique */ :table { trans:intvector { -1851537340, 323841600, 338958000 } typeOffsets:intvector { -14660, 0, -14400, 0, -14400, 3600 } @@ -758,7 +748,7 @@ zoneinfo64:table(nofallback) { finalRule { "Mexico" } finalRaw:int { -25200 } finalYear:int { 2003 } - links:intvector { 160, 538 } + links:intvector { 160, 539 } } //Z#160 /* America/Mendoza */ :int { 70 } //Z#161 /* America/Menominee */ :table { @@ -794,7 +784,7 @@ zoneinfo64:table(nofallback) { finalRule { "Mexico" } finalRaw:int { -21600 } finalYear:int { 2003 } - links:intvector { 165, 539 } + links:intvector { 165, 540 } } //Z#165 /* 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 } @@ -826,8 +816,8 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -13491, 0, -14400, 0, -12600, 0, -12600, 1800, -10800, 0, -10800, 1800, -10800, 3600, -10800, 5400 } typeMap:bin { "01030203020302030203020302030203020302030203020305040504060406040504060406040705040604060406040604060406040604060406040604060406040604060406040604060406040604060406040604" } } //Z#169 - /* America/Montreal */ :int { 217 } //Z#170 - /* America/Montserrat */ :int { 186 } //Z#171 + /* America/Montreal */ :int { 218 } //Z#170 + /* America/Montserrat */ :int { 187 } //Z#171 /* America/Nassau */ :table { 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 } @@ -844,7 +834,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 173, 620 } + links:intvector { 173, 621 } } //Z#173 /* America/Nipigon */ :table { transPre32:intvector { -1, 1928233280 } @@ -868,7 +858,7 @@ zoneinfo64:table(nofallback) { 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 { 176, 375 } + links:intvector { 176, 376 } } //Z#176 /* America/North_Dakota/Beulah */ :table { transPre32:intvector { -1, 1577323696 } @@ -897,6 +887,15 @@ zoneinfo64:table(nofallback) { finalRaw:int { -21600 } finalYear:int { 2008 } } //Z#179 + /* America/Nuuk */ :table { + trans:intvector { -1686083584, 323845200, 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 { -12416, 0, -10800, 0, -10800, 3600 } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201" } + finalRule { "EU" } + finalRaw:int { -10800 } + finalYear:int { 1997 } + links:intvector { 120, 180 } + } //Z#180 /* America/Ojinaga */ :table { trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800 } typeOffsets:intvector { -25060, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } @@ -904,14 +903,14 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -25200 } finalYear:int { 2011 } - } //Z#180 + } //Z#181 /* America/Panama */ :table { transPre32:intvector { -1, 1770464784 } trans:intvector { -1946918424 } typeOffsets:intvector { -19088, 0, -19176, 0, -18000, 0 } typeMap:bin { "0102" } - links:intvector { 97, 181 } - } //Z#181 + links:intvector { 97, 182 } + } //Z#182 /* America/Pangnirtung */ :table { trans:intvector { -1546300800, -880221600, -765399600, -147902400, -131572800, 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, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954662400, 972802800, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } typeOffsets:intvector { 0, 0, -21600, 0, -21600, 3600, -18000, 0, -18000, 3600, -14400, 0, -14400, 3600, -14400, 7200 } @@ -919,19 +918,19 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -18000 } finalYear:int { 2008 } - } //Z#182 + } //Z#183 /* America/Paramaribo */ :table { trans:intvector { -1861906760, -1104524348, -765317964, 465449400 } typeOffsets:intvector { -13240, 0, -13252, 0, -13236, 0, -12600, 0, -10800, 0 } typeMap:bin { "01020304" } - } //Z#183 + } //Z#184 /* America/Phoenix */ :table { transPre32:intvector { -1, 1577323696 } 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 { 184, 546, 617 } - } //Z#184 + links:intvector { 185, 547, 618 } + } //Z#185 /* 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, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600, 1489302000, 1509861600 } @@ -940,32 +939,32 @@ zoneinfo64:table(nofallback) { finalRule { "Haiti" } finalRaw:int { -18000 } finalYear:int { 2018 } - } //Z#185 + } //Z#186 /* America/Port_of_Spain */ :table { trans:intvector { -1825098836 } typeOffsets:intvector { -14764, 0, -14400, 0 } typeMap:bin { "01" } - links:intvector { 61, 62, 111, 123, 124, 157, 171, 186, 206, 208, 209, 210, 211, 218, 220 } - } //Z#186 - /* America/Porto_Acre */ :int { 196 } //Z#187 + links:intvector { 61, 62, 111, 123, 124, 157, 171, 187, 207, 209, 210, 211, 212, 219, 221 } + } //Z#187 + /* America/Porto_Acre */ :int { 197 } //Z#188 /* America/Porto_Velho */ :table { trans:intvector { -1767210264, -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 } typeOffsets:intvector { -15336, 0, -14400, 0, -14400, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201" } - } //Z#188 + } //Z#189 /* America/Puerto_Rico */ :table { transPre32:intvector { -1, 2061931961 } trans:intvector { -873057600, -765399600 } typeOffsets:intvector { -15865, 0, -14400, 0, -14400, 3600 } typeMap:bin { "010201" } - links:intvector { 189, 548 } - } //Z#189 + links:intvector { 190, 549 } + } //Z#190 /* America/Punta_Arenas */ :table { transPre32:intvector { -1, 1770462716 } trans:intvector { -1892661434, -1688410800, -1619205434, -1593806400, -1335986234, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -718056000, -713649600, -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, 592372800, 605674800, 624427200, 637124400, 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, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1480820400 } typeOffsets:intvector { -17020, 0, -18000, 0, -18000, 3600, -16966, 0, -14400, 0, -14400, 3600, -10800, 0 } typeMap:bin { "0301030403020102010201020102010401040104050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } - } //Z#190 + } //Z#191 /* America/Rainy_River */ :table { transPre32:intvector { -1, 1928234792 } trans:intvector { -1632067200, -1615136400, -923248800, -765392400, 136368000, 152089200, 167817600, 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 } @@ -974,7 +973,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#191 + } //Z#192 /* America/Rankin_Inlet */ :table { trans:intvector { -410227200, -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 } typeOffsets:intvector { 0, 0, -21600, 0, -21600, 3600, -21600, 7200, -18000, 0 } @@ -982,18 +981,18 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#192 + } //Z#193 /* America/Recife */ :table { trans:intvector { -1767217224, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 938919600, 951616800, 970974000, 971575200, 1003028400, 1013911200 } typeOffsets:intvector { -8376, 0, -10800, 0, -10800, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201" } - } //Z#193 + } //Z#194 /* America/Regina */ :table { 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 { 194, 386, 391 } - } //Z#194 + links:intvector { 195, 387, 392 } + } //Z#195 /* 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 } typeOffsets:intvector { 0, 0, -21600, 0, -21600, 3600, -21600, 7200, -18000, 0 } @@ -1001,20 +1000,20 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#195 + } //Z#196 /* America/Rio_Branco */ :table { 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, 1384056000 } typeOffsets:intvector { -16272, 0, -18000, 0, -18000, 3600, -14400, 0 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010301" } - links:intvector { 187, 196, 374 } - } //Z#196 - /* America/Rosario */ :int { 67 } //Z#197 - /* America/Santa_Isabel */ :int { 216 } //Z#198 + links:intvector { 188, 197, 375 } + } //Z#197 + /* America/Rosario */ :int { 67 } //Z#198 + /* America/Santa_Isabel */ :int { 217 } //Z#199 /* America/Santarem */ :table { trans:intvector { -1767212472, -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, 1214280000 } typeOffsets:intvector { -13128, 0, -14400, 0, -14400, 3600, -10800, 0 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020103" } - } //Z#199 + } //Z#200 /* America/Santiago */ :table { trans:intvector { -1892661434, -1688410800, -1619205434, -1593806400, -1335986234, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -740520000, -736376400, -718056000, -713649600, -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, 592372800, 605674800, 624427200, 637124400, 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, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1494730800, 1502596800, 1526180400, 1534046400, 1554606000, 1567915200 } typeOffsets:intvector { -16966, 0, -18000, 0, -18000, 3600, -14400, 0, -14400, 3600 } @@ -1022,20 +1021,20 @@ zoneinfo64:table(nofallback) { finalRule { "Chile" } finalRaw:int { -14400 } finalYear:int { 2020 } - links:intvector { 200, 393 } - } //Z#200 + links:intvector { 201, 394 } + } //Z#201 /* America/Santo_Domingo */ :table { transPre32:intvector { -1, 1770462472 } trans:intvector { -1159773600, -100119600, -89668800, -5770800, 4422600, 25678800, 33193800, 57733200, 64816200, 89182800, 96438600, 120632400, 127974600, 152082000, 972799200, 975823200 } typeOffsets:intvector { -16776, 0, -18000, 0, -18000, 1800, -18000, 3600, -16800, 0, -14400, 0 } typeMap:bin { "0401030102010201020102010201050105" } - } //Z#201 + } //Z#202 /* America/Sao_Paulo */ :table { trans:intvector { -1767214412, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -195426000, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 656478000, 666756000, 687927600, 697600800, 719982000, 728445600, 750826800, 761709600, 782276400, 793159200, 813726000, 824004000, 844570800, 856058400, 876106800, 888717600, 908074800, 919562400, 938919600, 951616800, 970974000, 982461600, 1003028400, 1013911200, 1036292400, 1045360800, 1066532400, 1076810400, 1099364400, 1108864800, 1129431600, 1140314400, 1162695600, 1172368800, 1192330800, 1203213600, 1224385200, 1234663200, 1255834800, 1266717600, 1287284400, 1298167200, 1318734000, 1330221600, 1350788400, 1361066400, 1382238000, 1392516000, 1413687600, 1424570400, 1445137200, 1456020000, 1476586800, 1487469600, 1508036400, 1518919200, 1541300400, 1550368800 } typeOffsets:intvector { -11188, 0, -10800, 0, -10800, 3600 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 202, 372, 376 } - } //Z#202 + links:intvector { 203, 373, 377 } + } //Z#203 /* 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 } typeOffsets:intvector { -5272, 0, -7200, 0, -7200, 3600, -3600, 0, -3600, 3600 } @@ -1043,8 +1042,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { -3600 } finalYear:int { 1997 } - } //Z#203 - /* America/Shiprock */ :int { 109 } //Z#204 + } //Z#204 + /* America/Shiprock */ :int { 109 } //Z#205 /* America/Sitka */ :table { transPre32:intvector { -1, 1069743569, -1, 2106012569 } trans:intvector { -880207200, -765385200, -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, 452084400, 467805600, 483534000, 499255200, 514983600, 530704800, 544618800, 562154400, 576068400, 594208800, 607518000, 625658400, 638967600, 657108000, 671022000, 688557600, 702471600, 720007200, 733921200, 752061600, 765370800, 783511200, 796820400, 814960800, 828874800, 846410400, 860324400, 877860000, 891774000, 909309600, 923223600, 941364000, 954673200, 972813600, 986122800, 1004263200, 1018177200, 1035712800, 1049626800, 1067162400, 1081076400, 1099216800, 1112526000, 1130666400, 1143975600, 1162116000, 1173610800, 1194170400 } @@ -1053,8 +1052,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - } //Z#205 - /* America/St_Barthelemy */ :int { 186 } //Z#206 + } //Z#206 + /* America/St_Barthelemy */ :int { 187 } //Z#207 /* America/St_Johns */ :table { trans:intvector { -1664130548, -1650137348, -1632076148, -1615145348, -1598650148, -1590100148, -1567286948, -1551565748, -1535837348, -1520116148, -1503782948, -1488666548, -1472333348, -1457216948, -1440883748, -1425767348, -1409434148, -1394317748, -1377984548, -1362263348, -1346534948, -1330813748, -1314480548, -1299364148, -1283030948, -1267914548, -1251581348, -1236464948, -1220131748, -1205015348, -1188682148, -1172960948, -1156627748, -1141511348, -1125178148, -1110061748, -1096921748, -1093728600, -1078612200, -1061670600, -1048973400, -1030221000, -1017523800, -998771400, -986074200, -966717000, -954624600, -935267400, -922570200, -903817800, -891120600, -872368200, -765401400, -746044200, -733347000, -714594600, -701897400, -683145000, -670447800, -651695400, -638998200, -619641000, -606943800, -589401000, -576099000, -557951400, -544649400, -526501800, -513199800, -495052200, -481750200, -463602600, -450300600, -431548200, -418246200, -400098600, -386796600, -368649000, -355347000, -337199400, -323897400, -305749800, -289423800, -273695400, -257974200, -242245800, -226524600, -210796200, -195075000, -179346600, -163625400, -147897000, -131571000, -116447400, -100121400, -84393000, -68671800, -52943400, -37222200, -21493800, -5772600, 9955800, 25677000, 41405400, 57731400, 73459800, 89181000, 104909400, 120630600, 136359000, 152080200, 167808600, 183529800, 199258200, 215584200, 230707800, 247033800, 262762200, 278483400, 294211800, 309933000, 325661400, 341382600, 357111000, 372832200, 388560600, 404886600, 420010200, 436336200, 452064600, 467785800, 483514200, 499235400, 514963800, 530685000, 544591860, 562127460, 576041460, 594178260, 607491060, 625631460, 638940660, 657081060, 670995060, 688530660, 702444660, 719980260, 733894260, 752034660, 765343860, 783484260, 796793460, 814933860, 828847860, 846383460, 860297460, 877833060, 891747060, 909282660, 923196660, 941337060, 954646260, 972786660, 986095860, 1004236260, 1018150260, 1035685860, 1049599860, 1067135460, 1081049460, 1099189860, 1112499060, 1130639460, 1143948660, 1162089060, 1173583860, 1194143460, 1205033460, 1225593060, 1236483060, 1257042660, 1268537460, 1289097060, 1299987060, 1320553800, 1331443800, 1352003400 } typeOffsets:intvector { -12652, 0, -12652, 3600, -12600, 0, -12600, 3600, -12600, 7200 } @@ -1062,22 +1061,22 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -12600 } finalYear:int { 2013 } - links:intvector { 207, 380, 389 } - } //Z#207 - /* America/St_Kitts */ :int { 186 } //Z#208 - /* America/St_Lucia */ :int { 186 } //Z#209 - /* America/St_Thomas */ :int { 186 } //Z#210 - /* America/St_Vincent */ :int { 186 } //Z#211 + links:intvector { 208, 381, 390 } + } //Z#208 + /* America/St_Kitts */ :int { 187 } //Z#209 + /* America/St_Lucia */ :int { 187 } //Z#210 + /* America/St_Thomas */ :int { 187 } //Z#211 + /* America/St_Vincent */ :int { 187 } //Z#212 /* America/Swift_Current */ :table { trans:intvector { -2030201320, -1632063600, -1615132800, -880210800, -765388800, -747241200, -732729600, -715791600, -702489600, -684342000, -671040000, -652892400, -639590400, -400086000, -384364800, -337186800, -321465600, -305737200, -292435200, -273682800, -260985600, 73472400 } typeOffsets:intvector { -25880, 0, -25200, 0, -25200, 3600, -21600, 0 } typeMap:bin { "01020102010201020102010201020102010201020103" } - } //Z#212 + } //Z#213 /* America/Tegucigalpa */ :table { trans:intvector { -1538503868, 547020000, 559717200, 578469600, 591166800, 1146981600, 1154926800 } typeOffsets:intvector { -20932, 0, -21600, 0, -21600, 3600 } typeMap:bin { "01020102010201" } - } //Z#213 + } //Z#214 /* America/Thule */ :table { trans:intvector { -1686079492, 670399200, 686120400, 701848800, 717570000, 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 { -16508, 0, -14400, 0, -14400, 3600 } @@ -1085,7 +1084,7 @@ zoneinfo64:table(nofallback) { finalRule { "Thule" } finalRaw:int { -14400 } finalYear:int { 2008 } - } //Z#214 + } //Z#215 /* America/Thunder_Bay */ :table { transPre32:intvector { -1, 1928233516 } trans:intvector { -1893434400, -880218000, -765396000, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 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 } @@ -1094,7 +1093,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -18000 } finalYear:int { 2008 } - } //Z#215 + } //Z#216 /* America/Tijuana */ :table { trans:intvector { -1514736000, -1451667600, -1343062800, -1234803600, -1222963200, -1207242000, -873820800, -761677200, -686073600, -661539600, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 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, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 } typeOffsets:intvector { -28084, 0, -28800, 0, -28800, 3600, -25200, 0 } @@ -1102,8 +1101,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2011 } - links:intvector { 115, 198, 216, 537 } - } //Z#216 + links:intvector { 115, 199, 217, 538 } + } //Z#217 /* America/Toronto */ :table { transPre32:intvector { -1, 1928231148 } trans:intvector { -1632070800, -1615140000, -1601753400, -1583697600, -1567357200, -1554667200, -1534698000, -1524074400, -1503248400, -1492365600, -1471798800, -1460916000, -1440954000, -1428861600, -1409504400, -1397412000, -1378054800, -1365962400, -1346605200, -1333908000, -1315155600, -1301853600, -1283706000, -1270404000, -1252256400, -1238954400, -1220806800, -1207504800, -1188752400, -1176055200, -1157302800, -1144000800, -1125853200, -1112551200, -1094403600, -1081101600, -1062954000, -1049652000, -1031504400, -1018202400, -1000054800, -986752800, -968000400, -955303200, -936550800, -765396000, -747248400, -733946400, -715806000, -702504000, -684356400, -671054400, -652906800, -634161600, -620845200, -602704800, -589395600, -576093600, -557946000, -544644000, -526496400, -513194400, -495046800, -481744800, -463597200, -450295200, -431542800, -418240800, -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, 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 } @@ -1112,9 +1111,9 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 170, 217, 387 } - } //Z#217 - /* America/Tortola */ :int { 186 } //Z#218 + links:intvector { 170, 218, 388 } + } //Z#218 + /* America/Tortola */ :int { 187 } //Z#219 /* America/Vancouver */ :table { transPre32:intvector { -1, 1581086444 } trans:intvector { -1632060000, -1615129200, -880207200, -765385200, -747237600, -733935600, -715788000, -702486000, -684338400, -671036400, -652888800, -639586800, -620834400, -608137200, -589384800, -576082800, -557935200, -544633200, -526485600, -513183600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, -273679200, -260982000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 136375200, 152096400, 167824800, 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 } @@ -1123,19 +1122,16 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 219, 390 } - } //Z#219 - /* America/Virgin */ :int { 186 } //Z#220 + links:intvector { 220, 391 } + } //Z#220 + /* America/Virgin */ :int { 187 } //Z#221 /* America/Whitehorse */ :table { transPre32:intvector { -1, 2105969308 } - trans:intvector { -1632056400, -1615125600, -1596978000, -1583164800, -880203600, -765381600, -147884400, -131554800, -81961200, 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 { -32412, 0, -32400, 0, -32400, 3600, -32400, 7200, -28800, 0, -28800, 3600 } - typeMap:bin { "010201020102010301040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504" } - finalRule { "Canada" } - finalRaw:int { -28800 } - finalYear:int { 2008 } - links:intvector { 221, 392 } - } //Z#221 + trans:intvector { -1632056400, -1615125600, -1596978000, -1583164800, -880203600, -765381600, -147884400, -131554800, -81961200, 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, 1205056800, 1225616400, 1236506400, 1257066000, 1268560800, 1289120400, 1300010400, 1320570000, 1331460000, 1352019600, 1362909600, 1383469200, 1394359200, 1414918800, 1425808800, 1446368400, 1457863200, 1478422800, 1489312800, 1509872400, 1520762400, 1541322000, 1552212000, 1572771600, 1583661600, 1604214000 } + typeOffsets:intvector { -32412, 0, -32400, 0, -32400, 3600, -32400, 7200, -28800, 0, -28800, 3600, -25200, 0 } + typeMap:bin { "0102010201020103010405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } + links:intvector { 222, 393 } + } //Z#222 /* America/Winnipeg */ :table { transPre32:intvector { -1, 1692709012 } trans:intvector { -1694368800, -1681671600, -1632067200, -1615136400, -1029686400, -1018198800, -880214400, -765392400, -746035200, -732733200, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620755200, -607626000, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -450291600, -431539200, -418237200, -400089600, -386787600, -368640000, -355338000, -337190400, -321469200, -305740800, -292438800, -210787200, -198090000, -116438400, -100108800, -84384000, -68659200, -52934400, -37209600, -21484800, -5760000, 9964800, 25689600, 41414400, 57744000, 73468800, 89193600, 104918400, 120643200, 136368000, 152092800, 167817600, 183542400, 199267200, 215596800, 230716800, 247046400, 262771200, 278496000, 294220800, 309945600, 325670400, 341395200, 357120000, 372844800, 388569600, 404899200, 420019200, 436348800, 452073600, 467798400, 483523200, 499248000, 514972800, 530697600, 544608000, 562147200, 576057600, 594201600, 607507200, 625651200, 638956800, 657100800, 671011200, 688550400, 702460800, 720000000, 733910400, 752054400, 765360000, 783504000, 796809600, 814953600, 828864000, 846403200, 860313600, 877852800, 891763200, 909302400, 923212800, 941356800, 954662400, 972806400, 986112000, 1004256000, 1018166400, 1035705600, 1049616000, 1067155200, 1081065600, 1099209600, 1112515200, 1130659200, 1143964800, 1162105200, 1173600000, 1194159600 } @@ -1144,8 +1140,8 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 222, 385 } - } //Z#222 + links:intvector { 223, 386 } + } //Z#223 /* America/Yakutat */ :table { transPre32:intvector { -1, 1069743569, -1, 2106013631 } trans:intvector { -880203600, -765381600, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 152100000, 162385200, 183549600, 199278000, 215604000, 230727600, 247053600, 262782000, 278503200, 294231600, 309952800, 325681200, 341402400, 357130800, 372852000, 388580400, 404906400, 420030000, 436356000, 452084400, 467805600, 483534000, 499255200, 514983600, 530704800, 544618800, 562154400, 576068400, 594208800, 607518000, 625658400, 638967600, 657108000, 671022000, 688557600, 702471600, 720007200, 733921200, 752061600, 765370800, 783511200, 796820400, 814960800, 828874800, 846410400, 860324400, 877860000, 891774000, 909309600, 923223600, 941364000, 954673200, 972813600, 986122800, 1004263200, 1018177200, 1035712800, 1049626800, 1067162400, 1081076400, 1099216800, 1112526000, 1130666400, 1143975600, 1162116000, 1173610800, 1194170400 } @@ -1154,7 +1150,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - } //Z#223 + } //Z#224 /* America/Yellowknife */ :table { trans:intvector { -1104537600, -880210800, -765388800, -147891600, -131562000, 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 { 0, 0, -25200, 0, -25200, 3600, -25200, 7200 } @@ -1162,50 +1158,53 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -25200 } finalYear:int { 2008 } - } //Z#224 - /* Antarctica/Casey */ :table { - trans:intvector { -31536000, 1255802400, 1267714800, 1319738400, 1329843600, 1477065600, 1520701200 } - typeOffsets:intvector { 0, 0, 28800, 0, 39600, 0 } - typeMap:bin { "01020102010201" } } //Z#225 + /* Antarctica/Casey */ :table { + trans:intvector { -31536000, 1255802400, 1267714800, 1319738400, 1329843600, 1477065600, 1520701200, 1538856000, 1552752000, 1570129200, 1583596800, 1601740860 } + typeOffsets:intvector { 0, 0, 28800, 0, 39600, 0 } + typeMap:bin { "010201020102010201020102" } + } //Z#226 /* Antarctica/Davis */ :table { trans:intvector { -409190400, -163062000, -28857600, 1255806000, 1268251200, 1319742000, 1329854400 } typeOffsets:intvector { 0, 0, 18000, 0, 25200, 0 } typeMap:bin { "02000201020102" } - } //Z#226 + } //Z#227 /* Antarctica/DumontDUrville */ :table { trans:intvector { -725846400, -566992800, -415497600 } typeOffsets:intvector { 0, 0, 36000, 0 } typeMap:bin { "010001" } - } //Z#227 + } //Z#228 /* Antarctica/Macquarie */ :table { 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 { "01020100010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } - } //Z#228 + 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, 1301760000, 1317484800 } + typeOffsets:intvector { 0, 0, 36000, 0, 36000, 3600 } + typeMap:bin { "0102010001020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" } + finalRule { "AT" } + finalRaw:int { 36000 } + finalYear:int { 2012 } + } //Z#229 /* Antarctica/Mawson */ :table { trans:intvector { -501206400, 1255809600 } typeOffsets:intvector { 0, 0, 18000, 0, 21600, 0 } typeMap:bin { "0201" } - } //Z#229 - /* Antarctica/McMurdo */ :int { 552 } //Z#230 + } //Z#230 + /* Antarctica/McMurdo */ :int { 553 } //Z#231 /* 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, 592372800, 605674800, 624427200, 637124400, 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, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1480820400 } typeOffsets:intvector { 0, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "02010201020102010201030403010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } - } //Z#231 + } //Z#232 /* Antarctica/Rothera */ :table { trans:intvector { 218246400 } typeOffsets:intvector { 0, 0, -10800, 0 } typeMap:bin { "01" } - } //Z#232 - /* Antarctica/South_Pole */ :int { 552 } //Z#233 + } //Z#233 + /* Antarctica/South_Pole */ :int { 553 } //Z#234 /* Antarctica/Syowa */ :table { trans:intvector { -407808000 } typeOffsets:intvector { 0, 0, 10800, 0 } typeMap:bin { "01" } - } //Z#234 + } //Z#235 /* Antarctica/Troll */ :table { trans:intvector { 1111885200, 1130634000 } typeOffsets:intvector { 0, 0, 0, 7200 } @@ -1213,19 +1212,19 @@ zoneinfo64:table(nofallback) { finalRule { "Troll" } finalRaw:int { 0 } finalYear:int { 2006 } - } //Z#235 + } //Z#236 /* Antarctica/Vostok */ :table { trans:intvector { -380073600 } typeOffsets:intvector { 0, 0, 21600, 0 } typeMap:bin { "01" } - } //Z#236 - /* Arctic/Longyearbyen */ :int { 474 } //Z#237 - /* Asia/Aden */ :int { 309 } //Z#238 + } //Z#237 + /* Arctic/Longyearbyen */ :int { 475 } //Z#238 + /* Asia/Aden */ :int { 310 } //Z#239 /* Asia/Almaty */ :table { trans:intvector { -1441170468, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600, 695768400, 701812800, 717537600, 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 { 18468, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403" } - } //Z#239 + } //Z#240 /* Asia/Amman */ :table { trans:intvector { -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1112306400, 1128031200, 1143756000, 1161900000, 1175205600, 1193349600, 1206655200, 1225404000, 1238104800, 1256853600, 1269554400, 1288303200, 1301608800, 1319752800, 1333058400, 1387486800, 1395957600, 1414706400 } typeOffsets:intvector { 8624, 0, 7200, 0, 7200, 3600 } @@ -1233,57 +1232,57 @@ zoneinfo64:table(nofallback) { finalRule { "Jordan" } finalRaw:int { 7200 } finalYear:int { 2015 } - } //Z#240 + } //Z#241 /* Asia/Anadyr */ :table { trans:intvector { -1441194596, -1247572800, 354884400, 370692000, 386420400, 402231600, 417960000, 433767600, 449582400, 465314400, 481039200, 496764000, 512488800, 528213600, 543938400, 559663200, 575388000, 591112800, 606837600, 622562400, 638287200, 654616800, 670341600, 686070000, 695746800, 701791200, 717516000, 733240800, 748965600, 764690400, 780415200, 796140000, 811864800, 828194400, 846338400, 859644000, 877788000, 891093600, 909237600, 922543200, 941292000, 953992800, 972741600, 985442400, 1004191200, 1017496800, 1035640800, 1048946400, 1067090400, 1080396000, 1099144800, 1111845600, 1130594400, 1143295200, 1162044000, 1174744800, 1193493600, 1206799200, 1224943200, 1238248800, 1256392800, 1269698400, 1288450800, 1301151600 } typeOffsets:intvector { 42596, 0, 39600, 0, 39600, 3600, 43200, 0, 43200, 3600, 46800, 0, 46800, 3600 } typeMap:bin { "03050605040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" } - } //Z#241 + } //Z#242 /* Asia/Aqtau */ :table { trans:intvector { -1441164064, -1247544000, 370724400, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600 } typeOffsets:intvector { 12064, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "0103050403040304030403040304030403040304030201030403040304010201020102010201020102010201020102010203" } - } //Z#242 + } //Z#243 /* Asia/Aqtobe */ :table { trans:intvector { -1441165720, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000 } typeOffsets:intvector { 13720, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010304050403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403" } - } //Z#243 + } //Z#244 /* Asia/Ashgabat */ :table { trans:intvector { -1441166012, -1247544000, 354913200, 370720800, 386449200, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000 } typeOffsets:intvector { 14012, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103" } - links:intvector { 244, 245 } - } //Z#244 - /* Asia/Ashkhabad */ :int { 244 } //Z#245 + links:intvector { 245, 246 } + } //Z#245 + /* Asia/Ashkhabad */ :int { 245 } //Z#246 /* Asia/Atyrau */ :table { trans:intvector { -1441164464, -1247540400, 370724400, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600 } typeOffsets:intvector { 12464, 0, 10800, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "0104060504050405040504050405040504050405040302040504050405040504050405040504030203020302030203020304" } - } //Z#246 + } //Z#247 /* Asia/Baghdad */ :table { transPre32:intvector { -1, 1770435036 } trans:intvector { -1641005856, 389048400, 402264000, 417906000, 433800000, 449614800, 465422400, 481150800, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670464000, 686275200, 702086400, 717897600, 733622400, 749433600, 765158400, 780969600, 796694400, 812505600, 828316800, 844128000, 859852800, 875664000, 891388800, 907200000, 922924800, 938736000, 954547200, 970358400, 986083200, 1001894400, 1017619200, 1033430400, 1049155200, 1064966400, 1080777600, 1096588800, 1112313600, 1128124800, 1143849600, 1159660800, 1175385600, 1191196800 } typeOffsets:intvector { 10660, 0, 10656, 0, 10800, 0, 10800, 3600 } typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - } //Z#247 - /* Asia/Bahrain */ :int { 305 } //Z#248 + } //Z#248 + /* Asia/Bahrain */ :int { 306 } //Z#249 /* Asia/Baku */ :table { trans:intvector { -1441163964, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701823600, 717548400, 828234000, 846378000, 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, 1319932800, 1332633600, 1351382400, 1364688000, 1382832000, 1396137600, 1414281600, 1427587200, 1445731200 } typeOffsets:intvector { 11964, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201020304030403040304030403040304030403040304030403040304030403040304030403040304030403" } - } //Z#249 + } //Z#250 /* Asia/Bangkok */ :table { trans:intvector { -1570084924 } typeOffsets:intvector { 24124, 0, 25200, 0 } typeMap:bin { "01" } - links:intvector { 250, 302, 331 } - } //Z#250 + links:intvector { 251, 303, 332 } + } //Z#251 /* Asia/Barnaul */ :table { trans:intvector { -1579844100, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 748983600, 764708400, 780433200, 796158000, 801590400, 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, 1414263600, 1459022400 } typeOffsets:intvector { 20100, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#251 + } //Z#252 /* Asia/Beirut */ :table { transPre32:intvector { -1, 1454817976 } trans:intvector { -1570413600, -1552186800, -1538359200, -1522551600, -1507514400, -1490583600, -1473645600, -1460948400, -399866400, -386650800, -368330400, -355114800, -336794400, -323578800, -305172000, -291956400, -273636000, -260420400, 78012000, 86734800, 105055200, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 212965200, 231285600, 244501200, 262735200, 275950800, 452210400, 466722000, 483746400, 498258000, 515282400, 529794000, 546818400, 561330000, 581119200, 592952400, 610754400, 624488400, 641512800, 656024400, 673048800, 687560400, 704671200, 718146000, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 843944400, 859672800, 875394000, 891122400, 906843600, 922572000, 941317200 } @@ -1292,37 +1291,37 @@ zoneinfo64:table(nofallback) { finalRule { "Lebanon" } finalRaw:int { 7200 } finalYear:int { 2000 } - } //Z#252 + } //Z#253 /* Asia/Bishkek */ :table { trans:intvector { -1441169904, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 683582400, 703018800, 717530400, 734468400, 748980000, 765918000, 780429600, 797367600, 811879200, 828817200, 843933600, 859671000, 877811400, 891120600, 909261000, 922570200, 941315400, 954019800, 972765000, 985469400, 1004214600, 1017523800, 1035664200, 1048973400, 1067113800, 1080423000, 1099168200, 1111872600, 1123783200 } typeOffsets:intvector { 17904, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020102010201020102010201020102010201020102010201020102010203" } - } //Z#253 + } //Z#254 /* Asia/Brunei */ :table { trans:intvector { -1383464380, -1167636600 } typeOffsets:intvector { 27580, 0, 27000, 0, 28800, 0 } typeMap:bin { "0102" } - } //Z#254 - /* Asia/Calcutta */ :int { 286 } //Z#255 + } //Z#255 + /* Asia/Calcutta */ :int { 287 } //Z#256 /* Asia/Chita */ :table { trans:intvector { -1579419232, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701802000, 717526800, 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, 1414252800, 1459015200 } typeOffsets:intvector { 27232, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 } typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" } - } //Z#256 + } //Z#257 /* 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, 1427479200, 1443193200, 1458928800, 1474642800 } typeOffsets:intvector { 27480, 0, 25200, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600 } typeMap:bin { "010205040504050405040504050405040504050405040504050405040504050405040504050405040504050405040203020302" } - } //Z#257 - /* Asia/Chongqing */ :int { 314 } //Z#258 - /* Asia/Chungking */ :int { 314 } //Z#259 + } //Z#258 + /* Asia/Chongqing */ :int { 315 } //Z#259 + /* Asia/Chungking */ :int { 315 } //Z#260 /* Asia/Colombo */ :table { transPre32:intvector { -1, 1454807332 } trans:intvector { -2019705572, -883287000, -862639200, -764051400, 832962600, 846266400, 1145039400 } typeOffsets:intvector { 19164, 0, 19172, 0, 19800, 0, 19800, 1800, 19800, 3600, 21600, 0, 23400, 0 } typeMap:bin { "0102030402060502" } - } //Z#260 - /* Asia/Dacca */ :int { 263 } //Z#261 + } //Z#261 + /* Asia/Dacca */ :int { 264 } //Z#262 /* Asia/Damascus */ :table { trans:intvector { -1577931912, -1568592000, -1554080400, -1537142400, -1522630800, -1505692800, -1491181200, -1474243200, -1459126800, -242265600, -228877200, -210556800, -197427600, -178934400, -165718800, -147398400, -134269200, -116467200, -102646800, -84326400, -71110800, -52704000, -39488400, -21168000, -7952400, 10368000, 23583600, 41904000, 55119600, 73526400, 86742000, 105062400, 118278000, 136598400, 149814000, 168134400, 181350000, 199756800, 212972400, 231292800, 241916400, 262828800, 273452400, 418694400, 433810800, 450316800, 465433200, 508896000, 529196400, 541555200, 562633200, 574387200, 594255600, 607305600, 623199600, 638928000, 654649200, 670456800, 686264400, 702684000, 717886800, 733096800, 748904400, 765151200, 780958800, 796687200, 812494800, 828309600, 844117200, 859759200, 875653200, 891208800, 907189200, 922917600, 938725200, 954540000, 970347600, 986076000, 1001883600, 1017612000, 1033419600, 1049148000, 1064955600, 1080770400, 1096578000, 1112306400, 1128114000, 1143842400, 1158872400, 1175205600, 1193950800, 1207260000, 1225486800, 1238104800, 1256850000, 1270159200, 1288299600, 1301608800, 1319749200, 1333058400, 1351198800 } typeOffsets:intvector { 8712, 0, 7200, 0, 7200, 3600 } @@ -1330,30 +1329,30 @@ zoneinfo64:table(nofallback) { finalRule { "Syria" } finalRaw:int { 7200 } finalYear:int { 2013 } - } //Z#262 + } //Z#263 /* Asia/Dhaka */ :table { transPre32:intvector { -1, 1770423996 } trans:intvector { -891582800, -872058600, -862637400, -576138600, 1245430800, 1262278800 } typeOffsets:intvector { 21700, 0, 19800, 0, 21200, 0, 21600, 0, 21600, 3600, 23400, 0 } typeMap:bin { "02050105030403" } - links:intvector { 261, 263, 373 } - } //Z#263 + links:intvector { 262, 264, 374 } + } //Z#264 /* Asia/Dili */ :table { trans:intvector { -1830414140, -879152400, 199897200, 969120000 } typeOffsets:intvector { 30140, 0, 28800, 0, 32400, 0 } typeMap:bin { "01020102" } - } //Z#264 + } //Z#265 /* Asia/Dubai */ :table { trans:intvector { -1577936472 } typeOffsets:intvector { 13272, 0, 14400, 0 } typeMap:bin { "01" } - links:intvector { 265, 296 } - } //Z#265 + links:intvector { 266, 297 } + } //Z#266 /* Asia/Dushanbe */ :table { trans:intvector { -1441168512, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 684363600 } typeOffsets:intvector { 16512, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201" } - } //Z#266 + } //Z#267 /* Asia/Famagusta */ :table { trans:intvector { -1518920148, 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, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1473282000, 1509238800, 1521939600, 1540688400 } typeOffsets:intvector { 8148, 0, 7200, 0, 7200, 3600, 10800, 0 } @@ -1361,59 +1360,59 @@ zoneinfo64:table(nofallback) { finalRule { "EUAsia" } finalRaw:int { 7200 } finalYear:int { 2019 } - } //Z#267 + } //Z#268 /* 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, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 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, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445547600, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572040800 } + 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, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 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, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400 } typeOffsets:intvector { 8272, 0, 7200, 0, 7200, 3600 } - typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - finalRule { "Palestine" } - finalRaw:int { 7200 } - finalYear:int { 2020 } - } //Z#268 - /* Asia/Harbin */ :int { 314 } //Z#269 - /* 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, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 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, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445547600, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572040800 } - typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } finalRule { "Palestine" } finalRaw:int { 7200 } - finalYear:int { 2020 } - } //Z#270 + finalYear:int { 2021 } + } //Z#269 + /* Asia/Harbin */ :int { 315 } //Z#270 + /* 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, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 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, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400 } + typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 } + typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + finalRule { "Palestine" } + finalRaw:int { 7200 } + finalYear:int { 2021 } + } //Z#271 /* Asia/Ho_Chi_Minh */ :table { trans:intvector { -2004073600, -1851577590, -852105600, -782643600, -767869200, -718095600, -457776000, -315648000, 171820800 } typeOffsets:intvector { 25600, 0, 25200, 0, 25590, 0, 28800, 0, 32400, 0 } typeMap:bin { "020103040103010301" } - links:intvector { 271, 310, 630 } - } //Z#271 + links:intvector { 272, 311, 631 } + } //Z#272 /* Asia/Hong_Kong */ :table { trans:intvector { -2056690800, -900910800, -891579600, -884248200, -761209200, -747907200, -728541000, -717049800, -697091400, -683785800, -668061000, -654755400, -636611400, -623305800, -605161800, -591856200, -573712200, -559801800, -541657800, -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, 1800, 28800, 3600, 32400, 0 } typeMap:bin { "010302040103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301" } - links:intvector { 272, 511 } - } //Z#272 + links:intvector { 273, 512 } + } //Z#273 /* 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, 1427482800, 1443196800, 1458932400, 1474646400 } typeOffsets:intvector { 21996, 0, 21600, 0, 25200, 0, 25200, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - } //Z#273 + } //Z#274 /* Asia/Irkutsk */ :table { trans:intvector { -1575874625, -1247554800, 354902400, 370710000, 386438400, 402246000, 417974400, 433782000, 449596800, 465328800, 481053600, 496778400, 512503200, 528228000, 543952800, 559677600, 575402400, 591127200, 606852000, 622576800, 638301600, 654631200, 670356000, 686084400, 695761200, 701805600, 717530400, 733255200, 748980000, 764704800, 780429600, 796154400, 811879200, 828208800, 846352800, 859658400, 877802400, 891108000, 909252000, 922557600, 941306400, 954007200, 972756000, 985456800, 1004205600, 1017511200, 1035655200, 1048960800, 1067104800, 1080410400, 1099159200, 1111860000, 1130608800, 1143309600, 1162058400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200, 1256407200, 1269712800, 1288461600, 1301162400, 1414256400 } typeOffsets:intvector { 25025, 0, 25200, 0, 25200, 3600, 28800, 0, 28800, 3600, 32400, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#274 - /* Asia/Istanbul */ :int { 458 } //Z#275 + } //Z#275 + /* Asia/Istanbul */ :int { 459 } //Z#276 /* 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 } typeMap:bin { "02030503040301" } - } //Z#276 + } //Z#277 /* Asia/Jayapura */ :table { trans:intvector { -1172913768, -799491600, -189423000 } typeOffsets:intvector { 33768, 0, 32400, 0, 34200, 0 } typeMap:bin { "010201" } - } //Z#277 + } //Z#278 /* Asia/Jerusalem */ :table { transPre32:intvector { -1, 1454818042 } trans:intvector { -1641003640, -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -681962400, -673243200, -667962000, -652327200, -636426000, -622087200, -608947200, -591847200, -572486400, -558576000, -542851200, -527731200, -514425600, -490845600, -482986800, -459475200, -451537200, -428551200, -418262400, -400032000, -387428400, 142380000, 150843600, 167176800, 178664400, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 826840800, 842821200, 858895200, 874184400, 890344800, 905029200, 923011200, 936313200, 955670400, 970783200, 986770800, 1001282400, 1017356400, 1033941600, 1048806000, 1065132000, 1081292400, 1095804000, 1112313600, 1128812400, 1143763200, 1159657200, 1175212800, 1189897200, 1206662400, 1223161200, 1238112000, 1254006000, 1269561600, 1284246000, 1301616000, 1317510000, 1333065600, 1348354800, 1364515200, 1382828400 } @@ -1422,87 +1421,87 @@ zoneinfo64:table(nofallback) { finalRule { "Zion" } finalRaw:int { 7200 } finalYear:int { 2014 } - links:intvector { 278, 321, 527 } - } //Z#278 + links:intvector { 279, 322, 528 } + } //Z#279 /* Asia/Kabul */ :table { transPre32:intvector { -1, 1770429088 } trans:intvector { -788932800 } typeOffsets:intvector { 16608, 0, 14400, 0, 16200, 0 } typeMap:bin { "0102" } - } //Z#279 + } //Z#280 /* Asia/Kamchatka */ :table { trans:intvector { -1487759676, -1247569200, 354888000, 370695600, 386424000, 402231600, 417960000, 433767600, 449582400, 465314400, 481039200, 496764000, 512488800, 528213600, 543938400, 559663200, 575388000, 591112800, 606837600, 622562400, 638287200, 654616800, 670341600, 686070000, 695746800, 701791200, 717516000, 733240800, 748965600, 764690400, 780415200, 796140000, 811864800, 828194400, 846338400, 859644000, 877788000, 891093600, 909237600, 922543200, 941292000, 953992800, 972741600, 985442400, 1004191200, 1017496800, 1035640800, 1048946400, 1067090400, 1080396000, 1099144800, 1111845600, 1130594400, 1143295200, 1162044000, 1174744800, 1193493600, 1206799200, 1224943200, 1238248800, 1256392800, 1269698400, 1288450800, 1301151600 } typeOffsets:intvector { 38076, 0, 39600, 0, 39600, 3600, 43200, 0, 43200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" } - } //Z#280 + } //Z#281 /* Asia/Karachi */ :table { trans:intvector { -1988166492, -862637400, -764145000, -576135000, 1018119600, 1033840800, 1212260400, 1225476000, 1239735600, 1257012000 } typeOffsets:intvector { 16092, 0, 18000, 0, 18000, 3600, 19800, 0, 19800, 3600 } typeMap:bin { "03040301020102010201" } - links:intvector { 281, 545 } - } //Z#281 - /* Asia/Kashgar */ :int { 329 } //Z#282 + links:intvector { 282, 546 } + } //Z#282 + /* Asia/Kashgar */ :int { 330 } //Z#283 /* Asia/Kathmandu */ :table { trans:intvector { -1577943676, 504901800 } typeOffsets:intvector { 20476, 0, 19800, 0, 20700, 0 } typeMap:bin { "0102" } - links:intvector { 283, 284 } - } //Z#283 - /* Asia/Katmandu */ :int { 283 } //Z#284 + links:intvector { 284, 285 } + } //Z#284 + /* Asia/Katmandu */ :int { 284 } //Z#285 /* 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, 701802000, 717526800, 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, 1414252800 } typeOffsets:intvector { 32533, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403050605060506050605060506050605070503" } - } //Z#285 + } //Z#286 /* Asia/Kolkata */ :table { transPre32:intvector { -1, 649730088, -1, 1139272496 } trans:intvector { -2019705670, -891581400, -872058600, -862637400, -764145000 } typeOffsets:intvector { 21208, 0, 19270, 0, 19800, 0, 19800, 3600, 21200, 0 } typeMap:bin { "04010203020302" } - links:intvector { 255, 286, 513 } - } //Z#286 + links:intvector { 256, 287, 514 } + } //Z#287 /* Asia/Krasnoyarsk */ :table { trans:intvector { -1577513486, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 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, 1414260000 } typeOffsets:intvector { 22286, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600, 28800, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#287 + } //Z#288 /* 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#288 + } //Z#289 /* 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#289 - /* Asia/Kuwait */ :int { 309 } //Z#290 - /* Asia/Macao */ :int { 292 } //Z#291 + } //Z#290 + /* Asia/Kuwait */ :int { 310 } //Z#291 + /* Asia/Macao */ :int { 293 } //Z#292 /* Asia/Macau */ :table { trans:intvector { -2056692850, -884509200, -873280800, -855918000, -841744800, -828529200, -765363600, -747046800, -733827600, -716461200, -697021200, -683715600, -667990800, -654771600, -636627600, -623322000, -605178000, -591872400, -573642000, -559818000, -541674000, -528368400, -510224400, -498128400, -478774800, -466678800, -446720400, -435229200, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132820200, -117088200, -101370600, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 } typeOffsets:intvector { 27250, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600 } typeMap:bin { "0103040304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 291, 292 } - } //Z#292 + links:intvector { 292, 293 } + } //Z#293 /* 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, 701794800, 717519600, 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, 1414245600, 1461427200 } typeOffsets:intvector { 36192, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" } - } //Z#293 + } //Z#294 /* Asia/Makassar */ :table { trans:intvector { -1172908656, -880272000, -766054800 } typeOffsets:intvector { 28656, 0, 28800, 0, 32400, 0 } typeMap:bin { "010201" } - links:intvector { 294, 326 } - } //Z#294 + links:intvector { 295, 327 } + } //Z#295 /* 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#295 - /* Asia/Muscat */ :int { 265 } //Z#296 + } //Z#296 + /* Asia/Muscat */ :int { 266 } //Z#297 /* 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 } @@ -1510,114 +1509,114 @@ zoneinfo64:table(nofallback) { finalRule { "EUAsia" } finalRaw:int { 7200 } finalYear:int { 2000 } - links:intvector { 297, 473 } - } //Z#297 + links:intvector { 298, 474 } + } //Z#298 /* Asia/Novokuznetsk */ :table { trans:intvector { -1441259328, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 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#298 + } //Z#299 /* 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, 701809200, 717534000, 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, 1414263600, 1469304000 } typeOffsets:intvector { 19900, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#299 + } //Z#300 /* Asia/Omsk */ :table { trans:intvector { -1582088010, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600, 695768400, 701812800, 717537600, 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, 1414263600 } typeOffsets:intvector { 17610, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600, 25200, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#300 + } //Z#301 /* Asia/Oral */ :table { trans:intvector { -1441164324, -1247540400, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622591200, 638316000, 654645600, 670370400, 686095200, 695772000, 701816400, 717544800, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600 } typeOffsets:intvector { 12324, 0, 10800, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010405060504050405040504050405040504030203020302040302030203020302030203020302030203020302030203020304" } - } //Z#301 - /* Asia/Phnom_Penh */ :int { 250 } //Z#302 + } //Z#302 + /* Asia/Phnom_Penh */ :int { 251 } //Z#303 /* 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#303 + } //Z#304 /* Asia/Pyongyang */ :table { trans:intvector { -1948782180, -1830414600, 1439564400, 1525446000 } typeOffsets:intvector { 30180, 0, 30600, 0, 32400, 0 } typeMap:bin { "01020102" } - } //Z#304 + } //Z#305 /* Asia/Qatar */ :table { trans:intvector { -1577935568, 76190400 } typeOffsets:intvector { 12368, 0, 10800, 0, 14400, 0 } typeMap:bin { "0201" } - links:intvector { 248, 305 } - } //Z#305 + links:intvector { 249, 306 } + } //Z#306 /* Asia/Qostanay */ :table { trans:intvector { -1441167268, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000 } typeOffsets:intvector { 15268, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010304050403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030405" } - } //Z#306 + } //Z#307 /* 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, 670366800, 686095200, 695768400, 701812800, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000, 1545328800 } typeOffsets:intvector { 15712, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "01030405040304030403040304030403040304030403020305040304030403040304030403040304030403040304030403040503" } - } //Z#307 - /* Asia/Rangoon */ :int { 334 } //Z#308 + } //Z#308 + /* Asia/Rangoon */ :int { 335 } //Z#309 /* Asia/Riyadh */ :table { trans:intvector { -719636812 } typeOffsets:intvector { 11212, 0, 10800, 0 } typeMap:bin { "01" } - links:intvector { 238, 290, 309 } - } //Z#309 - /* Asia/Saigon */ :int { 271 } //Z#310 + links:intvector { 239, 291, 310 } + } //Z#310 + /* Asia/Saigon */ :int { 272 } //Z#311 /* 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, 701794800, 717519600, 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, 1414249200, 1459008000 } typeOffsets:intvector { 34248, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600 } typeMap:bin { "010405040504050405040504050405040504050405040302040504050405040504050403020302030203020302030203020302030203020302030203020302040204" } - } //Z#311 + } //Z#312 /* Asia/Samarkand */ :table { trans:intvector { -1441168073, -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 { 16073, 0, 14400, 0, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010203040302030203020302030203020302030203020302" } - } //Z#312 + } //Z#313 /* Asia/Seoul */ :table { trans:intvector { -1948782472, -1830414600, -681210000, -672228000, -654771600, -640864800, -623408400, -609415200, -588848400, -577965600, -498128400, -462702600, -451733400, -429784200, -418296600, -399544200, -387451800, -368094600, -356002200, -336645000, -324552600, -305195400, -293103000, -264933000, 547578000, 560883600, 579027600, 592333200 } typeOffsets:intvector { 30472, 0, 30600, 0, 30600, 3600, 32400, 0, 32400, 3600 } typeMap:bin { "01030403040304030403010201020102010201020102010304030403" } - links:intvector { 313, 597 } - } //Z#313 + links:intvector { 314, 598 } + } //Z#314 /* Asia/Shanghai */ :table { transPre32:intvector { -1, 2117485353 } - trans:intvector { -933667200, -922093200, -908870400, -888829200, -881049600, -767869200, -745833600, -733827600, -716889600, -699613200, -683884800, -670669200, -652348800, -650019600, 515527200, 527014800, 545162400, 558464400, 577216800, 589914000, 608666400, 621968400, 640116000, 653418000, 671565600, 684867600 } + trans:intvector { -1600675200, -1585904400, -933667200, -922093200, -908870400, -888829200, -881049600, -767869200, -745833600, -733827600, -716889600, -699613200, -683884800, -670669200, -652348800, -650019600, 515527200, 527014800, 545162400, 558464400, 577216800, 589914000, 608666400, 621968400, 640116000, 653418000, 671565600, 684867600 } typeOffsets:intvector { 29143, 0, 28800, 0, 28800, 3600 } - typeMap:bin { "010201020102010201020102010201020102010201020102010201" } - links:intvector { 258, 259, 269, 314, 383, 547 } - } //Z#314 + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201" } + links:intvector { 259, 260, 270, 315, 384, 548 } + } //Z#315 /* 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 { 315, 599 } - } //Z#315 + links:intvector { 316, 600 } + } //Z#316 /* Asia/Srednekolymsk */ :table { trans:intvector { -1441188892, -1247565600, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701794800, 717519600, 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, 1414245600 } typeOffsets:intvector { 36892, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#316 + } //Z#317 /* Asia/Taipei */ :table { transPre32:intvector { -1, 1959718936 } trans:intvector { -1017820800, -766224000, -745833600, -733827600, -716889600, -699613200, -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, 299606400, 307551600 } typeOffsets:intvector { 29160, 0, 28800, 0, 28800, 3600, 32400, 0 } typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 317, 596 } - } //Z#317 + links:intvector { 318, 597 } + } //Z#318 /* Asia/Tashkent */ :table { trans:intvector { -1441168631, -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 { 16631, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201" } - } //Z#318 + } //Z#319 /* Asia/Tbilisi */ :table { trans:intvector { -1441162751, -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 { 10751, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "0103040304030403040304030403040304030403040302010201020102030403040304030403040304030403040304020103" } - } //Z#319 + } //Z#320 /* 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 } transPost32:intvector { 0, -2142151096, 0, -2126257096, 0, -2110615096, 0, -2094721096, 0, -2079079096, 0, -2063185096, 0, -2047543096, 0, -2031649096, 0, -2015920696, 0, -2000026696, 0, -1984384696, 0, -1968490696, 0, -1952848696, 0, -1936954696, 0, -1921312696, 0, -1905418696, 0, -1889690296, 0, -1873796296, 0, -1858154296, 0, -1842260296, 0, -1826618296, 0, -1810724296, 0, -1795082296, 0, -1779188296, 0, -1763459896, 0, -1747565896, 0, -1731923896, 0, -1716029896, 0, -1700387896, 0, -1684493896, 0, -1668851896, 0, -1652957896, 0, -1637229496, 0, -1621335496, 0, -1605693496, 0, -1589799496, 0, -1574157496, 0, -1558263496, 0, -1542621496, 0, -1526727496, 0, -1510999096, 0, -1495105096, 0, -1479463096, 0, -1463569096, 0, -1447927096, 0, -1432033096, 0, -1416391096, 0, -1400497096, 0, -1384855096, 0, -1368961096, 0, -1353232696, 0, -1337338696, 0, -1321696696, 0, -1305802696, 0, -1290160696, 0, -1274266696, 0, -1258624696, 0, -1242730696, 0, -1227002296, 0, -1211108296, 0, -1195466296, 0, -1179572296, 0, -1163930296, 0, -1148036296, 0, -1132394296, 0, -1116500296, 0, -1100771896, 0, -1084877896, 0, -1069235896, 0, -1053341896, 0, -1037699896, 0, -1021805896, 0, -1006163896, 0, -990269896, 0, -974541496, 0, -958647496, 0, -943005496, 0, -927111496, 0, -911469496, 0, -895575496, 0, -879933496, 0, -864039496, 0, -848311096, 0, -832417096, 0, -816775096, 0, -800881096, 0, -785239096, 0, -769345096, 0, -753703096, 0, -737809096, 0, -722080696, 0, -706186696, 0, -690544696, 0, -674650696, 0, -659008696, 0, -643114696, 0, -627472696, 0, -611578696, 0, -595850296, 0, -579956296, 0, -564314296, 0, -548420296 } @@ -1626,75 +1625,75 @@ zoneinfo64:table(nofallback) { finalRule { "Iran" } finalRaw:int { 12600 } finalYear:int { 2089 } - links:intvector { 320, 526 } - } //Z#320 - /* Asia/Tel_Aviv */ :int { 278 } //Z#321 - /* Asia/Thimbu */ :int { 323 } //Z#322 + links:intvector { 321, 527 } + } //Z#321 + /* Asia/Tel_Aviv */ :int { 279 } //Z#322 + /* Asia/Thimbu */ :int { 324 } //Z#323 /* Asia/Thimphu */ :table { trans:intvector { -706341516, 560025000 } typeOffsets:intvector { 21516, 0, 19800, 0, 21600, 0 } typeMap:bin { "0102" } - links:intvector { 322, 323 } - } //Z#323 + links:intvector { 323, 324 } + } //Z#324 /* Asia/Tokyo */ :table { transPre32:intvector { -1, 1707254896 } trans:intvector { -683802000, -672310800, -654771600, -640861200, -620298000, -609411600, -588848400, -577962000 } typeOffsets:intvector { 33539, 0, 32400, 0, 32400, 3600 } typeMap:bin { "010201020102010201" } - links:intvector { 324, 528, 530 } - } //Z#324 + links:intvector { 325, 529, 531 } + } //Z#325 /* Asia/Tomsk */ :table { trans:intvector { -1578807591, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1020193200, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600, 1414263600, 1464465600 } typeOffsets:intvector { 20391, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304020102010201020102010201020102010201030103" } - } //Z#325 - /* Asia/Ujung_Pandang */ :int { 294 } //Z#326 + } //Z#326 + /* Asia/Ujung_Pandang */ :int { 295 } //Z#327 /* 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, 1427479200, 1443193200, 1458928800, 1474642800 } typeOffsets:intvector { 25652, 0, 25200, 0, 28800, 0, 28800, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - links:intvector { 327, 328 } - } //Z#327 - /* Asia/Ulan_Bator */ :int { 327 } //Z#328 + links:intvector { 328, 329 } + } //Z#328 + /* Asia/Ulan_Bator */ :int { 328 } //Z#329 /* Asia/Urumqi */ :table { trans:intvector { -1325483420 } typeOffsets:intvector { 21020, 0, 21600, 0 } typeMap:bin { "01" } - links:intvector { 282, 329 } - } //Z#329 + links:intvector { 283, 330 } + } //Z#330 /* 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, 701794800, 717519600, 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, 1414249200 } typeOffsets:intvector { 34374, 0, 28800, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "010206050605060506050605060506050605060506050403050605060506050605060506050605060506050605060506050605060506050605060506050605070503" } - } //Z#330 - /* Asia/Vientiane */ :int { 250 } //Z#331 + } //Z#331 + /* Asia/Vientiane */ :int { 251 } //Z#332 /* Asia/Vladivostok */ :table { trans:intvector { -1487321251, -1247562000, 354895200, 370702800, 386431200, 402238800, 417967200, 433774800, 449589600, 465321600, 481046400, 496771200, 512496000, 528220800, 543945600, 559670400, 575395200, 591120000, 606844800, 622569600, 638294400, 654624000, 670348800, 686077200, 695754000, 701798400, 717523200, 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, 1414249200 } typeOffsets:intvector { 31651, 0, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#332 + } //Z#333 /* Asia/Yakutsk */ :table { trans:intvector { -1579423138, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701802000, 717526800, 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, 1414252800 } typeOffsets:intvector { 31138, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#333 + } //Z#334 /* Asia/Yangon */ :table { trans:intvector { -1577946287, -873268200, -778410000 } typeOffsets:intvector { 23087, 0, 23400, 0, 32400, 0 } typeMap:bin { "010201" } - links:intvector { 308, 334 } - } //Z#334 + links:intvector { 309, 335 } + } //Z#335 /* Asia/Yekaterinburg */ :table { trans:intvector { -1688270553, -1592610305, -1247544000, 354913200, 370720800, 386449200, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 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, 1414267200 } typeOffsets:intvector { 14553, 0, 13505, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010204050405040504050405040504050405040504050403020405040504050405040504050405040504050405040504050405040504050405040504050405040604" } - } //Z#335 + } //Z#336 /* 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, 701823600, 717548400, 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 { 336, 540 } - } //Z#336 + links:intvector { 337, 541 } + } //Z#337 /* Atlantic/Azores */ :table { transPre32:intvector { -1, 1581063056 } trans:intvector { -1830376800, -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 } @@ -1703,7 +1702,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { -3600 } finalYear:int { 1997 } - } //Z#337 + } //Z#338 /* Atlantic/Bermuda */ :table { 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 } @@ -1711,7 +1710,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -14400 } finalYear:int { 2008 } - } //Z#338 + } //Z#339 /* 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 } @@ -1719,13 +1718,13 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#339 + } //Z#340 /* Atlantic/Cape_Verde */ :table { trans:intvector { -1830376800, -862610400, -764118000, 186120000 } typeOffsets:intvector { -5644, 0, -7200, 0, -7200, 3600, -3600, 0 } typeMap:bin { "01020103" } - } //Z#340 - /* Atlantic/Faeroe */ :int { 342 } //Z#341 + } //Z#341 + /* Atlantic/Faeroe */ :int { 343 } //Z#342 /* 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 } @@ -1733,9 +1732,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 341, 342 } - } //Z#342 - /* Atlantic/Jan_Mayen */ :int { 474 } //Z#343 + links:intvector { 342, 343 } + } //Z#343 + /* Atlantic/Jan_Mayen */ :int { 475 } //Z#344 /* Atlantic/Madeira */ :table { trans:intvector { -1830380400, -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 } @@ -1743,25 +1742,25 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#344 + } //Z#345 /* Atlantic/Reykjavik */ :table { trans:intvector { -1956609120, -1668211200, -1647212400, -1636675200, -1613430000, -1605139200, -1581894000, -1539561600, -1531350000, -968025600, -952293600, -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 { -5280, 0, -3600, 0, -3600, 3600, 0, 0 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" } - links:intvector { 345, 514 } - } //Z#345 + links:intvector { 346, 515 } + } //Z#346 /* Atlantic/South_Georgia */ :table { transPre32:intvector { -1, 1770454464 } typeOffsets:intvector { -8768, 0, -7200, 0 } typeMap:bin { "01" } - } //Z#346 - /* Atlantic/St_Helena */ :int { 5 } //Z#347 + } //Z#347 + /* Atlantic/St_Helena */ :int { 5 } //Z#348 /* 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#348 - /* Australia/ACT */ :int { 367 } //Z#349 + } //Z#349 + /* Australia/ACT */ :int { 368 } //Z#350 /* 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 } @@ -1770,15 +1769,15 @@ zoneinfo64:table(nofallback) { finalRule { "AS" } finalRaw:int { 34200 } finalYear:int { 2009 } - links:intvector { 350, 366 } - } //Z#350 + links:intvector { 351, 367 } + } //Z#351 /* 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 { 351, 365 } - } //Z#351 + links:intvector { 352, 366 } + } //Z#352 /* 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 } @@ -1787,9 +1786,9 @@ zoneinfo64:table(nofallback) { finalRule { "AS" } finalRaw:int { 34200 } finalYear:int { 2009 } - links:intvector { 352, 371 } - } //Z#352 - /* Australia/Canberra */ :int { 367 } //Z#353 + links:intvector { 353, 372 } + } //Z#353 + /* Australia/Canberra */ :int { 368 } //Z#354 /* 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 } @@ -1798,20 +1797,20 @@ zoneinfo64:table(nofallback) { finalRule { "AT" } finalRaw:int { 36000 } finalYear:int { 2009 } - } //Z#354 + } //Z#355 /* 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, 355, 363 } - } //Z#355 + links:intvector { 0, 356, 364 } + } //Z#356 /* 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#356 + } //Z#357 /* 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 } @@ -1820,15 +1819,15 @@ zoneinfo64:table(nofallback) { finalRule { "AT" } finalRaw:int { 36000 } finalYear:int { 2009 } - links:intvector { 357, 368 } - } //Z#357 - /* Australia/LHI */ :int { 360 } //Z#358 + links:intvector { 358, 369 } + } //Z#358 + /* Australia/LHI */ :int { 361 } //Z#359 /* 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#359 + } //Z#360 /* 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 } @@ -1837,8 +1836,8 @@ zoneinfo64:table(nofallback) { finalRule { "LH" } finalRaw:int { 37800 } finalYear:int { 2009 } - links:intvector { 358, 360 } - } //Z#360 + links:intvector { 359, 361 } + } //Z#361 /* 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 } @@ -1847,19 +1846,19 @@ zoneinfo64:table(nofallback) { finalRule { "AV" } finalRaw:int { 36000 } finalYear:int { 2009 } - links:intvector { 361, 369 } - } //Z#361 - /* Australia/NSW */ :int { 367 } //Z#362 - /* Australia/North */ :int { 355 } //Z#363 + links:intvector { 362, 370 } + } //Z#362 + /* Australia/NSW */ :int { 368 } //Z#363 + /* Australia/North */ :int { 356 } //Z#364 /* 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 { 364, 370 } - } //Z#364 - /* Australia/Queensland */ :int { 351 } //Z#365 - /* Australia/South */ :int { 350 } //Z#366 + links:intvector { 365, 371 } + } //Z#365 + /* Australia/Queensland */ :int { 352 } //Z#366 + /* Australia/South */ :int { 351 } //Z#367 /* 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 } @@ -1868,19 +1867,19 @@ zoneinfo64:table(nofallback) { finalRule { "AN" } finalRaw:int { 36000 } finalYear:int { 2009 } - links:intvector { 1, 349, 353, 362, 367 } - } //Z#367 - /* Australia/Tasmania */ :int { 357 } //Z#368 - /* Australia/Victoria */ :int { 361 } //Z#369 - /* Australia/West */ :int { 364 } //Z#370 - /* Australia/Yancowinna */ :int { 352 } //Z#371 - /* BET */ :int { 202 } //Z#372 - /* BST */ :int { 263 } //Z#373 - /* Brazil/Acre */ :int { 196 } //Z#374 - /* Brazil/DeNoronha */ :int { 176 } //Z#375 - /* Brazil/East */ :int { 202 } //Z#376 - /* Brazil/West */ :int { 156 } //Z#377 - /* CAT */ :int { 43 } //Z#378 + links:intvector { 1, 350, 354, 363, 368 } + } //Z#368 + /* Australia/Tasmania */ :int { 358 } //Z#369 + /* Australia/Victoria */ :int { 362 } //Z#370 + /* Australia/West */ :int { 365 } //Z#371 + /* Australia/Yancowinna */ :int { 353 } //Z#372 + /* BET */ :int { 203 } //Z#373 + /* BST */ :int { 264 } //Z#374 + /* Brazil/Acre */ :int { 197 } //Z#375 + /* Brazil/DeNoronha */ :int { 176 } //Z#376 + /* Brazil/East */ :int { 203 } //Z#377 + /* Brazil/West */ :int { 156 } //Z#378 + /* CAT */ :int { 43 } //Z#379 /* 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 } @@ -1888,9 +1887,9 @@ zoneinfo64:table(nofallback) { finalRule { "C-Eur" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#379 - /* CNT */ :int { 207 } //Z#380 - /* CST */ :int { 98 } //Z#381 + } //Z#380 + /* CNT */ :int { 208 } //Z#381 + /* CST */ :int { 98 } //Z#382 /* 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 } @@ -1898,22 +1897,22 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#382 - /* CTT */ :int { 314 } //Z#383 - /* Canada/Atlantic */ :int { 128 } //Z#384 - /* Canada/Central */ :int { 222 } //Z#385 - /* Canada/East-Saskatchewan */ :int { 194 } //Z#386 - /* Canada/Eastern */ :int { 217 } //Z#387 - /* Canada/Mountain */ :int { 112 } //Z#388 - /* Canada/Newfoundland */ :int { 207 } //Z#389 - /* Canada/Pacific */ :int { 219 } //Z#390 - /* Canada/Saskatchewan */ :int { 194 } //Z#391 - /* Canada/Yukon */ :int { 221 } //Z#392 - /* Chile/Continental */ :int { 200 } //Z#393 - /* Chile/EasterIsland */ :int { 556 } //Z#394 - /* Cuba */ :int { 129 } //Z#395 - /* EAT */ :int { 48 } //Z#396 - /* ECT */ :int { 475 } //Z#397 + } //Z#383 + /* CTT */ :int { 315 } //Z#384 + /* Canada/Atlantic */ :int { 128 } //Z#385 + /* Canada/Central */ :int { 223 } //Z#386 + /* Canada/East-Saskatchewan */ :int { 195 } //Z#387 + /* Canada/Eastern */ :int { 218 } //Z#388 + /* Canada/Mountain */ :int { 112 } //Z#389 + /* Canada/Newfoundland */ :int { 208 } //Z#390 + /* Canada/Pacific */ :int { 220 } //Z#391 + /* Canada/Saskatchewan */ :int { 195 } //Z#392 + /* Canada/Yukon */ :int { 222 } //Z#393 + /* Chile/Continental */ :int { 201 } //Z#394 + /* Chile/EasterIsland */ :int { 557 } //Z#395 + /* Cuba */ :int { 129 } //Z#396 + /* EAT */ :int { 48 } //Z#397 + /* ECT */ :int { 476 } //Z#398 /* 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 } @@ -1921,10 +1920,10 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - } //Z#398 + } //Z#399 /* EST */ :table { typeOffsets:intvector { -18000, 0 } - } //Z#399 + } //Z#400 /* 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 } @@ -1932,105 +1931,105 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - } //Z#400 - /* Egypt */ :int { 18 } //Z#401 - /* Eire */ :int { 453 } //Z#402 + } //Z#401 + /* Egypt */ :int { 18 } //Z#402 + /* Eire */ :int { 454 } //Z#403 /* Etc/GMT */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 403, 404, 417, 432, 433, 505, 506, 507, 508, 509 } - } //Z#403 - /* Etc/GMT+0 */ :int { 403 } //Z#404 + links:intvector { 404, 405, 418, 433, 434, 506, 507, 508, 509, 510 } + } //Z#404 + /* Etc/GMT+0 */ :int { 404 } //Z#405 /* Etc/GMT+1 */ :table { typeOffsets:intvector { -3600, 0 } - } //Z#405 + } //Z#406 /* Etc/GMT+10 */ :table { typeOffsets:intvector { -36000, 0 } - } //Z#406 + } //Z#407 /* Etc/GMT+11 */ :table { typeOffsets:intvector { -39600, 0 } - } //Z#407 + } //Z#408 /* Etc/GMT+12 */ :table { typeOffsets:intvector { -43200, 0 } - } //Z#408 + } //Z#409 /* Etc/GMT+2 */ :table { typeOffsets:intvector { -7200, 0 } - } //Z#409 + } //Z#410 /* Etc/GMT+3 */ :table { typeOffsets:intvector { -10800, 0 } - } //Z#410 + } //Z#411 /* Etc/GMT+4 */ :table { typeOffsets:intvector { -14400, 0 } - } //Z#411 + } //Z#412 /* Etc/GMT+5 */ :table { typeOffsets:intvector { -18000, 0 } - } //Z#412 + } //Z#413 /* Etc/GMT+6 */ :table { typeOffsets:intvector { -21600, 0 } - } //Z#413 + } //Z#414 /* Etc/GMT+7 */ :table { typeOffsets:intvector { -25200, 0 } - } //Z#414 + } //Z#415 /* Etc/GMT+8 */ :table { typeOffsets:intvector { -28800, 0 } - } //Z#415 + } //Z#416 /* Etc/GMT+9 */ :table { typeOffsets:intvector { -32400, 0 } - } //Z#416 - /* Etc/GMT-0 */ :int { 403 } //Z#417 + } //Z#417 + /* Etc/GMT-0 */ :int { 404 } //Z#418 /* Etc/GMT-1 */ :table { typeOffsets:intvector { 3600, 0 } - } //Z#418 + } //Z#419 /* Etc/GMT-10 */ :table { typeOffsets:intvector { 36000, 0 } - } //Z#419 + } //Z#420 /* Etc/GMT-11 */ :table { typeOffsets:intvector { 39600, 0 } - } //Z#420 + } //Z#421 /* Etc/GMT-12 */ :table { typeOffsets:intvector { 43200, 0 } - } //Z#421 + } //Z#422 /* Etc/GMT-13 */ :table { typeOffsets:intvector { 46800, 0 } - } //Z#422 + } //Z#423 /* Etc/GMT-14 */ :table { typeOffsets:intvector { 50400, 0 } - } //Z#423 + } //Z#424 /* Etc/GMT-2 */ :table { typeOffsets:intvector { 7200, 0 } - } //Z#424 + } //Z#425 /* Etc/GMT-3 */ :table { typeOffsets:intvector { 10800, 0 } - } //Z#425 + } //Z#426 /* Etc/GMT-4 */ :table { typeOffsets:intvector { 14400, 0 } - } //Z#426 + } //Z#427 /* Etc/GMT-5 */ :table { typeOffsets:intvector { 18000, 0 } - } //Z#427 + } //Z#428 /* Etc/GMT-6 */ :table { typeOffsets:intvector { 21600, 0 } - } //Z#428 + } //Z#429 /* Etc/GMT-7 */ :table { typeOffsets:intvector { 25200, 0 } - } //Z#429 + } //Z#430 /* Etc/GMT-8 */ :table { typeOffsets:intvector { 28800, 0 } - } //Z#430 + } //Z#431 /* Etc/GMT-9 */ :table { typeOffsets:intvector { 32400, 0 } - } //Z#431 - /* Etc/GMT0 */ :int { 403 } //Z#432 - /* Etc/Greenwich */ :int { 403 } //Z#433 - /* Etc/UCT */ :int { 435 } //Z#434 + } //Z#432 + /* Etc/GMT0 */ :int { 404 } //Z#433 + /* Etc/Greenwich */ :int { 404 } //Z#434 + /* Etc/UCT */ :int { 436 } //Z#435 /* Etc/UTC */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 434, 435, 436, 438, 614, 628, 629, 633 } - } //Z#435 - /* Etc/Universal */ :int { 435 } //Z#436 + links:intvector { 435, 436, 437, 439, 615, 629, 630, 634 } + } //Z#436 + /* Etc/Universal */ :int { 436 } //Z#437 /* Etc/Unknown */ :table { typeOffsets:intvector { 0, 0 } - } //Z#437 - /* Etc/Zulu */ :int { 435 } //Z#438 + } //Z#438 + /* Etc/Zulu */ :int { 436 } //Z#439 /* 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 } @@ -2038,7 +2037,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#439 + } //Z#440 /* 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 } @@ -2047,12 +2046,12 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#440 + } //Z#441 /* Europe/Astrakhan */ :table { trans:intvector { -1441249932, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 701820000, 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, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1459033200 } typeOffsets:intvector { 11532, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "01030403040304030403040304030403040302010201030201020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#441 + } //Z#442 /* 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 } @@ -2060,8 +2059,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - } //Z#442 - /* Europe/Belfast */ :int { 465 } //Z#443 + } //Z#443 + /* Europe/Belfast */ :int { 466 } //Z#444 /* 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 } @@ -2070,8 +2069,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 444, 464, 476, 482, 485, 499 } - } //Z#444 + links:intvector { 445, 465, 477, 483, 486, 500 } + } //Z#445 /* 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 } @@ -2080,8 +2079,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#445 - /* Europe/Bratislava */ :int { 477 } //Z#446 + } //Z#446 + /* Europe/Bratislava */ :int { 478 } //Z#447 /* Europe/Brussels */ :table { transPre32:intvector { -1, 1843972096 } 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 } @@ -2090,7 +2089,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#447 + } //Z#448 /* 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 } @@ -2098,17 +2097,17 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1998 } - } //Z#448 + } //Z#449 /* Europe/Budapest */ :table { - transPre32:intvector { -1, 1794028316 } - trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1633212000, -1618700400, -1600466400, -1581202800, -906771600, -857257200, -844556400, -828226800, -812502000, -796777200, -778471200, -762660000, -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 } + transPre32:intvector { -1, 1796706716 } + trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1600470000, -1587250800, -1569711600, -1555196400, -906775200, -857257200, -844556400, -828226800, -812502000, -796777200, -778471200, -762656400, -749689200, -733276800, -717634800, -701910000, -686185200, -670460400, -654130800, -639010800, -492656400, -481168800, -461199600, -449708400, -428540400, -418258800, -397090800, -386809200, 323823600, 338943600, 354668400, 370393200, 386118000, 401842800, 417567600, 433292400, 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 { 4580, 0, 3600, 0, 3600, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#449 - /* Europe/Busingen */ :int { 501 } //Z#450 + } //Z#450 + /* Europe/Busingen */ :int { 502 } //Z#451 /* 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, 638319600, 641944800, 654652800, 670377600, 686102400, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859680000, 877824000 } @@ -2117,8 +2116,8 @@ zoneinfo64:table(nofallback) { finalRule { "Moldova" } finalRaw:int { 7200 } finalYear:int { 1998 } - links:intvector { 451, 490 } - } //Z#451 + links:intvector { 452, 491 } + } //Z#452 /* 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 } @@ -2127,7 +2126,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#452 + } //Z#453 /* 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, -733356000, -719445600, -699487200, -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 } @@ -2136,8 +2135,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 402, 453 } - } //Z#453 + links:intvector { 403, 454 } + } //Z#454 /* 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 } @@ -2146,8 +2145,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#454 - /* Europe/Guernsey */ :int { 465 } //Z#455 + } //Z#455 + /* Europe/Guernsey */ :int { 466 } //Z#456 /* Europe/Helsinki */ :table { trans:intvector { -1535938789, -875671200, -859773600, 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 { 5989, 0, 7200, 0, 7200, 3600 } @@ -2155,23 +2154,23 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - links:intvector { 456, 469 } - } //Z#456 - /* Europe/Isle_of_Man */ :int { 465 } //Z#457 + links:intvector { 457, 470 } + } //Z#457 + /* Europe/Isle_of_Man */ :int { 466 } //Z#458 /* Europe/Istanbul */ :table { transPre32:intvector { -1, 1454819544 } trans:intvector { -1869875816, -1693706400, -1680490800, -1570413600, -1552186800, -1538359200, -1522551600, -1507514400, -1490583600, -1440208800, -1428030000, -1409709600, -1396494000, -931053600, -922676400, -917834400, -892436400, -875844000, -764737200, -744343200, -733806000, -716436000, -701924400, -684986400, -670474800, -654141600, -639025200, -622087200, -606970800, -590032800, -575521200, -235620000, -194842800, -177732000, -165726000, 107910000, 121215600, 133920000, 152665200, 164678400, 184114800, 196214400, 215564400, 228873600, 245804400, 260323200, 267915600, 428454000, 433893600, 468111600, 482799600, 496710000, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686098800, 701823600, 717548400, 733273200, 748998000, 764118000, 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, 1364691600, 1382835600, 1396227600, 1414285200, 1427590800, 1446944400, 1459040400, 1473195600 } typeOffsets:intvector { 6952, 0, 7016, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030405040203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020304" } - links:intvector { 275, 458, 613 } - } //Z#458 - /* Europe/Jersey */ :int { 465 } //Z#459 + links:intvector { 276, 459, 614 } + } //Z#459 + /* Europe/Jersey */ :int { 466 } //Z#460 /* Europe/Kaliningrad */ :table { transPre32:intvector { -1, 1872911176 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -780372000, -778730400, -762663600, -749095200, 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, 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, 1414278000 } typeOffsets:intvector { 4920, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } typeMap:bin { "0102010201020102010201020102030403050605060506050605060506050605060504030403040304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#460 + } //Z#461 /* 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, 638319600, 646783200, 686102400, 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 } @@ -2179,12 +2178,12 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - } //Z#461 + } //Z#462 /* Europe/Kirov */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 701820000, 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, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 } typeOffsets:intvector { 11928, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "010304030403040304030403040304030403020102010302010201020102010201020102010201020102010201020102010201020102010201020102010301" } - } //Z#462 + } //Z#463 /* Europe/Lisbon */ :table { trans:intvector { -1830384000, -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 { -2205, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 } @@ -2192,9 +2191,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 463, 595 } - } //Z#463 - /* Europe/Ljubljana */ :int { 444 } //Z#464 + links:intvector { 464, 596 } + } //Z#464 + /* Europe/Ljubljana */ :int { 445 } //Z#465 /* 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 } @@ -2203,8 +2202,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 443, 455, 457, 459, 465, 503, 504 } - } //Z#465 + links:intvector { 444, 456, 458, 460, 466, 504, 505 } + } //Z#466 /* 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 } @@ -2212,7 +2211,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#466 + } //Z#467 /* Europe/Madrid */ :table { transPre32:intvector { -1, 2117514496 } trans:intvector { -1631926800, -1616889600, -1601168400, -1585353600, -1442451600, -1427673600, -1379293200, -1364774400, -1348448400, -1333324800, -1316390400, -1301270400, -1284339600, -1269820800, -1026954000, -1017619200, -1001898000, -999482400, -986090400, -954115200, -940208400, -873079200, -862621200, -842839200, -828320400, -811389600, -796870800, -779940000, -765421200, -748490400, -733971600, -652327200, -639018000, 135122400, 150246000, 166572000, 181695600, 196812000, 212540400, 228866400, 243990000, 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 } @@ -2221,7 +2220,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#467 + } //Z#468 /* Europe/Malta */ :table { transPre32:intvector { -1, 1891488612 } trans:intvector { -1690765200, -1680487200, -1664758800, -1648951200, -1635123600, -1616896800, -1604278800, -1585533600, -1571014800, -1555293600, -932432400, -857257200, -844556400, -828226800, -812588400, -798073200, -781052400, -766717200, -750898800, -733359600, -719456400, -701917200, -689209200, -670460400, -114051600, -103168800, -81997200, -71715600, -50547600, -40266000, -18493200, -8211600, 12956400, 23238000, 43801200, 54687600, 75855600, 86742000, 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 } @@ -2230,30 +2229,30 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#468 - /* Europe/Mariehamn */ :int { 456 } //Z#469 + } //Z#469 + /* Europe/Mariehamn */ :int { 457 } //Z#470 /* 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, 701827200, 717552000, 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#470 + } //Z#471 /* 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 } + transPre32:intvector { -1, 1846648724 } + trans:intvector { -1854403761, -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 } typeOffsets:intvector { 1772, 0, 0, 0, 0, 3600, 0, 7200, 561, 0, 3600, 0, 3600, 3600 } typeMap:bin { "04010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203020302030203020305060506050605060506050605060506050605060506050605060506050605060506050605060506050605" } finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#471 + } //Z#472 /* Europe/Moscow */ :table { trans:intvector { -1688265017, -1656819079, -1641353479, -1627965079, -1618716679, -1596429079, -1593820800, -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, 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, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 } typeOffsets:intvector { 9017, 0, 7200, 0, 7200, 3600, 9079, 0, 9079, 3600, 9079, 7200, 10800, 0, 10800, 3600, 10800, 7200, 14400, 0 } typeMap:bin { "0304030504050706070807060106070607060706070607060706070607060706070602010607060706070607060706070607060706070607060706070607060706070607060706070607060906" } - links:intvector { 472, 631 } - } //Z#472 - /* Europe/Nicosia */ :int { 297 } //Z#473 + links:intvector { 473, 632 } + } //Z#473 + /* Europe/Nicosia */ :int { 298 } //Z#474 /* 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 } @@ -2262,18 +2261,18 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 237, 343, 474 } - } //Z#474 + links:intvector { 238, 344, 475 } + } //Z#475 /* 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 } + 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, -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 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102050405040503020304050405040504050405040504050405040504050405040504050405040504050405040504050405040504" } finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 397, 475 } - } //Z#475 - /* Europe/Podgorica */ :int { 444 } //Z#476 + links:intvector { 398, 476 } + } //Z#476 + /* Europe/Podgorica */ :int { 445 } //Z#477 /* Europe/Prague */ :table { transPre32:intvector { -1, 1825565432 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -765327600, -746578800, -733359600, -728517600, -721260000, -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 } @@ -2282,8 +2281,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 446, 477 } - } //Z#477 + links:intvector { 447, 478 } + } //Z#478 /* Europe/Riga */ :table { trans:intvector { -1632008194, -1618702594, -1601681794, -1597275394, -1377308194, -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 { 5794, 0, 3600, 0, 3600, 3600, 5794, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } @@ -2291,7 +2290,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2002 } - } //Z#478 + } //Z#479 /* Europe/Rome */ :table { transPre32:intvector { -1, 1891402096 } trans:intvector { -1690765200, -1680487200, -1664758800, -1648951200, -1635123600, -1616896800, -1604278800, -1585533600, -1571014800, -1555293600, -932432400, -857257200, -844556400, -828226800, -812502000, -798073200, -781052400, -766717200, -750898800, -733359600, -719456400, -701917200, -689209200, -670460400, -114051600, -103168800, -81997200, -71715600, -50547600, -40266000, -18493200, -8211600, 12956400, 23238000, 43801200, 54687600, 75855600, 86742000, 107910000, 118191600, 138754800, 149641200, 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 } @@ -2300,27 +2299,27 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 479, 481, 494 } - } //Z#479 + links:intvector { 480, 482, 495 } + } //Z#480 /* Europe/Samara */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 686102400, 687916800, 701820000, 717544800, 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 { 12020, 0, 7200, 3600, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "02040504050405040504050405040504050403020302010204050405040504050405040504050405040504050405040504050405040504050405040504030204" } - } //Z#480 - /* Europe/San_Marino */ :int { 479 } //Z#481 - /* Europe/Sarajevo */ :int { 444 } //Z#482 + } //Z#481 + /* Europe/San_Marino */ :int { 480 } //Z#482 + /* Europe/Sarajevo */ :int { 445 } //Z#483 /* Europe/Saratov */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 701820000, 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, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1480806000 } typeOffsets:intvector { 11058, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "01030403040304030403040304030403020102010201030201020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#483 + } //Z#484 /* 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, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396137600, 1414274400 } typeOffsets:intvector { 8184, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 8160, 0, 10800, 0, 10800, 3600, 14400, 0 } typeMap:bin { "050306020102010206070607060706070607060706070607060706030403040304070607060706040304030403040304030403040304030403040304030403040304030403040304030806" } - } //Z#484 - /* Europe/Skopje */ :int { 444 } //Z#485 + } //Z#485 + /* Europe/Skopje */ :int { 445 } //Z#486 /* 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 } @@ -2329,7 +2328,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1998 } - } //Z#486 + } //Z#487 /* 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 } @@ -2338,7 +2337,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#487 + } //Z#488 /* 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 } @@ -2346,7 +2345,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2003 } - } //Z#488 + } //Z#489 /* 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 } @@ -2354,13 +2353,13 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#489 - /* Europe/Tiraspol */ :int { 451 } //Z#490 + } //Z#490 + /* Europe/Tiraspol */ :int { 452 } //Z#491 /* Europe/Ulyanovsk */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 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, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1459033200 } typeOffsets:intvector { 11616, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "030506050605060506050605060506050605040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050305" } - } //Z#491 + } //Z#492 /* 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 } @@ -2369,9 +2368,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - } //Z#492 - /* Europe/Vaduz */ :int { 501 } //Z#493 - /* Europe/Vatican */ :int { 479 } //Z#494 + } //Z#493 + /* Europe/Vaduz */ :int { 502 } //Z#494 + /* Europe/Vatican */ :int { 480 } //Z#495 /* Europe/Vienna */ :table { transPre32:intvector { -1, 1872912175 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1569711600, -1555801200, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -780188400, -748479600, -733273200, -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 } @@ -2380,7 +2379,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#495 + } //Z#496 /* 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, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891133200, 909277200, 922582800, 941331600, 1048986000, 1067130000 } @@ -2389,12 +2388,12 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2004 } - } //Z#496 + } //Z#497 /* Europe/Volgograd */ :table { trans:intvector { -1577761060, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 701820000, 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, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1540681200 } typeOffsets:intvector { 10660, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "01030403040304030403040304030403020102010201030201020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#497 + } //Z#498 /* 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 } @@ -2402,9 +2401,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 498, 594 } - } //Z#498 - /* Europe/Zagreb */ :int { 444 } //Z#499 + links:intvector { 499, 595 } + } //Z#499 + /* Europe/Zagreb */ :int { 445 } //Z#500 /* 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 } @@ -2413,7 +2412,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - } //Z#500 + } //Z#501 /* Europe/Zurich */ :table { transPre32:intvector { -1, 619768448, -1, 1909720710 } 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 } @@ -2422,75 +2421,75 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 450, 493, 501 } - } //Z#501 + links:intvector { 451, 494, 502 } + } //Z#502 /* Factory */ :table { typeOffsets:intvector { 0, 0 } - } //Z#502 - /* GB */ :int { 465 } //Z#503 - /* GB-Eire */ :int { 465 } //Z#504 - /* GMT */ :int { 403 } //Z#505 - /* GMT+0 */ :int { 403 } //Z#506 - /* GMT-0 */ :int { 403 } //Z#507 - /* GMT0 */ :int { 403 } //Z#508 - /* Greenwich */ :int { 403 } //Z#509 + } //Z#503 + /* GB */ :int { 466 } //Z#504 + /* GB-Eire */ :int { 466 } //Z#505 + /* GMT */ :int { 404 } //Z#506 + /* GMT+0 */ :int { 404 } //Z#507 + /* GMT-0 */ :int { 404 } //Z#508 + /* GMT0 */ :int { 404 } //Z#509 + /* Greenwich */ :int { 404 } //Z#510 /* HST */ :table { typeOffsets:intvector { -36000, 0 } - } //Z#510 - /* Hongkong */ :int { 272 } //Z#511 - /* IET */ :int { 131 } //Z#512 - /* IST */ :int { 286 } //Z#513 - /* Iceland */ :int { 345 } //Z#514 - /* Indian/Antananarivo */ :int { 48 } //Z#515 + } //Z#511 + /* Hongkong */ :int { 273 } //Z#512 + /* IET */ :int { 131 } //Z#513 + /* IST */ :int { 287 } //Z#514 + /* Iceland */ :int { 346 } //Z#515 + /* Indian/Antananarivo */ :int { 48 } //Z#516 /* Indian/Chagos */ :table { trans:intvector { -1988167780, 820436400 } typeOffsets:intvector { 17380, 0, 18000, 0, 21600, 0 } typeMap:bin { "0102" } - } //Z#516 + } //Z#517 /* Indian/Christmas */ :table { transPre32:intvector { -1, 1930865124 } typeOffsets:intvector { 25372, 0, 25200, 0 } typeMap:bin { "01" } - } //Z#517 + } //Z#518 /* Indian/Cocos */ :table { transPre32:intvector { -1, 2085955236 } typeOffsets:intvector { 23260, 0, 23400, 0 } typeMap:bin { "01" } - } //Z#518 - /* Indian/Comoro */ :int { 48 } //Z#519 + } //Z#519 + /* Indian/Comoro */ :int { 48 } //Z#520 /* Indian/Kerguelen */ :table { trans:intvector { -631152000 } typeOffsets:intvector { 0, 0, 18000, 0 } typeMap:bin { "01" } - } //Z#520 + } //Z#521 /* Indian/Mahe */ :table { trans:intvector { -2006653308 } typeOffsets:intvector { 13308, 0, 14400, 0 } typeMap:bin { "01" } - } //Z#521 + } //Z#522 /* Indian/Maldives */ :table { trans:intvector { -315636840 } typeOffsets:intvector { 17640, 0, 18000, 0 } typeMap:bin { "01" } - } //Z#522 + } //Z#523 /* Indian/Mauritius */ :table { trans:intvector { -1988164200, 403041600, 417034800, 1224972000, 1238274000 } typeOffsets:intvector { 13800, 0, 14400, 0, 14400, 3600 } typeMap:bin { "0102010201" } - } //Z#523 - /* Indian/Mayotte */ :int { 48 } //Z#524 + } //Z#524 + /* Indian/Mayotte */ :int { 48 } //Z#525 /* Indian/Reunion */ :table { trans:intvector { -1848886912 } typeOffsets:intvector { 13312, 0, 14400, 0 } typeMap:bin { "01" } - } //Z#525 - /* Iran */ :int { 320 } //Z#526 - /* Israel */ :int { 278 } //Z#527 - /* JST */ :int { 324 } //Z#528 - /* Jamaica */ :int { 142 } //Z#529 - /* Japan */ :int { 324 } //Z#530 - /* Kwajalein */ :int { 570 } //Z#531 - /* Libya */ :int { 56 } //Z#532 + } //Z#526 + /* Iran */ :int { 321 } //Z#527 + /* Israel */ :int { 279 } //Z#528 + /* JST */ :int { 325 } //Z#529 + /* Jamaica */ :int { 142 } //Z#530 + /* Japan */ :int { 325 } //Z#531 + /* Kwajalein */ :int { 571 } //Z#532 + /* Libya */ :int { 56 } //Z#533 /* 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 } @@ -2498,11 +2497,11 @@ zoneinfo64:table(nofallback) { finalRule { "C-Eur" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#533 - /* MIT */ :int { 551 } //Z#534 + } //Z#534 + /* MIT */ :int { 552 } //Z#535 /* MST */ :table { typeOffsets:intvector { -25200, 0 } - } //Z#535 + } //Z#536 /* 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 } @@ -2510,20 +2509,20 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -25200 } finalYear:int { 2008 } - } //Z#536 - /* Mexico/BajaNorte */ :int { 216 } //Z#537 - /* Mexico/BajaSur */ :int { 160 } //Z#538 - /* Mexico/General */ :int { 165 } //Z#539 - /* NET */ :int { 336 } //Z#540 - /* NST */ :int { 552 } //Z#541 - /* NZ */ :int { 552 } //Z#542 - /* NZ-CHAT */ :int { 554 } //Z#543 - /* Navajo */ :int { 109 } //Z#544 - /* PLT */ :int { 281 } //Z#545 - /* PNT */ :int { 184 } //Z#546 - /* PRC */ :int { 314 } //Z#547 - /* PRT */ :int { 189 } //Z#548 - /* PST */ :int { 151 } //Z#549 + } //Z#537 + /* Mexico/BajaNorte */ :int { 217 } //Z#538 + /* Mexico/BajaSur */ :int { 160 } //Z#539 + /* Mexico/General */ :int { 165 } //Z#540 + /* NET */ :int { 337 } //Z#541 + /* NST */ :int { 553 } //Z#542 + /* NZ */ :int { 553 } //Z#543 + /* NZ-CHAT */ :int { 555 } //Z#544 + /* Navajo */ :int { 109 } //Z#545 + /* PLT */ :int { 282 } //Z#546 + /* PNT */ :int { 185 } //Z#547 + /* PRC */ :int { 315 } //Z#548 + /* PRT */ :int { 190 } //Z#549 + /* PST */ :int { 151 } //Z#550 /* 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 } @@ -2531,7 +2530,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2008 } - } //Z#550 + } //Z#551 /* Pacific/Apia */ :table { transPre32:intvector { -1, 1849542912 } trans:intvector { -1861878784, -631110600, 1285498800, 1301752800, 1316872800, 1325239200, 1333202400, 1348927200 } @@ -2540,8 +2539,8 @@ zoneinfo64:table(nofallback) { finalRule { "WS" } finalRaw:int { 46800 } finalYear:int { 2013 } - links:intvector { 534, 551 } - } //Z#551 + links:intvector { 535, 552 } + } //Z#552 /* 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 } @@ -2550,14 +2549,14 @@ zoneinfo64:table(nofallback) { finalRule { "NZ" } finalRaw:int { 43200 } finalYear:int { 2009 } - links:intvector { 230, 233, 541, 542, 552 } - } //Z#552 + links:intvector { 231, 234, 542, 543, 553 } + } //Z#553 /* Pacific/Bougainville */ :table { transPre32:intvector { -1, 1454789160, -1, 1928176784 } trans:intvector { -868010400, -768906000, 1419696000 } typeOffsets:intvector { 37336, 0, 32400, 0, 35312, 0, 36000, 0, 39600, 0 } typeMap:bin { "0203010304" } - } //Z#553 + } //Z#554 /* Pacific/Chatham */ :table { transPre32:intvector { -1, 1102529668 } trans:intvector { -757426500, 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 } @@ -2566,15 +2565,15 @@ zoneinfo64:table(nofallback) { finalRule { "Chatham" } finalRaw:int { 45900 } finalYear:int { 2009 } - links:intvector { 543, 554 } - } //Z#554 + links:intvector { 544, 555 } + } //Z#555 /* Pacific/Chuuk */ :table { transPre32:intvector { -1, 350338868, -1, 2117478068 } trans:intvector { -1743674400, -1606813200, -907408800, -770634000 } typeOffsets:intvector { -49972, 0, 32400, 0, 36000, 0, 36428, 0 } typeMap:bin { "030201020102" } - links:intvector { 555, 590, 593 } - } //Z#555 + links:intvector { 556, 591, 594 } + } //Z#556 /* Pacific/Easter */ :table { trans:intvector { -1178124152, -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, 592372800, 605674800, 624427200, 637124400, 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, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1494730800, 1502596800, 1526180400, 1534046400, 1554606000, 1567915200 } typeOffsets:intvector { -26248, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } @@ -2582,111 +2581,111 @@ zoneinfo64:table(nofallback) { finalRule { "Chile" } finalRaw:int { -21600 } finalYear:int { 2020 } - links:intvector { 394, 556 } - } //Z#556 + links:intvector { 395, 557 } + } //Z#557 /* 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#557 + } //Z#558 /* Pacific/Enderbury */ :table { transPre32:intvector { -1, 2117555556 } trans:intvector { 307627200, 788871600 } typeOffsets:intvector { -41060, 0, -43200, 0, -39600, 0, 46800, 0 } typeMap:bin { "010203" } - } //Z#558 + } //Z#559 /* Pacific/Fakaofo */ :table { transPre32:intvector { -1, 2117555592 } trans:intvector { 1325242800 } typeOffsets:intvector { -41096, 0, -39600, 0, 46800, 0 } typeMap:bin { "0102" } - } //Z#559 + } //Z#560 /* Pacific/Fiji */ :table { - trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414850400, 1421503200, 1446300000, 1452952800, 1478354400, 1484402400, 1509804000, 1515852000, 1541253600, 1547301600, 1573308000 } + trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414850400, 1421503200, 1446300000, 1452952800, 1478354400, 1484402400, 1509804000, 1515852000, 1541253600, 1547301600, 1573308000, 1578751200, 1608386400, 1610805600, 1636812000 } typeOffsets:intvector { 42944, 0, 43200, 0, 43200, 3600 } - typeMap:bin { "0102010201020102010201020102010201020102010201020102" } + typeMap:bin { "010201020102010201020102010201020102010201020102010201020102" } finalRule { "Fiji" } finalRaw:int { 43200 } - finalYear:int { 2020 } - } //Z#560 + finalYear:int { 2022 } + } //Z#561 /* Pacific/Funafuti */ :table { transPre32:intvector { -1, 2117471484 } typeOffsets:intvector { 43012, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#561 + } //Z#562 /* Pacific/Galapagos */ :table { trans:intvector { -1230746496, 504939600, 722930400, 728888400 } typeOffsets:intvector { -21504, 0, -21600, 0, -21600, 3600, -18000, 0 } typeMap:bin { "03010201" } - } //Z#562 + } //Z#563 /* Pacific/Gambier */ :table { trans:intvector { -1806678012 } typeOffsets:intvector { -32388, 0, -32400, 0 } typeMap:bin { "01" } - } //Z#563 + } //Z#564 /* Pacific/Guadalcanal */ :table { trans:intvector { -1806748788 } typeOffsets:intvector { 38388, 0, 39600, 0 } typeMap:bin { "01" } - links:intvector { 564, 598 } - } //Z#564 + links:intvector { 565, 599 } + } //Z#565 /* Pacific/Guam */ :table { transPre32:intvector { -1, 350340556, -1, 2117479756 } trans:intvector { -885549600, -802256400, -331891200, -281610000, -73728000, -29415540, -16704000, -10659600, 9907200, 21394800, 41356800, 52844400, 124819200, 130863600, 201888000, 209487660, 230659200, 241542000 } typeOffsets:intvector { -51660, 0, 32400, 0, 34740, 0, 36000, 0, 36000, 3600 } typeMap:bin { "0203010304030403040304030403040304030403" } - links:intvector { 565, 585 } - } //Z#565 + links:intvector { 566, 586 } + } //Z#566 /* 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 { 566, 567, 621 } - } //Z#566 - /* Pacific/Johnston */ :int { 566 } //Z#567 + links:intvector { 567, 568, 622 } + } //Z#567 + /* Pacific/Johnston */ :int { 567 } //Z#568 /* Pacific/Kiritimati */ :table { transPre32:intvector { -1, 2117552256 } trans:intvector { 307622400, 788868000 } typeOffsets:intvector { -37760, 0, -38400, 0, -36000, 0, 50400, 0 } typeMap:bin { "010203" } - } //Z#568 + } //Z#569 /* Pacific/Kosrae */ :table { transPre32:intvector { -1, 350336180, -1, 2117475380 } trans:intvector { -1743678000, -1606813200, -1041418800, -907408800, -770634000, -7988400, 915105600 } typeOffsets:intvector { -47284, 0, 32400, 0, 36000, 0, 39116, 0, 39600, 0, 43200, 0 } typeMap:bin { "030401040201040504" } - } //Z#569 + } //Z#570 /* Pacific/Kwajalein */ :table { transPre32:intvector { -1, 2117474336 } trans:intvector { -1041418800, -907408800, -817462800, -7988400, 745934400 } typeOffsets:intvector { 40160, 0, -43200, 0, 32400, 0, 36000, 0, 39600, 0, 43200, 0 } typeMap:bin { "040302040105" } - links:intvector { 531, 570 } - } //Z#570 + links:intvector { 532, 571 } + } //Z#571 /* Pacific/Majuro */ :table { transPre32:intvector { -1, 2117473408 } trans:intvector { -1743678000, -1606813200, -1041418800, -907408800, -818067600, -7988400 } typeOffsets:intvector { 41088, 0, 32400, 0, 36000, 0, 39600, 0, 43200, 0 } typeMap:bin { "03010302010304" } - } //Z#571 + } //Z#572 /* Pacific/Marquesas */ :table { trans:intvector { -1806676920 } typeOffsets:intvector { -33480, 0, -34200, 0 } typeMap:bin { "01" } - } //Z#572 - /* Pacific/Midway */ :int { 578 } //Z#573 + } //Z#573 + /* Pacific/Midway */ :int { 579 } //Z#574 /* Pacific/Nauru */ :table { trans:intvector { -1545131260, -862918200, -767350800, 287418600 } typeOffsets:intvector { 40060, 0, 32400, 0, 41400, 0, 43200, 0 } typeMap:bin { "02010203" } - } //Z#574 + } //Z#575 /* 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#575 + } //Z#576 /* Pacific/Norfolk */ :table { transPre32:intvector { -1, 2117474184 } trans:intvector { -599656320, 152029800, 162916200, 1443882600, 1570287600, 1586012400, 1601737200 } @@ -2695,88 +2694,88 @@ zoneinfo64:table(nofallback) { finalRule { "AN" } finalRaw:int { 39600 } finalYear:int { 2021 } - } //Z#576 + } //Z#577 /* Pacific/Noumea */ :table { trans:intvector { -1829387148, 250002000, 257342400, 281451600, 288878400, 849366000, 857228400 } typeOffsets:intvector { 39948, 0, 39600, 0, 39600, 3600 } typeMap:bin { "01020102010201" } - } //Z#577 + } //Z#578 /* Pacific/Pago_Pago */ :table { transPre32:intvector { -1, 1849542664 } trans:intvector { -1861879032 } typeOffsets:intvector { 45432, 0, -40968, 0, -39600, 0 } typeMap:bin { "0102" } - links:intvector { 573, 578, 586, 627 } - } //Z#578 + links:intvector { 574, 579, 587, 628 } + } //Z#579 /* Pacific/Palau */ :table { transPre32:intvector { -1, 350343020, -1, 2117482220 } typeOffsets:intvector { -54124, 0, 32276, 0, 32400, 0 } typeMap:bin { "0102" } - } //Z#579 + } //Z#580 /* Pacific/Pitcairn */ :table { transPre32:intvector { -1, 2117545716 } trans:intvector { 893665800 } typeOffsets:intvector { -31220, 0, -30600, 0, -28800, 0 } typeMap:bin { "0102" } - } //Z#580 + } //Z#581 /* Pacific/Pohnpei */ :table { transPre32:intvector { -1, 350337324, -1, 2117476524 } trans:intvector { -1743678000, -1606813200, -1041418800, -907408800, -770634000 } typeOffsets:intvector { -48428, 0, 32400, 0, 36000, 0, 37972, 0, 39600, 0 } typeMap:bin { "03040104020104" } - links:intvector { 581, 582 } - } //Z#581 - /* Pacific/Ponape */ :int { 581 } //Z#582 + links:intvector { 582, 583 } + } //Z#582 + /* Pacific/Ponape */ :int { 582 } //Z#583 /* Pacific/Port_Moresby */ :table { transPre32:intvector { -1, 1454791176, -1, 1928176784 } typeOffsets:intvector { 35320, 0, 35312, 0, 36000, 0 } typeMap:bin { "0102" } - } //Z#583 + } //Z#584 /* 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#584 - /* Pacific/Saipan */ :int { 565 } //Z#585 - /* Pacific/Samoa */ :int { 578 } //Z#586 + } //Z#585 + /* Pacific/Saipan */ :int { 566 } //Z#586 + /* Pacific/Samoa */ :int { 579 } //Z#587 /* Pacific/Tahiti */ :table { trans:intvector { -1806674504 } typeOffsets:intvector { -35896, 0, -36000, 0 } typeMap:bin { "01" } - } //Z#587 + } //Z#588 /* Pacific/Tarawa */ :table { transPre32:intvector { -1, 2117472972 } typeOffsets:intvector { 41524, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#588 + } //Z#589 /* Pacific/Tongatapu */ :table { transPre32:intvector { -1, 2117470136 } trans:intvector { -915193200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400, 1478350800, 1484398800 } typeOffsets:intvector { 44360, 0, 44400, 0, 46800, 0, 46800, 3600 } typeMap:bin { "01020302030203020302" } - } //Z#589 - /* Pacific/Truk */ :int { 555 } //Z#590 + } //Z#590 + /* Pacific/Truk */ :int { 556 } //Z#591 /* Pacific/Wake */ :table { transPre32:intvector { -1, 2117474508 } typeOffsets:intvector { 39988, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#591 + } //Z#592 /* Pacific/Wallis */ :table { transPre32:intvector { -1, 2117470376 } typeOffsets:intvector { 44120, 0, 43200, 0 } typeMap:bin { "01" } - } //Z#592 - /* Pacific/Yap */ :int { 555 } //Z#593 - /* Poland */ :int { 498 } //Z#594 - /* Portugal */ :int { 463 } //Z#595 - /* ROC */ :int { 317 } //Z#596 - /* ROK */ :int { 313 } //Z#597 - /* SST */ :int { 564 } //Z#598 - /* Singapore */ :int { 315 } //Z#599 + } //Z#593 + /* Pacific/Yap */ :int { 556 } //Z#594 + /* Poland */ :int { 499 } //Z#595 + /* Portugal */ :int { 464 } //Z#596 + /* ROC */ :int { 318 } //Z#597 + /* ROK */ :int { 314 } //Z#598 + /* SST */ :int { 565 } //Z#599 + /* Singapore */ :int { 316 } //Z#600 /* SystemV/AST4 */ :table { typeOffsets:intvector { -14400, 0 } - } //Z#600 + } //Z#601 /* 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 } @@ -2785,10 +2784,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -14400 } finalYear:int { 1977 } - } //Z#601 + } //Z#602 /* SystemV/CST6 */ :table { typeOffsets:intvector { -21600, 0 } - } //Z#602 + } //Z#603 /* 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 } @@ -2797,10 +2796,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -21600 } finalYear:int { 1977 } - } //Z#603 + } //Z#604 /* SystemV/EST5 */ :table { typeOffsets:intvector { -18000, 0 } - } //Z#604 + } //Z#605 /* 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 } @@ -2809,13 +2808,13 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -18000 } finalYear:int { 1977 } - } //Z#605 + } //Z#606 /* SystemV/HST10 */ :table { typeOffsets:intvector { -36000, 0 } - } //Z#606 + } //Z#607 /* SystemV/MST7 */ :table { typeOffsets:intvector { -25200, 0 } - } //Z#607 + } //Z#608 /* 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 } @@ -2824,10 +2823,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -25200 } finalYear:int { 1977 } - } //Z#608 + } //Z#609 /* SystemV/PST8 */ :table { typeOffsets:intvector { -28800, 0 } - } //Z#609 + } //Z#610 /* 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 } @@ -2836,10 +2835,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -28800 } finalYear:int { 1977 } - } //Z#610 + } //Z#611 /* SystemV/YST9 */ :table { typeOffsets:intvector { -32400, 0 } - } //Z#611 + } //Z#612 /* 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 } @@ -2848,26 +2847,26 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -32400 } finalYear:int { 1977 } - } //Z#612 - /* Turkey */ :int { 458 } //Z#613 - /* UCT */ :int { 435 } //Z#614 - /* US/Alaska */ :int { 60 } //Z#615 - /* US/Aleutian */ :int { 59 } //Z#616 - /* US/Arizona */ :int { 184 } //Z#617 - /* US/Central */ :int { 98 } //Z#618 - /* US/East-Indiana */ :int { 131 } //Z#619 - /* US/Eastern */ :int { 173 } //Z#620 - /* US/Hawaii */ :int { 566 } //Z#621 - /* US/Indiana-Starke */ :int { 132 } //Z#622 - /* US/Michigan */ :int { 110 } //Z#623 - /* US/Mountain */ :int { 109 } //Z#624 - /* US/Pacific */ :int { 151 } //Z#625 - /* US/Pacific-New */ :int { 151 } //Z#626 - /* US/Samoa */ :int { 578 } //Z#627 - /* UTC */ :int { 435 } //Z#628 - /* Universal */ :int { 435 } //Z#629 - /* VST */ :int { 271 } //Z#630 - /* W-SU */ :int { 472 } //Z#631 + } //Z#613 + /* Turkey */ :int { 459 } //Z#614 + /* UCT */ :int { 436 } //Z#615 + /* US/Alaska */ :int { 60 } //Z#616 + /* US/Aleutian */ :int { 59 } //Z#617 + /* US/Arizona */ :int { 185 } //Z#618 + /* US/Central */ :int { 98 } //Z#619 + /* US/East-Indiana */ :int { 131 } //Z#620 + /* US/Eastern */ :int { 173 } //Z#621 + /* US/Hawaii */ :int { 567 } //Z#622 + /* US/Indiana-Starke */ :int { 132 } //Z#623 + /* US/Michigan */ :int { 110 } //Z#624 + /* US/Mountain */ :int { 109 } //Z#625 + /* US/Pacific */ :int { 151 } //Z#626 + /* US/Pacific-New */ :int { 151 } //Z#627 + /* US/Samoa */ :int { 579 } //Z#628 + /* UTC */ :int { 436 } //Z#629 + /* Universal */ :int { 436 } //Z#630 + /* VST */ :int { 272 } //Z#631 + /* W-SU */ :int { 473 } //Z#632 /* 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 } @@ -2875,8 +2874,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#632 - /* Zulu */ :int { 435 } //Z#633 + } //Z#633 + /* Zulu */ :int { 436 } //Z#634 } Names { "ACT","AET","AGT","ART","AST","Africa/Abidjan","Africa/Accra" // 6 @@ -2940,131 +2939,131 @@ zoneinfo64:table(nofallback) { ,"America/Montserrat","America/Nassau","America/New_York" // 173 ,"America/Nipigon","America/Nome","America/Noronha" // 176 ,"America/North_Dakota/Beulah","America/North_Dakota/Center" // 178 - ,"America/North_Dakota/New_Salem","America/Ojinaga" // 180 - ,"America/Panama","America/Pangnirtung","America/Paramaribo" // 183 - ,"America/Phoenix","America/Port-au-Prince","America/Port_of_Spain" // 186 - ,"America/Porto_Acre","America/Porto_Velho","America/Puerto_Rico" // 189 - ,"America/Punta_Arenas","America/Rainy_River","America/Rankin_Inlet" // 192 - ,"America/Recife","America/Regina","America/Resolute" // 195 - ,"America/Rio_Branco","America/Rosario","America/Santa_Isabel" // 198 - ,"America/Santarem","America/Santiago","America/Santo_Domingo" // 201 - ,"America/Sao_Paulo","America/Scoresbysund","America/Shiprock" // 204 - ,"America/Sitka","America/St_Barthelemy","America/St_Johns" // 207 - ,"America/St_Kitts","America/St_Lucia","America/St_Thomas" // 210 - ,"America/St_Vincent","America/Swift_Current","America/Tegucigalpa" // 213 - ,"America/Thule","America/Thunder_Bay","America/Tijuana" // 216 - ,"America/Toronto","America/Tortola","America/Vancouver" // 219 - ,"America/Virgin","America/Whitehorse","America/Winnipeg" // 222 - ,"America/Yakutat","America/Yellowknife","Antarctica/Casey" // 225 - ,"Antarctica/Davis","Antarctica/DumontDUrville","Antarctica/Macquarie" // 228 - ,"Antarctica/Mawson","Antarctica/McMurdo","Antarctica/Palmer" // 231 - ,"Antarctica/Rothera","Antarctica/South_Pole","Antarctica/Syowa" // 234 - ,"Antarctica/Troll","Antarctica/Vostok","Arctic/Longyearbyen" // 237 - ,"Asia/Aden","Asia/Almaty","Asia/Amman","Asia/Anadyr" // 241 - ,"Asia/Aqtau","Asia/Aqtobe","Asia/Ashgabat","Asia/Ashkhabad" // 245 - ,"Asia/Atyrau","Asia/Baghdad","Asia/Bahrain","Asia/Baku" // 249 - ,"Asia/Bangkok","Asia/Barnaul","Asia/Beirut","Asia/Bishkek" // 253 - ,"Asia/Brunei","Asia/Calcutta","Asia/Chita","Asia/Choibalsan" // 257 - ,"Asia/Chongqing","Asia/Chungking","Asia/Colombo","Asia/Dacca" // 261 - ,"Asia/Damascus","Asia/Dhaka","Asia/Dili","Asia/Dubai" // 265 - ,"Asia/Dushanbe","Asia/Famagusta","Asia/Gaza","Asia/Harbin" // 269 - ,"Asia/Hebron","Asia/Ho_Chi_Minh","Asia/Hong_Kong" // 272 - ,"Asia/Hovd","Asia/Irkutsk","Asia/Istanbul","Asia/Jakarta" // 276 - ,"Asia/Jayapura","Asia/Jerusalem","Asia/Kabul","Asia/Kamchatka" // 280 - ,"Asia/Karachi","Asia/Kashgar","Asia/Kathmandu","Asia/Katmandu" // 284 - ,"Asia/Khandyga","Asia/Kolkata","Asia/Krasnoyarsk" // 287 - ,"Asia/Kuala_Lumpur","Asia/Kuching","Asia/Kuwait","Asia/Macao" // 291 - ,"Asia/Macau","Asia/Magadan","Asia/Makassar","Asia/Manila" // 295 - ,"Asia/Muscat","Asia/Nicosia","Asia/Novokuznetsk","Asia/Novosibirsk" // 299 - ,"Asia/Omsk","Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak" // 303 - ,"Asia/Pyongyang","Asia/Qatar","Asia/Qostanay","Asia/Qyzylorda" // 307 - ,"Asia/Rangoon","Asia/Riyadh","Asia/Saigon","Asia/Sakhalin" // 311 - ,"Asia/Samarkand","Asia/Seoul","Asia/Shanghai","Asia/Singapore" // 315 - ,"Asia/Srednekolymsk","Asia/Taipei","Asia/Tashkent" // 318 - ,"Asia/Tbilisi","Asia/Tehran","Asia/Tel_Aviv","Asia/Thimbu" // 322 - ,"Asia/Thimphu","Asia/Tokyo","Asia/Tomsk","Asia/Ujung_Pandang" // 326 - ,"Asia/Ulaanbaatar","Asia/Ulan_Bator","Asia/Urumqi" // 329 - ,"Asia/Ust-Nera","Asia/Vientiane","Asia/Vladivostok" // 332 - ,"Asia/Yakutsk","Asia/Yangon","Asia/Yekaterinburg" // 335 - ,"Asia/Yerevan","Atlantic/Azores","Atlantic/Bermuda" // 338 - ,"Atlantic/Canary","Atlantic/Cape_Verde","Atlantic/Faeroe" // 341 - ,"Atlantic/Faroe","Atlantic/Jan_Mayen","Atlantic/Madeira" // 344 - ,"Atlantic/Reykjavik","Atlantic/South_Georgia","Atlantic/St_Helena" // 347 - ,"Atlantic/Stanley","Australia/ACT","Australia/Adelaide" // 350 - ,"Australia/Brisbane","Australia/Broken_Hill","Australia/Canberra" // 353 - ,"Australia/Currie","Australia/Darwin","Australia/Eucla" // 356 - ,"Australia/Hobart","Australia/LHI","Australia/Lindeman" // 359 - ,"Australia/Lord_Howe","Australia/Melbourne","Australia/NSW" // 362 - ,"Australia/North","Australia/Perth","Australia/Queensland" // 365 - ,"Australia/South","Australia/Sydney","Australia/Tasmania" // 368 - ,"Australia/Victoria","Australia/West","Australia/Yancowinna" // 371 - ,"BET","BST","Brazil/Acre","Brazil/DeNoronha","Brazil/East" // 376 - ,"Brazil/West","CAT","CET","CNT","CST","CST6CDT","CTT" // 383 - ,"Canada/Atlantic","Canada/Central","Canada/East-Saskatchewan" // 386 - ,"Canada/Eastern","Canada/Mountain","Canada/Newfoundland" // 389 - ,"Canada/Pacific","Canada/Saskatchewan","Canada/Yukon" // 392 - ,"Chile/Continental","Chile/EasterIsland","Cuba","EAT" // 396 - ,"ECT","EET","EST","EST5EDT","Egypt","Eire","Etc/GMT" // 403 - ,"Etc/GMT+0","Etc/GMT+1","Etc/GMT+10","Etc/GMT+11" // 407 - ,"Etc/GMT+12","Etc/GMT+2","Etc/GMT+3","Etc/GMT+4","Etc/GMT+5" // 412 - ,"Etc/GMT+6","Etc/GMT+7","Etc/GMT+8","Etc/GMT+9","Etc/GMT-0" // 417 - ,"Etc/GMT-1","Etc/GMT-10","Etc/GMT-11","Etc/GMT-12" // 421 - ,"Etc/GMT-13","Etc/GMT-14","Etc/GMT-2","Etc/GMT-3" // 425 - ,"Etc/GMT-4","Etc/GMT-5","Etc/GMT-6","Etc/GMT-7","Etc/GMT-8" // 430 - ,"Etc/GMT-9","Etc/GMT0","Etc/Greenwich","Etc/UCT","Etc/UTC" // 435 - ,"Etc/Universal","Etc/Unknown","Etc/Zulu","Europe/Amsterdam" // 439 - ,"Europe/Andorra","Europe/Astrakhan","Europe/Athens" // 442 - ,"Europe/Belfast","Europe/Belgrade","Europe/Berlin" // 445 - ,"Europe/Bratislava","Europe/Brussels","Europe/Bucharest" // 448 - ,"Europe/Budapest","Europe/Busingen","Europe/Chisinau" // 451 - ,"Europe/Copenhagen","Europe/Dublin","Europe/Gibraltar" // 454 - ,"Europe/Guernsey","Europe/Helsinki","Europe/Isle_of_Man" // 457 - ,"Europe/Istanbul","Europe/Jersey","Europe/Kaliningrad" // 460 - ,"Europe/Kiev","Europe/Kirov","Europe/Lisbon","Europe/Ljubljana" // 464 - ,"Europe/London","Europe/Luxembourg","Europe/Madrid" // 467 - ,"Europe/Malta","Europe/Mariehamn","Europe/Minsk","Europe/Monaco" // 471 - ,"Europe/Moscow","Europe/Nicosia","Europe/Oslo","Europe/Paris" // 475 - ,"Europe/Podgorica","Europe/Prague","Europe/Riga","Europe/Rome" // 479 - ,"Europe/Samara","Europe/San_Marino","Europe/Sarajevo" // 482 - ,"Europe/Saratov","Europe/Simferopol","Europe/Skopje" // 485 - ,"Europe/Sofia","Europe/Stockholm","Europe/Tallinn" // 488 - ,"Europe/Tirane","Europe/Tiraspol","Europe/Ulyanovsk" // 491 - ,"Europe/Uzhgorod","Europe/Vaduz","Europe/Vatican" // 494 - ,"Europe/Vienna","Europe/Vilnius","Europe/Volgograd" // 497 - ,"Europe/Warsaw","Europe/Zagreb","Europe/Zaporozhye" // 500 - ,"Europe/Zurich","Factory","GB","GB-Eire","GMT","GMT+0" // 506 - ,"GMT-0","GMT0","Greenwich","HST","Hongkong","IET" // 512 - ,"IST","Iceland","Indian/Antananarivo","Indian/Chagos" // 516 - ,"Indian/Christmas","Indian/Cocos","Indian/Comoro" // 519 - ,"Indian/Kerguelen","Indian/Mahe","Indian/Maldives" // 522 - ,"Indian/Mauritius","Indian/Mayotte","Indian/Reunion" // 525 - ,"Iran","Israel","JST","Jamaica","Japan","Kwajalein" // 531 - ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 537 - ,"Mexico/BajaSur","Mexico/General","NET","NST","NZ" // 542 - ,"NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST","PST8PDT" // 550 - ,"Pacific/Apia","Pacific/Auckland","Pacific/Bougainville" // 553 - ,"Pacific/Chatham","Pacific/Chuuk","Pacific/Easter" // 556 - ,"Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo" // 559 - ,"Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos" // 562 - ,"Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam" // 565 - ,"Pacific/Honolulu","Pacific/Johnston","Pacific/Kiritimati" // 568 - ,"Pacific/Kosrae","Pacific/Kwajalein","Pacific/Majuro" // 571 - ,"Pacific/Marquesas","Pacific/Midway","Pacific/Nauru" // 574 - ,"Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 577 - ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 580 - ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 583 - ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 586 - ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 589 - ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 593 - ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 599 - ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 603 - ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 607 - ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 610 - ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 615 - ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 619 - ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 623 - ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 627 - ,"UTC","Universal","VST","W-SU","WET","Zulu" // 633 + ,"America/North_Dakota/New_Salem","America/Nuuk","America/Ojinaga" // 181 + ,"America/Panama","America/Pangnirtung","America/Paramaribo" // 184 + ,"America/Phoenix","America/Port-au-Prince","America/Port_of_Spain" // 187 + ,"America/Porto_Acre","America/Porto_Velho","America/Puerto_Rico" // 190 + ,"America/Punta_Arenas","America/Rainy_River","America/Rankin_Inlet" // 193 + ,"America/Recife","America/Regina","America/Resolute" // 196 + ,"America/Rio_Branco","America/Rosario","America/Santa_Isabel" // 199 + ,"America/Santarem","America/Santiago","America/Santo_Domingo" // 202 + ,"America/Sao_Paulo","America/Scoresbysund","America/Shiprock" // 205 + ,"America/Sitka","America/St_Barthelemy","America/St_Johns" // 208 + ,"America/St_Kitts","America/St_Lucia","America/St_Thomas" // 211 + ,"America/St_Vincent","America/Swift_Current","America/Tegucigalpa" // 214 + ,"America/Thule","America/Thunder_Bay","America/Tijuana" // 217 + ,"America/Toronto","America/Tortola","America/Vancouver" // 220 + ,"America/Virgin","America/Whitehorse","America/Winnipeg" // 223 + ,"America/Yakutat","America/Yellowknife","Antarctica/Casey" // 226 + ,"Antarctica/Davis","Antarctica/DumontDUrville","Antarctica/Macquarie" // 229 + ,"Antarctica/Mawson","Antarctica/McMurdo","Antarctica/Palmer" // 232 + ,"Antarctica/Rothera","Antarctica/South_Pole","Antarctica/Syowa" // 235 + ,"Antarctica/Troll","Antarctica/Vostok","Arctic/Longyearbyen" // 238 + ,"Asia/Aden","Asia/Almaty","Asia/Amman","Asia/Anadyr" // 242 + ,"Asia/Aqtau","Asia/Aqtobe","Asia/Ashgabat","Asia/Ashkhabad" // 246 + ,"Asia/Atyrau","Asia/Baghdad","Asia/Bahrain","Asia/Baku" // 250 + ,"Asia/Bangkok","Asia/Barnaul","Asia/Beirut","Asia/Bishkek" // 254 + ,"Asia/Brunei","Asia/Calcutta","Asia/Chita","Asia/Choibalsan" // 258 + ,"Asia/Chongqing","Asia/Chungking","Asia/Colombo","Asia/Dacca" // 262 + ,"Asia/Damascus","Asia/Dhaka","Asia/Dili","Asia/Dubai" // 266 + ,"Asia/Dushanbe","Asia/Famagusta","Asia/Gaza","Asia/Harbin" // 270 + ,"Asia/Hebron","Asia/Ho_Chi_Minh","Asia/Hong_Kong" // 273 + ,"Asia/Hovd","Asia/Irkutsk","Asia/Istanbul","Asia/Jakarta" // 277 + ,"Asia/Jayapura","Asia/Jerusalem","Asia/Kabul","Asia/Kamchatka" // 281 + ,"Asia/Karachi","Asia/Kashgar","Asia/Kathmandu","Asia/Katmandu" // 285 + ,"Asia/Khandyga","Asia/Kolkata","Asia/Krasnoyarsk" // 288 + ,"Asia/Kuala_Lumpur","Asia/Kuching","Asia/Kuwait","Asia/Macao" // 292 + ,"Asia/Macau","Asia/Magadan","Asia/Makassar","Asia/Manila" // 296 + ,"Asia/Muscat","Asia/Nicosia","Asia/Novokuznetsk","Asia/Novosibirsk" // 300 + ,"Asia/Omsk","Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak" // 304 + ,"Asia/Pyongyang","Asia/Qatar","Asia/Qostanay","Asia/Qyzylorda" // 308 + ,"Asia/Rangoon","Asia/Riyadh","Asia/Saigon","Asia/Sakhalin" // 312 + ,"Asia/Samarkand","Asia/Seoul","Asia/Shanghai","Asia/Singapore" // 316 + ,"Asia/Srednekolymsk","Asia/Taipei","Asia/Tashkent" // 319 + ,"Asia/Tbilisi","Asia/Tehran","Asia/Tel_Aviv","Asia/Thimbu" // 323 + ,"Asia/Thimphu","Asia/Tokyo","Asia/Tomsk","Asia/Ujung_Pandang" // 327 + ,"Asia/Ulaanbaatar","Asia/Ulan_Bator","Asia/Urumqi" // 330 + ,"Asia/Ust-Nera","Asia/Vientiane","Asia/Vladivostok" // 333 + ,"Asia/Yakutsk","Asia/Yangon","Asia/Yekaterinburg" // 336 + ,"Asia/Yerevan","Atlantic/Azores","Atlantic/Bermuda" // 339 + ,"Atlantic/Canary","Atlantic/Cape_Verde","Atlantic/Faeroe" // 342 + ,"Atlantic/Faroe","Atlantic/Jan_Mayen","Atlantic/Madeira" // 345 + ,"Atlantic/Reykjavik","Atlantic/South_Georgia","Atlantic/St_Helena" // 348 + ,"Atlantic/Stanley","Australia/ACT","Australia/Adelaide" // 351 + ,"Australia/Brisbane","Australia/Broken_Hill","Australia/Canberra" // 354 + ,"Australia/Currie","Australia/Darwin","Australia/Eucla" // 357 + ,"Australia/Hobart","Australia/LHI","Australia/Lindeman" // 360 + ,"Australia/Lord_Howe","Australia/Melbourne","Australia/NSW" // 363 + ,"Australia/North","Australia/Perth","Australia/Queensland" // 366 + ,"Australia/South","Australia/Sydney","Australia/Tasmania" // 369 + ,"Australia/Victoria","Australia/West","Australia/Yancowinna" // 372 + ,"BET","BST","Brazil/Acre","Brazil/DeNoronha","Brazil/East" // 377 + ,"Brazil/West","CAT","CET","CNT","CST","CST6CDT","CTT" // 384 + ,"Canada/Atlantic","Canada/Central","Canada/East-Saskatchewan" // 387 + ,"Canada/Eastern","Canada/Mountain","Canada/Newfoundland" // 390 + ,"Canada/Pacific","Canada/Saskatchewan","Canada/Yukon" // 393 + ,"Chile/Continental","Chile/EasterIsland","Cuba","EAT" // 397 + ,"ECT","EET","EST","EST5EDT","Egypt","Eire","Etc/GMT" // 404 + ,"Etc/GMT+0","Etc/GMT+1","Etc/GMT+10","Etc/GMT+11" // 408 + ,"Etc/GMT+12","Etc/GMT+2","Etc/GMT+3","Etc/GMT+4","Etc/GMT+5" // 413 + ,"Etc/GMT+6","Etc/GMT+7","Etc/GMT+8","Etc/GMT+9","Etc/GMT-0" // 418 + ,"Etc/GMT-1","Etc/GMT-10","Etc/GMT-11","Etc/GMT-12" // 422 + ,"Etc/GMT-13","Etc/GMT-14","Etc/GMT-2","Etc/GMT-3" // 426 + ,"Etc/GMT-4","Etc/GMT-5","Etc/GMT-6","Etc/GMT-7","Etc/GMT-8" // 431 + ,"Etc/GMT-9","Etc/GMT0","Etc/Greenwich","Etc/UCT","Etc/UTC" // 436 + ,"Etc/Universal","Etc/Unknown","Etc/Zulu","Europe/Amsterdam" // 440 + ,"Europe/Andorra","Europe/Astrakhan","Europe/Athens" // 443 + ,"Europe/Belfast","Europe/Belgrade","Europe/Berlin" // 446 + ,"Europe/Bratislava","Europe/Brussels","Europe/Bucharest" // 449 + ,"Europe/Budapest","Europe/Busingen","Europe/Chisinau" // 452 + ,"Europe/Copenhagen","Europe/Dublin","Europe/Gibraltar" // 455 + ,"Europe/Guernsey","Europe/Helsinki","Europe/Isle_of_Man" // 458 + ,"Europe/Istanbul","Europe/Jersey","Europe/Kaliningrad" // 461 + ,"Europe/Kiev","Europe/Kirov","Europe/Lisbon","Europe/Ljubljana" // 465 + ,"Europe/London","Europe/Luxembourg","Europe/Madrid" // 468 + ,"Europe/Malta","Europe/Mariehamn","Europe/Minsk","Europe/Monaco" // 472 + ,"Europe/Moscow","Europe/Nicosia","Europe/Oslo","Europe/Paris" // 476 + ,"Europe/Podgorica","Europe/Prague","Europe/Riga","Europe/Rome" // 480 + ,"Europe/Samara","Europe/San_Marino","Europe/Sarajevo" // 483 + ,"Europe/Saratov","Europe/Simferopol","Europe/Skopje" // 486 + ,"Europe/Sofia","Europe/Stockholm","Europe/Tallinn" // 489 + ,"Europe/Tirane","Europe/Tiraspol","Europe/Ulyanovsk" // 492 + ,"Europe/Uzhgorod","Europe/Vaduz","Europe/Vatican" // 495 + ,"Europe/Vienna","Europe/Vilnius","Europe/Volgograd" // 498 + ,"Europe/Warsaw","Europe/Zagreb","Europe/Zaporozhye" // 501 + ,"Europe/Zurich","Factory","GB","GB-Eire","GMT","GMT+0" // 507 + ,"GMT-0","GMT0","Greenwich","HST","Hongkong","IET" // 513 + ,"IST","Iceland","Indian/Antananarivo","Indian/Chagos" // 517 + ,"Indian/Christmas","Indian/Cocos","Indian/Comoro" // 520 + ,"Indian/Kerguelen","Indian/Mahe","Indian/Maldives" // 523 + ,"Indian/Mauritius","Indian/Mayotte","Indian/Reunion" // 526 + ,"Iran","Israel","JST","Jamaica","Japan","Kwajalein" // 532 + ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 538 + ,"Mexico/BajaSur","Mexico/General","NET","NST","NZ" // 543 + ,"NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST","PST8PDT" // 551 + ,"Pacific/Apia","Pacific/Auckland","Pacific/Bougainville" // 554 + ,"Pacific/Chatham","Pacific/Chuuk","Pacific/Easter" // 557 + ,"Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo" // 560 + ,"Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos" // 563 + ,"Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam" // 566 + ,"Pacific/Honolulu","Pacific/Johnston","Pacific/Kiritimati" // 569 + ,"Pacific/Kosrae","Pacific/Kwajalein","Pacific/Majuro" // 572 + ,"Pacific/Marquesas","Pacific/Midway","Pacific/Nauru" // 575 + ,"Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 578 + ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 581 + ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 584 + ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 587 + ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 590 + ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 594 + ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 600 + ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 604 + ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 608 + ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 611 + ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 616 + ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 620 + ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 624 + ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 628 + ,"UTC","Universal","VST","W-SU","WET","Zulu" // 634 } Rules { AN:intvector { @@ -3128,7 +3127,7 @@ zoneinfo64:table(nofallback) { 8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600 } //_#19 Palestine:intvector { - 2, -31, -6, 0, 0, 9, -31, -7, 3600, 0, 3600 + 2, 24, -7, 0, 0, 9, 24, -7, 3600, 0, 3600 } //_#20 Para:intvector { 9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600 @@ -3336,459 +3335,460 @@ zoneinfo64:table(nofallback) { "US", //Z#177 America/North_Dakota/Beulah "US", //Z#178 America/North_Dakota/Center "US", //Z#179 America/North_Dakota/New_Salem - "MX", //Z#180 America/Ojinaga - "PA", //Z#181 America/Panama - "CA", //Z#182 America/Pangnirtung - "SR", //Z#183 America/Paramaribo - "US", //Z#184 America/Phoenix - "HT", //Z#185 America/Port-au-Prince - "TT", //Z#186 America/Port_of_Spain - "BR", //Z#187 America/Porto_Acre - "BR", //Z#188 America/Porto_Velho - "PR", //Z#189 America/Puerto_Rico - "CL", //Z#190 America/Punta_Arenas - "CA", //Z#191 America/Rainy_River - "CA", //Z#192 America/Rankin_Inlet - "BR", //Z#193 America/Recife - "CA", //Z#194 America/Regina - "CA", //Z#195 America/Resolute - "BR", //Z#196 America/Rio_Branco - "AR", //Z#197 America/Rosario - "MX", //Z#198 America/Santa_Isabel - "BR", //Z#199 America/Santarem - "CL", //Z#200 America/Santiago - "DO", //Z#201 America/Santo_Domingo - "BR", //Z#202 America/Sao_Paulo - "GL", //Z#203 America/Scoresbysund - "US", //Z#204 America/Shiprock - "US", //Z#205 America/Sitka - "BL", //Z#206 America/St_Barthelemy - "CA", //Z#207 America/St_Johns - "KN", //Z#208 America/St_Kitts - "LC", //Z#209 America/St_Lucia - "VI", //Z#210 America/St_Thomas - "VC", //Z#211 America/St_Vincent - "CA", //Z#212 America/Swift_Current - "HN", //Z#213 America/Tegucigalpa - "GL", //Z#214 America/Thule - "CA", //Z#215 America/Thunder_Bay - "MX", //Z#216 America/Tijuana - "CA", //Z#217 America/Toronto - "VG", //Z#218 America/Tortola - "CA", //Z#219 America/Vancouver - "TT", //Z#220 America/Virgin - "CA", //Z#221 America/Whitehorse - "CA", //Z#222 America/Winnipeg - "US", //Z#223 America/Yakutat - "CA", //Z#224 America/Yellowknife - "AQ", //Z#225 Antarctica/Casey - "AQ", //Z#226 Antarctica/Davis - "AQ", //Z#227 Antarctica/DumontDUrville - "AU", //Z#228 Antarctica/Macquarie - "AQ", //Z#229 Antarctica/Mawson - "AQ", //Z#230 Antarctica/McMurdo - "AQ", //Z#231 Antarctica/Palmer - "AQ", //Z#232 Antarctica/Rothera - "NZ", //Z#233 Antarctica/South_Pole - "AQ", //Z#234 Antarctica/Syowa - "AQ", //Z#235 Antarctica/Troll - "AQ", //Z#236 Antarctica/Vostok - "SJ", //Z#237 Arctic/Longyearbyen - "YE", //Z#238 Asia/Aden - "KZ", //Z#239 Asia/Almaty - "JO", //Z#240 Asia/Amman - "RU", //Z#241 Asia/Anadyr - "KZ", //Z#242 Asia/Aqtau - "KZ", //Z#243 Asia/Aqtobe - "TM", //Z#244 Asia/Ashgabat - "TM", //Z#245 Asia/Ashkhabad - "KZ", //Z#246 Asia/Atyrau - "IQ", //Z#247 Asia/Baghdad - "BH", //Z#248 Asia/Bahrain - "AZ", //Z#249 Asia/Baku - "TH", //Z#250 Asia/Bangkok - "RU", //Z#251 Asia/Barnaul - "LB", //Z#252 Asia/Beirut - "KG", //Z#253 Asia/Bishkek - "BN", //Z#254 Asia/Brunei - "IN", //Z#255 Asia/Calcutta - "RU", //Z#256 Asia/Chita - "MN", //Z#257 Asia/Choibalsan - "CN", //Z#258 Asia/Chongqing - "CN", //Z#259 Asia/Chungking - "LK", //Z#260 Asia/Colombo - "BD", //Z#261 Asia/Dacca - "SY", //Z#262 Asia/Damascus - "BD", //Z#263 Asia/Dhaka - "TL", //Z#264 Asia/Dili - "AE", //Z#265 Asia/Dubai - "TJ", //Z#266 Asia/Dushanbe - "CY", //Z#267 Asia/Famagusta - "PS", //Z#268 Asia/Gaza - "CN", //Z#269 Asia/Harbin - "PS", //Z#270 Asia/Hebron - "VN", //Z#271 Asia/Ho_Chi_Minh - "HK", //Z#272 Asia/Hong_Kong - "MN", //Z#273 Asia/Hovd - "RU", //Z#274 Asia/Irkutsk - "TR", //Z#275 Asia/Istanbul - "ID", //Z#276 Asia/Jakarta - "ID", //Z#277 Asia/Jayapura - "IL", //Z#278 Asia/Jerusalem - "AF", //Z#279 Asia/Kabul - "RU", //Z#280 Asia/Kamchatka - "PK", //Z#281 Asia/Karachi - "CN", //Z#282 Asia/Kashgar - "NP", //Z#283 Asia/Kathmandu - "NP", //Z#284 Asia/Katmandu - "RU", //Z#285 Asia/Khandyga - "IN", //Z#286 Asia/Kolkata - "RU", //Z#287 Asia/Krasnoyarsk - "MY", //Z#288 Asia/Kuala_Lumpur - "MY", //Z#289 Asia/Kuching - "KW", //Z#290 Asia/Kuwait - "MO", //Z#291 Asia/Macao - "MO", //Z#292 Asia/Macau - "RU", //Z#293 Asia/Magadan - "ID", //Z#294 Asia/Makassar - "PH", //Z#295 Asia/Manila - "OM", //Z#296 Asia/Muscat - "CY", //Z#297 Asia/Nicosia - "RU", //Z#298 Asia/Novokuznetsk - "RU", //Z#299 Asia/Novosibirsk - "RU", //Z#300 Asia/Omsk - "KZ", //Z#301 Asia/Oral - "KH", //Z#302 Asia/Phnom_Penh - "ID", //Z#303 Asia/Pontianak - "KP", //Z#304 Asia/Pyongyang - "QA", //Z#305 Asia/Qatar - "KZ", //Z#306 Asia/Qostanay - "KZ", //Z#307 Asia/Qyzylorda - "MM", //Z#308 Asia/Rangoon - "SA", //Z#309 Asia/Riyadh - "VN", //Z#310 Asia/Saigon - "RU", //Z#311 Asia/Sakhalin - "UZ", //Z#312 Asia/Samarkand - "KR", //Z#313 Asia/Seoul - "CN", //Z#314 Asia/Shanghai - "SG", //Z#315 Asia/Singapore - "RU", //Z#316 Asia/Srednekolymsk - "TW", //Z#317 Asia/Taipei - "UZ", //Z#318 Asia/Tashkent - "GE", //Z#319 Asia/Tbilisi - "IR", //Z#320 Asia/Tehran - "IL", //Z#321 Asia/Tel_Aviv - "BT", //Z#322 Asia/Thimbu - "BT", //Z#323 Asia/Thimphu - "JP", //Z#324 Asia/Tokyo - "RU", //Z#325 Asia/Tomsk - "ID", //Z#326 Asia/Ujung_Pandang - "MN", //Z#327 Asia/Ulaanbaatar - "MN", //Z#328 Asia/Ulan_Bator - "CN", //Z#329 Asia/Urumqi - "RU", //Z#330 Asia/Ust-Nera - "LA", //Z#331 Asia/Vientiane - "RU", //Z#332 Asia/Vladivostok - "RU", //Z#333 Asia/Yakutsk - "MM", //Z#334 Asia/Yangon - "RU", //Z#335 Asia/Yekaterinburg - "AM", //Z#336 Asia/Yerevan - "PT", //Z#337 Atlantic/Azores - "BM", //Z#338 Atlantic/Bermuda - "ES", //Z#339 Atlantic/Canary - "CV", //Z#340 Atlantic/Cape_Verde - "FO", //Z#341 Atlantic/Faeroe - "FO", //Z#342 Atlantic/Faroe - "NO", //Z#343 Atlantic/Jan_Mayen - "PT", //Z#344 Atlantic/Madeira - "IS", //Z#345 Atlantic/Reykjavik - "GS", //Z#346 Atlantic/South_Georgia - "SH", //Z#347 Atlantic/St_Helena - "FK", //Z#348 Atlantic/Stanley - "AU", //Z#349 Australia/ACT - "AU", //Z#350 Australia/Adelaide - "AU", //Z#351 Australia/Brisbane - "AU", //Z#352 Australia/Broken_Hill - "AU", //Z#353 Australia/Canberra - "AU", //Z#354 Australia/Currie - "AU", //Z#355 Australia/Darwin - "AU", //Z#356 Australia/Eucla - "AU", //Z#357 Australia/Hobart - "AU", //Z#358 Australia/LHI - "AU", //Z#359 Australia/Lindeman - "AU", //Z#360 Australia/Lord_Howe - "AU", //Z#361 Australia/Melbourne - "AU", //Z#362 Australia/NSW - "AU", //Z#363 Australia/North - "AU", //Z#364 Australia/Perth - "AU", //Z#365 Australia/Queensland - "AU", //Z#366 Australia/South - "AU", //Z#367 Australia/Sydney - "AU", //Z#368 Australia/Tasmania - "AU", //Z#369 Australia/Victoria - "AU", //Z#370 Australia/West - "AU", //Z#371 Australia/Yancowinna - "BR", //Z#372 BET - "BD", //Z#373 BST - "BR", //Z#374 Brazil/Acre - "BR", //Z#375 Brazil/DeNoronha - "BR", //Z#376 Brazil/East - "BR", //Z#377 Brazil/West - "MZ", //Z#378 CAT - "001",//Z#379 CET - "CA", //Z#380 CNT - "US", //Z#381 CST - "001",//Z#382 CST6CDT - "CN", //Z#383 CTT - "CA", //Z#384 Canada/Atlantic - "CA", //Z#385 Canada/Central - "CA", //Z#386 Canada/East-Saskatchewan - "CA", //Z#387 Canada/Eastern - "CA", //Z#388 Canada/Mountain - "CA", //Z#389 Canada/Newfoundland - "CA", //Z#390 Canada/Pacific - "CA", //Z#391 Canada/Saskatchewan - "CA", //Z#392 Canada/Yukon - "CL", //Z#393 Chile/Continental - "CL", //Z#394 Chile/EasterIsland - "CU", //Z#395 Cuba - "KE", //Z#396 EAT - "FR", //Z#397 ECT - "001",//Z#398 EET - "001",//Z#399 EST - "001",//Z#400 EST5EDT - "EG", //Z#401 Egypt - "IE", //Z#402 Eire - "001",//Z#403 Etc/GMT - "001",//Z#404 Etc/GMT+0 - "001",//Z#405 Etc/GMT+1 - "001",//Z#406 Etc/GMT+10 - "001",//Z#407 Etc/GMT+11 - "001",//Z#408 Etc/GMT+12 - "001",//Z#409 Etc/GMT+2 - "001",//Z#410 Etc/GMT+3 - "001",//Z#411 Etc/GMT+4 - "001",//Z#412 Etc/GMT+5 - "001",//Z#413 Etc/GMT+6 - "001",//Z#414 Etc/GMT+7 - "001",//Z#415 Etc/GMT+8 - "001",//Z#416 Etc/GMT+9 - "001",//Z#417 Etc/GMT-0 - "001",//Z#418 Etc/GMT-1 - "001",//Z#419 Etc/GMT-10 - "001",//Z#420 Etc/GMT-11 - "001",//Z#421 Etc/GMT-12 - "001",//Z#422 Etc/GMT-13 - "001",//Z#423 Etc/GMT-14 - "001",//Z#424 Etc/GMT-2 - "001",//Z#425 Etc/GMT-3 - "001",//Z#426 Etc/GMT-4 - "001",//Z#427 Etc/GMT-5 - "001",//Z#428 Etc/GMT-6 - "001",//Z#429 Etc/GMT-7 - "001",//Z#430 Etc/GMT-8 - "001",//Z#431 Etc/GMT-9 - "001",//Z#432 Etc/GMT0 - "001",//Z#433 Etc/Greenwich - "001",//Z#434 Etc/UCT - "001",//Z#435 Etc/UTC - "001",//Z#436 Etc/Universal - "001",//Z#437 Etc/Unknown - "001",//Z#438 Etc/Zulu - "NL", //Z#439 Europe/Amsterdam - "AD", //Z#440 Europe/Andorra - "RU", //Z#441 Europe/Astrakhan - "GR", //Z#442 Europe/Athens - "GB", //Z#443 Europe/Belfast - "RS", //Z#444 Europe/Belgrade - "DE", //Z#445 Europe/Berlin - "SK", //Z#446 Europe/Bratislava - "BE", //Z#447 Europe/Brussels - "RO", //Z#448 Europe/Bucharest - "HU", //Z#449 Europe/Budapest - "DE", //Z#450 Europe/Busingen - "MD", //Z#451 Europe/Chisinau - "DK", //Z#452 Europe/Copenhagen - "IE", //Z#453 Europe/Dublin - "GI", //Z#454 Europe/Gibraltar - "GG", //Z#455 Europe/Guernsey - "FI", //Z#456 Europe/Helsinki - "IM", //Z#457 Europe/Isle_of_Man - "TR", //Z#458 Europe/Istanbul - "JE", //Z#459 Europe/Jersey - "RU", //Z#460 Europe/Kaliningrad - "UA", //Z#461 Europe/Kiev - "RU", //Z#462 Europe/Kirov - "PT", //Z#463 Europe/Lisbon - "SI", //Z#464 Europe/Ljubljana - "GB", //Z#465 Europe/London - "LU", //Z#466 Europe/Luxembourg - "ES", //Z#467 Europe/Madrid - "MT", //Z#468 Europe/Malta - "AX", //Z#469 Europe/Mariehamn - "BY", //Z#470 Europe/Minsk - "MC", //Z#471 Europe/Monaco - "RU", //Z#472 Europe/Moscow - "CY", //Z#473 Europe/Nicosia - "NO", //Z#474 Europe/Oslo - "FR", //Z#475 Europe/Paris - "ME", //Z#476 Europe/Podgorica - "CZ", //Z#477 Europe/Prague - "LV", //Z#478 Europe/Riga - "IT", //Z#479 Europe/Rome - "RU", //Z#480 Europe/Samara - "SM", //Z#481 Europe/San_Marino - "BA", //Z#482 Europe/Sarajevo - "RU", //Z#483 Europe/Saratov - "UA", //Z#484 Europe/Simferopol - "MK", //Z#485 Europe/Skopje - "BG", //Z#486 Europe/Sofia - "SE", //Z#487 Europe/Stockholm - "EE", //Z#488 Europe/Tallinn - "AL", //Z#489 Europe/Tirane - "MD", //Z#490 Europe/Tiraspol - "RU", //Z#491 Europe/Ulyanovsk - "UA", //Z#492 Europe/Uzhgorod - "LI", //Z#493 Europe/Vaduz - "VA", //Z#494 Europe/Vatican - "AT", //Z#495 Europe/Vienna - "LT", //Z#496 Europe/Vilnius - "RU", //Z#497 Europe/Volgograd - "PL", //Z#498 Europe/Warsaw - "HR", //Z#499 Europe/Zagreb - "UA", //Z#500 Europe/Zaporozhye - "CH", //Z#501 Europe/Zurich - "001",//Z#502 Factory - "GB", //Z#503 GB - "GB", //Z#504 GB-Eire - "001",//Z#505 GMT - "001",//Z#506 GMT+0 - "001",//Z#507 GMT-0 - "001",//Z#508 GMT0 - "001",//Z#509 Greenwich - "001",//Z#510 HST - "HK", //Z#511 Hongkong - "US", //Z#512 IET - "IN", //Z#513 IST - "IS", //Z#514 Iceland - "MG", //Z#515 Indian/Antananarivo - "IO", //Z#516 Indian/Chagos - "CX", //Z#517 Indian/Christmas - "CC", //Z#518 Indian/Cocos - "KM", //Z#519 Indian/Comoro - "TF", //Z#520 Indian/Kerguelen - "SC", //Z#521 Indian/Mahe - "MV", //Z#522 Indian/Maldives - "MU", //Z#523 Indian/Mauritius - "YT", //Z#524 Indian/Mayotte - "RE", //Z#525 Indian/Reunion - "IR", //Z#526 Iran - "IL", //Z#527 Israel - "JP", //Z#528 JST - "JM", //Z#529 Jamaica - "JP", //Z#530 Japan - "MH", //Z#531 Kwajalein - "LY", //Z#532 Libya - "001",//Z#533 MET - "WS", //Z#534 MIT - "001",//Z#535 MST - "001",//Z#536 MST7MDT - "MX", //Z#537 Mexico/BajaNorte - "MX", //Z#538 Mexico/BajaSur - "MX", //Z#539 Mexico/General - "AM", //Z#540 NET - "NZ", //Z#541 NST - "NZ", //Z#542 NZ - "NZ", //Z#543 NZ-CHAT - "US", //Z#544 Navajo - "PK", //Z#545 PLT - "US", //Z#546 PNT - "CN", //Z#547 PRC - "PR", //Z#548 PRT - "US", //Z#549 PST - "001",//Z#550 PST8PDT - "WS", //Z#551 Pacific/Apia - "NZ", //Z#552 Pacific/Auckland - "PG", //Z#553 Pacific/Bougainville - "NZ", //Z#554 Pacific/Chatham - "FM", //Z#555 Pacific/Chuuk - "CL", //Z#556 Pacific/Easter - "VU", //Z#557 Pacific/Efate - "KI", //Z#558 Pacific/Enderbury - "TK", //Z#559 Pacific/Fakaofo - "FJ", //Z#560 Pacific/Fiji - "TV", //Z#561 Pacific/Funafuti - "EC", //Z#562 Pacific/Galapagos - "PF", //Z#563 Pacific/Gambier - "SB", //Z#564 Pacific/Guadalcanal - "GU", //Z#565 Pacific/Guam - "US", //Z#566 Pacific/Honolulu - "UM", //Z#567 Pacific/Johnston - "KI", //Z#568 Pacific/Kiritimati - "FM", //Z#569 Pacific/Kosrae - "MH", //Z#570 Pacific/Kwajalein - "MH", //Z#571 Pacific/Majuro - "PF", //Z#572 Pacific/Marquesas - "UM", //Z#573 Pacific/Midway - "NR", //Z#574 Pacific/Nauru - "NU", //Z#575 Pacific/Niue - "NF", //Z#576 Pacific/Norfolk - "NC", //Z#577 Pacific/Noumea - "AS", //Z#578 Pacific/Pago_Pago - "PW", //Z#579 Pacific/Palau - "PN", //Z#580 Pacific/Pitcairn - "FM", //Z#581 Pacific/Pohnpei - "FM", //Z#582 Pacific/Ponape - "PG", //Z#583 Pacific/Port_Moresby - "CK", //Z#584 Pacific/Rarotonga - "MP", //Z#585 Pacific/Saipan - "AS", //Z#586 Pacific/Samoa - "PF", //Z#587 Pacific/Tahiti - "KI", //Z#588 Pacific/Tarawa - "TO", //Z#589 Pacific/Tongatapu - "FM", //Z#590 Pacific/Truk - "UM", //Z#591 Pacific/Wake - "WF", //Z#592 Pacific/Wallis - "FM", //Z#593 Pacific/Yap - "PL", //Z#594 Poland - "PT", //Z#595 Portugal - "TW", //Z#596 ROC - "KR", //Z#597 ROK - "SB", //Z#598 SST - "SG", //Z#599 Singapore - "001",//Z#600 SystemV/AST4 - "001",//Z#601 SystemV/AST4ADT - "001",//Z#602 SystemV/CST6 - "001",//Z#603 SystemV/CST6CDT - "001",//Z#604 SystemV/EST5 - "001",//Z#605 SystemV/EST5EDT - "001",//Z#606 SystemV/HST10 - "001",//Z#607 SystemV/MST7 - "001",//Z#608 SystemV/MST7MDT - "001",//Z#609 SystemV/PST8 - "001",//Z#610 SystemV/PST8PDT - "001",//Z#611 SystemV/YST9 - "001",//Z#612 SystemV/YST9YDT - "TR", //Z#613 Turkey - "001",//Z#614 UCT - "US", //Z#615 US/Alaska - "US", //Z#616 US/Aleutian - "US", //Z#617 US/Arizona - "US", //Z#618 US/Central - "US", //Z#619 US/East-Indiana - "US", //Z#620 US/Eastern - "US", //Z#621 US/Hawaii - "US", //Z#622 US/Indiana-Starke - "US", //Z#623 US/Michigan - "US", //Z#624 US/Mountain - "US", //Z#625 US/Pacific - "US", //Z#626 US/Pacific-New - "AS", //Z#627 US/Samoa - "001",//Z#628 UTC - "001",//Z#629 Universal - "VN", //Z#630 VST - "RU", //Z#631 W-SU - "001",//Z#632 WET - "001",//Z#633 Zulu + "GL", //Z#180 America/Nuuk + "MX", //Z#181 America/Ojinaga + "PA", //Z#182 America/Panama + "CA", //Z#183 America/Pangnirtung + "SR", //Z#184 America/Paramaribo + "US", //Z#185 America/Phoenix + "HT", //Z#186 America/Port-au-Prince + "TT", //Z#187 America/Port_of_Spain + "BR", //Z#188 America/Porto_Acre + "BR", //Z#189 America/Porto_Velho + "PR", //Z#190 America/Puerto_Rico + "CL", //Z#191 America/Punta_Arenas + "CA", //Z#192 America/Rainy_River + "CA", //Z#193 America/Rankin_Inlet + "BR", //Z#194 America/Recife + "CA", //Z#195 America/Regina + "CA", //Z#196 America/Resolute + "BR", //Z#197 America/Rio_Branco + "AR", //Z#198 America/Rosario + "MX", //Z#199 America/Santa_Isabel + "BR", //Z#200 America/Santarem + "CL", //Z#201 America/Santiago + "DO", //Z#202 America/Santo_Domingo + "BR", //Z#203 America/Sao_Paulo + "GL", //Z#204 America/Scoresbysund + "US", //Z#205 America/Shiprock + "US", //Z#206 America/Sitka + "BL", //Z#207 America/St_Barthelemy + "CA", //Z#208 America/St_Johns + "KN", //Z#209 America/St_Kitts + "LC", //Z#210 America/St_Lucia + "VI", //Z#211 America/St_Thomas + "VC", //Z#212 America/St_Vincent + "CA", //Z#213 America/Swift_Current + "HN", //Z#214 America/Tegucigalpa + "GL", //Z#215 America/Thule + "CA", //Z#216 America/Thunder_Bay + "MX", //Z#217 America/Tijuana + "CA", //Z#218 America/Toronto + "VG", //Z#219 America/Tortola + "CA", //Z#220 America/Vancouver + "TT", //Z#221 America/Virgin + "CA", //Z#222 America/Whitehorse + "CA", //Z#223 America/Winnipeg + "US", //Z#224 America/Yakutat + "CA", //Z#225 America/Yellowknife + "AQ", //Z#226 Antarctica/Casey + "AQ", //Z#227 Antarctica/Davis + "AQ", //Z#228 Antarctica/DumontDUrville + "AU", //Z#229 Antarctica/Macquarie + "AQ", //Z#230 Antarctica/Mawson + "AQ", //Z#231 Antarctica/McMurdo + "AQ", //Z#232 Antarctica/Palmer + "AQ", //Z#233 Antarctica/Rothera + "NZ", //Z#234 Antarctica/South_Pole + "AQ", //Z#235 Antarctica/Syowa + "AQ", //Z#236 Antarctica/Troll + "AQ", //Z#237 Antarctica/Vostok + "SJ", //Z#238 Arctic/Longyearbyen + "YE", //Z#239 Asia/Aden + "KZ", //Z#240 Asia/Almaty + "JO", //Z#241 Asia/Amman + "RU", //Z#242 Asia/Anadyr + "KZ", //Z#243 Asia/Aqtau + "KZ", //Z#244 Asia/Aqtobe + "TM", //Z#245 Asia/Ashgabat + "TM", //Z#246 Asia/Ashkhabad + "KZ", //Z#247 Asia/Atyrau + "IQ", //Z#248 Asia/Baghdad + "BH", //Z#249 Asia/Bahrain + "AZ", //Z#250 Asia/Baku + "TH", //Z#251 Asia/Bangkok + "RU", //Z#252 Asia/Barnaul + "LB", //Z#253 Asia/Beirut + "KG", //Z#254 Asia/Bishkek + "BN", //Z#255 Asia/Brunei + "IN", //Z#256 Asia/Calcutta + "RU", //Z#257 Asia/Chita + "MN", //Z#258 Asia/Choibalsan + "CN", //Z#259 Asia/Chongqing + "CN", //Z#260 Asia/Chungking + "LK", //Z#261 Asia/Colombo + "BD", //Z#262 Asia/Dacca + "SY", //Z#263 Asia/Damascus + "BD", //Z#264 Asia/Dhaka + "TL", //Z#265 Asia/Dili + "AE", //Z#266 Asia/Dubai + "TJ", //Z#267 Asia/Dushanbe + "CY", //Z#268 Asia/Famagusta + "PS", //Z#269 Asia/Gaza + "CN", //Z#270 Asia/Harbin + "PS", //Z#271 Asia/Hebron + "VN", //Z#272 Asia/Ho_Chi_Minh + "HK", //Z#273 Asia/Hong_Kong + "MN", //Z#274 Asia/Hovd + "RU", //Z#275 Asia/Irkutsk + "TR", //Z#276 Asia/Istanbul + "ID", //Z#277 Asia/Jakarta + "ID", //Z#278 Asia/Jayapura + "IL", //Z#279 Asia/Jerusalem + "AF", //Z#280 Asia/Kabul + "RU", //Z#281 Asia/Kamchatka + "PK", //Z#282 Asia/Karachi + "CN", //Z#283 Asia/Kashgar + "NP", //Z#284 Asia/Kathmandu + "NP", //Z#285 Asia/Katmandu + "RU", //Z#286 Asia/Khandyga + "IN", //Z#287 Asia/Kolkata + "RU", //Z#288 Asia/Krasnoyarsk + "MY", //Z#289 Asia/Kuala_Lumpur + "MY", //Z#290 Asia/Kuching + "KW", //Z#291 Asia/Kuwait + "MO", //Z#292 Asia/Macao + "MO", //Z#293 Asia/Macau + "RU", //Z#294 Asia/Magadan + "ID", //Z#295 Asia/Makassar + "PH", //Z#296 Asia/Manila + "OM", //Z#297 Asia/Muscat + "CY", //Z#298 Asia/Nicosia + "RU", //Z#299 Asia/Novokuznetsk + "RU", //Z#300 Asia/Novosibirsk + "RU", //Z#301 Asia/Omsk + "KZ", //Z#302 Asia/Oral + "KH", //Z#303 Asia/Phnom_Penh + "ID", //Z#304 Asia/Pontianak + "KP", //Z#305 Asia/Pyongyang + "QA", //Z#306 Asia/Qatar + "KZ", //Z#307 Asia/Qostanay + "KZ", //Z#308 Asia/Qyzylorda + "MM", //Z#309 Asia/Rangoon + "SA", //Z#310 Asia/Riyadh + "VN", //Z#311 Asia/Saigon + "RU", //Z#312 Asia/Sakhalin + "UZ", //Z#313 Asia/Samarkand + "KR", //Z#314 Asia/Seoul + "CN", //Z#315 Asia/Shanghai + "SG", //Z#316 Asia/Singapore + "RU", //Z#317 Asia/Srednekolymsk + "TW", //Z#318 Asia/Taipei + "UZ", //Z#319 Asia/Tashkent + "GE", //Z#320 Asia/Tbilisi + "IR", //Z#321 Asia/Tehran + "IL", //Z#322 Asia/Tel_Aviv + "BT", //Z#323 Asia/Thimbu + "BT", //Z#324 Asia/Thimphu + "JP", //Z#325 Asia/Tokyo + "RU", //Z#326 Asia/Tomsk + "ID", //Z#327 Asia/Ujung_Pandang + "MN", //Z#328 Asia/Ulaanbaatar + "MN", //Z#329 Asia/Ulan_Bator + "CN", //Z#330 Asia/Urumqi + "RU", //Z#331 Asia/Ust-Nera + "LA", //Z#332 Asia/Vientiane + "RU", //Z#333 Asia/Vladivostok + "RU", //Z#334 Asia/Yakutsk + "MM", //Z#335 Asia/Yangon + "RU", //Z#336 Asia/Yekaterinburg + "AM", //Z#337 Asia/Yerevan + "PT", //Z#338 Atlantic/Azores + "BM", //Z#339 Atlantic/Bermuda + "ES", //Z#340 Atlantic/Canary + "CV", //Z#341 Atlantic/Cape_Verde + "FO", //Z#342 Atlantic/Faeroe + "FO", //Z#343 Atlantic/Faroe + "NO", //Z#344 Atlantic/Jan_Mayen + "PT", //Z#345 Atlantic/Madeira + "IS", //Z#346 Atlantic/Reykjavik + "GS", //Z#347 Atlantic/South_Georgia + "SH", //Z#348 Atlantic/St_Helena + "FK", //Z#349 Atlantic/Stanley + "AU", //Z#350 Australia/ACT + "AU", //Z#351 Australia/Adelaide + "AU", //Z#352 Australia/Brisbane + "AU", //Z#353 Australia/Broken_Hill + "AU", //Z#354 Australia/Canberra + "AU", //Z#355 Australia/Currie + "AU", //Z#356 Australia/Darwin + "AU", //Z#357 Australia/Eucla + "AU", //Z#358 Australia/Hobart + "AU", //Z#359 Australia/LHI + "AU", //Z#360 Australia/Lindeman + "AU", //Z#361 Australia/Lord_Howe + "AU", //Z#362 Australia/Melbourne + "AU", //Z#363 Australia/NSW + "AU", //Z#364 Australia/North + "AU", //Z#365 Australia/Perth + "AU", //Z#366 Australia/Queensland + "AU", //Z#367 Australia/South + "AU", //Z#368 Australia/Sydney + "AU", //Z#369 Australia/Tasmania + "AU", //Z#370 Australia/Victoria + "AU", //Z#371 Australia/West + "AU", //Z#372 Australia/Yancowinna + "BR", //Z#373 BET + "BD", //Z#374 BST + "BR", //Z#375 Brazil/Acre + "BR", //Z#376 Brazil/DeNoronha + "BR", //Z#377 Brazil/East + "BR", //Z#378 Brazil/West + "MZ", //Z#379 CAT + "001",//Z#380 CET + "CA", //Z#381 CNT + "US", //Z#382 CST + "001",//Z#383 CST6CDT + "CN", //Z#384 CTT + "CA", //Z#385 Canada/Atlantic + "CA", //Z#386 Canada/Central + "CA", //Z#387 Canada/East-Saskatchewan + "CA", //Z#388 Canada/Eastern + "CA", //Z#389 Canada/Mountain + "CA", //Z#390 Canada/Newfoundland + "CA", //Z#391 Canada/Pacific + "CA", //Z#392 Canada/Saskatchewan + "CA", //Z#393 Canada/Yukon + "CL", //Z#394 Chile/Continental + "CL", //Z#395 Chile/EasterIsland + "CU", //Z#396 Cuba + "KE", //Z#397 EAT + "FR", //Z#398 ECT + "001",//Z#399 EET + "001",//Z#400 EST + "001",//Z#401 EST5EDT + "EG", //Z#402 Egypt + "IE", //Z#403 Eire + "001",//Z#404 Etc/GMT + "001",//Z#405 Etc/GMT+0 + "001",//Z#406 Etc/GMT+1 + "001",//Z#407 Etc/GMT+10 + "001",//Z#408 Etc/GMT+11 + "001",//Z#409 Etc/GMT+12 + "001",//Z#410 Etc/GMT+2 + "001",//Z#411 Etc/GMT+3 + "001",//Z#412 Etc/GMT+4 + "001",//Z#413 Etc/GMT+5 + "001",//Z#414 Etc/GMT+6 + "001",//Z#415 Etc/GMT+7 + "001",//Z#416 Etc/GMT+8 + "001",//Z#417 Etc/GMT+9 + "001",//Z#418 Etc/GMT-0 + "001",//Z#419 Etc/GMT-1 + "001",//Z#420 Etc/GMT-10 + "001",//Z#421 Etc/GMT-11 + "001",//Z#422 Etc/GMT-12 + "001",//Z#423 Etc/GMT-13 + "001",//Z#424 Etc/GMT-14 + "001",//Z#425 Etc/GMT-2 + "001",//Z#426 Etc/GMT-3 + "001",//Z#427 Etc/GMT-4 + "001",//Z#428 Etc/GMT-5 + "001",//Z#429 Etc/GMT-6 + "001",//Z#430 Etc/GMT-7 + "001",//Z#431 Etc/GMT-8 + "001",//Z#432 Etc/GMT-9 + "001",//Z#433 Etc/GMT0 + "001",//Z#434 Etc/Greenwich + "001",//Z#435 Etc/UCT + "001",//Z#436 Etc/UTC + "001",//Z#437 Etc/Universal + "001",//Z#438 Etc/Unknown + "001",//Z#439 Etc/Zulu + "NL", //Z#440 Europe/Amsterdam + "AD", //Z#441 Europe/Andorra + "RU", //Z#442 Europe/Astrakhan + "GR", //Z#443 Europe/Athens + "GB", //Z#444 Europe/Belfast + "RS", //Z#445 Europe/Belgrade + "DE", //Z#446 Europe/Berlin + "SK", //Z#447 Europe/Bratislava + "BE", //Z#448 Europe/Brussels + "RO", //Z#449 Europe/Bucharest + "HU", //Z#450 Europe/Budapest + "DE", //Z#451 Europe/Busingen + "MD", //Z#452 Europe/Chisinau + "DK", //Z#453 Europe/Copenhagen + "IE", //Z#454 Europe/Dublin + "GI", //Z#455 Europe/Gibraltar + "GG", //Z#456 Europe/Guernsey + "FI", //Z#457 Europe/Helsinki + "IM", //Z#458 Europe/Isle_of_Man + "TR", //Z#459 Europe/Istanbul + "JE", //Z#460 Europe/Jersey + "RU", //Z#461 Europe/Kaliningrad + "UA", //Z#462 Europe/Kiev + "RU", //Z#463 Europe/Kirov + "PT", //Z#464 Europe/Lisbon + "SI", //Z#465 Europe/Ljubljana + "GB", //Z#466 Europe/London + "LU", //Z#467 Europe/Luxembourg + "ES", //Z#468 Europe/Madrid + "MT", //Z#469 Europe/Malta + "AX", //Z#470 Europe/Mariehamn + "BY", //Z#471 Europe/Minsk + "MC", //Z#472 Europe/Monaco + "RU", //Z#473 Europe/Moscow + "CY", //Z#474 Europe/Nicosia + "NO", //Z#475 Europe/Oslo + "FR", //Z#476 Europe/Paris + "ME", //Z#477 Europe/Podgorica + "CZ", //Z#478 Europe/Prague + "LV", //Z#479 Europe/Riga + "IT", //Z#480 Europe/Rome + "RU", //Z#481 Europe/Samara + "SM", //Z#482 Europe/San_Marino + "BA", //Z#483 Europe/Sarajevo + "RU", //Z#484 Europe/Saratov + "UA", //Z#485 Europe/Simferopol + "MK", //Z#486 Europe/Skopje + "BG", //Z#487 Europe/Sofia + "SE", //Z#488 Europe/Stockholm + "EE", //Z#489 Europe/Tallinn + "AL", //Z#490 Europe/Tirane + "MD", //Z#491 Europe/Tiraspol + "RU", //Z#492 Europe/Ulyanovsk + "UA", //Z#493 Europe/Uzhgorod + "LI", //Z#494 Europe/Vaduz + "VA", //Z#495 Europe/Vatican + "AT", //Z#496 Europe/Vienna + "LT", //Z#497 Europe/Vilnius + "RU", //Z#498 Europe/Volgograd + "PL", //Z#499 Europe/Warsaw + "HR", //Z#500 Europe/Zagreb + "UA", //Z#501 Europe/Zaporozhye + "CH", //Z#502 Europe/Zurich + "001",//Z#503 Factory + "GB", //Z#504 GB + "GB", //Z#505 GB-Eire + "001",//Z#506 GMT + "001",//Z#507 GMT+0 + "001",//Z#508 GMT-0 + "001",//Z#509 GMT0 + "001",//Z#510 Greenwich + "001",//Z#511 HST + "HK", //Z#512 Hongkong + "US", //Z#513 IET + "IN", //Z#514 IST + "IS", //Z#515 Iceland + "MG", //Z#516 Indian/Antananarivo + "IO", //Z#517 Indian/Chagos + "CX", //Z#518 Indian/Christmas + "CC", //Z#519 Indian/Cocos + "KM", //Z#520 Indian/Comoro + "TF", //Z#521 Indian/Kerguelen + "SC", //Z#522 Indian/Mahe + "MV", //Z#523 Indian/Maldives + "MU", //Z#524 Indian/Mauritius + "YT", //Z#525 Indian/Mayotte + "RE", //Z#526 Indian/Reunion + "IR", //Z#527 Iran + "IL", //Z#528 Israel + "JP", //Z#529 JST + "JM", //Z#530 Jamaica + "JP", //Z#531 Japan + "MH", //Z#532 Kwajalein + "LY", //Z#533 Libya + "001",//Z#534 MET + "WS", //Z#535 MIT + "001",//Z#536 MST + "001",//Z#537 MST7MDT + "MX", //Z#538 Mexico/BajaNorte + "MX", //Z#539 Mexico/BajaSur + "MX", //Z#540 Mexico/General + "AM", //Z#541 NET + "NZ", //Z#542 NST + "NZ", //Z#543 NZ + "NZ", //Z#544 NZ-CHAT + "US", //Z#545 Navajo + "PK", //Z#546 PLT + "US", //Z#547 PNT + "CN", //Z#548 PRC + "PR", //Z#549 PRT + "US", //Z#550 PST + "001",//Z#551 PST8PDT + "WS", //Z#552 Pacific/Apia + "NZ", //Z#553 Pacific/Auckland + "PG", //Z#554 Pacific/Bougainville + "NZ", //Z#555 Pacific/Chatham + "FM", //Z#556 Pacific/Chuuk + "CL", //Z#557 Pacific/Easter + "VU", //Z#558 Pacific/Efate + "KI", //Z#559 Pacific/Enderbury + "TK", //Z#560 Pacific/Fakaofo + "FJ", //Z#561 Pacific/Fiji + "TV", //Z#562 Pacific/Funafuti + "EC", //Z#563 Pacific/Galapagos + "PF", //Z#564 Pacific/Gambier + "SB", //Z#565 Pacific/Guadalcanal + "GU", //Z#566 Pacific/Guam + "US", //Z#567 Pacific/Honolulu + "UM", //Z#568 Pacific/Johnston + "KI", //Z#569 Pacific/Kiritimati + "FM", //Z#570 Pacific/Kosrae + "MH", //Z#571 Pacific/Kwajalein + "MH", //Z#572 Pacific/Majuro + "PF", //Z#573 Pacific/Marquesas + "UM", //Z#574 Pacific/Midway + "NR", //Z#575 Pacific/Nauru + "NU", //Z#576 Pacific/Niue + "NF", //Z#577 Pacific/Norfolk + "NC", //Z#578 Pacific/Noumea + "AS", //Z#579 Pacific/Pago_Pago + "PW", //Z#580 Pacific/Palau + "PN", //Z#581 Pacific/Pitcairn + "FM", //Z#582 Pacific/Pohnpei + "FM", //Z#583 Pacific/Ponape + "PG", //Z#584 Pacific/Port_Moresby + "CK", //Z#585 Pacific/Rarotonga + "MP", //Z#586 Pacific/Saipan + "AS", //Z#587 Pacific/Samoa + "PF", //Z#588 Pacific/Tahiti + "KI", //Z#589 Pacific/Tarawa + "TO", //Z#590 Pacific/Tongatapu + "FM", //Z#591 Pacific/Truk + "UM", //Z#592 Pacific/Wake + "WF", //Z#593 Pacific/Wallis + "FM", //Z#594 Pacific/Yap + "PL", //Z#595 Poland + "PT", //Z#596 Portugal + "TW", //Z#597 ROC + "KR", //Z#598 ROK + "SB", //Z#599 SST + "SG", //Z#600 Singapore + "001",//Z#601 SystemV/AST4 + "001",//Z#602 SystemV/AST4ADT + "001",//Z#603 SystemV/CST6 + "001",//Z#604 SystemV/CST6CDT + "001",//Z#605 SystemV/EST5 + "001",//Z#606 SystemV/EST5EDT + "001",//Z#607 SystemV/HST10 + "001",//Z#608 SystemV/MST7 + "001",//Z#609 SystemV/MST7MDT + "001",//Z#610 SystemV/PST8 + "001",//Z#611 SystemV/PST8PDT + "001",//Z#612 SystemV/YST9 + "001",//Z#613 SystemV/YST9YDT + "TR", //Z#614 Turkey + "001",//Z#615 UCT + "US", //Z#616 US/Alaska + "US", //Z#617 US/Aleutian + "US", //Z#618 US/Arizona + "US", //Z#619 US/Central + "US", //Z#620 US/East-Indiana + "US", //Z#621 US/Eastern + "US", //Z#622 US/Hawaii + "US", //Z#623 US/Indiana-Starke + "US", //Z#624 US/Michigan + "US", //Z#625 US/Mountain + "US", //Z#626 US/Pacific + "US", //Z#627 US/Pacific-New + "AS", //Z#628 US/Samoa + "001",//Z#629 UTC + "001",//Z#630 Universal + "VN", //Z#631 VST + "RU", //Z#632 W-SU + "001",//Z#633 WET + "001",//Z#634 Zulu } } diff --git a/intl/icu/source/data/rbnf/LOCALE_DEPS.json b/intl/icu/source/data/rbnf/LOCALE_DEPS.json index 55eca8a1661c..fff38f70760f 100644 --- a/intl/icu/source/data/rbnf/LOCALE_DEPS.json +++ b/intl/icu/source/data/rbnf/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "in": "id", diff --git a/intl/icu/source/data/rbnf/af.txt b/intl/icu/source/data/rbnf/af.txt index 3ddd28b39d46..41b0e584c286 100644 --- a/intl/icu/source/data/rbnf/af.txt +++ b/intl/icu/source/data/rbnf/af.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ RBNFRules{ OrdinalRules{ @@ -89,5 +90,4 @@ af{ "1000000000000000000: =#,##0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ak.txt b/intl/icu/source/data/rbnf/ak.txt index bbd2e25f3823..9e540ab6a53c 100644 --- a/intl/icu/source/data/rbnf/ak.txt +++ b/intl/icu/source/data/rbnf/ak.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak{ RBNFRules{ SpelloutRules{ @@ -57,5 +58,4 @@ ak{ "2: a-\u025B-t\u0254-so-=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/am.txt b/intl/icu/source/data/rbnf/am.txt index d853cf4f6155..d6860815a8b0 100644 --- a/intl/icu/source/data/rbnf/am.txt +++ b/intl/icu/source/data/rbnf/am.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ RBNFRules{ OrdinalRules{ @@ -47,5 +48,4 @@ am{ "0: =%spellout-numbering=\u129B;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ar.txt b/intl/icu/source/data/rbnf/ar.txt index e86e8ea228a1..add397998bfc 100644 --- a/intl/icu/source/data/rbnf/ar.txt +++ b/intl/icu/source/data/rbnf/ar.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ RBNFRules{ OrdinalRules{ @@ -281,5 +282,4 @@ ar{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ar_SA.txt b/intl/icu/source/data/rbnf/ar_SA.txt index d65944bd1360..a848e8bc9ce7 100644 --- a/intl/icu/source/data/rbnf/ar_SA.txt +++ b/intl/icu/source/data/rbnf/ar_SA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/rbnf/ars.txt b/intl/icu/source/data/rbnf/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/rbnf/ars.txt +++ b/intl/icu/source/data/rbnf/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/rbnf/az.txt b/intl/icu/source/data/rbnf/az.txt index f4dec6a8fcaa..6828a8f9561c 100644 --- a/intl/icu/source/data/rbnf/az.txt +++ b/intl/icu/source/data/rbnf/az.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ RBNFRules{ OrdinalRules{ @@ -90,5 +91,4 @@ az{ "1000000000000000000: =#,##0='inci;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/be.txt b/intl/icu/source/data/rbnf/be.txt index 0475508f1113..ab48fb9469be 100644 --- a/intl/icu/source/data/rbnf/be.txt +++ b/intl/icu/source/data/rbnf/be.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be{ RBNFRules{ SpelloutRules{ @@ -394,5 +395,4 @@ be{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/bg.txt b/intl/icu/source/data/rbnf/bg.txt index f3a129da7dec..7a73e62f896d 100644 --- a/intl/icu/source/data/rbnf/bg.txt +++ b/intl/icu/source/data/rbnf/bg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ RBNFRules{ SpelloutRules{ @@ -98,5 +99,4 @@ bg{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/bs.txt b/intl/icu/source/data/rbnf/bs.txt index 115a6ff53cf2..6cad7dfe5488 100644 --- a/intl/icu/source/data/rbnf/bs.txt +++ b/intl/icu/source/data/rbnf/bs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs{ RBNFRules{ SpelloutRules{ @@ -116,5 +117,4 @@ bs{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ca.txt b/intl/icu/source/data/rbnf/ca.txt index fbe9c3f3812f..1feabb4c6e20 100644 --- a/intl/icu/source/data/rbnf/ca.txt +++ b/intl/icu/source/data/rbnf/ca.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca{ RBNFRules{ OrdinalRules{ @@ -255,5 +256,4 @@ ca{ "1000000000000000000: =#,##0=ena;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ccp.txt b/intl/icu/source/data/rbnf/ccp.txt index 644a4d8f2d3f..4a1c4df3a1c0 100644 --- a/intl/icu/source/data/rbnf/ccp.txt +++ b/intl/icu/source/data/rbnf/ccp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp{ RBNFRules{ SpelloutRules{ @@ -51,5 +52,4 @@ ccp{ "0: =%spellout-numbering= \U0001111B\U00011133\U00011106\U00011118\U00011133\U00011120\U0001112C;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/chr.txt b/intl/icu/source/data/rbnf/chr.txt index 52ca1e4841ca..15e9ac97be71 100644 --- a/intl/icu/source/data/rbnf/chr.txt +++ b/intl/icu/source/data/rbnf/chr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr{ RBNFRules{ SpelloutRules{ @@ -53,5 +54,4 @@ chr{ "1: ' =%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/cs.txt b/intl/icu/source/data/rbnf/cs.txt index b04fa08a7d07..6206cdaf09c0 100644 --- a/intl/icu/source/data/rbnf/cs.txt +++ b/intl/icu/source/data/rbnf/cs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs{ RBNFRules{ SpelloutRules{ @@ -125,5 +126,4 @@ cs{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/cy.txt b/intl/icu/source/data/rbnf/cy.txt index 8eb1809c30e5..afbd9d5cac32 100644 --- a/intl/icu/source/data/rbnf/cy.txt +++ b/intl/icu/source/data/rbnf/cy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy{ RBNFRules{ SpelloutRules{ @@ -104,5 +105,4 @@ cy{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/da.txt b/intl/icu/source/data/rbnf/da.txt index 439a8b050421..31ed3aa79e38 100644 --- a/intl/icu/source/data/rbnf/da.txt +++ b/intl/icu/source/data/rbnf/da.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da{ RBNFRules{ SpelloutRules{ @@ -168,5 +169,4 @@ da{ "1: er =%spellout-ordinal-neuter=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/de.txt b/intl/icu/source/data/rbnf/de.txt index 8b404bfb221e..ea73a3915b8e 100644 --- a/intl/icu/source/data/rbnf/de.txt +++ b/intl/icu/source/data/rbnf/de.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ RBNFRules{ SpelloutRules{ @@ -182,5 +183,4 @@ de{ "0: =%spellout-ordinal=s;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/de_CH.txt b/intl/icu/source/data/rbnf/de_CH.txt index 919ada339903..187418a4d636 100644 --- a/intl/icu/source/data/rbnf/de_CH.txt +++ b/intl/icu/source/data/rbnf/de_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_CH{ RBNFRules{ SpelloutRules{ @@ -180,5 +181,4 @@ de_CH{ "0: =%spellout-ordinal=s;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ee.txt b/intl/icu/source/data/rbnf/ee.txt index 2999d3e6b105..a5a662c26f88 100644 --- a/intl/icu/source/data/rbnf/ee.txt +++ b/intl/icu/source/data/rbnf/ee.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee{ RBNFRules{ OrdinalRules{ @@ -83,5 +84,4 @@ ee{ "2: =%spellout-cardinal=lia;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/el.txt b/intl/icu/source/data/rbnf/el.txt index a3014e8792c8..244aeabf1644 100644 --- a/intl/icu/source/data/rbnf/el.txt +++ b/intl/icu/source/data/rbnf/el.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ RBNFRules{ SpelloutRules{ @@ -294,5 +295,4 @@ el{ "1000000000000000000: =#,##0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/en.txt b/intl/icu/source/data/rbnf/en.txt index 1d6536a9a1b1..77f54e20c66b 100644 --- a/intl/icu/source/data/rbnf/en.txt +++ b/intl/icu/source/data/rbnf/en.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ RBNFRules{ DurationRules{ @@ -206,5 +207,4 @@ en{ "1000000000000000000: =#,##0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/en_001.txt b/intl/icu/source/data/rbnf/en_001.txt index 25d5c2bb99c1..55882654b58f 100644 --- a/intl/icu/source/data/rbnf/en_001.txt +++ b/intl/icu/source/data/rbnf/en_001.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/en_IN.txt b/intl/icu/source/data/rbnf/en_IN.txt index 19f431ffba37..77955aa21cee 100644 --- a/intl/icu/source/data/rbnf/en_IN.txt +++ b/intl/icu/source/data/rbnf/en_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IN{ %%Parent{"en_001"} RBNFRules{ @@ -179,5 +180,4 @@ en_IN{ "1000000000000000000: =#,##0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/eo.txt b/intl/icu/source/data/rbnf/eo.txt index a22adf971dd0..b93e39108605 100644 --- a/intl/icu/source/data/rbnf/eo.txt +++ b/intl/icu/source/data/rbnf/eo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo{ RBNFRules{ SpelloutRules{ @@ -40,5 +41,4 @@ eo{ "0: =%spellout-cardinal=a;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es.txt b/intl/icu/source/data/rbnf/es.txt index 7de7c05c684f..b1a7244ffe0e 100644 --- a/intl/icu/source/data/rbnf/es.txt +++ b/intl/icu/source/data/rbnf/es.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ RBNFRules{ OrdinalRules{ @@ -288,5 +289,4 @@ es{ "1000000000000000000: =#,##0=\u00AA;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_419.txt b/intl/icu/source/data/rbnf/es_419.txt index 023b371d8e5c..3c84d7a1611b 100644 --- a/intl/icu/source/data/rbnf/es_419.txt +++ b/intl/icu/source/data/rbnf/es_419.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_419{ RBNFRules{ OrdinalRules{ @@ -24,5 +25,4 @@ es_419{ "0: =%digits-ordinal-masculine=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_DO.txt b/intl/icu/source/data/rbnf/es_DO.txt index f1713d4264ad..b5f781004f55 100644 --- a/intl/icu/source/data/rbnf/es_DO.txt +++ b/intl/icu/source/data/rbnf/es_DO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_DO{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_GT.txt b/intl/icu/source/data/rbnf/es_GT.txt index 3b1fecec3c79..76889af52738 100644 --- a/intl/icu/source/data/rbnf/es_GT.txt +++ b/intl/icu/source/data/rbnf/es_GT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GT{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_HN.txt b/intl/icu/source/data/rbnf/es_HN.txt index cd727c1cb014..4446521396e7 100644 --- a/intl/icu/source/data/rbnf/es_HN.txt +++ b/intl/icu/source/data/rbnf/es_HN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_HN{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_MX.txt b/intl/icu/source/data/rbnf/es_MX.txt index 27b775c7439b..0d5004f5e136 100644 --- a/intl/icu/source/data/rbnf/es_MX.txt +++ b/intl/icu/source/data/rbnf/es_MX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_MX{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_NI.txt b/intl/icu/source/data/rbnf/es_NI.txt index e711c11e2cbb..a58e4ec5bd74 100644 --- a/intl/icu/source/data/rbnf/es_NI.txt +++ b/intl/icu/source/data/rbnf/es_NI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_NI{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_PA.txt b/intl/icu/source/data/rbnf/es_PA.txt index aa4811456c40..248e10036819 100644 --- a/intl/icu/source/data/rbnf/es_PA.txt +++ b/intl/icu/source/data/rbnf/es_PA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PA{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_PR.txt b/intl/icu/source/data/rbnf/es_PR.txt index d5753dfdbc86..b7a1b11bb9b8 100644 --- a/intl/icu/source/data/rbnf/es_PR.txt +++ b/intl/icu/source/data/rbnf/es_PR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_SV.txt b/intl/icu/source/data/rbnf/es_SV.txt index 426c56d5b5f9..b4ed59588d5a 100644 --- a/intl/icu/source/data/rbnf/es_SV.txt +++ b/intl/icu/source/data/rbnf/es_SV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_SV{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/es_US.txt b/intl/icu/source/data/rbnf/es_US.txt index 4f97570d46c3..bcb9f38b3b03 100644 --- a/intl/icu/source/data/rbnf/es_US.txt +++ b/intl/icu/source/data/rbnf/es_US.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_US{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/et.txt b/intl/icu/source/data/rbnf/et.txt index 1d545359d01a..99a916bd5982 100644 --- a/intl/icu/source/data/rbnf/et.txt +++ b/intl/icu/source/data/rbnf/et.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et{ RBNFRules{ SpelloutRules{ @@ -40,5 +41,4 @@ et{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fa.txt b/intl/icu/source/data/rbnf/fa.txt index 5d8044a1bf5c..8b9fa938975a 100644 --- a/intl/icu/source/data/rbnf/fa.txt +++ b/intl/icu/source/data/rbnf/fa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa{ RBNFRules{ SpelloutRules{ @@ -55,5 +56,4 @@ fa{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fa_AF.txt b/intl/icu/source/data/rbnf/fa_AF.txt index 42bf047b57a0..df501875db5e 100644 --- a/intl/icu/source/data/rbnf/fa_AF.txt +++ b/intl/icu/source/data/rbnf/fa_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa_AF{ RBNFRules{ SpelloutRules{ @@ -51,5 +52,4 @@ fa_AF{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ff.txt b/intl/icu/source/data/rbnf/ff.txt index 71d82c38b5ad..5b19f5fe5a23 100644 --- a/intl/icu/source/data/rbnf/ff.txt +++ b/intl/icu/source/data/rbnf/ff.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff{ RBNFRules{ SpelloutRules{ @@ -85,5 +86,4 @@ ff{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fi.txt b/intl/icu/source/data/rbnf/fi.txt index b637738cd98f..eb627a9400a8 100644 --- a/intl/icu/source/data/rbnf/fi.txt +++ b/intl/icu/source/data/rbnf/fi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi{ RBNFRules{ SpelloutRules{ @@ -1271,5 +1272,4 @@ fi{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fil.txt b/intl/icu/source/data/rbnf/fil.txt index 1de52b52e20b..ca28ae79f163 100644 --- a/intl/icu/source/data/rbnf/fil.txt +++ b/intl/icu/source/data/rbnf/fil.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil{ RBNFRules{ OrdinalRules{ @@ -56,5 +57,4 @@ fil{ "0: ika =%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fo.txt b/intl/icu/source/data/rbnf/fo.txt index 37f571bdd999..813b1af90dbf 100644 --- a/intl/icu/source/data/rbnf/fo.txt +++ b/intl/icu/source/data/rbnf/fo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo{ RBNFRules{ SpelloutRules{ @@ -113,5 +114,4 @@ fo{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fr.txt b/intl/icu/source/data/rbnf/fr.txt index c13a192b7ea2..21f9bf9252a3 100644 --- a/intl/icu/source/data/rbnf/fr.txt +++ b/intl/icu/source/data/rbnf/fr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ RBNFRules{ OrdinalRules{ @@ -201,5 +202,4 @@ fr{ "2: =%%spellout-ordinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fr_BE.txt b/intl/icu/source/data/rbnf/fr_BE.txt index 151da3028f03..ac5de381a7bd 100644 --- a/intl/icu/source/data/rbnf/fr_BE.txt +++ b/intl/icu/source/data/rbnf/fr_BE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BE{ RBNFRules{ SpelloutRules{ @@ -180,5 +181,4 @@ fr_BE{ "2: =%%spellout-ordinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/fr_CH.txt b/intl/icu/source/data/rbnf/fr_CH.txt index d9a111db6288..b1458911ac8e 100644 --- a/intl/icu/source/data/rbnf/fr_CH.txt +++ b/intl/icu/source/data/rbnf/fr_CH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CH{ RBNFRules{ SpelloutRules{ @@ -181,5 +182,4 @@ fr_CH{ "2: =%%spellout-ordinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ga.txt b/intl/icu/source/data/rbnf/ga.txt index 59460753a3a6..4db32ccf3019 100644 --- a/intl/icu/source/data/rbnf/ga.txt +++ b/intl/icu/source/data/rbnf/ga.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga{ RBNFRules{ DurationRules{ @@ -242,5 +243,4 @@ ga{ "20: =%%is= =%%quadrillions=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/he.txt b/intl/icu/source/data/rbnf/he.txt index 9b63b65a0346..27ac1328a38c 100644 --- a/intl/icu/source/data/rbnf/he.txt +++ b/intl/icu/source/data/rbnf/he.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he{ RBNFRules{ SpelloutRules{ @@ -312,5 +313,4 @@ he{ "11: =%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/hi.txt b/intl/icu/source/data/rbnf/hi.txt index d34381c3e734..0f8d73600f6b 100644 --- a/intl/icu/source/data/rbnf/hi.txt +++ b/intl/icu/source/data/rbnf/hi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi{ RBNFRules{ OrdinalRules{ @@ -176,5 +177,4 @@ hi{ "7: =%spellout-cardinal=\u0935\u0940;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/hr.txt b/intl/icu/source/data/rbnf/hr.txt index 7f241c9d43b9..0e5d0e4f689c 100644 --- a/intl/icu/source/data/rbnf/hr.txt +++ b/intl/icu/source/data/rbnf/hr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr{ RBNFRules{ SpelloutRules{ @@ -202,5 +203,4 @@ hr{ "0: =%%spellout-ordinal-base=a;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/hu.txt b/intl/icu/source/data/rbnf/hu.txt index 3c5369765ac2..777442794655 100644 --- a/intl/icu/source/data/rbnf/hu.txt +++ b/intl/icu/source/data/rbnf/hu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu{ RBNFRules{ SpelloutRules{ @@ -122,5 +123,4 @@ hu{ "1000000000: =#,##0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/hy.txt b/intl/icu/source/data/rbnf/hy.txt index b763e435a1e5..80abcdfd961a 100644 --- a/intl/icu/source/data/rbnf/hy.txt +++ b/intl/icu/source/data/rbnf/hy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy{ RBNFRules{ SpelloutRules{ @@ -39,5 +40,4 @@ hy{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/id.txt b/intl/icu/source/data/rbnf/id.txt index 2cc0abae79aa..82e1d9fac478 100644 --- a/intl/icu/source/data/rbnf/id.txt +++ b/intl/icu/source/data/rbnf/id.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id{ RBNFRules{ OrdinalRules{ @@ -45,5 +46,4 @@ id{ "0: ke=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/in.txt b/intl/icu/source/data/rbnf/in.txt index 02335238ad02..e2df1690e399 100644 --- a/intl/icu/source/data/rbnf/in.txt +++ b/intl/icu/source/data/rbnf/in.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in{ "%%ALIAS"{"id"} } diff --git a/intl/icu/source/data/rbnf/is.txt b/intl/icu/source/data/rbnf/is.txt index 4e3e3eb795f3..1e476ece88e8 100644 --- a/intl/icu/source/data/rbnf/is.txt +++ b/intl/icu/source/data/rbnf/is.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is{ RBNFRules{ SpelloutRules{ @@ -113,5 +114,4 @@ is{ "1000000000000000000: =#,##0.#=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/it.txt b/intl/icu/source/data/rbnf/it.txt index 812321b472de..2dd2243f8ec2 100644 --- a/intl/icu/source/data/rbnf/it.txt +++ b/intl/icu/source/data/rbnf/it.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ RBNFRules{ OrdinalRules{ @@ -388,5 +389,4 @@ it{ "10: o\u00AD=%spellout-ordinal-feminine=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/iw.txt b/intl/icu/source/data/rbnf/iw.txt index d59865d1cdb7..4aa2f62d2681 100644 --- a/intl/icu/source/data/rbnf/iw.txt +++ b/intl/icu/source/data/rbnf/iw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw{ "%%ALIAS"{"he"} } diff --git a/intl/icu/source/data/rbnf/ja.txt b/intl/icu/source/data/rbnf/ja.txt index 6a14ed6194d1..b0e8b94f1af4 100644 --- a/intl/icu/source/data/rbnf/ja.txt +++ b/intl/icu/source/data/rbnf/ja.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ RBNFRules{ OrdinalRules{ @@ -78,5 +79,4 @@ ja{ "0: \u7B2C=%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ka.txt b/intl/icu/source/data/rbnf/ka.txt index 2383d69de87c..b5ef50269413 100644 --- a/intl/icu/source/data/rbnf/ka.txt +++ b/intl/icu/source/data/rbnf/ka.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka{ RBNFRules{ SpelloutRules{ @@ -63,5 +64,4 @@ ka{ "1: ' =%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/kl.txt b/intl/icu/source/data/rbnf/kl.txt index d5d355fe457e..9ffde5544c65 100644 --- a/intl/icu/source/data/rbnf/kl.txt +++ b/intl/icu/source/data/rbnf/kl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl{ RBNFRules{ SpelloutRules{ @@ -70,5 +71,4 @@ kl{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/km.txt b/intl/icu/source/data/rbnf/km.txt index 020826ab4fa3..f6133827b3ef 100644 --- a/intl/icu/source/data/rbnf/km.txt +++ b/intl/icu/source/data/rbnf/km.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km{ RBNFRules{ OrdinalRules{ @@ -47,5 +48,4 @@ km{ "0: \u1791\u17B8=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ko.txt b/intl/icu/source/data/rbnf/ko.txt index 934e832405f7..991022dfc7e9 100644 --- a/intl/icu/source/data/rbnf/ko.txt +++ b/intl/icu/source/data/rbnf/ko.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko{ RBNFRules{ OrdinalRules{ @@ -246,5 +247,4 @@ ko{ "3: =%%spellout-ordinal-native-smaller=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ky.txt b/intl/icu/source/data/rbnf/ky.txt index f824363c7128..fef5bdaf17ed 100644 --- a/intl/icu/source/data/rbnf/ky.txt +++ b/intl/icu/source/data/rbnf/ky.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky{ RBNFRules{ OrdinalRules{ @@ -165,5 +166,4 @@ ky{ "1000000000000: 0* <#,##0<<;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/lb.txt b/intl/icu/source/data/rbnf/lb.txt index 65746029f1c4..8c529306395c 100644 --- a/intl/icu/source/data/rbnf/lb.txt +++ b/intl/icu/source/data/rbnf/lb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb{ RBNFRules{ SpelloutRules{ @@ -201,5 +202,4 @@ lb{ "1: ' =%spellout-ordinal-neuter=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/lo.txt b/intl/icu/source/data/rbnf/lo.txt index bb9c818b57f7..133191674c52 100644 --- a/intl/icu/source/data/rbnf/lo.txt +++ b/intl/icu/source/data/rbnf/lo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo{ RBNFRules{ OrdinalRules{ @@ -43,5 +44,4 @@ lo{ "0: \u0E17\u0E35\u0E48\u200B=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/lrc.txt b/intl/icu/source/data/rbnf/lrc.txt index 5d6c7bd38a32..17a23d9a8cf1 100644 --- a/intl/icu/source/data/rbnf/lrc.txt +++ b/intl/icu/source/data/rbnf/lrc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc{ RBNFRules{ SpelloutRules{ @@ -55,5 +56,4 @@ lrc{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/lt.txt b/intl/icu/source/data/rbnf/lt.txt index 675a653403cd..36c8880b8af3 100644 --- a/intl/icu/source/data/rbnf/lt.txt +++ b/intl/icu/source/data/rbnf/lt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt{ RBNFRules{ SpelloutRules{ @@ -106,5 +107,4 @@ lt{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/lv.txt b/intl/icu/source/data/rbnf/lv.txt index 0510489c9403..3c4f40c09cae 100644 --- a/intl/icu/source/data/rbnf/lv.txt +++ b/intl/icu/source/data/rbnf/lv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv{ RBNFRules{ SpelloutRules{ @@ -81,5 +82,4 @@ lv{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/mk.txt b/intl/icu/source/data/rbnf/mk.txt index a402cfede4ae..a892bb20aa23 100644 --- a/intl/icu/source/data/rbnf/mk.txt +++ b/intl/icu/source/data/rbnf/mk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk{ RBNFRules{ SpelloutRules{ @@ -94,5 +95,4 @@ mk{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ms.txt b/intl/icu/source/data/rbnf/ms.txt index cab9d7dcce87..e31ffce65773 100644 --- a/intl/icu/source/data/rbnf/ms.txt +++ b/intl/icu/source/data/rbnf/ms.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms{ RBNFRules{ OrdinalRules{ @@ -50,5 +51,4 @@ ms{ "2: ke=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/mt.txt b/intl/icu/source/data/rbnf/mt.txt index dbdfd0f527b2..e62e619fd5f3 100644 --- a/intl/icu/source/data/rbnf/mt.txt +++ b/intl/icu/source/data/rbnf/mt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt{ RBNFRules{ DurationRules{ @@ -265,5 +266,4 @@ mt{ "10: g\u0127axart;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/my.txt b/intl/icu/source/data/rbnf/my.txt index b82be188e5a4..63df89133f41 100644 --- a/intl/icu/source/data/rbnf/my.txt +++ b/intl/icu/source/data/rbnf/my.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my{ RBNFRules{ SpelloutRules{ @@ -51,5 +52,4 @@ my{ "11: =%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/nb.txt b/intl/icu/source/data/rbnf/nb.txt index 3a9c562183d2..068f77413e2d 100644 --- a/intl/icu/source/data/rbnf/nb.txt +++ b/intl/icu/source/data/rbnf/nb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ RBNFRules{ SpelloutRules{ @@ -308,5 +309,4 @@ nb{ "1: er =%spellout-ordinal-plural=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/nl.txt b/intl/icu/source/data/rbnf/nl.txt index 3985730b62fd..1487b14115df 100644 --- a/intl/icu/source/data/rbnf/nl.txt +++ b/intl/icu/source/data/rbnf/nl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl{ RBNFRules{ OrdinalRules{ @@ -106,5 +107,4 @@ nl{ "1000000000000000000: =#,##0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/nn.txt b/intl/icu/source/data/rbnf/nn.txt index 00453ea43f04..acb80407bd94 100644 --- a/intl/icu/source/data/rbnf/nn.txt +++ b/intl/icu/source/data/rbnf/nn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ RBNFRules{ SpelloutRules{ @@ -67,5 +68,4 @@ nn{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/no.txt b/intl/icu/source/data/rbnf/no.txt index 097a923cd101..474d0b21b0d9 100644 --- a/intl/icu/source/data/rbnf/no.txt +++ b/intl/icu/source/data/rbnf/no.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ "%%ALIAS"{"nb"} } diff --git a/intl/icu/source/data/rbnf/pl.txt b/intl/icu/source/data/rbnf/pl.txt index ca8a8ab394be..a0428ecff267 100644 --- a/intl/icu/source/data/rbnf/pl.txt +++ b/intl/icu/source/data/rbnf/pl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl{ RBNFRules{ SpelloutRules{ @@ -394,5 +395,4 @@ pl{ "10: << >>;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/pt.txt b/intl/icu/source/data/rbnf/pt.txt index ab18470bb45f..73761389d0d3 100644 --- a/intl/icu/source/data/rbnf/pt.txt +++ b/intl/icu/source/data/rbnf/pt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ RBNFRules{ OrdinalRules{ @@ -194,5 +195,4 @@ pt{ "1000000000000000000: =#,##0=\u00AA;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/pt_PT.txt b/intl/icu/source/data/rbnf/pt_PT.txt index d9bc42f55c7e..ebc631bdd81d 100644 --- a/intl/icu/source/data/rbnf/pt_PT.txt +++ b/intl/icu/source/data/rbnf/pt_PT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_PT{ RBNFRules{ SpelloutRules{ @@ -184,5 +185,4 @@ pt_PT{ "1000000000000000000: =#,##0=\u00AA;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/qu.txt b/intl/icu/source/data/rbnf/qu.txt index aae34aff00de..a384cb269728 100644 --- a/intl/icu/source/data/rbnf/qu.txt +++ b/intl/icu/source/data/rbnf/qu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu{ RBNFRules{ SpelloutRules{ @@ -42,5 +43,4 @@ qu{ "0: =%spellout-cardinal=-\u00F1iqin;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ro.txt b/intl/icu/source/data/rbnf/ro.txt index df350b945e00..07eef94a2916 100644 --- a/intl/icu/source/data/rbnf/ro.txt +++ b/intl/icu/source/data/rbnf/ro.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro{ RBNFRules{ OrdinalRules{ @@ -87,5 +88,4 @@ ro{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/root.txt b/intl/icu/source/data/rbnf/root.txt index 0a81cae0e46f..186dc4ce690c 100644 --- a/intl/icu/source/data/rbnf/root.txt +++ b/intl/icu/source/data/rbnf/root.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ RBNFRules{ DurationRules{ @@ -655,5 +656,5 @@ root{ "0: =#,##0.#=.;", } } - Version{"37"} + Version{"38.1"} } diff --git a/intl/icu/source/data/rbnf/ru.txt b/intl/icu/source/data/rbnf/ru.txt index bddf25c5e1b5..9a349c8116f0 100644 --- a/intl/icu/source/data/rbnf/ru.txt +++ b/intl/icu/source/data/rbnf/ru.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ RBNFRules{ SpelloutRules{ @@ -1383,5 +1384,4 @@ ru{ "21001: =0=.;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/se.txt b/intl/icu/source/data/rbnf/se.txt index caddfefacf3b..80848e6363dc 100644 --- a/intl/icu/source/data/rbnf/se.txt +++ b/intl/icu/source/data/rbnf/se.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se{ RBNFRules{ SpelloutRules{ @@ -36,5 +37,4 @@ se{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sh.txt b/intl/icu/source/data/rbnf/sh.txt index 74b646a22923..83091b2d0a58 100644 --- a/intl/icu/source/data/rbnf/sh.txt +++ b/intl/icu/source/data/rbnf/sh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh{ "%%ALIAS"{"sr_Latn"} } diff --git a/intl/icu/source/data/rbnf/sk.txt b/intl/icu/source/data/rbnf/sk.txt index 038cbe3e9db5..5e19caf9cc4f 100644 --- a/intl/icu/source/data/rbnf/sk.txt +++ b/intl/icu/source/data/rbnf/sk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk{ RBNFRules{ SpelloutRules{ @@ -80,5 +81,4 @@ sk{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sl.txt b/intl/icu/source/data/rbnf/sl.txt index 8628cedf275c..8549d8a01245 100644 --- a/intl/icu/source/data/rbnf/sl.txt +++ b/intl/icu/source/data/rbnf/sl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl{ RBNFRules{ SpelloutRules{ @@ -128,5 +129,4 @@ sl{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sq.txt b/intl/icu/source/data/rbnf/sq.txt index 706782785bf9..6284d938e318 100644 --- a/intl/icu/source/data/rbnf/sq.txt +++ b/intl/icu/source/data/rbnf/sq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq{ RBNFRules{ SpelloutRules{ @@ -63,5 +64,4 @@ sq{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sr.txt b/intl/icu/source/data/rbnf/sr.txt index 81d7106e5db6..1e6e132b8db3 100644 --- a/intl/icu/source/data/rbnf/sr.txt +++ b/intl/icu/source/data/rbnf/sr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr{ RBNFRules{ SpelloutRules{ @@ -147,5 +148,4 @@ sr{ "400: <%spellout-cardinal-feminine<\u0441\u0442\u043E>%%ordti>;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sr_Latn.txt b/intl/icu/source/data/rbnf/sr_Latn.txt index 6770e4b32c5e..ea1cab9bf52f 100644 --- a/intl/icu/source/data/rbnf/sr_Latn.txt +++ b/intl/icu/source/data/rbnf/sr_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn{ %%Parent{"root"} RBNFRules{ @@ -146,5 +147,4 @@ sr_Latn{ "400: <%spellout-cardinal-feminine%%ordti>;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/su.txt b/intl/icu/source/data/rbnf/su.txt index ac19c4786f25..cf0feafac7cf 100644 --- a/intl/icu/source/data/rbnf/su.txt +++ b/intl/icu/source/data/rbnf/su.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su{ RBNFRules{ SpelloutRules{ @@ -39,5 +40,4 @@ su{ "0: ka=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sv.txt b/intl/icu/source/data/rbnf/sv.txt index e5133eb7e1ed..9f84d3a22414 100644 --- a/intl/icu/source/data/rbnf/sv.txt +++ b/intl/icu/source/data/rbnf/sv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv{ RBNFRules{ OrdinalRules{ @@ -221,5 +222,4 @@ sv{ "0: =%spellout-ordinal-neuter=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/sw.txt b/intl/icu/source/data/rbnf/sw.txt index d29537841929..eeb164e24afe 100644 --- a/intl/icu/source/data/rbnf/sw.txt +++ b/intl/icu/source/data/rbnf/sw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw{ RBNFRules{ SpelloutRules{ @@ -48,5 +49,4 @@ sw{ "3: wa =%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/ta.txt b/intl/icu/source/data/rbnf/ta.txt index 06dce55ebb66..501ff0c63f57 100644 --- a/intl/icu/source/data/rbnf/ta.txt +++ b/intl/icu/source/data/rbnf/ta.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta{ RBNFRules{ OrdinalRules{ @@ -84,5 +85,4 @@ ta{ "21: =#,##,##0=\u0BBE\u0BB5\u0BA4\u0BC1;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/th.txt b/intl/icu/source/data/rbnf/th.txt index de3e555fece6..6e441299d763 100644 --- a/intl/icu/source/data/rbnf/th.txt +++ b/intl/icu/source/data/rbnf/th.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th{ RBNFRules{ OrdinalRules{ @@ -43,5 +44,4 @@ th{ "0: \u0E17\u0E35\u0E48\u200B=%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/tr.txt b/intl/icu/source/data/rbnf/tr.txt index e9c99d4a7b64..20dadba4b6a3 100644 --- a/intl/icu/source/data/rbnf/tr.txt +++ b/intl/icu/source/data/rbnf/tr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr{ RBNFRules{ SpelloutRules{ @@ -87,5 +88,4 @@ tr{ "1000000000000000000: =#,##0='inci;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/uk.txt b/intl/icu/source/data/rbnf/uk.txt index db394b5face6..f9b916b5ae02 100644 --- a/intl/icu/source/data/rbnf/uk.txt +++ b/intl/icu/source/data/rbnf/uk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk{ RBNFRules{ SpelloutRules{ @@ -118,5 +119,4 @@ uk{ "1000000000000000000: =#,##0=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/vi.txt b/intl/icu/source/data/rbnf/vi.txt index f6d663ac441f..44fee14d82bd 100644 --- a/intl/icu/source/data/rbnf/vi.txt +++ b/intl/icu/source/data/rbnf/vi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi{ RBNFRules{ OrdinalRules{ @@ -59,5 +60,4 @@ vi{ "5: th\u1EE9 =%spellout-cardinal=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/yue.txt b/intl/icu/source/data/rbnf/yue.txt index b2b1b5ed65c9..37a2cac83c44 100644 --- a/intl/icu/source/data/rbnf/yue.txt +++ b/intl/icu/source/data/rbnf/yue.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue{ RBNFRules{ OrdinalRules{ @@ -158,5 +159,4 @@ yue{ "0: \u7B2C=%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/yue_Hans.txt b/intl/icu/source/data/rbnf/yue_Hans.txt index 681e422d0266..57059241280b 100644 --- a/intl/icu/source/data/rbnf/yue_Hans.txt +++ b/intl/icu/source/data/rbnf/yue_Hans.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans{ %%Parent{"root"} RBNFRules{ @@ -159,5 +160,4 @@ yue_Hans{ "0: \u7B2C=%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/zh.txt b/intl/icu/source/data/rbnf/zh.txt index d8994efa47a4..a92136d71c4d 100644 --- a/intl/icu/source/data/rbnf/zh.txt +++ b/intl/icu/source/data/rbnf/zh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ RBNFRules{ OrdinalRules{ @@ -240,5 +241,4 @@ zh{ "0: \u7B2C=%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/zh_HK.txt b/intl/icu/source/data/rbnf/zh_HK.txt index fe72a0ea43cd..c34c98fdd21b 100644 --- a/intl/icu/source/data/rbnf/zh_HK.txt +++ b/intl/icu/source/data/rbnf/zh_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_HK{ "%%ALIAS"{"zh_Hant_HK"} } diff --git a/intl/icu/source/data/rbnf/zh_Hant.txt b/intl/icu/source/data/rbnf/zh_Hant.txt index a89b088d1db9..a7490039e82b 100644 --- a/intl/icu/source/data/rbnf/zh_Hant.txt +++ b/intl/icu/source/data/rbnf/zh_Hant.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ %%Parent{"root"} RBNFRules{ @@ -214,5 +215,4 @@ zh_Hant{ "0: \u7B2C=%spellout-numbering=;", } } - Version{"37"} } diff --git a/intl/icu/source/data/rbnf/zh_Hant_HK.txt b/intl/icu/source/data/rbnf/zh_Hant_HK.txt index 9af3285f76dc..978e040b06fd 100644 --- a/intl/icu/source/data/rbnf/zh_Hant_HK.txt +++ b/intl/icu/source/data/rbnf/zh_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_HK{ "%%ALIAS"{"yue"} } diff --git a/intl/icu/source/data/rbnf/zh_Hant_MO.txt b/intl/icu/source/data/rbnf/zh_Hant_MO.txt index 379ea44361a8..79dff768b301 100644 --- a/intl/icu/source/data/rbnf/zh_Hant_MO.txt +++ b/intl/icu/source/data/rbnf/zh_Hant_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/rbnf/zh_Hant_TW.txt b/intl/icu/source/data/rbnf/zh_Hant_TW.txt index b62ad6927771..b079f20e1385 100644 --- a/intl/icu/source/data/rbnf/zh_Hant_TW.txt +++ b/intl/icu/source/data/rbnf/zh_Hant_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/rbnf/zh_MO.txt b/intl/icu/source/data/rbnf/zh_MO.txt index 6565bf7c3fc3..c6b2148478d5 100644 --- a/intl/icu/source/data/rbnf/zh_MO.txt +++ b/intl/icu/source/data/rbnf/zh_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_MO{ "%%ALIAS"{"zh_Hant_MO"} } diff --git a/intl/icu/source/data/rbnf/zh_TW.txt b/intl/icu/source/data/rbnf/zh_TW.txt index 9372c5067ad4..c54ccbfe8920 100644 --- a/intl/icu/source/data/rbnf/zh_TW.txt +++ b/intl/icu/source/data/rbnf/zh_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_TW{ "%%ALIAS"{"zh_Hant_TW"} } diff --git a/intl/icu/source/data/region/LOCALE_DEPS.json b/intl/icu/source/data/region/LOCALE_DEPS.json index 681e78cf5870..2508537d097a 100644 --- a/intl/icu/source/data/region/LOCALE_DEPS.json +++ b/intl/icu/source/data/region/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -33,7 +34,7 @@ "sh_YU": "sr_Latn_RS", "shi_MA": "shi_Tfng_MA", "sr_BA": "sr_Cyrl_BA", - "sr_CS": "sr_Cyrl_RS", + "sr_CS": "sr_RS", "sr_Cyrl_CS": "sr_Cyrl_RS", "sr_Cyrl_YU": "sr_Cyrl_RS", "sr_Latn_CS": "sr_Latn_RS", @@ -41,7 +42,7 @@ "sr_ME": "sr_Latn_ME", "sr_RS": "sr_Cyrl_RS", "sr_XK": "sr_Cyrl_XK", - "sr_YU": "sr_Cyrl_RS", + "sr_YU": "sr_RS", "su_ID": "su_Latn_ID", "tl": "fil", "tl_PH": "fil_PH", diff --git a/intl/icu/source/data/region/af.txt b/intl/icu/source/data/region/af.txt index 6bcf3a00cc1c..2cbc1228b26b 100644 --- a/intl/icu/source/data/region/af.txt +++ b/intl/icu/source/data/region/af.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ Countries{ 001{"Wêreld"} @@ -81,7 +82,7 @@ af{ CK{"Cookeilande"} CL{"Chili"} CM{"Kameroen"} - CN{"Sjina"} + CN{"China"} CO{"Colombië"} CP{"Clippertoneiland"} CR{"Costa Rica"} @@ -133,7 +134,7 @@ af{ GU{"Guam"} GW{"Guinee-Bissau"} GY{"Guyana"} - HK{"Hongkong SAS Sjina"} + HK{"Hongkong SAS China"} HM{"Heardeiland en McDonaldeilande"} HN{"Honduras"} HR{"Kroasië"} @@ -187,7 +188,7 @@ af{ ML{"Mali"} MM{"Mianmar (Birma)"} MN{"Mongolië"} - MO{"Macau SAS Sjina"} + MO{"Macau SAS China"} MP{"Noord-Mariane-eilande"} MQ{"Martinique"} MR{"Mauritanië"} @@ -222,7 +223,7 @@ af{ PM{"Sint Pierre en Miquelon"} PN{"Pitcairneilande"} PR{"Puerto Rico"} - PS{"Palestynse gebiede"} + PS{"Palestynse Grondgebiede"} PT{"Portugal"} PW{"Palau"} PY{"Paraguay"} @@ -241,7 +242,7 @@ af{ SG{"Singapoer"} SH{"Sint Helena"} SI{"Slowenië"} - SJ{"Svalbard en Jan Mayen"} + SJ{"Spitsbergen en Jan Mayen"} SK{"Slowakye"} SL{"Sierra Leone"} SM{"San Marino"} @@ -308,9 +309,7 @@ af{ Countries%variant{ CD{"Kongo (DRK)"} CG{"Kongo (Republiek die)"} - CI{"Cote d’Ivoire"} CZ{"Tsjeggiese Republiek"} FK{"Falklandeilande (Malvinas)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/agq.txt b/intl/icu/source/data/region/agq.txt index 50a2e6610d05..c520719d808f 100644 --- a/intl/icu/source/data/region/agq.txt +++ b/intl/icu/source/data/region/agq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml agq{ Countries{ AD{"Àndolà"} @@ -226,5 +227,4 @@ agq{ ZM{"Zambìa"} ZW{"Zìmbagbɛ̀"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ak.txt b/intl/icu/source/data/region/ak.txt index 1c050f08d004..5b76e0f0c350 100644 --- a/intl/icu/source/data/region/ak.txt +++ b/intl/icu/source/data/region/ak.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ ak{ ZM{"Zambia"} ZW{"Zembabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/am.txt b/intl/icu/source/data/region/am.txt index 2e6c3c2ca8e3..b34e9440e742 100644 --- a/intl/icu/source/data/region/am.txt +++ b/intl/icu/source/data/region/am.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ Countries{ 001{"ዓለም"} @@ -187,7 +188,7 @@ am{ ML{"ማሊ"} MM{"ማይናማር(በርማ)"} MN{"ሞንጎሊያ"} - MO{"ማካኡ ልዩ የአስተዳደር ክልል ቻይና"} + MO{"ማካኦ ልዩ የአስተዳደር ክልል ቻይና"} MP{"የሰሜናዊ ማሪያና ደሴቶች"} MQ{"ማርቲኒክ"} MR{"ሞሪቴኒያ"} @@ -220,7 +221,7 @@ am{ PK{"ፓኪስታን"} PL{"ፖላንድ"} PM{"ቅዱስ ፒዬር እና ሚኩኤሎን"} - PN{"ፒትካኢርን አይስላንድ"} + PN{"ፒትካኢርን ደሴቶች"} PR{"ፖርታ ሪኮ"} PS{"የፍልስጤም ግዛት"} PT{"ፖርቱጋል"} @@ -300,19 +301,18 @@ am{ Countries%short{ GB{"ዩኬ"} HK{"ሆንግ ኮንግ"} - MO{"ማካኡ"} + MO{"ማካኦ"} PS{"ፍልስጥኤም"} UN{"የተመ"} US{"ዩ ኤስ"} } Countries%variant{ CD{"ኮንጎ (የዲሞክራቲክ ሪፐብሊክ ኮንጎ)"} - CG{"ኮንጎ (ሪፐብሊክ)"} + CG{"ኮንጎ (ሪፑብሊክ)"} CI{"አይቮሪኮስት"} CZ{"ቼክ ሪፑብሊክ"} FK{"ፎክላንድ ደሴቶች (ኢስላስ ማልቪናስ)"} SZ{"ስዋዚላንድ"} TL{"ምስራቅ ቲሞር"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ar.txt b/intl/icu/source/data/region/ar.txt index edae3b33568d..83dd5ccbe59f 100644 --- a/intl/icu/source/data/region/ar.txt +++ b/intl/icu/source/data/region/ar.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ Countries{ 001{"العالم"} @@ -311,5 +312,4 @@ ar{ SZ{"سوازيلاند"} TL{"تيمور الشرقية"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ar_AE.txt b/intl/icu/source/data/region/ar_AE.txt index aedab77fb8ed..b811eb8594e9 100644 --- a/intl/icu/source/data/region/ar_AE.txt +++ b/intl/icu/source/data/region/ar_AE.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_AE{ Countries%variant{ CI{"ساحل العاج"} TL{"التيمور الشرقية"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ar_LY.txt b/intl/icu/source/data/region/ar_LY.txt index 3edfae61b79d..71bccd4f0733 100644 --- a/intl/icu/source/data/region/ar_LY.txt +++ b/intl/icu/source/data/region/ar_LY.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_LY{ Countries{ EA{"سبتة ومليلية"} MS{"مونتيسيرات"} UY{"أوروغواي"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ar_SA.txt b/intl/icu/source/data/region/ar_SA.txt index d0f200863efc..413b10a15be3 100644 --- a/intl/icu/source/data/region/ar_SA.txt +++ b/intl/icu/source/data/region/ar_SA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SA{ Countries{ AC{"جزيرة أسينشين"} @@ -14,5 +15,4 @@ ar_SA{ Countries%variant{ CZ{"التشيك"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ars.txt b/intl/icu/source/data/region/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/region/ars.txt +++ b/intl/icu/source/data/region/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/region/as.txt b/intl/icu/source/data/region/as.txt index cc033cd0fa2b..f12c1da632b7 100644 --- a/intl/icu/source/data/region/as.txt +++ b/intl/icu/source/data/region/as.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as{ Countries{ 001{"বিশ্ব"} @@ -313,5 +314,4 @@ as{ SZ{"স্বাজিলেণ্ড"} TL{"পূৱ টিমোৰ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/asa.txt b/intl/icu/source/data/region/asa.txt index 0db3709cf795..02d1081b6254 100644 --- a/intl/icu/source/data/region/asa.txt +++ b/intl/icu/source/data/region/asa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml asa{ Countries{ AD{"Andora"} @@ -224,5 +225,4 @@ asa{ ZM{"Dhambia"} ZW{"Dhimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ast.txt b/intl/icu/source/data/region/ast.txt index 1862c101dfa0..a8afacda1ce8 100644 --- a/intl/icu/source/data/region/ast.txt +++ b/intl/icu/source/data/region/ast.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ast{ Countries{ 001{"Mundu"} @@ -308,5 +309,4 @@ ast{ FK{"Islles Malvines (Falkland Islands)"} TL{"Timor Este"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/az.txt b/intl/icu/source/data/region/az.txt index a4c80f9c7cc4..98a8f2a7cad8 100644 --- a/intl/icu/source/data/region/az.txt +++ b/intl/icu/source/data/region/az.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ Countries{ 001{"Dünya"} @@ -313,5 +314,4 @@ az{ FK{"Folklend adaları (Malvin adaları)"} SZ{"Svazilend"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/az_AZ.txt b/intl/icu/source/data/region/az_AZ.txt index caf84c09534a..8932e86db2ee 100644 --- a/intl/icu/source/data/region/az_AZ.txt +++ b/intl/icu/source/data/region/az_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_AZ{ "%%ALIAS"{"az_Latn_AZ"} } diff --git a/intl/icu/source/data/region/az_Cyrl.txt b/intl/icu/source/data/region/az_Cyrl.txt index f4955de5d0fa..0517668c7279 100644 --- a/intl/icu/source/data/region/az_Cyrl.txt +++ b/intl/icu/source/data/region/az_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Cyrl{ %%Parent{"root"} Countries{ @@ -301,5 +302,4 @@ az_Cyrl{ CZ{"Чех Республикасы"} FK{"Фолкленд адалары (Малвин адалары)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/az_Latn.txt b/intl/icu/source/data/region/az_Latn.txt index 6022c58dbe02..6464d2e841f3 100644 --- a/intl/icu/source/data/region/az_Latn.txt +++ b/intl/icu/source/data/region/az_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/region/az_Latn_AZ.txt b/intl/icu/source/data/region/az_Latn_AZ.txt index 36c6e61ba045..3963c91e61c2 100644 --- a/intl/icu/source/data/region/az_Latn_AZ.txt +++ b/intl/icu/source/data/region/az_Latn_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/bas.txt b/intl/icu/source/data/region/bas.txt index d97361b3b073..89b21f032a96 100644 --- a/intl/icu/source/data/region/bas.txt +++ b/intl/icu/source/data/region/bas.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bas{ Countries{ AD{"Àŋdɔ̂r"} @@ -223,5 +224,4 @@ bas{ ZM{"Zàmbià"} ZW{"Zìmbàbwê"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/be.txt b/intl/icu/source/data/region/be.txt index b0311d85af53..a322906ae38c 100644 --- a/intl/icu/source/data/region/be.txt +++ b/intl/icu/source/data/region/be.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be{ Countries{ 001{"Свет"} @@ -288,7 +289,7 @@ be{ WF{"Уоліс і Футуна"} WS{"Самоа"} XA{"Псеўдаакцэнты"} - XB{"Псеўда-Bidi"} + XB{"псеўдадвухнапрамкавы"} XK{"Косава"} YE{"Емен"} YT{"Маёта"} @@ -312,5 +313,4 @@ be{ SZ{"Свазіленд"} TL{"Усходні Тымор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bem.txt b/intl/icu/source/data/region/bem.txt index e1d1a1892b78..fa9a0d744390 100644 --- a/intl/icu/source/data/region/bem.txt +++ b/intl/icu/source/data/region/bem.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bem{ Countries{ ZM{"Zambia"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bez.txt b/intl/icu/source/data/region/bez.txt index 3823245d11bb..7b70497a5f20 100644 --- a/intl/icu/source/data/region/bez.txt +++ b/intl/icu/source/data/region/bez.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bez{ Countries{ AD{"Huandola"} @@ -226,5 +227,4 @@ bez{ ZM{"Huzambia"} ZW{"Huzimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bg.txt b/intl/icu/source/data/region/bg.txt index 2d7705459b3f..449be73f1383 100644 --- a/intl/icu/source/data/region/bg.txt +++ b/intl/icu/source/data/region/bg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ Countries{ 001{"свят"} @@ -262,7 +263,7 @@ bg{ TH{"Тайланд"} TJ{"Таджикистан"} TK{"Токелау"} - TL{"Източен Тимор"} + TL{"Тимор Лесте"} TM{"Туркменистан"} TN{"Тунис"} TO{"Тонга"} @@ -309,6 +310,6 @@ bg{ CZ{"Чешка република"} FK{"Фолкландски острови (Малвински острови)"} SZ{"Свазиленд"} + TL{"Източен Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bm.txt b/intl/icu/source/data/region/bm.txt index a89f56b8ace2..6d0c10de10ac 100644 --- a/intl/icu/source/data/region/bm.txt +++ b/intl/icu/source/data/region/bm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bm{ Countries{ AD{"Andɔr"} @@ -226,5 +227,4 @@ bm{ ZM{"Zanbi"} ZW{"Zimbabuwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bn.txt b/intl/icu/source/data/region/bn.txt index edbb5afdc8c5..60bce8d5c2a2 100644 --- a/intl/icu/source/data/region/bn.txt +++ b/intl/icu/source/data/region/bn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn{ Countries{ 001{"পৃথিবী"} @@ -187,7 +188,10 @@ bn{ ML{"মালি"} MM{"মায়ানমার (বার্মা)"} MN{"মঙ্গোলিয়া"} - MO{"ম্যাকাও এসএআর চীনা"} + MO{ + "ম্যাকাও এসএআর চীনা চীনা (ম্যাকাও এসএআর চীনা) চীনা (ঐতিহ্যবাহী, ম্যাকাও এ" + "সএআর চীনা) অঞ্চল: ম্যাকাও এসএআর চীন" + } MP{"উত্তরাঞ্চলীয় মারিয়ানা দ্বীপপুঞ্জ"} MQ{"মার্টিনিক"} MR{"মরিতানিয়া"} @@ -314,5 +318,4 @@ bn{ SZ{"সোয়াজিল্যান্ড"} TL{"পূর্ব তিমুর"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bn_IN.txt b/intl/icu/source/data/region/bn_IN.txt index 2d05e0c45416..ccc3e1f744da 100644 --- a/intl/icu/source/data/region/bn_IN.txt +++ b/intl/icu/source/data/region/bn_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn_IN{ Countries{ UM{"মার্কিন যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ"} @@ -7,5 +8,4 @@ bn_IN{ Countries%variant{ CD{"কঙ্গো (DRC)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bo.txt b/intl/icu/source/data/region/bo.txt index a628404bf578..b3f091c57090 100644 --- a/intl/icu/source/data/region/bo.txt +++ b/intl/icu/source/data/region/bo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo{ Countries{ 001{"འཛམ་གླིང་།"} @@ -15,5 +16,4 @@ bo{ US{"ཨ་མེ་རི་ཀ།"} ZZ{"མིའི་ཤེས་རྟོགས་མ་བྱུང་བའི་ཁོར་ཡུག"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bo_IN.txt b/intl/icu/source/data/region/bo_IN.txt index 7d4c09cd1c7d..390d8d4ecdc3 100644 --- a/intl/icu/source/data/region/bo_IN.txt +++ b/intl/icu/source/data/region/bo_IN.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo_IN{ Countries{ 009{"ཨོཤི་ཡཱན་ན།"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/br.txt b/intl/icu/source/data/region/br.txt index 08a195d49f43..7ad7734e94be 100644 --- a/intl/icu/source/data/region/br.txt +++ b/intl/icu/source/data/region/br.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml br{ Countries{ 001{"Bed"} @@ -313,5 +314,4 @@ br{ SZ{"Swaziland"} TL{"Timor ar Reter"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/brx.txt b/intl/icu/source/data/region/brx.txt index c5efd8b4b51d..61e7cdf052d6 100644 --- a/intl/icu/source/data/region/brx.txt +++ b/intl/icu/source/data/region/brx.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml brx{ Countries{ 001{"दुनिया"} @@ -280,5 +281,4 @@ brx{ ZW{"ज़ीम्बाब्वे"} ZZ{"अज्ञात या अवैध प्रदेश"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bs.txt b/intl/icu/source/data/region/bs.txt index b4e361e16e0a..b9fa32781404 100644 --- a/intl/icu/source/data/region/bs.txt +++ b/intl/icu/source/data/region/bs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs{ Countries{ 001{"Svijet"} @@ -83,10 +84,10 @@ bs{ CM{"Kamerun"} CN{"Kina"} CO{"Kolumbija"} - CP{"Ostrvo Kliperton"} + CP{"Ostrvo Clipperton"} CR{"Kostarika"} CU{"Kuba"} - CV{"Kape Verde"} + CV{"Zelenortska Ostrva"} CW{"Kurasao"} CX{"Božićno ostrvo"} CY{"Kipar"} @@ -119,7 +120,7 @@ bs{ GD{"Grenada"} GE{"Gruzija"} GF{"Francuska Gvajana"} - GG{"Gernzi"} + GG{"Guernsey"} GH{"Gana"} GI{"Gibraltar"} GL{"Grenland"} @@ -134,7 +135,7 @@ bs{ GW{"Gvineja-Bisao"} GY{"Gvajana"} HK{"Hong Kong (SAR Kina)"} - HM{"Herd i arhipelag MekDonald"} + HM{"Ostrvo Heard i arhipelag McDonald"} HN{"Honduras"} HR{"Hrvatska"} HT{"Haiti"} @@ -308,10 +309,8 @@ bs{ Countries%variant{ CD{"DR Kongo"} CG{"Republika Kongo"} - CI{"Obala Bjelokosti"} CZ{"Češka Republika"} FK{"Folklandska (Malvinska) ostrva"} SZ{"Svazilend"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bs_BA.txt b/intl/icu/source/data/region/bs_BA.txt index e5e3a465740d..70619a1bff37 100644 --- a/intl/icu/source/data/region/bs_BA.txt +++ b/intl/icu/source/data/region/bs_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_BA{ "%%ALIAS"{"bs_Latn_BA"} } diff --git a/intl/icu/source/data/region/bs_Cyrl.txt b/intl/icu/source/data/region/bs_Cyrl.txt index a0ae1a4f4138..d1fcfb7421e2 100644 --- a/intl/icu/source/data/region/bs_Cyrl.txt +++ b/intl/icu/source/data/region/bs_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Cyrl{ %%Parent{"root"} Countries{ @@ -313,5 +314,4 @@ bs_Cyrl{ FK{"Фокландска Острва (Малвинска)"} TL{"Тимор-Лесте (Источни Тимор)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/bs_Latn.txt b/intl/icu/source/data/region/bs_Latn.txt index d1a6b5e7fa79..f2561126b44d 100644 --- a/intl/icu/source/data/region/bs_Latn.txt +++ b/intl/icu/source/data/region/bs_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/region/bs_Latn_BA.txt b/intl/icu/source/data/region/bs_Latn_BA.txt index 3ef1cc4058e9..04342dc0ad7c 100644 --- a/intl/icu/source/data/region/bs_Latn_BA.txt +++ b/intl/icu/source/data/region/bs_Latn_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ca.txt b/intl/icu/source/data/region/ca.txt index b9b4b7caf624..0245a6f27e56 100644 --- a/intl/icu/source/data/region/ca.txt +++ b/intl/icu/source/data/region/ca.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca{ Countries{ 001{"Món"} @@ -125,7 +126,7 @@ ca{ GL{"Groenlàndia"} GM{"Gàmbia"} GN{"Guinea"} - GP{"Guadeloupe"} + GP{"Guadalupe"} GQ{"Guinea Equatorial"} GR{"Grècia"} GS{"Illes Geòrgia del Sud i Sandwich del Sud"} @@ -313,5 +314,4 @@ ca{ FK{"Illes Malvines (Illes Falkland)"} SZ{"Swazilàndia"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ccp.txt b/intl/icu/source/data/region/ccp.txt index c40f19ef2441..5d7d26623c56 100644 --- a/intl/icu/source/data/region/ccp.txt +++ b/intl/icu/source/data/region/ccp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp{ Countries{ 001{"𑄛𑄨𑄖𑄴𑄗𑄨𑄟𑄨"} @@ -320,5 +321,4 @@ ccp{ } TL{"𑄛𑄪𑄉𑄮 𑄖𑄨𑄟𑄪𑄢𑄴"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ce.txt b/intl/icu/source/data/region/ce.txt index 079c819fb465..5a6daa6d19bb 100644 --- a/intl/icu/source/data/region/ce.txt +++ b/intl/icu/source/data/region/ce.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ce{ Countries{ 001{"Дерригдуьненан"} @@ -306,5 +307,4 @@ ce{ FK{"Фолклендан гӀайренаш (Мальвинаш)"} TL{"Тимор-Лесте"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ceb.txt b/intl/icu/source/data/region/ceb.txt index 094f97b2bee8..9c920b900f6d 100644 --- a/intl/icu/source/data/region/ceb.txt +++ b/intl/icu/source/data/region/ceb.txt @@ -1,10 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ceb{ Countries{ 001{"Kalibutan"} 002{"Africa"} - 003{"North America"} + 003{"Amihanang Amerika"} 005{"South America"} 009{"Oceania"} 011{"Western Africa"} @@ -104,7 +105,7 @@ ceb{ EG{"Egypt"} EH{"Western Sahara"} ER{"Eritrea"} - ES{"Spain"} + ES{"Espanya"} ET{"Ethiopia"} EU{"European Union"} EZ{"Eurozone"} @@ -274,7 +275,7 @@ ceb{ UA{"Ukraine"} UG{"Uganda"} UM{"U.S. Outlying Islands"} - UN{"United Nations"} + UN{"Hiniusang Kanasoran"} US{"Estados Unidos"} UY{"Uruguay"} UZ{"Uzbekistan"} @@ -306,12 +307,11 @@ ceb{ } Countries%variant{ CD{"Congo (DRC)"} - CG{"Congo (Republic)"} + CG{"Congo (Republika)"} CI{"Ivory Coast"} CZ{"Czech Republic"} FK{"Falkland Islands (Islas Malvinas)"} SZ{"Swaziland"} TL{"East Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/cgg.txt b/intl/icu/source/data/region/cgg.txt index b88c2bdd59d6..225bc76c89b0 100644 --- a/intl/icu/source/data/region/cgg.txt +++ b/intl/icu/source/data/region/cgg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cgg{ Countries{ AD{"Andora"} @@ -224,5 +225,4 @@ cgg{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/chr.txt b/intl/icu/source/data/region/chr.txt index e6f960f75a2d..103877bebbf0 100644 --- a/intl/icu/source/data/region/chr.txt +++ b/intl/icu/source/data/region/chr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr{ Countries{ 001{"ᎡᎶᎯ"} @@ -313,5 +314,4 @@ chr{ SZ{"ᎠᏂᏍᏩᏏᎢ"} TL{"ᏗᎧᎸᎬᎢ ᏘᎼᎵ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ckb.txt b/intl/icu/source/data/region/ckb.txt index a95a69f38f35..00406908eec4 100644 --- a/intl/icu/source/data/region/ckb.txt +++ b/intl/icu/source/data/region/ckb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb{ Countries{ 001{"جیهان"} @@ -302,5 +303,4 @@ ckb{ CD{"کۆماری دیموکراتیی کۆنگۆ"} CG{"کۆماری کۆنگۆ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/cs.txt b/intl/icu/source/data/region/cs.txt index 9c5a1d174394..fee9a7ec2024 100644 --- a/intl/icu/source/data/region/cs.txt +++ b/intl/icu/source/data/region/cs.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs{ Countries{ 001{"svět"} @@ -253,7 +254,7 @@ cs{ SV{"Salvador"} SX{"Svatý Martin (Nizozemsko)"} SY{"Sýrie"} - SZ{"Svazijsko"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Turks a Caicos"} TD{"Čad"} @@ -311,8 +312,7 @@ cs{ CI{"Côte d’Ivoire"} CZ{"Česká republika"} FK{"Falklandské ostrovy (Malvíny)"} - SZ{"Eswatini"} + SZ{"Svazijsko"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/cy.txt b/intl/icu/source/data/region/cy.txt index dc4f561829dc..f97df4421739 100644 --- a/intl/icu/source/data/region/cy.txt +++ b/intl/icu/source/data/region/cy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy{ Countries{ 001{"Y Byd"} @@ -49,7 +50,7 @@ cy{ AU{"Awstralia"} AW{"Aruba"} AX{"Ynysoedd Åland"} - AZ{"Azerbaijan"} + AZ{"Aserbaijan"} BA{"Bosnia a Herzegovina"} BB{"Barbados"} BD{"Bangladesh"} @@ -124,16 +125,16 @@ cy{ GI{"Gibraltar"} GL{"Yr Ynys Las"} GM{"Gambia"} - GN{"Guinée"} + GN{"Gini"} GP{"Guadeloupe"} - GQ{"Guinea Gyhydeddol"} + GQ{"Gini Gyhydeddol"} GR{"Gwlad Groeg"} GS{"De Georgia ac Ynysoedd Sandwich y De"} GT{"Guatemala"} GU{"Guam"} GW{"Guiné-Bissau"} GY{"Guyana"} - HK{"Hong Kong SAR Tseina"} + HK{"Hong Kong SAR Tsieina"} HM{"Ynys Heard ac Ynysoedd McDonald"} HN{"Honduras"} HR{"Croatia"} @@ -160,11 +161,11 @@ cy{ KI{"Kiribati"} KM{"Comoros"} KN{"Saint Kitts a Nevis"} - KP{"Gogledd Korea"} - KR{"De Korea"} + KP{"Gogledd Corea"} + KR{"De Corea"} KW{"Kuwait"} KY{"Ynysoedd Cayman"} - KZ{"Kazakstan"} + KZ{"Kazakhstan"} LA{"Laos"} LB{"Libanus"} LC{"Saint Lucia"} @@ -172,7 +173,7 @@ cy{ LK{"Sri Lanka"} LR{"Liberia"} LS{"Lesotho"} - LT{"Lithuania"} + LT{"Lithwania"} LU{"Lwcsembwrg"} LV{"Latfia"} LY{"Libya"} @@ -187,7 +188,7 @@ cy{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macau RhGA Tsieina"} + MO{"Macau SAR Tsieina"} MP{"Ynysoedd Gogledd Mariana"} MQ{"Martinique"} MR{"Mauritania"} @@ -256,15 +257,15 @@ cy{ SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Ynysoedd Turks a Caicos"} - TD{"Tchad"} + TD{"Tsiad"} TF{"Tiroedd Deheuol ac Antarctig Ffrainc"} TG{"Togo"} TH{"Gwlad Thai"} - TJ{"Tajikistan"} + TJ{"Tajicistan"} TK{"Tokelau"} TL{"Timor-Leste"} - TM{"Turkmenistan"} - TN{"Tunisia"} + TM{"Tyrcmenistan"} + TN{"Tiwnisia"} TO{"Tonga"} TR{"Twrci"} TT{"Trinidad a Tobago"} @@ -314,5 +315,4 @@ cy{ SZ{"Gwlad Swazi"} TL{"Dwyrain Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/da.txt b/intl/icu/source/data/region/da.txt index dfcf1eaa753e..f7c515be40e9 100644 --- a/intl/icu/source/data/region/da.txt +++ b/intl/icu/source/data/region/da.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da{ Countries{ 001{"Verden"} @@ -298,7 +299,6 @@ da{ ZZ{"Ukendt område"} } Countries%short{ - GB{"UK"} HK{"Hongkong"} MO{"Macao"} PS{"Palæstina"} @@ -312,5 +312,4 @@ da{ SZ{"Swaziland"} TL{"Østtimor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/dav.txt b/intl/icu/source/data/region/dav.txt index 26bc48e70bba..e7885d2ce677 100644 --- a/intl/icu/source/data/region/dav.txt +++ b/intl/icu/source/data/region/dav.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dav{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ dav{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/de.txt b/intl/icu/source/data/region/de.txt index 89085946e8d5..89b42ffb25e4 100644 --- a/intl/icu/source/data/region/de.txt +++ b/intl/icu/source/data/region/de.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ Countries{ 001{"Welt"} @@ -63,7 +64,7 @@ de{ BM{"Bermuda"} BN{"Brunei Darussalam"} BO{"Bolivien"} - BQ{"Bonaire, Sint Eustatius und Saba"} + BQ{"Karibische Niederlande"} BR{"Brasilien"} BS{"Bahamas"} BT{"Bhutan"} @@ -298,7 +299,7 @@ de{ ZZ{"Unbekannte Region"} } Countries%short{ - GB{"GB"} + GB{"UK"} HK{"Hongkong"} MO{"Macau"} PS{"Palästina"} @@ -314,5 +315,4 @@ de{ SZ{"Swasiland"} TL{"Osttimor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/de_AT.txt b/intl/icu/source/data/region/de_AT.txt index 064634195107..df3f63a4ae25 100644 --- a/intl/icu/source/data/region/de_AT.txt +++ b/intl/icu/source/data/region/de_AT.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_AT{ Countries{ SJ{"Svalbard und Jan Mayen"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/de_CH.txt b/intl/icu/source/data/region/de_CH.txt index 184a4f237c09..80ace03b987f 100644 --- a/intl/icu/source/data/region/de_CH.txt +++ b/intl/icu/source/data/region/de_CH.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_CH{ Countries{ BN{"Brunei"} BW{"Botswana"} - BY{"Weissrussland"} CV{"Kapverden"} GB{"Grossbritannien"} QO{"Äusseres Ozeanien"} @@ -12,5 +12,4 @@ de_CH{ TL{"Osttimor"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/dje.txt b/intl/icu/source/data/region/dje.txt index ef10ab7d698a..78e1fd36e89a 100644 --- a/intl/icu/source/data/region/dje.txt +++ b/intl/icu/source/data/region/dje.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dje{ Countries{ AD{"Andoora"} @@ -225,5 +226,4 @@ dje{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/doi.txt b/intl/icu/source/data/region/doi.txt new file mode 100644 index 000000000000..881c7727f29a --- /dev/null +++ b/intl/icu/source/data/region/doi.txt @@ -0,0 +1,18 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +doi{ + Countries{ + BR{"ब्राजील"} + CN{"चीन"} + DE{"जर्मनी"} + FR{"फ्रांस"} + GB{"यूनाइटेड किंगडम"} + IN{"भारत"} + IT{"इटली"} + JP{"जापान"} + RU{"रूस"} + US{"यूएस"} + ZZ{"अनजांता खेत्तर"} + } +} diff --git a/intl/icu/source/data/region/dsb.txt b/intl/icu/source/data/region/dsb.txt index 03078f30dc26..6b3c0fa2dbbe 100644 --- a/intl/icu/source/data/region/dsb.txt +++ b/intl/icu/source/data/region/dsb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dsb{ Countries{ 001{"swět"} @@ -305,5 +306,4 @@ dsb{ FK{"Falklandske kupy (Malwiny)"} TL{"Pódzajtšny Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/dua.txt b/intl/icu/source/data/region/dua.txt index 0c1a475a6d4b..42e1424d6833 100644 --- a/intl/icu/source/data/region/dua.txt +++ b/intl/icu/source/data/region/dua.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dua{ Countries{ CM{"Cameroun"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/dyo.txt b/intl/icu/source/data/region/dyo.txt index c5d95304b7be..b8c3c7baba35 100644 --- a/intl/icu/source/data/region/dyo.txt +++ b/intl/icu/source/data/region/dyo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dyo{ Countries{ AD{"Andorra"} @@ -111,5 +112,4 @@ dyo{ TG{"Togo"} TH{"Tailand"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/dz.txt b/intl/icu/source/data/region/dz.txt index e81f6c387d73..ab82d9777d8a 100644 --- a/intl/icu/source/data/region/dz.txt +++ b/intl/icu/source/data/region/dz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dz{ Countries{ 001{"འཛམ་གླིང༌"} @@ -301,5 +302,4 @@ dz{ FK{"ཕལྐ་ལནྜ་གླིང་ཚོམ (ཨིས་ལཱས་མལ་བི་ཎཱས)"} TL{"ཤར་ཕྱོགས་ཏི་་མོར"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ebu.txt b/intl/icu/source/data/region/ebu.txt index b3e49f29b78e..6620cf3ca8a5 100644 --- a/intl/icu/source/data/region/ebu.txt +++ b/intl/icu/source/data/region/ebu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ebu{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ ebu{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ee.txt b/intl/icu/source/data/region/ee.txt index 380419e5dc14..d9795979f4ba 100644 --- a/intl/icu/source/data/region/ee.txt +++ b/intl/icu/source/data/region/ee.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee{ Countries{ 001{"xexeme"} @@ -296,5 +297,4 @@ ee{ FK{"Falkland ƒudomekpowo (Islas Malvinas) nutome"} TL{"Ɣedzeƒe Timɔ nutome"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/el.txt b/intl/icu/source/data/region/el.txt index 14210755e8f3..762686e75d12 100644 --- a/intl/icu/source/data/region/el.txt +++ b/intl/icu/source/data/region/el.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ Countries{ 001{"Κόσμος"} @@ -253,7 +254,7 @@ el{ SV{"Ελ Σαλβαδόρ"} SX{"Άγιος Μαρτίνος (Ολλανδικό τμήμα)"} SY{"Συρία"} - SZ{"Σουαζιλάνδη"} + SZ{"Εσουατίνι"} TA{"Τριστάν ντα Κούνια"} TC{"Νήσοι Τερκς και Κάικος"} TD{"Τσαντ"} @@ -310,7 +311,7 @@ el{ CG{"Κονγκό (Δημοκρατία)"} CZ{"Τσεχική Δημοκρατία"} FK{"Νήσοι Φόκλαντ (Νήσοι Μαλβίνας)"} + SZ{"Σουαζιλάνδη"} TL{"Ανατολικό Τιμόρ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/en.txt b/intl/icu/source/data/region/en.txt index 5c7702ed2745..7b683db6a41f 100644 --- a/intl/icu/source/data/region/en.txt +++ b/intl/icu/source/data/region/en.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ Countries{ 001{"World"} @@ -317,5 +318,4 @@ en{ SZ{"Swaziland"} TL{"East Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/en_001.txt b/intl/icu/source/data/region/en_001.txt index 37e5e713f270..d3b9559aa466 100644 --- a/intl/icu/source/data/region/en_001.txt +++ b/intl/icu/source/data/region/en_001.txt @@ -1,16 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ Countries{ - BL{"St Barthélemy"} - KN{"St Kitts & Nevis"} - LC{"St Lucia"} - MF{"St Martin"} - PM{"St Pierre & Miquelon"} - SH{"St Helena"} UM{"US Outlying Islands"} - VC{"St Vincent & Grenadines"} VI{"US Virgin Islands"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/en_150.txt b/intl/icu/source/data/region/en_150.txt index 5a9d0dde62b1..a616e2470fb7 100644 --- a/intl/icu/source/data/region/en_150.txt +++ b/intl/icu/source/data/region/en_150.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_150{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_AG.txt b/intl/icu/source/data/region/en_AG.txt index 15f4f3b2f146..95a979e89b03 100644 --- a/intl/icu/source/data/region/en_AG.txt +++ b/intl/icu/source/data/region/en_AG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_AI.txt b/intl/icu/source/data/region/en_AI.txt index ec4deb24332a..e1cf7517e8af 100644 --- a/intl/icu/source/data/region/en_AI.txt +++ b/intl/icu/source/data/region/en_AI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_AT.txt b/intl/icu/source/data/region/en_AT.txt index e4a6465fadcf..075c742b8e80 100644 --- a/intl/icu/source/data/region/en_AT.txt +++ b/intl/icu/source/data/region/en_AT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AT{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_AU.txt b/intl/icu/source/data/region/en_AU.txt index 9cd8be6af3b9..ba324c3761a2 100644 --- a/intl/icu/source/data/region/en_AU.txt +++ b/intl/icu/source/data/region/en_AU.txt @@ -1,13 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AU{ %%Parent{"en_001"} - Countries{ - BL{"St. Barthélemy"} - KN{"St. Kitts & Nevis"} - LC{"St. Lucia"} - MF{"St. Martin"} - VC{"St. Vincent & Grenadines"} - } - Version{"37"} } diff --git a/intl/icu/source/data/region/en_BB.txt b/intl/icu/source/data/region/en_BB.txt index 814000f3539c..d62d19252e08 100644 --- a/intl/icu/source/data/region/en_BB.txt +++ b/intl/icu/source/data/region/en_BB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_BE.txt b/intl/icu/source/data/region/en_BE.txt index ded640548a45..0e5fffa332ea 100644 --- a/intl/icu/source/data/region/en_BE.txt +++ b/intl/icu/source/data/region/en_BE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_BM.txt b/intl/icu/source/data/region/en_BM.txt index 1f9a62c1ac63..d45a1f99e2f1 100644 --- a/intl/icu/source/data/region/en_BM.txt +++ b/intl/icu/source/data/region/en_BM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_BS.txt b/intl/icu/source/data/region/en_BS.txt index 115d86885a11..fa71936df178 100644 --- a/intl/icu/source/data/region/en_BS.txt +++ b/intl/icu/source/data/region/en_BS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_BW.txt b/intl/icu/source/data/region/en_BW.txt index 611516b83c07..ab8bf0919f95 100644 --- a/intl/icu/source/data/region/en_BW.txt +++ b/intl/icu/source/data/region/en_BW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_BZ.txt b/intl/icu/source/data/region/en_BZ.txt index 226183af7d00..fbf69779811b 100644 --- a/intl/icu/source/data/region/en_BZ.txt +++ b/intl/icu/source/data/region/en_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CA.txt b/intl/icu/source/data/region/en_CA.txt index ee4fcd489cbd..0d35e55e2b18 100644 --- a/intl/icu/source/data/region/en_CA.txt +++ b/intl/icu/source/data/region/en_CA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CC.txt b/intl/icu/source/data/region/en_CC.txt index bce9886347ba..906cf1e9307e 100644 --- a/intl/icu/source/data/region/en_CC.txt +++ b/intl/icu/source/data/region/en_CC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CH.txt b/intl/icu/source/data/region/en_CH.txt index 244edf251572..23629216bb2e 100644 --- a/intl/icu/source/data/region/en_CH.txt +++ b/intl/icu/source/data/region/en_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CH{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CK.txt b/intl/icu/source/data/region/en_CK.txt index ad52b0e60e4d..dc1c0652a0aa 100644 --- a/intl/icu/source/data/region/en_CK.txt +++ b/intl/icu/source/data/region/en_CK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CM.txt b/intl/icu/source/data/region/en_CM.txt index bf63213a9c6b..b7fdf6d9851c 100644 --- a/intl/icu/source/data/region/en_CM.txt +++ b/intl/icu/source/data/region/en_CM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CX.txt b/intl/icu/source/data/region/en_CX.txt index 702f22b69973..58ff41550186 100644 --- a/intl/icu/source/data/region/en_CX.txt +++ b/intl/icu/source/data/region/en_CX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_CY.txt b/intl/icu/source/data/region/en_CY.txt index 21b11b75693b..d4e75c0ad7c6 100644 --- a/intl/icu/source/data/region/en_CY.txt +++ b/intl/icu/source/data/region/en_CY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_DE.txt b/intl/icu/source/data/region/en_DE.txt index 262361402a19..0147e016a82c 100644 --- a/intl/icu/source/data/region/en_DE.txt +++ b/intl/icu/source/data/region/en_DE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_DG.txt b/intl/icu/source/data/region/en_DG.txt index 95b8e88b2410..10bd8d9f5c7b 100644 --- a/intl/icu/source/data/region/en_DG.txt +++ b/intl/icu/source/data/region/en_DG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_DK.txt b/intl/icu/source/data/region/en_DK.txt index d98349b1211f..d694bb01d391 100644 --- a/intl/icu/source/data/region/en_DK.txt +++ b/intl/icu/source/data/region/en_DK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DK{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_DM.txt b/intl/icu/source/data/region/en_DM.txt index 5bfedb7bc574..224df76b66c2 100644 --- a/intl/icu/source/data/region/en_DM.txt +++ b/intl/icu/source/data/region/en_DM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_ER.txt b/intl/icu/source/data/region/en_ER.txt index afd82fc80845..a39df789c0b7 100644 --- a/intl/icu/source/data/region/en_ER.txt +++ b/intl/icu/source/data/region/en_ER.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ER{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_FI.txt b/intl/icu/source/data/region/en_FI.txt index ae4b5178a0fa..0b93a7e23208 100644 --- a/intl/icu/source/data/region/en_FI.txt +++ b/intl/icu/source/data/region/en_FI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_FJ.txt b/intl/icu/source/data/region/en_FJ.txt index 0c4ca01ddb12..65b19ac752d1 100644 --- a/intl/icu/source/data/region/en_FJ.txt +++ b/intl/icu/source/data/region/en_FJ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FJ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_FK.txt b/intl/icu/source/data/region/en_FK.txt index 9c92bfddf150..1fca5161ce21 100644 --- a/intl/icu/source/data/region/en_FK.txt +++ b/intl/icu/source/data/region/en_FK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_FM.txt b/intl/icu/source/data/region/en_FM.txt index 352f324e9718..ad38147c27bf 100644 --- a/intl/icu/source/data/region/en_FM.txt +++ b/intl/icu/source/data/region/en_FM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_GB.txt b/intl/icu/source/data/region/en_GB.txt index a03b26b743f3..2450432fd07a 100644 --- a/intl/icu/source/data/region/en_GB.txt +++ b/intl/icu/source/data/region/en_GB.txt @@ -1,6 +1,15 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GB{ %%Parent{"en_001"} - Version{"37"} + Countries{ + BL{"St Barthélemy"} + KN{"St Kitts & Nevis"} + LC{"St Lucia"} + MF{"St Martin"} + PM{"St Pierre & Miquelon"} + SH{"St Helena"} + VC{"St Vincent & the Grenadines"} + } } diff --git a/intl/icu/source/data/region/en_GD.txt b/intl/icu/source/data/region/en_GD.txt index 98ca5e43fb1e..5aadd228902a 100644 --- a/intl/icu/source/data/region/en_GD.txt +++ b/intl/icu/source/data/region/en_GD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_GG.txt b/intl/icu/source/data/region/en_GG.txt index 8bee533ca6ed..6d63e5509c60 100644 --- a/intl/icu/source/data/region/en_GG.txt +++ b/intl/icu/source/data/region/en_GG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_GH.txt b/intl/icu/source/data/region/en_GH.txt index de3715085046..8d0f240339d5 100644 --- a/intl/icu/source/data/region/en_GH.txt +++ b/intl/icu/source/data/region/en_GH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_GI.txt b/intl/icu/source/data/region/en_GI.txt index 5afa54f0b21a..809590db2c12 100644 --- a/intl/icu/source/data/region/en_GI.txt +++ b/intl/icu/source/data/region/en_GI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_GM.txt b/intl/icu/source/data/region/en_GM.txt index bbf424ce80b4..0f9710e3cfe0 100644 --- a/intl/icu/source/data/region/en_GM.txt +++ b/intl/icu/source/data/region/en_GM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_GY.txt b/intl/icu/source/data/region/en_GY.txt index 905d5bef1647..0e53543e03e5 100644 --- a/intl/icu/source/data/region/en_GY.txt +++ b/intl/icu/source/data/region/en_GY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_HK.txt b/intl/icu/source/data/region/en_HK.txt index 3eec8fe6d580..f074e0c27571 100644 --- a/intl/icu/source/data/region/en_HK.txt +++ b/intl/icu/source/data/region/en_HK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_HK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_IE.txt b/intl/icu/source/data/region/en_IE.txt index 96feab56fd02..1426a90d3ea6 100644 --- a/intl/icu/source/data/region/en_IE.txt +++ b/intl/icu/source/data/region/en_IE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_IL.txt b/intl/icu/source/data/region/en_IL.txt index 2d329190ae66..39fe76349fde 100644 --- a/intl/icu/source/data/region/en_IL.txt +++ b/intl/icu/source/data/region/en_IL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_IM.txt b/intl/icu/source/data/region/en_IM.txt index 15a218b34593..d6e869d81edb 100644 --- a/intl/icu/source/data/region/en_IM.txt +++ b/intl/icu/source/data/region/en_IM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_IN.txt b/intl/icu/source/data/region/en_IN.txt index 7cc832de46b9..a4ffb58ba55a 100644 --- a/intl/icu/source/data/region/en_IN.txt +++ b/intl/icu/source/data/region/en_IN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_IO.txt b/intl/icu/source/data/region/en_IO.txt index 5cd721054613..5b70c5ab66ad 100644 --- a/intl/icu/source/data/region/en_IO.txt +++ b/intl/icu/source/data/region/en_IO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_JE.txt b/intl/icu/source/data/region/en_JE.txt index d8e0823c1652..715ff18d66ba 100644 --- a/intl/icu/source/data/region/en_JE.txt +++ b/intl/icu/source/data/region/en_JE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_JM.txt b/intl/icu/source/data/region/en_JM.txt index 695ae1a18125..08a51274d409 100644 --- a/intl/icu/source/data/region/en_JM.txt +++ b/intl/icu/source/data/region/en_JM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_KE.txt b/intl/icu/source/data/region/en_KE.txt index eecdd357a018..01411a3aabe7 100644 --- a/intl/icu/source/data/region/en_KE.txt +++ b/intl/icu/source/data/region/en_KE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_KI.txt b/intl/icu/source/data/region/en_KI.txt index 6c68a9fa83d5..8cd023d08082 100644 --- a/intl/icu/source/data/region/en_KI.txt +++ b/intl/icu/source/data/region/en_KI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_KN.txt b/intl/icu/source/data/region/en_KN.txt index 35ebc91eb17e..092c41e9eb64 100644 --- a/intl/icu/source/data/region/en_KN.txt +++ b/intl/icu/source/data/region/en_KN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_KY.txt b/intl/icu/source/data/region/en_KY.txt index 71fa196b611a..a0c571e78e8b 100644 --- a/intl/icu/source/data/region/en_KY.txt +++ b/intl/icu/source/data/region/en_KY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_LC.txt b/intl/icu/source/data/region/en_LC.txt index 5e248adcff89..ce2445292795 100644 --- a/intl/icu/source/data/region/en_LC.txt +++ b/intl/icu/source/data/region/en_LC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_LR.txt b/intl/icu/source/data/region/en_LR.txt index 0a77adc8b4fc..979fa999139a 100644 --- a/intl/icu/source/data/region/en_LR.txt +++ b/intl/icu/source/data/region/en_LR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_LS.txt b/intl/icu/source/data/region/en_LS.txt index 14848c9fef04..bd1380cb3de1 100644 --- a/intl/icu/source/data/region/en_LS.txt +++ b/intl/icu/source/data/region/en_LS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MG.txt b/intl/icu/source/data/region/en_MG.txt index 2f24348d2b73..8799b5bcb3bd 100644 --- a/intl/icu/source/data/region/en_MG.txt +++ b/intl/icu/source/data/region/en_MG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MO.txt b/intl/icu/source/data/region/en_MO.txt index 2cd5c0a8f383..769b2ea19989 100644 --- a/intl/icu/source/data/region/en_MO.txt +++ b/intl/icu/source/data/region/en_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MS.txt b/intl/icu/source/data/region/en_MS.txt index fbedac5bdeff..e0028aa3cb1b 100644 --- a/intl/icu/source/data/region/en_MS.txt +++ b/intl/icu/source/data/region/en_MS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MT.txt b/intl/icu/source/data/region/en_MT.txt index a3af9271389a..a21782743294 100644 --- a/intl/icu/source/data/region/en_MT.txt +++ b/intl/icu/source/data/region/en_MT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MU.txt b/intl/icu/source/data/region/en_MU.txt index 1e672406bf18..1a4260b7206b 100644 --- a/intl/icu/source/data/region/en_MU.txt +++ b/intl/icu/source/data/region/en_MU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MW.txt b/intl/icu/source/data/region/en_MW.txt index 06244544e9de..1920911dc756 100644 --- a/intl/icu/source/data/region/en_MW.txt +++ b/intl/icu/source/data/region/en_MW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_MY.txt b/intl/icu/source/data/region/en_MY.txt index ffd93f8e315a..891c100c2873 100644 --- a/intl/icu/source/data/region/en_MY.txt +++ b/intl/icu/source/data/region/en_MY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NA.txt b/intl/icu/source/data/region/en_NA.txt index 0b019a8d650f..c1a4e58564fe 100644 --- a/intl/icu/source/data/region/en_NA.txt +++ b/intl/icu/source/data/region/en_NA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NF.txt b/intl/icu/source/data/region/en_NF.txt index e264ade967b9..514d0d9c3ea2 100644 --- a/intl/icu/source/data/region/en_NF.txt +++ b/intl/icu/source/data/region/en_NF.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NF{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NG.txt b/intl/icu/source/data/region/en_NG.txt index 70db1dbe8f90..c047e030fcdb 100644 --- a/intl/icu/source/data/region/en_NG.txt +++ b/intl/icu/source/data/region/en_NG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NH.txt b/intl/icu/source/data/region/en_NH.txt index 958b96bdad8e..5dc995b2118b 100644 --- a/intl/icu/source/data/region/en_NH.txt +++ b/intl/icu/source/data/region/en_NH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NH{ "%%ALIAS"{"en_VU"} } diff --git a/intl/icu/source/data/region/en_NL.txt b/intl/icu/source/data/region/en_NL.txt index 5b5436b9dc60..0b352bd44db3 100644 --- a/intl/icu/source/data/region/en_NL.txt +++ b/intl/icu/source/data/region/en_NL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NL{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NR.txt b/intl/icu/source/data/region/en_NR.txt index 4377e15a6568..89304ca9b0da 100644 --- a/intl/icu/source/data/region/en_NR.txt +++ b/intl/icu/source/data/region/en_NR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NU.txt b/intl/icu/source/data/region/en_NU.txt index 56d9b22ea29c..830320b281b0 100644 --- a/intl/icu/source/data/region/en_NU.txt +++ b/intl/icu/source/data/region/en_NU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_NZ.txt b/intl/icu/source/data/region/en_NZ.txt index ca3650e0f511..63e43a3938da 100644 --- a/intl/icu/source/data/region/en_NZ.txt +++ b/intl/icu/source/data/region/en_NZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_PG.txt b/intl/icu/source/data/region/en_PG.txt index ffddbf48a87f..217c90f4dd6b 100644 --- a/intl/icu/source/data/region/en_PG.txt +++ b/intl/icu/source/data/region/en_PG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_PH.txt b/intl/icu/source/data/region/en_PH.txt index 96578848ab80..1b59777cecbf 100644 --- a/intl/icu/source/data/region/en_PH.txt +++ b/intl/icu/source/data/region/en_PH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_PK.txt b/intl/icu/source/data/region/en_PK.txt index 874a3eeda131..909315766bb5 100644 --- a/intl/icu/source/data/region/en_PK.txt +++ b/intl/icu/source/data/region/en_PK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_PN.txt b/intl/icu/source/data/region/en_PN.txt index 7f93228000e3..975dcb4418f7 100644 --- a/intl/icu/source/data/region/en_PN.txt +++ b/intl/icu/source/data/region/en_PN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_PW.txt b/intl/icu/source/data/region/en_PW.txt index ed60f26fed87..89ef3e6c9463 100644 --- a/intl/icu/source/data/region/en_PW.txt +++ b/intl/icu/source/data/region/en_PW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_RH.txt b/intl/icu/source/data/region/en_RH.txt index b60f708fb284..24bad293f695 100644 --- a/intl/icu/source/data/region/en_RH.txt +++ b/intl/icu/source/data/region/en_RH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RH{ "%%ALIAS"{"en_ZW"} } diff --git a/intl/icu/source/data/region/en_RW.txt b/intl/icu/source/data/region/en_RW.txt index bc329328e290..ea92ac1dead5 100644 --- a/intl/icu/source/data/region/en_RW.txt +++ b/intl/icu/source/data/region/en_RW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SB.txt b/intl/icu/source/data/region/en_SB.txt index 7e736c28dae8..99071572dc6c 100644 --- a/intl/icu/source/data/region/en_SB.txt +++ b/intl/icu/source/data/region/en_SB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SC.txt b/intl/icu/source/data/region/en_SC.txt index df04930ee040..9d503c4f86b8 100644 --- a/intl/icu/source/data/region/en_SC.txt +++ b/intl/icu/source/data/region/en_SC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SD.txt b/intl/icu/source/data/region/en_SD.txt index f2110fab60c4..ef3c460dae03 100644 --- a/intl/icu/source/data/region/en_SD.txt +++ b/intl/icu/source/data/region/en_SD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SE.txt b/intl/icu/source/data/region/en_SE.txt index c2a72c0820b6..ec7d34ecf478 100644 --- a/intl/icu/source/data/region/en_SE.txt +++ b/intl/icu/source/data/region/en_SE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SG.txt b/intl/icu/source/data/region/en_SG.txt index ddf857dc6401..1f25c8634c6a 100644 --- a/intl/icu/source/data/region/en_SG.txt +++ b/intl/icu/source/data/region/en_SG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SH.txt b/intl/icu/source/data/region/en_SH.txt index 0e6c3dc082d3..09e4765ae382 100644 --- a/intl/icu/source/data/region/en_SH.txt +++ b/intl/icu/source/data/region/en_SH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SI.txt b/intl/icu/source/data/region/en_SI.txt index a69030ee8795..6fb107aec3d0 100644 --- a/intl/icu/source/data/region/en_SI.txt +++ b/intl/icu/source/data/region/en_SI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SL.txt b/intl/icu/source/data/region/en_SL.txt index b956002c8c65..c79ccc50137a 100644 --- a/intl/icu/source/data/region/en_SL.txt +++ b/intl/icu/source/data/region/en_SL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SS.txt b/intl/icu/source/data/region/en_SS.txt index 80fb80078f97..390a313b3ff7 100644 --- a/intl/icu/source/data/region/en_SS.txt +++ b/intl/icu/source/data/region/en_SS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SX.txt b/intl/icu/source/data/region/en_SX.txt index 28da271484bb..11fa700ebcd0 100644 --- a/intl/icu/source/data/region/en_SX.txt +++ b/intl/icu/source/data/region/en_SX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_SZ.txt b/intl/icu/source/data/region/en_SZ.txt index 431d63a6eaf2..7e9c97d0d227 100644 --- a/intl/icu/source/data/region/en_SZ.txt +++ b/intl/icu/source/data/region/en_SZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_TC.txt b/intl/icu/source/data/region/en_TC.txt index 4129b99aedf9..181633bb547b 100644 --- a/intl/icu/source/data/region/en_TC.txt +++ b/intl/icu/source/data/region/en_TC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_TK.txt b/intl/icu/source/data/region/en_TK.txt index 11010f35ad4c..e50d57245622 100644 --- a/intl/icu/source/data/region/en_TK.txt +++ b/intl/icu/source/data/region/en_TK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_TO.txt b/intl/icu/source/data/region/en_TO.txt index 6b63ad24fc11..d21d084e934f 100644 --- a/intl/icu/source/data/region/en_TO.txt +++ b/intl/icu/source/data/region/en_TO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_TT.txt b/intl/icu/source/data/region/en_TT.txt index d91ebb5a6aa4..d375378a8bf3 100644 --- a/intl/icu/source/data/region/en_TT.txt +++ b/intl/icu/source/data/region/en_TT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_TV.txt b/intl/icu/source/data/region/en_TV.txt index 2d0ae8f9f059..62477529f574 100644 --- a/intl/icu/source/data/region/en_TV.txt +++ b/intl/icu/source/data/region/en_TV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TV{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_TZ.txt b/intl/icu/source/data/region/en_TZ.txt index 2ff0cbd9517f..2aa8e46e6255 100644 --- a/intl/icu/source/data/region/en_TZ.txt +++ b/intl/icu/source/data/region/en_TZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_UG.txt b/intl/icu/source/data/region/en_UG.txt index 7ad0d876d3d0..26ed28e6b2df 100644 --- a/intl/icu/source/data/region/en_UG.txt +++ b/intl/icu/source/data/region/en_UG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_UG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_VC.txt b/intl/icu/source/data/region/en_VC.txt index 45b455da495d..a0187543234c 100644 --- a/intl/icu/source/data/region/en_VC.txt +++ b/intl/icu/source/data/region/en_VC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_VG.txt b/intl/icu/source/data/region/en_VG.txt index 3e84e3013cc5..1a001d05daa8 100644 --- a/intl/icu/source/data/region/en_VG.txt +++ b/intl/icu/source/data/region/en_VG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_VU.txt b/intl/icu/source/data/region/en_VU.txt index 6229365b1f91..91d6b819ccf7 100644 --- a/intl/icu/source/data/region/en_VU.txt +++ b/intl/icu/source/data/region/en_VU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_WS.txt b/intl/icu/source/data/region/en_WS.txt index 5d2f739b8e3e..f197bb1f1507 100644 --- a/intl/icu/source/data/region/en_WS.txt +++ b/intl/icu/source/data/region/en_WS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_WS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_ZA.txt b/intl/icu/source/data/region/en_ZA.txt index 942751ed3d33..13468e262d33 100644 --- a/intl/icu/source/data/region/en_ZA.txt +++ b/intl/icu/source/data/region/en_ZA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_ZM.txt b/intl/icu/source/data/region/en_ZM.txt index 32588ce8afff..f61c471a8de3 100644 --- a/intl/icu/source/data/region/en_ZM.txt +++ b/intl/icu/source/data/region/en_ZM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/en_ZW.txt b/intl/icu/source/data/region/en_ZW.txt index 05fb790dbc5f..60eaea8a1863 100644 --- a/intl/icu/source/data/region/en_ZW.txt +++ b/intl/icu/source/data/region/en_ZW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/region/eo.txt b/intl/icu/source/data/region/eo.txt index 885790514b0d..959c0025c26b 100644 --- a/intl/icu/source/data/region/eo.txt +++ b/intl/icu/source/data/region/eo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo{ Countries{ 001{"Mondo"} @@ -226,5 +227,4 @@ eo{ ZM{"Zambio"} ZW{"Zimbabvo"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es.txt b/intl/icu/source/data/region/es.txt index 33912aec7d69..acbba3fa2c35 100644 --- a/intl/icu/source/data/region/es.txt +++ b/intl/icu/source/data/region/es.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ Countries{ 001{"Mundo"} @@ -48,7 +49,7 @@ es{ AT{"Austria"} AU{"Australia"} AW{"Aruba"} - AX{"Islas Åland"} + AX{"Islas Aland"} AZ{"Azerbaiyán"} BA{"Bosnia y Herzegovina"} BB{"Barbados"} @@ -107,7 +108,7 @@ es{ ES{"España"} ET{"Etiopía"} EU{"Unión Europea"} - EZ{"zona euro"} + EZ{"zona del euro"} FI{"Finlandia"} FJ{"Fiyi"} FK{"Islas Malvinas"} @@ -119,7 +120,7 @@ es{ GD{"Granada"} GE{"Georgia"} GF{"Guayana Francesa"} - GG{"Guernsey"} + GG{"Guernesey"} GH{"Ghana"} GI{"Gibraltar"} GL{"Groenlandia"} @@ -313,5 +314,4 @@ es{ SZ{"Suazilandia"} TL{"Timor Oriental"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_419.txt b/intl/icu/source/data/region/es_419.txt index fb4ec738b378..dafbaacb0a7d 100644 --- a/intl/icu/source/data/region/es_419.txt +++ b/intl/icu/source/data/region/es_419.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_419{ Countries{ 011{"África del Oeste"} @@ -15,11 +16,11 @@ es_419{ 154{"Europa del Norte"} 155{"Europa del Oeste"} AC{"Isla Ascensión"} + AX{"Islas Åland"} BA{"Bosnia-Herzegovina"} CG{"República del Congo"} CI{"Costa de Marfil"} EZ{"Eurozona"} - GG{"Guernesey"} IC{"Islas Canarias"} QO{"Islas Ultramarinas"} TA{"Tristán da Cunha"} @@ -31,5 +32,4 @@ es_419{ Countries%variant{ CD{"Congo (República Democrática del Congo)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_AR.txt b/intl/icu/source/data/region/es_AR.txt index 45edf2567386..bb6f1eb9e650 100644 --- a/intl/icu/source/data/region/es_AR.txt +++ b/intl/icu/source/data/region/es_AR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_AR{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_AR{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_BO.txt b/intl/icu/source/data/region/es_BO.txt index 01579cfd7622..a735d3d666fc 100644 --- a/intl/icu/source/data/region/es_BO.txt +++ b/intl/icu/source/data/region/es_BO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BO{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_BO{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_BR.txt b/intl/icu/source/data/region/es_BR.txt index a8d655c2c505..a18c09fbb9ad 100644 --- a/intl/icu/source/data/region/es_BR.txt +++ b/intl/icu/source/data/region/es_BR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/region/es_BZ.txt b/intl/icu/source/data/region/es_BZ.txt index f7034128e3b6..471108e8d7a7 100644 --- a/intl/icu/source/data/region/es_BZ.txt +++ b/intl/icu/source/data/region/es_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BZ{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/region/es_CL.txt b/intl/icu/source/data/region/es_CL.txt index cc7b1ab681ae..1d7a86dc526d 100644 --- a/intl/icu/source/data/region/es_CL.txt +++ b/intl/icu/source/data/region/es_CL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CL{ %%Parent{"es_419"} Countries{ @@ -11,5 +12,4 @@ es_CL{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_CO.txt b/intl/icu/source/data/region/es_CO.txt index bffa2eb3c303..f1f4387fb38a 100644 --- a/intl/icu/source/data/region/es_CO.txt +++ b/intl/icu/source/data/region/es_CO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CO{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_CO{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_CR.txt b/intl/icu/source/data/region/es_CR.txt index 7e4ffc1ff1cc..8d7d079f63cd 100644 --- a/intl/icu/source/data/region/es_CR.txt +++ b/intl/icu/source/data/region/es_CR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CR{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_CR{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_CU.txt b/intl/icu/source/data/region/es_CU.txt index a316a0d43e0b..1a3a70a76b8d 100644 --- a/intl/icu/source/data/region/es_CU.txt +++ b/intl/icu/source/data/region/es_CU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CU{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/region/es_DO.txt b/intl/icu/source/data/region/es_DO.txt index 7530abb23769..a4ca636427b4 100644 --- a/intl/icu/source/data/region/es_DO.txt +++ b/intl/icu/source/data/region/es_DO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_DO{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_DO{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_EC.txt b/intl/icu/source/data/region/es_EC.txt index da94a6d50e5e..fca4a0fac5c4 100644 --- a/intl/icu/source/data/region/es_EC.txt +++ b/intl/icu/source/data/region/es_EC.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_EC{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_EC{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_GT.txt b/intl/icu/source/data/region/es_GT.txt index 14552b4fef59..d377434882d2 100644 --- a/intl/icu/source/data/region/es_GT.txt +++ b/intl/icu/source/data/region/es_GT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GT{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_GT{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_HN.txt b/intl/icu/source/data/region/es_HN.txt index 9ce01166c1b8..465d14a4ce60 100644 --- a/intl/icu/source/data/region/es_HN.txt +++ b/intl/icu/source/data/region/es_HN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_HN{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_HN{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_MX.txt b/intl/icu/source/data/region/es_MX.txt index e127f41600f3..ae70f8cf3776 100644 --- a/intl/icu/source/data/region/es_MX.txt +++ b/intl/icu/source/data/region/es_MX.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_MX{ %%Parent{"es_419"} Countries{ @@ -29,5 +30,4 @@ es_MX{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_NI.txt b/intl/icu/source/data/region/es_NI.txt index 2a2255a459af..0bfdc58713f6 100644 --- a/intl/icu/source/data/region/es_NI.txt +++ b/intl/icu/source/data/region/es_NI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_NI{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_NI{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_PA.txt b/intl/icu/source/data/region/es_PA.txt index c2543647f143..ea377edfd854 100644 --- a/intl/icu/source/data/region/es_PA.txt +++ b/intl/icu/source/data/region/es_PA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PA{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_PA{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_PE.txt b/intl/icu/source/data/region/es_PE.txt index f98004fb2368..f51a4cf9e8d5 100644 --- a/intl/icu/source/data/region/es_PE.txt +++ b/intl/icu/source/data/region/es_PE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PE{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_PE{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_PR.txt b/intl/icu/source/data/region/es_PR.txt index 05427e023f5a..00f18b121003 100644 --- a/intl/icu/source/data/region/es_PR.txt +++ b/intl/icu/source/data/region/es_PR.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PR{ %%Parent{"es_419"} Countries{ UM{"Islas menores alejadas de EE. UU."} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_PY.txt b/intl/icu/source/data/region/es_PY.txt index 011d7da35109..2e51d1206168 100644 --- a/intl/icu/source/data/region/es_PY.txt +++ b/intl/icu/source/data/region/es_PY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PY{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_PY{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_SV.txt b/intl/icu/source/data/region/es_SV.txt index fc7116e5ad93..ad142d4c1f9d 100644 --- a/intl/icu/source/data/region/es_SV.txt +++ b/intl/icu/source/data/region/es_SV.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_SV{ %%Parent{"es_419"} Countries{ UM{"Islas menores alejadas de EE. UU."} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_US.txt b/intl/icu/source/data/region/es_US.txt index 6f36612b4af3..10a247afe2e7 100644 --- a/intl/icu/source/data/region/es_US.txt +++ b/intl/icu/source/data/region/es_US.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_US{ %%Parent{"es_419"} Countries{ @@ -18,7 +19,6 @@ es_US{ AC{"Isla de la Ascensión"} BA{"Bosnia y Herzegovina"} CI{"Côte d’Ivoire"} - EZ{"zona euro"} GG{"Guernsey"} QO{"Territorios alejados de Oceanía"} TA{"Tristán de Acuña"} @@ -27,5 +27,4 @@ es_US{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/es_UY.txt b/intl/icu/source/data/region/es_UY.txt index 41fc7c05d55e..143b9b3fbe7a 100644 --- a/intl/icu/source/data/region/es_UY.txt +++ b/intl/icu/source/data/region/es_UY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_UY{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/region/es_VE.txt b/intl/icu/source/data/region/es_VE.txt index b09daf4123e3..c4578eb26634 100644 --- a/intl/icu/source/data/region/es_VE.txt +++ b/intl/icu/source/data/region/es_VE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_VE{ %%Parent{"es_419"} Countries{ @@ -10,5 +11,4 @@ es_VE{ Countries%short{ GB{"RU"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/et.txt b/intl/icu/source/data/region/et.txt index af534295d5d6..52912c15d7e8 100644 --- a/intl/icu/source/data/region/et.txt +++ b/intl/icu/source/data/region/et.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et{ Countries{ 001{"maailm"} @@ -115,7 +116,7 @@ et{ FO{"Fääri saared"} FR{"Prantsusmaa"} GA{"Gabon"} - GB{"Suurbritannia"} + GB{"Ühendkuningriik"} GD{"Grenada"} GE{"Gruusia"} GF{"Prantsuse Guajaana"} @@ -309,10 +310,9 @@ et{ CD{"Kongo-Kinshasa"} CG{"Kongo-Brazzaville"} CI{"Elevandiluurannik"} - CZ{"Tšehhia"} - FK{"Malviini saared"} + CZ{"Tšehhi Vabariik"} + FK{"Falklandi saared (Malviini saared)"} SZ{"eSwatini"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/eu.txt b/intl/icu/source/data/region/eu.txt index 9b02e748b9f2..c7c9c3de2d2e 100644 --- a/intl/icu/source/data/region/eu.txt +++ b/intl/icu/source/data/region/eu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eu{ Countries{ 001{"Mundua"} @@ -288,7 +289,7 @@ eu{ WF{"Wallis eta Futuna"} WS{"Samoa"} XA{"Sasiazentuak"} - XB{"pseudobidia"} + XB{"Pseudobidia"} XK{"Kosovo"} YE{"Yemen"} YT{"Mayotte"} @@ -311,5 +312,4 @@ eu{ CZ{"Txekiar Errepublika"} FK{"Falklandak (Malvinak)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ewo.txt b/intl/icu/source/data/region/ewo.txt index 4a77b2760473..3f9b3cc8c5b5 100644 --- a/intl/icu/source/data/region/ewo.txt +++ b/intl/icu/source/data/region/ewo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ewo{ Countries{ AD{"Andór"} @@ -226,5 +227,4 @@ ewo{ ZM{"Zambí"} ZW{"Zimbabwé"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fa.txt b/intl/icu/source/data/region/fa.txt index efc11bfdfb98..e42a6af9e054 100644 --- a/intl/icu/source/data/region/fa.txt +++ b/intl/icu/source/data/region/fa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa{ Countries{ 001{"جهان"} @@ -307,10 +308,10 @@ fa{ Countries%variant{ CD{"کنگو (جمهوری دموکراتیک)"} CG{"کنگو (جمهوری)"} + CI{"ساحل‌عاج"} CZ{"جمهوری چک"} FK{"جزایر فالکلند (ایسلاس مالویناس)"} SZ{"سوازیلند"} TL{"تیمور شرقی"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fa_AF.txt b/intl/icu/source/data/region/fa_AF.txt index e35f89435735..d28064f86011 100644 --- a/intl/icu/source/data/region/fa_AF.txt +++ b/intl/icu/source/data/region/fa_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa_AF{ Countries{ AD{"اندورا"} @@ -95,5 +96,4 @@ fa_AF{ Countries%short{ HK{"هانگ کانگ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ff.txt b/intl/icu/source/data/region/ff.txt index 53c5fe8fe43e..284df52e50dc 100644 --- a/intl/icu/source/data/region/ff.txt +++ b/intl/icu/source/data/region/ff.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff{ Countries{ AD{"Anndoora"} @@ -226,5 +227,4 @@ ff{ ZM{"Sammbi"} ZW{"Simbaabuwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ff_Adlm.txt b/intl/icu/source/data/region/ff_Adlm.txt index 0865e99ef633..07cc423d3a81 100644 --- a/intl/icu/source/data/region/ff_Adlm.txt +++ b/intl/icu/source/data/region/ff_Adlm.txt @@ -1,95 +1,317 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm{ %%Parent{"root"} Countries{ 001{"𞤀𞤣𞤵𞤲𞤢"} - 002{"𞤀𞤬𞤪𞤭𞤳"} + 002{"𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + 003{"𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} + 005{"𞤙𞤢𞤥𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} 009{"𞤌𞤧𞤭𞤴𞤢𞤲𞤭𞥅"} - 019{"𞤀𞤥𞤫𞤪𞤭𞤳"} + 011{"𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + 013{"𞤚𞤵𞤥𞤦𞤮 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} + 014{"𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + 015{"𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + 017{"𞤚𞤵𞤥𞤦𞤮 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + 018{"𞤙𞤢𞥄𞤥𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + 019{"𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} + 021{"𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} + 029{"𞤑𞤢𞤪𞤦𞤭𞤴𞤢𞥄"} + 030{"𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢"} + 034{"𞤙𞤢𞤥𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢"} + 035{"𞤙𞤢𞤥𞤬𞤭𞤯𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞥄𞤧𞤭𞤴𞤢"} + 039{"𞤙𞤢𞤥𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤓𞤪𞤨𞤢"} + 053{"𞤀𞤧𞤼𞤢𞤪𞤤𞤢𞥄𞤧𞤭𞤴𞤢𞥄"} + 054{"𞤃𞤭𞤤𞤢𞤲𞤭𞥅𞤧𞤴𞤢"} + 057{"𞤖𞤭𞤤𞥆𞤮 𞤃𞤭𞤳𞤪𞤮𞤲𞤭𞥅𞤧𞤸𞤮"} + 061{"𞤆𞤮𞤤𞤭𞤲𞤭𞥅𞤧𞤴𞤢"} 142{"𞤀𞥄𞤧𞤭𞤴𞤢"} - 150{"𞤓𞤪𞤮𞤨𞥆𞤢"} + 143{"𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢"} + 145{"𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤀𞥄𞤧𞤭𞤴𞤢"} + 150{"𞤓𞤪𞤨𞤢"} + 151{"𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤓𞤪𞤨𞤢"} + 154{"𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤓𞤪𞤨𞤢"} + 155{"𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤓𞤪𞤨𞤢"} + 202{"𞤀𞤬𞤪𞤭𞤳𞤢𞥄 𞤂𞤫𞤧-𞤅𞤢𞥄𞤸𞤢𞤪𞤢"} + 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{"𞤀𞤬𞤪𞤭𞤳𞤭 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭"} + 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{"𞤋𞤧𞤨𞤢𞤲𞤭𞤴𞤢"} + ES{"𞤉𞤧𞤨𞤢𞤻𞤢𞥄"} ET{"𞤀𞤦𞤢𞤧𞤭𞤲𞤭𞥅"} - EU{"𞤑𞤢𞤱𞤼𞤢𞤤 𞤓𞤪𞤮𞤨𞥆𞤢"} + EU{"𞤑𞤢𞤱𞤼𞤢𞤤 𞤓𞤪𞤨𞤢"} EZ{"𞤊𞤭𞤪𞤤𞤢 𞤓𞤪𞤮𞥅"} + FI{"𞤊𞤭𞤲𞤤𞤢𞤲𞤣"} + FJ{"𞤊𞤭𞤶𞤭𞥅"} + FK{"𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤊𞤢𞤤𞤳𞤵𞤤𞤢𞤲𞤣"} + FM{"𞤃𞤭𞤳𞤪𞤮𞤲𞤫𞥅𞤧𞤭𞤴𞤢"} + FO{"𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤊𞤢𞤪𞤵𞥅𞤧"} FR{"𞤊𞤢𞤪𞤢𞤲𞤧𞤭"} GA{"𞤘𞤢𞤦𞤮𞤲"} - GG{"𞤘𞤢𞤴𞤪𞤢𞤲𞤧𞤭𞥅"} + 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{"𞤓𞤺𞤢𞤲𞤣𞤢𞥄"} - UN{"𞤑𞤢𞤱𞤼𞤢𞤤 𞤘𞤫𞤲𞤣𞤭𞥅𞤶𞤭 𞤀𞤣𞤵𞤲𞤢"} + UM{"𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤁𞤢𞥄𞤴𞤭𞥅𞤯𞤫 𞤁𞤂𞤀"} + UN{"𞤑𞤢𞤱𞤼𞤢𞤤 𞤘𞤫𞤲𞤯𞤭"} + US{"𞤁𞤫𞤲𞤼𞤢𞤤 𞤂𞤢𞤪𞤫"} + UY{"𞤓𞤪𞤵𞤺𞤵𞤱𞤢𞥄𞤴"} + UZ{"𞤓𞥁𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} + VA{"𞤜𞤢𞤼𞤭𞤳𞤢𞥄𞤲"} + VC{"𞤅𞤼. 𞤜𞤭𞤲𞤧𞤢𞤲 & 𞤘𞤭𞤪𞤲𞤢𞤣𞤭𞥅𞤲"} + VE{"𞤜𞤫𞥊𞤲𞤭𞥅𞥁𞤵𞤱𞤫𞤤𞤢𞥄"} + VG{"𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤜𞤭𞤪𞤺𞤭𞥅𞤲 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤶𞤫"} + VI{"𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤜𞤭𞤪𞤺𞤭𞥅𞤲 𞤁𞤂𞤀"} + VN{"𞤜𞤭𞤴𞤫𞤼𞤲𞤢𞥄𞤥"} + VU{"𞤜𞤢𞤲𞤵𞤱𞤢𞥄𞤼𞤵"} + WF{"𞤏𞤢𞤤𞥆𞤭𞥅𞤧 & 𞤊𞤵𞤼𞤵𞤲𞤢"} + WS{"𞤅𞤢𞤥𞤵𞤱𞤢"} + XK{"𞤑𞤮𞥅𞤧𞤮𞤾𞤮𞥅"} + YE{"𞤒𞤢𞤥𞤢𞤲"} YT{"𞤃𞤢𞤴𞤮𞥅𞤼𞤵"} ZA{"𞤀𞤬𞤪𞤭𞤳𞤢 𞤂𞤫𞤧𞤤𞤫𞤴𞤪𞤭"} ZM{"𞤟𞤢𞤥𞤦𞤭𞤴𞤢"} ZW{"𞤟𞤭𞤥𞤦𞤢𞥄𞤥𞤵𞤴𞤢"} - ZZ{"𞤂𞤢𞤪𞤢𞤤 𞤀𞤧-𞤢𞤲𞤣𞤢𞥄𞤲𞤺𞤢𞤤"} + ZZ{"𞤖𞤭𞤤𞥆𞤮 𞤀𞤧-𞤢𞤲𞤣𞤢𞥄𞤲𞤺𞤮"} } Countries%short{ + GB{"𞤑𞤘"} + HK{"𞤖𞤮𞤲𞤺 𞤑𞤮𞤲𞤺"} + MO{"𞤃𞤢𞤳𞤢𞤱𞤮𞥅"} US{"𞤁𞤂𞤀"} } Countries%variant{ CD{"𞤐𞤣𞤫𞤲𞤣𞤭 𞤁𞤫𞤥𞤮𞤳𞤪𞤢𞥄𞤳𞤵 𞤑𞤮𞤲𞤺𞤮"} CG{"𞤐𞤣𞤫𞤲𞤣𞤭 𞤑𞤮𞤲𞤺𞤮"} + CZ{"𞤐𞤣𞤫𞤲𞤣𞤭 𞤕𞤫𞤧𞤳𞤢𞥄"} + FK{"𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤃𞤢𞤤𞤾𞤭𞤲𞤢𞥄𞤧"} SZ{"𞤅𞤵𞤱𞤢𞥄𞤧𞤭𞤤𞤫𞤴𞤣𞤭"} + TL{"𞤚𞤭𞤥𞤮𞥅𞤪 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ff_CM.txt b/intl/icu/source/data/region/ff_CM.txt index c381f6cd740d..0bf68ef91987 100644 --- a/intl/icu/source/data/region/ff_CM.txt +++ b/intl/icu/source/data/region/ff_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_CM{ "%%ALIAS"{"ff_Latn_CM"} } diff --git a/intl/icu/source/data/region/ff_GN.txt b/intl/icu/source/data/region/ff_GN.txt index c3a0bf3d7bf3..433db4db3d8d 100644 --- a/intl/icu/source/data/region/ff_GN.txt +++ b/intl/icu/source/data/region/ff_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_GN{ "%%ALIAS"{"ff_Latn_GN"} } diff --git a/intl/icu/source/data/region/ff_Latn.txt b/intl/icu/source/data/region/ff_Latn.txt index 3d8715b562c7..d30cb6250832 100644 --- a/intl/icu/source/data/region/ff_Latn.txt +++ b/intl/icu/source/data/region/ff_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/region/ff_Latn_CM.txt b/intl/icu/source/data/region/ff_Latn_CM.txt index a141c2f858f1..123bc57aeef0 100644 --- a/intl/icu/source/data/region/ff_Latn_CM.txt +++ b/intl/icu/source/data/region/ff_Latn_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ff_Latn_GN.txt b/intl/icu/source/data/region/ff_Latn_GN.txt index b37284e2b028..54b7546ef6ba 100644 --- a/intl/icu/source/data/region/ff_Latn_GN.txt +++ b/intl/icu/source/data/region/ff_Latn_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ff_Latn_MR.txt b/intl/icu/source/data/region/ff_Latn_MR.txt index 9b83c9511093..dd6364bc3bdf 100644 --- a/intl/icu/source/data/region/ff_Latn_MR.txt +++ b/intl/icu/source/data/region/ff_Latn_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ff_Latn_SN.txt b/intl/icu/source/data/region/ff_Latn_SN.txt index 6112f6fdf109..33ed4073beb5 100644 --- a/intl/icu/source/data/region/ff_Latn_SN.txt +++ b/intl/icu/source/data/region/ff_Latn_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ff_MR.txt b/intl/icu/source/data/region/ff_MR.txt index 17a887321fa0..1da6e5116ae4 100644 --- a/intl/icu/source/data/region/ff_MR.txt +++ b/intl/icu/source/data/region/ff_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_MR{ "%%ALIAS"{"ff_Latn_MR"} } diff --git a/intl/icu/source/data/region/ff_SN.txt b/intl/icu/source/data/region/ff_SN.txt index c6908546784d..ca2f4ec58333 100644 --- a/intl/icu/source/data/region/ff_SN.txt +++ b/intl/icu/source/data/region/ff_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_SN{ "%%ALIAS"{"ff_Latn_SN"} } diff --git a/intl/icu/source/data/region/fi.txt b/intl/icu/source/data/region/fi.txt index defa943a5483..fc175c90582d 100644 --- a/intl/icu/source/data/region/fi.txt +++ b/intl/icu/source/data/region/fi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi{ Countries{ 001{"maailma"} @@ -22,7 +23,7 @@ fi{ 039{"Etelä-Eurooppa"} 053{"Australaasia"} 054{"Melanesia"} - 057{"Mikronesia"} + 057{"Mikronesian alue"} 061{"Polynesia"} 142{"Aasia"} 143{"Keski-Aasia"} @@ -111,7 +112,7 @@ fi{ FI{"Suomi"} FJ{"Fidži"} FK{"Falklandinsaaret"} - FM{"Mikronesian liittovaltio"} + FM{"Mikronesia"} FO{"Färsaaret"} FR{"Ranska"} GA{"Gabon"} @@ -128,12 +129,12 @@ fi{ GP{"Guadeloupe"} GQ{"Päiväntasaajan Guinea"} GR{"Kreikka"} - GS{"Etelä-Georgia ja Eteläiset Sandwichsaaret"} + GS{"Etelä-Georgia ja Eteläiset Sandwichinsaaret"} GT{"Guatemala"} GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong – Kiinan e.h.a."} + HK{"Hongkong – Kiinan erityishallintoalue"} HM{"Heard ja McDonaldinsaaret"} HN{"Honduras"} HR{"Kroatia"} @@ -187,7 +188,7 @@ fi{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macao – Kiinan e.h.a."} + MO{"Macao – Kiinan erityishallintoalue"} MP{"Pohjois-Mariaanit"} MQ{"Martinique"} MR{"Mauritania"} @@ -222,12 +223,12 @@ fi{ PM{"Saint-Pierre ja Miquelon"} PN{"Pitcairn"} PR{"Puerto Rico"} - PS{"Palestiinalaisalueet"} + PS{"Palestiinalaisalue"} PT{"Portugali"} PW{"Palau"} PY{"Paraguay"} QA{"Qatar"} - QO{"ulkomeri"} + QO{"Oseanian erillissaaret"} RE{"Réunion"} RO{"Romania"} RS{"Serbia"} @@ -241,7 +242,7 @@ fi{ SG{"Singapore"} SH{"Saint Helena"} SI{"Slovenia"} - SJ{"Huippuvuoret ja Jan Mayen"} + SJ{"Svalbard ja Jan Mayen"} SK{"Slovakia"} SL{"Sierra Leone"} SM{"San Marino"} @@ -253,11 +254,11 @@ fi{ SV{"El Salvador"} SX{"Sint Maarten"} SY{"Syyria"} - SZ{"Swazimaa"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Turks- ja Caicossaaret"} TD{"Tšad"} - TF{"Ranskan eteläiset alueet"} + TF{"Ranskan eteläiset ja antarktiset alueet"} TG{"Togo"} TH{"Thaimaa"} TJ{"Tadžikistan"} @@ -311,8 +312,7 @@ fi{ CI{"Côte d’Ivoire"} CZ{"Tšekin tasavalta"} FK{"Falklandinsaaret (Malvinassaaret)"} - SZ{"Eswatini"} + SZ{"Swazimaa"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fil.txt b/intl/icu/source/data/region/fil.txt index 835ae20eb8dc..e84a7abf07c6 100644 --- a/intl/icu/source/data/region/fil.txt +++ b/intl/icu/source/data/region/fil.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil{ Countries{ 001{"Mundo"} @@ -313,5 +314,4 @@ fil{ FK{"Falkland Islands (Islas Malvinas)"} TL{"East Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fil_PH.txt b/intl/icu/source/data/region/fil_PH.txt index 5b83d8215fcb..481c955f9053 100644 --- a/intl/icu/source/data/region/fil_PH.txt +++ b/intl/icu/source/data/region/fil_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/fo.txt b/intl/icu/source/data/region/fo.txt index ecbbc327abfd..bfb453a5d2d2 100644 --- a/intl/icu/source/data/region/fo.txt +++ b/intl/icu/source/data/region/fo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo{ Countries{ 001{"heimur"} @@ -183,6 +184,7 @@ fo{ MF{"St-Martin"} MG{"Madagaskar"} MH{"Marshalloyggjar"} + MK{"Norður Makedónia"} ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} @@ -307,5 +309,4 @@ fo{ FK{"Falklandsoyggjar (Islas Malvinas)"} SZ{"Svasiland"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fr.txt b/intl/icu/source/data/region/fr.txt index a081dcdf278d..e0bbd16fa77d 100644 --- a/intl/icu/source/data/region/fr.txt +++ b/intl/icu/source/data/region/fr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ Countries{ 001{"Monde"} @@ -61,7 +62,7 @@ fr{ BJ{"Bénin"} BL{"Saint-Barthélemy"} BM{"Bermudes"} - BN{"Brunéi Darussalam"} + BN{"Brunei"} BO{"Bolivie"} BQ{"Pays-Bas caribéens"} BR{"Brésil"} @@ -111,7 +112,7 @@ fr{ FI{"Finlande"} FJ{"Fidji"} FK{"Îles Malouines"} - FM{"États fédérés de Micronésie"} + FM{"Micronésie"} FO{"Îles Féroé"} FR{"France"} GA{"Gabon"} @@ -128,13 +129,13 @@ fr{ GP{"Guadeloupe"} GQ{"Guinée équatoriale"} GR{"Grèce"} - GS{"Géorgie du Sud et îles Sandwich du Sud"} + GS{"Géorgie du Sud-et-les Îles Sandwich du Sud"} GT{"Guatemala"} GU{"Guam"} GW{"Guinée-Bissau"} GY{"Guyana"} HK{"R.A.S. chinoise de Hong Kong"} - HM{"Îles Heard et McDonald"} + HM{"Îles Heard-et-MacDonald"} HN{"Honduras"} HR{"Croatie"} HT{"Haïti"} @@ -155,7 +156,7 @@ fr{ JO{"Jordanie"} JP{"Japon"} KE{"Kenya"} - KG{"Kirghizistan"} + KG{"Kirghizstan"} KH{"Cambodge"} KI{"Kiribati"} KM{"Comores"} @@ -170,7 +171,7 @@ fr{ LC{"Sainte-Lucie"} LI{"Liechtenstein"} LK{"Sri Lanka"} - LR{"Libéria"} + LR{"Liberia"} LS{"Lesotho"} LT{"Lituanie"} LU{"Luxembourg"} @@ -203,7 +204,7 @@ fr{ NC{"Nouvelle-Calédonie"} NE{"Niger"} NF{"Île Norfolk"} - NG{"Nigéria"} + NG{"Nigeria"} NI{"Nicaragua"} NL{"Pays-Bas"} NO{"Norvège"} @@ -279,11 +280,11 @@ fr{ UY{"Uruguay"} UZ{"Ouzbékistan"} VA{"État de la Cité du Vatican"} - VC{"Saint-Vincent-et-les-Grenadines"} + VC{"Saint-Vincent-et-les Grenadines"} VE{"Venezuela"} VG{"Îles Vierges britanniques"} VI{"Îles Vierges des États-Unis"} - VN{"Vietnam"} + VN{"Viêt Nam"} VU{"Vanuatu"} WF{"Wallis-et-Futuna"} WS{"Samoa"} @@ -310,9 +311,8 @@ fr{ CG{"République du Congo"} CI{"​​République de Côte d’Ivoire"} CZ{"République tchèque"} - FK{"Îles Falkland"} + FK{"Îles Malouines (Îles Falkland)"} SZ{"Swaziland"} TL{"Timor-Oriental"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fr_BE.txt b/intl/icu/source/data/region/fr_BE.txt index b9d2f9c312b4..7b8cd5ec9392 100644 --- a/intl/icu/source/data/region/fr_BE.txt +++ b/intl/icu/source/data/region/fr_BE.txt @@ -1,9 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_BE{ Countries{ - BN{"Brunei"} GS{"Îles Géorgie du Sud et Sandwich du Sud"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fr_CA.txt b/intl/icu/source/data/region/fr_CA.txt index 4d31d2fd01d9..793b6c974350 100644 --- a/intl/icu/source/data/region/fr_CA.txt +++ b/intl/icu/source/data/region/fr_CA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CA{ Countries{ 030{"Asie orientale"} @@ -10,23 +11,24 @@ fr_CA{ 155{"Europe occidentale"} AC{"île de l’Ascension"} AX{"îles d’Åland"} - BN{"Brunei"} BV{"île Bouvet"} BY{"Bélarus"} CC{"îles Cocos (Keeling)"} CK{"îles Cook"} CX{"île Christmas"} FK{"îles Malouines"} - FM{"Micronésie"} FO{"îles Féroé"} HM{"îles Heard et McDonald"} IC{"îles Canaries"} IM{"île de Man"} IO{"territoire britannique de l’océan Indien"} + KG{"Kirghizistan"} + LR{"Libéria"} MF{"Saint-Martin (France)"} MM{"Myanmar"} MP{"Mariannes du Nord"} NF{"île Norfolk"} + NG{"Nigéria"} PN{"îles Pitcairn"} QO{"Océanie lointaine"} RE{"la Réunion"} @@ -34,14 +36,13 @@ fr_CA{ TL{"Timor-Leste"} UM{"îles mineures éloignées des États-Unis"} VA{"Cité du Vatican"} - VC{"Saint-Vincent-et-les Grenadines"} VG{"îles Vierges britanniques"} VI{"îles Vierges américaines"} + VN{"Vietnam"} } Countries%variant{ CI{"République de Côte d’Ivoire"} FK{"îles Falkland (Malouines)"} TL{"Timor oriental"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fur.txt b/intl/icu/source/data/region/fur.txt index ed1e6748befc..9f318c154bc6 100644 --- a/intl/icu/source/data/region/fur.txt +++ b/intl/icu/source/data/region/fur.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fur{ Countries{ 001{"Mont"} @@ -294,5 +295,4 @@ fur{ CG{"Congo (Republiche)"} FK{"Isulis Falkland (Isulis Malvinas)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/fy.txt b/intl/icu/source/data/region/fy.txt index b54fdf8bd791..ab1081f90cba 100644 --- a/intl/icu/source/data/region/fy.txt +++ b/intl/icu/source/data/region/fy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fy{ Countries{ 001{"Wrâld"} @@ -303,5 +304,4 @@ fy{ CG{"Congo (Republyk)"} FK{"Falklâneilannen (Islas Malvinas)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ga.txt b/intl/icu/source/data/region/ga.txt index ee5391eb8108..6081dfb29469 100644 --- a/intl/icu/source/data/region/ga.txt +++ b/intl/icu/source/data/region/ga.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga{ Countries{ 001{"an Domhan"} @@ -313,5 +314,4 @@ ga{ FK{"Oileáin Fháclainne (Islas Malvinas)"} SZ{"an tSuasalainn"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/gd.txt b/intl/icu/source/data/region/gd.txt index 59cc5ffa297e..710d052d29bf 100644 --- a/intl/icu/source/data/region/gd.txt +++ b/intl/icu/source/data/region/gd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gd{ Countries{ 001{"An Saoghal"} @@ -241,7 +242,7 @@ gd{ SG{"Singeapòr"} SH{"Eilean Naomh Eilidh"} SI{"An t-Slòbhain"} - SJ{"Svalbard agus Jan Mayen"} + SJ{"Svalbard is Jan Mayen"} SK{"An t-Slòbhac"} SL{"Siarra Leòmhann"} SM{"San Marino"} @@ -313,5 +314,4 @@ gd{ SZ{"Dùthaich nan Suasaidh"} TL{"Tìomor an Ear"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/gl.txt b/intl/icu/source/data/region/gl.txt index 151c484bca99..0c69721944e7 100644 --- a/intl/icu/source/data/region/gl.txt +++ b/intl/icu/source/data/region/gl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gl{ Countries{ 001{"Mundo"} @@ -311,7 +312,6 @@ gl{ CI{"Costa do Marfil"} CZ{"República Checa"} FK{"Illas Malvinas (Falkland)"} - SZ{"Suacilandia"} + SZ{"Swazilandia"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/gsw.txt b/intl/icu/source/data/region/gsw.txt index c130bdb8f2f1..108a5ca1114f 100644 --- a/intl/icu/source/data/region/gsw.txt +++ b/intl/icu/source/data/region/gsw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw{ Countries{ 001{"Wält"} @@ -284,5 +285,4 @@ gsw{ HK{"Hongkong"} MO{"Macao"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/gu.txt b/intl/icu/source/data/region/gu.txt index c09efdb200aa..4533c2f2476b 100644 --- a/intl/icu/source/data/region/gu.txt +++ b/intl/icu/source/data/region/gu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gu{ Countries{ 001{"વિશ્વ"} @@ -314,5 +315,4 @@ gu{ SZ{"સ્વાઝીલેન્ડ"} TL{"પૂર્વ તિમોર"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/guz.txt b/intl/icu/source/data/region/guz.txt index b45072052394..2e0aab21022e 100644 --- a/intl/icu/source/data/region/guz.txt +++ b/intl/icu/source/data/region/guz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml guz{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ guz{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/gv.txt b/intl/icu/source/data/region/gv.txt index 293a03842a9c..e24989d65816 100644 --- a/intl/icu/source/data/region/gv.txt +++ b/intl/icu/source/data/region/gv.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gv{ Countries{ GB{"Rywvaneth Unys"} IM{"Ellan Vannin"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ha.txt b/intl/icu/source/data/region/ha.txt index 38295e46fc65..b8696341e582 100644 --- a/intl/icu/source/data/region/ha.txt +++ b/intl/icu/source/data/region/ha.txt @@ -1,28 +1,29 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha{ Countries{ 001{"Duniya"} 002{"Afirka"} - 003{"North America"} - 005{"South America"} - 009{"Oceania"} + 003{"Amurka ta Arewa"} + 005{"Amurka ta Kudu"} + 009{"Osheniya"} 011{"Afirka ta Yamma"} - 013{"Central America"} + 013{"Amurka ta Tsakiya"} 014{"Afirka ta Gabas"} - 015{"Arewacin Africa"} + 015{"Arewacin Afirka"} 017{"Afirka ta Tsakiya"} 018{"Kudancin Afirka"} - 019{"nahiyoyin Amurka"} + 019{"Nahiyoyin Amurka"} 021{"Arewacin Amurka"} - 029{"Caribbean"} + 029{"Karebiyan"} 030{"Gabashin Asiya"} - 034{"kudancin Asiya"} + 034{"Kudancin Asiya"} 035{"Kudu Maso Gabashin Asiya"} 039{"Kudancin Turai"} 053{"Tsibarai na Austraila da New Zealand da maƙota"} 054{"Tsibirai na New Guinea da Fiji da maƙota"} - 057{"Yankin Micronesia"} + 057{"Yankin Micronesiya"} 061{"tsibiri"} 142{"Asiya"} 143{"Asiya ta Tsakiya"} @@ -31,13 +32,13 @@ ha{ 151{"Gabashin Turai"} 154{"Arewacin Turai"} 155{"Yammacin Turai"} - 202{"Sub-Saharan Africa"} - 419{"Latin America"} + 202{"Afirka ta Kudancin Sahara"} + 419{"Latin Amurka"} AC{"Tsibirin Ascension"} AD{"Andora"} AE{"Haɗaɗɗiyar Daular Larabawa"} AF{"Afaganistan"} - AG{"Antigwa da Barbuba"} + AG{"Antigua da Barbuda"} AI{"Angila"} AL{"Albaniya"} AM{"Armeniya"} @@ -50,7 +51,7 @@ ha{ AW{"Aruba"} AX{"Tsibirai na Åland"} AZ{"Azarbaijan"} - BA{"Bosniya Harzagobina"} + BA{"Bosniya da Harzagobina"} BB{"Barbadas"} BD{"Bangiladas"} BE{"Belgiyom"} @@ -59,7 +60,7 @@ ha{ BH{"Baharan"} BI{"Burundi"} BJ{"Binin"} - BL{"St. Barthélemy"} + BL{"San Barthélemy"} BM{"Barmuda"} BN{"Burune"} BO{"Bolibiya"} @@ -87,7 +88,7 @@ ha{ CR{"Kwasta Rika"} CU{"Kyuba"} CV{"Tsibiran Kap Barde"} - CW{"Kasar Curaçao"} + CW{"Ƙasar Curaçao"} CX{"Tsibirin Kirsmati"} CY{"Sifurus"} CZ{"Jamhuriyar Cak"} @@ -98,7 +99,7 @@ ha{ DM{"Dominika"} DO{"Jamhuriyar Dominika"} DZ{"Aljeriya"} - EA{"Ceuta & Melilla"} + EA{"Ceuta da Melilla"} EC{"Ekwador"} EE{"Estoniya"} EG{"Misira"} @@ -133,16 +134,16 @@ ha{ GU{"Gwam"} GW{"Gini Bisau"} GY{"Guyana"} - HK{"Hong Kong Babban Birnin Kasar Chana"} + HK{"Babban Yankin Mulkin Hong Kong na Ƙasar Sin"} HM{"Tsibirin Heard da McDonald"} HN{"Honduras"} HR{"Kurowaishiya"} HT{"Haiti"} HU{"Hungari"} - IC{"Canary Islands"} + IC{"Tsibiran Canary"} ID{"Indunusiya"} IE{"Ayalan"} - IL{"Iziraʼila"} + IL{"Israʼila"} IM{"Isle na Mutum"} IN{"Indiya"} IO{"Yankin Birtaniya Na Tekun Indiya"} @@ -153,7 +154,7 @@ ha{ JE{"Kasar Jersey"} JM{"Jamaika"} JO{"Jordan"} - JP{"Jàpân"} + JP{"Japan"} KE{"Kenya"} KG{"Kirgizistan"} KH{"Kambodiya"} @@ -174,20 +175,20 @@ ha{ LS{"Lesoto"} LT{"Lituweniya"} LU{"Lukusambur"} - LV{"latibiya"} + LV{"Litibiya"} LY{"Libiya"} MA{"Maroko"} MC{"Monako"} MD{"Maldoba"} ME{"Mantanegara"} - MF{"St. Martin"} + MF{"San Martin"} MG{"Madagaskar"} MH{"Tsibiran Marshal"} MK{"Macedonia ta Arewa"} ML{"Mali"} MM{"Burma, Miyamar"} MN{"Mangoliya"} - MO{"Babban Birnin Mulki na Chana"} + MO{"Babban Yankin Mulkin Macao na Ƙasar Sin"} MP{"Tsibiran Mariyana Na Arewa"} MQ{"Martinik"} MR{"Moritaniya"} @@ -219,10 +220,10 @@ ha{ PH{"Filipin"} PK{"Pakistan"} PL{"Polan"} - PM{"San Piyar Da Mikelan"} + PM{"San Piyar da Mikelan"} PN{"Pitakarin"} PR{"Porto Riko"} - PS{"Palasɗinu"} + PS{"Yankunan Palasɗinu"} PT{"Portugal"} PW{"Palau"} PY{"Faragwai"} @@ -248,10 +249,10 @@ ha{ SN{"Sanigal"} SO{"Somaliya"} SR{"Suriname"} - SS{"Sudan ta kudu"} + SS{"Sudan ta Kudu"} ST{"Sawo Tome Da Paransip"} SV{"El Salbador"} - SX{"Sint Maarten"} + SX{"San Maarten"} SY{"Sham, Siriya"} SZ{"Eswatini"} TA{"Tritan da Kunha"} @@ -274,7 +275,7 @@ ha{ UA{"Yukaran"} UG{"Yuganda"} UM{"Rukunin Tsibirin U.S"} - UN{"Majalisar Dinkin Duniya"} + UN{"Majalisar Ɗinkin Duniya"} US{"Amurka"} UY{"Yurigwai"} UZ{"Uzubekistan"} @@ -297,9 +298,12 @@ ha{ ZW{"Zimbabuwe"} ZZ{"Yanki da ba a sani ba"} } + Countries%short{ + PS{"Palasɗinu"} + } Countries%variant{ CD{"Kongo (DRC)"} CG{"Jamhuriyar Kongo"} + SZ{"Suwazilan"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/haw.txt b/intl/icu/source/data/region/haw.txt index db97cc0df724..c6557acbadd3 100644 --- a/intl/icu/source/data/region/haw.txt +++ b/intl/icu/source/data/region/haw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml haw{ Countries{ AU{"Nūhōlani"} @@ -23,5 +24,4 @@ haw{ RU{"Lūkia"} US{"ʻAmelika Hui Pū ʻIa"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/he.txt b/intl/icu/source/data/region/he.txt index ebfc740113f7..47c2db8c08fd 100644 --- a/intl/icu/source/data/region/he.txt +++ b/intl/icu/source/data/region/he.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he{ Countries{ 001{"העולם"} @@ -312,5 +313,4 @@ he{ SZ{"סווזילנד"} TL{"מזרח טימור"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/he_IL.txt b/intl/icu/source/data/region/he_IL.txt index 71039533a130..21ee915c5e3d 100644 --- a/intl/icu/source/data/region/he_IL.txt +++ b/intl/icu/source/data/region/he_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/hi.txt b/intl/icu/source/data/region/hi.txt index 36a424e03701..cb6e97f67019 100644 --- a/intl/icu/source/data/region/hi.txt +++ b/intl/icu/source/data/region/hi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi{ Countries{ 001{"विश्व"} @@ -312,5 +313,4 @@ hi{ FK{"फ़ॉकलैंड द्वीपसमूह (इज़्लास माल्विनास)"} TL{"पूर्वी तिमोर"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/hr.txt b/intl/icu/source/data/region/hr.txt index f5c8ca77ddaa..76bec6deef68 100644 --- a/intl/icu/source/data/region/hr.txt +++ b/intl/icu/source/data/region/hr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr{ Countries{ 001{"Svijet"} @@ -314,5 +315,4 @@ hr{ SZ{"Svazi"} TL{"Istočni Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/hsb.txt b/intl/icu/source/data/region/hsb.txt index 6e7d73e4c102..faa82aa44407 100644 --- a/intl/icu/source/data/region/hsb.txt +++ b/intl/icu/source/data/region/hsb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hsb{ Countries{ 001{"swět"} @@ -271,6 +272,7 @@ hsb{ UA{"Ukraina"} UG{"Uganda"} UM{"Ameriska Oceaniska"} + UN{"Zjednoćene narody"} US{"Zjednoćene staty Ameriki"} UY{"Uruguay"} UZ{"Uzbekistan"} @@ -305,5 +307,4 @@ hsb{ FK{"Falklandske kupy (Malwiny)"} TL{"Wuchodny Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/hu.txt b/intl/icu/source/data/region/hu.txt index d77570987ca3..0a055c71e003 100644 --- a/intl/icu/source/data/region/hu.txt +++ b/intl/icu/source/data/region/hu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu{ Countries{ 001{"Világ"} @@ -73,9 +74,9 @@ hu{ BZ{"Belize"} CA{"Kanada"} CC{"Kókusz (Keeling)-szigetek"} - CD{"Kongó - Kinshasa"} + CD{"Kongó – Kinshasa"} CF{"Közép-afrikai Köztársaság"} - CG{"Kongó - Brazzaville"} + CG{"Kongó – Brazzaville"} CH{"Svájc"} CI{"Elefántcsontpart"} CK{"Cook-szigetek"} @@ -222,7 +223,7 @@ hu{ PM{"Saint-Pierre és Miquelon"} PN{"Pitcairn-szigetek"} PR{"Puerto Rico"} - PS{"Palesztin Terület"} + PS{"Palesztin Autonómia"} PT{"Portugália"} PW{"Palau"} PY{"Paraguay"} @@ -313,5 +314,4 @@ hu{ SZ{"Eswatini"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/hy.txt b/intl/icu/source/data/region/hy.txt index 75a961c73082..08f98e33e328 100644 --- a/intl/icu/source/data/region/hy.txt +++ b/intl/icu/source/data/region/hy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy{ Countries{ 001{"Աշխարհ"} @@ -314,5 +315,4 @@ hy{ SZ{"Սվազիլենդ"} TL{"Արևելյան Թիմոր"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ia.txt b/intl/icu/source/data/region/ia.txt index e75aed8354c6..3b602a515f42 100644 --- a/intl/icu/source/data/region/ia.txt +++ b/intl/icu/source/data/region/ia.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ia{ Countries{ 001{"Mundo"} @@ -40,6 +41,7 @@ ia{ AL{"Albania"} AM{"Armenia"} AO{"Angola"} + AQ{"Antarctica"} AR{"Argentina"} AS{"Samoa american"} AT{"Austria"} @@ -204,6 +206,7 @@ ia{ SY{"Syria"} SZ{"Swazilandia"} TC{"Insulas Turcos e Caicos"} + TD{"Tchad"} TF{"Territorios meridional francese"} TG{"Togo"} TH{"Thailandia"} @@ -243,5 +246,4 @@ ia{ Countries%variant{ CZ{"Republica Chec"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/id.txt b/intl/icu/source/data/region/id.txt index b4fe0f7becff..4b03a2d11a1e 100644 --- a/intl/icu/source/data/region/id.txt +++ b/intl/icu/source/data/region/id.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id{ Countries{ 001{"Dunia"} @@ -122,7 +123,7 @@ id{ GG{"Guernsey"} GH{"Ghana"} GI{"Gibraltar"} - GL{"Grinlandia"} + GL{"Greenland"} GM{"Gambia"} GN{"Guinea"} GP{"Guadeloupe"} @@ -155,7 +156,7 @@ id{ JO{"Yordania"} JP{"Jepang"} KE{"Kenya"} - KG{"Kirgistan"} + KG{"Kirgizstan"} KH{"Kamboja"} KI{"Kiribati"} KM{"Komoro"} @@ -164,7 +165,7 @@ id{ KR{"Korea Selatan"} KW{"Kuwait"} KY{"Kepulauan Cayman"} - KZ{"Kazakstan"} + KZ{"Kazakhstan"} LA{"Laos"} LB{"Lebanon"} LC{"Saint Lucia"} @@ -175,7 +176,7 @@ id{ LT{"Lituania"} LU{"Luksemburg"} LV{"Latvia"} - LY{"Libia"} + LY{"Libya"} MA{"Maroko"} MC{"Monako"} MD{"Moldova"} @@ -256,14 +257,14 @@ id{ SZ{"eSwatini"} TA{"Tristan da Cunha"} TC{"Kepulauan Turks dan Caicos"} - TD{"Cad"} - TF{"Wilayah Selatan Perancis"} + TD{"Chad"} + TF{"Wilayah Selatan Prancis"} TG{"Togo"} TH{"Thailand"} TJ{"Tajikistan"} TK{"Tokelau"} TL{"Timor Leste"} - TM{"Turkimenistan"} + TM{"Turkmenistan"} TN{"Tunisia"} TO{"Tonga"} TR{"Turki"} @@ -273,7 +274,7 @@ id{ TZ{"Tanzania"} UA{"Ukraina"} UG{"Uganda"} - UM{"Kepulauan Terluar A.S."} + UM{"Kepulauan Terluar AS"} UN{"Perserikatan Bangsa-Bangsa"} US{"Amerika Serikat"} UY{"Uruguay"} @@ -303,15 +304,13 @@ id{ MO{"Makau"} PS{"Palestina"} UN{"PBB"} - US{"A.S."} + US{"AS"} } Countries%variant{ CD{"Kongo (RDK)"} CG{"Kongo (Republik)"} CZ{"Republik Ceko"} FK{"Kepulauan Falkland (Malvinas)"} - SZ{"Swaziland"} TL{"Timor Timur"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/id_ID.txt b/intl/icu/source/data/region/id_ID.txt index 20daa236ee75..63f19a21aa60 100644 --- a/intl/icu/source/data/region/id_ID.txt +++ b/intl/icu/source/data/region/id_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ig.txt b/intl/icu/source/data/region/ig.txt index 1e1c51f83aac..b6f24c6677d4 100644 --- a/intl/icu/source/data/region/ig.txt +++ b/intl/icu/source/data/region/ig.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ig{ Countries{ 001{"Uwa"} @@ -35,12 +36,12 @@ ig{ 419{"Latin America"} AC{"Ascension Island"} AD{"Andorra"} - AE{"Obodo United Arab Emirates"} - AF{"Mba Afghanistan"} - AG{"Antigua & Barbuda"} + AE{"United Arab Emirates"} + AF{"Afghanistan"} + AG{"Antigua na Barbuda"} AI{"Anguilla"} AL{"Albania"} - AM{"Obodo Armenia"} + AM{"Armenia"} AO{"Angola"} AQ{"Antarctica"} AR{"Argentina"} @@ -49,24 +50,24 @@ ig{ AU{"Australia"} AW{"Aruba"} AX{"Agwaetiti Aland"} - AZ{"Obodo Azerbaijan"} + AZ{"Azerbaijan"} BA{"Bosnia & Herzegovina"} BB{"Barbados"} - BD{"Obodo Bangladesh"} + BD{"Bangladesh"} BE{"Belgium"} BF{"Burkina Faso"} BG{"Bulgaria"} - BH{"Obodo Bahrain"} + BH{"Bahrain"} BI{"Burundi"} BJ{"Binin"} - BL{"St. Barthélemy"} + BL{"Barthélemy Dị nsọ"} BM{"Bemuda"} BN{"Brunei"} BO{"Bolivia"} BQ{"Caribbean Netherlands"} - BR{"Mba Brazil"} + BR{"Brazil"} BS{"Bahamas"} - BT{"Obodo Bhutan"} + BT{"Bhutan"} BV{"Agwaetiti Bouvet"} BW{"Botswana"} BY{"Belarus"} @@ -81,7 +82,7 @@ ig{ CK{"Agwaetiti Cook"} CL{"Chile"} CM{"Cameroon"} - CN{"Mba China"} + CN{"China"} CO{"Colombia"} CP{"Agwaetiti Clipperton"} CR{"Kosta Rika"} @@ -89,9 +90,9 @@ ig{ CV{"Cape Verde"} CW{"Kurakao"} CX{"Agwaetiti Christmas"} - CY{"Obodo Cyprus"} + CY{"Cyprus"} CZ{"Czechia"} - DE{"Mba Germany"} + DE{"Jamanị"} DG{"Diego Garcia"} DJ{"Djibouti"} DK{"Denmark"} @@ -113,11 +114,11 @@ ig{ FK{"Agwaetiti Falkland"} FM{"Micronesia"} FO{"Agwaetiti Faroe"} - FR{"Mba France"} + FR{"France"} GA{"Gabon"} - GB{"Mba United Kingdom"} + GB{"United Kingdom"} GD{"Grenada"} - GE{"Obodo Georgia"} + GE{"Georgia"} GF{"Frenchi Guiana"} GG{"Guernsey"} GH{"Ghana"} @@ -133,7 +134,7 @@ ig{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Honk Kong mba nwere ndozi pụrụ iche n’obodo China"} + HK{"Hong Kong SAR China"} HM{"Agwaetiti Heard na Agwaetiti McDonald"} HN{"Honduras"} HR{"Croatia"} @@ -142,52 +143,52 @@ ig{ IC{"Agwaetiti Kanarị"} ID{"Indonesia"} IE{"Ireland"} - IL{"Obodo Israel"} + IL{"Israel"} IM{"Isle of Man"} - IN{"Mba India"} + IN{"India"} IO{"British Indian Ocean Territory"} - IQ{"Obodo Iraq"} - IR{"Obodo Iran"} + IQ{"Iraq"} + IR{"Iran"} IS{"Iceland"} - IT{"Mba Italy"} + IT{"Italy"} JE{"Jersey"} JM{"Jamaika"} - JO{"Obodo Jordan"} - JP{"Mba Japan"} + JO{"Jordan"} + JP{"Japan"} KE{"Kenya"} - KG{"Obodo Kyrgyzstan"} + KG{"Kyrgyzstan"} KH{"Cambodia"} KI{"Kiribati"} KM{"Comorosu"} - KN{"St. Kitts & Nevis"} - KP{"Mba Ugwu Korea"} - KR{"Mba South Korea"} - KW{"Obodo Kuwait"} + KN{"Kitts na Nevis Dị nsọ"} + KP{"Ugwu Korea"} + KR{"South Korea"} + KW{"Kuwait"} KY{"Agwaetiti Cayman"} - KZ{"Obodo Kazakhstan"} + KZ{"Kazakhstan"} LA{"Laos"} - LB{"Obodo Lebanon"} - LC{"St. Lucia"} + LB{"Lebanon"} + LC{"Lucia Dị nsọ"} LI{"Liechtenstein"} - LK{"Obodo Sri Lanka"} + LK{"Sri Lanka"} LR{"Liberia"} LS{"Lesotho"} LT{"Lithuania"} LU{"Luxembourg"} LV{"Latvia"} - LY{"Libyia"} + LY{"Libia"} MA{"Morocco"} MC{"Monaco"} MD{"Moldova"} ME{"Montenegro"} - MF{"St. Martin"} + MF{"Martin Dị nsọ"} MG{"Madagaskar"} MH{"Agwaetiti Marshall"} MK{"North Macedonia"} ML{"Mali"} MM{"Myanmar (Burma)"} - MN{"Obodo Mongolia"} - MO{"Obodo Macao nwere ndozi pụrụ iche na mba China"} + MN{"Mongolia"} + MO{"Macao SAR China"} MP{"Agwaetiti Northern Mariana"} MQ{"Martinique"} MR{"Mauritania"} @@ -207,33 +208,33 @@ ig{ NI{"Nicaragua"} NL{"Netherlands"} NO{"Norway"} - NP{"Obodo Nepal"} + NP{"Nepal"} NR{"Nauru"} NU{"Niue"} NZ{"New Zealand"} - OM{"Obodo Oman"} + OM{"Oman"} PA{"Panama"} PE{"Peru"} PF{"Frenchi Polynesia"} PG{"Papua New Guinea"} PH{"Philippines"} - PK{"Obodo Pakistan"} + PK{"Pakistan"} PL{"Poland"} - PM{"St. Pierre & Miquelon"} + PM{"Pierre na Miquelon Dị nsọ"} PN{"Agwaetiti Pitcairn"} PR{"Puerto Rico"} - PS{"Obodo dị iche iche dị n’okpuru mba Palestine"} + PS{"Palestinian Territories"} PT{"Portugal"} PW{"Palau"} PY{"Paraguay"} - QA{"Obodo Qatar"} + QA{"Qatar"} QO{"Outlying Oceania"} RE{"Réunion"} RO{"Romania"} RS{"Serbia"} - RU{"Mba Russia"} + RU{"Rụssịa"} RW{"Rwanda"} - SA{"Obodo Saudi Arabia"} + SA{"Saudi Arabia"} SB{"Agwaetiti Solomon"} SC{"Seychelles"} SD{"Sudan"} @@ -252,7 +253,7 @@ ig{ ST{"São Tomé & Príncipe"} SV{"El Salvador"} SX{"Sint Maarten"} - SY{"Obodo Syria"} + SY{"Syria"} SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Agwaetiti Turks na Caicos"} @@ -260,26 +261,26 @@ ig{ TF{"Ụmụ ngalaba Frenchi Southern"} TG{"Togo"} TH{"Thailand"} - TJ{"Obodo Tajikistan"} + TJ{"Tajikistan"} TK{"Tokelau"} TL{"Timor-Leste"} - TM{"Obodo Turkmenistan"} + TM{"Turkmenistan"} TN{"Tunisia"} TO{"Tonga"} - TR{"Obodo Turkey"} - TT{"Trinidad & Tobago"} + TR{"Turkey"} + TT{"Trinidad na Tobago"} TV{"Tuvalu"} - TW{"Obodo Taiwan"} + TW{"Taiwan"} TZ{"Tanzania"} UA{"Ukraine"} UG{"Uganda"} UM{"Obere Agwaetiti Dị Na Mpụga U.S"} UN{"Mba Ụwa Jikọrọ Ọnụ"} - US{"Mba United States"} + US{"United States"} UY{"Uruguay"} - UZ{"Obodo Uzbekistan"} + UZ{"Uzbekistan"} VA{"Vatican City"} - VC{"St. Vincent & Grenadines"} + VC{"Vincent na Grenadines Dị nsọ"} VE{"Venezuela"} VG{"Agwaetiti British Virgin"} VI{"Agwaetiti Virgin nke US"} @@ -290,7 +291,7 @@ ig{ XA{"Pseudo-Accents"} XB{"Pseudo-Bidi"} XK{"Kosovo"} - YE{"Obodo Yemen"} + YE{"Yemen"} YT{"Mayotte"} ZA{"South Africa"} ZM{"Zambia"} @@ -299,6 +300,7 @@ ig{ } Countries%short{ GB{"UK"} + MO{"Macao"} } Countries%variant{ CD{"Congo (DRC)"} @@ -308,5 +310,4 @@ ig{ SZ{"Swaziland"} TL{"East Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ii.txt b/intl/icu/source/data/region/ii.txt index ad05ab8eb9aa..5e165046298f 100644 --- a/intl/icu/source/data/region/ii.txt +++ b/intl/icu/source/data/region/ii.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ii{ Countries{ BR{"ꀠꑭ"} @@ -14,5 +15,4 @@ ii{ US{"ꂰꇩ"} ZZ{"ꃅꄷꅉꀋꐚꌠ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/in.txt b/intl/icu/source/data/region/in.txt index 02335238ad02..e2df1690e399 100644 --- a/intl/icu/source/data/region/in.txt +++ b/intl/icu/source/data/region/in.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in{ "%%ALIAS"{"id"} } diff --git a/intl/icu/source/data/region/in_ID.txt b/intl/icu/source/data/region/in_ID.txt index acec72c6e987..03f238793675 100644 --- a/intl/icu/source/data/region/in_ID.txt +++ b/intl/icu/source/data/region/in_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in_ID{ "%%ALIAS"{"id_ID"} } diff --git a/intl/icu/source/data/region/is.txt b/intl/icu/source/data/region/is.txt index 337d44f9a962..613fdcf9b116 100644 --- a/intl/icu/source/data/region/is.txt +++ b/intl/icu/source/data/region/is.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is{ Countries{ 001{"Heimurinn"} @@ -251,7 +252,7 @@ is{ SS{"Suður-Súdan"} ST{"Saó Tóme og Prinsípe"} SV{"El Salvador"} - SX{"Sankti Martin"} + SX{"Sint Maarten"} SY{"Sýrland"} SZ{"Svasíland"} TA{"Tristan da Cunha"} @@ -260,7 +261,7 @@ is{ TF{"Frönsku suðlægu landsvæðin"} TG{"Tógó"} TH{"Taíland"} - TJ{"Tadsjikistan"} + TJ{"Tadsíkistan"} TK{"Tókelá"} TL{"Tímor-Leste"} TM{"Túrkmenistan"} @@ -310,5 +311,4 @@ is{ FK{"Falklandseyjar (Malvinas)"} TL{"Austur-Tímor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/it.txt b/intl/icu/source/data/region/it.txt index 2b3c7dbfde10..af0cdc2e3c31 100644 --- a/intl/icu/source/data/region/it.txt +++ b/intl/icu/source/data/region/it.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ Countries{ 001{"Mondo"} @@ -106,7 +107,7 @@ it{ ER{"Eritrea"} ES{"Spagna"} ET{"Etiopia"} - EU{"Unione Europea"} + EU{"Unione europea"} EZ{"Eurozona"} FI{"Finlandia"} FJ{"Figi"} @@ -312,6 +313,6 @@ it{ CZ{"Repubblica Ceca"} FK{"Isole Falkland (Isole Malvine)"} SZ{"Regno di eSwatini"} + TL{"Timor Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/iw.txt b/intl/icu/source/data/region/iw.txt index d59865d1cdb7..4aa2f62d2681 100644 --- a/intl/icu/source/data/region/iw.txt +++ b/intl/icu/source/data/region/iw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw{ "%%ALIAS"{"he"} } diff --git a/intl/icu/source/data/region/iw_IL.txt b/intl/icu/source/data/region/iw_IL.txt index cf1666a681ee..984aefd0f82d 100644 --- a/intl/icu/source/data/region/iw_IL.txt +++ b/intl/icu/source/data/region/iw_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw_IL{ "%%ALIAS"{"he_IL"} } diff --git a/intl/icu/source/data/region/ja.txt b/intl/icu/source/data/region/ja.txt index 6a01e40b54bb..99d3b9cff04c 100644 --- a/intl/icu/source/data/region/ja.txt +++ b/intl/icu/source/data/region/ja.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ Countries{ 001{"世界"} @@ -314,5 +315,4 @@ ja{ SZ{"スワジランド"} TL{"東チモール"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/jgo.txt b/intl/icu/source/data/region/jgo.txt index 3ff517a170e8..0c1ef4ec4190 100644 --- a/intl/icu/source/data/region/jgo.txt +++ b/intl/icu/source/data/region/jgo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jgo{ Countries{ 001{"Mbí"} @@ -85,5 +86,4 @@ jgo{ ZW{"Zimbámbwɛ"} ZZ{"ŋgɔŋ yi pɛ́ ká kɛ́ jʉɔ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/jmc.txt b/intl/icu/source/data/region/jmc.txt index 398e6b30c418..4c9428e4a2f1 100644 --- a/intl/icu/source/data/region/jmc.txt +++ b/intl/icu/source/data/region/jmc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jmc{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ jmc{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/jv.txt b/intl/icu/source/data/region/jv.txt index 262f407ac8f8..3dbfe99c0ae2 100644 --- a/intl/icu/source/data/region/jv.txt +++ b/intl/icu/source/data/region/jv.txt @@ -1,14 +1,17 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jv{ Countries{ 001{"Donya"} 002{"Afrika"} + 003{"Amérika Lor"} 005{"Amérika Kidul"} 009{"Oséania"} 011{"Afrika Kulon"} 013{"Amérika Tengah"} 014{"Afrika Wétan"} + 015{"Afrika Lor"} 017{"Afrika Sisih Tengah"} 018{"Afrika Sisih Kidul"} 019{"Amérika"} @@ -27,6 +30,7 @@ jv{ 145{"Asia Kulon"} 150{"Éropah"} 151{"Éropah Wétan"} + 154{"Éropah Lor"} 155{"Éropah Kulon"} 202{"Afrika Kidule Sahara"} 419{"Amérika Latin"} @@ -141,6 +145,7 @@ jv{ IE{"Républik Irlan"} IL{"Israèl"} IM{"Pulo Man"} + IN{"Indhia"} IO{"Wilayah Inggris nang Segoro Hindia"} IQ{"Irak"} IR{"Iran"} @@ -156,6 +161,7 @@ jv{ KI{"Kiribati"} KM{"Komoro"} KN{"Saint Kits lan Nèvis"} + KP{"Korea Lor"} KR{"Koréa Kidul"} KW{"Kuwait"} KY{"Kapuloan Kéman"} @@ -178,6 +184,7 @@ jv{ MF{"Santa Martin"} MG{"Madagaskar"} MH{"Kapuloan Marshall"} + MK{"Républik Makédonia Lor"} ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} @@ -204,6 +211,7 @@ jv{ NP{"Népal"} NR{"Nauru"} NU{"Niue"} + NZ{"Selandia Anyar"} OM{"Oman"} PA{"Panama"} PE{"Peru"} @@ -305,5 +313,4 @@ jv{ SZ{"(Swasiland)"} TL{"Timor Wétan"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ka.txt b/intl/icu/source/data/region/ka.txt index dd5ae4f82dfd..d46b92ed05f8 100644 --- a/intl/icu/source/data/region/ka.txt +++ b/intl/icu/source/data/region/ka.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka{ Countries{ 001{"მსოფლიო"} @@ -313,5 +314,4 @@ ka{ SZ{"სვაზილანდი"} TL{"აღმოსავლეთ ტიმორი"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kab.txt b/intl/icu/source/data/region/kab.txt index 9c9b34fb0a44..7e86f8d7a28f 100644 --- a/intl/icu/source/data/region/kab.txt +++ b/intl/icu/source/data/region/kab.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kab{ Countries{ AD{"Undura"} @@ -226,5 +227,4 @@ kab{ ZM{"Zambya"} ZW{"Zimbabwi"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kam.txt b/intl/icu/source/data/region/kam.txt index d9f837bbfa47..8d1ae39d8baa 100644 --- a/intl/icu/source/data/region/kam.txt +++ b/intl/icu/source/data/region/kam.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kam{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ kam{ ZM{"Nzambia"} ZW{"Nzimbambwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kde.txt b/intl/icu/source/data/region/kde.txt index 3f78fe655839..faab83ff0806 100644 --- a/intl/icu/source/data/region/kde.txt +++ b/intl/icu/source/data/region/kde.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kde{ Countries{ AD{"Andola"} @@ -226,5 +227,4 @@ kde{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kea.txt b/intl/icu/source/data/region/kea.txt index 513d3a9ced1c..89b312c44d16 100644 --- a/intl/icu/source/data/region/kea.txt +++ b/intl/icu/source/data/region/kea.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kea{ Countries{ 001{"Mundu"} @@ -82,7 +83,7 @@ kea{ CL{"Xili"} CM{"Kamarons"} CN{"Xina"} - CO{"Kolômbia"} + CO{"Kolómbia"} CP{"Ilha Kliperton"} CR{"Kosta Rika"} CU{"Kuba"} @@ -313,5 +314,4 @@ kea{ SZ{"Suazilándia"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/khq.txt b/intl/icu/source/data/region/khq.txt index 1e6d8fb4b9ce..0e5b7bca6559 100644 --- a/intl/icu/source/data/region/khq.txt +++ b/intl/icu/source/data/region/khq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml khq{ Countries{ AD{"Andoora"} @@ -226,5 +227,4 @@ khq{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ki.txt b/intl/icu/source/data/region/ki.txt index 5d3c30723840..c8b80f9b5c13 100644 --- a/intl/icu/source/data/region/ki.txt +++ b/intl/icu/source/data/region/ki.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ki{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ ki{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kk.txt b/intl/icu/source/data/region/kk.txt index 2e3cc185e893..0cd216292d0d 100644 --- a/intl/icu/source/data/region/kk.txt +++ b/intl/icu/source/data/region/kk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kk{ Countries{ 001{"Әлем"} @@ -259,7 +260,7 @@ kk{ TD{"Чад"} TF{"Францияның оңтүстік аймақтары"} TG{"Того"} - TH{"Тайланд"} + TH{"Таиланд"} TJ{"Тәжікстан"} TK{"Токелау"} TL{"Тимор-Лесте"} @@ -311,5 +312,4 @@ kk{ FK{"Фолкленд аралдары (Мальвин аралдары)"} TL{"Шығыс Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kkj.txt b/intl/icu/source/data/region/kkj.txt index 3443f9b26909..c9ceec5a2de8 100644 --- a/intl/icu/source/data/region/kkj.txt +++ b/intl/icu/source/data/region/kkj.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kkj{ Countries{ CM{"Kamɛrun"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kl.txt b/intl/icu/source/data/region/kl.txt index f353e3247b7c..78916900e05d 100644 --- a/intl/icu/source/data/region/kl.txt +++ b/intl/icu/source/data/region/kl.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl{ Countries{ GL{"Kalaallit Nunaat"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kln.txt b/intl/icu/source/data/region/kln.txt index a4e395f1a9bf..d4e64b0888e1 100644 --- a/intl/icu/source/data/region/kln.txt +++ b/intl/icu/source/data/region/kln.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kln{ Countries{ AD{"Emetab Andorra"} @@ -226,5 +227,4 @@ kln{ ZM{"Emetab Zambia"} ZW{"Emetab Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/km.txt b/intl/icu/source/data/region/km.txt index 392e61f0dba3..4dff124723d2 100644 --- a/intl/icu/source/data/region/km.txt +++ b/intl/icu/source/data/region/km.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km{ Countries{ 001{"ពិភពលោក"} @@ -36,7 +37,7 @@ km{ AC{"កោះ​អាសេនសិន"} AD{"អង់ដូរ៉ា"} AE{"អេមីរ៉ាត​អារ៉ាប់​រួម"} - AF{"អាហ្វហ្គានីស្ថាន"} + AF{"អាហ្វហ្កានីស្ថាន"} AG{"អង់ទីហ្គា និង បាប៊ុយដា"} AI{"អង់ហ្គីឡា"} AL{"អាល់បានី"} @@ -50,12 +51,12 @@ km{ AW{"អារូបា"} AX{"កោះ​អាឡង់"} AZ{"អាស៊ែបៃហ្សង់"} - BA{"បូស្នី និងហឺហ្សីហ្គូវីណា"} + BA{"បូស្ន៊ី និងហឺហ្ស៊ីហ្គូវីណា"} BB{"បាបាដុស"} BD{"បង់ក្លាដែស"} BE{"បែលហ្ស៊ិក"} BF{"បួគីណាហ្វាសូ"} - BG{"ប៊ុលហ្គារី"} + BG{"ប៊ុលហ្ការី"} BH{"បារ៉ែន"} BI{"ប៊ូរុនឌី"} BJ{"បេណាំង"} @@ -76,7 +77,7 @@ km{ CD{"កុងហ្គោ- គីនស្ហាសា"} CF{"សាធារណរដ្ឋអាហ្វ្រិកកណ្ដាល"} CG{"កុងហ្គោ - ប្រាហ្សាវីល"} - CH{"ស្វីស"} + CH{"ស្វ៊ីស"} CI{"កូតឌីវ័រ"} CK{"កោះ​ខូក"} CL{"ស៊ីលី"} @@ -90,7 +91,7 @@ km{ CW{"កូរ៉ាកៅ"} CX{"កោះ​គ្រីស្មាស"} CY{"ស៊ីប"} - CZ{"ឆែគា"} + CZ{"ឆែក"} DE{"អាល្លឺម៉ង់"} DG{"ឌៀហ្គោហ្គាស៊ី"} DJ{"ជីប៊ូទី"} @@ -133,8 +134,8 @@ km{ GU{"ហ្គាំ"} GW{"ហ្គីណេប៊ីស្សូ"} GY{"ហ្គីយ៉ាន"} - HK{"ហុងកុង"} - HM{"កោះ​ហឺដ និង​ម៉ាក់ដូណាល់"} + HK{"ហុងកុង តំបន់រដ្ឋបាលពិសេសចិន"} + HM{"កោះ​ហឺដនិង​ម៉ាក់ដូណាល់"} HN{"ហុងឌូរ៉ាស"} HR{"ក្រូអាស៊ី"} HT{"ហៃទី"} @@ -150,7 +151,7 @@ km{ IR{"អ៊ីរ៉ង់"} IS{"អ៊ីស្លង់"} IT{"អ៊ីតាលី"} - JE{"ជឺស៊ី"} + JE{"ជើស៊ី"} JM{"ហ្សាម៉ាអ៊ីក"} JO{"ហ៊្សកដានី"} JP{"ជប៉ុន"} @@ -216,14 +217,14 @@ km{ PE{"ប៉េរូ"} PF{"ប៉ូលី​ណេស៊ី​បារាំង"} PG{"ប៉ាពូអាស៊ី​នូវែលហ្គីណេ"} - PH{"ហ្វីលីពីន"} + PH{"ហ្វ៊ីលីពីន"} PK{"ប៉ាគីស្ថាន"} PL{"ប៉ូឡូញ"} PM{"សង់ព្យែរ និង​មីគីឡុង"} PN{"កោះ​ភីតកាន"} PR{"ព័រតូរីកូ"} - PS{"ដែន​ដីប៉ាលេស្ទីន"} - PT{"ព័រទុយហ្គាល់"} + PS{"ដែនដីប៉ាឡេស្ទីន"} + PT{"ព័រទុយហ្កាល់"} PW{"ផៅឡូ"} PY{"ប៉ារ៉ាហ្គាយ"} QA{"កាតា"} @@ -299,9 +300,9 @@ km{ } Countries%short{ GB{"ច.អ."} - HK{"ហុងកុង តំបន់រដ្ឋបាលពិសេសចិន"} + HK{"ហុងកុង"} MO{"ម៉ាកាវ"} - PS{"ប៉ាលេស្ទីន"} + PS{"ប៉ាឡេស្ទីន"} UN{"UN"} US{"ស.រ.អ"} } @@ -309,9 +310,8 @@ km{ CD{"កុងហ្គោ (សាធារណរដ្ឋ​ប្រជាធិបតេយ្យ)"} CG{"កុងហ្គោ (សធារណរដ្ឋ)"} CI{"អាយវ៉ូរី ខូសថ៍"} - CZ{"សាធារណរដ្ឋឆេក"} + CZ{"សាធារណរដ្ឋឆែក"} FK{"កោះ​ហ្វក់ឡែន (ម៉ាវីណាស)"} TL{"ទីម័រ​ខាង​កើត"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kn.txt b/intl/icu/source/data/region/kn.txt index 2b53ff7b7770..b35ee0a597a0 100644 --- a/intl/icu/source/data/region/kn.txt +++ b/intl/icu/source/data/region/kn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kn{ Countries{ 001{"ಪ್ರಪಂಚ"} @@ -77,7 +78,7 @@ kn{ CF{"ಮಧ್ಯ ಆಫ್ರಿಕಾ ಗಣರಾಜ್ಯ"} CG{"ಕಾಂಗೋ - ಬ್ರಾಜಾವಿಲ್ಲೇ"} CH{"ಸ್ವಿಟ್ಜರ್ಲ್ಯಾಂಡ್"} - CI{"ಕೋತ್‌ ದಿವಾರ್‍"} + CI{"ಕೋತ್ ದ್‘ಇವಾರ್"} CK{"ಕುಕ್ ದ್ವೀಪಗಳು"} CL{"ಚಿಲಿ"} CM{"ಕ್ಯಾಮರೂನ್"} @@ -314,5 +315,4 @@ kn{ SZ{"ಸ್ವಾಜಿಲ್ಯಾಂಡ್‌"} TL{"ಪೂರ್ವ ಟಿಮೋರ್"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ko.txt b/intl/icu/source/data/region/ko.txt index 70195629ae16..4cef2bf5754e 100644 --- a/intl/icu/source/data/region/ko.txt +++ b/intl/icu/source/data/region/ko.txt @@ -1,11 +1,12 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko{ Countries{ 001{"세계"} 002{"아프리카"} 003{"북아메리카"} - 005{"남아메리카(남미)"} + 005{"남아메리카"} 009{"오세아니아"} 011{"서부 아프리카"} 013{"중앙 아메리카"} @@ -83,7 +84,7 @@ ko{ CM{"카메룬"} CN{"중국"} CO{"콜롬비아"} - CP{"클립퍼튼 섬"} + CP{"클리퍼턴섬"} CR{"코스타리카"} CU{"쿠바"} CV{"카보베르데"} @@ -143,7 +144,7 @@ ko{ ID{"인도네시아"} IE{"아일랜드"} IL{"이스라엘"} - IM{"맨 섬"} + IM{"맨섬"} IN{"인도"} IO{"영국령 인도양 식민지"} IQ{"이라크"} @@ -220,7 +221,7 @@ ko{ PK{"파키스탄"} PL{"폴란드"} PM{"생피에르 미클롱"} - PN{"핏케언 섬"} + PN{"핏케언 제도"} PR{"푸에르토리코"} PS{"팔레스타인 지구"} PT{"포르투갈"} @@ -228,7 +229,7 @@ ko{ PY{"파라과이"} QA{"카타르"} QO{"오세아니아 외곽"} - RE{"리유니온"} + RE{"레위니옹"} RO{"루마니아"} RS{"세르비아"} RU{"러시아"} @@ -274,7 +275,7 @@ ko{ UA{"우크라이나"} UG{"우간다"} UM{"미국령 해외 제도"} - UN{"유엔"} + UN{"국제연합"} US{"미국"} UY{"우루과이"} UZ{"우즈베키스탄"} @@ -301,6 +302,7 @@ ko{ HK{"홍콩"} MO{"마카오"} PS{"팔레스타인"} + UN{"유엔"} } Countries%variant{ CD{"콩고민주공화국"} @@ -311,5 +313,4 @@ ko{ SZ{"스와질란드"} TL{"티모르레스테"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ko_KP.txt b/intl/icu/source/data/region/ko_KP.txt index 7186d0522620..c32b723ef1e6 100644 --- a/intl/icu/source/data/region/ko_KP.txt +++ b/intl/icu/source/data/region/ko_KP.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko_KP{ Countries{ KP{"조선민주주의인민공화국"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kok.txt b/intl/icu/source/data/region/kok.txt index 229186c64d5c..07e258815725 100644 --- a/intl/icu/source/data/region/kok.txt +++ b/intl/icu/source/data/region/kok.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kok{ Countries{ 001{"जग"} @@ -75,7 +76,7 @@ kok{ CC{"कोकोस (कीलिंग) आयलँड"} CD{"कोंगो - किंशासा"} CF{"मध्य अफ्रीकी लोकसत्तकराज्य"} - CG{"काँगो - ब्राझाविला"} + CG{"कोंगो - ब्राझाविला"} CH{"स्विट्ज़रलैंड"} CI{"कोत द’ईवोआर"} CK{"कुक आयलँड्स"} @@ -305,7 +306,7 @@ kok{ US{"युएस"} } Countries%variant{ - CD{"काँगो (डीआरसी)"} + CD{"कोंगो (डीआरसी)"} CG{"कोंगो (प्रजासत्ताक)"} CI{"आयवोरी कोस्ट"} CZ{"चेक लोकसत्ताक"} @@ -313,5 +314,4 @@ kok{ SZ{"स्वाझिलँड"} TL{"ईस्ट तिमूर"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ks.txt b/intl/icu/source/data/region/ks.txt index fb476a7aff14..3f9727c05177 100644 --- a/intl/icu/source/data/region/ks.txt +++ b/intl/icu/source/data/region/ks.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks{ Countries{ 001{"دُنیا"} @@ -277,5 +278,4 @@ ks{ ZW{"زِمبابے"} ZZ{"نامعلوٗم تہٕ نالَگہار عَلاقہٕ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ks_Arab.txt b/intl/icu/source/data/region/ks_Arab.txt index aafa093f1849..f3d2206e1162 100644 --- a/intl/icu/source/data/region/ks_Arab.txt +++ b/intl/icu/source/data/region/ks_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/region/ks_Arab_IN.txt b/intl/icu/source/data/region/ks_Arab_IN.txt index a13c0c960582..2d29f4c5e86f 100644 --- a/intl/icu/source/data/region/ks_Arab_IN.txt +++ b/intl/icu/source/data/region/ks_Arab_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/ks_IN.txt b/intl/icu/source/data/region/ks_IN.txt index fd8b52d9b4a2..bd1a22537a8f 100644 --- a/intl/icu/source/data/region/ks_IN.txt +++ b/intl/icu/source/data/region/ks_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_IN{ "%%ALIAS"{"ks_Arab_IN"} } diff --git a/intl/icu/source/data/region/ksb.txt b/intl/icu/source/data/region/ksb.txt index af2c99e59af6..22651580da10 100644 --- a/intl/icu/source/data/region/ksb.txt +++ b/intl/icu/source/data/region/ksb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksb{ Countries{ AD{"Andola"} @@ -225,5 +226,4 @@ ksb{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ksf.txt b/intl/icu/source/data/region/ksf.txt index eb58d403909e..6b3a1a340d67 100644 --- a/intl/icu/source/data/region/ksf.txt +++ b/intl/icu/source/data/region/ksf.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksf{ Countries{ AD{"andɔrǝ"} @@ -226,5 +227,4 @@ ksf{ ZM{"zambí"} ZW{"zimbabwɛ́"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ksh.txt b/intl/icu/source/data/region/ksh.txt index 5b01baa39747..3ab9a42f9968 100644 --- a/intl/icu/source/data/region/ksh.txt +++ b/intl/icu/source/data/region/ksh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksh{ Countries{ 001{"de Ääd"} @@ -300,5 +301,4 @@ ksh{ CI{"de Älfebeijnköß"} FK{"de malleviinesche Enselle"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ku.txt b/intl/icu/source/data/region/ku.txt index 1f6ed9df198d..34014addfcd9 100644 --- a/intl/icu/source/data/region/ku.txt +++ b/intl/icu/source/data/region/ku.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ku{ Countries{ 001{"Cîhan"} @@ -264,5 +265,4 @@ ku{ FK{"Giravên Falkland"} TL{"Tîmora Rojhilat"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/kw.txt b/intl/icu/source/data/region/kw.txt index 3b27d2b51aca..033a20150e7e 100644 --- a/intl/icu/source/data/region/kw.txt +++ b/intl/icu/source/data/region/kw.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kw{ Countries{ GB{"Rywvaneth Unys"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ky.txt b/intl/icu/source/data/region/ky.txt index 1b94e110bca0..6db292b02355 100644 --- a/intl/icu/source/data/region/ky.txt +++ b/intl/icu/source/data/region/ky.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky{ Countries{ 001{"Дүйнө"} @@ -187,7 +188,7 @@ ky{ ML{"Мали"} MM{"Мьянма (Бирма)"} MN{"Монголия"} - MO{"Макау Кытай ААА"} + MO{"Макао Кытай ААА"} MP{"Түндүк Мариана аралдары"} MQ{"Мартиника"} MR{"Мавритания"} @@ -300,7 +301,7 @@ ky{ Countries%short{ GB{"УБ"} HK{"Гонконг"} - MO{"Макау"} + MO{"Макао"} PS{"Палестина"} US{"АКШ"} } @@ -312,5 +313,4 @@ ky{ FK{"Фолкленд (Мальвина) аралдары"} TL{"Чыгыш Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lag.txt b/intl/icu/source/data/region/lag.txt index 7a7a6c6531e1..46126be47970 100644 --- a/intl/icu/source/data/region/lag.txt +++ b/intl/icu/source/data/region/lag.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lag{ Countries{ AD{"Andóra"} @@ -226,5 +227,4 @@ lag{ ZM{"Sámbia"} ZW{"Simbáabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lb.txt b/intl/icu/source/data/region/lb.txt index c875b15bcdbb..18342e46409b 100644 --- a/intl/icu/source/data/region/lb.txt +++ b/intl/icu/source/data/region/lb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb{ Countries{ 001{"Welt"} @@ -304,5 +305,4 @@ lb{ CG{"Kongo (Republik)"} CI{"Elfebeeküst"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lg.txt b/intl/icu/source/data/region/lg.txt index 7c3ca27a8a4a..52d6ec3fde7d 100644 --- a/intl/icu/source/data/region/lg.txt +++ b/intl/icu/source/data/region/lg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lg{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ lg{ ZM{"Zambya"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lkt.txt b/intl/icu/source/data/region/lkt.txt index d31bdd68a598..24ef72bab3d6 100644 --- a/intl/icu/source/data/region/lkt.txt +++ b/intl/icu/source/data/region/lkt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lkt{ Countries{ 001{"Makȟásitomni"} @@ -15,5 +16,4 @@ lkt{ MX{"Spayóla Makȟóčhe"} US{"Mílahaŋska Tȟamákȟočhe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ln.txt b/intl/icu/source/data/region/ln.txt index a77714c6de6c..eeab8b37183e 100644 --- a/intl/icu/source/data/region/ln.txt +++ b/intl/icu/source/data/region/ln.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln{ Countries{ AD{"Andorɛ"} @@ -236,5 +237,4 @@ ln{ Countries%variant{ CZ{"Repibiki Tsekɛ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lo.txt b/intl/icu/source/data/region/lo.txt index 15774963e3b9..ac4a8abf8b4d 100644 --- a/intl/icu/source/data/region/lo.txt +++ b/intl/icu/source/data/region/lo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo{ Countries{ 001{"ໂລກ"} @@ -222,7 +223,7 @@ lo{ PM{"ເຊນ ປີແອ ມິເກວລອນ"} PN{"ໝູ່ເກາະພິດແຄນ"} PR{"ເພືອໂຕ ຣິໂກ"} - PS{"ດິນແດນ ປາເລສຕິນຽນ"} + PS{"ດິນແດນປາເລດສະຕິນ"} PT{"ພອລທູໂກ"} PW{"ປາລາວ"} PY{"ພາຣາກວຍ"} @@ -301,7 +302,7 @@ lo{ GB{"ສະຫະລາດຊະອະນາຈັກຯ"} HK{"ຮົງກົງ"} MO{"ມາກາວ"} - PS{"ປາເລສຕາຍ"} + PS{"ປາເລດສະຕິນ"} UN{"ຢູເອັນ"} US{"ສະຫະລັດຯ"} } @@ -314,5 +315,4 @@ lo{ SZ{"ສະ​ວາ​ຊິ​ແລນ"} TL{"ທິມໍ ຕາເວັນອອກ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lrc.txt b/intl/icu/source/data/region/lrc.txt index 29fd96daec0a..c1270347a074 100644 --- a/intl/icu/source/data/region/lrc.txt +++ b/intl/icu/source/data/region/lrc.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc{ Countries{ 001{"دونیا"} @@ -26,5 +27,4 @@ lrc{ US{"ڤولاتیا یأکاگئرتە"} ZZ{"راساگە نادیار"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lt.txt b/intl/icu/source/data/region/lt.txt index 1ceb36ec5037..528027f251ff 100644 --- a/intl/icu/source/data/region/lt.txt +++ b/intl/icu/source/data/region/lt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt{ Countries{ 001{"pasaulis"} @@ -254,7 +255,7 @@ lt{ SX{"Sint Martenas"} SY{"Sirija"} SZ{"Svazilandas"} - TA{"Tristanas da Kunja"} + TA{"Tristano da Kunjos"} TC{"Terkso ir Kaikoso Salos"} TD{"Čadas"} TF{"Prancūzijos Pietų sritys"} @@ -312,5 +313,4 @@ lt{ CZ{"Čekijos Respublika"} FK{"Folklando (Malvinų) Salos"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lu.txt b/intl/icu/source/data/region/lu.txt index 020c1344bc16..b03455214bba 100644 --- a/intl/icu/source/data/region/lu.txt +++ b/intl/icu/source/data/region/lu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lu{ Countries{ AD{"Andore"} @@ -226,5 +227,4 @@ lu{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/luo.txt b/intl/icu/source/data/region/luo.txt index dc622074f195..a7ea7c993e4a 100644 --- a/intl/icu/source/data/region/luo.txt +++ b/intl/icu/source/data/region/luo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luo{ Countries{ AD{"Andorra"} @@ -226,5 +227,4 @@ luo{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/luy.txt b/intl/icu/source/data/region/luy.txt index 5e755a3a9546..3449d3ab4fda 100644 --- a/intl/icu/source/data/region/luy.txt +++ b/intl/icu/source/data/region/luy.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luy{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ luy{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/lv.txt b/intl/icu/source/data/region/lv.txt index 01dce86b6cd4..4e749558e9a8 100644 --- a/intl/icu/source/data/region/lv.txt +++ b/intl/icu/source/data/region/lv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv{ Countries{ 001{"pasaule"} @@ -143,7 +144,7 @@ lv{ ID{"Indonēzija"} IE{"Īrija"} IL{"Izraēla"} - IM{"Mena"} + IM{"Menas sala"} IN{"Indija"} IO{"Indijas okeāna Britu teritorija"} IQ{"Irāka"} @@ -222,7 +223,7 @@ lv{ PM{"Senpjēra un Mikelona"} PN{"Pitkērnas salas"} PR{"Puertoriko"} - PS{"Palestīna"} + PS{"Palestīnas teritorijas"} PT{"Portugāle"} PW{"Palau"} PY{"Paragvaja"} @@ -254,7 +255,7 @@ lv{ SX{"Sintmārtena"} SY{"Sīrija"} SZ{"Svatini"} - TA{"Tristana da Kuņas salas"} + TA{"Tristana da Kuņjas salu teritorijas"} TC{"Tērksas un Kaikosas salas"} TD{"Čada"} TF{"Francijas Dienvidjūru teritorija"} @@ -300,6 +301,7 @@ lv{ Countries%short{ HK{"Honkonga"} MO{"Makao"} + PS{"Palestīna"} UN{"ANO"} US{"ASV"} } @@ -311,5 +313,4 @@ lv{ FK{"Folklenda (Malvinu) salas"} SZ{"Svazilenda"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mai.txt b/intl/icu/source/data/region/mai.txt index 35c03ab385d2..14d461dfafb2 100644 --- a/intl/icu/source/data/region/mai.txt +++ b/intl/icu/source/data/region/mai.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mai{ Countries{ BR{"ब्राज़ील"} @@ -14,5 +15,4 @@ mai{ US{"संयुक्त राज्य"} ZZ{"अज्ञात क्षेत्र"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mas.txt b/intl/icu/source/data/region/mas.txt index 45b7eda2e6a9..2d9a9718977b 100644 --- a/intl/icu/source/data/region/mas.txt +++ b/intl/icu/source/data/region/mas.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ mas{ ZM{"Sambia"} ZW{"Simbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mer.txt b/intl/icu/source/data/region/mer.txt index 7e7611e780dc..264decc0b54d 100644 --- a/intl/icu/source/data/region/mer.txt +++ b/intl/icu/source/data/region/mer.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mer{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ mer{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mfe.txt b/intl/icu/source/data/region/mfe.txt index bd9993c22f03..341fa5078cc8 100644 --- a/intl/icu/source/data/region/mfe.txt +++ b/intl/icu/source/data/region/mfe.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mfe{ Countries{ AD{"Andor"} @@ -226,5 +227,4 @@ mfe{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mg.txt b/intl/icu/source/data/region/mg.txt index efb492156272..b7e44d9d4673 100644 --- a/intl/icu/source/data/region/mg.txt +++ b/intl/icu/source/data/region/mg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mg{ Countries{ AD{"Andorra"} @@ -226,5 +227,4 @@ mg{ ZM{"Zambia"} ZW{"Zimbaboe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mgh.txt b/intl/icu/source/data/region/mgh.txt index 8602dd3f3d0f..0741d0dbdc4a 100644 --- a/intl/icu/source/data/region/mgh.txt +++ b/intl/icu/source/data/region/mgh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgh{ Countries{ AD{"Uandora"} @@ -139,5 +140,4 @@ mgh{ ZM{"Uzambia"} ZW{"Uzimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mgo.txt b/intl/icu/source/data/region/mgo.txt index e8b7ca5e0ec3..3f22f95808c4 100644 --- a/intl/icu/source/data/region/mgo.txt +++ b/intl/icu/source/data/region/mgo.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgo{ Countries{ CM{"Kamalun"} ZZ{"aba aben tisɔ̀"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mi.txt b/intl/icu/source/data/region/mi.txt index d5669c8f2447..429c70ec8de1 100644 --- a/intl/icu/source/data/region/mi.txt +++ b/intl/icu/source/data/region/mi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mi{ Countries{ BR{"Parahi"} @@ -16,5 +17,4 @@ mi{ US{"Hononga o Amerika"} ZZ{"Rohe Tē Mōhiotia"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mk.txt b/intl/icu/source/data/region/mk.txt index 1e442772f6a0..19e8e42a7f77 100644 --- a/intl/icu/source/data/region/mk.txt +++ b/intl/icu/source/data/region/mk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk{ Countries{ 001{"Свет"} @@ -133,7 +134,7 @@ mk{ GU{"Гуам"} GW{"Гвинеја-Бисау"} GY{"Гвајана"} - HK{"Хонг Конг С.А.Р Кина"} + HK{"Хонгконг САР Кина"} HM{"Остров Херд и Острови Мекдоналд"} HN{"Хондурас"} HR{"Хрватска"} @@ -222,7 +223,7 @@ mk{ PM{"Сент Пјер и Микелан"} PN{"Питкернски Острови"} PR{"Порторико"} - PS{"Палестински територии"} + PS{"Палестински Територии"} PT{"Португалија"} PW{"Палау"} PY{"Парагвај"} @@ -241,7 +242,7 @@ mk{ SG{"Сингапур"} SH{"Света Елена"} SI{"Словенија"} - SJ{"Свалбард и Жан Мејен"} + SJ{"Свалбард и Јан Мајен"} SK{"Словачка"} SL{"Сиера Леоне"} SM{"Сан Марино"} @@ -262,7 +263,7 @@ mk{ TH{"Тајланд"} TJ{"Таџикистан"} TK{"Токелау"} - TL{"Источен Тимор (Тимор Лесте)"} + TL{"Тимор Лесте"} TM{"Туркменистан"} TN{"Тунис"} TO{"Тонга"} @@ -299,7 +300,7 @@ mk{ } Countries%short{ GB{"ОК"} - HK{"Хонг Конг"} + HK{"Хонгконг"} MO{"Макао"} PS{"Палестина"} UN{"ОН"} @@ -309,9 +310,8 @@ mk{ CD{"Конго (Демократска Република Конго)"} CG{"Конго (Република)"} CI{"Брег на Слоновата Коска"} - CZ{"Република Чешка"} + CZ{"Чешка Република"} FK{"Фолкландски Острови (Малвински Острови)"} TL{"Источен Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ml.txt b/intl/icu/source/data/region/ml.txt index 6ed539f0991a..332ddde3329b 100644 --- a/intl/icu/source/data/region/ml.txt +++ b/intl/icu/source/data/region/ml.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ml{ Countries{ 001{"ലോകം"} @@ -187,7 +188,7 @@ ml{ ML{"മാലി"} MM{"മ്യാൻമാർ (ബർമ്മ)"} MN{"മംഗോളിയ"} - MO{"മക്കാവു (SAR) ചൈന"} + MO{"മക്കാവു SAR ചൈന"} MP{"ഉത്തര മറിയാനാ ദ്വീപുകൾ"} MQ{"മാർട്ടിനിക്ക്"} MR{"മൗറിറ്റാനിയ"} @@ -253,7 +254,7 @@ ml{ SV{"എൽ സാൽവദോർ"} SX{"സിന്റ് മാർട്ടെൻ"} SY{"സിറിയ"} - SZ{"സ്വാസിലാന്റ്"} + SZ{"സ്വാസിലൻഡ്"} TA{"ട്രിസ്റ്റൻ ഡ കൂന"} TC{"ടർക്ക്‌സും കെയ്‌ക്കോ ദ്വീപുകളും"} TD{"ഛാഡ്"} @@ -298,7 +299,6 @@ ml{ ZZ{"അജ്ഞാത പ്രദേശം"} } Countries%short{ - GB{"യു.കെ."} HK{"ഹോങ്കോങ്"} MO{"മക്കാവു"} PS{"പലസ്‌തീൻ"} @@ -314,5 +314,4 @@ ml{ SZ{"സ്വിറ്റ്സർലൻഡ്"} TL{"കിഴക്കൻ തിമോർ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mn.txt b/intl/icu/source/data/region/mn.txt index d9205c4eb890..b43883c07bc2 100644 --- a/intl/icu/source/data/region/mn.txt +++ b/intl/icu/source/data/region/mn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mn{ Countries{ 001{"Дэлхий"} @@ -314,5 +315,4 @@ mn{ SZ{"Свазиланд"} TL{"Зүүн Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mni.txt b/intl/icu/source/data/region/mni.txt index 9e8f5e768ebd..19258510f069 100644 --- a/intl/icu/source/data/region/mni.txt +++ b/intl/icu/source/data/region/mni.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni{ Countries{ BR{"ব্রাজিল"} @@ -14,5 +15,4 @@ mni{ US{"য়ুনাইটেদ ষ্টেটস"} ZZ{"মশকখংদবা লমদম"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mni_Beng.txt b/intl/icu/source/data/region/mni_Beng.txt index e861947a77ff..08de0f17e1f1 100644 --- a/intl/icu/source/data/region/mni_Beng.txt +++ b/intl/icu/source/data/region/mni_Beng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_Beng{ - Version{"37"} } diff --git a/intl/icu/source/data/region/mni_Beng_IN.txt b/intl/icu/source/data/region/mni_Beng_IN.txt index fee698999256..c896779f2ba3 100644 --- a/intl/icu/source/data/region/mni_Beng_IN.txt +++ b/intl/icu/source/data/region/mni_Beng_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/mni_IN.txt b/intl/icu/source/data/region/mni_IN.txt index 00d8c00a15b3..99173b141555 100644 --- a/intl/icu/source/data/region/mni_IN.txt +++ b/intl/icu/source/data/region/mni_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_IN{ "%%ALIAS"{"mni_Beng_IN"} } diff --git a/intl/icu/source/data/region/mo.txt b/intl/icu/source/data/region/mo.txt index 01049c8f3c89..6ef831378395 100644 --- a/intl/icu/source/data/region/mo.txt +++ b/intl/icu/source/data/region/mo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mo{ "%%ALIAS"{"ro"} } diff --git a/intl/icu/source/data/region/mr.txt b/intl/icu/source/data/region/mr.txt index 2734d12b4790..1d61633583e0 100644 --- a/intl/icu/source/data/region/mr.txt +++ b/intl/icu/source/data/region/mr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mr{ Countries{ 001{"विश्व"} @@ -77,7 +78,7 @@ mr{ CF{"केंद्रीय अफ्रिकी प्रजासत्ताक"} CG{"काँगो - ब्राझाविले"} CH{"स्वित्झर्लंड"} - CI{"आयव्हरी कोस्ट"} + CI{"Côte d’Ivoire"} CK{"कुक बेटे"} CL{"चिली"} CM{"कॅमेरून"} @@ -145,7 +146,7 @@ mr{ IL{"इस्त्राइल"} IM{"आयल ऑफ मॅन"} IN{"भारत"} - IO{"ब्रिटिश हिंदी महासागर क्षेत्र"} + IO{"ब्रिटिश हिंद महासागर प्रदेश"} IQ{"इराक"} IR{"इराण"} IS{"आइसलँड"} @@ -174,7 +175,7 @@ mr{ LS{"लेसोथो"} LT{"लिथुआनिया"} LU{"लक्झेंबर्ग"} - LV{"लात्विया"} + LV{"लाटव्हिया"} LY{"लिबिया"} MA{"मोरोक्को"} MC{"मोनॅको"} @@ -313,5 +314,4 @@ mr{ SZ{"स्वाझिलँड"} TL{"पूर्व तिमोर"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ms.txt b/intl/icu/source/data/region/ms.txt index 54aac88abebe..bfa29b40a424 100644 --- a/intl/icu/source/data/region/ms.txt +++ b/intl/icu/source/data/region/ms.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms{ Countries{ 001{"Dunia"} @@ -313,5 +314,4 @@ ms{ FK{"Kepulauan Falkland (Islas Malvinas)"} TL{"Timor Timur"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mt.txt b/intl/icu/source/data/region/mt.txt index 8cac24cf3383..361c4286ecd6 100644 --- a/intl/icu/source/data/region/mt.txt +++ b/intl/icu/source/data/region/mt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt{ Countries{ 001{"Dinja"} @@ -309,5 +310,4 @@ mt{ FK{"Il-Gżejjer Falkland (il-Gżejjer Malvinas)"} TL{"Timor tal-Lvant"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mua.txt b/intl/icu/source/data/region/mua.txt index 4521a612dd22..611037a65288 100644 --- a/intl/icu/source/data/region/mua.txt +++ b/intl/icu/source/data/region/mua.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mua{ Countries{ AD{"andorra"} @@ -226,5 +227,4 @@ mua{ ZM{"Zambiya"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/my.txt b/intl/icu/source/data/region/my.txt index b323b6db1d4e..26054cb791d2 100644 --- a/intl/icu/source/data/region/my.txt +++ b/intl/icu/source/data/region/my.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my{ Countries{ 001{"ကမ္ဘာ"} @@ -172,7 +173,7 @@ my{ LK{"သီရိလင်္ကာ"} LR{"လိုက်ဘေးရီးယား"} LS{"လီဆိုသို"} - LT{"လစ်သူယေးနီးယား"} + LT{"လစ်သူဝေးနီးယား"} LU{"လူဇင်ဘတ်"} LV{"လတ်ဗီးယား"} LY{"လစ်ဗျား"} @@ -311,5 +312,4 @@ my{ CZ{"ချက် ပြည်ထောင်စု"} FK{"ဖော့ကလန် ကျွန်းစု (အီလားစ် မောလ်ဗီနာစ်)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/mzn.txt b/intl/icu/source/data/region/mzn.txt index e5c6be455a20..01fcdb2aa4af 100644 --- a/intl/icu/source/data/region/mzn.txt +++ b/intl/icu/source/data/region/mzn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mzn{ Countries{ 001{"جهون"} @@ -304,5 +305,4 @@ mzn{ FK{"فالکلند (مالویناس)"} TL{"شرقی تیمور"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/naq.txt b/intl/icu/source/data/region/naq.txt index 5947e310cc0f..21c005d5dd25 100644 --- a/intl/icu/source/data/region/naq.txt +++ b/intl/icu/source/data/region/naq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml naq{ Countries{ AD{"Andorrab"} @@ -226,5 +227,4 @@ naq{ ZM{"Zambiab"} ZW{"Zimbabweb"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nb.txt b/intl/icu/source/data/region/nb.txt index be54a44e9572..bf2ceb091007 100644 --- a/intl/icu/source/data/region/nb.txt +++ b/intl/icu/source/data/region/nb.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ Countries{ 001{"verden"} @@ -73,7 +74,7 @@ nb{ BZ{"Belize"} CA{"Canada"} CC{"Kokosøyene"} - CD{"Kongo-Kinshasa"} + CD{"Kongo"} CF{"Den sentralafrikanske republikk"} CG{"Kongo-Brazzaville"} CH{"Sveits"} @@ -133,7 +134,7 @@ nb{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong S.A.R. Kina"} + HK{"Hongkong SAR Kina"} HM{"Heard- og McDonaldøyene"} HN{"Honduras"} HR{"Kroatia"} @@ -187,7 +188,7 @@ nb{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macao S.A.R. Kina"} + MO{"Macao SAR Kina"} MP{"Nord-Marianene"} MQ{"Martinique"} MR{"Mauritania"} @@ -288,7 +289,7 @@ nb{ WF{"Wallis og Futuna"} WS{"Samoa"} XA{"pseudospråk – aksenter"} - XB{"pseudospråk – RTL"} + XB{"pseudospråk – tekst begge veier"} XK{"Kosovo"} YE{"Jemen"} YT{"Mayotte"} @@ -310,5 +311,4 @@ nb{ SZ{"Swaziland"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nb_NO.txt b/intl/icu/source/data/region/nb_NO.txt index fdac28bf658d..15a33c3396f5 100644 --- a/intl/icu/source/data/region/nb_NO.txt +++ b/intl/icu/source/data/region/nb_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/nd.txt b/intl/icu/source/data/region/nd.txt index 34a770b03648..029608a9d92c 100644 --- a/intl/icu/source/data/region/nd.txt +++ b/intl/icu/source/data/region/nd.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nd{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ nd{ ZM{"Zambiya"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ne.txt b/intl/icu/source/data/region/ne.txt index 809e5cfd7e71..faf3348dd9f7 100644 --- a/intl/icu/source/data/region/ne.txt +++ b/intl/icu/source/data/region/ne.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne{ Countries{ 001{"विश्व"} @@ -46,7 +47,7 @@ ne{ AR{"अर्जेन्टिना"} AS{"अमेरिकी समोआ"} AT{"अष्ट्रिया"} - AU{"अष्ट्रेलिया"} + AU{"अस्ट्रेलिया"} AW{"अरुबा"} AX{"अलान्ड टापुहरु"} AZ{"अजरबैजान"} @@ -187,7 +188,7 @@ ne{ ML{"माली"} MM{"म्यान्मार (बर्मा)"} MN{"मङ्गोलिया"} - MO{"(मकाउ चिनियाँ विशेष प्रशासनिक क्षेत्र"} + MO{"मकाउ चिनियाँ विशेष प्रशासनिक क्षेत्र"} MP{"उत्तरी मारिआना टापु"} MQ{"मार्टिनिक"} MR{"माउरिटानिया"} @@ -222,7 +223,7 @@ ne{ PM{"सेन्ट पिर्रे र मिक्केलोन"} PN{"पिटकाइर्न टापुहरु"} PR{"पुएर्टो रिको"} - PS{"प्यालेस्टनी भू-भागहरु"} + PS{"प्यालेस्टिनी भू-भागहरू"} PT{"पोर्चुगल"} PW{"पलाउ"} PY{"प्याराग्वे"} @@ -301,7 +302,7 @@ ne{ GB{"युके"} HK{"हङकङ"} MO{"मकाउ"} - PS{"प्यालेसटाइन"} + PS{"प्‍यालेस्टाइन"} UN{"यूएन"} US{"अमेरिका"} } @@ -313,5 +314,4 @@ ne{ FK{"फक्ल्याण्ड टापुहरू (इज्लास माल्भिनास)"} TL{"पृर्वी टीमोर"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nl.txt b/intl/icu/source/data/region/nl.txt index 91a300e204cf..5ed9734d436e 100644 --- a/intl/icu/source/data/region/nl.txt +++ b/intl/icu/source/data/region/nl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl{ Countries{ 001{"wereld"} @@ -253,7 +254,7 @@ nl{ SV{"El Salvador"} SX{"Sint-Maarten"} SY{"Syrië"} - SZ{"eSwatini"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Turks- en Caicoseilanden"} TD{"Tsjaad"} @@ -308,11 +309,9 @@ nl{ Countries%variant{ CD{"Congo (DRC)"} CG{"Congo (Republiek)"} - CI{"Republiek Ivoorkust"} CZ{"Tsjechische Republiek"} FK{"Falklandeilanden (Islas Malvinas)"} SZ{"Swaziland"} TL{"Democratische Republiek Oost-Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nmg.txt b/intl/icu/source/data/region/nmg.txt index 4805ff9b3e05..10076705c8aa 100644 --- a/intl/icu/source/data/region/nmg.txt +++ b/intl/icu/source/data/region/nmg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nmg{ Countries{ AD{"Andɔ́ra"} @@ -226,5 +227,4 @@ nmg{ ZM{"Zambia"} ZW{"Zimbabwǝ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nn.txt b/intl/icu/source/data/region/nn.txt index 9b8bbb440fac..061e8ea2d524 100644 --- a/intl/icu/source/data/region/nn.txt +++ b/intl/icu/source/data/region/nn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ Countries{ 001{"verda"} @@ -14,7 +15,7 @@ nn{ 017{"Sentral-Afrika"} 018{"Sørlege Afrika"} 019{"Amerika"} - 021{"nordlege Amerika"} + 021{"Nordlege Amerika"} 029{"Karibia"} 030{"Aust-Asia"} 034{"Sør-Asia"} @@ -31,6 +32,7 @@ nn{ 151{"Aust-Europa"} 154{"Nord-Europa"} 155{"Vest-Europa"} + 202{"Afrika sør for Sahara"} 419{"Latin-Amerika"} AC{"Ascension"} AD{"Andorra"} @@ -105,6 +107,7 @@ nn{ ER{"Eritrea"} ES{"Spania"} ET{"Etiopia"} + EU{"Den europeiske unionen"} EZ{"eurosona"} FI{"Finland"} FJ{"Fiji"} @@ -126,12 +129,12 @@ nn{ GP{"Guadeloupe"} GQ{"Ekvatorial-Guinea"} GR{"Hellas"} - GS{"Sør-Georgia og Sør-Sandwichøyene"} + GS{"Sør-Georgia og Sør-Sandwichøyane"} GT{"Guatemala"} GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong S.A.R. Kina"} + HK{"Hongkong SAR Kina"} HM{"Heardøya og McDonaldøyane"} HN{"Honduras"} HR{"Kroatia"} @@ -143,7 +146,7 @@ nn{ IL{"Israel"} IM{"Man"} IN{"India"} - IO{"Det britiske territoriet I Indiahavet"} + IO{"Det britiske territoriet i Indiahavet"} IQ{"Irak"} IR{"Iran"} IS{"Island"} @@ -178,14 +181,14 @@ nn{ MC{"Monaco"} MD{"Moldova"} ME{"Montenegro"} - MF{"Saint Martin"} + MF{"Saint-Martin"} MG{"Madagaskar"} MH{"Marshalløyane"} MK{"Nord-Makedonia"} ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macao S.A.R. Kina"} + MO{"Macao SAR Kina"} MP{"Nord-Marianane"} MQ{"Martinique"} MR{"Mauritania"} @@ -220,7 +223,7 @@ nn{ PM{"Saint-Pierre-et-Miquelon"} PN{"Pitcairn"} PR{"Puerto Rico"} - PS{"Palestinsk territorium"} + PS{"Det palestinske området"} PT{"Portugal"} PW{"Palau"} PY{"Paraguay"} @@ -251,7 +254,7 @@ nn{ SV{"El Salvador"} SX{"Sint Maarten"} SY{"Syria"} - SZ{"Swaziland"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Turks- og Caicosøyane"} TD{"Tsjad"} @@ -260,7 +263,7 @@ nn{ TH{"Thailand"} TJ{"Tadsjikistan"} TK{"Tokelau"} - TL{"Timor-Leste (Aust-Timor)"} + TL{"Aust-Timor"} TM{"Turkmenistan"} TN{"Tunisia"} TO{"Tonga"} @@ -285,6 +288,8 @@ nn{ VU{"Vanuatu"} WF{"Wallis og Futuna"} WS{"Samoa"} + XA{"pseudospråk – aksentar"} + XB{"pseudospråk – RTL"} XK{"Kosovo"} YE{"Jemen"} YT{"Mayotte"} @@ -302,7 +307,6 @@ nn{ CD{"Den demokratiske republikken Kongo"} CG{"Republikken Kongo"} FK{"Falklandsøyane (Islas Malvinas)"} - TL{"Aust-Timor"} + SZ{"Swaziland"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nn_NO.txt b/intl/icu/source/data/region/nn_NO.txt index 4e8a5f78d9b5..9eaa33990d32 100644 --- a/intl/icu/source/data/region/nn_NO.txt +++ b/intl/icu/source/data/region/nn_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/nnh.txt b/intl/icu/source/data/region/nnh.txt index 3e96cce8ee3a..4b3168994075 100644 --- a/intl/icu/source/data/region/nnh.txt +++ b/intl/icu/source/data/region/nnh.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nnh{ Countries{ CM{"Kàmalûm"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/no.txt b/intl/icu/source/data/region/no.txt index 097a923cd101..474d0b21b0d9 100644 --- a/intl/icu/source/data/region/no.txt +++ b/intl/icu/source/data/region/no.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ "%%ALIAS"{"nb"} } diff --git a/intl/icu/source/data/region/no_NO.txt b/intl/icu/source/data/region/no_NO.txt index 188a8a4a680a..5d7f8599c0e5 100644 --- a/intl/icu/source/data/region/no_NO.txt +++ b/intl/icu/source/data/region/no_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ "%%ALIAS"{"nb_NO"} } diff --git a/intl/icu/source/data/region/no_NO_NY.txt b/intl/icu/source/data/region/no_NO_NY.txt index aa897fe6f515..c900df7fea21 100644 --- a/intl/icu/source/data/region/no_NO_NY.txt +++ b/intl/icu/source/data/region/no_NO_NY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO_NY{ "%%ALIAS"{"nn_NO"} } diff --git a/intl/icu/source/data/region/nus.txt b/intl/icu/source/data/region/nus.txt index bc58fc774635..e8d4c5493ada 100644 --- a/intl/icu/source/data/region/nus.txt +++ b/intl/icu/source/data/region/nus.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nus{ Countries{ AD{"Andora"} @@ -54,5 +55,4 @@ nus{ TD{"Ca̱d"} VG{"Burutic dhuɔ̱ɔ̱l be̱rgin"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/nyn.txt b/intl/icu/source/data/region/nyn.txt index 18a730541a38..175d0db126ee 100644 --- a/intl/icu/source/data/region/nyn.txt +++ b/intl/icu/source/data/region/nyn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nyn{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ nyn{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/om.txt b/intl/icu/source/data/region/om.txt index d8454072bd22..cc5dbb49115e 100644 --- a/intl/icu/source/data/region/om.txt +++ b/intl/icu/source/data/region/om.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om{ Countries{ BR{"Brazil"} @@ -15,5 +16,4 @@ om{ RU{"Russia"} US{"United States"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/or.txt b/intl/icu/source/data/region/or.txt index 573623dc9b7c..76caa24f379b 100644 --- a/intl/icu/source/data/region/or.txt +++ b/intl/icu/source/data/region/or.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml or{ Countries{ 001{"ବିଶ୍ୱ"} @@ -312,5 +313,4 @@ or{ SZ{"ସ୍ୱାଜିଲ୍ୟାଣ୍ଡ"} TL{"ପୂର୍ବ ତିମୋର୍‌"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/os.txt b/intl/icu/source/data/region/os.txt index 29326d0ef3fb..6396ffaca07b 100644 --- a/intl/icu/source/data/region/os.txt +++ b/intl/icu/source/data/region/os.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os{ Countries{ 001{"Дуне"} @@ -21,5 +22,4 @@ os{ US{"АИШ"} ZZ{"Нӕзонгӕ бӕстӕ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pa.txt b/intl/icu/source/data/region/pa.txt index d79fe302aeb5..df5a09bc8e7a 100644 --- a/intl/icu/source/data/region/pa.txt +++ b/intl/icu/source/data/region/pa.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa{ Countries{ 001{"ਸੰਸਾਰ"} @@ -314,5 +315,4 @@ pa{ SZ{"ਸਵਾਜ਼ੀਲੈਂਡ"} TL{"ਪੂਰਬ ਤਿਮੋਰ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pa_Arab.txt b/intl/icu/source/data/region/pa_Arab.txt index 23d94c49344f..bf09db531fe0 100644 --- a/intl/icu/source/data/region/pa_Arab.txt +++ b/intl/icu/source/data/region/pa_Arab.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Arab{ %%Parent{"root"} Countries{ PK{"پاکستان"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pa_Arab_PK.txt b/intl/icu/source/data/region/pa_Arab_PK.txt index e6b58610aed6..3b1bc420fabe 100644 --- a/intl/icu/source/data/region/pa_Arab_PK.txt +++ b/intl/icu/source/data/region/pa_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/pa_Guru.txt b/intl/icu/source/data/region/pa_Guru.txt index a0ee56949a68..f10658f06f81 100644 --- a/intl/icu/source/data/region/pa_Guru.txt +++ b/intl/icu/source/data/region/pa_Guru.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Guru{ - Version{"37"} } diff --git a/intl/icu/source/data/region/pa_Guru_IN.txt b/intl/icu/source/data/region/pa_Guru_IN.txt index adeae3fecc4e..f67b7c32236f 100644 --- a/intl/icu/source/data/region/pa_Guru_IN.txt +++ b/intl/icu/source/data/region/pa_Guru_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/pa_IN.txt b/intl/icu/source/data/region/pa_IN.txt index b18bba68dc7f..0c963d73dff9 100644 --- a/intl/icu/source/data/region/pa_IN.txt +++ b/intl/icu/source/data/region/pa_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_IN{ "%%ALIAS"{"pa_Guru_IN"} } diff --git a/intl/icu/source/data/region/pa_PK.txt b/intl/icu/source/data/region/pa_PK.txt index 1c66c7b37a41..29612addf4c1 100644 --- a/intl/icu/source/data/region/pa_PK.txt +++ b/intl/icu/source/data/region/pa_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_PK{ "%%ALIAS"{"pa_Arab_PK"} } diff --git a/intl/icu/source/data/region/pcm.txt b/intl/icu/source/data/region/pcm.txt index 9a59f80953f0..8d4e30e35f0f 100644 --- a/intl/icu/source/data/region/pcm.txt +++ b/intl/icu/source/data/region/pcm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pcm{ Countries{ 001{"Wọld"} @@ -312,5 +313,4 @@ pcm{ FK{"Fọ́klánd Aílands (Íslás Malvínas)"} SZ{"Swáziland"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pl.txt b/intl/icu/source/data/region/pl.txt index 730536a1884c..bb0bdf482644 100644 --- a/intl/icu/source/data/region/pl.txt +++ b/intl/icu/source/data/region/pl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl{ Countries{ 001{"świat"} @@ -314,5 +315,4 @@ pl{ SZ{"Suazi"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ps.txt b/intl/icu/source/data/region/ps.txt index 83dc1aba011d..45a35cb493f2 100644 --- a/intl/icu/source/data/region/ps.txt +++ b/intl/icu/source/data/region/ps.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps{ Countries{ 001{"نړۍ"} @@ -44,7 +45,7 @@ ps{ AO{"انګولا"} AQ{"انتارکتیکا"} AR{"ارجنټاين"} - AS{"امریکایی سمو"} + AS{"امریکایی ساماوا"} AT{"اتریش"} AU{"آسټرالیا"} AW{"آروبا"} @@ -125,8 +126,8 @@ ps{ GL{"ګرینلینډ"} GM{"ګامبیا"} GN{"ګینه"} - GP{"ګالډیپ"} - GQ{"استوایی ګینه"} + GP{"ګوادلوپ"} + GQ{"استوایی ګیني"} GR{"یونان"} GS{"سويلي جارجيا او سويلي سېنډوچ ټاپوګان"} GT{"ګواتیمالا"} @@ -145,7 +146,7 @@ ps{ IL{"اسراييل"} IM{"د آئل آف مین"} IN{"هند"} - IO{"د بريتانوي هند سمندري سيمه"} + IO{"د برتانوي هند سمندري سيمه"} IQ{"عراق"} IR{"ايران"} IS{"آیسلینډ"} @@ -187,7 +188,7 @@ ps{ ML{"مالي"} MM{"ميانمار (برما)"} MN{"منګوليا"} - MO{"مکاو سار چین"} + MO{"مکاو SAR چین"} MP{"شمالي ماريانا ټاپوګان"} MQ{"مارټینیک"} MR{"موریتانیا"} @@ -201,7 +202,7 @@ ps{ MZ{"موزمبيق"} NA{"نیمبیا"} NC{"نوی کالیډونیا"} - NE{"نیجر"} + NE{"نايجير"} NF{"نارفولک ټاپوګان"} NG{"نایجیریا"} NI{"نکاراګوا"} @@ -222,7 +223,7 @@ ps{ PM{"سینټ پییر او میکولون"} PN{"پيټکيرن ټاپوګان"} PR{"پورتو ریکو"} - PS{"فلسطين سيمې"} + PS{"فلسطیني سيمې"} PT{"پورتګال"} PW{"پلاؤ"} PY{"پاراګوی"} @@ -286,9 +287,9 @@ ps{ VN{"وېتنام"} VU{"واناتو"} WF{"والیس او فوتونا"} - WS{"ساموا"} + WS{"ساماوا"} XA{"جعلي خج"} - XB{"جعلي بيدي"} + XB{"سیډو بیډی"} XK{"کوسوو"} YE{"یمن"} YT{"مايوټ"} @@ -312,5 +313,4 @@ ps{ SZ{"سوازيلېنډ"} TL{"ختيځ تيمور"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ps_PK.txt b/intl/icu/source/data/region/ps_PK.txt index d8ff23d14d31..17faa4542916 100644 --- a/intl/icu/source/data/region/ps_PK.txt +++ b/intl/icu/source/data/region/ps_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps_PK{ Countries{ 019{"امريکے"} @@ -7,5 +8,4 @@ ps_PK{ TC{"د ترکیے او کیکاسو ټاپو"} TF{"د فرانسے جنوبي سیمے"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pt.txt b/intl/icu/source/data/region/pt.txt index d35a0b787e99..a943754eba06 100644 --- a/intl/icu/source/data/region/pt.txt +++ b/intl/icu/source/data/region/pt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ Countries{ 001{"Mundo"} @@ -56,7 +57,7 @@ pt{ BE{"Bélgica"} BF{"Burquina Faso"} BG{"Bulgária"} - BH{"Bahrein"} + BH{"Barein"} BI{"Burundi"} BJ{"Benin"} BL{"São Bartolomeu"} @@ -112,7 +113,7 @@ pt{ FJ{"Fiji"} FK{"Ilhas Malvinas"} FM{"Micronésia"} - FO{"Ilhas Faroe"} + FO{"Ilhas Faroé"} FR{"França"} GA{"Gabão"} GB{"Reino Unido"} @@ -178,7 +179,7 @@ pt{ LY{"Líbia"} MA{"Marrocos"} MC{"Mônaco"} - MD{"Moldova"} + MD{"Moldávia"} ME{"Montenegro"} MF{"São Martinho"} MG{"Madagascar"} @@ -313,5 +314,4 @@ pt{ SZ{"Suazilândia"} TL{"República Democrática de Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_AO.txt b/intl/icu/source/data/region/pt_AO.txt index 95cf1c6eeb25..c6fcc6bfab1f 100644 --- a/intl/icu/source/data/region/pt_AO.txt +++ b/intl/icu/source/data/region/pt_AO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_AO{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_CH.txt b/intl/icu/source/data/region/pt_CH.txt index 3a679be16d07..67d661e786be 100644 --- a/intl/icu/source/data/region/pt_CH.txt +++ b/intl/icu/source/data/region/pt_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CH{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_CV.txt b/intl/icu/source/data/region/pt_CV.txt index 6d4dd3a184a5..ebaaea839bb3 100644 --- a/intl/icu/source/data/region/pt_CV.txt +++ b/intl/icu/source/data/region/pt_CV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CV{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_GQ.txt b/intl/icu/source/data/region/pt_GQ.txt index 7cbf7717a1ea..9364da966374 100644 --- a/intl/icu/source/data/region/pt_GQ.txt +++ b/intl/icu/source/data/region/pt_GQ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GQ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_GW.txt b/intl/icu/source/data/region/pt_GW.txt index da37fbe5cb59..e28e46c16b08 100644 --- a/intl/icu/source/data/region/pt_GW.txt +++ b/intl/icu/source/data/region/pt_GW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GW{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_LU.txt b/intl/icu/source/data/region/pt_LU.txt index ebead8d520fb..c402ea2ae5ed 100644 --- a/intl/icu/source/data/region/pt_LU.txt +++ b/intl/icu/source/data/region/pt_LU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_LU{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_MO.txt b/intl/icu/source/data/region/pt_MO.txt index cf54f6259212..293d10b8cd3a 100644 --- a/intl/icu/source/data/region/pt_MO.txt +++ b/intl/icu/source/data/region/pt_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MO{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_MZ.txt b/intl/icu/source/data/region/pt_MZ.txt index b99439ce7700..a8cc01a1b6e1 100644 --- a/intl/icu/source/data/region/pt_MZ.txt +++ b/intl/icu/source/data/region/pt_MZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MZ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_PT.txt b/intl/icu/source/data/region/pt_PT.txt index 56d73a04983b..19b18b470d2e 100644 --- a/intl/icu/source/data/region/pt_PT.txt +++ b/intl/icu/source/data/region/pt_PT.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_PT{ Countries{ 009{"Oceânia"} @@ -29,8 +30,7 @@ pt_PT{ EE{"Estónia"} EH{"Sara Ocidental"} EZ{"Zona Euro"} - FK{"Ilhas Malvinas (Falkland)"} - FO{"Ilhas Faroé"} + FK{"Ilhas Falkland"} GG{"Guernesey"} GL{"Gronelândia"} GU{"Guame"} @@ -44,7 +44,6 @@ pt_PT{ LK{"Sri Lanca"} LV{"Letónia"} MC{"Mónaco"} - MD{"Moldávia"} MG{"Madagáscar"} MK{"Macedónia do Norte"} MS{"Monserrate"} @@ -84,5 +83,4 @@ pt_PT{ CZ{"República Checa"} FK{"Ilhas Falkland (Malvinas)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_ST.txt b/intl/icu/source/data/region/pt_ST.txt index e4321678d60b..ba0c09e92c58 100644 --- a/intl/icu/source/data/region/pt_ST.txt +++ b/intl/icu/source/data/region/pt_ST.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_ST{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/pt_TL.txt b/intl/icu/source/data/region/pt_TL.txt index b3777b6af6af..0dafd096f317 100644 --- a/intl/icu/source/data/region/pt_TL.txt +++ b/intl/icu/source/data/region/pt_TL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_TL{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/region/qu.txt b/intl/icu/source/data/region/qu.txt index 3b480217ecf8..95715e80cbc5 100644 --- a/intl/icu/source/data/region/qu.txt +++ b/intl/icu/source/data/region/qu.txt @@ -1,7 +1,39 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu{ Countries{ + 001{"Pacha"} + 002{"Africa"} + 003{"Norte America"} + 005{"Sud America"} + 009{"Oceania"} + 011{"Africa Occidental"} + 013{"America Central"} + 014{"Africa Oriental"} + 015{"Africa del Norte"} + 017{"Africa Media"} + 018{"Sud Africa"} + 019{"America"} + 021{"America del Norte"} + 029{"Caribe"} + 030{"Asia Oriental"} + 034{"Asia del Sur"} + 035{"Sureste de Asia"} + 039{"Europa del Sur"} + 053{"Australasia"} + 054{"Melanesia"} + 057{"Región Micronesia"} + 061{"Polinesia"} + 142{"Asia"} + 143{"Asia Central"} + 145{"Asia Occidental"} + 150{"Europa"} + 151{"Europa Oriental"} + 154{"Europa del Norte"} + 155{"Europa Occidental"} + 202{"Africa Sub-Sahariana"} + 419{"AmericaLatina"} AC{"Islas Ascensión"} AD{"Andorra"} AE{"Emiratos Árabes Unidos"} @@ -75,6 +107,8 @@ qu{ ER{"Eritrea"} ES{"España"} ET{"Etiopía"} + EU{"Union Europea"} + EZ{"Eurozona"} FI{"Finlandia"} FJ{"Fiyi"} FK{"Islas Malvinas"} @@ -100,7 +134,7 @@ qu{ GU{"Guam"} GW{"Guinea-Bisáu"} GY{"Guyana"} - HK{"Hong Kong (RAE)"} + HK{"Hong Kong RAE China"} HM{"Islas Heard y McDonald"} HN{"Honduras"} HR{"Croacia"} @@ -154,7 +188,7 @@ qu{ ML{"Malí"} MM{"Myanmar"} MN{"Mongolia"} - MO{"Macao RAE"} + MO{"Macao RAE China"} MP{"Islas Marianas del Norte"} MQ{"Martinica"} MR{"Mauritania"} @@ -194,6 +228,7 @@ qu{ PW{"Palaos"} PY{"Paraguay"} QA{"Qatar"} + QO{"Oceanía Periférica"} RE{"Reunión"} RO{"Rumania"} RS{"Serbia"} @@ -240,6 +275,7 @@ qu{ UA{"Ucrania"} UG{"Uganda"} UM{"Islas menores alejadas de los EE.UU."} + UN{"Naciones Unidas"} US{"Estados Unidos"} UY{"Uruguay"} UZ{"Uzbekistán"} @@ -252,15 +288,22 @@ qu{ VU{"Vanuatu"} WF{"Wallis y Futuna"} WS{"Samoa"} + XA{"Seudo-Acentos"} + XB{"Seudo-Bidi"} XK{"Kosovo"} YE{"Yemen"} YT{"Mayotte"} ZA{"Sudáfrica"} ZM{"Zambia"} ZW{"Zimbabue"} + ZZ{"Mana yachasqa Suyu"} + } + Countries%short{ + HK{"Hong Kong"} + MO{"Macao"} + PS{"Palestina"} } Countries%variant{ CZ{"República Checa"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/rm.txt b/intl/icu/source/data/region/rm.txt index d80dd7e66f41..4634db7aa23b 100644 --- a/intl/icu/source/data/region/rm.txt +++ b/intl/icu/source/data/region/rm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rm{ Countries{ 001{"mund"} @@ -13,7 +14,8 @@ rm{ 015{"Africa dal Nord"} 017{"Africa Centrala"} 018{"Africa Meridiunala"} - 019{"America dal Nord, America Centrala ed America dal Sid"} + 019{"americas"} + 021{"Amercia dal Nord"} 029{"Caribica"} 030{"Asia da l’Ost"} 034{"Asia dal Sid"} @@ -30,7 +32,9 @@ rm{ 151{"Europa Orientala"} 154{"Europa dal Nord"} 155{"Europa dal Vest"} + 202{"Africa Subsaharica"} 419{"America Latina"} + AC{"Insla d’Ascensiun"} AD{"Andorra"} AE{"Emirats Arabs Unids"} AF{"Afghanistan"} @@ -60,6 +64,7 @@ rm{ BM{"Bermudas"} BN{"Brunei"} BO{"Bolivia"} + BQ{"Antillas Ollandaisas"} BR{"Brasilia"} BS{"Bahamas"} BT{"Bhutan"} @@ -69,7 +74,7 @@ rm{ BZ{"Belize"} CA{"Canada"} CC{"Inslas Cocos"} - CD{"Republica Democratica dal Congo"} + CD{"Congo - Kinshasa"} CF{"Republica Centralafricana"} CG{"Congo"} CH{"Svizra"} @@ -79,18 +84,22 @@ rm{ CM{"Camerun"} CN{"China"} CO{"Columbia"} + CP{"Insla da Clipperton"} CR{"Costa Rica"} CU{"Cuba"} CV{"Cap Verd"} - CX{"Insla da Christmas"} + CW{"Curaçao"} + CX{"Insla da Nadal"} CY{"Cipra"} - CZ{"Republica Tscheca"} + CZ{"Tschechia"} DE{"Germania"} + DG{"Diego Garcia"} DJ{"Dschibuti"} DK{"Danemarc"} DM{"Dominica"} DO{"Republica Dominicana"} DZ{"Algeria"} + EA{"Ceuta e Melilla"} EC{"Ecuador"} EE{"Estonia"} EG{"Egipta"} @@ -98,7 +107,8 @@ rm{ ER{"Eritrea"} ES{"Spagna"} ET{"Etiopia"} - EU{"Uniun europeica"} + EU{"Uniun Europeica"} + EZ{"zona da l’euro"} FI{"Finlanda"} FJ{"Fidschi"} FK{"Inslas dal Falkland"} @@ -130,6 +140,7 @@ rm{ HR{"Croazia"} HT{"Haiti"} HU{"Ungaria"} + IC{"Inslas Canarias"} ID{"Indonesia"} IE{"Irlanda"} IL{"Israel"} @@ -145,7 +156,7 @@ rm{ JO{"Jordania"} JP{"Giapun"} KE{"Kenia"} - KG{"Kirghisistan"} + KG{"Kirgisistan"} KH{"Cambodscha"} KI{"Kiribati"} KM{"Comoras"} @@ -173,8 +184,9 @@ rm{ MF{"Saint Martin"} MG{"Madagascar"} MH{"Inslas da Marshall"} + MK{"Macedonia dal Nord"} ML{"Mali"} - MM{"Myanmar"} + MM{"Myanmar (Burma)"} MN{"Mongolia"} MO{"Regiun d’administraziun speziala Macao, China"} MP{"Inslas Mariannas dal Nord"} @@ -223,7 +235,7 @@ rm{ RU{"Russia"} RW{"Ruanda"} SA{"Arabia Saudita"} - SB{"Salomonas"} + SB{"Inslas Salomonas"} SC{"Seychellas"} SD{"Sudan"} SE{"Svezia"} @@ -237,10 +249,13 @@ rm{ SN{"Senegal"} SO{"Somalia"} SR{"Surinam"} - ST{"São Tomé e Principe"} + SS{"Sudan dal Sid"} + ST{"São Tomé & Príncipe"} SV{"El Salvador"} + SX{"Sint Maarten"} SY{"Siria"} - SZ{"Swaziland"} + SZ{"Eswatini"} + TA{"Tristan da Cunha"} TC{"Inslas Turks e Caicos"} TD{"Tschad"} TF{"Territoris Franzos Meridiunals"} @@ -259,7 +274,8 @@ rm{ TZ{"Tansania"} UA{"Ucraina"} UG{"Uganda"} - UM{"Inslas pitschnas perifericas dals Stadis Unids da l’America"} + UM{"Inslas Pitschnas Perifericas dals Stadis Unids da l’America"} + UN{"Naziuns Unidas"} US{"Stadis Unids da l’America"} UY{"Uruguay"} UZ{"Usbekistan"} @@ -270,14 +286,30 @@ rm{ VI{"Inslas Virginas Americanas"} VN{"Vietnam"} VU{"Vanuatu"} - WF{"Wallis e Futuna"} + WF{"Wallis & Futuna"} WS{"Samoa"} + XA{"accents pseudo"} + XB{"pseudo-bidirecziunal"} + XK{"Cosovo"} YE{"Jemen"} YT{"Mayotte"} ZA{"Africa dal Sid"} ZM{"Sambia"} ZW{"Simbabwe"} - ZZ{"Regiun betg encouschenta u nunvalaivla"} + ZZ{"regiun nunenconuschenta"} + } + Countries%short{ + GB{"GB"} + HK{"Hong Kong"} + MO{"Macao"} + PS{"Palestina"} + US{"US"} + } + Countries%variant{ + CD{"Congo (DRC)"} + CG{"Congo (republica)"} + CZ{"Republica Tscheca"} + FK{"Inslas Falkland"} + SZ{"Swaziland"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/rn.txt b/intl/icu/source/data/region/rn.txt index 439953f9ef3b..e34a3a61441c 100644 --- a/intl/icu/source/data/region/rn.txt +++ b/intl/icu/source/data/region/rn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rn{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ rn{ ZM{"Zambiya"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ro.txt b/intl/icu/source/data/region/ro.txt index 05427ab4af0b..8b93f5cafcab 100644 --- a/intl/icu/source/data/region/ro.txt +++ b/intl/icu/source/data/region/ro.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro{ Countries{ 001{"Lume"} @@ -133,7 +134,7 @@ ro{ GU{"Guam"} GW{"Guineea-Bissau"} GY{"Guyana"} - HK{"R.A.S. Hong Kong a Chinei"} + HK{"R.A.S. Hong Kong, China"} HM{"Insula Heard și Insulele McDonald"} HN{"Honduras"} HR{"Croația"} @@ -253,7 +254,7 @@ ro{ SV{"El Salvador"} SX{"Sint-Maarten"} SY{"Siria"} - SZ{"eSwatini"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Insulele Turks și Caicos"} TD{"Ciad"} @@ -313,5 +314,4 @@ ro{ SZ{"Swaziland"} TL{"Timorul de Est"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ro_MD.txt b/intl/icu/source/data/region/ro_MD.txt index a854c4c9c3a9..71f88b1fe772 100644 --- a/intl/icu/source/data/region/ro_MD.txt +++ b/intl/icu/source/data/region/ro_MD.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro_MD{ Countries{ MM{"Myanmar"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/rof.txt b/intl/icu/source/data/region/rof.txt index 104997dafbb2..95c45260e824 100644 --- a/intl/icu/source/data/region/rof.txt +++ b/intl/icu/source/data/region/rof.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rof{ Countries{ AD{"Andoro"} @@ -226,5 +227,4 @@ rof{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/root.txt b/intl/icu/source/data/region/root.txt index 1beeea6252bb..429dfb4efb55 100644 --- a/intl/icu/source/data/region/root.txt +++ b/intl/icu/source/data/region/root.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"37"} + Version{"38.1"} } diff --git a/intl/icu/source/data/region/ru.txt b/intl/icu/source/data/region/ru.txt index cd3c20325559..290806d5edaf 100644 --- a/intl/icu/source/data/region/ru.txt +++ b/intl/icu/source/data/region/ru.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ Countries{ 001{"весь мир"} @@ -313,5 +314,4 @@ ru{ SZ{"Свазиленд"} TL{"Тимор-Лесте"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ru_UA.txt b/intl/icu/source/data/region/ru_UA.txt index 68a781d87f92..721642b86880 100644 --- a/intl/icu/source/data/region/ru_UA.txt +++ b/intl/icu/source/data/region/ru_UA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru_UA{ Countries{ AC{"О-в Вознесения"} @@ -13,5 +14,4 @@ ru_UA{ TL{"Тимор-Лесте"} UM{"Малые Тихоокеанские Отдаленные Острова США"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/rw.txt b/intl/icu/source/data/region/rw.txt index 37595949388f..ef39e74b4821 100644 --- a/intl/icu/source/data/region/rw.txt +++ b/intl/icu/source/data/region/rw.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rw{ Countries{ MK{"Masedoniya y’Amajyaruguru"} RW{"U Rwanda"} TO{"Tonga"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/rwk.txt b/intl/icu/source/data/region/rwk.txt index d2b789d85151..8ec4b203a4ed 100644 --- a/intl/icu/source/data/region/rwk.txt +++ b/intl/icu/source/data/region/rwk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rwk{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ rwk{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sa.txt b/intl/icu/source/data/region/sa.txt new file mode 100644 index 000000000000..9c629b7116b7 --- /dev/null +++ b/intl/icu/source/data/region/sa.txt @@ -0,0 +1,18 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +sa{ + Countries{ + BR{"ब्राजील"} + CN{"चीन:"} + DE{"जर्मनीदेश:"} + FR{"फ़्रांस:"} + GB{"संयुक्त राष्ट्र:"} + IN{"भारतः"} + IT{"इटली:"} + JP{"जापन:"} + RU{"रष्यदेश:"} + US{"संयुक्त राज्य:"} + ZZ{"अज्ञात क्षेत्र:"} + } +} diff --git a/intl/icu/source/data/region/sah.txt b/intl/icu/source/data/region/sah.txt index bf000c2065ca..93ef22373538 100644 --- a/intl/icu/source/data/region/sah.txt +++ b/intl/icu/source/data/region/sah.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sah{ Countries{ 001{"Аан дойду"} @@ -31,5 +32,4 @@ sah{ Countries%short{ US{"АХШ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/saq.txt b/intl/icu/source/data/region/saq.txt index 59c8d340c385..779e6ef6c8a9 100644 --- a/intl/icu/source/data/region/saq.txt +++ b/intl/icu/source/data/region/saq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml saq{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ saq{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sat.txt b/intl/icu/source/data/region/sat.txt index 3e131eed080b..20fb53990bca 100644 --- a/intl/icu/source/data/region/sat.txt +++ b/intl/icu/source/data/region/sat.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat{ Countries{ BR{"ᱵᱨᱟᱡᱤᱞ"} @@ -14,5 +15,4 @@ sat{ US{"ᱭᱩᱱᱟᱭᱴᱮᱰ ᱮᱥᱴᱮᱴ"} ZZ{"ᱵᱟᱝᱩᱨᱩᱢ ᱴᱚᱴᱷᱟ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sat_IN.txt b/intl/icu/source/data/region/sat_IN.txt index c4976b4d7f96..15af3290b576 100644 --- a/intl/icu/source/data/region/sat_IN.txt +++ b/intl/icu/source/data/region/sat_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_IN{ "%%ALIAS"{"sat_Olck_IN"} } diff --git a/intl/icu/source/data/region/sat_Olck.txt b/intl/icu/source/data/region/sat_Olck.txt index 0d7225f984f0..f09b6a0014dd 100644 --- a/intl/icu/source/data/region/sat_Olck.txt +++ b/intl/icu/source/data/region/sat_Olck.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_Olck{ - Version{"37"} } diff --git a/intl/icu/source/data/region/sat_Olck_IN.txt b/intl/icu/source/data/region/sat_Olck_IN.txt index 8bda43c4ea7c..0a44bdb50245 100644 --- a/intl/icu/source/data/region/sat_Olck_IN.txt +++ b/intl/icu/source/data/region/sat_Olck_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/sbp.txt b/intl/icu/source/data/region/sbp.txt index 90e2ae24ce10..a425f0f72495 100644 --- a/intl/icu/source/data/region/sbp.txt +++ b/intl/icu/source/data/region/sbp.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sbp{ Countries{ AD{"Andola"} @@ -226,5 +227,4 @@ sbp{ ZM{"Sambiya"} ZW{"Simbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sd.txt b/intl/icu/source/data/region/sd.txt index 9290d79d1977..2d7c3f86e383 100644 --- a/intl/icu/source/data/region/sd.txt +++ b/intl/icu/source/data/region/sd.txt @@ -1,16 +1,17 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd{ Countries{ 001{"دنيا"} 002{"آفريڪا"} 003{"اتر آمريڪا"} 005{"ڏکڻ آمريڪا"} - 009{"سامونڊي"} + 009{"اوشنيا"} 011{"اولهه آفريقا"} 013{"وچ آمريڪا"} 014{"اوڀر آفريڪا"} - 015{"اترين آفريڪا"} + 015{"اتر آفريڪا"} 017{"وچ آفريڪا"} 018{"ڏاکڻي آمريڪا"} 019{"آمريڪا"} @@ -37,7 +38,7 @@ sd{ AD{"اندورا"} AE{"متحده عرب امارات"} AF{"افغانستان"} - AG{"انٽيگئا و بربودا"} + AG{"انٽيگا ۽ باربوڊا"} AI{"انگويلا"} AL{"البانيا"} AM{"ارمینیا"} @@ -45,12 +46,12 @@ sd{ AQ{"انٽارڪٽيڪا"} AR{"ارجنٽينا"} AS{"آمريڪي ساموا"} - AT{"آشٽريا"} + AT{"آسٽريا"} AU{"آسٽريليا"} AW{"عروبا"} AX{"الند ٻيٽ"} AZ{"آذربائيجان"} - BA{"بوسنیا اور هرزیگوینا"} + BA{"بوسنيا ۽ ھرزيگوينا"} BB{"باربڊوس"} BD{"بنگلاديش"} BE{"بيلجيم"} @@ -65,26 +66,26 @@ sd{ BO{"بوليويا"} BQ{"ڪيريبين نيدرلينڊ"} BR{"برازيل"} - BS{"بهاماس"} + BS{"باهاماس"} BT{"ڀوٽان"} BV{"بووٽ ٻيٽ"} BW{"بوٽسوانا"} BY{"بیلارس"} BZ{"بيليز"} - CA{"ڪئناڊا"} + CA{"ڪينيڊا"} CC{"ڪوڪوس ٻيٽ"} CD{"ڪانگو -ڪنشاسا"} CF{"وچ آفريقي جمهوريه"} CG{"ڪانگو - برازاویل"} CH{"سوئزرلينڊ"} - CI{"آئيوري ڪنارو"} + CI{"ڪوٽ ڊي وار"} CK{"ڪوڪ ٻيٽ"} CL{"چلي"} CM{"ڪيمرون"} CN{"چين"} CO{"ڪولمبيا"} CP{"ڪلپرٽن ٻيٽ"} - CR{"ڪوسٽا رڪا"} + CR{"ڪوسٽا ريڪا"} CU{"ڪيوبا"} CV{"ڪيپ وردي"} CW{"ڪيوراسائو"} @@ -115,7 +116,7 @@ sd{ FO{"فارو ٻيٽ"} FR{"فرانس"} GA{"گبون"} - GB{"برطانيه"} + GB{"برطانيہ"} GD{"گرينڊا"} GE{"جارجيا"} GF{"فرانسيسي گيانا"} @@ -133,18 +134,18 @@ sd{ GU{"گوام"} GW{"گني بسائو"} GY{"گيانا"} - HK{"هانگ ڪانگ"} + HK{"هانگ ڪانگ SAR"} HM{"هرڊ ۽ مڪڊونلڊ ٻيٽ"} HN{"هنڊورس"} HR{"ڪروئيشيا"} HT{"هيٽي"} - HU{"چيڪ جهموريه"} + HU{"هنگري"} IC{"ڪينري ٻيٽ"} ID{"انڊونيشيا"} IE{"آئرلينڊ"} IL{"اسرائيل"} IM{"انسانن جو ٻيٽ"} - IN{"انڊيا"} + IN{"ڀارت"} IO{"برطانوي هندي سمنڊ خطو"} IQ{"عراق"} IR{"ايران"} @@ -173,22 +174,22 @@ sd{ LR{"لائبیریا"} LS{"ليسوٿو"} LT{"لٿونيا"} - LU{"لیگزمبرگ"} + LU{"لگزمبرگ"} LV{"لاتويا"} LY{"لبيا"} - MA{"موروڪو"} + MA{"مراڪش"} MC{"موناڪو"} MD{"مالدووا"} ME{"مونٽي نيگرو"} MF{"سينٽ مارٽن"} - MG{"مداگيسڪر"} - MH{"مارشل ڀيٽ"} - MK{"شمالي مقدونيا"} + MG{"مدگاسڪر"} + MH{"مارشل ٻيٽ"} + MK{"اتر مقدونيا"} ML{"مالي"} MM{"ميانمار (برما)"} MN{"منگوليا"} MO{"مڪائو SAR چين"} - MP{"اتر مرينا ٻيٽ"} + MP{"اتريان ماريانا ٻيٽ"} MQ{"مارتينڪ"} MR{"موريتانيا"} MS{"مونٽسراٽ"} @@ -222,7 +223,7 @@ sd{ PM{"سینٽ پیئر و میڪوئیلون"} PN{"پٽڪئرن ٻيٽ"} PR{"پيوئرٽو ريڪو"} - PS{"فلسطيني حدون"} + PS{"فلسطيني علائقا"} PT{"پرتگال"} PW{"پلائو"} PY{"پيراگوءِ"} @@ -238,7 +239,7 @@ sd{ SC{"شي شلز"} SD{"سوڊان"} SE{"سوئيڊن"} - SG{"سينگاپور"} + SG{"سنگاپور"} SH{"سينٽ ھيلينا"} SI{"سلوینیا"} SJ{"سوالبارڊ ۽ جان ماین"} @@ -258,7 +259,7 @@ sd{ TC{"ترڪ ۽ ڪيڪوس ٻيٽ"} TD{"چاڊ"} TF{"فرانسيسي ڏاکڻي علائقا"} - TG{"توگو"} + TG{"ٽوگو"} TH{"ٿائيليند"} TJ{"تاجڪستان"} TK{"ٽوڪلائو"} @@ -273,20 +274,20 @@ sd{ TZ{"تنزانيا"} UA{"يوڪرين"} UG{"يوگنڊا"} - UM{"آمريڪي ٻاهريون ٻيٽ"} - UN{"اقوام متحده"} + UM{"آمريڪي خارجي ٻيٽ"} + UN{"گڏيل قومون"} US{"آمريڪا جون گڏيل رياستون"} UY{"يوروگوءِ"} UZ{"ازبڪستان"} VA{"ويٽڪين سٽي"} VC{"سینٽ ونسنت ۽ گریناڊینز"} - VE{"وينزيلا"} + VE{"وينزويلا"} VG{"برطانوي ورجن ٻيٽ"} VI{"آمريڪي ورجن ٻيٽ"} VN{"ويتنام"} VU{"وينيٽيو"} WF{"والس ۽ فتونا"} - WS{"سموئا"} + WS{"ساموا"} XA{"سوڊو-لهجا"} XB{"سوڊو-بي ڊي"} XK{"ڪوسووو"} @@ -298,6 +299,8 @@ sd{ ZZ{"اڻڄاتل خطو"} } Countries%short{ + GB{"برطانيه"} + HK{"هانگ ڪانگ"} MO{"مڪائو"} PS{"فلسطين"} US{"يوايس"} @@ -306,10 +309,9 @@ sd{ CD{"ڪانگو"} CG{"ڪانگو (جمهوري)"} CI{"آئيوري ڪوسٽ"} - CZ{"چيڪ جهموريو"} - FK{"فلڪ لينڊ ٻيٽ"} + CZ{"چيڪ جهموريہ"} + FK{"فاڪ لينڊ ٻيٽ (اسلس مالويناس)"} SZ{"سوازيلينڊ"} TL{"اوڀر تيمور"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sd_Arab.txt b/intl/icu/source/data/region/sd_Arab.txt index 52a97c862438..c089e06d8ec5 100644 --- a/intl/icu/source/data/region/sd_Arab.txt +++ b/intl/icu/source/data/region/sd_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/region/sd_Arab_PK.txt b/intl/icu/source/data/region/sd_Arab_PK.txt index 4a9803a3c859..2e57dba96af5 100644 --- a/intl/icu/source/data/region/sd_Arab_PK.txt +++ b/intl/icu/source/data/region/sd_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/sd_Deva.txt b/intl/icu/source/data/region/sd_Deva.txt index b010b610bd24..ef08e59c88e7 100644 --- a/intl/icu/source/data/region/sd_Deva.txt +++ b/intl/icu/source/data/region/sd_Deva.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Deva{ %%Parent{"root"} Countries{ @@ -15,5 +16,4 @@ sd_Deva{ US{"अमेरिका"} ZZ{"अणवाकुफु इलाको"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sd_PK.txt b/intl/icu/source/data/region/sd_PK.txt index 766360070b4e..b7def87808ea 100644 --- a/intl/icu/source/data/region/sd_PK.txt +++ b/intl/icu/source/data/region/sd_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_PK{ "%%ALIAS"{"sd_Arab_PK"} } diff --git a/intl/icu/source/data/region/se.txt b/intl/icu/source/data/region/se.txt index b52d09355cbb..5f05a01dc982 100644 --- a/intl/icu/source/data/region/se.txt +++ b/intl/icu/source/data/region/se.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se{ Countries{ 001{"máilbmi"} @@ -289,5 +290,4 @@ se{ Countries%short{ US{"USA"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/se_FI.txt b/intl/icu/source/data/region/se_FI.txt index 74948cba46e8..26ec1372a66a 100644 --- a/intl/icu/source/data/region/se_FI.txt +++ b/intl/icu/source/data/region/se_FI.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se_FI{ Countries{ 001{"Máilbmi"} @@ -26,5 +27,4 @@ se_FI{ Countries%variant{ CI{"Côte d’Ivoire"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/seh.txt b/intl/icu/source/data/region/seh.txt index 4378f82b2236..17e781adb800 100644 --- a/intl/icu/source/data/region/seh.txt +++ b/intl/icu/source/data/region/seh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml seh{ Countries{ AD{"Andorra"} @@ -225,5 +226,4 @@ seh{ ZM{"Zâmbia"} ZW{"Zimbábue"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ses.txt b/intl/icu/source/data/region/ses.txt index 16898e348d4a..49c1e1bd7a3b 100644 --- a/intl/icu/source/data/region/ses.txt +++ b/intl/icu/source/data/region/ses.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ses{ Countries{ AD{"Andoora"} @@ -226,5 +227,4 @@ ses{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sg.txt b/intl/icu/source/data/region/sg.txt index b421b68c85fd..6c4a811159d5 100644 --- a/intl/icu/source/data/region/sg.txt +++ b/intl/icu/source/data/region/sg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sg{ Countries{ AD{"Andôro"} @@ -226,5 +227,4 @@ sg{ ZM{"Zambïi"} ZW{"Zimbäbwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sh.txt b/intl/icu/source/data/region/sh.txt index 74b646a22923..83091b2d0a58 100644 --- a/intl/icu/source/data/region/sh.txt +++ b/intl/icu/source/data/region/sh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh{ "%%ALIAS"{"sr_Latn"} } diff --git a/intl/icu/source/data/region/sh_BA.txt b/intl/icu/source/data/region/sh_BA.txt index 93bdac63f042..7f73cd515f1a 100644 --- a/intl/icu/source/data/region/sh_BA.txt +++ b/intl/icu/source/data/region/sh_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_BA{ "%%ALIAS"{"sr_Latn_BA"} } diff --git a/intl/icu/source/data/region/sh_CS.txt b/intl/icu/source/data/region/sh_CS.txt index 224568a08c08..3b2f92bbf46c 100644 --- a/intl/icu/source/data/region/sh_CS.txt +++ b/intl/icu/source/data/region/sh_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/region/sh_YU.txt b/intl/icu/source/data/region/sh_YU.txt index 8a7d4609802f..dc5a35beadb0 100644 --- a/intl/icu/source/data/region/sh_YU.txt +++ b/intl/icu/source/data/region/sh_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/region/shi.txt b/intl/icu/source/data/region/shi.txt index 66530bd04663..0d9ccfda84d4 100644 --- a/intl/icu/source/data/region/shi.txt +++ b/intl/icu/source/data/region/shi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi{ Countries{ AD{"ⴰⵏⴷⵓⵔⴰ"} @@ -226,5 +227,4 @@ shi{ ZM{"ⵣⴰⵎⴱⵢⴰ"} ZW{"ⵣⵉⵎⴱⴰⴱⵡⵉ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/shi_Latn.txt b/intl/icu/source/data/region/shi_Latn.txt index 32b45f9424b2..24a13e729614 100644 --- a/intl/icu/source/data/region/shi_Latn.txt +++ b/intl/icu/source/data/region/shi_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Latn{ %%Parent{"root"} Countries{ @@ -227,5 +228,4 @@ shi_Latn{ ZM{"zambya"} ZW{"zimbabwi"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/shi_MA.txt b/intl/icu/source/data/region/shi_MA.txt index 00de1b1b27a7..c96251db2b7c 100644 --- a/intl/icu/source/data/region/shi_MA.txt +++ b/intl/icu/source/data/region/shi_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_MA{ "%%ALIAS"{"shi_Tfng_MA"} } diff --git a/intl/icu/source/data/region/shi_Tfng.txt b/intl/icu/source/data/region/shi_Tfng.txt index 397f53f49446..723cdf148de1 100644 --- a/intl/icu/source/data/region/shi_Tfng.txt +++ b/intl/icu/source/data/region/shi_Tfng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Tfng{ - Version{"37"} } diff --git a/intl/icu/source/data/region/shi_Tfng_MA.txt b/intl/icu/source/data/region/shi_Tfng_MA.txt index 978cd5cab856..3ec81a4f824a 100644 --- a/intl/icu/source/data/region/shi_Tfng_MA.txt +++ b/intl/icu/source/data/region/shi_Tfng_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/si.txt b/intl/icu/source/data/region/si.txt index bfc733722090..fe94f975d5fe 100644 --- a/intl/icu/source/data/region/si.txt +++ b/intl/icu/source/data/region/si.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml si{ Countries{ 001{"ලෝකය"} @@ -133,7 +134,7 @@ si{ GU{"ගුවාම්"} GW{"ගිනි බිසව්"} GY{"ගයනාව"} - HK{"හොංකොං චීන විශේෂ පරිපාලන කලාපය"} + HK{"හොංකොං විශේෂ පරිපාලන කලාපය චීනය"} HM{"හර්ඩ් දූපත සහ මැක්ඩොනල්ඩ් දූපත්"} HN{"හොන්ඩුරාස්"} HR{"ක්‍රොඒෂියාව"} @@ -187,7 +188,7 @@ si{ ML{"මාලි"} MM{"මියන්මාරය (බුරුමය)"} MN{"මොන්ගෝලියාව"} - MO{"මකාවු එස්ඒආර්"} + MO{"මැකාවු විශේෂ පරිපාලන කලාපය චීනය"} MP{"උතුරු මරියානා දූපත්"} MQ{"මර්ටිනික්"} MR{"මොරිටේනියාව"} @@ -312,5 +313,4 @@ si{ SZ{"ස්වාසිලන්තය"} TL{"නැගෙනහිර ටිමෝරය"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sk.txt b/intl/icu/source/data/region/sk.txt index 2bb0159c0c94..de40debd12ee 100644 --- a/intl/icu/source/data/region/sk.txt +++ b/intl/icu/source/data/region/sk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk{ Countries{ 001{"svet"} @@ -312,5 +313,4 @@ sk{ FK{"Falklandy (Malvíny)"} SZ{"Svazijsko"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sl.txt b/intl/icu/source/data/region/sl.txt index 06c53950d684..ce5a47e77d27 100644 --- a/intl/icu/source/data/region/sl.txt +++ b/intl/icu/source/data/region/sl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl{ Countries{ 001{"svet"} @@ -74,7 +75,7 @@ sl{ CA{"Kanada"} CC{"Kokosovi otoki"} CD{"Demokratična republika Kongo"} - CF{"Centralnoafriška republika"} + CF{"Srednjeafriška republika"} CG{"Kongo - Brazzaville"} CH{"Švica"} CI{"Slonokoščena obala"} @@ -133,7 +134,7 @@ sl{ GU{"Guam"} GW{"Gvineja Bissau"} GY{"Gvajana"} - HK{"Posebno administrativno območje LR Kitajske Hongkong"} + HK{"Posebno upravno območje Ljudske republike Kitajske Hongkong"} HM{"Heardov otok in McDonaldovi otoki"} HN{"Honduras"} HR{"Hrvaška"} @@ -187,7 +188,7 @@ sl{ ML{"Mali"} MM{"Mjanmar (Burma)"} MN{"Mongolija"} - MO{"Posebno administrativno območje LR Kitajske Macao"} + MO{"Posebno upravno območje Ljudske republike Kitajske Macao"} MP{"Severni Marianski otoki"} MQ{"Martinik"} MR{"Mavretanija"} @@ -300,6 +301,7 @@ sl{ Countries%short{ GB{"ZK"} HK{"Hongkong"} + MO{"Macao"} PS{"Palestina"} UN{"ZN"} US{"ZDA"} @@ -313,5 +315,4 @@ sl{ SZ{"Svazi"} TL{"Vzhodni Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/smn.txt b/intl/icu/source/data/region/smn.txt index aff80447c8a8..5d052956c3b4 100644 --- a/intl/icu/source/data/region/smn.txt +++ b/intl/icu/source/data/region/smn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml smn{ Countries{ AC{"Ascension-suálui"} @@ -264,5 +265,4 @@ smn{ CG{"Kongo täsiväldi"} FK{"Falklandsuolluuh (Malvinassuolluuh)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sn.txt b/intl/icu/source/data/region/sn.txt index beb216e470ea..a2fc877e38be 100644 --- a/intl/icu/source/data/region/sn.txt +++ b/intl/icu/source/data/region/sn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sn{ Countries{ AD{"Andora"} @@ -225,5 +226,4 @@ sn{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/so.txt b/intl/icu/source/data/region/so.txt index 845e274288f8..3d5cf707aab6 100644 --- a/intl/icu/source/data/region/so.txt +++ b/intl/icu/source/data/region/so.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so{ Countries{ 001{"Dunida"} @@ -35,7 +36,7 @@ so{ 419{"Laatiin Ameerika"} AC{"Jasiiradda Asensiyoon"} AD{"Andora"} - AE{"Imaaraadka Carabta ee Midoobay"} + AE{"Midawga Imaaraatka Carabta"} AF{"Afgaanistaan"} AG{"Antigua & Barbuuda"} AI{"Anguula"} @@ -52,7 +53,7 @@ so{ AZ{"Asarbajan"} BA{"Boosniya & Harsegofina"} BB{"Baarbadoos"} - BD{"Bangladesh"} + BD{"Bangaladhesh"} BE{"Biljam"} BF{"Burkiina Faaso"} BG{"Bulgaariya"} @@ -61,7 +62,7 @@ so{ BJ{"Biniin"} BL{"St. Baathelemiy"} BM{"Barmuuda"} - BN{"Buruneeya"} + BN{"Buruneey"} BO{"Boliifiya"} BQ{"Karibiyaan Nadarlands"} BR{"Baraasiil"} @@ -185,7 +186,7 @@ so{ MH{"Jasiiradda Maarshal"} MK{"Masedooniya Waqooyi"} ML{"Maali"} - MM{"Miyanmar"} + MM{"Mayanmar"} MN{"Mongooliya"} MO{"Makaaw"} MP{"Jasiiradda Waqooyiga Mariaana"} @@ -194,10 +195,10 @@ so{ MS{"Montserrat"} MT{"Maalta"} MU{"Mawrishiyaas"} - MV{"Maaldiqeen"} + MV{"Maaldiifis"} MW{"Malaawi"} MX{"Meksiko"} - MY{"Malaysia"} + MY{"Malaysiya"} MZ{"Musambiik"} NA{"Namiibiya"} NC{"Jasiiradda Niyuu Kaledooniya"} @@ -215,14 +216,14 @@ so{ PA{"Baanama"} PE{"Beeru"} PF{"Booliyneesiya Faransiiska"} - PG{"Babua Niyuu Gini"} + PG{"Babwa Niyuu Gini"} PH{"Filibiin"} PK{"Bakistaan"} PL{"Booland"} PM{"Saint Pierre and Miquelon"} PN{"Bitkairn"} PR{"Bueerto Riiko"} - PS{"Falastiin Daanka galbeed iyo Qasa"} + PS{"Dhulka Falastiiniyiinta daanta galbeed iyo marinka qasa"} PT{"Bortugaal"} PW{"Balaaw"} PY{"Baraguaay"} @@ -239,7 +240,7 @@ so{ SD{"Suudaan"} SE{"Iswidhan"} SG{"Singaboor"} - SH{"Saint Helena"} + SH{"Saynt Helena"} SI{"Islofeeniya"} SJ{"Jasiiradda Sfaldbaad & Jaan Mayen"} SK{"Islofaakiya"} @@ -277,7 +278,7 @@ so{ UN{"Qaramada Midoobay"} US{"Maraykanka"} UY{"Uruguwaay"} - UZ{"Uusbakistaan"} + UZ{"Usbakistan"} VA{"Faatikaan"} VC{"St. Finsent & Girenadiins"} VE{"Fenisuweela"} @@ -308,7 +309,6 @@ so{ CZ{"Jamhuuriyadda Jek"} FK{"Jasiiradaha Fookland"} SZ{"Iswaasilaan"} - TL{"Timoor Bari"} + TL{"Bariga Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sq.txt b/intl/icu/source/data/region/sq.txt index d5ab3a7b1294..66318aa7ed28 100644 --- a/intl/icu/source/data/region/sq.txt +++ b/intl/icu/source/data/region/sq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq{ Countries{ 001{"Bota"} @@ -313,5 +314,4 @@ sq{ SZ{"Suazilend"} TL{"Timori Lindor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr.txt b/intl/icu/source/data/region/sr.txt index 69929a85bb4f..b3d478c63fe1 100644 --- a/intl/icu/source/data/region/sr.txt +++ b/intl/icu/source/data/region/sr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr{ Countries{ 001{"свет"} @@ -313,5 +314,4 @@ sr{ FK{"Фокландска (Малвинска) острва"} TL{"Источни Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_BA.txt b/intl/icu/source/data/region/sr_BA.txt index edad17f703fe..04f2efd1a7a2 100644 --- a/intl/icu/source/data/region/sr_BA.txt +++ b/intl/icu/source/data/region/sr_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_BA{ "%%ALIAS"{"sr_Cyrl_BA"} } diff --git a/intl/icu/source/data/region/sr_CS.txt b/intl/icu/source/data/region/sr_CS.txt index 5f8becfab3ed..6a32f49e2a6f 100644 --- a/intl/icu/source/data/region/sr_CS.txt +++ b/intl/icu/source/data/region/sr_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_CS{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/region/sr_Cyrl.txt b/intl/icu/source/data/region/sr_Cyrl.txt index df3a287587cf..772d8b3da519 100644 --- a/intl/icu/source/data/region/sr_Cyrl.txt +++ b/intl/icu/source/data/region/sr_Cyrl.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl{ - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_Cyrl_BA.txt b/intl/icu/source/data/region/sr_Cyrl_BA.txt index 8d8dce21e52c..66438278850d 100644 --- a/intl/icu/source/data/region/sr_Cyrl_BA.txt +++ b/intl/icu/source/data/region/sr_Cyrl_BA.txt @@ -1,20 +1,42 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_BA{ Countries{ + 001{"свијет"} + 003{"Сјеверноамерички континент"} + 015{"Сјеверна Африка"} + 019{"Сјеверна и Јужна Америка"} + 021{"Сјеверна Америка"} + 154{"Сјеверна Европа"} + AC{"острво Асенсион"} BY{"Бјелорусија"} + CC{"Кокосова (Килинг) острва"} CG{"Конго"} + CP{"острво Клипертон"} CV{"Кабо Верде"} CZ{"Чешка Република"} DE{"Њемачка"} + GS{"Јужна Џорџија и Јужна Сендвичка острва"} + GU{"Гвам"} + HK{"Хонгконг (САО Кине)"} + HM{"острво Херд и острва Макдоналд"} KN{"Свети Китс и Невис"} + KP{"Сјеверна Кореја"} + MK{"Сјеверна Македонија"} MO{"САР Макао"} + MP{"Сјеверна Маријанска острва"} + NF{"острво Норфок"} + NU{"Нијуе"} PM{"Свети Пјер и Микелон"} + PS{"палестинске територије"} RE{"Реунион"} - UM{"Мања удаљена острва САД"} + UM{"Спољна острва САД"} VC{"Свети Винсент и Гренадини"} VG{"Британска Дјевичанска Острва"} VI{"Америчка Дјевичанска Острва"} } - Version{"37"} + Countries%variant{ + FK{"Фолкландска (Малвинска) острва"} + } } diff --git a/intl/icu/source/data/region/sr_Cyrl_CS.txt b/intl/icu/source/data/region/sr_Cyrl_CS.txt index 9325e5a76a14..2da82d2d35e0 100644 --- a/intl/icu/source/data/region/sr_Cyrl_CS.txt +++ b/intl/icu/source/data/region/sr_Cyrl_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_CS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/region/sr_Cyrl_ME.txt b/intl/icu/source/data/region/sr_Cyrl_ME.txt index b3f48f0ac1f3..14c153d34b43 100644 --- a/intl/icu/source/data/region/sr_Cyrl_ME.txt +++ b/intl/icu/source/data/region/sr_Cyrl_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_ME{ Countries{ BY{"Бјелорусија"} @@ -14,5 +15,4 @@ sr_Cyrl_ME{ VG{"Британска Дјевичанска Острва"} VI{"Америчка Дјевичанска Острва"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_Cyrl_RS.txt b/intl/icu/source/data/region/sr_Cyrl_RS.txt index 7ef8fabce652..c74b8608c8e9 100644 --- a/intl/icu/source/data/region/sr_Cyrl_RS.txt +++ b/intl/icu/source/data/region/sr_Cyrl_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/sr_Cyrl_XK.txt b/intl/icu/source/data/region/sr_Cyrl_XK.txt index 7b0a0ee02350..28dd748b7713 100644 --- a/intl/icu/source/data/region/sr_Cyrl_XK.txt +++ b/intl/icu/source/data/region/sr_Cyrl_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_XK{ Countries{ CG{"Конго"} @@ -13,5 +14,4 @@ sr_Cyrl_XK{ UM{"Мања удаљена острва САД"} VC{"Свети Винсент и Гренадини"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_Cyrl_YU.txt b/intl/icu/source/data/region/sr_Cyrl_YU.txt index 806d42c439fb..5874f8cb4091 100644 --- a/intl/icu/source/data/region/sr_Cyrl_YU.txt +++ b/intl/icu/source/data/region/sr_Cyrl_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_YU{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/region/sr_Latn.txt b/intl/icu/source/data/region/sr_Latn.txt index 7b525b7b15b1..3aa23eaf9544 100644 --- a/intl/icu/source/data/region/sr_Latn.txt +++ b/intl/icu/source/data/region/sr_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn{ %%Parent{"root"} Countries{ @@ -314,5 +315,4 @@ sr_Latn{ FK{"Foklandska (Malvinska) ostrva"} TL{"Istočni Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_Latn_BA.txt b/intl/icu/source/data/region/sr_Latn_BA.txt index f8bfa57afdbe..4a1a1bf5e647 100644 --- a/intl/icu/source/data/region/sr_Latn_BA.txt +++ b/intl/icu/source/data/region/sr_Latn_BA.txt @@ -1,20 +1,42 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_BA{ Countries{ + 001{"svijet"} + 003{"Sjevernoamerički kontinent"} + 015{"Sjeverna Afrika"} + 019{"Sjeverna i Južna Amerika"} + 021{"Sjeverna Amerika"} + 154{"Sjeverna Evropa"} + AC{"ostrvo Asension"} BY{"Bjelorusija"} + CC{"Kokosova (Kiling) ostrva"} CG{"Kongo"} + CP{"ostrvo Kliperton"} CV{"Kabo Verde"} CZ{"Češka Republika"} DE{"Njemačka"} + GS{"Južna Džordžija i Južna Sendvička ostrva"} + GU{"Gvam"} + HK{"Hongkong (SAO Kine)"} + HM{"ostrvo Herd i ostrva Makdonald"} KN{"Sveti Kits i Nevis"} + KP{"Sjeverna Koreja"} + MK{"Sjeverna Makedonija"} MO{"SAR Makao"} + MP{"Sjeverna Marijanska ostrva"} + NF{"ostrvo Norfok"} + NU{"Nijue"} PM{"Sveti Pjer i Mikelon"} + PS{"palestinske teritorije"} RE{"Reunion"} - UM{"Manja udaljena ostrva SAD"} + UM{"Spoljna ostrva SAD"} VC{"Sveti Vinsent i Grenadini"} VG{"Britanska Djevičanska Ostrva"} VI{"Američka Djevičanska Ostrva"} } - Version{"37"} + Countries%variant{ + FK{"Folklandska (Malvinska) ostrva"} + } } diff --git a/intl/icu/source/data/region/sr_Latn_CS.txt b/intl/icu/source/data/region/sr_Latn_CS.txt index 0952735a9c87..7204cfd29a04 100644 --- a/intl/icu/source/data/region/sr_Latn_CS.txt +++ b/intl/icu/source/data/region/sr_Latn_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/region/sr_Latn_ME.txt b/intl/icu/source/data/region/sr_Latn_ME.txt index 09c9c143c779..a3db08291e68 100644 --- a/intl/icu/source/data/region/sr_Latn_ME.txt +++ b/intl/icu/source/data/region/sr_Latn_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_ME{ Countries{ BY{"Bjelorusija"} @@ -14,5 +15,4 @@ sr_Latn_ME{ VG{"Britanska Djevičanska Ostrva"} VI{"Američka Djevičanska Ostrva"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_Latn_RS.txt b/intl/icu/source/data/region/sr_Latn_RS.txt index 76d38f8b734b..8d63da618417 100644 --- a/intl/icu/source/data/region/sr_Latn_RS.txt +++ b/intl/icu/source/data/region/sr_Latn_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/sr_Latn_XK.txt b/intl/icu/source/data/region/sr_Latn_XK.txt index 638dd83da635..fc6d9a3677e8 100644 --- a/intl/icu/source/data/region/sr_Latn_XK.txt +++ b/intl/icu/source/data/region/sr_Latn_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_XK{ Countries{ CG{"Kongo"} @@ -13,5 +14,4 @@ sr_Latn_XK{ UM{"Manja udaljena ostrva SAD"} VC{"Sveti Vinsent i Grenadini"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sr_Latn_YU.txt b/intl/icu/source/data/region/sr_Latn_YU.txt index 2747ab210a4c..415a4d892a22 100644 --- a/intl/icu/source/data/region/sr_Latn_YU.txt +++ b/intl/icu/source/data/region/sr_Latn_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/region/sr_ME.txt b/intl/icu/source/data/region/sr_ME.txt index 32dc91046bc8..aa5162679c6b 100644 --- a/intl/icu/source/data/region/sr_ME.txt +++ b/intl/icu/source/data/region/sr_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_ME{ "%%ALIAS"{"sr_Latn_ME"} } diff --git a/intl/icu/source/data/region/sr_RS.txt b/intl/icu/source/data/region/sr_RS.txt index 674ff77554b8..84db46919eb6 100644 --- a/intl/icu/source/data/region/sr_RS.txt +++ b/intl/icu/source/data/region/sr_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_RS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/region/sr_XK.txt b/intl/icu/source/data/region/sr_XK.txt index 9628a2763e54..0d3aa53999a4 100644 --- a/intl/icu/source/data/region/sr_XK.txt +++ b/intl/icu/source/data/region/sr_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_XK{ "%%ALIAS"{"sr_Cyrl_XK"} } diff --git a/intl/icu/source/data/region/sr_YU.txt b/intl/icu/source/data/region/sr_YU.txt index 26563d041d43..2d67778ecbdc 100644 --- a/intl/icu/source/data/region/sr_YU.txt +++ b/intl/icu/source/data/region/sr_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_YU{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/region/su.txt b/intl/icu/source/data/region/su.txt index bc474a4a17ed..a45bfec21eda 100644 --- a/intl/icu/source/data/region/su.txt +++ b/intl/icu/source/data/region/su.txt @@ -1,18 +1,18 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su{ Countries{ BR{"Brasil"} CN{"Tiongkok"} DE{"Jérman"} FR{"Prancis"} - GB{"Inggris Raya"} + GB{"Britania Raya"} IN{"India"} IT{"Italia"} JP{"Jepang"} RU{"Rusia"} US{"Amérika Sarikat"} - ZZ{"Wilayah Teu Dipikaterang"} + ZZ{"Wilayah Teu Dikenal"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/su_ID.txt b/intl/icu/source/data/region/su_ID.txt index 67dde384e09b..8da0f567d041 100644 --- a/intl/icu/source/data/region/su_ID.txt +++ b/intl/icu/source/data/region/su_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_ID{ "%%ALIAS"{"su_Latn_ID"} } diff --git a/intl/icu/source/data/region/su_Latn.txt b/intl/icu/source/data/region/su_Latn.txt index 008b42355f21..87ca4fa76d0b 100644 --- a/intl/icu/source/data/region/su_Latn.txt +++ b/intl/icu/source/data/region/su_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/region/su_Latn_ID.txt b/intl/icu/source/data/region/su_Latn_ID.txt index 462983284c53..d6b42f358c4b 100644 --- a/intl/icu/source/data/region/su_Latn_ID.txt +++ b/intl/icu/source/data/region/su_Latn_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/sv.txt b/intl/icu/source/data/region/sv.txt index e9a1d9511480..24b3a1752d75 100644 --- a/intl/icu/source/data/region/sv.txt +++ b/intl/icu/source/data/region/sv.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv{ Countries{ 001{"världen"} @@ -14,7 +15,7 @@ sv{ 017{"Centralafrika"} 018{"södra Afrika"} 019{"Nord- och Sydamerika"} - 021{"norra Amerika"} + 021{"Norra Amerika"} 029{"Karibien"} 030{"Östasien"} 034{"Sydasien"} @@ -107,7 +108,7 @@ sv{ ES{"Spanien"} ET{"Etiopien"} EU{"Europeiska unionen"} - EZ{"eurozonen"} + EZ{"euroområdet"} FI{"Finland"} FJ{"Fiji"} FK{"Falklandsöarna"} @@ -133,7 +134,7 @@ sv{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong"} + HK{"Hongkong SAR"} HM{"Heardön och McDonaldöarna"} HN{"Honduras"} HR{"Kroatien"} @@ -187,7 +188,7 @@ sv{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongoliet"} - MO{"Macao"} + MO{"Macao SAR"} MP{"Nordmarianerna"} MQ{"Martinique"} MR{"Mauretanien"} @@ -261,7 +262,7 @@ sv{ TG{"Togo"} TH{"Thailand"} TJ{"Tadzjikistan"} - TK{"Tokelau"} + TK{"Tokelauöarna"} TL{"Östtimor"} TM{"Turkmenistan"} TN{"Tunisien"} @@ -298,6 +299,8 @@ sv{ ZZ{"okänd region"} } Countries%short{ + HK{"Hongkong"} + MO{"Macao"} PS{"Palestina"} UN{"FN"} } @@ -307,5 +310,4 @@ sv{ SZ{"Eswatini"} TL{"Timor-Leste"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sw.txt b/intl/icu/source/data/region/sw.txt index de7e7d5cc628..5c577edaeb69 100644 --- a/intl/icu/source/data/region/sw.txt +++ b/intl/icu/source/data/region/sw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw{ Countries{ 001{"Dunia"} @@ -31,7 +32,7 @@ sw{ 151{"Ulaya ya Mashariki"} 154{"Ulaya ya Kaskazini"} 155{"Ulaya ya Magharibi"} - 202{"Afrika Kusini mwa Jangwa la Sahara"} + 202{"Afrika ya Kusini mwa Jangwa la Sahara"} 419{"Amerika ya Kilatini"} AC{"Kisiwa cha Ascension"} AD{"Andorra"} @@ -85,16 +86,16 @@ sw{ CO{"Kolombia"} CP{"Kisiwa cha Clipperton"} CR{"Kostarika"} - CU{"Cuba"} + CU{"Kuba"} CV{"Cape Verde"} CW{"Curacao"} CX{"Kisiwa cha Krismasi"} - CY{"Cyprus"} + CY{"Saiprasi"} CZ{"Chechia"} DE{"Ujerumani"} DG{"Diego Garcia"} DJ{"Jibuti"} - DK{"Denmark"} + DK{"Denmaki"} DM{"Dominika"} DO{"Jamhuri ya Dominika"} DZ{"Aljeria"} @@ -111,7 +112,7 @@ sw{ FI{"Ufini"} FJ{"Fiji"} FK{"Visiwa vya Falkland"} - FM{"Micronesia"} + FM{"Mikronesia"} FO{"Visiwa vya Faroe"} FR{"Ufaransa"} GA{"Gabon"} @@ -194,7 +195,7 @@ sw{ MS{"Montserrat"} MT{"Malta"} MU{"Morisi"} - MV{"Maldives"} + MV{"Maldivi"} MW{"Malawi"} MX{"Meksiko"} MY{"Malesia"} @@ -249,11 +250,11 @@ sw{ SO{"Somalia"} SR{"Suriname"} SS{"Sudan Kusini"} - ST{"São Tomé na Príncipe"} + ST{"Sao Tome na Principe"} SV{"El Salvador"} SX{"Sint Maarten"} SY{"Syria"} - SZ{"Uswazi"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Visiwa vya Turks na Caicos"} TD{"Chad"} @@ -283,7 +284,7 @@ sw{ VE{"Venezuela"} VG{"Visiwa vya Virgin, Uingereza"} VI{"Visiwa vya Virgin, Marekani"} - VN{"Vietnam"} + VN{"Vietnamu"} VU{"Vanuatu"} WF{"Wallis na Futuna"} WS{"Samoa"} @@ -309,7 +310,7 @@ sw{ CI{"Ivory Coast"} CZ{"Jamhuri ya Cheki"} FK{"Visiwa vya Falkland (Islas Malvinas)"} + SZ{"Uswazi"} TL{"Timor ya Mashariki"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sw_CD.txt b/intl/icu/source/data/region/sw_CD.txt index 41308e5406d4..4ac82fd241f6 100644 --- a/intl/icu/source/data/region/sw_CD.txt +++ b/intl/icu/source/data/region/sw_CD.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_CD{ Countries{ 030{"Asia Mashariki"} @@ -8,8 +9,6 @@ sw_CD{ BJ{"Benini"} CI{"Kodivaa"} CX{"Kisiwa cha Christmas"} - CY{"Saiprasi"} - DK{"Denmaki"} HR{"Kroeshia"} JO{"Yordani"} LB{"Lebanoni"} @@ -18,7 +17,6 @@ sw_CD{ LV{"Lativia"} MA{"Moroko"} MM{"Myama"} - MV{"Maldivi"} NE{"Nijeri"} NG{"Nijeria"} NO{"Norwe"} @@ -30,7 +28,5 @@ sw_CD{ ST{"Sao Tome na Prinsipe"} TD{"Chadi"} TL{"Timori ya Mashariki"} - VN{"Vietnamu"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/sw_KE.txt b/intl/icu/source/data/region/sw_KE.txt index 6dc4648db9f7..1f32c32c5a15 100644 --- a/intl/icu/source/data/region/sw_KE.txt +++ b/intl/icu/source/data/region/sw_KE.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_KE{ Countries{ 202{"Kusini mwa Jangwa la Sahara"} @@ -12,13 +13,9 @@ sw_KE{ BY{"Belarusi"} CC{"Visiwa vya Kokos (Keeling)"} CD{"Kongo - Kinshasa"} - CI{"Ivorikosti"} CV{"Kepuvede"} - CY{"Saiprasi"} - DK{"Denmaki"} EA{"Keuta na Melilla"} EC{"Ekwado"} - FM{"Mikronesia"} GA{"Gaboni"} GL{"Grinilandi"} GP{"Gwadelupe"} @@ -40,7 +37,6 @@ sw_KE{ MM{"Myama (Burma)"} MQ{"Martiniki"} MS{"Montserati"} - MV{"Maldivi"} NC{"Nyukaledonia"} NE{"Nijeri"} NO{"Norwe"} @@ -66,10 +62,8 @@ sw_KE{ VA{"Mji wa Vatikani"} VG{"Visiwa vya Virgin vya Uingereza"} VI{"Visiwa vya Virgin vya Marekani"} - VN{"Vietnamu"} XA{"Kiinitoni cha kigeni"} XB{"Pseudo-Bidi"} YT{"Mayote"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ta.txt b/intl/icu/source/data/region/ta.txt index ff662471d9dc..0aa82a0af32f 100644 --- a/intl/icu/source/data/region/ta.txt +++ b/intl/icu/source/data/region/ta.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta{ Countries{ 001{"உலகம்"} @@ -313,5 +314,4 @@ ta{ FK{"ஃபாக்லாந்து தீவுகள் (இஸ்லாஸ் மால்வினஸ்)"} TL{"கிழக்கு தைமூர்"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/te.txt b/intl/icu/source/data/region/te.txt index b0e2e7abdbcc..e4483ba90b3c 100644 --- a/intl/icu/source/data/region/te.txt +++ b/intl/icu/source/data/region/te.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml te{ Countries{ 001{"ప్రపంచం"} @@ -314,5 +315,4 @@ te{ SZ{"స్వాజిల్యాండ్"} TL{"తూర్పు టిమోర్"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/teo.txt b/intl/icu/source/data/region/teo.txt index 1b1b18b0e524..a15f8a5de901 100644 --- a/intl/icu/source/data/region/teo.txt +++ b/intl/icu/source/data/region/teo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ teo{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/tg.txt b/intl/icu/source/data/region/tg.txt index b24929ee10d5..a45c97d6489e 100644 --- a/intl/icu/source/data/region/tg.txt +++ b/intl/icu/source/data/region/tg.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tg{ Countries{ AC{"Асунсон"} @@ -259,5 +260,4 @@ tg{ CD{"Конго (ҶДК)"} CG{"Конго"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/th.txt b/intl/icu/source/data/region/th.txt index cbb2d817395e..4c04123f91b9 100644 --- a/intl/icu/source/data/region/th.txt +++ b/intl/icu/source/data/region/th.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th{ Countries{ 001{"โลก"} @@ -185,7 +186,7 @@ th{ MH{"หมู่เกาะมาร์แชลล์"} MK{"มาซิโดเนียเหนือ"} ML{"มาลี"} - MM{"เมียนมาร์ (พม่า)"} + MM{"เมียนมา (พม่า)"} MN{"มองโกเลีย"} MO{"เขตปกครองพิเศษมาเก๊าแห่งสาธารณรัฐประชาชนจีน"} MP{"หมู่เกาะนอร์เทิร์นมาเรียนา"} @@ -312,5 +313,4 @@ th{ SZ{"สวาซิแลนด์"} TL{"ติมอร์ตะวันออก"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ti.txt b/intl/icu/source/data/region/ti.txt index 3b99ff5a151a..7d6585f29a9f 100644 --- a/intl/icu/source/data/region/ti.txt +++ b/intl/icu/source/data/region/ti.txt @@ -1,55 +1,79 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti{ Countries{ + 001{"ዓለም"} + 002{"አፍሪካ"} + 005{"ደቡባዊ አሜሪካ"} + 009{"ኦሽኒያ"} + 011{"ምዕራባዊ አፍሪካ"} + 014{"ምስራቃዊ አፍሪካ"} + 015{"ሰሜናዊ አፍሪካ"} + 017{"መካከለኛ አፍሪካ"} + 018{"ደቡባዊ አፍሪካ"} + 019{"አሜሪካዎች"} + 021{"ሰሜናዊ አሜሪካ"} + 029{"ካሪቢያን"} + 034{"ምሥራቃዊ እስያ"} + 039{"ደቡባዊ አውሮፓ"} + 053{"አውስትራሊያ እና ኒው ዚላንድ"} + 054{"ሜላኔሲያ"} + 061{"ፖሊኔዢያ"} + 142{"እስያ"} + 145{"ምዕራባዊ እስያ"} + 150{"አውሮፓ"} + 151{"ምስራቃዊ አውሮፓ"} + 154{"ሰሜናዊ አውሮፓ"} + 155{"ምዕራባዊ አውሮፓ"} AC{"አሴንሽን ደሴት"} - AD{"አንዶራ"} + AD{"ኣንዶራ"} AE{"ሕቡራት ኢማራት ዓረብ"} - AF{"አፍጋኒስታን"} - AG{"ኣንቲጓን ባሩዳን"} - AI{"አንጉኢላ"} - AL{"አልባኒያ"} - AM{"አርሜኒያ"} - AO{"አንጐላ"} - AQ{"አንታርክቲካ"} - AR{"አርጀንቲና"} - AS{"ናይ ኣሜሪካ ሳሞኣ"} + AF{"ኣፍጋኒስታን"} + AG{"ኣንቲጓን ባርቡዳን"} + AI{"ኣንጊላ"} + AL{"ኣልቤኒያ"} + AM{"ኣርሜኒያ"} + AO{"ኣንጎላ"} + AQ{"ኣንታርክቲካ"} + AR{"ኣርጀንቲና"} + AS{"ኣሜሪካ ሳሞኣ"} AT{"ኦስትሪያ"} - AU{"አውስትሬሊያ"} - AW{"አሩባ"} + AU{"ኣውስትራሊያ"} + AW{"ኣሩባ"} AX{"ደሴታት ኣላንድ"} - AZ{"አዘርባጃን"} + AZ{"ኣዘርበጃን"} BA{"ቦዝንያን ሄርዘጎቪናን"} - BB{"ባርቤዶስ"} + BB{"ባርባዶስ"} BD{"ባንግላዲሽ"} - BE{"ቤልጄም"} + BE{"ቤልጀም"} BF{"ቡርኪና ፋሶ"} - BG{"ቡልጌሪያ"} - BH{"ባህሬን"} - BI{"ብሩንዲ"} + BG{"ቡልጋሪያ"} + BH{"ባሕሬን"} + BI{"ቡሩንዲ"} BJ{"ቤኒን"} BL{"ቅዱስ ባርተለሚይ"} BM{"ቤርሙዳ"} - BN{"ብሩኒ"} + BN{"ብሩነይ"} BO{"ቦሊቪያ"} BQ{"ካሪቢያን ኔዘርላንድስ"} BR{"ብራዚል"} BS{"ባሃማስ"} - BT{"ቡህታን"} - BV{"ደሴታት ቦውቬት"} + BT{"ቡታን"} + BV{"ደሴት ቡቬት"} BW{"ቦትስዋና"} BY{"ቤላሩስ"} - BZ{"ቤሊዘ"} + BZ{"ቤሊዝ"} CA{"ካናዳ"} CC{"ኮኮስ ኬሊንግ ደሴቶች"} CD{"ኮንጎ"} - CF{"ማእከላይ ኣፍሪቃ ሪፓብሊክ"} + CF{"ማእከላዊ አፍሪቃ ሪፖብሊክ"} CG{"ኮንጎ ሪፓብሊክ"} CH{"ስዊዘርላንድ"} CI{"ኮት ዲቯር"} CK{"ደሴታት ኩክ"} CL{"ቺሊ"} - CM{"ካሜሩን"} + CM{"ካሜሮን"} CN{"ቻይና"} CO{"ኮሎምቢያ"} CP{"ክሊፐርቶን ደሴት"} @@ -57,7 +81,7 @@ ti{ CU{"ኩባ"} CV{"ኬፕ ቬርዴ"} CW{"ኩራካዎ"} - CX{"ደሴታት ክሪስትማስ"} + CX{"ደሴት ክሪስማስ"} CY{"ሳይፕረስ"} CZ{"ቼክ ሪፓብሊክ"} DE{"ጀርመን"} @@ -66,7 +90,7 @@ ti{ DK{"ዴንማርክ"} DM{"ዶሚኒካ"} DO{"ዶመኒካ ሪፓብሊክ"} - DZ{"አልጄሪያ"} + DZ{"ኣልጀሪያ"} EA{"ሲውታን ሜሊላን"} EC{"ኢኳዶር"} EE{"ኤስቶኒያ"} @@ -100,7 +124,7 @@ ti{ GU{"ጉዋም"} GW{"ቢሳዎ"} GY{"ጉያና"} - HK{"ሆንግ ኮንግ"} + HK{"ፍሉይ ምምሕዳር ዞባ ሆንግ ኮንግ"} HM{"ደሴታት ሀርድን ማክዶናልድን"} HN{"ሆንዱራስ"} HR{"ክሮኤሽያ"} @@ -112,10 +136,10 @@ ti{ IL{"እስራኤል"} IM{"አይል ኦፍ ማን"} IN{"ህንዲ"} - IO{"ናይ ብሪጣንያ ህንዳዊ ውቅያኖስ ግዝኣት"} + IO{"ናይ ብሪጣኒያ ህንዲ ውቅያኖስ ግዝኣት"} IQ{"ኢራቅ"} IR{"ኢራን"} - IS{"አይስላንድ"} + IS{"ኣየርላንድ"} IT{"ጣሊያን"} JE{"ጀርሲ"} JM{"ጃማይካ"} @@ -130,7 +154,7 @@ ti{ KP{"ሰሜን ኮሪያ"} KR{"ደቡብ ኮሪያ"} KW{"ክዌት"} - KY{"ካይማን ደሴቶች"} + KY{"ደሴታት ኬይማን"} KZ{"ካዛኪስታን"} LA{"ላኦስ"} LB{"ሊባኖስ"} @@ -154,7 +178,7 @@ ti{ ML{"ማሊ"} MM{"ማያንማር"} MN{"ሞንጎሊያ"} - MO{"ማካዎ"} + MO{"ፍሉይ ምምሕዳር ዞባ ማካዎ"} MP{"ደሴታት ሰሜናዊ ማሪያና"} MQ{"ማርቲኒክ"} MR{"ሞሪቴኒያ"} @@ -189,11 +213,12 @@ ti{ PM{"ቅዱስ ፒዬርን ሚኩኤሎን"} PN{"ፒትካኢርን"} PR{"ፖርታ ሪኮ"} - PS{"ምምሕዳር ፍልስጤም"} + PS{"የፍልስጤም ግዛት"} PT{"ፖርቱጋል"} PW{"ፓላው"} PY{"ፓራጓይ"} QA{"ቀጠር"} + QO{"ወጣ ያለ ኦሽኒያ"} RE{"ሪዩኒየን"} RO{"ሮሜኒያ"} RS{"ሰርቢያ"} @@ -207,7 +232,7 @@ ti{ SG{"ሲንጋፖር"} SH{"ሴንት ሄለና"} SI{"ስሎቬኒያ"} - SJ{"ስቫልባርድን ዣን ማየን ደሴታት"} + SJ{"ስቫልባርድን ጃን ማየንን"} SK{"ስሎቫኪያ"} SL{"ሴራሊዮን"} SM{"ሳን ማሪኖ"} @@ -219,7 +244,7 @@ ti{ SV{"ኤል ሳልቫዶር"} SX{"ሲንት ማርቲን"} SY{"ሲሪያ"} - SZ{"ሱዋዚላንድ"} + SZ{"ኢስዋቲኒ"} TA{"ትሪስን ዳ ኩንሃ"} TC{"ደሴታት ቱርክን ካይኮስን"} TD{"ጫድ"} @@ -246,7 +271,7 @@ ti{ VA{"ቫቲካን"} VC{"ቅዱስ ቪንሴንትን ግሬናዲንስን"} VE{"ቬንዙዌላ"} - VG{"ቨርጂን ደሴታት እንግሊዝ"} + VG{"ደሴታት ቨርጂን ብሪጣኒያ"} VI{"ቨርጂን ደሴታት ኣሜሪካ"} VN{"ቬትናም"} VU{"ቫኑአቱ"} @@ -261,12 +286,13 @@ ti{ } Countries%short{ GB{"ዩኬይ"} - MO{"ማካው"} + HK{"ሆንግ ኮንግ"} + MO{"ማካዎ"} PS{"ፍልስጤም"} US{"ዩኤስ"} } Countries%variant{ CI{"አይቮሪ ኮስት"} + SZ{"ስዋዚላንድ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/tk.txt b/intl/icu/source/data/region/tk.txt index 0edf123a604b..a6b8a45247ab 100644 --- a/intl/icu/source/data/region/tk.txt +++ b/intl/icu/source/data/region/tk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tk{ Countries{ 001{"Dünýä"} @@ -179,15 +180,15 @@ tk{ MA{"Marokko"} MC{"Monako"} MD{"Moldowa"} - ME{"Montenegro"} + ME{"Çernogoriýa"} MF{"Sen-Marten"} MG{"Madagaskar"} MH{"Marşall adalary"} MK{"Demirgazyk Makedoniýa"} ML{"Mali"} - MM{"Mýanma (Burma)"} + MM{"Mýanma (Birma)"} MN{"Mongoliýa"} - MO{"Makau AAS Hytaý"} + MO{"Makao AAS Hytaý"} MP{"Demirgazyk Mariana adalary"} MQ{"Martinika"} MR{"Mawritaniýa"} @@ -312,5 +313,4 @@ tk{ SZ{"Swazilend"} TL{"Gündogar Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/tl.txt b/intl/icu/source/data/region/tl.txt index 4e521f927601..8c39518018d6 100644 --- a/intl/icu/source/data/region/tl.txt +++ b/intl/icu/source/data/region/tl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl{ "%%ALIAS"{"fil"} } diff --git a/intl/icu/source/data/region/tl_PH.txt b/intl/icu/source/data/region/tl_PH.txt index 07c9f9047edf..59af39479e02 100644 --- a/intl/icu/source/data/region/tl_PH.txt +++ b/intl/icu/source/data/region/tl_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl_PH{ "%%ALIAS"{"fil_PH"} } diff --git a/intl/icu/source/data/region/to.txt b/intl/icu/source/data/region/to.txt index e75c7a75bcbd..b0fe62a2c4da 100644 --- a/intl/icu/source/data/region/to.txt +++ b/intl/icu/source/data/region/to.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml to{ Countries{ 001{"Māmani"} @@ -310,5 +311,4 @@ to{ FK{"ʻOtumotu Malivina"} SZ{"Suasilani"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/tr.txt b/intl/icu/source/data/region/tr.txt index 6a71539bf28f..a9671798b7f5 100644 --- a/intl/icu/source/data/region/tr.txt +++ b/intl/icu/source/data/region/tr.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr{ Countries{ 001{"Dünya"} @@ -314,5 +315,4 @@ tr{ SZ{"Svaziland"} TL{"Doğu Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/tt.txt b/intl/icu/source/data/region/tt.txt index f06d22f6d1ea..c26b684ca905 100644 --- a/intl/icu/source/data/region/tt.txt +++ b/intl/icu/source/data/region/tt.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tt{ Countries{ AD{"Андорра"} @@ -252,5 +253,4 @@ tt{ Countries%variant{ CD{"Конго (КДР)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/twq.txt b/intl/icu/source/data/region/twq.txt index 754f2e6f0f94..ddfd967977fa 100644 --- a/intl/icu/source/data/region/twq.txt +++ b/intl/icu/source/data/region/twq.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml twq{ Countries{ AD{"Andoora"} @@ -226,5 +227,4 @@ twq{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/tzm.txt b/intl/icu/source/data/region/tzm.txt index 081b0048952e..b850a19c512f 100644 --- a/intl/icu/source/data/region/tzm.txt +++ b/intl/icu/source/data/region/tzm.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tzm{ Countries{ AD{"Anḍurra"} @@ -226,5 +227,4 @@ tzm{ ZM{"Zambya"} ZW{"Zimbabwi"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ug.txt b/intl/icu/source/data/region/ug.txt index 68084712070a..7be4ff9ecb42 100644 --- a/intl/icu/source/data/region/ug.txt +++ b/intl/icu/source/data/region/ug.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ug{ Countries{ 001{"دۇنيا"} @@ -305,5 +306,4 @@ ug{ CI{"پىل چىشى قىرغىقى"} FK{"فالكلاند ئاراللىرى (ئىسلاس مالۋىناس)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/uk.txt b/intl/icu/source/data/region/uk.txt index 76787688783a..a933661a0f7f 100644 --- a/intl/icu/source/data/region/uk.txt +++ b/intl/icu/source/data/region/uk.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk{ Countries{ 001{"Світ"} @@ -13,7 +14,7 @@ uk{ 015{"Північна Африка"} 017{"Центральна Африка"} 018{"Південноафриканський регіон"} - 019{"Америка"} + 019{"Американський регіон"} 021{"Північноамериканський регіон"} 029{"Карибський басейн"} 030{"Східна Азія"} @@ -37,8 +38,8 @@ uk{ AD{"Андорра"} AE{"Обʼєднані Арабські Емірати"} AF{"Афганістан"} - AG{"Антиґуа і Барбуда"} - AI{"Анґілья"} + AG{"Антигуа і Барбуда"} + AI{"Ангілья"} AL{"Албанія"} AM{"Вірменія"} AO{"Ангола"} @@ -50,21 +51,21 @@ uk{ AW{"Аруба"} AX{"Аландські Острови"} AZ{"Азербайджан"} - BA{"Боснія і Герцеґовина"} + BA{"Боснія і Герцеговина"} BB{"Барбадос"} BD{"Бангладеш"} - BE{"Бельґія"} + BE{"Бельгія"} BF{"Буркіна-Фасо"} BG{"Болгарія"} BH{"Бахрейн"} BI{"Бурунді"} BJ{"Бенін"} - BL{"Сен-Бартельмі"} + BL{"Сен-Бартелемі"} BM{"Бермудські Острови"} BN{"Бруней"} BO{"Болівія"} - BQ{"Нідерландські Карибські острови"} - BR{"Бразілія"} + BQ{"Карибські Нідерланди"} + BR{"Бразилія"} BS{"Багамські Острови"} BT{"Бутан"} BV{"Острів Буве"} @@ -72,19 +73,19 @@ uk{ BY{"Білорусь"} BZ{"Беліз"} CA{"Канада"} - CC{"Кокосові (Кілінґ) Острови"} + CC{"Кокосові (Кілінг) Острови"} CD{"Конго – Кіншаса"} CF{"Центральноафриканська Республіка"} CG{"Конго – Браззавіль"} CH{"Швейцарія"} CI{"Кот-дʼІвуар"} CK{"Острови Кука"} - CL{"Чілі"} + CL{"Чилі"} CM{"Камерун"} CN{"Китай"} CO{"Колумбія"} CP{"Острів Кліппертон"} - CR{"Коста-Ріка"} + CR{"Коста-Рика"} CU{"Куба"} CV{"Кабо-Верде"} CW{"Кюрасао"} @@ -116,24 +117,24 @@ uk{ FR{"Франція"} GA{"Габон"} GB{"Велика Британія"} - GD{"Ґренада"} + GD{"Гренада"} GE{"Грузія"} - GF{"Французька Ґвіана"} - GG{"Ґернсі"} + GF{"Французька Гвіана"} + GG{"Гернсі"} GH{"Гана"} - GI{"Ґібралтар"} - GL{"Ґренландія"} + GI{"Гібралтар"} + GL{"Гренландія"} GM{"Гамбія"} GN{"Гвінея"} - GP{"Ґваделупа"} + GP{"Гваделупа"} GQ{"Екваторіальна Гвінея"} GR{"Греція"} GS{"Південна Джорджія та Південні Сандвічеві Острови"} - GT{"Ґватемала"} - GU{"Ґуам"} + GT{"Гватемала"} + GU{"Гуам"} GW{"Гвінея-Бісау"} - GY{"Ґайана"} - HK{"Гонконг, О.А.Р. Китаю"} + GY{"Гаяна"} + HK{"Гонконг, ОАР Китаю"} HM{"Острови Герд і Макдоналд"} HN{"Гондурас"} HR{"Хорватія"} @@ -157,7 +158,7 @@ uk{ KE{"Кенія"} KG{"Киргизстан"} KH{"Камбоджа"} - KI{"Кірібаті"} + KI{"Кірибаті"} KM{"Комори"} KN{"Сент-Кітс і Невіс"} KP{"Північна Корея"} @@ -173,7 +174,7 @@ uk{ LR{"Ліберія"} LS{"Лесото"} LT{"Литва"} - LU{"Люксембурґ"} + LU{"Люксембург"} LV{"Латвія"} LY{"Лівія"} MA{"Марокко"} @@ -187,13 +188,13 @@ uk{ ML{"Малі"} MM{"Мʼянма (Бірма)"} MN{"Монголія"} - MO{"Макао, О.А.Р Китаю"} + MO{"Макао, ОАР Китаю"} MP{"Північні Маріанські Острови"} - MQ{"Мартініка"} + MQ{"Мартиніка"} MR{"Мавританія"} MS{"Монтсеррат"} MT{"Мальта"} - MU{"Маврікій"} + MU{"Маврикій"} MV{"Мальдіви"} MW{"Малаві"} MX{"Мексика"} @@ -204,9 +205,9 @@ uk{ NE{"Нігер"} NF{"Острів Норфолк"} NG{"Нігерія"} - NI{"Нікараґуа"} + NI{"Нікарагуа"} NL{"Нідерланди"} - NO{"Норвеґія"} + NO{"Норвегія"} NP{"Непал"} NR{"Науру"} NU{"Ніуе"} @@ -215,17 +216,17 @@ uk{ PA{"Панама"} PE{"Перу"} PF{"Французька Полінезія"} - PG{"Папуа-Нова Ґвінея"} + PG{"Папуа-Нова Гвінея"} PH{"Філіппіни"} PK{"Пакистан"} PL{"Польща"} PM{"Сен-Пʼєр і Мікелон"} PN{"Острови Піткерн"} - PR{"Пуерто-Ріко"} + PR{"Пуерто-Рико"} PS{"Палестинські території"} - PT{"Портуґалія"} + PT{"Португалія"} PW{"Палау"} - PY{"Параґвай"} + PY{"Парагвай"} QA{"Катар"} QO{"Віддалена Океанія"} RE{"Реюньйон"} @@ -244,12 +245,12 @@ uk{ SJ{"Шпіцберген та Ян-Маєн"} SK{"Словаччина"} SL{"Сьєрра-Леоне"} - SM{"Сан-Маріно"} + SM{"Сан-Марино"} SN{"Сенегал"} SO{"Сомалі"} - SR{"Сурінам"} + SR{"Суринам"} SS{"Південний Судан"} - ST{"Сан-Томе і Прінсіпі"} + ST{"Сан-Томе і Принсіпі"} SV{"Сальвадор"} SX{"Сінт-Мартен"} SY{"Сирія"} @@ -265,9 +266,9 @@ uk{ TL{"Тімор-Лешті"} TM{"Туркменістан"} TN{"Туніс"} - TO{"Тонґа"} + TO{"Тонга"} TR{"Туреччина"} - TT{"Трінідад і Тобаґо"} + TT{"Тринідад і Тобаго"} TV{"Тувалу"} TW{"Тайвань"} TZ{"Танзанія"} @@ -276,13 +277,13 @@ uk{ UM{"Віддалені острови США"} UN{"Організація Об’єднаних Націй"} US{"Сполучені Штати"} - UY{"Уруґвай"} + UY{"Уругвай"} UZ{"Узбекистан"} VA{"Ватикан"} - VC{"Сент-Вінсент і Ґренадіни"} + VC{"Сент-Вінсент і Гренадіни"} VE{"Венесуела"} VG{"Британські Віргінські острови"} - VI{"Віргінські острови, США"} + VI{"Віргінські Острови (США)"} VN{"Вʼєтнам"} VU{"Вануату"} WF{"Уолліс і Футуна"} @@ -314,5 +315,4 @@ uk{ SZ{"Свазіленд"} TL{"Східний Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ur.txt b/intl/icu/source/data/region/ur.txt index 7c905dfc8af5..5a088e18c8c6 100644 --- a/intl/icu/source/data/region/ur.txt +++ b/intl/icu/source/data/region/ur.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur{ Countries{ 001{"دنیا"} @@ -12,7 +13,7 @@ ur{ 014{"مشرقی افریقہ"} 015{"شمالی افریقہ"} 017{"وسطی افریقہ"} - 018{"جنوبی افریقہ کے علاقہ"} + 018{"جنوبی افریقہ کا علاقہ"} 019{"امیریکاز"} 021{"شمالی امریکہ کا علاقہ"} 029{"کریبیائی"} @@ -288,7 +289,7 @@ ur{ WF{"ویلیز اور فیوٹیونا"} WS{"ساموآ"} XA{"بناوٹی لہجے"} - XB{"مصنوعی بیڑی"} + XB{"بناوٹی دو سمتی"} XK{"کوسووو"} YE{"یمن"} YT{"مایوٹ"} @@ -313,5 +314,4 @@ ur{ SZ{"سوازی لینڈ"} TL{"مشرقی تیمور"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/ur_IN.txt b/intl/icu/source/data/region/ur_IN.txt index d15132bf1a0b..8037c628c7c9 100644 --- a/intl/icu/source/data/region/ur_IN.txt +++ b/intl/icu/source/data/region/ur_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur_IN{ Countries{ AC{"جزیرہ اسینشن"} @@ -29,5 +30,4 @@ ur_IN{ Countries%variant{ FK{"جزائر فاکلینڈ (اسلاس مالویناس)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/uz.txt b/intl/icu/source/data/region/uz.txt index 14be96318d3c..887582c38761 100644 --- a/intl/icu/source/data/region/uz.txt +++ b/intl/icu/source/data/region/uz.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz{ Countries{ 001{"Dunyo"} @@ -313,5 +314,4 @@ uz{ FK{"Folklend (Malvin) orollari"} TL{"Sharqiy Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/uz_AF.txt b/intl/icu/source/data/region/uz_AF.txt index 24ca294580df..0e8d20c4cf48 100644 --- a/intl/icu/source/data/region/uz_AF.txt +++ b/intl/icu/source/data/region/uz_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_AF{ "%%ALIAS"{"uz_Arab_AF"} } diff --git a/intl/icu/source/data/region/uz_Arab.txt b/intl/icu/source/data/region/uz_Arab.txt index 3c1c9c531c56..4e5455297fac 100644 --- a/intl/icu/source/data/region/uz_Arab.txt +++ b/intl/icu/source/data/region/uz_Arab.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Arab{ %%Parent{"root"} Countries{ AF{"افغانستان"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/uz_Arab_AF.txt b/intl/icu/source/data/region/uz_Arab_AF.txt index e45d70894be0..e2978bbe125b 100644 --- a/intl/icu/source/data/region/uz_Arab_AF.txt +++ b/intl/icu/source/data/region/uz_Arab_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/uz_Cyrl.txt b/intl/icu/source/data/region/uz_Cyrl.txt index de87edf9fb8f..f2bc9cc40634 100644 --- a/intl/icu/source/data/region/uz_Cyrl.txt +++ b/intl/icu/source/data/region/uz_Cyrl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Cyrl{ %%Parent{"root"} Countries{ @@ -307,5 +308,4 @@ uz_Cyrl{ FK{"Фолкленд (Малвин) ороллари"} TL{"Шарқий Тимор"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/uz_Latn.txt b/intl/icu/source/data/region/uz_Latn.txt index f6035b73d6e3..1ae52daa8f8c 100644 --- a/intl/icu/source/data/region/uz_Latn.txt +++ b/intl/icu/source/data/region/uz_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/region/uz_Latn_UZ.txt b/intl/icu/source/data/region/uz_Latn_UZ.txt index 2d34effafec3..356e549792c6 100644 --- a/intl/icu/source/data/region/uz_Latn_UZ.txt +++ b/intl/icu/source/data/region/uz_Latn_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/uz_UZ.txt b/intl/icu/source/data/region/uz_UZ.txt index ffac5329b1b6..3a6a14d8072a 100644 --- a/intl/icu/source/data/region/uz_UZ.txt +++ b/intl/icu/source/data/region/uz_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_UZ{ "%%ALIAS"{"uz_Latn_UZ"} } diff --git a/intl/icu/source/data/region/vai.txt b/intl/icu/source/data/region/vai.txt index 6ca500596725..218ab23cfe0f 100644 --- a/intl/icu/source/data/region/vai.txt +++ b/intl/icu/source/data/region/vai.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai{ Countries{ AC{"ꗻꗡ ꕒꕡꕌ ꗏ ꔳꘋꗣ"} @@ -259,5 +260,4 @@ vai{ Countries%short{ MO{"ꕮꗛꖺ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/vai_LR.txt b/intl/icu/source/data/region/vai_LR.txt index 27d42387f34b..f682350b1193 100644 --- a/intl/icu/source/data/region/vai_LR.txt +++ b/intl/icu/source/data/region/vai_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_LR{ "%%ALIAS"{"vai_Vaii_LR"} } diff --git a/intl/icu/source/data/region/vai_Latn.txt b/intl/icu/source/data/region/vai_Latn.txt index a649e8e08d1a..6478de522b90 100644 --- a/intl/icu/source/data/region/vai_Latn.txt +++ b/intl/icu/source/data/region/vai_Latn.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Latn{ %%Parent{"root"} Countries{ @@ -226,5 +227,4 @@ vai_Latn{ ZM{"Zambiya"} ZW{"Zimbabhuwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/vai_Vaii.txt b/intl/icu/source/data/region/vai_Vaii.txt index cffa5917afbb..6dc5e995dac4 100644 --- a/intl/icu/source/data/region/vai_Vaii.txt +++ b/intl/icu/source/data/region/vai_Vaii.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Vaii{ - Version{"37"} } diff --git a/intl/icu/source/data/region/vai_Vaii_LR.txt b/intl/icu/source/data/region/vai_Vaii_LR.txt index a17bc11e00e8..d2845ca31a01 100644 --- a/intl/icu/source/data/region/vai_Vaii_LR.txt +++ b/intl/icu/source/data/region/vai_Vaii_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/vi.txt b/intl/icu/source/data/region/vi.txt index 5f8d76238607..39be8e982129 100644 --- a/intl/icu/source/data/region/vi.txt +++ b/intl/icu/source/data/region/vi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi{ Countries{ 001{"Thế giới"} @@ -133,7 +134,7 @@ vi{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hồng Kông, Trung Quốc"} + HK{"Đặc khu Hành chính Hồng Kông, Trung Quốc"} HM{"Quần đảo Heard và McDonald"} HN{"Honduras"} HR{"Croatia"} @@ -187,7 +188,7 @@ vi{ ML{"Mali"} MM{"Myanmar (Miến Điện)"} MN{"Mông Cổ"} - MO{"Macao, Trung Quốc"} + MO{"Đặc khu Hành chính Macao, Trung Quốc"} MP{"Quần đảo Bắc Mariana"} MQ{"Martinique"} MR{"Mauritania"} @@ -253,7 +254,7 @@ vi{ SV{"El Salvador"} SX{"Sint Maarten"} SY{"Syria"} - SZ{"Swaziland"} + SZ{"Eswatini"} TA{"Tristan da Cunha"} TC{"Quần đảo Turks và Caicos"} TD{"Chad"} @@ -282,7 +283,7 @@ vi{ VC{"St. Vincent và Grenadines"} VE{"Venezuela"} VG{"Quần đảo Virgin thuộc Anh"} - VI{"Quần đảo Virgin thuộc Mỹ"} + VI{"Quần đảo Virgin thuộc Hoa Kỳ"} VN{"Việt Nam"} VU{"Vanuatu"} WF{"Wallis và Futuna"} @@ -308,8 +309,7 @@ vi{ CI{"Bờ Biển Ngà"} CZ{"Cộng hòa Séc"} FK{"Quần đảo Falkland (Islas Malvinas)"} - SZ{"Eswatini"} + SZ{"Swaziland"} TL{"Đông Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/vun.txt b/intl/icu/source/data/region/vun.txt index 5a0a8e57c134..eef3c2f26d15 100644 --- a/intl/icu/source/data/region/vun.txt +++ b/intl/icu/source/data/region/vun.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vun{ Countries{ AD{"Andora"} @@ -226,5 +227,4 @@ vun{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/wae.txt b/intl/icu/source/data/region/wae.txt index e16062f2cff5..4e6a39ce8535 100644 --- a/intl/icu/source/data/region/wae.txt +++ b/intl/icu/source/data/region/wae.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wae{ Countries{ 001{"Wäld"} @@ -297,5 +298,4 @@ wae{ FK{"Falklandinslä (Malwine)"} TL{"Wešttimor"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/wo.txt b/intl/icu/source/data/region/wo.txt index 250870d2fd0d..978db57528e4 100644 --- a/intl/icu/source/data/region/wo.txt +++ b/intl/icu/source/data/region/wo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wo{ Countries{ AD{"Andoor"} @@ -254,5 +255,4 @@ wo{ CD{"Kongo (R K D)"} CG{"Réewum Kongo"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/xh.txt b/intl/icu/source/data/region/xh.txt index 08f6eafaae83..4fc3d4f68f3a 100644 --- a/intl/icu/source/data/region/xh.txt +++ b/intl/icu/source/data/region/xh.txt @@ -1,9 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xh{ Countries{ MK{"uMntla Macedonia"} ZA{"eMzantsi Afrika"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/xog.txt b/intl/icu/source/data/region/xog.txt index f3cf0b88bb20..e86da404bed8 100644 --- a/intl/icu/source/data/region/xog.txt +++ b/intl/icu/source/data/region/xog.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xog{ Countries{ AD{"Andora"} @@ -225,5 +226,4 @@ xog{ ZM{"Zambya"} ZW{"Zimbabwe"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yav.txt b/intl/icu/source/data/region/yav.txt index 7dd6daeba866..a46d3536ee1d 100644 --- a/intl/icu/source/data/region/yav.txt +++ b/intl/icu/source/data/region/yav.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yav{ Countries{ AD{"Aŋtúla"} @@ -225,5 +226,4 @@ yav{ ZM{"saambíi"} ZW{"simbapuwé"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yi.txt b/intl/icu/source/data/region/yi.txt index 7f7dbfa7af59..635ad3a01e40 100644 --- a/intl/icu/source/data/region/yi.txt +++ b/intl/icu/source/data/region/yi.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yi{ Countries{ 001{"וועלט"} @@ -230,5 +231,4 @@ yi{ Countries%variant{ TL{"מזרח טימאר"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yo.txt b/intl/icu/source/data/region/yo.txt index de3af655595e..f85b49c1bd5e 100644 --- a/intl/icu/source/data/region/yo.txt +++ b/intl/icu/source/data/region/yo.txt @@ -1,16 +1,17 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo{ Countries{ 001{"Agbáyé"} 002{"Áfíríkà"} 003{"Àríwá Amẹ́ríkà"} 005{"Gúúṣù Amẹ́ríkà"} - 009{"Oceania"} + 009{"Òsọ́ọ́níà"} 011{"Ìwọ̀ oorùn Afíríkà"} 013{"Ààrin Gbùgbùn Àmẹ́ríkà"} 014{"Ìlà Oorùn Áfíríkà"} - 015{"Northern Africa"} + 015{"Àríwá Afíríkà"} 017{"Ààrín gbùngbùn Afíríkà"} 018{"Apágúúsù Áfíríkà"} 019{"Amẹ́ríkà"} @@ -24,286 +25,288 @@ yo{ 054{"Mẹlanéṣíà"} 057{"Agbègbè Maikironéṣíà"} 061{"Polineṣíà"} - 142{"Asia"} + 142{"Áṣíà"} 143{"Ààrin Gbùngbùn Éṣíà"} 145{"Ìwọ̀ Òòrùn Eṣíà"} - 150{"Europe"} + 150{"Yúróòpù"} 151{"Ìlà Òrùn Yúrópù"} - 154{"Northern Europe"} + 154{"Àríwá Yúróòpù"} 155{"Ìwọ̀ Òòrùn Yúrópù"} - 202{"Sàhárà Áfíríkà"} + 202{"Apá Sàhárà Áfíríkà"} 419{"Látín Amẹ́ríkà"} AC{"Erékùsù Ascension"} - AD{"Orílẹ́ède Ààndórà"} - AE{"Orílẹ́ède Ẹmirate ti Awọn Arabu"} - AF{"Orílẹ́ède Àfùgànístánì"} - AG{"Orílẹ́ède Ààntígúà àti Báríbúdà"} - AI{"Orílẹ́ède Ààngúlílà"} - AL{"Orílẹ́ède Àlùbàníánì"} - AM{"Orílẹ́ède Améníà"} - AO{"Orílẹ́ède Ààngólà"} + AD{"Ààndórà"} + AE{"Ẹmirate ti Awọn Arabu"} + AF{"Àfùgànístánì"} + AG{"Ààntígúà àti Báríbúdà"} + AI{"Ààngúlílà"} + AL{"Àlùbàníánì"} + AM{"Améníà"} + AO{"Ààngólà"} AQ{"Antakítíkà"} - AR{"Orílẹ́ède Agentínà"} + AR{"Agentínà"} AS{"Sámóánì ti Orílẹ́ède Àméríkà"} - AT{"Orílẹ́ède Asítíríà"} - AU{"Orílẹ́ède Ástràlìá"} - AW{"Orílẹ́ède Árúbà"} + AT{"Asítíríà"} + AU{"Ástràlìá"} + AW{"Árúbà"} AX{"Àwọn Erékùsù ti Åland"} - AZ{"Orílẹ́ède Asẹ́bájánì"} - BA{"Orílẹ́ède Bọ̀síníà àti Ẹtisẹgófínà"} - BB{"Orílẹ́ède Bábádósì"} - BD{"Orílẹ́ède Bángáládésì"} - BE{"Orílẹ́ède Bégíọ́mù"} - BF{"Orílẹ́ède Bùùkíná Fasò"} - BG{"Orílẹ́ède Bùùgáríà"} - BH{"Orílẹ́ède Báránì"} - BI{"Orílẹ́ède Bùùrúndì"} - BJ{"Orílẹ́ède Bẹ̀nẹ̀"} + AZ{"Asẹ́bájánì"} + BA{"Bọ̀síníà àti Ẹtisẹgófínà"} + BB{"Bábádósì"} + BD{"Bángáládésì"} + BE{"Bégíọ́mù"} + BF{"Bùùkíná Fasò"} + BG{"Bùùgáríà"} + BH{"Báránì"} + BI{"Bùùrúndì"} + BJ{"Bẹ̀nẹ̀"} BL{"St. Barthélemy"} - BM{"Orílẹ́ède Bémúdà"} - BN{"Orílẹ́ède Búrúnẹ́lì"} - BO{"Orílẹ́ède Bọ̀lífíyà"} + BM{"Bémúdà"} + BN{"Búrúnẹ́lì"} + BO{"Bọ̀lífíyà"} BQ{"Caribbean Netherlands"} - BR{"Orilẹ̀-èdè Bàràsílì"} - BS{"Orílẹ́ède Bàhámásì"} - BT{"Orílẹ́ède Bútánì"} + BR{"Bàràsílì"} + BS{"Bàhámásì"} + BT{"Bútánì"} BV{"Erékùsù Bouvet"} - BW{"Orílẹ́ède Bọ̀tìsúwánà"} - BY{"Orílẹ́ède Bélárúsì"} - BZ{"Orílẹ́ède Bèlísẹ̀"} - CA{"Orílẹ́ède Kánádà"} + BW{"Bọ̀tìsúwánà"} + BY{"Bélárúsì"} + BZ{"Bèlísẹ̀"} + CA{"Kánádà"} CC{"Erékùsù Cocos (Keeling)"} - CD{"Orilẹ́ède Kóngò"} - CF{"Orílẹ́ède Àrin gùngun Áfíríkà"} - CG{"Orílẹ́ède Kóngò"} - CH{"Orílẹ́ède switiṣilandi"} - CI{"Orílẹ́ède Kóútè forà"} - CK{"Orílẹ́ède Etíokun Kùúkù"} - CL{"Orílẹ́ède ṣílè"} - CM{"Orílẹ́ède Kamerúúnì"} - CN{"Orilẹ̀-èdè Ṣáínà"} - CO{"Orílẹ́ède Kòlómíbìa"} + CD{"Kóńgò – Kinshasa"} + CF{"Àrin gùngun Áfíríkà"} + CG{"Kóńgò – Brazaville"} + CH{"switiṣilandi"} + CI{"Kóútè forà"} + CK{"Etíokun Kùúkù"} + CL{"Ṣílè"} + CM{"Kamerúúnì"} + CN{"Ṣáínà"} + CO{"Kòlómíbìa"} CP{"Erékùsù Clipperston"} - CR{"Orílẹ́ède Kuusita Ríkà"} - CU{"Orílẹ́ède Kúbà"} - CV{"Orílẹ́ède Etíokun Kápé féndè"} + CR{"Kuusita Ríkà"} + CU{"Kúbà"} + CV{"Etíokun Kápé féndè"} CW{"Curaçao"} CX{"Erékùsù Christmas"} - CY{"Orílẹ́ède Kúrúsì"} - CZ{"Orílẹ́ède ṣẹ́ẹ́kì"} - DE{"Orílẹèdè Jámánì"} + CY{"Kúrúsì"} + CZ{"Ṣẹ́ẹ́kì"} + DE{"Jámánì"} DG{"Diego Gaṣia"} - DJ{"Orílẹ́ède Díbọ́ótì"} - DK{"Orílẹ́ède Dẹ́mákì"} - DM{"Orílẹ́ède Dòmíníkà"} - DO{"Orilẹ́ède Dòmíníkánì"} - DZ{"Orílẹ́ède Àlùgèríánì"} + DJ{"Díbọ́ótì"} + DK{"Dẹ́mákì"} + DM{"Dòmíníkà"} + DO{"Dòmíníkánì"} + DZ{"Àlùgèríánì"} EA{"Seuta àti Melilla"} - EC{"Orílẹ́ède Ekuádò"} - EE{"Orílẹ́ède Esitonia"} - EG{"Orílẹ́ède Égípítì"} + EC{"Ekuádò"} + EE{"Esitonia"} + EG{"Égípítì"} EH{"Ìwọ̀òòrùn Sàhárà"} - ER{"Orílẹ́ède Eritira"} - ES{"Orílẹ́ède Sipani"} - ET{"Orílẹ́ède Etopia"} - EU{"Ìṣọ̀kan Yúròpù"} - EZ{"Agbègbè Euro"} - FI{"Orílẹ́ède Filandi"} - FJ{"Orílẹ́ède Fiji"} - FK{"Orílẹ́ède Etikun Fakalandi"} - FM{"Orílẹ́ède Makoronesia"} + ER{"Eritira"} + ES{"Sipani"} + ET{"Etopia"} + EU{"Àpapọ̀ Yúróòpù"} + EZ{"Agbègbè Yúrò"} + FI{"Filandi"} + FJ{"Fiji"} + FK{"Etikun Fakalandi"} + FM{"Makoronesia"} FO{"Àwọn Erékùsù ti Faroe"} - FR{"Orílẹ́ède Faranse"} - GA{"Orílẹ́ède Gabon"} - GB{"Orílẹ́èdè Gẹ̀ẹ́sì"} - GD{"Orílẹ́ède Genada"} - GE{"Orílẹ́ède Gọgia"} - GF{"Orílẹ́ède Firenṣi Guana"} + FR{"Faranse"} + GA{"Gabon"} + GB{"Gẹ̀ẹ́sì"} + GD{"Genada"} + GE{"Gọgia"} + GF{"Firenṣi Guana"} GG{"Guernsey"} - GH{"Orílẹ́ède Gana"} - GI{"Orílẹ́ède Gibaratara"} - GL{"Orílẹ́ède Gerelandi"} - GM{"Orílẹ́ède Gambia"} - GN{"Orílẹ́ède Gene"} - GP{"Orílẹ́ède Gadelope"} - GQ{"Orílẹ́ède Ekutoria Gini"} - GR{"Orílẹ́ède Geriisi"} + GH{"Gana"} + GI{"Gibaratara"} + GL{"Gerelandi"} + GM{"Gambia"} + GN{"Gene"} + GP{"Gadelope"} + GQ{"Ekutoria Gini"} + GR{"Geriisi"} GS{"Gúúsù Georgia àti Gúúsù Àwọn Erékùsù Sandwich"} - GT{"Orílẹ́ède Guatemala"} - GU{"Orílẹ́ède Guamu"} - GW{"Orílẹ́ède Gene-Busau"} - GY{"Orílẹ́ède Guyana"} - HK{"Hong Kong SAR ti Ṣáìnà"} + GT{"Guatemala"} + GU{"Guamu"} + GW{"Gene-Busau"} + GY{"Guyana"} + HK{"Agbègbè Ìṣàkóso Ìṣúná Hong Kong Tí Ṣánà Ń Darí"} HM{"Erékùsù Heard àti Erékùsù McDonald"} - HN{"Orílẹ́ède Hondurasi"} - HR{"Orílẹ́ède Kòróátíà"} - HT{"Orílẹ́ède Haati"} - HU{"Orílẹ́ède Hungari"} + HN{"Hondurasi"} + HR{"Kòróátíà"} + HT{"Haati"} + HU{"Hungari"} IC{"Ẹrékùsù Kánárì"} - ID{"Orílẹ́ède Indonesia"} - IE{"Orílẹ́ède Ailandi"} - IL{"Orílẹ́ède Iserẹli"} + ID{"Indonesia"} + IE{"Ailandi"} + IL{"Iserẹli"} IM{"Isle of Man"} - IN{"Orílẹ́ède India"} - IO{"Orílẹ́ède Etíkun Índíánì ti Ìlú Bírítísì"} - IQ{"Orílẹ́ède Iraki"} - IR{"Orílẹ́ède Irani"} - IS{"Orílẹ́ède Aṣilandi"} - IT{"Orílẹ́ède Itáli"} + IN{"India"} + IO{"Etíkun Índíánì ti Ìlú Bírítísì"} + IQ{"Iraki"} + IR{"Irani"} + IS{"Aṣilandi"} + IT{"Itáli"} JE{"Jersey"} - JM{"Orílẹ́ède Jamaika"} - JO{"Orílẹ́ède Jọdani"} - JP{"Orílẹ́ède Japani"} - KE{"Orílẹ́ède Kenya"} - KG{"Orílẹ́ède Kuriṣisitani"} - KH{"Orílẹ́ède Kàmùbódíà"} - KI{"Orílẹ́ède Kiribati"} - KM{"Orílẹ́ède Kòmòrósì"} - KN{"Orílẹ́ède Kiiti ati Neefi"} - KP{"Orílẹ́ède Guusu Kọria"} - KR{"Orílẹ́ède Ariwa Kọria"} - KW{"Orílẹ́ède Kuweti"} - KY{"Orílẹ́ède Etíokun Kámánì"} - KZ{"Orílẹ́ède Kaṣaṣatani"} - LA{"Orílẹ́ède Laosi"} - LB{"Orílẹ́ède Lebanoni"} - LC{"Orílẹ́ède Luṣia"} - LI{"Orílẹ́ède Lẹṣitẹnisiteni"} - LK{"Orílẹ́ède Siri Lanka"} - LR{"Orílẹ́ède Laberia"} - LS{"Orílẹ́ède Lesoto"} - LT{"Orílẹ́ède Lituania"} - LU{"Orílẹ́ède Lusemogi"} - LV{"Orílẹ́ède Latifia"} - LY{"Orílẹ́ède Libiya"} - MA{"Orílẹ́ède Moroko"} - MC{"Orílẹ́ède Monako"} - MD{"Orílẹ́ède Modofia"} + JM{"Jamaika"} + JO{"Jọdani"} + JP{"Japani"} + KE{"Kenya"} + KG{"Kuriṣisitani"} + KH{"Kàmùbódíà"} + KI{"Kiribati"} + KM{"Kòmòrósì"} + KN{"Kiiti ati Neefi"} + KP{"Guusu Kọria"} + KR{"Ariwa Kọria"} + KW{"Kuweti"} + KY{"Etíokun Kámánì"} + KZ{"Kaṣaṣatani"} + LA{"Laosi"} + LB{"Lebanoni"} + LC{"Luṣia"} + LI{"Lẹṣitẹnisiteni"} + LK{"Siri Lanka"} + LR{"Laberia"} + LS{"Lesoto"} + LT{"Lituania"} + LU{"Lusemogi"} + LV{"Latifia"} + LY{"Libiya"} + MA{"Moroko"} + MC{"Monako"} + MD{"Modofia"} ME{"Montenegro"} MF{"St. Martin"} - MG{"Orílẹ́ède Madasika"} - MH{"Orílẹ́ède Etikun Máṣali"} + MG{"Madasika"} + MH{"Etikun Máṣali"} MK{"Àríwá Macedonia"} - ML{"Orílẹ́ède Mali"} - MM{"Orílẹ́ède Manamari"} - MN{"Orílẹ́ède Mogolia"} - MO{"Macao SAR ti Ṣáìnà"} - MP{"Orílẹ́ède Etikun Guusu Mariana"} - MQ{"Orílẹ́ède Matinikuwi"} - MR{"Orílẹ́ède Maritania"} - MS{"Orílẹ́ède Motserati"} - MT{"Orílẹ́ède Malata"} - MU{"Orílẹ́ède Maritiusi"} - MV{"Orílẹ́ède Maladifi"} - MW{"Orílẹ́ède Malawi"} - MX{"Orílẹ́ède Mesiko"} - MY{"Orílẹ́ède Malasia"} - MZ{"Orílẹ́ède Moṣamibiku"} - NA{"Orílẹ́ède Namibia"} - NC{"Orílẹ́ède Kaledonia Titun"} - NE{"Orílẹ́ède Nàìjá"} - NF{"Orílẹ́ède Etikun Nọ́úfókì"} - NG{"Orilẹ̀-èdè Nàìjíríà"} - NI{"Orílẹ́ède NIkaragua"} - NL{"Orílẹ́ède Nedalandi"} - NO{"Orílẹ́ède Nọọwii"} - NP{"Orílẹ́ède Nepa"} - NR{"Orílẹ́ède Nauru"} - NU{"Orílẹ́ède Niue"} - NZ{"Orílẹ́ède ṣilandi Titun"} - OM{"Orílẹ́ède Ọọma"} - PA{"Orílẹ́ède Panama"} - PE{"Orílẹ́ède Peru"} - PF{"Orílẹ́ède Firenṣi Polinesia"} - PG{"Orílẹ́ède Paapu ti Giini"} - PH{"Orílẹ́ède filipini"} - PK{"Orílẹ́ède Pakisitan"} - PL{"Orílẹ́ède Polandi"} - PM{"Orílẹ́ède Pẹẹri ati mikuloni"} - PN{"Orílẹ́ède Pikarini"} - PR{"Orílẹ́ède Pọto Riko"} - PS{"Agbègbè Palẹsítíànù"} - PT{"Orílẹ́ède Pọ́túgà"} - PW{"Orílẹ́ède Paalu"} - PY{"Orílẹ́ède Paraguye"} - QA{"Orílẹ́ède Kota"} - QO{"Agbègbè Oceania"} - RE{"Orílẹ́ède Riuniyan"} - RO{"Orílẹ́ède Romaniya"} + ML{"Mali"} + MM{"Manamari"} + MN{"Mogolia"} + MO{"Agbègbè Ìṣàkóso Pàtàkì Macao"} + MP{"Etikun Guusu Mariana"} + MQ{"Matinikuwi"} + MR{"Maritania"} + MS{"Motserati"} + MT{"Malata"} + MU{"Maritiusi"} + MV{"Maladifi"} + MW{"Malawi"} + MX{"Mesiko"} + MY{"Malasia"} + MZ{"Moṣamibiku"} + NA{"Namibia"} + NC{"Kaledonia Titun"} + NE{"Nàìjá"} + NF{"Etikun Nọ́úfókì"} + NG{"Nàìjíríà"} + NI{"Nikaragua"} + NL{"Nedalandi"} + NO{"Nọọwii"} + NP{"Nepa"} + NR{"Nauru"} + NU{"Niue"} + NZ{"Ṣilandi Titun"} + OM{"Ọọma"} + PA{"Panama"} + PE{"Peru"} + PF{"Firenṣi Polinesia"} + PG{"Paapu ti Giini"} + PH{"Filipini"} + PK{"Pakisitan"} + PL{"Polandi"} + PM{"Pẹẹri ati mikuloni"} + PN{"Pikarini"} + PR{"Pọto Riko"} + PS{"Agbègbè ara Palẹsítínì"} + PT{"Pọ́túgà"} + PW{"Paalu"} + PY{"Paraguye"} + QA{"Kota"} + QO{"Agbègbè Òṣọ́ọ́níà"} + RE{"Riuniyan"} + RO{"Romaniya"} RS{"Serbia"} - RU{"Orílẹ́ède Rọṣia"} - RW{"Orílẹ́ède Ruwanda"} - SA{"Orílẹ́ède Saudi Arabia"} - SB{"Orílẹ́ède Etikun Solomoni"} - SC{"Orílẹ́ède seṣẹlẹsi"} - SD{"Orílẹ́ède Sudani"} - SE{"Orílẹ́ède Swidini"} - SG{"Orílẹ́ède Singapo"} - SH{"Orílẹ́ède Hẹlena"} - SI{"Orílẹ́ède Silofania"} + RU{"Rọṣia"} + RW{"Ruwanda"} + SA{"Saudi Arabia"} + SB{"Etikun Solomoni"} + SC{"Ṣeṣẹlẹsi"} + SD{"Sudani"} + SE{"Swidini"} + SG{"Singapo"} + SH{"Hẹlena"} + SI{"Silofania"} SJ{"Svalbard & Jan Mayen"} - SK{"Orílẹ́ède Silofakia"} - SL{"Orílẹ́ède Siria looni"} - SM{"Orílẹ́ède Sani Marino"} - SN{"Orílẹ́ède Sẹnẹga"} - SO{"Orílẹ́ède Somalia"} - SR{"Orílẹ́ède Surinami"} + SK{"Silofakia"} + SL{"Siria looni"} + SM{"Sani Marino"} + SN{"Sẹnẹga"} + SO{"Somalia"} + SR{"Surinami"} SS{"Gúúsù Sudan"} - ST{"Orílẹ́ède Sao tomi ati piriiṣipi"} - SV{"Orílẹ́ède Ẹẹsáfádò"} + ST{"Sao tomi ati piriiṣipi"} + SV{"Ẹẹsáfádò"} SX{"Sint Maarten"} - SY{"Orílẹ́ède Siria"} - SZ{"Orílẹ́ède Saṣiland"} + SY{"Siria"} + SZ{"Saṣiland"} TA{"Tristan da Kunha"} - TC{"Orílẹ́ède Tọọki ati Etikun Kakọsi"} - TD{"Orílẹ́ède ṣààdì"} + TC{"Tọọki ati Etikun Kakọsi"} + TD{"Ṣààdì"} TF{"Agbègbè Gúúsù Faranṣé"} - TG{"Orílẹ́ède Togo"} - TH{"Orílẹ́ède Tailandi"} - TJ{"Orílẹ́ède Takisitani"} - TK{"Orílẹ́ède Tokelau"} - TL{"Orílẹ́ède ÌlàOòrùn Tímọ̀"} - TM{"Orílẹ́ède Tọọkimenisita"} - TN{"Orílẹ́ède Tuniṣia"} - TO{"Orílẹ́ède Tonga"} - TR{"Orílẹ́ède Tọọki"} - TT{"Orílẹ́ède Tirinida ati Tobaga"} - TV{"Orílẹ́ède Tufalu"} - TW{"Orílẹ́ède Taiwani"} - TZ{"Orílẹ́ède Tàǹsáníà"} - UA{"Orílẹ́ède Ukarini"} - UG{"Orílẹ́ède Uganda"} + TG{"Togo"} + TH{"Tailandi"} + TJ{"Takisitani"} + TK{"Tokelau"} + TL{"ÌlàOòrùn Tímọ̀"} + TM{"Tọọkimenisita"} + TN{"Tuniṣia"} + TO{"Tonga"} + TR{"Tọọki"} + TT{"Tirinida ati Tobaga"} + TV{"Tufalu"} + TW{"Taiwani"} + TZ{"Tàǹsáníà"} + UA{"Ukarini"} + UG{"Uganda"} UM{"Àwọn Erékùsù Kékèké Agbègbè US"} UN{"Ìṣọ̀kan àgbáyé"} - US{"Orílẹ̀-èdè Amẹrikà"} - UY{"Orílẹ́ède Nruguayi"} - UZ{"Orílẹ́ède Nṣibẹkisitani"} + US{"Amẹrikà"} + UY{"Nruguayi"} + UZ{"Nṣibẹkisitani"} VA{"Ìlú Vatican"} - VC{"Orílẹ́ède Fisẹnnti ati Genadina"} - VE{"Orílẹ́ède Fẹnẹṣuẹla"} - VG{"Orílẹ́ède Etíkun Fágínì ti ìlú Bírítísì"} - VI{"Orílẹ́ède Etikun Fagini ti Amẹrika"} - VN{"Orílẹ́ède Fẹtinami"} - VU{"Orílẹ́ède Faniatu"} - WF{"Orílẹ́ède Wali ati futuna"} - WS{"Orílẹ́ède Samọ"} - XA{"Pseudo-Accents"} - XB{"Pseudo-Bidi"} + VC{"Fisẹnnti ati Genadina"} + VE{"Fẹnẹṣuẹla"} + VG{"Etíkun Fágínì ti ìlú Bírítísì"} + VI{"Etikun Fagini ti Amẹrika"} + VN{"Fẹtinami"} + VU{"Faniatu"} + WF{"Wali ati futuna"} + WS{"Samọ"} + XA{"ìsọ̀rọ̀sí irọ́"} + XB{"ibi irọ́"} XK{"Kòsófò"} - YE{"Orílẹ́ède yemeni"} - YT{"Orílẹ́ède Mayote"} + YE{"Yemeni"} + YT{"Mayote"} ZA{"Gúúṣù Áfíríkà"} - ZM{"Orílẹ́ède ṣamibia"} - ZW{"Orílẹ́ède ṣimibabe"} + ZM{"Ṣamibia"} + ZW{"Ṣimibabe"} ZZ{"Àgbègbè àìmọ̀"} } Countries%short{ + HK{"Hong Kong"} MO{"Màkáò"} - PS{"Palẹsitín"} + PS{"Palẹsítínì"} } Countries%variant{ + CD{"Kóńgò (Tiwantiwa)"} + CG{"Kóńgò (Olómìnira)"} SZ{"Síwásìlandì"} TL{"Ìlà Òòrùn Tímọ̀"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yo_BJ.txt b/intl/icu/source/data/region/yo_BJ.txt index 5bc1646134af..8f37be88e961 100644 --- a/intl/icu/source/data/region/yo_BJ.txt +++ b/intl/icu/source/data/region/yo_BJ.txt @@ -1,9 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo_BJ{ Countries{ 003{"Àríwá Amɛ́ríkà"} 005{"Gúúshù Amɛ́ríkà"} + 009{"Òsɔ́ɔ́níà"} 011{"Ìwɔ̀ oorùn Afíríkà"} 013{"Ààrin Gbùgbùn Àmɛ́ríkà"} 019{"Amɛ́ríkà"} @@ -16,251 +18,95 @@ yo_BJ{ 054{"Mɛlanéshíà"} 057{"Agbègbè Maikironéshíà"} 061{"Polineshíà"} + 142{"Áshíà"} 143{"Ààrin Gbùngbùn Éshíà"} 145{"Ìwɔ̀ Òòrùn Eshíà"} 155{"Ìwɔ̀ Òòrùn Yúrópù"} 419{"Látín Amɛ́ríkà"} - AD{"Orílɛ́ède Ààndórà"} - AE{"Orílɛ́ède Ɛmirate ti Awɔn Arabu"} - AF{"Orílɛ́ède Àfùgànístánì"} - AG{"Orílɛ́ède Ààntígúà àti Báríbúdà"} - AI{"Orílɛ́ède Ààngúlílà"} - AL{"Orílɛ́ède Àlùbàníánì"} - AM{"Orílɛ́ède Améníà"} - AO{"Orílɛ́ède Ààngólà"} - AR{"Orílɛ́ède Agentínà"} + AE{"Ɛmirate ti Awɔn Arabu"} AS{"Sámóánì ti Orílɛ́ède Àméríkà"} - AT{"Orílɛ́ède Asítíríà"} - AU{"Orílɛ́ède Ástràlìá"} - AW{"Orílɛ́ède Árúbà"} AX{"Àwɔn Erékùsù ti Åland"} - AZ{"Orílɛ́ède Asɛ́bájánì"} - BA{"Orílɛ́ède Bɔ̀síníà àti Ɛtisɛgófínà"} - BB{"Orílɛ́ède Bábádósì"} - BD{"Orílɛ́ède Bángáládésì"} - BE{"Orílɛ́ède Bégíɔ́mù"} - BF{"Orílɛ́ède Bùùkíná Fasò"} - BG{"Orílɛ́ède Bùùgáríà"} - BH{"Orílɛ́ède Báránì"} - BI{"Orílɛ́ède Bùùrúndì"} - BJ{"Orílɛ́ède Bɛ̀nɛ̀"} - BM{"Orílɛ́ède Bémúdà"} - BN{"Orílɛ́ède Búrúnɛ́lì"} - BO{"Orílɛ́ède Bɔ̀lífíyà"} - BR{"Orilɛ̀-èdè Bàràsílì"} - BS{"Orílɛ́ède Bàhámásì"} - BT{"Orílɛ́ède Bútánì"} - BW{"Orílɛ́ède Bɔ̀tìsúwánà"} - BY{"Orílɛ́ède Bélárúsì"} - BZ{"Orílɛ́ède Bèlísɛ̀"} - CA{"Orílɛ́ède Kánádà"} - CD{"Orilɛ́ède Kóngò"} - CF{"Orílɛ́ède Àrin gùngun Áfíríkà"} - CG{"Orílɛ́ède Kóngò"} - CH{"Orílɛ́ède switishilandi"} - CI{"Orílɛ́ède Kóútè forà"} - CK{"Orílɛ́ède Etíokun Kùúkù"} - CL{"Orílɛ́ède shílè"} - CM{"Orílɛ́ède Kamerúúnì"} - CN{"Orilɛ̀-èdè Sháínà"} - CO{"Orílɛ́ède Kòlómíbìa"} - CR{"Orílɛ́ède Kuusita Ríkà"} - CU{"Orílɛ́ède Kúbà"} - CV{"Orílɛ́ède Etíokun Kápé féndè"} - CY{"Orílɛ́ède Kúrúsì"} - CZ{"Orílɛ́ède shɛ́ɛ́kì"} - DE{"Orílɛèdè Jámánì"} + AZ{"Asɛ́bájánì"} + BA{"Bɔ̀síníà àti Ɛtisɛgófínà"} + BE{"Bégíɔ́mù"} + BJ{"Bɛ̀nɛ̀"} + BN{"Búrúnɛ́lì"} + BO{"Bɔ̀lífíyà"} + BW{"Bɔ̀tìsúwánà"} + BZ{"Bèlísɛ̀"} + CH{"switishilandi"} + CL{"Shílè"} + CN{"Sháínà"} + CZ{"Shɛ́ɛ́kì"} DG{"Diego Gashia"} - DJ{"Orílɛ́ède Díbɔ́ótì"} - DK{"Orílɛ́ède Dɛ́mákì"} - DM{"Orílɛ́ède Dòmíníkà"} - DO{"Orilɛ́ède Dòmíníkánì"} - DZ{"Orílɛ́ède Àlùgèríánì"} - EC{"Orílɛ́ède Ekuádò"} - EE{"Orílɛ́ède Esitonia"} - EG{"Orílɛ́ède Égípítì"} + DJ{"Díbɔ́ótì"} + DK{"Dɛ́mákì"} EH{"Ìwɔ̀òòrùn Sàhárà"} - ER{"Orílɛ́ède Eritira"} - ES{"Orílɛ́ède Sipani"} - ET{"Orílɛ́ède Etopia"} - EU{"Ìshɔ̀kan Yúròpù"} - FI{"Orílɛ́ède Filandi"} - FJ{"Orílɛ́ède Fiji"} - FK{"Orílɛ́ède Etikun Fakalandi"} - FM{"Orílɛ́ède Makoronesia"} + EU{"Àpapɔ̀ Yúróòpù"} FO{"Àwɔn Erékùsù ti Faroe"} - FR{"Orílɛ́ède Faranse"} - GA{"Orílɛ́ède Gabon"} - GB{"Orílɛ́èdè Gɛ̀ɛ́sì"} - GD{"Orílɛ́ède Genada"} - GE{"Orílɛ́ède Gɔgia"} - GF{"Orílɛ́ède Firenshi Guana"} - GH{"Orílɛ́ède Gana"} - GI{"Orílɛ́ède Gibaratara"} - GL{"Orílɛ́ède Gerelandi"} - GM{"Orílɛ́ède Gambia"} - GN{"Orílɛ́ède Gene"} - GP{"Orílɛ́ède Gadelope"} - GQ{"Orílɛ́ède Ekutoria Gini"} - GR{"Orílɛ́ède Geriisi"} + GB{"Gɛ̀ɛ́sì"} + GE{"Gɔgia"} + GF{"Firenshi Guana"} GS{"Gúúsù Georgia àti Gúúsù Àwɔn Erékùsù Sandwich"} - GT{"Orílɛ́ède Guatemala"} - GU{"Orílɛ́ède Guamu"} - GW{"Orílɛ́ède Gene-Busau"} - GY{"Orílɛ́ède Guyana"} - HK{"Hong Kong SAR ti Sháìnà"} - HN{"Orílɛ́ède Hondurasi"} - HR{"Orílɛ́ède Kòróátíà"} - HT{"Orílɛ́ède Haati"} - HU{"Orílɛ́ède Hungari"} + HK{"Agbègbè Ìshàkóso Ìshúná Hong Kong Tí Shánà Ń Darí"} IC{"Ɛrékùsù Kánárì"} - ID{"Orílɛ́ède Indonesia"} - IE{"Orílɛ́ède Ailandi"} - IL{"Orílɛ́ède Iserɛli"} - IN{"Orílɛ́ède India"} - IO{"Orílɛ́ède Etíkun Índíánì ti Ìlú Bírítísì"} - IQ{"Orílɛ́ède Iraki"} - IR{"Orílɛ́ède Irani"} - IS{"Orílɛ́ède Ashilandi"} - IT{"Orílɛ́ède Itáli"} - JM{"Orílɛ́ède Jamaika"} - JO{"Orílɛ́ède Jɔdani"} - JP{"Orílɛ́ède Japani"} - KE{"Orílɛ́ède Kenya"} - KG{"Orílɛ́ède Kurishisitani"} - KH{"Orílɛ́ède Kàmùbódíà"} - KI{"Orílɛ́ède Kiribati"} - KM{"Orílɛ́ède Kòmòrósì"} - KN{"Orílɛ́ède Kiiti ati Neefi"} - KP{"Orílɛ́ède Guusu Kɔria"} - KR{"Orílɛ́ède Ariwa Kɔria"} - KW{"Orílɛ́ède Kuweti"} - KY{"Orílɛ́ède Etíokun Kámánì"} - KZ{"Orílɛ́ède Kashashatani"} - LA{"Orílɛ́ède Laosi"} - LB{"Orílɛ́ède Lebanoni"} - LC{"Orílɛ́ède Lushia"} - LI{"Orílɛ́ède Lɛshitɛnisiteni"} - LK{"Orílɛ́ède Siri Lanka"} - LR{"Orílɛ́ède Laberia"} - LS{"Orílɛ́ède Lesoto"} - LT{"Orílɛ́ède Lituania"} - LU{"Orílɛ́ède Lusemogi"} - LV{"Orílɛ́ède Latifia"} - LY{"Orílɛ́ède Libiya"} - MA{"Orílɛ́ède Moroko"} - MC{"Orílɛ́ède Monako"} - MD{"Orílɛ́ède Modofia"} - MG{"Orílɛ́ède Madasika"} - MH{"Orílɛ́ède Etikun Máshali"} - ML{"Orílɛ́ède Mali"} - MM{"Orílɛ́ède Manamari"} - MN{"Orílɛ́ède Mogolia"} - MO{"Macao SAR ti Sháìnà"} - MP{"Orílɛ́ède Etikun Guusu Mariana"} - MQ{"Orílɛ́ède Matinikuwi"} - MR{"Orílɛ́ède Maritania"} - MS{"Orílɛ́ède Motserati"} - MT{"Orílɛ́ède Malata"} - MU{"Orílɛ́ède Maritiusi"} - MV{"Orílɛ́ède Maladifi"} - MW{"Orílɛ́ède Malawi"} - MX{"Orílɛ́ède Mesiko"} - MY{"Orílɛ́ède Malasia"} - MZ{"Orílɛ́ède Moshamibiku"} - NA{"Orílɛ́ède Namibia"} - NC{"Orílɛ́ède Kaledonia Titun"} - NE{"Orílɛ́ède Nàìjá"} - NF{"Orílɛ́ède Etikun Nɔ́úfókì"} - NG{"Orilɛ̀-èdè Nàìjíríà"} - NI{"Orílɛ́ède NIkaragua"} - NL{"Orílɛ́ède Nedalandi"} - NO{"Orílɛ́ède Nɔɔwii"} - NP{"Orílɛ́ède Nepa"} - NR{"Orílɛ́ède Nauru"} - NU{"Orílɛ́ède Niue"} - NZ{"Orílɛ́ède shilandi Titun"} - OM{"Orílɛ́ède Ɔɔma"} - PA{"Orílɛ́ède Panama"} - PE{"Orílɛ́ède Peru"} - PF{"Orílɛ́ède Firenshi Polinesia"} - PG{"Orílɛ́ède Paapu ti Giini"} - PH{"Orílɛ́ède filipini"} - PK{"Orílɛ́ède Pakisitan"} - PL{"Orílɛ́ède Polandi"} - PM{"Orílɛ́ède Pɛɛri ati mikuloni"} - PN{"Orílɛ́ède Pikarini"} - PR{"Orílɛ́ède Pɔto Riko"} - PS{"Agbègbè Palɛsítíànù"} - PT{"Orílɛ́ède Pɔ́túgà"} - PW{"Orílɛ́ède Paalu"} - PY{"Orílɛ́ède Paraguye"} - QA{"Orílɛ́ède Kota"} - RE{"Orílɛ́ède Riuniyan"} - RO{"Orílɛ́ède Romaniya"} - RU{"Orílɛ́ède Rɔshia"} - RW{"Orílɛ́ède Ruwanda"} - SA{"Orílɛ́ède Saudi Arabia"} - SB{"Orílɛ́ède Etikun Solomoni"} - SC{"Orílɛ́ède seshɛlɛsi"} - SD{"Orílɛ́ède Sudani"} - SE{"Orílɛ́ède Swidini"} - SG{"Orílɛ́ède Singapo"} - SH{"Orílɛ́ède Hɛlena"} - SI{"Orílɛ́ède Silofania"} - SK{"Orílɛ́ède Silofakia"} - SL{"Orílɛ́ède Siria looni"} - SM{"Orílɛ́ède Sani Marino"} - SN{"Orílɛ́ède Sɛnɛga"} - SO{"Orílɛ́ède Somalia"} - SR{"Orílɛ́ède Surinami"} - ST{"Orílɛ́ède Sao tomi ati piriishipi"} - SV{"Orílɛ́ède Ɛɛsáfádò"} - SY{"Orílɛ́ède Siria"} - SZ{"Orílɛ́ède Sashiland"} - TC{"Orílɛ́ède Tɔɔki ati Etikun Kakɔsi"} - TD{"Orílɛ́ède shààdì"} + IL{"Iserɛli"} + IS{"Ashilandi"} + JO{"Jɔdani"} + KG{"Kurishisitani"} + KP{"Guusu Kɔria"} + KR{"Ariwa Kɔria"} + KZ{"Kashashatani"} + LC{"Lushia"} + LI{"Lɛshitɛnisiteni"} + MH{"Etikun Máshali"} + MO{"Agbègbè Ìshàkóso Pàtàkì Macao"} + MZ{"Moshamibiku"} + NF{"Etikun Nɔ́úfókì"} + NO{"Nɔɔwii"} + NZ{"Shilandi Titun"} + OM{"Ɔɔma"} + PF{"Firenshi Polinesia"} + PM{"Pɛɛri ati mikuloni"} + PR{"Pɔto Riko"} + PS{"Agbègbè ara Palɛsítínì"} + PT{"Pɔ́túgà"} + QO{"Agbègbè Òshɔ́ɔ́níà"} + RU{"Rɔshia"} + SC{"Sheshɛlɛsi"} + SH{"Hɛlena"} + SN{"Sɛnɛga"} + ST{"Sao tomi ati piriishipi"} + SV{"Ɛɛsáfádò"} + SZ{"Sashiland"} + TC{"Tɔɔki ati Etikun Kakɔsi"} + TD{"Shààdì"} TF{"Agbègbè Gúúsù Faranshé"} - TG{"Orílɛ́ède Togo"} - TH{"Orílɛ́ède Tailandi"} - TJ{"Orílɛ́ède Takisitani"} - TK{"Orílɛ́ède Tokelau"} - TL{"Orílɛ́ède ÌlàOòrùn Tímɔ̀"} - TM{"Orílɛ́ède Tɔɔkimenisita"} - TN{"Orílɛ́ède Tunishia"} - TO{"Orílɛ́ède Tonga"} - TR{"Orílɛ́ède Tɔɔki"} - TT{"Orílɛ́ède Tirinida ati Tobaga"} - TV{"Orílɛ́ède Tufalu"} - TW{"Orílɛ́ède Taiwani"} - TZ{"Orílɛ́ède Tàǹsáníà"} - UA{"Orílɛ́ède Ukarini"} - UG{"Orílɛ́ède Uganda"} + TL{"ÌlàOòrùn Tímɔ̀"} + TM{"Tɔɔkimenisita"} + TN{"Tunishia"} + TR{"Tɔɔki"} UM{"Àwɔn Erékùsù Kékèké Agbègbè US"} UN{"Ìshɔ̀kan àgbáyé"} - US{"Orílɛ̀-èdè Amɛrikà"} - UY{"Orílɛ́ède Nruguayi"} - UZ{"Orílɛ́ède Nshibɛkisitani"} - VC{"Orílɛ́ède Fisɛnnti ati Genadina"} - VE{"Orílɛ́ède Fɛnɛshuɛla"} - VG{"Orílɛ́ède Etíkun Fágínì ti ìlú Bírítísì"} - VI{"Orílɛ́ède Etikun Fagini ti Amɛrika"} - VN{"Orílɛ́ède Fɛtinami"} - VU{"Orílɛ́ède Faniatu"} - WF{"Orílɛ́ède Wali ati futuna"} - WS{"Orílɛ́ède Samɔ"} - YE{"Orílɛ́ède yemeni"} - YT{"Orílɛ́ède Mayote"} + US{"Amɛrikà"} + UZ{"Nshibɛkisitani"} + VC{"Fisɛnnti ati Genadina"} + VE{"Fɛnɛshuɛla"} + VI{"Etikun Fagini ti Amɛrika"} + VN{"Fɛtinami"} + WS{"Samɔ"} + XA{"ìsɔ̀rɔ̀sí irɔ́"} + XB{"ibi irɔ́"} ZA{"Gúúshù Áfíríkà"} - ZM{"Orílɛ́ède shamibia"} - ZW{"Orílɛ́ède shimibabe"} + ZM{"Shamibia"} + ZW{"Shimibabe"} ZZ{"Àgbègbè àìmɔ̀"} } Countries%short{ - PS{"Palɛsitín"} + PS{"Palɛsítínì"} } Countries%variant{ + CZ{"Shɛ́ɛ́kì"} TL{"Ìlà Òòrùn Tímɔ̀"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yue.txt b/intl/icu/source/data/region/yue.txt index a8569ff5c7ca..47d27481638f 100644 --- a/intl/icu/source/data/region/yue.txt +++ b/intl/icu/source/data/region/yue.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue{ Countries{ 001{"世界"} @@ -309,5 +310,4 @@ yue{ FK{"福克蘭群島 (馬爾維納斯群島)"} SZ{"斯威士蘭"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yue_CN.txt b/intl/icu/source/data/region/yue_CN.txt index 26d4356a9eeb..2a3cc8af71ba 100644 --- a/intl/icu/source/data/region/yue_CN.txt +++ b/intl/icu/source/data/region/yue_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_CN{ "%%ALIAS"{"yue_Hans_CN"} } diff --git a/intl/icu/source/data/region/yue_HK.txt b/intl/icu/source/data/region/yue_HK.txt index 29a7459ef3d9..7bce3c57365e 100644 --- a/intl/icu/source/data/region/yue_HK.txt +++ b/intl/icu/source/data/region/yue_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_HK{ "%%ALIAS"{"yue_Hant_HK"} } diff --git a/intl/icu/source/data/region/yue_Hans.txt b/intl/icu/source/data/region/yue_Hans.txt index 81f2dcb68de3..326051c933c6 100644 --- a/intl/icu/source/data/region/yue_Hans.txt +++ b/intl/icu/source/data/region/yue_Hans.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans{ %%Parent{"root"} Countries{ @@ -310,5 +311,4 @@ yue_Hans{ FK{"福克兰群岛 (马尔维纳斯群岛)"} SZ{"斯威士兰"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/yue_Hans_CN.txt b/intl/icu/source/data/region/yue_Hans_CN.txt index 479d1253cc95..07edcb8320b7 100644 --- a/intl/icu/source/data/region/yue_Hans_CN.txt +++ b/intl/icu/source/data/region/yue_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/yue_Hant.txt b/intl/icu/source/data/region/yue_Hant.txt index 8f398126c061..f1fb01c3f546 100644 --- a/intl/icu/source/data/region/yue_Hant.txt +++ b/intl/icu/source/data/region/yue_Hant.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hant{ - Version{"37"} } diff --git a/intl/icu/source/data/region/yue_Hant_HK.txt b/intl/icu/source/data/region/yue_Hant_HK.txt index 9adeba7275b4..e2bb01d90d09 100644 --- a/intl/icu/source/data/region/yue_Hant_HK.txt +++ b/intl/icu/source/data/region/yue_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/zgh.txt b/intl/icu/source/data/region/zgh.txt index 4034e7829940..9fc14a7dcd07 100644 --- a/intl/icu/source/data/region/zgh.txt +++ b/intl/icu/source/data/region/zgh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zgh{ Countries{ AD{"ⴰⵏⴷⵓⵔⴰ"} @@ -229,5 +230,4 @@ zgh{ ZM{"ⵣⴰⵎⴱⵢⴰ"} ZW{"ⵣⵉⵎⴱⴰⴱⵡⵉ"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/zh.txt b/intl/icu/source/data/region/zh.txt index 5bac1f5658d8..95b30960d1bb 100644 --- a/intl/icu/source/data/region/zh.txt +++ b/intl/icu/source/data/region/zh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ Countries{ 001{"世界"} @@ -309,5 +310,4 @@ zh{ CZ{"捷克共和国"} FK{"福克兰群岛(马尔维纳斯群岛)"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/zh_CN.txt b/intl/icu/source/data/region/zh_CN.txt index c9151613a23b..0136d26fa140 100644 --- a/intl/icu/source/data/region/zh_CN.txt +++ b/intl/icu/source/data/region/zh_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_CN{ "%%ALIAS"{"zh_Hans_CN"} } diff --git a/intl/icu/source/data/region/zh_HK.txt b/intl/icu/source/data/region/zh_HK.txt index fe72a0ea43cd..c34c98fdd21b 100644 --- a/intl/icu/source/data/region/zh_HK.txt +++ b/intl/icu/source/data/region/zh_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_HK{ "%%ALIAS"{"zh_Hant_HK"} } diff --git a/intl/icu/source/data/region/zh_Hans.txt b/intl/icu/source/data/region/zh_Hans.txt index 72c418ec6990..58a5386534ef 100644 --- a/intl/icu/source/data/region/zh_Hans.txt +++ b/intl/icu/source/data/region/zh_Hans.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans{ - Version{"37"} } diff --git a/intl/icu/source/data/region/zh_Hans_CN.txt b/intl/icu/source/data/region/zh_Hans_CN.txt index 70a6a77b3aa7..333ba54a7fec 100644 --- a/intl/icu/source/data/region/zh_Hans_CN.txt +++ b/intl/icu/source/data/region/zh_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/zh_Hans_SG.txt b/intl/icu/source/data/region/zh_Hans_SG.txt index 498813bb8d04..5e0fabf0bf96 100644 --- a/intl/icu/source/data/region/zh_Hans_SG.txt +++ b/intl/icu/source/data/region/zh_Hans_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/zh_Hant.txt b/intl/icu/source/data/region/zh_Hant.txt index bbe5e2f20248..7f7cbf8b0837 100644 --- a/intl/icu/source/data/region/zh_Hant.txt +++ b/intl/icu/source/data/region/zh_Hant.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ %%Parent{"root"} Countries{ @@ -310,5 +311,4 @@ zh_Hant{ FK{"福克蘭群島(馬爾維納斯群島)"} SZ{"史瓦濟蘭"} } - Version{"37"} } diff --git a/intl/icu/source/data/region/zh_Hant_HK.txt b/intl/icu/source/data/region/zh_Hant_HK.txt index d63ee72c4700..c6bd211a7909 100644 --- a/intl/icu/source/data/region/zh_Hant_HK.txt +++ b/intl/icu/source/data/region/zh_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_HK{ Countries{ 013{"中美洲"} @@ -50,6 +51,7 @@ zh_Hant_HK{ LC{"聖盧西亞"} LI{"列支敦士登"} LR{"利比里亞"} + LS{"萊索托"} ME{"黑山"} ML{"馬里"} MR{"毛里塔尼亞"} @@ -81,7 +83,6 @@ zh_Hant_HK{ TC{"特克斯和凱科斯群島"} TD{"乍得"} TF{"法屬南部領地"} - TG{"多哥共和國"} TO{"湯加"} TT{"千里達和多巴哥"} TV{"圖瓦盧"} @@ -95,5 +96,8 @@ zh_Hant_HK{ ZM{"贊比亞"} ZW{"津巴布韋"} } - Version{"37"} + Countries%short{ + HK{"中國香港"} + MO{"中國澳門"} + } } diff --git a/intl/icu/source/data/region/zh_Hant_MO.txt b/intl/icu/source/data/region/zh_Hant_MO.txt index 670cffc3f25d..1f5fac879191 100644 --- a/intl/icu/source/data/region/zh_Hant_MO.txt +++ b/intl/icu/source/data/region/zh_Hant_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_MO{ %%Parent{"zh_Hant_HK"} - Version{"37"} } diff --git a/intl/icu/source/data/region/zh_Hant_TW.txt b/intl/icu/source/data/region/zh_Hant_TW.txt index b62ad6927771..b079f20e1385 100644 --- a/intl/icu/source/data/region/zh_Hant_TW.txt +++ b/intl/icu/source/data/region/zh_Hant_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/region/zh_MO.txt b/intl/icu/source/data/region/zh_MO.txt index 6565bf7c3fc3..c6b2148478d5 100644 --- a/intl/icu/source/data/region/zh_MO.txt +++ b/intl/icu/source/data/region/zh_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_MO{ "%%ALIAS"{"zh_Hant_MO"} } diff --git a/intl/icu/source/data/region/zh_SG.txt b/intl/icu/source/data/region/zh_SG.txt index bf277736bf8b..14136c339a80 100644 --- a/intl/icu/source/data/region/zh_SG.txt +++ b/intl/icu/source/data/region/zh_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_SG{ "%%ALIAS"{"zh_Hans_SG"} } diff --git a/intl/icu/source/data/region/zh_TW.txt b/intl/icu/source/data/region/zh_TW.txt index 9372c5067ad4..c54ccbfe8920 100644 --- a/intl/icu/source/data/region/zh_TW.txt +++ b/intl/icu/source/data/region/zh_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_TW{ "%%ALIAS"{"zh_Hant_TW"} } diff --git a/intl/icu/source/data/region/zu.txt b/intl/icu/source/data/region/zu.txt index a2e906509aa4..96f4d6b2b3bd 100644 --- a/intl/icu/source/data/region/zu.txt +++ b/intl/icu/source/data/region/zu.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zu{ Countries{ 001{"umhlaba"} @@ -107,6 +108,7 @@ zu{ ES{"i-Spain"} ET{"i-Ethiopia"} EU{"i-European Union"} + EZ{"I-Eurozone"} FI{"i-Finland"} FJ{"i-Fiji"} FK{"i-Falkland Islands"} @@ -312,5 +314,4 @@ zu{ FK{"i-Falkland Islands (Islas Malvinas)"} TL{"i-East Timor"} } - Version{"37"} } diff --git a/intl/icu/source/data/translit/Any_Accents.txt b/intl/icu/source/data/translit/Any_Accents.txt index 7ba23d4fed8b..a0f7b5bde890 100644 --- a/intl/icu/source/data/translit/Any_Accents.txt +++ b/intl/icu/source/data/translit/Any_Accents.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Any_Accents.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Any_Publishing.txt b/intl/icu/source/data/translit/Any_Publishing.txt index 2cc2e5272c76..50e8681d7200 100644 --- a/intl/icu/source/data/translit/Any_Publishing.txt +++ b/intl/icu/source/data/translit/Any_Publishing.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Any_Publishing.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Arab_Latn.txt b/intl/icu/source/data/translit/Arab_Latn.txt index ead4fcb89f87..4fa228eb51ed 100644 --- a/intl/icu/source/data/translit/Arab_Latn.txt +++ b/intl/icu/source/data/translit/Arab_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Arab_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Arab.txt b/intl/icu/source/data/translit/Beng_Arab.txt index 8a110102c59c..f07b0ebae44b 100644 --- a/intl/icu/source/data/translit/Beng_Arab.txt +++ b/intl/icu/source/data/translit/Beng_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Deva.txt b/intl/icu/source/data/translit/Beng_Deva.txt index 7cb0e718ebc2..ee40944a27e4 100644 --- a/intl/icu/source/data/translit/Beng_Deva.txt +++ b/intl/icu/source/data/translit/Beng_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Gujr.txt b/intl/icu/source/data/translit/Beng_Gujr.txt index 7599dcc896df..f6df822a7490 100644 --- a/intl/icu/source/data/translit/Beng_Gujr.txt +++ b/intl/icu/source/data/translit/Beng_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Guru.txt b/intl/icu/source/data/translit/Beng_Guru.txt index 99227096214e..8ff938dfb516 100644 --- a/intl/icu/source/data/translit/Beng_Guru.txt +++ b/intl/icu/source/data/translit/Beng_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Knda.txt b/intl/icu/source/data/translit/Beng_Knda.txt index dedc9e747375..98ac853841f7 100644 --- a/intl/icu/source/data/translit/Beng_Knda.txt +++ b/intl/icu/source/data/translit/Beng_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Latn.txt b/intl/icu/source/data/translit/Beng_Latn.txt index e5be38870191..d5cc47b4d89f 100644 --- a/intl/icu/source/data/translit/Beng_Latn.txt +++ b/intl/icu/source/data/translit/Beng_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Mlym.txt b/intl/icu/source/data/translit/Beng_Mlym.txt index 26099349e932..d3128230014a 100644 --- a/intl/icu/source/data/translit/Beng_Mlym.txt +++ b/intl/icu/source/data/translit/Beng_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Orya.txt b/intl/icu/source/data/translit/Beng_Orya.txt index b2ad0cb7cf20..ddbac9eda59a 100644 --- a/intl/icu/source/data/translit/Beng_Orya.txt +++ b/intl/icu/source/data/translit/Beng_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Taml.txt b/intl/icu/source/data/translit/Beng_Taml.txt index 17bc84dc01f6..ed45f71ca9f4 100644 --- a/intl/icu/source/data/translit/Beng_Taml.txt +++ b/intl/icu/source/data/translit/Beng_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_Telu.txt b/intl/icu/source/data/translit/Beng_Telu.txt index 8bc99bf86192..f9975b1b0ffe 100644 --- a/intl/icu/source/data/translit/Beng_Telu.txt +++ b/intl/icu/source/data/translit/Beng_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Beng_ur.txt b/intl/icu/source/data/translit/Beng_ur.txt index 8f9a2a46fd80..993c47aac932 100644 --- a/intl/icu/source/data/translit/Beng_ur.txt +++ b/intl/icu/source/data/translit/Beng_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Beng_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Bengali_InterIndic.txt b/intl/icu/source/data/translit/Bengali_InterIndic.txt index 3391a2ef7d21..eb16f4d10afe 100644 --- a/intl/icu/source/data/translit/Bengali_InterIndic.txt +++ b/intl/icu/source/data/translit/Bengali_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Bengali_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Cyrl_Latn.txt b/intl/icu/source/data/translit/Cyrl_Latn.txt index 12ab8f4abc3b..d595f99df074 100644 --- a/intl/icu/source/data/translit/Cyrl_Latn.txt +++ b/intl/icu/source/data/translit/Cyrl_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Cyrl_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Arab.txt b/intl/icu/source/data/translit/Deva_Arab.txt index 7ccc8383ce5c..2402eec69ce1 100644 --- a/intl/icu/source/data/translit/Deva_Arab.txt +++ b/intl/icu/source/data/translit/Deva_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Beng.txt b/intl/icu/source/data/translit/Deva_Beng.txt index ae854051a8ce..083b43d140d0 100644 --- a/intl/icu/source/data/translit/Deva_Beng.txt +++ b/intl/icu/source/data/translit/Deva_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Gujr.txt b/intl/icu/source/data/translit/Deva_Gujr.txt index 1240f012d4de..bd60dd059732 100644 --- a/intl/icu/source/data/translit/Deva_Gujr.txt +++ b/intl/icu/source/data/translit/Deva_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Guru.txt b/intl/icu/source/data/translit/Deva_Guru.txt index d4857782a1ec..845c0553313f 100644 --- a/intl/icu/source/data/translit/Deva_Guru.txt +++ b/intl/icu/source/data/translit/Deva_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Knda.txt b/intl/icu/source/data/translit/Deva_Knda.txt index 4569d26137fe..468c4224a2f5 100644 --- a/intl/icu/source/data/translit/Deva_Knda.txt +++ b/intl/icu/source/data/translit/Deva_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Latn.txt b/intl/icu/source/data/translit/Deva_Latn.txt index 919050f17a46..aa9d654c1ff7 100644 --- a/intl/icu/source/data/translit/Deva_Latn.txt +++ b/intl/icu/source/data/translit/Deva_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Mlym.txt b/intl/icu/source/data/translit/Deva_Mlym.txt index 2fe980b448d0..8180b12b85b0 100644 --- a/intl/icu/source/data/translit/Deva_Mlym.txt +++ b/intl/icu/source/data/translit/Deva_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Orya.txt b/intl/icu/source/data/translit/Deva_Orya.txt index 144f47923147..7f1832e4047a 100644 --- a/intl/icu/source/data/translit/Deva_Orya.txt +++ b/intl/icu/source/data/translit/Deva_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Taml.txt b/intl/icu/source/data/translit/Deva_Taml.txt index a453b7b796a3..50851a3f11f0 100644 --- a/intl/icu/source/data/translit/Deva_Taml.txt +++ b/intl/icu/source/data/translit/Deva_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_Telu.txt b/intl/icu/source/data/translit/Deva_Telu.txt index 60c218b2e79a..3bc718ef48ef 100644 --- a/intl/icu/source/data/translit/Deva_Telu.txt +++ b/intl/icu/source/data/translit/Deva_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Deva_ur.txt b/intl/icu/source/data/translit/Deva_ur.txt index b6b5ec1f13f0..4e0cb92d3240 100644 --- a/intl/icu/source/data/translit/Deva_ur.txt +++ b/intl/icu/source/data/translit/Deva_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Deva_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Devanagari_InterIndic.txt b/intl/icu/source/data/translit/Devanagari_InterIndic.txt index 3ffb3b97c39e..e4db19146387 100644 --- a/intl/icu/source/data/translit/Devanagari_InterIndic.txt +++ b/intl/icu/source/data/translit/Devanagari_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Devanagari_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Fullwidth_Halfwidth.txt b/intl/icu/source/data/translit/Fullwidth_Halfwidth.txt index 66ed739883e0..82435faec569 100644 --- a/intl/icu/source/data/translit/Fullwidth_Halfwidth.txt +++ b/intl/icu/source/data/translit/Fullwidth_Halfwidth.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Fullwidth_Halfwidth.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Geor_Latn.txt b/intl/icu/source/data/translit/Geor_Latn.txt index 547da33d996a..c5066c7323c6 100644 --- a/intl/icu/source/data/translit/Geor_Latn.txt +++ b/intl/icu/source/data/translit/Geor_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Geor_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Grek_Latn.txt b/intl/icu/source/data/translit/Grek_Latn.txt index a682aff6712b..81a1069dea87 100644 --- a/intl/icu/source/data/translit/Grek_Latn.txt +++ b/intl/icu/source/data/translit/Grek_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Grek_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Grek_Latn_UNGEGN.txt b/intl/icu/source/data/translit/Grek_Latn_UNGEGN.txt index fa29c4282775..573a21bf4d6e 100644 --- a/intl/icu/source/data/translit/Grek_Latn_UNGEGN.txt +++ b/intl/icu/source/data/translit/Grek_Latn_UNGEGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Grek_Latn_UNGEGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujarati_InterIndic.txt b/intl/icu/source/data/translit/Gujarati_InterIndic.txt index 00e56b1eda2a..0a99f1e7ea28 100644 --- a/intl/icu/source/data/translit/Gujarati_InterIndic.txt +++ b/intl/icu/source/data/translit/Gujarati_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujarati_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Arab.txt b/intl/icu/source/data/translit/Gujr_Arab.txt index 023e044a5982..d7dcd7c641ba 100644 --- a/intl/icu/source/data/translit/Gujr_Arab.txt +++ b/intl/icu/source/data/translit/Gujr_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Beng.txt b/intl/icu/source/data/translit/Gujr_Beng.txt index 73650571bde8..e9857706f1be 100644 --- a/intl/icu/source/data/translit/Gujr_Beng.txt +++ b/intl/icu/source/data/translit/Gujr_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Deva.txt b/intl/icu/source/data/translit/Gujr_Deva.txt index 4ca773422bef..69343ddec9c6 100644 --- a/intl/icu/source/data/translit/Gujr_Deva.txt +++ b/intl/icu/source/data/translit/Gujr_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Guru.txt b/intl/icu/source/data/translit/Gujr_Guru.txt index cc04410a9b2b..edaf75287349 100644 --- a/intl/icu/source/data/translit/Gujr_Guru.txt +++ b/intl/icu/source/data/translit/Gujr_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Knda.txt b/intl/icu/source/data/translit/Gujr_Knda.txt index 23561da7eef5..ab9c71126315 100644 --- a/intl/icu/source/data/translit/Gujr_Knda.txt +++ b/intl/icu/source/data/translit/Gujr_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Latn.txt b/intl/icu/source/data/translit/Gujr_Latn.txt index 9140fba378e5..22f820b90a5a 100644 --- a/intl/icu/source/data/translit/Gujr_Latn.txt +++ b/intl/icu/source/data/translit/Gujr_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Mlym.txt b/intl/icu/source/data/translit/Gujr_Mlym.txt index 16b20bb50b7c..a884cba56805 100644 --- a/intl/icu/source/data/translit/Gujr_Mlym.txt +++ b/intl/icu/source/data/translit/Gujr_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Orya.txt b/intl/icu/source/data/translit/Gujr_Orya.txt index 6916746e1fea..8f03a066ca44 100644 --- a/intl/icu/source/data/translit/Gujr_Orya.txt +++ b/intl/icu/source/data/translit/Gujr_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Taml.txt b/intl/icu/source/data/translit/Gujr_Taml.txt index d5279506a357..b1fb7cdf5935 100644 --- a/intl/icu/source/data/translit/Gujr_Taml.txt +++ b/intl/icu/source/data/translit/Gujr_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_Telu.txt b/intl/icu/source/data/translit/Gujr_Telu.txt index 9bf821b21836..532cba2cb6f4 100644 --- a/intl/icu/source/data/translit/Gujr_Telu.txt +++ b/intl/icu/source/data/translit/Gujr_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gujr_ur.txt b/intl/icu/source/data/translit/Gujr_ur.txt index b30877d5e955..66f9d5f782d0 100644 --- a/intl/icu/source/data/translit/Gujr_ur.txt +++ b/intl/icu/source/data/translit/Gujr_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gujr_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Gurmukhi_InterIndic.txt b/intl/icu/source/data/translit/Gurmukhi_InterIndic.txt index 7e22add1a77e..75e1f17c72b0 100644 --- a/intl/icu/source/data/translit/Gurmukhi_InterIndic.txt +++ b/intl/icu/source/data/translit/Gurmukhi_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Gurmukhi_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Arab.txt b/intl/icu/source/data/translit/Guru_Arab.txt index d06cfedc7d3f..847bdf611614 100644 --- a/intl/icu/source/data/translit/Guru_Arab.txt +++ b/intl/icu/source/data/translit/Guru_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Beng.txt b/intl/icu/source/data/translit/Guru_Beng.txt index b9498c072ced..6f1e4f9ed5fb 100644 --- a/intl/icu/source/data/translit/Guru_Beng.txt +++ b/intl/icu/source/data/translit/Guru_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Deva.txt b/intl/icu/source/data/translit/Guru_Deva.txt index bb80ebd6a30d..a66a468ac3a1 100644 --- a/intl/icu/source/data/translit/Guru_Deva.txt +++ b/intl/icu/source/data/translit/Guru_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Gujr.txt b/intl/icu/source/data/translit/Guru_Gujr.txt index fa71121d642b..757bfc933cef 100644 --- a/intl/icu/source/data/translit/Guru_Gujr.txt +++ b/intl/icu/source/data/translit/Guru_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Knda.txt b/intl/icu/source/data/translit/Guru_Knda.txt index bd3ad19022fb..5396f0ec97f1 100644 --- a/intl/icu/source/data/translit/Guru_Knda.txt +++ b/intl/icu/source/data/translit/Guru_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Latn.txt b/intl/icu/source/data/translit/Guru_Latn.txt index 61dac245e2bf..516b5036471d 100644 --- a/intl/icu/source/data/translit/Guru_Latn.txt +++ b/intl/icu/source/data/translit/Guru_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Mlym.txt b/intl/icu/source/data/translit/Guru_Mlym.txt index 7218c348997f..52bd3d4dd9e5 100644 --- a/intl/icu/source/data/translit/Guru_Mlym.txt +++ b/intl/icu/source/data/translit/Guru_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Orya.txt b/intl/icu/source/data/translit/Guru_Orya.txt index 767500a08f5f..d379eba2e131 100644 --- a/intl/icu/source/data/translit/Guru_Orya.txt +++ b/intl/icu/source/data/translit/Guru_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Taml.txt b/intl/icu/source/data/translit/Guru_Taml.txt index e52eac6f04f6..15fc7cb94dca 100644 --- a/intl/icu/source/data/translit/Guru_Taml.txt +++ b/intl/icu/source/data/translit/Guru_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_Telu.txt b/intl/icu/source/data/translit/Guru_Telu.txt index 0e26ef854271..9cbdcb632574 100644 --- a/intl/icu/source/data/translit/Guru_Telu.txt +++ b/intl/icu/source/data/translit/Guru_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Guru_ur.txt b/intl/icu/source/data/translit/Guru_ur.txt index bfa77669cfab..cf067244fece 100644 --- a/intl/icu/source/data/translit/Guru_ur.txt +++ b/intl/icu/source/data/translit/Guru_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Guru_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Han_Latin_Names.txt b/intl/icu/source/data/translit/Han_Latin_Names.txt index 406a9ef7afaa..ca9c31e4eb77 100644 --- a/intl/icu/source/data/translit/Han_Latin_Names.txt +++ b/intl/icu/source/data/translit/Han_Latin_Names.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Han_Latin_Names.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Han_Spacedhan.txt b/intl/icu/source/data/translit/Han_Spacedhan.txt index 9428d4dd9c8f..da8e7b929344 100644 --- a/intl/icu/source/data/translit/Han_Spacedhan.txt +++ b/intl/icu/source/data/translit/Han_Spacedhan.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Han_Spacedhan.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Hang_Latn.txt b/intl/icu/source/data/translit/Hang_Latn.txt index a7aacf65b67f..889797a99cef 100644 --- a/intl/icu/source/data/translit/Hang_Latn.txt +++ b/intl/icu/source/data/translit/Hang_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Hang_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Hani_Latn.txt b/intl/icu/source/data/translit/Hani_Latn.txt index 997d18f3332a..365de7b194e7 100644 --- a/intl/icu/source/data/translit/Hani_Latn.txt +++ b/intl/icu/source/data/translit/Hani_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Hani_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Hans_Hant.txt b/intl/icu/source/data/translit/Hans_Hant.txt index aefdd2d08cb9..30c62f8a90a9 100644 --- a/intl/icu/source/data/translit/Hans_Hant.txt +++ b/intl/icu/source/data/translit/Hans_Hant.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Hans_Hant.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Hebr_Latn.txt b/intl/icu/source/data/translit/Hebr_Latn.txt index 63791d721484..360593899585 100644 --- a/intl/icu/source/data/translit/Hebr_Latn.txt +++ b/intl/icu/source/data/translit/Hebr_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Hebr_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Hira_Kana.txt b/intl/icu/source/data/translit/Hira_Kana.txt index a1eb33b56c4a..d4332049aef3 100644 --- a/intl/icu/source/data/translit/Hira_Kana.txt +++ b/intl/icu/source/data/translit/Hira_Kana.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Hira_Kana.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Hira_Latn.txt b/intl/icu/source/data/translit/Hira_Latn.txt index 2e9674d2ee68..45a74b8d73fc 100644 --- a/intl/icu/source/data/translit/Hira_Latn.txt +++ b/intl/icu/source/data/translit/Hira_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Hira_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Arabic.txt b/intl/icu/source/data/translit/InterIndic_Arabic.txt index 8e4f1a1e8cae..8f31e05bdfb4 100644 --- a/intl/icu/source/data/translit/InterIndic_Arabic.txt +++ b/intl/icu/source/data/translit/InterIndic_Arabic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Arabic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Bengali.txt b/intl/icu/source/data/translit/InterIndic_Bengali.txt index 5dc39aa283b3..a9f9ce2f861a 100644 --- a/intl/icu/source/data/translit/InterIndic_Bengali.txt +++ b/intl/icu/source/data/translit/InterIndic_Bengali.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Bengali.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Devanagari.txt b/intl/icu/source/data/translit/InterIndic_Devanagari.txt index 29265fdb0d33..7ffd9d4c1a4d 100644 --- a/intl/icu/source/data/translit/InterIndic_Devanagari.txt +++ b/intl/icu/source/data/translit/InterIndic_Devanagari.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Devanagari.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Gujarati.txt b/intl/icu/source/data/translit/InterIndic_Gujarati.txt index 25178fa2eba8..d8664f7f39e0 100644 --- a/intl/icu/source/data/translit/InterIndic_Gujarati.txt +++ b/intl/icu/source/data/translit/InterIndic_Gujarati.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Gujarati.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Gurmukhi.txt b/intl/icu/source/data/translit/InterIndic_Gurmukhi.txt index c04b54c8cbba..c0c2433f9a48 100644 --- a/intl/icu/source/data/translit/InterIndic_Gurmukhi.txt +++ b/intl/icu/source/data/translit/InterIndic_Gurmukhi.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Gurmukhi.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Kannada.txt b/intl/icu/source/data/translit/InterIndic_Kannada.txt index fa3aa04e8d51..5c233dd527ec 100644 --- a/intl/icu/source/data/translit/InterIndic_Kannada.txt +++ b/intl/icu/source/data/translit/InterIndic_Kannada.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Kannada.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Latin.txt b/intl/icu/source/data/translit/InterIndic_Latin.txt index 13cd64a7211c..9f5d2cfbc04a 100644 --- a/intl/icu/source/data/translit/InterIndic_Latin.txt +++ b/intl/icu/source/data/translit/InterIndic_Latin.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Latin.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Malayalam.txt b/intl/icu/source/data/translit/InterIndic_Malayalam.txt index e99b295df6c6..5a5673774e3d 100644 --- a/intl/icu/source/data/translit/InterIndic_Malayalam.txt +++ b/intl/icu/source/data/translit/InterIndic_Malayalam.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Malayalam.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Oriya.txt b/intl/icu/source/data/translit/InterIndic_Oriya.txt index 4f1d90856302..c2fbc58f22fe 100644 --- a/intl/icu/source/data/translit/InterIndic_Oriya.txt +++ b/intl/icu/source/data/translit/InterIndic_Oriya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Oriya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Tamil.txt b/intl/icu/source/data/translit/InterIndic_Tamil.txt index 5386a9f810fe..3447db1890f7 100644 --- a/intl/icu/source/data/translit/InterIndic_Tamil.txt +++ b/intl/icu/source/data/translit/InterIndic_Tamil.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Tamil.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_Telugu.txt b/intl/icu/source/data/translit/InterIndic_Telugu.txt index bc8d8dd4322f..e1545ddcd4af 100644 --- a/intl/icu/source/data/translit/InterIndic_Telugu.txt +++ b/intl/icu/source/data/translit/InterIndic_Telugu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_Telugu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/InterIndic_ur.txt b/intl/icu/source/data/translit/InterIndic_ur.txt index bbfaf02cc0b4..84df11469da7 100644 --- a/intl/icu/source/data/translit/InterIndic_ur.txt +++ b/intl/icu/source/data/translit/InterIndic_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: InterIndic_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Jamo_Latn.txt b/intl/icu/source/data/translit/Jamo_Latn.txt index 696e96abcbd8..22fc464d50a4 100644 --- a/intl/icu/source/data/translit/Jamo_Latn.txt +++ b/intl/icu/source/data/translit/Jamo_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Jamo_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Kannada_InterIndic.txt b/intl/icu/source/data/translit/Kannada_InterIndic.txt index 818f0b775214..a955f8e89c20 100644 --- a/intl/icu/source/data/translit/Kannada_InterIndic.txt +++ b/intl/icu/source/data/translit/Kannada_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Kannada_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Arab.txt b/intl/icu/source/data/translit/Knda_Arab.txt index ab7c1aaa7b40..1dd3f779dc60 100644 --- a/intl/icu/source/data/translit/Knda_Arab.txt +++ b/intl/icu/source/data/translit/Knda_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Beng.txt b/intl/icu/source/data/translit/Knda_Beng.txt index 7a0c8bfb9636..394461e75254 100644 --- a/intl/icu/source/data/translit/Knda_Beng.txt +++ b/intl/icu/source/data/translit/Knda_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Deva.txt b/intl/icu/source/data/translit/Knda_Deva.txt index eda9d5fc154d..9fe9dc1287ba 100644 --- a/intl/icu/source/data/translit/Knda_Deva.txt +++ b/intl/icu/source/data/translit/Knda_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Gujr.txt b/intl/icu/source/data/translit/Knda_Gujr.txt index e9a69b3aa2aa..acad214d3d3c 100644 --- a/intl/icu/source/data/translit/Knda_Gujr.txt +++ b/intl/icu/source/data/translit/Knda_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Guru.txt b/intl/icu/source/data/translit/Knda_Guru.txt index bd743bbd350e..35cdf254cf00 100644 --- a/intl/icu/source/data/translit/Knda_Guru.txt +++ b/intl/icu/source/data/translit/Knda_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Latn.txt b/intl/icu/source/data/translit/Knda_Latn.txt index d4e9564e8e97..5d3267098db0 100644 --- a/intl/icu/source/data/translit/Knda_Latn.txt +++ b/intl/icu/source/data/translit/Knda_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Mlym.txt b/intl/icu/source/data/translit/Knda_Mlym.txt index ec71e3a2d6b3..6f76ed29b57d 100644 --- a/intl/icu/source/data/translit/Knda_Mlym.txt +++ b/intl/icu/source/data/translit/Knda_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Orya.txt b/intl/icu/source/data/translit/Knda_Orya.txt index b727a17a552b..f4fae98dbb61 100644 --- a/intl/icu/source/data/translit/Knda_Orya.txt +++ b/intl/icu/source/data/translit/Knda_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Taml.txt b/intl/icu/source/data/translit/Knda_Taml.txt index 302ef98e4986..cede0b412a5c 100644 --- a/intl/icu/source/data/translit/Knda_Taml.txt +++ b/intl/icu/source/data/translit/Knda_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_Telu.txt b/intl/icu/source/data/translit/Knda_Telu.txt index dc17a04e7e3a..9da54d53a3f6 100644 --- a/intl/icu/source/data/translit/Knda_Telu.txt +++ b/intl/icu/source/data/translit/Knda_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Knda_ur.txt b/intl/icu/source/data/translit/Knda_ur.txt index f2b9a2ac23a1..5fbc5d33fa53 100644 --- a/intl/icu/source/data/translit/Knda_ur.txt +++ b/intl/icu/source/data/translit/Knda_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Knda_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latin_ASCII.txt b/intl/icu/source/data/translit/Latin_ASCII.txt index 686e441cc320..7807c3592026 100644 --- a/intl/icu/source/data/translit/Latin_ASCII.txt +++ b/intl/icu/source/data/translit/Latin_ASCII.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latin_ASCII.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latin_ConjoiningJamo.txt b/intl/icu/source/data/translit/Latin_ConjoiningJamo.txt index c88944e04f4b..8e7937a0a6ff 100644 --- a/intl/icu/source/data/translit/Latin_ConjoiningJamo.txt +++ b/intl/icu/source/data/translit/Latin_ConjoiningJamo.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latin_ConjoiningJamo.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latin_InterIndic.txt b/intl/icu/source/data/translit/Latin_InterIndic.txt index 7a4f1feffbcb..ff09b5d60487 100644 --- a/intl/icu/source/data/translit/Latin_InterIndic.txt +++ b/intl/icu/source/data/translit/Latin_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latin_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latin_NumericPinyin.txt b/intl/icu/source/data/translit/Latin_NumericPinyin.txt index 316e0758ab1e..9f832fcad481 100644 --- a/intl/icu/source/data/translit/Latin_NumericPinyin.txt +++ b/intl/icu/source/data/translit/Latin_NumericPinyin.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latin_NumericPinyin.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Armn.txt b/intl/icu/source/data/translit/Latn_Armn.txt index 9feace29e9e6..053c46390d70 100644 --- a/intl/icu/source/data/translit/Latn_Armn.txt +++ b/intl/icu/source/data/translit/Latn_Armn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Armn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Beng.txt b/intl/icu/source/data/translit/Latn_Beng.txt index 5a3edc9213fb..505fec78c37f 100644 --- a/intl/icu/source/data/translit/Latn_Beng.txt +++ b/intl/icu/source/data/translit/Latn_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Bopo.txt b/intl/icu/source/data/translit/Latn_Bopo.txt index b00e0d3165ab..259269efea5d 100644 --- a/intl/icu/source/data/translit/Latn_Bopo.txt +++ b/intl/icu/source/data/translit/Latn_Bopo.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Bopo.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Cans.txt b/intl/icu/source/data/translit/Latn_Cans.txt index 9520455f4cc7..f4d45dd73c9b 100644 --- a/intl/icu/source/data/translit/Latn_Cans.txt +++ b/intl/icu/source/data/translit/Latn_Cans.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Cans.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Deva.txt b/intl/icu/source/data/translit/Latn_Deva.txt index 913d066775f6..7adce8d221b0 100644 --- a/intl/icu/source/data/translit/Latn_Deva.txt +++ b/intl/icu/source/data/translit/Latn_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Ethi.txt b/intl/icu/source/data/translit/Latn_Ethi.txt index 6a54a65b030e..8cf5f2dc9a9e 100644 --- a/intl/icu/source/data/translit/Latn_Ethi.txt +++ b/intl/icu/source/data/translit/Latn_Ethi.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Ethi.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Gujr.txt b/intl/icu/source/data/translit/Latn_Gujr.txt index c8d9553f430e..c2321123e60f 100644 --- a/intl/icu/source/data/translit/Latn_Gujr.txt +++ b/intl/icu/source/data/translit/Latn_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Guru.txt b/intl/icu/source/data/translit/Latn_Guru.txt index 65458b731820..a36829d18ac7 100644 --- a/intl/icu/source/data/translit/Latn_Guru.txt +++ b/intl/icu/source/data/translit/Latn_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Hang.txt b/intl/icu/source/data/translit/Latn_Hang.txt index 7b063a45ef84..ef53d53052d0 100644 --- a/intl/icu/source/data/translit/Latn_Hang.txt +++ b/intl/icu/source/data/translit/Latn_Hang.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Hang.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Jamo.txt b/intl/icu/source/data/translit/Latn_Jamo.txt index 1c1ae7407bc4..feefb3093611 100644 --- a/intl/icu/source/data/translit/Latn_Jamo.txt +++ b/intl/icu/source/data/translit/Latn_Jamo.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Jamo.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Kana.txt b/intl/icu/source/data/translit/Latn_Kana.txt index ea4b7dd6875e..73224f8af73f 100644 --- a/intl/icu/source/data/translit/Latn_Kana.txt +++ b/intl/icu/source/data/translit/Latn_Kana.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Kana.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Knda.txt b/intl/icu/source/data/translit/Latn_Knda.txt index e16d43db0a59..ae2a03335cf8 100644 --- a/intl/icu/source/data/translit/Latn_Knda.txt +++ b/intl/icu/source/data/translit/Latn_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Mlym.txt b/intl/icu/source/data/translit/Latn_Mlym.txt index 642fd5269863..792a5ceea01a 100644 --- a/intl/icu/source/data/translit/Latn_Mlym.txt +++ b/intl/icu/source/data/translit/Latn_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Orya.txt b/intl/icu/source/data/translit/Latn_Orya.txt index 51aa6379fcad..5320037dedb1 100644 --- a/intl/icu/source/data/translit/Latn_Orya.txt +++ b/intl/icu/source/data/translit/Latn_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Taml.txt b/intl/icu/source/data/translit/Latn_Taml.txt index 42e59f602d7c..7e0d6ddca8a3 100644 --- a/intl/icu/source/data/translit/Latn_Taml.txt +++ b/intl/icu/source/data/translit/Latn_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Telu.txt b/intl/icu/source/data/translit/Latn_Telu.txt index 50b8873c73fe..0631d2c2ccbb 100644 --- a/intl/icu/source/data/translit/Latn_Telu.txt +++ b/intl/icu/source/data/translit/Latn_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Thaa.txt b/intl/icu/source/data/translit/Latn_Thaa.txt index 15a437772643..8548d1efdfa1 100644 --- a/intl/icu/source/data/translit/Latn_Thaa.txt +++ b/intl/icu/source/data/translit/Latn_Thaa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Thaa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Latn_Thai.txt b/intl/icu/source/data/translit/Latn_Thai.txt index f8cb5fcb6040..daaed60e2ded 100644 --- a/intl/icu/source/data/translit/Latn_Thai.txt +++ b/intl/icu/source/data/translit/Latn_Thai.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Latn_Thai.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Malayalam_InterIndic.txt b/intl/icu/source/data/translit/Malayalam_InterIndic.txt index cd2825989fb1..65549662a952 100644 --- a/intl/icu/source/data/translit/Malayalam_InterIndic.txt +++ b/intl/icu/source/data/translit/Malayalam_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Malayalam_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Arab.txt b/intl/icu/source/data/translit/Mlym_Arab.txt index 59dffbf9f87e..e7644d89c6e9 100644 --- a/intl/icu/source/data/translit/Mlym_Arab.txt +++ b/intl/icu/source/data/translit/Mlym_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Beng.txt b/intl/icu/source/data/translit/Mlym_Beng.txt index 14409f8fa613..8be5e2679fdb 100644 --- a/intl/icu/source/data/translit/Mlym_Beng.txt +++ b/intl/icu/source/data/translit/Mlym_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Deva.txt b/intl/icu/source/data/translit/Mlym_Deva.txt index 7a2f938ca8b9..58d7329e6844 100644 --- a/intl/icu/source/data/translit/Mlym_Deva.txt +++ b/intl/icu/source/data/translit/Mlym_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Gujr.txt b/intl/icu/source/data/translit/Mlym_Gujr.txt index 95dd8cb032e7..2a14e0e23d10 100644 --- a/intl/icu/source/data/translit/Mlym_Gujr.txt +++ b/intl/icu/source/data/translit/Mlym_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Guru.txt b/intl/icu/source/data/translit/Mlym_Guru.txt index 87fcdfef9476..35ec6b762ea9 100644 --- a/intl/icu/source/data/translit/Mlym_Guru.txt +++ b/intl/icu/source/data/translit/Mlym_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Knda.txt b/intl/icu/source/data/translit/Mlym_Knda.txt index 5ebafc267983..e1d4ce17ace0 100644 --- a/intl/icu/source/data/translit/Mlym_Knda.txt +++ b/intl/icu/source/data/translit/Mlym_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Latn.txt b/intl/icu/source/data/translit/Mlym_Latn.txt index da902f1e05e2..de65e4271b84 100644 --- a/intl/icu/source/data/translit/Mlym_Latn.txt +++ b/intl/icu/source/data/translit/Mlym_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Orya.txt b/intl/icu/source/data/translit/Mlym_Orya.txt index c9ee9b459a3d..89b2f79bc0c0 100644 --- a/intl/icu/source/data/translit/Mlym_Orya.txt +++ b/intl/icu/source/data/translit/Mlym_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Taml.txt b/intl/icu/source/data/translit/Mlym_Taml.txt index 1a796a74d663..b3d29c76180f 100644 --- a/intl/icu/source/data/translit/Mlym_Taml.txt +++ b/intl/icu/source/data/translit/Mlym_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_Telu.txt b/intl/icu/source/data/translit/Mlym_Telu.txt index af4d0137ec16..2824e2a50635 100644 --- a/intl/icu/source/data/translit/Mlym_Telu.txt +++ b/intl/icu/source/data/translit/Mlym_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Mlym_ur.txt b/intl/icu/source/data/translit/Mlym_ur.txt index aca234a50c05..e8c79c4ecdb4 100644 --- a/intl/icu/source/data/translit/Mlym_ur.txt +++ b/intl/icu/source/data/translit/Mlym_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Mlym_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Oriya_InterIndic.txt b/intl/icu/source/data/translit/Oriya_InterIndic.txt index 47b50658dbef..59bc980f2396 100644 --- a/intl/icu/source/data/translit/Oriya_InterIndic.txt +++ b/intl/icu/source/data/translit/Oriya_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Oriya_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Arab.txt b/intl/icu/source/data/translit/Orya_Arab.txt index 7ab87e1dc6ca..2fe3eb7b0197 100644 --- a/intl/icu/source/data/translit/Orya_Arab.txt +++ b/intl/icu/source/data/translit/Orya_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Beng.txt b/intl/icu/source/data/translit/Orya_Beng.txt index c1a25e7ce242..d64e2289b0ad 100644 --- a/intl/icu/source/data/translit/Orya_Beng.txt +++ b/intl/icu/source/data/translit/Orya_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Deva.txt b/intl/icu/source/data/translit/Orya_Deva.txt index 1f553fee0d86..a4c5c75781f5 100644 --- a/intl/icu/source/data/translit/Orya_Deva.txt +++ b/intl/icu/source/data/translit/Orya_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Gujr.txt b/intl/icu/source/data/translit/Orya_Gujr.txt index 8bcdea89db43..474cdaca71db 100644 --- a/intl/icu/source/data/translit/Orya_Gujr.txt +++ b/intl/icu/source/data/translit/Orya_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Guru.txt b/intl/icu/source/data/translit/Orya_Guru.txt index c20ca59c7a81..4338aec01999 100644 --- a/intl/icu/source/data/translit/Orya_Guru.txt +++ b/intl/icu/source/data/translit/Orya_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Knda.txt b/intl/icu/source/data/translit/Orya_Knda.txt index 9145380bb272..61da78495931 100644 --- a/intl/icu/source/data/translit/Orya_Knda.txt +++ b/intl/icu/source/data/translit/Orya_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Latn.txt b/intl/icu/source/data/translit/Orya_Latn.txt index 53f533f9d031..345de6853045 100644 --- a/intl/icu/source/data/translit/Orya_Latn.txt +++ b/intl/icu/source/data/translit/Orya_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Mlym.txt b/intl/icu/source/data/translit/Orya_Mlym.txt index 50ea6df14f36..212dca9e4eb7 100644 --- a/intl/icu/source/data/translit/Orya_Mlym.txt +++ b/intl/icu/source/data/translit/Orya_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Taml.txt b/intl/icu/source/data/translit/Orya_Taml.txt index bb6e2380dd7f..6de54711da13 100644 --- a/intl/icu/source/data/translit/Orya_Taml.txt +++ b/intl/icu/source/data/translit/Orya_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_Telu.txt b/intl/icu/source/data/translit/Orya_Telu.txt index 632994fbf17f..7b3efb95e3a5 100644 --- a/intl/icu/source/data/translit/Orya_Telu.txt +++ b/intl/icu/source/data/translit/Orya_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Orya_ur.txt b/intl/icu/source/data/translit/Orya_ur.txt index 90349666c96e..6c8b7a095e92 100644 --- a/intl/icu/source/data/translit/Orya_ur.txt +++ b/intl/icu/source/data/translit/Orya_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Orya_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Pinyin_NumericPinyin.txt b/intl/icu/source/data/translit/Pinyin_NumericPinyin.txt index 0653b9a4f8af..1ab98c1b2089 100644 --- a/intl/icu/source/data/translit/Pinyin_NumericPinyin.txt +++ b/intl/icu/source/data/translit/Pinyin_NumericPinyin.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Pinyin_NumericPinyin.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Syrc_Latn.txt b/intl/icu/source/data/translit/Syrc_Latn.txt index 94605e0345c7..10f73e2d0644 100644 --- a/intl/icu/source/data/translit/Syrc_Latn.txt +++ b/intl/icu/source/data/translit/Syrc_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Syrc_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Tamil_InterIndic.txt b/intl/icu/source/data/translit/Tamil_InterIndic.txt index 4af41e15a223..aef7de666ff8 100644 --- a/intl/icu/source/data/translit/Tamil_InterIndic.txt +++ b/intl/icu/source/data/translit/Tamil_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Tamil_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Arab.txt b/intl/icu/source/data/translit/Taml_Arab.txt index 189a4f7d9be1..fd6cb1171cf3 100644 --- a/intl/icu/source/data/translit/Taml_Arab.txt +++ b/intl/icu/source/data/translit/Taml_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Beng.txt b/intl/icu/source/data/translit/Taml_Beng.txt index 6459d7adf88e..2db2588b46f7 100644 --- a/intl/icu/source/data/translit/Taml_Beng.txt +++ b/intl/icu/source/data/translit/Taml_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Deva.txt b/intl/icu/source/data/translit/Taml_Deva.txt index e6616ea41e9c..0a483c185a50 100644 --- a/intl/icu/source/data/translit/Taml_Deva.txt +++ b/intl/icu/source/data/translit/Taml_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Gujr.txt b/intl/icu/source/data/translit/Taml_Gujr.txt index f00dbf05a464..feeef990ba80 100644 --- a/intl/icu/source/data/translit/Taml_Gujr.txt +++ b/intl/icu/source/data/translit/Taml_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Guru.txt b/intl/icu/source/data/translit/Taml_Guru.txt index 762d85797cda..060e085895a0 100644 --- a/intl/icu/source/data/translit/Taml_Guru.txt +++ b/intl/icu/source/data/translit/Taml_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Knda.txt b/intl/icu/source/data/translit/Taml_Knda.txt index 59ee0ebbdf8f..c8dd77cbe285 100644 --- a/intl/icu/source/data/translit/Taml_Knda.txt +++ b/intl/icu/source/data/translit/Taml_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Latn.txt b/intl/icu/source/data/translit/Taml_Latn.txt index eb3d2ebf6413..f6572b8bcb5e 100644 --- a/intl/icu/source/data/translit/Taml_Latn.txt +++ b/intl/icu/source/data/translit/Taml_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Mlym.txt b/intl/icu/source/data/translit/Taml_Mlym.txt index d3680c444123..b29bc7d6fdd3 100644 --- a/intl/icu/source/data/translit/Taml_Mlym.txt +++ b/intl/icu/source/data/translit/Taml_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Orya.txt b/intl/icu/source/data/translit/Taml_Orya.txt index 6db28c5afc9c..a010d0961a72 100644 --- a/intl/icu/source/data/translit/Taml_Orya.txt +++ b/intl/icu/source/data/translit/Taml_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_Telu.txt b/intl/icu/source/data/translit/Taml_Telu.txt index 185a8b9ae72e..9f7d6ab2fefa 100644 --- a/intl/icu/source/data/translit/Taml_Telu.txt +++ b/intl/icu/source/data/translit/Taml_Telu.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_Telu.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Taml_ur.txt b/intl/icu/source/data/translit/Taml_ur.txt index 26b2f476236e..f8f428feb17d 100644 --- a/intl/icu/source/data/translit/Taml_ur.txt +++ b/intl/icu/source/data/translit/Taml_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Taml_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Arab.txt b/intl/icu/source/data/translit/Telu_Arab.txt index c44e7b58e61a..8a9aa4db1319 100644 --- a/intl/icu/source/data/translit/Telu_Arab.txt +++ b/intl/icu/source/data/translit/Telu_Arab.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Arab.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Beng.txt b/intl/icu/source/data/translit/Telu_Beng.txt index a8c9d33bf5b4..feddb1a81564 100644 --- a/intl/icu/source/data/translit/Telu_Beng.txt +++ b/intl/icu/source/data/translit/Telu_Beng.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Beng.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Deva.txt b/intl/icu/source/data/translit/Telu_Deva.txt index 4a43a534b84c..dddb26950ab9 100644 --- a/intl/icu/source/data/translit/Telu_Deva.txt +++ b/intl/icu/source/data/translit/Telu_Deva.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Deva.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Gujr.txt b/intl/icu/source/data/translit/Telu_Gujr.txt index 07484848b31d..f87d0d0ecb9d 100644 --- a/intl/icu/source/data/translit/Telu_Gujr.txt +++ b/intl/icu/source/data/translit/Telu_Gujr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Gujr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Guru.txt b/intl/icu/source/data/translit/Telu_Guru.txt index 02fec5d1a03b..99db85166415 100644 --- a/intl/icu/source/data/translit/Telu_Guru.txt +++ b/intl/icu/source/data/translit/Telu_Guru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Guru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Knda.txt b/intl/icu/source/data/translit/Telu_Knda.txt index cf75420bc20b..63f257b8c5be 100644 --- a/intl/icu/source/data/translit/Telu_Knda.txt +++ b/intl/icu/source/data/translit/Telu_Knda.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Knda.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Latn.txt b/intl/icu/source/data/translit/Telu_Latn.txt index 8c274deb3859..681d22760b69 100644 --- a/intl/icu/source/data/translit/Telu_Latn.txt +++ b/intl/icu/source/data/translit/Telu_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Mlym.txt b/intl/icu/source/data/translit/Telu_Mlym.txt index cfef84ee13d3..667d73b1c6ec 100644 --- a/intl/icu/source/data/translit/Telu_Mlym.txt +++ b/intl/icu/source/data/translit/Telu_Mlym.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Mlym.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Orya.txt b/intl/icu/source/data/translit/Telu_Orya.txt index 66be8e8b919d..a1fbcbc445a4 100644 --- a/intl/icu/source/data/translit/Telu_Orya.txt +++ b/intl/icu/source/data/translit/Telu_Orya.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Orya.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_Taml.txt b/intl/icu/source/data/translit/Telu_Taml.txt index 3acc5622f492..1a29ac25b6c8 100644 --- a/intl/icu/source/data/translit/Telu_Taml.txt +++ b/intl/icu/source/data/translit/Telu_Taml.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_Taml.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telu_ur.txt b/intl/icu/source/data/translit/Telu_ur.txt index 042ee217aecb..a00760e851d0 100644 --- a/intl/icu/source/data/translit/Telu_ur.txt +++ b/intl/icu/source/data/translit/Telu_ur.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telu_ur.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Telugu_InterIndic.txt b/intl/icu/source/data/translit/Telugu_InterIndic.txt index f22d563c3dc4..c470576d8138 100644 --- a/intl/icu/source/data/translit/Telugu_InterIndic.txt +++ b/intl/icu/source/data/translit/Telugu_InterIndic.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Telugu_InterIndic.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ThaiLogical_Latin.txt b/intl/icu/source/data/translit/ThaiLogical_Latin.txt index c063e7901b4a..36dbe4401749 100644 --- a/intl/icu/source/data/translit/ThaiLogical_Latin.txt +++ b/intl/icu/source/data/translit/ThaiLogical_Latin.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ThaiLogical_Latin.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Thai_Latn.txt b/intl/icu/source/data/translit/Thai_Latn.txt index d8a5bf0dc278..e3cd839e3576 100644 --- a/intl/icu/source/data/translit/Thai_Latn.txt +++ b/intl/icu/source/data/translit/Thai_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Thai_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Thai_ThaiLogical.txt b/intl/icu/source/data/translit/Thai_ThaiLogical.txt index e7045cdeb7d7..c7a4b5f2c44d 100644 --- a/intl/icu/source/data/translit/Thai_ThaiLogical.txt +++ b/intl/icu/source/data/translit/Thai_ThaiLogical.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Thai_ThaiLogical.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Thai_ThaiSemi.txt b/intl/icu/source/data/translit/Thai_ThaiSemi.txt index 999d0223a746..c469faa01225 100644 --- a/intl/icu/source/data/translit/Thai_ThaiSemi.txt +++ b/intl/icu/source/data/translit/Thai_ThaiSemi.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Thai_ThaiSemi.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/Zawgyi_my.txt b/intl/icu/source/data/translit/Zawgyi_my.txt index 6bd51ab717ba..e9b60243eb9b 100644 --- a/intl/icu/source/data/translit/Zawgyi_my.txt +++ b/intl/icu/source/data/translit/Zawgyi_my.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: Zawgyi_my.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/am_am_FONIPA.txt b/intl/icu/source/data/translit/am_am_FONIPA.txt index a3390db715b4..011b8d7760bf 100644 --- a/intl/icu/source/data/translit/am_am_FONIPA.txt +++ b/intl/icu/source/data/translit/am_am_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: am_am_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/am_am_Latn_BGN.txt b/intl/icu/source/data/translit/am_am_Latn_BGN.txt index 76e05791063d..1561c6318e7f 100644 --- a/intl/icu/source/data/translit/am_am_Latn_BGN.txt +++ b/intl/icu/source/data/translit/am_am_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: am_am_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/am_ar.txt b/intl/icu/source/data/translit/am_ar.txt index c5e55873dfbc..60daf9d2950c 100644 --- a/intl/icu/source/data/translit/am_ar.txt +++ b/intl/icu/source/data/translit/am_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: am_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/am_chr.txt b/intl/icu/source/data/translit/am_chr.txt index f3be88771a9f..97e0a8f48584 100644 --- a/intl/icu/source/data/translit/am_chr.txt +++ b/intl/icu/source/data/translit/am_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: am_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/am_fa.txt b/intl/icu/source/data/translit/am_fa.txt index e5a27c790ca9..82527884236d 100644 --- a/intl/icu/source/data/translit/am_fa.txt +++ b/intl/icu/source/data/translit/am_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: am_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ar_ar_Latn_BGN.txt b/intl/icu/source/data/translit/ar_ar_Latn_BGN.txt index ecd9363c7ea0..198e51122508 100644 --- a/intl/icu/source/data/translit/ar_ar_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ar_ar_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ar_ar_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/az_Cyrl_az_BGN.txt b/intl/icu/source/data/translit/az_Cyrl_az_BGN.txt index d8e6d3c8a88a..bce445e15b19 100644 --- a/intl/icu/source/data/translit/az_Cyrl_az_BGN.txt +++ b/intl/icu/source/data/translit/az_Cyrl_az_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: az_Cyrl_az_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/az_Lower.txt b/intl/icu/source/data/translit/az_Lower.txt index ac32a0be5214..c33f6d402090 100644 --- a/intl/icu/source/data/translit/az_Lower.txt +++ b/intl/icu/source/data/translit/az_Lower.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: az_Lower.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/az_Title.txt b/intl/icu/source/data/translit/az_Title.txt index f22224c26d8c..8dfa398ad21f 100644 --- a/intl/icu/source/data/translit/az_Title.txt +++ b/intl/icu/source/data/translit/az_Title.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: az_Title.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/az_Upper.txt b/intl/icu/source/data/translit/az_Upper.txt index 38855c12970b..29e6f8573105 100644 --- a/intl/icu/source/data/translit/az_Upper.txt +++ b/intl/icu/source/data/translit/az_Upper.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: az_Upper.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/be_be_Latn_BGN.txt b/intl/icu/source/data/translit/be_be_Latn_BGN.txt index 83cc37c06fe4..f4d2034c37b7 100644 --- a/intl/icu/source/data/translit/be_be_Latn_BGN.txt +++ b/intl/icu/source/data/translit/be_be_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: be_be_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/bg_bg_Latn_BGN.txt b/intl/icu/source/data/translit/bg_bg_Latn_BGN.txt index d8351ce9bb41..17afc485a37b 100644 --- a/intl/icu/source/data/translit/bg_bg_Latn_BGN.txt +++ b/intl/icu/source/data/translit/bg_bg_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: bg_bg_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/blt_blt_FONIPA.txt b/intl/icu/source/data/translit/blt_blt_FONIPA.txt index 02988658cef5..dbe1c710c4c6 100644 --- a/intl/icu/source/data/translit/blt_blt_FONIPA.txt +++ b/intl/icu/source/data/translit/blt_blt_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: blt_blt_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ch_am.txt b/intl/icu/source/data/translit/ch_am.txt index 4f6405bd1060..5f41da874f01 100644 --- a/intl/icu/source/data/translit/ch_am.txt +++ b/intl/icu/source/data/translit/ch_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ch_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ch_ar.txt b/intl/icu/source/data/translit/ch_ar.txt index e8861dc66d5a..1701c9827235 100644 --- a/intl/icu/source/data/translit/ch_ar.txt +++ b/intl/icu/source/data/translit/ch_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ch_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ch_ch_FONIPA.txt b/intl/icu/source/data/translit/ch_ch_FONIPA.txt index 54554245d971..e569640c358d 100644 --- a/intl/icu/source/data/translit/ch_ch_FONIPA.txt +++ b/intl/icu/source/data/translit/ch_ch_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ch_ch_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ch_chr.txt b/intl/icu/source/data/translit/ch_chr.txt index 82d5762a3673..6d37578aa46c 100644 --- a/intl/icu/source/data/translit/ch_chr.txt +++ b/intl/icu/source/data/translit/ch_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ch_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ch_fa.txt b/intl/icu/source/data/translit/ch_fa.txt index 250428f3a896..f3f3c6ea42e3 100644 --- a/intl/icu/source/data/translit/ch_fa.txt +++ b/intl/icu/source/data/translit/ch_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ch_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/chr_chr_FONIPA.txt b/intl/icu/source/data/translit/chr_chr_FONIPA.txt index c2d5a759b898..539be155a050 100644 --- a/intl/icu/source/data/translit/chr_chr_FONIPA.txt +++ b/intl/icu/source/data/translit/chr_chr_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: chr_chr_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_FONIPA_ja.txt b/intl/icu/source/data/translit/cs_FONIPA_ja.txt index f4ee08ec8533..c9ab8a218cab 100644 --- a/intl/icu/source/data/translit/cs_FONIPA_ja.txt +++ b/intl/icu/source/data/translit/cs_FONIPA_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_FONIPA_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_FONIPA_ko.txt b/intl/icu/source/data/translit/cs_FONIPA_ko.txt index bad8f842b532..8303b5ccdb29 100644 --- a/intl/icu/source/data/translit/cs_FONIPA_ko.txt +++ b/intl/icu/source/data/translit/cs_FONIPA_ko.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_FONIPA_ko.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_am.txt b/intl/icu/source/data/translit/cs_am.txt index d3f8cd0b4cd7..e577dda30c7c 100644 --- a/intl/icu/source/data/translit/cs_am.txt +++ b/intl/icu/source/data/translit/cs_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_ar.txt b/intl/icu/source/data/translit/cs_ar.txt index e8a11507017d..b4f9044b4d93 100644 --- a/intl/icu/source/data/translit/cs_ar.txt +++ b/intl/icu/source/data/translit/cs_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_chr.txt b/intl/icu/source/data/translit/cs_chr.txt index 60b770471eb3..8a34c5b25140 100644 --- a/intl/icu/source/data/translit/cs_chr.txt +++ b/intl/icu/source/data/translit/cs_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_cs_FONIPA.txt b/intl/icu/source/data/translit/cs_cs_FONIPA.txt index 01236ef692e0..40ae8000e4c1 100644 --- a/intl/icu/source/data/translit/cs_cs_FONIPA.txt +++ b/intl/icu/source/data/translit/cs_cs_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_cs_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_fa.txt b/intl/icu/source/data/translit/cs_fa.txt index 4cd6c907bc00..79dffb38c305 100644 --- a/intl/icu/source/data/translit/cs_fa.txt +++ b/intl/icu/source/data/translit/cs_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_ja.txt b/intl/icu/source/data/translit/cs_ja.txt index 51ab828e6866..352e88698eac 100644 --- a/intl/icu/source/data/translit/cs_ja.txt +++ b/intl/icu/source/data/translit/cs_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cs_ko.txt b/intl/icu/source/data/translit/cs_ko.txt index 04b4e2814156..4eec68c4e67f 100644 --- a/intl/icu/source/data/translit/cs_ko.txt +++ b/intl/icu/source/data/translit/cs_ko.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cs_ko.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/cy_cy_FONIPA.txt b/intl/icu/source/data/translit/cy_cy_FONIPA.txt index 7df84badd870..60bf95760c85 100644 --- a/intl/icu/source/data/translit/cy_cy_FONIPA.txt +++ b/intl/icu/source/data/translit/cy_cy_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: cy_cy_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/de_ASCII.txt b/intl/icu/source/data/translit/de_ASCII.txt index 614240ba08b5..637102157e7f 100644 --- a/intl/icu/source/data/translit/de_ASCII.txt +++ b/intl/icu/source/data/translit/de_ASCII.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: de_ASCII.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/dsb_dsb_FONIPA.txt b/intl/icu/source/data/translit/dsb_dsb_FONIPA.txt index da70c771d22d..6ed53190fc48 100644 --- a/intl/icu/source/data/translit/dsb_dsb_FONIPA.txt +++ b/intl/icu/source/data/translit/dsb_dsb_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: dsb_dsb_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/dv_dv_Latn_BGN.txt b/intl/icu/source/data/translit/dv_dv_Latn_BGN.txt index 45f0d12bae66..4eec469ce5c4 100644 --- a/intl/icu/source/data/translit/dv_dv_Latn_BGN.txt +++ b/intl/icu/source/data/translit/dv_dv_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: dv_dv_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/el_Lower.txt b/intl/icu/source/data/translit/el_Lower.txt index 06eaf407658f..54c6d113642f 100644 --- a/intl/icu/source/data/translit/el_Lower.txt +++ b/intl/icu/source/data/translit/el_Lower.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: el_Lower.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/el_Title.txt b/intl/icu/source/data/translit/el_Title.txt index 95b4fe95b7e4..f7fdd3a09147 100644 --- a/intl/icu/source/data/translit/el_Title.txt +++ b/intl/icu/source/data/translit/el_Title.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: el_Title.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/el_Upper.txt b/intl/icu/source/data/translit/el_Upper.txt index 3c3ff80f66c2..e0565a1f58cd 100644 --- a/intl/icu/source/data/translit/el_Upper.txt +++ b/intl/icu/source/data/translit/el_Upper.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: el_Upper.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/el_el_Latn_BGN.txt b/intl/icu/source/data/translit/el_el_Latn_BGN.txt index 6d7fbaf5d35f..75dff629bd2c 100644 --- a/intl/icu/source/data/translit/el_el_Latn_BGN.txt +++ b/intl/icu/source/data/translit/el_el_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: el_el_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/eo_am.txt b/intl/icu/source/data/translit/eo_am.txt index 826374f7b659..00fca9efabee 100644 --- a/intl/icu/source/data/translit/eo_am.txt +++ b/intl/icu/source/data/translit/eo_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: eo_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/eo_ar.txt b/intl/icu/source/data/translit/eo_ar.txt index 6d19d835a423..b926e707f50d 100644 --- a/intl/icu/source/data/translit/eo_ar.txt +++ b/intl/icu/source/data/translit/eo_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: eo_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/eo_chr.txt b/intl/icu/source/data/translit/eo_chr.txt index 787b3a168de0..2b9eed3c058d 100644 --- a/intl/icu/source/data/translit/eo_chr.txt +++ b/intl/icu/source/data/translit/eo_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: eo_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/eo_eo_FONIPA.txt b/intl/icu/source/data/translit/eo_eo_FONIPA.txt index 7e64b4260783..c7b40e0227f3 100644 --- a/intl/icu/source/data/translit/eo_eo_FONIPA.txt +++ b/intl/icu/source/data/translit/eo_eo_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: eo_eo_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/eo_fa.txt b/intl/icu/source/data/translit/eo_fa.txt index 422d0435b95b..dcec49a82f0d 100644 --- a/intl/icu/source/data/translit/eo_fa.txt +++ b/intl/icu/source/data/translit/eo_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: eo_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_419_am.txt b/intl/icu/source/data/translit/es_419_am.txt index 211092d105d1..3d8bfefc02f6 100644 --- a/intl/icu/source/data/translit/es_419_am.txt +++ b/intl/icu/source/data/translit/es_419_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_419_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_419_ar.txt b/intl/icu/source/data/translit/es_419_ar.txt index 7bfdca36803a..7e7142ef5ecd 100644 --- a/intl/icu/source/data/translit/es_419_ar.txt +++ b/intl/icu/source/data/translit/es_419_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_419_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_419_chr.txt b/intl/icu/source/data/translit/es_419_chr.txt index b3487a51d2d9..094331f5f7dc 100644 --- a/intl/icu/source/data/translit/es_419_chr.txt +++ b/intl/icu/source/data/translit/es_419_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_419_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_419_fa.txt b/intl/icu/source/data/translit/es_419_fa.txt index 1e1015ec010b..ef539f974091 100644 --- a/intl/icu/source/data/translit/es_419_fa.txt +++ b/intl/icu/source/data/translit/es_419_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_419_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_419_ja.txt b/intl/icu/source/data/translit/es_419_ja.txt index 13cb779f8479..12e590a3abcc 100644 --- a/intl/icu/source/data/translit/es_419_ja.txt +++ b/intl/icu/source/data/translit/es_419_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_419_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_419_zh.txt b/intl/icu/source/data/translit/es_419_zh.txt index d56702bb6a1e..4ca283d1cf12 100644 --- a/intl/icu/source/data/translit/es_419_zh.txt +++ b/intl/icu/source/data/translit/es_419_zh.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_419_zh.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_FONIPA_am.txt b/intl/icu/source/data/translit/es_FONIPA_am.txt index 63fb22b266c3..b111a6560b85 100644 --- a/intl/icu/source/data/translit/es_FONIPA_am.txt +++ b/intl/icu/source/data/translit/es_FONIPA_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_FONIPA_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_FONIPA_es_419_FONIPA.txt b/intl/icu/source/data/translit/es_FONIPA_es_419_FONIPA.txt index 12b46fe12657..da343205fe41 100644 --- a/intl/icu/source/data/translit/es_FONIPA_es_419_FONIPA.txt +++ b/intl/icu/source/data/translit/es_FONIPA_es_419_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_FONIPA_es_419_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_FONIPA_ja.txt b/intl/icu/source/data/translit/es_FONIPA_ja.txt index 22277b3bc734..761fea3a65b3 100644 --- a/intl/icu/source/data/translit/es_FONIPA_ja.txt +++ b/intl/icu/source/data/translit/es_FONIPA_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_FONIPA_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_FONIPA_zh.txt b/intl/icu/source/data/translit/es_FONIPA_zh.txt index e7798c936153..dfc33bef8e46 100644 --- a/intl/icu/source/data/translit/es_FONIPA_zh.txt +++ b/intl/icu/source/data/translit/es_FONIPA_zh.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_FONIPA_zh.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_am.txt b/intl/icu/source/data/translit/es_am.txt index 431602d5bffe..a9dc357eef19 100644 --- a/intl/icu/source/data/translit/es_am.txt +++ b/intl/icu/source/data/translit/es_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_ar.txt b/intl/icu/source/data/translit/es_ar.txt index 87a9e8621651..478b23c49e1b 100644 --- a/intl/icu/source/data/translit/es_ar.txt +++ b/intl/icu/source/data/translit/es_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_chr.txt b/intl/icu/source/data/translit/es_chr.txt index 96b0b74ec456..c48c26c0f7f7 100644 --- a/intl/icu/source/data/translit/es_chr.txt +++ b/intl/icu/source/data/translit/es_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_es_FONIPA.txt b/intl/icu/source/data/translit/es_es_FONIPA.txt index 89196cf3be20..a78c59f0c605 100644 --- a/intl/icu/source/data/translit/es_es_FONIPA.txt +++ b/intl/icu/source/data/translit/es_es_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_es_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_fa.txt b/intl/icu/source/data/translit/es_fa.txt index dedb23a518e5..9df0448102c6 100644 --- a/intl/icu/source/data/translit/es_fa.txt +++ b/intl/icu/source/data/translit/es_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_ja.txt b/intl/icu/source/data/translit/es_ja.txt index d50a61333495..9125a7003fca 100644 --- a/intl/icu/source/data/translit/es_ja.txt +++ b/intl/icu/source/data/translit/es_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/es_zh.txt b/intl/icu/source/data/translit/es_zh.txt index 17f4b5a27b20..815a56b48750 100644 --- a/intl/icu/source/data/translit/es_zh.txt +++ b/intl/icu/source/data/translit/es_zh.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: es_zh.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/fa_fa_FONIPA.txt b/intl/icu/source/data/translit/fa_fa_FONIPA.txt index d0f8097a058a..e8dd7028fcec 100644 --- a/intl/icu/source/data/translit/fa_fa_FONIPA.txt +++ b/intl/icu/source/data/translit/fa_fa_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: fa_fa_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/fa_fa_Latn_BGN.txt b/intl/icu/source/data/translit/fa_fa_Latn_BGN.txt index 0fd2d1181ea9..6b47cd170bc9 100644 --- a/intl/icu/source/data/translit/fa_fa_Latn_BGN.txt +++ b/intl/icu/source/data/translit/fa_fa_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: fa_fa_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ha_ha_NE.txt b/intl/icu/source/data/translit/ha_ha_NE.txt index 92aa80d396be..e8305da05cc8 100644 --- a/intl/icu/source/data/translit/ha_ha_NE.txt +++ b/intl/icu/source/data/translit/ha_ha_NE.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ha_ha_NE.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/he_he_Latn_BGN.txt b/intl/icu/source/data/translit/he_he_Latn_BGN.txt index fc971dbf5c13..fd799470525f 100644 --- a/intl/icu/source/data/translit/he_he_Latn_BGN.txt +++ b/intl/icu/source/data/translit/he_he_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: he_he_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_AREVMDA_am.txt b/intl/icu/source/data/translit/hy_AREVMDA_am.txt index e3440afca53d..71a518d933c8 100644 --- a/intl/icu/source/data/translit/hy_AREVMDA_am.txt +++ b/intl/icu/source/data/translit/hy_AREVMDA_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_AREVMDA_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_AREVMDA_ar.txt b/intl/icu/source/data/translit/hy_AREVMDA_ar.txt index 9e7421ffea1e..bb351aca2928 100644 --- a/intl/icu/source/data/translit/hy_AREVMDA_ar.txt +++ b/intl/icu/source/data/translit/hy_AREVMDA_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_AREVMDA_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_AREVMDA_chr.txt b/intl/icu/source/data/translit/hy_AREVMDA_chr.txt index 8c10c156de5b..65e0272fced2 100644 --- a/intl/icu/source/data/translit/hy_AREVMDA_chr.txt +++ b/intl/icu/source/data/translit/hy_AREVMDA_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_AREVMDA_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_AREVMDA_fa.txt b/intl/icu/source/data/translit/hy_AREVMDA_fa.txt index eb67e535b316..68f217a6dd20 100644 --- a/intl/icu/source/data/translit/hy_AREVMDA_fa.txt +++ b/intl/icu/source/data/translit/hy_AREVMDA_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_AREVMDA_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_AREVMDA_hy_AREVMDA_FONIPA.txt b/intl/icu/source/data/translit/hy_AREVMDA_hy_AREVMDA_FONIPA.txt index 2b3018a76a2a..061ec87f6833 100644 --- a/intl/icu/source/data/translit/hy_AREVMDA_hy_AREVMDA_FONIPA.txt +++ b/intl/icu/source/data/translit/hy_AREVMDA_hy_AREVMDA_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_AREVMDA_hy_AREVMDA_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_am.txt b/intl/icu/source/data/translit/hy_am.txt index 024a909a687c..9f8eb203e4f3 100644 --- a/intl/icu/source/data/translit/hy_am.txt +++ b/intl/icu/source/data/translit/hy_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_ar.txt b/intl/icu/source/data/translit/hy_ar.txt index dceab602c95b..36d27b8f4625 100644 --- a/intl/icu/source/data/translit/hy_ar.txt +++ b/intl/icu/source/data/translit/hy_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_chr.txt b/intl/icu/source/data/translit/hy_chr.txt index 969efe9f7f33..0ac6916f7344 100644 --- a/intl/icu/source/data/translit/hy_chr.txt +++ b/intl/icu/source/data/translit/hy_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_fa.txt b/intl/icu/source/data/translit/hy_fa.txt index 141ec3c6d77c..fa8fab98c3c4 100644 --- a/intl/icu/source/data/translit/hy_fa.txt +++ b/intl/icu/source/data/translit/hy_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_hy_FONIPA.txt b/intl/icu/source/data/translit/hy_hy_FONIPA.txt index be93da2d058d..698340094c57 100644 --- a/intl/icu/source/data/translit/hy_hy_FONIPA.txt +++ b/intl/icu/source/data/translit/hy_hy_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_hy_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/hy_hy_Latn_BGN.txt b/intl/icu/source/data/translit/hy_hy_Latn_BGN.txt index 3538737147cd..47abcaba7d16 100644 --- a/intl/icu/source/data/translit/hy_hy_Latn_BGN.txt +++ b/intl/icu/source/data/translit/hy_hy_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: hy_hy_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ia_am.txt b/intl/icu/source/data/translit/ia_am.txt index c77d89a75fe9..fbe2b2359589 100644 --- a/intl/icu/source/data/translit/ia_am.txt +++ b/intl/icu/source/data/translit/ia_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ia_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ia_ar.txt b/intl/icu/source/data/translit/ia_ar.txt index c0008630b39b..8c4b17b9cccf 100644 --- a/intl/icu/source/data/translit/ia_ar.txt +++ b/intl/icu/source/data/translit/ia_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ia_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ia_chr.txt b/intl/icu/source/data/translit/ia_chr.txt index a3bbda7d32e0..6a9f94d23649 100644 --- a/intl/icu/source/data/translit/ia_chr.txt +++ b/intl/icu/source/data/translit/ia_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ia_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ia_fa.txt b/intl/icu/source/data/translit/ia_fa.txt index 68d5ca7dec03..2a38475a67de 100644 --- a/intl/icu/source/data/translit/ia_fa.txt +++ b/intl/icu/source/data/translit/ia_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ia_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ia_ia_FONIPA.txt b/intl/icu/source/data/translit/ia_ia_FONIPA.txt index 48210de3a38d..5331e5beb923 100644 --- a/intl/icu/source/data/translit/ia_ia_FONIPA.txt +++ b/intl/icu/source/data/translit/ia_ia_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ia_ia_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/it_am.txt b/intl/icu/source/data/translit/it_am.txt index 9238bb580cc3..cc5723dd21de 100644 --- a/intl/icu/source/data/translit/it_am.txt +++ b/intl/icu/source/data/translit/it_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: it_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/it_ja.txt b/intl/icu/source/data/translit/it_ja.txt index 78e3a9bc0691..08ecffcc07d5 100644 --- a/intl/icu/source/data/translit/it_ja.txt +++ b/intl/icu/source/data/translit/it_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: it_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ja_Hrkt_ja_Latn_BGN.txt b/intl/icu/source/data/translit/ja_Hrkt_ja_Latn_BGN.txt index cb1e87bf7dfe..b79becc2dde1 100644 --- a/intl/icu/source/data/translit/ja_Hrkt_ja_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ja_Hrkt_ja_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ja_Hrkt_ja_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ja_Latn_ko.txt b/intl/icu/source/data/translit/ja_Latn_ko.txt index 9c0024ffb8fa..a123d810f0fc 100644 --- a/intl/icu/source/data/translit/ja_Latn_ko.txt +++ b/intl/icu/source/data/translit/ja_Latn_ko.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ja_Latn_ko.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ja_Latn_ru.txt b/intl/icu/source/data/translit/ja_Latn_ru.txt index fc2bf525a2ee..9d7ec6a24066 100644 --- a/intl/icu/source/data/translit/ja_Latn_ru.txt +++ b/intl/icu/source/data/translit/ja_Latn_ru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ja_Latn_ru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ka_ka_Latn_BGN.txt b/intl/icu/source/data/translit/ka_ka_Latn_BGN.txt index 39d352fad87d..6d27cc940bd4 100644 --- a/intl/icu/source/data/translit/ka_ka_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ka_ka_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ka_ka_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ka_ka_Latn_BGN_1981.txt b/intl/icu/source/data/translit/ka_ka_Latn_BGN_1981.txt index 9b805bc7bd05..f38a66fbffc3 100644 --- a/intl/icu/source/data/translit/ka_ka_Latn_BGN_1981.txt +++ b/intl/icu/source/data/translit/ka_ka_Latn_BGN_1981.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ka_ka_Latn_BGN_1981.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/kk_am.txt b/intl/icu/source/data/translit/kk_am.txt index 95090da3bed3..a7db89f7ab23 100644 --- a/intl/icu/source/data/translit/kk_am.txt +++ b/intl/icu/source/data/translit/kk_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: kk_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/kk_ar.txt b/intl/icu/source/data/translit/kk_ar.txt index 5cd9b5b19954..b6e19136c15e 100644 --- a/intl/icu/source/data/translit/kk_ar.txt +++ b/intl/icu/source/data/translit/kk_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: kk_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/kk_chr.txt b/intl/icu/source/data/translit/kk_chr.txt index 6503297d6c27..068df5529b9a 100644 --- a/intl/icu/source/data/translit/kk_chr.txt +++ b/intl/icu/source/data/translit/kk_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: kk_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/kk_fa.txt b/intl/icu/source/data/translit/kk_fa.txt index e86fa4001b44..cc8fb4587154 100644 --- a/intl/icu/source/data/translit/kk_fa.txt +++ b/intl/icu/source/data/translit/kk_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: kk_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/kk_kk_FONIPA.txt b/intl/icu/source/data/translit/kk_kk_FONIPA.txt index d5b43dbc7e5f..3a95d4db02a7 100644 --- a/intl/icu/source/data/translit/kk_kk_FONIPA.txt +++ b/intl/icu/source/data/translit/kk_kk_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: kk_kk_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/kk_kk_Latn_BGN.txt b/intl/icu/source/data/translit/kk_kk_Latn_BGN.txt index d9ef30e974cb..d69697f3eef9 100644 --- a/intl/icu/source/data/translit/kk_kk_Latn_BGN.txt +++ b/intl/icu/source/data/translit/kk_kk_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: kk_kk_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ko_ko_Latn_BGN.txt b/intl/icu/source/data/translit/ko_ko_Latn_BGN.txt index ff54254be1b2..5749fe0fa0e2 100644 --- a/intl/icu/source/data/translit/ko_ko_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ko_ko_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ko_ko_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ky_am.txt b/intl/icu/source/data/translit/ky_am.txt index d342ddd91bf6..e7c36542e4f3 100644 --- a/intl/icu/source/data/translit/ky_am.txt +++ b/intl/icu/source/data/translit/ky_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ky_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ky_ar.txt b/intl/icu/source/data/translit/ky_ar.txt index d877705ed3a9..8b488558db33 100644 --- a/intl/icu/source/data/translit/ky_ar.txt +++ b/intl/icu/source/data/translit/ky_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ky_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ky_chr.txt b/intl/icu/source/data/translit/ky_chr.txt index 9193c344cf92..44068941a947 100644 --- a/intl/icu/source/data/translit/ky_chr.txt +++ b/intl/icu/source/data/translit/ky_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ky_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ky_fa.txt b/intl/icu/source/data/translit/ky_fa.txt index 218d9c0eed59..595fefa141a9 100644 --- a/intl/icu/source/data/translit/ky_fa.txt +++ b/intl/icu/source/data/translit/ky_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ky_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ky_ky_FONIPA.txt b/intl/icu/source/data/translit/ky_ky_FONIPA.txt index 6aeb87940c64..fec9769c4bbb 100644 --- a/intl/icu/source/data/translit/ky_ky_FONIPA.txt +++ b/intl/icu/source/data/translit/ky_ky_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ky_ky_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ky_ky_Latn_BGN.txt b/intl/icu/source/data/translit/ky_ky_Latn_BGN.txt index 0f14c66466ef..0c7cf13a5dd0 100644 --- a/intl/icu/source/data/translit/ky_ky_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ky_ky_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ky_ky_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/la_la_FONIPA.txt b/intl/icu/source/data/translit/la_la_FONIPA.txt index e2d94e0b4337..c789c5a0c809 100644 --- a/intl/icu/source/data/translit/la_la_FONIPA.txt +++ b/intl/icu/source/data/translit/la_la_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: la_la_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/lt_Lower.txt b/intl/icu/source/data/translit/lt_Lower.txt index a90cff9ef2c4..f9c68ecf0ce3 100644 --- a/intl/icu/source/data/translit/lt_Lower.txt +++ b/intl/icu/source/data/translit/lt_Lower.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: lt_Lower.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/lt_Title.txt b/intl/icu/source/data/translit/lt_Title.txt index 018ba4d5f0f7..31c64191111d 100644 --- a/intl/icu/source/data/translit/lt_Title.txt +++ b/intl/icu/source/data/translit/lt_Title.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: lt_Title.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/lt_Upper.txt b/intl/icu/source/data/translit/lt_Upper.txt index 644b4224517b..06a708668a85 100644 --- a/intl/icu/source/data/translit/lt_Upper.txt +++ b/intl/icu/source/data/translit/lt_Upper.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: lt_Upper.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/mk_mk_Latn_BGN.txt b/intl/icu/source/data/translit/mk_mk_Latn_BGN.txt index 4dbd9999f869..f7f4ba3cee82 100644 --- a/intl/icu/source/data/translit/mk_mk_Latn_BGN.txt +++ b/intl/icu/source/data/translit/mk_mk_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: mk_mk_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/mn_mn_Latn_BGN.txt b/intl/icu/source/data/translit/mn_mn_Latn_BGN.txt index dbed925d0d6d..57e9b1047ab8 100644 --- a/intl/icu/source/data/translit/mn_mn_Latn_BGN.txt +++ b/intl/icu/source/data/translit/mn_mn_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: mn_mn_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/mn_mn_Latn_MNS.txt b/intl/icu/source/data/translit/mn_mn_Latn_MNS.txt index 88fe86101bb5..1a3a7e1c0fef 100644 --- a/intl/icu/source/data/translit/mn_mn_Latn_MNS.txt +++ b/intl/icu/source/data/translit/mn_mn_Latn_MNS.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: mn_mn_Latn_MNS.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_Zawgyi.txt b/intl/icu/source/data/translit/my_Zawgyi.txt index cd4d90fbc9a3..068379f25cbf 100644 --- a/intl/icu/source/data/translit/my_Zawgyi.txt +++ b/intl/icu/source/data/translit/my_Zawgyi.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_Zawgyi.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_am.txt b/intl/icu/source/data/translit/my_am.txt index 1901f12f9a2b..93b4f79ed803 100644 --- a/intl/icu/source/data/translit/my_am.txt +++ b/intl/icu/source/data/translit/my_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_ar.txt b/intl/icu/source/data/translit/my_ar.txt index 3a1e29e880ea..1d3dde395ae1 100644 --- a/intl/icu/source/data/translit/my_ar.txt +++ b/intl/icu/source/data/translit/my_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_chr.txt b/intl/icu/source/data/translit/my_chr.txt index c697d14d5771..3e5b38a45aee 100644 --- a/intl/icu/source/data/translit/my_chr.txt +++ b/intl/icu/source/data/translit/my_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_fa.txt b/intl/icu/source/data/translit/my_fa.txt index 466e1b3845f6..9e9e0c56b0af 100644 --- a/intl/icu/source/data/translit/my_fa.txt +++ b/intl/icu/source/data/translit/my_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_my_FONIPA.txt b/intl/icu/source/data/translit/my_my_FONIPA.txt index 7713d6eb2d7d..4436e7c1c353 100644 --- a/intl/icu/source/data/translit/my_my_FONIPA.txt +++ b/intl/icu/source/data/translit/my_my_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_my_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/my_my_Latn.txt b/intl/icu/source/data/translit/my_my_Latn.txt index 0bc05231f3c8..ff0bd44a6b66 100644 --- a/intl/icu/source/data/translit/my_my_Latn.txt +++ b/intl/icu/source/data/translit/my_my_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: my_my_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/nl_Title.txt b/intl/icu/source/data/translit/nl_Title.txt index 1243aee76781..7fce7b6955c8 100644 --- a/intl/icu/source/data/translit/nl_Title.txt +++ b/intl/icu/source/data/translit/nl_Title.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: nl_Title.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/nv_nv_FONIPA.txt b/intl/icu/source/data/translit/nv_nv_FONIPA.txt index 0d882bc5cf0d..49ca0157f775 100644 --- a/intl/icu/source/data/translit/nv_nv_FONIPA.txt +++ b/intl/icu/source/data/translit/nv_nv_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: nv_nv_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_FONIPA_ja.txt b/intl/icu/source/data/translit/pl_FONIPA_ja.txt index 70122906f401..a1d94e737ffb 100644 --- a/intl/icu/source/data/translit/pl_FONIPA_ja.txt +++ b/intl/icu/source/data/translit/pl_FONIPA_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_FONIPA_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_am.txt b/intl/icu/source/data/translit/pl_am.txt index 7c2e972856cf..717503234674 100644 --- a/intl/icu/source/data/translit/pl_am.txt +++ b/intl/icu/source/data/translit/pl_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_ar.txt b/intl/icu/source/data/translit/pl_ar.txt index 623f1c01538e..fa224b85899b 100644 --- a/intl/icu/source/data/translit/pl_ar.txt +++ b/intl/icu/source/data/translit/pl_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_chr.txt b/intl/icu/source/data/translit/pl_chr.txt index e738a19704b0..956dd7798e35 100644 --- a/intl/icu/source/data/translit/pl_chr.txt +++ b/intl/icu/source/data/translit/pl_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_fa.txt b/intl/icu/source/data/translit/pl_fa.txt index bac9dd68ecfa..f2a3505fd374 100644 --- a/intl/icu/source/data/translit/pl_fa.txt +++ b/intl/icu/source/data/translit/pl_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_ja.txt b/intl/icu/source/data/translit/pl_ja.txt index 9b5f9b354a61..a71a5a30b7ac 100644 --- a/intl/icu/source/data/translit/pl_ja.txt +++ b/intl/icu/source/data/translit/pl_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/pl_pl_FONIPA.txt b/intl/icu/source/data/translit/pl_pl_FONIPA.txt index 6ee4cfb5f987..248d87f3eee7 100644 --- a/intl/icu/source/data/translit/pl_pl_FONIPA.txt +++ b/intl/icu/source/data/translit/pl_pl_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: pl_pl_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ps_ps_Latn_BGN.txt b/intl/icu/source/data/translit/ps_ps_Latn_BGN.txt index 90f48df9ef7f..595c8f9df092 100644 --- a/intl/icu/source/data/translit/ps_ps_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ps_ps_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ps_ps_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/rm_SURSILV_am.txt b/intl/icu/source/data/translit/rm_SURSILV_am.txt index b7319459e7dc..1898b89dd20c 100644 --- a/intl/icu/source/data/translit/rm_SURSILV_am.txt +++ b/intl/icu/source/data/translit/rm_SURSILV_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: rm_SURSILV_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/rm_SURSILV_ar.txt b/intl/icu/source/data/translit/rm_SURSILV_ar.txt index e6da6120cbb6..86389aa3e0dd 100644 --- a/intl/icu/source/data/translit/rm_SURSILV_ar.txt +++ b/intl/icu/source/data/translit/rm_SURSILV_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: rm_SURSILV_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/rm_SURSILV_chr.txt b/intl/icu/source/data/translit/rm_SURSILV_chr.txt index da47518730de..167d833f3230 100644 --- a/intl/icu/source/data/translit/rm_SURSILV_chr.txt +++ b/intl/icu/source/data/translit/rm_SURSILV_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: rm_SURSILV_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/rm_SURSILV_fa.txt b/intl/icu/source/data/translit/rm_SURSILV_fa.txt index 7b5e8c6db5df..b71ca911d090 100644 --- a/intl/icu/source/data/translit/rm_SURSILV_fa.txt +++ b/intl/icu/source/data/translit/rm_SURSILV_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: rm_SURSILV_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/rm_SURSILV_rm_FONIPA_SURSILV.txt b/intl/icu/source/data/translit/rm_SURSILV_rm_FONIPA_SURSILV.txt index ec69a0d63796..8bdfca937d7a 100644 --- a/intl/icu/source/data/translit/rm_SURSILV_rm_FONIPA_SURSILV.txt +++ b/intl/icu/source/data/translit/rm_SURSILV_rm_FONIPA_SURSILV.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: rm_SURSILV_rm_FONIPA_SURSILV.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_FONIPA_ja.txt b/intl/icu/source/data/translit/ro_FONIPA_ja.txt index 8e2f97e6ad30..9251086bbff4 100644 --- a/intl/icu/source/data/translit/ro_FONIPA_ja.txt +++ b/intl/icu/source/data/translit/ro_FONIPA_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_FONIPA_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_am.txt b/intl/icu/source/data/translit/ro_am.txt index 9be22b847fb5..5bc9c525620d 100644 --- a/intl/icu/source/data/translit/ro_am.txt +++ b/intl/icu/source/data/translit/ro_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_ar.txt b/intl/icu/source/data/translit/ro_ar.txt index 6d850ca21386..a413aa3d5570 100644 --- a/intl/icu/source/data/translit/ro_ar.txt +++ b/intl/icu/source/data/translit/ro_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_chr.txt b/intl/icu/source/data/translit/ro_chr.txt index b3ea3c1dc08b..496a71ac404a 100644 --- a/intl/icu/source/data/translit/ro_chr.txt +++ b/intl/icu/source/data/translit/ro_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_fa.txt b/intl/icu/source/data/translit/ro_fa.txt index 809ef00fcc21..e19285e2979a 100644 --- a/intl/icu/source/data/translit/ro_fa.txt +++ b/intl/icu/source/data/translit/ro_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_ja.txt b/intl/icu/source/data/translit/ro_ja.txt index 999718ba4126..2483ff1820f8 100644 --- a/intl/icu/source/data/translit/ro_ja.txt +++ b/intl/icu/source/data/translit/ro_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ro_ro_FONIPA.txt b/intl/icu/source/data/translit/ro_ro_FONIPA.txt index f96589640f3b..68aaacf6415c 100644 --- a/intl/icu/source/data/translit/ro_ro_FONIPA.txt +++ b/intl/icu/source/data/translit/ro_ro_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ro_ro_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/root.txt b/intl/icu/source/data/translit/root.txt index c774df902961..94f6e42afb97 100644 --- a/intl/icu/source/data/translit/root.txt +++ b/intl/icu/source/data/translit/root.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * File: root.txt */ diff --git a/intl/icu/source/data/translit/ru_Latn_ru_BGN.txt b/intl/icu/source/data/translit/ru_Latn_ru_BGN.txt index 19196b05aee1..10759475a125 100644 --- a/intl/icu/source/data/translit/ru_Latn_ru_BGN.txt +++ b/intl/icu/source/data/translit/ru_Latn_ru_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ru_Latn_ru_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ru_ja.txt b/intl/icu/source/data/translit/ru_ja.txt index f28487631d40..129986a1ba73 100644 --- a/intl/icu/source/data/translit/ru_ja.txt +++ b/intl/icu/source/data/translit/ru_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ru_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ru_ru_Latn_BGN.txt b/intl/icu/source/data/translit/ru_ru_Latn_BGN.txt index be3a4e87664d..e8a62ad172c8 100644 --- a/intl/icu/source/data/translit/ru_ru_Latn_BGN.txt +++ b/intl/icu/source/data/translit/ru_ru_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ru_ru_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ru_zh.txt b/intl/icu/source/data/translit/ru_zh.txt index 694fd17b440e..7653ebd7ed80 100644 --- a/intl/icu/source/data/translit/ru_zh.txt +++ b/intl/icu/source/data/translit/ru_zh.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ru_zh.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sat_Olck_sat_FONIPA.txt b/intl/icu/source/data/translit/sat_Olck_sat_FONIPA.txt index 4a6105d0b0d8..b1316179b7f8 100644 --- a/intl/icu/source/data/translit/sat_Olck_sat_FONIPA.txt +++ b/intl/icu/source/data/translit/sat_Olck_sat_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sat_Olck_sat_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sat_am.txt b/intl/icu/source/data/translit/sat_am.txt index c52cb39a06d8..5a41b79c4e5d 100644 --- a/intl/icu/source/data/translit/sat_am.txt +++ b/intl/icu/source/data/translit/sat_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sat_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sat_ar.txt b/intl/icu/source/data/translit/sat_ar.txt index 9df1b0371791..7bc98537e932 100644 --- a/intl/icu/source/data/translit/sat_ar.txt +++ b/intl/icu/source/data/translit/sat_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sat_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sat_chr.txt b/intl/icu/source/data/translit/sat_chr.txt index b6b63b0d3548..7be27e9e5c79 100644 --- a/intl/icu/source/data/translit/sat_chr.txt +++ b/intl/icu/source/data/translit/sat_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sat_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sat_fa.txt b/intl/icu/source/data/translit/sat_fa.txt index 08cda47da032..133e55b180cc 100644 --- a/intl/icu/source/data/translit/sat_fa.txt +++ b/intl/icu/source/data/translit/sat_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sat_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/si_am.txt b/intl/icu/source/data/translit/si_am.txt index 702ab9cb18e5..6a5597cab925 100644 --- a/intl/icu/source/data/translit/si_am.txt +++ b/intl/icu/source/data/translit/si_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: si_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/si_ar.txt b/intl/icu/source/data/translit/si_ar.txt index 11ad884240f6..7d7e8173276e 100644 --- a/intl/icu/source/data/translit/si_ar.txt +++ b/intl/icu/source/data/translit/si_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: si_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/si_chr.txt b/intl/icu/source/data/translit/si_chr.txt index 1cd4beb0832c..30fe3d1eead6 100644 --- a/intl/icu/source/data/translit/si_chr.txt +++ b/intl/icu/source/data/translit/si_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: si_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/si_fa.txt b/intl/icu/source/data/translit/si_fa.txt index 7b89a36fa323..22a311551dcf 100644 --- a/intl/icu/source/data/translit/si_fa.txt +++ b/intl/icu/source/data/translit/si_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: si_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/si_si_FONIPA.txt b/intl/icu/source/data/translit/si_si_FONIPA.txt index b1c6c8ac28fb..581de75f0e81 100644 --- a/intl/icu/source/data/translit/si_si_FONIPA.txt +++ b/intl/icu/source/data/translit/si_si_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: si_si_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/si_si_Latn.txt b/intl/icu/source/data/translit/si_si_Latn.txt index f17dbe19ec4c..1bad5c0c005c 100644 --- a/intl/icu/source/data/translit/si_si_Latn.txt +++ b/intl/icu/source/data/translit/si_si_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: si_si_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_FONIPA_ja.txt b/intl/icu/source/data/translit/sk_FONIPA_ja.txt index 40dcf9d14453..07bd28a39479 100644 --- a/intl/icu/source/data/translit/sk_FONIPA_ja.txt +++ b/intl/icu/source/data/translit/sk_FONIPA_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_FONIPA_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_am.txt b/intl/icu/source/data/translit/sk_am.txt index 0ecf8a7e9a03..a09aca78e55d 100644 --- a/intl/icu/source/data/translit/sk_am.txt +++ b/intl/icu/source/data/translit/sk_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_ar.txt b/intl/icu/source/data/translit/sk_ar.txt index 4d815cd0a94c..a90f87f38d6d 100644 --- a/intl/icu/source/data/translit/sk_ar.txt +++ b/intl/icu/source/data/translit/sk_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_chr.txt b/intl/icu/source/data/translit/sk_chr.txt index dc91cf1bae81..b0be3bce0bcb 100644 --- a/intl/icu/source/data/translit/sk_chr.txt +++ b/intl/icu/source/data/translit/sk_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_fa.txt b/intl/icu/source/data/translit/sk_fa.txt index fe6d8aab24cf..db8a82581c19 100644 --- a/intl/icu/source/data/translit/sk_fa.txt +++ b/intl/icu/source/data/translit/sk_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_ja.txt b/intl/icu/source/data/translit/sk_ja.txt index 3e937024d853..ba5d96af843e 100644 --- a/intl/icu/source/data/translit/sk_ja.txt +++ b/intl/icu/source/data/translit/sk_ja.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_ja.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sk_sk_FONIPA.txt b/intl/icu/source/data/translit/sk_sk_FONIPA.txt index 807b659f1a75..bfffbd012e6e 100644 --- a/intl/icu/source/data/translit/sk_sk_FONIPA.txt +++ b/intl/icu/source/data/translit/sk_sk_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sk_sk_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/sr_sr_Latn_BGN.txt b/intl/icu/source/data/translit/sr_sr_Latn_BGN.txt index 6389f8564b77..a979ff94ab75 100644 --- a/intl/icu/source/data/translit/sr_sr_Latn_BGN.txt +++ b/intl/icu/source/data/translit/sr_sr_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: sr_sr_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/ta_ta_FONIPA.txt b/intl/icu/source/data/translit/ta_ta_FONIPA.txt index 1334fb15c53c..812c5c2e0367 100644 --- a/intl/icu/source/data/translit/ta_ta_FONIPA.txt +++ b/intl/icu/source/data/translit/ta_ta_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ta_ta_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tk_Cyrl_tk_BGN.txt b/intl/icu/source/data/translit/tk_Cyrl_tk_BGN.txt index da7785433acd..e042a53901e4 100644 --- a/intl/icu/source/data/translit/tk_Cyrl_tk_BGN.txt +++ b/intl/icu/source/data/translit/tk_Cyrl_tk_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tk_Cyrl_tk_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tlh_am.txt b/intl/icu/source/data/translit/tlh_am.txt index 6d0c893123c1..4e18e580a07f 100644 --- a/intl/icu/source/data/translit/tlh_am.txt +++ b/intl/icu/source/data/translit/tlh_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tlh_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tlh_ar.txt b/intl/icu/source/data/translit/tlh_ar.txt index 358aee9012d6..3b88f63e58e3 100644 --- a/intl/icu/source/data/translit/tlh_ar.txt +++ b/intl/icu/source/data/translit/tlh_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tlh_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tlh_chr.txt b/intl/icu/source/data/translit/tlh_chr.txt index 1b77102b9aec..e0d8bdd1e7b2 100644 --- a/intl/icu/source/data/translit/tlh_chr.txt +++ b/intl/icu/source/data/translit/tlh_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tlh_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tlh_fa.txt b/intl/icu/source/data/translit/tlh_fa.txt index 67c9aef8a7f9..77744099e6ae 100644 --- a/intl/icu/source/data/translit/tlh_fa.txt +++ b/intl/icu/source/data/translit/tlh_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tlh_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tlh_tlh_FONIPA.txt b/intl/icu/source/data/translit/tlh_tlh_FONIPA.txt index 8b63b6656010..7d34755d4093 100644 --- a/intl/icu/source/data/translit/tlh_tlh_FONIPA.txt +++ b/intl/icu/source/data/translit/tlh_tlh_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tlh_tlh_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tr_Lower.txt b/intl/icu/source/data/translit/tr_Lower.txt index 8fbf10689ab8..4af866d38afb 100644 --- a/intl/icu/source/data/translit/tr_Lower.txt +++ b/intl/icu/source/data/translit/tr_Lower.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tr_Lower.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tr_Title.txt b/intl/icu/source/data/translit/tr_Title.txt index 745c5b8f9152..bff96a6bf88a 100644 --- a/intl/icu/source/data/translit/tr_Title.txt +++ b/intl/icu/source/data/translit/tr_Title.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tr_Title.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/tr_Upper.txt b/intl/icu/source/data/translit/tr_Upper.txt index 24c629aaed9d..9155bb57fa4d 100644 --- a/intl/icu/source/data/translit/tr_Upper.txt +++ b/intl/icu/source/data/translit/tr_Upper.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: tr_Upper.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/trnsfiles.mk b/intl/icu/source/data/translit/trnsfiles.mk deleted file mode 100644 index 3c2630b8200c..000000000000 --- a/intl/icu/source/data/translit/trnsfiles.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html -# * Copyright (C) 1997-2006, International Business Machines -# * Corporation and others. All Rights Reserved. -# A list of txt's to build -# Note: -# -# If you are thinking of modifying this file, READ THIS. -# -# Instead of changing this file [unless you want to check it back in], -# you should consider creating a 'trnslocal.mk' file in this same directory. -# Then, you can have your local changes remain even if you upgrade or re -# configure the ICU. -# -# Example 'trnslocal.mk' files: -# -# * To add an additional transliterators to the list: -# _____________________________________________________ -# | TRANSLIT_SOURCE_LOCAL = myTranslitRules.txt ... -# -# * To REPLACE the default list and only build with a few -# transliterators: -# _____________________________________________________ -# | TRANLIST_SOURCE = el.txt th.txt -# -# - -TRANSLIT_SOURCE=root.txt en.txt el.txt diff --git a/intl/icu/source/data/translit/ug_ug_FONIPA.txt b/intl/icu/source/data/translit/ug_ug_FONIPA.txt index 8ba1ab2085d4..b6716eea4b02 100644 --- a/intl/icu/source/data/translit/ug_ug_FONIPA.txt +++ b/intl/icu/source/data/translit/ug_ug_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: ug_ug_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/uk_uk_Latn_BGN.txt b/intl/icu/source/data/translit/uk_uk_Latn_BGN.txt index c2da7942049c..fdba3cab5503 100644 --- a/intl/icu/source/data/translit/uk_uk_Latn_BGN.txt +++ b/intl/icu/source/data/translit/uk_uk_Latn_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: uk_uk_Latn_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/und_FONIPA_ar.txt b/intl/icu/source/data/translit/und_FONIPA_ar.txt index 1e79833c4943..ba60ef4a5dae 100644 --- a/intl/icu/source/data/translit/und_FONIPA_ar.txt +++ b/intl/icu/source/data/translit/und_FONIPA_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: und_FONIPA_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/und_FONIPA_chr.txt b/intl/icu/source/data/translit/und_FONIPA_chr.txt index 5448e0564e82..38484e336a45 100644 --- a/intl/icu/source/data/translit/und_FONIPA_chr.txt +++ b/intl/icu/source/data/translit/und_FONIPA_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: und_FONIPA_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/und_FONIPA_fa.txt b/intl/icu/source/data/translit/und_FONIPA_fa.txt index 5a1a322c8e34..12060f2ae245 100644 --- a/intl/icu/source/data/translit/und_FONIPA_fa.txt +++ b/intl/icu/source/data/translit/und_FONIPA_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: und_FONIPA_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/und_FONIPA_und_FONXSAMP.txt b/intl/icu/source/data/translit/und_FONIPA_und_FONXSAMP.txt index b86314682a2a..c8c5ccadda31 100644 --- a/intl/icu/source/data/translit/und_FONIPA_und_FONXSAMP.txt +++ b/intl/icu/source/data/translit/und_FONIPA_und_FONXSAMP.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: und_FONIPA_und_FONXSAMP.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/uz_Cyrl_uz_BGN.txt b/intl/icu/source/data/translit/uz_Cyrl_uz_BGN.txt index 84898e65e108..f30265c90a88 100644 --- a/intl/icu/source/data/translit/uz_Cyrl_uz_BGN.txt +++ b/intl/icu/source/data/translit/uz_Cyrl_uz_BGN.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: uz_Cyrl_uz_BGN.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/uz_Cyrl_uz_Latn.txt b/intl/icu/source/data/translit/uz_Cyrl_uz_Latn.txt index ae94dddfe5a1..fb570ffaf7b9 100644 --- a/intl/icu/source/data/translit/uz_Cyrl_uz_Latn.txt +++ b/intl/icu/source/data/translit/uz_Cyrl_uz_Latn.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: uz_Cyrl_uz_Latn.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/vec_vec_FONIPA.txt b/intl/icu/source/data/translit/vec_vec_FONIPA.txt index 8920ee434beb..b91e42c62d59 100644 --- a/intl/icu/source/data/translit/vec_vec_FONIPA.txt +++ b/intl/icu/source/data/translit/vec_vec_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: vec_vec_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/xh_am.txt b/intl/icu/source/data/translit/xh_am.txt index 639732c1b392..94f34b55e580 100644 --- a/intl/icu/source/data/translit/xh_am.txt +++ b/intl/icu/source/data/translit/xh_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: xh_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/xh_ar.txt b/intl/icu/source/data/translit/xh_ar.txt index 586b1bacecc5..44078b812065 100644 --- a/intl/icu/source/data/translit/xh_ar.txt +++ b/intl/icu/source/data/translit/xh_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: xh_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/xh_chr.txt b/intl/icu/source/data/translit/xh_chr.txt index 6d05af401688..d951252f8752 100644 --- a/intl/icu/source/data/translit/xh_chr.txt +++ b/intl/icu/source/data/translit/xh_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: xh_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/xh_fa.txt b/intl/icu/source/data/translit/xh_fa.txt index ae2e4910d5ab..f1b28280a73f 100644 --- a/intl/icu/source/data/translit/xh_fa.txt +++ b/intl/icu/source/data/translit/xh_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: xh_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/xh_xh_FONIPA.txt b/intl/icu/source/data/translit/xh_xh_FONIPA.txt index f9b3ebc6c8fe..1d5f9a1dfd05 100644 --- a/intl/icu/source/data/translit/xh_xh_FONIPA.txt +++ b/intl/icu/source/data/translit/xh_xh_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: xh_xh_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/yo_yo_BJ.txt b/intl/icu/source/data/translit/yo_yo_BJ.txt index 0eea75a6e153..f6111169c4c9 100644 --- a/intl/icu/source/data/translit/yo_yo_BJ.txt +++ b/intl/icu/source/data/translit/yo_yo_BJ.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: yo_yo_BJ.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/zh_Latn_PINYIN_ru.txt b/intl/icu/source/data/translit/zh_Latn_PINYIN_ru.txt index ef543daad4b1..ca84af68357e 100644 --- a/intl/icu/source/data/translit/zh_Latn_PINYIN_ru.txt +++ b/intl/icu/source/data/translit/zh_Latn_PINYIN_ru.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: zh_Latn_PINYIN_ru.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/zu_am.txt b/intl/icu/source/data/translit/zu_am.txt index 4a46f63d63c6..2ff8fc21f3b1 100644 --- a/intl/icu/source/data/translit/zu_am.txt +++ b/intl/icu/source/data/translit/zu_am.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: zu_am.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/zu_ar.txt b/intl/icu/source/data/translit/zu_ar.txt index 08799a8eabd2..a74430d7b7bf 100644 --- a/intl/icu/source/data/translit/zu_ar.txt +++ b/intl/icu/source/data/translit/zu_ar.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: zu_ar.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/zu_chr.txt b/intl/icu/source/data/translit/zu_chr.txt index e1d4f3387478..6686e573ca8c 100644 --- a/intl/icu/source/data/translit/zu_chr.txt +++ b/intl/icu/source/data/translit/zu_chr.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: zu_chr.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/zu_fa.txt b/intl/icu/source/data/translit/zu_fa.txt index 69e7cb719e21..9efb57c54b74 100644 --- a/intl/icu/source/data/translit/zu_fa.txt +++ b/intl/icu/source/data/translit/zu_fa.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: zu_fa.txt # Generated from CLDR diff --git a/intl/icu/source/data/translit/zu_zu_FONIPA.txt b/intl/icu/source/data/translit/zu_zu_FONIPA.txt index 530d9a0fbc18..ea8abf439237 100644 --- a/intl/icu/source/data/translit/zu_zu_FONIPA.txt +++ b/intl/icu/source/data/translit/zu_zu_FONIPA.txt @@ -1,5 +1,6 @@ # © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License +# License & terms of use: http://www.unicode.org/copyright.html +# Generated using tools/cldr/cldr-to-icu/build-icu-data.xml # # File: zu_zu_FONIPA.txt # Generated from CLDR diff --git a/intl/icu/source/data/unit/LOCALE_DEPS.json b/intl/icu/source/data/unit/LOCALE_DEPS.json index 681e78cf5870..2508537d097a 100644 --- a/intl/icu/source/data/unit/LOCALE_DEPS.json +++ b/intl/icu/source/data/unit/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -33,7 +34,7 @@ "sh_YU": "sr_Latn_RS", "shi_MA": "shi_Tfng_MA", "sr_BA": "sr_Cyrl_BA", - "sr_CS": "sr_Cyrl_RS", + "sr_CS": "sr_RS", "sr_Cyrl_CS": "sr_Cyrl_RS", "sr_Cyrl_YU": "sr_Cyrl_RS", "sr_Latn_CS": "sr_Latn_RS", @@ -41,7 +42,7 @@ "sr_ME": "sr_Latn_ME", "sr_RS": "sr_Cyrl_RS", "sr_XK": "sr_Cyrl_XK", - "sr_YU": "sr_Cyrl_RS", + "sr_YU": "sr_RS", "su_ID": "su_Latn_ID", "tl": "fil", "tl_PH": "fil_PH", diff --git a/intl/icu/source/data/unit/af.txt b/intl/icu/source/data/unit/af.txt index dfeb458bab8b..34d07dfd4aa4 100644 --- a/intl/icu/source/data/unit/af.txt +++ b/intl/icu/source/data/unit/af.txt @@ -1,10 +1,10 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ - Version{"37"} durationUnits{ - hm{"h:mm"} - hms{"h:mm:ss"} + hm{"hh:mm"} + hms{"hh:mm:ss"} ms{"mm:ss"} } units{ @@ -284,7 +284,7 @@ af{ dnam{"sekondes"} one{"{0} sekonde"} other{"{0} sekondes"} - per{"{0}/s"} + per{"{0} per sekonde"} } week{ dnam{"weke"} @@ -403,6 +403,11 @@ af{ } } graphics{ + dot{ + dnam{"stippel"} + one{"{0}stippel"} + other{"{0}stippel"} + } dot-per-centimeter{ dnam{"stippels per sentimeter"} one{"{0} stippel per sentimeter"} @@ -416,11 +421,26 @@ af{ em{ dnam{"tipografiese em"} } + megapixel{ + dnam{"megapieksels"} + one{"{0} megapieksel"} + other{"{0} megapieksels"} + } pixel{ dnam{"pieksels"} one{"{0} pieksel"} other{"{0} pieksels"} } + pixel-per-centimeter{ + dnam{"pieksels per sentimeter"} + one{"{0} pieksel per sentimeter"} + other{"{0} pieksels per sentimeter"} + } + pixel-per-inch{ + dnam{"pieksels per duim"} + one{"{0} pieksel per duim"} + other{"{0} pieksels per duim"} + } } length{ astronomical-unit{ @@ -439,12 +459,26 @@ af{ one{"{0} desimeter"} other{"{0} desimeter"} } + earth-radius{ + dnam{"aardstraal"} + one{"{0} aardstraal"} + other{"{0} aardstraal"} + } + fathom{ + one{"{0} vaam"} + other{"{0} vaam"} + } foot{ dnam{"voet"} one{"{0} voet"} other{"{0} voet"} per{"{0} per voet"} } + furlong{ + dnam{"furlongs"} + one{"{0} furlong"} + other{"{0} furlongs"} + } inch{ dnam{"duim"} one{"{0} duim"} @@ -525,6 +559,16 @@ af{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -552,6 +596,11 @@ af{ one{"{0} aardemassa"} other{"{0} aardemassas"} } + grain{ + dnam{"korrelgewig"} + one{"{0} korrelgewig"} + other{"{0} korrelgewig"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -601,6 +650,11 @@ af{ one{"{0} sonmassa"} other{"{0} sonmassas"} } + stone{ + dnam{"stone"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ dnam{"VSA-ton"} one{"{0} VSA-ton"} @@ -716,8 +770,8 @@ af{ } generic{ dnam{"°"} - one{"{0}°"} - other{"{0}°"} + one{"{0} graad"} + other{"{0} graad"} } kelvin{ dnam{"kelvin"} @@ -733,7 +787,7 @@ af{ } pound-force-foot{ dnam{"pondvoet"} - one{"{0} pondvoet"} + one{"{0} pondvoetkrag"} other{"{0} pondvoet"} } } @@ -748,6 +802,10 @@ af{ one{"{0} vat"} other{"{0} vate"} } + bushel{ + one{"{0} skepel"} + other{"{0} skepel"} + } centiliter{ dnam{"sentiliter"} one{"{0} sentiliter"} @@ -805,6 +863,26 @@ af{ one{"{0} desiliter"} other{"{0} desiliter"} } + dessert-spoon{ + dnam{"dessertlepel"} + one{"{0} dstlpl."} + other{"{0} dessertlepel"} + } + dessert-spoon-imperial{ + dnam{"Engelse dessertlepel"} + one{"{0} Engelse dessertlepel"} + other{"{0} Engelse dessertlepel"} + } + dram{ + dnam{"dragme"} + one{"{0} dragme"} + other{"{0} dragme"} + } + drop{ + dnam{"druppel"} + one{"{0} druppel"} + other{"{0} druppels"} + } fluid-ounce{ dnam{"vloeistofons"} one{"{0} vloeistofons"} @@ -832,6 +910,11 @@ af{ one{"{0} hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"sopie"} + one{"{0} sopie"} + other{"{0} sopies"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -848,6 +931,11 @@ af{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"knypie"} + one{"{0} knypie"} + other{"{0} knypie"} + } pint{ dnam{"pinte"} one{"{0} pint"} @@ -863,6 +951,11 @@ af{ one{"{0} VSA-kwartgelling"} other{"{0} VSA-kwartgellings"} } + quart-imperial{ + dnam{"kwartgelling"} + one{"{0} Engelse kwartgelling"} + other{"{0} Engelse kwartgelling"} + } tablespoon{ dnam{"eetlepels"} one{"{0} eetlepel"} @@ -1382,7 +1475,7 @@ af{ other{"{0} μs."} } millisecond{ - dnam{"millisekondes"} + dnam{"millisek."} one{"{0} ms."} other{"{0} ms"} } @@ -1526,6 +1619,11 @@ af{ } } graphics{ + dot{ + dnam{"stip."} + one{"{0} stip."} + other{"{0} stip."} + } dot-per-centimeter{ dnam{"stip./cm"} one{"{0} stip./cm"} @@ -1579,12 +1677,22 @@ af{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"vaam"} + one{"{0} vaam"} + other{"{0} vaam"} + } foot{ dnam{"voet"} one{"{0} vt."} other{"{0} vt."} per{"{0}/vt."} } + furlong{ + dnam{"furlongs"} + one{"{0} fur."} + other{"{0} fur."} + } inch{ dnam{"duim"} one{"{0} duim"} @@ -1692,6 +1800,11 @@ af{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"korrelgewig"} + one{"{0} korrelgewig"} + other{"{0} korrelgewig"} + } gram{ dnam{"gram"} one{"{0} g"} @@ -1741,6 +1854,9 @@ af{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"stone"} + } ton{ dnam{"VSA-ton"} one{"{0} VSA-t."} @@ -1897,6 +2013,10 @@ af{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + one{"{0} skepel"} + other{"{0} skepel"} + } centiliter{ dnam{"cℓ"} one{"{0} cℓ"} @@ -1954,6 +2074,26 @@ af{ one{"{0} dℓ"} other{"{0} dℓ"} } + dessert-spoon{ + dnam{"dstlpl."} + one{"{0} dstlpl."} + other{"{0} dstlpl."} + } + dessert-spoon-imperial{ + dnam{"dstlpl. Eng."} + one{"{0} dstlpl. Eng."} + other{"{0} dstlpl. Eng."} + } + dram{ + dnam{"dragme vloeistof"} + one{"{0} dr. vl."} + other{"{0} dr. vl."} + } + drop{ + dnam{"druppel"} + one{"{0} druppel"} + other{"{0} druppels"} + } fluid-ounce{ dnam{"vl.oz."} one{"{0} vl.oz."} @@ -1981,6 +2121,11 @@ af{ one{"{0} hℓ"} other{"{0} hℓ"} } + jigger{ + dnam{"sopie"} + one{"{0} sopie"} + other{"{0} sopies"} + } liter{ dnam{"liter"} one{"{0} ℓ"} @@ -1997,6 +2142,11 @@ af{ one{"{0} mℓ"} other{"{0} mℓ"} } + pinch{ + dnam{"knypie"} + one{"{0} knypie"} + other{"{0} knypie"} + } pint{ dnam{"pinte"} one{"{0} pt."} @@ -2012,6 +2162,11 @@ af{ one{"{0} VSA-kw.gell."} other{"{0} VSA-kw.gell."} } + quart-imperial{ + dnam{"kwart Eng."} + one{"{0} kwart Eng."} + other{"{0} kwart Eng."} + } tablespoon{ dnam{"e."} one{"{0} e."} diff --git a/intl/icu/source/data/unit/agq.txt b/intl/icu/source/data/unit/agq.txt index b54dffaac06d..a75f2528f564 100644 --- a/intl/icu/source/data/unit/agq.txt +++ b/intl/icu/source/data/unit/agq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml agq{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ak.txt b/intl/icu/source/data/unit/ak.txt index 5057e2a0be4b..9e5c5d1786b0 100644 --- a/intl/icu/source/data/unit/ak.txt +++ b/intl/icu/source/data/unit/ak.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/am.txt b/intl/icu/source/data/unit/am.txt index 9f091f70b145..6d7ff92716c8 100644 --- a/intl/icu/source/data/unit/am.txt +++ b/intl/icu/source/data/unit/am.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -383,6 +383,11 @@ am{ } } graphics{ + dot{ + dnam{"ነቁጥ"} + one{"{0} ነቁጥ"} + other{"{0} ነቁጥ"} + } dot-per-centimeter{ dnam{"ነበሴሜ"} one{"{0} ነበሴሜ"} @@ -393,6 +398,9 @@ am{ one{"{0} ነበኢ"} other{"{0} ነበኢ"} } + em{ + dnam{"ታይፖግራፊክ em"} + } megapixel{ dnam{"ሜጋ ፒክስል"} one{"{0} ሜጋ ፒክስል"} @@ -431,12 +439,22 @@ am{ one{"{0} ዴሲ ሜትር"} other{"{0} ዴሲ ሜትር"} } + fathom{ + dnam{"ተዳክሞዎች"} + one{"{0} ተዳክሞ"} + other{"{0} ተዳክሞዎች"} + } foot{ dnam{"ጫማ"} one{"{0} ጫማ"} other{"{0} ጫማ"} per{"{0}/ጫማ"} } + furlong{ + dnam{"ፈሎን"} + one{"{0} ፈሎን"} + other{"{0} ፈሎን"} + } inch{ dnam{"ኢንች"} one{"{0} ኢንች"} @@ -505,6 +523,11 @@ am{ one{"{0} ነጥብ"} other{"{0} ነጥብ"} } + solar-radius{ + dnam{"ሶላር ራዲ"} + one{"{0} ሶላር ዳዲየስ"} + other{"{0} ሶላር ራዲ"} + } yard{ dnam{"ያርድ"} one{"{0} ያርድ"} @@ -512,6 +535,16 @@ am{ } } light{ + candela{ + dnam{"ካንዴላ"} + one{"{0} ካንዴላ"} + other{"{0} ካንዴላ"} + } + lumen{ + dnam{"ቱቦ ቀዳዳ"} + one{"{0} ቱቦ ቀዳዳ"} + other{"{0} ቱቦ ቀዳዳ"} + } lux{ dnam{"lx"} one{"{0} lx"} @@ -524,6 +557,21 @@ am{ one{"{0} CD"} other{"{0} CD"} } + dalton{ + dnam{"ዳተንስ"} + one{"{0} ዳተንስ"} + other{"{0} ዳተንስ"} + } + earth-mass{ + dnam{"ኤርዝማስስ"} + one{"{0} ኤርዝማስስ"} + other{"{0} ኤርዝማስስ"} + } + grain{ + dnam{"ጥራ ጥሬ"} + one{"{0} ጥራ ጥሬ"} + other{"{0} ጥራ ጥሬ"} + } gram{ dnam{"ግራም"} one{"{0} ግራም"} @@ -568,6 +616,16 @@ am{ other{"{0} ፓውንድ"} per{"{0}/ፓውንድ"} } + solar-mass{ + dnam{"ሶላር ማስስ"} + one{"{0} ሶላር ማስስ"} + other{"{0} ሶላር ማስስ"} + } + stone{ + dnam{"ድንጋይ"} + one{"{0} ድንጋይ"} + other{"{0} ድንጋይ"} + } ton{ dnam{"ቶን"} one{"{0} ቶን"} @@ -720,6 +778,11 @@ am{ one{"{0} በርሜል"} other{"{0} በርሜሎች"} } + bushel{ + dnam{"ዳውላ"} + one{"{0} ዳውላ"} + other{"{0} ዳውላ"} + } centiliter{ dnam{"ሴንቲ ሊትር"} one{"{0} ሴንቲ ሊትር"} @@ -777,11 +840,36 @@ am{ one{"{0} ዴሲ ሊትር"} other{"{0} ዴሲ ሊትር"} } + dessert-spoon{ + dnam{"የመምድረ በዳ ማንኪያ"} + one{"{0} የመምድረ በዳ ማንኪያ"} + other{"{0} የመምድረ በዳ ማንኪያ"} + } + dessert-spoon-imperial{ + dnam{"የምድረ በዳ ማንኪያ"} + one{"{0} የምድረ በዳ ማንኪያ"} + other{"{0} የምድረ በዳ ማንኪያ"} + } + dram{ + dnam{"የክብደት መለኪያ"} + one{"{0} የክብደት መለኪያ"} + other{"{0} የክብደት መለኪያ"} + } + drop{ + dnam{"ጠብታ"} + one{"{0} ጠብታ"} + other{"{0} ጠብታ"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} other{"{0} fl oz"} } + fluid-ounce-imperial{ + dnam{"Imp. fluid ኦንስስ"} + one{"{0} Imp. fluid ኦንስስ"} + other{"{0} Imp. fluid ኦንስስ"} + } gallon{ dnam{"gal"} one{"{0} gal"} @@ -799,6 +887,11 @@ am{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"ሙጃሌ"} + one{"{0} ሙጃሌ"} + other{"{0} ሙጃሌ"} + } liter{ dnam{"ሊትር"} one{"{0} ሊትር"} @@ -815,6 +908,11 @@ am{ one{"{0} ሚሊ ሊትር"} other{"{0} ሚሊ ሊትር"} } + pinch{ + dnam{"ቁንጥ"} + one{"{0} ቁንጥ"} + other{"{0} ቁንጥ"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -830,6 +928,11 @@ am{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"የፈሳሽ መለኪያ"} + one{"{0} የፈሳሽ መለኪያ"} + other{"{0} የፈሳሽ መለኪያ"} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} @@ -1472,6 +1575,11 @@ am{ } } graphics{ + dot{ + dnam{"ነቁጥ"} + one{"{0} ነቁጥ"} + other{"{0} ነቁጥ"} + } dot-per-centimeter{ dnam{"ነበሴሜ"} one{"{0} ነበሴሜ"} @@ -1520,12 +1628,22 @@ am{ one{"{0} ዴሜ"} other{"{0} ዴሜ"} } + fathom{ + dnam{"ተዳክሞዎች"} + one{"{0} ተዳክሞ"} + other{"{0} ተዳክሞ"} + } foot{ dnam{"ጫማ"} one{"{0} ጫማ"} other{"{0} ጫማ"} per{"{0}/ጫማ"} } + furlong{ + dnam{"ፈሎን"} + one{"{0} ፈሎን"} + other{"{0} ፈሎን"} + } inch{ dnam{"ኢንች"} one{"{0} ኢንች"} @@ -1594,6 +1712,9 @@ am{ one{"{0} ነጥብ"} other{"{0} ነጥብ"} } + solar-radius{ + dnam{"ሶላር ራዲ"} + } yard{ dnam{"ያርድ"} one{"{0} ያርድ"} @@ -1601,6 +1722,16 @@ am{ } } light{ + candela{ + dnam{"ካንዴላ"} + one{"{0} ካንዴላ"} + other{"{0} ካንዴላ"} + } + lumen{ + dnam{"ቱቦ ቀዳዳ"} + one{"{0} ቱቦ ቀዳዳ"} + other{"{0} ቱቦ ቀዳዳ"} + } lux{ dnam{"lx"} one{"{0} lx"} @@ -1613,6 +1744,17 @@ am{ one{"{0} CD"} other{"{0} CD"} } + dalton{ + dnam{"ዳተንስ"} + } + earth-mass{ + dnam{"ኤርዝማስስ"} + } + grain{ + dnam{"ጥራ ጥሬ"} + one{"{0} ጥራ ጥሬ"} + other{"{0} ጥራ ጥሬ"} + } gram{ dnam{"ግራም"} one{"{0} ግ"} @@ -1657,6 +1799,14 @@ am{ other{"{0} ፓውንድ"} per{"{0}/ፓውንድ"} } + solar-mass{ + dnam{"ሶላር ማስስ"} + } + stone{ + dnam{"ድንጋይ"} + one{"{0} ድንጋይ"} + other{"{0} ድንጋይ"} + } ton{ dnam{"ቶን"} one{"{0} ቶን"} @@ -1809,6 +1959,11 @@ am{ one{"{0} በርሜል"} other{"{0} በርሜል"} } + bushel{ + dnam{"ዳውላ"} + one{"{0} ዳውላ"} + other{"{0} ዳውላ"} + } centiliter{ dnam{"ሴሊ"} one{"{0} ሴሊ"} @@ -1866,6 +2021,26 @@ am{ one{"{0} ዴሊ"} other{"{0} ዴሊ"} } + dessert-spoon{ + dnam{"የመምድረ በዳ ማንኪያ"} + one{"{0} የመምድረ በዳ ማንኪያ"} + other{"{0} የመምድረ በዳ ማንኪያ"} + } + dessert-spoon-imperial{ + dnam{"የምድረ በዳ ማንኪያ"} + one{"{0} የምድረ በዳ ማንኪያ"} + other{"{0} የምድረ በዳ ማንኪያ"} + } + dram{ + dnam{"የክብደት መለኪያ"} + one{"{0} የክብደት መለኪያ"} + other{"{0} የክብደት መለኪያ"} + } + drop{ + dnam{"ጠብታ"} + one{"{0} ጠብታ"} + other{"{0} ጠብታ"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1888,6 +2063,11 @@ am{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"ሙጃሌ"} + one{"{0} ሙጃሌ"} + other{"{0} ሙጃሌ"} + } liter{ dnam{"ሊትር"} one{"{0} ሊ"} @@ -1904,6 +2084,11 @@ am{ one{"{0} ሚሊ ሊትር"} other{"{0} ሚሊ ሊትር"} } + pinch{ + dnam{"ቁንጥ"} + one{"{0} ቁንጥ"} + other{"{0} ቁንጥ"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -1919,6 +2104,11 @@ am{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"የፈሳሽ መለኪያ"} + one{"{0} የፈሳሽ መለኪያ"} + other{"{0} የፈሳሽ መለኪያ"} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/ar.txt b/intl/icu/source/data/unit/ar.txt index c33132b9dc5d..8f4a8f899491 100644 --- a/intl/icu/source/data/unit/ar.txt +++ b/intl/icu/source/data/unit/ar.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -683,6 +683,15 @@ ar{ } } graphics{ + dot{ + dnam{"بكسل"} + few{"{0} بكسل"} + many{"{0} بكسل"} + one{"{0} بكسل"} + other{"{0} بكسل"} + two{"{0} بكسل"} + zero{"{0} بكسل"} + } dot-per-centimeter{ dnam{"نقطة لكل سنتيمتر"} few{"{0} نقاط لكل سنتيمتر"} @@ -776,6 +785,24 @@ ar{ two{"{0} ديسيمتر"} zero{"{0} ديسيمتر"} } + earth-radius{ + dnam{"نصف قطر أرضي"} + few{"{0} نصف قطر أرضي"} + many{"{0} نصف قطر أرضي"} + one{"{0} نصف قطر أرضي"} + other{"{0} نصف قطر أرضي"} + two{"{0} نصف قطر أرضي"} + zero{"{0} نصف قطر أرضي"} + } + fathom{ + dnam{"قامة"} + few{"{0} قامة"} + many{"{0} قامة"} + one{"{0} قامة"} + other{"{0} قامة"} + two{"{0} قامة"} + zero{"{0} قامة"} + } foot{ dnam{"قدم"} few{"{0} قدم"} @@ -786,6 +813,15 @@ ar{ two{"{0} قدم"} zero{"{0} قدم"} } + furlong{ + dnam{"فرلنغ"} + few{"{0} فرلنغ"} + many{"{0} فرلنغ"} + one{"{0} فرلنغ"} + other{"{0} فرلنغ"} + two{"{0} فرلنغ"} + zero{"{0} فرلنغ"} + } inch{ dnam{"بوصة"} few{"{0} بوصة"} @@ -926,6 +962,24 @@ ar{ } } light{ + candela{ + dnam{"شمعة"} + few{"{0} شمعة"} + many{"{0} شمعة"} + one{"{0} شمعة"} + other{"{0} شمعة"} + two{"{0} شمعة"} + zero{"{0} شمعة"} + } + lumen{ + dnam{"لومن"} + few{"{0} لومن"} + many{"{0} لومن"} + one{"{0} لومن"} + other{"{0} لومن"} + two{"{0} لومن"} + zero{"{0} لومن"} + } lux{ dnam{"لكس"} few{"{0} لكس"} @@ -973,6 +1027,15 @@ ar{ two{"{0} كتلة أرضية"} zero{"{0} كتلة أرضية"} } + grain{ + dnam{"قمحة"} + few{"{0} قمحة"} + many{"{0} قمحة"} + one{"{0} قمحة"} + other{"{0} قمحة"} + two{"{0} قمحة"} + zero{"{0} قمحة"} + } gram{ dnam{"غرام"} few{"{0} غرامات"} @@ -1041,7 +1104,7 @@ ar{ } pound{ dnam{"رطل"} - few{"{0} أرطل"} + few{"{0} رطل"} many{"{0} رطلًا"} one{"{0} رطل"} other{"{0} رطل"} @@ -1058,6 +1121,15 @@ ar{ two{"{0} كتلة شمسية"} zero{"{0} كتلة شمسية"} } + stone{ + dnam{"ستون"} + few{"{0} ستون"} + many{"{0} ستون"} + one{"{0} ستون"} + other{"{0} ستون"} + two{"{0} ستون"} + zero{"{0} ستون"} + } ton{ dnam{"طن"} few{"{0} أطنان"} @@ -1331,6 +1403,15 @@ ar{ two{"برميلان"} zero{"{0} برميل"} } + bushel{ + dnam{"بوشل"} + few{"{0} بوشل"} + many{"{0} بوشل"} + one{"{0} بوشل"} + other{"{0} بوشل"} + two{"{0} بوشل"} + zero{"{0} بوشل"} + } centiliter{ dnam{"سنتيلتر"} few{"{0} سنتيلتر"} @@ -1432,6 +1513,42 @@ ar{ two{"{0} ديسيلتر"} zero{"{0} ديسيلتر"} } + dessert-spoon{ + dnam{"ملعقة حلو"} + few{"{0} ملعقة حلو"} + many{"{0} ملعقة حلو"} + one{"{0} ملعقة حلو"} + other{"{0} ملعقة حلو"} + two{"{0} ملعقة حلو"} + zero{"{0} ملعقة حلو"} + } + dessert-spoon-imperial{ + dnam{"ملعقة حلو إمبراطوري"} + few{"{0} ملعقة حلو إمبراطوري"} + many{"{0} ملعقة حلو إمبراطوري"} + one{"{0} ملعقة حلو إمبراطوري"} + other{"{0} ملعقة حلو إمبراطوري"} + two{"{0} ملعقة حلو إمبراطوري"} + zero{"{0} ملعقة حلو إمبراطوري"} + } + dram{ + dnam{"درهم سائل"} + few{"{0} درهم سائل"} + many{"{0} درهم سائل"} + one{"{0} درهم"} + other{"{0} درهم"} + two{"{0} درهم سائل"} + zero{"{0} درهم سائل"} + } + drop{ + dnam{"قطرة"} + few{"{0} قطرات"} + many{"{0} قطرة"} + one{"{0} قطرة"} + other{"{0} قطرة"} + two{"قطرتان"} + zero{"{0} قطرة"} + } fluid-ounce{ dnam{"أونصة سائلة"} few{"{0} أونصة سائلة"} @@ -1479,6 +1596,15 @@ ar{ two{"{0} هكتولتر"} zero{"{0} هكتولتر"} } + jigger{ + dnam{"قدح"} + few{"{0} أقداح"} + many{"{0} قدح"} + one{"{0} قدح"} + other{"{0} قدح"} + two{"{0} قدح"} + zero{"{0} قدح"} + } liter{ dnam{"لتر"} few{"{0} لتر"} @@ -1507,6 +1633,15 @@ ar{ two{"{0} مليلتر"} zero{"{0} مليلتر"} } + pinch{ + dnam{"رشّة"} + few{"{0} رشّات"} + many{"{0} رشّة"} + one{"{0} رشّة"} + other{"{0} رشّة"} + two{"{0} رشّة"} + zero{"{0} رشّة"} + } pint{ dnam{"باينت"} few{"{0} باينت"} @@ -1534,6 +1669,15 @@ ar{ two{"{0} ربع غالون"} zero{"{0} ربع غالون"} } + quart-imperial{ + dnam{"ربع غالون إمبراطوري"} + few{"{0} ربع غالون إمبراطوري"} + many{"{0} ربع غالون إمبراطوري"} + one{"{0} ربع غالون إمبراطوري"} + other{"{0} ربع غالون إمبراطوري"} + two{"{0} ربع غالون إمبراطوري"} + zero{"{0} ربع غالون إمبراطوري"} + } tablespoon{ dnam{"ملعقة كبيرة"} few{"{0} ملعقة كبيرة"} @@ -1712,8 +1856,8 @@ ar{ } month{ dnam{"شهر"} - few{"{0} شهر"} - many{"{0} شهر"} + few{"{0} أشهر"} + many{"{0} شهرًا"} one{"شهر"} other{"{0} شهر"} per{"{0}/ش"} @@ -2674,13 +2818,22 @@ ar{ } } graphics{ + dot{ + dnam{"بكسل"} + few{"{0} بكسل"} + many{"{0} بكسل"} + one{"{0} بكسل"} + other{"{0} بكسل"} + two{"{0} بكسل"} + zero{"{0} بكسل"} + } dot-per-centimeter{ - dnam{"نقطة لكل سنتيمتر"} + dnam{"نقطة/سم"} few{"{0} نقاط/سم"} many{"{0} نقطة/سم"} one{"{0} نقطة/سم"} other{"{0} نقطة/سم"} - two{"نقطتان/سم"} + two{"{0} نقطة/سم"} zero{"{0} نقطة/سم"} } dot-per-inch{ @@ -2689,7 +2842,7 @@ ar{ many{"{0} نقطة/بوصة"} one{"{0} نقطة/بوصة"} other{"{0} نقطة/بوصة"} - two{"نقطتان/بوصة"} + two{"{0} نقطة/بوصة"} zero{"{0} نقطة/بوصة"} } em{ @@ -2767,6 +2920,24 @@ ar{ two{"{0} دسم"} zero{"{0} دسم"} } + earth-radius{ + dnam{"نق أرضي"} + few{"{0} نق أرضي"} + many{"{0} نق أرضي"} + one{"{0} نق أرضي"} + other{"{0} نق أرضي"} + two{"{0} نق أرضي"} + zero{"{0} نق أرضي"} + } + fathom{ + dnam{"قامة"} + few{"{0} قامة"} + many{"{0} قامة"} + one{"{0} قامة"} + other{"{0} قامة"} + two{"{0} قامة"} + zero{"{0} قامة"} + } foot{ dnam{"قدم"} few{"{0} قدم"} @@ -2777,6 +2948,15 @@ ar{ two{"{0} قدم"} zero{"{0} قدم"} } + furlong{ + dnam{"فرلنغ"} + few{"{0} فرلنغ"} + many{"{0} فرلنغ"} + one{"{0} فرلنغ"} + other{"{0} فرلنغ"} + two{"{0} فرلنغ"} + zero{"{0} فرلنغ"} + } inch{ dnam{"بوصة"} few{"{0} بوصة"} @@ -2917,6 +3097,24 @@ ar{ } } light{ + candela{ + dnam{"شمعة"} + few{"{0} شمعة"} + many{"{0} شمعة"} + one{"{0} شمعة"} + other{"{0} شمعة"} + two{"{0} شمعة"} + zero{"{0} شمعة"} + } + lumen{ + dnam{"لومن"} + few{"{0} لومن"} + many{"{0} لومن"} + one{"{0} لومن"} + other{"{0} لومن"} + two{"{0} لومن"} + zero{"{0} لومن"} + } lux{ dnam{"لكس"} few{"{0} لكس"} @@ -2964,6 +3162,15 @@ ar{ two{"{0} كتلة أرضية"} zero{"{0} كتلة أرضية"} } + grain{ + dnam{"قمحة"} + few{"{0} قمحة"} + many{"{0} قمحة"} + one{"{0} قمحة"} + other{"{0} قمحة"} + two{"{0} قمحة"} + zero{"{0} قمحة"} + } gram{ dnam{"غرام"} few{"{0} غرام"} @@ -3049,6 +3256,15 @@ ar{ two{"{0} كتلة شمسية"} zero{"{0} كتلة شمسية"} } + stone{ + dnam{"ستون"} + few{"{0} ستون"} + many{"{0} ستون"} + one{"{0} ستون"} + other{"{0} ستون"} + two{"{0} ستون"} + zero{"{0} ستون"} + } ton{ dnam{"طن"} few{"{0} طن"} @@ -3322,6 +3538,15 @@ ar{ two{"برميلان"} zero{"{0} برميل"} } + bushel{ + dnam{"بوشل"} + few{"{0} بوشل"} + many{"{0} بوشل"} + one{"{0} بوشل"} + other{"{0} بوشل"} + two{"{0} بوشل"} + zero{"{0} بوشل"} + } centiliter{ dnam{"سنتيلتر"} few{"{0} سنتيلتر"} @@ -3423,6 +3648,42 @@ ar{ two{"{0} ديسيلتر"} zero{"{0} ديسيلتر"} } + dessert-spoon{ + dnam{"ملعقة ح."} + few{"{0} ملعقة ح."} + many{"{0} ملعقة ح."} + one{"{0} ملعقة ح."} + other{"{0} ملعقة ح."} + two{"{0} ملعقة ح."} + zero{"{0} ملعقة ح."} + } + dessert-spoon-imperial{ + dnam{"ملعقة حلو إمبراطوري"} + few{"{0} ملعقة ح. إمبراطوري"} + many{"{0} ملعقة ح. إمبراطوري"} + one{"{0} ملعقة ح. إمبراطوري"} + other{"{0} ملعقة ح. إمبراطوري"} + two{"{0} ملعقة ح. إمبراطوري"} + zero{"{0} ملعقة ح. إمبراطوري"} + } + dram{ + dnam{"درهم سائل"} + few{"{0} درهم سائل"} + many{"{0} درهم سائل"} + one{"{0} درهم سائل"} + other{"{0} درهم سائل"} + two{"{0} درهم سائل"} + zero{"{0} درهم سائل"} + } + drop{ + dnam{"قطرة"} + few{"{0} قطرة"} + many{"{0} قطرة"} + one{"{0} قطرة"} + other{"{0} قطرة"} + two{"{0} قطرة"} + zero{"{0} قطرة"} + } fluid-ounce{ dnam{"أونصة سائلة"} few{"{0} أونصات سائلة"} @@ -3464,6 +3725,15 @@ ar{ two{"{0} هكتولتر"} zero{"{0} هكتولتر"} } + jigger{ + dnam{"قدح"} + few{"{0} أقداح"} + many{"{0} قدح"} + one{"{0} قدح"} + other{"{0} قدح"} + two{"{0} قدح"} + zero{"{0} قدح"} + } liter{ dnam{"لتر"} few{"{0} لتر"} @@ -3492,6 +3762,15 @@ ar{ two{"{0} ملتر"} zero{"{0} ملتر"} } + pinch{ + dnam{"رشّة"} + few{"{0} رشّة"} + many{"{0} رشّة"} + one{"{0} رشّة"} + other{"{0} رشّة"} + two{"{0} رشّة"} + zero{"{0} رشّة"} + } pint{ dnam{"باينت"} few{"{0} باينت"} @@ -3519,6 +3798,15 @@ ar{ two{"{0} ربع غالون"} zero{"{0} ربع غالون"} } + quart-imperial{ + dnam{"ربع غالون إمبراطوري"} + few{"{0} ربع غالون إمبراطوري"} + many{"{0} ربع غالون إمبراطوري"} + one{"{0} ربع غالون إمبراطوري"} + other{"{0} ربع غالون إمبراطوري"} + two{"{0} ربع غالون إمبراطوري"} + zero{"{0} ربع غالون إمبراطوري"} + } tablespoon{ dnam{"ملعقة كبيرة"} few{"{0} ملعقة ك."} diff --git a/intl/icu/source/data/unit/ar_SA.txt b/intl/icu/source/data/unit/ar_SA.txt index d07e1a8acab1..8c7235451cf4 100644 --- a/intl/icu/source/data/unit/ar_SA.txt +++ b/intl/icu/source/data/unit/ar_SA.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar_SA{ - Version{"37"} units{ acceleration{ meter-per-square-second{ diff --git a/intl/icu/source/data/unit/ars.txt b/intl/icu/source/data/unit/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/unit/ars.txt +++ b/intl/icu/source/data/unit/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/unit/as.txt b/intl/icu/source/data/unit/as.txt index 62e4842baaa5..a76b15772803 100644 --- a/intl/icu/source/data/unit/as.txt +++ b/intl/icu/source/data/unit/as.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -424,12 +424,27 @@ as{ one{"{0} ডেচিমিটাৰ"} other{"{0} ডেচিমিটাৰ"} } + earth-radius{ + dnam{"পৃথিৱীৰ ব্যাসাৰ্ধ"} + one{"{0} পৃথিৱীৰ ব্যাসাৰ্ধ"} + other{"{0} পৃথিৱীৰ ব্যাসাৰ্ধ"} + } + fathom{ + dnam{"ফাথম"} + one{"{0} ফাথম"} + other{"{0} ফাথম"} + } foot{ dnam{"ফুট"} one{"{0} ফুট"} other{"{0} ফুট"} per{"{0} প্ৰতি ফুট"} } + furlong{ + dnam{"ফাৰ্লং"} + one{"{0} ফাৰ্লং"} + other{"{0} ফাৰ্লং"} + } inch{ dnam{"ইঞ্চি"} one{"{0} ইঞ্চি"} @@ -510,6 +525,16 @@ as{ } } light{ + candela{ + dnam{"কেণ্ডেলা"} + one{"{0} কেণ্ডেলা"} + other{"{0} কেণ্ডেলা"} + } + lumen{ + dnam{"লুমেন"} + one{"{0} লুমেন"} + other{"{0} লুমেন"} + } lux{ dnam{"লাক্স"} one{"{0} লাক্স"} @@ -537,6 +562,11 @@ as{ one{"{0} আৰ্থ মাছ"} other{"{0} আৰ্থ মাছ"} } + grain{ + dnam{"গ্ৰেইন"} + one{"{0} গ্ৰেইন"} + other{"{0} গ্ৰেইন"} + } gram{ dnam{"গ্ৰাম"} one{"{0} গ্ৰাম"} @@ -586,6 +616,11 @@ as{ one{"{0} সৌৰ ভৰ"} other{"{0} সৌৰ ভৰ"} } + stone{ + dnam{"ষ্ট’ন"} + one{"{0} ষ্ট'ন"} + other{"{0} ষ্ট'ন"} + } ton{ dnam{"টন"} one{"{0} টন"} @@ -661,9 +696,9 @@ as{ other{"{0} মিলিমিটাৰ মাৰ্কিউৰী"} } pound-force-per-square-inch{ - dnam{"প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড"} - one{"{0} প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড"} - other{"{0} প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড"} + dnam{"প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড"} + one{"{0} প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড"} + other{"{0} প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড"} } } speed{ @@ -733,6 +768,11 @@ as{ one{"{0} বেৰেল"} other{"{0} বেৰেল"} } + bushel{ + dnam{"বুশ্বেল"} + one{"{0} বুশ্লেল"} + other{"{0} বুশ্বেল"} + } centiliter{ dnam{"ছেণ্টিলিটাৰ"} one{"{0} ছেণ্টিলিটাৰ"} @@ -790,6 +830,26 @@ as{ one{"{0} ডেচিলিটাৰ"} other{"{0} ডেচিলিটাৰ"} } + dessert-spoon{ + dnam{"ডেজাৰ্ট চামুচ"} + one{"{0} ডেজাৰ্ট চামুচ"} + other{"{0} ডেজাৰ্ট চামুচ"} + } + dessert-spoon-imperial{ + dnam{"ইম্পেৰিয়েল ডেজাৰ্ট চামুচ"} + one{"{0} ইম্পেৰিয়েল ডেজাৰ্ট চামুচ"} + other{"{0} ইম্পেৰিয়েল ডেজাৰ্ট চামুচ"} + } + dram{ + dnam{"ড্ৰাম"} + one{"{0} ড্ৰাম"} + other{"{0} ড্ৰাম"} + } + drop{ + dnam{"ড্ৰপ"} + one{"{0} ড্ৰপ"} + other{"{0} ড্ৰপ"} + } fluid-ounce{ dnam{"ফ্লুইড আউন্স"} one{"{0} ফ্লুইড আউন্স"} @@ -817,6 +877,11 @@ as{ one{"{0} হেক্টোলিটাৰ"} other{"{0} হেক্টোলিটাৰ"} } + jigger{ + dnam{"জিগাৰ"} + one{"{0} জিগাৰ"} + other{"{0} জিগাৰ"} + } liter{ dnam{"লিটাৰ"} one{"{0} লিটাৰ"} @@ -833,6 +898,11 @@ as{ one{"{0} মিলিলিটাৰ"} other{"{0} মিলিলিটাৰ"} } + pinch{ + dnam{"পিঞ্চ"} + one{"{0} পিঞ্চ"} + other{"{0} পিঞ্চ"} + } pint{ dnam{"পিণ্ট"} one{"{0} পিণ্ট"} @@ -848,6 +918,11 @@ as{ one{"{0} কোৱাৰ্ট"} other{"{0} কোৱাৰ্ট"} } + quart-imperial{ + dnam{"ইম্পেৰিয়েল কুৱাৰ্ট"} + one{"{0} ইম্পেৰিয়েল কুৱাৰ্ট"} + other{"{0} ইম্পেৰিয়েল কুৱাৰ্ট"} + } tablespoon{ dnam{"টেব’লস্পুন"} one{"{0} টেব’লস্পুন"} @@ -1400,12 +1475,22 @@ as{ one{"{0} ডেঃ মিঃ"} other{"{0} ডেঃ মিঃ"} } + fathom{ + dnam{"ফাথম"} + one{"{0} ফাথম"} + other{"{0} ফাথম"} + } foot{ dnam{"ফুট"} one{"{0} ফুঃ"} other{"{0} ফুঃ"} per{"{0}/ফুঃ"} } + furlong{ + dnam{"ফাৰ্লং"} + one{"{0} ফাৰ্লং"} + other{"{0} ফাৰ্লং"} + } inch{ dnam{"ইঞ্চি"} one{"{0} ইঃ"} @@ -1513,6 +1598,11 @@ as{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"গ্ৰেইন"} + one{"{0} গ্ৰেইন"} + other{"{0} গ্ৰেইন"} + } gram{ dnam{"গ্ৰাম"} one{"{0} গ্ৰাঃ"} @@ -1562,6 +1652,11 @@ as{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"ষ্ট’ন"} + one{"{0} ষ্ট'ন"} + other{"{0} ষ্ট'ন"} + } ton{ dnam{"টন"} one{"{0} টন"} @@ -1709,6 +1804,9 @@ as{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"বুশ্বেল"} + } centiliter{ dnam{"ছেঃ লিঃ"} one{"{0} ছেঃ লিঃ"} @@ -1766,6 +1864,16 @@ as{ one{"{0} ডেঃ লিঃ"} other{"{0} ডেঃ লিঃ"} } + dram{ + dnam{"ড্ৰাম তৰল পদাৰ্থ"} + one{"{0} ড্ৰাম তৰল পদাৰ্থ"} + other{"{0} ড্ৰাম তৰল পদাৰ্থ"} + } + drop{ + dnam{"ড্ৰপ"} + one{"{0} ড্ৰপ"} + other{"{0} ড্ৰপ"} + } fluid-ounce{ dnam{"ফ্লুঃ আঃ"} one{"{0} ফ্লুঃ আঃ"} @@ -1793,6 +1901,11 @@ as{ one{"{0} হেঃ লিঃ"} other{"{0} হেঃ লিঃ"} } + jigger{ + dnam{"জিগাৰ"} + one{"{0} জিগাৰ"} + other{"{0} জিগাৰ"} + } liter{ dnam{"লিটাৰ"} one{"{0} লিঃ"} @@ -1809,6 +1922,11 @@ as{ one{"{0} মিঃ লিঃ"} other{"{0} মিঃ লিঃ"} } + pinch{ + dnam{"পিঞ্চ"} + one{"{0} পিঞ্চ"} + other{"{0} পিঞ্চ"} + } pint{ dnam{"পিণ্ট"} one{"{0} পিণ্ট"} diff --git a/intl/icu/source/data/unit/asa.txt b/intl/icu/source/data/unit/asa.txt index 6a30986cbe23..5389fa3e3dc6 100644 --- a/intl/icu/source/data/unit/asa.txt +++ b/intl/icu/source/data/unit/asa.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml asa{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ast.txt b/intl/icu/source/data/unit/ast.txt index c8d880d560a1..4621f85cca77 100644 --- a/intl/icu/source/data/unit/ast.txt +++ b/intl/icu/source/data/unit/ast.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ast{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/az.txt b/intl/icu/source/data/unit/az.txt index ed3b5d254219..46c1867255f3 100644 --- a/intl/icu/source/data/unit/az.txt +++ b/intl/icu/source/data/unit/az.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -15,9 +15,9 @@ az{ other{"{0} g qüvvəsi"} } meter-per-square-second{ - dnam{"metr saniyə kvadratı"} - one{"{0} metr saniyə kvadratı"} - other{"{0} metr saniyə kvadratı"} + dnam{"metr kvadrat saniyə"} + one{"{0} metr kvadrat saniyə"} + other{"{0} metr kvadrat saniyə"} } } angle{ @@ -135,8 +135,8 @@ az{ } permillion{ dnam{"milyonda hissəcik"} - one{"milyonda {0} hissəcik"} - other{"milyonda {0} hissəcik"} + one{"{0} milyonda hissəcik"} + other{"{0} milyonda hissəcik"} } permyriad{ dnam{"permiriada"} @@ -403,6 +403,9 @@ az{ } } graphics{ + dot{ + dnam{"dot nöqtə"} + } dot-per-centimeter{ dnam{"nöqtə / santimetr"} one{"{0} nöqtə / santimetr"} @@ -454,12 +457,27 @@ az{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"yer radiusu"} + one{"{0} yer radiusu"} + other{"{0} yer radiusu"} + } + fathom{ + dnam{"fatom"} + one{"{0} fatom"} + other{"{0} fatom"} + } foot{ dnam{"fut"} one{"{0} fut"} other{"{0} fut"} per{"{0}/ft"} } + furlong{ + dnam{"farlonq"} + one{"{0} farlonq"} + other{"{0} farlonq"} + } inch{ dnam{"düym"} one{"{0} düym"} @@ -540,6 +558,16 @@ az{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lümen"} + one{"{0} lümen"} + other{"{0} lümen"} + } lux{ dnam{"lüks"} one{"{0} lüks"} @@ -567,6 +595,11 @@ az{ one{"{0} yer kütləsi"} other{"{0} yer kütləsi"} } + grain{ + dnam{"qranul"} + one{"{0} qranul"} + other{"{0} qranul"} + } gram{ dnam{"qram"} one{"{0} qram"} @@ -771,6 +804,11 @@ az{ barrel{ dnam{"barrel"} } + bushel{ + dnam{"buşel"} + one{"{0} buşel"} + other{"{0} buşel"} + } centiliter{ dnam{"santilitr"} one{"{0} santilitr"} @@ -828,6 +866,26 @@ az{ one{"{0} desilitr"} other{"{0} desilitr"} } + dessert-spoon{ + dnam{"dessert qaşığı"} + one{"{0} dessert qaşığı"} + other{"{0} dessert qaşığı"} + } + dessert-spoon-imperial{ + dnam{"İmp. dessert qaşığı"} + one{"{0} İmp. dessert qaşığı"} + other{"{0} İmp. dessert qaşığı"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"damcı"} + one{"{0} damcı"} + other{"{0} damcı"} + } fluid-ounce{ dnam{"maye unsiyası"} one{"{0} maye unsiyası"} @@ -871,6 +929,11 @@ az{ one{"{0} millilitr"} other{"{0} millilitr"} } + pinch{ + dnam{"çimdik"} + one{"{0} çimdik"} + other{"{0} çimdik"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -886,6 +949,11 @@ az{ one{"{0} kvart"} other{"{0} kvart"} } + quart-imperial{ + dnam{"İmp. kvarta"} + one{"{0} İmp. kvarta"} + other{"{0} İmp. kvarta"} + } tablespoon{ dnam{"xörək qaşığı"} one{"{0} xörək qaşığı"} @@ -1158,7 +1226,7 @@ az{ other{"{0} G"} } meter-per-square-second{ - dnam{"m/s²"} + dnam{"metr/s²"} one{"{0} m/s²"} other{"{0} m/s²"} } @@ -1592,12 +1660,27 @@ az{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"yer radiusu"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"fatom"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"fut"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"farlonq"} + one{"{0} farlonq"} + other{"{0} farlonq"} + } inch{ dnam{"düym"} one{"{0} in"} @@ -1676,6 +1759,16 @@ az{ } } light{ + candela{ + dnam{"kd"} + one{"{0} kd"} + other{"{0} kd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lx"} one{"{0} lx"} @@ -1697,6 +1790,11 @@ az{ earth-mass{ dnam{"yer kütləsi"} } + grain{ + dnam{"qranul"} + one{"{0} qranul"} + other{"{0} qranul"} + } gram{ dnam{"qram"} one{"{0} q"} @@ -1800,8 +1898,8 @@ az{ } inch-ofhg{ dnam{"civə düymü"} - one{"{0} inHg"} - other{"{0} inHg"} + one{"{0} civə düymü"} + other{"{0} civə düymü"} } millibar{ dnam{"millibar"} @@ -1874,6 +1972,11 @@ az{ one{"{0} ac ft"} other{"{0} ac ft"} } + bushel{ + dnam{"buşel"} + one{"{0} buşel"} + other{"{0} buşel"} + } centiliter{ dnam{"sL"} one{"{0} sL"} @@ -1931,6 +2034,21 @@ az{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"des.qaş."} + one{"{0} des.qaş."} + other{"{0} des.qaş."} + } + dessert-spoon-imperial{ + dnam{"des.qaş. İmp."} + one{"{0} des.qaş. İmp"} + other{"{0} des.qaş. İmp."} + } + drop{ + dnam{"damcı"} + one{"{0} damcı"} + other{"{0} damcı"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1974,6 +2092,11 @@ az{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"çimdik"} + one{"{0} çimdik"} + other{"{0} çimdik"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -1989,6 +2112,11 @@ az{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"kvarta İmp."} + one{"{0} kvarta İmp."} + other{"{0} kvarta İmp."} + } tablespoon{ dnam{"xrqş"} one{"{0} xrqş"} diff --git a/intl/icu/source/data/unit/az_AZ.txt b/intl/icu/source/data/unit/az_AZ.txt index caf84c09534a..8932e86db2ee 100644 --- a/intl/icu/source/data/unit/az_AZ.txt +++ b/intl/icu/source/data/unit/az_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_AZ{ "%%ALIAS"{"az_Latn_AZ"} } diff --git a/intl/icu/source/data/unit/az_Cyrl.txt b/intl/icu/source/data/unit/az_Cyrl.txt index bd374aea67f7..f09e5a620607 100644 --- a/intl/icu/source/data/unit/az_Cyrl.txt +++ b/intl/icu/source/data/unit/az_Cyrl.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Cyrl{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/az_Latn.txt b/intl/icu/source/data/unit/az_Latn.txt index 6022c58dbe02..6464d2e841f3 100644 --- a/intl/icu/source/data/unit/az_Latn.txt +++ b/intl/icu/source/data/unit/az_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/az_Latn_AZ.txt b/intl/icu/source/data/unit/az_Latn_AZ.txt index 36c6e61ba045..3963c91e61c2 100644 --- a/intl/icu/source/data/unit/az_Latn_AZ.txt +++ b/intl/icu/source/data/unit/az_Latn_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/bas.txt b/intl/icu/source/data/unit/bas.txt index c1c65dd01bef..a18120afb8b9 100644 --- a/intl/icu/source/data/unit/bas.txt +++ b/intl/icu/source/data/unit/bas.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bas{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/be.txt b/intl/icu/source/data/unit/be.txt index d9d5673af086..9591ab587d8e 100644 --- a/intl/icu/source/data/unit/be.txt +++ b/intl/icu/source/data/unit/be.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be{ - Version{"37"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} @@ -185,7 +185,7 @@ be{ other{"{0} праміле"} } permillion{ - dnam{"частак на мільён"} + dnam{"часткі на мільён"} few{"{0} часткі на мільён"} many{"{0} частак на мільён"} one{"{0} частка на мільён"} @@ -550,6 +550,13 @@ be{ } } graphics{ + dot{ + dnam{"кропкі"} + few{"{0} кропкі"} + many{"{0} кропак"} + one{"{0} кропка"} + other{"{0} кропкі"} + } dot-per-centimeter{ dnam{"кропкі на сантыметр"} few{"{0} кропкі на сантыметр"} @@ -623,6 +630,20 @@ be{ one{"{0} дэцыметр"} other{"{0} дэцыметра"} } + earth-radius{ + dnam{"радыус Зямлі"} + few{"{0} R⊕"} + many{"{0} R⊕"} + one{"{0} радыус Зямлі"} + other{"{0} радыуса Зямлі"} + } + fathom{ + dnam{"фатамы"} + few{"{0} фатамы"} + many{"{0} фатамаў"} + one{"{0} фатам"} + other{"{0} фатама"} + } foot{ dnam{"футы"} few{"{0} футы"} @@ -631,6 +652,13 @@ be{ other{"{0} фута"} per{"{0} на фут"} } + furlong{ + dnam{"фурлонгі"} + few{"{0} фурлонгі"} + many{"{0} фурлонгаў"} + one{"{0} фурлонг"} + other{"{0} фурлонга"} + } inch{ dnam{"цалі"} few{"{0} цалі"} @@ -741,6 +769,20 @@ be{ } } light{ + candela{ + dnam{"кандэла"} + few{"{0} кандэлы"} + many{"{0} кандэл"} + one{"{0} кандэла"} + other{"{0} кандэлы"} + } + lumen{ + dnam{"люмен"} + few{"{0} люмены"} + many{"{0} люменаў"} + one{"{0} люмен"} + other{"{0} люмена"} + } lux{ dnam{"люкс"} few{"{0} люксы"} @@ -778,6 +820,13 @@ be{ one{"{0} маса Зямлі"} other{"{0} масы Зямлі"} } + grain{ + dnam{"граны"} + few{"{0} граны"} + many{"{0} гранаў"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"грамы"} few{"{0} г"} @@ -845,6 +894,13 @@ be{ one{"{0} маса Сонца"} other{"{0} масы Сонца"} } + stone{ + dnam{"стоны"} + few{"{0} стоны"} + many{"{0} стонаў"} + one{"{0} стоўн"} + other{"{0} стона"} + } ton{ dnam{"амерыканскія тоны"} few{"{0} амерыканскія тоны"} @@ -1060,6 +1116,13 @@ be{ one{"{0} барэль"} other{"{0} барэля"} } + bushel{ + dnam{"бушалі"} + few{"{0} бушалі"} + many{"{0} бушаляў"} + one{"{0} бушаль"} + other{"{0} бушаля"} + } centiliter{ dnam{"сантылітр"} few{"{0} сантылітры"} @@ -1139,6 +1202,34 @@ be{ one{"{0} дэцылітр"} other{"{0} дэцылітра"} } + dessert-spoon{ + dnam{"дэсертная лыжка"} + few{"{0} дэсертныя лыжкі"} + many{"{0} дэсертных лыжак"} + one{"{0} дэсертная лыжка"} + other{"{0} дэсертнай лыжкі"} + } + dessert-spoon-imperial{ + dnam{"брытанская дэсертная лыжка"} + few{"{0} брыт. дэс. л."} + many{"{0} брыт. дэс. л."} + one{"{0} брытанская дэсертная лыжка"} + other{"{0} брытанскай дэсертнай лыжкі"} + } + dram{ + dnam{"драхма"} + few{"{0} вад. драхмы"} + many{"{0} вад. драхмаў"} + one{"{0} драхма"} + other{"{0} вад. драхмы"} + } + drop{ + dnam{"кропля"} + few{"{0} кроплі"} + many{"{0} кропляў"} + one{"{0} кропля"} + other{"{0} кроплі"} + } fluid-ounce{ dnam{"вадкія унцыі"} few{"{0} вадкія унцыі"} @@ -1176,6 +1267,13 @@ be{ one{"{0} гекталітр"} other{"{0} гекталітра"} } + jigger{ + dnam{"джыгер"} + few{"{0} джыгеры"} + many{"{0} джыгераў"} + one{"{0} джыгер"} + other{"{0} джыгера"} + } liter{ dnam{"літры"} few{"{0} літры"} @@ -1198,6 +1296,13 @@ be{ one{"{0} мілілітр"} other{"{0} мілілітра"} } + pinch{ + dnam{"дробка"} + few{"{0} дробкі"} + many{"{0} дробак"} + one{"{0} дробка"} + other{"{0} дробкі"} + } pint{ dnam{"пінты"} few{"{0} пінты"} @@ -1219,6 +1324,13 @@ be{ one{"{0} кварта"} other{"{0} кварты"} } + quart-imperial{ + dnam{"брыт. кварта"} + few{"{0} брыт. кварты"} + many{"{0} брыт. кварт"} + one{"{0} брыт. кварта"} + other{"{0} брыт. кварты"} + } tablespoon{ dnam{"сталовыя лыжкі"} few{"{0} сталовыя лыжкі"} @@ -1624,14 +1736,14 @@ be{ } digital{ bit{ - dnam{"біты"} + dnam{"біт"} few{"{0} біты"} many{"{0} біт"} one{"{0} біт"} other{"{0} біта"} } byte{ - dnam{"байты"} + dnam{"байт"} few{"{0} байты"} many{"{0} байт"} one{"{0} байт"} @@ -1680,7 +1792,7 @@ be{ other{"{0} МБ"} } petabyte{ - dnam{"ПБайт"} + dnam{"ПБ"} few{"{0} ПБ"} many{"{0} ПБ"} one{"{0} ПБ"} @@ -1936,6 +2048,13 @@ be{ } } graphics{ + dot{ + dnam{"кр"} + few{"{0} кр"} + many{"{0} кр"} + one{"{0} кр"} + other{"{0} кр"} + } dot-per-centimeter{ dnam{"кр/см"} few{"{0} кр/см"} @@ -2009,6 +2128,13 @@ be{ one{"{0} дм"} other{"{0} дм"} } + fathom{ + dnam{"фатамы"} + few{"{0} фат."} + many{"{0} фат."} + one{"{0} фат."} + other{"{0} фат."} + } foot{ dnam{"футы"} few{"{0} футы"} @@ -2017,6 +2143,13 @@ be{ other{"{0} фута"} per{"{0}/фут"} } + furlong{ + dnam{"фурлонгі"} + few{"{0} фур."} + many{"{0} фур."} + one{"{0} фур."} + other{"{0} фур."} + } inch{ dnam{"цалі"} few{"{0} цалі"} @@ -2127,6 +2260,20 @@ be{ } } light{ + candela{ + dnam{"кд"} + few{"{0} кд"} + many{"{0} кд"} + one{"{0} кд"} + other{"{0} кд"} + } + lumen{ + dnam{"лм"} + few{"{0} лм"} + many{"{0} лм"} + one{"{0} лм"} + other{"{0} лм"} + } lux{ dnam{"лк"} few{"{0} лк"} @@ -2164,6 +2311,13 @@ be{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"гран"} + few{"{0} граны"} + many{"{0} гранаў"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"г"} few{"{0} г"} @@ -2231,6 +2385,13 @@ be{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"стоны"} + few{"{0} стоны"} + many{"{0} стонаў"} + one{"{0} стон"} + other{"{0} стона"} + } ton{ dnam{"амер. т"} few{"{0} амер. т"} @@ -2446,6 +2607,13 @@ be{ one{"{0} барэль"} other{"{0} барэля"} } + bushel{ + dnam{"бушалі"} + few{"{0} буш."} + many{"{0} буш."} + one{"{0} буш."} + other{"{0} буш."} + } centiliter{ dnam{"сл"} few{"{0} сл"} @@ -2525,6 +2693,34 @@ be{ one{"{0} дл"} other{"{0} дл"} } + dessert-spoon{ + dnam{"дэс. л."} + few{"{0} дэс. л."} + many{"{0} дэс. л."} + one{"{0} дэс. л."} + other{"{0} дэс. л."} + } + dessert-spoon-imperial{ + dnam{"брыт. дэс. л."} + few{"{0} брыт. дэс. л."} + many{"{0} брыт. дэс. л."} + one{"{0} брыт. дэс. л."} + other{"{0} брыт. дэс. л."} + } + dram{ + dnam{"вад. драхма"} + few{"{0} вад. драхмы"} + many{"{0} вад. драхмаў"} + one{"{0} вад. драхма"} + other{"{0} вад. драхмы"} + } + drop{ + dnam{"кропля"} + few{"{0} кроплі"} + many{"{0} кропель"} + one{"{0} кропля"} + other{"{0} кроплі"} + } fluid-ounce{ dnam{"вадк. унц."} few{"{0} вадк. унц."} @@ -2562,6 +2758,13 @@ be{ one{"{0} гл"} other{"{0} гл"} } + jigger{ + dnam{"джыгер"} + few{"{0} джыгеры"} + many{"{0} джыгераў"} + one{"{0} джыгер"} + other{"{0} джыгера"} + } liter{ dnam{"л"} few{"{0} л"} @@ -2584,6 +2787,13 @@ be{ one{"{0} мл"} other{"{0} мл"} } + pinch{ + dnam{"дробка"} + few{"{0} дробкі"} + many{"{0} дробак"} + one{"{0} дробка"} + other{"{0} дробкі"} + } pint{ dnam{"пінты"} few{"{0} пінты"} @@ -2605,6 +2815,13 @@ be{ one{"{0} кварта"} other{"{0} кварты"} } + quart-imperial{ + dnam{"брыт. кварта"} + few{"{0} брыт. кварты"} + many{"{0} брыт. кварт"} + one{"{0} брыт. кварта"} + other{"{0} брыт. кварты"} + } tablespoon{ dnam{"ст. лыжкі"} few{"{0} ст. лыжкі"} diff --git a/intl/icu/source/data/unit/bem.txt b/intl/icu/source/data/unit/bem.txt index 9b64218ac30a..c874e0ede7b3 100644 --- a/intl/icu/source/data/unit/bem.txt +++ b/intl/icu/source/data/unit/bem.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bem{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/bez.txt b/intl/icu/source/data/unit/bez.txt index c7543782ac81..0884fce79e7e 100644 --- a/intl/icu/source/data/unit/bez.txt +++ b/intl/icu/source/data/unit/bez.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bez{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/bg.txt b/intl/icu/source/data/unit/bg.txt index cbaebfc51649..6909346c3923 100644 --- a/intl/icu/source/data/unit/bg.txt +++ b/intl/icu/source/data/unit/bg.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -161,14 +161,14 @@ bg{ other{"{0} литра на километър"} } mile-per-gallon{ - dnam{"мили с един галон"} - one{"{0} миля с един галон"} - other{"{0} мили с един галон"} + dnam{"мили на галон"} + one{"{0} миля на галон"} + other{"{0} мили на галон"} } mile-per-gallon-imperial{ - dnam{"мили с един британски галон"} - one{"{0} миля с един британски галон"} - other{"{0} мили с един британски галон"} + dnam{"мили на имперски галон"} + one{"{0} миля на имперски галон"} + other{"{0} мили на имперски галон"} } } coordinate{ @@ -408,6 +408,11 @@ bg{ } } graphics{ + dot{ + dnam{"точка"} + one{"{0} точка"} + other{"{0} точки"} + } dot-per-centimeter{ dnam{"точки на сантиметър"} one{"{0} точка на сантиметър"} @@ -459,12 +464,27 @@ bg{ one{"{0} дециметър"} other{"{0} дециметра"} } + earth-radius{ + dnam{"земен радиус"} + one{"{0} земен радиус"} + other{"{0} земни радиуса"} + } + fathom{ + dnam{"фатоми"} + one{"{0} фатом"} + other{"{0} фатома"} + } foot{ dnam{"футове"} one{"{0} фут"} other{"{0} фута"} per{"{0} на фут"} } + furlong{ + dnam{"фърлонги"} + one{"{0} фърлонг"} + other{"{0} фърлонга"} + } inch{ dnam{"инчове"} one{"{0} инч"} @@ -545,6 +565,16 @@ bg{ } } light{ + candela{ + dnam{"кандела"} + one{"{0} кандела"} + other{"{0} кандели"} + } + lumen{ + dnam{"лумен"} + one{"{0} лумен"} + other{"{0} лумена"} + } lux{ dnam{"луксове"} one{"{0} лукс"} @@ -572,6 +602,11 @@ bg{ one{"{0} маса на Земята"} other{"{0} маси на Земята"} } + grain{ + dnam{"гран"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"грамове"} one{"{0} грам"} @@ -585,9 +620,9 @@ bg{ per{"{0} на килограм"} } metric-ton{ - dnam{"тонове"} - one{"{0} тон"} - other{"{0} тона"} + dnam{"метрични тонове"} + one{"{0} метричен тон"} + other{"{0} метрични тона"} } microgram{ dnam{"микрограмове"} @@ -621,6 +656,11 @@ bg{ one{"{0} слънчева маса"} other{"{0} слънчеви маси"} } + stone{ + dnam{"стоунове"} + one{"{0} стоун"} + other{"{0} стоуна"} + } ton{ dnam{"къси тонове"} one{"{0} къс тон"} @@ -762,9 +802,9 @@ bg{ other{"{0} нютон-метра"} } pound-force-foot{ - dnam{"фунт-футове"} - one{"{0} фунт-фут"} - other{"{0} фунт-фута"} + dnam{"паунд-футове"} + one{"{0} паунд-фут сила"} + other{"{0} паунд-фута"} } } volume{ @@ -778,6 +818,11 @@ bg{ one{"{0} барел"} other{"{0} барела"} } + bushel{ + dnam{"бушели"} + one{"{0} бушел"} + other{"{0} бушела"} + } centiliter{ dnam{"сентилитри"} one{"{0} сентилитър"} @@ -835,19 +880,34 @@ bg{ one{"{0} децилитър"} other{"{0} децилитра"} } + dessert-spoon{ + dnam{"десертна лъжица"} + one{"{0} десертна лъжица"} + other{"{0} десертни лъжици"} + } + dram{ + dnam{"драм"} + one{"{0} драм"} + other{"{0} драма"} + } + drop{ + dnam{"капка"} + one{"{0} капка"} + other{"{0} капки"} + } fluid-ounce{ dnam{"течни унции"} one{"{0} течна унция"} other{"{0} течни унции"} } fluid-ounce-imperial{ - dnam{"Британски течни унции"} - one{"{0} британска течна унция"} - other{"{0} британски течни унции"} + dnam{"имперски течни унции"} + one{"{0} имперска течна унция"} + other{"{0} имперски течни унции"} } gallon{ dnam{"галони"} - one{"{0} галона"} + one{"{0} галон"} other{"{0} галона"} per{"{0} на галон"} } @@ -862,6 +922,11 @@ bg{ one{"{0} хектолитър"} other{"{0} хектолитра"} } + jigger{ + dnam{"джигър"} + one{"{0} джигър"} + other{"{0} джигъра"} + } liter{ dnam{"литри"} one{"{0} литър"} @@ -878,6 +943,11 @@ bg{ one{"{0} милилитър"} other{"{0} милилитра"} } + pinch{ + dnam{"щипка"} + one{"{0} щипка"} + other{"{0} щипки"} + } pint{ dnam{"пинти"} one{"{0} пинта"} @@ -893,6 +963,11 @@ bg{ one{"{0} кварта"} other{"{0} кварти"} } + quart-imperial{ + dnam{"имперска кварта"} + one{"{0} имперска кварта"} + other{"{0} имперски кварти"} + } tablespoon{ dnam{"супени лъжици"} one{"{0} супена лъжица"} @@ -1388,6 +1463,11 @@ bg{ other{"{0} д"} per{"{0}/д"} } + decade{ + dnam{"декада"} + one{"{0} декада"} + other{"{0} декади"} + } hour{ dnam{"часове"} one{"{0} ч"} @@ -1541,6 +1621,11 @@ bg{ } } graphics{ + dot{ + dnam{"точка"} + one{"{0} точка"} + other{"{0} точки"} + } em{ dnam{"ем"} } @@ -1562,10 +1647,23 @@ bg{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + one{"{0} fth"} + other{"{0} fth"} + } foot{ one{"{0} ft"} other{"{0} ft"} } + furlong{ + one{"{0} fur"} + other{"{0} fur"} + } inch{ one{"{0} in"} other{"{0} in"} @@ -1622,7 +1720,6 @@ bg{ other{"{0} pc"} } picometer{ - dnam{"пикометри"} one{"{0} pm"} other{"{0} pm"} } @@ -1641,6 +1738,16 @@ bg{ } } light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lx"} one{"{0} lx"} @@ -1666,6 +1773,11 @@ bg{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"гран"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"g"} one{"{0} g"} @@ -1711,6 +1823,10 @@ bg{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + one{"{0} st"} + other{"{0} st"} + } ton{ one{"{0} tn"} other{"{0} tn"} @@ -1856,6 +1972,11 @@ bg{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"бушели"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1909,6 +2030,26 @@ bg{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"дес. лъжица"} + one{"{0} дес. лъжица"} + other{"{0} дес. лъжици"} + } + dessert-spoon-imperial{ + dnam{"брит. дес. лъжица"} + one{"{0} брит. дес. лъжица"} + other{"{0} брит. дес. лъжици"} + } + dram{ + dnam{"течен драм"} + one{"{0} теч. драм"} + other{"{0} теч. драма"} + } + drop{ + dnam{"капка"} + one{"{0} капка"} + other{"{0} капки"} + } fluid-ounce{ one{"{0} fl oz US"} other{"{0} fl oz US"} @@ -1925,7 +2066,7 @@ bg{ gallon-imperial{ dnam{"имп. галон"} one{"{0} имп. галон"} - other{"{0} имп. гал."} + other{"{0} имп. галона"} per{"{0}/имп. галон"} } hectoliter{ @@ -1933,6 +2074,11 @@ bg{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"джигър"} + one{"{0} джигър"} + other{"{0} джигъра"} + } liter{ dnam{"l"} one{"{0} l"} @@ -1949,6 +2095,11 @@ bg{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"щипка"} + one{"{0} щипка"} + other{"{0} щипки"} + } pint{ one{"{0} pt"} other{"{0} pt"} @@ -1962,6 +2113,11 @@ bg{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"имп. кварта"} + one{"{0} имп. кварта"} + other{"{0} имп. кварти"} + } tablespoon{ dnam{"с. л."} one{"{0} с. л."} diff --git a/intl/icu/source/data/unit/bm.txt b/intl/icu/source/data/unit/bm.txt index 92cb478b8a09..94e42a41ef2a 100644 --- a/intl/icu/source/data/unit/bm.txt +++ b/intl/icu/source/data/unit/bm.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bm{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/bn.txt b/intl/icu/source/data/unit/bn.txt index 03a30015d0b9..8543f829381b 100644 --- a/intl/icu/source/data/unit/bn.txt +++ b/intl/icu/source/data/unit/bn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -540,6 +540,16 @@ bn{ } } light{ + candela{ + dnam{"ক্যান্ডেলা"} + one{"{0} ক্যান্ডেলা"} + other{"{0} ক্যান্ডেলা"} + } + lumen{ + dnam{"লুমেন"} + one{"{0} লুমেন"} + other{"{0} লুমেন"} + } lux{ dnam{"লাক্স"} one{"{0} লাক্স"} @@ -746,6 +756,11 @@ bn{ one{"{0} নিউটন-একক"} other{"{0} নিউটন-এককগুলি"} } + pound-force-foot{ + dnam{"পাউন্ড-ফিট"} + one{"{0} lbf⋅ft"} + other{"{0} পাউন্ড-ফিট"} + } } volume{ acre-foot{ @@ -857,6 +872,11 @@ bn{ one{"{0} মিলিলিটার"} other{"{0} মিলিলিটার"} } + pinch{ + dnam{"চিমটে"} + one{"{0} চিমটে"} + other{"{0} চিমটে"} + } pint{ dnam{"পিন্ট"} one{"{0} পিন্ট"} @@ -949,9 +969,9 @@ bn{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100km"} - one{"{0} L/100km"} - other{"{0} L/100km"} + dnam{"লি/100কিমি"} + one{"{0} লি/100কিমি"} + other{"{0} লি/100কিমি"} } } coordinate{ @@ -1427,9 +1447,9 @@ bn{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100km"} - one{"{0} L/100km"} - other{"{0} L/100km"} + dnam{"লি/100কিমি"} + one{"{0} লি/100কিমি"} + other{"{0} লি/100কিমি"} } liter-per-kilometer{ dnam{"লিটার/কিমি"} @@ -2081,6 +2101,11 @@ bn{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"চিমটে"} + one{"{0} চিমটে"} + other{"{0} চিমটে"} + } pint{ dnam{"pt"} one{"{0} pt"} diff --git a/intl/icu/source/data/unit/bo.txt b/intl/icu/source/data/unit/bo.txt index c1d22eafd69a..4aa84f4f8cf9 100644 --- a/intl/icu/source/data/unit/bo.txt +++ b/intl/icu/source/data/unit/bo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/br.txt b/intl/icu/source/data/unit/br.txt index 4df7507bc385..7ff8016a1cb6 100644 --- a/intl/icu/source/data/unit/br.txt +++ b/intl/icu/source/data/unit/br.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml br{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -9,6 +9,14 @@ br{ } units{ acceleration{ + g-force{ + dnam{"buanadur g"} + few{"{0} buanadur g"} + many{"{0} a vuanadurioù g"} + one{"{0} buanadur g"} + other{"{0} buanadur g"} + two{"{0} vuanadur g"} + } meter-per-square-second{ dnam{"metroù dre eilenn garrez"} few{"{0} metr dre eilenn garrez"} @@ -228,6 +236,7 @@ br{ } } coordinate{ + dnam{"durcʼhadur"} east{"{0} Reter"} north{"{0} Norzh"} south{"{0} Su"} @@ -581,6 +590,14 @@ br{ } } graphics{ + dot{ + dnam{"pik"} + few{"{0} fik"} + many{"{0} a bikoù"} + one{"{0} pik"} + other{"{0} pik"} + two{"{0} bik"} + } dot-per-centimeter{ dnam{"pikoù dre gentimetr"} few{"{0} fik dre gentimetr"} @@ -597,6 +614,14 @@ br{ other{"{0} pik dre veutad"} two{"{0} bik dre veutad"} } + em{ + dnam{"esaouenn em"} + few{"{0} esaouenn em"} + many{"{0} a esaouennoù em"} + one{"{0} esaouenn em"} + other{"{0} esaouenn em"} + two{"{0} esaouenn em"} + } megapixel{ dnam{"megapikselioù"} few{"{0} megapiksel"} @@ -656,6 +681,14 @@ br{ other{"{0} dekimetr"} two{"{0} zekimetr"} } + earth-radius{ + dnam{"skin douar"} + few{"{0} skin douar"} + many{"{0} a skinoù douar"} + one{"{0} skin douar"} + other{"{0} skin douar"} + two{"{0} skin douar"} + } fathom{ dnam{"gourhedadoù"} few{"{0} gourhedad"} @@ -806,6 +839,22 @@ br{ } } light{ + candela{ + dnam{"kandelaoù"} + few{"{0} c'handela"} + many{"{0} a gandelaoù"} + one{"{0} c'handela"} + other{"{0} kandela"} + two{"{0} gandela"} + } + lumen{ + dnam{"lumenoù"} + few{"{0} lumen"} + many{"{0} a lumenoù"} + one{"{0} lumen"} + other{"{0} lumen"} + two{"{0} lumen"} + } lux{ dnam{"luksoù"} few{"{0} luks"} @@ -840,6 +889,13 @@ br{ other{"{0} tolzad douar"} two{"{0} dolzad douar"} } + grain{ + few{"{0} greunad"} + many{"{0} a c'hreunadoù"} + one{"{0} greunad"} + other{"{0} greunad"} + two{"{0} c'hreunad"} + } gram{ dnam{"grammoù"} few{"{0} gramm"} @@ -984,6 +1040,14 @@ br{ } } pressure{ + atmosphere{ + dnam{"atmosfer"} + few{"{0} atmosfer"} + many{"{0} a atmosferoù"} + one{"{0} atmosfer"} + other{"{0} atmosfer"} + two{"{0} atmosfer"} + } bar{ dnam{"baroù"} few{"{0} bar"} @@ -1000,6 +1064,14 @@ br{ other{"{0} hektopaskal"} two{"{0} hektopaskal"} } + inch-ofhg{ + dnam{"meutadoù merkur"} + few{"{0} meutad merkur"} + many{"{0} a veutadoù merkur"} + one{"{0} meutad merkur"} + other{"{0} meutad merkur"} + two{"{0} veutad merkur"} + } kilopascal{ dnam{"kilopaskaloù"} few{"{0} c'hilopaskal"} @@ -1024,6 +1096,14 @@ br{ other{"{0} milibar"} two{"{0} vilibar"} } + millimeter-ofhg{ + dnam{"milimetradoù merkur"} + few{"{0} milimetrad merkur"} + many{"{0} a vilimetradoù merkur"} + one{"{0} milimetrad merkur"} + other{"{0} milimetrad merkur"} + two{"{0} vilimetrad merkur"} + } pascal{ dnam{"paskaloù"} few{"{0} faskal"} @@ -1234,6 +1314,38 @@ br{ other{"{0} dekilitr"} two{"{0} zekilitr"} } + dessert-spoon{ + dnam{"loaiad dibenn-pred"} + few{"{0} loaiad dibenn-pred"} + many{"{0} a loaiadoù dibenn-pred"} + one{"{0} loaiad dibenn-pred"} + other{"{0} loaiad dibenn-pred"} + two{"{0} loaiad dibenn-pred"} + } + dessert-spoon-imperial{ + dnam{"loaiad dibenn-pred impalaerel"} + few{"{0} loaiad dibenn-pred impalaerel"} + many{"{0} a loaiadoù dibenn-pred impalaerel"} + one{"{0} loaiad dibenn-pred impalaerel"} + other{"{0} loaiad dibenn-pred impalaerel"} + two{"{0} loaiad dibenn-pred impalaerel"} + } + dram{ + dnam{"drakm liñvel"} + few{"{0} drakm liñvel"} + many{"{0} a zrakmoù liñvel"} + one{"{0} drakm liñvel"} + other{"{0} drakm liñvel"} + two{"{0} zrakm liñvel"} + } + drop{ + dnam{"takenn"} + few{"{0} zakenn"} + many{"{0} a dakennoù"} + one{"{0} dakenn"} + other{"{0} takenn"} + two{"{0} dakenn"} + } fluid-ounce{ dnam{"oñsoù liñvel"} few{"{0} oñs liñvel"} @@ -1276,6 +1388,14 @@ br{ other{"{0} hektolitr"} two{"{0} hektolitr"} } + jigger{ + dnam{"shot"} + few{"{0} shot"} + many{"{0} a shotoù"} + one{"{0} shot"} + other{"{0} shot"} + two{"{0} shot"} + } liter{ dnam{"litroù"} few{"{0} litr"} @@ -1301,6 +1421,14 @@ br{ other{"{0} mililitr"} two{"{0} vililitr"} } + pinch{ + dnam{"piñsad"} + few{"{0} fiñsad"} + many{"{0} a biñsadoù"} + one{"{0} piñsad"} + other{"{0} piñsad"} + two{"{0} biñsad"} + } pint{ dnam{"pintoù"} few{"{0} fint"} @@ -1325,6 +1453,14 @@ br{ other{"{0} kard"} two{"{0} gard"} } + quart-imperial{ + dnam{"kardoù impalaerel"} + few{"{0} c'hard impalaerel"} + many{"{0} a gardoù impalaerel"} + one{"{0} c'hard impalaerel"} + other{"{0} kard impalaerel"} + two{"{0} gard impalaerel"} + } tablespoon{ dnam{"loaiadoù-boued"} few{"{0} loaiad-voued"} @@ -1539,6 +1675,13 @@ br{ other{"{0}‰"} two{"{0}‰"} } + permillion{ + few{"{0}ppm"} + many{"{0}ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + two{"{0}ppm"} + } permyriad{ few{"{0}‱"} many{"{0}‱"} @@ -1582,6 +1725,7 @@ br{ } } coordinate{ + dnam{"durcʼhadur"} east{"{0}R"} north{"{0}N"} south{"{0}S"} @@ -1919,6 +2063,14 @@ br{ } } graphics{ + dot{ + dnam{"pik"} + few{"{0}pik"} + many{"{0}pik"} + one{"{0}pik"} + other{"{0}pik"} + two{"{0}pik"} + } dot-per-centimeter{ dnam{"pdcm"} few{"{0}pdcm"} @@ -2000,6 +2152,13 @@ br{ other{"{0}dm"} two{"{0}dm"} } + earth-radius{ + few{"{0}R⊕"} + many{"{0}R⊕"} + one{"{0}R⊕"} + other{"{0}R⊕"} + two{"{0}R⊕"} + } fathom{ dnam{"fth"} few{"{0}fth"} @@ -2147,6 +2306,20 @@ br{ } } light{ + candela{ + few{"{0}cd"} + many{"{0}cd"} + one{"{0}cd"} + other{"{0}cd"} + two{"{0}cd"} + } + lumen{ + few{"{0}lm"} + many{"{0}lm"} + one{"{0}lm"} + other{"{0}lm"} + two{"{0}lm"} + } lux{ dnam{"lx"} few{"{0}lx"} @@ -2186,6 +2359,14 @@ br{ other{"{0}M⊕"} two{"{0}M⊕"} } + grain{ + dnam{"gr"} + few{"{0}gr"} + many{"{0}gr"} + one{"{0}gr"} + other{"{0}gr"} + two{"{0}gr"} + } gram{ dnam{"g"} few{"{0}g"} @@ -2594,6 +2775,38 @@ br{ other{"{0}dl"} two{"{0}dl"} } + dessert-spoon{ + dnam{"l.d.-b."} + few{"{0}l.d.-b."} + many{"{0}l.d.-b."} + one{"{0}l.d.-b."} + other{"{0}l.d.-b."} + two{"{0}l.d.-b."} + } + dessert-spoon-imperial{ + dnam{"ldb Imp"} + few{"{0}ldb Imp"} + many{"{0}ldb Imp"} + one{"{0}ldb Imp"} + other{"{0}ldb Imp"} + two{"{0}ldb Imp"} + } + dram{ + dnam{"fl dr"} + few{"{0}fl dr"} + many{"{0}fl dr"} + one{"{0}fl dr"} + other{"{0}fl dr"} + two{"{0}fl dr"} + } + drop{ + dnam{"gt"} + few{"{0}gt"} + many{"{0}gt"} + one{"{0}gt"} + other{"{0}gt"} + two{"{0}gt"} + } fluid-ounce{ dnam{"fl oz"} few{"{0}fl oz"} @@ -2635,6 +2848,14 @@ br{ other{"{0}hl"} two{"{0}hl"} } + jigger{ + dnam{"shot"} + few{"{0}shot"} + many{"{0}shot"} + one{"{0}shot"} + other{"{0}shot"} + two{"{0}shot"} + } liter{ dnam{"l"} few{"{0}l"} @@ -2660,6 +2881,14 @@ br{ other{"{0}ml"} two{"{0}ml"} } + pinch{ + dnam{"piñs"} + few{"{0}piñs"} + many{"{0}piñs"} + one{"{0}piñs"} + other{"{0}piñs"} + two{"{0}piñs"} + } pint{ dnam{"pt"} few{"{0}pt"} @@ -2684,6 +2913,14 @@ br{ other{"{0}qt"} two{"{0}qt"} } + quart-imperial{ + dnam{"qt Imp."} + few{"{0}qt Imp."} + many{"{0}qt Imp."} + one{"{0}qt Imp."} + other{"{0}qt Imp."} + two{"{0}qt Imp."} + } tablespoon{ dnam{"l.-v."} few{"{0}l.-v."} @@ -2922,6 +3159,7 @@ br{ } } coordinate{ + dnam{"durcʼhadur"} east{"{0} R"} north{"{0} N"} south{"{0} S"} @@ -3249,6 +3487,14 @@ br{ } } graphics{ + dot{ + dnam{"pik"} + few{"{0} pik"} + many{"{0} pik"} + one{"{0} pik"} + other{"{0} pik"} + two{"{0} pik"} + } dot-per-centimeter{ dnam{"pdcm"} few{"{0} pdcm"} @@ -3462,6 +3708,14 @@ br{ other{"{0} CD"} two{"{0} CD"} } + grain{ + dnam{"gr"} + few{"{0} gr"} + many{"{0} gr"} + one{"{0} gr"} + other{"{0} gr"} + two{"{0} gr"} + } gram{ dnam{"g"} few{"{0} g"} @@ -3782,6 +4036,38 @@ br{ other{"{0} dl"} two{"{0} dl"} } + dessert-spoon{ + dnam{"l.d.-b."} + few{"{0} l.d.-b."} + many{"{0} l.d.-b."} + one{"{0} l.d.-b."} + other{"{0} l.d.-b."} + two{"{0} l.d.-b."} + } + dessert-spoon-imperial{ + dnam{"l.d.-b. imp."} + few{"{0} l.d.-b. imp."} + many{"{0} l.d.-b. imp."} + one{"{0} l.d.-b. imp."} + other{"{0} l.d.-b. imp."} + two{"{0} l.d.-b. imp."} + } + dram{ + dnam{"fl dr"} + few{"{0} fl dr"} + many{"{0} fl dr"} + one{"{0} fl dr"} + other{"{0} fl dr"} + two{"{0} fl dr"} + } + drop{ + dnam{"gt"} + few{"{0} gt"} + many{"{0} gt"} + one{"{0} gt"} + other{"{0} gt"} + two{"{0} gt"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -3824,6 +4110,14 @@ br{ other{"{0} hl"} two{"{0} hl"} } + jigger{ + dnam{"shot"} + few{"{0} shot"} + many{"{0} shot"} + one{"{0} shot"} + other{"{0} shot"} + two{"{0} shot"} + } liter{ dnam{"l"} few{"{0} l"} @@ -3849,6 +4143,14 @@ br{ other{"{0} ml"} two{"{0} ml"} } + pinch{ + dnam{"piñs"} + few{"{0} piñs"} + many{"{0} piñs"} + one{"{0} piñs"} + other{"{0} piñs"} + two{"{0} piñs"} + } pint{ dnam{"pt"} few{"{0} pt"} @@ -3873,6 +4175,14 @@ br{ other{"{0} qt"} two{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp."} + few{"{0} qt Imp."} + many{"{0} qt Imp."} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + two{"{0} qt Imp."} + } tablespoon{ dnam{"l.-v."} few{"{0} l.-v."} diff --git a/intl/icu/source/data/unit/brx.txt b/intl/icu/source/data/unit/brx.txt index 09f257a1e7cd..b39932eacf70 100644 --- a/intl/icu/source/data/unit/brx.txt +++ b/intl/icu/source/data/unit/brx.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml brx{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/bs.txt b/intl/icu/source/data/unit/bs.txt index 53c13cea2dcc..7b72edc1d477 100644 --- a/intl/icu/source/data/unit/bs.txt +++ b/intl/icu/source/data/unit/bs.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -253,7 +253,7 @@ bs{ megabyte{ dnam{"megabajti"} few{"{0} megabajta"} - one{"{0} megabajta"} + one{"{0} megabajt"} other{"{0} megabajta"} } petabyte{ @@ -473,6 +473,12 @@ bs{ } } graphics{ + dot{ + dnam{"tačka"} + few{"{0} tačke"} + one{"{0} tačka"} + other{"{0} tačaka"} + } megapixel{ dnam{"megapikseli"} } @@ -500,6 +506,18 @@ bs{ one{"{0} decimetar"} other{"{0} decimetara"} } + earth-radius{ + dnam{"radijus zemlje"} + few{"{0} radijusa zemlje"} + one{"{0} radijus zemlje"} + other{"{0} radijus zemlje"} + } + fathom{ + dnam{"hvat"} + few{"{0} hvata"} + one{"{0} hvat"} + other{"{0} hvata"} + } foot{ dnam{"stope"} few{"{0} stope"} @@ -507,6 +525,12 @@ bs{ other{"{0} stopa"} per{"{0} po stopi"} } + furlong{ + dnam{"osmina milje"} + few{"{0} osmine milje"} + one{"{0} osmina milje"} + other{"{0} osmina milje"} + } inch{ dnam{"inči"} few{"{0} inča"} @@ -583,10 +607,10 @@ bs{ other{"{0} pikometara"} } point{ - dnam{"tačke"} - few{"{0} tč"} - one{"{0} tačka"} - other{"{0} tačaka"} + dnam{"DTP tačke"} + few{"{0} DTP tačke"} + one{"{0} DTP tačka"} + other{"{0} DTP tačaka"} } solar-radius{ dnam{"Sunčevi radijusi"} @@ -602,6 +626,18 @@ bs{ } } light{ + candela{ + dnam{"kandela"} + few{"{0} kandele"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumena"} + one{"{0} lumen"} + other{"{0} lumena"} + } lux{ dnam{"luksi"} few{"{0} luksa"} @@ -692,6 +728,12 @@ bs{ one{"{0} Sunčeva masa"} other{"{0} Sunčevih masa"} } + stone{ + dnam{"stone"} + few{"{0} stone"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ dnam{"tone"} few{"{0} tone"} @@ -759,7 +801,7 @@ bs{ dnam{"inči živinog stuba"} few{"{0} inča živinog stuba"} one{"{0} inč živinog stuba"} - other{"{0} inča žive"} + other{"{0} inča živinog stuba"} } kilopascal{ dnam{"kilopaskali"} @@ -877,6 +919,12 @@ bs{ one{"{0} barel"} other{"{0} barela"} } + bushel{ + dnam{"bušeli"} + few{"{0} bušela"} + one{"{0} bušel"} + other{"{0} bušela"} + } centiliter{ dnam{"centilitri"} few{"{0} centilitra"} @@ -945,6 +993,30 @@ bs{ one{"{0} decilitar"} other{"{0} decilitara"} } + dessert-spoon{ + dnam{"kašika za desert"} + few{"{0} kašike za desert"} + one{"{0} kašika za desert"} + other{"{0} kašika za desert"} + } + dessert-spoon-imperial{ + dnam{"imperijalna kašika za desert"} + few{"{0} imperijalne kašike za desert"} + one{"{0} imperijalna kašika za desert"} + other{"{0} imperijalnih kašika za desert"} + } + dram{ + dnam{"tečni dram"} + few{"{0} tečna drama"} + one{"{0} tečni dram"} + other{"{0} tečnih drama"} + } + drop{ + dnam{"kap"} + few{"{0} kapi"} + one{"{0} kap"} + other{"{0} kapi"} + } fluid-ounce{ dnam{"tečne unce"} few{"{0} tečne unce"} @@ -977,6 +1049,12 @@ bs{ one{"{0} hektolitar"} other{"{0} hektolitara"} } + jigger{ + dnam{"mala čašica"} + few{"{0} male čašice"} + one{"{0} mala čašica"} + other{"{0} malih čašica"} + } liter{ dnam{"litri"} few{"{0} litra"} @@ -996,6 +1074,12 @@ bs{ one{"{0} mililitar"} other{"{0} mililitara"} } + pinch{ + dnam{"prstohvat"} + few{"{0} prstohvata"} + one{"{0} prstohvat"} + other{"{0} prstohvata"} + } pint{ dnam{"pinte"} few{"{0} pinte"} @@ -1014,6 +1098,12 @@ bs{ one{"{0} četvrtina"} other{"{0} četvrtina"} } + quart-imperial{ + dnam{"imperijalni kvarc"} + few{"{0} imperijalna kvarca"} + one{"{0} imperijalni kvarc"} + other{"{0} imperijalnih kvarca"} + } tablespoon{ dnam{"kašike"} few{"{0} kašike"} @@ -1029,6 +1119,62 @@ bs{ } } unitsNarrow{ + acceleration{ + g-force{ + few{"{0} G"} + one{"{0} G"} + other{"{0} G"} + } + } + angle{ + arc-minute{ + few{"{0}′"} + one{"{0}′"} + other{"{0}′"} + } + arc-second{ + few{"{0}″"} + one{"{0}″"} + other{"{0}″"} + } + degree{ + few{"{0}°"} + one{"{0}°"} + other{"{0}°"} + } + } + area{ + acre{ + few{"{0} kj"} + one{"{0} kj"} + other{"{0} kj"} + } + hectare{ + few{"{0} ha"} + one{"{0} ha"} + other{"{0} ha"} + } + square-foot{ + few{"{0} ft²"} + one{"{0} ft²"} + other{"{0} ft²"} + } + square-kilometer{ + few{"{0} km²"} + one{"{0} km²"} + other{"{0} km²"} + } + square-meter{ + few{"{0} m²"} + one{"{0} m²"} + other{"{0} m²"} + } + square-mile{ + few{"{0} mi²"} + one{"{0} mi²"} + other{"{0} mi²"} + } + } compound{ per{"{0}/{1}"} } @@ -1124,12 +1270,27 @@ bs{ one{"{0} m"} other{"{0} m"} } + mile{ + few{"{0} mi"} + one{"{0} mi"} + other{"{0} mi"} + } millimeter{ dnam{"mm"} few{"{0} mm"} one{"{0} mm"} other{"{0} mm"} } + picometer{ + few{"{0} pm"} + one{"{0} pm"} + other{"{0} pm"} + } + yard{ + few{"{0} yd"} + one{"{0} yd"} + other{"{0} yd"} + } } mass{ gram{ @@ -1144,6 +1305,45 @@ bs{ one{"{0} kg"} other{"{0} kg"} } + ounce{ + few{"{0} oz"} + one{"{0} oz"} + other{"{0} oz"} + } + pound{ + few{"{0} lb"} + one{"{0} lb"} + other{"{0} lb"} + } + } + power{ + kilowatt{ + few{"{0} kW"} + one{"{0} kW"} + other{"{0} kW"} + } + watt{ + few{"{0} W"} + one{"{0} W"} + other{"{0} W"} + } + } + pressure{ + hectopascal{ + few{"{0} hPa"} + one{"{0} hPa"} + other{"{0} hPa"} + } + inch-ofhg{ + few{"{0} inHg"} + one{"{0} inHg"} + other{"{0} inHg"} + } + millibar{ + few{"{0} mbar"} + one{"{0} mb"} + other{"{0} mb"} + } } speed{ kilometer-per-hour{ @@ -1152,6 +1352,16 @@ bs{ one{"{0} km/h"} other{"{0} km/h"} } + meter-per-second{ + few{"{0} m/s"} + one{"{0} m/s"} + other{"{0} m/s"} + } + mile-per-hour{ + few{"{0} mi/h"} + one{"{0} mi/h"} + other{"{0} mi/h"} + } } temperature{ celsius{ @@ -1160,8 +1370,23 @@ bs{ one{"{0}°"} other{"{0}°"} } + fahrenheit{ + few{"{0}°F"} + one{"{0}°F"} + other{"{0}°F"} + } } volume{ + cubic-kilometer{ + few{"{0} km³"} + one{"{0} km³"} + other{"{0} km³"} + } + cubic-mile{ + few{"{0} mi³"} + one{"{0} mi³"} + other{"{0} mi³"} + } liter{ dnam{"litar"} few{"{0}l"} @@ -1706,6 +1931,12 @@ bs{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"hvat"} + few{"{0} hvata"} + one{"{0} hvat"} + other{"{0} hvata"} + } foot{ dnam{"stope"} few{"{0} ft"} @@ -1713,6 +1944,12 @@ bs{ other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"osmina milje"} + few{"{0} osmine milje"} + one{"{0} osmina milje"} + other{"{0} osmina milje"} + } inch{ dnam{"inči"} few{"{0} in"} @@ -1789,10 +2026,10 @@ bs{ other{"{0} pm"} } point{ - dnam{"tč"} - few{"{0} tč"} - one{"{0} tč"} - other{"{0} tč"} + dnam{"DTP tč"} + few{"{0} DTP tč"} + one{"{0} DTP tč"} + other{"{0} DTP tč"} } solar-radius{ dnam{"R☉"} @@ -1963,7 +2200,7 @@ bs{ other{"{0} hPa"} } inch-ofhg{ - dnam{"in Hg"} + dnam{"inHg"} few{"{0} inHg"} one{"{0} inHg"} other{"{0} inHg"} @@ -1987,10 +2224,10 @@ bs{ other{"{0} mbar"} } millimeter-ofhg{ - dnam{"mm Hg"} - few{"{0} mm Hg"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} + dnam{"mmHg"} + few{"{0} mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} } pascal{ dnam{"Pa"} @@ -2084,6 +2321,12 @@ bs{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"bu"} + few{"{0} bu"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cL"} few{"{0} cL"} @@ -2152,6 +2395,30 @@ bs{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"kš. des."} + few{"{0} kš. des."} + one{"{0} kš. des."} + other{"{0} kš. des."} + } + dessert-spoon-imperial{ + dnam{"imp. kš. des."} + few{"{0} imp. kš. des."} + one{"{0} imp. kš. des."} + other{"{0} imp. kš. des."} + } + dram{ + dnam{"teč. dram"} + few{"{0} teč. drama"} + one{"{0} teč. dram"} + other{"{0} teč. drama"} + } + drop{ + dnam{"kap"} + few{"{0} kapi"} + one{"{0} kap"} + other{"{0} kapi"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -2184,6 +2451,12 @@ bs{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"mala čašica"} + few{"{0} male čašice"} + one{"{0} mala čašica"} + other{"{0} malih čašica"} + } liter{ dnam{"litri"} few{"{0} l"} @@ -2203,6 +2476,12 @@ bs{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"prstohvat"} + few{"{0} prstohvata"} + one{"{0} prstohvat"} + other{"{0} prstohvata"} + } pint{ dnam{"pinte"} few{"{0} pt"} @@ -2221,6 +2500,12 @@ bs{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"imp. kvarc"} + few{"{0} imp. kvarca"} + one{"{0} imp. kvarc"} + other{"{0} imp. kvarca"} + } tablespoon{ dnam{"tbsp"} few{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/bs_BA.txt b/intl/icu/source/data/unit/bs_BA.txt index e5e3a465740d..70619a1bff37 100644 --- a/intl/icu/source/data/unit/bs_BA.txt +++ b/intl/icu/source/data/unit/bs_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_BA{ "%%ALIAS"{"bs_Latn_BA"} } diff --git a/intl/icu/source/data/unit/bs_Cyrl.txt b/intl/icu/source/data/unit/bs_Cyrl.txt index 51f0a63643b1..6728961fad86 100644 --- a/intl/icu/source/data/unit/bs_Cyrl.txt +++ b/intl/icu/source/data/unit/bs_Cyrl.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Cyrl{ %%Parent{"root"} - Version{"37"} units{ area{ acre{ diff --git a/intl/icu/source/data/unit/bs_Latn.txt b/intl/icu/source/data/unit/bs_Latn.txt index d1a6b5e7fa79..f2561126b44d 100644 --- a/intl/icu/source/data/unit/bs_Latn.txt +++ b/intl/icu/source/data/unit/bs_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/bs_Latn_BA.txt b/intl/icu/source/data/unit/bs_Latn_BA.txt index 3ef1cc4058e9..04342dc0ad7c 100644 --- a/intl/icu/source/data/unit/bs_Latn_BA.txt +++ b/intl/icu/source/data/unit/bs_Latn_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ca.txt b/intl/icu/source/data/unit/ca.txt index 97a91f2520ca..bf56c90a8237 100644 --- a/intl/icu/source/data/unit/ca.txt +++ b/intl/icu/source/data/unit/ca.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -387,22 +387,22 @@ ca{ } frequency{ gigahertz{ - dnam{"gigahertzs"} + dnam{"gigahertz"} one{"{0} gigahertz"} other{"{0} gigahertzs"} } hertz{ - dnam{"hertzs"} + dnam{"hertz"} one{"{0} hertz"} other{"{0} hertzs"} } kilohertz{ - dnam{"quilohertzs"} + dnam{"quilohertz"} one{"{0} quilohertz"} other{"{0} quilohertzs"} } megahertz{ - dnam{"megahertzs"} + dnam{"megahertz"} one{"{0} megahertz"} other{"{0} megahertzs"} } @@ -459,12 +459,27 @@ ca{ one{"{0} decímetre"} other{"{0} decímetres"} } + earth-radius{ + dnam{"radi terrestre"} + one{"{0} radi terrestre"} + other{"{0} radis terrestres"} + } + fathom{ + dnam{"braces"} + one{"{0} braça"} + other{"{0} braces"} + } foot{ dnam{"peus"} one{"{0} peu"} other{"{0} peus"} per{"{0} per peu"} } + furlong{ + dnam{"estadis"} + one{"{0} estadi"} + other{"{0} estadis"} + } inch{ dnam{"polzades"} one{"{0} polzada"} @@ -530,8 +545,8 @@ ca{ } point{ dnam{"punts"} - one{"{0} punt"} - other{"{0} punts"} + one{"{0} punt tipogràfic"} + other{"{0} punts tipogràfics"} } solar-radius{ dnam{"radis solars"} @@ -545,6 +560,16 @@ ca{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candeles"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumens"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -572,6 +597,10 @@ ca{ one{"{0} massa de la Terra"} other{"{0} masses de la Terra"} } + grain{ + one{"{0} gra"} + other{"{0} grans"} + } gram{ dnam{"grams"} one{"{0} gram"} @@ -621,6 +650,11 @@ ca{ one{"{0} massa solar"} other{"{0} masses solars"} } + stone{ + dnam{"pedres"} + one{"{0} pedra"} + other{"{0} pedres"} + } ton{ dnam{"tones"} one{"{0} tona"} @@ -778,6 +812,11 @@ ca{ one{"{0} barril"} other{"{0} barrils"} } + bushel{ + dnam{"bushels"} + one{"{0} bushel"} + other{"{0} bushels"} + } centiliter{ dnam{"centilitres"} one{"{0} centilitre"} @@ -835,8 +874,26 @@ ca{ one{"{0} decilitre"} other{"{0} decilitres"} } + dessert-spoon{ + one{"{0} cullereta de postres"} + other{"{0} culleretes de postres"} + } + dessert-spoon-imperial{ + dnam{"cullereta de postres imperial"} + one{"{0} cullereta de postres imperial"} + other{"{0} culleretes de postres imperials"} + } + dram{ + dnam{"dracma"} + one{"{0} dracma"} + other{"{0} dracmes"} + } + drop{ + one{"{0} gota"} + other{"{0} gotes"} + } fluid-ounce{ - dnam{"unça líquida"} + dnam{"unces líquides"} one{"{0} unça líquida"} other{"{0} unces líquides"} } @@ -862,6 +919,11 @@ ca{ one{"{0} hectolitre"} other{"{0} hectolitres"} } + jigger{ + dnam{"mesurador de cocteleria"} + one{"{0} mesurador de cocteleria"} + other{"{0} mesuradors de cocteleria"} + } liter{ dnam{"litres"} one{"{0} litre"} @@ -878,6 +940,10 @@ ca{ one{"{0} mil·lilitre"} other{"{0} mil·lilitres"} } + pinch{ + one{"{0} pessic"} + other{"{0} pessics"} + } pint{ dnam{"pintes"} one{"{0} pinta"} @@ -893,6 +959,10 @@ ca{ one{"{0} quart"} other{"{0} quarts"} } + quart-imperial{ + one{"{0} quart imperial"} + other{"{0} quarts imperials"} + } tablespoon{ dnam{"cullerades"} one{"{0} cullerada"} @@ -1200,12 +1270,12 @@ ca{ other{"{0} arcsec"} } degree{ - dnam{"º"} + dnam{"graus"} one{"{0}°"} other{"{0}°"} } radian{ - dnam{"rad"} + dnam{"radiants"} one{"{0} rad"} other{"{0} rad"} } @@ -1278,7 +1348,7 @@ ca{ } concentr{ karat{ - dnam{"ct"} + dnam{"quirats"} one{"{0} ct"} other{"{0} ct"} } @@ -1288,7 +1358,7 @@ ca{ other{"{0} mg/dl"} } millimole-per-liter{ - dnam{"mM/l"} + dnam{"mil·limols/litre"} one{"{0} mM/l"} other{"{0} mM/l"} } @@ -1303,7 +1373,7 @@ ca{ other{"{0} ‰"} } permillion{ - dnam{"ppm"} + dnam{"parts/milió"} one{"{0} ppm"} other{"{0} ppm"} } @@ -1531,8 +1601,11 @@ ca{ } } force{ + newton{ + dnam{"newton"} + } pound-force{ - dnam{"lbf"} + dnam{"lliures-força"} one{"{0} lbf"} other{"{0} lbf"} } @@ -1560,6 +1633,11 @@ ca{ } } graphics{ + dot{ + dnam{"punt"} + one{"{0} punt"} + other{"{0} punts"} + } dot-per-centimeter{ dnam{"ppcm"} one{"{0} ppcm"} @@ -1587,7 +1665,7 @@ ca{ } pixel-per-centimeter{ dnam{"píxels per cm"} - one{"{0} píxels per cm"} + one{"{0} píxel per cm"} other{"{0} píxels per cm"} } pixel-per-inch{ @@ -1694,11 +1772,17 @@ ca{ } } light{ + lumen{ + dnam{"lm"} + } lux{ - dnam{"lx"} + dnam{"lux"} one{"{0} lx"} other{"{0} lx"} } + solar-luminosity{ + dnam{"lluminositats solars"} + } } mass{ carat{ @@ -1715,6 +1799,11 @@ ca{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"gra"} + one{"{0} gra"} + other{"{0} grans"} + } gram{ dnam{"grams"} one{"{0} g"} @@ -1759,6 +1848,11 @@ ca{ other{"{0} lb"} per{"{0}/lb"} } + stone{ + dnam{"st"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"t"} one{"{0} t"} @@ -1908,6 +2002,11 @@ ca{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"bushels"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1965,6 +2064,26 @@ ca{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"cullereta de postres"} + one{"{0} cullereta de postres"} + other{"{0} culleretes de postres"} + } + dessert-spoon-imperial{ + dnam{"cull. postres imp."} + one{"{0} cull. postres imp."} + other{"{0} cull. postres imp."} + } + dram{ + dnam{"dracma fluid"} + one{"{0} dracma fluid"} + other{"{0} dracmes fluids"} + } + drop{ + dnam{"gota"} + one{"{0} gota"} + other{"{0} gotes"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1992,6 +2111,11 @@ ca{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"mesurador"} + one{"{0} mesurador"} + other{"{0} mesuradors"} + } liter{ dnam{"l"} one{"{0} l"} @@ -2008,6 +2132,11 @@ ca{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"pessic"} + one{"{0} pessic"} + other{"{0} pessics"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -2023,6 +2152,11 @@ ca{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"quart imperial"} + one{"{0} quart imperial"} + other{"{0} quarts imperials"} + } tablespoon{ dnam{"cull."} one{"{0} cull."} diff --git a/intl/icu/source/data/unit/ccp.txt b/intl/icu/source/data/unit/ccp.txt index ae5929104761..617fea034f3c 100644 --- a/intl/icu/source/data/unit/ccp.txt +++ b/intl/icu/source/data/unit/ccp.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/ce.txt b/intl/icu/source/data/unit/ce.txt index 703a623108e5..ad7f2ddbefd8 100644 --- a/intl/icu/source/data/unit/ce.txt +++ b/intl/icu/source/data/unit/ce.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ce{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/ceb.txt b/intl/icu/source/data/unit/ceb.txt index 97f03f286c1e..fe5070c16813 100644 --- a/intl/icu/source/data/unit/ceb.txt +++ b/intl/icu/source/data/unit/ceb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ceb{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -14,9 +14,9 @@ ceb{ other{"{0} g-force"} } meter-per-square-second{ - dnam{"mga metro kada second squared"} - one{"{0} ka metro kada second squared"} - other{"{0} ka mga metro kada second squared"} + dnam{"mga metro kada segundo kwadrado"} + one{"{0} ka metro kada segundo kwadrado"} + other{"{0} ka mga metro kada segundo kwadrado"} } } angle{ @@ -63,10 +63,10 @@ ceb{ other{"{0} ka mga ektarya"} } square-centimeter{ - dnam{"mga square centimeter"} - one{"{0} ka square centimeter"} - other{"{0} ka mga square centimeter"} - per{"{0} kada square centimeter"} + dnam{"mga centimetro kwadrado"} + one{"{0} ka sentimetro kwadrado"} + other{"{0} ka mga sentimetro kwadrado"} + per{"{0} kada sentimetro kwadrado"} } square-foot{ dnam{"mga square foot"} @@ -81,21 +81,21 @@ ceb{ } square-kilometer{ dnam{"mga square kilometer"} - one{"{0} ka square kilometer"} - other{"{0} ka mga square kilometer"} - per{"{0} kada square kilometer"} + one{"{0} ka kilometro kwadrado"} + other{"{0} ka mga kilometro kwadrado"} + per{"{0} kada kilometro kwadrado"} } square-meter{ - dnam{"mga square meter"} - one{"{0} ka square meter"} - other{"{0} ka mga square meter"} - per{"{0} kada square meter"} + dnam{"mga metro kwadrado"} + one{"{0} ka metro kwadrado"} + other{"{0} ka mga metro kwadrado"} + per{"{0} kada metro kwadrado"} } square-mile{ - dnam{"mga square mile"} - one{"{0} ka square mile"} - other{"{0} ka mga square mile"} - per{"{0} kada square mile"} + dnam{"mga milya kwadrado"} + one{"{0} ka milya kwadrado"} + other{"{0} ka mga milya kwadrado"} + per{"{0} kada milya kwadrado"} } square-yard{ dnam{"mga square yard"} @@ -407,6 +407,10 @@ ceb{ } } graphics{ + dot{ + one{"{0} dot"} + other{"{0} dot"} + } dot-per-centimeter{ dnam{"mga dot kada sentimetro"} one{"{0} ka dot kada sentimetro"} @@ -460,6 +464,11 @@ ceb{ one{"{0} ka decimeter"} other{"{0} ka mga decimeter"} } + earth-radius{ + dnam{"radyus sa yuta"} + one{"{0} ka radyus sa yuta"} + other{"{0} ka radyus sa yuta"} + } foot{ dnam{"mga piye"} one{"{0} ka piye"} @@ -546,6 +555,16 @@ ceb{ } } light{ + candela{ + dnam{"candela"} + one{"{0} ka candela"} + other{"{0} ka candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} ka lumen"} + other{"{0} ka lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -573,6 +592,10 @@ ceb{ one{"{0} ka mass sa Earth"} other{"{0} ka mga mass sa Earth"} } + grain{ + one{"{0} ka grain"} + other{"{0} ka grain"} + } gram{ dnam{"mga gramo"} one{"{0} ka gramo"} @@ -677,8 +700,8 @@ ceb{ other{"{0} ka mga hectopascal"} } inch-ofhg{ - dnam{"mga pulgada sa mercury"} - one{"{0} ka pulgada sa mercury"} + dnam{"mga inch sa mercury"} + one{"{0} ka inch sa mercury"} other{"{0} ka mga pulgada sa mercury"} } kilopascal{ @@ -754,11 +777,11 @@ ceb{ torque{ newton-meter{ dnam{"mga newton-meter"} - one{"{0} ka newton-meter"} + one{"{0} N⋅m"} other{"{0} ka mga newton-meter"} } pound-force-foot{ - dnam{"mga pound-force-foot"} + dnam{"pound-feet"} one{"{0} ka pound-force-foot"} other{"{0} ka mga pound-force-foot"} } @@ -831,6 +854,25 @@ ceb{ one{"{0} ka deciliter"} other{"{0} ka mga deciliter"} } + dessert-spoon{ + dnam{"kutsarang panghinam-is"} + one{"{0} ka kutsarang panghinam-is"} + other{"{0} ka kutsarang panghinam-is"} + } + dessert-spoon-imperial{ + dnam{"Imp. nga kutsarang panghinam-is"} + one{"{0} ka Imp. nga kutsarang panghinam-is"} + other{"{0} ka Imp. nga kutsarang panghinam-is"} + } + dram{ + dnam{"dram"} + one{"{0} ka dram"} + other{"{0} ka dram"} + } + drop{ + one{"{0} ka drop"} + other{"{0} ka drop"} + } fluid-ounce{ dnam{"mga fluid ounce"} one{"{0} ka fluid ounce"} @@ -858,6 +900,10 @@ ceb{ one{"{0} ka hectoliter"} other{"{0} ka mga hectoliter"} } + jigger{ + one{"{0} ka jigger"} + other{"{0} ka jigger"} + } liter{ dnam{"mga litro"} one{"{0} ka litro"} @@ -874,6 +920,10 @@ ceb{ one{"{0} ka milliliter"} other{"{0} ka mga milliliter"} } + pinch{ + one{"{0} ka pinch"} + other{"{0} ka pinch"} + } pint{ dnam{"mga pint"} one{"{0} ka pint"} @@ -889,6 +939,11 @@ ceb{ one{"{0} ka quart"} other{"{0} ka mga quart"} } + quart-imperial{ + dnam{"Imp. quart"} + one{"{0} ka Imp. quart"} + other{"{0} ka Imp. quart"} + } tablespoon{ dnam{"mga kutsara"} one{"{0} ka kutsara"} @@ -1058,10 +1113,10 @@ ceb{ dnam{"mga inch²"} } square-meter{ - dnam{"mga meter²"} + dnam{"mga metro²"} } square-mile{ - dnam{"mga sq mile"} + dnam{"mga milya kwadrado"} one{"{0} sq mi"} other{"{0} sq mi"} } @@ -1405,6 +1460,14 @@ ceb{ cup{ dnam{"mga tasa"} } + dram{ + one{"{0} ka dram fl"} + other{"{0} ka dram fl"} + } + drop{ + one{"{0} ka drop"} + other{"{0} ka drop"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1421,12 +1484,20 @@ ceb{ other{"{0} gal"} per{"{0}/gal US"} } + jigger{ + one{"{0} ka jigger"} + other{"{0} ka jigger"} + } liter{ dnam{"mga litro"} one{"{0} L"} other{"{0} L"} per{"{0}/L"} } + pinch{ + one{"{0} ka pinch"} + other{"{0} ka pinch"} + } pint{ dnam{"mga pint"} } diff --git a/intl/icu/source/data/unit/cgg.txt b/intl/icu/source/data/unit/cgg.txt index 25daf6b28b8b..61aa5e5b3a65 100644 --- a/intl/icu/source/data/unit/cgg.txt +++ b/intl/icu/source/data/unit/cgg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cgg{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/chr.txt b/intl/icu/source/data/unit/chr.txt index 2e2af5af3cdd..0b88761aab61 100644 --- a/intl/icu/source/data/unit/chr.txt +++ b/intl/icu/source/data/unit/chr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/ckb.txt b/intl/icu/source/data/unit/ckb.txt index 8400cf4cd20e..ddfecf28d140 100644 --- a/intl/icu/source/data/unit/ckb.txt +++ b/intl/icu/source/data/unit/ckb.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/cs.txt b/intl/icu/source/data/unit/cs.txt index 34de1af1ce87..9ca472575423 100644 --- a/intl/icu/source/data/unit/cs.txt +++ b/intl/icu/source/data/unit/cs.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -17,7 +17,7 @@ cs{ other{"{0} G"} } meter-per-square-second{ - dnam{"metr za sekundu na druhou"} + dnam{"metry za sekundu na druhou"} few{"{0} metry za sekundu na druhou"} many{"{0} metru za sekundu na druhou"} one{"{0} metr za sekundu na druhou"} @@ -223,11 +223,11 @@ cs{ other{"{0} mil na galon"} } mile-per-gallon-imperial{ - dnam{"míle na imp. galon"} - few{"{0} míle na imp. galon"} - many{"{0} míle na imp. galon"} - one{"{0} míle na imp. galon"} - other{"{0} mil na imp. galon"} + dnam{"míle na britský galon"} + few{"{0} míle na britský galon"} + many{"{0} míle na britský galon"} + one{"{0} míle na britský galon"} + other{"{0} mil na britský galon"} } } coordinate{ @@ -551,6 +551,13 @@ cs{ } } graphics{ + dot{ + dnam{"obrazový bod"} + few{"{0} obrazové body"} + many{"{0} obrazového bodu"} + one{"{0} obrazový bod"} + other{"{0} obrazových bodů"} + } dot-per-centimeter{ dnam{"body na centimetr"} few{"{0} body na centimetr"} @@ -624,12 +631,19 @@ cs{ one{"{0} decimetr"} other{"{0} decimetrů"} } + earth-radius{ + dnam{"poloměr Země"} + few{"{0} poloměry Země"} + many{"{0} poloměru Země"} + one{"{0} poloměr Země"} + other{"{0} poloměrů Země"} + } fathom{ - dnam{"fathomy"} - few{"{0} fathomy"} - many{"{0} fathomu"} - one{"{0} fathom"} - other{"{0} fathomů"} + dnam{"sáhy"} + few{"{0} sáhy"} + many{"{0} sáhu"} + one{"{0} sáh"} + other{"{0} sáhů"} } foot{ dnam{"stopy"} @@ -756,6 +770,20 @@ cs{ } } light{ + candela{ + dnam{"kandely"} + few{"{0} kandely"} + many{"{0} kandely"} + one{"{0} kandela"} + other{"{0} kandel"} + } + lumen{ + dnam{"lumeny"} + few{"{0} lumeny"} + many{"{0} lumenu"} + one{"{0} lumen"} + other{"{0} lumenů"} + } lux{ dnam{"luxy"} few{"{0} luxy"} @@ -764,7 +792,7 @@ cs{ other{"{0} luxů"} } solar-luminosity{ - dnam{"zářivé výkony Sllunce"} + dnam{"zářivé výkony Slunce"} few{"{0} zářivé výkony Slunce"} many{"{0} zářivého výkonu Slunce"} one{"{0} zářivý výkon Slunce"} @@ -793,6 +821,13 @@ cs{ one{"{0} hmotnost Země"} other{"{0} hmotností Země"} } + grain{ + dnam{"grainy"} + few{"{0} grainy"} + many{"{0} grainu"} + one{"{0} grain"} + other{"{0} grainů"} + } gram{ dnam{"gramy"} few{"{0} gramy"} @@ -810,11 +845,11 @@ cs{ per{"{0} na kilogram"} } metric-ton{ - dnam{"metrické tuny"} - few{"{0} metrické tuny"} - many{"{0} metrické tuny"} - one{"{0} metrická tuna"} - other{"{0} metrických tun"} + dnam{"tuny"} + few{"{0} tuny"} + many{"{0} tuny"} + one{"{0} tuna"} + other{"{0} tun"} } microgram{ dnam{"mikrogramy"} @@ -846,7 +881,7 @@ cs{ other{"{0} trojských uncí"} } pound{ - dnam{"libra"} + dnam{"libry"} few{"{0} libry"} many{"{0} libry"} one{"{0} libra"} @@ -868,11 +903,11 @@ cs{ other{"{0} kamenů"} } ton{ - dnam{"tuny"} - few{"{0} tuny"} - many{"{0} tuny"} - one{"{0} tuna"} - other{"{0} tun"} + dnam{"americké tuny"} + few{"{0} americké tuny"} + many{"{0} americké tuny"} + one{"{0} americká tuna"} + other{"{0} amerických tun"} } } power{ @@ -942,11 +977,11 @@ cs{ other{"{0} hektopascalů"} } inch-ofhg{ - dnam{"palce rtuti"} - few{"{0} palce rtuti"} - many{"{0} palce rtuti"} - one{"{0} palec rtuti"} - other{"{0} palců rtuti"} + dnam{"palce rtuťového sloupce"} + few{"{0} palce rtuťového sloupce"} + many{"{0} palce rtuťového sloupce"} + one{"{0} palec rtuťového sloupce"} + other{"{0} palců rtuťového sloupce"} } kilopascal{ dnam{"kilopascaly"} @@ -970,11 +1005,11 @@ cs{ other{"{0} milibarů"} } millimeter-ofhg{ - dnam{"milimetry rtuti"} - few{"{0} milimetry rtuti"} - many{"{0} milimetru rtuti"} - one{"{0} milimetr rtuti"} - other{"{0} milimetrů rtuti"} + dnam{"milimetry rtuťového sloupce"} + few{"{0} milimetry rtuťového sloupce"} + many{"{0} milimetru rtuťového sloupce"} + one{"{0} milimetr rtuťového sloupce"} + other{"{0} milimetrů rtuťového sloupce"} } pascal{ dnam{"pascaly"} @@ -988,7 +1023,7 @@ cs{ few{"{0} libry na čtvereční palec"} many{"{0} libry na čtvereční palec"} one{"{0} libra na čtvereční palec"} - other{"{0} psi"} + other{"{0} liber na čtvereční palec"} } } speed{ @@ -1148,7 +1183,7 @@ cs{ other{"{0} yardů krychlových"} } cup{ - dnam{"šálek"} + dnam{"šálky"} few{"{0} šálky"} many{"{0} šálku"} one{"{0} šálek"} @@ -1168,12 +1203,40 @@ cs{ one{"{0} decilitr"} other{"{0} decilitrů"} } + dessert-spoon{ + dnam{"dezertní lžičky"} + few{"{0} dezertní lžičky"} + many{"{0} dezertní lžičky"} + one{"{0} dezertní lžička"} + other{"{0} dezertních lžiček"} + } + dessert-spoon-imperial{ + dnam{"britské dezertní lžičky"} + few{"{0} britské dezertní lžičky"} + many{"{0} britské dezertní lžičky"} + one{"{0} britská dezertní lžička"} + other{"{0} britských dezertních lžiček"} + } + dram{ + dnam{"duté dramy"} + few{"{0} duté dramy"} + many{"{0} dutého dramu"} + one{"{0} dutý dram"} + other{"{0} dutých dramů"} + } + drop{ + dnam{"kapky"} + few{"{0} kapky"} + many{"{0} kapky"} + one{"{0} kapka"} + other{"{0} kapek"} + } fluid-ounce{ - dnam{"kapalinové unce"} - few{"{0} kapalinové unce"} - many{"{0} kapalinové unce"} - one{"{0} kapalinová unce"} - other{"{0} kapalinových uncí"} + dnam{"duté unce"} + few{"{0} duté unce"} + many{"{0} duté unce"} + one{"{0} dutá unce"} + other{"{0} dutých uncí"} } fluid-ounce-imperial{ dnam{"britské duté unce"} @@ -1191,20 +1254,27 @@ cs{ per{"{0} na galon"} } gallon-imperial{ - dnam{"imp. galony"} - few{"{0} imp. galony"} - many{"{0} imp. galonu"} - one{"{0} imp. galon"} - other{"{0} imp. galonů"} - per{"{0} na imp. galon"} + dnam{"britské galony"} + few{"{0} britské galony"} + many{"{0} britského galonu"} + one{"{0} britský galon"} + other{"{0} britských galonů"} + per{"{0} na britský galon"} } hectoliter{ - dnam{"hektolitr"} + dnam{"hektolitry"} few{"{0} hektolitry"} many{"{0} hektolitru"} one{"{0} hektolitr"} other{"{0} hektolitrů"} } + jigger{ + dnam{"barmanské odměrky"} + few{"{0} barmanské odměrky"} + many{"{0} barmanské odměrky"} + one{"{0} barmanská odměrka"} + other{"{0} barmanských odměrek"} + } liter{ dnam{"litry"} few{"{0} litry"} @@ -1227,6 +1297,13 @@ cs{ one{"{0} mililitr"} other{"{0} mililitrů"} } + pinch{ + dnam{"špetky"} + few{"{0} špetky"} + many{"{0} špetky"} + one{"{0} špetka"} + other{"{0} špetek"} + } pint{ dnam{"pinty"} few{"{0} pinty"} @@ -1248,6 +1325,13 @@ cs{ one{"{0} kvart"} other{"{0} kvartů"} } + quart-imperial{ + dnam{"britské kvarty"} + few{"{0} britské kvarty"} + many{"{0} britského kvartu"} + one{"{0} britský kvart"} + other{"{0} britských kvartů"} + } tablespoon{ dnam{"lžíce"} few{"{0} lžíce"} @@ -1256,7 +1340,7 @@ cs{ other{"{0} lžic"} } teaspoon{ - dnam{"lžička"} + dnam{"lžičky"} few{"{0} lžičky"} many{"{0} lžičky"} one{"{0} lžička"} @@ -1431,11 +1515,11 @@ cs{ } consumption{ liter-per-100-kilometer{ - dnam{"l/100 km"} - few{"{0} l/100 km"} - many{"{0} l/100 km"} - one{"{0} l/100 km"} - other{"{0} l/100 km"} + dnam{"l/100km"} + few{"{0} l/100km"} + many{"{0} l/100km"} + one{"{0} l/100km"} + other{"{0} l/100km"} } liter-per-kilometer{ dnam{"l/km"} @@ -1901,11 +1985,11 @@ cs{ per{"{0}/kg"} } metric-ton{ - dnam{"mt"} - few{"{0} mt"} - many{"{0} mt"} - one{"{0} mt"} - other{"{0} mt"} + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} } microgram{ dnam{"µg"} @@ -2241,6 +2325,9 @@ cs{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"šp"} + } pint{ dnam{"pt"} few{"{0} pt"} @@ -2822,6 +2909,13 @@ cs{ } } graphics{ + dot{ + dnam{"bod"} + few{"{0} b."} + many{"{0} b."} + one{"{0} b."} + other{"{0} b."} + } dot-per-centimeter{ dnam{"DPCM"} few{"{0} DPCM"} @@ -2895,8 +2989,19 @@ cs{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + few{"{0} R⊕"} + many{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } fathom{ dnam{"fm"} + few{"{0} fth"} + many{"{0} fth"} + one{"{0} fth"} + other{"{0} fth"} } foot{ dnam{"ft"} @@ -3023,6 +3128,20 @@ cs{ } } light{ + candela{ + dnam{"cd"} + few{"{0} cd"} + many{"{0} cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + few{"{0} lm"} + many{"{0} lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lx"} few{"{0} lx"} @@ -3060,6 +3179,13 @@ cs{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"gr"} + few{"{0} gr"} + many{"{0} gr"} + one{"{0} gr"} + other{"{0} gr"} + } gram{ dnam{"g"} few{"{0} g"} @@ -3077,11 +3203,11 @@ cs{ per{"{0}/kg"} } metric-ton{ - dnam{"mt"} - few{"{0} mt"} - many{"{0} mt"} - one{"{0} mt"} - other{"{0} mt"} + dnam{"t"} + few{"{0} t"} + many{"{0} t"} + one{"{0} t"} + other{"{0} t"} } microgram{ dnam{"µg"} @@ -3135,11 +3261,11 @@ cs{ other{"{0} st"} } ton{ - dnam{"t"} - few{"{0} t"} - many{"{0} t"} - one{"{0} t"} - other{"{0} t"} + dnam{"sht"} + few{"{0} sht"} + many{"{0} sht"} + one{"{0} sht"} + other{"{0} sht"} } } power{ @@ -3237,11 +3363,11 @@ cs{ other{"{0} mb"} } millimeter-ofhg{ - dnam{"mm Hg"} - few{"{0} mm Hg"} - many{"{0} mm Hg"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} + dnam{"mmHg"} + few{"{0} mmHg"} + many{"{0} mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} } pascal{ dnam{"Pa"} @@ -3435,6 +3561,34 @@ cs{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"dstspn"} + few{"{0} dstspn"} + many{"{0} dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp."} + few{"{0} dstspn Imp."} + many{"{0} dstspn Imp."} + one{"{0} dstspn Imp."} + other{"{0} dstspn Imp."} + } + dram{ + dnam{"fl dr"} + few{"{0} fl dr"} + many{"{0} fl dr"} + one{"{0} fl dr"} + other{"{0} fl dr"} + } + drop{ + dnam{"kapky"} + few{"{0} kapky"} + many{"{0} kapky"} + one{"{0} kapka"} + other{"{0} kapek"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -3472,6 +3626,13 @@ cs{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"odměrky"} + few{"{0} odměrky"} + many{"{0} odměrky"} + one{"{0} odměrka"} + other{"{0} odměrek"} + } liter{ dnam{"l"} few{"{0} l"} @@ -3494,6 +3655,13 @@ cs{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"špetky"} + few{"{0} špetky"} + many{"{0} špetky"} + one{"{0} špetka"} + other{"{0} špetek"} + } pint{ dnam{"pt"} few{"{0} pt"} @@ -3515,6 +3683,13 @@ cs{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp."} + few{"{0} qt Imp."} + many{"{0} qt Imp."} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} few{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/cy.txt b/intl/icu/source/data/unit/cy.txt index d7474246aa4f..7a4e9cbb3f01 100644 --- a/intl/icu/source/data/unit/cy.txt +++ b/intl/icu/source/data/unit/cy.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -236,7 +236,7 @@ cy{ many{"{0} rhan pob miliwn"} one{"{0} rhan pob miliwn"} other{"{0} rhan pob miliwn"} - two{"{0} rhan pob miliwn"} + two{"{0} ran pob miliwn"} zero{"{0} rhan pob miliwn"} } permyriad{ @@ -683,6 +683,14 @@ cy{ } } graphics{ + dot{ + few{"{0} dot"} + many{"{0} dot"} + one{"{0} dot"} + other{"{0} dot"} + two{"{0} ddot"} + zero{"{0} dot"} + } dot-per-centimeter{ dnam{"dotiau mewn centimedr"} few{"{0} dpcm"} @@ -696,11 +704,14 @@ cy{ dnam{"dotiau mewn modfedd"} few{"{0} dpi"} many{"{0} dpi"} - one{"{0} mewn modfedd"} + one{"{0} dot mewn modfedd"} other{"{0} dot mewn modfedd"} two{"{0} dpi"} zero{"{0} dpi"} } + em{ + dnam{"em argraffyddol"} + } megapixel{ dnam{"megapicseli"} few{"{0} MP"} @@ -767,6 +778,15 @@ cy{ two{"{0} dm"} zero{"{0} dm"} } + earth-radius{ + dnam{"radiws y Ddaear"} + few{"{0} R⊕"} + many{"{0} R⊕"} + one{"{0} radiws y Ddaear"} + other{"{0} radiws y Ddaear"} + two{"{0} R⊕"} + zero{"{0} R⊕"} + } fathom{ dnam{"gwrhydau"} few{"{0} gwryd"} @@ -935,6 +955,12 @@ cy{ } } light{ + candela{ + dnam{"candela"} + } + lumen{ + dnam{"lwmen"} + } lux{ dnam{"lycsau"} few{"{0} lx"} @@ -982,6 +1008,15 @@ cy{ two{"{0} M⊕"} zero{"{0} M⊕"} } + grain{ + dnam{"graen"} + few{"{0} graen"} + many{"{0} graen"} + one{"{0} graen"} + other{"{0} graen"} + two{"{0} raen"} + zero{"{0} graen"} + } gram{ dnam{"gramau"} few{"{0} g"} @@ -1163,12 +1198,12 @@ cy{ } inch-ofhg{ dnam{"modfeddi o fercwri"} - few{"{0} ″ Hg"} - many{"{0} ″ Hg"} + few{"{0} inHg"} + many{"{0} inHg"} one{"{0} fodfedd o fercwri"} other{"{0} modfedd o fercwri"} - two{"{0} ″ Hg"} - zero{"{0} ″ Hg"} + two{"{0} inHg"} + zero{"{0} inHg"} } kilopascal{ dnam{"cilopascalau"} @@ -1199,15 +1234,21 @@ cy{ } millimeter-ofhg{ dnam{"milimetrau o fercwri"} - few{"{0} mm Hg"} - many{"{0} mm Hg"} + few{"{0} mmHg"} + many{"{0} mmHg"} one{"{0} milimetr o fercwri"} other{"{0} milimetr o fercwri"} - two{"{0} mm Hg"} - zero{"{0} mm Hg"} + two{"{0} mmHg"} + zero{"{0} mmHg"} } pascal{ - dnam{"pascals"} + dnam{"pascalau"} + few{"{0} Pa"} + many{"{0} Pa"} + one{"{0} pascal"} + other{"{0} pascal"} + two{"{0} Pa"} + zero{"{0} Pa"} } pound-force-per-square-inch{ dnam{"pwysau y fodfedd sgwar"} @@ -1309,7 +1350,7 @@ cy{ dnam{"pwys-troedfeddi"} few{"{0} lbf⋅ft"} many{"{0} lbf⋅ft"} - one{"{0} pwys-troedfedd"} + one{"{0} pwys o rym⋅droedfedd"} other{"{0} pwys-troedfeddi"} two{"{0} lbf⋅ft"} zero{"{0} lbf⋅ft"} @@ -1336,12 +1377,12 @@ cy{ } bushel{ dnam{"bwsielau"} - few{"{0} bwsiel"} - many{"{0} bwsiel"} + few{"{0} bw"} + many{"{0} bw"} one{"{0} bwsiel"} other{"{0} bwsiel"} - two{"{0} bwsiel"} - zero{"{0} bwsiel"} + two{"{0} bw"} + zero{"{0} bw"} } centiliter{ dnam{"centilitrau"} @@ -1444,6 +1485,42 @@ cy{ two{"{0} dL"} zero{"{0} dL"} } + dessert-spoon{ + dnam{"llond llwy bwdin"} + few{"{0} dstspn"} + many{"{0} dstspn"} + one{"{0} llond llwy bwdin"} + other{"{0} llond llwy bwdin"} + two{"{0} dstspn"} + zero{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"llond llwy bwdin imp."} + few{"{0} dstspn Imp"} + many{"{0} dstspn Imp"} + one{"{0} llond llwy bwdin imp."} + other{"{0} llond llwy bwdin imp."} + two{"{0} dstspn Imp"} + zero{"{0} dstspn Imp"} + } + dram{ + dnam{"dracmon hylifol"} + few{"{0} dracmon hy"} + many{"{0} dracmon hy"} + one{"{0} dracmon hy"} + other{"{0} dracmon hy"} + two{"{0} ddracmon hy"} + zero{"{0} dracmon hy"} + } + drop{ + dnam{"diferyn"} + few{"{0} diferyn"} + many{"{0} diferyn"} + one{"{0} diferyn"} + other{"{0} diferyn"} + two{"{0} ddiferyn"} + zero{"{0} diferyn"} + } fluid-ounce{ dnam{"ownsiau hylifol"} few{"{0} owns hylifol"} @@ -1491,6 +1568,15 @@ cy{ two{"{0} hL"} zero{"{0} hL"} } + jigger{ + dnam{"joch"} + few{"{0} joch"} + many{"{0} joch"} + one{"{0} joch"} + other{"{0} joch"} + two{"{0} joch"} + zero{"{0} joch"} + } liter{ dnam{"litrau"} few{"{0} L"} @@ -1519,6 +1605,15 @@ cy{ two{"{0} mL"} zero{"{0} mL"} } + pinch{ + dnam{"pinsiad"} + few{"{0} phinsiad"} + many{"{0} pinsiad"} + one{"{0} pinsiad"} + other{"{0} pinsiad"} + two{"{0} binsiad"} + zero{"{0} pinsiad"} + } pint{ dnam{"peintiau"} few{"{0} pheint"} @@ -1546,6 +1641,15 @@ cy{ two{"{0} gwart"} zero{"{0} chwart"} } + quart-imperial{ + dnam{"chwart Imp"} + few{"{0} cht Imp."} + many{"{0} cht Imp."} + one{"{0} cht Imp."} + other{"{0} cht Imp."} + two{"{0} cht Imp."} + zero{"{0} cht Imp."} + } tablespoon{ dnam{"llond llwy fwrdd"} few{"{0} llond llwy fwrdd"} @@ -1855,14 +1959,14 @@ cy{ zero{"{0} eil"} } week{ - dnam{"w"} - few{"{0}w"} - many{"{0}w"} + dnam{"ws"} + few{"{0} ws"} + many{"{0} ws"} one{"{0}w"} other{"{0}w"} per{"{0}/w"} - two{"{0}w"} - zero{"{0}w"} + two{"{0} ws"} + zero{"{0} ws"} } year{ dnam{"bl"} @@ -2836,6 +2940,7 @@ cy{ zero{"{0} beit"} } gigabit{ + dnam{"Gbit"} few{"{0} Gb"} many{"{0} Gb"} one{"{0} Gb"} @@ -2852,6 +2957,9 @@ cy{ two{"{0} GB"} zero{"{0} GB"} } + kilobit{ + dnam{"kbit"} + } kilobyte{ dnam{"kBeit"} few{"{0} kB"} @@ -2861,6 +2969,9 @@ cy{ two{"{0} kB"} zero{"{0} kB"} } + megabit{ + dnam{"Mbit"} + } megabyte{ dnam{"MBeit"} } @@ -2914,12 +3025,12 @@ cy{ } decade{ dnam{"deg"} - few{"{0} degawd"} - many{"{0} degawd"} - one{"{0} degawd"} - other{"{0} degawd"} + few{"{0} deg"} + many{"{0} deg"} + one{"{0} deg"} + other{"{0} deg"} two{"{0} degawd"} - zero{"{0} degawd"} + zero{"{0} deg"} } hour{ dnam{"oriau"} @@ -2990,13 +3101,13 @@ cy{ } week{ dnam{"wythnosau"} - few{"{0} wythnos"} - many{"{0} wythnos"} - one{"{0} wythnos"} - other{"{0} wythnos"} - per{"{0}/wythnos"} - two{"{0} wythnos"} - zero{"{0} wythnos"} + few{"{0} ws"} + many{"{0} ws"} + one{"{0} ws"} + other{"{0} ws"} + per{"{0}/ws"} + two{"{0} ws"} + zero{"{0} ws"} } year{ dnam{"blynyddoedd"} @@ -3132,6 +3243,14 @@ cy{ } } graphics{ + dot{ + few{"{0} dot"} + many{"{0} dot"} + one{"{0} dot"} + other{"{0} dot"} + two{"{0} ddot"} + zero{"{0} dot"} + } megapixel{ dnam{"megapicseli"} } @@ -3189,6 +3308,12 @@ cy{ } furlong{ dnam{"ystadenni"} + few{"{0} yst"} + many{"{0} yst"} + one{"{0} yst"} + other{"{0} yst"} + two{"{0} yst"} + zero{"{0} yst"} } inch{ dnam{"modfeddi"} @@ -3353,6 +3478,15 @@ cy{ earth-mass{ dnam{"masau ddaear"} } + grain{ + dnam{"graen"} + few{"{0} graen"} + many{"{0} graen"} + one{"{0} graen"} + other{"{0} graen"} + two{"{0} raen"} + zero{"{0} graen"} + } gram{ dnam{"gramau"} few{"{0} g"} @@ -3518,13 +3652,13 @@ cy{ zero{"{0} hPa"} } inch-ofhg{ - dnam{"\u0022 Hg"} - few{"{0} ″ Hg"} - many{"{0} ″ Hg"} - one{"{0} ″ Hg"} - other{"{0} ″ Hg"} - two{"{0} ″ Hg"} - zero{"{0} ″ Hg"} + dnam{"inHg"} + few{"{0} inHg"} + many{"{0} inHg"} + one{"{0} inHg"} + other{"{0} inHg"} + two{"{0} inHg"} + zero{"{0} inHg"} } millibar{ dnam{"mbar"} @@ -3535,6 +3669,15 @@ cy{ two{"{0} mbar"} zero{"{0} mbar"} } + millimeter-ofhg{ + dnam{"mmHg"} + few{"{0} mmHg"} + many{"{0} mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} + two{"{0} mmHg"} + zero{"{0} mmHg"} + } pound-force-per-square-inch{ few{"{0} psi"} many{"{0} psi"} @@ -3614,12 +3757,12 @@ cy{ } bushel{ dnam{"bwsielau"} - few{"{0} bwsiel"} - many{"{0} bwsiel"} - one{"{0} bwsiel"} - other{"{0} bwsiel"} - two{"{0} bwsiel"} - zero{"{0} bwsiel"} + few{"{0} bw"} + many{"{0} bw"} + one{"{0} bw"} + other{"{0} bw"} + two{"{0} bw"} + zero{"{0} bw"} } centiliter{ dnam{"cL"} @@ -3721,6 +3864,24 @@ cy{ two{"{0} dL"} zero{"{0} dL"} } + dram{ + dnam{"dracmon hylifol"} + few{"{0} dracmon hy"} + many{"{0} dracmon hy"} + one{"{0} dracmon hy"} + other{"{0} dracmon hy"} + two{"{0} ddracmon hy"} + zero{"{0} dracmon hy"} + } + drop{ + dnam{"diferyn"} + few{"{0} diferyn"} + many{"{0} diferyn"} + one{"{0} diferyn"} + other{"{0} diferyn"} + two{"{0} ddiferyn"} + zero{"{0} diferyn"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -3759,6 +3920,15 @@ cy{ two{"{0} hL"} zero{"{0} hL"} } + jigger{ + dnam{"joch"} + few{"{0} joch"} + many{"{0} joch"} + one{"{0} joch"} + other{"{0} joch"} + two{"{0} joch"} + zero{"{0} joch"} + } liter{ dnam{"litrau"} few{"{0} L"} @@ -3787,6 +3957,15 @@ cy{ two{"{0} mL"} zero{"{0} mL"} } + pinch{ + dnam{"pinsiad"} + few{"{0} phinsiad"} + many{"{0} pinsiad"} + one{"{0} pinsiad"} + other{"{0} pinsiad"} + two{"{0} binsiad"} + zero{"{0} pinsiad"} + } pint{ dnam{"peintiau"} few{"{0} pt"} @@ -3814,6 +3993,15 @@ cy{ two{"{0} qt"} zero{"{0} qt"} } + quart-imperial{ + dnam{"cht Imp."} + few{"{0} cht Imp."} + many{"{0} cht Imp."} + one{"{0} cht Imp."} + other{"{0} cht Imp."} + two{"{0} cht Imp."} + zero{"{0} cht Imp."} + } tablespoon{ dnam{"tbsp"} few{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/da.txt b/intl/icu/source/data/unit/da.txt index 9004cdf032c6..92edf034c093 100644 --- a/intl/icu/source/data/unit/da.txt +++ b/intl/icu/source/data/unit/da.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da{ - Version{"37"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -73,7 +73,7 @@ da{ dnam{"kvadrattommer"} one{"{0} kvadrattomme"} other{"{0} kvadrattommer"} - per{"{0}/in²"} + per{"{0} pr. kvadrattomme"} } square-kilometer{ dnam{"kvadratkilometer"} @@ -131,7 +131,7 @@ da{ } permillion{ dnam{"parts per million"} - one{"{0} parts per million"} + one{"{0} part per million"} other{"{0} parts per million"} } } @@ -345,7 +345,7 @@ da{ } kilowatt-hour{ dnam{"kilowatt-timer"} - one{"kilowatt-time"} + one{"{0} kilowatt-time"} other{"{0} kilowatt-timer"} } } @@ -379,6 +379,11 @@ da{ } } graphics{ + dot{ + dnam{"prik"} + one{"{0} prik"} + other{"{0} punkter"} + } dot-per-centimeter{ dnam{"punkter per centimeter"} one{"{0} punkt per centimeter"} @@ -399,6 +404,11 @@ da{ one{"{0} megapixel"} other{"{0} megapixels"} } + pixel{ + dnam{"pixels"} + one{"{0} pixel"} + other{"{0} pixels"} + } pixel-per-centimeter{ dnam{"pixels per centimeter"} one{"{0} pixel per centimeter"} @@ -427,12 +437,27 @@ da{ one{"{0} decimeter"} other{"{0} decimeter"} } + earth-radius{ + dnam{"jordradius"} + one{"{0} jordradius"} + other{"{0} jordradier"} + } + fathom{ + dnam{"favne"} + one{"{0} favn"} + other{"{0} favne"} + } foot{ dnam{"fod"} one{"{0} fod"} other{"{0} fod"} per{"{0} pr. fod"} } + furlong{ + dnam{"furlongs"} + one{"{0} furlong"} + other{"{0} furlongs"} + } inch{ dnam{"tommer"} one{"{0} tomme"} @@ -513,6 +538,16 @@ da{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -525,6 +560,16 @@ da{ one{"{0} karat"} other{"{0} karat"} } + earth-mass{ + dnam{"Jordmasser"} + one{"{0} jordmasse"} + other{"{0} jordmasser"} + } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} gran"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -574,6 +619,11 @@ da{ one{"{0} solmasse"} other{"{0} solmasser"} } + stone{ + dnam{"stone"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ dnam{"short ton"} one{"{0} short ton"} @@ -656,7 +706,7 @@ da{ pound-force-per-square-inch{ dnam{"pounds pr. kvadrattomme"} one{"{0} pound pr. kvadrattomme"} - other{"{0} pounds pr. kvadrattommer"} + other{"{0} pounds pr. kvadrattomme"} } } speed{ @@ -721,6 +771,11 @@ da{ one{"{0} tønde"} other{"{0} tønder"} } + bushel{ + dnam{"skæpper"} + one{"{0} skæppe"} + other{"{0} skæpper"} + } centiliter{ dnam{"centiliter"} one{"{0} centiliter"} @@ -765,7 +820,7 @@ da{ } cup{ dnam{"cups"} - one{"cup"} + one{"{0} cup"} other{"{0} cups"} } cup-metric{ @@ -778,6 +833,26 @@ da{ one{"{0} deciliter"} other{"{0} deciliter"} } + dessert-spoon{ + dnam{"dessertske"} + one{"{0} dessertske"} + other{"{0} dessertskeer"} + } + dessert-spoon-imperial{ + dnam{"britisk dessertske"} + one{"{0} britisk dessertske"} + other{"{0} britiske dessertskeer"} + } + dram{ + dnam{"britisk flydende dram"} + one{"{0} britisk flydende dram"} + other{"{0} britiske flydende dramme"} + } + drop{ + dnam{"dråbe"} + one{"{0} dråbe"} + other{"{0} dråber"} + } fluid-ounce{ dnam{"engelske fluid ounces"} one{"{0} engelsk fluid ounce"} @@ -804,6 +879,10 @@ da{ one{"{0} hektoliter"} other{"{0} hektoliter"} } + jigger{ + one{"{0} jigger"} + other{"{0} jigger"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -820,6 +899,11 @@ da{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"knivspids"} + one{"{0} knivspids"} + other{"{0} knivspidser"} + } pint{ dnam{"pints"} one{"{0} pint"} @@ -835,6 +919,11 @@ da{ one{"{0} engelsk quart"} other{"{0} engelske quarts"} } + quart-imperial{ + dnam{"britisk quart"} + one{"{0} britisk quart"} + other{"{0} britiske quarts"} + } tablespoon{ dnam{"spiseskeer"} one{"{0} spiseske"} @@ -1338,9 +1427,9 @@ da{ other{"{0} bit"} } byte{ - dnam{"byte"} - one{"{0} byte"} - other{"{0} byte"} + dnam{"B"} + one{"{0} B"} + other{"{0} B"} } gigabit{ dnam{"Gbit"} @@ -1408,7 +1497,7 @@ da{ hour{ dnam{"timer"} one{"{0} t."} - other{"{0} t"} + other{"{0} t."} per{"{0} /t"} } microsecond{ @@ -1543,6 +1632,13 @@ da{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"prik"} + one{"{0} p"} + other{"{0} p"} + } + } length{ astronomical-unit{ dnam{"ae"} @@ -1560,6 +1656,11 @@ da{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"favn"} + one{"{0} favn"} + other{"{0} favne"} + } foot{ dnam{"fod"} one{"{0} fod"} @@ -1656,6 +1757,11 @@ da{ one{"{0} kt."} other{"{0} kt."} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} gran"} + } gram{ dnam{"gram"} one{"{0} g"} @@ -1663,7 +1769,6 @@ da{ per{"{0}/g"} } kilogram{ - dnam{"kilogram"} one{"{0} kg"} other{"{0} kg"} per{"{0}/kg"} @@ -1828,6 +1933,11 @@ da{ one{"{0} td."} other{"{0} tdr."} } + bushel{ + dnam{"skp."} + one{"{0} skp."} + other{"{0} skp."} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1885,6 +1995,26 @@ da{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"dsk."} + one{"{0} dsk."} + other{"{0} dsk."} + } + dessert-spoon-imperial{ + dnam{"brit. dsk."} + one{"{0} brit. dsk."} + other{"{0} brit. dsk."} + } + dram{ + dnam{"br. fl. dr."} + one{"{0} br. fl. dr."} + other{"{0} br. fl. dr."} + } + drop{ + dnam{"dråbe"} + one{"{0} dråbe"} + other{"{0} dråber"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1923,6 +2053,11 @@ da{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"knsp."} + one{"{0} knsp."} + other{"{0} knsp."} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -1938,6 +2073,11 @@ da{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"britisk qt"} + one{"{0} britisk qt"} + other{"{0} britiske qt"} + } tablespoon{ dnam{"spsk."} one{"{0} spsk."} diff --git a/intl/icu/source/data/unit/dav.txt b/intl/icu/source/data/unit/dav.txt index 6894cef6142e..d2d0189009ea 100644 --- a/intl/icu/source/data/unit/dav.txt +++ b/intl/icu/source/data/unit/dav.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dav{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/de.txt b/intl/icu/source/data/unit/de.txt index 89f48d9584c4..daf4dea51d59 100644 --- a/intl/icu/source/data/unit/de.txt +++ b/intl/icu/source/data/unit/de.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -11,11 +11,13 @@ de{ acceleration{ g-force{ dnam{"g-Kraft"} - one{"{0}-fache Erdbeschleunigung"} - other{"{0}-fache Erdbeschleunigung"} + one{"{0} g-Kraft"} + other{"{0} g-Kraft"} } meter-per-square-second{ dnam{"Meter pro Quadratsekunde"} + one{"{0} Meter pro Quadratsekunde"} + other{"{0} Meter pro Quadratsekunde"} } } angle{ @@ -133,15 +135,15 @@ de{ } permillion{ dnam{"Parts per million"} - one{"{0} Parts per million"} + one{"{0} Part per million"} other{"{0} Parts per million"} } } consumption{ liter-per-100-kilometer{ - dnam{"Liter auf 100 Kilometer"} - one{"{0} Liter auf 100 Kilometer"} - other{"{0} Liter auf 100 Kilometer"} + dnam{"Liter pro 100 Kilometer"} + one{"{0} Liter pro 100 Kilometer"} + other{"{0} Liter pro 100 Kilometer"} } liter-per-kilometer{ dnam{"Liter pro Kilometer"} @@ -170,22 +172,22 @@ de{ bit{ dnam{"Bits"} one{"{0} Bit"} - other{"{0} Bits"} + other{"{0} Bit"} } byte{ dnam{"Bytes"} one{"{0} Byte"} - other{"{0} Bytes"} + other{"{0} Byte"} } gigabit{ dnam{"Gigabits"} one{"{0} Gigabit"} - other{"{0} Gigabits"} + other{"{0} Gigabit"} } gigabyte{ dnam{"Gigabytes"} one{"{0} Gigabyte"} - other{"{0} Gigabytes"} + other{"{0} Gigabyte"} } kilobit{ dnam{"Kilobits"} @@ -195,32 +197,32 @@ de{ kilobyte{ dnam{"Kilobytes"} one{"{0} Kilobyte"} - other{"{0} Kilobytes"} + other{"{0} Kilobyte"} } megabit{ dnam{"Megabits"} one{"{0} Megabit"} - other{"{0} Megabits"} + other{"{0} Megabit"} } megabyte{ dnam{"Megabytes"} one{"{0} Megabyte"} - other{"{0} Megabytes"} + other{"{0} Megabyte"} } petabyte{ dnam{"Petabytes"} one{"{0} Petabyte"} - other{"{0} Petabytes"} + other{"{0} Petabyte"} } terabit{ dnam{"Terabits"} one{"{0} Terabit"} - other{"{0} Terabits"} + other{"{0} Terabit"} } terabyte{ dnam{"Terabytes"} one{"{0} Terabyte"} - other{"{0} Terabytes"} + other{"{0} Terabyte"} } } duration{ @@ -363,8 +365,9 @@ de{ } force{ pound-force{ - one{"Pound-force"} - other{"{0} lbf"} + dnam{"Pound-force"} + one{"{0} Pound-force"} + other{"{0} Pound-force"} } } frequency{ @@ -390,6 +393,11 @@ de{ } } graphics{ + dot{ + dnam{"Punkt"} + one{"{0} Punkt"} + other{"{0} Punkt"} + } dot-per-centimeter{ dnam{"Punkte pro Zentimeter"} one{"{0} Punkt pro Zentimeter"} @@ -438,6 +446,11 @@ de{ one{"{0} Dezimeter"} other{"{0} Dezimeter"} } + earth-radius{ + dnam{"Erdradius"} + one{"{0} Erdradius"} + other{"{0} Erdradien"} + } fathom{ dnam{"Nautischer Faden"} one{"{0} Faden"} @@ -450,7 +463,7 @@ de{ per{"{0} pro Fuß"} } furlong{ - dnam{"Furlong"} + dnam{"Furlongs"} one{"{0} Furlong"} other{"{0} Furlong"} } @@ -518,12 +531,12 @@ de{ other{"{0} Pikometer"} } point{ - dnam{"Punkte"} - one{"{0} Punkt"} - other{"{0} Punkte"} + dnam{"DTP-Punkte"} + one{"{0} DTP-Punkt"} + other{"{0} DTP-Punkte"} } solar-radius{ - dnam{"Sonnenradius"} + dnam{"Sonnenradien"} one{"{0} Sonnenradius"} other{"{0} Sonnenradien"} } @@ -534,11 +547,26 @@ de{ } } light{ + candela{ + dnam{"Candela"} + one{"{0} Candela"} + other{"{0} Candela"} + } + lumen{ + dnam{"Lumen"} + one{"{0} Lumen"} + other{"{0} Lumen"} + } lux{ dnam{"Lux"} one{"{0} Lux"} other{"{0} Lux"} } + solar-luminosity{ + dnam{"Sonnenleuchtkräfte"} + one{"{0} Sonnenleuchtkraft"} + other{"{0} Sonnenleuchtkräfte"} + } } mass{ carat{ @@ -552,9 +580,14 @@ de{ other{"{0} Dalton"} } earth-mass{ - dnam{"Erdmasse"} + dnam{"Erdmassen"} one{"{0} Erdmasse"} - other{"{0} Erdmasse"} + other{"{0} Erdmassen"} + } + grain{ + dnam{"Gran"} + one{"{0} Gran"} + other{"{0} Gran"} } gram{ dnam{"Gramm"} @@ -601,9 +634,9 @@ de{ per{"{0} pro Pfund"} } solar-mass{ - dnam{"Sonnenmasse"} + dnam{"Sonnenmassen"} one{"{0} Sonnenmasse"} - other{"{0} Sonnenmasse"} + other{"{0} Sonnenmassen"} } stone{ dnam{"Stones"} @@ -623,7 +656,7 @@ de{ other{"{0} Gigawatt"} } horsepower{ - dnam{"Pferdestärken"} + dnam{"Pferdestärke"} one{"{0} Pferdestärke"} other{"{0} Pferdestärken"} } @@ -735,8 +768,8 @@ de{ } generic{ dnam{"°"} - one{"{0}°"} - other{"{0}°"} + one{"{0} Grad"} + other{"{0} Grad"} } kelvin{ dnam{"Kelvin"} @@ -744,6 +777,18 @@ de{ other{"{0} Kelvin"} } } + torque{ + newton-meter{ + dnam{"Newtonmeter"} + one{"{0} Newtonmeter"} + other{"{0} Newtonmeter"} + } + pound-force-foot{ + dnam{"Foot-pound"} + one{"{0} Foot-pound"} + other{"{0} Foot-pound"} + } + } volume{ acre-foot{ dnam{"Acre-Feet"} @@ -803,20 +848,40 @@ de{ other{"{0} Kubikyards"} } cup{ - dnam{"Cups"} - one{"{0} Cup"} - other{"{0} Cups"} - } - cup-metric{ - dnam{"Tasse"} + dnam{"Tassen"} one{"{0} Tasse"} other{"{0} Tassen"} } + cup-metric{ + dnam{"metrische Tassen"} + one{"{0} metrische Tasse"} + other{"{0} metrische Tassen"} + } deciliter{ dnam{"Deziliter"} one{"{0} Deziliter"} other{"{0} Deziliter"} } + dessert-spoon{ + dnam{"Dessertlöffel"} + one{"{0} Dessertlöffel"} + other{"{0} Dessertlöffel"} + } + dessert-spoon-imperial{ + dnam{"Imp. Dessertlöffel"} + one{"{0} Imp. Dessertlöffel"} + other{"{0} Imp. Dessertlöffel"} + } + dram{ + dnam{"Dram"} + one{"{0} Dram"} + other{"{0} Dram"} + } + drop{ + dnam{"Tropfen"} + one{"{0} Tropfen"} + other{"{0} Tropfen"} + } fluid-ounce{ dnam{"Flüssigunzen"} one{"{0} Flüssigunze"} @@ -828,15 +893,15 @@ de{ other{"{0} Imp. Flüssigunzen"} } gallon{ - dnam{"Gallonen"} + dnam{"Gallone"} one{"{0} Gallone"} other{"{0} Gallonen"} per{"{0} pro Gallone"} } gallon-imperial{ - dnam{"Imp. Gallone"} - one{"{0} Imp. Gallone"} - other{"{0} Imp. Gallonen"} + dnam{"Imp. Gallonen"} + one{"{0} Imp. Gallone"} + other{"{0} Imp. Gallonen"} per{"{0} pro Imp. Gallone"} } hectoliter{ @@ -844,6 +909,11 @@ de{ one{"{0} Hektoliter"} other{"{0} Hektoliter"} } + jigger{ + dnam{"Jigger"} + one{"{0} Jigger"} + other{"{0} Jigger"} + } liter{ dnam{"Liter"} one{"{0} Liter"} @@ -860,6 +930,11 @@ de{ one{"{0} Milliliter"} other{"{0} Milliliter"} } + pinch{ + dnam{"Prise"} + one{"{0} Prise"} + other{"{0} Prisen"} + } pint{ dnam{"Pints"} one{"{0} Pint"} @@ -871,10 +946,15 @@ de{ other{"{0} metrische Pints"} } quart{ - dnam{"Quart"} + dnam{"Quarts"} one{"{0} Quart"} other{"{0} Quart"} } + quart-imperial{ + dnam{"Imp. Quart"} + one{"{0} Imp. Quart"} + other{"{0} Imp. Quart"} + } tablespoon{ dnam{"Esslöffel"} one{"{0} Esslöffel"} @@ -972,9 +1052,9 @@ de{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100 km"} - one{"{0} L/100 km"} - other{"{0} L/100 km"} + dnam{"L/100km"} + one{"{0}L/100km"} + other{"{0}L/100km"} } liter-per-kilometer{ one{"{0} l/km"} @@ -1058,7 +1138,7 @@ de{ other{"{0} μs"} } minute{ - dnam{"Min."} + dnam{"min"} one{"{0} Min."} other{"{0} Min."} per{"{0}/min"} @@ -1362,8 +1442,6 @@ de{ temperature{ celsius{ dnam{"°C"} - one{"{0}°"} - other{"{0}°"} } fahrenheit{ dnam{"°F"} @@ -1476,6 +1554,8 @@ de{ acceleration{ g-force{ dnam{"g-Kraft"} + one{"{0} g-Kraft"} + other{"{0} g-Kraft"} } } angle{ @@ -1507,7 +1587,7 @@ de{ } area{ acre{ - dnam{"Acres"} + dnam{"ac"} one{"{0} ac"} other{"{0} ac"} } @@ -1571,7 +1651,6 @@ de{ other{"{0} ‰"} } permillion{ - dnam{"parts/million"} one{"{0} ppm"} other{"{0} ppm"} } @@ -1609,7 +1688,7 @@ de{ bit{ dnam{"Bit"} one{"{0} Bit"} - other{"{0} Bits"} + other{"{0} Bit"} } byte{ dnam{"Byte"} @@ -1685,7 +1764,6 @@ de{ other{"{0} μs"} } minute{ - dnam{"Min."} one{"{0} Min."} other{"{0} Min."} } @@ -1773,8 +1851,8 @@ de{ } fathom{ dnam{"Faden"} - one{"{0} fth"} - other{"{0} fth"} + one{"{0} fm"} + other{"{0} fm"} } foot{ dnam{"Fuß"} @@ -1821,6 +1899,11 @@ de{ picometer{ dnam{"Pikometer"} } + point{ + dnam{"p"} + one{"{0} p"} + other{"{0} p"} + } yard{ dnam{"Yards"} } @@ -1838,6 +1921,11 @@ de{ one{"{0} Kt"} other{"{0} Kt"} } + grain{ + dnam{"Gran"} + one{"{0} gr"} + other{"{0} gr"} + } gram{ dnam{"Gramm"} } @@ -1851,6 +1939,11 @@ de{ one{"{0} st"} other{"{0} st"} } + ton{ + dnam{"tn. sh."} + one{"{0} tn. sh."} + other{"{0} tn. sh."} + } } power{ gigawatt{ @@ -1923,8 +2016,8 @@ de{ } fahrenheit{ dnam{"°F"} - one{"{0}°F"} - other{"{0}°F"} + one{"{0} °F"} + other{"{0} °F"} } generic{ dnam{"°"} @@ -1984,11 +2077,36 @@ de{ one{"{0} Cup"} other{"{0} Cups"} } + cup-metric{ + dnam{"Ta"} + one{"{0} Ta"} + other{"{0} Ta"} + } deciliter{ dnam{"dl"} one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"DL"} + one{"{0} DL"} + other{"{0} DL"} + } + dessert-spoon-imperial{ + dnam{"Imp. DL"} + one{"{0} Imp. DL"} + other{"{0} Imp. DL"} + } + dram{ + dnam{"Flüssigdram"} + one{"{0} Fl.-Dram"} + other{"{0} Fl.-Dram"} + } + drop{ + dnam{"Trpf."} + one{"{0} Trpf."} + other{"{0} Trpf."} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2010,6 +2128,11 @@ de{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"Jigger"} + one{"{0} Jigger"} + other{"{0} Jigger"} + } liter{ dnam{"Liter"} } @@ -2023,10 +2146,20 @@ de{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"Prise"} + one{"{0} Pr."} + other{"{0} Pr"} + } quart{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"EL"} one{"{0} EL"} diff --git a/intl/icu/source/data/unit/de_CH.txt b/intl/icu/source/data/unit/de_CH.txt index 63229f03172e..5204ea414810 100644 --- a/intl/icu/source/data/unit/de_CH.txt +++ b/intl/icu/source/data/unit/de_CH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_CH{ - Version{"37"} units{ area{ square-foot{ @@ -23,6 +23,11 @@ de_CH{ per{"{0} pro Fuss"} } } + mass{ + grain{ + dnam{"Messerspitze"} + } + } volume{ cubic-foot{ dnam{"Kubikfuss"} @@ -34,6 +39,9 @@ de_CH{ other{"{0} gal Imp."} per{"{0}/gal Imp."} } + jigger{ + dnam{"Schuss"} + } } } unitsShort{ @@ -42,12 +50,32 @@ de_CH{ dnam{"Fuss"} } } + mass{ + grain{ + dnam{"Messerspitze"} + other{"{0} Msp."} + } + } volume{ + dram{ + dnam{"Dram"} + one{"{0} dr."} + other{"{0} dr."} + } gallon-imperial{ one{"{0} gal Imp."} other{"{0} gal Imp."} per{"{0}/gal Imp."} } + jigger{ + dnam{"Schuss"} + one{"Schuss"} + other{"{0} Schuss"} + } + pinch{ + one{"{0} Prise"} + other{"{0} Prise"} + } } } } diff --git a/intl/icu/source/data/unit/dje.txt b/intl/icu/source/data/unit/dje.txt index 63575f595a17..acff366bc42b 100644 --- a/intl/icu/source/data/unit/dje.txt +++ b/intl/icu/source/data/unit/dje.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dje{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/doi.txt b/intl/icu/source/data/unit/doi.txt new file mode 100644 index 000000000000..42db246441b9 --- /dev/null +++ b/intl/icu/source/data/unit/doi.txt @@ -0,0 +1,10 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +doi{ + durationUnits{ + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} + } +} diff --git a/intl/icu/source/data/unit/dsb.txt b/intl/icu/source/data/unit/dsb.txt index 2edee1481984..1ace4af7c666 100644 --- a/intl/icu/source/data/unit/dsb.txt +++ b/intl/icu/source/data/unit/dsb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dsb{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/dua.txt b/intl/icu/source/data/unit/dua.txt index ba39bd9e0a5c..bf646aae9786 100644 --- a/intl/icu/source/data/unit/dua.txt +++ b/intl/icu/source/data/unit/dua.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dua{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/dyo.txt b/intl/icu/source/data/unit/dyo.txt index d9da7c43092b..5fbeb3b29df0 100644 --- a/intl/icu/source/data/unit/dyo.txt +++ b/intl/icu/source/data/unit/dyo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dyo{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/dz.txt b/intl/icu/source/data/unit/dz.txt index 1cc6edfd72e2..1135053353e8 100644 --- a/intl/icu/source/data/unit/dz.txt +++ b/intl/icu/source/data/unit/dz.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dz{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/ebu.txt b/intl/icu/source/data/unit/ebu.txt index bfefc7921072..510053d4dfee 100644 --- a/intl/icu/source/data/unit/ebu.txt +++ b/intl/icu/source/data/unit/ebu.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ebu{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ee.txt b/intl/icu/source/data/unit/ee.txt index c5711ef363a4..defc600dbccd 100644 --- a/intl/icu/source/data/unit/ee.txt +++ b/intl/icu/source/data/unit/ee.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/el.txt b/intl/icu/source/data/unit/el.txt index 227bbd4cd3b0..15dcfb4db099 100644 --- a/intl/icu/source/data/unit/el.txt +++ b/intl/icu/source/data/unit/el.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -369,7 +369,7 @@ el{ } therm-us{ dnam{"θερμικές μονάδες ΗΠΑ"} - one{"{0} θερμ. μονάδα ΗΠΑ"} + one{"{0} θερμική μονάδα ΗΠΑ"} other{"{0} θερμικές μονάδες ΗΠΑ"} } } @@ -408,6 +408,11 @@ el{ } } graphics{ + dot{ + dnam{"κουκκίδα"} + one{"{0} κουκκίδα"} + other{"{0} κουκκίδες"} + } dot-per-centimeter{ dnam{"κουκκίδες ανά εκατοστό"} one{"{0} κουκκίδα ανά εκατοστό"} @@ -461,12 +466,27 @@ el{ one{"{0} δεκατόμετρο"} other{"{0} δεκατόμετρα"} } + earth-radius{ + dnam{"ακτίνα της Γης"} + one{"{0} ακτίνα της Γης"} + other{"{0} ακτίνες της Γης"} + } + fathom{ + dnam{"οργιές"} + one{"{0} οργιά"} + other{"{0} οργιές"} + } foot{ dnam{"πόδια"} one{"{0} πόδι"} other{"{0} πόδια"} per{"{0} ανά πόδι"} } + furlong{ + dnam{"φέρλονγκ"} + one{"{0} φέρλονγκ"} + other{"{0} φέρλονγκ"} + } inch{ dnam{"ίντσες"} one{"{0} ίντσα"} @@ -545,6 +565,16 @@ el{ } } light{ + candela{ + dnam{"καντέλα"} + one{"{0} καντέλα"} + other{"{0} καντέλα"} + } + lumen{ + dnam{"λούμεν"} + one{"{0} λούμεν"} + other{"{0} λούμεν"} + } lux{ dnam{"λουξ"} one{"{0} λουξ"} @@ -571,6 +601,11 @@ el{ one{"{0} μάζα της Γης"} other{"{0} μάζες της Γης"} } + grain{ + dnam{"κόκκος"} + one{"{0} κόκκος"} + other{"{0} κόκκοι"} + } gram{ dnam{"γραμμάρια"} one{"{0} γραμμάριο"} @@ -584,9 +619,9 @@ el{ per{"{0} ανά χιλιόγραμμο"} } metric-ton{ - dnam{"μετρικοί τόνοι"} - one{"{0} μετρικός τόνος"} - other{"{0} μετρικοί τόνοι"} + dnam{"τόνοι"} + one{"{0} τόνος"} + other{"{0} τόνοι"} } microgram{ dnam{"μικρογραμμάρια"} @@ -620,10 +655,15 @@ el{ one{"{0} μάζα του Ήλιου"} other{"{0} μάζες του Ήλιου"} } + stone{ + dnam{"stone"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ - dnam{"τόνοι"} - one{"{0} τόνος"} - other{"{0} τόνοι"} + dnam{"τόνοι ΗΠΑ"} + one{"{0} τόνος ΗΠΑ"} + other{"{0} τόνοι ΗΠΑ"} } } power{ @@ -777,6 +817,11 @@ el{ one{"{0} βαρέλι"} other{"{0} βαρέλια"} } + bushel{ + dnam{"μπούσελ"} + one{"{0} μπούσελ"} + other{"{0} μπούσελ"} + } centiliter{ dnam{"εκατοστόλιτρα"} one{"{0} εκατοστόλιτρο"} @@ -834,6 +879,26 @@ el{ one{"{0} δεκατόλιτρο"} other{"{0} δεκατόλιτρα"} } + dessert-spoon{ + dnam{"κουταλιά φρούτου"} + one{"{0} κουταλιά φρούτου"} + other{"{0} κουταλιές φρούτου"} + } + dessert-spoon-imperial{ + dnam{"αγγλοσαξονική κουταλιά φρούτου"} + one{"{0} αγγλοσαξονική κουταλιά φρούτου"} + other{"{0} αγγλοσαξονικές κουταλιές φρούτου"} + } + dram{ + dnam{"δράμι"} + one{"{0} δράμι"} + other{"{0} δράμια"} + } + drop{ + dnam{"σταγόνα"} + one{"{0} σταγόνα"} + other{"{0} σταγόνες"} + } fluid-ounce{ dnam{"ουγγιές όγκου"} one{"{0} ουγγιά όγκου"} @@ -861,6 +926,11 @@ el{ one{"{0} εκτόλιτρο"} other{"{0} εκτόλιτρα"} } + jigger{ + dnam{"μεζούρα"} + one{"{0} μεζούρα"} + other{"{0} μεζούρες"} + } liter{ dnam{"λίτρα"} one{"{0} λίτρο"} @@ -877,6 +947,11 @@ el{ one{"{0} χιλιοστόλιτρο"} other{"{0} χιλιοστόλιτρα"} } + pinch{ + dnam{"πρέζα"} + one{"{0} πρέζα"} + other{"{0} πρέζες"} + } pint{ dnam{"πίντες"} one{"{0} πίντα"} @@ -892,6 +967,11 @@ el{ one{"{0} τέταρτο του γαλονιού"} other{"{0} τέταρτα του γαλονιού"} } + quart-imperial{ + dnam{"αγγλοσαξονικά τέταρτα του γαλονιού"} + one{"{0} αγγλοσαξονικό τέταρτο του γαλονιού"} + other{"{0} αγγλοσαξονικά τέταρτα του γαλονιού"} + } tablespoon{ dnam{"κουταλιές της σούπας"} one{"{0} κουταλιά της σούπας"} @@ -1287,7 +1367,7 @@ el{ other{"{0}‰"} } permillion{ - dnam{"ppm"} + dnam{"μέρη/εκατ."} one{"{0} ppm"} other{"{0} ppm"} } @@ -1551,6 +1631,11 @@ el{ } } graphics{ + dot{ + dnam{"κουκ."} + one{"{0} κουκ."} + other{"{0} κουκ."} + } megapixel{ dnam{"megapixel"} } @@ -1572,12 +1657,27 @@ el{ one{"{0} δεκ."} other{"{0} δεκ."} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"οργιές"} + one{"{0} οργ."} + other{"{0} οργ."} + } foot{ dnam{"πόδια"} one{"{0} πδ"} other{"{0} πδ"} per{"{0}/πδ"} } + furlong{ + dnam{"φέρλ."} + one{"{0} φέρλ."} + other{"{0} φέρλ."} + } inch{ dnam{"ίντσες"} one{"{0} ίν."} @@ -1656,6 +1756,16 @@ el{ } } light{ + candela{ + dnam{"καντ."} + one{"{0} καντ."} + other{"{0} καντ."} + } + lumen{ + dnam{"λμ"} + one{"{0} λμ."} + other{"{0} λμ."} + } lux{ dnam{"λουξ"} one{"{0} λουξ"} @@ -1683,6 +1793,11 @@ el{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"κόκ."} + one{"{0} κόκ."} + other{"{0} κόκ."} + } gram{ dnam{"γραμμ."} one{"{0} γρ."} @@ -1696,9 +1811,9 @@ el{ per{"{0}/κιλό"} } metric-ton{ - dnam{"μ.τ."} - one{"{0} μ.τ."} - other{"{0} μ.τ."} + dnam{"τ."} + one{"{0} τ."} + other{"{0} τ."} } microgram{ dnam{"µg"} @@ -1732,10 +1847,14 @@ el{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + one{"{0} st"} + other{"{0} st"} + } ton{ - dnam{"τόνοι"} - one{"{0} τ."} - other{"{0} τ."} + dnam{"τόνοι ΗΠΑ"} + one{"{0} τ. ΗΠΑ"} + other{"{0} τ. ΗΠΑ"} } } power{ @@ -1888,6 +2007,11 @@ el{ one{"{0} βρλ"} other{"{0} βρλ"} } + bushel{ + dnam{"μπ."} + one{"{0} μπ."} + other{"{0} μπ."} + } centiliter{ dnam{"cL"} one{"{0} cL"} @@ -1945,6 +2069,26 @@ el{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"κ.φρ."} + one{"{0} κ.φρ."} + other{"{0} κ.φρ."} + } + dessert-spoon-imperial{ + dnam{"αγγλ. κουτ. φρ."} + one{"{0} αγγλ. κουτ. φρ."} + other{"{0} αγγλ. κουτ. φρ."} + } + dram{ + dnam{"δράμι όγκου"} + one{"{0} δρ. όγκου"} + other{"{0} δρ. όγκου"} + } + drop{ + dnam{"σταγ."} + one{"{0} σταγ."} + other{"{0} σταγ."} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1972,6 +2116,11 @@ el{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"μεζ."} + one{"{0} μεζ."} + other{"{0} μεζ."} + } liter{ dnam{"λίτρα"} one{"{0} λίτ."} @@ -1988,6 +2137,11 @@ el{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"πρ."} + one{"{0} πρ."} + other{"{0} πρ."} + } pint{ dnam{"πίντες"} one{"{0} πντ"} @@ -2003,6 +2157,11 @@ el{ one{"{0} τέτ. γαλ."} other{"{0} τέτ. γαλ."} } + quart-imperial{ + dnam{"αγγλ. τέτ. γαλ."} + one{"{0} αγγλ. τέτ. γαλ."} + other{"{0} αγγλ. τέτ. γαλ."} + } tablespoon{ dnam{"κ.σ."} one{"{0} κ.σ."} diff --git a/intl/icu/source/data/unit/en.txt b/intl/icu/source/data/unit/en.txt index 3c42afb09fea..abae139bcd16 100644 --- a/intl/icu/source/data/unit/en.txt +++ b/intl/icu/source/data/unit/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ - Version{"37"} units{ acceleration{ g-force{ @@ -101,6 +101,7 @@ en{ } compound{ per{"{0} per {1}"} + times{"{0}-{1}"} } concentr{ karat{ @@ -403,6 +404,11 @@ en{ } } graphics{ + dot{ + dnam{"dot"} + one{"{0} dot"} + other{"{0} dot"} + } dot-per-centimeter{ dnam{"dots per centimeter"} one{"{0} dot per centimeter"} @@ -456,6 +462,11 @@ en{ one{"{0} decimeter"} other{"{0} decimeters"} } + earth-radius{ + dnam{"earth radius"} + one{"{0} earth radius"} + other{"{0} earth radius"} + } fathom{ dnam{"fathoms"} one{"{0} fathom"} @@ -552,6 +563,16 @@ en{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -579,6 +600,11 @@ en{ one{"{0} Earth mass"} other{"{0} Earth masses"} } + grain{ + dnam{"grain"} + one{"{0} grain"} + other{"{0} grain"} + } gram{ dnam{"grams"} one{"{0} gram"} @@ -718,9 +744,9 @@ en{ other{"{0} pascals"} } pound-force-per-square-inch{ - dnam{"pounds per square inch"} - one{"{0} pound per square inch"} - other{"{0} pounds per square inch"} + dnam{"pounds-force per square inch"} + one{"{0} pound-force per square inch"} + other{"{0} pounds-force per square inch"} } } speed{ @@ -771,7 +797,7 @@ en{ pound-force-foot{ dnam{"pound-feet"} one{"{0} pound-force-foot"} - other{"{0} pound-feet"} + other{"{0} pound-force-feet"} } } volume{ @@ -847,6 +873,26 @@ en{ one{"{0} deciliter"} other{"{0} deciliters"} } + dessert-spoon{ + dnam{"dessert spoon"} + one{"{0} dessert spoon"} + other{"{0} dessert spoon"} + } + dessert-spoon-imperial{ + dnam{"Imp. dessert spoon"} + one{"{0} Imp. dessert spoon"} + other{"{0} Imp. dessert spoon"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"drop"} + one{"{0} drop"} + other{"{0} drop"} + } fluid-ounce{ dnam{"fluid ounces"} one{"{0} fluid ounce"} @@ -874,6 +920,11 @@ en{ one{"{0} hectoliter"} other{"{0} hectoliters"} } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jigger"} + } liter{ dnam{"liters"} one{"{0} liter"} @@ -890,6 +941,11 @@ en{ one{"{0} milliliter"} other{"{0} milliliters"} } + pinch{ + dnam{"pinch"} + one{"{0} pinch"} + other{"{0} pinch"} + } pint{ dnam{"pints"} one{"{0} pint"} @@ -905,6 +961,11 @@ en{ one{"{0} quart"} other{"{0} quarts"} } + quart-imperial{ + dnam{"Imp. quart"} + one{"{0} Imp. quart"} + other{"{0} Imp. quart"} + } tablespoon{ dnam{"tablespoons"} one{"{0} tablespoon"} @@ -1089,52 +1150,52 @@ en{ other{"{0}bit"} } byte{ - dnam{"byte"} + dnam{"B"} one{"{0}B"} other{"{0}B"} } gigabit{ - dnam{"Gbit"} + dnam{"Gb"} one{"{0}Gb"} other{"{0}Gb"} } gigabyte{ - dnam{"GByte"} + dnam{"GB"} one{"{0}GB"} other{"{0}GB"} } kilobit{ - dnam{"kbit"} + dnam{"kb"} one{"{0}kb"} other{"{0}kb"} } kilobyte{ - dnam{"kByte"} + dnam{"kB"} one{"{0}kB"} other{"{0}kB"} } megabit{ - dnam{"Mbit"} + dnam{"Mb"} one{"{0}Mb"} other{"{0}Mb"} } megabyte{ - dnam{"MByte"} + dnam{"MB"} one{"{0}MB"} other{"{0}MB"} } petabyte{ - dnam{"PByte"} + dnam{"PB"} one{"{0}PB"} other{"{0}PB"} } terabit{ - dnam{"Tbit"} + dnam{"Tb"} one{"{0}Tb"} other{"{0}Tb"} } terabyte{ - dnam{"TByte"} + dnam{"TB"} one{"{0}TB"} other{"{0}TB"} } @@ -1305,6 +1366,11 @@ en{ } } graphics{ + dot{ + dnam{"dot"} + one{"{0}dot"} + other{"{0}dot"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0}dpcm"} @@ -1357,6 +1423,11 @@ en{ one{"{0}dm"} other{"{0}dm"} } + earth-radius{ + dnam{"R⊕"} + one{"{0}R⊕"} + other{"{0}R⊕"} + } fathom{ dnam{"fathom"} one{"{0}fth"} @@ -1449,6 +1520,16 @@ en{ } } light{ + candela{ + dnam{"cd"} + one{"{0}cd"} + other{"{0}cd"} + } + lumen{ + dnam{"lm"} + one{"{0}lm"} + other{"{0}lm"} + } lux{ dnam{"lux"} one{"{0}lx"} @@ -1476,6 +1557,11 @@ en{ one{"{0}M⊕"} other{"{0}M⊕"} } + grain{ + dnam{"gr"} + one{"{0}gr"} + other{"{0}gr"} + } gram{ dnam{"gram"} one{"{0}g"} @@ -1740,6 +1826,26 @@ en{ one{"{0}dL"} other{"{0}dL"} } + dessert-spoon{ + dnam{"dsp"} + one{"{0}dsp"} + other{"{0}dsp"} + } + dessert-spoon-imperial{ + dnam{"dsp Imp"} + one{"{0}dsp-Imp"} + other{"{0}dsp-Imp"} + } + dram{ + dnam{"fl.dr."} + one{"{0}fl.dr."} + other{"{0}fl.dr."} + } + drop{ + dnam{"dr"} + one{"{0}dr"} + other{"{0}dr"} + } fluid-ounce{ dnam{"fl oz"} one{"{0}fl oz"} @@ -1767,6 +1873,11 @@ en{ one{"{0}hL"} other{"{0}hL"} } + jigger{ + dnam{"jigger"} + one{"{0}jigger"} + other{"{0}jigger"} + } liter{ dnam{"liter"} one{"{0}L"} @@ -1783,6 +1894,11 @@ en{ one{"{0}mL"} other{"{0}mL"} } + pinch{ + dnam{"pn"} + one{"{0}pn"} + other{"{0}pn"} + } pint{ dnam{"pt"} one{"{0}pt"} @@ -1798,6 +1914,11 @@ en{ one{"{0}qt"} other{"{0}qt"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0}qt-Imp."} + other{"{0}qt-Imp."} + } tablespoon{ dnam{"tbsp"} one{"{0}tbsp"} diff --git a/intl/icu/source/data/unit/en_001.txt b/intl/icu/source/data/unit/en_001.txt index 5fc1b2cc5d95..a457b4b81a77 100644 --- a/intl/icu/source/data/unit/en_001.txt +++ b/intl/icu/source/data/unit/en_001.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ - Version{"37"} units{ acceleration{ meter-per-square-second{ @@ -79,7 +79,15 @@ en_001{ other{"{0} miles per gallon"} } } + energy{ + kilowatt-hour{ + one{"{0} kilowatt-hour"} + } + } graphics{ + dot{ + other{"{0} dots"} + } dot-per-centimeter{ dnam{"dots per centimetre"} one{"{0} dot per centimetre"} @@ -103,6 +111,9 @@ en_001{ one{"{0} decimetre"} other{"{0} decimetres"} } + earth-radius{ + other{"{0} earth radii"} + } kilometer{ dnam{"kilometres"} one{"{0} kilometre"} @@ -120,6 +131,11 @@ en_001{ one{"{0} micrometre"} other{"{0} micrometres"} } + mile-scandinavian{ + dnam{"Scandinavian mile"} + one{"{0} Scandinavian mile"} + other{"{0} Scandinavian miles"} + } millimeter{ dnam{"millimetres"} one{"{0} millimetre"} @@ -136,7 +152,18 @@ en_001{ other{"{0} picometres"} } } + light{ + candela{ + other{"{0} candelas"} + } + lumen{ + other{"{0} lumens"} + } + } mass{ + grain{ + other{"{0} grains"} + } metric-ton{ dnam{"tonnes"} one{"{0} tonne"} @@ -168,6 +195,9 @@ en_001{ } } temperature{ + generic{ + dnam{"degree"} + } kelvin{ dnam{"kelvin"} one{"{0} kelvin"} @@ -209,6 +239,22 @@ en_001{ one{"{0} decilitre"} other{"{0} decilitres"} } + dessert-spoon{ + dnam{"US dessertspoon"} + one{"{0} US dessertspoon"} + other{"{0} US dessertspoons"} + } + dessert-spoon-imperial{ + dnam{"dessertspoon"} + one{"{0} dessertspoon"} + other{"{0} dessertspoons"} + } + dram{ + other{"{0} drams"} + } + drop{ + other{"{0} drops"} + } fluid-ounce{ dnam{"US fluid ounces"} one{"{0} US fluid ounce"} @@ -231,6 +277,9 @@ en_001{ one{"{0} hectolitre"} other{"{0} hectolitres"} } + jigger{ + other{"{0} jiggers"} + } liter{ dnam{"litres"} one{"{0} litre"} @@ -247,6 +296,19 @@ en_001{ one{"{0} millilitre"} other{"{0} millilitres"} } + pinch{ + other{"{0} pinches"} + } + quart{ + dnam{"US quarts"} + one{"{0} US quart"} + other{"{0} US quarts"} + } + quart-imperial{ + dnam{"quart"} + one{"{0} quart"} + other{"{0} quarts"} + } } } unitsNarrow{ @@ -304,6 +366,9 @@ en_001{ kilometer-per-hour{ dnam{"km/h"} } + mile-per-hour{ + dnam{"mph"} + } } temperature{ celsius{ @@ -367,6 +432,11 @@ en_001{ dnam{"metres/sec²"} } } + angle{ + revolution{ + other{"{0} revs"} + } + } area{ square-meter{ dnam{"metres²"} @@ -384,7 +454,7 @@ en_001{ other{"{0} mg/dl"} } millimole-per-liter{ - dnam{"millimol/litre"} + dnam{"millimole/litre"} one{"{0} mmol/l"} other{"{0} mmol/l"} } @@ -407,7 +477,7 @@ en_001{ other{"{0} l/km"} } mile-per-gallon{ - dnam{"miles/gal US"} + dnam{"miles/US gal"} one{"{0} mpg US"} other{"{0} mpg US"} } @@ -422,6 +492,11 @@ en_001{ one{"{0} hr"} other{"{0} hrs"} } + microsecond{ + dnam{"μsecs"} + one{"{0} μs"} + other{"{0} μs"} + } minute{ one{"{0} min"} other{"{0} mins"} @@ -431,6 +506,12 @@ en_001{ other{"{0} secs"} } } + graphics{ + dot{ + one{"{0} dot"} + other{"{0} dots"} + } + } length{ meter{ dnam{"metres"} @@ -440,15 +521,18 @@ en_001{ } } mass{ + carat{ + one{"{0} ct"} + other{"{0} ct"} + } + grain{ + one{"{0} grains"} + other{"{0} grains"} + } stone{ dnam{"stone"} } } - pressure{ - inch-ofhg{ - dnam{"inHG"} - } - } speed{ meter-per-second{ dnam{"metres/sec"} @@ -465,6 +549,25 @@ en_001{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"US dstspn"} + one{"{0} US dstspn"} + other{"{0} US dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} drams"} + } + drop{ + one{"{0} drops"} + other{"{0} drops"} + } fluid-ounce{ dnam{"US fl oz"} one{"{0} US fl oz"} @@ -472,8 +575,9 @@ en_001{ } gallon{ dnam{"US gal"} - one{"{0} gal US"} - other{"{0} gal US"} + one{"{0} US gal"} + other{"{0} US gal"} + per{"{0}/US gal"} } gallon-imperial{ dnam{"gal"} @@ -486,6 +590,9 @@ en_001{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + other{"{0} jiggers"} + } liter{ dnam{"litres"} one{"{0} l"} @@ -502,6 +609,20 @@ en_001{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + one{"{0} pinches"} + other{"{0} pinches"} + } + quart{ + dnam{"US qts"} + one{"{0} US qt"} + other{"{0} US qt"} + } + quart-imperial{ + dnam{"qt"} + one{"{0} qt"} + other{"{0} qt"} + } } } } diff --git a/intl/icu/source/data/unit/en_150.txt b/intl/icu/source/data/unit/en_150.txt index 5a9d0dde62b1..a616e2470fb7 100644 --- a/intl/icu/source/data/unit/en_150.txt +++ b/intl/icu/source/data/unit/en_150.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_150{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_AG.txt b/intl/icu/source/data/unit/en_AG.txt index 15f4f3b2f146..95a979e89b03 100644 --- a/intl/icu/source/data/unit/en_AG.txt +++ b/intl/icu/source/data/unit/en_AG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_AI.txt b/intl/icu/source/data/unit/en_AI.txt index ec4deb24332a..e1cf7517e8af 100644 --- a/intl/icu/source/data/unit/en_AI.txt +++ b/intl/icu/source/data/unit/en_AI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_AT.txt b/intl/icu/source/data/unit/en_AT.txt index e4a6465fadcf..075c742b8e80 100644 --- a/intl/icu/source/data/unit/en_AT.txt +++ b/intl/icu/source/data/unit/en_AT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AT{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_AU.txt b/intl/icu/source/data/unit/en_AU.txt index 288edc664d58..2be16c20c8cd 100644 --- a/intl/icu/source/data/unit/en_AU.txt +++ b/intl/icu/source/data/unit/en_AU.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AU{ %%Parent{"en_001"} - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -37,11 +37,16 @@ en_AU{ other{"{0} tonnes"} } } + pressure{ + pound-force-per-square-inch{ + dnam{"pounds per square inch"} + one{"{0} pound per square inch"} + other{"{0} pounds per square inch"} + } + } temperature{ generic{ dnam{"degrees"} - one{"{0} degree"} - other{"{0} degrees"} } } volume{ @@ -100,11 +105,6 @@ en_AU{ one{"{0} km/h"} other{"{0} km/h"} } - mile-per-hour{ - dnam{"m.p.h."} - one{"{0} m.p.h."} - other{"{0} m.p.h."} - } } temperature{ celsius{ @@ -207,9 +207,6 @@ en_AU{ one{"{0} C."} other{"{0} C."} } - hour{ - per{"{0} phr"} - } microsecond{ dnam{"μsec."} } @@ -219,20 +216,16 @@ en_AU{ minute{ dnam{"min."} one{"{0} min."} - other{"{0} min."} + other{"{0} mins"} per{"{0}/min."} } - month{ - one{"{0} m."} - other{"{0} m."} - } nanosecond{ dnam{"nanosec."} } second{ dnam{"sec."} one{"{0} sec."} - other{"{0} sec."} + other{"{0} secs"} per{"{0} ps."} } } @@ -284,10 +277,6 @@ en_AU{ one{"{0} m/s."} other{"{0} m/s."} } - mile-per-hour{ - one{"{0} m.p.h."} - other{"{0} m.p.h."} - } } temperature{ generic{ diff --git a/intl/icu/source/data/unit/en_BB.txt b/intl/icu/source/data/unit/en_BB.txt index 814000f3539c..d62d19252e08 100644 --- a/intl/icu/source/data/unit/en_BB.txt +++ b/intl/icu/source/data/unit/en_BB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_BE.txt b/intl/icu/source/data/unit/en_BE.txt index ded640548a45..0e5fffa332ea 100644 --- a/intl/icu/source/data/unit/en_BE.txt +++ b/intl/icu/source/data/unit/en_BE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_BM.txt b/intl/icu/source/data/unit/en_BM.txt index 1f9a62c1ac63..d45a1f99e2f1 100644 --- a/intl/icu/source/data/unit/en_BM.txt +++ b/intl/icu/source/data/unit/en_BM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_BS.txt b/intl/icu/source/data/unit/en_BS.txt index a4d4410d72d1..2bda4e89b1d3 100644 --- a/intl/icu/source/data/unit/en_BS.txt +++ b/intl/icu/source/data/unit/en_BS.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BS{ %%Parent{"en_001"} - Version{"37"} unitsNarrow{ temperature{ celsius{ diff --git a/intl/icu/source/data/unit/en_BW.txt b/intl/icu/source/data/unit/en_BW.txt index 611516b83c07..ab8bf0919f95 100644 --- a/intl/icu/source/data/unit/en_BW.txt +++ b/intl/icu/source/data/unit/en_BW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_BZ.txt b/intl/icu/source/data/unit/en_BZ.txt index bf7b18157550..f2706e17c414 100644 --- a/intl/icu/source/data/unit/en_BZ.txt +++ b/intl/icu/source/data/unit/en_BZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BZ{ %%Parent{"en_001"} - Version{"37"} unitsNarrow{ temperature{ celsius{ diff --git a/intl/icu/source/data/unit/en_CA.txt b/intl/icu/source/data/unit/en_CA.txt index 9a4b09f3024b..1be7f23ce9cd 100644 --- a/intl/icu/source/data/unit/en_CA.txt +++ b/intl/icu/source/data/unit/en_CA.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CA{ %%Parent{"en_001"} - Version{"37"} units{ concentr{ karat{ @@ -11,10 +11,23 @@ en_CA{ other{"{0} karats"} } } - energy{ - kilowatt-hour{ - one{"{0} kilowatt-hour"} - other{"{0} kilowatt-hours"} + graphics{ + dot{ + one{"{0} dot"} + other{"{0} dots"} + } + } + light{ + candela{ + dnam{"candelas"} + } + lumen{ + dnam{"lumens"} + } + } + mass{ + grain{ + dnam{"grains"} } } torque{ @@ -25,11 +38,35 @@ en_CA{ } } volume{ + dram{ + dnam{"fluid drams"} + one{"{0} fluid dram"} + other{"{0} fluid drams"} + } + drop{ + dnam{"drops"} + } + fluid-ounce{ + dnam{"fluid ounces"} + one{"{0} fluid ounce"} + other{"{0} fluid ounces"} + } fluid-ounce-imperial{ dnam{"imp. fluid ounces"} one{"{0} imp. fluid ounce"} other{"{0} imp. fluid ounces"} } + jigger{ + dnam{"jiggers"} + } + pinch{ + dnam{"pinches"} + } + quart-imperial{ + dnam{"imp. quart"} + one{"{0} imp. quart"} + other{"{0} imp. quarts"} + } } } unitsNarrow{ @@ -84,7 +121,7 @@ en_CA{ other{"{0} m"} } second{ - dnam{"s"} + dnam{"sec."} one{"{0} sec."} other{"{0} sec."} } @@ -289,9 +326,9 @@ en_CA{ other{"{0} nanosec."} } second{ - dnam{"secs."} + dnam{"sec."} one{"{0} sec."} - other{"{0} secs."} + other{"{0} sec."} per{"{0}/sec."} } week{ @@ -371,8 +408,9 @@ en_CA{ mass{ carat{ dnam{"ct"} - one{"{0} ct"} - other{"{0} ct"} + } + grain{ + dnam{"grains"} } ounce{ dnam{"oz."} @@ -406,8 +444,10 @@ en_CA{ } } pressure{ - inch-ofhg{ - dnam{"inHg"} + millimeter-ofhg{ + dnam{"mm Hg"} + one{"{0} mm Hg"} + other{"{0} mm Hg"} } } speed{ @@ -432,7 +472,7 @@ en_CA{ } volume{ acre-foot{ - dnam{"acre ft."} + dnam{"ac. ft."} one{"{0} ac. ft."} other{"{0} ac. ft."} } @@ -474,6 +514,24 @@ en_CA{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"dssp"} + one{"{0} dssp"} + other{"{0} dssp"} + } + dessert-spoon-imperial{ + dnam{"imp. dssp"} + one{"{0} imp. dssp"} + other{"{0} imp. dssp"} + } + dram{ + dnam{"fl. dr."} + one{"{0} fl. dr."} + other{"{0} fl. dr."} + } + drop{ + dnam{"drops"} + } fluid-ounce{ dnam{"fl. oz."} one{"{0} fl. oz."} @@ -481,8 +539,8 @@ en_CA{ } fluid-ounce-imperial{ dnam{"imp. fl. oz."} - one{"{0} fl. oz. imp."} - other{"{0} fl. oz. imp."} + one{"{0} imp. fl. oz."} + other{"{0} imp. fl. oz."} } gallon{ dnam{"US gal."} @@ -501,6 +559,9 @@ en_CA{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"jiggers"} + } liter{ one{"{0} L"} other{"{0} L"} @@ -516,6 +577,9 @@ en_CA{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"pinches"} + } pint{ one{"{0} pt."} other{"{0} pt."} @@ -525,6 +589,11 @@ en_CA{ one{"{0} qt."} other{"{0} qt."} } + quart-imperial{ + dnam{"imp. qt."} + one{"{0} imp. qt."} + other{"{0} imp. qt."} + } tablespoon{ dnam{"tbsp."} one{"{0} tbsp."} diff --git a/intl/icu/source/data/unit/en_CC.txt b/intl/icu/source/data/unit/en_CC.txt index bce9886347ba..906cf1e9307e 100644 --- a/intl/icu/source/data/unit/en_CC.txt +++ b/intl/icu/source/data/unit/en_CC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_CH.txt b/intl/icu/source/data/unit/en_CH.txt index 244edf251572..23629216bb2e 100644 --- a/intl/icu/source/data/unit/en_CH.txt +++ b/intl/icu/source/data/unit/en_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CH{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_CK.txt b/intl/icu/source/data/unit/en_CK.txt index ad52b0e60e4d..dc1c0652a0aa 100644 --- a/intl/icu/source/data/unit/en_CK.txt +++ b/intl/icu/source/data/unit/en_CK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_CM.txt b/intl/icu/source/data/unit/en_CM.txt index bf63213a9c6b..b7fdf6d9851c 100644 --- a/intl/icu/source/data/unit/en_CM.txt +++ b/intl/icu/source/data/unit/en_CM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_CX.txt b/intl/icu/source/data/unit/en_CX.txt index 702f22b69973..58ff41550186 100644 --- a/intl/icu/source/data/unit/en_CX.txt +++ b/intl/icu/source/data/unit/en_CX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_CY.txt b/intl/icu/source/data/unit/en_CY.txt index 21b11b75693b..d4e75c0ad7c6 100644 --- a/intl/icu/source/data/unit/en_CY.txt +++ b/intl/icu/source/data/unit/en_CY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_DE.txt b/intl/icu/source/data/unit/en_DE.txt index 262361402a19..0147e016a82c 100644 --- a/intl/icu/source/data/unit/en_DE.txt +++ b/intl/icu/source/data/unit/en_DE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_DG.txt b/intl/icu/source/data/unit/en_DG.txt index 95b8e88b2410..10bd8d9f5c7b 100644 --- a/intl/icu/source/data/unit/en_DG.txt +++ b/intl/icu/source/data/unit/en_DG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_DK.txt b/intl/icu/source/data/unit/en_DK.txt index d98349b1211f..d694bb01d391 100644 --- a/intl/icu/source/data/unit/en_DK.txt +++ b/intl/icu/source/data/unit/en_DK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DK{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_DM.txt b/intl/icu/source/data/unit/en_DM.txt index 5bfedb7bc574..224df76b66c2 100644 --- a/intl/icu/source/data/unit/en_DM.txt +++ b/intl/icu/source/data/unit/en_DM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_ER.txt b/intl/icu/source/data/unit/en_ER.txt index afd82fc80845..a39df789c0b7 100644 --- a/intl/icu/source/data/unit/en_ER.txt +++ b/intl/icu/source/data/unit/en_ER.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ER{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_FI.txt b/intl/icu/source/data/unit/en_FI.txt index ae4b5178a0fa..0b93a7e23208 100644 --- a/intl/icu/source/data/unit/en_FI.txt +++ b/intl/icu/source/data/unit/en_FI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_FJ.txt b/intl/icu/source/data/unit/en_FJ.txt index 0c4ca01ddb12..65b19ac752d1 100644 --- a/intl/icu/source/data/unit/en_FJ.txt +++ b/intl/icu/source/data/unit/en_FJ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FJ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_FK.txt b/intl/icu/source/data/unit/en_FK.txt index 9c92bfddf150..1fca5161ce21 100644 --- a/intl/icu/source/data/unit/en_FK.txt +++ b/intl/icu/source/data/unit/en_FK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_FM.txt b/intl/icu/source/data/unit/en_FM.txt index 352f324e9718..ad38147c27bf 100644 --- a/intl/icu/source/data/unit/en_FM.txt +++ b/intl/icu/source/data/unit/en_FM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_GB.txt b/intl/icu/source/data/unit/en_GB.txt index 6b7a4eb3b4b2..cd1c2e88d741 100644 --- a/intl/icu/source/data/unit/en_GB.txt +++ b/intl/icu/source/data/unit/en_GB.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GB{ %%Parent{"en_001"} - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -18,19 +18,16 @@ en_GB{ } } unitsShort{ - duration{ - microsecond{ - dnam{"μsecs"} - one{"{0} μs"} - other{"{0} μs"} - } - } volume{ fluid-ounce-imperial{ dnam{"fl oz"} one{"{0} fl oz"} other{"{0} fl oz"} } + jigger{ + one{"{0} jigger"} + other{"{0} jiggers"} + } } } } diff --git a/intl/icu/source/data/unit/en_GD.txt b/intl/icu/source/data/unit/en_GD.txt index 98ca5e43fb1e..5aadd228902a 100644 --- a/intl/icu/source/data/unit/en_GD.txt +++ b/intl/icu/source/data/unit/en_GD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_GG.txt b/intl/icu/source/data/unit/en_GG.txt index 8bee533ca6ed..6d63e5509c60 100644 --- a/intl/icu/source/data/unit/en_GG.txt +++ b/intl/icu/source/data/unit/en_GG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_GH.txt b/intl/icu/source/data/unit/en_GH.txt index de3715085046..8d0f240339d5 100644 --- a/intl/icu/source/data/unit/en_GH.txt +++ b/intl/icu/source/data/unit/en_GH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_GI.txt b/intl/icu/source/data/unit/en_GI.txt index 5afa54f0b21a..809590db2c12 100644 --- a/intl/icu/source/data/unit/en_GI.txt +++ b/intl/icu/source/data/unit/en_GI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_GM.txt b/intl/icu/source/data/unit/en_GM.txt index bbf424ce80b4..0f9710e3cfe0 100644 --- a/intl/icu/source/data/unit/en_GM.txt +++ b/intl/icu/source/data/unit/en_GM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_GY.txt b/intl/icu/source/data/unit/en_GY.txt index 905d5bef1647..0e53543e03e5 100644 --- a/intl/icu/source/data/unit/en_GY.txt +++ b/intl/icu/source/data/unit/en_GY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_HK.txt b/intl/icu/source/data/unit/en_HK.txt index 3eec8fe6d580..f074e0c27571 100644 --- a/intl/icu/source/data/unit/en_HK.txt +++ b/intl/icu/source/data/unit/en_HK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_HK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_IE.txt b/intl/icu/source/data/unit/en_IE.txt index 96feab56fd02..1426a90d3ea6 100644 --- a/intl/icu/source/data/unit/en_IE.txt +++ b/intl/icu/source/data/unit/en_IE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_IL.txt b/intl/icu/source/data/unit/en_IL.txt index 2d329190ae66..39fe76349fde 100644 --- a/intl/icu/source/data/unit/en_IL.txt +++ b/intl/icu/source/data/unit/en_IL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_IM.txt b/intl/icu/source/data/unit/en_IM.txt index 15a218b34593..d6e869d81edb 100644 --- a/intl/icu/source/data/unit/en_IM.txt +++ b/intl/icu/source/data/unit/en_IM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_IN.txt b/intl/icu/source/data/unit/en_IN.txt index 9ee679429bd3..b52a7f80427e 100644 --- a/intl/icu/source/data/unit/en_IN.txt +++ b/intl/icu/source/data/unit/en_IN.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IN{ %%Parent{"en_001"} - Version{"37"} units{ temperature{ generic{ diff --git a/intl/icu/source/data/unit/en_IO.txt b/intl/icu/source/data/unit/en_IO.txt index 5cd721054613..5b70c5ab66ad 100644 --- a/intl/icu/source/data/unit/en_IO.txt +++ b/intl/icu/source/data/unit/en_IO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_JE.txt b/intl/icu/source/data/unit/en_JE.txt index d8e0823c1652..715ff18d66ba 100644 --- a/intl/icu/source/data/unit/en_JE.txt +++ b/intl/icu/source/data/unit/en_JE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_JM.txt b/intl/icu/source/data/unit/en_JM.txt index 695ae1a18125..08a51274d409 100644 --- a/intl/icu/source/data/unit/en_JM.txt +++ b/intl/icu/source/data/unit/en_JM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_KE.txt b/intl/icu/source/data/unit/en_KE.txt index eecdd357a018..01411a3aabe7 100644 --- a/intl/icu/source/data/unit/en_KE.txt +++ b/intl/icu/source/data/unit/en_KE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_KI.txt b/intl/icu/source/data/unit/en_KI.txt index 6c68a9fa83d5..8cd023d08082 100644 --- a/intl/icu/source/data/unit/en_KI.txt +++ b/intl/icu/source/data/unit/en_KI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_KN.txt b/intl/icu/source/data/unit/en_KN.txt index 35ebc91eb17e..092c41e9eb64 100644 --- a/intl/icu/source/data/unit/en_KN.txt +++ b/intl/icu/source/data/unit/en_KN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_KY.txt b/intl/icu/source/data/unit/en_KY.txt index 1f707eec0246..311bc3a01fa8 100644 --- a/intl/icu/source/data/unit/en_KY.txt +++ b/intl/icu/source/data/unit/en_KY.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KY{ %%Parent{"en_001"} - Version{"37"} unitsNarrow{ temperature{ celsius{ diff --git a/intl/icu/source/data/unit/en_LC.txt b/intl/icu/source/data/unit/en_LC.txt index 5e248adcff89..ce2445292795 100644 --- a/intl/icu/source/data/unit/en_LC.txt +++ b/intl/icu/source/data/unit/en_LC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_LR.txt b/intl/icu/source/data/unit/en_LR.txt index 0a77adc8b4fc..979fa999139a 100644 --- a/intl/icu/source/data/unit/en_LR.txt +++ b/intl/icu/source/data/unit/en_LR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_LS.txt b/intl/icu/source/data/unit/en_LS.txt index 14848c9fef04..bd1380cb3de1 100644 --- a/intl/icu/source/data/unit/en_LS.txt +++ b/intl/icu/source/data/unit/en_LS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MG.txt b/intl/icu/source/data/unit/en_MG.txt index 2f24348d2b73..8799b5bcb3bd 100644 --- a/intl/icu/source/data/unit/en_MG.txt +++ b/intl/icu/source/data/unit/en_MG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MO.txt b/intl/icu/source/data/unit/en_MO.txt index 2cd5c0a8f383..769b2ea19989 100644 --- a/intl/icu/source/data/unit/en_MO.txt +++ b/intl/icu/source/data/unit/en_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MS.txt b/intl/icu/source/data/unit/en_MS.txt index fbedac5bdeff..e0028aa3cb1b 100644 --- a/intl/icu/source/data/unit/en_MS.txt +++ b/intl/icu/source/data/unit/en_MS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MT.txt b/intl/icu/source/data/unit/en_MT.txt index a3af9271389a..a21782743294 100644 --- a/intl/icu/source/data/unit/en_MT.txt +++ b/intl/icu/source/data/unit/en_MT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MU.txt b/intl/icu/source/data/unit/en_MU.txt index 1e672406bf18..1a4260b7206b 100644 --- a/intl/icu/source/data/unit/en_MU.txt +++ b/intl/icu/source/data/unit/en_MU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MW.txt b/intl/icu/source/data/unit/en_MW.txt index 06244544e9de..1920911dc756 100644 --- a/intl/icu/source/data/unit/en_MW.txt +++ b/intl/icu/source/data/unit/en_MW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_MY.txt b/intl/icu/source/data/unit/en_MY.txt index ffd93f8e315a..891c100c2873 100644 --- a/intl/icu/source/data/unit/en_MY.txt +++ b/intl/icu/source/data/unit/en_MY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NA.txt b/intl/icu/source/data/unit/en_NA.txt index 0b019a8d650f..c1a4e58564fe 100644 --- a/intl/icu/source/data/unit/en_NA.txt +++ b/intl/icu/source/data/unit/en_NA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NF.txt b/intl/icu/source/data/unit/en_NF.txt index e264ade967b9..514d0d9c3ea2 100644 --- a/intl/icu/source/data/unit/en_NF.txt +++ b/intl/icu/source/data/unit/en_NF.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NF{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NG.txt b/intl/icu/source/data/unit/en_NG.txt index 70db1dbe8f90..c047e030fcdb 100644 --- a/intl/icu/source/data/unit/en_NG.txt +++ b/intl/icu/source/data/unit/en_NG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NH.txt b/intl/icu/source/data/unit/en_NH.txt index 958b96bdad8e..5dc995b2118b 100644 --- a/intl/icu/source/data/unit/en_NH.txt +++ b/intl/icu/source/data/unit/en_NH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NH{ "%%ALIAS"{"en_VU"} } diff --git a/intl/icu/source/data/unit/en_NL.txt b/intl/icu/source/data/unit/en_NL.txt index 5b5436b9dc60..0b352bd44db3 100644 --- a/intl/icu/source/data/unit/en_NL.txt +++ b/intl/icu/source/data/unit/en_NL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NL{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NR.txt b/intl/icu/source/data/unit/en_NR.txt index 4377e15a6568..89304ca9b0da 100644 --- a/intl/icu/source/data/unit/en_NR.txt +++ b/intl/icu/source/data/unit/en_NR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NU.txt b/intl/icu/source/data/unit/en_NU.txt index 56d9b22ea29c..830320b281b0 100644 --- a/intl/icu/source/data/unit/en_NU.txt +++ b/intl/icu/source/data/unit/en_NU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_NZ.txt b/intl/icu/source/data/unit/en_NZ.txt index ca3650e0f511..63e43a3938da 100644 --- a/intl/icu/source/data/unit/en_NZ.txt +++ b/intl/icu/source/data/unit/en_NZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_PG.txt b/intl/icu/source/data/unit/en_PG.txt index ffddbf48a87f..217c90f4dd6b 100644 --- a/intl/icu/source/data/unit/en_PG.txt +++ b/intl/icu/source/data/unit/en_PG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_PH.txt b/intl/icu/source/data/unit/en_PH.txt index 96578848ab80..1b59777cecbf 100644 --- a/intl/icu/source/data/unit/en_PH.txt +++ b/intl/icu/source/data/unit/en_PH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_PK.txt b/intl/icu/source/data/unit/en_PK.txt index 874a3eeda131..909315766bb5 100644 --- a/intl/icu/source/data/unit/en_PK.txt +++ b/intl/icu/source/data/unit/en_PK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_PN.txt b/intl/icu/source/data/unit/en_PN.txt index 7f93228000e3..975dcb4418f7 100644 --- a/intl/icu/source/data/unit/en_PN.txt +++ b/intl/icu/source/data/unit/en_PN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_PW.txt b/intl/icu/source/data/unit/en_PW.txt index 3a0ff855fe20..01ae41876f6d 100644 --- a/intl/icu/source/data/unit/en_PW.txt +++ b/intl/icu/source/data/unit/en_PW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PW{ %%Parent{"en_001"} - Version{"37"} unitsNarrow{ temperature{ celsius{ diff --git a/intl/icu/source/data/unit/en_RH.txt b/intl/icu/source/data/unit/en_RH.txt index b60f708fb284..24bad293f695 100644 --- a/intl/icu/source/data/unit/en_RH.txt +++ b/intl/icu/source/data/unit/en_RH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RH{ "%%ALIAS"{"en_ZW"} } diff --git a/intl/icu/source/data/unit/en_RW.txt b/intl/icu/source/data/unit/en_RW.txt index bc329328e290..ea92ac1dead5 100644 --- a/intl/icu/source/data/unit/en_RW.txt +++ b/intl/icu/source/data/unit/en_RW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SB.txt b/intl/icu/source/data/unit/en_SB.txt index 7e736c28dae8..99071572dc6c 100644 --- a/intl/icu/source/data/unit/en_SB.txt +++ b/intl/icu/source/data/unit/en_SB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SC.txt b/intl/icu/source/data/unit/en_SC.txt index df04930ee040..9d503c4f86b8 100644 --- a/intl/icu/source/data/unit/en_SC.txt +++ b/intl/icu/source/data/unit/en_SC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SD.txt b/intl/icu/source/data/unit/en_SD.txt index f2110fab60c4..ef3c460dae03 100644 --- a/intl/icu/source/data/unit/en_SD.txt +++ b/intl/icu/source/data/unit/en_SD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SE.txt b/intl/icu/source/data/unit/en_SE.txt index c2a72c0820b6..ec7d34ecf478 100644 --- a/intl/icu/source/data/unit/en_SE.txt +++ b/intl/icu/source/data/unit/en_SE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SG.txt b/intl/icu/source/data/unit/en_SG.txt index ddf857dc6401..1f25c8634c6a 100644 --- a/intl/icu/source/data/unit/en_SG.txt +++ b/intl/icu/source/data/unit/en_SG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SH.txt b/intl/icu/source/data/unit/en_SH.txt index 0e6c3dc082d3..09e4765ae382 100644 --- a/intl/icu/source/data/unit/en_SH.txt +++ b/intl/icu/source/data/unit/en_SH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SI.txt b/intl/icu/source/data/unit/en_SI.txt index a69030ee8795..6fb107aec3d0 100644 --- a/intl/icu/source/data/unit/en_SI.txt +++ b/intl/icu/source/data/unit/en_SI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SL.txt b/intl/icu/source/data/unit/en_SL.txt index b956002c8c65..c79ccc50137a 100644 --- a/intl/icu/source/data/unit/en_SL.txt +++ b/intl/icu/source/data/unit/en_SL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SS.txt b/intl/icu/source/data/unit/en_SS.txt index 80fb80078f97..390a313b3ff7 100644 --- a/intl/icu/source/data/unit/en_SS.txt +++ b/intl/icu/source/data/unit/en_SS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SX.txt b/intl/icu/source/data/unit/en_SX.txt index 28da271484bb..11fa700ebcd0 100644 --- a/intl/icu/source/data/unit/en_SX.txt +++ b/intl/icu/source/data/unit/en_SX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_SZ.txt b/intl/icu/source/data/unit/en_SZ.txt index 431d63a6eaf2..7e9c97d0d227 100644 --- a/intl/icu/source/data/unit/en_SZ.txt +++ b/intl/icu/source/data/unit/en_SZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_TC.txt b/intl/icu/source/data/unit/en_TC.txt index 4129b99aedf9..181633bb547b 100644 --- a/intl/icu/source/data/unit/en_TC.txt +++ b/intl/icu/source/data/unit/en_TC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_TK.txt b/intl/icu/source/data/unit/en_TK.txt index 11010f35ad4c..e50d57245622 100644 --- a/intl/icu/source/data/unit/en_TK.txt +++ b/intl/icu/source/data/unit/en_TK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_TO.txt b/intl/icu/source/data/unit/en_TO.txt index 6b63ad24fc11..d21d084e934f 100644 --- a/intl/icu/source/data/unit/en_TO.txt +++ b/intl/icu/source/data/unit/en_TO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_TT.txt b/intl/icu/source/data/unit/en_TT.txt index d91ebb5a6aa4..d375378a8bf3 100644 --- a/intl/icu/source/data/unit/en_TT.txt +++ b/intl/icu/source/data/unit/en_TT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_TV.txt b/intl/icu/source/data/unit/en_TV.txt index 2d0ae8f9f059..62477529f574 100644 --- a/intl/icu/source/data/unit/en_TV.txt +++ b/intl/icu/source/data/unit/en_TV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TV{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_TZ.txt b/intl/icu/source/data/unit/en_TZ.txt index 2ff0cbd9517f..2aa8e46e6255 100644 --- a/intl/icu/source/data/unit/en_TZ.txt +++ b/intl/icu/source/data/unit/en_TZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_UG.txt b/intl/icu/source/data/unit/en_UG.txt index 7ad0d876d3d0..26ed28e6b2df 100644 --- a/intl/icu/source/data/unit/en_UG.txt +++ b/intl/icu/source/data/unit/en_UG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_UG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_VC.txt b/intl/icu/source/data/unit/en_VC.txt index 45b455da495d..a0187543234c 100644 --- a/intl/icu/source/data/unit/en_VC.txt +++ b/intl/icu/source/data/unit/en_VC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_VG.txt b/intl/icu/source/data/unit/en_VG.txt index 3e84e3013cc5..1a001d05daa8 100644 --- a/intl/icu/source/data/unit/en_VG.txt +++ b/intl/icu/source/data/unit/en_VG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_VU.txt b/intl/icu/source/data/unit/en_VU.txt index 6229365b1f91..91d6b819ccf7 100644 --- a/intl/icu/source/data/unit/en_VU.txt +++ b/intl/icu/source/data/unit/en_VU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_WS.txt b/intl/icu/source/data/unit/en_WS.txt index 5d2f739b8e3e..f197bb1f1507 100644 --- a/intl/icu/source/data/unit/en_WS.txt +++ b/intl/icu/source/data/unit/en_WS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_WS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_ZA.txt b/intl/icu/source/data/unit/en_ZA.txt index 942751ed3d33..13468e262d33 100644 --- a/intl/icu/source/data/unit/en_ZA.txt +++ b/intl/icu/source/data/unit/en_ZA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZA{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_ZM.txt b/intl/icu/source/data/unit/en_ZM.txt index 32588ce8afff..f61c471a8de3 100644 --- a/intl/icu/source/data/unit/en_ZM.txt +++ b/intl/icu/source/data/unit/en_ZM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/en_ZW.txt b/intl/icu/source/data/unit/en_ZW.txt index 05fb790dbc5f..60eaea8a1863 100644 --- a/intl/icu/source/data/unit/en_ZW.txt +++ b/intl/icu/source/data/unit/en_ZW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/eo.txt b/intl/icu/source/data/unit/eo.txt index 36f7c405114d..a88206bc2baa 100644 --- a/intl/icu/source/data/unit/eo.txt +++ b/intl/icu/source/data/unit/eo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo{ - Version{"37"} unitsShort{ duration{ month{ diff --git a/intl/icu/source/data/unit/es.txt b/intl/icu/source/data/unit/es.txt index eb95dd38e97a..30fd5f5b006c 100644 --- a/intl/icu/source/data/unit/es.txt +++ b/intl/icu/source/data/unit/es.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -10,9 +10,9 @@ es{ units{ acceleration{ g-force{ - dnam{"fuerza G"} - one{"{0} unidad de fuerza gravitacional"} - other{"{0} unidades de fuerza gravitacional"} + dnam{"unidades de fuerza g"} + one{"{0} unidad de fuerza g"} + other{"{0} unidades de fuerza g"} } meter-per-square-second{ dnam{"metros por segundo al cuadrado"} @@ -126,7 +126,7 @@ es{ } mole{ dnam{"moles"} - one{"{0} moles"} + one{"{0} mol"} other{"{0} moles"} } percent{ @@ -344,9 +344,9 @@ es{ other{"{0} electronvoltios"} } foodcalorie{ - dnam{"calorías"} - one{"{0} caloría"} - other{"{0} calorías"} + dnam{"kilocalorías"} + one{"{0} kilocaloría"} + other{"{0} kilocalorías"} } joule{ dnam{"julios"} @@ -369,7 +369,7 @@ es{ other{"{0} kilovatios-hora"} } therm-us{ - dnam{"termia estadounidense"} + dnam{"termias estadounidenses"} one{"{0} termia estadounidense"} other{"{0} termias estadounidenses"} } @@ -409,6 +409,11 @@ es{ } } graphics{ + dot{ + dnam{"puntos tipográficos"} + one{"{0} punto tipográfico"} + other{"{0} puntos tipográficos"} + } dot-per-centimeter{ dnam{"puntos por centímetro"} one{"{0} punto por centímetro"} @@ -462,12 +467,27 @@ es{ one{"{0} decímetro"} other{"{0} decímetros"} } + earth-radius{ + dnam{"radios terrestres"} + one{"{0} radio terrestre"} + other{"{0} radios terrestres"} + } + fathom{ + dnam{"brazas"} + one{"{0} braza"} + other{"{0} brazas"} + } foot{ dnam{"pies"} one{"{0} pie"} other{"{0} pies"} per{"{0} por pie"} } + furlong{ + dnam{"furlongs"} + one{"{0} furlong"} + other{"{0} furlongs"} + } inch{ dnam{"pulgadas"} one{"{0} pulgada"} @@ -548,6 +568,16 @@ es{ } } light{ + candela{ + dnam{"candelas"} + one{"{0} candela"} + other{"{0} candelas"} + } + lumen{ + dnam{"lúmenes"} + one{"{0} lumen"} + other{"{0} lúmenes"} + } lux{ dnam{"luxes"} one{"{0} lux"} @@ -575,6 +605,11 @@ es{ one{"{0} masa terrestre"} other{"{0} masas terrestres"} } + grain{ + dnam{"granos"} + one{"{0} grano"} + other{"{0} granos"} + } gram{ dnam{"gramos"} one{"{0} gramo"} @@ -588,9 +623,9 @@ es{ per{"{0} por kilogramo"} } metric-ton{ - dnam{"toneladas métricas"} - one{"{0} tonelada métrica"} - other{"{0} toneladas métricas"} + dnam{"toneladas"} + one{"{0} tonelada"} + other{"{0} toneladas"} } microgram{ dnam{"microgramos"} @@ -624,10 +659,15 @@ es{ one{"{0} masa solar"} other{"{0} masas solares"} } + stone{ + dnam{"stones"} + one{"{0} stone"} + other{"{0} stones"} + } ton{ - dnam{"toneladas"} - one{"{0} tonelada"} - other{"{0} toneladas"} + dnam{"toneladas cortas"} + one{"{0} tonelada corta"} + other{"{0} toneladas cortas"} } } power{ @@ -748,9 +788,9 @@ es{ other{"{0} grados Fahrenheit"} } generic{ - dnam{"°"} - one{"{0}°"} - other{"{0}°"} + dnam{"grados"} + one{"{0} grado"} + other{"{0} grados"} } kelvin{ dnam{"kelvin"} @@ -760,12 +800,12 @@ es{ } torque{ newton-meter{ - dnam{"newton metro"} + dnam{"newton metros"} one{"{0} newton metro"} other{"{0} newton metros"} } pound-force-foot{ - dnam{"libra pies"} + dnam{"libras pies"} one{"{0} libra pie"} other{"{0} libras pies"} } @@ -781,6 +821,11 @@ es{ one{"{0} barril"} other{"{0} barriles"} } + bushel{ + dnam{"bushels"} + one{"{0} bushel"} + other{"{0} bushels"} + } centiliter{ dnam{"centilitros"} one{"{0} centilitro"} @@ -838,6 +883,26 @@ es{ one{"{0} decilitro"} other{"{0} decilitros"} } + dessert-spoon{ + dnam{"cucharadas de postre"} + one{"{0} cucharada de postre"} + other{"{0} cucharadas de postre"} + } + dessert-spoon-imperial{ + dnam{"cucharadas de postre imperiales"} + one{"{0} cucharada de postre imperial"} + other{"{0} cucharadas de postre imperiales"} + } + dram{ + dnam{"dracmas líquidas"} + one{"{0} dracma líquida"} + other{"{0} dracmas líquidas"} + } + drop{ + dnam{"gotas"} + one{"{0} gota"} + other{"{0} gotas"} + } fluid-ounce{ dnam{"onzas líquidas"} one{"{0} onza líquida"} @@ -865,6 +930,11 @@ es{ one{"{0} hectolitro"} other{"{0} hectolitros"} } + jigger{ + dnam{"vasos medidores"} + one{"{0} vaso medidor"} + other{"{0} vasos medidores"} + } liter{ dnam{"litros"} one{"{0} litro"} @@ -881,6 +951,11 @@ es{ one{"{0} mililitro"} other{"{0} mililitros"} } + pinch{ + dnam{"pizcas"} + one{"{0} pizca"} + other{"{0} pizcas"} + } pint{ dnam{"pintas"} one{"{0} pinta"} @@ -896,6 +971,11 @@ es{ one{"{0} cuarto"} other{"{0} cuartos"} } + quart-imperial{ + dnam{"cuartos imperiales"} + one{"{0} cuarto imperial"} + other{"{0} cuartos imperiales"} + } tablespoon{ dnam{"cucharadas"} one{"{0} cucharada"} @@ -962,8 +1042,8 @@ es{ concentr{ percent{ dnam{"%"} - one{"{0} %"} - other{"{0} %"} + one{"{0}%"} + other{"{0}%"} } } consumption{ @@ -988,10 +1068,14 @@ es{ } day{ dnam{"d"} + one{"{0}d"} + other{"{0}d"} per{"{0}/d"} } hour{ dnam{"h"} + one{"{0}h"} + other{"{0}h"} per{"{0}/h"} } microsecond{ @@ -1001,15 +1085,19 @@ es{ } millisecond{ dnam{"ms"} + one{"{0}ms"} + other{"{0}ms"} } minute{ dnam{"min"} + one{"{0}min"} + other{"{0}min"} per{"{0}/min"} } month{ dnam{"m."} - one{"{0} m."} - other{"{0} m."} + one{"{0}m."} + other{"{0}m."} } nanosecond{ dnam{"ns"} @@ -1018,17 +1106,19 @@ es{ } second{ dnam{"s"} + one{"{0}s"} + other{"{0}s"} per{"{0}/s"} } week{ - one{"{0} sem."} - other{"{0} sem."} + one{"{0}sem."} + other{"{0}sem."} per{"{0}/sem"} } year{ dnam{"a"} - one{"{0} a"} - other{"{0} a"} + one{"{0}a"} + other{"{0}a"} per{"{0}/a"} } } @@ -1074,6 +1164,8 @@ es{ } meter{ dnam{"m"} + one{"{0}m"} + other{"{0}m"} per{"{0}/m"} } micrometer{ @@ -1362,8 +1454,8 @@ es{ other{"{0} mmol/L"} } mole{ - one{"{0} moles"} - other{"{0} moles"} + one{"{0} mol"} + other{"{0} mol"} } percent{ dnam{"por ciento"} @@ -1371,7 +1463,6 @@ es{ other{"{0} %"} } permille{ - dnam{"por mil"} one{"{0} ‰"} other{"{0} ‰"} } @@ -1381,7 +1472,6 @@ es{ other{"{0} ppm"} } permyriad{ - dnam{"por diez mil"} one{"{0} ‱"} other{"{0} ‱"} } @@ -1558,7 +1648,7 @@ es{ other{"{0} Ω"} } volt{ - dnam{"voltios"} + dnam{"V"} one{"{0} V"} other{"{0} V"} } @@ -1574,13 +1664,10 @@ es{ one{"{0} cal"} other{"{0} cal"} } - electronvolt{ - dnam{"electronvoltio"} - } foodcalorie{ - dnam{"cal"} - one{"{0} cal"} - other{"{0} cal"} + dnam{"kcal"} + one{"{0} kcal"} + other{"{0} kcal"} } joule{ dnam{"J"} @@ -1608,14 +1695,6 @@ es{ other{"{0} thm EE. UU."} } } - force{ - newton{ - dnam{"newton"} - } - pound-force{ - dnam{"libra fuerza"} - } - } frequency{ gigahertz{ dnam{"GHz"} @@ -1639,6 +1718,11 @@ es{ } } graphics{ + dot{ + dnam{"pt"} + one{"{0} pt"} + other{"{0} pt"} + } dot-per-centimeter{ dnam{"ppcm"} one{"{0} ppcm"} @@ -1692,12 +1776,20 @@ es{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"ftm"} + one{"{0} ftm"} + other{"{0} ftm"} + } foot{ dnam{"ft"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"fur"} + } inch{ dnam{"in"} one{"{0} in"} @@ -1762,13 +1854,10 @@ es{ other{"{0} pm"} } point{ - dnam{"puntos"} + dnam{"ptos."} one{"{0} pto."} other{"{0} ptos."} } - solar-radius{ - dnam{"radios solares"} - } yard{ dnam{"yd"} one{"{0} yd"} @@ -1781,21 +1870,17 @@ es{ one{"{0} lx"} other{"{0} lx"} } - solar-luminosity{ - dnam{"luminosidades solares"} - } } mass{ carat{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} + dnam{"ct"} + one{"{0} ct"} + other{"{0} ct"} } - dalton{ - dnam{"daltones"} - } - earth-mass{ - dnam{"masas terrestres"} + grain{ + dnam{"gr"} + one{"{0} gr"} + other{"{0} gr"} } gram{ dnam{"g"} @@ -1810,9 +1895,8 @@ es{ per{"{0}/kg"} } metric-ton{ - dnam{"tm"} - one{"{0} tm"} - other{"{0} tm"} + one{"{0} t"} + other{"{0} t"} } microgram{ dnam{"µg"} @@ -1841,13 +1925,10 @@ es{ other{"{0} lb"} per{"{0}/lb"} } - solar-mass{ - dnam{"masas solares"} - } ton{ - dnam{"t"} - one{"{0} t"} - other{"{0} t"} + dnam{"tc"} + one{"{0} tc"} + other{"{0} tc"} } } power{ @@ -1877,7 +1958,7 @@ es{ other{"{0} mW"} } watt{ - dnam{"vatios"} + dnam{"W"} one{"{0} W"} other{"{0} W"} } @@ -1987,7 +2068,6 @@ es{ other{"{0} ac ft"} } barrel{ - dnam{"barril"} one{"{0} bbl"} other{"{0} bbl"} } @@ -2034,20 +2114,40 @@ es{ other{"{0} yd³"} } cup{ - dnam{"tazas"} - one{"{0} tza."} - other{"{0} tza."} + dnam{"tza"} + one{"{0} tza"} + other{"{0} tza"} } cup-metric{ - dnam{"mc"} - one{"{0} mc"} - other{"{0} mc"} + dnam{"tza m"} + one{"{0} tza m"} + other{"{0} tza m"} } deciliter{ dnam{"dl"} one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"c/p"} + one{"{0} c/p"} + other{"{0} c/p"} + } + dessert-spoon-imperial{ + dnam{"dstspn imp."} + one{"{0} dstspn imp."} + other{"{0} dstspn imp."} + } + dram{ + dnam{"fl dr"} + one{"{0} fl dr"} + other{"{0} fl dr"} + } + drop{ + dnam{"gota"} + one{"{0} gota"} + other{"{0} gotas"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2075,6 +2175,11 @@ es{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"medidor"} + one{"{0} medidor"} + other{"{0} medidores"} + } liter{ dnam{"l"} one{"{0} l"} @@ -2091,10 +2196,15 @@ es{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"pzc"} + one{"{0} pzc"} + other{"{0} pzc"} + } pint{ - dnam{"pt"} - one{"{0} pt"} - other{"{0} pt"} + dnam{"p"} + one{"{0} p"} + other{"{0} p"} } pint-metric{ dnam{"mpt"} @@ -2106,6 +2216,11 @@ es{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt imp."} + one{"{0} qt imp."} + other{"{0} qt imp."} + } tablespoon{ dnam{"cda"} one{"{0} cda"} diff --git a/intl/icu/source/data/unit/es_419.txt b/intl/icu/source/data/unit/es_419.txt index c9bf29801f8c..3051b00028b2 100644 --- a/intl/icu/source/data/unit/es_419.txt +++ b/intl/icu/source/data/unit/es_419.txt @@ -1,8 +1,15 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_419{ - Version{"37"} units{ + acceleration{ + g-force{ + dnam{"fuerza G"} + one{"{0} unidad de fuerza gravitacional"} + other{"{0} unidades de fuerza gravitacional"} + } + } concentr{ milligram-per-deciliter{ dnam{"mg/dL"} @@ -48,10 +55,15 @@ es_419{ } } mass{ - stone{ - dnam{"stones"} - one{"{0} stone"} - other{"{0} stones"} + metric-ton{ + dnam{"toneladas métricas"} + one{"{0} tonelada métrica"} + other{"{0} toneladas métricas"} + } + ton{ + dnam{"toneladas"} + one{"{0} tonelada"} + other{"{0} toneladas"} } } power{ @@ -62,6 +74,10 @@ es_419{ } } temperature{ + generic{ + one{"{0}°"} + other{"{0}°"} + } kelvin{ dnam{"kelvins"} one{"{0} kelvin"} @@ -99,14 +115,6 @@ es_419{ other{"{0}dd."} per{"{0}/d."} } - hour{ - one{"{0}h"} - other{"{0}h"} - } - minute{ - one{"{0}min"} - other{"{0}min"} - } month{ one{"{0}m."} other{"{0}mm."} @@ -225,6 +233,13 @@ es_419{ per{"{0}/a."} } } + graphics{ + dot{ + dnam{"p"} + one{"{0} p"} + other{"{0} p"} + } + } length{ astronomical-unit{ dnam{"ua"} @@ -252,11 +267,6 @@ es_419{ } } mass{ - carat{ - dnam{"ct"} - one{"{0} ct"} - other{"{0} ct"} - } metric-ton{ dnam{"t"} one{"{0} t"} @@ -284,11 +294,14 @@ es_419{ } } volume{ - gallon-imperial{ - per{"{0}/gal Imp."} + cup{ + one{"{0} tza."} + other{"{0} tza."} } pint{ dnam{"pintas"} + one{"{0} pt"} + other{"{0} pt"} } tablespoon{ dnam{"cdas."} diff --git a/intl/icu/source/data/unit/es_AR.txt b/intl/icu/source/data/unit/es_AR.txt index 30820ee7e434..129168d170b0 100644 --- a/intl/icu/source/data/unit/es_AR.txt +++ b/intl/icu/source/data/unit/es_AR.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_AR{ %%Parent{"es_419"} - Version{"37"} units{ duration{ year{ @@ -74,5 +74,15 @@ es_AR{ per{"{0}/a"} } } + electric{ + volt{ + dnam{"voltios"} + } + } + power{ + watt{ + dnam{"vatios"} + } + } } } diff --git a/intl/icu/source/data/unit/es_BO.txt b/intl/icu/source/data/unit/es_BO.txt index dac8e43a9484..413f9de3d3db 100644 --- a/intl/icu/source/data/unit/es_BO.txt +++ b/intl/icu/source/data/unit/es_BO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BO{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_BR.txt b/intl/icu/source/data/unit/es_BR.txt index a8d655c2c505..a18c09fbb9ad 100644 --- a/intl/icu/source/data/unit/es_BR.txt +++ b/intl/icu/source/data/unit/es_BR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_BZ.txt b/intl/icu/source/data/unit/es_BZ.txt index f7034128e3b6..471108e8d7a7 100644 --- a/intl/icu/source/data/unit/es_BZ.txt +++ b/intl/icu/source/data/unit/es_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BZ{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_CL.txt b/intl/icu/source/data/unit/es_CL.txt index 37d36d7d40bd..bbabb2affeee 100644 --- a/intl/icu/source/data/unit/es_CL.txt +++ b/intl/icu/source/data/unit/es_CL.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CL{ %%Parent{"es_419"} - Version{"37"} durationUnits{ hms{"hh:mm:ss"} ms{"mm:ss"} @@ -25,4 +25,16 @@ es_CL{ } } } + unitsShort{ + electric{ + volt{ + dnam{"voltios"} + } + } + power{ + watt{ + dnam{"vatios"} + } + } + } } diff --git a/intl/icu/source/data/unit/es_CO.txt b/intl/icu/source/data/unit/es_CO.txt index 7133af7c56b1..d5e2cfc6e8b4 100644 --- a/intl/icu/source/data/unit/es_CO.txt +++ b/intl/icu/source/data/unit/es_CO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CO{ %%Parent{"es_419"} - Version{"37"} units{ duration{ month{ diff --git a/intl/icu/source/data/unit/es_CR.txt b/intl/icu/source/data/unit/es_CR.txt index 209ac6c86245..6164236e1d3f 100644 --- a/intl/icu/source/data/unit/es_CR.txt +++ b/intl/icu/source/data/unit/es_CR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_CU.txt b/intl/icu/source/data/unit/es_CU.txt index a316a0d43e0b..1a3a70a76b8d 100644 --- a/intl/icu/source/data/unit/es_CU.txt +++ b/intl/icu/source/data/unit/es_CU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CU{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_DO.txt b/intl/icu/source/data/unit/es_DO.txt index c6fb2a283beb..34bb68821aba 100644 --- a/intl/icu/source/data/unit/es_DO.txt +++ b/intl/icu/source/data/unit/es_DO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_DO{ %%Parent{"es_419"} - Version{"37"} units{ electric{ ampere{ @@ -44,5 +44,15 @@ es_DO{ other{"{0} seg."} } } + electric{ + volt{ + dnam{"voltios"} + } + } + power{ + watt{ + dnam{"vatios"} + } + } } } diff --git a/intl/icu/source/data/unit/es_EC.txt b/intl/icu/source/data/unit/es_EC.txt index e9e98083a198..eafd1a4cdb61 100644 --- a/intl/icu/source/data/unit/es_EC.txt +++ b/intl/icu/source/data/unit/es_EC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_EC{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_GT.txt b/intl/icu/source/data/unit/es_GT.txt index 78a3245ce9bf..d51db8b05432 100644 --- a/intl/icu/source/data/unit/es_GT.txt +++ b/intl/icu/source/data/unit/es_GT.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GT{ %%Parent{"es_419"} - Version{"37"} units{ duration{ day{ @@ -63,11 +63,21 @@ es_GT{ } } unitsShort{ + electric{ + volt{ + dnam{"voltios"} + } + } length{ foot{ dnam{"pie"} } } + power{ + watt{ + dnam{"vatios"} + } + } volume{ acre-foot{ dnam{"acre pie"} diff --git a/intl/icu/source/data/unit/es_HN.txt b/intl/icu/source/data/unit/es_HN.txt index cd727c1cb014..4446521396e7 100644 --- a/intl/icu/source/data/unit/es_HN.txt +++ b/intl/icu/source/data/unit/es_HN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_HN{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_MX.txt b/intl/icu/source/data/unit/es_MX.txt index 09dfead02026..f1daeacad1df 100644 --- a/intl/icu/source/data/unit/es_MX.txt +++ b/intl/icu/source/data/unit/es_MX.txt @@ -1,21 +1,20 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_MX{ %%Parent{"es_419"} - Version{"37"} units{ concentr{ milligram-per-deciliter{ - one{"{0} mg/dL"} - other{"{0} mg/dL"} - } - millimole-per-liter{ - dnam{"mmol/L"} - } - permillion{ - dnam{"ppm"} + dnam{"miligramos por decilitro"} } } + coordinate{ + east{"{0} este"} + north{"{0} norte"} + south{"{0} sur"} + west{"{0} oeste"} + } electric{ ohm{ dnam{"ohmios"} @@ -31,11 +30,6 @@ es_MX{ } } length{ - micrometer{ - dnam{"micrometros"} - one{"{0} micrometro"} - other{"{0} micrometros"} - } mile-scandinavian{ dnam{"millas escandinavas"} } @@ -68,11 +62,6 @@ es_MX{ other{"{0} kelvines"} } } - torque{ - newton-meter{ - dnam{"newton metros"} - } - } volume{ acre-foot{ one{"{0} acre-pie"} @@ -122,9 +111,6 @@ es_MX{ } } angle{ - arc-second{ - dnam{"arcseg"} - } degree{ dnam{"º"} } @@ -172,9 +158,11 @@ es_MX{ per{"{0}/a"} } } - electric{ - volt{ - dnam{"V"} + graphics{ + dot{ + dnam{"pto"} + one{"{0} pto"} + other{"{0} ptos"} } } length{ diff --git a/intl/icu/source/data/unit/es_NI.txt b/intl/icu/source/data/unit/es_NI.txt index e711c11e2cbb..a58e4ec5bd74 100644 --- a/intl/icu/source/data/unit/es_NI.txt +++ b/intl/icu/source/data/unit/es_NI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_NI{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_PA.txt b/intl/icu/source/data/unit/es_PA.txt index aa4811456c40..248e10036819 100644 --- a/intl/icu/source/data/unit/es_PA.txt +++ b/intl/icu/source/data/unit/es_PA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PA{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_PE.txt b/intl/icu/source/data/unit/es_PE.txt index a0f01df21e4f..80ab18edd869 100644 --- a/intl/icu/source/data/unit/es_PE.txt +++ b/intl/icu/source/data/unit/es_PE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PE{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_PR.txt b/intl/icu/source/data/unit/es_PR.txt index 10a09c6df092..18906c15dbeb 100644 --- a/intl/icu/source/data/unit/es_PR.txt +++ b/intl/icu/source/data/unit/es_PR.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PR{ %%Parent{"es_419"} - Version{"37"} unitsNarrow{ temperature{ fahrenheit{ diff --git a/intl/icu/source/data/unit/es_PY.txt b/intl/icu/source/data/unit/es_PY.txt index d45a290dcdf7..581dc8508b6c 100644 --- a/intl/icu/source/data/unit/es_PY.txt +++ b/intl/icu/source/data/unit/es_PY.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PY{ %%Parent{"es_419"} - Version{"37"} units{ duration{ year{ @@ -66,5 +66,15 @@ es_PY{ per{"{0}/año"} } } + electric{ + volt{ + dnam{"voltios"} + } + } + power{ + watt{ + dnam{"vatios"} + } + } } } diff --git a/intl/icu/source/data/unit/es_SV.txt b/intl/icu/source/data/unit/es_SV.txt index 426c56d5b5f9..b4ed59588d5a 100644 --- a/intl/icu/source/data/unit/es_SV.txt +++ b/intl/icu/source/data/unit/es_SV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_SV{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_US.txt b/intl/icu/source/data/unit/es_US.txt index d3875326c752..7f347865e550 100644 --- a/intl/icu/source/data/unit/es_US.txt +++ b/intl/icu/source/data/unit/es_US.txt @@ -1,41 +1,31 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_US{ %%Parent{"es_419"} - Version{"37"} units{ - angle{ - arc-minute{ - dnam{"arcominutos"} - one{"{0} minuto"} - other{"{0} minutos"} - } - arc-second{ - dnam{"arcosegundos"} - one{"{0} segundo"} - other{"{0} segundos"} - } - } concentr{ milligram-per-deciliter{ - one{"{0} mg/dL"} - other{"{0} mg/dL"} - } - millimole-per-liter{ - dnam{"mmol/L"} - } - permillion{ - dnam{"ppm"} + dnam{"miligramos por decilitro"} } } - consumption{ - mile-per-gallon-imperial{ - dnam{"mpg Imp."} - one{"{0} mpg Imp."} - other{"{0} mpg Imp."} - } + coordinate{ + east{"{0} este"} + north{"{0} norte"} + south{"{0} sur"} + west{"{0} oeste"} } electric{ + ampere{ + dnam{"amperios"} + one{"{0} amperio"} + other{"{0} amperios"} + } + milliampere{ + dnam{"miliamperio"} + one{"{0} miliamperio"} + other{"{0} miliamperios"} + } ohm{ dnam{"ohmios"} one{"{0} ohmio"} @@ -43,68 +33,115 @@ es_US{ } } energy{ + foodcalorie{ + dnam{"Calorías"} + one{"{0} Caloría"} + other{"{0} Calorías"} + } + joule{ + dnam{"julios"} + one{"{0} julio"} + other{"{0} julios"} + } + kilojoule{ + dnam{"kilojulios"} + one{"{0} kilojulio"} + other{"{0} kilojulio"} + } kilowatt-hour{ - dnam{"kilovatios hora"} - one{"{0} kilovatio hora"} - other{"{0} kilovatios hora"} + dnam{"kilovatios por hora"} + one{"{0} kilovatio por hora"} + other{"{0} kilovatios por hora"} + } + } + graphics{ + em{ + dnam{"espacio eme"} + } + megapixel{ + dnam{"megapixeles"} + one{"{0} megapixel"} + other{"{0} megapixeles"} + } + pixel{ + dnam{"pixeles"} + one{"{0} pixel"} + other{"{0} pixeles"} + } + pixel-per-centimeter{ + dnam{"pixeles por centímetro"} + one{"{0} pixel por centímetro"} + other{"{0} pixeles por centímetro"} + } + pixel-per-inch{ + dnam{"pixeles por pulgada"} + one{"{0} pixel por pulgada"} + other{"{0} pixeles por pulgada"} } } length{ - mile-scandinavian{ - dnam{"millas escandinavas"} + furlong{ + dnam{"furlones"} + one{"{0} furlong"} + other{"{0} frulones"} } nautical-mile{ dnam{"millas naúticas"} one{"{0} milla naútica"} other{"{0} millas naúticas"} } - point{ - dnam{"pt"} - one{"{0} pt"} - other{"{0} pt"} - } - } - light{ - lux{ - dnam{"lux"} - } } power{ horsepower{ - one{"{0} caballo de vapor"} - other{"{0} caballos de vapor"} + one{"{0} caballo de fuerza"} + other{"{0} caballos de fuerza"} } } temperature{ + generic{ + one{"{0} grado"} + other{"{0} grados"} + } kelvin{ dnam{"kelvin"} one{"kelvin"} other{"{0} kelvin"} } } + torque{ + pound-force-foot{ + dnam{"libra fuerza-pies"} + one{"{0} libra fuerza-pie"} + other{"{0} libra fuerza-pies"} + } + } volume{ acre-foot{ dnam{"acres-pies"} one{"{0} acre-pie"} - other{"{0} acre-pies"} + other{"{0} acres pies"} } - fluid-ounce{ - dnam{"onzas líquidas"} - one{"{0} onza líquida"} - other{"{0} onzas líquidas"} + dram{ + dnam{"dracma fluida"} + one{"{0} dracma fluida"} + other{"{0} dreacmas fluidas"} } - gallon-imperial{ - dnam{"Imp. gal"} - one{"{0} gal Imp."} - other{"{0} gal Imp."} - per{"{0}/gal Imp."} + fluid-ounce-imperial{ + dnam{"onzas fluidas imperiales"} + one{"onza fluida imperial"} + other{"{0} onzas fluidas imperiales"} + } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jiggers"} } } } unitsNarrow{ duration{ day{ - dnam{"días"} + dnam{"día"} one{"{0}d"} other{"{0}d"} } @@ -113,11 +150,6 @@ es_US{ one{"{0}m"} other{"{0}m"} } - week{ - dnam{"sem"} - one{"{0}sem"} - other{"{0}sem"} - } year{ dnam{"a"} one{"{0}a"} @@ -132,27 +164,6 @@ es_US{ } } unitsShort{ - acceleration{ - g-force{ - dnam{"Fg"} - one{"{0} Fg"} - other{"{0} Fg"} - } - } - angle{ - arc-minute{ - one{"{0} min"} - other{"{0} min"} - } - arc-second{ - dnam{"arcseg"} - one{"{0} s"} - other{"{0} s"} - } - degree{ - dnam{"grad."} - } - } concentr{ percent{ dnam{"%"} @@ -161,13 +172,6 @@ es_US{ dnam{"‰"} } } - consumption{ - mile-per-gallon-imperial{ - dnam{"mpg Imp."} - one{"{0} mpg Imp."} - other{"{0} mpg Imp."} - } - } digital{ bit{ dnam{"bit"} @@ -183,74 +187,116 @@ es_US{ other{"{0} días"} per{"{0}/d"} } + minute{ + dnam{"mins"} + } month{ one{"{0} m"} - other{"{0} m"} - } - week{ - one{"{0} sem"} - other{"{0} sem"} + other{"{0} mm."} } year{ - dnam{"a"} one{"{0} a"} - other{"{0} a"} + other{"{0} aa."} per{"{0}/a"} } } + energy{ + foodcalorie{ + dnam{"Cal"} + one{"{0} Cal"} + other{"{0} Cal"} + } + therm-us{ + dnam{"th US"} + one{"{0} th US"} + other{"{0} th US"} + } + } + graphics{ + dot{ + dnam{"pts"} + one{"{0} pts"} + other{"{0} p"} + } + } length{ - astronomical-unit{ - dnam{"au"} - one{"{0} au"} - other{"{0} au"} + fathom{ + dnam{"brz."} + one{"{0} brz."} + other{"{0} brz."} + } + furlong{ + dnam{"furlones"} + one{"{0} fur."} + other{"{0} fur."} } light-year{ one{"{0} a. l."} other{"{0} a. l."} } nautical-mile{ - dnam{"M"} - one{"{0} M"} - other{"{0} M"} - } - point{ - dnam{"pt"} - one{"{0} pt"} - other{"{0} pt"} + dnam{"mn"} + one{"{0} mn"} + other{"{0} mn"} } yard{ dnam{"yd"} } } - mass{ - carat{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} - } - ounce-troy{ - dnam{"oz t"} - one{"{0} oz t"} - other{"{0} oz t"} + speed{ + knot{ + dnam{"nudo"} + one{"{0} nudo"} + other{"{0} nudos"} } } - power{ - horsepower{ - dnam{"CV"} - one{"{0} CV"} - other{"{0} CV"} + torque{ + pound-force-foot{ + dnam{"lbf⋅ft"} + one{"{0} lbf⋅ft"} + other{"{0} lbf⋅ft"} } } volume{ + bushel{ + dnam{"bsh"} + one{"{0} bsh"} + other{"{0} bsh"} + } cup{ dnam{"tza."} one{"{0} tza."} other{"{0} tzas."} } - gallon-imperial{ - dnam{"Imp. gal"} - one{"{0} gal Imp."} - other{"{0} gal Imp."} + cup-metric{ + dnam{"Tm"} + one{"{0} Tm"} + other{"{0} Tm"} + } + dessert-spoon{ + dnam{"cdapostre"} + one{"{0} cdapostre"} + other{"{0} cdapostre"} + } + dessert-spoon-imperial{ + dnam{"cdapostre imp."} + one{"{0} cdapostre imp."} + other{"{0} cdaspostre imp."} + } + dram{ + dnam{"fl dracma"} + one{"{0} fl dracma"} + other{"{0} fl dracmas"} + } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jiggers"} + } + pint-metric{ + dnam{"ptm"} + one{"{0} ptm"} + other{"{0} ptm"} } } } diff --git a/intl/icu/source/data/unit/es_UY.txt b/intl/icu/source/data/unit/es_UY.txt index 41fc7c05d55e..143b9b3fbe7a 100644 --- a/intl/icu/source/data/unit/es_UY.txt +++ b/intl/icu/source/data/unit/es_UY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_UY{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/es_VE.txt b/intl/icu/source/data/unit/es_VE.txt index 445e952f80a3..7f8b65ed4dfa 100644 --- a/intl/icu/source/data/unit/es_VE.txt +++ b/intl/icu/source/data/unit/es_VE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_VE{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/et.txt b/intl/icu/source/data/unit/et.txt index 16bd5da350ab..0c3addb24d37 100644 --- a/intl/icu/source/data/unit/et.txt +++ b/intl/icu/source/data/unit/et.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -409,6 +409,11 @@ et{ } } graphics{ + dot{ + dnam{"punkt"} + one{"{0} punkt"} + other{"{0} punkti"} + } dot-per-centimeter{ dnam{"punkte sentimeetri kohta"} one{"{0} punkt sentimeetri kohta"} @@ -462,6 +467,11 @@ et{ one{"{0} detsimeeter"} other{"{0} detsimeetrit"} } + earth-radius{ + dnam{"Maa raadius"} + one{"{0} Maa raadius"} + other{"{0} Maa raadiust"} + } fathom{ dnam{"süllad"} one{"{0} süld"} @@ -542,9 +552,9 @@ et{ other{"{0} pikomeetrit"} } point{ - dnam{"punktid"} - one{"{0} punkt"} - other{"{0} punkti"} + dnam{"tüpograafilised punktid"} + one{"{0} tüpograafiline punkt"} + other{"{0} tüpograafilist punkti"} } solar-radius{ dnam{"Päikese raadiused"} @@ -558,6 +568,16 @@ et{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandelat"} + } + lumen{ + dnam{"luumen"} + one{"{0} luumen"} + other{"{0} luumenit"} + } lux{ dnam{"luks"} one{"{0} luks"} @@ -583,6 +603,11 @@ et{ one{"{0} Maa massi"} other{"{0} Maa massi"} } + grain{ + dnam{"graan"} + one{"{0} graan"} + other{"{0} graani"} + } gram{ dnam{"grammid"} one{"{0} gramm"} @@ -856,6 +881,26 @@ et{ one{"{0} detsiliiter"} other{"{0} detsiliitrit"} } + dessert-spoon{ + dnam{"dessertlusikas"} + one{"{0} dessertlusikas"} + other{"{0} dessertlusikat"} + } + dessert-spoon-imperial{ + dnam{"inglise dessertlusikas"} + one{"{0} inglise dessertlusikas"} + other{"{0} inglise dessertlusikat"} + } + dram{ + dnam{"drahm"} + one{"{0} drahm"} + other{"{0} drahmi"} + } + drop{ + dnam{"tilk"} + one{"{0} tilk"} + other{"{0} tilka"} + } fluid-ounce{ dnam{"vedelikuuntsid"} one{"{0} vedelikuunts"} @@ -883,6 +928,11 @@ et{ one{"{0} hektoliiter"} other{"{0} hektoliitrit"} } + jigger{ + dnam{"pits"} + one{"{0} pits"} + other{"{0} pitsi"} + } liter{ dnam{"liitrid"} one{"{0} liiter"} @@ -899,6 +949,11 @@ et{ one{"{0} milliliiter"} other{"{0} milliliitrit"} } + pinch{ + dnam{"näputäis"} + one{"{0} näputäis"} + other{"{0} näputäit"} + } pint{ dnam{"pindid"} one{"{0} pint"} @@ -914,6 +969,11 @@ et{ one{"{0} kvart"} other{"{0} kvarti"} } + quart-imperial{ + dnam{"inglise kvart"} + one{"{0} inglise kvart"} + other{"{0} inglise kvarti"} + } tablespoon{ dnam{"supilusikad"} one{"{0} supilusikas"} @@ -1614,6 +1674,11 @@ et{ } } graphics{ + dot{ + dnam{"p"} + one{"{0} p"} + other{"{0} p"} + } dot-per-centimeter{ one{"{0} dpcm"} other{"{0} dpcm"} @@ -1785,6 +1850,11 @@ et{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"graan"} + one{"{0} graan"} + other{"{0} graani"} + } gram{ dnam{"grammid"} one{"{0} g"} @@ -2049,6 +2119,21 @@ et{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon-imperial{ + dnam{"ingl dl"} + one{"{0} ingl dl"} + other{"{0} ingl dl"} + } + dram{ + dnam{"drahm vedelikku"} + one{"{0} drahm vedelikku"} + other{"{0} drahmi vedelikku"} + } + drop{ + dnam{"tilk"} + one{"{0} tilk"} + other{"{0} tilka"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2076,6 +2161,11 @@ et{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"pits"} + one{"{0} pits"} + other{"{0} pitsi"} + } liter{ dnam{"liitrid"} one{"{0} l"} @@ -2092,6 +2182,11 @@ et{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"näputäis"} + one{"{0} näputäis"} + other{"{0} näputäit"} + } pint{ dnam{"pindid"} one{"{0} pt"} @@ -2107,6 +2202,11 @@ et{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"ingl kvart"} + one{"{0} ingl kvart"} + other{"{0} ingl kvarti"} + } tablespoon{ dnam{"spl"} one{"{0} spl"} diff --git a/intl/icu/source/data/unit/eu.txt b/intl/icu/source/data/unit/eu.txt index 83f5c3024bb1..42fb70d7fdb4 100644 --- a/intl/icu/source/data/unit/eu.txt +++ b/intl/icu/source/data/unit/eu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eu{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -388,6 +388,11 @@ eu{ } } graphics{ + dot{ + dnam{"puntua"} + one{"{0} puntu"} + other{"{0} puntu"} + } dot-per-centimeter{ dnam{"puntu zentimetroko"} one{"{0} puntu zentimetroko"} @@ -441,12 +446,27 @@ eu{ one{"{0} dezimetro"} other{"{0} dezimetro"} } + earth-radius{ + dnam{"Lurraren erradio"} + one{"{0} Lurraren erradio"} + other{"{0} Lurraren erradio"} + } + fathom{ + dnam{"besoa"} + one{"{0} beso"} + other{"{0} beso"} + } foot{ dnam{"oin"} one{"{0} oin"} other{"{0} oin"} per{"{0} oin bakoitzeko"} } + furlong{ + dnam{"fulong"} + one{"{0} furlong"} + other{"{0} furlong"} + } inch{ dnam{"hazbete"} one{"{0} hazbete"} @@ -512,8 +532,8 @@ eu{ } point{ dnam{"puntu"} - one{"{0} puntu"} - other{"{0} puntu"} + one{"{0} puntu tipografiko"} + other{"{0} puntu tipografiko"} } solar-radius{ one{"{0} eguzki-erradio"} @@ -526,6 +546,16 @@ eu{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumena"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -545,12 +575,17 @@ eu{ } dalton{ one{"{0} dalton"} - other{"{0} daltons"} + other{"{0} dalton"} } earth-mass{ one{"{0} lur-masa"} other{"{0} lur-masa"} } + grain{ + dnam{"alea"} + one{"{0} ale"} + other{"{0} ale"} + } gram{ dnam{"gramoak"} one{"{0} gramo"} @@ -599,6 +634,11 @@ eu{ one{"{0} eguzki-masa"} other{"{0} eguzki-masa"} } + stone{ + dnam{"stone-a"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ dnam{"AEBko tonak"} one{"{0} AEBko tona"} @@ -695,7 +735,7 @@ eu{ other{"{0} kilometro orduko"} } knot{ - dnam{"knot"} + dnam{"korapilo"} one{"{0} korapilo"} other{"{0} korapilo"} } @@ -754,6 +794,11 @@ eu{ one{"{0} upel"} other{"{0} upel"} } + bushel{ + dnam{"bushelak"} + one{"{0} bushel"} + other{"{0} bushel"} + } centiliter{ dnam{"zentilitro"} one{"{0} zentilitro"} @@ -811,6 +856,26 @@ eu{ one{"{0} dezilitro"} other{"{0} dezilitro"} } + dessert-spoon{ + dnam{"postre-koilarakada"} + one{"{0} postre-koilarakada"} + other{"{0} postre-koilarakada"} + } + dessert-spoon-imperial{ + dnam{"Postre-koilarakada inperiala"} + one{"{0} postre-koilarakada inperial"} + other{"{0} postre-koilarakada inperial"} + } + dram{ + dnam{"dram fluidoa"} + one{"{0} dram fluido"} + other{"{0} dram fluido"} + } + drop{ + dnam{"tanta"} + one{"{0} tanta"} + other{"{0} tanta"} + } fluid-ounce{ dnam{"ontza likido"} one{"{0} likido-ontza"} @@ -837,6 +902,11 @@ eu{ one{"{0} hektolitro"} other{"{0} hektolitro"} } + jigger{ + dnam{"txupitoa"} + one{"{0} txupito"} + other{"{0} txupito"} + } liter{ dnam{"litro"} one{"{0} litro"} @@ -853,6 +923,11 @@ eu{ one{"{0} mililitro"} other{"{0} mililitro"} } + pinch{ + dnam{"pinch-a"} + one{"{0} pinch"} + other{"{0} pinch"} + } pint{ dnam{"pinta"} one{"{0} pinta"} @@ -868,6 +943,11 @@ eu{ one{"{0} galoi-laurden"} other{"{0} galoi-laurden"} } + quart-imperial{ + dnam{"laurden inperiala"} + one{"{0} laurden inperial"} + other{"{0} laurden inperial"} + } tablespoon{ dnam{"koilarakada"} one{"{0} koilarakada"} @@ -1507,6 +1587,9 @@ eu{ } } graphics{ + dot{ + dnam{"puntua"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1546,8 +1629,8 @@ eu{ length{ astronomical-unit{ dnam{"ua"} - one{"{0} au"} - other{"{0} au"} + one{"{0} ua"} + other{"{0} ua"} } centimeter{ dnam{"cm"} @@ -1560,12 +1643,22 @@ eu{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"fm"} + one{"{0} fm"} + other{"{0} fm"} + } foot{ dnam{"oin"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"furlong"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"hazbete"} one{"{0} in"} @@ -1631,8 +1724,8 @@ eu{ } point{ dnam{"puntu"} - one{"{0} puntu"} - other{"{0} puntu"} + one{"{0} pt"} + other{"{0} pt"} } solar-radius{ dnam{"eguzki-erradio"} @@ -1644,6 +1737,16 @@ eu{ } } light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -1667,6 +1770,11 @@ eu{ one{"{0} lur-masa"} other{"{0} lur-masa"} } + grain{ + dnam{"alea"} + one{"{0} ale"} + other{"{0} ale"} + } gram{ dnam{"g"} one{"{0} g"} @@ -1716,6 +1824,10 @@ eu{ one{"{0} eguzki-masa"} other{"{0} eguzki-masa"} } + stone{ + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"AEBko tona"} one{"{0} AEBko tona"} @@ -1873,6 +1985,11 @@ eu{ one{"{0} upel"} other{"{0} upel"} } + bushel{ + dnam{"bushelak"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1930,6 +2047,26 @@ eu{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"postre-koilar."} + one{"{0} postre-koilar."} + other{"{0} postre-koilar."} + } + dessert-spoon-imperial{ + dnam{"postre-koilar. inp."} + one{"{0} postre-koilar. inp."} + other{"{0} postre-koilar. inp."} + } + dram{ + dnam{"dram fluidoa"} + one{"{0} dram fl"} + other{"{0} dram fl"} + } + drop{ + dnam{"tanta"} + one{"{0} tanta"} + other{"{0} tanta"} + } fluid-ounce{ dnam{"likido-ontza"} one{"{0} likido-ontza"} @@ -1957,6 +2094,11 @@ eu{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"txupitoa"} + one{"{0} txupito"} + other{"{0} txupito"} + } liter{ dnam{"l"} one{"{0} l"} @@ -1973,6 +2115,11 @@ eu{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"pinch-a"} + one{"{0} pinch"} + other{"{0} pinch"} + } pint{ dnam{"pinta"} one{"{0} pinta"} @@ -1988,6 +2135,11 @@ eu{ one{"{0} galoi-laurden"} other{"{0} galoi-laurden"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"koilarakada"} one{"{0} koilarakada"} diff --git a/intl/icu/source/data/unit/ewo.txt b/intl/icu/source/data/unit/ewo.txt index 9fd55df66cb8..c522c9411d8c 100644 --- a/intl/icu/source/data/unit/ewo.txt +++ b/intl/icu/source/data/unit/ewo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ewo{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/fa.txt b/intl/icu/source/data/unit/fa.txt index 7a58e5022d56..4d166da16ae3 100644 --- a/intl/icu/source/data/unit/fa.txt +++ b/intl/icu/source/data/unit/fa.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -10,9 +10,9 @@ fa{ units{ acceleration{ g-force{ - dnam{"نیروی جاذبه"} - one{"{0} نیروی جاذبه"} - other{"{0} جاذبه"} + dnam{"گرانش"} + one{"{0} جی"} + other{"{0} جی"} } meter-per-square-second{ dnam{"متر بر مجذور ثانیه"} @@ -406,6 +406,11 @@ fa{ } } graphics{ + dot{ + dnam{"نقطه"} + one{"{0}نقطه"} + other{"{0}نقطه"} + } dot-per-centimeter{ dnam{"نقطه در سانتی‌متر"} one{"{0} نقطه در سانتی‌متر"} @@ -454,12 +459,27 @@ fa{ one{"{0} دسی‌متر"} other{"{0} دسی‌متر"} } + earth-radius{ + dnam{"شعاع زمین"} + one{"{0} شعاع زمین"} + other{"{0} شعاع زمین"} + } + fathom{ + dnam{"فاتوم"} + one{"{0} فاتوم"} + other{"{0} فاتوم"} + } foot{ dnam{"فوت"} one{"{0} فوت"} other{"{0} فوت"} per{"{0}/فوت"} } + furlong{ + dnam{"فرلانگ"} + one{"{0} فرلانگ"} + other{"{0} فرلانگ"} + } inch{ dnam{"اینچ"} one{"{0} اینچ"} @@ -524,9 +544,9 @@ fa{ other{"{0} پیکومتر"} } point{ - dnam{"پونت"} - one{"{0} پونت"} - other{"{0} پونت"} + dnam{"پوینت"} + one{"{0} پوینت"} + other{"{0} پوینت"} } solar-radius{ dnam{"شعاع خورشید"} @@ -540,6 +560,16 @@ fa{ } } light{ + candela{ + dnam{"شمع"} + one{"{0} شمع"} + other{"{0} شمع"} + } + lumen{ + dnam{"لومن"} + one{"{0} لومن"} + other{"{0} لومن"} + } lux{ dnam{"لوکس"} one{"{0} لوکس"} @@ -567,6 +597,11 @@ fa{ one{"{0} جرم زمین"} other{"{0} جرم زمین"} } + grain{ + dnam{"دانه"} + one{"{0} دانه"} + other{"{0} دانه"} + } gram{ dnam{"گرم"} one{"{0} گرم"} @@ -616,6 +651,11 @@ fa{ one{"{0} جرم خورشید"} other{"{0} جرم خورشید"} } + stone{ + dnam{"سنگ"} + one{"{0} سنگ"} + other{"{0} سنگ"} + } ton{ dnam{"تن"} one{"{0} تن"} @@ -772,6 +812,11 @@ fa{ one{"{0} بشکه"} other{"{0} بشکه"} } + bushel{ + dnam{"بوشل"} + one{"{0} بوشل"} + other{"{0} بوشل"} + } centiliter{ dnam{"سانتی‌لیتر"} one{"{0} سانتی‌لیتر"} @@ -829,6 +874,26 @@ fa{ one{"{0} دسی‌لیتر"} other{"{0} دسی‌لیتر"} } + dessert-spoon{ + dnam{"قاشق دسرخوری"} + one{"{0} قاشق دسرخوری"} + other{"{0} قاشق دسرخوری"} + } + dessert-spoon-imperial{ + dnam{"قاشق دسرخوری امپراتوری"} + one{"{0} قاشق دسرخوری امپراتوری"} + other{"{0} قاشق دسرخوری امپراتوری"} + } + dram{ + dnam{"درم"} + one{"{0} درم"} + other{"{0} درم"} + } + drop{ + dnam{"قطره"} + one{"{0} قطره"} + other{"{0} قطره"} + } fluid-ounce{ dnam{"اونس سیال"} one{"{0} اونس سیال"} @@ -856,6 +921,11 @@ fa{ one{"{0} هکتولیتر"} other{"{0} هکتولیتر"} } + jigger{ + dnam{"گیلاس"} + one{"{0} گیلاس"} + other{"{0} گیلاس"} + } liter{ dnam{"لیتر"} one{"{0} لیتر"} @@ -872,6 +942,11 @@ fa{ one{"{0} میلی‌لیتر"} other{"{0} میلی‌لیتر"} } + pinch{ + dnam{"یک سر انگشت"} + one{"{0} یک سر انگشت"} + other{"{0} یک سر انگشت"} + } pint{ dnam{"پاینت"} one{"{0} پاینت"} @@ -887,6 +962,11 @@ fa{ one{"{0} کوارت"} other{"{0} کوارت"} } + quart-imperial{ + dnam{"کوارت امپراتوری"} + one{"{0} کوارت امپراتوری"} + other{"{0} کوارت امپراتوری"} + } tablespoon{ dnam{"قاشق غذاخوری"} one{"{0} قاشق غذاخوری"} @@ -1005,8 +1085,8 @@ fa{ } hour{ dnam{"ساعت"} - one{"{0} ساعت"} - other{"{0} ساعت"} + one{"{0}h"} + other{"{0}h"} per{"{0}/ساعت"} } microsecond{ @@ -1021,8 +1101,8 @@ fa{ } minute{ dnam{"دقیقه"} - one{"{0} دقیقه"} - other{"{0} دقیقه"} + one{"{0}m"} + other{"{0}m"} per{"{0}/دقیقه"} } month{ @@ -1038,8 +1118,8 @@ fa{ } second{ dnam{"ثانیه"} - one{"{0} ث"} - other{"{0} ث"} + one{"{0}s"} + other{"{0}s"} per{"{0}/ث"} } week{ @@ -1077,9 +1157,9 @@ fa{ dnam{"واحد نجومی"} } centimeter{ - dnam{"سانت"} - one{"{0} سانت"} - other{"{0} سانت"} + dnam{"cm"} + one{"{0}cm"} + other{"{0}cm"} per{"{0}/سانت"} } decimeter{ @@ -1099,7 +1179,7 @@ fa{ per{"{0}/اینچ"} } kilometer{ - dnam{"کیلومتر"} + dnam{"km"} one{"{0}km"} other{"{0}km"} } @@ -1124,9 +1204,9 @@ fa{ other{"{0}mi"} } millimeter{ - dnam{"م‌م"} - one{"{0} م‌م"} - other{"{0} م‌م"} + dnam{"mm"} + one{"{0}mm"} + other{"{0}mm"} } nanometer{ dnam{"نانومتر"} @@ -1157,7 +1237,7 @@ fa{ per{"{0} در گرم"} } kilogram{ - dnam{"کیلوگرم"} + dnam{"kg"} one{"{0}kg"} other{"{0}kg"} } @@ -1288,17 +1368,17 @@ fa{ } liter{ dnam{"لیتر"} - one{"{0} لیتر"} - other{"{0} لیتر"} + one{"{0}L"} + other{"{0}L"} } } } unitsShort{ acceleration{ g-force{ - dnam{"نیروی جاذبه"} - one{"{0} جاذبه"} - other{"{0} جاذبه"} + dnam{"گرانش"} + one{"{0} G"} + other{"{0} G"} } meter-per-square-second{ dnam{"متر/مجذور ثانیه"} @@ -1346,14 +1426,13 @@ fa{ } hectare{ dnam{"هکتار"} - one{"{0} هکتار"} - other{"{0} هکتار"} + one{"{0} هک"} + other{"{0} ha"} } square-centimeter{ - dnam{"سانتی‌متر مربع"} one{"{0}‎ cm²"} other{"{0}‎ cm²"} - per{"{0} در سانتی‌متر مربع"} + per{"{0}/cm²"} } square-foot{ dnam{"فوت مربع"} @@ -1362,9 +1441,9 @@ fa{ } square-inch{ dnam{"اینچ مربع"} - one{"{0} اینچ مربع"} - other{"{0} اینچ مربع"} - per{"{0} در اینچ مربع"} + one{"{0}/in²"} + other{"{0}/in²"} + per{"{0}/in²"} } square-kilometer{ dnam{"کیلومتر مربع"} @@ -1374,20 +1453,20 @@ fa{ } square-meter{ dnam{"متر مربع"} - one{"{0} مترمربع"} - other{"{0} مترمربع"} - per{"{0} در متر مربع"} + one{"{0} m²"} + other{"{0} m²"} + per{"{0}/m²"} } square-mile{ dnam{"مایل مربع"} one{"{0} مایل مربع"} other{"{0} مایل مربع"} - per{"{0}/mi²"} + per{"{0}/mi²"} } square-yard{ dnam{"یارد مربع"} - one{"{0} یارد مربع"} - other{"{0} یارد مربع"} + one{"{0} yd²"} + other{"{0} yd²"} } } compound{ @@ -1478,48 +1557,48 @@ fa{ } gigabit{ dnam{"گیگابیت"} - one{"{0} گیگابیت"} - other{"{0} گیگابیت"} + one{"{0} Gb"} + other{"{0} Gb"} } gigabyte{ dnam{"گیگابایت"} - one{"{0} گیگابایت"} - other{"{0} گیگابایت"} + one{"{0} GB"} + other{"{0} GB"} } kilobit{ dnam{"کیلوبیت"} - one{"{0} کیلوبیت"} - other{"{0} کیلوبیت"} + one{"{0} kb"} + other{"{0} kb"} } kilobyte{ dnam{"کیلوبایت"} - one{"{0} کیلوبایت"} - other{"{0} کیلوبایت"} + one{"{0} kB"} + other{"{0} kB"} } megabit{ dnam{"مگابیت"} - one{"{0} مگابیت"} - other{"{0} مگابیت"} + one{"{0} Mb"} + other{"{0} Mb"} } megabyte{ dnam{"مگابایت"} - one{"{0} مگابایت"} - other{"{0} مگابایت"} + one{"{0} MB"} + other{"{0} MB"} } petabyte{ dnam{"پتابایت"} - one{"{0} پتابایت"} - other{"{0} پتابایت"} + one{"{0} PB"} + other{"{0} PB"} } terabit{ dnam{"ترابیت"} - one{"{0} ترابیت"} - other{"{0} ترابیت"} + one{"{0} Tb"} + other{"{0} Tb"} } terabyte{ dnam{"ترابایت"} - one{"{0} ترابایت"} - other{"{0} ترابایت"} + one{"{0} TB"} + other{"{0} TB"} } } duration{ @@ -1548,7 +1627,7 @@ fa{ microsecond{ dnam{"میکروثانیه"} one{"{0} میکروثانیه"} - other{"{0} میکروثانیه"} + other{"{0} µs"} } millisecond{ dnam{"میلی‌ثانیه"} @@ -1569,8 +1648,8 @@ fa{ } nanosecond{ dnam{"نانوثانیه"} - one{"{0} نانوثانیه"} - other{"{0} نانوثانیه"} + one{"{0} ns"} + other{"{0} ns"} } second{ dnam{"ثانیه"} @@ -1695,110 +1774,151 @@ fa{ } } graphics{ + dot{ + dnam{"نقطه"} + one{"{0} نقطه"} + other{"{0} نقطه"} + } dot-per-centimeter{ dnam{"dpcm"} + one{"{0} dpcm"} + other{"{0} dpcm"} + } + dot-per-inch{ + one{"{0} dpi"} + other{"{0} dpi"} + } + em{ + one{"{0} em"} + other{"{0} em"} + } + megapixel{ + one{"{0} MP"} + other{"{0} MP"} + } + pixel{ + one{"{0} px"} + other{"{0} px"} + } + pixel-per-centimeter{ + one{"{0} ppcm"} + other{"{0} ppcm"} + } + pixel-per-inch{ + one{"{0} ppi"} + other{"{0} ppi"} } } length{ astronomical-unit{ - dnam{"واحد نجومی"} - one{"{0} واحد نجومی"} - other{"{0} واحد نجومی"} + one{"{0} au"} + other{"{0} au"} } centimeter{ - dnam{"سانت"} - one{"{0} سانت"} - other{"{0} سانت"} - per{"{0}/سانت"} + dnam{"cm"} + one{"{0} cm"} + other{"{0} cm"} + per{"{0}/cm"} } decimeter{ - dnam{"دسی‌متر"} - one{"{0} دسی‌متر"} - other{"{0} دسی‌متر"} + one{"{0} dm"} + other{"{0} dm"} + } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"فاتوم"} + one{"{0} fth"} + other{"{0} fth"} } foot{ dnam{"فوت"} - one{"{0} فوت"} - other{"{0} فوت"} - per{"{0}/فوت"} + one{"{0} ft"} + other{"{0} ft"} + per{"{0}/ft"} + } + furlong{ + dnam{"فرلانگ"} + one{"{0} fur"} + other{"{0} fur"} } inch{ dnam{"اینچ"} - one{"{0} اینچ"} - other{"{0} اینچ"} - per{"{0}/اینچ"} + one{"{0} in"} + other{"{0} in"} + per{"{0}/in"} } kilometer{ dnam{"کیلومتر"} - one{"{0} کیلومتر"} - other{"{0} کیلومتر"} - per{"{0} در کیلومتر"} + one{"{0} km"} + other{"{0} km"} + per{"{0}/km"} } light-year{ dnam{"سال نوری"} - one{"{0} سال نوری"} - other{"{0} سال نوری"} + one{"{0} ly"} + other{"{0} ly"} } meter{ dnam{"متر"} - one{"{0} متر"} - other{"{0} متر"} - per{"{0} در متر"} + one{"{0} m"} + other{"{0} m"} + per{"{0}/m"} } micrometer{ dnam{"میکرومتر"} - one{"{0} میکرومتر"} - other{"{0} میکرومتر"} + one{"{0} µm"} + other{"{0} µm"} } mile{ dnam{"مایل"} - one{"{0} مایل"} - other{"{0} مایل"} + one{"{0} mi"} + other{"{0} mi"} } mile-scandinavian{ - dnam{"مایل اسکاندیناوی"} one{"{0}‎ smi"} other{"{0}‎ smi"} } millimeter{ - dnam{"م‌م"} - one{"{0} م‌م"} - other{"{0} م‌م"} + dnam{"mm"} + one{"{0} mm"} + other{"{0} mm"} } nanometer{ - dnam{"نانومتر"} - one{"{0} نانومتر"} - other{"{0} نانومتر"} + one{"{0} nm"} + other{"{0} nm"} } nautical-mile{ - dnam{"مایل دریایی"} - one{"{0} مایل دریایی"} - other{"{0} مایل دریایی"} + one{"{0} nmi"} + other{"{0} nmi"} } parsec{ dnam{"پارسک"} - one{"{0} پارسک"} - other{"{0} پارسک"} + one{"{0} pc"} + other{"{0} pc"} } picometer{ - dnam{"پیکومتر"} - one{"{0} پیکومتر"} - other{"{0} پیکومتر"} + dnam{"pm"} + one{"{0} pm"} + other{"{0} pm"} } point{ - dnam{"پونت"} - one{"{0} امتیاز"} - other{"{0} امتیاز"} + dnam{"پوینت"} + one{"{0} pt"} + other{"{0} pt"} } solar-radius{ dnam{"شعاع خورشید"} - one{"{0} ☉R"} - other{"{0} ☉R"} + one{"{0} R☉"} + other{"{0} R☉"} } yard{ dnam{"یارد"} - one{"{0} یارد"} - other{"{0} یارد"} + one{"{0} yd"} + other{"{0} yd"} } } light{ @@ -1829,6 +1949,11 @@ fa{ one{"{0} M⊕"} other{"{0} ⊕M"} } + grain{ + dnam{"دانه"} + one{"{0} دانه"} + other{"{0} دانه"} + } gram{ dnam{"گرم"} one{"{0} گرم"} @@ -1837,24 +1962,21 @@ fa{ } kilogram{ dnam{"کیلوگرم"} - one{"{0} کیلوگرم"} + one{"{0} kg"} other{"{0} کیلوگرم"} - per{"{0} در کیلوگرم"} + per{"{0}/kg"} } metric-ton{ - dnam{"تن متریک"} - one{"{0} تن متریک"} - other{"{0} تن متریک"} + one{"{0} t"} + other{"{0} t"} } microgram{ - dnam{"میکروگرم"} - one{"{0} میکروگرم"} - other{"{0} میکروگرم"} + one{"{0} µg"} + other{"{0} µg"} } milligram{ - dnam{"میلی‌گرم"} - one{"{0} میلی‌گرم"} - other{"{0} میلی‌گرم"} + one{"{0} mg"} + other{"{0} mg"} } ounce{ dnam{"اونس"} @@ -1878,6 +2000,11 @@ fa{ one{"{0} ☉M"} other{"{0} ☉M"} } + stone{ + dnam{"سنگ"} + one{"{0} سنگ"} + other{"{0} سنگ"} + } ton{ dnam{"تن"} one{"{0} تن"} @@ -1957,6 +2084,10 @@ fa{ one{"{0} م‌م جیوه"} other{"{0} م‌م جیوه"} } + pascal{ + one{"{0} Pa"} + other{"{0} Pa"} + } pound-force-per-square-inch{ dnam{"پوند در اینچ مربع"} one{"{0}‎ psi"} @@ -1976,8 +2107,8 @@ fa{ } meter-per-second{ dnam{"متر در ثانیه"} - one{"{0} متردرثانیه"} - other{"{0} متردرثانیه"} + one{"{0} m/s"} + other{"{0} m/s"} } mile-per-hour{ dnam{"مایل در ساعت"} @@ -2029,26 +2160,29 @@ fa{ one{"{0} بشکه"} other{"{0} بشکه"} } + bushel{ + dnam{"بوشل"} + one{"{0} بوشل"} + other{"{0} بوشل"} + } centiliter{ - dnam{"سانتی‌لیتر"} - one{"{0} سانتی‌لیتر"} - other{"{0} سانتی‌لیتر"} + one{"{0} cL"} + other{"{0} cL"} } cubic-centimeter{ - dnam{"سانتی‌متر مکعب"} one{"{0}‎ cm³"} other{"{0}‎ cm³"} per{"{0}‎ /cm³"} } cubic-foot{ dnam{"فوت مکعب"} - one{"{0} فوت مکعب"} - other{"{0} فوت مکعب"} + one{"{0} ft³"} + other{"{0} ft³"} } cubic-inch{ dnam{"اینچ مکعب"} - one{"{0} اینچ مکعب"} - other{"{0} اینچ مکعب"} + one{"{0} in³"} + other{"{0} in³"} } cubic-kilometer{ dnam{"کیلومتر مکعب"} @@ -2057,19 +2191,18 @@ fa{ } cubic-meter{ dnam{"متر مکعب"} - one{"{0} متر مکعب"} - other{"{0} متر مکعب"} - per{"{0} در متر مکعب"} + one{"{0} m³"} + other{"{0} m³"} + per{"{0}/m³"} } cubic-mile{ - dnam{"مایل مکعب"} - one{"{0} مایل مکعب"} - other{"{0} مایل مکعب"} + one{"{0} mi³"} + other{"{0} mi³"} } cubic-yard{ dnam{"یارد مکعب"} - one{"{0} یارد مکعب"} - other{"{0} یارد مکعب"} + one{"{0} yd³"} + other{"{0} yd³"} } cup{ dnam{"پیمانه"} @@ -2082,9 +2215,28 @@ fa{ other{"{0} پیمانهٔ متریک"} } deciliter{ - dnam{"دسی‌لیتر"} - one{"{0} دسی‌لیتر"} - other{"{0} دسی‌لیتر"} + one{"{0} dL"} + other{"{0} dL"} + } + dessert-spoon{ + dnam{"قاشق دسرخوری"} + one{"{0} ق.دس.خ."} + other{"{0} ق.دس.خ."} + } + dessert-spoon-imperial{ + dnam{"قاشق دسرخوری امپراتوری"} + one{"{0} قاشق امپراتوری"} + other{"{0} قاشق امپراتوری"} + } + dram{ + dnam{"درم سیال"} + one{"{0} درم سیال"} + other{"{0} درم سیال"} + } + drop{ + dnam{"قطره"} + one{"{0} قطره"} + other{"{0} قطره"} } fluid-ounce{ dnam{"اونس سیال"} @@ -2109,26 +2261,35 @@ fa{ per{"{0}/گالن امپریال"} } hectoliter{ - dnam{"هکتولیتر"} - one{"{0} هکتولیتر"} - other{"{0} هکتولیتر"} + one{"{0} hL"} + other{"{0} hL"} + } + jigger{ + dnam{"گیلاس"} + one{"{0} گیلاس"} + other{"{0} گیلاس"} } liter{ dnam{"لیتر"} - one{"{0} لیتر"} - other{"{0} لیتر"} - per{"{0} در لیتر"} + one{"{0} L"} + other{"{0} L"} + per{"{0}/L"} } megaliter{ dnam{"مگالیتر"} - one{"{0} مگالیتر"} - other{"{0} مگالیتر"} + one{"{0} ML"} + other{"{0} ML"} } milliliter{ dnam{"میلی‌لیتر"} one{"{0} میلی‌لیتر"} other{"{0} میلی‌لیتر"} } + pinch{ + dnam{"یک سر انگشت"} + one{"{0} سرانگشت"} + other{"{0} سرانگشت"} + } pint{ dnam{"پاینت"} one{"{0} پاینت"} @@ -2144,9 +2305,14 @@ fa{ one{"{0} کوارت"} other{"{0} کوارت"} } + quart-imperial{ + dnam{"کوارت امپراتوری"} + one{"{0} کوارت امپراتوری"} + other{"{0} کوارت امپراتوری"} + } tablespoon{ dnam{"قاشق غ."} - one{"{0} قاشق غ."} + one{"{0} ق.غ.خ"} other{"{0} قاشق غ."} } teaspoon{ diff --git a/intl/icu/source/data/unit/ff.txt b/intl/icu/source/data/unit/ff.txt index b51bbce2161b..91de86239878 100644 --- a/intl/icu/source/data/unit/ff.txt +++ b/intl/icu/source/data/unit/ff.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ff_Adlm.txt b/intl/icu/source/data/unit/ff_Adlm.txt index 9dafb5a41f73..cb37da07451d 100644 --- a/intl/icu/source/data/unit/ff_Adlm.txt +++ b/intl/icu/source/data/unit/ff_Adlm.txt @@ -1,20 +1,176 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm{ %%Parent{"root"} - Version{"37"} units{ + acceleration{ + g-force{ + dnam{"𞤵𞥅𞤴𞤲𞤣𞤭 𞤻𞤭𞥅𞤧𞤵𞤳𞤭 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + one{"{0} 𞤲𞤣𞤫 𞤵𞥅𞤴𞤲𞤣𞤭 𞤻𞤭𞥅𞤧𞤵𞤳𞤭 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + other{"{0} 𞤲𞤣𞤫 𞤵𞥅𞤴𞤲𞤣𞤭 𞤻𞤭𞥅𞤧𞤵𞤳𞤭 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + } + meter-per-square-second{ + dnam{"𞤥𞤫𞥅𞤼𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫𞤪𞤫 𞤣𞤭𞤲𞤺𞤢𞥄𞤲𞤣𞤫"} + one{"{0} 𞤥𞤫𞥅𞤼𞤮𞤤 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫𞤪𞤫 𞤣𞤭𞤲𞤺𞤢𞥄𞤲𞤣𞤫"} + other{"{0} 𞤥𞤫𞥅𞤼𞤭 𞤲𞤣𞤫𞤪 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤪𞤫 𞤣𞤭𞤲𞤺𞤢𞥄𞤲𞤣𞤫"} + } + } + angle{ + arc-minute{ + dnam{"𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫 𞤤𞤢𞥄𞤻𞤢𞤤"} + one{"{0} 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤪𞤫 𞤤𞤢𞥄𞤻𞤢𞤤"} + other{"{0} 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫 𞤤𞤢𞥄𞤻𞤢𞤤"} + } + arc-second{ + dnam{"𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫 𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + one{"{0} 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫 𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + other{"{0} 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫 𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + } + degree{ + dnam{"𞤶𞤫𞤩𞤫"} + one{"{0} 𞤶𞤫𞤩𞤫𞤪𞤫"} + other{"{0} 𞤶𞤫𞤩𞤫"} + } + radian{ + dnam{"𞤪𞤢𞤣𞤭𞤴𞤢𞤲𞤶𞤭"} + one{"{0} 𞤪𞤢𞤣𞤭𞤴𞤢𞤲𞤪𞤵"} + other{"{0} 𞤪𞤢𞤣𞤭𞤴𞤢𞤲𞤶𞤭"} + } + revolution{ + dnam{"𞤱𞤭𞤣𞥆𞤢𞤲𞤣𞤫"} + one{"{0} 𞤱𞤭𞤣𞥆𞤢𞤲𞤣𞤫"} + other{"{0} 𞤱𞤭𞤣𞥆𞤢𞤲𞤯𞤫"} + } + } area{ + acre{ + dnam{"𞤺𞤢𞤪𞤳𞤭"} + one{"{0} 𞤺𞤢𞤪𞤳𞤵"} + other{"{0} 𞤺𞤢𞤪𞤳𞤭"} + } + dunam{ + dnam{"𞤣𞤵𞥅𞤲𞤢𞤥𞤭"} + one{"{0} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵"} + other{"{0} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭"} + } hectare{ - dnam{"𞤸𞤫𞤳𞤼𞤢𞥄𞤪𞤭"} - one{"{0} 𞤸𞤫𞤳𞤼𞤢𞥄𞤪𞤵"} - other{"{0} 𞤸𞤫𞤳𞤼𞤢𞥄𞤪𞤵𞥅𞤶𞤭"} + dnam{"𞤸𞤫𞤳𞤼𞤢𞤪𞤯𞤫"} + one{"{0} 𞤸𞤫𞤳𞤼𞤢𞤪𞤣𞤫"} + other{"{0} 𞤸𞤫𞤳𞤼𞤢𞤪𞤯𞤫"} + } + square-centimeter{ + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} + } + square-foot{ + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤼𞤫𞤨𞥆𞤭"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤼𞤫𞤨𞥆𞤵"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤼𞤫𞤨𞥆𞤭"} + } + square-inch{ + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤭"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤵"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤵"} } square-kilometer{ - dnam{"𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭 𞤶𞤢𞥄𞤣𞤭𞤲𞤳𞤮𞥅𞤶𞤭"} - one{"{0} 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤮𞤤 𞤶𞤢𞥄𞤣𞤭𞤲𞤳𞤮𞤱𞤮𞤤"} - other{"{0} 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭 𞤶𞤢𞥄𞤣𞤭𞤲𞤳𞤮𞥅𞤶𞤭"} - per{"{0}/𞤫 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤮𞤤 𞤶𞤢𞥄𞤣𞤭𞤲𞤳𞤮𞤱𞤮𞤤"} + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤮𞤤"} + } + square-meter{ + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤫𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤫𞥅𞤼𞤮𞤤"} + } + square-mile{ + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤢𞤴𞤤𞤭"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤢𞤴𞤤𞤵"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤢𞤴𞤤𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤥𞤢𞤴𞤤𞤵"} + } + square-yard{ + dnam{"𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤮𞤺𞤮𞤲𞤫"} + one{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤮𞤺𞤮𞤲𞤢𞤤"} + other{"{0} 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤧𞤮𞤺𞤮𞤲𞤫"} + } + } + compound{ + per{"{0} 𞤲𞤣𞤫𞤪 {1}"} + times{"{0}-{1}"} + } + concentr{ + milligram-per-deciliter{ + dnam{"𞤥𞤭𞤤𞤭𞤺𞤢𞤪𞤬𞤭 𞤲𞤣𞤫𞤪 𞤣𞤫𞥅𞤧𞤭𞤤𞤭𞥅𞤼𞤵"} + } + } + coordinate{ + dnam{"𞤦𞤢𞤲𞤽𞤢𞤤 𞤸𞤫𞤣𞥆𞤫"} + east{"{0} 𞤬𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫"} + north{"{0} 𞤲𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫"} + south{"{0} 𞤻𞤢𞤥𞤲𞤢𞥄𞤲𞤺𞤫"} + west{"{0} 𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫"} + } + digital{ + bit{ + dnam{"𞤦𞤭𞥅𞤼𞥆𞤭"} + one{"{0} 𞤦𞤭𞥅𞤼𞥆𞤵"} + other{"{0} 𞤦𞤭𞥅𞤼𞥆𞤭"} + } + byte{ + dnam{"𞤶𞤫𞥅𞤼𞥆𞤭"} + one{"{0} 𞤶𞤫𞥅𞤼𞥆𞤵"} + other{"{0} 𞤶𞤫𞥅𞤼𞥆𞤭"} + } + gigabit{ + dnam{"𞤺𞤭𞤺𞤢𞤦𞤭𞥅𞤼𞥆𞤭"} + one{"{0} 𞤺𞤭𞤺𞤢𞤦𞤭𞥅𞤼𞥆𞤵"} + other{"{0} 𞤺𞤭𞤺𞤢𞤦𞤭𞥅𞤼𞥆𞤭"} + } + gigabyte{ + dnam{"𞤺𞤭𞤺𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + one{"{0} 𞤺𞤭𞤺𞤢𞤶𞤫𞥅𞤼𞥆𞤵"} + other{"{0} 𞤺𞤭𞤺𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + } + kilobit{ + dnam{"𞤳𞤭𞤤𞤮𞤦𞤭𞥅𞤼𞥆𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤦𞤭𞥅𞤼𞥆𞤵"} + other{"{0} 𞤳𞤭𞤤𞤮𞤦𞤭𞥅𞤼𞥆𞤭"} + } + kilobyte{ + dnam{"𞤳𞤭𞤤𞤮𞤶𞤫𞥅𞤼𞥆𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤶𞤫𞥅𞤼𞥆𞤵"} + other{"{0} 𞤳𞤭𞤤𞤮𞤶𞤫𞥅𞤼𞥆𞤭"} + } + megabit{ + dnam{"𞤥𞤫𞤺𞤢𞤦𞤭𞥅𞤼𞥆𞤭"} + one{"{0} 𞤥𞤫𞤺𞤢𞤦𞤭𞥅𞤼𞥆𞤵"} + other{"{0} 𞤥𞤫𞤺𞤢𞤦𞤭𞥅𞤼𞥆𞤭"} + } + megabyte{ + dnam{"𞤥𞤫𞤺𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + one{"{0} 𞤥𞤫𞤺𞤢𞤶𞤫𞥅𞤼𞥆𞤵"} + other{"{0} 𞤥𞤫𞤺𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + } + petabyte{ + dnam{"𞤨𞤫𞤼𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + one{"{0} 𞤨𞤫𞤼𞤢𞤶𞤫𞥅𞤼𞥆𞤵"} + other{"{0} 𞤨𞤫𞤼𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + } + terabit{ + dnam{"𞤼𞤫𞤪𞤢𞤦𞤭𞥅𞤼𞥆𞤭"} + one{"{0} 𞤼𞤫𞤪𞤢𞤦𞤭𞥅𞤼𞥆𞤵"} + other{"{0} 𞤼𞤫𞤪𞤢𞤦𞤭𞥅𞤼𞥆𞤭"} + } + terabyte{ + dnam{"𞤼𞤫𞤪𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} + one{"{0} 𞤼𞤫𞤪𞤢𞤶𞤫𞥅𞤼𞥆𞤵"} + other{"{0} 𞤼𞤫𞤪𞤢𞤶𞤫𞥅𞤼𞥆𞤭"} } } duration{ @@ -29,27 +185,32 @@ ff_Adlm{ other{"{0} 𞤻𞤢𞤤𞥆𞤫"} per{"{0} 𞤲𞥋𞤣𞤫𞤪 𞤻𞤢𞤤𞥆𞤢𞤤"} } + decade{ + dnam{"𞤼𞤭𞤶𞤢𞤲𞤯𞤫"} + one{"{0} 𞤼𞤭𞤶𞤢𞤲𞤣𞤫"} + other{"{0} 𞤼𞤭𞤶𞤢𞤲𞤯𞤫"} + } hour{ - dnam{"𞤲𞥋𞤶𞤢𞤥𞤤𞤭"} - one{"{0} 𞤲𞥋𞤶𞤢𞤥𞤲𞥋𞤣𞤭"} - other{"{0} 𞤲𞥋𞤶𞤢𞤥𞤤𞤭"} - per{"{0} 𞤲𞥋𞤣𞤫𞤪 𞤲𞥋𞤶𞤢𞤥𞤲𞥋𞤣𞤭"} + dnam{"𞤲𞤶𞤢𞤥𞤤𞤭"} + one{"{0} 𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + other{"{0} 𞤲𞤶𞤢𞤥𞤤𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} } microsecond{ dnam{"𞤻𞤭𞤤𞤢𞤳𞤭𞤲𞤰𞤫"} - one{"{0} 𞤻𞤭𞤤𞤢𞤳𞤭𞤲𞤰𞤢𞤤"} + one{"{0} 𞤻𞤭𞤤𞤢𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} other{"{0} 𞤻𞤭𞤤𞤢𞤳𞤭𞤲𞤰𞤫"} } millisecond{ - dnam{"𞤤𞤫𞤤𞤳𞤭𞤲𞤰𞤫"} - one{"{0} 𞤤𞤫𞤤𞤳𞤭𞤲𞤰𞤢𞤤"} - other{"{0} 𞤤𞤫𞤤𞤳𞤭𞤲𞤰𞤫"} + dnam{"𞤥𞤭𞤤𞤭𞤳𞤭𞤲𞤰𞤫"} + one{"{0} 𞤥𞤭𞤤𞤭𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + other{"{0} 𞤥𞤭𞤤𞤭𞤳𞤭𞤲𞤰𞤫"} } minute{ - dnam{"𞤳𞤮𞤶𞤮𞤥𞤶𞤫"} - one{"{0} 𞤸𞤮𞤶𞤮𞤥𞤪𞤫"} - other{"{0} 𞤳𞤮𞤶𞤮𞤥𞤶𞤫"} - per{"{0} 𞤲𞥋𞤣𞤫𞤪 𞤸𞤮𞤶𞤮𞤥𞤪𞤫"} + dnam{"𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫"} + one{"{0} 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤪𞤫"} + other{"{0} 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤶𞤫"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤸𞤮𞤶𞤮𞤥𞤢𞥄𞤪𞤫"} } month{ dnam{"𞤤𞤫𞤦𞥆𞤭"} @@ -59,14 +220,14 @@ ff_Adlm{ } nanosecond{ dnam{"𞤲𞤢𞤲𞤮𞥅𞤳𞤭𞤲𞤰𞤫"} - one{"{0} 𞤲𞤢𞤲𞤮𞥅𞤳𞤭𞤲𞤰𞤢𞤤"} + one{"{0} 𞤲𞤢𞤲𞤮𞥅𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} other{"{0} 𞤲𞤢𞤲𞤮𞥅𞤳𞤭𞤲𞤰𞤫"} } second{ dnam{"𞤳𞤭𞤲𞤰𞤫"} - one{"{0} 𞤳𞤭𞤲𞤰𞤢𞤤"} + one{"{0} 𞤳𞤭𞤲𞤰𞤮"} other{"{0} 𞤳𞤭𞤲𞤰𞤫"} - per{"{0} 𞤲𞥋𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤢𞤤"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫"} } week{ dnam{"𞤶𞤮𞤲𞤼𞤫"} @@ -81,34 +242,179 @@ ff_Adlm{ per{"{0} 𞤲𞥋𞤣𞤫𞤪 𞤸𞤭𞤼𞤢𞥄𞤲𞥋𞤣𞤫"} } } + electric{ + ampere{ + dnam{"𞤢𞤥𞤨𞤫𞤪𞤶𞤭"} + one{"{0} 𞤢𞤥𞤨𞤫𞤪𞤱𞤵"} + other{"{0} 𞤢𞤥𞤨𞤫𞤪𞤶𞤭"} + } + milliampere{ + dnam{"𞤥𞤭𞤤𞤭𞤢𞤥𞤨𞤫𞤪𞤶𞤭"} + one{"{0} 𞤥𞤭𞤤𞤭𞤢𞤥𞤨𞤫𞤪𞤱𞤵"} + other{"{0} 𞤥𞤭𞤤𞤭𞤢𞤥𞤨𞤫𞤪𞤶𞤭"} + } + ohm{ + dnam{"𞤮𞤸𞤥𞤵𞥅𞤶𞤭"} + one{"{0} 𞤮𞤸𞤥𞤵"} + other{"{0} 𞤮𞤸𞤥𞤵𞥅𞤶𞤭"} + } + volt{ + dnam{"𞤾𞤮𞤤𞤼𞤵𞥅𞤶𞤭"} + one{"{0} 𞤾𞤮𞤤𞤼𞤵"} + other{"{0} 𞤾𞤮𞤤𞤼𞤵𞥅𞤶𞤭"} + } + } + energy{ + british-thermal-unit{ + dnam{"𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤲𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮"} + one{"{0} 𞤑𞤵𞥅𞤰𞤮 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮"} + other{"{0} 𞤑𞤵𞥅𞤰𞤫 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤄𞤭𞤪𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮"} + } + calorie{ + dnam{"𞤲𞤺𞤵𞤤𞤭"} + one{"{0} 𞤲𞤺𞤵𞤤𞤵"} + other{"{0} 𞤲𞤺𞤵𞤤𞤭"} + } + electronvolt{ + dnam{"𞤫𞤤𞤫𞤳𞤼𞤮𞤾𞤮𞤤𞤼𞤵𞥅𞤶𞤭"} + one{"{0} 𞤫𞤤𞤫𞤳𞤼𞤮𞤾𞤮𞤤𞤼𞤵"} + other{"{0} 𞤫𞤤𞤫𞤳𞤼𞤮𞤾𞤮𞤤𞤼𞤵𞥅𞤶𞤭"} + } + foodcalorie{ + dnam{"𞤐𞤺𞤵𞤤𞤭"} + one{"{0} 𞤐𞤺𞤵𞤤𞤵"} + other{"{0} 𞤐𞤺𞤵𞤤𞤭"} + } + joule{ + dnam{"𞥁𞤵𞥅𞤤𞤶𞤭"} + one{"{0} 𞥁𞤵𞥅𞤤𞤱𞤵"} + other{"{0} 𞥁𞤵𞥅𞤤𞤶𞤭"} + } + kilocalorie{ + dnam{"𞤳𞤭𞤤𞤮𞤲𞤺𞤵𞤤𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤲𞤺𞤵𞤤𞤵"} + other{"{0} 𞤳𞤭𞤤𞤮𞤲𞤺𞤵𞤤𞤭"} + } + kilojoule{ + dnam{"𞤳𞤭𞤤𞤮𞥁𞤵𞥅𞤤𞤶𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞥁𞤵𞥅𞤤𞤶𞤭"} + other{"{0} 𞤳𞤭𞤤𞤮𞥁𞤵𞥅𞤤𞤶𞤭"} + } + kilowatt-hour{ + dnam{"𞤳𞤭𞤤𞤮𞤱𞤢𞥄𞤼𞤵-𞤲𞤶𞤢𞤥𞤤𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤱𞤢𞥄𞤼𞤵-𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + other{"{0} 𞤳𞤭𞤤𞤮𞤱𞤢𞥄𞤼𞤵-𞤲𞤶𞤢𞤥𞤤𞤭"} + } + therm-us{ + dnam{"𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤫 𞤁𞤀"} + one{"{0} 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤁𞤀"} + other{"{0} 𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤫 𞤁𞤀"} + } + } + force{ + newton{ + dnam{"𞤲𞤫𞤱𞤼𞤮𞤲𞤶𞤭"} + one{"{0} 𞤲𞤫𞤱𞤼𞤮𞤲"} + other{"{0} 𞤲𞤫𞤱𞤼𞤮𞤲𞤶𞤭"} + } + } + frequency{ + gigahertz{ + dnam{"𞤺𞤭𞤺𞤢𞤸𞤫𞤪𞤼𞤵"} + one{"{0} 𞤺𞤭𞤺𞤢𞤸𞤫𞤪𞤼𞤵"} + other{"{0} 𞤺𞤭𞤺𞤢𞤸𞤫𞤪𞤼𞤭"} + } + hertz{ + dnam{"𞤸𞤫𞤪𞤼𞤵"} + one{"{0} 𞤸𞤫𞤪𞤼𞤵"} + other{"{0} 𞤸𞤫𞤪𞤼𞤭"} + } + kilohertz{ + dnam{"𞤳𞤭𞤤𞤮𞤸𞤫𞤪𞤼𞤵"} + one{"{0} 𞤳𞤭𞤤𞤮𞤸𞤫𞤪𞤼𞤵"} + other{"{0} 𞤳𞤭𞤤𞤮𞤸𞤫𞤪𞤼𞤭"} + } + megahertz{ + dnam{"𞤥𞤫𞤺𞤢𞤸𞤫𞤪𞤼𞤵"} + one{"{0} 𞤥𞤫𞤺𞤢𞤸𞤫𞤪𞤼𞤵"} + other{"{0} 𞤥𞤫𞤺𞤢𞤸𞤫𞤪𞤼𞤭"} + } + } + graphics{ + dot{ + dnam{"𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} + one{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} + other{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} + } + dot-per-centimeter{ + dnam{"𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + one{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + } + dot-per-inch{ + dnam{"𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} + one{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} + other{"{0} 𞤼𞤮𞤩𞥆𞤫 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} + } + em{ + dnam{"𞤭𞤥𞤵 𞤬𞤭𞥅 𞤴𞤢𞥄𞤴𞤮"} + one{"{0} 𞤭𞤥𞤵"} + other{"{0} 𞤭𞤥𞤭"} + } + megapixel{ + dnam{"𞤥𞤫𞤺𞤢𞤨𞤭𞤳𞤷𞤮𞤤"} + one{"{0} 𞤥𞤫𞤺𞤢𞤨𞤭𞤳𞤷𞤮𞤤"} + other{"{0} 𞤥𞤫𞤺𞤢𞤨𞤭𞤳𞤷𞤭"} + } + pixel{ + dnam{"𞤨𞤭𞤳𞤷𞤭"} + one{"{0} 𞤨𞤭𞤳𞤷𞤮𞤤"} + other{"{0} 𞤨𞤭𞤳𞤷𞤭"} + } + pixel-per-centimeter{ + dnam{"𞤨𞤭𞤳𞤷𞤭 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + one{"{0} 𞤨𞤭𞤳𞤷𞤮𞤤 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤨𞤭𞤳𞤷𞤭 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + } + pixel-per-inch{ + dnam{"𞤨𞤭𞤳𞤷𞤭 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} + one{"{0} 𞤨𞤭𞤳𞤷𞤮𞤤 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} + other{"{0} 𞤨𞤭𞤳𞤷𞤭 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} + } + } length{ astronomical-unit{ - dnam{"𞤺𞤵𞤥𞤫 𞤦𞤵𞤪𞤶𞤵𞤲𞤳𞤮𞤶𞤵𞤲"} - one{"{0} 𞤺𞤵𞤥𞤪𞤫 𞤦𞤵𞤪𞤶𞤵𞤲𞤳𞤮𞤶𞤵𞤲"} - other{"{0} 𞤺𞤵𞤥𞤫 𞤦𞤵𞤪𞤶𞤵𞤲𞤳𞤮𞤶𞤵𞤲"} + dnam{"𞤳𞤵𞥅𞤰𞤫 𞤦𞤵𞤪𞤶𞤵𞤲𞤳𞤮𞥅𞤶𞤫"} + one{"{0} 𞤳𞤵𞥅𞤰𞤵 𞤦𞤵𞤪𞤶𞤵𞤲𞤳𞤮𞤱𞤵"} + other{"{0} 𞤳𞤵𞥅𞤰𞤫 𞤦𞤵𞤪𞤶𞤵𞤲𞤳𞤮𞥅𞤶𞤫"} } centimeter{ dnam{"𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} one{"{0} 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} other{"{0} 𞤧𞤫𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} - per{"{0} 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} } decimeter{ - dnam{"𞤣𞤫𞤧𞤭𞤥𞤫𞥅𞤼𞤭"} - one{"{0} 𞤣𞤫𞤧𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} - other{"{0} 𞤣𞤫𞤧𞤭𞤥𞤫𞥅𞤼𞤭"} + dnam{"𞤣𞤫𞥅𞤧𞤭𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤣𞤫𞥅𞤧𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤣𞤫𞥅𞤧𞤭𞤥𞤫𞥅𞤼𞤭"} + } + earth-radius{ + dnam{"𞤤𞤢𞥄𞤧𞤮𞤤 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + one{"{0} 𞤤𞤢𞥄𞤧𞤮𞤤 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + other{"{0} 𞤤𞤢𞥄𞤧𞤮𞤤 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} } foot{ - dnam{"𞤼𞤫𞤨𞥆𞤫"} - one{"{0} 𞤼𞤫𞤨𞥆𞤫𞤪𞤫"} - other{"{0} 𞤼𞤫𞤨𞥆𞤫"} - per{"{0}/𞤫 𞤼𞤫𞤨𞥆𞤫𞤪𞤫"} + dnam{"𞤼𞤫𞤨𞥆𞤭"} + one{"{0} 𞤼𞤫𞤨𞥆𞤵"} + other{"{0} 𞤼𞤫𞤨𞥆𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤼𞤫𞤨𞥆𞤵"} } inch{ - dnam{"𞤺𞤮𞤪𞤭"} - one{"{0} 𞤺𞤮𞤪𞤲𞤣𞤵"} - other{"{0} 𞤺𞤮𞤪𞤭"} - per{"{0} 𞤫 𞤺𞤮𞤪𞤲𞤣𞤵"} + dnam{"𞤲𞤺𞤮𞤪𞤰𞤭"} + one{"{0} 𞤲𞤺𞤮𞤪𞤰𞤵"} + other{"{0} 𞤲𞤺𞤮𞤪𞤰𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤲𞤺𞤮𞤪𞤰𞤵"} } kilometer{ dnam{"𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭"} @@ -123,9 +429,9 @@ ff_Adlm{ } meter{ dnam{"𞤥𞤫𞥅𞤼𞤭"} - one{"{0}/𞤥𞤫𞥅𞤼𞤮𞤤"} - other{"{0}/𞤥𞤫𞥅𞤼𞤭"} - per{"{0}/𞤫 𞤥𞤫𞥅𞤼𞤮𞤤"} + one{"{0} 𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤥𞤫𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤥𞤫𞥅𞤼𞤮𞤤"} } micrometer{ dnam{"𞤻𞤭𞤤𞤢𞤥𞤫𞥅𞤼𞤭"} @@ -138,9 +444,9 @@ ff_Adlm{ other{"{0} 𞤥𞤢𞤴𞤤𞤭"} } mile-scandinavian{ - dnam{"𞤥𞤢𞤴𞤤𞤵 𞤧𞤭𞤳𞤢𞤣𞤭𞤲𞤢𞥄𞤾𞤭𞤴𞤢𞤲𞤳𞤮"} - one{"{0} 𞤥𞤢𞤴𞤤𞤵 𞤧𞤭𞤳𞤢𞤣𞤭𞤲𞤢𞥄𞤾𞤭𞤴𞤢𞤲𞤳𞤮"} - other{"{0} 𞤥𞤢𞤴𞤤𞤭 𞤧𞤭𞤳𞤢𞤣𞤭𞤲𞤢𞥄𞤾𞤭𞤴𞤢𞤲𞤳𞤮"} + dnam{"𞤃𞤢𞤴𞤤𞤵 𞤧𞤭𞤳𞤢𞥄𞤣𞤭𞤲𞤢𞥄𞤾𞤭𞤲𞤳𞤮"} + one{"{0} 𞤃𞤢𞤴𞤤𞤵 𞤧𞤭𞤳𞤢𞥄𞤣𞤭𞤲𞤢𞥄𞤾𞤭𞤲𞤳𞤮"} + other{"{0} 𞤃𞤢𞤴𞤤𞤭 𞤧𞤭𞤳𞤢𞥄𞤣𞤭𞤲𞤢𞥄𞤾𞤭𞤲𞤳𞤮"} } millimeter{ dnam{"𞤥𞤭𞤤𞤭𞤥𞤫𞥅𞤼𞤭"} @@ -148,14 +454,14 @@ ff_Adlm{ other{"{0} 𞤥𞤭𞤤𞤭𞤥𞤫𞥅𞤼𞤭"} } nanometer{ - dnam{"𞤲𞤢𞤲𞤮𞤥𞤫𞥅𞤼𞤭"} - one{"{0} 𞤲𞤢𞤲𞤮𞤥𞤫𞥅𞤼𞤮𞤤"} - other{"{0} 𞤲𞤢𞤲𞤮𞤥𞤫𞥅𞤼𞤭"} + dnam{"𞤲𞤢𞤲𞤮𞥊𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤲𞤢𞤲𞤮𞥊𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤲𞤢𞤲𞤮𞥊𞤥𞤫𞥅𞤼𞤭"} } nautical-mile{ - dnam{"𞤥𞤢𞤴𞤤𞤭 𞤥𞤢𞥄𞤶𞤫𞤴𞤢𞤲𞤳𞤮"} - one{"{0} 𞤥𞤢𞤴𞤤𞤵 𞤥𞤢𞥄𞤶𞤫𞤴𞤢𞤲𞤳𞤮"} - other{"{0} 𞤥𞤢𞤴𞤤𞤭 𞤥𞤢𞥄𞤶𞤫𞤴𞤢𞤲𞤳𞤮"} + dnam{"𞤥𞤢𞤴𞤤𞤭 𞤥𞤢𞥄𞤶𞤫𞤴𞤢𞤲𞤳𞤮𞥅𞤶𞤭"} + one{"{0} 𞤥𞤢𞤴𞤤𞤵 𞤥𞤢𞥄𞤶𞤫𞤴𞤢𞤲𞤳𞤮𞤱𞤵"} + other{"{0} 𞤥𞤢𞤴𞤤𞤭 𞤥𞤢𞥄𞤶𞤫𞤴𞤢𞤲𞤳𞤮𞥅𞤶𞤭"} } parsec{ dnam{"𞤨𞤢𞤪𞤧𞤫𞤳𞤭"} @@ -168,23 +474,416 @@ ff_Adlm{ other{"{0} 𞤨𞤭𞤳𞤮𞤥𞤫𞥅𞤼𞤭"} } point{ - dnam{"𞤼𞤮𞤩𞥆𞤫"} - one{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} - other{"{0} 𞤼𞤮𞤩𞥆𞤫"} + dnam{"𞤲𞤶𞤮𞤣𞥆𞤵𞥅𞤶𞤭"} + one{"{0} 𞤲𞤶𞤮𞤣𞥆𞤵"} + other{"{0} 𞤲𞤶𞤮𞤣𞥆𞤵𞥅𞤶𞤭"} + } + solar-radius{ + dnam{"𞤤𞤢𞥄𞤧𞤮𞤤 𞤲𞤢𞥄𞤲𞤺𞤫𞤴𞤢𞤲𞤳𞤮"} + one{"{0} 𞤤𞤢𞥄𞤧𞤭 𞤲𞤢𞥄𞤲𞤺𞤫𞤴𞤢𞤲𞤳𞤮"} + other{"{0} 𞤤𞤢𞥄𞤧𞤮𞤤 𞤲𞤢𞥄𞤲𞤺𞤫𞤴𞤢𞤲𞤳𞤮"} } yard{ - dnam{"𞤴𞤢𞤪𞤣𞤵𞥅𞤶𞤭"} - one{"{0} 𞤴𞤢𞤪𞤣𞤵"} - other{"{0} 𞤴𞤢𞤪𞤣𞤵𞥅𞤶𞤭"} + dnam{"𞤧𞤮𞤺𞤮𞤲𞤫"} + one{"{0} 𞤧𞤮𞤺𞤮𞤲𞤢𞤤"} + other{"{0} 𞤧𞤮𞤺𞤮𞤲𞤫"} + } + } + mass{ + carat{ + dnam{"𞤳𞤭𞤪𞤢𞤪𞤼𞤵"} + one{"{0} 𞤳𞤢𞤪𞤢𞤪𞤼𞤵"} + other{"{0} 𞤳𞤢𞤪𞤢𞤪𞤼𞤭"} + } + dalton{ + dnam{"𞤣𞤢𞤤𞤼𞤮𞥅𞤲𞤭"} + one{"{0} 𞤣𞤢𞤤𞤼𞤮𞥅𞤲𞤵"} + other{"{0} 𞤣𞤢𞤤𞤼𞤮𞥅𞤲𞤭"} + } + earth-mass{ + dnam{"𞤲𞤭𞥅𞤧𞤵𞥅𞤶𞤭 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + one{"{0} 𞤲𞤭𞥅𞤧𞤵 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + other{"{0} 𞤲𞤭𞥅𞤧𞤵𞥅𞤶𞤭 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + } + grain{ + dnam{"𞤺𞤢𞤰𞥆𞤫𞤪𞤫"} + one{"{0} 𞤺𞤢𞤰𞥆𞤫"} + other{"{0} 𞤺𞤢𞤰𞥆𞤫"} + } + gram{ + dnam{"𞤺𞤢𞤪𞤬𞤭"} + one{"{0} 𞤺𞤢𞤪𞤬𞤵"} + other{"{0} 𞤺𞤢𞤪𞤬𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤺𞤢𞤪𞤬𞤵"} + } + kilogram{ + dnam{"𞤳𞤭𞤤𞤮𞤺𞤢𞤪𞤬𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤺𞤢𞤪𞤬𞤵"} + other{"{0} 𞤳𞤭𞤤𞤮𞤺𞤢𞤪𞤬𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤳𞤭𞤤𞤮𞤺𞤢𞤪𞤬𞤵"} + } + metric-ton{ + dnam{"𞤼𞤮𞥅𞤲𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + one{"{0} 𞤼𞤮𞥅𞤲𞤵 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + other{"{0} 𞤼𞤮𞥅𞤲𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + } + microgram{ + dnam{"𞤻𞤭𞤤𞤢𞤺𞤢𞤪𞤬𞤭"} + one{"{0} 𞤻𞤭𞤤𞤢𞤺𞤢𞤪𞤬𞤵"} + other{"{0} 𞤻𞤭𞤤𞤢𞤺𞤢𞤪𞤬𞤭"} + } + milligram{ + dnam{"𞤥𞤭𞤤𞤭𞤺𞤢𞤪𞤬𞤭"} + one{"{0} 𞤥𞤭𞤤𞤭𞤺𞤢𞤪𞤬𞤵"} + other{"{0} 𞤥𞤭𞤤𞤭𞤺𞤢𞤪𞤬𞤭"} + } + ounce{ + dnam{"𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭"} + one{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞤱𞤵"} + other{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤱𞤢𞤺𞤭𞤴𞤢𞤱𞤵"} + } + ounce-troy{ + dnam{"𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭 𞤥𞤫𞤲𞤳𞤫𞤤𞤣𞤭"} + one{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞤱𞤵 𞤥𞤫𞤲𞤳𞤫𞤤𞤣𞤫"} + other{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭 𞤥𞤫𞤲𞤳𞤫𞤤𞤣𞤫"} + } + pound{ + dnam{"𞤺𞤢𞤪𞤤𞤭"} + one{"{0} 𞤺𞤢𞤪𞤤𞤵"} + other{"{0} 𞤺𞤢𞤪𞤤𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤺𞤢𞤪𞤤𞤵"} + } + solar-mass{ + dnam{"𞤲𞤭𞥅𞤧𞤵𞥅𞤶𞤭 𞤲𞤢𞥄𞤲𞤺𞤫 𞤲𞤺𞤫𞤲"} + one{"{0} 𞤲𞤭𞥅𞤧𞤵 𞤲𞤢𞥄𞤲𞤺𞤫 𞤲𞤺𞤫𞤲"} + other{"{0} 𞤲𞤭𞥅𞤧𞤵𞥅𞤶𞤭 𞤲𞤢𞥄𞤲𞤺𞤫 𞤲𞤺𞤫𞤲"} + } + ton{ + dnam{"𞤼𞤮𞥅𞤲𞤭"} + one{"{0} 𞤼𞤮𞥅𞤲𞤵"} + other{"{0} 𞤼𞤮𞥅𞤲𞤭"} + } + } + power{ + gigawatt{ + dnam{"𞤺𞤭𞤺𞤢𞤱𞤢𞥄𞤼𞤭"} + one{"{0} 𞤺𞤭𞤺𞤢𞤱𞤢𞥄𞤼𞤵"} + other{"{0} 𞤺𞤭𞤺𞤢𞤱𞤢𞥄𞤼𞤭"} + } + horsepower{ + dnam{"𞤷𞤫𞤥𞤦𞤫-𞤨𞤵𞤷𞥆𞤭"} + one{"{0} 𞤷𞤫𞤥𞤦𞤫-𞤨𞤵𞤨𞥆𞤵"} + other{"{0} 𞤷𞤫𞤥𞤦𞤫-𞤨𞤵𞤷𞥆𞤭"} + } + kilowatt{ + dnam{"𞤳𞤭𞤤𞤮𞤱𞤢𞥄𞤼𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤱𞤢𞥄𞤼𞤵"} + other{"{0} 𞤳𞤭𞤤𞤮𞤱𞤢𞥄𞤼𞤭"} + } + megawatt{ + dnam{"𞤥𞤫𞤺𞤢𞤱𞤢𞥄𞤼𞤭"} + one{"{0} 𞤥𞤫𞤺𞤢𞤱𞤢𞥄𞤼𞤵"} + other{"{0} 𞤥𞤫𞤺𞤢𞤱𞤢𞥄𞤼𞤭"} + } + milliwatt{ + dnam{"𞤥𞤭𞤤𞤭𞤱𞤢𞥄𞤼𞤭"} + one{"{0} 𞤥𞤭𞤤𞤭𞤱𞤢𞥄𞤼𞤵"} + other{"{0} 𞤥𞤭𞤤𞤭𞤱𞤢𞥄𞤼𞤭"} + } + watt{ + dnam{"𞤱𞤢𞥄𞤼𞤭"} + one{"{0} 𞤱𞤢𞥄𞤼𞤭"} + other{"{0} 𞤱𞤢𞥄𞤼𞤭"} + } + } + pressure{ + atmosphere{ + dnam{"𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭"} + one{"{0} 𞤦𞤫𞤧𞤤𞤮𞥅𞤪𞤭"} + other{"{0} 𞤦𞤫𞤧𞤤𞤮𞥅𞤶𞤭"} + } + bar{ + dnam{"𞤦𞤢𞤪𞤤𞤭"} + one{"{0} 𞤦𞤢𞤪𞤤𞤵"} + other{"{0} 𞤦𞤢𞤪𞤤𞤭"} + } + hectopascal{ + dnam{"𞤸𞤫𞤳𞤼𞤮𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + one{"{0} 𞤸𞤫𞤳𞤼𞤮𞤨𞤢𞤧𞤳𞤢𞤤"} + other{"{0} 𞤸𞤫𞤳𞤼𞤮𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + } + inch-ofhg{ + dnam{"𞤲𞤺𞤮𞤪𞤰𞤭 𞤯𞤫𞤤𞤳𞤮𞥅𞤪𞤭"} + one{"{0} 𞤲𞤺𞤮𞤪𞤰𞤵 𞤯𞤫𞤤𞤳𞤮𞥅𞤪𞤭"} + other{"{0} 𞤲𞤺𞤮𞤪𞤰𞤭 𞤯𞤫𞤤𞤳𞤮𞥅𞤪𞤭"} + } + kilopascal{ + dnam{"𞤳𞤭𞤤𞤮𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤨𞤢𞤧𞤳𞤢𞤤"} + other{"{0} 𞤳𞤭𞤤𞤮𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + } + megapascal{ + dnam{"𞤥𞤫𞤺𞤢𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + one{"{0} 𞤥𞤫𞤺𞤢𞤨𞤢𞤧𞤳𞤢𞤤"} + other{"{0} 𞤥𞤫𞤺𞤢𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + } + millibar{ + dnam{"𞤥𞤭𞤤𞤭𞤦𞤢𞤪𞤤𞤭"} + one{"{0} 𞤥𞤭𞤤𞤭𞤦𞤢𞤪𞤤𞤵"} + other{"{0} 𞤥𞤭𞤤𞤭𞤦𞤢𞤪𞤤𞤭"} + } + millimeter-ofhg{ + dnam{"𞤥𞤭𞤤𞤭𞤥𞤫𞥅𞤼𞤭 𞤯𞤫𞤤𞤳𞤮𞥅𞤪𞤭"} + one{"{0} 𞤥𞤭𞤤𞤭𞤥𞤫𞥅𞤼𞤮𞤤 𞤯𞤫𞤤𞤳𞤮𞥅𞤪𞤭"} + other{"{0} 𞤥𞤭𞤤𞤭𞤥𞤫𞥅𞤼𞤭 𞤯𞤫𞤤𞤳𞤮𞥅𞤪𞤭"} + } + pascal{ + dnam{"𞤨𞤢𞤧𞤳𞤢𞤤𞤶𞤭"} + one{"{0} 𞤨𞤢𞤧𞤷𞤢𞤤"} + other{"{0} 𞤨𞤢𞤧𞤷𞤢𞤤𞤶𞤭"} + } + pound-force-per-square-inch{ + dnam{"𞤺𞤢𞤪𞤤𞤭 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤵"} + one{"{0} 𞤺𞤢𞤪𞤤𞤵 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤵"} + other{"{0} 𞤺𞤢𞤪𞤤𞤭 𞤲𞤣𞤫𞤪 𞤣𞤭𞤲𞤺𞤫𞤪𞤫 𞤲𞤺𞤮𞤪𞤰𞤵"} + } + } + speed{ + kilometer-per-hour{ + dnam{"𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤣𞤭"} + one{"{0} 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤮𞤤 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤣𞤭"} + other{"{0} 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤣𞤭"} + } + knot{ + dnam{"𞤨𞤭𞤩𞤫"} + one{"{0} 𞤨𞤭𞤩𞤮"} + other{"{0} 𞤨𞤭𞤩𞤫"} + } + meter-per-second{ + dnam{"𞤥𞤫𞥅𞤼𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + one{"{0} 𞤥𞤫𞥅𞤼𞤮𞤤 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + other{"{0} 𞤥𞤫𞥅𞤼𞤭 𞤲𞤣𞤫𞤪 𞤳𞤭𞤲𞤰𞤫𞤪𞤫"} + } + mile-per-hour{ + dnam{"𞤥𞤢𞤴𞤤𞤭 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + one{"{0} 𞤥𞤢𞤴𞤤𞤵 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + other{"{0} 𞤥𞤢𞤴𞤤𞤭 𞤲𞤣𞤫𞤪 𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + } + } + temperature{ + celsius{ + dnam{"𞤶𞤫𞤩𞤫 𞤅𞤫𞤤𞤧𞤵"} + one{"{0} 𞤶𞤫𞤩𞤫𞤪𞤫 𞤅𞤫𞤤𞤧𞤵"} + other{"{0} 𞤶𞤫𞤩𞤫 𞤅𞤫𞤤𞤧𞤵"} + } + fahrenheit{ + dnam{"𞤶𞤫𞤩𞤫 𞤊𞤢𞤸𞤪𞤢𞤲𞤫𞤴𞤼𞤵"} + one{"{0} 𞤶𞤫𞤩𞤫𞤪𞤫 𞤊𞤢𞤸𞤪𞤢𞤲𞤫𞤴𞤼𞤵"} + other{"{0} 𞤶𞤫𞤩𞤫 𞤊𞤢𞤸𞤪𞤢𞤲𞤫𞤴𞤼𞤵"} + } + generic{ + one{"{0} 𞤶𞤫𞤩𞤫𞤪𞤫"} + other{"{0} 𞤶𞤫𞤩𞤫"} + } + kelvin{ + dnam{"𞤶𞤫𞤩𞤫 𞤳𞤫𞤤𞤾𞤭𞥅𞤲"} + one{"{0} 𞤶𞤫𞤩𞤫𞤪𞤫 𞤳𞤫𞤤𞤾𞤭𞥅𞤲"} + other{"{0} 𞤶𞤫𞤩𞤫 𞤳𞤫𞤤𞤾𞤭𞥅𞤲"} + } + } + torque{ + newton-meter{ + dnam{"𞤲𞤫𞤱𞤼𞤮𞤲-𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤲𞤫𞤱𞤼𞤮𞤲-𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤲𞤫𞤱𞤼𞤮𞤲-𞤥𞤫𞥅𞤼𞤭"} } } volume{ + acre-foot{ + dnam{"𞤺𞤢𞤪𞤳𞤵 𞤼𞤫𞤨𞥆𞤭"} + one{"{0} 𞤺𞤢𞤪𞤳𞤵 𞤼𞤫𞤨𞥆𞤵"} + other{"{0} 𞤺𞤢𞤪𞤳𞤵 𞤼𞤫𞤨𞥆𞤭"} + } + barrel{ + dnam{"𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭"} + one{"{0} 𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵"} + other{"{0} 𞤺𞤮𞤲𞤺𞤮𞥅𞤶𞤭"} + } + centiliter{ + dnam{"𞤧𞤢𞤲𞤼𞤭𞤤𞤭𞥅𞤼𞤭"} + one{"{0} 𞤧𞤢𞤲𞤼𞤭𞤤𞤭𞥅𞤼𞤵"} + other{"{0} 𞤧𞤢𞤲𞤼𞤭𞤤𞤭𞥅𞤼𞤭"} + } + cubic-centimeter{ + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤤𞤢𞤥𞤦𞤵 𞤧𞤢𞤲𞤼𞤭𞤥𞤫𞥅𞤼𞤭"} + } + cubic-foot{ + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤼𞤫𞤨𞥆𞤭"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤼𞤫𞤨𞥆𞤵"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤼𞤫𞤨𞥆𞤭"} + } + cubic-inch{ + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤲𞤺𞤮𞤪𞤰𞤵"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤲𞤺𞤮𞤪𞤰𞤵"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤲𞤺𞤮𞤪𞤰𞤭"} + } + cubic-kilometer{ + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤳𞤭𞤤𞤮𞤥𞤫𞥅𞤼𞤭"} + } cubic-meter{ - dnam{"𞤥𞥓"} + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤥𞤫𞥅𞤼𞤮𞤤"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤥𞤫𞥅𞤼𞤮𞤤"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤥𞤫𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤤𞤢𞤥𞤦𞤵 𞤥𞤫𞥅𞤼𞤮𞤤"} + } + cubic-mile{ + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤥𞤢𞤴𞤤𞤭"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤥𞤢𞤴𞤤𞤵"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤥𞤢𞤴𞤤𞤭"} + } + cubic-yard{ + dnam{"𞤤𞤢𞤥𞤦𞤵 𞤧𞤮𞤺𞤮𞤲𞤫"} + one{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤧𞤮𞤺𞤮𞤲𞤢𞤤"} + other{"{0} 𞤤𞤢𞤥𞤦𞤵 𞤧𞤮𞤺𞤮𞤲𞤫"} + } + cup{ + dnam{"𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤫"} + one{"{0} 𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤮"} + other{"{0} 𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤫"} + } + cup-metric{ + dnam{"𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤫 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + one{"{0} 𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤮 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + other{"{0} 𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤫 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + } + deciliter{ + dnam{"𞤣𞤫𞥅𞤧𞤭𞤤𞤭𞥅𞤼𞤭"} + one{"{0} 𞤣𞤫𞥅𞤧𞤭𞤤𞤭𞥅𞤼𞤵"} + other{"{0} 𞤣𞤫𞥅𞤧𞤭𞤤𞤭𞥅𞤼𞤭"} + } + dessert-spoon{ + dnam{"𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭"} + one{"{0} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭"} + other{"{0} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭"} + } + dessert-spoon-imperial{ + dnam{"𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤."} + one{"{0} 𞤳𞤮𞤤𞤬𞤫 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤."} + other{"{0} 𞤳𞤮𞤤𞤬𞤮 𞤤𞤫𞤥𞤰𞤢𞥄𞤪𞤭 𞤚𞤭𞤤."} + } + dram{ + dnam{"𞤣𞤭𞤪𞤸𞤢𞤥𞤵"} + one{"{0} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵"} + other{"{0} 𞤣𞤭𞤪𞤸𞤢𞤥𞤵"} + } + drop{ + dnam{"𞤧𞤭𞤲𞤼𞤫𞤪𞤫"} + one{"{0} 𞤧𞤭𞤲𞤼𞤫𞤪𞤫"} + other{"{0} 𞤷𞤭𞤲𞤼𞤫"} + } + fluid-ounce{ + dnam{"𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭 𞤧𞤫𞤤𞤦𞤢𞤲"} + one{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞤱𞤵 𞤧𞤫𞤤𞤦𞤢𞤲"} + other{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭 𞤧𞤫𞤤𞤦𞤢𞤲"} + } + fluid-ounce-imperial{ + dnam{"𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵"} + one{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞤱𞤵 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵"} + other{"{0} 𞤱𞤢𞤺𞤭𞤴𞤢𞥄𞤶𞤭 𞤧𞤫𞤤𞤦𞤢𞤲 𞤚𞤭𞤤𞤧𞤵"} + } + gallon{ + dnam{"𞤺𞤢𞤤𞤮𞤲𞤶𞤭"} + one{"{0} 𞤺𞤢𞤤𞤮𞤲𞤪𞤵"} + other{"{0} 𞤺𞤢𞤤𞤮𞤲𞤶𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤺𞤢𞤤𞤮𞤲𞤪𞤵"} + } + gallon-imperial{ + dnam{"𞤺𞤢𞤤𞤮𞤲𞤶𞤭 𞤚𞤭𞤤𞤧𞤵"} + one{"{0} 𞤺𞤢𞤤𞤮𞤲𞤪𞤵 𞤚𞤭𞤤𞤧𞤵"} + other{"{0} 𞤺𞤢𞤤𞤮𞤲𞤶𞤭 𞤚𞤭𞤤𞤧𞤵"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤺𞤢𞤤𞤮𞤲𞤪𞤵 𞤚𞤭𞤤𞤧𞤵"} + } + hectoliter{ + dnam{"𞤸𞤫𞤳𞤼𞤮𞤤𞤭𞥅𞤼𞤭"} + one{"{0} 𞤸𞤫𞤳𞤼𞤮𞤤𞤭𞥅𞤼𞤵"} + other{"{0} 𞤸𞤫𞤳𞤼𞤮𞤤𞤭𞥅𞤼𞤭"} + } + jigger{ + dnam{"𞤶𞤭𞤺𞥆𞤮"} + one{"{0} 𞤶𞤭𞤺𞥆𞤮"} + other{"{0} 𞤶𞤭𞤺𞥆𞤫"} + } + liter{ + dnam{"𞤤𞤭𞥅𞤼𞤭"} + one{"{0} 𞤤𞤭𞥅𞤼𞤵"} + other{"{0} 𞤤𞤭𞥅𞤼𞤭"} + per{"{0} 𞤲𞤣𞤫𞤪 𞤤𞤭𞥅𞤼𞤵"} + } + megaliter{ + dnam{"𞤥𞤫𞤺𞤢𞤤𞤭𞥅𞤼𞤵"} + one{"{0} 𞤥𞤫𞤺𞤢𞤤𞤭𞥅𞤼𞤵"} + other{"{0} 𞤥𞤫𞤺𞤢𞤤𞤭𞥅𞤼𞤭"} + } + milliliter{ + dnam{"𞤥𞤭𞤤𞤭𞤤𞤭𞥅𞤼𞤭"} + one{"{0} 𞤥𞤭𞤤𞤭𞤤𞤭𞥅𞤼𞤵"} + other{"{0} 𞤥𞤭𞤤𞤭𞤤𞤭𞥅𞤼𞤭"} + } + pinch{ + dnam{"𞤩𞤵𞤷𞥆𞤢𞤲𞤣𞤫"} + one{"{0} 𞤩𞤵𞤷𞥆𞤢𞤲𞤣𞤫"} + other{"{0} 𞤩𞤵𞤷𞥆𞤢𞤲𞤯𞤫"} + } + pint{ + dnam{"𞤨𞤭𞤲𞤼𞤭"} + one{"{0} 𞤨𞤭𞤲𞤼𞤵"} + other{"{0} 𞤨𞤭𞤲𞤼𞤭"} + } + pint-metric{ + dnam{"𞤨𞤭𞤲𞤼𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + one{"{0} 𞤨𞤭𞤲𞤼𞤵 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + other{"{0} 𞤨𞤭𞤲𞤼𞤭 𞤥𞤫𞤼𞤭𞤪𞤳𞤵"} + } + quart{ + dnam{"𞤳𞤮𞤪𞤼𞤭"} + one{"{0} 𞤳𞤮𞤪𞤼𞤵"} + other{"{0} 𞤳𞤮𞤪𞤼𞤭"} + } + quart-imperial{ + dnam{"𞤳𞤮𞤪𞤼𞤵 𞤚𞤭𞤤𞤧𞤵"} + one{"{0} 𞤳𞤮𞤪𞤼𞤵 𞤚𞤭𞤤𞤧𞤵"} + other{"{0} 𞤳𞤮𞤪𞤼𞤭 𞤚𞤭𞤤𞤧𞤵"} + } + tablespoon{ + dnam{"𞤳𞤮𞤤𞤬𞤫-𞤻𞤢𞥄𞤥𞤣𞤵"} + one{"{0} 𞤳𞤮𞤤𞤬𞤮-𞤻𞤢𞥄𞤥𞤣𞤵"} + other{"{0} 𞤳𞤮𞤤𞤬𞤫-𞤻𞤢𞥄𞤥𞤣𞤵"} + } + teaspoon{ + dnam{"𞤳𞤮𞤤𞤬𞤫-𞤲𞤦𞤢𞤪𞤩𞤵"} + one{"{0} 𞤳𞤮𞤤𞤬𞤮-𞤲𞤦𞤢𞤪𞤩𞤵"} + other{"{0} 𞤳𞤮𞤤𞤬𞤫-𞤲𞤦𞤢𞤪𞤩𞤵"} } } } unitsNarrow{ + compound{ + per{"{0}/{1}"} + times{"{0}-{1}"} + } + coordinate{ + dnam{"𞤸𞤫𞤤𞥆𞤢"} + east{"{0}𞤊"} + north{"{0}𞤐"} + south{"{0}𞤙"} + west{"{0}𞤖"} + } duration{ day{ dnam{"𞤻𞤢𞤤."} @@ -192,19 +891,19 @@ ff_Adlm{ other{"{0} 𞤻𞤢𞤤."} } hour{ - dnam{"𞤶𞤢"} - one{"{0} 𞤶𞤢"} - other{"{0} 𞤶𞤢"} + dnam{"𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + one{"{0}𞤶"} + other{"{0}𞤶"} } millisecond{ - dnam{"𞤤𞤳𞤭𞤲"} - one{"{0} 𞤤𞤳𞤭"} - other{"{0} 𞤤𞤳𞤭"} + dnam{"𞤥𞤳𞤭𞤲"} + one{"{0}𞤥𞤳𞤭𞤲"} + other{"{0}𞤥𞤳𞤭𞤲"} } minute{ dnam{"𞤸𞤮𞤶"} - one{"{0} 𞤸𞤮𞤶"} - other{"{0} 𞤳𞤮𞤶"} + one{"{0}𞤸𞤮𞤶"} + other{"{0}𞤸𞤮𞤶"} } month{ dnam{"𞤤𞤫𞤦𞥆𞤭"} @@ -213,8 +912,8 @@ ff_Adlm{ } second{ dnam{"𞤳𞤭𞤲"} - one{"{0} 𞤳𞤭𞤲"} - other{"{0} 𞤳𞤭𞤲"} + one{"{0}𞤳𞤭𞤲"} + other{"{0}𞤳𞤭𞤲"} } week{ dnam{"𞤶𞤼"} @@ -230,39 +929,223 @@ ff_Adlm{ length{ centimeter{ dnam{"𞤧𞤥"} - one{"{0} 𞤧𞤥"} - other{"{0} 𞤧𞤥"} + one{"{0}𞤧𞤥"} + other{"{0}𞤧𞤥"} } kilometer{ dnam{"𞤳𞤥"} - one{"{0} 𞤳𞤥"} - other{"{0} 𞤳𞤥"} + one{"{0}𞤳𞤥"} + other{"{0}𞤳𞤥"} } meter{ dnam{"𞤥"} - one{"{0}/𞤥"} - other{"{0}/𞤥"} + one{"{0}𞤥"} + other{"{0}𞤥"} } millimeter{ dnam{"𞤥𞤥"} - one{"{0} 𞤥𞤥"} - other{"{0} 𞤥𞤥"} + one{"{0}𞤥𞤥"} + other{"{0}𞤥𞤥"} + } + } + mass{ + gram{ + dnam{"𞤺𞤢𞤪𞤬𞤵"} + one{"{0}𞤺"} + other{"{0}𞤺"} + } + kilogram{ + dnam{"𞤳𞤺"} + one{"{0}𞤳𞤺"} + other{"{0}𞤳𞤺"} + } + } + speed{ + kilometer-per-hour{ + dnam{"𞤳𞤥/𞤶𞤢"} + one{"{0}𞤳𞤥/𞤶"} + other{"{0}𞤳𞤥/𞤶"} + } + } + temperature{ + celsius{ + dnam{"°𞤅"} + one{"{0}°𞤅"} + other{"{0}°𞤅"} + } + } + volume{ + liter{ + dnam{"𞤤𞤭𞥅𞤼𞤵"} + one{"{0}𞤂"} + other{"{0}𞤂"} } } } unitsShort{ + acceleration{ + g-force{ + dnam{"𞤻-𞤷𞤫𞤥𞤦𞤫"} + one{"{0} 𞤙"} + other{"{0} 𞤙"} + } + meter-per-square-second{ + dnam{"𞤥𞤫𞥅𞤼𞤭/𞤳𞤭𞤲𞥒"} + one{"{0} 𞤥/𞤳𞤭𞤲𞥒"} + other{"{0} 𞤥/𞤳𞤭𞤲𞥒"} + } + } + angle{ + arc-minute{ + dnam{"𞤸𞤮𞤶𞤤𞤢"} + one{"{0} 𞤸𞤮𞤶𞤤𞤢"} + other{"{0} 𞤸𞤮𞤶𞤤𞤢"} + } + arc-second{ + dnam{"𞤶𞤮𞤶𞤳𞤭𞤲"} + one{"{0} 𞤸𞤮𞤶𞤳𞤭𞤲"} + other{"{0} 𞤸𞤮𞤶𞤳𞤭𞤲"} + } + degree{ + dnam{"𞤶𞤫𞤩𞤫"} + one{"{0} 𞤶𞤫𞤩"} + other{"{0} 𞤶𞤫𞤩"} + } + radian{ + dnam{"𞤪𞤢𞤣𞤭𞤴𞤢𞤲𞤶𞤭"} + one{"{0} 𞤪𞤢𞤣"} + other{"{0} 𞤪𞤢𞤣"} + } + revolution{ + dnam{"𞤱𞤭𞤣"} + one{"{0} 𞤱𞤭𞤣"} + other{"{0} 𞤱𞤭𞤣"} + } + } area{ + acre{ + dnam{"𞤺𞤢𞤪𞤳𞤭"} + one{"{0} 𞤺𞤢"} + other{"{0} 𞤺𞤢"} + } + dunam{ + dnam{"𞤣𞤵𞥅𞤲𞤢𞤥𞤭"} + one{"{0} 𞤣𞤵𞥅𞤲𞤢𞤥𞤵"} + other{"{0} 𞤣𞤵𞥅𞤲𞤢𞤥𞤭"} + } hectare{ - dnam{"𞤸𞤢"} + dnam{"𞤸𞤫𞤳𞤼𞤢𞤪𞤯𞤫"} one{"{0} 𞤸𞤢"} other{"{0} 𞤸𞤢"} } + square-centimeter{ + dnam{"𞤧𞤥𞥒"} + one{"{0} 𞤧𞤥𞥒"} + other{"{0} 𞤧𞤥𞥒"} + per{"{0}/𞤧𞤥𞥒"} + } + square-foot{ + dnam{"𞤣𞤺 𞤼𞤫𞤨𞥆𞤭"} + one{"{0} 𞤣𞤺 𞤼𞤨"} + other{"{0} 𞤣𞤺 𞤼𞤨"} + } + square-inch{ + dnam{"𞤲𞤺𞤮𞤪𞤰𞤭𞥒"} + one{"{0} 𞤺𞤮𞥒"} + other{"{0} 𞤺𞤮𞥒"} + per{"{0}/𞤺𞤮𞥒"} + } square-kilometer{ dnam{"𞤳𞤥𞥒"} one{"{0} 𞤳𞤥𞥒"} other{"{0} 𞤳𞤥𞥒"} per{"{0}/𞤳𞤥𞥒"} } + square-meter{ + dnam{"𞤥𞤫𞥅𞤼𞤭𞥒"} + one{"{0} 𞤥𞥒"} + other{"{0} 𞤥𞥒"} + per{"{0}/𞤥𞥒"} + } + square-mile{ + dnam{"𞤣𞤺 𞤥𞤢𞤴𞤤𞤭"} + one{"{0} 𞤥𞤢 𞤣𞤺"} + other{"{0} 𞤥𞤢 𞤣𞤺"} + per{"{0}/𞤥𞤢𞥒"} + } + square-yard{ + dnam{"𞤧𞤮𞤺𞤮𞤲𞤫𞥒"} + one{"{0} 𞤧𞤮𞥒"} + other{"{0} 𞤧𞤮𞥒"} + } + } + compound{ + per{"{0}/{1}"} + times{"{0}-{1}"} + } + coordinate{ + dnam{"𞤸𞤫𞤤𞥆𞤢"} + east{"{0} 𞤊"} + north{"{0} 𞤐"} + south{"{0} 𞤙"} + west{"{0} 𞤖"} + } + digital{ + bit{ + dnam{"𞤦𞤭𞥅𞤼𞥆𞤵"} + one{"{0} 𞤦"} + other{"{0} 𞤦"} + } + byte{ + dnam{"𞤶𞤫𞥅𞤼𞥆𞤵"} + one{"{0} 𞤔"} + other{"{0} 𞤔"} + } + gigabit{ + dnam{"𞤘𞤦𞤭𞥅𞤼𞥆𞤵"} + one{"{0} 𞤘𞤦"} + other{"{0} 𞤘𞤦"} + } + gigabyte{ + dnam{"𞤘𞤔𞤫𞥅𞤼𞥆𞤵"} + one{"{0} 𞤘𞤔"} + other{"{0} 𞤘𞤔"} + } + kilobit{ + dnam{"𞤳𞤦𞤭𞥅𞤼𞥆𞤵"} + one{"{0} 𞤳𞤦"} + other{"{0} 𞤳𞤦"} + } + kilobyte{ + dnam{"𞤳𞤔𞤫𞥅𞤼𞥆𞤵"} + one{"{0} 𞤳𞤔"} + other{"{0} 𞤳𞤔"} + } + megabit{ + dnam{"𞤃𞤦𞤭𞥅𞤼𞥆𞤵"} + one{"{0} 𞤃𞤦"} + other{"{0} 𞤃𞤦"} + } + megabyte{ + dnam{"𞤃𞤔𞤫𞥅𞤼𞥆𞤵"} + one{"{0} 𞤃𞤔"} + other{"{0} 𞤃𞤔"} + } + petabyte{ + dnam{"𞤆𞤔𞤫𞥅𞤼𞥆𞤵"} + one{"{0} 𞤆𞤔"} + other{"{0} 𞤆𞤔"} + } + terabit{ + dnam{"𞤚𞤦𞤭𞥅𞤼𞥆𞤭"} + one{"{0} 𞤚𞤦"} + other{"{0} 𞤚𞤦"} + } + terabyte{ + dnam{"𞤚𞤔𞤫𞥅𞤼𞥆𞤵"} + one{"{0} 𞤚𞤔"} + other{"{0} 𞤚𞤔"} + } } duration{ century{ @@ -276,11 +1159,16 @@ ff_Adlm{ other{"{0} 𞤻𞤢𞤤."} per{"{0}/𞤻𞤢𞤤."} } + decade{ + dnam{"𞤼𞤭𞤶"} + one{"{0} 𞤼𞤭𞤶"} + other{"{0} 𞤼𞤭𞤶"} + } hour{ - dnam{"𞤶𞤢"} + dnam{"𞤲𞤶𞤢𞤥𞤤𞤭"} one{"{0} 𞤶𞤢"} other{"{0} 𞤶𞤢"} - per{"{0}/𞤶𞤢"} + per{"{0}/𞤶"} } microsecond{ dnam{"𞤻𞤳𞤭𞤲"} @@ -288,19 +1176,19 @@ ff_Adlm{ other{"{0} 𞤻𞤳𞤭𞤲"} } millisecond{ - dnam{"𞤤𞤳𞤭𞤲"} - one{"{0} 𞤤𞤳𞤭𞤲"} - other{"{0} 𞤤𞤳𞤭𞤲"} + dnam{"𞤥𞤭𞤤𞤭𞤳𞤭𞤲"} + one{"{0} 𞤥𞤳𞤭𞤲"} + other{"{0} 𞤥𞤳𞤭𞤲"} } minute{ dnam{"𞤸𞤮𞤶"} one{"{0} 𞤸𞤮𞤶"} - other{"{0} 𞤳𞤮𞤶"} + other{"{0} 𞤸𞤮𞤶"} per{"{0}/𞤸𞤮𞤶"} } month{ dnam{"𞤤𞤫𞤦𞥆𞤭"} - one{"{0}/𞤳𞤭𞤼"} + one{"{0}/𞤤𞤫𞤱"} other{"{0} 𞤤𞤫𞤦"} per{"{0}/𞤤𞤫𞤱"} } @@ -328,11 +1216,151 @@ ff_Adlm{ per{"{0}/𞤸𞤭𞤼𞤢𞥄𞤲𞥋𞤣𞤫"} } } + electric{ + ampere{ + dnam{"𞤢𞤥𞤨𞤫𞤪𞤶𞤭"} + one{"{0} 𞤀"} + other{"{0} 𞤀"} + } + milliampere{ + dnam{"𞤥𞤭𞤤𞤭𞤢𞤥𞤨𞤫𞤪𞤶𞤭"} + one{"{0} 𞤥𞤀"} + other{"{0} 𞤥𞤀"} + } + ohm{ + dnam{"𞤮𞤸𞤥𞤵𞥅𞤶𞤭"} + one{"{0} Ω"} + other{"{0} Ω"} + } + volt{ + dnam{"𞤾𞤮𞤤𞤼𞤵𞥅𞤶𞤭"} + one{"{0} 𞤜"} + other{"{0} 𞤜"} + } + } + energy{ + british-thermal-unit{ + dnam{"𞤑𞤘𞤄"} + one{"{0} 𞤑𞤺𞤦"} + other{"{0} 𞤑𞤺𞤦"} + } + calorie{ + dnam{"𞤺𞤵𞤤"} + one{"{0} 𞤺𞤵𞤤"} + other{"{0} 𞤺𞤵𞤤"} + } + electronvolt{ + dnam{"𞤫𞤤𞤫𞤳𞤼𞤮𞤾𞤮𞤤𞤼𞤵"} + one{"{0} 𞤫𞤜"} + other{"{0} 𞤫𞤜"} + } + foodcalorie{ + dnam{"𞤺𞤵𞤤"} + one{"{0} 𞤺𞤵𞤤"} + other{"{0} 𞤺𞤵𞤤"} + } + joule{ + dnam{"𞥁𞤵𞥅𞤤𞤶𞤭"} + one{"{0} 𞤟"} + other{"{0} 𞤟"} + } + kilocalorie{ + dnam{"𞤳𞤺𞤵𞤤"} + one{"{0} 𞤳𞤺𞤵𞤤"} + other{"{0} 𞤳𞤺𞤵𞤤"} + } + kilojoule{ + dnam{"𞤳𞤭𞤤𞤮𞥁𞤵𞥅𞤤𞤱𞤵"} + one{"{0} 𞤳𞥁"} + other{"{0} 𞤳𞥁"} + } + kilowatt-hour{ + dnam{"𞤳𞤏-𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + one{"{0} 𞤳𞤏𞤶"} + other{"{0} 𞤳𞤏𞤶"} + } + therm-us{ + dnam{"𞤲𞤺𞤵𞤤𞤣𞤭𞤲𞤳𞤮 𞤁𞤀"} + one{"{0} 𞤲𞤺𞤣𞤳𞤮 𞤁𞤀"} + other{"{0} 𞤲𞤺𞤣𞤳𞤮 𞤁𞤀"} + } + } + force{ + newton{ + dnam{"𞤲𞤫𞤱𞤼𞤮𞤲"} + one{"{0} 𞤐"} + other{"{0} 𞤐"} + } + } + frequency{ + gigahertz{ + dnam{"𞤘𞤖𞤪"} + one{"{0} 𞤘𞤖𞤪"} + other{"{0} 𞤘𞤖𞤪"} + } + hertz{ + dnam{"𞤖𞤪"} + one{"{0} 𞤖𞤪"} + other{"{0} 𞤖𞤪"} + } + kilohertz{ + dnam{"𞤳𞤖𞤪"} + one{"{0} 𞤳𞤖𞤪"} + other{"{0} 𞤳𞤖𞤪"} + } + megahertz{ + dnam{"𞤃𞤖𞤪"} + one{"{0} 𞤃𞤖𞤪"} + other{"{0} 𞤃𞤖𞤪"} + } + } + graphics{ + dot{ + dnam{"𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} + one{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} + other{"{0} 𞤼𞤮𞤩𞥆𞤫𞤪𞤫"} + } + dot-per-centimeter{ + dnam{"𞤼𞤩𞤧𞤥"} + one{"{0} 𞤼𞤩𞤧𞤥"} + other{"{0} 𞤼𞤩𞤧𞤥"} + } + dot-per-inch{ + dnam{"𞤼𞤩𞤺𞤰"} + one{"{0} 𞤼𞤩𞤺𞤰"} + other{"{0} 𞤼𞤩𞤺𞤰"} + } + em{ + dnam{"𞤭𞤥𞤵"} + one{"{0} 𞤭𞤥𞤵"} + other{"{0} 𞤭𞤥𞤵"} + } + megapixel{ + dnam{"𞤥𞤫𞤺𞤢𞤨𞤭𞤳𞤷𞤭"} + one{"{0} 𞤃𞤆"} + other{"{0} 𞤃𞤆"} + } + pixel{ + dnam{"𞤨𞤭𞤳𞤷𞤭"} + one{"{0} 𞤨𞤳"} + other{"{0} 𞤨𞤳"} + } + pixel-per-centimeter{ + dnam{"𞤨𞤳𞤣𞤧𞤥"} + one{"{0} 𞤨𞤳𞤣𞤧𞤥"} + other{"{0} 𞤨𞤳𞤣𞤧𞤥"} + } + pixel-per-inch{ + dnam{"𞤨𞤳𞤣𞤺𞤰"} + one{"{0} 𞤨𞤳𞤣𞤺𞤰"} + other{"{0} 𞤨𞤳𞤣𞤺𞤰"} + } + } length{ astronomical-unit{ - dnam{"𞤺𞤭"} - one{"{0} 𞤺𞤭"} - other{"{0} 𞤺𞤭"} + dnam{"𞤳𞤵"} + one{"{0} 𞤳𞤵"} + other{"{0} 𞤳𞤵"} } centimeter{ dnam{"𞤧𞤥"} @@ -345,14 +1373,19 @@ ff_Adlm{ one{"{0} 𞤣𞤥"} other{"{0} 𞤣𞤥"} } + earth-radius{ + dnam{"𞤂⊕"} + one{"{0} 𞤂⊕"} + other{"{0} 𞤂⊕"} + } foot{ - dnam{"𞤼𞤫"} - one{"{0} 𞤼𞤫"} - other{"{0} 𞤼𞤫"} - per{"{0}/𞤼𞤫"} + dnam{"𞤼𞤨"} + one{"{0} 𞤼𞤨"} + other{"{0} 𞤼𞤨"} + per{"{0}/𞤼𞤨"} } inch{ - dnam{"𞤺𞤮"} + dnam{"𞤲𞤺𞤮𞤪𞤰𞤭"} one{"{0} 𞤺𞤮"} other{"{0} 𞤺𞤮"} per{"{0}/𞤺𞤮"} @@ -370,12 +1403,12 @@ ff_Adlm{ } meter{ dnam{"𞤥"} - one{"{0}/𞤥"} - other{"{0}/𞤥"} + one{"{0} 𞤥"} + other{"{0} 𞤥"} per{"{0}/𞤥"} } micrometer{ - dnam{"𞤻𞤥"} + dnam{"𞤻𞤥𞤫𞥅𞤼𞤭"} one{"{0} 𞤻𞤥"} other{"{0} 𞤻𞤥"} } @@ -415,14 +1448,397 @@ ff_Adlm{ other{"{0} 𞤨𞤥"} } point{ - dnam{"𞤼𞤩"} - one{"{0} 𞤼𞤩"} - other{"{0} 𞤼𞤩"} + dnam{"𞤶𞤣"} + one{"{0} 𞤶𞤣"} + other{"{0} 𞤶𞤣"} + } + solar-radius{ + dnam{"𞤤𞤢𞥄𞤧𞤮𞤤 𞤲𞤢𞥄𞤲𞤺𞤫𞤴𞤢𞤲𞤳𞤮"} + one{"{0} 𞤂☉"} + other{"{0} 𞤂☉"} } yard{ - dnam{"𞤴𞤣"} - one{"{0} 𞤴𞤣"} - other{"{0} 𞤴𞤣"} + dnam{"𞤧𞤮𞤺𞤮𞤲𞤫"} + one{"{0} 𞤧𞤮"} + other{"{0} 𞤧𞤮"} + } + } + mass{ + carat{ + dnam{"𞤳𞤭𞤪𞤭𞤪𞤼𞤭"} + one{"{0} 𞤑𞤈"} + other{"{0} 𞤑𞤈"} + } + dalton{ + dnam{"𞤣𞤢𞤤𞤼𞤮𞥅𞤲𞤭"} + one{"{0} 𞤁𞤢"} + other{"{0} 𞤁𞤢"} + } + earth-mass{ + dnam{"𞤲𞤭𞥅𞤧𞤵𞥅𞤶𞤭 𞤤𞤫𞤴𞤣𞤭 𞤲𞤣𞤭𞤲"} + one{"{0} 𞤐⊕"} + other{"{0} 𞤐⊕"} + } + grain{ + dnam{"𞤺𞤢𞤰𞥆𞤫"} + one{"{0} 𞤺𞤢𞤰"} + other{"{0} 𞤺𞤢𞤰"} + } + gram{ + dnam{"𞤺𞤢𞤪𞤬𞤭"} + one{"{0} 𞤺"} + other{"{0} 𞤺"} + per{"{0}/𞤺"} + } + kilogram{ + dnam{"𞤳𞤺"} + one{"{0} 𞤳𞤺"} + other{"{0} 𞤳𞤺"} + per{"{0}/𞤳𞤺"} + } + metric-ton{ + dnam{"𞤼"} + one{"{0} 𞤼"} + other{"{0} 𞤼"} + } + microgram{ + dnam{"𞤻𞤺"} + one{"{0} 𞤻𞤺"} + other{"{0} 𞤻𞤺"} + } + milligram{ + dnam{"𞤥𞤺"} + one{"{0} 𞤥𞤺"} + other{"{0} 𞤥𞤺"} + } + ounce{ + dnam{"𞤱𞤺"} + one{"{0} 𞤱𞤺"} + other{"{0} 𞤱𞤺"} + per{"{0}/𞤱𞤺"} + } + ounce-troy{ + dnam{"𞤱𞤺 𞤥𞤫𞤲𞤳𞤫𞤤𞤣𞤫"} + one{"{0} 𞤱𞤺 𞤥𞤳"} + other{"{0} 𞤱𞤺 𞤥𞤳"} + } + pound{ + dnam{"𞤺𞤢𞤪𞤤𞤭"} + one{"{0} 𞤺𞤤"} + other{"{0} 𞤺𞤤"} + per{"{0}/𞤺𞤤"} + } + solar-mass{ + dnam{"𞤲𞤭𞥅𞤧𞤵𞥅𞤶𞤭 𞤲𞤢𞥄𞤲𞤺𞤫 𞤲𞤺𞤫𞤲"} + one{"{0} 𞤐☉"} + other{"{0} 𞤐☉"} + } + ton{ + dnam{"𞤼𞤮𞥅𞤲𞤭"} + one{"{0} 𞤼𞤲"} + other{"{0} 𞤼𞤲"} + } + } + power{ + gigawatt{ + dnam{"𞤘𞤏"} + one{"{0} 𞤘𞤏"} + other{"{0} 𞤘𞤏"} + } + horsepower{ + dnam{"𞤷𞤨"} + one{"{0} 𞤷𞤨"} + other{"{0} 𞤷𞤨"} + } + kilowatt{ + dnam{"𞤳𞤏"} + one{"{0} 𞤳𞤏"} + other{"{0} 𞤳𞤏"} + } + megawatt{ + dnam{"𞤃𞤏"} + one{"{0} 𞤃𞤏"} + other{"{0} 𞤃𞤏"} + } + milliwatt{ + dnam{"𞤥𞤏"} + one{"{0} 𞤥𞤏"} + other{"{0} 𞤥𞤏"} + } + watt{ + dnam{"𞤱𞤢𞥄𞤼𞤭"} + one{"{0} 𞤏"} + other{"{0} 𞤏"} + } + } + pressure{ + atmosphere{ + dnam{"𞤦𞤫𞤧"} + one{"{0} 𞤦𞤫𞤧"} + other{"{0} 𞤦𞤫𞤧"} + } + bar{ + dnam{"𞤦𞤢𞤪𞤤𞤵"} + one{"{0} 𞤦𞤢𞤪"} + other{"{0} 𞤦𞤢𞤪"} + } + hectopascal{ + dnam{"𞤸𞤆𞤢"} + one{"{0} 𞤸𞤆𞤢"} + other{"{0} 𞤸𞤆𞤢"} + } + inch-ofhg{ + dnam{"𞤺𞤮𞤖𞤺"} + one{"{0} 𞤺𞤮𞤖𞤺"} + other{"{0} 𞤺𞤮𞤖𞤺"} + } + kilopascal{ + dnam{"𞤳𞤆𞤢"} + one{"{0} 𞤳𞤆𞤢"} + other{"{0} 𞤳𞤆𞤢"} + } + megapascal{ + dnam{"𞤃𞤆𞤢"} + one{"{0} 𞤃𞤆𞤢"} + other{"{0} 𞤃𞤆𞤢"} + } + millibar{ + dnam{"𞤥𞤦𞤢𞤪"} + one{"{0} 𞤥𞤦𞤢𞤪"} + other{"{0} 𞤥𞤦𞤢𞤪"} + } + millimeter-ofhg{ + dnam{"𞤥𞤥𞤖𞤺"} + one{"{0} 𞤥𞤥𞤖𞤺"} + other{"{0} 𞤥𞤥𞤖𞤺"} + } + pascal{ + dnam{"𞤆𞤢"} + one{"{0} 𞤆𞤢"} + other{"{0} 𞤆𞤢"} + } + pound-force-per-square-inch{ + dnam{"𞤺𞤣𞤺𞤮"} + one{"{0} 𞤺𞤣𞤺𞤮"} + other{"{0} 𞤺𞤣𞤺𞤮"} + } + } + speed{ + kilometer-per-hour{ + dnam{"𞤳𞤥/𞤲𞤶𞤢𞤥𞤣𞤭"} + one{"{0} 𞤳𞤥/𞤶"} + other{"{0} 𞤳𞤥/𞤶"} + } + knot{ + dnam{"𞤨𞤩"} + one{"{0} 𞤨𞤩"} + other{"{0} 𞤨𞤩"} + } + meter-per-second{ + dnam{"𞤥𞤫𞥅𞤼𞤭/𞤳𞤭𞤲"} + one{"{0} 𞤥/𞤳𞤭𞤲"} + other{"{0} 𞤥/𞤳𞤭𞤲"} + } + mile-per-hour{ + dnam{"𞤥𞤢𞤴𞤤𞤭/𞤲𞤶𞤢𞤥𞤲𞤣𞤭"} + one{"{0} 𞤥𞤢𞥋𞤣𞤶"} + other{"{0} 𞤥𞤢𞥋𞤣𞤶"} + } + } + temperature{ + celsius{ + dnam{"𞤶𞤫𞤩. 𞤅"} + one{"{0}°𞤅"} + other{"{0}°𞤅"} + } + fahrenheit{ + dnam{"𞤶𞤫𞤩. 𞤊"} + one{"{0}°𞤊"} + other{"{0}°𞤊"} + } + kelvin{ + dnam{"𞤑"} + one{"{0} 𞤑"} + other{"{0} 𞤑"} + } + } + torque{ + newton-meter{ + dnam{"𞤐.𞤥"} + one{"{0} 𞤐.𞤥"} + other{"{0} 𞤐.𞤥"} + } + } + volume{ + acre-foot{ + dnam{"𞤺𞤢𞤪𞤳𞤵 𞤼𞤨"} + one{"{0} 𞤺𞤢 𞤼𞤨"} + other{"{0} 𞤺𞤢 𞤼𞤨"} + } + barrel{ + dnam{"𞤺𞤮𞤲𞤺𞤮𞥅𞤪𞤵"} + one{"{0} 𞤺𞤮𞤺"} + other{"{0} 𞤺𞤮𞤺"} + } + centiliter{ + dnam{"𞤧𞤂"} + one{"{0} 𞤧𞤂"} + other{"{0} 𞤧𞤂"} + } + cubic-centimeter{ + dnam{"𞤧𞤥𞥓"} + one{"{0} 𞤧𞤥𞥓"} + other{"{0} 𞤧𞤥𞥓"} + per{"{0}/𞤧𞤥𞥓"} + } + cubic-foot{ + dnam{"𞤼𞤫𞤨𞥆𞤭𞥓"} + one{"{0} 𞤼𞤨𞥓"} + other{"{0} 𞤼𞤨𞥓"} + } + cubic-inch{ + dnam{"𞤲𞤺𞤮𞤪𞤰𞤭𞥓"} + one{"{0} 𞤺𞤮𞥓"} + other{"{0} 𞤺𞤮𞥓"} + } + cubic-kilometer{ + dnam{"𞤳𞤥𞥓"} + one{"{0} 𞤳𞤥𞥓"} + other{"{0} 𞤳𞤥𞥓"} + } + cubic-meter{ + dnam{"𞤥𞥓"} + one{"{0} 𞤥𞥓"} + other{"{0} 𞤥𞥓"} + per{"{0}/𞤥𞥓"} + } + cubic-mile{ + dnam{"𞤥𞤢𞥓"} + one{"{0} 𞤥𞤢𞥓"} + other{"{0} 𞤥𞤢𞥓"} + } + cubic-yard{ + dnam{"𞤧𞤮𞤺𞤮𞤲𞤫𞥓"} + one{"{0} 𞤧𞤮𞥓"} + other{"{0} 𞤧𞤮𞥓"} + } + cup{ + dnam{"𞤳𞤮𞤪𞤲𞤣𞤮𞥅𞤤𞤫"} + one{"{0} 𞤳𞤮𞤪"} + other{"{0} 𞤳𞤮𞤪"} + } + cup-metric{ + dnam{"𞤳𞤮𞤪𞤥"} + one{"{0} 𞤳𞤮𞤪𞤥"} + other{"{0} 𞤳𞤮𞤪𞤥"} + } + deciliter{ + dnam{"𞤣𞤂"} + one{"{0} 𞤣𞤂"} + other{"{0} 𞤣𞤂"} + } + dessert-spoon{ + dnam{"𞤳𞤤𞤤"} + one{"{0} 𞤳𞤤𞤤"} + other{"{0} 𞤳𞤤𞤤"} + } + dessert-spoon-imperial{ + dnam{"𞤳𞤤𞤤 𞤚𞤭𞤤."} + one{"{0} 𞤳𞤤𞤤 𞤚𞤭𞤤."} + other{"{0} 𞤳𞤤𞤤 𞤚𞤭𞤤."} + } + dram{ + dnam{"𞤣𞤭𞤪𞤸𞤢𞤥𞤵 𞤧𞤫𞤤𞤦𞤢𞤲"} + one{"{0} 𞤣𞤪 𞤧𞤫𞤤"} + other{"{0} 𞤣𞤪 𞤧𞤫𞤤"} + } + drop{ + dnam{"𞤧𞤭𞤲𞤼𞤫𞤪𞤫"} + one{"{0} 𞤧𞤭𞤲"} + other{"{0} 𞤷𞤭𞤲"} + } + fluid-ounce{ + dnam{"𞤱𞤺 𞤧𞤫𞤤"} + one{"{0} 𞤱𞤺 𞤧𞤫𞤤"} + other{"{0} 𞤱𞤺 𞤧𞤫𞤤"} + } + fluid-ounce-imperial{ + dnam{"𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤."} + one{"{0} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤."} + other{"{0} 𞤱𞤺 𞤧𞤫𞤤 𞤚𞤭𞤤."} + } + gallon{ + dnam{"𞤺𞤢𞤤"} + one{"{0} 𞤺𞤢𞤤"} + other{"{0} 𞤺𞤢𞤤"} + per{"{0}/𞤺𞤢𞤤"} + } + gallon-imperial{ + dnam{"𞤺𞤢𞤤 𞤚𞤭𞤤."} + one{"{0} 𞤺𞤢𞤤 𞤚𞤭𞤤."} + other{"{0} 𞤺𞤢𞤤 𞤚𞤭𞤤."} + per{"{0}/𞤺𞤢𞤤 𞤚𞤭𞤤."} + } + hectoliter{ + dnam{"𞤸𞤂"} + one{"{0} 𞤸𞤂"} + other{"{0} 𞤸𞤂"} + } + jigger{ + dnam{"𞤶𞤭𞤺𞥆𞤮"} + one{"{0} 𞤶𞤭𞤺𞥆𞤮"} + other{"{0} 𞤶𞤭𞤺𞥆𞤮"} + } + liter{ + dnam{"𞤤𞤭𞥅𞤼𞤭"} + one{"{0} 𞤂"} + other{"{0} 𞤂"} + per{"{0}/𞤂"} + } + megaliter{ + dnam{"𞤃𞤂"} + one{"{0} 𞤃𞤂"} + other{"{0} 𞤃𞤂"} + } + milliliter{ + dnam{"𞤥𞤂"} + one{"{0} 𞤥𞤂"} + other{"{0} 𞤥𞤂"} + } + pinch{ + dnam{"𞤩𞤵𞤷𞥆𞤢𞤲𞤣𞤫"} + one{"{0} 𞤩𞤵𞤷"} + other{"{0} 𞤩𞤵𞤷"} + } + pint{ + dnam{"𞤨𞤭𞤲𞤼𞤭"} + one{"{0} 𞤨𞤼"} + other{"{0} 𞤨𞤼"} + } + pint-metric{ + dnam{"𞤨𞤼𞤥"} + one{"{0} 𞤨𞤼𞤥"} + other{"{0} 𞤨𞤼𞤥"} + } + quart{ + dnam{"𞤳𞤼𞤭"} + one{"{0} 𞤳𞤼"} + other{"{0} 𞤳𞤼"} + } + quart-imperial{ + dnam{"𞤳𞤼 𞤚𞤭𞤤"} + one{"{0} 𞤳𞤼 𞤚𞤭𞤤."} + other{"{0} 𞤳𞤼 𞤚𞤭𞤤."} + } + tablespoon{ + dnam{"𞤳𞤤𞤻"} + one{"{0} 𞤳𞤤𞤻"} + other{"{0} 𞤳𞤤𞤻"} + } + teaspoon{ + dnam{"𞤳𞤤𞤦"} + one{"{0} 𞤳𞤤𞤦"} + other{"{0} 𞤳𞤤𞤦"} } } } diff --git a/intl/icu/source/data/unit/ff_CM.txt b/intl/icu/source/data/unit/ff_CM.txt index c381f6cd740d..0bf68ef91987 100644 --- a/intl/icu/source/data/unit/ff_CM.txt +++ b/intl/icu/source/data/unit/ff_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_CM{ "%%ALIAS"{"ff_Latn_CM"} } diff --git a/intl/icu/source/data/unit/ff_GN.txt b/intl/icu/source/data/unit/ff_GN.txt index c3a0bf3d7bf3..433db4db3d8d 100644 --- a/intl/icu/source/data/unit/ff_GN.txt +++ b/intl/icu/source/data/unit/ff_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_GN{ "%%ALIAS"{"ff_Latn_GN"} } diff --git a/intl/icu/source/data/unit/ff_Latn.txt b/intl/icu/source/data/unit/ff_Latn.txt index 3d8715b562c7..d30cb6250832 100644 --- a/intl/icu/source/data/unit/ff_Latn.txt +++ b/intl/icu/source/data/unit/ff_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ff_Latn_CM.txt b/intl/icu/source/data/unit/ff_Latn_CM.txt index a141c2f858f1..123bc57aeef0 100644 --- a/intl/icu/source/data/unit/ff_Latn_CM.txt +++ b/intl/icu/source/data/unit/ff_Latn_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ff_Latn_GN.txt b/intl/icu/source/data/unit/ff_Latn_GN.txt index b37284e2b028..54b7546ef6ba 100644 --- a/intl/icu/source/data/unit/ff_Latn_GN.txt +++ b/intl/icu/source/data/unit/ff_Latn_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ff_Latn_MR.txt b/intl/icu/source/data/unit/ff_Latn_MR.txt index 9b83c9511093..dd6364bc3bdf 100644 --- a/intl/icu/source/data/unit/ff_Latn_MR.txt +++ b/intl/icu/source/data/unit/ff_Latn_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ff_Latn_SN.txt b/intl/icu/source/data/unit/ff_Latn_SN.txt index 6112f6fdf109..33ed4073beb5 100644 --- a/intl/icu/source/data/unit/ff_Latn_SN.txt +++ b/intl/icu/source/data/unit/ff_Latn_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ff_MR.txt b/intl/icu/source/data/unit/ff_MR.txt index 17a887321fa0..1da6e5116ae4 100644 --- a/intl/icu/source/data/unit/ff_MR.txt +++ b/intl/icu/source/data/unit/ff_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_MR{ "%%ALIAS"{"ff_Latn_MR"} } diff --git a/intl/icu/source/data/unit/ff_SN.txt b/intl/icu/source/data/unit/ff_SN.txt index c6908546784d..ca2f4ec58333 100644 --- a/intl/icu/source/data/unit/ff_SN.txt +++ b/intl/icu/source/data/unit/ff_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_SN{ "%%ALIAS"{"ff_Latn_SN"} } diff --git a/intl/icu/source/data/unit/fi.txt b/intl/icu/source/data/unit/fi.txt index 838e7d379608..783dda5eb376 100644 --- a/intl/icu/source/data/unit/fi.txt +++ b/intl/icu/source/data/unit/fi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi{ - Version{"37"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -139,9 +139,9 @@ fi{ other{"{0} promillea"} } permillion{ - dnam{"ppm"} - one{"{0} ppm"} - other{"{0} ppm"} + dnam{"miljoonasosat"} + one{"{0} miljoonasosa"} + other{"{0} miljoonasosaa"} } permyriad{ dnam{"peruspiste"} @@ -247,6 +247,11 @@ fi{ other{"{0} päivää"} per{"{0} / päivä"} } + decade{ + dnam{"vuosikymmenet"} + one{"{0} vuosikymmen"} + other{"{0} vuosikymmentä"} + } hour{ dnam{"tunnit"} one{"{0} tunti"} @@ -397,6 +402,13 @@ fi{ other{"{0} megahertsiä"} } } + graphics{ + dot{ + dnam{"piste"} + one{"{0} piste"} + other{"{0} pistettä"} + } + } length{ astronomical-unit{ dnam{"astronomiset yksiköt"} @@ -414,6 +426,11 @@ fi{ one{"{0} desimetri"} other{"{0} desimetriä"} } + earth-radius{ + dnam{"Maan säteet"} + one{"{0} Maan säde"} + other{"{0} Maan sädettä"} + } fathom{ dnam{"sylet"} one{"{0} syli"} @@ -510,6 +527,16 @@ fi{ } } light{ + candela{ + dnam{"kandelat"} + one{"{0} kandela"} + other{"{0} kandelaa"} + } + lumen{ + dnam{"luumenit"} + one{"{0} luumen"} + other{"{0} luumenia"} + } lux{ dnam{"luksit"} one{"{0} luksi"} @@ -537,6 +564,11 @@ fi{ one{"{0} Maan massa"} other{"{0} Maan massaa"} } + grain{ + dnam{"graanit"} + one{"{0} graani"} + other{"{0} graania"} + } gram{ dnam{"grammat"} one{"{0} gramma"} @@ -647,8 +679,8 @@ fi{ } inch-ofhg{ dnam{"elohopeatuumat"} - one{"{0} tuuma elohopeaa"} - other{"{0} tuumaa elohopeaa"} + one{"{0} elohopeatuuma"} + other{"{0} elohopeatuumaa"} } kilopascal{ dnam{"kilopascalit"} @@ -667,8 +699,8 @@ fi{ } millimeter-ofhg{ dnam{"elohopeamillimetrit"} - one{"{0} millimetri elohopeaa"} - other{"{0} millimetriä elohopeaa"} + one{"{0} elohopeamillimetri"} + other{"{0} elohopeamillimetriä"} } pascal{ dnam{"pascalit"} @@ -810,6 +842,26 @@ fi{ one{"{0} desilitra"} other{"{0} desilitraa"} } + dessert-spoon{ + dnam{"jälkiruokalusikat"} + one{"{0} jälkiruokalusikka"} + other{"{0} jälkiruokalusikkaa"} + } + dessert-spoon-imperial{ + dnam{"Imp. jälkiruokalusikat"} + one{"{0} imp. jälkiruokalusikka"} + other{"{0} imp. jälkiruokalusikkaa"} + } + dram{ + dnam{"dramit"} + one{"{0} dram"} + other{"{0} dramia"} + } + drop{ + dnam{"tipat"} + one{"{0} tippa"} + other{"{0} tippaa"} + } fluid-ounce{ dnam{"nesteunssit"} one{"{0} nesteunssi"} @@ -837,6 +889,11 @@ fi{ one{"{0} hehtolitra"} other{"{0} hehtolitraa"} } + jigger{ + dnam{"jiggerit"} + one{"{0} jigger"} + other{"{0} jiggeriä"} + } liter{ dnam{"litrat"} one{"{0} litra"} @@ -853,6 +910,11 @@ fi{ one{"{0} millilitra"} other{"{0} millilitraa"} } + pinch{ + dnam{"ripaus"} + one{"{0} ripaus"} + other{"{0} ripausta"} + } pint{ dnam{"pintit"} one{"{0} pint"} @@ -868,6 +930,11 @@ fi{ one{"{0} neljännesgallona"} other{"{0} neljännesgallonaa"} } + quart-imperial{ + dnam{"Imp. neljännesgallonat"} + one{"{0} imp. neljännesgallona"} + other{"{0} imp. neljännesgallonaa"} + } tablespoon{ dnam{"ruokalusikat"} one{"{0} ruokalusikka"} @@ -2152,6 +2219,13 @@ fi{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"piste"} + one{"{0} piste"} + other{"{0} pistettä"} + } + } length{ astronomical-unit{ dnam{"au"} @@ -2286,6 +2360,11 @@ fi{ earth-mass{ dnam{"Maan massat"} } + grain{ + dnam{"graanit"} + one{"{0} graani"} + other{"{0} graania"} + } gram{ dnam{"g"} one{"{0} g"} @@ -2395,9 +2474,9 @@ fi{ other{"{0} mbar"} } millimeter-ofhg{ - dnam{"mm Hg"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} + dnam{"mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} } pound-force-per-square-inch{ dnam{"psi"} @@ -2532,6 +2611,26 @@ fi{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"jrkl"} + one{"{0} jrkl"} + other{"{0} jrkl"} + } + dessert-spoon-imperial{ + dnam{"imp. jrkl"} + one{"{0} imp. jrkl"} + other{"{0} imp. jrkl"} + } + dram{ + dnam{"dramit"} + one{"{0} dram"} + other{"{0} dramia"} + } + drop{ + dnam{"tipat"} + one{"{0} tippa"} + other{"{0} tippaa"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2557,6 +2656,11 @@ fi{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"jiggerit"} + one{"{0} jigger"} + other{"{0} jiggeriä"} + } liter{ dnam{"l"} one{"{0} l"} @@ -2573,6 +2677,11 @@ fi{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"ripaus"} + one{"{0} ripaus"} + other{"{0} ripausta"} + } pint{ dnam{"pt"} one{"{0} pt"} diff --git a/intl/icu/source/data/unit/fil.txt b/intl/icu/source/data/unit/fil.txt index e8e1dfd530eb..eb2e9cf7a48d 100644 --- a/intl/icu/source/data/unit/fil.txt +++ b/intl/icu/source/data/unit/fil.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -398,6 +398,11 @@ fil{ } } graphics{ + dot{ + dnam{"tuldok"} + one{"{0} tuldok"} + other{"{0} tuldok"} + } dot-per-centimeter{ dnam{"tuldok bawat sentimetro"} one{"{0} tuldok bawat sentimetro"} @@ -449,6 +454,11 @@ fil{ one{"{0} decimetro"} other{"{0} na decimetro"} } + earth-radius{ + dnam{"earth radius"} + one{"{0} earth radius"} + other{"{0} na earth radius"} + } fathom{ dnam{"fathoms"} one{"{0} fathom"} @@ -545,6 +555,16 @@ fil{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -572,6 +592,11 @@ fil{ one{"{0} Earth mass"} other{"{0} Earth mass"} } + grain{ + dnam{"butil"} + one{"{0} butil"} + other{"{0} butil"} + } gram{ dnam{"gramo"} one{"{0} gramo"} @@ -777,6 +802,11 @@ fil{ one{"{0} bariles"} other{"{0} bariles"} } + bushel{ + dnam{"mga bushel"} + one{"{0} bushel"} + other{"{0} mga bushel"} + } centiliter{ dnam{"sentilitro"} one{"{0} sentilitro"} @@ -834,6 +864,21 @@ fil{ one{"{0} decilitro"} other{"{0} na decilitro"} } + dessert-spoon{ + dnam{"kutsarang panghimagas"} + one{"{0} kutsarang panghimagas"} + other{"{0} kutsarang panghimagas"} + } + dessert-spoon-imperial{ + dnam{"Imp. na kutsarang panghimagas"} + one{"{0} Imp. na kutsarang panghimagas"} + other{"{0} Imp. na kutsarang panghimagas"} + } + drop{ + dnam{"patak"} + one{"{0} patak"} + other{"{0} patak"} + } fluid-ounce{ dnam{"fluid ounces"} one{"{0} fluid ounce"} @@ -877,6 +922,11 @@ fil{ one{"{0} mililitro"} other{"{0} mililitro"} } + pinch{ + dnam{"karampot"} + one{"{0} karampot"} + other{"{0} karampot"} + } pint{ dnam{"pints"} one{"{0} pint"} @@ -892,6 +942,11 @@ fil{ one{"{0} quart"} other{"{0} na quarts"} } + quart-imperial{ + dnam{"Imp. na kuwart"} + one{"{0} Imp. na kuwart"} + other{"{0} Imp. na kuwart"} + } tablespoon{ dnam{"kutsara"} one{"{0} kutsara"} @@ -1687,6 +1742,11 @@ fil{ } } graphics{ + dot{ + dnam{"tuldok"} + one{"{0} tuldok"} + other{"{0} tuldok"} + } pixel{ dnam{"mga pixel"} } @@ -1708,6 +1768,10 @@ fil{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + one{"{0} na R⊕"} + other{"{0} na R⊕"} + } fathom{ dnam{"fathoms"} one{"{0} fth"} @@ -1829,6 +1893,11 @@ fil{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"butil"} + one{"{0} butil"} + other{"{0} butil"} + } gram{ dnam{"gramo"} one{"{0} g"} @@ -2028,6 +2097,9 @@ fil{ barrel{ dnam{"bariles"} } + bushel{ + dnam{"mga bushel"} + } centiliter{ dnam{"cL"} one{"{0} cL"} @@ -2085,6 +2157,11 @@ fil{ one{"{0} dL"} other{"{0} dL"} } + drop{ + dnam{"patak"} + one{"{0} patak"} + other{"{0} patak"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2123,6 +2200,11 @@ fil{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"karampot"} + one{"{0} karampot"} + other{"{0} karampot"} + } pint{ dnam{"pints"} one{"{0} pt"} @@ -2138,6 +2220,9 @@ fil{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"Imp na kuwart"} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/fil_PH.txt b/intl/icu/source/data/unit/fil_PH.txt index 5b83d8215fcb..481c955f9053 100644 --- a/intl/icu/source/data/unit/fil_PH.txt +++ b/intl/icu/source/data/unit/fil_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/fo.txt b/intl/icu/source/data/unit/fo.txt index 574e98f1b01d..4496577758f0 100644 --- a/intl/icu/source/data/unit/fo.txt +++ b/intl/icu/source/data/unit/fo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -398,6 +398,11 @@ fo{ } } graphics{ + dot{ + dnam{"punkt"} + one{"{0} punkt"} + other{"{0} punkt"} + } dot-per-centimeter{ dnam{"punkt fyri hvønn sentimetur"} one{"{0} punkt fyri hvønn sentimetur"} @@ -449,12 +454,27 @@ fo{ one{"{0} desimetur"} other{"{0} desimetrar"} } + earth-radius{ + dnam{"radius á jørðuni"} + one{"{0} radius á jørðuni"} + other{"{0} radius á jørðuni"} + } + fathom{ + dnam{"favnar"} + one{"{0} favnur"} + other{"{0} favnar"} + } foot{ dnam{"føtur"} one{"{0} fótur"} other{"{0} føtur"} per{"{0}/fót"} } + furlong{ + dnam{"furlongrar"} + one{"{0} furlongur"} + other{"{0} furlongrar"} + } inch{ dnam{"tummar"} one{"{0} tummi"} @@ -519,9 +539,9 @@ fo{ other{"{0} picometrar"} } point{ - dnam{"punkt"} - one{"{0} punkt"} - other{"{0} punkt"} + dnam{"prikkar"} + one{"{0} prikkur"} + other{"{0} prikkar"} } solar-radius{ dnam{"sólarradii"} @@ -535,6 +555,16 @@ fo{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"luks"} one{"{0} luks"} @@ -611,6 +641,11 @@ fo{ one{"{0} sólarmassi"} other{"{0} sólarmassar"} } + stone{ + dnam{"stones"} + one{"{0} stone"} + other{"{0} stones"} + } ton{ dnam{"stutt tons"} one{"{0} stutt tons"} @@ -687,13 +722,13 @@ fo{ } pascal{ dnam{"pascal"} - one{"{0} Pascal"} - other{"{0} Pascal"} + one{"{0} pascal"} + other{"{0} pascal"} } pound-force-per-square-inch{ - dnam{"psi"} - one{"{0} psi"} - other{"{0} psi"} + dnam{"pund fyri hvønn kvadrattumma"} + one{"pund fyri hvønn kvadrattumma"} + other{"{0} pund fyri hvønn kvadrattumma"} } } speed{ @@ -763,6 +798,11 @@ fo{ one{"{0} tunna"} other{"{0} tunnur"} } + bushel{ + dnam{"skeppur"} + one{"{0} skeppa"} + other{"{0} skeppur"} + } centiliter{ dnam{"sentilitrar"} one{"{0} sentilitur"} @@ -820,6 +860,26 @@ fo{ one{"{0} desilitur"} other{"{0} desilitrar"} } + dessert-spoon{ + dnam{"dessertskeið"} + one{"{0} dessertskeið"} + other{"{0} dessertskeiðir"} + } + dessert-spoon-imperial{ + dnam{"bretsk dessertskeið"} + one{"{0} bretsk dessertskeið"} + other{"{0} bretskar dessertskeiðir"} + } + dram{ + dnam{"drammur"} + one{"{0} drammur"} + other{"{0} drammar"} + } + drop{ + dnam{"dropi"} + one{"{0} dropi"} + other{"{0} dropar"} + } fluid-ounce{ dnam{"flótandi unsur"} one{"{0} flótandi unsa"} @@ -847,6 +907,11 @@ fo{ one{"{0} hektolitur"} other{"{0} hektolitrar"} } + jigger{ + dnam{"snapsur"} + one{"{0} snapsur"} + other{"{0} snapsar"} + } liter{ dnam{"litrar"} one{"{0} litur"} @@ -863,6 +928,11 @@ fo{ one{"{0} millilitur"} other{"{0} millilitrar"} } + pinch{ + dnam{"vet"} + one{"{0} vet"} + other{"{0} vet"} + } pint{ dnam{"pints"} one{"{0} pint"} @@ -878,6 +948,11 @@ fo{ one{"{0} quart"} other{"{0} quarts"} } + quart-imperial{ + dnam{"bretskur quart"} + one{"{0} bretskur quart"} + other{"{0} bretskir quartar"} + } tablespoon{ dnam{"súpiskeiðir"} one{"{0} súpiskeið"} @@ -930,6 +1005,7 @@ fo{ } concentr{ percent{ + dnam{"%"} one{"{0} %"} other{"{0} %"} } @@ -1457,6 +1533,11 @@ fo{ } } graphics{ + dot{ + dnam{"punkt"} + one{"{0} punkt"} + other{"{0} punkt"} + } megapixel{ dnam{"megaskíggjadeplar"} } @@ -1481,12 +1562,22 @@ fo{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"favnar"} + one{"{0} favnur"} + other{"{0} favnar"} + } foot{ dnam{"føtur"} one{"{0} fótur"} other{"{0} føtur"} per{"{0}/fót"} } + furlong{ + dnam{"furlongrar"} + one{"{0} furlongur"} + other{"{0} furlongrar"} + } inch{ dnam{"tum."} one{"{0} tum."} @@ -1551,9 +1642,9 @@ fo{ other{"{0} pm"} } point{ - dnam{"pkt"} - one{"{0} pkt"} - other{"{0} pkt"} + dnam{"prikkar"} + one{"{0} prikkur"} + other{"{0} prikkar"} } solar-radius{ dnam{"sólarradii"} @@ -1633,6 +1724,11 @@ fo{ solar-mass{ dnam{"sólarmassi"} } + stone{ + dnam{"stones"} + one{"{0} stone"} + other{"{0} stones"} + } ton{ dnam{"stutt t"} one{"{0} stutt t"} @@ -1698,7 +1794,7 @@ fo{ other{"{0} mmHg"} } pascal{ - dnam{"pascal"} + dnam{"Pa"} } pound-force-per-square-inch{ dnam{"psi"} @@ -1761,6 +1857,11 @@ fo{ one{"{0} tunna"} other{"{0} tunnur"} } + bushel{ + dnam{"skeppur"} + one{"{0} skeppa"} + other{"{0} skeppur"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1818,6 +1919,26 @@ fo{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"dessertsk."} + one{"{0} dessertsk."} + other{"{0} dessertsk."} + } + dessert-spoon-imperial{ + dnam{"bretsk dessertsk."} + one{"{0} bretsk dessertsk."} + other{"{0} bretskar dessertsk."} + } + dram{ + dnam{"drammur"} + one{"{0} drammur"} + other{"{0} drammar"} + } + drop{ + dnam{"dropi"} + one{"{0} dropi"} + other{"{0} dropar"} + } fluid-ounce{ dnam{"flótandi unsur"} one{"{0} flótandi unsa"} @@ -1845,6 +1966,11 @@ fo{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"snapsur"} + one{"{0} snapsur"} + other{"{0} snapsar"} + } liter{ dnam{"l"} one{"{0} l"} @@ -1861,6 +1987,11 @@ fo{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"vet"} + one{"{0} vet"} + other{"{0} vet"} + } pint{ dnam{"pints"} one{"{0} pint"} @@ -1876,6 +2007,11 @@ fo{ one{"{0} quart"} other{"{0} quarts"} } + quart-imperial{ + dnam{"bretskur quart"} + one{"{0} bretskur quart"} + other{"{0} bretskir quartar"} + } tablespoon{ dnam{"súpisk."} one{"{0} súpisk."} diff --git a/intl/icu/source/data/unit/fr.txt b/intl/icu/source/data/unit/fr.txt index 407f11c15686..852de85de87b 100644 --- a/intl/icu/source/data/unit/fr.txt +++ b/intl/icu/source/data/unit/fr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ fr{ } } graphics{ + dot{ + dnam{"point"} + one{"{0} point"} + other{"{0} pts"} + } dot-per-centimeter{ dnam{"points par centimètre"} one{"{0} point par centimètre"} @@ -461,6 +466,11 @@ fr{ one{"{0} décimètre"} other{"{0} décimètres"} } + earth-radius{ + dnam{"rayon terrestre"} + one{"{0} rayon terrestre"} + other{"{0} rayons terrestres"} + } fathom{ dnam{"brasses"} one{"{0} brasse"} @@ -542,7 +552,7 @@ fr{ } point{ dnam{"points"} - one{"{0} point"} + one{"{0} point typographique"} other{"{0} points"} } solar-radius{ @@ -557,6 +567,11 @@ fr{ } } light{ + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumens"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -584,6 +599,10 @@ fr{ one{"{0} masse terrestre"} other{"{0} masses terrestres"} } + grain{ + one{"{0} grain"} + other{"{0} grains"} + } gram{ dnam{"grammes"} one{"{0} gramme"} @@ -795,6 +814,11 @@ fr{ one{"{0} baril"} other{"{0} barils"} } + bushel{ + dnam{"boisseaux"} + one{"{0} boisseau"} + other{"{0} boisseaux"} + } centiliter{ dnam{"centilitres"} one{"{0} centilitre"} @@ -852,6 +876,26 @@ fr{ one{"{0} décilitre"} other{"{0} décilitres"} } + dessert-spoon{ + dnam{"cuillère à dessert"} + one{"{0} cuillère à dessert"} + other{"{0} cuillères à dessert"} + } + dessert-spoon-imperial{ + dnam{"cuillère à dessert impériale"} + one{"{0} cuillère à dessert impériale"} + other{"{0} cuillères à dessert impériales"} + } + dram{ + dnam{"drachme"} + one{"{0} drachme"} + other{"{0} drachmes"} + } + drop{ + dnam{"goutte"} + one{"{0} goutte"} + other{"{0} gouttes"} + } fluid-ounce{ dnam{"onces liquides"} one{"{0} once liquide"} @@ -879,6 +923,11 @@ fr{ one{"{0} hectolitre"} other{"{0} hectolitres"} } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jiggers"} + } liter{ dnam{"litres"} one{"{0} litre"} @@ -895,6 +944,11 @@ fr{ one{"{0} millilitre"} other{"{0} millilitres"} } + pinch{ + dnam{"pincée"} + one{"{0} pincée"} + other{"{0} pincées"} + } pint{ dnam{"pintes"} one{"{0} pinte"} @@ -910,6 +964,11 @@ fr{ one{"{0} quart"} other{"{0} quarts"} } + quart-imperial{ + dnam{"quart impérial"} + one{"{0} quart impérial"} + other{"{0} quarts impériaux"} + } tablespoon{ dnam{"cuillères à soupe"} one{"{0} cuillère à soupe"} @@ -1589,7 +1648,7 @@ fr{ terabit{ dnam{"Tbit"} one{"{0} Tbit"} - other{"{0} Tb"} + other{"{0} Tbit"} } terabyte{ dnam{"To"} @@ -1767,6 +1826,11 @@ fr{ } } graphics{ + dot{ + dnam{"pt"} + one{"{0} pt"} + other{"{0} pts"} + } dot-per-centimeter{ dnam{"pt/cm"} one{"{0} pt/cm"} @@ -1822,8 +1886,8 @@ fr{ } fathom{ dnam{"fm"} - one{"{0} fth"} - other{"{0} fth"} + one{"{0} fm"} + other{"{0} fm"} } foot{ dnam{"pi"} @@ -1900,9 +1964,9 @@ fr{ other{"{0} pm"} } point{ - dnam{"points"} - one{"{0} pt"} - other{"{0} pt"} + dnam{"points typographiques"} + one{"{0} pt typog."} + other{"{0} pts typog."} } solar-radius{ dnam{"R☉"} @@ -1942,6 +2006,10 @@ fr{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + one{"{0} grains"} + other{"{0} grains"} + } gram{ dnam{"g"} one{"{0} g"} @@ -2147,6 +2215,11 @@ fr{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"bu"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -2204,6 +2277,26 @@ fr{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"c. à d."} + one{"{0} c. à d."} + other{"{0} c. à d."} + } + dessert-spoon-imperial{ + dnam{"c. à d. imp."} + one{"{0} c. à d. imp."} + other{"{0} c. à d. imp."} + } + dram{ + dnam{"drachme fluide"} + one{"{0} fl dr"} + other{"{0} fl dr"} + } + drop{ + dnam{"gte"} + one{"{0} gte"} + other{"{0} gte"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2231,6 +2324,11 @@ fr{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jiggers"} + } liter{ dnam{"l"} one{"{0} l"} @@ -2247,6 +2345,11 @@ fr{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"pincée"} + one{"{0} pincée"} + other{"{0} pincées"} + } pint{ dnam{"pte"} one{"{0} pte"} @@ -2262,6 +2365,11 @@ fr{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt imp."} + one{"{0} qt imp."} + other{"{0} qt imp."} + } tablespoon{ dnam{"c. à s."} one{"{0} c. à s."} diff --git a/intl/icu/source/data/unit/fr_CA.txt b/intl/icu/source/data/unit/fr_CA.txt index 037f68a59ec5..eb932b4ad997 100644 --- a/intl/icu/source/data/unit/fr_CA.txt +++ b/intl/icu/source/data/unit/fr_CA.txt @@ -1,11 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CA{ - Version{"37"} units{ acceleration{ g-force{ - dnam{"force G"} + dnam{"force g"} } meter-per-square-second{ one{"{0} mètre par seconde carrée"} @@ -13,14 +13,6 @@ fr_CA{ } } angle{ - arc-minute{ - one{"{0} minute d’angle"} - other{"{0} minutes d’angle"} - } - arc-second{ - one{"{0} seconde d’angle"} - other{"{0} secondes d’angle"} - } degree{ one{"{0} degré"} other{"{0} degrés"} @@ -325,6 +317,9 @@ fr_CA{ } } light{ + candela{ + dnam{"candela"} + } lux{ one{"{0} lux"} other{"{0} lux"} @@ -335,6 +330,9 @@ fr_CA{ one{"{0} carat"} other{"{0} carats"} } + grain{ + dnam{"grain"} + } gram{ one{"{0} gramme"} other{"{0} grammes"} @@ -485,6 +483,11 @@ fr_CA{ one{"{0} hectolitre"} other{"{0} hectolitres"} } + jigger{ + dnam{"gobelet doseur"} + one{"{0} gobelet doseur"} + other{"{0} gobelets doseurs"} + } liter{ one{"{0} litre"} other{"{0} litres"} @@ -503,6 +506,11 @@ fr_CA{ one{"{0} pinte"} other{"{0} pintes"} } + quart-imperial{ + dnam{"pinte impériale"} + one{"{0} pinte impériale"} + other{"{0} pintes impériales"} + } teaspoon{ dnam{"cuillères à thé"} one{"{0} cuillère à thé"} @@ -756,6 +764,8 @@ fr_CA{ } mile-per-gallon-imperial{ dnam{"mi/gal Imp"} + one{"{0} mi/gal Imp"} + other{"{0} mi/gal Imp"} } } digital{ @@ -915,6 +925,23 @@ fr_CA{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"p"} + one{"{0} p"} + other{"{0} p"} + } + dot-per-centimeter{ + dnam{"ppcm"} + one{"{0} ppcm"} + other{"{0} ppcm"} + } + dot-per-inch{ + dnam{"ppp"} + one{"{0} ppp"} + other{"{0} ppp"} + } + } length{ astronomical-unit{ one{"{0} ua"} @@ -994,6 +1021,10 @@ fr_CA{ one{"{0} ct"} other{"{0} ct"} } + grain{ + one{"{0} grain"} + other{"{0} grains"} + } gram{ one{"{0} g"} other{"{0} g"} @@ -1158,6 +1189,26 @@ fr_CA{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"cuill. à d."} + one{"{0} cuill. à d."} + other{"{0} cuill. à d."} + } + dessert-spoon-imperial{ + dnam{"cuill. à d. imp."} + one{"{0} cuill. à d. imp."} + other{"{0} cuill. à d. imp."} + } + dram{ + dnam{"dram liquide"} + one{"{0} dram liq"} + other{"{0} dram liq"} + } + drop{ + dnam{"goutte"} + one{"{0} goutte"} + other{"{0} gouttes"} + } fluid-ounce{ dnam{"oz liq."} one{"{0} oz liq."} @@ -1179,6 +1230,11 @@ fr_CA{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"gobelet doseur"} + one{"{0} gobelet doseur"} + other{"{0} gobelets doseurs"} + } liter{ dnam{"L"} one{"{0} L"} @@ -1205,6 +1261,11 @@ fr_CA{ one{"{0} pte"} other{"{0} pte"} } + quart-imperial{ + dnam{"pte Imp"} + one{"{0} pte Imp"} + other{"{0} pte Imp"} + } teaspoon{ dnam{"c. à t."} one{"{0} c. à t."} diff --git a/intl/icu/source/data/unit/fr_HT.txt b/intl/icu/source/data/unit/fr_HT.txt index a41fd505929c..52988f0f3304 100644 --- a/intl/icu/source/data/unit/fr_HT.txt +++ b/intl/icu/source/data/unit/fr_HT.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_HT{ - Version{"37"} units{ area{ hectare{ diff --git a/intl/icu/source/data/unit/fur.txt b/intl/icu/source/data/unit/fur.txt index 1bf73820331c..66a5f2ae9ee6 100644 --- a/intl/icu/source/data/unit/fur.txt +++ b/intl/icu/source/data/unit/fur.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fur{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/fy.txt b/intl/icu/source/data/unit/fy.txt index b558cfdbf5cf..7dfa402a6b61 100644 --- a/intl/icu/source/data/unit/fy.txt +++ b/intl/icu/source/data/unit/fy.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fy{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/ga.txt b/intl/icu/source/data/unit/ga.txt index 7e3cf3f19d35..5ca10df9c7f0 100644 --- a/intl/icu/source/data/unit/ga.txt +++ b/intl/icu/source/data/unit/ga.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -78,7 +78,7 @@ ga{ two{"{0} acra"} } dunam{ - dnam{"dunaim"} + dnam{"dúnaim"} few{"{0} dhunam"} many{"{0} ndunam"} one{"{0} dunam"} @@ -160,8 +160,8 @@ ga{ } concentr{ karat{ - dnam{"carait óir"} - few{"{0} charat óir"} + dnam{"carait"} + few{"{0} charat"} many{"{0} gcarat óir"} one{"{0} charat óir"} other{"{0} carat óir"} @@ -209,17 +209,17 @@ ga{ } permillion{ dnam{"codanna sa mhilliún"} - few{"{0} sa mhilliún"} - many{"{0} sa mhilliún"} - one{"{0} sa mhilliún"} - other{"{0} sa mhilliún"} - two{"{0} sa mhilliún"} + few{"{0} chuid sa mhilliún"} + many{"{0} gcuid sa mhilliún"} + one{"{0} chuid sa mhilliún"} + other{"{0} cuid sa mhilliún"} + two{"{0} chuid sa mhilliún"} } permyriad{ - dnam{"permeiriad"} + dnam{"faoin deich míle"} few{"{0}‱"} many{"{0}‱"} - one{"{0} permeiriad"} + one{"{0} faoin deich míle"} other{"{0}‱"} two{"{0}‱"} } @@ -331,7 +331,7 @@ ga{ two{"{0} mheigibheart"} } petabyte{ - dnam{"peitibheart"} + dnam{"peitibhearta"} few{"{0} PB"} many{"{0} PB"} one{"{0} peitibheart"} @@ -496,10 +496,10 @@ ga{ } energy{ british-thermal-unit{ - dnam{"aonad teirmeach Briotanach"} + dnam{"teas-aonaid Bhriotanacha"} few{"{0} Btu"} many{"{0} Btu"} - one{"{0} aonad teirmeach Briontanach"} + one{"{0} theas-aonad Briotanach"} other{"{0} aonad teirmeach Briotanach"} two{"{0} Btu"} } @@ -512,11 +512,11 @@ ga{ two{"{0} chalra"} } electronvolt{ - dnam{"leictravoltaí"} + dnam{"leictreonvoltanna"} few{"{0} eV"} many{"{0} eV"} one{"{0} leictreavolta"} - other{"{0} leictreavoltaí"} + other{"{0} leictreonvolta"} two{"{0} eV"} } foodcalorie{ @@ -560,12 +560,12 @@ ga{ two{"{0} chileavatuair"} } therm-us{ - dnam{"teirmeacha US"} - few{"{0} theirm US"} - many{"{0} dteirm US"} - one{"{0} teirm US"} - other{"{0} teirm US"} - two{"{0} theirm US"} + dnam{"teirmeacha SAM"} + few{"{0} theirm SAM"} + many{"{0} dteirm SAM"} + one{"{0} teirm SAM"} + other{"{0} teirm SAM"} + two{"{0} theirm SAM"} } } force{ @@ -621,56 +621,69 @@ ga{ } } graphics{ + dot{ + dnam{"ponc"} + few{"{0} phonc"} + many{"{0} bponc"} + one{"{0} phonc"} + other{"{0} ponc"} + two{"{0} phonc"} + } dot-per-centimeter{ dnam{"poncanna sa cheintiméadar"} - few{"{0} dpcm"} - many{"{0} dpcm"} - one{"{0} ponc sa cheintiméadar"} - other{"{0} poncanna sa cheintiméadar"} - two{"{0} dpcm"} + few{"{0} phonc sa cheintiméadar"} + many{"{0} bponc sa cheintiméadar"} + one{"{0} phonc sa cheintiméadar"} + other{"{0} ponc sa cheintiméadar"} + two{"{0} phonc sa cheintiméadar"} } dot-per-inch{ dnam{"poncanna san orlach"} - few{"{0} dpi"} - many{"{0} dpi"} - one{"{0} ponc san orlach"} - other{"{0} poncanna san orlach"} - two{"{0} dpi"} + few{"{0} phonc san orlach"} + many{"{0} bponc san orlach"} + one{"{0} phonc san orlach"} + other{"{0} ponc san orlach"} + two{"{0} phonc san orlach"} } em{ - dnam{"eim chlógrafach"} + dnam{"eim chlóghrafach"} + few{"{0} eim"} + many{"{0} n-eim"} + one{"{0} eim"} + other{"{0} eim"} + two{"{0} eim"} } megapixel{ dnam{"meigiphicteilíní"} - few{"{0} MP"} - many{"{0} MP"} - one{"{0} meigiphicteilín"} + few{"{0} mheigiphicteilín"} + many{"{0} meigiphicteilín"} + one{"{0} mheigiphicteilín"} other{"{0} meigiphicteilín"} - two{"{0} MP"} + two{"{0} mheigiphicteilín"} } pixel{ dnam{"picteilíní"} - few{"{0} px"} - many{"{0} px"} - one{"{0} picteilín"} + few{"{0} phicteilín"} + many{"{0} bpicteilín"} + one{"{0} phicteilín"} other{"{0} picteilín"} - two{"{0} px"} + two{"{0} phicteilín"} } pixel-per-centimeter{ dnam{"picteilíní sa cheintiméadar"} - few{"{0} ppcm"} - many{"{0} ppcm"} - one{"{0} picteilín sa cheintiméadar"} - other{"{0} picteilíní sa cheintiméadar"} - two{"{0} ppcm"} + few{"{0} phicteilín sa cheintiméadar"} + many{"{0} bpicteilín sa cheintiméadar"} + one{"{0} phicteilín sa cheintiméadar"} + other{"{0} picteilín sa cheintiméadar"} + two{"{0} phicteilín sa cheintiméadar"} } pixel-per-inch{ dnam{"picteilíní san orlach"} - few{"{0} ppi"} - many{"{0} ppi"} - one{"{0} picteilín san orlach"} + few{"{0} phicteilín san orlach"} + many{"{0} bpicteilín san orlach"} + one{"{0} phicteilín san orlach"} other{"{0} picteilín san orlach"} - two{"{0} ppi"} + two{"{0} phicteilín san orlach"} } } length{ @@ -699,6 +712,14 @@ ga{ other{"{0} deiciméadar"} two{"{0} dheiciméadar"} } + earth-radius{ + dnam{"ga an domhain"} + few{"{0} gha an domhain"} + many{"{0} nga an domhain"} + one{"{0} gha an domhain"} + other{"{0} ga an domhain"} + two{"{0} gha an domhain"} + } fathom{ dnam{"feánna"} few{"{0} fheá"} @@ -832,12 +853,12 @@ ga{ two{"{0} phointe"} } solar-radius{ - dnam{"raonta gréine"} - few{"{0} R☉"} - many{"{0} R☉"} - one{"{0} raon gréine"} - other{"{0} raon gréine"} - two{"{0} R☉"} + dnam{"grianghathanna"} + few{"{0} ghriangha"} + many{"{0} ngriangha"} + one{"{0} ghriangha"} + other{"{0} griangha"} + two{"{0} ghriangha"} } yard{ dnam{"slata"} @@ -849,6 +870,22 @@ ga{ } } light{ + candela{ + dnam{"caindéile"} + few{"{0} chaindéile"} + many{"{0} gcaindéile"} + one{"{0} chaindéile"} + other{"{0} caindéile"} + two{"{0} chaindéile"} + } + lumen{ + dnam{"lúman"} + few{"{0} lúman"} + many{"{0} lúman"} + one{"{0} lúman"} + other{"{0} lúman"} + two{"{0} lúman"} + } lux{ dnam{"lucsa"} few{"{0} lucsa"} @@ -858,12 +895,12 @@ ga{ two{"{0} lucsa"} } solar-luminosity{ - dnam{"lonrachtaí gréine"} + dnam{"grianlonrachas"} few{"{0} L☉"} many{"{0} L☉"} - one{"{0} lonracht ghréine"} - other{"{0} lonracht ghréine"} - two{"{0} L☉"} + one{"{0} ghrianlonrachas"} + other{"{0} grianlonrachas"} + two{"{0} ghrianlonrachas"} } } mass{ @@ -891,6 +928,14 @@ ga{ other{"{0} mais an Domhain"} two{"{0} mhais an Domhain"} } + grain{ + dnam{"gráinne"} + few{"{0} ghráinne"} + many{"{0} ngráinne"} + one{"{0} ghráinne"} + other{"{0} gráinne"} + two{"{0} ghráinne"} + } gram{ dnam{"graim"} few{"{0} ghram"} @@ -963,7 +1008,7 @@ ga{ dnam{"maiseanna gréine"} few{"{0} mhais ghréine"} many{"{0} mais ghréine"} - one{"{0} mais ghréine"} + one{"{0} mhais ghréine"} other{"{0} mais ghréine"} two{"{0} mhais ghréine"} } @@ -1036,15 +1081,15 @@ ga{ } pressure{ atmosphere{ - dnam{"atmaisféar"} - few{"{0} atm"} - many{"{0} atm"} + dnam{"atmaisféir"} + few{"{0} atmaisféar"} + many{"{0} n-atmaisféar"} one{"{0} atmaisféar"} other{"{0} atmaisféar"} - two{"{0} atm"} + two{"{0} atmaisféar"} } bar{ - dnam{"barraí"} + dnam{"bair"} few{"{0} bharra"} many{"{0} mbarra"} one{"{0} bharra"} @@ -1071,7 +1116,7 @@ ga{ dnam{"cileapascail"} few{"{0} kPa"} many{"{0} kPa"} - one{"{0} cileapascal"} + one{"{0} chileapascal"} other{"{0} kPa"} two{"{0} kPa"} } @@ -1079,7 +1124,7 @@ ga{ dnam{"meigeapascail"} few{"{0} MPa"} many{"{0} MPa"} - one{"meigeapascal"} + one{"{0} mheigeapascal"} other{"{0} meigeapascal"} two{"{0} MPa"} } @@ -1092,13 +1137,21 @@ ga{ two{"{0} mhilleabar"} } millimeter-ofhg{ - dnam{"milliméadair mhearcair"} + dnam{"milliméadair mearcair"} few{"{0} mhilliméadar mearcair"} many{"{0} milliméadar mearcair"} one{"{0} mhilliméadar mearcair"} other{"{0} milliméadar mearcair"} two{"{0} mhilliméadar mearcair"} } + pascal{ + dnam{"Pascail"} + few{"{0} phascal"} + many{"{0} bpascal"} + one{"{0} phascal"} + other{"{0} pascal"} + two{"{0} phascal"} + } pound-force-per-square-inch{ dnam{"puint san orlach cearnach"} few{"{0} phunt san orlach cearnach"} @@ -1181,9 +1234,9 @@ ga{ dnam{"méadar niútain"} few{"{0} N⋅m"} many{"{0} N⋅m"} - one{"{0} méadar niútain"} + one{"{0} mhéadar niútain"} other{"{0} méadar niútain"} - two{"{0} N⋅m"} + two{"{0} mhéadar niútain"} } pound-force-foot{ dnam{"punt-troigh"} @@ -1309,6 +1362,38 @@ ga{ other{"{0} deicilítear"} two{"{0} dheicilítear"} } + dessert-spoon{ + dnam{"spúnóga milseoige"} + few{"{0} spúnóg mhilseoige"} + many{"{0} spúnóg mhilseoige"} + one{"{0} spúnóg mhilseoige"} + other{"{0} spúnóg mhilseoige"} + two{"{0} spúnóg mhilseoige"} + } + dessert-spoon-imperial{ + dnam{"spúnóga milseoige impiriúla"} + few{"{0} spúnóg mhilseoige impiriúla"} + many{"{0} spúnóg mhilseoige impiriúla"} + one{"{0} spúnóg mhilseoige impiriúil"} + other{"{0} spúnóg mhilseoige impiriúol"} + two{"{0} spúnóg mhilseoige impiriúla"} + } + dram{ + dnam{"dram leachtach"} + few{"{0} dhram leachtacha"} + many{"{0} ndram leachtacha"} + one{"{0} dram leachtach"} + other{"{0} dram leachtach"} + two{"{0} dhram leachtacha"} + } + drop{ + dnam{"braon"} + few{"{0} bhraon"} + many{"{0} mbraon"} + one{"{0} bhraon"} + other{"{0} braon"} + two{"{0} bhraon"} + } fluid-ounce{ dnam{"unsaí leachtacha"} few{"{0} unsa leachtacha"} @@ -1323,7 +1408,7 @@ ga{ many{"{0} fl oz Imp."} one{"{0} unsa leachtach impiriúil"} other{"{0} fl oz Imp."} - two{"{0} unsa leachtach impiriúil"} + two{"{0} unsa leachtacha impiriúla"} } gallon{ dnam{"galúin"} @@ -1351,6 +1436,14 @@ ga{ other{"{0} heictilítear"} two{"{0} heictilítear"} } + jigger{ + dnam{"miosúr"} + few{"{0} mhiosúr"} + many{"{0} miosúr"} + one{"{0} mhiosúr"} + other{"{0} miosúr"} + two{"{0} mhiosúr"} + } liter{ dnam{"lítir"} few{"{0} lítear"} @@ -1376,6 +1469,14 @@ ga{ other{"{0} millilítear"} two{"{0} mhillilítear"} } + pinch{ + dnam{"pinse"} + few{"{0} phinse"} + many{"{0} bpinse"} + one{"{0} phinse"} + other{"{0} pinse"} + two{"{0} phinse"} + } pint{ dnam{"piontaí"} few{"{0} phionta"} @@ -1400,6 +1501,14 @@ ga{ other{"{0} cárt"} two{"{0} chárt"} } + quart-imperial{ + dnam{"cárt impiriúil"} + few{"{0} chárt impiriúla"} + many{"{0} gcárt impiriúla"} + one{"{0} chárt impiriúil"} + other{"{0} cárt impiriúil"} + two{"{0} chárt impiriúla"} + } tablespoon{ dnam{"spúnóga boird"} few{"{0} spúnóg bhoird"} @@ -3125,12 +3234,12 @@ ga{ two{"{0} kWh"} } therm-us{ - dnam{"teirmeacha US"} - few{"{0} theirm US"} - many{"{0} dteirm US"} - one{"{0} teirm US"} - other{"{0} teirm US"} - two{"{0} theirm US"} + dnam{"teirmeacha SAM"} + few{"{0} theirm SAM"} + many{"{0} dteirm SAM"} + one{"{0} teirm SAM"} + other{"{0} teirm SAM"} + two{"{0} theirm SAM"} } } force{ @@ -3186,6 +3295,22 @@ ga{ } } graphics{ + dot{ + dnam{"ponc"} + few{"{0} phonc"} + many{"{0} bponc"} + one{"{0} phonc"} + other{"{0} ponc"} + two{"{0} phonc"} + } + em{ + dnam{"eim"} + few{"{0} eim"} + many{"{0} n-eim"} + one{"{0} eim"} + other{"{0} eim"} + two{"{0} eim"} + } megapixel{ dnam{"meigiphicteilíní"} } @@ -3411,6 +3536,14 @@ ga{ other{"{0} M⊕"} two{"{0} M⊕"} } + grain{ + dnam{"gráinne"} + few{"{0} ghráinne"} + many{"{0} ngráinne"} + one{"{0} ghráinne"} + other{"{0} gráinne"} + two{"{0} ghráinne"} + } gram{ dnam{"graim"} few{"{0} g"} @@ -3829,6 +3962,38 @@ ga{ other{"{0} dl"} two{"{0} dl"} } + dessert-spoon{ + dnam{"spmhil"} + few{"{0} spmhil"} + many{"{0} spmhil"} + one{"{0} spmhil"} + other{"{0} spmhil"} + two{"{0} spmhil"} + } + dessert-spoon-imperial{ + dnam{"spmhil imp"} + few{"{0} spmhil imp"} + many{"{0} spmhil imp"} + one{"{0} spmhil imp"} + other{"{0} spmhil imp"} + two{"{0} spmhil imp"} + } + dram{ + dnam{"dr l."} + few{"{0} dr l."} + many{"{0} dr l."} + one{"{0} dr l."} + other{"{0} dr l."} + two{"{0} dr l."} + } + drop{ + dnam{"braon"} + few{"{0} bhraon"} + many{"{0} mbraon"} + one{"{0} bhraon"} + other{"{0} braon"} + two{"{0} bhraon"} + } fluid-ounce{ dnam{"unsaí leacht."} few{"{0} unsa l."} @@ -3871,6 +4036,14 @@ ga{ other{"{0} hl"} two{"{0} hl"} } + jigger{ + dnam{"miosúr"} + few{"{0} mhiosúr"} + many{"{0} miosúr"} + one{"{0} mhiosúr"} + other{"{0} miosúr"} + two{"{0} mhiosúr"} + } liter{ dnam{"lítir"} few{"{0} l"} @@ -3896,6 +4069,14 @@ ga{ other{"{0} ml"} two{"{0} ml"} } + pinch{ + dnam{"pinse"} + few{"{0} phinse"} + many{"{0} bpinse"} + one{"{0} phinse"} + other{"{0} pinse"} + two{"{0} phinse"} + } pint{ dnam{"piontaí"} few{"{0} pt"} @@ -3920,6 +4101,14 @@ ga{ other{"{0} cárt"} two{"{0} chárt"} } + quart-imperial{ + dnam{"cárt impiriúil"} + few{"{0} chárt impiriúla"} + many{"{0} gcárt impiriúla"} + one{"{0} chárt impiriúil"} + other{"{0} cárt impiriúil"} + two{"{0} chárt impiriúla"} + } tablespoon{ dnam{"spbh"} few{"{0} spbh"} diff --git a/intl/icu/source/data/unit/gd.txt b/intl/icu/source/data/unit/gd.txt index 3acde98886b8..61698d70a354 100644 --- a/intl/icu/source/data/unit/gd.txt +++ b/intl/icu/source/data/unit/gd.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gd{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -550,6 +550,13 @@ gd{ } } graphics{ + dot{ + dnam{"dotag"} + few{"{0} dotagan"} + one{"{0} dotag"} + other{"{0} dotag"} + two{"{0} dhotag"} + } dot-per-centimeter{ dnam{"dotag sa cheudameatair"} few{"{0} dotagan sa cheudameatair"} @@ -619,6 +626,13 @@ gd{ other{"{0} deicheamh-meatair"} two{"{0} dheicheamh-meatair"} } + earth-radius{ + dnam{"rèideas-talmhainn"} + few{"{0} rèideasan-talmhainn"} + one{"{0} rèideas-talmhainn"} + other{"{0} rèideas-talmhainn"} + two{"{0} rèideas-talmhainn"} + } fathom{ dnam{"aitheamh"} few{"{0} aitheamhan"} @@ -751,6 +765,20 @@ gd{ } } light{ + candela{ + dnam{"candela"} + few{"{0} candela"} + one{"{0} chandela"} + other{"{0} candela"} + two{"{0} chandela"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + two{"{0} lumen"} + } lux{ dnam{"lux"} few{"{0} lux"} @@ -788,6 +816,13 @@ gd{ other{"{0} tomad-talmhainn"} two{"{0} thomad-talmhainn"} } + grain{ + dnam{"gràinne"} + few{"{0} gràinnean"} + one{"{0} ghràinne"} + other{"{0} gràinne"} + two{"{0} gràinne"} + } gram{ dnam{"gram"} few{"{0} gramaichean"} @@ -1163,6 +1198,34 @@ gd{ other{"{0} deicheamh-liotair"} two{"{0} dheicheamh-liotair"} } + dessert-spoon{ + dnam{"spàin-mhìlsein"} + few{"{0} spàinean-mìlsein"} + one{"{0} spàin-mhìlsein"} + other{"{0} spàin-mhìlsein"} + two{"{0} spàin-mhìlsein"} + } + dessert-spoon-imperial{ + dnam{"spàin-mhìlsein ìmpireil"} + few{"{0} spàinean-mìlsein ìmpireil"} + one{"{0} spàin-mhìlsein ìmpireil"} + other{"{0} spàin-mhìlsein ìmpireil"} + two{"{0} spàin-mhìlsein ìmpireil"} + } + dram{ + dnam{"drama"} + few{"{0} dramaichean"} + one{"{0} drama"} + other{"{0} drama"} + two{"{0} dhrama"} + } + drop{ + dnam{"boinne"} + few{"{0} boinnean"} + one{"{0} bhoinne"} + other{"{0} boinne"} + two{"{0} bhoinne"} + } fluid-ounce{ dnam{"unnsa-dighe"} few{"{0} unnsachan-dighe"} @@ -1200,6 +1263,13 @@ gd{ other{"{0} heacta-liotair"} two{"{0} heacta-liotair"} } + jigger{ + dnam{"sigire"} + few{"{0} sigirean"} + one{"{0} sigire"} + other{"{0} sigire"} + two{"{0} sigire"} + } liter{ dnam{"liotair"} few{"{0} liotairean"} @@ -1222,6 +1292,13 @@ gd{ other{"{0} mililiotair"} two{"{0} mhililiotair"} } + pinch{ + dnam{"crudhagan"} + few{"{0} crudhagain"} + one{"{0} chrudhagan"} + other{"{0} crudhagan"} + two{"{0} chrudhagan"} + } pint{ dnam{"pinnt"} few{"{0} pinntean"} @@ -1243,6 +1320,13 @@ gd{ other{"{0} càrt"} two{"{0} chàrt"} } + quart-imperial{ + dnam{"càrt ìmpireil"} + few{"{0} càrtan ìmpireil"} + one{"{0} chàrt ìmpireil"} + other{"{0} càrt ìmpireil"} + two{"{0} chàrt ìmpireil"} + } tablespoon{ dnam{"spàin-bhùird"} few{"{0} spàinean-bùird"} @@ -1796,6 +1880,13 @@ gd{ } } graphics{ + dot{ + dnam{"dot"} + few{"{0}dot"} + one{"{0}dot"} + other{"{0}dot"} + two{"{0}dhot"} + } dot-per-centimeter{ few{"{0}dpcm"} one{"{0}dpcm"} @@ -1863,6 +1954,12 @@ gd{ other{"{0}dm"} two{"{0}dm"} } + earth-radius{ + few{"{0}R⊕"} + one{"{0}R⊕"} + other{"{0}R⊕"} + two{"{0}R⊕"} + } fathom{ dnam{"aitheamh"} few{"{0}aith"} @@ -1994,6 +2091,18 @@ gd{ } } light{ + candela{ + few{"{0}cd"} + one{"{0}cd"} + other{"{0}cd"} + two{"{0}cd"} + } + lumen{ + few{"{0}lm"} + one{"{0}lm"} + other{"{0}lm"} + two{"{0}lm"} + } lux{ dnam{"lux"} few{"{0}lx"} @@ -2029,6 +2138,13 @@ gd{ other{"{0}M⊕"} two{"{0}M⊕"} } + grain{ + dnam{"gràinne"} + few{"{0}gr"} + one{"{0}ghr"} + other{"{0}gr"} + two{"{0}ghr"} + } gram{ dnam{"gram"} few{"{0}g"} @@ -2398,6 +2514,34 @@ gd{ other{"{0}dL"} two{"{0}dL"} } + dessert-spoon{ + dnam{"sp-mhìl"} + few{"{0}sp-mìl"} + one{"{0}sp-mhìl"} + other{"{0}sp-mhìl"} + two{"{0}sp-mhìl"} + } + dessert-spoon-imperial{ + dnam{"sp-mhìl ìmp."} + few{"{0}sp-mìl ì."} + one{"{0}sp-mìl ì."} + other{"{0}sp-mìl ì."} + two{"{0}sp-mìl ì."} + } + dram{ + dnam{"drama"} + few{"{0}drama"} + one{"{0}drama"} + other{"{0}drama"} + two{"{0}dhrama"} + } + drop{ + dnam{"boinne"} + few{"{0}boinne"} + one{"{0}bhoinne"} + other{"{0}boinne"} + two{"{0}bhoinne"} + } fluid-ounce{ dnam{"fl oz"} few{"{0}fl oz"} @@ -2435,6 +2579,13 @@ gd{ other{"{0}hL"} two{"{0}hL"} } + jigger{ + dnam{"sigire"} + few{"{0}sigire"} + one{"{0}sigire"} + other{"{0}sigire"} + two{"{0}sigire"} + } liter{ dnam{"liotair"} few{"{0}l"} @@ -2457,6 +2608,13 @@ gd{ other{"{0}mL"} two{"{0}mL"} } + pinch{ + dnam{"crudhag"} + few{"{0}crud."} + one{"{0}chrud."} + other{"{0}crud."} + two{"{0}chrud."} + } pint{ dnam{"pt"} few{"{0}pt"} @@ -2478,6 +2636,13 @@ gd{ other{"{0}càrt"} two{"{0}càrt"} } + quart-imperial{ + dnam{"càrt ìmp."} + few{"{0}càrt ì."} + one{"{0}chàrt ì."} + other{"{0}càrt ì."} + two{"{0}chàrt ì."} + } tablespoon{ dnam{"sp"} few{"{0}sp"} @@ -3013,6 +3178,13 @@ gd{ } } graphics{ + dot{ + dnam{"dotag"} + few{"{0} dot"} + one{"{0} dot"} + other{"{0} dot"} + two{"{0} dot"} + } megapixel{ dnam{"meaga-piogsail"} } @@ -3168,6 +3340,12 @@ gd{ } } light{ + candela{ + dnam{"candela"} + } + lumen{ + dnam{"lumen"} + } lux{ dnam{"lux"} few{"{0} lx"} @@ -3197,6 +3375,13 @@ gd{ earth-mass{ dnam{"tomad-talmhainn"} } + grain{ + dnam{"gràinne"} + few{"{0} gràinne"} + one{"{0} ghràinne"} + other{"{0} gràinne"} + two{"{0} ghràinne"} + } gram{ dnam{"gram"} few{"{0} g"} @@ -3542,6 +3727,34 @@ gd{ other{"{0} dL"} two{"{0} dL"} } + dessert-spoon{ + dnam{"spàin-mhìl"} + few{"{0} spàin-mìl"} + one{"{0} spàin-mhìl"} + other{"{0} spàin-mhìl"} + two{"{0} spàin-mhìl"} + } + dessert-spoon-imperial{ + dnam{"spàin-mhìl ìmp."} + few{"{0} spàin-mìl ìmp."} + one{"{0} spàin-mhìl ìmp."} + other{"{0} spàin-mhìl ìmp."} + two{"{0} spàin-mhìl ìmp."} + } + dram{ + dnam{"drama"} + few{"{0} drama"} + one{"{0} drama"} + other{"{0} drama"} + two{"{0} dhrama"} + } + drop{ + dnam{"boinne"} + few{"{0} boinne"} + one{"{0} bhoinne"} + other{"{0} boinne"} + two{"{0} bhoinne"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -3579,6 +3792,13 @@ gd{ other{"{0} hL"} two{"{0} hL"} } + jigger{ + dnam{"sigire"} + few{"{0} sigire"} + one{"{0} sigire"} + other{"{0} sigire"} + two{"{0} sigire"} + } liter{ dnam{"liotair"} few{"{0} l"} @@ -3601,6 +3821,13 @@ gd{ other{"{0} mL"} two{"{0} mL"} } + pinch{ + dnam{"crudhagan"} + few{"{0} crudhag"} + one{"{0} chrudhag"} + other{"{0} crudhag"} + two{"{0} chrudhag"} + } pint{ dnam{"pinnt"} few{"{0} pt"} @@ -3622,6 +3849,13 @@ gd{ other{"{0} càrt"} two{"{0} chàrt"} } + quart-imperial{ + dnam{"càrt ìmp."} + few{"{0} càrt ìmp."} + one{"{0} chàrt ìmp."} + other{"{0} càrt ìmp."} + two{"{0} chàrt ìmp."} + } tablespoon{ dnam{"spàin"} few{"{0} spàin"} diff --git a/intl/icu/source/data/unit/gl.txt b/intl/icu/source/data/unit/gl.txt index e57de6a2a450..3b542937280d 100644 --- a/intl/icu/source/data/unit/gl.txt +++ b/intl/icu/source/data/unit/gl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gl{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ gl{ } } graphics{ + dot{ + dnam{"puntos tipográficos"} + one{"{0} punto tipográfico"} + other{"{0} puntos tipográficos"} + } dot-per-centimeter{ dnam{"puntos por centímetro"} one{"{0} punto por centímetro"} @@ -461,12 +466,27 @@ gl{ one{"{0} decímetro"} other{"{0} decímetros"} } + earth-radius{ + dnam{"raio terrestre"} + one{"{0} raio terrestre"} + other{"{0} raios terrestres"} + } + fathom{ + dnam{"brazas inglesas"} + one{"{0} braza inglesa"} + other{"{0} brazas inglesas"} + } foot{ dnam{"pés"} one{"{0} pé"} other{"{0} pés"} per{"{0} por pé"} } + furlong{ + dnam{"furlongs"} + one{"{0} furlong"} + other{"{0} furlongs"} + } inch{ dnam{"polgadas"} one{"{0} polgada"} @@ -547,6 +567,16 @@ gl{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candelas"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumens"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -574,6 +604,11 @@ gl{ one{"{0} masa da Terra"} other{"{0} masas da Terra"} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} grans"} + } gram{ dnam{"gramos"} one{"{0} gramo"} @@ -623,6 +658,11 @@ gl{ one{"{0} masa solar"} other{"{0} masas solares"} } + stone{ + dnam{"stones"} + one{"{0} stone"} + other{"{0} stones"} + } ton{ dnam{"toneladas estadounidenses"} one{"{0} tonelada estadounidense"} @@ -760,7 +800,7 @@ gl{ torque{ newton-meter{ dnam{"newtons metro"} - one{"newton metro"} + one{"{0} newton metro"} other{"{0} newtons metro"} } pound-force-foot{ @@ -780,6 +820,11 @@ gl{ one{"{0} barril"} other{"{0} barrís"} } + bushel{ + dnam{"bushels"} + one{"{0} bushel"} + other{"{0} bushels"} + } centiliter{ dnam{"centilitros"} one{"{0} centilitro"} @@ -837,6 +882,26 @@ gl{ one{"{0} decilitro"} other{"{0} decilitros"} } + dessert-spoon{ + dnam{"cullerada de sobremesa"} + one{"{0} cullerada de sobremesa"} + other{"{0} culleradas de sobremesa"} + } + dessert-spoon-imperial{ + dnam{"cullerada de sobremesa imperial"} + one{"{0} cullerada de sobremesa imperial"} + other{"{0} culleradas de sobremesa imperiais"} + } + dram{ + dnam{"dracma líquida"} + one{"{0} dracma líquida"} + other{"{0} dracmas líquidas"} + } + drop{ + dnam{"gota"} + one{"{0} gota"} + other{"{0} gotas"} + } fluid-ounce{ dnam{"onzas líquidas"} one{"{0} onza líquida"} @@ -844,7 +909,7 @@ gl{ } fluid-ounce-imperial{ dnam{"onzas líquidas imperiais"} - one{"onza líquida imperial"} + one{"{0} onza líquida imperial"} other{"{0} onzas líquidas imperiais"} } gallon{ @@ -864,6 +929,11 @@ gl{ one{"{0} hectolitro"} other{"{0} hectolitros"} } + jigger{ + dnam{"medidor de cóctel"} + one{"{0} medidor de cóctel"} + other{"{0} medidores de cóctel"} + } liter{ dnam{"litros"} one{"{0} litro"} @@ -880,6 +950,11 @@ gl{ one{"{0} mililitro"} other{"{0} mililitros"} } + pinch{ + dnam{"chisco"} + one{"{0} chisco"} + other{"{0} chiscos"} + } pint{ dnam{"pintas"} one{"{0} pinta"} @@ -895,6 +970,11 @@ gl{ one{"{0} cuarto"} other{"{0} cuartos"} } + quart-imperial{ + dnam{"cuarto imperial"} + one{"{0} cuarto imperial"} + other{"{0} cuartos imperiais"} + } tablespoon{ dnam{"culleradas"} one{"{0} cullerada"} @@ -1429,6 +1509,11 @@ gl{ } } graphics{ + dot{ + dnam{"ptos."} + one{"{0} ptos."} + other{"{0} ptos."} + } dot-per-centimeter{ dnam{"ppcm"} one{"{0} ppcm"} @@ -1472,12 +1557,22 @@ gl{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"brazas inglesas"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"pés"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"furlongs"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"polg."} one{"{0} in"} @@ -1577,6 +1672,11 @@ gl{ earth-mass{ dnam{"masas da Terra"} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} grans"} + } gram{ dnam{"gramos"} one{"{0} g"} @@ -1821,6 +1921,26 @@ gl{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"cull. sobr."} + one{"{0} cull. sobr."} + other{"{0} cull. sobr."} + } + dessert-spoon-imperial{ + dnam{"cull. sobr. imp."} + one{"{0} cull. sobr. imp."} + other{"{0} cull. sobr. imp."} + } + dram{ + dnam{"dracma"} + one{"{0} dracma"} + other{"{0} dracmas"} + } + drop{ + dnam{"gota"} + one{"{0} gota"} + other{"{0} gotas"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1848,6 +1968,11 @@ gl{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"medidor"} + one{"{0} medidor"} + other{"{0} medidores"} + } liter{ dnam{"litros"} one{"{0} l"} @@ -1864,6 +1989,11 @@ gl{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"chisco"} + one{"{0} chisco"} + other{"{0} chiscos"} + } pint{ dnam{"pintas"} one{"{0} pt"} @@ -1879,15 +2009,20 @@ gl{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"cuarto imperial"} + one{"{0} cto. imp."} + other{"{0} ctos. imp."} + } tablespoon{ dnam{"cull."} one{"{0} cull."} other{"{0} cull."} } teaspoon{ - dnam{"cullña."} + dnam{"cullñs."} one{"{0} cullña."} - other{"{0} cullña."} + other{"{0} cullñs."} } } } diff --git a/intl/icu/source/data/unit/gsw.txt b/intl/icu/source/data/unit/gsw.txt index fe79da4cfbce..e715a32bd64b 100644 --- a/intl/icu/source/data/unit/gsw.txt +++ b/intl/icu/source/data/unit/gsw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/gu.txt b/intl/icu/source/data/unit/gu.txt index d7583d014892..5966d0d235f4 100644 --- a/intl/icu/source/data/unit/gu.txt +++ b/intl/icu/source/data/unit/gu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gu{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -42,9 +42,9 @@ gu{ other{"{0} સમત્રિજ્યાકોણ"} } revolution{ - dnam{"ક્રાંતિ"} - one{"{0} ક્રાંતિ"} - other{"{0} ક્રાંતિ"} + dnam{"પરિભ્રમણ"} + one{"{0} પરિભ્રમણ"} + other{"{0} પરિભ્રમણ"} } } area{ @@ -106,7 +106,7 @@ gu{ } compound{ per{"{0} પ્રતિ {1}"} - times{"{0}⋅{1}"} + times{"{0}-{1}"} } concentr{ karat{ @@ -409,6 +409,11 @@ gu{ } } graphics{ + dot{ + dnam{"ડૉટ"} + one{"{0} ડૉટ"} + other{"{0} ડૉટ"} + } dot-per-centimeter{ dnam{"ડૉટ્સ પ્રતિ સેન્ટિમીટર"} one{"{0} ડૉટ પ્રતિ સેન્ટિમીટર"} @@ -455,12 +460,22 @@ gu{ one{"{0} ડેસિમીટર"} other{"{0} ડેસિમીટર"} } + fathom{ + dnam{"ફૅધમ"} + one{"{0} ફૅધમ"} + other{"{0} ફૅધમ"} + } foot{ dnam{"ફૂટ"} one{"{0} ફૂટ"} other{"{0} ફૂટ"} per{"{0} પ્રતિ ફૂટ"} } + furlong{ + dnam{"ફર્લાંગ"} + one{"{0} ફર્લાંગ"} + other{"{0} ફર્લાંગ"} + } inch{ dnam{"ઇંચ"} one{"{0} ઇંચ"} @@ -541,6 +556,11 @@ gu{ } } light{ + lumen{ + dnam{"લૂમેન"} + one{"{0} લૂમેન"} + other{"{0} લૂમેન"} + } lux{ dnam{"લક્સ"} one{"{0} લક્સ"} @@ -568,6 +588,11 @@ gu{ one{"{0} પૃથ્વી ઘનતા"} other{"{0} પૃથ્વી ઘનતા"} } + grain{ + dnam{"ગ્રેન"} + one{"{0} ગ્રેન"} + other{"{0} ગ્રેન"} + } gram{ dnam{"ગ્રામ"} one{"{0} ગ્રામ"} @@ -779,6 +804,11 @@ gu{ one{"{0} બેરલ"} other{"{0} બેરલ"} } + bushel{ + dnam{"બુશલ"} + one{"{0} બુશલ"} + other{"{0} બુશલ"} + } centiliter{ dnam{"સેન્ટિલીટર"} one{"{0} સેન્ટિલીટર"} @@ -836,6 +866,26 @@ gu{ one{"{0} ડેસિલીટર"} other{"{0} ડેસિલીટર"} } + dessert-spoon{ + dnam{"ડેઝર્ટ સ્પૂન"} + one{"{0} ડેઝર્ટ સ્પૂન"} + other{"{0} ડેઝર્ટ સ્પૂન"} + } + dessert-spoon-imperial{ + dnam{"ઇમ્પીરિયલ ડેઝર્ટ સ્પૂન"} + one{"{0} ઇમ્પીરિયલ ડેઝર્ટ સ્પૂન"} + other{"{0} ઇમ્પીરિયલ ડેઝર્ટ સ્પૂન"} + } + dram{ + dnam{"ડ્રામ"} + one{"{0} ડ્રામ"} + other{"{0} ડ્રામ"} + } + drop{ + dnam{"ડ્રોપ"} + one{"{0} ડ્રોપ"} + other{"{0} ડ્રોપ"} + } fluid-ounce{ dnam{"પ્રવાહી ઔંસ"} one{"{0} પ્રવાહી ઔંસ"} @@ -863,6 +913,11 @@ gu{ one{"{0} હેક્ટોલીટર"} other{"{0} હેક્ટોલીટર"} } + jigger{ + dnam{"જિગર"} + one{"{0} જિગર"} + other{"{0} જિગર"} + } liter{ dnam{"લિટર"} one{"{0} લિટર"} @@ -879,6 +934,11 @@ gu{ one{"{0} મિલિલીટર"} other{"{0} મિલિલીટર"} } + pinch{ + dnam{"ચપટી"} + one{"{0} ચપટી"} + other{"{0} ચપટી"} + } pint{ dnam{"પિન્ટ"} one{"{0} પિન્ટ"} @@ -894,6 +954,11 @@ gu{ one{"{0} ક્વાર્ટ"} other{"{0} ક્વાર્ટ"} } + quart-imperial{ + dnam{"ઇમ્પીરિયલ ક્વૉર્ટ"} + one{"{0} ઇમ્પીરિયલ ક્વૉર્ટ"} + other{"{0} ઇમ્પીરિયલ ક્વૉર્ટ"} + } tablespoon{ dnam{"ટેબલસ્પૂન"} one{"{0} ટેબલસ્પૂન"} @@ -1187,9 +1252,9 @@ gu{ other{"{0} સમત્રિજ્યાકોણ"} } revolution{ - dnam{"ક્રાંતિ"} - one{"{0} ક્રાંતિ"} - other{"{0} ક્રાંતિ"} + dnam{"પરિભ્રમણ"} + one{"{0} પરિભ્રમણ"} + other{"{0} પરિભ્રમણ"} } } area{ @@ -1285,8 +1350,8 @@ gu{ } permillion{ dnam{"કણ/મિલિયન"} - one{"{0} પીપીએમ"} - other{"{0} પીપીએમ"} + one{"{0} ppm"} + other{"{0} ppm"} } permyriad{ dnam{"પરમિરિયડ"} @@ -1366,8 +1431,8 @@ gu{ } petabyte{ dnam{"પીબાઈટ"} - one{"{0} પીબી"} - other{"{0} પીબી"} + one{"{0} PB"} + other{"{0} PB"} } terabit{ dnam{"Tb"} @@ -1553,6 +1618,11 @@ gu{ } } graphics{ + dot{ + dnam{"ડૉટ"} + one{"{0} ડૉટ"} + other{"{0} ડૉટ"} + } pixel{ dnam{"પિક્સેલ"} } @@ -1574,12 +1644,18 @@ gu{ one{"{0} ડેમી"} other{"{0} ડેમી"} } + fathom{ + dnam{"ફૅધમ"} + } foot{ dnam{"ફૂટ"} one{"{0} ફૂટ"} other{"{0} ફૂટ"} per{"{0}/ફૂટ"} } + furlong{ + dnam{"ફર્લાંગ"} + } inch{ dnam{"ઇંચ"} one{"{0} ઇંચ"} @@ -1687,6 +1763,11 @@ gu{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"ગ્રેન"} + one{"{0} ગ્રેન"} + other{"{0} ગ્રેન"} + } gram{ dnam{"ગ્રામ"} one{"{0} ગ્રા"} @@ -1816,9 +1897,9 @@ gu{ other{"{0} mbar"} } millimeter-ofhg{ - dnam{"mm Hg"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} + dnam{"mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} } pascal{ dnam{"Pa"} @@ -1898,6 +1979,9 @@ gu{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"બુશલ"} + } centiliter{ dnam{"સેન્ટિલીટર"} one{"{0} સેન્ટિલીટર"} @@ -1955,6 +2039,14 @@ gu{ one{"{0} ડેસિલીટર"} other{"{0} ડેસિલીટર"} } + dram{ + dnam{"ડ્રામ ફ્લૂઇડ"} + } + drop{ + dnam{"ડ્રોપ"} + one{"{0} ડ્રોપ"} + other{"{0} ડ્રોપ"} + } fluid-ounce{ dnam{"પ્રવાહી ઔંસ"} one{"{0} પ્રવાહી ઔંસ"} @@ -1982,6 +2074,11 @@ gu{ one{"{0} હેક્ટોલીટર"} other{"{0} હેક્ટોલીટર"} } + jigger{ + dnam{"જિગર"} + one{"{0} જિગર"} + other{"{0} જિગર"} + } liter{ dnam{"લિટર"} one{"{0} લિ"} @@ -1998,6 +2095,11 @@ gu{ one{"{0} મિલિલીટર"} other{"{0} મિલિલીટર"} } + pinch{ + dnam{"ચપટી"} + one{"{0} ચપટી"} + other{"{0} ચપટી"} + } pint{ dnam{"પિન્ટ"} one{"{0} પિન્ટ"} diff --git a/intl/icu/source/data/unit/guz.txt b/intl/icu/source/data/unit/guz.txt index b50d5beca2a0..c9a66de72e52 100644 --- a/intl/icu/source/data/unit/guz.txt +++ b/intl/icu/source/data/unit/guz.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml guz{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/gv.txt b/intl/icu/source/data/unit/gv.txt index 63c855d28749..87aeded149e1 100644 --- a/intl/icu/source/data/unit/gv.txt +++ b/intl/icu/source/data/unit/gv.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gv{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ha.txt b/intl/icu/source/data/unit/ha.txt index b542317fe5bd..bd2660c50772 100644 --- a/intl/icu/source/data/unit/ha.txt +++ b/intl/icu/source/data/unit/ha.txt @@ -1,5 +1,1926 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha{ - Version{"37"} + durationUnits{ + ms{"m:ss"} + } + units{ + acceleration{ + g-force{ + one{"g-force {0}"} + other{"g-force {0}"} + } + meter-per-square-second{ + dnam{"meters per second squared"} + one{"meter per second squared {0}"} + other{"meters per second squared {0}"} + } + } + angle{ + arc-minute{ + dnam{"arcminutes"} + one{"arcminute {0}"} + other{"arcminutes {0}"} + } + arc-second{ + dnam{"arcseconds"} + one{"arcsecond {0}"} + other{"arcseconds {0}"} + } + degree{ + dnam{"degrees"} + one{"degree {0}"} + other{"degrees {0}"} + } + radian{ + dnam{"radians"} + one{"radian {0}"} + other{"radians {0}"} + } + revolution{ + dnam{"revolution"} + one{"revolution {0}"} + other{"revolutions {0}"} + } + } + area{ + acre{ + dnam{"eka"} + one{"eka {0}"} + other{"ekoki {0}"} + } + dunam{ + dnam{"dunams"} + one{"dunam {0}"} + other{"dunams {0}"} + } + hectare{ + dnam{"hektoci"} + one{"hekta {0}"} + other{"hektoci {0}"} + } + square-centimeter{ + dnam{"sikwaya sentimitoci"} + one{"sikwaya sentimita {0}"} + other{"sikwaya sentimitoci {0}"} + per{"{0} a sikwaya sentimita"} + } + square-foot{ + dnam{"sikwaya ƙafafu"} + one{"sikwaya ƙafa {0}"} + other{"sikwaya ƙafafu {0}"} + } + square-inch{ + dnam{"sikwaya incis"} + one{"sikwaya inci {0}"} + other{"sikwaya incina {0}"} + per{"{0} a sikwaya inci"} + } + square-kilometer{ + dnam{"sikwaya kilomitoci"} + one{"sikwaya kilomita {0}"} + other{"sikwaya kilomitoci {0}"} + per{"{0} a sikwaya kilomita"} + } + square-meter{ + dnam{"sikwaya mitoci"} + one{"sikwaya mita {0}"} + other{"sikwaya mitoci {0}"} + per{"{0} a sikwaya mita"} + } + square-mile{ + dnam{"sikwaya mil-mil"} + one{"sikwaya mil {0}"} + other{"sikwaya mil-mil {0}"} + per{"{0} a sikwaya mil"} + } + square-yard{ + dnam{"sikwaya yadina"} + one{"sikwaya yadi {0}"} + other{"sikwaya yaduna {0}"} + } + } + compound{ + per{"{0} a {1}"} + } + concentr{ + karat{ + dnam{"karats"} + one{"karat {0}"} + other{"karats {0}"} + } + milligram-per-deciliter{ + dnam{"milligrams per deciliter"} + one{"milligram per deciliter {0}"} + other{"milligrams per deciliter {0}"} + } + millimole-per-liter{ + dnam{"millimoles per liter"} + one{"millimole per liter {0}"} + other{"millimoles per liter {0}"} + } + mole{ + dnam{"moles"} + one{"mole {0}"} + other{"moles {0}"} + } + percent{ + dnam{"kaso"} + one{"kaso {0}"} + other{"Kaso {0}"} + } + permille{ + dnam{"permille"} + one{"permille {0}"} + other{"permille {0}"} + } + permillion{ + dnam{"parts per million"} + one{"part per million {0}"} + other{"parts per million {0}"} + } + permyriad{ + dnam{"permyriad"} + one{"permyriad {0}"} + other{"permyriad {0}"} + } + } + consumption{ + liter-per-100-kilometer{ + dnam{"litoci a kilomitoci 100"} + one{"lita a kilomitoci 100 {0}"} + other{"litoci a kilomitoci 100 {0}"} + } + liter-per-kilometer{ + dnam{"litoci a kilomita"} + one{"lita a kilomita {0}"} + other{"litoci a kilomita {0}"} + } + mile-per-gallon{ + dnam{"mil-mil a galan"} + one{"mil a galan {0}"} + other{"mil-mil a galan {0}"} + } + mile-per-gallon-imperial{ + dnam{"mil-mil a Imp. gallon"} + one{"mil a Imp. gallon {0}"} + other{"mil-mil a Imp. gallon {0}"} + } + } + coordinate{ + dnam{"cardinal direction"} + east{"Gabas {0}"} + north{"arewa {0}"} + south{"Kudu {0}"} + west{"Yamma {0}"} + } + digital{ + bit{ + dnam{"bits"} + one{"bit {0}"} + other{"bits {0}"} + } + byte{ + dnam{"bytes"} + one{"byte {0}"} + other{"bytes {0}"} + } + gigabit{ + dnam{"gigabits"} + one{"gigabit {0}"} + other{"gigabits {0}"} + } + gigabyte{ + dnam{"gigabytes"} + one{"gigabyte {0}"} + other{"gigabytes {0}"} + } + kilobit{ + dnam{"kilobits"} + one{"kilobit {0}"} + other{"kilobits {0}"} + } + kilobyte{ + dnam{"kilobytes"} + one{"kilobyte {0}"} + other{"kilobytes {0}"} + } + megabit{ + dnam{"megabits"} + one{"megabit {0}"} + other{"megabits {0}"} + } + megabyte{ + dnam{"megabytes"} + one{"megabyte {0}"} + other{"megabytes {0}"} + } + petabyte{ + dnam{"petabytes"} + one{"petabyte {0}"} + other{"petabytes {0}"} + } + terabit{ + dnam{"terabits"} + one{"terabit {0}"} + other{"terabits {0}"} + } + terabyte{ + dnam{"terabytes"} + one{"terabyte {0}"} + other{"terabytes {0}"} + } + } + duration{ + century{ + dnam{"ƙarnoni"} + one{"ƙarni {0}"} + other{"ƙarnoni {0}"} + } + day{ + dnam{"ranaku"} + one{"rana {0}"} + other{"ranaku {0}"} + per{"{0} a rana"} + } + decade{ + dnam{"shekaru goma-goma"} + one{"shekaru goma {0}"} + other{"shekaru goma-goma {0}"} + } + hour{ + dnam{"saʼoʼi"} + one{"sa'a {0}"} + other{"sa'o'i {0}"} + per{"{0} a saʼa"} + } + microsecond{ + dnam{"makirosekan"} + one{"makirosekan {0}"} + other{"makirosekans {0}"} + } + millisecond{ + dnam{"millisakan"} + one{"millisakan {0}"} + other{"millisakans {0}"} + } + minute{ + dnam{"mintoci"} + one{"minti {0}"} + other{"mintoci {0}"} + per{"{0} a minti"} + } + month{ + dnam{"wat"} + one{"wata {0}"} + other{"watanni {0}"} + per{"{0} a wata"} + } + nanosecond{ + dnam{"nanosekan"} + one{"nanosekan {0}"} + other{"nanosekans {0}"} + } + second{ + dnam{"daƙiƙoƙi"} + one{"daƙiƙa {0}"} + other{"daƙiƙoƙi {0}"} + per{"{0} a daƙiƙa"} + } + week{ + dnam{"makonni"} + one{"mako {0}"} + other{"makonni {0}"} + per{"{0} a mako"} + } + year{ + dnam{"shekaru"} + one{"shekara {0}"} + other{"shekaru {0}"} + per{"{0} a shekara"} + } + } + electric{ + ampere{ + dnam{"amperes"} + one{"ampere {0}"} + other{"amperes {0}"} + } + milliampere{ + dnam{"milliamperes"} + one{"milliamperes {0}"} + other{"milliamperes {0}"} + } + ohm{ + dnam{"ohms"} + one{"ohm {0}"} + other{"ohms {0}"} + } + volt{ + dnam{"volts"} + one{"volt {0}"} + other{"volts {0}"} + } + } + energy{ + british-thermal-unit{ + dnam{"British thermal units"} + one{"British thermal unit {0}"} + other{"British thermal units {0}"} + } + calorie{ + dnam{"kaloris"} + one{"kalori {0}"} + other{"kaloris {0}"} + } + electronvolt{ + dnam{"electronvolts"} + one{"electronvolt {0}"} + other{"electronvolts {0}"} + } + foodcalorie{ + dnam{"Kaloris"} + one{"Kalori {0}"} + other{"Kaloris {0}"} + } + joule{ + dnam{"joules"} + one{"joule {0}"} + other{"joules {0}"} + } + kilocalorie{ + dnam{"kilokaloris"} + one{"kilokalori {0}"} + other{"kilokaloris {0}"} + } + kilojoule{ + dnam{"kilojoules"} + one{"kilojoule {0}"} + other{"kilojoules {0}"} + } + kilowatt-hour{ + dnam{"kilowatt-hours"} + one{"kilowatt hour {0}"} + other{"kilowatt-hours {0}"} + } + therm-us{ + one{"US therm {0}"} + other{"US therms {0}"} + } + } + force{ + newton{ + dnam{"newtons"} + one{"newton {0}"} + other{"newtons {0}"} + } + pound-force{ + dnam{"pounds of force"} + one{"pound of force {0}"} + other{"pounds of force {0}"} + } + } + frequency{ + gigahertz{ + dnam{"gigahertz"} + one{"gigahertz {0}"} + other{"gigahertz {0}"} + } + hertz{ + dnam{"hertz"} + one{"hertz {0}"} + other{"hertz {0}"} + } + kilohertz{ + dnam{"kilohertz"} + one{"kilohertz {0}"} + other{"kilohertz {0}"} + } + megahertz{ + dnam{"megahertz"} + one{"megahertz {0}"} + other{"megahertz {0}"} + } + } + graphics{ + dot{ + dnam{"aya"} + one{"aya {0}"} + other{"aya {0}"} + } + dot-per-centimeter{ + dnam{"ayoyi a sentimita"} + one{"{0} aya a sentimita"} + other{"{0} ayoyi a sentimita"} + } + dot-per-inch{ + dnam{"ayoyi a inci"} + one{"{0} aya a inci"} + other{"{0} ayoyi a inci"} + } + em{ + dnam{"typographic em"} + one{"em {0}"} + other{"{0} ems"} + } + megapixel{ + dnam{"megafikzels"} + one{"megafikzel {0}"} + other{"megafikzels {0}"} + } + pixel{ + dnam{"fikzel"} + one{"fikzel {0}"} + other{"fikzels {0}"} + } + pixel-per-centimeter{ + dnam{"fikzels a sentimita"} + one{"{0} fikzel a sentimita"} + other{"{0} fikzels a sentimita"} + } + pixel-per-inch{ + dnam{"fikzel a inci"} + one{"{0} fikzel a inci"} + other{"{0} fikzels a inci"} + } + } + length{ + astronomical-unit{ + dnam{"astronomical units"} + one{"astronomical unit {0}"} + other{"astronomical units {0}"} + } + centimeter{ + dnam{"sentimitoci"} + one{"sentimita {0}"} + other{"sentimitoci {0}"} + per{"{0} a sentimita"} + } + decimeter{ + dnam{"disimitoci"} + one{"disimita {0}"} + other{"disimitoci {0}"} + } + earth-radius{ + dnam{"earth radius"} + one{"earth radius {0}"} + other{"earth radius {0}"} + } + foot{ + dnam{"ƙafafu"} + one{"ƙafa {0}"} + other{"ƙafafu {0}"} + per{"{0} a ƙafa"} + } + inch{ + dnam{"incina"} + one{"inci {0}"} + other{"incina {0}"} + per{"{0} a inci"} + } + kilometer{ + dnam{"kilomitoci"} + one{"kilomita {0}"} + other{"kilomitoci {0}"} + per{"{0} a kilomita"} + } + light-year{ + dnam{"light years"} + one{"light year {0}"} + other{"light years {0}"} + } + meter{ + dnam{"mitoci"} + one{"mita {0}"} + other{"mitoci {0}"} + per{"{0} a mita"} + } + micrometer{ + dnam{"makiromitoci"} + one{"makiromita {0}"} + other{"makiromitoci {0}"} + } + mile{ + dnam{"mil-mil"} + one{"mil {0}"} + other{"mil-mil {0}"} + } + mile-scandinavian{ + dnam{"mile-scandinavian"} + one{"mile-scandinavian {0}"} + other{"miles-scandinavian {0}"} + } + millimeter{ + dnam{"milimitoci"} + one{"milimita {0}"} + other{"milimitoci {0}"} + } + nanometer{ + dnam{"nanomitoci"} + one{"nanomita {0}"} + other{"nanomitoci {0}"} + } + nautical-mile{ + dnam{"nautical miles"} + one{"nautical mile {0}"} + other{"nautical miles {0}"} + } + parsec{ + dnam{"fasek"} + one{"fasek {0}"} + other{"fasekoki {0}"} + } + picometer{ + dnam{"fikomitoci"} + one{"fikomita {0}"} + other{"fikomitoci {0}"} + } + point{ + dnam{"makuna"} + one{"maki {0}"} + other{"makuna {0}"} + } + solar-radius{ + dnam{"solar radii"} + one{"solar radius {0}"} + other{"solar radii {0}"} + } + yard{ + dnam{"yaduka"} + one{"yadi {0}"} + other{"yaduka {0}"} + } + } + light{ + candela{ + dnam{"candela"} + one{"candela {0}"} + other{"candela {0}"} + } + lumen{ + dnam{"lumen"} + one{"lumen {0}"} + other{"lumen {0}"} + } + lux{ + dnam{"lux"} + one{"lux {0}"} + other{"lux {0}"} + } + solar-luminosity{ + one{"solar luminosity {0}"} + other{"solar luminosities {0}"} + } + } + mass{ + carat{ + dnam{"carats"} + one{"carat {0}"} + other{"carats {0}"} + } + dalton{ + dnam{"daltons"} + one{"dalton {0}"} + other{"daltons {0}"} + } + earth-mass{ + dnam{"Earth masses"} + one{"Earth mas {0}"} + other{"Earth masses {0}"} + } + grain{ + dnam{"ƙwaya"} + one{"ƙwaya {0}"} + other{"ƙwaya {0}"} + } + gram{ + dnam{"giram-giram"} + one{"giram {0}"} + other{"giram-giram {0}"} + per{"{0} a giram"} + } + kilogram{ + dnam{"kilogiramgiram"} + one{"kilogiram {0}"} + other{"kilogiramgiram {0}"} + per{"{0} a kilogiram"} + } + metric-ton{ + dnam{"metric tons"} + one{"metric ton {0}"} + other{"metric tons {0}"} + } + microgram{ + dnam{"makirogiramgiram"} + one{"makirogiram {0}"} + other{"makirogiramgiram {0}"} + } + milligram{ + dnam{"milligiramgiram"} + one{"milligiram {0}"} + other{"milligiramgiram {0}"} + } + ounce{ + dnam{"oza-oza"} + one{"oza {0}"} + other{"oza-oza {0}"} + per{"{0} a oza"} + } + ounce-troy{ + dnam{"oza-ozar troy"} + one{"oza troy {0}"} + other{"oza-ozar troy {0}"} + } + pound{ + one{"laba {0}"} + other{"laba-laba {0}"} + } + solar-mass{ + dnam{"solar masses"} + one{"solar mas {0}"} + other{"solar masses {0}"} + } + ton{ + dnam{"tan-tan"} + one{"tan {0}"} + other{"tan-tan {0}"} + } + } + power{ + gigawatt{ + dnam{"gigawatwat"} + one{"gigawat {0}"} + other{"gigawatwat {0}"} + } + horsepower{ + dnam{"ƙarfin inji"} + one{"ƙarfin inji {0}"} + other{"ƙarfin inji {0}"} + } + kilowatt{ + dnam{"kilowatwat"} + one{"kilowat {0}"} + other{"kilowatwat {0}"} + } + megawatt{ + dnam{"megawatwat"} + one{"megawat {0}"} + other{"megawatwat {0}"} + } + milliwatt{ + dnam{"milliwatwat"} + one{"milliwat {0}"} + other{"milliwatwat {0}"} + } + watt{ + dnam{"wat-wat"} + one{"wat {0}"} + other{"wat-wat {0}"} + } + } + pressure{ + atmosphere{ + dnam{"yanaye-yanaye"} + one{"yanayi {0}"} + other{"yanaye-yanaye {0}"} + } + bar{ + dnam{"sanduna"} + one{"sanda {0}"} + other{"anduna {0}"} + } + hectopascal{ + dnam{"hectopascals"} + one{"hectopascal {0}"} + other{"hectopascals {0}"} + } + inch-ofhg{ + dnam{"incinan zaiba"} + one{"incin zaiba {0}"} + other{"incinan zaiba {0}"} + } + kilopascal{ + dnam{"kilopascals"} + one{"kilopascal {0}"} + other{"kilopascals {0}"} + } + megapascal{ + dnam{"megapascals"} + one{"megapascal {0}"} + other{"megapascals {0}"} + } + millibar{ + dnam{"millibars"} + one{"millibar {0}"} + other{"millibars {0}"} + } + millimeter-ofhg{ + dnam{"millimitocin zaiba"} + one{"millimitar zaiba {0}"} + other{"millimitocin zaiba {0}"} + } + pascal{ + dnam{"pascals"} + one{"pascal {0}"} + other{"pascals {0}"} + } + pound-force-per-square-inch{ + dnam{"laba-laba a sikwaya inci"} + one{"laba a sikwaya inci {0}"} + other{"laba-laba a sikwaya inci {0}"} + } + } + speed{ + kilometer-per-hour{ + dnam{"kilomitoci a saʼa"} + one{"kilomita a sa'a {0}"} + other{"kilomitoci a sa'a {0}"} + } + knot{ + dnam{"knots"} + one{"knot {0}"} + other{"knots {0}"} + } + meter-per-second{ + dnam{"mitoci a daƙiƙa"} + one{"mita a daƙiƙa {0}"} + other{"mitoci a daƙiƙa {0}"} + } + mile-per-hour{ + dnam{"mil-mil a saʼa"} + one{"mil a sa'a {0}"} + other{"mil-mil a sa'a {0}"} + } + } + temperature{ + celsius{ + dnam{"digiri-digiri Selsiyas"} + one{"digiri Selsiyas {0}"} + other{"digiri-digiri Selsiyas {0}"} + } + fahrenheit{ + dnam{"digiri-digiri faranhit"} + one{"digiri faranhit {0}"} + other{"digiri-digiri faranhit {0}"} + } + generic{ + one{"digiri {0}"} + other{"digiri-digiri {0}"} + } + kelvin{ + dnam{"kelvins"} + one{"kelvin {0}"} + other{"kelvins {0}"} + } + } + torque{ + newton-meter{ + dnam{"newton-meters"} + one{"newton-meter {0}"} + other{"newton-meters {0}"} + } + pound-force-foot{ + dnam{"pound-feet"} + one{"pound-force-foot {0}"} + other{"pound-feet {0}"} + } + } + volume{ + acre-foot{ + dnam{"eka-ƙafafu"} + one{"eka-ƙafa {0}"} + other{"eka-ƙafafu {0}"} + } + barrel{ + dnam{"ganguna"} + one{"ganga {0}"} + other{"ganguna {0}"} + } + centiliter{ + dnam{"sentilitoci"} + one{"sentilita {0}"} + other{"sentilitoci {0}"} + } + cubic-centimeter{ + dnam{"kubik sentimitoci"} + one{"kubik sentimita {0}"} + other{"kubik sentimitoci {0}"} + per{"{0} a kubik sentimita"} + } + cubic-foot{ + dnam{"kubik ƙafafu"} + one{"kubik ƙafa {0}"} + other{"kubik ƙafafu {0}"} + } + cubic-inch{ + dnam{"kubic incina"} + one{"kubik inci {0}"} + other{"kubik incina {0}"} + } + cubic-kilometer{ + dnam{"kubik kilomitoci"} + one{"kubik kilomita {0}"} + other{"kubik kilomitoci {0}"} + } + cubic-meter{ + dnam{"kubic mitoci"} + one{"kubic mita {0}"} + other{"kubic mitoci {0}"} + per{"{0} a kubic mita"} + } + cubic-mile{ + dnam{"kubik mil-mil"} + one{"kubik mil {0}"} + other{"kubik mil-mil {0}"} + } + cubic-yard{ + dnam{"kubik yaduka"} + one{"kubik yadi {0}"} + other{"kubik yaduka {0}"} + } + cup{ + dnam{"kofuna"} + one{"kofi {0}"} + other{"kofuna {0}"} + } + cup-metric{ + dnam{"metric cups"} + one{"metric cup {0}"} + other{"metric cups {0}"} + } + deciliter{ + dnam{"desilitoci"} + one{"desilita {0}"} + other{"desilitoci {0}"} + } + dessert-spoon{ + dnam{"dessert spoon"} + one{"dessert spoon {0}"} + other{"dessert spoon {0}"} + } + dessert-spoon-imperial{ + dnam{"Imp. dessert spoon"} + one{"Imp. dessert spoon {0}"} + other{"Imp. dessert spoon {0}"} + } + dram{ + dnam{"dram"} + one{"dram {0}"} + other{"{0} dram"} + } + drop{ + dnam{"ɗigo"} + one{"ɗigo {0}"} + other{"ɗigo {0}"} + } + fluid-ounce{ + dnam{"fluid ounces"} + one{"fluid ounce {0}"} + other{"fluid ounces {0}"} + } + fluid-ounce-imperial{ + dnam{"Imp. fluid ounces"} + one{"Imp. fluid ounce {0}"} + other{"Imp. fluid ounces {0}"} + } + gallon{ + dnam{"galan-galan"} + one{"galan {0}"} + other{"galan-galan {0}"} + per{"{0} a galan"} + } + gallon-imperial{ + dnam{"Imp. gallons"} + one{"Imp. gallon {0}"} + other{"Imp. gallons {0}"} + per{"{0} a Imp. gallons"} + } + hectoliter{ + dnam{"hektolitoci"} + one{"hektolita {0}"} + other{"hektolitoci {0}"} + } + liter{ + dnam{"litoci"} + one{"lita {0}"} + other{"litoci {0}"} + per{"{0} a lita"} + } + megaliter{ + dnam{"megalitoci"} + one{"megalita {0}"} + other{"megalitoci {0}"} + } + milliliter{ + dnam{"millimitoci"} + one{"millimita {0}"} + other{"millimitoci {0}"} + } + pint{ + dnam{"pints"} + one{"pint {0}"} + other{"pints {0}"} + } + pint-metric{ + dnam{"metric pints"} + one{"metric pint {0}"} + other{"metric pints {0}"} + } + quart{ + dnam{"quarts"} + one{"quart {0}"} + other{"quarts {0}"} + } + quart-imperial{ + dnam{"Imp. quart"} + one{"{0}"} + other{"Imp. quart {0}"} + } + tablespoon{ + dnam{"manyan cokula"} + one{"babban cokali {0}"} + other{"manyan cokula {0}"} + } + teaspoon{ + dnam{"ƙananan cokula"} + one{"ƙaramin cokali {0}"} + other{"ƙananan cokula {0}"} + } + } + } + unitsNarrow{ + concentr{ + percent{ + one{"%{0}"} + other{"%{0}"} + } + } + consumption{ + liter-per-100-kilometer{ + dnam{"L/100km"} + one{"L/100km"} + other{"L/100km {0}"} + } + } + coordinate{ + east{"G{0}"} + north{"A{0}"} + south{"K{0}"} + west{"Y{0}"} + } + duration{ + day{ + dnam{"rana"} + one{"r{0}"} + other{"r{0}"} + } + hour{ + dnam{"saʼa"} + one{"s{0}"} + other{"s{0}"} + } + millisecond{ + dnam{"msek"} + one{"ms {0}"} + other{"ms {0}"} + } + minute{ + dnam{"mnt"} + one{"mtn"} + other{"minti {0}"} + } + month{ + dnam{"wata"} + one{"w{0}"} + other{"w{0}"} + } + second{ + dnam{"daƙ"} + one{"d {0}"} + other{"d {0}"} + } + week{ + dnam{"mk"} + one{"m{0}"} + other{"m{0}"} + } + year{ + dnam{"shkr"} + one{"shkr {0}"} + other{"s{0}"} + } + } + length{ + centimeter{ + one{"cm{0}"} + other{"cm{0}"} + } + kilometer{ + one{"km{0}"} + other{"km{0}"} + } + meter{ + dnam{"m"} + one{"m{0}"} + other{"m{0}"} + } + millimeter{ + one{"mm{0}"} + other{"mm{0}"} + } + } + mass{ + gram{ + dnam{"giram"} + one{"g{0}"} + other{"g{0}"} + } + kilogram{ + one{"kg{0}"} + other{"kg{0}"} + } + } + speed{ + kilometer-per-hour{ + one{"km/s{0}"} + other{"km/s{0}"} + } + } + temperature{ + celsius{ + dnam{"°S"} + one{"S°{0}"} + other{"S°{0}"} + } + } + volume{ + liter{ + dnam{"lita"} + one{"L{0}"} + other{"L{0}"} + } + } + } + unitsShort{ + acceleration{ + g-force{ + one{"G {0}"} + other{"G {0}"} + } + meter-per-square-second{ + dnam{"meters/sec²"} + one{"m/s² {0}"} + other{"m/s² {0}"} + } + } + angle{ + arc-minute{ + dnam{"arcmins"} + one{"arcmin {0}"} + other{"arcmin {0}"} + } + arc-second{ + dnam{"arcsecs"} + one{"arcsec {0}"} + other{"arcsec {0}"} + } + degree{ + dnam{"degrees"} + one{"deg {0}"} + other{"deg {0}"} + } + radian{ + dnam{"radian"} + one{"rad {0}"} + other{"rad {0}"} + } + revolution{ + one{"rev {0}"} + other{"rev {0}"} + } + } + area{ + acre{ + dnam{"ekoki"} + one{"ek {0}"} + other{"ek {0}"} + } + dunam{ + dnam{"dunams"} + one{"dunam {0}"} + other{"dunam {0}"} + } + hectare{ + dnam{"hektoci"} + one{"ha {0}"} + other{"ha {0}"} + } + square-centimeter{ + one{"cm² {0}"} + other{"cm² {0}"} + } + square-foot{ + dnam{"sk ƙafa"} + one{"sk ƙf {0}"} + other{"sk ƙf {0}"} + } + square-inch{ + dnam{"incina²"} + one{"in² {0}"} + other{"in² {0}"} + } + square-kilometer{ + one{"km² {0}"} + other{"km² {0}"} + } + square-meter{ + dnam{"mitoci²"} + one{"m² {0}"} + other{"m² {0}"} + } + square-mile{ + dnam{"sk mil-mil"} + one{"sq mi {0}"} + other{"sq mi {0}"} + } + square-yard{ + dnam{"yaduna²"} + one{"yd² {0}"} + other{"yd² {0}"} + } + } + concentr{ + karat{ + dnam{"karats"} + one{"kt {0}"} + other{"kt {0}"} + } + milligram-per-deciliter{ + one{"mg/dL {0}"} + other{"mg/dL {0}"} + } + millimole-per-liter{ + dnam{"millimol/liter"} + one{"mmol/L {0}"} + other{"mmol/L {0}"} + } + mole{ + dnam{"mole"} + one{"mol {0}"} + other{"mol {0}"} + } + percent{ + dnam{"kaso"} + } + permille{ + dnam{"permille"} + one{"‰{0}"} + other{"‰{0}"} + } + permillion{ + dnam{"parts/million"} + one{"ppm {0}"} + other{"ppm {0}"} + } + permyriad{ + dnam{"permyriad"} + one{"‱{0}"} + other{"‱{0}"} + } + } + consumption{ + liter-per-100-kilometer{ + one{"L/100km {0}"} + other{"L/100km {0}"} + } + liter-per-kilometer{ + dnam{"litoci/km"} + one{"L/km {0}"} + other{"L/km {0}"} + } + mile-per-gallon{ + dnam{"mil-mil/gal"} + one{"mag {0}"} + other{"mag {0}"} + } + mile-per-gallon-imperial{ + dnam{"mil-mil/gal Imp."} + one{"mag Imp. {0}"} + other{"mag Imp. {0}"} + } + } + coordinate{ + east{"G {0}"} + north{"A {0}"} + south{"K {0}"} + west{"Y {0}"} + } + digital{ + bit{ + one{"bit {0}"} + other{"bit {0}"} + } + byte{ + one{"byte {0}"} + other{"byte {0}"} + } + gigabit{ + dnam{"Gbit"} + one{"Gb {0}"} + other{"Gb {0}"} + } + gigabyte{ + dnam{"GByte"} + one{"GB {0}"} + other{"GB {0}"} + } + kilobit{ + dnam{"kbit"} + one{"kb {0}"} + other{"kb {0}"} + } + kilobyte{ + dnam{"KByte"} + one{"kB {0}"} + other{"kB {0}"} + } + megabit{ + dnam{"Mbit"} + one{"Mb {0}"} + other{"Mb {0}"} + } + megabyte{ + dnam{"MByte"} + one{"MB {0}"} + other{"MB {0}"} + } + petabyte{ + dnam{"PByte"} + one{"PB {0}"} + other{"PB {0}"} + } + terabit{ + dnam{"Tbit"} + one{"Tb {0}"} + other{"Tb {0}"} + } + terabyte{ + dnam{"TByte"} + one{"TB {0}"} + other{"TB {0}"} + } + } + duration{ + century{ + dnam{"ƙ"} + one{"ƙ {0}"} + other{"ƙ {0}"} + } + day{ + dnam{"ranaku"} + one{"rana {0}"} + other{"ranaku {0}"} + per{"{0}/r"} + } + decade{ + dnam{"shkr gm"} + one{"shkr gm {0}"} + other{"shkr gm {0}"} + } + hour{ + dnam{"saʼoʼi"} + one{"s {0}"} + other{"s {0}"} + per{"{0}/saʼa"} + } + microsecond{ + dnam{"µsecs"} + one{"µs {0}"} + other{"µs {0}"} + } + millisecond{ + dnam{"milseks"} + one{"ms {0}"} + other{"ms {0}"} + } + minute{ + dnam{"mintc"} + one{"mnt {0}"} + other{"mnt {0}"} + per{"{0}/mnt"} + } + month{ + dnam{"watanni"} + one{"wat {0}"} + other{"wtnn {0}"} + per{"{0}/w"} + } + nanosecond{ + dnam{"nanoseks"} + one{"ns {0}"} + other{"ns {0}"} + } + second{ + dnam{"daƙ"} + one{"d {0}"} + other{"d {0}"} + per{"{0}/d"} + } + week{ + dnam{"makonni"} + one{"mk {0}"} + other{"mkn {0}"} + per{"{0}/m"} + } + year{ + dnam{"shekaru"} + one{"shkr {0}"} + other{"shkru {0}"} + per{"{0}/s"} + } + } + electric{ + ampere{ + one{"A {0}"} + other{"A {0}"} + } + milliampere{ + dnam{"milliamps"} + one{"mA {0}"} + other{"mA {0}"} + } + ohm{ + dnam{"ohm"} + one{"Ω {0}"} + other{"Ω {0}"} + } + volt{ + dnam{"volts"} + one{"V {0}"} + other{"V {0}"} + } + } + energy{ + british-thermal-unit{ + dnam{"BTU"} + one{"Btu {0}"} + other{"Btu {0}"} + } + calorie{ + dnam{"kal"} + one{"kal {0}"} + other{"kal {0}"} + } + electronvolt{ + dnam{"electronvolt"} + one{"eV {0}"} + other{"eV {0}"} + } + foodcalorie{ + dnam{"Kal"} + one{"Kal {0}"} + other{"Kal {0}"} + } + joule{ + dnam{"joules"} + one{"J {0}"} + other{"J {0}"} + } + kilocalorie{ + one{"kcal {0}"} + other{"kcal {0}"} + } + kilojoule{ + dnam{"kilojoule"} + one{"kj {0}"} + other{"kj {0}"} + } + kilowatt-hour{ + dnam{"kW-hour"} + one{"kWh {0}"} + other{"kWh {0}"} + } + therm-us{ + one{"US therm {0}"} + other{"US therm {0}"} + } + } + force{ + newton{ + dnam{"newton"} + one{"N {0}"} + other{"N {0}"} + } + pound-force{ + dnam{"pounds-force"} + one{"lbf {0}"} + other{"lbf {0}"} + } + } + frequency{ + gigahertz{ + one{"GHz {0}"} + other{"GHz {0}"} + } + hertz{ + one{"Hz {0}"} + other{"Hz {0}"} + } + kilohertz{ + one{"kHz {0}"} + other{"kHz {0}"} + } + megahertz{ + one{"MHz {0}"} + other{"MHz {0}"} + } + } + graphics{ + dot{ + dnam{"aya"} + one{"aya {0}"} + other{"aya {0}"} + } + dot-per-centimeter{ + one{"dpcm {0}"} + other{"dpcm {0}"} + } + dot-per-inch{ + one{"dpi {0}"} + other{"dpi {0}"} + } + em{ + one{"em {0}"} + other{"em {0}"} + } + megapixel{ + dnam{"megafikzels"} + one{"MP {0}"} + other{"MP {0}"} + } + pixel{ + dnam{"fikzels"} + one{"px {0}"} + other{"px {0}"} + } + pixel-per-centimeter{ + dnam{"ppcm"} + one{"{0} ppcm"} + other{"{0} ppcm"} + } + pixel-per-inch{ + one{"ppi {0}"} + other{"ppi {0}"} + } + } + length{ + astronomical-unit{ + one{"au {0}"} + other{"au {0}"} + } + centimeter{ + one{"cm {0}"} + other{"cm {0}"} + } + decimeter{ + one{"dm {0}"} + other{"dm {0}"} + } + earth-radius{ + one{"R⊕ {0}"} + other{"R⊕ {0}"} + } + foot{ + dnam{"ƙafafu"} + one{"ƙf {0}"} + other{"ƙf {0}"} + per{"{0}/ƙf"} + } + inch{ + dnam{"incina"} + one{"in {0}"} + other{"in {0}"} + } + kilometer{ + one{"km {0}"} + other{"{0} km"} + } + light-year{ + dnam{"light yrs"} + one{"ly {0}"} + other{"ly {0}"} + } + meter{ + dnam{"m"} + one{"m {0}"} + other{"m {0}"} + } + micrometer{ + dnam{"µmeters"} + one{"µm {0}"} + other{"µm {0}"} + } + mile{ + dnam{"mil-mil"} + one{"mi {0}"} + other{"mi {0}"} + } + mile-scandinavian{ + one{"smi {0}"} + other{"smi {0}"} + } + millimeter{ + one{"mm {0}"} + other{"mm {0}"} + } + nanometer{ + one{"nm {0}"} + other{"nm {0}"} + } + nautical-mile{ + one{"nmi {0}"} + other{"nmi {0}"} + } + parsec{ + dnam{"fasekoki"} + one{"pc {0}"} + other{"pc {0}"} + } + picometer{ + one{"pm {0}"} + other{"pm {0}"} + } + point{ + dnam{"makuna"} + one{"mk {0}"} + other{"mk {0}"} + } + solar-radius{ + dnam{"solar radii"} + one{"R☉ {0}"} + other{"R☉ {0}"} + } + yard{ + dnam{"yaduka"} + one{"yd {0}"} + other{"yd {0}"} + } + } + light{ + candela{ + one{"cd {0}"} + other{"cd {0}"} + } + lux{ + dnam{"lux"} + one{"lx {0}"} + other{"lx {0}"} + } + solar-luminosity{ + dnam{"solar luminosities"} + one{"L☉ {0}"} + other{"L☉ {0}"} + } + } + mass{ + carat{ + dnam{"carats"} + one{"CD {0}"} + other{"CD {0}"} + } + dalton{ + dnam{"daltons"} + one{"Da {0}"} + other{"daltons {0}"} + } + earth-mass{ + dnam{"Earth masses"} + one{"M⊕ {0}"} + other{"M⊕ {0}"} + } + grain{ + dnam{"ƙwaya"} + one{"ƙwaya {0}"} + other{"ƙwaya {0}"} + } + gram{ + dnam{"giram"} + one{"g {0}"} + other{"g {0}"} + } + kilogram{ + one{"kg {0}"} + other{"kg {0}"} + } + metric-ton{ + one{"t {0}"} + other{"t {0}"} + } + microgram{ + one{"µg {0}"} + other{"µg {0}"} + } + milligram{ + one{"mg {0}"} + other{"mg {0}"} + } + ounce{ + one{"oz {0}"} + other{"oz {0}"} + } + ounce-troy{ + dnam{"ozar troy"} + one{"oz t {0}"} + other{"oz t {0}"} + } + pound{ + dnam{"laba-laba"} + one{"lb {0}"} + other{"lb {0}"} + } + solar-mass{ + dnam{"solar masses"} + one{"M☉ {0}"} + other{"M☉ {0}"} + } + ton{ + dnam{"tan-tan"} + one{"tn {0}"} + other{"tn {0}"} + } + } + power{ + gigawatt{ + one{"GW {0}"} + other{"GW {0}"} + } + horsepower{ + dnam{"ƙi"} + one{"ƙi {0}"} + other{"ƙi {0}"} + } + kilowatt{ + one{"kW {0}"} + other{"kW {0}"} + } + megawatt{ + one{"MW {0}"} + other{"MW {0}"} + } + milliwatt{ + one{"mW {0}"} + other{"mW {0}"} + } + watt{ + dnam{"wat-wat"} + one{"W {0}"} + other{"W {0}"} + } + } + pressure{ + atmosphere{ + dnam{"yny"} + one{"yny {0}"} + other{"yny {0}"} + } + bar{ + dnam{"sanda"} + one{"sanda {0}"} + other{"sanda {0}"} + } + hectopascal{ + one{"hPa {0}"} + other{"hPa {0}"} + } + inch-ofhg{ + one{"inHg {0}"} + other{"inHg {0}"} + } + kilopascal{ + one{"kPa {0}"} + other{"kPa {0}"} + } + megapascal{ + one{"MPa {0}"} + other{"MPa {0}"} + } + millibar{ + one{"mbar {0}"} + other{"mbar {0}"} + } + millimeter-ofhg{ + one{"mmHg {0}"} + other{"mmHg {0}"} + } + pascal{ + one{"Pa {0}"} + other{"Pa {0}"} + } + pound-force-per-square-inch{ + one{"psi {0}"} + other{"psi {0}"} + } + } + speed{ + kilometer-per-hour{ + dnam{"km/saʼa"} + one{"km/s {0}"} + other{"km/s {0}"} + } + knot{ + one{"kn {0}"} + other{"kn {0}"} + } + meter-per-second{ + dnam{"mitoci/daƙ"} + one{"m/s {0}"} + other{"m/s {0}"} + } + mile-per-hour{ + dnam{"mil-mil/saʼa"} + one{"mas {0}"} + other{"mas {0}"} + } + } + temperature{ + celsius{ + dnam{"dig. S"} + one{"°S{0}"} + other{"°S{0}"} + } + fahrenheit{ + dnam{"dig. F"} + one{"F°{0}"} + other{"F°{0}"} + } + generic{ + one{"°{0}"} + other{"°{0}"} + } + kelvin{ + one{"K {0}"} + other{"K {0}"} + } + } + torque{ + newton-meter{ + one{"N⋅m {0}"} + other{"N⋅m {0}"} + } + pound-force-foot{ + one{"lbf⋅ft {0}"} + other{"lbf⋅ft {0}"} + } + } + volume{ + acre-foot{ + dnam{"eka ƙf"} + one{"ek ƙf {0}"} + other{"ek ƙf {0}"} + } + barrel{ + one{"gang {0}"} + other{"gang {0}"} + } + centiliter{ + one{"cL {0}"} + other{"cL {0}"} + } + cubic-centimeter{ + one{"cm³ {0}"} + other{"cm³ {0}"} + } + cubic-foot{ + dnam{"ƙafafu³"} + one{"ƙf³ {0}"} + other{"ƙf³ {0}"} + } + cubic-inch{ + dnam{"incina³"} + one{"in³ {0}"} + other{"in³ {0}"} + } + cubic-kilometer{ + one{"km³ {0}"} + other{"km³ {0}"} + } + cubic-meter{ + one{"m³ {0}"} + other{"m³ {0}"} + } + cubic-mile{ + one{"mi³ {0}"} + other{"mi³ {0}"} + } + cubic-yard{ + dnam{"yaduka³"} + one{"yd³ {0}"} + other{"yd³ {0}"} + } + cup{ + dnam{"kofuna"} + one{"k {0}"} + other{"k {0}"} + } + cup-metric{ + one{"mc {0}"} + other{"mc {0}"} + } + deciliter{ + one{"dL {0}"} + other{"dL {0}"} + } + dessert-spoon{ + one{"dstspn {0}"} + other{"dstspn {0}"} + } + dessert-spoon-imperial{ + one{"dstspn Imp {0}"} + other{"dstspn Imp {0}"} + } + dram{ + one{"dram fl {0}"} + other{"dram fl {0}"} + } + drop{ + dnam{"ɗigo"} + one{"ɗigo {0}"} + other{"ɗigo {0}"} + } + fluid-ounce{ + dnam{"fl oz"} + one{"fl oz {0}"} + other{"fl oz {0}"} + } + fluid-ounce-imperial{ + dnam{"Imp. fl oz"} + one{"fl oz Imp. {0}"} + other{"fl oz Imp. {0}"} + } + gallon{ + dnam{"gal"} + one{"gal {0}"} + other{"gal {0}"} + } + gallon-imperial{ + one{"gal Imp. {0}"} + other{"gal Imp.{0}"} + } + hectoliter{ + one{"hL {0}"} + other{"hL {0}"} + } + jigger{ + one{"jigger {0}"} + other{"jigger {0}"} + } + liter{ + dnam{"litoci"} + one{"L {0}"} + other{"L {0}"} + per{"{0}/L"} + } + megaliter{ + one{"ML {0}"} + other{"ML {0}"} + } + milliliter{ + one{"mL {0}"} + other{"mL {0}"} + } + pinch{ + one{"pinch {0}"} + other{"pinch {0}"} + } + pint{ + dnam{"pints"} + one{"pt {0}"} + other{"pt {0}"} + } + pint-metric{ + one{"mpt {0}"} + other{"mpt {0}"} + } + quart{ + dnam{"qts"} + one{"qt {0}"} + other{"qt {0}"} + } + quart-imperial{ + one{"qt Imp. {0}"} + other{"qt Imp. {0}"} + } + tablespoon{ + dnam{"bckl"} + one{"bckl {0}"} + other{"bckl {0}"} + } + teaspoon{ + dnam{"ƙmc"} + one{"ƙmc {0}"} + other{"{0} tsp"} + } + } + } } diff --git a/intl/icu/source/data/unit/haw.txt b/intl/icu/source/data/unit/haw.txt index 6ab5f263ecef..28887bdba7f6 100644 --- a/intl/icu/source/data/unit/haw.txt +++ b/intl/icu/source/data/unit/haw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml haw{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/he.txt b/intl/icu/source/data/unit/he.txt index c201e4e381cd..d675fc820028 100644 --- a/intl/icu/source/data/unit/he.txt +++ b/intl/icu/source/data/unit/he.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -546,6 +546,13 @@ he{ } } graphics{ + dot{ + dnam{"נקודה קטנה"} + many{"{0} נקודות קטנות"} + one{"{0} נקודה"} + other{"{0} נקודות קטנות"} + two{"{0} נקודות קטנות"} + } dot-per-centimeter{ dnam{"נקודות לסנטימטר"} many{"‎{0} dpcm"} @@ -619,6 +626,20 @@ he{ other{"{0} דצימטרים"} two{"{0} דצימטרים"} } + earth-radius{ + dnam{"רדיוס כדור-הארץ"} + many{"{0} רדיוס כדור-הארץ"} + one{"רדיוס כדור-הארץ"} + other{"{0} רדיוס כדור-הארץ"} + two{"{0} רדיוס כדור-הארץ"} + } + fathom{ + dnam{"פתום"} + many{"{0} פתום"} + one{"{0} פתום"} + other{"{0} פתום"} + two{"{0} פתום"} + } foot{ dnam{"רגל"} many{"{0} רגל"} @@ -627,6 +648,13 @@ he{ per{"{0} לרגל"} two{"{0} רגל"} } + furlong{ + dnam{"פורלונג"} + many{"{0} פורלונג"} + one{"{0} פורלונג"} + other{"{0} פורלונג"} + two{"{0} פורלונג"} + } inch{ dnam{"אינץ׳"} many{"{0} אינץ׳"} @@ -737,6 +765,20 @@ he{ } } light{ + candela{ + dnam{"קנדלה"} + many{"{0} קנדלה"} + one{"קנדלה"} + other{"{0} קנדלה"} + two{"{0} קנדלה"} + } + lumen{ + dnam{"לומן"} + many{"{0} לומן"} + one{"לומן {0}"} + other{"{0} לומן"} + two{"{0} לומן"} + } lux{ dnam{"לוקס"} many{"{0} לוקס"} @@ -770,6 +812,13 @@ he{ other{"{0} M⊕"} two{"{0} מסות כדור הארץ"} } + grain{ + dnam{"גרעין"} + many{"{0} גרעינים"} + one{"גרעין {0}"} + other{"{0} גרעינים"} + two{"{0} גרעינים"} + } gram{ dnam{"גרם"} many{"{0} גרם"} @@ -1037,11 +1086,11 @@ he{ two{"{0} ניוטון-מטר"} } pound-force-foot{ - dnam{"כוח פאונד"} - many{"{0} כוח פאונד"} - one{"{0} כוח פאונד"} - other{"{0} כוח פאונד"} - two{"{0} כוח פאונד"} + dnam{"רגל-פאונד"} + many{"{0} רגל-פאונד"} + one{"{0} רגל-פאונד"} + other{"{0} רגל-פאונד"} + two{"{0} רגל-פאונד"} } } volume{ @@ -1059,6 +1108,13 @@ he{ other{"{0} חביות"} two{"{0} חביות"} } + bushel{ + dnam{"בושל"} + many{"{0} בושל"} + one{"{0} בושל"} + other{"{0} בושל"} + two{"{0} בושל"} + } centiliter{ dnam{"סנטיליטר"} many{"{0} סנטיליטר"} @@ -1138,6 +1194,34 @@ he{ other{"{0} דציליטר"} two{"{0} דציליטר"} } + dessert-spoon{ + dnam{"כפית קינוחים"} + many{"{0} כפיות קינוחים"} + one{"כפית קינוחים"} + other{"{0} כפיות קינוחים"} + two{"{0} כפיות קינוחים"} + } + dessert-spoon-imperial{ + dnam{"כפית קינוחים בארה״ב"} + many{"{0} כפיות קינוחים בארה\u0022ב"} + one{"כפית קינוחים בארה״ב"} + other{"{0} כפיות קינוחים בארה\u0022ב"} + two{"{0} כפיות קינוחים בארה\u0022ב"} + } + dram{ + dnam{"דראם אלכוהול"} + many{"{0} דראם אלכוהול"} + one{"דראם אלכוהול {0}"} + other{"{0} דראם אלכוהול"} + two{"{0} דראם אלכוהול"} + } + drop{ + dnam{"טיפה"} + many{"{0} טיפות"} + one{"טיפה"} + other{"{0} טיפות"} + two{"{0} טיפות"} + } fluid-ounce{ dnam{"אונקיות נוזלים"} many{"{0} אונקיות נוזלים"} @@ -1175,6 +1259,13 @@ he{ other{"{0} הקטוליטר"} two{"{0} הקטוליטר"} } + jigger{ + dnam{"ג׳יגר"} + many{"{0} ג'יגר"} + one{"ג'יגר {0}"} + other{"{0} ג'יגר"} + two{"{0} ג'יגר"} + } liter{ dnam{"ליטר"} many{"{0} ליטר"} @@ -1197,6 +1288,13 @@ he{ other{"{0} מיליליטר"} two{"{0} מיליליטר"} } + pinch{ + dnam{"פינץ׳"} + many{"{0} פינץ'"} + one{"פינץ' {0}"} + other{"{0} פינץ'"} + two{"{0} פינץ'"} + } pint{ dnam{"פינט"} many{"{0} פינט"} @@ -1218,6 +1316,13 @@ he{ other{"{0} קווארטות"} two{"{0} קווארטות"} } + quart-imperial{ + dnam{"קווארט אימפריאלי"} + many{"{0} קווארטות אימפריאליות"} + one{"קווארט אימפריאלי {0}"} + other{"{0} קווארטות אימפריאליות"} + two{"{0} קווארטות אימפריאליות"} + } tablespoon{ dnam{"כפות"} many{"{0} כפות"} @@ -2296,6 +2401,13 @@ he{ } } graphics{ + dot{ + dnam{"נקודה קטנה"} + many{"{0} נק′ קטנות"} + one{"{0} נק′ קטנה"} + other{"{0} נק′ קטנות"} + two{"{0} נק′ קטנות"} + } dot-per-centimeter{ many{"‎{0} dpcm"} one{"‎{0} dpcm"} @@ -2495,6 +2607,13 @@ he{ other{"{0} CD"} two{"{0} CD"} } + grain{ + dnam{"גרעין"} + many{"{0} גרעינים"} + one{"גרעין {0}"} + other{"{0} גרעינים"} + two{"{0} גרעינים"} + } gram{ dnam{"גרם"} many{"{0} גר׳"} @@ -2818,6 +2937,13 @@ he{ other{"{0} דצ״ל"} two{"{0} דצ״ל"} } + drop{ + dnam{"טיפה"} + many{"{0} טיפות"} + one{"טיפה"} + other{"{0} טיפות"} + two{"{0} טיפות"} + } fluid-ounce{ dnam{"fl oz"} many{"‎{0} fl oz"} @@ -2876,6 +3002,13 @@ he{ other{"{0} מ״ל"} two{"{0} מ״ל"} } + pinch{ + dnam{"פינץ׳"} + many{"{0} פינץ'"} + one{"{0} פינץ'"} + other{"{0} פינץ'"} + two{"{0} פינץ'"} + } pint{ dnam{"פינט"} many{"‎{0} pt"} diff --git a/intl/icu/source/data/unit/he_IL.txt b/intl/icu/source/data/unit/he_IL.txt index 71039533a130..21ee915c5e3d 100644 --- a/intl/icu/source/data/unit/he_IL.txt +++ b/intl/icu/source/data/unit/he_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/hi.txt b/intl/icu/source/data/unit/hi.txt index 509c87383ca7..03c7a600d157 100644 --- a/intl/icu/source/data/unit/hi.txt +++ b/intl/icu/source/data/unit/hi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -139,8 +139,8 @@ hi{ other{"{0} प्रति हज़ार"} } permillion{ - dnam{"ppm"} - one{"{0} ppm"} + dnam{"हिस्सा प्रति दस लाख"} + one{"{0} हिस्सा प्रति दस लाख"} other{"{0} हिस्सा प्रति दस लाख"} } permyriad{ @@ -408,6 +408,9 @@ hi{ } } graphics{ + dot{ + dnam{"बिंदु"} + } dot-per-centimeter{ dnam{"बिंदु प्रति सेंटीमीटर"} one{"{0} बिंदु प्रति सेंटीमीटर"} @@ -459,12 +462,27 @@ hi{ one{"{0} डेसीमीटर"} other{"{0} डेसीमीटर"} } + earth-radius{ + dnam{"पृथ्वी की त्रिज्या"} + one{"{0} पृथ्वी की त्रिज्या"} + other{"{0} पृथ्वी की त्रिज्या"} + } + fathom{ + dnam{"फ़ैदम"} + one{"{0} फ़ैदम"} + other{"{0} फ़ैदम"} + } foot{ dnam{"फ़ीट"} one{"{0} फ़ुट"} other{"{0} फ़ीट"} per{"{0}/फ़ीट"} } + furlong{ + dnam{"फ़र्लांग"} + one{"{0} फ़र्लांग"} + other{"{0} फ़र्लांग"} + } inch{ dnam{"इंच"} one{"{0} इंच"} @@ -545,6 +563,16 @@ hi{ } } light{ + candela{ + dnam{"कैन्डेला"} + one{"{0} कैन्डेला"} + other{"{0} कैन्डेला"} + } + lumen{ + dnam{"लुमेन"} + one{"{0} लुमेन"} + other{"{0} लुमेन"} + } lux{ dnam{"लक्स"} one{"{0} लक्स"} @@ -572,6 +600,11 @@ hi{ one{"{0} पृथ्वी द्रव्यमान"} other{"{0} पृथ्वी द्रव्यमान"} } + grain{ + dnam{"डेढ़ रत्ती"} + one{"{0} डेढ़ रत्ती"} + other{"{0} डेढ़ रत्ती"} + } gram{ dnam{"ग्राम"} one{"{0} ग्राम"} @@ -621,6 +654,11 @@ hi{ one{"{0} सौर द्रव्यमान"} other{"{0} सौर द्रव्यमान"} } + stone{ + dnam{"14 पौंड का बट्टा"} + one{"{0} 14 पौंड का बट्टा"} + other{"{0} 14 पौंड का बट्टा"} + } ton{ dnam{"टन"} one{"{0} टन"} @@ -778,6 +816,11 @@ hi{ one{"{0} बैरल"} other{"{0} बैरल"} } + bushel{ + dnam{"बुशल"} + one{"{0} बुशल"} + other{"{0} बुशल"} + } centiliter{ dnam{"सेंटीलीटर"} one{"{0} सेंटीलीटर"} @@ -835,6 +878,26 @@ hi{ one{"{0} डेसीलीटर"} other{"{0} डेसीलीटर"} } + dessert-spoon{ + dnam{"डेज़र्ट स्पून"} + one{"{0} डेज़र्ट स्पून"} + other{"{0} डेज़र्ट स्पून"} + } + dessert-spoon-imperial{ + dnam{"इम्पीरियल डेज़र्टस्पून"} + one{"{0} इम्पीरियल डेज़र्टस्पून"} + other{"{0} इम्पीरियल डेज़र्टस्पून"} + } + dram{ + dnam{"ड्रम फ्लूइड"} + one{"{0} ड्रम"} + other{"{0} ड्रम"} + } + drop{ + dnam{"बूंद"} + one{"{0} बूंद"} + other{"{0} बूंद"} + } fluid-ounce{ dnam{"फ़्लूइड आउंस"} one{"{0} फ़्लूइड आउंस"} @@ -862,6 +925,11 @@ hi{ one{"{0} हैक्टोलीटर"} other{"{0} हैक्टोलीटर"} } + jigger{ + dnam{"जिगर"} + one{"{0} जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लीटर"} one{"{0} लीटर"} @@ -878,10 +946,14 @@ hi{ one{"{0} मिलीलीटर"} other{"{0} मिलीलीटर"} } + pinch{ + dnam{"चुटकी"} + one{"{0} चुटकी"} + other{"{0} चुटकी"} + } pint{ - dnam{"पिंट"} - one{"{0} पिंट"} - other{"{0} पिंट"} + one{"{0} पाइंट"} + other{"{0} पाइंट"} } pint-metric{ dnam{"मीट्रिक पिंट"} @@ -893,6 +965,11 @@ hi{ one{"{0} क्वार्ट"} other{"{0} क्वार्ट"} } + quart-imperial{ + dnam{"क्वार्ट इम्पीरियल"} + one{"{0} क्वार्ट इम्पीरियल"} + other{"{0} क्वार्ट इम्पीरियल"} + } tablespoon{ dnam{"टेबलस्पून"} one{"{0} टेबलस्पून"} @@ -1019,6 +1096,12 @@ hi{ other{"{0}वर्ष"} } } + graphics{ + dot{ + one{"{0}बिंदु"} + other{"{0}बिंदु"} + } + } length{ centimeter{ dnam{"सें॰मी॰"} @@ -1084,6 +1167,10 @@ hi{ one{"{0}#"} other{"{0}#"} } + stone{ + one{"{0} ला"} + other{"{0}st"} + } } power{ horsepower{ @@ -1536,6 +1623,11 @@ hi{ } } graphics{ + dot{ + dnam{"बिंदु"} + one{"{0} बिंदु"} + other{"{0} बिंदु"} + } megapixel{ dnam{"मेगापिक्सेल"} } @@ -1560,12 +1652,22 @@ hi{ one{"{0} डे॰मी॰"} other{"{0} डे॰मी॰"} } + fathom{ + dnam{"फ़ैदम"} + one{"{0} फ़ैदम"} + other{"{0} फ़ैदम"} + } foot{ dnam{"फ़ीट"} one{"{0} फ़ीट"} other{"{0} फ़ीट"} per{"{0}/फ़ीट"} } + furlong{ + dnam{"फ़र्लांग"} + one{"{0} फ़र्लांग"} + other{"{0} फ़र्लांग"} + } inch{ dnam{"इंच"} one{"{0} इंच"} @@ -1658,6 +1760,11 @@ hi{ one{"{0} डाल्टन"} other{"{0} डाल्टन"} } + grain{ + dnam{"डे. रत्ती"} + one{"{0} डे. रत्ती"} + other{"{0} डेढ़ रत्ती"} + } gram{ dnam{"ग्राम"} one{"{0} ग्रा॰"} @@ -1702,6 +1809,11 @@ hi{ other{"{0} पौंड"} per{"{0}/पौंड"} } + stone{ + dnam{"14 पौ. का बट्टा"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"टन"} one{"{0} टन"} @@ -1854,6 +1966,11 @@ hi{ one{"{0} बैरल"} other{"{0} बैरल"} } + bushel{ + dnam{"बुशल"} + one{"{0} बुश."} + other{"{0} बुश."} + } centiliter{ dnam{"सें॰ली॰"} one{"{0} सें॰ली॰"} @@ -1911,6 +2028,26 @@ hi{ one{"{0} डे॰ली॰"} other{"{0} डे॰ली॰"} } + dessert-spoon{ + dnam{"डे. स्पून"} + one{"{0} डे. स्पून"} + other{"{0} डे. स्पून"} + } + dessert-spoon-imperial{ + dnam{"इम्पी. डेज़र्टस्पून"} + one{"{0} इम्पी. डेज़र्टस्पून"} + other{"{0} इम्पी. डेज़र्टस्पून"} + } + dram{ + dnam{"ड्रम फ्लूइड"} + one{"{0} ड्रम फ्लू."} + other{"{0} ड्रम फ्लू."} + } + drop{ + dnam{"बूंद"} + one{"{0} बूंद"} + other{"{0} बूंद"} + } fluid-ounce{ dnam{"फ़्लूइड आउंस"} one{"{0} फ़्लूइड आउंस"} @@ -1933,6 +2070,11 @@ hi{ one{"{0} है॰ली॰"} other{"{0} है॰ली॰"} } + jigger{ + dnam{"जिगर"} + one{"{0} जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लीटर"} one{"{0} ली॰"} @@ -1949,10 +2091,15 @@ hi{ one{"{0} मि॰ ली॰"} other{"{0} मि॰ ली॰"} } + pinch{ + dnam{"चुटकी"} + one{"{0} चुटकी"} + other{"{0} चुटकी"} + } pint{ - dnam{"पिंट"} - one{"{0} पिंट"} - other{"{0} पिंट"} + dnam{"पाइंट"} + one{"{0} पाइंट"} + other{"{0} पाइंट"} } pint-metric{ dnam{"मीट्रिक पिंट"} @@ -1964,6 +2111,11 @@ hi{ one{"{0} क्वार्ट"} other{"{0} क्वार्ट"} } + quart-imperial{ + dnam{"क्वार्ट इम्पी."} + one{"{0} क. इम्पी."} + other{"{0} क. इम्पी."} + } tablespoon{ dnam{"टे॰ स्पून"} one{"{0} टे॰ स्पून"} diff --git a/intl/icu/source/data/unit/hr.txt b/intl/icu/source/data/unit/hr.txt index 61aefe430392..6ba0a4feedfd 100644 --- a/intl/icu/source/data/unit/hr.txt +++ b/intl/icu/source/data/unit/hr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -202,10 +202,10 @@ hr{ } coordinate{ dnam{"kardinalni smjer"} - east{"{0}I"} - north{"{0}S"} - south{"{0}J"} - west{"{0}Z"} + east{"{0} istočno"} + north{"{0} sjeverno"} + south{"{0} južno"} + west{"{0} zapadno"} } digital{ bit{ @@ -479,6 +479,12 @@ hr{ } } graphics{ + dot{ + dnam{"točka"} + few{"{0} točke"} + one{"{0} točka"} + other{"{0} točaka"} + } dot-per-centimeter{ dnam{"točke po centimetru"} few{"{0} točke po centimetru"} @@ -542,6 +548,12 @@ hr{ one{"{0} decimetar"} other{"{0} decimetara"} } + earth-radius{ + dnam{"srednji polumjer Zemlje"} + few{"{0} srednja polumjera Zemlje"} + one{"{0} srednji polumjer Zemlje"} + other{"{0} srednjih polumjera Zemlje"} + } fathom{ dnam{"hvati"} few{"{0} hvata"} @@ -638,9 +650,9 @@ hr{ } point{ dnam{"točke"} - few{"{0} točke"} - one{"{0} točka"} - other{"{0} točaka"} + few{"{0} tipografske točke"} + one{"{0} tipografska točka"} + other{"{0} tipografskih točaka"} } solar-radius{ dnam{"Sunčevi polumjeri"} @@ -656,6 +668,18 @@ hr{ } } light{ + candela{ + dnam{"kandela"} + few{"{0} kandele"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumena"} + one{"{0} lumen"} + other{"{0} lumena"} + } lux{ dnam{"luksi"} few{"{0} luksa"} @@ -688,6 +712,11 @@ hr{ one{"{0} Zemljina masa"} other{"{0} Zemljinih masa"} } + grain{ + few{"{0} graina"} + one{"{0} gr"} + other{"{0} graina"} + } gram{ dnam{"grami"} few{"{0} grama"} @@ -1012,6 +1041,30 @@ hr{ one{"{0} decilitar"} other{"{0} decilitara"} } + dessert-spoon{ + dnam{"desertna žličica"} + few{"{0} desertne žličice"} + one{"{0} desertna žličica"} + other{"{0} desertnih žličica"} + } + dessert-spoon-imperial{ + dnam{"imperijalna desertna žličica"} + few{"{0} imperijalne desertne žličice"} + one{"{0} imperijalna desertna žličica"} + other{"{0} imperijalnih desertnih žličica"} + } + dram{ + dnam{"dram tekućine"} + few{"{0} drama tekućine"} + one{"{0} dram tekućine"} + other{"{0} drama tekućine"} + } + drop{ + dnam{"kap"} + few{"{0} kapi"} + one{"{0} kap"} + other{"{0} kapi"} + } fluid-ounce{ dnam{"tekuće unce"} few{"{0} tekuće unce"} @@ -1044,6 +1097,11 @@ hr{ one{"{0} hektolitar"} other{"{0} hektolitara"} } + jigger{ + few{"{0} jiggera"} + one{"{0} jiggera"} + other{"{0} jiggera"} + } liter{ dnam{"litre"} few{"{0} litre"} @@ -1063,6 +1121,12 @@ hr{ one{"{0} mililitar"} other{"{0} mililitara"} } + pinch{ + dnam{"prstohvat"} + few{"{0} prstohvata"} + one{"{0} prstohvat"} + other{"{0} prstohvata"} + } pint{ dnam{"pinte"} few{"{0} pinte"} @@ -1081,6 +1145,12 @@ hr{ one{"{0} četvrtina"} other{"{0} četvrtina"} } + quart-imperial{ + dnam{"imperijalna četvrtina"} + few{"{0} imperijalne četvrtine"} + one{"{0} imperijalna četvrtina"} + other{"{0} imperijalne četvrtine"} + } tablespoon{ dnam{"žlice"} few{"{0} žlice"} @@ -1970,10 +2040,10 @@ hr{ } coordinate{ dnam{"smjer"} - east{"{0}I"} - north{"{0}S"} - south{"{0}J"} - west{"{0}Z"} + east{"{0} I"} + north{"{0} S"} + south{"{0} J"} + west{"{0} Z"} } digital{ bit{ @@ -2227,6 +2297,12 @@ hr{ } } graphics{ + dot{ + dnam{"točka"} + few{"{0} točke"} + one{"{0} točka"} + other{"{0} točaka"} + } dot-per-centimeter{ dnam{"dpcm"} few{"{0} dpcm"} @@ -2290,6 +2366,12 @@ hr{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + few{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } fathom{ dnam{"hv"} few{"{0} hv"} @@ -2415,6 +2497,12 @@ hr{ dalton{ dnam{"daltoni"} } + grain{ + dnam{"gr"} + few{"{0} gr"} + one{"{0} gr"} + other{"{0} gr"} + } gram{ dnam{"g"} few{"{0} g"} @@ -2709,6 +2797,30 @@ hr{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"žličica"} + few{"{0} des. žličice"} + one{"{0} des. žličica"} + other{"{0} des. žličica"} + } + dessert-spoon-imperial{ + dnam{"imp. žličica"} + few{"{0} imp. žličice"} + one{"{0} imp. žličica"} + other{"{0} imp. žličica"} + } + dram{ + dnam{"fl dr"} + few{"{0} fl dr"} + one{"{0} fl dr"} + other{"{0} fl dr"} + } + drop{ + dnam{"kap"} + few{"{0} kapi"} + one{"{0} kap"} + other{"{0} kapi"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -2741,6 +2853,11 @@ hr{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + few{"{0} jiggera"} + one{"{0} jiggera"} + other{"{0} jiggera"} + } liter{ dnam{"l"} few{"{0} l"} @@ -2760,6 +2877,12 @@ hr{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"prstohvat"} + few{"{0} prstohvata"} + one{"{0} prstohvat"} + other{"{0} prstohvata"} + } pint{ dnam{"pt"} few{"{0} pt"} diff --git a/intl/icu/source/data/unit/hsb.txt b/intl/icu/source/data/unit/hsb.txt index d378c28654b2..ba2bb9b3f86f 100644 --- a/intl/icu/source/data/unit/hsb.txt +++ b/intl/icu/source/data/unit/hsb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hsb{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/hu.txt b/intl/icu/source/data/unit/hu.txt index bede3462cf94..a05056c29814 100644 --- a/intl/icu/source/data/unit/hu.txt +++ b/intl/icu/source/data/unit/hu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -403,6 +403,11 @@ hu{ } } graphics{ + dot{ + dnam{"képpont"} + one{"képpont"} + other{"{0} képpont"} + } dot-per-centimeter{ dnam{"pont per centiméter"} one{"{0} pont per centiméter"} @@ -456,12 +461,27 @@ hu{ one{"{0} deciméter"} other{"{0} deciméter"} } + earth-radius{ + dnam{"földsugár"} + one{"{0} földsugár"} + other{"{0} földsugár"} + } + fathom{ + dnam{"öl"} + one{"{0} öl"} + other{"{0} öl"} + } foot{ dnam{"láb"} one{"{0} láb"} other{"{0} láb"} per{"{0}/láb"} } + furlong{ + dnam{"furlong"} + one{"{0} furlong"} + other{"{0} furlong"} + } inch{ dnam{"hüvelyk"} one{"{0} hüvelyk"} @@ -542,6 +562,16 @@ hu{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -569,6 +599,11 @@ hu{ one{"{0} Föld-tömeg"} other{"{0} Föld-tömeg"} } + grain{ + dnam{"grain"} + one{"{0} grain"} + other{"{0} grain"} + } gram{ dnam{"gramm"} one{"{0} gramm"} @@ -624,9 +659,9 @@ hu{ other{"{0} stone"} } ton{ - dnam{"tonna"} - one{"{0} tonna"} - other{"{0} tonna"} + dnam{"amerikai tonna"} + one{"{0} amerikai tonna"} + other{"{0} amerikai tonna"} } } power{ @@ -775,6 +810,11 @@ hu{ one{"{0} hordó"} other{"{0} hordó"} } + bushel{ + dnam{"véka"} + one{"{0} véka"} + other{"{0} véka"} + } centiliter{ dnam{"centiliter"} one{"{0} centiliter"} @@ -832,6 +872,26 @@ hu{ one{"{0} deciliter"} other{"{0} deciliter"} } + dessert-spoon{ + dnam{"desszertkanál"} + one{"{0} desszertkanál"} + other{"{0} desszertkanál"} + } + dessert-spoon-imperial{ + dnam{"bir. desszertkanál"} + one{"{0} bir. desszertkanál"} + other{"{0} bir. desszertkanál"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"csepp"} + one{"{0} csepp"} + other{"{0} csepp"} + } fluid-ounce{ dnam{"folyadékuncia"} one{"{0} folyadékuncia"} @@ -859,6 +919,11 @@ hu{ one{"{0} hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"adagolópohár"} + one{"{0} adagolópohár"} + other{"{0} adagolópohár"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -875,6 +940,11 @@ hu{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"csipet"} + one{"{0} csipet"} + other{"{0} csipet"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -890,6 +960,11 @@ hu{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"birodalmi kvart"} + one{"{0} birodalmi kvart"} + other{"{0} birodalmi kvart"} + } tablespoon{ dnam{"evőkanál"} one{"{0} evőkanál"} @@ -995,8 +1070,8 @@ hu{ per{"{0}/nap"} } hour{ - dnam{"h"} - one{"{0} h"} + dnam{"ó"} + one{"{0} ó"} other{"{0} h"} per{"{0}/h"} } @@ -1006,9 +1081,9 @@ hu{ other{"{0} ms"} } minute{ - dnam{"min"} - one{"{0} min"} - other{"{0} min"} + dnam{"p"} + one{"{0} p"} + other{"{0} p"} per{"{0}/min"} } month{ @@ -1456,9 +1531,9 @@ hu{ } hour{ dnam{"h"} - one{"{0} h"} - other{"{0} h"} - per{"{0}/h"} + one{"{0} ó"} + other{"{0} ó"} + per{"{0}/ó"} } microsecond{ dnam{"μs"} @@ -1471,10 +1546,10 @@ hu{ other{"{0} ms"} } minute{ - dnam{"min"} - one{"{0} min"} - other{"{0} min"} - per{"{0}/min"} + dnam{"p"} + one{"{0} p"} + other{"{0} p"} + per{"{0}/p"} } month{ dnam{"hónap"} @@ -1588,6 +1663,11 @@ hu{ } } graphics{ + dot{ + dnam{"képpont"} + one{"{0} képpont"} + other{"{0} képpont"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1622,12 +1702,22 @@ hu{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"öl"} + one{"{0} öl"} + other{"{0} öl"} + } foot{ dnam{"láb"} one{"{0} láb"} other{"{0} láb"} per{"{0}/láb"} } + furlong{ + dnam{"furlong"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"hüvelyk"} one{"{0} hüvelyk"} @@ -1718,6 +1808,11 @@ hu{ one{"{0} Kt"} other{"{0} Kt"} } + grain{ + dnam{"grain"} + one{"{0} grain"} + other{"{0} grain"} + } gram{ dnam{"gram"} one{"{0} g"} @@ -1823,8 +1918,8 @@ hu{ } millimeter-ofhg{ dnam{"Hgmm"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} + one{"{0} Hgmm"} + other{"{0} Hgmm"} } pascal{ dnam{"Pa"} @@ -1899,6 +1994,11 @@ hu{ one{"{0} hordó"} other{"{0} hordó"} } + bushel{ + dnam{"véka"} + one{"{0} véka"} + other{"{0} véka"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1956,6 +2056,26 @@ hu{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"desszertkanál"} + one{"{0} desszertkanál"} + other{"{0} desszertkanál"} + } + dessert-spoon-imperial{ + dnam{"bir. desszertkanál"} + one{"{0} bir. desszertkanál"} + other{"{0} bir. desszertkanál"} + } + dram{ + dnam{"fluid dram"} + one{"{0} fl dram"} + other{"{0} fl dram"} + } + drop{ + dnam{"csepp"} + one{"{0} csepp"} + other{"{0} csepp"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1983,6 +2103,11 @@ hu{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"adagolópohár"} + one{"{0} adagolópohár"} + other{"{0} adagolópohár"} + } liter{ dnam{"l"} one{"{0} l"} @@ -1999,6 +2124,11 @@ hu{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"csipet"} + one{"{0} csipet"} + other{"{0} csipet"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -2014,6 +2144,11 @@ hu{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"bir. qt"} + one{"{0} bir. qt"} + other{"{0} bir. qt"} + } tablespoon{ dnam{"ek."} one{"{0} ek."} diff --git a/intl/icu/source/data/unit/hy.txt b/intl/icu/source/data/unit/hy.txt index dbedd4a74e02..e7164ee3843f 100644 --- a/intl/icu/source/data/unit/hy.txt +++ b/intl/icu/source/data/unit/hy.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ hy{ } } graphics{ + dot{ + dnam{"կետ"} + one{"{0} կետ"} + other{"{0} կետ"} + } dot-per-centimeter{ dnam{"կետեր սանտիմետրի վրա"} one{"{0} կետ սանտիմետրի վրա"} @@ -465,6 +470,10 @@ hy{ other{"{0} ֆուտ"} per{"{0} ֆուտի վրա"} } + furlong{ + one{"{0} ֆուրլոնգ"} + other{"{0} ֆուրլոնգ"} + } inch{ dnam{"մատնաչափեր"} one{"{0} մատնաչափ"} @@ -529,9 +538,9 @@ hy{ other{"{0} պիկոմետր"} } point{ - dnam{"կետեր"} - one{"{0} կետ"} - other{"{0} կետ"} + dnam{"pt"} + one{"{0} pt"} + other{"{0} pt"} } solar-radius{ dnam{"արեգակնային շառավիղներ"} @@ -545,6 +554,11 @@ hy{ } } light{ + candela{ + dnam{"կանդելա"} + one{"{0} կանդելա"} + other{"{0} կանդելա"} + } lux{ dnam{"լյուքսեր"} one{"{0} լյուքս"} @@ -572,6 +586,11 @@ hy{ one{"{0} երկրային զանգված"} other{"{0} արևային զանգված"} } + grain{ + dnam{"գրան"} + one{"{0} գրան"} + other{"{0} գրան"} + } gram{ dnam{"գրամներ"} one{"{0} գրամ"} @@ -621,6 +640,10 @@ hy{ one{"{0} արեգակնային զանգված"} other{"{0} արեգակնային զանգված"} } + stone{ + one{"{0} սթոուն"} + other{"{0} սթոուն"} + } ton{ dnam{"ամերիկյան տոննաներ"} one{"{0} ամերիկյան տոննա"} @@ -778,6 +801,11 @@ hy{ one{"{0} տակառ"} other{"{0} տակառ"} } + bushel{ + dnam{"բուշել"} + one{"{0} բուշել"} + other{"{0} բուշել"} + } centiliter{ dnam{"սանտիլիտրեր"} one{"{0} սանտիլիտր"} @@ -835,6 +863,24 @@ hy{ one{"{0} դեցիլիտր"} other{"{0} դեցիլիտր"} } + dessert-spoon{ + one{"{0} աղանդերի գդալ"} + other{"{0} աղանդերի գդալ"} + } + dessert-spoon-imperial{ + one{"{0} անգլիական աղանդերի գդալ"} + other{"{0} անգլիական աղանդերի գդալ"} + } + dram{ + dnam{"դրամ"} + one{"{0} դրամ"} + other{"{0} դրամ"} + } + drop{ + dnam{"կաթիլ"} + one{"{0} կաթիլ"} + other{"{0} կաթիլ"} + } fluid-ounce{ dnam{"հեղուկ ունկիներ"} one{"{0} հեղուկ ունկի"} @@ -862,6 +908,11 @@ hy{ one{"{0} հեկտոլիտր"} other{"{0} հեկտոլիտր"} } + jigger{ + dnam{"ջիգեր"} + one{"{0} ջիգեր"} + other{"{0} ջիգեր"} + } liter{ dnam{"լիտրեր"} one{"{0} լիտր"} @@ -878,6 +929,11 @@ hy{ one{"{0} միլիլիտր"} other{"{0} միլիլիտր"} } + pinch{ + dnam{"պտղունց"} + one{"{0} պտղունց"} + other{"{0} պտղունց"} + } pint{ dnam{"փինթեր"} one{"{0} փինթ"} @@ -893,6 +949,11 @@ hy{ one{"{0} քվարտ"} other{"{0} քվարտ"} } + quart-imperial{ + dnam{"անգլիական քվարտ"} + one{"{0} անգլիական քվարտ"} + other{"{0} անգլիական քվարտ"} + } tablespoon{ dnam{"ճաշի գդալ"} one{"{0} ճաշի գդալ"} @@ -964,9 +1025,9 @@ hy{ } consumption{ liter-per-100-kilometer{ - dnam{"լ/100 կմ"} - one{"{0} լ/100 կմ"} - other{"{0} լ/100 կմ"} + dnam{"Լ/100 կմ"} + one{"{0} Լ/100 կմ"} + other{"{0} Լ/100 կմ"} } } coordinate{ @@ -1287,8 +1348,8 @@ hy{ } permillion{ dnam{"մասնիկ/միլիոն"} - one{"{0} մասնիկ/միլիոն"} - other{"{0} մասնիկ/միլիոն"} + one{"{0} մմվ"} + other{"{0} մմվ"} } permyriad{ dnam{"‱"} @@ -1298,9 +1359,9 @@ hy{ } consumption{ liter-per-100-kilometer{ - dnam{"լ/100 կմ"} - one{"{0} լ/100 կմ"} - other{"{0} լ/100 կմ"} + dnam{"Լ/100 կմ"} + one{"{0} Լ/100 կմ"} + other{"{0} Լ/100 կմ"} } liter-per-kilometer{ dnam{"լ/կմ"} @@ -1474,6 +1535,11 @@ hy{ } } energy{ + british-thermal-unit{ + dnam{"ԲՋՄ"} + one{"{0} Բջմ"} + other{"{0} Բջմ"} + } calorie{ dnam{"կալ"} one{"{0} կալ"} @@ -1550,6 +1616,11 @@ hy{ } } graphics{ + dot{ + dnam{"կետ"} + one{"{0} կետ"} + other{"{0} կետ"} + } dot-per-centimeter{ dnam{"կսմ"} one{"{0} կսմ"} @@ -1598,12 +1669,22 @@ hy{ one{"{0} դմ"} other{"{0} դմ"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } foot{ dnam{"ֆտ"} one{"{0} ֆտ"} other{"{0} ֆտ"} per{"{0}/ֆտ"} } + furlong{ + dnam{"ֆուրլոնգ"} + one{"{0} ֆուրլ․"} + other{"{0} ֆուրլ․"} + } inch{ dnam{"մատ"} one{"{0} մատ"} @@ -1668,9 +1749,8 @@ hy{ other{"{0} պմ"} } point{ - dnam{"կտ"} - one{"{0} կտ"} - other{"{0} կտ"} + one{"{0} pt"} + other{"{0} pt"} } solar-radius{ dnam{"R☉"} @@ -1684,6 +1764,16 @@ hy{ } } light{ + candela{ + dnam{"կդ"} + one{"{0} կդ"} + other{"{0} կդ"} + } + lumen{ + dnam{"լմ"} + one{"{0} լմ"} + other{"{0} լմ"} + } lux{ dnam{"լք"} one{"{0} լք"} @@ -1701,6 +1791,11 @@ hy{ one{"{0} դա"} other{"{0} դա"} } + grain{ + dnam{"գրան"} + one{"{0} գրան"} + other{"{0} գրան"} + } gram{ dnam{"գ"} one{"{0} գ"} @@ -1745,6 +1840,11 @@ hy{ other{"{0} ֆունտ"} per{"{0}/ֆունտ"} } + stone{ + dnam{"սթոուն"} + one{"{0} սթոուն"} + other{"{0} սթոուն"} + } ton{ dnam{"ամեր․ տ"} one{"{0} ամեր․ տ"} @@ -1959,6 +2059,26 @@ hy{ one{"{0} դլ"} other{"{0} դլ"} } + dessert-spoon{ + dnam{"ագ․"} + one{"{0} ագ․"} + other{"{0} ագ․"} + } + dessert-spoon-imperial{ + dnam{"անգլ․ ագ․"} + one{"{0} անգլ․ ագ․"} + other{"{0} անգլ․ ագ․"} + } + dram{ + dnam{"հեղուկ դրամ"} + one{"{0} հեղուկ դրամ"} + other{"{0} հեղուկ դրամ"} + } + drop{ + dnam{"կաթիլ"} + one{"{0} կաթիլ"} + other{"{0} կաթիլ"} + } fluid-ounce{ dnam{"հղ․ ունկ․"} one{"{0} հղ. ունկ․"} @@ -1986,6 +2106,11 @@ hy{ one{"{0} հլ"} other{"{0} հլ"} } + jigger{ + dnam{"ջիգեր"} + one{"{0} ջիգեր"} + other{"{0} ջիգեր"} + } liter{ dnam{"լ"} one{"{0} լ"} @@ -2002,6 +2127,11 @@ hy{ one{"{0} մլ"} other{"{0} մլ"} } + pinch{ + dnam{"պտղունց"} + one{"{0} պտղունց"} + other{"{0} պտղունց"} + } pint{ dnam{"փինթեր"} one{"{0} փինթ"} @@ -2017,6 +2147,11 @@ hy{ one{"{0} քվարտ"} other{"{0} քվարտ"} } + quart-imperial{ + dnam{"անգլիական քվարտ"} + one{"{0} անգլիական քվարտ"} + other{"{0} անգլիական քվարտ"} + } tablespoon{ dnam{"ճգ."} one{"{0} ճգ."} diff --git a/intl/icu/source/data/unit/ia.txt b/intl/icu/source/data/unit/ia.txt index e355a1917c8e..6e01a9c49f58 100644 --- a/intl/icu/source/data/unit/ia.txt +++ b/intl/icu/source/data/unit/ia.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ia{ - Version{"37"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} diff --git a/intl/icu/source/data/unit/id.txt b/intl/icu/source/data/unit/id.txt index a742b276ad64..4a7eca3af077 100644 --- a/intl/icu/source/data/unit/id.txt +++ b/intl/icu/source/data/unit/id.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id{ - Version{"37"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -136,10 +136,10 @@ id{ } coordinate{ dnam{"arah mata angin"} - east{"{0}T"} - north{"{0}U"} - south{"{0}S"} - west{"{0}B"} + east{"{0} timur"} + north{"{0} utara"} + south{"{0} selatan"} + west{"{0} barat"} } digital{ bit{ @@ -371,6 +371,10 @@ id{ dnam{"desimeter"} other{"{0} desimeter"} } + earth-radius{ + dnam{"jari-jari Bumi"} + other{"{0} jari-jari Bumi"} + } fathom{ dnam{"depa"} other{"{0} depa"} @@ -449,6 +453,14 @@ id{ } } light{ + candela{ + dnam{"candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} other{"{0} lux"} @@ -471,6 +483,10 @@ id{ dnam{"massa Bumi"} other{"{0} massa Bumi"} } + grain{ + dnam{"grain"} + other{"{0} grain"} + } gram{ dnam{"gram"} other{"{0} gram"} @@ -503,17 +519,21 @@ id{ other{"{0} troy ons"} } pound{ - dnam{"pon"} - other{"{0} pon"} - per{"{0} per pon"} + dnam{"pound"} + other{"{0} pound"} + per{"{0} per pound"} } solar-mass{ dnam{"massa Matahari"} other{"{0} massa Matahari"} } + stone{ + dnam{"stone"} + other{"{0} stone"} + } ton{ - dnam{"ton"} - other{"{0} ton"} + dnam{"ton Amerika Serikat"} + other{"{0} ton Amerika Serikat"} } } power{ @@ -552,8 +572,8 @@ id{ other{"{0} hektopascal"} } inch-ofhg{ - dnam{"inci merkuri"} - other{"{0} inci merkuri"} + dnam{"inci raksa"} + other{"{0} inci raksa"} } kilopascal{ dnam{"kilopascal"} @@ -568,16 +588,16 @@ id{ other{"{0} milibar"} } millimeter-ofhg{ - dnam{"milimeter merkuri"} - other{"{0} milimeter merkuri"} + dnam{"milimeter raksa"} + other{"{0} milimeter raksa"} } pascal{ dnam{"pascal"} other{"{0} pascal"} } pound-force-per-square-inch{ - dnam{"pon per inci persegi"} - other{"{0} pon per inci persegi"} + dnam{"pound per inci persegi"} + other{"{0} pound per inci persegi"} } } speed{ @@ -628,13 +648,17 @@ id{ } volume{ acre-foot{ - dnam{"acre-feet"} - other{"{0} acre-feet"} + dnam{"ekar kaki"} + other{"{0} ekar kaki"} } barrel{ dnam{"barrel"} other{"{0} barrel"} } + bushel{ + dnam{"gantang"} + other{"{0} gantang"} + } centiliter{ dnam{"sentiliter"} other{"{0} sentiliter"} @@ -681,6 +705,22 @@ id{ dnam{"desiliter"} other{"{0} desiliter"} } + dessert-spoon{ + dnam{"sendok dessert"} + other{"{0} sendok dessert"} + } + dessert-spoon-imperial{ + dnam{"sendok dessert Imp."} + other{"{0} sendok dessert Imp."} + } + dram{ + dnam{"dram"} + other{"{0} dram"} + } + drop{ + dnam{"tetes"} + other{"{0} tetes"} + } fluid-ounce{ dnam{"fluid ounce"} other{"{0} fluid ounce"} @@ -703,6 +743,10 @@ id{ dnam{"hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"jigger"} + other{"{0} sloki"} + } liter{ dnam{"liter"} other{"{0} liter"} @@ -716,6 +760,10 @@ id{ dnam{"mililiter"} other{"{0} mililiter"} } + pinch{ + dnam{"jumput"} + other{"{0} jumput"} + } pint{ dnam{"pint"} other{"{0} pint"} @@ -728,6 +776,10 @@ id{ dnam{"quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"quart Imp."} + other{"{0} quart Imp."} + } tablespoon{ dnam{"sendok makan"} other{"{0} sendok makan"} @@ -767,8 +819,8 @@ id{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100km"} - other{"{0}L/100km"} + dnam{"L/100 km"} + other{"{0}L/100 km"} } } coordinate{ @@ -1069,8 +1121,8 @@ id{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100km"} - other{"{0} L/100km"} + dnam{"L/100 km"} + other{"{0} L/100 km"} } liter-per-kilometer{ dnam{"liter/km"} @@ -1087,10 +1139,10 @@ id{ } coordinate{ dnam{"arah"} - east{"{0}T"} - north{"{0}U"} - south{"{0}S"} - west{"{0}B"} + east{"{0} T"} + north{"{0} U"} + south{"{0} S"} + west{"{0} B"} } digital{ bit{ @@ -1373,6 +1425,14 @@ id{ } } light{ + candela{ + dnam{"cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + other{"{0} lm"} + } lux{ dnam{"lux"} other{"{0} lx"} @@ -1392,6 +1452,10 @@ id{ earth-mass{ dnam{"massa Bumi"} } + grain{ + dnam{"grain"} + other{"{0} grain"} + } gram{ dnam{"gram"} other{"{0} g"} @@ -1424,7 +1488,7 @@ id{ other{"{0} oz t"} } pound{ - dnam{"pon"} + dnam{"pound"} other{"{0} lb"} per{"{0}/lb"} } @@ -1435,8 +1499,8 @@ id{ dnam{"stone"} } ton{ - dnam{"ton"} - other{"{0} tn"} + dnam{"ton AS"} + other{"{0} tn AS"} } } power{ @@ -1483,8 +1547,8 @@ id{ other{"{0} mbar"} } millimeter-ofhg{ - dnam{"mm Hg"} - other{"{0} mm Hg"} + dnam{"mmHg"} + other{"{0} mmHg"} } pound-force-per-square-inch{ dnam{"psi"} @@ -1535,6 +1599,9 @@ id{ barrel{ dnam{"barrel"} } + bushel{ + dnam{"gantang"} + } centiliter{ dnam{"cL"} other{"{0} cL"} @@ -1581,6 +1648,13 @@ id{ dnam{"dL"} other{"{0} dL"} } + dram{ + dnam{"dram cairan"} + } + drop{ + dnam{"tetes"} + other{"{0} tetes"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} @@ -1599,6 +1673,10 @@ id{ dnam{"hL"} other{"{0} hL"} } + jigger{ + dnam{"sloki"} + other{"{0} sloki"} + } liter{ dnam{"liter"} other{"{0} l"} @@ -1612,6 +1690,10 @@ id{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"jumput"} + other{"{0} jumput"} + } pint{ dnam{"pint"} other{"{0} pt"} @@ -1624,6 +1706,10 @@ id{ dnam{"qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"sdm"} other{"{0} sdm"} diff --git a/intl/icu/source/data/unit/id_ID.txt b/intl/icu/source/data/unit/id_ID.txt index 20daa236ee75..63f19a21aa60 100644 --- a/intl/icu/source/data/unit/id_ID.txt +++ b/intl/icu/source/data/unit/id_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ig.txt b/intl/icu/source/data/unit/ig.txt index 2b2dbfd451ae..2b5212f523a7 100644 --- a/intl/icu/source/data/unit/ig.txt +++ b/intl/icu/source/data/unit/ig.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ig{ - Version{"37"} units{ duration{ century{ @@ -23,5 +23,25 @@ ig{ dnam{"Ọtụtụ Afọ"} } } + length{ + earth-radius{ + dnam{"radius uwa"} + } + } + volume{ + dessert-spoon{ + dnam{"ngaji mégharia onu"} + } + dram{ + dnam{"mmiri dram"} + } + } + } + unitsShort{ + volume{ + drop{ + dnam{"dobé"} + } + } } } diff --git a/intl/icu/source/data/unit/ii.txt b/intl/icu/source/data/unit/ii.txt index e9f1c2751776..904db14264a6 100644 --- a/intl/icu/source/data/unit/ii.txt +++ b/intl/icu/source/data/unit/ii.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ii{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/in.txt b/intl/icu/source/data/unit/in.txt index 02335238ad02..e2df1690e399 100644 --- a/intl/icu/source/data/unit/in.txt +++ b/intl/icu/source/data/unit/in.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in{ "%%ALIAS"{"id"} } diff --git a/intl/icu/source/data/unit/in_ID.txt b/intl/icu/source/data/unit/in_ID.txt index acec72c6e987..03f238793675 100644 --- a/intl/icu/source/data/unit/in_ID.txt +++ b/intl/icu/source/data/unit/in_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in_ID{ "%%ALIAS"{"id_ID"} } diff --git a/intl/icu/source/data/unit/is.txt b/intl/icu/source/data/unit/is.txt index e62f15135041..6a7de882ab26 100644 --- a/intl/icu/source/data/unit/is.txt +++ b/intl/icu/source/data/unit/is.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ is{ } } graphics{ + dot{ + dnam{"punktur"} + one{"{0} punktur"} + other{"{0} punktur"} + } dot-per-centimeter{ dnam{"punktar á sentimetra"} one{"{0} punktur á sentimetra"} @@ -456,6 +461,11 @@ is{ one{"{0} desimetri"} other{"{0} desimetrar"} } + earth-radius{ + dnam{"geisli jarðar"} + one{"{0} geisli jarðar"} + other{"{0} geisli jarðar"} + } fathom{ dnam{"faðmar"} one{"{0} faðmur"} @@ -552,6 +562,16 @@ is{ } } light{ + candela{ + dnam{"kerti"} + one{"{0} kerti"} + other{"{0} kerti"} + } + lumen{ + dnam{"lúmen"} + one{"{0} lúmen"} + other{"{0} lúmen"} + } lux{ dnam{"lúx"} one{"{0} lúx"} @@ -578,6 +598,11 @@ is{ one{"{0} jarðmassi"} other{"{0} jarðmassar"} } + grain{ + dnam{"ögn"} + one{"{0} ögn"} + other{"{0} agnir"} + } gram{ dnam{"grömm"} one{"{0} gramm"} @@ -774,7 +799,7 @@ is{ } pound-force-foot{ dnam{"pundfet"} - one{"{0} pundfet"} + one{"{0} pund-kraftur-fet"} other{"{0} pundfet"} } } @@ -789,6 +814,10 @@ is{ one{"{0} tunna"} other{"{0} tunnur"} } + bushel{ + one{"{0} skeppa"} + other{"{0} skeppur"} + } centiliter{ dnam{"sentilítrar"} one{"{0} sentilítri"} @@ -846,6 +875,26 @@ is{ one{"{0} desilítri"} other{"{0} desilítrar"} } + dessert-spoon{ + dnam{"ábætisskeið"} + one{"{0} ábætisskeið"} + other{"{0} ábætisskeið"} + } + dessert-spoon-imperial{ + dnam{"bresk ábætisskeið"} + one{"{0} bresk ábætisskeið"} + other{"{0} bresk ábætisskeið"} + } + dram{ + dnam{"dramm"} + one{"{0} dramm"} + other{"{0} drömm"} + } + drop{ + dnam{"dropi"} + one{"{0} dropi"} + other{"{0} dropar"} + } fluid-ounce{ dnam{"vökvaúnsur"} one{"{0} vökvaúnsa"} @@ -873,6 +922,11 @@ is{ one{"{0} hektólítri"} other{"{0} hektólítrar"} } + jigger{ + dnam{"sjúss"} + one{"{0} sjúss"} + other{"{0} sjússar"} + } liter{ dnam{"lítrar"} one{"{0} lítri"} @@ -889,6 +943,11 @@ is{ one{"{0} millilítri"} other{"{0} millilítrar"} } + pinch{ + dnam{"klípa"} + one{"{0} klípa"} + other{"{0} klípur"} + } pint{ dnam{"hálfpottar"} one{"{0} hálfpottur"} @@ -904,6 +963,11 @@ is{ one{"{0} kvart"} other{"{0} kvartar"} } + quart-imperial{ + dnam{"lagarmál"} + one{"{0} lagarmál"} + other{"{0} lagarmál"} + } tablespoon{ dnam{"matskeiðar"} one{"{0} matskeið"} @@ -1745,6 +1809,11 @@ is{ } } graphics{ + dot{ + dnam{"punktur"} + one{"{0} punktur"} + other{"{0} punktur"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1889,6 +1958,11 @@ is{ } } light{ + candela{ + dnam{"kerti"} + one{"{0} kerti"} + other{"{0} kerti"} + } lux{ dnam{"lúx"} one{"{0} lx"} @@ -1912,6 +1986,11 @@ is{ earth-mass{ dnam{"jarðmassar"} } + grain{ + dnam{"ögn"} + one{"{0} ögn"} + other{"{0} agnir"} + } gram{ dnam{"grömm"} one{"{0} g"} @@ -2020,9 +2099,9 @@ is{ other{"{0} hPa"} } inch-ofhg{ - dnam{"inHg"} - one{"{0} inHg"} - other{"{0} inHg"} + dnam{"to Hg"} + one{"{0} to Hg"} + other{"{0} to Hg"} } millibar{ dnam{"mbar"} @@ -2098,7 +2177,12 @@ is{ barrel{ dnam{"tunna"} one{"{0} tunna"} - other{"{0} tunna"} + other{"{0} tunnur"} + } + bushel{ + dnam{"skeppur"} + one{"{0} skeppa"} + other{"{0} skeppur"} } centiliter{ dnam{"cl"} @@ -2157,6 +2241,26 @@ is{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"ábætissk."} + one{"{0} ábætissk."} + other{"{0} ábætissk."} + } + dessert-spoon-imperial{ + dnam{"bresk ábætissk."} + one{"{0} bresk ábætissk."} + other{"{0} bresk ábætissk."} + } + dram{ + dnam{"dramm"} + one{"{0} dramm"} + other{"{0} drömm"} + } + drop{ + dnam{"dropi"} + one{"{0} dropi"} + other{"{0} dropar"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2184,6 +2288,11 @@ is{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"sjúss"} + one{"{0} sjúss"} + other{"{0} sjússar"} + } liter{ dnam{"lítrar"} one{"{0} l"} @@ -2200,6 +2309,11 @@ is{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"klípa"} + one{"{0} klípa"} + other{"{0} klípur"} + } pint{ dnam{"hálfp."} one{"{0} hálfp."} @@ -2215,6 +2329,11 @@ is{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"lagarmál"} + one{"{0} lagarmál"} + other{"{0} lagarmál"} + } tablespoon{ dnam{"msk"} one{"{0} msk"} diff --git a/intl/icu/source/data/unit/it.txt b/intl/icu/source/data/unit/it.txt index 92145ed3a703..003b9c3d9548 100644 --- a/intl/icu/source/data/unit/it.txt +++ b/intl/icu/source/data/unit/it.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,7 @@ it{ } compound{ per{"{0} al {1}"} + times{"{0} {1}"} } concentr{ karat{ @@ -408,6 +409,26 @@ it{ } } graphics{ + dot{ + dnam{"punto"} + one{"{0} punto"} + other{"{0} punti"} + } + dot-per-centimeter{ + dnam{"punti per centimetro"} + one{"{0} punto per centimetro"} + other{"{0} punti per centimetro"} + } + dot-per-inch{ + dnam{"punti per pollice"} + one{"{0} punto per pollice"} + other{"{0} punti per pollice"} + } + megapixel{ + dnam{"megapixel"} + one{"{0} megapixel"} + other{"{0} megapixel"} + } pixel{ dnam{"pixel"} one{"{0} pixel"} @@ -418,6 +439,11 @@ it{ one{"{0} pixel per centimetro"} other{"{0} pixel per centimetro"} } + pixel-per-inch{ + dnam{"pixel per pollice"} + one{"{0} pixel per pollice"} + other{"{0} pixel per pollice"} + } } length{ astronomical-unit{ @@ -436,12 +462,27 @@ it{ one{"{0} decimetro"} other{"{0} decimetri"} } + earth-radius{ + dnam{"raggio terrestre"} + one{"{0} raggio terrestre"} + other{"{0} raggi terrestri"} + } + fathom{ + dnam{"braccia"} + one{"{0} braccio"} + other{"{0} braccia"} + } foot{ dnam{"piedi"} one{"{0} piede"} other{"{0} piedi"} per{"{0} per piede"} } + furlong{ + dnam{"furlong"} + one{"{0} furlong"} + other{"{0} furlong"} + } inch{ dnam{"pollici"} one{"{0} pollice"} @@ -507,8 +548,8 @@ it{ } point{ dnam{"punti"} - one{"{0} punto"} - other{"{0} punti"} + one{"{0} punto tipografico"} + other{"{0} punti tipografici"} } solar-radius{ dnam{"raggi solari"} @@ -522,6 +563,16 @@ it{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candele"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -549,6 +600,11 @@ it{ one{"{0} massa terrestre"} other{"{0} masse terrestri"} } + grain{ + dnam{"grano"} + one{"{0} grano"} + other{"{0} grani"} + } gram{ dnam{"grammi"} one{"{0} grammo"} @@ -598,6 +654,11 @@ it{ one{"{0} massa solare"} other{"{0} masse solari"} } + stone{ + dnam{"stone"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ dnam{"tonnellate"} one{"{0} tonnellata"} @@ -672,6 +733,11 @@ it{ one{"{0} millimetro di mercurio"} other{"{0} millimetri di mercurio"} } + pascal{ + dnam{"pascal"} + one{"{0} pascal"} + other{"{0} pascal"} + } pound-force-per-square-inch{ dnam{"libbre per pollice quadrato"} one{"{0} libbra per pollice quadrato"} @@ -685,7 +751,7 @@ it{ other{"{0} chilometri orari"} } knot{ - dnam{"nodo"} + dnam{"nodi"} one{"{0} nodo"} other{"{0} nodi"} } @@ -730,7 +796,7 @@ it{ } pound-force-foot{ dnam{"libbre-piede"} - one{"{0} libbra-piede"} + one{"{0} libbra-forza piede"} other{"{0} libbre-piedi"} } } @@ -807,6 +873,26 @@ it{ one{"{0} decilitro"} other{"{0} decilitri"} } + dessert-spoon{ + dnam{"cucchiaino da dessert"} + one{"{0} cucchiaino da dessert"} + other{"{0} cucchiaini da dessert"} + } + dessert-spoon-imperial{ + dnam{"cucchiaino da dessert imperiale"} + one{"{0} cucchiaino da dessert imperiale"} + other{"{0} cucchiaini da dessert imperiali"} + } + dram{ + dnam{"dramma"} + one{"{0} dramma"} + other{"{0} dramme"} + } + drop{ + dnam{"goccia"} + one{"{0} goccia"} + other{"{0} gocce"} + } fluid-ounce{ dnam{"once fluide"} one{"{0} oncia fluida"} @@ -834,6 +920,10 @@ it{ one{"{0} ettolitro"} other{"{0} ettolitri"} } + jigger{ + one{"{0} jigger"} + other{"{0} jigger"} + } liter{ dnam{"litri"} one{"{0} litro"} @@ -850,6 +940,11 @@ it{ one{"{0} millilitro"} other{"{0} millilitri"} } + pinch{ + dnam{"pizzico"} + one{"{0} pizzico"} + other{"{0} pizzichi"} + } pint{ dnam{"pinte"} one{"{0} pinta"} @@ -865,13 +960,18 @@ it{ one{"{0} quarto"} other{"{0} quarti"} } + quart-imperial{ + dnam{"quarto imperiale"} + one{"{0} quarto imperiale"} + other{"{0} quarti imperiali"} + } tablespoon{ dnam{"cucchiai da tavola"} one{"{0} cucchiaio da tavola"} other{"{0} cucchiai da tavola"} } teaspoon{ - dnam{"cucchiai da tè"} + dnam{"cucchiaio da tè"} one{"{0} cucchiaio da tè"} other{"{0} cucchiai da tè"} } @@ -1108,6 +1208,7 @@ it{ other{"{0}km³"} } cubic-mile{ + dnam{"mi³"} one{"{0}mi³"} other{"{0}mi³"} } @@ -1321,7 +1422,7 @@ it{ other{"{0} MB"} } petabyte{ - dnam{"PByte"} + dnam{"PB"} one{"{0} PB"} other{"{0} PB"} } @@ -1491,6 +1592,13 @@ it{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"punto"} + one{"{0} p"} + other{"{0} p"} + } + } length{ astronomical-unit{ dnam{"au"} @@ -1508,6 +1616,10 @@ it{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + one{"{0} fm"} + other{"{0} fm"} + } foot{ dnam{"ft"} one{"{0} ft"} @@ -1606,6 +1718,11 @@ it{ one{"{0} Da"} other{"{0} Da"} } + grain{ + dnam{"grano"} + one{"{0} grano"} + other{"{0} grani"} + } gram{ dnam{"grammi"} one{"{0} g"} @@ -1847,6 +1964,16 @@ it{ one{"{0} dl"} other{"{0} dl"} } + dram{ + dnam{"dramma liquida"} + one{"{0} dr liq"} + other{"{0} dr liq"} + } + drop{ + dnam{"goccia"} + one{"{0} goccia"} + other{"{0} gocce"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1890,6 +2017,11 @@ it{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"pizzico"} + one{"{0} pizzico"} + other{"{0} pizzichi"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -1905,6 +2037,11 @@ it{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"imp qt"} + one{"{0} imp qt"} + other{"{0} imp qt"} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/iw.txt b/intl/icu/source/data/unit/iw.txt index d59865d1cdb7..4aa2f62d2681 100644 --- a/intl/icu/source/data/unit/iw.txt +++ b/intl/icu/source/data/unit/iw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw{ "%%ALIAS"{"he"} } diff --git a/intl/icu/source/data/unit/iw_IL.txt b/intl/icu/source/data/unit/iw_IL.txt index cf1666a681ee..984aefd0f82d 100644 --- a/intl/icu/source/data/unit/iw_IL.txt +++ b/intl/icu/source/data/unit/iw_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw_IL{ "%%ALIAS"{"he_IL"} } diff --git a/intl/icu/source/data/unit/ja.txt b/intl/icu/source/data/unit/ja.txt index 235c7fa2d685..bed6efd5857f 100644 --- a/intl/icu/source/data/unit/ja.txt +++ b/intl/icu/source/data/unit/ja.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -338,6 +338,9 @@ ja{ } } graphics{ + dot{ + dnam{"ドット"} + } dot-per-centimeter{ dnam{"ドット/cm"} other{"{0} ドット/cm"} @@ -380,6 +383,10 @@ ja{ dnam{"デシメートル"} other{"{0} デシメートル"} } + earth-radius{ + dnam{"地球半径"} + other{"{0} 地球半径"} + } fathom{ dnam{"ファゾム"} other{"{0} ファゾム"} @@ -458,6 +465,14 @@ ja{ } } light{ + candela{ + dnam{"カンデラ"} + other{"{0} カンデラ"} + } + lumen{ + dnam{"ルーメン"} + other{"{0} ルーメン"} + } lux{ dnam{"ルクス"} other{"{0} ルクス"} @@ -480,6 +495,10 @@ ja{ dnam{"地球質量"} other{"{0} 地球質量"} } + grain{ + dnam{"グレーン"} + other{"{0} グレーン"} + } gram{ dnam{"グラム"} other{"{0} グラム"} @@ -702,6 +721,22 @@ ja{ dnam{"デシリットル"} other{"{0} デシリットル"} } + dessert-spoon{ + dnam{"中さじ"} + other{"中さじ {0}"} + } + dessert-spoon-imperial{ + dnam{"英デザートスプーン"} + other{"{0} 英デザートスプーン"} + } + dram{ + dnam{"ドラム"} + other{"{0} ドラム"} + } + drop{ + dnam{"滴"} + other{"{0} 滴"} + } fluid-ounce{ dnam{"液量オンス"} other{"{0} 液量オンス"} @@ -724,6 +759,10 @@ ja{ dnam{"ヘクトリットル"} other{"{0} ヘクトリットル"} } + jigger{ + dnam{"ジガー"} + other{"{0} ジガー"} + } liter{ dnam{"リットル"} other{"{0} リットル"} @@ -737,6 +776,10 @@ ja{ dnam{"ミリリットル"} other{"{0} ミリリットル"} } + pinch{ + dnam{"つまみ"} + other{"{0} つまみ"} + } pint{ dnam{"パイント"} other{"{0} パイント"} @@ -749,6 +792,10 @@ ja{ dnam{"クォート"} other{"{0} クォート"} } + quart-imperial{ + dnam{"英クォート"} + other{"{0} 英クォート"} + } tablespoon{ dnam{"大さじ"} other{"大さじ {0}"} @@ -1579,6 +1626,10 @@ ja{ } } graphics{ + dot{ + dnam{"ドット"} + other{"{0} ドット"} + } dot-per-centimeter{ dnam{"dpcm"} other{"{0} dpcm"} @@ -1622,6 +1673,10 @@ ja{ dnam{"デシメートル"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + other{"{0} R⊕"} + } fathom{ dnam{"ファゾム"} other{"{0} fth"} @@ -1700,6 +1755,14 @@ ja{ } } light{ + candela{ + dnam{"cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + other{"{0} lm"} + } lux{ dnam{"ルクス"} other{"{0} lx"} @@ -1722,6 +1785,10 @@ ja{ dnam{"地球質量"} other{"{0} M⊕"} } + grain{ + dnam{"グレーン"} + other{"{0} グレーン"} + } gram{ dnam{"グラム"} other{"{0} g"} @@ -1944,6 +2011,22 @@ ja{ dnam{"デシリットル"} other{"{0} dL"} } + dessert-spoon{ + dnam{"中さじ"} + other{"中さじ {0}"} + } + dessert-spoon-imperial{ + dnam{"英デザートスプーン"} + other{"{0} 英デザートスプーン"} + } + dram{ + dnam{"液量ドラム"} + other{"{0} 液量ドラム"} + } + drop{ + dnam{"滴"} + other{"{0} 滴"} + } fluid-ounce{ dnam{"液量オンス"} other{"{0} fl oz"} @@ -1966,6 +2049,10 @@ ja{ dnam{"ヘクトリットル"} other{"{0} hL"} } + jigger{ + dnam{"ジガー"} + other{"{0} ジガー"} + } liter{ dnam{"リットル"} other{"{0} L"} @@ -1979,6 +2066,10 @@ ja{ dnam{"ミリリットル"} other{"{0} ml"} } + pinch{ + dnam{"つまみ"} + other{"{0} つまみ"} + } pint{ dnam{"パイント"} other{"{0} pt"} @@ -1991,6 +2082,10 @@ ja{ dnam{"クォート"} other{"{0} qt"} } + quart-imperial{ + dnam{"英クォート"} + other{"{0} qt Imp."} + } tablespoon{ dnam{"大さじ"} other{"大さじ {0}"} diff --git a/intl/icu/source/data/unit/jgo.txt b/intl/icu/source/data/unit/jgo.txt index d1b41962e335..eb1aef719cdc 100644 --- a/intl/icu/source/data/unit/jgo.txt +++ b/intl/icu/source/data/unit/jgo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jgo{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/jmc.txt b/intl/icu/source/data/unit/jmc.txt index a67dfa46d809..425a4ab91030 100644 --- a/intl/icu/source/data/unit/jmc.txt +++ b/intl/icu/source/data/unit/jmc.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jmc{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/jv.txt b/intl/icu/source/data/unit/jv.txt index 8b45866652e8..24be4543fe90 100644 --- a/intl/icu/source/data/unit/jv.txt +++ b/intl/icu/source/data/unit/jv.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jv{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -50,37 +50,37 @@ jv{ other{"{0} hektar"} } square-centimeter{ - dnam{"sentimeter persegi"} - other{"{0} sentimeter persegi"} - per{"{0} saben sentimeter persegi"} + dnam{"sentimeter pesagi"} + other{"{0} sentimeter pesagi"} + per{"{0} saben sentimeter pesagi"} } square-foot{ - dnam{"kaki persegi"} - other{"{0} kaki persegi"} + dnam{"kaki pesagi"} + other{"{0} kaki pesagi"} } square-inch{ - dnam{"inci persegi"} - other{"{0} inci persegi"} - per{"{0} saben inci persegi"} + dnam{"inci pesagi"} + other{"{0} inci pesagi"} + per{"{0} saben inci pesagi"} } square-kilometer{ - dnam{"kilometer persegi"} - other{"{0} kilometer persegi"} - per{"{0} saben kilometer persegi"} + dnam{"kilometer pesagi"} + other{"{0} kilometer pesagi"} + per{"{0} saben kilometer pesagi"} } square-meter{ - dnam{"meter persegi"} - other{"{0} meter persegi"} - per{"{0} saben meter persegi"} + dnam{"meter pesagi"} + other{"{0} meter pesagi"} + per{"{0} saben meter pesagi"} } square-mile{ - dnam{"mil persegi"} - other{"{0} mil persegi"} - per{"{0} saben mil persegi"} + dnam{"mil pesagi"} + other{"{0} mil pesagi"} + per{"{0} saben mil pesagi"} } square-yard{ - dnam{"yard persegi"} - other{"{0} yard persegi"} + dnam{"yard pesagi"} + other{"{0} yard pesagi"} } } compound{ @@ -329,6 +329,10 @@ jv{ } } graphics{ + dot{ + dnam{"titik"} + other{"{0} titik"} + } dot-per-centimeter{ dnam{"titek saben sentimeter"} other{"{0} titek saben sentimeter"} @@ -363,11 +367,23 @@ jv{ dnam{"desimeter"} other{"{0} desimeter"} } + earth-radius{ + dnam{"radius donya"} + other{"{0} radius donya"} + } + fathom{ + dnam{"fathoms"} + other{"{0} fathoms"} + } foot{ dnam{"kaki"} other{"{0} kaki"} per{"{0} saben kaki"} } + furlong{ + dnam{"furlongs"} + other{"{0} furlongs"} + } inch{ dnam{"inci"} other{"{0} inci"} @@ -433,6 +449,14 @@ jv{ } } light{ + candela{ + dnam{"kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + other{"{0} lumen"} + } lux{ dnam{"luk"} other{"{0} luk"} @@ -455,6 +479,10 @@ jv{ dnam{"massa Bumi"} other{"{0} massa Bumi"} } + grain{ + dnam{"wiji"} + other{"{0} wiji"} + } gram{ dnam{"gram"} other{"{0} gram"} @@ -495,6 +523,10 @@ jv{ dnam{"massa srengenge"} other{"{0} massa srengenge"} } + stone{ + dnam{"watu"} + other{"{0} watu"} + } ton{ dnam{"ton"} other{"{0} ton"} @@ -619,6 +651,10 @@ jv{ dnam{"barel"} other{"{0} barel"} } + bushel{ + dnam{"gantang"} + other{"{0} gantang"} + } centiliter{ dnam{"sentiliter"} other{"{0} sentiliter"} @@ -665,6 +701,22 @@ jv{ dnam{"desiliter"} other{"{0} desiliter"} } + dessert-spoon{ + dnam{"sendok es"} + other{"{0} sendok es"} + } + dessert-spoon-imperial{ + dnam{"Imp. sendok es"} + other{"{0} Imp. sendok es"} + } + dram{ + dnam{"banyu dram"} + other{"{0} banyu dram"} + } + drop{ + dnam{"tetes"} + other{"{0} tetes"} + } fluid-ounce{ dnam{"ons banyu"} other{"{0} ons banyu"} @@ -700,6 +752,10 @@ jv{ dnam{"mililiter"} other{"{0} mililiter"} } + pinch{ + dnam{"sak juwit"} + other{"{0} sak juwit"} + } pint{ dnam{"pin"} other{"{0} pin"} @@ -712,6 +768,10 @@ jv{ dnam{"seprapat galon"} other{"{0} seprapat galon"} } + quart-imperial{ + dnam{"Imp. seprapat galon"} + other{"{0} Imp. seprapat galon"} + } tablespoon{ dnam{"sendok mangan"} other{"{0} sendok mangan"} @@ -755,7 +815,7 @@ jv{ other{"{0}j"} } millisecond{ - dnam{"md"} + dnam{"mdtk"} other{"{0} md"} } minute{ @@ -834,7 +894,7 @@ jv{ } meter-per-square-second{ dnam{"meter/detik²"} - other{"{0} meter/detik²"} + other{"{0} m/detik²"} } } angle{ @@ -874,8 +934,8 @@ jv{ per{"{0}/cm²"} } square-foot{ - dnam{"kaki persegi"} - other{"{0} kaki persegi"} + dnam{"kaki pesagi"} + other{"{0} kaki pesagi"} } square-inch{ dnam{"inci²"} @@ -1142,6 +1202,10 @@ jv{ } } graphics{ + dot{ + dnam{"titik"} + other{"{0} titik"} + } dot-per-centimeter{ dnam{"tscm"} other{"{0} tscm"} @@ -1165,11 +1229,19 @@ jv{ dnam{"dm"} other{"{0} dm"} } + fathom{ + dnam{"fathoms"} + other{"{0} fth"} + } foot{ dnam{"kaki"} other{"{0} kaki"} per{"{0}/kaki"} } + furlong{ + dnam{"furlongs"} + other{"{0} fur"} + } inch{ dnam{"inci"} other{"{0} in"} @@ -1197,10 +1269,6 @@ jv{ dnam{"mil"} other{"{0} mil"} } - mile-scandinavian{ - dnam{"mil-skandinavia"} - other{"{0} mil-skandinavia"} - } millimeter{ dnam{"mm"} other{"{0} mm"} @@ -1209,10 +1277,6 @@ jv{ dnam{"nm"} other{"{0} nm"} } - nautical-mile{ - dnam{"mil segoro"} - other{"{0} mil segoro"} - } parsec{ dnam{"parsek"} other{"{0} ps"} @@ -1234,6 +1298,10 @@ jv{ } } light{ + candela{ + dnam{"kandela"} + other{"{0} kandela"} + } lux{ dnam{"luk"} other{"{0} luk"} @@ -1253,6 +1321,10 @@ jv{ earth-mass{ dnam{"massa Bumi"} } + grain{ + dnam{"wiji"} + other{"{0} wiji"} + } gram{ dnam{"gram"} other{"{0} g"} @@ -1269,7 +1341,6 @@ jv{ } microgram{ dnam{"mikrogram"} - other{"{0} mikrogram"} } milligram{ dnam{"mg"} @@ -1292,6 +1363,10 @@ jv{ solar-mass{ dnam{"massa srengenge"} } + stone{ + dnam{"watu"} + other{"{0} watu"} + } ton{ dnam{"ton"} other{"{0} ton"} @@ -1399,6 +1474,10 @@ jv{ barrel{ dnam{"barel"} } + bushel{ + dnam{"gantang"} + other{"{0} gantang"} + } centiliter{ dnam{"sentiliter"} other{"{0} sentiliter"} @@ -1439,12 +1518,27 @@ jv{ } cup-metric{ dnam{"metrik kup"} - other{"{0} metrik kup"} } deciliter{ dnam{"dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"sendok es"} + other{"{0} sendok es"} + } + dessert-spoon-imperial{ + dnam{"Imp. sendok es"} + other{"{0} Imp. sendok es"} + } + dram{ + dnam{"banyu dram"} + other{"{0} banyu dram"} + } + drop{ + dnam{"tetes"} + other{"{0} tetes"} + } fluid-ounce{ dnam{"ons banyu"} other{"{0} ons banyu"} @@ -1460,7 +1554,7 @@ jv{ } gallon-imperial{ dnam{"galon inggris"} - other{"{0} galon inggris"} + other{"{0} gal inggris"} per{"{0}/galon inggris"} } hectoliter{ @@ -1480,6 +1574,10 @@ jv{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"juwit"} + other{"{0} sak juwit"} + } pint{ dnam{"pin"} other{"{0} pin"} @@ -1492,6 +1590,10 @@ jv{ dnam{"seprapat galon"} other{"{0} seprapat galon"} } + quart-imperial{ + dnam{"Imp. seprapat galon"} + other{"{0} Imp. seprapat galon"} + } tablespoon{ dnam{"sdk mgn"} other{"{0} sdk mgn"} diff --git a/intl/icu/source/data/unit/ka.txt b/intl/icu/source/data/unit/ka.txt index b540a8515f42..9e3ffdda1dd8 100644 --- a/intl/icu/source/data/unit/ka.txt +++ b/intl/icu/source/data/unit/ka.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -386,6 +386,11 @@ ka{ } } graphics{ + dot{ + dnam{"წერტილი"} + one{"{0} წერტილი"} + other{"{0} წერტილი"} + } dot-per-centimeter{ dnam{"წერტილი სანტიმეტრზე"} one{"{0} წერტილი სანტიმეტრზე"} @@ -439,12 +444,27 @@ ka{ one{"{0} დეციმეტრი"} other{"{0} დეციმეტრი"} } + earth-radius{ + dnam{"დედამიწის რადიუსი"} + one{"{0} დედამიწის რადიუსი"} + other{"{0} დედამიწის რადიუსი"} + } + fathom{ + dnam{"ფატომი"} + one{"{0} ფატომი"} + other{"{0} ფატომი"} + } foot{ dnam{"ფუტი"} one{"{0} ფუტი"} other{"{0} ფუტი"} per{"{0} ფუტში"} } + furlong{ + dnam{"ფურლონგი"} + one{"{0} ფურლონგი"} + other{"{0} ფურლონგი"} + } inch{ dnam{"დუიმი"} one{"{0} დუიმი"} @@ -513,6 +533,11 @@ ka{ one{"{0} პუნქტი"} other{"{0} პუნქტი"} } + solar-radius{ + dnam{"მზის რადიუსი"} + one{"{0} მზის რადიუსი"} + other{"{0} მზის რადიუსი"} + } yard{ dnam{"იარდი"} one{"{0} იარდი"} @@ -520,11 +545,26 @@ ka{ } } light{ + candela{ + dnam{"კანდელა"} + one{"{0} კანდელა"} + other{"{0} კანდელა"} + } + lumen{ + dnam{"ლუმენი"} + one{"{0} ლუმენი"} + other{"{0} ლუმენი"} + } lux{ dnam{"ლუქსი"} one{"{0} ლუქსი"} other{"{0} ლუქსი"} } + solar-luminosity{ + dnam{"მზის სხივიერობა"} + one{"{0} მზის სხივიერობა"} + other{"{0} მზის სხივიერობა"} + } } mass{ carat{ @@ -542,6 +582,11 @@ ka{ one{"{0} დედამიწის მასა"} other{"{0} დედამიწის მასა"} } + grain{ + dnam{"გრანი"} + one{"{0} გრანი"} + other{"{0} გრანი"} + } gram{ dnam{"გრამი"} one{"{0} გრამი"} @@ -591,6 +636,11 @@ ka{ one{"{0} მზის მასა"} other{"{0} მზის მასა"} } + stone{ + dnam{"სტოუნი"} + one{"{0} სტოუნი"} + other{"{0} სტოუნი"} + } ton{ dnam{"ტონა"} one{"{0} ტონა"} @@ -725,6 +775,18 @@ ka{ other{"{0} კელვინის გრადუსი"} } } + torque{ + newton-meter{ + dnam{"ნიუტონ-მეტრი"} + one{"{0} ნიუტონ-მეტრი"} + other{"{0} ნიუტონ-მეტრი"} + } + pound-force-foot{ + dnam{"ფუნტი-ფუტი"} + one{"{0} ფუნტი-ფუტი"} + other{"{0} ფუნტი-ფუტი"} + } + } volume{ acre-foot{ dnam{"აკრი-ფუტი"} @@ -736,6 +798,11 @@ ka{ one{"{0} ბარელი"} other{"{0} ბარელი"} } + bushel{ + dnam{"ბუშელი"} + one{"{0} ბუშელი"} + other{"{0} ბუშელი"} + } centiliter{ dnam{"სანტილიტრი"} one{"{0} სანტილიტრი"} @@ -793,6 +860,26 @@ ka{ one{"{0} დეცილიტრი"} other{"{0} დეცილიტრი"} } + dessert-spoon{ + dnam{"დესერტის კოვზი"} + one{"{0} დესერტის კოვზი"} + other{"{0} დესერტის კოვზი"} + } + dessert-spoon-imperial{ + dnam{"ბრიტ. დესერტის კოვზი"} + one{"{0} ბრიტ. დესერტის კოვზი"} + other{"{0} ბრიტ. დესერტის კოვზი"} + } + dram{ + dnam{"ბრიტანული თხევადი დრაქმა"} + one{"{0} ბრიტანული თხევადი დრაქმა"} + other{"{0} ბრიტანული თხევადი დრაქმა"} + } + drop{ + dnam{"წვეთი"} + one{"{0} წვეთი"} + other{"{0} წვეთი"} + } fluid-ounce{ dnam{"თხევადი უნცია"} one{"{0} თხევადი უნცია"} @@ -820,6 +907,11 @@ ka{ one{"{0} ჰექტოლიტრი"} other{"{0} ჰექტოლიტრი"} } + jigger{ + dnam{"ჯიგერი"} + one{"{0} ჯიგერი"} + other{"{0} ჯიგერი"} + } liter{ dnam{"ლიტრი"} one{"{0} ლიტრი"} @@ -836,6 +928,11 @@ ka{ one{"{0} მილილიტრი"} other{"{0} მილილიტრი"} } + pinch{ + dnam{"მწიკვი"} + one{"{0} მწიკვი"} + other{"{0} მწიკვი"} + } pint{ dnam{"პინტა"} one{"{0} პინტა"} @@ -851,6 +948,11 @@ ka{ one{"{0} კვარტა"} other{"{0} კვარტა"} } + quart-imperial{ + dnam{"ბრიტანული კვარტი"} + one{"{0} ბრიტანული კვარტი"} + other{"{0} ბრიტანული კვარტი"} + } tablespoon{ dnam{"სუფრის კოვზი"} one{"{0} სუფრის კოვზი"} @@ -1491,6 +1593,11 @@ ka{ } } graphics{ + dot{ + dnam{"წერტილი"} + one{"{0} წერტილი"} + other{"{0} წერტილი"} + } dot-per-centimeter{ dnam{"წერტ/სმ-ზე"} one{"{0} წერტ/სმ-ზე"} @@ -1544,12 +1651,27 @@ ka{ one{"{0} დმ"} other{"{0} დმ"} } + earth-radius{ + dnam{"⊕ რადიუსი"} + one{"{0} ⊕ რადიუსი"} + other{"{0} ⊕ რადიუსი"} + } + fathom{ + dnam{"ფატომი"} + one{"{0} ფატომი"} + other{"{0} ფატომი"} + } foot{ dnam{"ფტ"} one{"{0} ფტ"} other{"{0} ფტ"} per{"{0}/ფტ"} } + furlong{ + dnam{"ფურლონგი"} + one{"{0} ფურლონგი"} + other{"{0} ფურლონგი"} + } inch{ dnam{"დუიმი"} one{"{0} დუიმი"} @@ -1618,6 +1740,11 @@ ka{ one{"{0} პნქტ."} other{"{0} პქნტ."} } + solar-radius{ + dnam{"☉ რადიუსი"} + one{"{0} ☉ რადიუსი"} + other{"{0} ☉ რადიუსი"} + } yard{ dnam{"იარდი"} one{"{0} იარდი"} @@ -1625,11 +1752,26 @@ ka{ } } light{ + candela{ + dnam{"კდ"} + one{"{0} კდ"} + other{"{0} კდ"} + } + lumen{ + dnam{"ლმ"} + one{"{0} ლმ"} + other{"{0} ლმ"} + } lux{ dnam{"ლუქსი"} one{"{0} ლუქსი"} other{"{0} ლუქსი"} } + solar-luminosity{ + dnam{"☉ სხივიერობა"} + one{"{0} ☉ სხივიერობა"} + other{"{0} ☉ სხივიერობა"} + } } mass{ carat{ @@ -1642,6 +1784,11 @@ ka{ one{"{0} დალტ."} other{"{0} დალტ."} } + grain{ + dnam{"გრანი"} + one{"{0} გრანი"} + other{"{0} გრანი"} + } gram{ dnam{"გრამი"} one{"{0} გ"} @@ -1686,6 +1833,11 @@ ka{ other{"{0} ფნტ"} per{"{0}/ფნტ"} } + stone{ + dnam{"სტოუნი"} + one{"{0} სტოუნი"} + other{"{0} სტოუნი"} + } ton{ dnam{"ტონა"} one{"{0} ტ"} @@ -1820,6 +1972,18 @@ ka{ other{"{0} K"} } } + torque{ + newton-meter{ + dnam{"ნიუტ. მ"} + one{"{0} ნიუტ. მ"} + other{"{0} ნიუტ. მ"} + } + pound-force-foot{ + dnam{"ფუნტი-ფუტი"} + one{"{0} ფუნტი-ფუტი"} + other{"{0} ფუნტი-ფუტი"} + } + } volume{ acre-foot{ dnam{"აკრ.ფტ."} @@ -1831,6 +1995,11 @@ ka{ one{"{0} ბარ."} other{"{0} ბარ."} } + bushel{ + dnam{"ბუშელი"} + one{"{0} ბუშელი"} + other{"{0} ბუშელი"} + } centiliter{ dnam{"სლ"} one{"{0} სლ"} @@ -1888,6 +2057,26 @@ ka{ one{"{0} დლ"} other{"{0} დლ"} } + dessert-spoon{ + dnam{"დესერტის კოვზი"} + one{"{0} დესერტის კოვზი"} + other{"{0} დესერტის კოვზი"} + } + dessert-spoon-imperial{ + dnam{"ბრიტ. დესერტის კოვზი"} + one{"{0} ბრიტ. დეს. კოვზი"} + other{"{0} ბრიტ. დეს. კოვზი"} + } + dram{ + dnam{"ბრიტ. თხევადი დრაქმა"} + one{"{0} ბრიტ. თხევ. დრაქმა"} + other{"{0} ბრიტ. თხევ. დრაქმა"} + } + drop{ + dnam{"წვეთი"} + one{"{0} წვეთი"} + other{"{0} წვეთი"} + } fluid-ounce{ dnam{"თხ. უნცია"} one{"{0} თხ. უნცია"} @@ -1915,6 +2104,11 @@ ka{ one{"{0} ჰლ"} other{"{0} ჰლ"} } + jigger{ + dnam{"ჯიგერი"} + one{"{0} ჯიგერი"} + other{"{0} ჯიგერი"} + } liter{ dnam{"ლიტრი"} one{"{0} ლ"} @@ -1931,6 +2125,11 @@ ka{ one{"{0} მილილ."} other{"{0} მილილ."} } + pinch{ + dnam{"მწიკვი"} + one{"{0} მწიკვი"} + other{"{0} მწიკვი"} + } pint{ dnam{"პინტა"} one{"{0} პინტა"} @@ -1946,6 +2145,11 @@ ka{ one{"{0} კვარტა"} other{"{0} კვარტა"} } + quart-imperial{ + dnam{"ბრიტ. კვარტი"} + one{"{0} ბრიტ. კვარტი"} + other{"{0} ბრიტ. კვარტი"} + } tablespoon{ dnam{"ს. კოვზი"} one{"{0} ს. კოვზი"} diff --git a/intl/icu/source/data/unit/kab.txt b/intl/icu/source/data/unit/kab.txt index 75a697e6112a..f76905a5be77 100644 --- a/intl/icu/source/data/unit/kab.txt +++ b/intl/icu/source/data/unit/kab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kab{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/kam.txt b/intl/icu/source/data/unit/kam.txt index f9443d0603d6..26e23bcd3190 100644 --- a/intl/icu/source/data/unit/kam.txt +++ b/intl/icu/source/data/unit/kam.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kam{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/kde.txt b/intl/icu/source/data/unit/kde.txt index a7179f73f769..ce04321a8194 100644 --- a/intl/icu/source/data/unit/kde.txt +++ b/intl/icu/source/data/unit/kde.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kde{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/kea.txt b/intl/icu/source/data/unit/kea.txt index 648fbaa0ae59..3a3d50a314bf 100644 --- a/intl/icu/source/data/unit/kea.txt +++ b/intl/icu/source/data/unit/kea.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kea{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -131,8 +131,8 @@ kea{ other{"{0} milha pur galãu"} } mile-per-gallon-imperial{ - dnam{"milha pur galãu imperial"} - other{"{0} milha pur galãu imperial"} + dnam{"milha pur galãu britániku"} + other{"{0} milha pur galãu britániku"} } } coordinate{ @@ -327,6 +327,10 @@ kea{ } } graphics{ + dot{ + dnam{"pontu"} + other{"{0} pontu"} + } dot-per-centimeter{ dnam{"pontu pur sentímeru"} other{"{0} pontu pur sentímetru"} @@ -370,6 +374,10 @@ kea{ dnam{"desímetru"} other{"{0} desímetru"} } + earth-radius{ + dnam{"raiu di Tera"} + other{"{0} raiu di Tera"} + } foot{ dnam{"pe"} other{"{0} pe"} @@ -426,10 +434,6 @@ kea{ dnam{"pikómetru"} other{"{0} pikómetru"} } - point{ - dnam{"pontu"} - other{"{0} pontu"} - } solar-radius{ dnam{"raiu solar"} other{"{0} raiu solar"} @@ -440,6 +444,14 @@ kea{ } } light{ + candela{ + dnam{"kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} other{"{0} lux"} @@ -462,6 +474,10 @@ kea{ dnam{"masa di Tera"} other{"{0} masa di Tera"} } + grain{ + dnam{"grãu"} + other{"{0} grãu"} + } gram{ dnam{"grama"} other{"{0} grama"} @@ -672,13 +688,29 @@ kea{ dnam{"desilitru"} other{"{0} desilitru"} } + dessert-spoon{ + dnam{"kudjer di subrimeza"} + other{"{0} kudjer di subrimeza"} + } + dessert-spoon-imperial{ + dnam{"kudjer di subrimeza britániku"} + other{"{0} kudjer di subrimeza britániku"} + } + dram{ + dnam{"drakma fluídu"} + other{"{0} drakma fluídu"} + } + drop{ + dnam{"gota"} + other{"{0} gota"} + } fluid-ounce{ dnam{"ónsa fluídu"} other{"{0} ónsa fluídu"} } fluid-ounce-imperial{ - dnam{"ónsa fluídu imperial"} - other{"{0} ónsa fluídu imperial"} + dnam{"ónsa fluídu britániku"} + other{"{0} ónsa fluídu britániku"} } gallon{ dnam{"galãu"} @@ -686,14 +718,18 @@ kea{ per{"{0} pur galãu"} } gallon-imperial{ - dnam{"galãu imperial"} - other{"{0} galãu imperial"} - per{"{0} pur galãu imperial"} + dnam{"galãu britániku"} + other{"{0} galãu britániku"} + per{"{0} pur galãu britániku"} } hectoliter{ dnam{"ektolitru"} other{"{0} ektolitru"} } + jigger{ + dnam{"kopu di xot"} + other{"{0} kopu di xot"} + } liter{ dnam{"litru"} other{"{0} litru"} @@ -707,6 +743,10 @@ kea{ dnam{"mililitru"} other{"{0} mililitru"} } + pinch{ + dnam{"pitada"} + other{"{0} pitada"} + } pint{ dnam{"pint"} other{"{0} pint"} @@ -719,6 +759,10 @@ kea{ dnam{"kuart"} other{"{0} kuart"} } + quart-imperial{ + dnam{"kuart britániku"} + other{"{0} kuart britániku"} + } tablespoon{ dnam{"kudjer di sopa"} other{"{0} kudjer di sopa"} @@ -915,8 +959,8 @@ kea{ other{"{0} mpg"} } mile-per-gallon-imperial{ - dnam{"milha/gal imp."} - other{"{0} mpg imp."} + dnam{"milha/gal brit."} + other{"{0} mpg brit."} } } coordinate{ @@ -1161,12 +1205,8 @@ kea{ other{"{0} pm"} } point{ - dnam{"pontu"} other{"{0} pt"} } - solar-radius{ - dnam{"raiu solar"} - } yard{ dnam{"yd"} other{"{0} yd"} @@ -1183,6 +1223,10 @@ kea{ dnam{"kt"} other{"{0} kt"} } + grain{ + dnam{"grãu"} + other{"{0} grãu"} + } gram{ dnam{"g"} } @@ -1246,13 +1290,25 @@ kea{ dnam{"dl"} other{"{0} dl"} } + dessert-spoon-imperial{ + dnam{"dstspn brit."} + other{"{0} dstspn brit."} + } + dram{ + dnam{"drakma fl."} + other{"{0} drakma fl."} + } + drop{ + dnam{"gota"} + other{"{0} gota"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} } fluid-ounce-imperial{ - dnam{"fl oz imp."} - other{"{0} fl oz imp."} + dnam{"fl oz brit."} + other{"{0} fl oz brit."} } gallon{ dnam{"gal"} @@ -1260,14 +1316,18 @@ kea{ per{"{0}/gal"} } gallon-imperial{ - dnam{"gal imp."} - other{"{0} gal imp."} - per{"{0}/gal imp."} + dnam{"gal brit."} + other{"{0} gal brit."} + per{"{0}/gal brit."} } hectoliter{ dnam{"hl"} other{"{0} hl"} } + jigger{ + dnam{"kopu x."} + other{"{0} kopu x."} + } liter{ dnam{"l"} } @@ -1279,6 +1339,10 @@ kea{ dnam{"ml"} other{"{0} ml"} } + pinch{ + dnam{"pit."} + other{"{0} pit."} + } pint{ dnam{"pt"} other{"{0} pt"} @@ -1291,6 +1355,10 @@ kea{ dnam{"qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt brit."} + other{"{0} qt brit."} + } tablespoon{ dnam{"ks"} other{"{0} ks"} diff --git a/intl/icu/source/data/unit/khq.txt b/intl/icu/source/data/unit/khq.txt index a1314c46e8c1..a225321ade69 100644 --- a/intl/icu/source/data/unit/khq.txt +++ b/intl/icu/source/data/unit/khq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml khq{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ki.txt b/intl/icu/source/data/unit/ki.txt index 9d196a41067c..b48183819162 100644 --- a/intl/icu/source/data/unit/ki.txt +++ b/intl/icu/source/data/unit/ki.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ki{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/kk.txt b/intl/icu/source/data/unit/kk.txt index a2a24cd537c6..e26daab48413 100644 --- a/intl/icu/source/data/unit/kk.txt +++ b/intl/icu/source/data/unit/kk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kk{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ kk{ } } graphics{ + dot{ + dnam{"нүкте"} + one{"{0} нүкте"} + other{"{0} нүкте"} + } dot-per-centimeter{ dnam{"нүкте/сантиметр"} one{"{0} нүкте/сантиметр"} @@ -461,12 +466,27 @@ kk{ one{"{0} дециметр"} other{"{0} дециметр"} } + earth-radius{ + dnam{"Жер радиусы"} + one{"{0} Жер радиусы"} + other{"{0} Жер радиусы"} + } + fathom{ + dnam{"фатом"} + one{"{0} фатом"} + other{"{0} фатом"} + } foot{ dnam{"фут"} one{"{0} фут"} other{"{0} фут"} per{"{0}/фут"} } + furlong{ + dnam{"фурлонг"} + one{"{0} фурлонг"} + other{"{0} фурлонг"} + } inch{ dnam{"дюйм"} one{"{0} дюйм"} @@ -547,6 +567,16 @@ kk{ } } light{ + candela{ + dnam{"кандела"} + one{"{0} кандела"} + other{"{0} кандела"} + } + lumen{ + dnam{"люмен"} + one{"{0} люмен"} + other{"{0} люмен"} + } lux{ dnam{"люкс"} one{"{0} люкс"} @@ -574,6 +604,11 @@ kk{ one{"{0} жер массасы"} other{"{0} жер массасы"} } + grain{ + dnam{"гран"} + one{"{0} гран"} + other{"{0} гран"} + } gram{ dnam{"грамм"} one{"{0} грамм"} @@ -623,6 +658,11 @@ kk{ one{"{0} Күн массасы"} other{"{0} Күн массасы"} } + stone{ + dnam{"стоун"} + one{"{0} стоун"} + other{"{0} стоун"} + } ton{ dnam{"тонна"} one{"{0} тонна"} @@ -780,6 +820,11 @@ kk{ one{"{0} баррель"} other{"{0} баррель"} } + bushel{ + dnam{"бушель"} + one{"{0} бушель"} + other{"{0} бушель"} + } centiliter{ dnam{"сантилитр"} one{"{0} cантилитр"} @@ -837,6 +882,26 @@ kk{ one{"{0} децилитр"} other{"{0} децилитр"} } + dessert-spoon{ + dnam{"десерт қасығы"} + one{"{0} десерт қасығы"} + other{"{0} десерт қасығы"} + } + dessert-spoon-imperial{ + dnam{"британдық десерт қасығы"} + one{"{0} британдық десерт қасығы"} + other{"{0} британдық десерт қасығы"} + } + dram{ + dnam{"драхма"} + one{"{0} драхма"} + other{"{0} драхма"} + } + drop{ + dnam{"тамшы"} + one{"{0} тамшы"} + other{"{0} тамшы"} + } fluid-ounce{ dnam{"сұйық унция"} one{"{0} сұйық унция"} @@ -864,6 +929,11 @@ kk{ one{"{0} гектолитр"} other{"{0} гектолитр"} } + jigger{ + dnam{"джиггер"} + one{"{0} джиггер"} + other{"{0} джиггер"} + } liter{ dnam{"литр"} one{"{0} литр"} @@ -880,6 +950,11 @@ kk{ one{"{0} миллилитр"} other{"{0} миллилитр"} } + pinch{ + dnam{"шөкім"} + one{"{0} шөкім"} + other{"{0} шөкім"} + } pint{ dnam{"пинта"} one{"{0} пинта"} @@ -895,6 +970,11 @@ kk{ one{"{0} кварта"} other{"{0} кварта"} } + quart-imperial{ + dnam{"британдық кварта"} + one{"{0} британдық кварта"} + other{"{0} британдық кварта"} + } tablespoon{ dnam{"ас қасық"} one{"{0} ас қасық"} @@ -1557,6 +1637,11 @@ kk{ } } graphics{ + dot{ + dnam{"нүкте"} + one{"{0} нүкте"} + other{"{0} нүкте"} + } dot-per-centimeter{ dnam{"нүкте/см"} one{"{0} нүкте/см"} @@ -1600,12 +1685,22 @@ kk{ one{"{0} дм"} other{"{0} дм"} } + fathom{ + dnam{"фатом"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"фут"} one{"{0} фут"} other{"{0} фут"} per{"{0}/фут"} } + furlong{ + dnam{"фурлонг"} + one{"{0} фурлонг"} + other{"{0} фурлонг"} + } inch{ dnam{"дюйм"} one{"{0} дюйм"} @@ -1671,8 +1766,8 @@ kk{ } point{ dnam{"пункт"} - one{"{0} ұпай"} - other{"{0} ұпай"} + one{"{0} пункт"} + other{"{0} пункт"} } solar-radius{ dnam{"R☉"} @@ -1686,6 +1781,16 @@ kk{ } } light{ + candela{ + dnam{"Кд"} + one{"{0} Кд"} + other{"{0} Кд"} + } + lumen{ + dnam{"лм"} + one{"{0} лм"} + other{"{0} лм"} + } lux{ dnam{"люкс"} one{"{0} лк"} @@ -1713,6 +1818,11 @@ kk{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"гран"} + one{"{0} гран"} + other{"{0} гран"} + } gram{ dnam{"грамм"} one{"{0} г"} @@ -1762,6 +1872,11 @@ kk{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"стоун"} + one{"{0} стоун"} + other{"{0} стоун"} + } ton{ dnam{"тонна"} one{"{0} тн"} @@ -1919,6 +2034,10 @@ kk{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"сл"} one{"{0} cл"} @@ -1975,6 +2094,26 @@ kk{ one{"{0} дл"} other{"{0} дл"} } + dessert-spoon{ + dnam{"дес. қас."} + one{"{0} дес. қас."} + other{"{0} дес. қас."} + } + dessert-spoon-imperial{ + dnam{"брит. дес. қас."} + one{"{0} брит. дес. қас."} + other{"{0} брит. дес. қас."} + } + dram{ + dnam{"сұйық драхма"} + one{"{0} сұй. драхма"} + other{"{0} сұй. драхма"} + } + drop{ + dnam{"тамшы"} + one{"{0} тамшы"} + other{"{0} тамшы"} + } fluid-ounce{ dnam{"сұй. унц."} one{"{0} сұй. унц."} @@ -2002,6 +2141,11 @@ kk{ one{"{0} гл"} other{"{0} гл"} } + jigger{ + dnam{"джиггер"} + one{"{0} джиггер"} + other{"{0} джиггер"} + } liter{ dnam{"литр"} one{"{0} л"} @@ -2018,6 +2162,11 @@ kk{ one{"{0} мл"} other{"{0} мл"} } + pinch{ + dnam{"шөкім"} + one{"{0} шөкім"} + other{"{0} шөкім"} + } pint{ dnam{"пинта"} one{"{0} pt"} @@ -2033,6 +2182,11 @@ kk{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"брит. кварта"} + one{"{0} брит. кварта"} + other{"{0} брит. кварта"} + } tablespoon{ dnam{"ас қ."} one{"{0} ас қ."} diff --git a/intl/icu/source/data/unit/kkj.txt b/intl/icu/source/data/unit/kkj.txt index 4eaaba5f17c1..dd77640ec5a7 100644 --- a/intl/icu/source/data/unit/kkj.txt +++ b/intl/icu/source/data/unit/kkj.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kkj{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/kl.txt b/intl/icu/source/data/unit/kl.txt index 01e221fb7510..deb710446153 100644 --- a/intl/icu/source/data/unit/kl.txt +++ b/intl/icu/source/data/unit/kl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/kln.txt b/intl/icu/source/data/unit/kln.txt index 6ac43c271ceb..0db23ba9ec63 100644 --- a/intl/icu/source/data/unit/kln.txt +++ b/intl/icu/source/data/unit/kln.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kln{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/km.txt b/intl/icu/source/data/unit/km.txt index 0c55f6841649..5744a6e0954c 100644 --- a/intl/icu/source/data/unit/km.txt +++ b/intl/icu/source/data/unit/km.txt @@ -1,11 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km{ - Version{"37"} durationUnits{ - hm{"h:mm"} - hms{"h:mm:ss"} - ms{"m:ss"} + hm{"ម៉:នន"} + hms{"ម៉:នន:វិវិ"} + ms{"ម៉:វិវិ"} } units{ acceleration{ @@ -46,7 +46,8 @@ km{ other{"{0} អា"} } dunam{ - other{"{0} dunams"} + dnam{"ឌូណាម"} + other{"{0} ឌូណាម"} } hectare{ dnam{"ហិកតា"} @@ -166,16 +167,16 @@ km{ other{"{0} គីឡូបៃ"} } megabit{ - dnam{"មេហ្គាប៊ីត"} - other{"{0} មេហ្គាប៊ីត"} + dnam{"មេកាប៊ីត"} + other{"{0} មេកាប៊ីត"} } megabyte{ - dnam{"មេហ្គាបៃ"} - other{"{0} មេហ្គាបៃ"} + dnam{"មេកាបៃ"} + other{"{0} មេកាបៃ"} } petabyte{ - dnam{"PB"} - other{"{0} PB"} + dnam{"ប៉េតាបៃ"} + other{"{0} ប៉េតាបៃ"} } terabit{ dnam{"តេរ៉ាប៊ីត"} @@ -211,7 +212,7 @@ km{ } millisecond{ dnam{"មិល្លី​វិនាទី"} - other{"{0} មិល្លី​វិនាទី"} + other{"{0} មីលី​វិនាទី"} } minute{ dnam{"នាទី"} @@ -262,10 +263,18 @@ km{ } } energy{ + british-thermal-unit{ + dnam{"ឯកតាកម្ដៅអង់គ្លេស"} + other{"{0} ឯកតាកម្ដៅអង់គ្លេស"} + } calorie{ dnam{"កាឡូរី"} other{"{0} កាឡូរី"} } + electronvolt{ + dnam{"អេឡិចត្រូវ៉ុល"} + other{"{0} អេឡិចត្រូវ៉ុល"} + } foodcalorie{ dnam{"កាឡូរី"} other{"{0} កាឡូរី"} @@ -286,6 +295,10 @@ km{ dnam{"គីឡូវ៉ាត់​ម៉ោង"} other{"{0} គីឡូវ៉ាត់​ម៉ោង"} } + therm-us{ + dnam{"ឯកតាកម្ដៅអាមេរិក"} + other{"{0} ឯកតាកម្ដៅអាមេរិក"} + } } frequency{ gigahertz{ @@ -305,6 +318,36 @@ km{ other{"{0} មេហ្គា​ហឺត"} } } + graphics{ + dot{ + dnam{"ចំណុច"} + other{"{0}ចំណុច"} + } + dot-per-centimeter{ + dnam{"ចំណុចក្នុង១សង់ទីម៉ែត្រ"} + other{"{0} ចំណុចក្នុង១សង់ទីម៉ែត្រ"} + } + dot-per-inch{ + dnam{"ចំណុចក្នុង១អ៊ីញ"} + other{"{0} ចំណុចក្នុង១អ៊ីញ"} + } + megapixel{ + dnam{"មេហ្កាភិចស៊ែល"} + other{"{0} មេហ្កាភិចស៊ែល"} + } + pixel{ + dnam{"ភិចស៊ែល"} + other{"{0} ភិចស៊ែល"} + } + pixel-per-centimeter{ + dnam{"ភិចស៊ែលក្នុង១សង់ទីម៉ែត្រ"} + other{"{0} ភិចស៊ែលក្នុង១សង់ទីម៉ែត្រ"} + } + pixel-per-inch{ + dnam{"ភិចស៊ែលក្នុង១អ៊ីញ"} + other{"{0} ភិចស៊ែលក្នុង១អ៊ីញ"} + } + } length{ astronomical-unit{ dnam{"ឯកតាតារាសាស្ត្រ"} @@ -316,14 +359,26 @@ km{ per{"{0} ក្នុងមួយសង់ទីម៉ែត្រ"} } decimeter{ - dnam{"ដេសីុម៉ែត្រ"} - other{"{0} ដេសីុម៉ែត្រ"} + dnam{"ដេស៊ីម៉ែត្រ"} + other{"{0} ដេស៊ីម៉ែត្រ"} + } + earth-radius{ + dnam{"កាំផែនដី"} + other{"{0} កាំផែនដី"} + } + fathom{ + dnam{"ហ្វាតឹម"} + other{"{0} ហ្វាតឹម"} } foot{ dnam{"ហ្វីត"} other{"{0} ហ្វីត"} per{"{0} ក្នុងមួយហ្វីត"} } + furlong{ + dnam{"ហ្វឺឡង"} + other{"{0} ហ្វឺឡង"} + } inch{ dnam{"អ៊ីញ"} other{"{0} អ៊ីញ"} @@ -385,6 +440,14 @@ km{ } } light{ + candela{ + dnam{"កានដេឡា"} + other{"{0} កានដេឡា"} + } + lumen{ + dnam{"លូមែន"} + other{"{0} លូមែន"} + } lux{ dnam{"lux"} other{"{0} lux"} @@ -395,6 +458,10 @@ km{ dnam{"ការ៉ាត់"} other{"{0} ការ៉ាត់"} } + grain{ + dnam{"គ្រាប់"} + other{"{0} គ្រាប់"} + } gram{ dnam{"ក្រាម"} other{"{0} ក្រាម"} @@ -431,9 +498,13 @@ km{ other{"{0} ផោន"} per{"{0} ក្នុងមួយផោន"} } + stone{ + dnam{"ស្តូន"} + other{"{0} ស្តូន"} + } ton{ - dnam{"តោន"} - other{"{0} តោន"} + dnam{"តោនអាមេរិក"} + other{"{0} តោនអាមេរិក"} } } power{ @@ -475,6 +546,14 @@ km{ dnam{"អ៊ីញនៃបារត"} other{"{0} អ៊ីញនៃបារត"} } + kilopascal{ + dnam{"គីឡូប៉ាស្កាល់"} + other{"{0} គីឡូប៉ាស្កាល់"} + } + megapascal{ + dnam{"មេហ្កាប៉ាស្កាល់"} + other{"{0} មេហ្កាប៉ាស្កាល់"} + } millibar{ dnam{"មិល្លីបារ"} other{"{0} មិល្លីបារ"} @@ -483,6 +562,10 @@ km{ dnam{"មិល្លីម៉ែត្រនៃ​បារត"} other{"{0} មិល្លីម៉ែត្រនៃ​បារត"} } + pascal{ + dnam{"ប៉ាស្កាល់"} + other{"{0} ប៉ាស្កាល់"} + } pound-force-per-square-inch{ dnam{"ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ"} other{"{0} ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ"} @@ -529,6 +612,10 @@ km{ dnam{"អាហ្វីត"} other{"{0} អាហ្វីត"} } + bushel{ + dnam{"ប៊ូសែល"} + other{"{0} ប៊ូសែល"} + } centiliter{ dnam{"សង់ទីលីត្រ"} other{"{0} សង់ទីលីត្រ"} @@ -572,8 +659,20 @@ km{ other{"{0} រង្វាស់ពែង"} } deciliter{ - dnam{"ដេសីុលីត្រ"} - other{"{0} ដេសីុលីត្រ"} + dnam{"ដេស៊ីលីត្រ"} + other{"{0} ដេស៊ីលីត្រ"} + } + dessert-spoon{ + dnam{"ស្លាបព្រាបង្អែម"} + other{"{0} ស្លាបព្រាបង្អែម"} + } + dram{ + dnam{"ត្រាម"} + other{"{0} ត្រាម"} + } + drop{ + dnam{"តំណក់"} + other{"{0} តំណក់"} } fluid-ounce{ dnam{"អោន​វត្ថុ​រាវ"} @@ -593,6 +692,10 @@ km{ dnam{"ហិកតូលីត្រ"} other{"{0} ហិកតូលីត្រ"} } + jigger{ + dnam{"ជីកហ្គឺរ"} + other{"{0} ជីកហ្គឺរ"} + } liter{ dnam{"លីត្រ"} other{"{0} លីត្រ"} @@ -606,6 +709,10 @@ km{ dnam{"មិល្លីលីត្រ"} other{"{0} មិល្លីលីត្រ"} } + pinch{ + dnam{"ច្បិច"} + other{"{0} ច្បិច"} + } pint{ dnam{"ភីន"} other{"{0} ភីន"} @@ -698,7 +805,7 @@ km{ } millisecond{ dnam{"មិល្លី​វិនាទី"} - other{"{0}ms"} + other{"{0} ម.វិ"} } minute{ dnam{"នាទី"} @@ -723,8 +830,8 @@ km{ } length{ centimeter{ - dnam{"cm"} - other{"{0} cm"} + dnam{"សម"} + other{"{0} សម"} } foot{ other{"{0}′"} @@ -733,22 +840,21 @@ km{ other{"{0}″"} } kilometer{ - dnam{"km"} - other{"{0} km"} + dnam{"គម"} } light-year{ other{"{0} ឆ្នាំ​ពន្លឺ"} } meter{ dnam{"ម៉ែត្រ"} - other{"{0}m"} + other{"{0} ម"} } mile{ other{"{0} ម៉."} } millimeter{ - dnam{"mm"} - other{"{0} mm"} + dnam{"មម"} + other{"{0} មម"} } picometer{ other{"{0} ព.ម."} @@ -868,7 +974,8 @@ km{ other{"{0} ac"} } dunam{ - dnam{"dunams"} + dnam{"ឌូណាម"} + other{"{0} ឌូណាម"} } hectare{ dnam{"ហិកតា"} @@ -1033,7 +1140,7 @@ km{ } millisecond{ dnam{"មិល្លី​វិនាទី"} - other{"{0} ms"} + other{"{0} ម.វិ"} } minute{ dnam{"នាទី"} @@ -1130,34 +1237,47 @@ km{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"ចំណុច"} + other{"{0} ចំណុច"} + } + } length{ astronomical-unit{ dnam{"au"} other{"{0} au"} } centimeter{ - dnam{"cm"} - other{"{0} cm"} - per{"{0}/cm"} + dnam{"សម"} + other{"{0} សម"} + per{"{0}/សម"} } decimeter{ - dnam{"dm"} - other{"{0} dm"} + dnam{"ដម"} + other{"{0} ដម"} + } + fathom{ + dnam{"ហ្វាតឹម"} } foot{ dnam{"ហ្វីត"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"ហ្វឺឡង"} + other{"{0} ហ្វឺ"} + } inch{ dnam{"អ៊ីញ"} other{"{0} in"} per{"{0}/in"} } kilometer{ - dnam{"km"} - other{"{0} km"} - per{"{0}/km"} + dnam{"គម"} + other{"{0} គម"} + per{"{0}/គម"} } light-year{ dnam{"ឆ្នាំ​ពន្លឺ"} @@ -1165,8 +1285,8 @@ km{ } meter{ dnam{"ម៉ែត្រ"} - other{"{0} m"} - per{"{0}/m"} + other{"{0} ម"} + per{"{0}/ម"} } micrometer{ dnam{"មីក្រូ​ម៉ែត្រ"} @@ -1220,6 +1340,10 @@ km{ dnam{"ការ៉ាត់"} other{"{0} CD"} } + grain{ + dnam{"គ្រាប់"} + other{"{0} គ្រាប់"} + } gram{ dnam{"ក្រាម"} other{"{0} g"} @@ -1256,8 +1380,12 @@ km{ other{"{0} lb"} per{"{0}/lb"} } + stone{ + dnam{"ស្តូន"} + other{"{0} st"} + } ton{ - dnam{"តោន"} + dnam{"តោនអាមេរិក"} other{"{0} tn"} } } @@ -1354,6 +1482,9 @@ km{ dnam{"អាហ្វីត"} other{"{0} ac ft"} } + bushel{ + dnam{"ប៊ូសែល"} + } centiliter{ dnam{"cL"} other{"{0} cL"} @@ -1400,6 +1531,14 @@ km{ dnam{"dL"} other{"{0} dL"} } + dram{ + dnam{"ត្រាមរាវ"} + other{"{0} ត្រាមរាវ"} + } + drop{ + dnam{"តំណក់"} + other{"{0} តំណក់"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} @@ -1418,6 +1557,10 @@ km{ dnam{"hL"} other{"{0} hL"} } + jigger{ + dnam{"ជីកហ្គឺរ"} + other{"{0} ជីកហ្គឺរ"} + } liter{ dnam{"លីត្រ"} other{"{0} L"} @@ -1431,6 +1574,10 @@ km{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"ច្បិច"} + other{"{0} ច្បិច"} + } pint{ dnam{"ភីន"} other{"{0} pt"} diff --git a/intl/icu/source/data/unit/kn.txt b/intl/icu/source/data/unit/kn.txt index 9ac244c47349..5d41ab1abd86 100644 --- a/intl/icu/source/data/unit/kn.txt +++ b/intl/icu/source/data/unit/kn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kn{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ kn{ } } graphics{ + dot{ + dnam{"ಡಾಟ್"} + one{"{0}ಡಾಟ್"} + other{"{0}ಡಾಟ್"} + } dot-per-centimeter{ dnam{"ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್"} one{"{0} ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್"} @@ -461,12 +466,27 @@ kn{ one{"{0} ಡೆಸಿಮೀಟರ್"} other{"{0} ಡೆಸಿಮೀಟರ್‌ಗಳು"} } + earth-radius{ + dnam{"ಭೂಮಿಯ ತ್ರಿಜ್ಯ"} + one{"{0} ಭೂಮಿಯ ತ್ರಿಜ್ಯ"} + other{"{0} ಭೂಮಿಯ ತ್ರಿಜ್ಯ"} + } + fathom{ + dnam{"ಫ್ಯಾಥಮ್ಸ್"} + one{"{0} ಫ್ಯಾಥಮ್"} + other{"{0} ಫ್ಯಾಥಮ್ಸ್"} + } foot{ dnam{"ಅಡಿ"} one{"{0} ಅಡಿ"} other{"{0} ಅಡಿ"} per{"ಪ್ರತಿ ಅಡಿಗೆ {0}"} } + furlong{ + dnam{"ಫರ್ಲಾಂಗ್ಸ್"} + one{"{0} ಫರ್ಲಾಂಗ್"} + other{"{0} ಫರ್ಲಾಂಗ್ಸ್"} + } inch{ dnam{"ಅಂಗುಲಗಳು"} one{"{0} ಅಂಗುಲ"} @@ -547,6 +567,16 @@ kn{ } } light{ + candela{ + dnam{"ಕ್ಯಾಂಡಿಲಾ"} + one{"{0} ಕ್ಯಾಂಡಿಲಾ"} + other{"{0} ಕ್ಯಾಂಡಿಲಾ"} + } + lumen{ + dnam{"ಲೂಮೆನ್"} + one{"{0} ಲೂಮೆನ್"} + other{"{0} ಲೂಮೆನ್"} + } lux{ dnam{"ಲಕ್ಸ್‌‌"} one{"{0} ಲಕ್ಸ್‌‌"} @@ -574,6 +604,11 @@ kn{ one{"{0} ಭೂಮಿಯ ದೃವ್ಯರಾಶಿ"} other{"{0} ಭೂಮಿಯ ದೃವ್ಯರಾಶಿ"} } + grain{ + dnam{"ಗ್ರೇನ್"} + one{"{0} ಗ್ರೇನ್"} + other{"{0} ಗ್ರೇನ್"} + } gram{ dnam{"ಗ್ರಾಂಗಳು"} one{"{0} ಗ್ರಾಂ"} @@ -785,6 +820,11 @@ kn{ one{"{0} ಬ್ಯಾರೆಲ್"} other{"{0} ಬ್ಯಾರೆಲ್‌ಗಳು"} } + bushel{ + dnam{"ಬುಶಲ್‌ಗಳು"} + one{"{0} ಬುಶಲ್"} + other{"{0} ಬುಶಲ್‌ಗಳು"} + } centiliter{ dnam{"ಸೆಂಟಿಲೀಟರ್‌ಗಳು"} one{"{0} ಸೆಂಟಿಲೀಟರ್"} @@ -842,6 +882,26 @@ kn{ one{"{0} ಡೆಸಿಲೀಟರ್‌"} other{"{0} ಡೆಸಿಲೀಟರ್‌‌ಗಳು"} } + dessert-spoon{ + dnam{"ಡೆಸರ್ಟ್ ಸ್ಪೂನ್"} + one{"{0} ಡೆಸರ್ಟ್ ಸ್ಪೂನ್"} + other{"{0} ಡೆಸರ್ಟ್ ಸ್ಪೂನ್"} + } + dessert-spoon-imperial{ + dnam{"ಇಂಪಿರಿಯಲ್ ಡೆಸರ್ಟ್ ಸ್ಪೂನ್"} + one{"{0} ಇಂಪಿರಿಯಲ್ ಡೆಸರ್ಟ್ ಸ್ಪೂನ್"} + other{"{0} ಇಂಪಿರಿಯಲ್ ಡೆಸರ್ಟ್ ಸ್ಪೂನ್"} + } + dram{ + dnam{"ಡ್ರಾಮ್"} + one{"{0} ಡ್ರಾಮ್"} + other{"{0} ಡ್ರಾಮ್"} + } + drop{ + dnam{"ಡ್ರಾಪ್"} + one{"{0} ಡ್ರಾಪ್"} + other{"{0} ಡ್ರಾಪ್"} + } fluid-ounce{ dnam{"ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು"} one{"{0} ಫ್ಲೂಡ್ ಔನ್ಸ್‌"} @@ -869,6 +929,11 @@ kn{ one{"{0} ಹೆಕ್ಟೋಲೀಟರ್"} other{"{0} ಹೆಕ್ಟೋಲೀಟರ್‌ಗಳು"} } + jigger{ + dnam{"ಜಿಗರ್"} + one{"{0} ಜಿಗರ್"} + other{"{0} ಜಿಗರ್"} + } liter{ dnam{"ಲೀಟರ್‌‌ಗಳು"} one{"{0} ಲೀಟರ್"} @@ -885,6 +950,11 @@ kn{ one{"{0} ಮಿಲಿಲೀಟರ್"} other{"{0} ಮಿಲಿಲೀಟರ್‌ಗಳು"} } + pinch{ + dnam{"ಪಿಂಚ್"} + one{"{0} ಪಿಂಚ್"} + other{"{0} ಪಿಂಚ್"} + } pint{ dnam{"ಪಿಂಟ್‌ಗಳು"} one{"{0} ಪಿಂಟ್‌"} @@ -900,6 +970,11 @@ kn{ one{"{0} ಕಾಲುಭಾಗ"} other{"{0} ಕಾಲುಭಾಗಗಳು"} } + quart-imperial{ + dnam{"ಇಂಪಿರಿಯಲ್ ಕ್ವಾರ್ಟ್"} + one{"{0} ಇಂಪಿರಿಯಲ್ ಕ್ವಾರ್ಟ್"} + other{"{0} ಇಂಪಿರಿಯಲ್ ಕ್ವಾರ್ಟ್"} + } tablespoon{ dnam{"ಟೇಬಲ್ ಸ್ಪೂನ್‍ಗಳು"} one{"{0} ಟೇಬಲ್ ಸ್ಪೂನ್‍"} @@ -1620,6 +1695,11 @@ kn{ } } graphics{ + dot{ + dnam{"ಡಾಟ್"} + one{"{0} ಡಾಟ್"} + other{"{0} ಡಾಟ್"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1673,12 +1753,27 @@ kn{ one{"{0} ಡೆಮೀ"} other{"{0} ಡೆಮೀ"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"ಫ್ಯಾಥಮ್ಸ್"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"ಅಡಿ"} one{"{0} ಅ"} other{"{0} ಅ"} per{"{0}/ಅ"} } + furlong{ + dnam{"ಫರ್ಲಾಂಗ್ಸ್"} + one{"{0} ಫರ್"} + other{"{0} ಫರ್"} + } inch{ dnam{"ಅಂಗುಲಗಳು"} one{"{0} ಅಂ"} @@ -1759,6 +1854,16 @@ kn{ } } light{ + candela{ + dnam{"ಕ್ಯಾಂ"} + one{"{0} ಕ್ಯಾಂ"} + other{"{0} ಕ್ಯಾಂ"} + } + lumen{ + dnam{"ಎಲ್ಎಮ್"} + one{"{0} ಎಲ್ಎಮ್"} + other{"{0} ಎಲ್ಎಮ್"} + } lux{ dnam{"ಲಕ್ಸ್"} one{"{0} ಎಲ್‌ಎಕ್ಸ್"} @@ -1784,6 +1889,11 @@ kn{ one{"{0} ದೃ⊕"} other{"{0} ದೃ⊕"} } + grain{ + dnam{"ಗ್ರೇನ್"} + one{"{0} ಗ್ರೇನ್"} + other{"{0} ಗ್ರೇನ್"} + } gram{ dnam{"ಗ್ರಾಂಗಳು"} one{"{0} ಗ್ರಾ"} @@ -1995,6 +2105,11 @@ kn{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"ಬುಶಲ್‌ಗಳು"} + one{"{0} ಬು"} + other{"{0} ಬು"} + } centiliter{ dnam{"ಸೆಂ.ಲೀ"} one{"{0} ಸೆಂ.ಲೀ"} @@ -2052,6 +2167,26 @@ kn{ one{"{0} ಡೆ.ಲೀ"} other{"{0} ಡೆ.ಲೀ"} } + dessert-spoon{ + dnam{"ಡೆ.ಸ್ಪೂ"} + one{"{0} ಡೆ.ಸ್ಪೂ"} + other{"{0} ಡೆ.ಸ್ಪೂ"} + } + dessert-spoon-imperial{ + dnam{"ಡೆ.ಸ್ಪೂ.ಇಂಪಿ"} + one{"{0} ಡೆ.ಸ್ಪೂ.ಇಂಪಿ"} + other{"{0} ಡೆ.ಸ್ಪೂ.ಇಂಪಿ"} + } + dram{ + dnam{"ಡ್ರಾಮ್ ಫ್ಲೂಡ್"} + one{"{0} ಡ್ರಾಮ್ ಫ್ಲೂ"} + other{"{0} ಡ್ರಾಮ್.ಫ್ಲೂ"} + } + drop{ + dnam{"ಡ್ರಾಪ್"} + one{"{0} ಡ್ರಾಪ್"} + other{"{0} ಡ್ರಾಪ್"} + } fluid-ounce{ dnam{"ಫ್ಲೂ.ಔ"} one{"{0} ಫ್ಲೂ.ಔ"} @@ -2079,6 +2214,11 @@ kn{ one{"{0} ಹೆ.ಲೀ"} other{"{0} ಹೆ.ಲೀ"} } + jigger{ + dnam{"ಜಿಗರ್"} + one{"{0} ಜಿಗರ್"} + other{"{0} ಜಿಗರ್"} + } liter{ dnam{"ಲೀಟರ್‌ಗಳು"} one{"{0} ಲೀ"} @@ -2095,6 +2235,11 @@ kn{ one{"{0} ಮಿ.ಲೀ"} other{"{0} ಮಿ.ಲೀ"} } + pinch{ + dnam{"ಪಿಂಚ್"} + one{"{0} ಪಿಂಚ್"} + other{"{0} ಪಿಂಚ್"} + } pint{ dnam{"ಪಿಂಟ್‍ಗಳು"} one{"{0} ಪಿಂಟ್‌"} @@ -2110,6 +2255,11 @@ kn{ one{"{0} ಕಾ.ಭಾ"} other{"{0} ಕಾ.ಭಾ"} } + quart-imperial{ + dnam{"ಕ್ವಾ.ಇಂಪ್"} + one{"{0} ಕ್ವಾ.ಇಂಪ್"} + other{"{0} ಕ್ವಾ.ಇಂಪ್"} + } tablespoon{ dnam{"ಟೇ.ಸ್ಪೂ"} one{"{0} ಟೇ.ಸ್ಪೂ"} diff --git a/intl/icu/source/data/unit/ko.txt b/intl/icu/source/data/unit/ko.txt index 000d1bf7b6e3..294b3811a593 100644 --- a/intl/icu/source/data/unit/ko.txt +++ b/intl/icu/source/data/unit/ko.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -14,8 +14,8 @@ ko{ other{"{0} 중력가속도"} } meter-per-square-second{ - dnam{"제곱 초당 미터"} - other{"{0}제곱 초당 미터"} + dnam{"미터 매 초 제곱"} + other{"제곱 초당 {0}미터"} } } angle{ @@ -295,6 +295,10 @@ ko{ dnam{"킬로와트시"} other{"{0}킬로와트시"} } + therm-us{ + dnam{"미국 섬"} + other{"{0}섬"} + } } force{ newton{ @@ -324,6 +328,29 @@ ko{ other{"{0}메가헤르츠"} } } + graphics{ + dot{ + other{"{0}dot"} + } + dot-per-inch{ + other{"{0}dpi"} + } + em{ + other{"{0}em"} + } + megapixel{ + other{"{0}MP"} + } + pixel{ + other{"{0}px"} + } + pixel-per-centimeter{ + other{"{0}ppcm"} + } + pixel-per-inch{ + other{"{0}ppi"} + } + } length{ astronomical-unit{ dnam{"천문 단위"} @@ -338,6 +365,10 @@ ko{ dnam{"데시미터"} other{"{0}데시미터"} } + earth-radius{ + dnam{"지구 반경"} + other{"{0}지구 반경"} + } fathom{ dnam{"패덤"} other{"{0}패덤"} @@ -408,7 +439,7 @@ ko{ } solar-radius{ dnam{"태양 반경"} - other{"{0} 태양 반경"} + other{"{0}태양 반경"} } yard{ dnam{"야드"} @@ -416,6 +447,14 @@ ko{ } } light{ + candela{ + dnam{"칸델라"} + other{"{0}칸델라"} + } + lumen{ + dnam{"루멘"} + other{"{0}루멘"} + } lux{ dnam{"룩스"} other{"{0}룩스"} @@ -438,6 +477,10 @@ ko{ dnam{"지구 질량"} other{"{0}지구 질량"} } + grain{ + dnam{"그레인"} + other{"{0}그레인"} + } gram{ dnam{"그램"} other{"{0}그램"} @@ -518,6 +561,10 @@ ko{ dnam{"atm"} other{"{0}atm"} } + bar{ + dnam{"바"} + other{"{0}바"} + } hectopascal{ dnam{"헥토파스칼"} other{"{0}헥토파스칼"} @@ -542,6 +589,10 @@ ko{ dnam{"수은주밀리미터"} other{"{0}수은주밀리미터"} } + pascal{ + dnam{"파스칼"} + other{"{0}파스칼"} + } pound-force-per-square-inch{ dnam{"제곱인치당 파운드"} other{"{0}제곱인치당 파운드"} @@ -557,11 +608,11 @@ ko{ other{"{0}노트"} } meter-per-second{ - dnam{"m/s"} + dnam{"미터 매 초"} other{"초속 {0}미터"} } mile-per-hour{ - dnam{"mi/h"} + dnam{"시간당 마일"} other{"시속 {0}마일"} } } @@ -601,6 +652,10 @@ ko{ dnam{"배럴"} other{"{0}배럴"} } + bushel{ + dnam{"부셸"} + other{"{0}부셸"} + } centiliter{ dnam{"센티리터"} other{"{0}센티리터"} @@ -647,6 +702,22 @@ ko{ dnam{"데시리터"} other{"{0}데시리터"} } + dessert-spoon{ + dnam{"디저트스푼"} + other{"{0}디저트스푼"} + } + dessert-spoon-imperial{ + dnam{"영국 디저트스푼"} + other{"{0}영국 디저트스푼"} + } + dram{ + dnam{"영국 액량 드램"} + other{"{0}영국 액량 드램"} + } + drop{ + dnam{"방울"} + other{"{0}방울"} + } fluid-ounce{ dnam{"액량 온스"} other{"{0}액량 온스"} @@ -669,6 +740,10 @@ ko{ dnam{"헥토리터"} other{"{0}헥토리터"} } + jigger{ + dnam{"지거"} + other{"{0}지거"} + } liter{ dnam{"리터"} other{"{0}리터"} @@ -682,6 +757,10 @@ ko{ dnam{"밀리리터"} other{"{0}밀리리터"} } + pinch{ + dnam{"꼬집"} + other{"{0}꼬집"} + } pint{ dnam{"파인트"} other{"{0}파인트"} @@ -694,6 +773,10 @@ ko{ dnam{"쿼트"} other{"{0}쿼트"} } + quart-imperial{ + dnam{"영국 쿼트"} + other{"{0}영국 쿼트"} + } tablespoon{ dnam{"테이블스푼"} other{"{0}테이블스푼"} @@ -1236,7 +1319,7 @@ ko{ } decade{ dnam{"dec"} - other{"{0} dec"} + other{"{0}dec"} } hour{ dnam{"시간"} @@ -1333,8 +1416,8 @@ ko{ other{"{0}kWh"} } therm-us{ - dnam{"US therm"} - other{"{0} US therm"} + dnam{"미국 섬"} + other{"{0}섬"} } } force{ @@ -1364,33 +1447,36 @@ ko{ } } graphics{ + dot{ + other{"{0}dot"} + } dot-per-centimeter{ dnam{"dpcm"} - other{"{0} dpcm"} + other{"{0}dpcm"} } dot-per-inch{ dnam{"dpi"} - other{"{0} dpi"} + other{"{0}dpi"} } em{ dnam{"em"} - other{"{0} em"} + other{"{0}em"} } megapixel{ dnam{"MP"} - other{"{0} MP"} + other{"{0}MP"} } pixel{ dnam{"px"} - other{"{0} px"} + other{"{0}px"} } pixel-per-centimeter{ dnam{"ppcm"} - other{"{0} ppcm"} + other{"{0}ppcm"} } pixel-per-inch{ dnam{"ppi"} - other{"{0} ppi"} + other{"{0}ppi"} } } length{ @@ -1407,6 +1493,10 @@ ko{ dnam{"dm"} other{"{0}dm"} } + earth-radius{ + dnam{"R⊕"} + other{"{0}R⊕"} + } fathom{ dnam{"fm"} other{"{0}fth"} @@ -1481,10 +1571,16 @@ ko{ } yard{ dnam{"yd"} - other{"{0}야드"} + other{"{0}yd"} } } light{ + candela{ + other{"{0}cd"} + } + lumen{ + other{"{0}lm"} + } lux{ dnam{"lx"} other{"{0}lx"} @@ -1506,6 +1602,9 @@ ko{ dnam{"M⊕"} other{"{0}M⊕"} } + grain{ + other{"{0}grain"} + } gram{ dnam{"그램"} other{"{0}g"} @@ -1588,7 +1687,7 @@ ko{ } bar{ dnam{"bar"} - other{"{0} bar"} + other{"{0}bar"} } hectopascal{ dnam{"hPa"} @@ -1616,7 +1715,7 @@ ko{ } pascal{ dnam{"Pa"} - other{"{0} Pa"} + other{"{0}Pa"} } pound-force-per-square-inch{ dnam{"psi"} @@ -1676,6 +1775,10 @@ ko{ dnam{"bbl"} other{"{0}bbl"} } + bushel{ + dnam{"bu"} + other{"{0}bu"} + } centiliter{ dnam{"cL"} other{"{0}cL"} @@ -1722,6 +1825,18 @@ ko{ dnam{"dL"} other{"{0}dL"} } + dessert-spoon{ + other{"{0}dstspn"} + } + dessert-spoon-imperial{ + other{"{0}dstspn Imp"} + } + dram{ + other{"{0}dram fl"} + } + drop{ + other{"{0}drop"} + } fluid-ounce{ dnam{"fl oz"} other{"{0}fl oz"} @@ -1744,6 +1859,9 @@ ko{ dnam{"hL"} other{"{0}hL"} } + jigger{ + other{"{0}jigger"} + } liter{ dnam{"리터"} other{"{0}L"} @@ -1757,6 +1875,9 @@ ko{ dnam{"mL"} other{"{0}mL"} } + pinch{ + other{"{0}pinch"} + } pint{ dnam{"pt"} other{"{0}pt"} @@ -1769,6 +1890,9 @@ ko{ dnam{"qt"} other{"{0}qt"} } + quart-imperial{ + other{"{0}qt Imp."} + } tablespoon{ dnam{"tbsp"} other{"{0}tbsp"} diff --git a/intl/icu/source/data/unit/kok.txt b/intl/icu/source/data/unit/kok.txt index 6814a3107cb7..e41c523fddf0 100644 --- a/intl/icu/source/data/unit/kok.txt +++ b/intl/icu/source/data/unit/kok.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kok{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -9,6 +9,10 @@ kok{ } units{ acceleration{ + g-force{ + dnam{"जी-फोर्स"} + other{"{0} जी-फोर्स"} + } meter-per-square-second{ dnam{"मी/से²"} other{"{0} मी/से²"} @@ -84,7 +88,8 @@ kok{ } } compound{ - per{"{1} क {0}"} + per{"{0} दर {1}"} + times{"{0}-{1}"} } concentr{ karat{ @@ -111,6 +116,14 @@ kok{ dnam{"दरमायल"} other{"{0} दरमायल"} } + permillion{ + dnam{"पार्ट पर मिलियन"} + other{"{0} पार्ट पर मिलियन"} + } + permyriad{ + dnam{"परमिरियड"} + other{"{0} परमिरियड"} + } } consumption{ liter-per-100-kilometer{ @@ -121,6 +134,14 @@ kok{ dnam{"लिटर/किलोमीटर"} other{"{0} लिटर/किलोमीटर"} } + mile-per-gallon{ + dnam{"मैल दर गॅलोन"} + other{"{0} मैल दर गॅलोन"} + } + mile-per-gallon-imperial{ + dnam{"मैल दर इंपिरियल गॅलोन"} + other{"{0} मैल दर इंपिरियल गॅलोन"} + } } coordinate{ dnam{"मुख्य दिका"} @@ -237,8 +258,13 @@ kok{ dnam{"एम्पियर"} other{"{0} एम्पियर"} } + milliampere{ + dnam{"मिलिएम्पियर"} + other{"{0} मिलिएम्पियर"} + } ohm{ dnam{"ओम"} + other{"{0} ओम"} } volt{ dnam{"वोल्ट"} @@ -276,6 +302,10 @@ kok{ dnam{"न्युटन"} other{"{0} न्युटन"} } + pound-force{ + dnam{"पावंड ऑफ फोर्स"} + other{"{0} पावंड ऑफ फोर्स"} + } } frequency{ gigahertz{ @@ -296,6 +326,10 @@ kok{ } } graphics{ + dot{ + dnam{"ठिपको"} + other{"{0}ठिपको"} + } dot-per-centimeter{ dnam{"दर सेंटिमीटर ठिपके"} other{"दर सेंटिमीटर ठिपके {0}"} @@ -339,11 +373,23 @@ kok{ dnam{"डेसीमीटर"} other{"{0} डेसीमीटर"} } + earth-radius{ + dnam{"पृथ्वी त्रिज्या"} + other{"{0} पृथ्वी त्रिज्या"} + } + fathom{ + dnam{"फॅदम"} + other{"{0} फॅदम"} + } foot{ dnam{"फूट"} other{"{0} फूट"} per{"दर फूट {0}"} } + furlong{ + dnam{"फर्लांग"} + other{"{0} फर्लांग"} + } inch{ dnam{"इंच"} other{"{0} इंच"} @@ -388,8 +434,8 @@ kok{ other{"{0} नॉटिकल्स मायल्स"} } parsec{ - dnam{"पॅरासे"} - other{"{0} पॅरासे"} + dnam{"पासेक्स"} + other{"{0} पासेक्स"} } picometer{ dnam{"पिकोमीटर"} @@ -408,11 +454,41 @@ kok{ other{"{0} यार्ड"} } } + light{ + candela{ + dnam{"कॅन्डेला"} + other{"{0} कॅन्डेला"} + } + lumen{ + dnam{"ल्युमन"} + other{"{0} ल्युमन"} + } + lux{ + dnam{"लक्स"} + other{"{0} लक्स"} + } + solar-luminosity{ + dnam{"सौर ल्युमिनोसायटिस"} + other{"{0} सौर ल्युमिनोसायटिस"} + } + } mass{ carat{ dnam{"कॅरट"} other{"{0} कॅरट"} } + dalton{ + dnam{"डाल्टन"} + other{"{0} डाल्टन"} + } + earth-mass{ + dnam{"पृथ्वी वस्तुमान"} + other{"{0} पृथ्वी वस्तुमान"} + } + grain{ + dnam{"कण"} + other{"{0} कण"} + } gram{ dnam{"ग्राम"} other{"{0} ग्राम"} @@ -431,9 +507,27 @@ kok{ dnam{"मिलिग्राम"} other{"{0} मिलिग्राम"} } + ounce{ + dnam{"औंस"} + other{"{0} औंस"} + per{"{0} दर औंस"} + } + ounce-troy{ + dnam{"ट्रॉय औंस"} + other{"{0} ट्रॉय औंस"} + } pound{ dnam{"पौंड"} other{"{0} पौंड"} + per{"{0} दर पौंड"} + } + solar-mass{ + dnam{"सौर वस्तुमान"} + other{"{0} सौर वस्तुमान"} + } + stone{ + dnam{"स्टोन"} + other{"{0} स्टोन"} } ton{ dnam{"टन"} @@ -475,16 +569,48 @@ kok{ dnam{"पट्टी"} other{"{0} पट्ट्यो"} } + hectopascal{ + dnam{"हेक्टोपास्कल"} + other{"{0} हेक्टोपास्कल"} + } + inch-ofhg{ + dnam{"इंचेस ऑफ मर्क्युरी"} + other{"{0} इंचेस ऑफ मर्क्युरी"} + } + kilopascal{ + dnam{"किलोपास्कल"} + other{"{0} किलोपास्कल"} + } + megapascal{ + dnam{"मेगापास्कल"} + other{"{0} किलोपास्कल्स"} + } + millibar{ + dnam{"मिलिबार"} + other{"{0} मिलिबार"} + } + millimeter-ofhg{ + dnam{"मिलिमीटर ऑफ मर्क्युरी"} + other{"{0} मिलिमीटर ऑफ मर्क्युरी"} + } pascal{ dnam{"पास्कल"} other{"{0} पास्कल"} } + pound-force-per-square-inch{ + dnam{"पावंड दर चौरस इंच"} + other{"{0} पावंड दर चौरस इंच"} + } } speed{ kilometer-per-hour{ dnam{"किमी/व"} other{"{0} किमी/व"} } + knot{ + dnam{"नॉट"} + other{"{0} नॉट"} + } meter-per-second{ dnam{"मी/से"} other{"{0} मी/से"} @@ -513,6 +639,10 @@ kok{ dnam{"न्युटन-मीटर"} other{"{0} न्युटन-मीटर"} } + pound-force-foot{ + dnam{"पावंड-फूट"} + other{"{0} पावंड-फूट"} + } } volume{ acre-foot{ @@ -523,18 +653,26 @@ kok{ dnam{"बॅरल"} other{"{0} बॅरल"} } + bushel{ + dnam{"बुशेल्स"} + other{"{0} बुशेल्स"} + } + centiliter{ + dnam{"सेंटिलीटर"} + other{"{0} सेंटिलीटर"} + } cubic-centimeter{ - dnam{"सेमी³"} - other{"{0} सेमी³"} - per{"{0}/सेमी³"} + dnam{"क्युबीक सेंटीमीटर"} + other{"{0} क्युबीक सेंटीमीटर"} + per{"{0} दर क्युबीक सेंटीमीटर"} } cubic-foot{ - dnam{"फू³"} - other{"{0} फू³"} + dnam{"क्युबीक फूट"} + other{"{0} क्युबीक फूट"} } cubic-inch{ - dnam{"इं³"} - other{"{0} इं³"} + dnam{"क्युबीक इंच"} + other{"{0} क्युबीक इंच"} } cubic-kilometer{ dnam{"क्युबीक किलोमीटर"} @@ -546,12 +684,12 @@ kok{ per{"{0}/मी³"} } cubic-mile{ - dnam{"मा³"} - other{"{0} मा³"} + dnam{"क्युबीक मील"} + other{"{0} क्युबीक मील"} } cubic-yard{ - dnam{"या³"} - other{"{0} या³"} + dnam{"क्युबीक यार्ड"} + other{"{0} क्युबीक यार्ड"} } cup{ dnam{"कप"} @@ -561,15 +699,51 @@ kok{ dnam{"मॅट्रिक कप"} other{"{0} मॅट्रिक कप"} } + deciliter{ + dnam{"डेसिलीटर"} + other{"{0} डेसिलीटर"} + } + dessert-spoon{ + dnam{"डिझर्ट कुलेर"} + other{"{0} डिझर्ट कुलेर"} + } + dessert-spoon-imperial{ + dnam{"इंपिरियल डिझर्ट कुलेर"} + other{"{0} इंप. डिझर्ट कुलेर"} + } + dram{ + dnam{"ड्रॅम"} + other{"{0} ड्रॅम"} + } + drop{ + dnam{"थेंबो"} + other{"{0} थेंबो"} + } fluid-ounce{ dnam{"फ्लुइड औंस"} other{"{0} फ्लुइड औंस"} } + fluid-ounce-imperial{ + dnam{"इंपिरियल फ्लुइड औंस"} + other{"{0} इंप. फ्लुइड औंस"} + } gallon{ dnam{"गॅलोन"} other{"{0} गॅलोन"} per{"दर गॅलोन {0}"} } + gallon-imperial{ + dnam{"इंपिरियल गॅलोन"} + other{"{0} इंप. गॅलोन"} + per{"{0} दर इंप. गॅलोन"} + } + hectoliter{ + dnam{"हॅक्टोलीटर"} + } + jigger{ + dnam{"जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लिटर"} other{"{0} लिटर"} @@ -583,10 +757,26 @@ kok{ dnam{"मिलिलिटर"} other{"{0} मिलिलिटर"} } + pinch{ + dnam{"चिमटी"} + other{"{0} चिमटी"} + } + pint{ + dnam{"पाइंट"} + other{"{0} पाइंट"} + } + pint-metric{ + dnam{"मॅट्रिक पाइंट"} + other{"{0} मॅट्रिक पाइंट"} + } quart{ dnam{"क्वार्त"} other{"{0} क्वार्त"} } + quart-imperial{ + dnam{"इंपिरियल क्वार्त"} + other{"{0} इंप. क्वार्त"} + } tablespoon{ dnam{"व्हडलें कुलेर"} other{"{0} व्हडलें कुलेर"} @@ -598,6 +788,10 @@ kok{ } } unitsNarrow{ + compound{ + per{"{0}/{1}"} + times{"{0}⋅{1}"} + } coordinate{ dnam{"दिका"} east{"{0}उदें"} @@ -689,7 +883,7 @@ kok{ unitsShort{ acceleration{ g-force{ - dnam{"g-force"} + dnam{"जी-फोर्स"} other{"{0} G"} } meter-per-square-second{ @@ -814,11 +1008,11 @@ kok{ other{"{0} लि/किमी"} } mile-per-gallon{ - dnam{"mpg US"} - other{"{0} mpg US"} + dnam{"मैल/गॅ"} + other{"{0} mpg"} } mile-per-gallon-imperial{ - dnam{"mpg Imp."} + dnam{"मैल/गॅ इंप."} other{"{0} mpg Imp."} } } @@ -938,11 +1132,11 @@ kok{ other{"{0} ए"} } milliampere{ - dnam{"mA"} + dnam{"मिलिएम्प"} other{"{0} mA"} } ohm{ - dnam{"ओम्स"} + dnam{"ओम"} other{"{0} Ω"} } volt{ @@ -994,7 +1188,7 @@ kok{ other{"{0} न्यु"} } pound-force{ - dnam{"lbf"} + dnam{"पावंड-फोर्स"} other{"{0} lbf"} } } @@ -1017,6 +1211,10 @@ kok{ } } graphics{ + dot{ + dnam{"ठिपको"} + other{"{0} ठिपको"} + } dot-per-centimeter{ dnam{"dpcm"} other{"{0} dpcm"} @@ -1060,11 +1258,23 @@ kok{ dnam{"डेमी"} other{"{0} डेमी"} } + earth-radius{ + dnam{"R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"फॅदम"} + other{"{0} fth"} + } foot{ dnam{"फूट"} other{"{0} फूट"} per{"{0}/ft"} } + furlong{ + dnam{"फर्लांग"} + other{"{0} fur"} + } inch{ dnam{"इंच"} other{"{0} in"} @@ -1109,7 +1319,7 @@ kok{ other{"{0} nmi"} } parsec{ - dnam{"pc"} + dnam{"पासेक"} other{"{0} pc"} } picometer{ @@ -1130,12 +1340,20 @@ kok{ } } light{ + candela{ + dnam{"cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + other{"{0} lm"} + } lux{ - dnam{"lx"} + dnam{"लक्स"} other{"{0} lx"} } solar-luminosity{ - dnam{"L☉"} + dnam{"सौर ल्युमिनोसायटिस"} other{"{0} L☉"} } } @@ -1145,13 +1363,17 @@ kok{ other{"{0} कॅ"} } dalton{ - dnam{"Da"} + dnam{"डाल्टन"} other{"{0} Da"} } earth-mass{ - dnam{"M⊕"} + dnam{"पृथ्वी वस्तुमान"} other{"{0} M⊕"} } + grain{ + dnam{"कण"} + other{"{0} कण"} + } gram{ dnam{"ग्राम"} other{"{0} ग्राम"} @@ -1175,23 +1397,27 @@ kok{ other{"{0} मिग्रा"} } ounce{ - dnam{"oz"} + dnam{"औंस"} other{"{0} oz"} - per{"{0}/oz"} + per{"{0}/औंस"} } ounce-troy{ - dnam{"oz t"} + dnam{"औंस ट्रॉय"} other{"{0} oz t"} } pound{ - dnam{"lb"} + dnam{"पौंड"} other{"{0} lb"} - per{"{0}/lb"} + per{"{0}/पौंड"} } solar-mass{ - dnam{"M☉"} + dnam{"सौर वस्तुमान"} other{"{0} M☉"} } + stone{ + dnam{"स्टोन"} + other{"{0} स्टोन"} + } ton{ dnam{"टन"} other{"{0} टन"} @@ -1271,7 +1497,7 @@ kok{ other{"{0} किमी/व"} } knot{ - dnam{"kn"} + dnam{"नॉट"} other{"{0} kn"} } meter-per-second{ @@ -1307,19 +1533,23 @@ kok{ other{"{0} N⋅m"} } pound-force-foot{ - dnam{"lbf⋅ft"} + dnam{"पावंड-फूट"} other{"{0} lbf⋅ft"} } } volume{ acre-foot{ dnam{"एकर फू"} - other{"{0} ए फू"} + other{"{0} ac ft"} } barrel{ dnam{"बॅरल"} other{"{0} बॅरल"} } + bushel{ + dnam{"बुशेल्स"} + other{"{0} bu"} + } centiliter{ dnam{"cL"} other{"{0} cL"} @@ -1330,12 +1560,12 @@ kok{ per{"{0}/सेमी³"} } cubic-foot{ - dnam{"फू³"} - other{"{0} फू³"} + dnam{"फूट³"} + other{"{0} ft³"} } cubic-inch{ dnam{"इंच³"} - other{"{0} इ³"} + other{"{0} in³"} } cubic-kilometer{ dnam{"किमी³"} @@ -1351,8 +1581,8 @@ kok{ other{"{0} mi³"} } cubic-yard{ - dnam{"या³"} - other{"{0} या³"} + dnam{"यार्ड³"} + other{"{0} yd³"} } cup{ dnam{"कप"} @@ -1366,6 +1596,22 @@ kok{ dnam{"dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"डिझ. कुलेर"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"डिझ. कुलेर इंप"} + other{"{0} dstspn Imp"} + } + dram{ + dnam{"ड्रॅम फ्लुइड"} + other{"{0} ड्रॅम फ्लु"} + } + drop{ + dnam{"थेंबो"} + other{"{0} थेंबो"} + } fluid-ounce{ dnam{"US fl oz"} other{"{0} fl oz US"} @@ -1380,14 +1626,18 @@ kok{ per{"{0}/गॅलो युएस"} } gallon-imperial{ - dnam{"Imp. gal"} - other{"{0} gal Imp."} - per{"{0}/gal Imp."} + dnam{"इंप.गॅलोन"} + other{"{0} गॅल इंप."} + per{"{0}/गॅलोन इंप."} } hectoliter{ dnam{"hL"} other{"{0} hL"} } + jigger{ + dnam{"जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लिटर"} other{"{0} लि"} @@ -1401,8 +1651,12 @@ kok{ dnam{"मिलि"} other{"{0} मिलि"} } + pinch{ + dnam{"चिमटी"} + other{"{0} चिमटी"} + } pint{ - dnam{"pt"} + dnam{"पाइंट"} other{"{0} pt"} } pint-metric{ @@ -1413,6 +1667,10 @@ kok{ dnam{"क्वा"} other{"{0} क्वा"} } + quart-imperial{ + dnam{"क्वार्त इंप"} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} other{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/ks.txt b/intl/icu/source/data/unit/ks.txt index 2fce9d19e5c4..a126ad35f25d 100644 --- a/intl/icu/source/data/unit/ks.txt +++ b/intl/icu/source/data/unit/ks.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/ks_Arab.txt b/intl/icu/source/data/unit/ks_Arab.txt index aafa093f1849..f3d2206e1162 100644 --- a/intl/icu/source/data/unit/ks_Arab.txt +++ b/intl/icu/source/data/unit/ks_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ks_Arab_IN.txt b/intl/icu/source/data/unit/ks_Arab_IN.txt index a13c0c960582..2d29f4c5e86f 100644 --- a/intl/icu/source/data/unit/ks_Arab_IN.txt +++ b/intl/icu/source/data/unit/ks_Arab_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/ks_IN.txt b/intl/icu/source/data/unit/ks_IN.txt index fd8b52d9b4a2..bd1a22537a8f 100644 --- a/intl/icu/source/data/unit/ks_IN.txt +++ b/intl/icu/source/data/unit/ks_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_IN{ "%%ALIAS"{"ks_Arab_IN"} } diff --git a/intl/icu/source/data/unit/ksb.txt b/intl/icu/source/data/unit/ksb.txt index f4818ce459be..77a38c1650ab 100644 --- a/intl/icu/source/data/unit/ksb.txt +++ b/intl/icu/source/data/unit/ksb.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksb{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ksf.txt b/intl/icu/source/data/unit/ksf.txt index bf1a877221f0..710fb8ba9cf4 100644 --- a/intl/icu/source/data/unit/ksf.txt +++ b/intl/icu/source/data/unit/ksf.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksf{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ksh.txt b/intl/icu/source/data/unit/ksh.txt index 7b2ef1e65da7..2ceed82b44a6 100644 --- a/intl/icu/source/data/unit/ksh.txt +++ b/intl/icu/source/data/unit/ksh.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksh{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/ku.txt b/intl/icu/source/data/unit/ku.txt index 46c727f920ee..5c2518575e10 100644 --- a/intl/icu/source/data/unit/ku.txt +++ b/intl/icu/source/data/unit/ku.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ku{ - Version{"37"} units{ angle{ arc-minute{ diff --git a/intl/icu/source/data/unit/kw.txt b/intl/icu/source/data/unit/kw.txt index 5e7c801cafc6..c7bcb9f14bcd 100644 --- a/intl/icu/source/data/unit/kw.txt +++ b/intl/icu/source/data/unit/kw.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kw{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ky.txt b/intl/icu/source/data/unit/ky.txt index 6b08196ed405..0a04c9a77af4 100644 --- a/intl/icu/source/data/unit/ky.txt +++ b/intl/icu/source/data/unit/ky.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -10,7 +10,7 @@ ky{ units{ acceleration{ g-force{ - dnam{"оордук күчүнүн ылдамдануусу"} + dnam{"оордук күчү"} one{"{0} оордук күчү"} other{"{0} оордук күчү"} } @@ -105,7 +105,7 @@ ky{ } } compound{ - per{"{1}/{0}"} + per{"{0}/{1}"} } concentr{ karat{ @@ -126,7 +126,7 @@ ky{ mole{ dnam{"мольдор"} one{"{0} моль"} - other{"{0} мольдор"} + other{"{0} моль"} } percent{ dnam{"пайыз"} @@ -173,10 +173,10 @@ ky{ } coordinate{ dnam{"негизги багыт"} - east{"{0}Ч"} - north{"{0}Тн"} - south{"{0}Тш"} - west{"{0}Б"} + east{"{0} чыгыш"} + north{"{0} түндүк"} + south{"{0} түштүк"} + west{"{0} батыш"} } digital{ bit{ @@ -248,7 +248,6 @@ ky{ per{"күнүнө {0}"} } decade{ - dnam{"декадалар"} one{"{0} он жылдык"} other{"{0} он жылдык"} } @@ -407,6 +406,11 @@ ky{ other{"{0} мегагерц"} } } + graphics{ + dot{ + dnam{"чекит"} + } + } length{ astronomical-unit{ dnam{"астрономиялык бирдик"} @@ -424,6 +428,11 @@ ky{ one{"{0} дециметр"} other{"{0} дециметр"} } + earth-radius{ + dnam{"жер радиусу"} + one{"жер радиусу"} + other{"{0} жер радиусу"} + } foot{ dnam{"фут"} one{"{0} фут"} @@ -455,7 +464,7 @@ ky{ } micrometer{ dnam{"микрометр"} - one{"микрометр"} + one{"{0} микрометр"} other{"{0} микрометр"} } mile{ @@ -510,6 +519,16 @@ ky{ } } light{ + candela{ + dnam{"кандела"} + one{"{0} кандела"} + other{"{0} кандела"} + } + lumen{ + dnam{"люмен"} + one{"{0} люмен"} + other{"{0} люмен"} + } lux{ dnam{"люкс"} one{"{0} люкс"} @@ -537,6 +556,11 @@ ky{ one{"{0} Жер массасы"} other{"{0} Жер массалары"} } + grain{ + dnam{"грэйн"} + one{"{0} грэйн"} + other{"{0} грэйн"} + } gram{ dnam{"грамм"} one{"{0} грамм"} @@ -587,8 +611,8 @@ ky{ other{"{0} M☉"} } ton{ - dnam{"тонна"} - one{"{0} тонна"} + dnam{"Америкалык тонна"} + one{"Америкалык тонна"} other{"{0} тонна"} } } @@ -646,9 +670,9 @@ ky{ other{"{0} kPa"} } megapascal{ - dnam{"мегапаскалдар"} - one{"{0} MPa"} - other{"{0} MPa"} + dnam{"мегапаскаль"} + one{"{0} мегапаскаль"} + other{"{0} мегапаскаль"} } millibar{ dnam{"миллибар"} @@ -701,8 +725,8 @@ ky{ } generic{ dnam{"°"} - one{"{0}°"} - other{"{0}°"} + one{"{0} градус"} + other{"{0} градус"} } kelvin{ dnam{"Келвин градусу"} @@ -733,6 +757,11 @@ ky{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"бушел"} + one{"{0} бушел"} + other{"{0} бушел"} + } centiliter{ dnam{"сантилитр"} one{"{0} сантилитр"} @@ -790,6 +819,16 @@ ky{ one{"{0} децилитр"} other{"{0} децилитр"} } + dram{ + dnam{"драм"} + one{"{0} драм"} + other{"{0} драм"} + } + drop{ + dnam{"дроп"} + one{"{0} дроп"} + other{"{0} дроп"} + } fluid-ounce{ dnam{"суюк унция"} one{"{0} суюк унция"} @@ -798,7 +837,7 @@ ky{ fluid-ounce-imperial{ dnam{"Имп. суюктук унциялары"} one{"{0} Имп. суюктук унциялары"} - other{"{0} имп. суюктук унциялары"} + other{"{0} имп. суюктук унциясы"} } gallon{ dnam{"галлон"} @@ -817,6 +856,11 @@ ky{ one{"{0} гектолитр"} other{"{0} гектолитр"} } + jigger{ + dnam{"жиггер"} + one{"{0} жиггер"} + other{"{0} жиггер"} + } liter{ dnam{"литр"} one{"{0} литр"} @@ -833,6 +877,11 @@ ky{ one{"{0} миллилитр"} other{"{0} миллилитр"} } + pinch{ + dnam{"пинч"} + one{"{0} пинч"} + other{"{0} пинч"} + } pint{ dnam{"пинта"} one{"{0} пинта"} @@ -908,7 +957,7 @@ ky{ } } compound{ - per{"{1}/{0}"} + per{"{0}/{1}"} } concentr{ percent{ @@ -1026,7 +1075,6 @@ ky{ other{"{0} гр"} } kilogram{ - dnam{"килограмм"} one{"{0} кг"} other{"{0} кг"} } @@ -1112,7 +1160,7 @@ ky{ unitsShort{ acceleration{ g-force{ - dnam{"оордук күчүнүн ылдамдануусу"} + dnam{"оордук күчү"} one{"{0} о.к."} other{"{0} о.к."} } @@ -1135,8 +1183,8 @@ ky{ } degree{ dnam{"градус"} - one{"{0}°"} - other{"{0}°"} + one{"{0} град"} + other{"{0} град"} } radian{ dnam{"рад."} @@ -1169,7 +1217,7 @@ ky{ dnam{"см²"} one{"{0} см²"} other{"{0} см²"} - per{"см²/{0}"} + per{"{0}/см²"} } square-foot{ dnam{"чарчы фут"} @@ -1180,7 +1228,7 @@ ky{ dnam{"дюйм²"} one{"{0} дюйм²"} other{"{0} дюйм²"} - per{"дюйм²/{0}"} + per{"{0}/дюйм²"} } square-kilometer{ dnam{"км²"} @@ -1192,13 +1240,13 @@ ky{ dnam{"метр²"} one{"{0} м²"} other{"{0} м²"} - per{"м²/{0}"} + per{"{0}/м²"} } square-mile{ dnam{"чарчы миля"} one{"{0} мл²"} other{"{0} мл²"} - per{"mi²/{0}"} + per{"{0}/ми²"} } square-yard{ dnam{"ярд²"} @@ -1207,7 +1255,7 @@ ky{ } } compound{ - per{"{1}/{0}"} + per{"{0}/{1}"} } concentr{ karat{ @@ -1216,12 +1264,12 @@ ky{ other{"{0} кт"} } milligram-per-deciliter{ - dnam{"мг/Дл"} - one{"{0} мг/Дл"} - other{"{0} мг/Дл"} + dnam{"мг/дл"} + one{"{0} мг/дл"} + other{"{0} мг/дл"} } millimole-per-liter{ - dnam{"ммоль/л"} + dnam{"миллимоль/литр"} one{"{0} ммоль/л"} other{"{0} ммоль/л"} } @@ -1253,12 +1301,12 @@ ky{ } consumption{ liter-per-100-kilometer{ - dnam{"100 км/л"} + dnam{"л/100 км"} one{"{0} л/100км"} other{"{0} л/100км"} } liter-per-kilometer{ - dnam{"км/литр"} + dnam{"литр/км"} one{"{0} л/км"} other{"{0} л/км"} } @@ -1276,9 +1324,9 @@ ky{ coordinate{ dnam{"багыт"} east{"{0}Ч"} - north{"{0}Тн"} - south{"{0}Тш"} - west{"{0}Б"} + north{"{0} Тн"} + south{"{0} Тш"} + west{"{0} Б"} } digital{ bit{ @@ -1347,7 +1395,7 @@ ky{ dnam{"күн"} one{"{0} күн"} other{"{0} күн"} - per{"күн/{0}"} + per{"{0}/күн"} } decade{ dnam{"он жылдык"} @@ -1358,7 +1406,7 @@ ky{ dnam{"саат"} one{"{0} ст"} other{"{0} ст"} - per{"ст/{0}"} + per{"{0}/ст"} } microsecond{ dnam{"μсек"} @@ -1374,7 +1422,7 @@ ky{ dnam{"мүнөт"} one{"{0} мүн"} other{"{0} мүн"} - per{"мүн/{0}"} + per{"{0}/мүн"} } month{ dnam{"ай"} @@ -1391,19 +1439,19 @@ ky{ dnam{"секунд"} one{"{0} сек"} other{"{0} сек"} - per{"сек/{0}"} + per{"{0}/сек"} } week{ dnam{"апта"} one{"{0} апт"} other{"{0} апт"} - per{"апт/{0}"} + per{"{0}/апт"} } year{ dnam{"жыл"} - one{"{0} ж."} + one{"{0}-ж."} other{"{0} ж."} - per{"ж/{0}"} + per{"{0}/ж"} } } electric{ @@ -1509,6 +1557,13 @@ ky{ other{"{0} МГЦ"} } } + graphics{ + dot{ + dnam{"графикалык чекит"} + one{"{0} графикалык чекит"} + other{"{0} графикалык чекит"} + } + } length{ astronomical-unit{ dnam{"а. б."} @@ -1519,7 +1574,7 @@ ky{ dnam{"см"} one{"{0} см"} other{"{0} см"} - per{"см/{0}"} + per{"{0}/см"} } decimeter{ dnam{"дм"} @@ -1530,19 +1585,19 @@ ky{ dnam{"фут"} one{"{0} фут"} other{"{0} фут"} - per{"ф/{0}"} + per{"{0}/ф"} } inch{ dnam{"дюйм"} one{"{0} дюйм"} other{"{0} дюйм"} - per{"д/{0}"} + per{"{0}/д"} } kilometer{ dnam{"км"} one{"{0} км"} other{"{0} км"} - per{"км/{0}"} + per{"{0}/км"} } light-year{ dnam{"жарык жыл"} @@ -1553,7 +1608,7 @@ ky{ dnam{"метр"} one{"{0} м"} other{"{0} м"} - per{"м/{0}"} + per{"{0}/м"} } micrometer{ dnam{"µметр"} @@ -1588,7 +1643,7 @@ ky{ parsec{ dnam{"парсек"} one{"{0} пк"} - other{"{0} пк"} + other{"{0} пс"} } picometer{ dnam{"пм"} @@ -1639,6 +1694,11 @@ ky{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"грэйн"} + one{"{0} грэйн"} + other{"{0} грэйн"} + } gram{ dnam{"грамм"} one{"{0} гр"} @@ -1646,10 +1706,10 @@ ky{ per{"гр/{0}"} } kilogram{ - dnam{"килограмм"} + dnam{"кг"} one{"{0} кг"} other{"{0} кг"} - per{"кг/{0}"} + per{"{0}/кг"} } metric-ton{ dnam{"т"} @@ -1689,9 +1749,9 @@ ky{ other{"{0} M☉"} } ton{ - dnam{"тонна"} - one{"{0} тон."} - other{"{0} тон."} + dnam{"Америкалык тонна"} + one{"{0} АКШ тон."} + other{"{0} АКШ тон."} } } power{ @@ -1730,7 +1790,7 @@ ky{ atmosphere{ dnam{"атм"} one{"{0} атм"} - other{"{0} атмс"} + other{"{0} атм"} } hectopascal{ dnam{"гПа"} @@ -1835,6 +1895,9 @@ ky{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"бушел"} + } centiliter{ dnam{"сЛ"} one{"{0} сЛ"} @@ -1844,7 +1907,7 @@ ky{ dnam{"см³"} one{"{0} см³"} other{"{0} см³"} - per{"см³/{0}"} + per{"{0}/см³"} } cubic-foot{ dnam{"фут³"} @@ -1865,7 +1928,7 @@ ky{ dnam{"м³"} one{"{0} м³"} other{"{0} м³"} - per{"м³/{0}"} + per{"{0}/м³"} } cubic-mile{ dnam{"мил³"} @@ -1892,6 +1955,14 @@ ky{ one{"{0} дл"} other{"{0} дл"} } + dram{ + dnam{"драм суюктук"} + } + drop{ + dnam{"дроп"} + one{"{0} дроп"} + other{"{0} дроп"} + } fluid-ounce{ dnam{"с. унц."} one{"{0} с. унц."} @@ -1906,7 +1977,7 @@ ky{ dnam{"гал"} one{"{0} гал"} other{"{0} гал"} - per{"гал/{0}"} + per{"{0}/АКШ гал"} } gallon-imperial{ dnam{"англ. гал"} @@ -1919,11 +1990,16 @@ ky{ one{"{0} гл"} other{"{0} гл"} } + jigger{ + dnam{"жиггер"} + one{"{0} жиггер"} + other{"{0} жиггер"} + } liter{ dnam{"литр"} one{"{0} л"} other{"{0} л"} - per{"л/{0}"} + per{"{0}/л"} } megaliter{ dnam{"мгл"} @@ -1935,6 +2011,11 @@ ky{ one{"{0} мл"} other{"{0} мл"} } + pinch{ + dnam{"пинч"} + one{"{0} пинч"} + other{"{0} пинч"} + } pint{ dnam{"пт"} one{"{0} пт"} diff --git a/intl/icu/source/data/unit/lag.txt b/intl/icu/source/data/unit/lag.txt index c34bb7fb1c78..b382d6ddf32e 100644 --- a/intl/icu/source/data/unit/lag.txt +++ b/intl/icu/source/data/unit/lag.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lag{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/lb.txt b/intl/icu/source/data/unit/lb.txt index d602b3fc836e..3143f4a796f6 100644 --- a/intl/icu/source/data/unit/lb.txt +++ b/intl/icu/source/data/unit/lb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/lg.txt b/intl/icu/source/data/unit/lg.txt index 0f448ef91717..d511f9e793fb 100644 --- a/intl/icu/source/data/unit/lg.txt +++ b/intl/icu/source/data/unit/lg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lg{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/lkt.txt b/intl/icu/source/data/unit/lkt.txt index 4e123b50f3f3..4a5ccaeff224 100644 --- a/intl/icu/source/data/unit/lkt.txt +++ b/intl/icu/source/data/unit/lkt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lkt{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/ln.txt b/intl/icu/source/data/unit/ln.txt index 5d72bdea1816..fbb6e928b87b 100644 --- a/intl/icu/source/data/unit/ln.txt +++ b/intl/icu/source/data/unit/ln.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/lo.txt b/intl/icu/source/data/unit/lo.txt index 7fdd44aa0567..06d0c6f24175 100644 --- a/intl/icu/source/data/unit/lo.txt +++ b/intl/icu/source/data/unit/lo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -14,8 +14,8 @@ lo{ other{"{0} ແຮງຕົກຕາມລຳພັງ"} } meter-per-square-second{ - dnam{"m/s²"} - other{"{0} m/s²"} + dnam{"ແມັດຕໍ່ວິນາທີກໍາລັງສອງ"} + other{"{0} ແມັດຕໍ່ວິນາທີກໍາລັງສອງ"} } } angle{ @@ -332,6 +332,12 @@ lo{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"ດັອດ"} + other{"{0} ດັອດ"} + } + } length{ astronomical-unit{ dnam{"astronomical units"} @@ -346,6 +352,10 @@ lo{ dnam{"ເດຊີແມັດ"} other{"{0} ເດຊີແມັດ"} } + fathom{ + dnam{"ftm"} + other{"{0} ftm"} + } foot{ dnam{"ຟຸດ"} other{"{0} ຟຸດ"} @@ -416,6 +426,14 @@ lo{ } } light{ + candela{ + dnam{"ແຄນເດລາ"} + other{"{0} ແຄນເດລາ"} + } + lumen{ + dnam{"ລູເມນ"} + other{"{0} ລູເມນ"} + } lux{ dnam{"lux"} other{"{0} lux"} @@ -438,6 +456,10 @@ lo{ dnam{"ມວນ​ສານ​ໜ່ວຍ​ໂລກ"} other{"{0} ມວນ​ສານ​ໜ່ວຍ​ໂລກ"} } + grain{ + dnam{"ເກຣນ"} + other{"{0} ເກຣນ"} + } gram{ dnam{"ກຣາມ"} other{"{0} ກຣາມ"} @@ -457,8 +479,8 @@ lo{ other{"{0} µg"} } milligram{ - dnam{"mg"} - other{"{0} mg"} + dnam{"ມິນລີກຣາມ"} + other{"{0} ມິນລີກຣາມ"} } ounce{ dnam{"ອອນສ"} @@ -478,6 +500,10 @@ lo{ dnam{"ມວນ​ສານດວງ​ຕາ​ເວັນ"} other{"{0} ມວນ​ສານດວງ​ຕາ​ເວັນ"} } + stone{ + dnam{"stones"} + other{"{0} stones"} + } ton{ dnam{"ໂຕນ"} other{"{0} ໂຕນ"} @@ -519,8 +545,8 @@ lo{ other{"{0} hectopascals"} } inch-ofhg{ - dnam{"in Hg"} - other{"{0} inches of mercury"} + dnam{"ນິ້ວໃນບາຫຼອດ"} + other{"{0} ນິ້ວໃນບາຫຼອດ"} } kilopascal{ dnam{"ກິ​ໂລ​ປາ​ສ​ການ"} @@ -535,12 +561,12 @@ lo{ other{"{0} ມິນລິບາ"} } millimeter-ofhg{ - dnam{"mm Hg"} - other{"{0} mm Hg"} + dnam{"ມິນລີແມັດໃນບາຫຼອດ"} + other{"{0} ມິນລີແມັດໃນບາຫຼອດ"} } pound-force-per-square-inch{ - dnam{"pounds per square inch"} - other{"{0} pounds per square inch"} + dnam{"ປອນຕໍ່ຕະລາງນິ້້ວ"} + other{"{0} ປອນຕໍ່ຕະລາງນິ້້ວ"} } } speed{ @@ -644,6 +670,14 @@ lo{ dnam{"dL"} other{"{0} dL"} } + dram{ + dnam{"ແດຣມ"} + other{"{0} ແດຣມ"} + } + drop{ + dnam{"ຢອດ"} + other{"{0} ຢອດ"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} @@ -675,6 +709,10 @@ lo{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"ຢິບ"} + other{"{0} ຢິບ"} + } pint{ dnam{"pt"} other{"{0} pt"} @@ -911,8 +949,8 @@ lo{ other{"{0} G"} } meter-per-square-second{ - dnam{"m/s²"} - other{"{0} m/s²"} + dnam{"ແມັດ/ວິນາທີ²"} + other{"{0} ມ/ວນທ²"} } } angle{ @@ -1203,6 +1241,12 @@ lo{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"ດັອດ"} + other{"{0} ດັອດ"} + } + } length{ astronomical-unit{ dnam{"au"} @@ -1217,6 +1261,10 @@ lo{ dnam{"ດມ"} other{"{0} ດມ"} } + fathom{ + dnam{"ftm"} + other{"{0} ftm"} + } foot{ dnam{"ຟຸດ"} other{"{0} ຟ"} @@ -1293,6 +1341,10 @@ lo{ dnam{"CD"} other{"{0} CD"} } + grain{ + dnam{"gr"} + other{"{0} gr"} + } gram{ dnam{"ກຣາມ"} other{"{0} ກຼ"} @@ -1473,6 +1525,14 @@ lo{ dnam{"dL"} other{"{0} dL"} } + dram{ + dnam{"dr fl"} + other{"{0} dr fl"} + } + drop{ + dnam{"ຢອດ"} + other{"{0} ຢອດ"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} @@ -1504,6 +1564,10 @@ lo{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"ຢິບ"} + other{"{0} ຢິບ"} + } pint{ dnam{"pt"} other{"{0} pt"} diff --git a/intl/icu/source/data/unit/lrc.txt b/intl/icu/source/data/unit/lrc.txt index 0dadb3d3d9f2..45cb518913ac 100644 --- a/intl/icu/source/data/unit/lrc.txt +++ b/intl/icu/source/data/unit/lrc.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/lt.txt b/intl/icu/source/data/unit/lt.txt index 2c08fc102fdc..9bcdab428c47 100644 --- a/intl/icu/source/data/unit/lt.txt +++ b/intl/icu/source/data/unit/lt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt{ - Version{"37"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} @@ -539,6 +539,13 @@ lt{ } } graphics{ + dot{ + dnam{"taškas"} + few{"{0} taškai"} + many{"{0} taško"} + one{"{0} taškas"} + other{"{0} taškų"} + } dot-per-centimeter{ dnam{"taškai centimetre"} few{"{0} taškai centimetre"} @@ -608,6 +615,13 @@ lt{ one{"{0} decimetras"} other{"{0} decimetrų"} } + earth-radius{ + dnam{"žemės spindulys"} + few{"{0} R⊕"} + many{"{0} R⊕"} + one{"{0} žemės spindulys"} + other{"{0} žemės spindulių"} + } fathom{ dnam{"fadomai"} few{"{0} fadomai"} @@ -736,6 +750,20 @@ lt{ } } light{ + candela{ + dnam{"kandela"} + few{"{0} cd"} + many{"{0} cd"} + one{"{0} kandela"} + other{"{0} kandelų"} + } + lumen{ + dnam{"liumenas"} + few{"{0} lm"} + many{"{0} lm"} + one{"{0} liumenas"} + other{"{0} liumenų"} + } lux{ dnam{"liuksai"} few{"{0} liuksai"} @@ -765,6 +793,13 @@ lt{ earth-mass{ dnam{"žemės masė"} } + grain{ + dnam{"grūdas"} + few{"{0} grūdai"} + many{"{0} grūdo"} + one{"{0} grūdas"} + other{"{0} grūdų"} + } gram{ dnam{"gramai"} few{"{0} gramai"} @@ -1132,6 +1167,34 @@ lt{ one{"{0} decilitras"} other{"{0} decilitrų"} } + dessert-spoon{ + dnam{"desertinis šaukštelis"} + few{"{0} desertiniai šaukšteliai"} + many{"{0} desertinio šaukštelio"} + one{"{0} desertinis šaukštelis"} + other{"{0} desertinių šaukštelių"} + } + dessert-spoon-imperial{ + dnam{"imp. desertinis šaukštelis"} + few{"{0} imp. desertiniai šaukšteliai"} + many{"{0} imp. desertinio šaukštelio"} + one{"{0} imp. desertinis šaukštelis"} + other{"{0} imp. desertinių šaukštelių"} + } + dram{ + dnam{"skysčio drachma"} + few{"{0} skysčio drachmos"} + many{"{0} skysčio drachmos"} + one{"{0} skysčio drachma"} + other{"{0} skysčio drachmų"} + } + drop{ + dnam{"lašas"} + few{"{0} lašai"} + many{"{0} lašo"} + one{"{0} lašas"} + other{"{0} lašų"} + } fluid-ounce{ dnam{"skysčio uncijos"} few{"{0} skysčio uncijos"} @@ -1169,6 +1232,13 @@ lt{ one{"{0} hektolitras"} other{"{0} hektolitrų"} } + jigger{ + dnam{"džigeris"} + few{"{0} džigeriai"} + many{"{0} džigerio"} + one{"{0} džigeris"} + other{"{0} džigerio"} + } liter{ dnam{"litrai"} few{"{0} litrai"} @@ -1191,6 +1261,13 @@ lt{ one{"{0} mililitras"} other{"{0} mililitrų"} } + pinch{ + dnam{"žiupsnelis"} + few{"{0} žiupsneliai"} + many{"{0} žiupsnelio"} + one{"{0} žiupsnelių"} + other{"{0} žiupsnelis"} + } pint{ dnam{"pintos"} few{"{0} pintos"} @@ -1212,6 +1289,13 @@ lt{ one{"{0} kvorta"} other{"{0} kvortų"} } + quart-imperial{ + dnam{"imp. kvorta"} + few{"{0} imp. kvortos"} + many{"{0} imp. kvortos"} + one{"{0} imp. kvorta"} + other{"{0} imp. kvortų"} + } tablespoon{ dnam{"valgomieji šaukštai"} few{"{0} valgomieji šaukštai"} @@ -2231,6 +2315,13 @@ lt{ } } graphics{ + dot{ + dnam{"tšk."} + few{"{0} tšk."} + many{"{0} tšk."} + one{"{0} tšk."} + other{"{0} tšk."} + } dot-per-centimeter{ dnam{"taškai centimetre"} few{"{0} tšk./cm"} @@ -2292,6 +2383,13 @@ lt{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + few{"{0} R⊕"} + many{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } fathom{ dnam{"fth"} few{"{0} fth"} @@ -2417,6 +2515,20 @@ lt{ } } light{ + candela{ + dnam{"cd"} + few{"{0} cd"} + many{"{0} cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + few{"{0} lm"} + many{"{0} lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lx"} few{"{0} lx"} @@ -2433,6 +2545,13 @@ lt{ one{"{0} ct"} other{"{0} ct"} } + grain{ + dnam{"grūdas"} + few{"{0} grūdai"} + many{"{0} grūdo"} + one{"{0} grūdas"} + other{"{0} grūdų"} + } gram{ dnam{"g"} few{"{0} g"} @@ -2769,6 +2888,34 @@ lt{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"des. š."} + few{"{0} des. š."} + many{"{0} des. š."} + one{"{0} des. š."} + other{"{0} des. š."} + } + dessert-spoon-imperial{ + dnam{"imp. des. š."} + few{"{0} imp. des. š."} + many{"{0} imp. des. š."} + one{"{0} imp. des. š."} + other{"{0} imp. des. š."} + } + dram{ + dnam{"sk. drach."} + few{"{0} sk. drach."} + many{"{0} sk. drach."} + one{"{0} sk. drach."} + other{"{0} sk. drach."} + } + drop{ + dnam{"laš."} + few{"{0} laš."} + many{"{0} laš."} + one{"{0} laš."} + other{"{0} laš."} + } fluid-ounce{ dnam{"skysčio oz"} few{"{0} skysčio oz"} @@ -2806,6 +2953,13 @@ lt{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"džigeris"} + few{"{0} džigeriai"} + many{"{0} džigerio"} + one{"{0} džigeris"} + other{"{0} džigerio"} + } liter{ dnam{"litrai"} few{"{0} l"} @@ -2828,6 +2982,13 @@ lt{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"žiupsn."} + few{"{0} žiupsn."} + many{"{0} žiupsn."} + one{"{0} žiupsn."} + other{"{0} žiupsn."} + } pint{ dnam{"pintos"} few{"{0} pt"} @@ -2849,6 +3010,13 @@ lt{ one{"{0} kvorta"} other{"{0} kvortų"} } + quart-imperial{ + dnam{"imp. kv."} + few{"{0} imp. kv."} + many{"{0} imp. kv."} + one{"{0} imp. kv."} + other{"{0} imp. kv."} + } tablespoon{ dnam{"v. š."} few{"{0} v. š."} diff --git a/intl/icu/source/data/unit/lu.txt b/intl/icu/source/data/unit/lu.txt index abe800139f7a..593232707c04 100644 --- a/intl/icu/source/data/unit/lu.txt +++ b/intl/icu/source/data/unit/lu.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lu{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/luo.txt b/intl/icu/source/data/unit/luo.txt index 4a1add62ec6d..47bd822be0cc 100644 --- a/intl/icu/source/data/unit/luo.txt +++ b/intl/icu/source/data/unit/luo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luo{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/luy.txt b/intl/icu/source/data/unit/luy.txt index a1e374c07371..b3fda2108d53 100644 --- a/intl/icu/source/data/unit/luy.txt +++ b/intl/icu/source/data/unit/luy.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luy{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/lv.txt b/intl/icu/source/data/unit/lv.txt index 974b2cfd18c7..fed680b0c45b 100644 --- a/intl/icu/source/data/unit/lv.txt +++ b/intl/icu/source/data/unit/lv.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -16,10 +16,10 @@ lv{ zero{"{0} smagumspēku"} } meter-per-square-second{ - dnam{"metri kvadrātsekundē"} - one{"{0} metrs kvadrātsekundē"} - other{"{0} metri kvadrātsekundē"} - zero{"{0} metru kvadrātsekundē"} + dnam{"metri sekundē kvadrātā"} + one{"{0} metrs sekundē kvadrātā"} + other{"{0} metri sekundē kvadrātā"} + zero{"{0} metru sekundē kvadrātā"} } } angle{ @@ -478,6 +478,9 @@ lv{ } } graphics{ + dot{ + dnam{"punkts"} + } dot-per-centimeter{ dnam{"punkti centimetrā"} one{"{0} punkts centimetrā"} @@ -535,6 +538,12 @@ lv{ other{"{0} decimetri"} zero{"{0} decimetru"} } + earth-radius{ + dnam{"Zemes rādiuss"} + one{"{0} Zemes rādiuss"} + other{"{0} Zemes rādiuss"} + zero{"{0} R⊕"} + } fathom{ dnam{"fatomi"} one{"{0} fatoms"} @@ -649,6 +658,18 @@ lv{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandelas"} + zero{"{0} kandelu"} + } + lumen{ + dnam{"lūmens"} + one{"{0} lūmens"} + other{"{0} lūmeni"} + zero{"{0} lūmenu"} + } lux{ dnam{"lukss"} one{"{0} lukss"} @@ -681,6 +702,12 @@ lv{ other{"{0} Zemes masas"} zero{"{0} M⊕"} } + grain{ + dnam{"grans"} + one{"{0} grans"} + other{"{0} grana"} + zero{"{0} granu"} + } gram{ dnam{"grami"} one{"{0} grams"} @@ -920,7 +947,7 @@ lv{ } volume{ acre-foot{ - dnam{"akrpēdas"} + dnam{"akrpēda"} one{"{0} akrpēda"} other{"{0} akrpēdas"} zero{"{0} akrpēdu"} @@ -931,6 +958,12 @@ lv{ other{"{0} bareli"} zero{"{0} bbl"} } + bushel{ + dnam{"bušelis"} + one{"{0} bušelis"} + other{"{0} bušeļi"} + zero{"{0} bušeļu"} + } centiliter{ dnam{"centilitri"} one{"{0} centilitrs"} @@ -999,6 +1032,30 @@ lv{ other{"{0} decilitri"} zero{"{0} decilitru"} } + dessert-spoon{ + dnam{"deserta karote"} + one{"{0} deserta karote"} + other{"{0} deserta karotes"} + zero{"{0} deserta karošu"} + } + dessert-spoon-imperial{ + dnam{"britu deserta karote"} + one{"{0} britu deserta karote"} + other{"{0} britu deserta karotes"} + zero{"{0} britu deserta karošu"} + } + dram{ + dnam{"šķidruma drahma"} + one{"{0} šķidruma drahma"} + other{"{0} šķidruma drahmas"} + zero{"{0} šķidruma drahmu"} + } + drop{ + dnam{"piliens"} + one{"{0} piliens"} + other{"{0} pilieni"} + zero{"{0} pilienu"} + } fluid-ounce{ dnam{"šķidruma unces"} one{"{0} šķidruma unce"} @@ -1031,6 +1088,12 @@ lv{ other{"{0} hektolitri"} zero{"{0} hektolitru"} } + jigger{ + dnam{"mērglāzīte"} + one{"{0} mērglāzīte"} + other{"{0} mērglāzītes"} + zero{"{0} mērglāzīšu"} + } liter{ dnam{"litri"} one{"{0} litrs"} @@ -1050,6 +1113,12 @@ lv{ other{"{0} mililitri"} zero{"{0} mililitru"} } + pinch{ + dnam{"šķipsniņa"} + one{"{0} šķipsniņa"} + other{"{0} šķipsniņas"} + zero{"{0} šķipsniņu"} + } pint{ dnam{"pintes"} one{"{0} pinte"} @@ -1068,6 +1137,12 @@ lv{ other{"{0} kvartas"} zero{"{0} kvartu"} } + quart-imperial{ + dnam{"britu kvarta"} + one{"{0} britu kvarta"} + other{"{0} britu kvartas"} + zero{"{0} britu kvartu"} + } tablespoon{ dnam{"ēdamkarotes"} one{"{0} ēdamkarote"} @@ -1405,7 +1480,7 @@ lv{ dnam{"km/h"} one{"{0} km/h"} other{"{0} km/h"} - zero{"{0}km/h"} + zero{"{0} km/h"} } knot{ dnam{"mezgls"} @@ -1451,9 +1526,6 @@ lv{ } liter{ dnam{"l"} - one{"{0} l"} - other{"{0} l"} - zero{"{0}l"} } } } @@ -1466,7 +1538,7 @@ lv{ zero{"{0} G"} } meter-per-square-second{ - dnam{"metri kvadrātsekundē"} + dnam{"metri sekundē kvadrātā"} one{"{0} m/s²"} other{"{0} m/s²"} zero{"{0} m/s²"} @@ -1587,10 +1659,10 @@ lv{ zero{"{0} mg/dl"} } millimole-per-liter{ - dnam{"mmol/L"} - one{"{0} mmol/L"} - other{"{0} mmol/L"} - zero{"{0} mmol/L"} + dnam{"mmol/l"} + one{"{0} mmol/l"} + other{"{0} mmol/l"} + zero{"{0} mmol/l"} } mole{ dnam{"mols"} @@ -1920,6 +1992,12 @@ lv{ } } graphics{ + dot{ + dnam{"punkts"} + one{"{0} p."} + other{"{0} p."} + zero{"{0} p."} + } dot-per-centimeter{ dnam{"dpc"} one{"{0} dpc"} @@ -2060,6 +2138,12 @@ lv{ } } light{ + candela{ + dnam{"kandela"} + } + lumen{ + dnam{"lūmens"} + } lux{ dnam{"lukss"} one{"{0} lx"} @@ -2092,6 +2176,12 @@ lv{ other{"{0} M⊕"} zero{"{0} M⊕"} } + grain{ + dnam{"gr."} + one{"{0} gr."} + other{"{0} gr."} + zero{"{0} gr."} + } gram{ dnam{"grami"} one{"{0} g"} @@ -2310,7 +2400,7 @@ lv{ dnam{"mārciņpēda"} one{"{0} mārc. pēda"} other{"{0} mārc. pēdas"} - zero{"{0} mārc. pēdas"} + zero{"{0} mārc. pēdu"} } } volume{ @@ -2383,10 +2473,10 @@ lv{ zero{"{0} gl."} } cup-metric{ - dnam{"metr.gl."} - one{"{0} metr.gl."} - other{"{0} metr.gl."} - zero{"{0} metr.gl."} + dnam{"metr. gl."} + one{"{0} metr. gl."} + other{"{0} metr. gl."} + zero{"{0} metr. gl."} } deciliter{ dnam{"dl"} @@ -2394,6 +2484,30 @@ lv{ other{"{0} dl"} zero{"{0} dl"} } + dessert-spoon{ + dnam{"des. kar."} + one{"{0} des. kar."} + other{"{0} des. kar."} + zero{"{0} des. kar."} + } + dessert-spoon-imperial{ + dnam{"britu des. kar."} + one{"{0} britu des. kar."} + other{"{0} britu des. kar."} + zero{"{0} britu des. kar."} + } + dram{ + dnam{"šķidruma drahma"} + one{"{0} šķ. drahma"} + other{"{0} šķ. drahmas"} + zero{"{0} šķi. drahmu"} + } + drop{ + dnam{"pil."} + one{"{0} pil."} + other{"{0} pil."} + zero{"{0} pil."} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2426,6 +2540,12 @@ lv{ other{"{0} hl"} zero{"{0} hl"} } + jigger{ + dnam{"mērglāzīte"} + one{"{0} mērgl."} + other{"{0} mērgl."} + zero{"{0} mērgl."} + } liter{ dnam{"l"} one{"{0} l"} @@ -2445,6 +2565,12 @@ lv{ other{"{0} ml"} zero{"{0} ml"} } + pinch{ + dnam{"šķips."} + one{"{0} šķips."} + other{"{0} šķips."} + zero{"{0} šķips."} + } pint{ dnam{"pintes"} one{"{0} pt"} @@ -2463,6 +2589,12 @@ lv{ other{"{0} qt"} zero{"{0} qt"} } + quart-imperial{ + dnam{"IQT"} + one{"{0} IQT"} + other{"{0} IQT"} + zero{"{0} IQT"} + } tablespoon{ dnam{"ĒK"} one{"{0} ĒK"} diff --git a/intl/icu/source/data/unit/mai.txt b/intl/icu/source/data/unit/mai.txt index fa81ebb95f6e..a5be8d7b3734 100644 --- a/intl/icu/source/data/unit/mai.txt +++ b/intl/icu/source/data/unit/mai.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mai{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mas.txt b/intl/icu/source/data/unit/mas.txt index e679bf522c3b..b1e1c71b2bca 100644 --- a/intl/icu/source/data/unit/mas.txt +++ b/intl/icu/source/data/unit/mas.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mer.txt b/intl/icu/source/data/unit/mer.txt index 9f20f6d4a60a..9092e9a54e92 100644 --- a/intl/icu/source/data/unit/mer.txt +++ b/intl/icu/source/data/unit/mer.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mer{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mfe.txt b/intl/icu/source/data/unit/mfe.txt index a48151104b1d..876eff6d0ab0 100644 --- a/intl/icu/source/data/unit/mfe.txt +++ b/intl/icu/source/data/unit/mfe.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mfe{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mg.txt b/intl/icu/source/data/unit/mg.txt index 95608d1d56b3..178591fc5d20 100644 --- a/intl/icu/source/data/unit/mg.txt +++ b/intl/icu/source/data/unit/mg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mg{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mgh.txt b/intl/icu/source/data/unit/mgh.txt index 315912dc2452..3d1d29cacb6a 100644 --- a/intl/icu/source/data/unit/mgh.txt +++ b/intl/icu/source/data/unit/mgh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgh{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mgo.txt b/intl/icu/source/data/unit/mgo.txt index 0e510c3c0cf5..7a49b6d86021 100644 --- a/intl/icu/source/data/unit/mgo.txt +++ b/intl/icu/source/data/unit/mgo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgo{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/mi.txt b/intl/icu/source/data/unit/mi.txt index 69d14d39efdd..c3879c71e506 100644 --- a/intl/icu/source/data/unit/mi.txt +++ b/intl/icu/source/data/unit/mi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mi{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/mk.txt b/intl/icu/source/data/unit/mk.txt index cbea1b74b13a..0c93989d00f3 100644 --- a/intl/icu/source/data/unit/mk.txt +++ b/intl/icu/source/data/unit/mk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -115,7 +115,7 @@ mk{ other{"{0} карати"} } milligram-per-deciliter{ - dnam{"mg/dL"} + dnam{"милиграм по децилитар"} one{"{0} mg/dL"} other{"{0} mg/dL"} } @@ -181,9 +181,9 @@ mk{ } digital{ bit{ - dnam{"битови"} + dnam{"бита"} one{"{0} бит"} - other{"{0} битови"} + other{"{0} бита"} } byte{ dnam{"бајти"} @@ -191,9 +191,9 @@ mk{ other{"{0} бајти"} } gigabit{ - dnam{"гигабитови"} + dnam{"гигабита"} one{"{0} гигабит"} - other{"{0} гигабитови"} + other{"{0} гигабита"} } gigabyte{ dnam{"гигабајти"} @@ -201,9 +201,9 @@ mk{ other{"{0} гигабајти"} } kilobit{ - dnam{"килобитови"} + dnam{"килобита"} one{"{0} килобит"} - other{"{0} килобитови"} + other{"{0} килобита"} } kilobyte{ dnam{"килобајти"} @@ -211,9 +211,9 @@ mk{ other{"{0} килобајти"} } megabit{ - dnam{"мегабитови"} + dnam{"мегабита"} one{"{0} мегабит"} - other{"{0} мегабитови"} + other{"{0} мегабита"} } megabyte{ dnam{"мегабајти"} @@ -226,9 +226,9 @@ mk{ other{"{0} петабајти"} } terabit{ - dnam{"терабитови"} + dnam{"терабита"} one{"{0} терабит"} - other{"{0} терабитови"} + other{"{0} терабита"} } terabyte{ dnam{"терабајти"} @@ -408,6 +408,13 @@ mk{ other{"{0} мегахерци"} } } + graphics{ + dot{ + dnam{"точка"} + one{"{0} точка"} + other{"{0} точки"} + } + } length{ astronomical-unit{ dnam{"астрономски единици"} @@ -425,6 +432,11 @@ mk{ one{"{0} дециметар"} other{"{0} дециметри"} } + earth-radius{ + dnam{"земјен радиус"} + one{"{0} земјен радиус"} + other{"{0} земјени радиуси"} + } fathom{ dnam{"фатоми"} one{"{0} фатом"} @@ -504,11 +516,6 @@ mk{ one{"{0} пикометар"} other{"{0} пикометри"} } - point{ - dnam{"точки"} - one{"{0} точка"} - other{"{0} точки"} - } solar-radius{ dnam{"сончеви радиуси"} one{"{0} сончев радиус"} @@ -521,6 +528,16 @@ mk{ } } light{ + candela{ + dnam{"кандела"} + one{"{0} кандела"} + other{"{0} кандели"} + } + lumen{ + dnam{"лумен"} + one{"{0} лумен"} + other{"{0} лумени"} + } lux{ dnam{"лукс"} one{"{0} лукс"} @@ -548,6 +565,11 @@ mk{ one{"{0} земјина маса"} other{"{0} земјини маси"} } + grain{ + dnam{"грејн"} + one{"{0} грејн"} + other{"{0} грејни"} + } gram{ dnam{"грама"} one{"{0} грам"} @@ -561,9 +583,9 @@ mk{ per{"{0} на килограм"} } metric-ton{ - dnam{"метрички тони"} - one{"{0} метрички тон"} - other{"{0} метрички тони"} + dnam{"тони"} + one{"{0} тон"} + other{"{0} тони"} } microgram{ dnam{"микрограми"} @@ -603,9 +625,9 @@ mk{ other{"{0} стоуни"} } ton{ - dnam{"тони"} - one{"{0} тон"} - other{"{0} тони"} + dnam{"американски тони"} + one{"{0} американски тон"} + other{"{0} американски тони"} } } power{ @@ -681,6 +703,11 @@ mk{ one{"{0} милиметар жива"} other{"{0} милиметри жива"} } + pascal{ + dnam{"паскали"} + one{"{0} паскал"} + other{"{0} паскали"} + } pound-force-per-square-inch{ dnam{"фунти на квадратен инч"} one{"{0} фунта на квадратен инч"} @@ -745,9 +772,9 @@ mk{ } volume{ acre-foot{ - dnam{"ар-стапка"} - one{"{0} ар-стапка"} - other{"{0} ар-стапки"} + dnam{"акр-стапка"} + one{"{0} акр-стапка"} + other{"{0} акр-стапки"} } barrel{ dnam{"барели"} @@ -816,6 +843,26 @@ mk{ one{"{0} децилитар"} other{"{0} децилитри"} } + dessert-spoon{ + dnam{"лажица за десерт"} + one{"{0} лажица за десерт"} + other{"{0} лажици за десерт"} + } + dessert-spoon-imperial{ + dnam{"имп. лажица за десерт"} + one{"{0} имп. лажица за десерт"} + other{"{0} имп. лажици за десерт"} + } + dram{ + dnam{"драм"} + one{"{0} драм"} + other{"{0} драмови"} + } + drop{ + dnam{"капка"} + one{"{0} капка"} + other{"{0} капки"} + } fluid-ounce{ dnam{"унци течност"} one{"{0} унца течност"} @@ -843,6 +890,11 @@ mk{ one{"{0} хектолитар"} other{"{0} хектолитри"} } + jigger{ + dnam{"џигер"} + one{"{0} џигер"} + other{"{0} џигери"} + } liter{ dnam{"литри"} one{"{0} литар"} @@ -859,6 +911,11 @@ mk{ one{"{0} милилитар"} other{"{0} милилитри"} } + pinch{ + dnam{"прстофат"} + one{"{0} прстофат"} + other{"{0} прстофати"} + } pint{ dnam{"пинти"} one{"{0} пинта"} @@ -874,6 +931,11 @@ mk{ one{"{0} кварт"} other{"{0} кварти"} } + quart-imperial{ + dnam{"имп. четвртина"} + one{"{0} имп. четвртина"} + other{"{0} имп. четвртини"} + } tablespoon{ dnam{"супени лажици"} one{"{0} супена лажица"} @@ -1102,9 +1164,9 @@ mk{ other{"{0} ае"} } centimeter{ - dnam{"см"} - one{"{0} см"} - other{"{0} см"} + dnam{"cm"} + one{"{0}cm"} + other{"{0}cm"} per{"{0}/см"} } decimeter{ @@ -1135,9 +1197,9 @@ mk{ per{"{0}/ин"} } kilometer{ - dnam{"км"} - one{"{0} км"} - other{"{0} км"} + dnam{"km"} + one{"{0}km"} + other{"{0}km"} per{"{0}/км"} } light-year{ @@ -1146,9 +1208,9 @@ mk{ other{"{0} сг"} } meter{ - dnam{"метар"} - one{"{0} м"} - other{"{0} м"} + dnam{"m"} + one{"{0}m"} + other{"{0}m"} per{"{0}/м"} } micrometer{ @@ -1166,9 +1228,9 @@ mk{ other{"{0} сми"} } millimeter{ - dnam{"мм"} - one{"{0} мм"} - other{"{0} мм"} + dnam{"mm"} + one{"{0}mm"} + other{"{0}mm"} } nanometer{ dnam{"нм"} @@ -1210,14 +1272,14 @@ mk{ } gram{ dnam{"грам"} - one{"{0}г"} - other{"{0}г"} + one{"{0}g"} + other{"{0}g"} per{"{0}/г"} } kilogram{ - dnam{"кг"} - one{"{0} кг"} - other{"{0} кг"} + dnam{"kg"} + one{"{0}kg"} + other{"{0}kg"} per{"{0}/кг"} } metric-ton{ @@ -1295,9 +1357,9 @@ mk{ } speed{ kilometer-per-hour{ - dnam{"км/ч"} - one{"{0} к/ч"} - other{"{0} к/ч"} + dnam{"km/hr"} + one{"{0}km/h"} + other{"{0}km/h"} } knot{ dnam{"ја"} @@ -1390,8 +1452,8 @@ mk{ } liter{ dnam{"литар"} - one{"{0} л"} - other{"{0} л"} + one{"{0}L"} + other{"{0}L"} } megaliter{ one{"{0} Мл"} @@ -1428,25 +1490,25 @@ mk{ } meter-per-square-second{ dnam{"метри/сек²"} - one{"{0} м/с²"} - other{"{0} м/с²"} + one{"{0} m/s²"} + other{"{0} m/s²"} } } angle{ arc-minute{ - dnam{"аголни минути"} - one{"{0} аголна мин."} - other{"{0} аголни мин."} + dnam{"arcmins"} + one{"{0} arcmin"} + other{"{0} arcmins"} } arc-second{ - dnam{"аголни секунди"} - one{"{0} аголна сек."} - other{"{0} аголни сек."} + dnam{"arcsecs"} + one{"{0} arcsec"} + other{"{0} arcsecs"} } degree{ dnam{"степени"} - one{"{0} степ."} - other{"{0} степ."} + one{"{0} deg"} + other{"{0} deg"} } radian{ dnam{"радијани"} @@ -1462,29 +1524,29 @@ mk{ area{ acre{ dnam{"акри"} - one{"{0} акр"} - other{"{0} акри"} + one{"{0} ac"} + other{"{0} ac"} } dunam{ dnam{"дунами"} - one{"{0} дунам"} - other{"{0} дунам"} + one{"{0} dunam"} + other{"{0} dunam"} } hectare{ dnam{"хектари"} - one{"{0} хектар"} - other{"{0} хектари"} + one{"{0} ha"} + other{"{0} ha"} } square-centimeter{ - dnam{"см²"} - one{"{0} см²"} - other{"{0} см²"} - per{"{0}/см²"} + dnam{"cm²"} + one{"{0} cm²"} + other{"{0} cm²"} + per{"{0}/cm²"} } square-foot{ dnam{"квадратни стапки"} - one{"{0} кв. стапка"} - other{"{0} кв. ст."} + one{"{0} sq ft"} + other{"{0} sq ft"} } square-inch{ dnam{"in²"} @@ -1493,27 +1555,27 @@ mk{ per{"{0}/in²"} } square-kilometer{ - dnam{"км²"} - one{"{0} км²"} - other{"{0} км²"} + dnam{"km²"} + one{"{0} km²"} + other{"{0} km²"} per{"{0}/km²"} } square-meter{ dnam{"метри²"} - one{"{0} м²"} - other{"{0} м²"} - per{"{0}/м²"} + one{"{0} m²"} + other{"{0} m²"} + per{"{0}/m²"} } square-mile{ dnam{"кв. милји"} - one{"{0} кв. милја"} - other{"{0} кв. милји"} + one{"{0} sq mi"} + other{"{0} sq mi"} per{"{0}/mi²"} } square-yard{ dnam{"јарди²"} - one{"{0} јд²"} - other{"{0} јд²"} + one{"{0} yd²"} + other{"{0} yd²"} } } compound{ @@ -1593,9 +1655,9 @@ mk{ } digital{ bit{ - dnam{"бит"} - one{"{0} бит"} - other{"{0} битови"} + dnam{"bit"} + one{"{0} bit"} + other{"{0} bit"} } byte{ dnam{"бајт"} @@ -1746,9 +1808,9 @@ mk{ other{"{0} Btu"} } calorie{ - dnam{"кал."} - one{"{0} кал."} - other{"{0} кал."} + dnam{"cal"} + one{"{0} cal"} + other{"{0} cal"} } electronvolt{ dnam{"електронволт"} @@ -1756,9 +1818,9 @@ mk{ other{"{0} eV"} } foodcalorie{ - dnam{"Кал."} - one{"{0} кал."} - other{"{0} кал."} + dnam{"Cal"} + one{"{0} Cal"} + other{"{0} Cal"} } joule{ dnam{"џули"} @@ -1821,6 +1883,11 @@ mk{ } } graphics{ + dot{ + dnam{"тчк."} + one{"{0} тчк."} + other{"{0} тчк."} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1859,59 +1926,59 @@ mk{ } length{ astronomical-unit{ - dnam{"ае"} - one{"{0} ае"} - other{"{0} ае"} + dnam{"au"} + one{"{0} au"} + other{"{0} au"} } centimeter{ - dnam{"см"} - one{"{0} см"} - other{"{0} см"} - per{"{0}/см"} + dnam{"cm"} + one{"{0} cm"} + other{"{0} cm"} + per{"{0}/cm"} } decimeter{ - dnam{"дм"} - one{"{0} дм"} - other{"{0} дм"} + dnam{"dm"} + one{"{0} dm"} + other{"{0} dm"} } fathom{ dnam{"фатоми"} - one{"{0} фм"} - other{"{0} фм"} + one{"{0} fth"} + other{"{0} fth"} } foot{ dnam{"стапки"} - one{"{0} ст"} - other{"{0} ст"} - per{"{0}/ст"} + one{"{0} ft"} + other{"{0} ft"} + per{"{0}/ft"} } furlong{ dnam{"фурлонзи"} - one{"{0} фур"} - other{"{0} фур"} + one{"{0} fur"} + other{"{0} fur"} } inch{ dnam{"инчи"} - one{"{0} инч"} - other{"{0} инчи"} - per{"{0}/ин"} + one{"{0} in"} + other{"{0} in"} + per{"{0}/in"} } kilometer{ - dnam{"км"} - one{"{0} км"} - other{"{0} км"} - per{"{0}/км"} + dnam{"km"} + one{"{0} km"} + other{"{0} km"} + per{"{0}/km"} } light-year{ dnam{"свет. год."} - one{"{0} сг"} - other{"{0} сг"} + one{"{0} ly"} + other{"{0} ly"} } meter{ dnam{"метри"} - one{"{0} м"} - other{"{0} м"} - per{"{0}/м"} + one{"{0} m"} + other{"{0} m"} + per{"{0}/m"} } micrometer{ dnam{"µm"} @@ -1920,8 +1987,8 @@ mk{ } mile{ dnam{"милји"} - one{"{0} ми"} - other{"{0} ми"} + one{"{0} mi"} + other{"{0} mi"} } mile-scandinavian{ dnam{"smi"} @@ -1929,29 +1996,29 @@ mk{ other{"{0} smi"} } millimeter{ - dnam{"мм"} - one{"{0} мм"} - other{"{0} мм"} + dnam{"mm"} + one{"{0} mm"} + other{"{0} mm"} } nanometer{ - dnam{"нм"} - one{"{0} нм"} - other{"{0} нм"} + dnam{"nm"} + one{"{0} nm"} + other{"{0} nm"} } nautical-mile{ - dnam{"нми"} - one{"{0} нми"} - other{"{0} нми"} + dnam{"nmi"} + one{"{0} nmi"} + other{"{0} nmi"} } parsec{ dnam{"парсеци"} - one{"{0} пс"} - other{"{0} пс"} + one{"{0} pc"} + other{"{0} pc"} } picometer{ - dnam{"пм"} - one{"{0} пм"} - other{"{0} пм"} + dnam{"pm"} + one{"{0} pm"} + other{"{0} pm"} } point{ dnam{"pt"} @@ -1965,8 +2032,8 @@ mk{ } yard{ dnam{"јарди"} - one{"{0} јард"} - other{"{0} јарди"} + one{"{0} yd"} + other{"{0} yd"} } } light{ @@ -1984,8 +2051,8 @@ mk{ mass{ carat{ dnam{"карати"} - one{"{0} кар."} - other{"{0} кар."} + one{"{0} CD"} + other{"{0} CD"} } dalton{ dnam{"Da"} @@ -1997,22 +2064,27 @@ mk{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"грејн"} + one{"{0} grain"} + other{"{0} grain"} + } gram{ dnam{"грама"} - one{"{0} г"} - other{"{0} г"} - per{"{0}/г"} + one{"{0} g"} + other{"{0} g"} + per{"{0}/g"} } kilogram{ - dnam{"кг"} - one{"{0} кг"} - other{"{0} кг"} - per{"{0}/кг"} + dnam{"kg"} + one{"{0} kg"} + other{"{0} kg"} + per{"{0}/kg"} } metric-ton{ - dnam{"т"} - one{"{0} т"} - other{"{0} т"} + dnam{"t"} + one{"{0} t"} + other{"{0} t"} } microgram{ dnam{"µg"} @@ -2020,14 +2092,14 @@ mk{ other{"{0} µg"} } milligram{ - dnam{"мг"} - one{"{0} мг"} - other{"{0} мг"} + dnam{"mg"} + one{"{0} mg"} + other{"{0} mg"} } ounce{ - dnam{"унци"} - one{"{0} унца"} - other{"{0} унци"} + dnam{"oz"} + one{"{0} oz"} + other{"{0} oz"} per{"{0}/oz"} } ounce-troy{ @@ -2037,8 +2109,8 @@ mk{ } pound{ dnam{"фунти"} - one{"{0} фунта"} - other{"{0} фунти"} + one{"{0} lb"} + other{"{0} lb"} per{"{0}/lb"} } solar-mass{ @@ -2048,13 +2120,13 @@ mk{ } stone{ dnam{"стоуни"} - one{"{0} стоун"} - other{"{0} стоуни"} + one{"{0} st"} + other{"{0} st"} } ton{ - dnam{"тони"} - one{"{0} тн"} - other{"{0} тн"} + dnam{"американски тони"} + one{"{0} tn"} + other{"{0} tn"} } } power{ @@ -2064,9 +2136,9 @@ mk{ other{"{0} GW"} } horsepower{ - dnam{"коњски сили"} - one{"{0} кс"} - other{"{0} кс"} + dnam{"hp"} + one{"{0} hp"} + other{"{0} hp"} } kilowatt{ dnam{"kW"} @@ -2085,20 +2157,20 @@ mk{ } watt{ dnam{"вати"} - one{"{0} ват"} - other{"{0} вати"} + one{"{0} W"} + other{"{0} W"} } } pressure{ atmosphere{ - dnam{"атм"} - one{"{0} атм"} - other{"{0} атм"} + dnam{"atm"} + one{"{0} atm"} + other{"{0} atm"} } bar{ - dnam{"бар"} - one{"{0} бар"} - other{"{0} бари"} + dnam{"bar"} + one{"{0} bar"} + other{"{0} bar"} } hectopascal{ dnam{"hPa"} @@ -2121,9 +2193,9 @@ mk{ other{"{0} MPa"} } millibar{ - dnam{"мбар"} - one{"{0} мбар"} - other{"{0} мб."} + dnam{"mbar"} + one{"{0} mbar"} + other{"{0} mbar"} } millimeter-ofhg{ dnam{"mmHg"} @@ -2144,8 +2216,8 @@ mk{ speed{ kilometer-per-hour{ dnam{"км/час"} - one{"{0} к/ч"} - other{"{0} к/ч"} + one{"{0} km/h"} + other{"{0} km/h"} } knot{ dnam{"kn"} @@ -2154,13 +2226,13 @@ mk{ } meter-per-second{ dnam{"метри/сек"} - one{"{0} м/с"} - other{"{0} м/с"} + one{"{0} m/s"} + other{"{0} m/s"} } mile-per-hour{ dnam{"милји/час"} - one{"{0} ми/ч"} - other{"{0} ми/ч"} + one{"{0} mph"} + other{"{0} mph"} } } temperature{ @@ -2199,9 +2271,9 @@ mk{ } volume{ acre-foot{ - dnam{"ар-ст."} - one{"{0} ар-ст."} - other{"{0} ар-ст."} + dnam{"acre ft"} + one{"{0} ac ft"} + other{"{0} ac ft"} } barrel{ dnam{"bbl"} @@ -2210,8 +2282,8 @@ mk{ } bushel{ dnam{"бушели"} - one{"{0} бу"} - other{"{0} бу"} + one{"{0} bu"} + other{"{0} bu"} } centiliter{ dnam{"cL"} @@ -2219,15 +2291,15 @@ mk{ other{"{0} cL"} } cubic-centimeter{ - dnam{"см³"} - one{"{0} см³"} - other{"{0} см³"} - per{"{0}/см³"} + dnam{"cm³"} + one{"{0} cm³"} + other{"{0} cm³"} + per{"{0}/cm³"} } cubic-foot{ dnam{"стапки³"} - one{"{0} ст³"} - other{"{0} ст³"} + one{"{0} ft³"} + other{"{0} ft³"} } cubic-inch{ dnam{"инчи³"} @@ -2235,30 +2307,30 @@ mk{ other{"{0} in³"} } cubic-kilometer{ - dnam{"км³"} - one{"{0} км³"} - other{"{0} км³"} + dnam{"km³"} + one{"{0} km³"} + other{"{0} km³"} } cubic-meter{ - dnam{"м³"} - one{"{0} м³"} - other{"{0} м³"} - per{"{0}/м³"} + dnam{"m³"} + one{"{0} m³"} + other{"{0} m³"} + per{"{0}/m³"} } cubic-mile{ - dnam{"ми³"} - one{"{0} ми³"} - other{"{0} ми³"} + dnam{"mi³"} + one{"{0} mi³"} + other{"{0} mi³"} } cubic-yard{ dnam{"јарди³"} - one{"{0} јд³"} - other{"{0} јд³"} + one{"{0} yd³"} + other{"{0} yd³"} } cup{ dnam{"чаши"} - one{"{0} ч."} - other{"{0} ч."} + one{"{0} c"} + other{"{0} c"} } cup-metric{ dnam{"mcup"} @@ -2270,6 +2342,22 @@ mk{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + } + dram{ + dnam{"драм течност"} + } + drop{ + dnam{"капка"} + one{"{0} drop"} + other{"{0} drop"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2281,27 +2369,30 @@ mk{ other{"{0} fl oz Imp."} } gallon{ - dnam{"гал"} - one{"{0} гал"} - other{"{0} гал"} - per{"{0}/gal"} + dnam{"gal"} + one{"{0} gal"} + other{"{0} gal"} + per{"{0}/gal US"} } gallon-imperial{ - dnam{"имп. галон"} - one{"{0} имп. галон"} - other{"{0} имп. галони"} - per{"{0}/имп. галон"} + dnam{"Imp. gal"} + one{"{0} gal Imp."} + other{"{0} gal Imp."} + per{"{0}/gal Imp."} } hectoliter{ dnam{"hL"} one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"џигер"} + } liter{ dnam{"литри"} - one{"{0} л"} - other{"{0} л"} - per{"{0}/л"} + one{"{0} L"} + other{"{0} L"} + per{"{0}/L"} } megaliter{ dnam{"ML"} diff --git a/intl/icu/source/data/unit/ml.txt b/intl/icu/source/data/unit/ml.txt index a19f32039409..749a4dfd7d7b 100644 --- a/intl/icu/source/data/unit/ml.txt +++ b/intl/icu/source/data/unit/ml.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ml{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -534,6 +534,10 @@ ml{ one{"{0} ഭൂപിണ്ഡം"} other{"{0} ഭൂപിണ്ഡം"} } + grain{ + one{"{0} gr"} + other{"{0} gr"} + } gram{ dnam{"ഗ്രാം"} one{"{0} ഗ്രാം"} @@ -802,6 +806,11 @@ ml{ one{"{0} ഡെസിലിറ്റർ"} other{"{0} ഡെസിലിറ്റർ"} } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } fluid-ounce{ dnam{"ഫ്ലൂയിഡ് ഔൺസ്"} one{"{0} ഫ്ലൂയിഡ് ഔൺസ്"} @@ -824,6 +833,11 @@ ml{ one{"{0} ഹെക്ടോലിറ്റർ"} other{"{0} ഹെക്ടോലിറ്റർ"} } + jigger{ + dnam{"ജിഗർ"} + one{"{0} ജിഗർ"} + other{"{0} ജിഗർ"} + } liter{ dnam{"ലിറ്റർ"} one{"{0} ലിറ്റർ"} @@ -840,6 +854,11 @@ ml{ one{"{0} മില്ലിലിറ്റർ"} other{"{0} മില്ലിലിറ്റർ"} } + pinch{ + dnam{"നുള്ള്"} + one{"{0} നുള്ള്"} + other{"{0} നുള്ള്"} + } pint{ dnam{"പൈന്റ്"} one{"{0} പൈന്റ്"} @@ -1824,6 +1843,11 @@ ml{ earth-mass{ dnam{"ഭൂപിണ്ഡം"} } + grain{ + dnam{"grain"} + one{"{0} gr"} + other{"{0} gr"} + } gram{ dnam{"ഗ്രാം"} one{"{0} ഗ്രാം"} @@ -2088,6 +2112,11 @@ ml{ one{"{0} ഹെ.ലി."} other{"{0} ഹെ.ലി."} } + jigger{ + dnam{"ജിഗർ"} + one{"{0} ജിഗർ"} + other{"{0} ജിഗർ"} + } liter{ dnam{"ലിറ്റർ"} one{"{0} ലി."} @@ -2104,6 +2133,11 @@ ml{ one{"{0} മി.ലി."} other{"{0} മി.ലി."} } + pinch{ + dnam{"നുള്ള്"} + one{"{0} നുള്ള്"} + other{"{0} നുള്ള്"} + } pint{ dnam{"പൈ."} one{"{0} പൈ."} diff --git a/intl/icu/source/data/unit/mn.txt b/intl/icu/source/data/unit/mn.txt index 9ae20d3c6ed0..8ec3d3fbcc0f 100644 --- a/intl/icu/source/data/unit/mn.txt +++ b/intl/icu/source/data/unit/mn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mn{ - Version{"37"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} @@ -408,6 +408,11 @@ mn{ } } graphics{ + dot{ + dnam{"цэг"} + one{"{0} цэг"} + other{"{0} цэг"} + } dot-per-centimeter{ dnam{"цэг/см"} one{"{0} цэг/см"} @@ -441,12 +446,27 @@ mn{ one{"{0} дециметр"} other{"{0} дециметр"} } + earth-radius{ + dnam{"дэлхийн радиус"} + one{"{0} дэлхийн радиус"} + other{"{0} дэлхийн радиус"} + } + fathom{ + dnam{"фатом"} + one{"{0} фатом"} + other{"{0} фатом"} + } foot{ dnam{"фут"} one{"{0} фут"} other{"{0} фут"} per{"{0}/фут"} } + furlong{ + dnam{"фурлонг"} + one{"{0} фурлонг"} + other{"{0} фурлонг"} + } inch{ dnam{"инч"} one{"{0} инч"} @@ -527,6 +547,16 @@ mn{ } } light{ + candela{ + dnam{"кандел"} + one{"{0} кандел"} + other{"{0} кандел"} + } + lumen{ + dnam{"люмен"} + one{"{0} люмен"} + other{"{0} люмен"} + } lux{ dnam{"люкс"} one{"{0} люкс"} @@ -554,6 +584,11 @@ mn{ one{"{0} Дэлхийн масс"} other{"{0} Дэлхийн масс"} } + grain{ + dnam{"үр"} + one{"{0} үр"} + other{"{0} үр"} + } gram{ dnam{"грамм"} one{"{0} грамм"} @@ -603,6 +638,11 @@ mn{ one{"{0} нарны масс"} other{"{0} нарны масс"} } + stone{ + dnam{"чулуу"} + one{"{0} чулуу"} + other{"{0} чулуу"} + } ton{ dnam{"америк тонн"} one{"{0} америк тонн"} @@ -815,6 +855,26 @@ mn{ one{"{0} децилитр"} other{"{0} децилитр"} } + dessert-spoon{ + dnam{"амттаны халбага"} + one{"{0} амттаны халбага"} + other{"{0} амттаны халбага"} + } + dessert-spoon-imperial{ + dnam{"Том амттаны халбага"} + one{"{0} том амттаны халбага"} + other{"{0} том амттаны халбага"} + } + dram{ + dnam{"драм"} + one{"{0} драм"} + other{"{0} драм"} + } + drop{ + dnam{"дусал"} + one{"{0} дусал"} + other{"{0} дусал"} + } fluid-ounce{ dnam{"шингэн унц"} one{"{0} шингэн унц"} @@ -842,6 +902,11 @@ mn{ one{"{0} хектолитр"} other{"{0} хектолитр"} } + jigger{ + dnam{"джиггер"} + one{"{0} джиггер"} + other{"{0} джиггер"} + } liter{ dnam{"литр"} one{"{0} литр"} @@ -858,6 +923,11 @@ mn{ one{"{0} миллилитр"} other{"{0} миллилитр"} } + pinch{ + dnam{"чимх"} + one{"{0} чимх"} + other{"{0} чимх"} + } pint{ dnam{"пинт"} one{"{0} пинт"} @@ -873,6 +943,11 @@ mn{ one{"{0} кварц"} other{"{0} кварц"} } + quart-imperial{ + dnam{"Том куарт"} + one{"{0} том куарт"} + other{"{0} том куарт"} + } tablespoon{ dnam{"хоолны халбага"} one{"{0} хоолны халбага"} @@ -1529,6 +1604,11 @@ mn{ } } graphics{ + dot{ + dnam{"цэг"} + one{"{0} цэг"} + other{"{0} цэг"} + } dot-per-centimeter{ dnam{"цэг/см"} one{"{0} цэг/см"} @@ -1552,12 +1632,18 @@ mn{ one{"{0} дм"} other{"{0} дм"} } + fathom{ + dnam{"фатом"} + } foot{ dnam{"фут"} one{"{0} фут"} other{"{0} фут"} per{"{0}/фут"} } + furlong{ + dnam{"фурлонг"} + } inch{ dnam{"инч"} one{"{0} инч"} @@ -1659,6 +1745,11 @@ mn{ earth-mass{ dnam{"Дэлхийн масс"} } + grain{ + dnam{"үр"} + one{"{0} үр"} + other{"{0} үр"} + } gram{ dnam{"грамм"} one{"{0} гр"} @@ -1706,6 +1797,11 @@ mn{ solar-mass{ dnam{"нарны масс"} } + stone{ + dnam{"чулуу"} + one{"{0} ч"} + other{"{0} ч"} + } ton{ dnam{"америк тонн"} one{"{0} ам. тн"} @@ -1842,7 +1938,9 @@ mn{ } torque{ newton-meter{ - dnam{"Н*м"} + dnam{"Н⋅м"} + one{"{0} Н⋅м"} + other{"{0} Н⋅м"} } } volume{ @@ -1913,6 +2011,26 @@ mn{ one{"{0} дл"} other{"{0} дл"} } + dessert-spoon{ + dnam{"амт.х"} + one{"{0} амт.х"} + other{"{0} амт.х"} + } + dessert-spoon-imperial{ + dnam{"том амт.х"} + one{"{0} том амт.х"} + other{"{0} том амт.х"} + } + dram{ + dnam{"драм шингэн"} + one{"{0} драм.ш"} + other{"{0} драм.ш"} + } + drop{ + dnam{"дусал"} + one{"{0} дусал"} + other{"{0} дусал"} + } fluid-ounce{ dnam{"ш.унц"} one{"{0} ш.унц"} @@ -1940,6 +2058,11 @@ mn{ one{"{0} хл"} other{"{0} хл"} } + jigger{ + dnam{"джиггер"} + one{"{0} джиггер"} + other{"{0} джиггер"} + } liter{ dnam{"литр"} one{"{0} л"} @@ -1956,6 +2079,11 @@ mn{ one{"{0} мл"} other{"{0} мл"} } + pinch{ + dnam{"чимх"} + one{"{0} чимх"} + other{"{0} чимх"} + } pint{ dnam{"пинт"} one{"{0} пт"} @@ -1971,6 +2099,11 @@ mn{ one{"{0} крц"} other{"{0} крц"} } + quart-imperial{ + dnam{"том куарт"} + one{"{0} том куарт"} + other{"{0} том куарт"} + } tablespoon{ dnam{"х.х"} one{"{0} х.х"} diff --git a/intl/icu/source/data/unit/mni.txt b/intl/icu/source/data/unit/mni.txt index 765eb1811913..15874e97811c 100644 --- a/intl/icu/source/data/unit/mni.txt +++ b/intl/icu/source/data/unit/mni.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mni_Beng.txt b/intl/icu/source/data/unit/mni_Beng.txt index e861947a77ff..08de0f17e1f1 100644 --- a/intl/icu/source/data/unit/mni_Beng.txt +++ b/intl/icu/source/data/unit/mni_Beng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_Beng{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/mni_Beng_IN.txt b/intl/icu/source/data/unit/mni_Beng_IN.txt index fee698999256..c896779f2ba3 100644 --- a/intl/icu/source/data/unit/mni_Beng_IN.txt +++ b/intl/icu/source/data/unit/mni_Beng_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/mni_IN.txt b/intl/icu/source/data/unit/mni_IN.txt index 00d8c00a15b3..99173b141555 100644 --- a/intl/icu/source/data/unit/mni_IN.txt +++ b/intl/icu/source/data/unit/mni_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_IN{ "%%ALIAS"{"mni_Beng_IN"} } diff --git a/intl/icu/source/data/unit/mo.txt b/intl/icu/source/data/unit/mo.txt index 01049c8f3c89..6ef831378395 100644 --- a/intl/icu/source/data/unit/mo.txt +++ b/intl/icu/source/data/unit/mo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mo{ "%%ALIAS"{"ro"} } diff --git a/intl/icu/source/data/unit/mr.txt b/intl/icu/source/data/unit/mr.txt index eaf19a1093b5..ba5d9154fad9 100644 --- a/intl/icu/source/data/unit/mr.txt +++ b/intl/icu/source/data/unit/mr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mr{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -230,9 +230,9 @@ mr{ other{"{0} टेराबिट"} } terabyte{ - dnam{"टेराबाइट"} + dnam{"टेराबाइट्स"} one{"{0} टेराबाइट"} - other{"{0} टेराबाइट"} + other{"{0} टेराबाइट्स"} } } duration{ @@ -403,6 +403,11 @@ mr{ } } graphics{ + dot{ + dnam{"टिंब"} + one{"{0}टिंब"} + other{"{0}टिंब"} + } dot-per-centimeter{ dnam{"प्रति सेंटीमीटर बिंदू"} one{"{0} प्रति सेंटीमीटर बिंदू"} @@ -456,12 +461,27 @@ mr{ one{"{0} डेसीमीटर"} other{"{0} डेसीमीटर"} } + earth-radius{ + dnam{"पृथ्वी त्रिज्या"} + one{"{0} पृथ्वी त्रिज्या"} + other{"{0} पृथ्वी त्रिज्या"} + } + fathom{ + dnam{"फॅदम"} + one{"{0} फॅदम"} + other{"{0} फॅदम"} + } foot{ dnam{"फूट"} one{"{0} फूट"} other{"{0} फूट"} per{"{0} दर फूट"} } + furlong{ + dnam{"फर्लांग"} + one{"{0} फर्लांग"} + other{"{0} फर्लांग"} + } inch{ dnam{"इंच"} one{"{0} इंच"} @@ -542,6 +562,16 @@ mr{ } } light{ + candela{ + dnam{"कँडेला"} + one{"{0} कँडेला"} + other{"{0} कँडेला"} + } + lumen{ + dnam{"लुमेन"} + one{"{0} लुमेन"} + other{"{0} लुमेन"} + } lux{ dnam{"लक्स"} one{"{0} लक्स"} @@ -569,6 +599,11 @@ mr{ one{"{0} पृथ्वी द्रव्यमान"} other{"{0} पृथ्वी द्रव्यमान"} } + grain{ + dnam{"अल्पांश"} + one{"{0} अल्पांश"} + other{"{0} अल्पांश"} + } gram{ dnam{"ग्रॅम"} one{"{0} ग्रॅम"} @@ -667,6 +702,10 @@ mr{ one{"{0} वातावरण"} other{"{0} वातावरण"} } + bar{ + one{"{0} बार"} + other{"{0} बार"} + } hectopascal{ dnam{"हेक्टोपास्कल"} one{"{0} हेक्टोपास्कल"} @@ -697,6 +736,11 @@ mr{ one{"{0} मर्क्यूरी मिलिमीटर"} other{"{0} मर्क्यूरी मिलिमीटर"} } + pascal{ + dnam{"पास्काल"} + one{"{0} पास्काल"} + other{"{0} पास्काल"} + } pound-force-per-square-inch{ dnam{"प्रति चौरस इंच पाउंड"} one{"{0} प्रति चौरस इंच पाउंड"} @@ -770,6 +814,11 @@ mr{ one{"{0} बॅरल"} other{"{0} बॅरल"} } + bushel{ + dnam{"बुशेल"} + one{"{0} बुशेल"} + other{"{0} बुशेल"} + } centiliter{ dnam{"सेंटीलीटर"} one{"{0} सेंटीलीटर"} @@ -827,6 +876,26 @@ mr{ one{"{0} डेसीलीटर"} other{"{0} डेसीलीटर"} } + dessert-spoon{ + dnam{"डेझर्ट स्पून"} + one{"{0} डेझर्ट स्पून"} + other{"{0} डेझर्ट स्पून"} + } + dessert-spoon-imperial{ + dnam{"इंपि. डेझर्ट स्पून"} + one{"{0} इंपि. डेझर्ट स्पून"} + other{"{0} इंपि. डेझर्ट स्पून"} + } + dram{ + dnam{"ड्रॅम"} + one{"{0} ड्रॅम"} + other{"{0} ड्रॅम"} + } + drop{ + dnam{"पात"} + one{"{0} पात"} + other{"{0} पात"} + } fluid-ounce{ dnam{"फ्लूइड औंस"} one{"{0} फ्लूइड औंस"} @@ -854,6 +923,11 @@ mr{ one{"{0} हेक्टोलीटर"} other{"{0} हेक्टोलीटर"} } + jigger{ + dnam{"जिगर"} + one{"{0} जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लीटर"} one{"{0} लीटर"} @@ -870,6 +944,11 @@ mr{ one{"{0} मिलीलीटर"} other{"{0} मिलीलीटर"} } + pinch{ + dnam{"आकुंचन"} + one{"{0} आकुंचन"} + other{"{0} आकुंचन"} + } pint{ dnam{"पिंट"} one{"{0} पिंट"} @@ -885,6 +964,11 @@ mr{ one{"{0} क्वार्ट"} other{"{0} क्वार्ट"} } + quart-imperial{ + dnam{"इंपि. क्वार्ट"} + one{"{0} इंपि. क्वार्ट"} + other{"{0} इंपि. क्वार्ट"} + } tablespoon{ dnam{"टेबलस्पून"} one{"{0} टेबलस्पून"} @@ -1388,7 +1472,7 @@ mr{ other{"{0}‰"} } permillion{ - dnam{"ppm"} + dnam{"भाग/दशलक्ष"} one{"{0} ppm"} other{"{0} ppm"} } @@ -1644,6 +1728,11 @@ mr{ } } graphics{ + dot{ + dnam{"टिंब"} + one{"{0} टिंब"} + other{"{0} टिंब"} + } dot-per-centimeter{ dnam{"प्र सें बिं"} one{"{0} प्र सें बिं"} @@ -1692,12 +1781,25 @@ mr{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + } + fathom{ + dnam{"फॅदम"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"फूट"} one{"{0} फूट"} other{"{0} फूट"} per{"{0}/फूट"} } + furlong{ + dnam{"फर्लांग"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"इंच"} one{"{0} इंच"} @@ -1776,6 +1878,16 @@ mr{ } } light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"लक्स"} one{"{0} lx"} @@ -1799,6 +1911,11 @@ mr{ earth-mass{ dnam{"पृथ्वी द्रव्यमान"} } + grain{ + dnam{"अल्पांश"} + one{"{0} अल्पांश"} + other{"{0} अल्पांश"} + } gram{ dnam{"ग्रॅम"} one{"{0} ग्रॅ"} @@ -1895,6 +2012,11 @@ mr{ one{"{0} atm"} other{"{0} atm"} } + bar{ + dnam{"बार"} + one{"{0} बार"} + other{"{0} बार"} + } hectopascal{ dnam{"hPa"} one{"{0} hPa"} @@ -1977,6 +2099,9 @@ mr{ barrel{ dnam{"बॅरल"} } + bushel{ + dnam{"बुशेल"} + } centiliter{ dnam{"cL"} one{"{0} cL"} @@ -2034,6 +2159,21 @@ mr{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + one{"{0} dstspn Imp"} + other{"{0} dstspn Imp"} + } + drop{ + dnam{"पात"} + one{"{0} पात"} + other{"{0} पात"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2059,6 +2199,11 @@ mr{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"जिगर"} + one{"{0} जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लीटर"} one{"{0} ली"} @@ -2075,6 +2220,11 @@ mr{ one{"{0} मिली"} other{"{0} मिली"} } + pinch{ + dnam{"आकुंचन"} + one{"{0} आकुंचन"} + other{"{0} आकुंचन"} + } pint{ dnam{"पिंट"} one{"{0} pt"} @@ -2090,6 +2240,11 @@ mr{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/ms.txt b/intl/icu/source/data/unit/ms.txt index 9c52e2fc4758..bde82b068a63 100644 --- a/intl/icu/source/data/unit/ms.txt +++ b/intl/icu/source/data/unit/ms.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -372,6 +372,10 @@ ms{ dnam{"desimeter"} other{"{0} desimeter"} } + earth-radius{ + dnam{"radius bumi"} + other{"{0} radius bumi"} + } fathom{ dnam{"fathom"} other{"{0} fathom"} @@ -450,6 +454,14 @@ ms{ } } light{ + candela{ + dnam{"kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} other{"{0} lux"} @@ -514,7 +526,7 @@ ms{ } stone{ dnam{"stone"} - other{"{0} st"} + other{"{0} stone"} } ton{ dnam{"tan"} @@ -565,7 +577,7 @@ ms{ other{"{0} kilopaskal"} } megapascal{ - dnam{"megapascal"} + dnam{"megapaskal"} other{"{0} megapaskal"} } millibar{ @@ -640,6 +652,10 @@ ms{ dnam{"tong"} other{"{0} tong"} } + bushel{ + dnam{"busyel"} + other{"{0} busyel"} + } centiliter{ dnam{"sentiliter"} other{"{0} sentiliter"} @@ -686,6 +702,22 @@ ms{ dnam{"desiliter"} other{"{0} desiliter"} } + dessert-spoon{ + dnam{"sudu desert"} + other{"{0} sudu desert"} + } + dessert-spoon-imperial{ + dnam{"sudu desert Imp."} + other{"{0} sudu desert Imp."} + } + dram{ + dnam{"dram"} + other{"{0} dram"} + } + drop{ + dnam{"titis"} + other{"{0} titis"} + } fluid-ounce{ dnam{"auns cecair"} other{"{0} auns cecair"} @@ -704,6 +736,9 @@ ms{ dnam{"hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"jigger"} + } liter{ dnam{"liter"} other{"{0} liter"} @@ -717,6 +752,10 @@ ms{ dnam{"mililiter"} other{"{0} mililiter"} } + pinch{ + dnam{"cubit"} + other{"{0} cubit"} + } pint{ dnam{"pain"} other{"{0} pain"} @@ -729,6 +768,10 @@ ms{ dnam{"kuart"} other{"{0} kuart"} } + quart-imperial{ + dnam{"kuart Imp."} + other{"{0} kuart Imp."} + } tablespoon{ dnam{"sudu besar"} other{"{0} sudu besar"} @@ -860,7 +903,7 @@ ms{ other{"{0} au"} } centimeter{ - dnam{"sentimeter"} + dnam{"cm"} other{"{0} cm"} per{"{0}/cm"} } @@ -882,11 +925,11 @@ ms{ other{"{0} fur"} } inch{ + dnam{"in"} other{"{0}\u0022"} per{"{0}/in"} } kilometer{ - dnam{"kilometer"} other{"{0} km"} per{"{0}/km"} } @@ -900,6 +943,7 @@ ms{ per{"{0}/m"} } micrometer{ + dnam{"µm"} other{"{0} µm"} } mile{ @@ -916,7 +960,7 @@ ms{ } nanometer{ dnam{"nm"} - other{"{0} nm"} + other{"{0}nm"} } nautical-mile{ dnam{"btn"} @@ -1409,7 +1453,6 @@ ms{ other{"{0} au"} } centimeter{ - dnam{"sentimeter"} other{"{0} cm"} per{"{0}/cm"} } @@ -1436,7 +1479,6 @@ ms{ per{"{0}/in"} } kilometer{ - dnam{"kilometer"} other{"{0} km"} per{"{0}/km"} } @@ -1702,6 +1744,13 @@ ms{ dnam{"dL"} other{"{0} dL"} } + dram{ + dnam{"dram fl"} + } + drop{ + dnam{"titis"} + other{"{0} titis"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} @@ -1733,6 +1782,10 @@ ms{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"cubit"} + other{"{0} cubit"} + } pint{ dnam{"pain"} other{"{0} pt"} diff --git a/intl/icu/source/data/unit/mt.txt b/intl/icu/source/data/unit/mt.txt index a261d974807a..6177fdd914ae 100644 --- a/intl/icu/source/data/unit/mt.txt +++ b/intl/icu/source/data/unit/mt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt{ - Version{"37"} units{ angle{ arc-minute{ diff --git a/intl/icu/source/data/unit/mua.txt b/intl/icu/source/data/unit/mua.txt index 707d8967e3c0..75276ce50a1c 100644 --- a/intl/icu/source/data/unit/mua.txt +++ b/intl/icu/source/data/unit/mua.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mua{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/my.txt b/intl/icu/source/data/unit/my.txt index 694281b28038..52c42db50eca 100644 --- a/intl/icu/source/data/unit/my.txt +++ b/intl/icu/source/data/unit/my.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -336,6 +336,12 @@ my{ other{"{0} မီဂါဟတ်ဇ်"} } } + graphics{ + dot{ + dnam{"အစက်"} + other{"{0} အစက်"} + } + } length{ astronomical-unit{ dnam{"နက်ခတ်တဗဒေယူနဈ"} @@ -350,11 +356,23 @@ my{ dnam{"ဒက်စီမီတာ"} other{"{0} ဒက်စီမီတာ"} } + earth-radius{ + dnam{"ကမ္ဘာ့ အချင်းဝက်"} + other{"{0} ကမ္ဘာ့အချင်းဝက်"} + } + fathom{ + dnam{"ဖန်တမ်"} + other{"{0} ဖန်တမ်"} + } foot{ dnam{"ပေ"} other{"{0} ပေ"} per{"တစ်ပေလျှင် {0}"} } + furlong{ + dnam{"ဖာလုံ"} + other{"{0} ဖာလုံ"} + } inch{ dnam{"လက်မ"} other{"{0} လက်မ"} @@ -420,6 +438,14 @@ my{ } } light{ + candela{ + dnam{"ကန်ဒဲလာ"} + other{"{0} ကန်ဒဲလာ"} + } + lumen{ + dnam{"လူမန်"} + other{"{0} လူမန်"} + } lux{ dnam{"လတ်ခ်"} other{"{0} လတ်ခ်"} @@ -442,6 +468,10 @@ my{ dnam{"ကမ္ဘာ့ဒြပ်ထု"} other{"{0} ကမ္ဘာ့ဒြပ်ထု"} } + grain{ + dnam{"ဂရိန်"} + other{"{0} ဂရိန်"} + } gram{ dnam{"ဂရမ်"} other{"{0} ဂရမ်"} @@ -482,6 +512,10 @@ my{ dnam{"နေရောင်ခြည် ဒြပ်ထု"} other{"{0} နေရောင်ခြည် ဒြပ်ထု"} } + stone{ + dnam{"စတုန်"} + other{"{0} စတုန်"} + } ton{ dnam{"တန်"} other{"{0} တန်"} @@ -519,8 +553,8 @@ my{ other{"{0} ကမ္ဘာ့လေထု"} } bar{ - dnam{"bars"} - other{"{0} bars"} + dnam{"ဘား"} + other{"{0} ဘား"} } hectopascal{ dnam{"ဟက်တိုပါစကယ်"} @@ -606,6 +640,10 @@ my{ dnam{"ဘယ်ရလ်စ်"} other{"{0} ဘယ်ရလ်စ်"} } + bushel{ + dnam{"၈ ဂါလံဝင်ပုံး"} + other{"၈ ဂါလံဝင်ပုံး {0} ပုံး"} + } centiliter{ dnam{"စင်တီလီတာ"} other{"{0} စင်တီလီတာ"} @@ -652,6 +690,22 @@ my{ dnam{"ဒက်စီလီတာ"} other{"{0} ဒက်စီလီတာ"} } + dessert-spoon{ + dnam{"အချိုပွဲဇွန်း"} + other{"အချိုပွဲဇွန်း {0} ဇွန်း"} + } + dessert-spoon-imperial{ + dnam{"ဗြိတိသျှသုံး အချိုပွဲဇွန်း"} + other{"ဗြိတိသျှသုံး အချိုပွဲဇွန်း {0} ဇွန်း"} + } + dram{ + dnam{"ဒရမ်"} + other{"{0} ဒရမ်"} + } + drop{ + dnam{"တစ်စက်"} + other{"{0} စက်"} + } fluid-ounce{ dnam{"အရည်အောင်စ"} other{"{0} အရည်အောင်စ"} @@ -674,6 +728,10 @@ my{ dnam{"ဟက်တိုလီတာ"} other{"{0} ဟက်တိုမီတာ"} } + jigger{ + dnam{"ပက်"} + other{"{0} ပက်"} + } liter{ dnam{"လီတာ"} other{"{0} လီတာ"} @@ -687,6 +745,10 @@ my{ dnam{"မီလီလီတာ"} other{"{0} မီလီလီတာ"} } + pinch{ + dnam{"တစ်ဆိတ်"} + other{"{0} ဆိတ်"} + } pint{ dnam{"ပိုင့်"} other{"{0} ပိုင့်"} @@ -699,6 +761,10 @@ my{ dnam{"ကွတ်"} other{"{0} ကွတ်"} } + quart-imperial{ + dnam{"ဗြိတိသျှသုံး ကွတ်"} + other{"ဗြိတိသျှသုံး {0} ကွတ်"} + } tablespoon{ dnam{"စားပွဲဇွန်း"} other{"စားပွဲဇွန်း {0} ဇွန်း"} @@ -1086,7 +1152,7 @@ my{ other{"{0} MB"} } petabyte{ - dnam{"PB"} + dnam{"ပက်တာဘိုက်"} other{"{0} PB"} } terabit{ @@ -1208,7 +1274,7 @@ my{ } therm-us{ dnam{"ယူအက်စ် သာမယ်လ်"} - other{"{0} ယူအက်စပ် သာမယ်လ်"} + other{"{0} ယူအက်စ်သာမယ်လ်"} } } force{ @@ -1238,6 +1304,12 @@ my{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"အစက်"} + other{"{0} အစက်"} + } + } length{ astronomical-unit{ dnam{"နက်ခတ်တဗဒေယူနဈ"} @@ -1252,11 +1324,23 @@ my{ dnam{"dm"} other{"{0} dm"} } + earth-radius{ + dnam{"ကမ္ဘာ့အချင်းဝက်"} + other{"{0} ကမ္ဘာ့အချင်းဝက်"} + } + fathom{ + dnam{"ဖန်တမ်"} + other{"{0} ဖန်တမ်"} + } foot{ dnam{"ပေ"} other{"{0} ပေ"} per{"{0}/ပေ"} } + furlong{ + dnam{"ဖာလုံ"} + other{"{0} ဖာလုံ"} + } inch{ dnam{"လက်မ"} other{"{0} လက်မ"} @@ -1322,6 +1406,14 @@ my{ } } light{ + candela{ + dnam{"ကန်ဒဲလာ"} + other{"{0} ကန်ဒဲလာ"} + } + lumen{ + dnam{"လူမန်"} + other{"{0} လူမန်"} + } lux{ dnam{"လတ်ခ်"} other{"{0} lx"} @@ -1343,6 +1435,10 @@ my{ dnam{"ကမ္ဘာ့ဒြပ်ထု"} other{"{0} M⊕"} } + grain{ + dnam{"ဂရိန်"} + other{"{0} ဂရိန်"} + } gram{ dnam{"ဂရမ်"} other{"{0} g"} @@ -1383,6 +1479,10 @@ my{ dnam{"နေရောင်ခြည် ဒြပ်ထု"} other{"{0} M☉"} } + stone{ + dnam{"စတုန်"} + other{"{0} စတုန်"} + } ton{ dnam{"တန်"} other{"{0} tn"} @@ -1420,7 +1520,8 @@ my{ other{"{0} atm"} } bar{ - other{"{0} bars"} + dnam{"ဘား"} + other{"{0} ဘား"} } hectopascal{ dnam{"hPa"} @@ -1506,6 +1607,10 @@ my{ dnam{"ဘယ်ရလ်"} other{"{0} bbl"} } + bushel{ + dnam{"၈ ဂါလံဝင်ပုံး"} + other{"၈ ဂါလံဝင်ပုံး {0} ပုံး"} + } centiliter{ dnam{"စင်တီလီတာ"} other{"{0} cL"} @@ -1552,6 +1657,22 @@ my{ dnam{"ဒက်စီလီတာ"} other{"{0} dL"} } + dessert-spoon{ + dnam{"အချိုပွဲဇွန်း"} + other{"အချိုပွဲဇွန်း {0} ဇွန်း"} + } + dessert-spoon-imperial{ + dnam{"ဗြိတိသျှသုံး အချိုပွဲဇွန်း"} + other{"ဗြိတိသျှသုံးအချိုပွဲဇွန်း {0} ဇွန်း"} + } + dram{ + dnam{"ဒရမ်"} + other{"{0} ဒရမ်"} + } + drop{ + dnam{"တစ်စက်"} + other{"{0} စက်"} + } fluid-ounce{ dnam{"အရည်အောင်စ"} other{"{0} fl oz"} @@ -1566,14 +1687,18 @@ my{ per{"{0}/gal US"} } gallon-imperial{ - dnam{"ယူကဂေါလံ"} - other{"{0} ယူကဂေါလံ"} + dnam{"ယူကေ ဂါလံ"} + other{"{0} ယူကေ ဂါလံ"} per{"{0}/gal Imp."} } hectoliter{ dnam{"ဟက်တိုလီတာ"} other{"{0} hL"} } + jigger{ + dnam{"ပက်"} + other{"{0} ပက်"} + } liter{ dnam{"လီတာ"} other{"{0} လီတာ"} @@ -1587,6 +1712,10 @@ my{ dnam{"မီလီလီတာ"} other{"{0} mL"} } + pinch{ + dnam{"တစ်ဆိတ်"} + other{"{0} ဆိတ်"} + } pint{ dnam{"ပိုင့်"} other{"{0} pt"} @@ -1599,6 +1728,10 @@ my{ dnam{"ကွတ်"} other{"{0} qt"} } + quart-imperial{ + dnam{"ဗြိတိသျှသုံး ကွတ်"} + other{"ဗြိတိသျှသုံး {0} ကွတ်"} + } tablespoon{ dnam{"စားပွဲဇွန်း"} other{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/mzn.txt b/intl/icu/source/data/unit/mzn.txt index 71cdb9a654f3..370d1accd7f7 100644 --- a/intl/icu/source/data/unit/mzn.txt +++ b/intl/icu/source/data/unit/mzn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mzn{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/naq.txt b/intl/icu/source/data/unit/naq.txt index b5a2a9ba5b98..3295d391ef0f 100644 --- a/intl/icu/source/data/unit/naq.txt +++ b/intl/icu/source/data/unit/naq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml naq{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/nb.txt b/intl/icu/source/data/unit/nb.txt index 7adb4c48d873..fac164f14f19 100644 --- a/intl/icu/source/data/unit/nb.txt +++ b/intl/icu/source/data/unit/nb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -396,6 +396,11 @@ nb{ } } graphics{ + dot{ + dnam{"punkt"} + one{"{0} punkt"} + other{"{0} punkter"} + } dot-per-centimeter{ dnam{"punkter per centimeter"} one{"{0} punkt per centimeter"} @@ -449,12 +454,27 @@ nb{ one{"{0} desimeter"} other{"{0} desimeter"} } + earth-radius{ + dnam{"jordradius"} + one{"{0} jordradius"} + other{"{0} jordradier"} + } + fathom{ + dnam{"favner"} + one{"{0} favn"} + other{"{0} favner"} + } foot{ dnam{"fot"} one{"{0} fot"} other{"{0} fot"} per{"{0} per fot"} } + furlong{ + dnam{"furlong"} + one{"{0} furlong"} + other{"{0} furlong"} + } inch{ dnam{"tommer"} one{"{0} tomme"} @@ -519,12 +539,14 @@ nb{ other{"{0} pikometer"} } point{ - dnam{"punkter"} - one{"{0} punkt"} - other{"{0} punkter"} + dnam{"typografiske punkter"} + one{"{0} typografisk punkt"} + other{"{0} typografiske punkter"} } solar-radius{ - dnam{"solradius"} + dnam{"solradier"} + one{"{0} solradius"} + other{"{0} solradier"} } yard{ dnam{"yard"} @@ -533,6 +555,16 @@ nb{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -558,6 +590,10 @@ nb{ one{"{0} jordmasse"} other{"{0} jordmasser"} } + grain{ + one{"{0} grain"} + other{"{0} grain"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -607,6 +643,11 @@ nb{ one{"{0} solmasse"} other{"{0} solmasser"} } + stone{ + dnam{"stone"} + one{"{0} stone"} + other{"{0} stone"} + } ton{ dnam{"amerikanske tonn"} one{"{0} amerikansk tonn"} @@ -726,9 +767,9 @@ nb{ other{"{0} grader fahrenheit"} } generic{ - dnam{"°"} - one{"{0}°"} - other{"{0}°"} + dnam{"grader"} + one{"{0} grad"} + other{"{0} grader"} } kelvin{ dnam{"kelvin"} @@ -743,7 +784,9 @@ nb{ other{"{0} Nm"} } pound-force-foot{ - dnam{"pound-force-foot"} + dnam{"pound-foot"} + one{"{0} pound-foot"} + other{"{0} pound-foot"} } } volume{ @@ -757,6 +800,11 @@ nb{ one{"{0} fat"} other{"{0} fat"} } + bushel{ + dnam{"bushel"} + one{"{0} bushel"} + other{"{0} bushels"} + } centiliter{ dnam{"centiliter"} one{"{0} centiliter"} @@ -814,15 +862,35 @@ nb{ one{"{0} desiliter"} other{"{0} desiliter"} } + dessert-spoon{ + dnam{"barneskje"} + one{"{0} barneskje"} + other{"{0} barneskjeer"} + } + dessert-spoon-imperial{ + dnam{"britisk barneskje"} + one{"{0} britisk barneskje"} + other{"{0} britiske barneskjeer"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"dråpe"} + one{"{0} dråpe"} + other{"{0} dråper"} + } fluid-ounce{ dnam{"væskeunser"} one{"{0} væskeunse"} other{"{0} væskeunser"} } fluid-ounce-imperial{ - dnam{"imp. fluid ounce"} - one{"{0} imp. fluid ounce"} - other{"{0} imp. fluid ounce"} + dnam{"britiske væskeunser"} + one{"{0} britisk væskeunse"} + other{"{0} britiske væskeunser"} } gallon{ dnam{"gallon"} @@ -841,6 +909,11 @@ nb{ one{"{0} hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"shot"} + one{"{0} shot"} + other{"{0} shot"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -857,6 +930,11 @@ nb{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"klype"} + one{"{0} klype"} + other{"{0} klyper"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -872,6 +950,11 @@ nb{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"britisk quart"} + one{"{0} britisk quart"} + other{"{0} britiske quart"} + } tablespoon{ dnam{"spiseskjeer"} one{"{0} spiseskje"} @@ -1245,13 +1328,13 @@ nb{ angle{ arc-minute{ dnam{"bueminutter"} - one{"{0} bmin"} - other{"{0} bmin"} + one{"{0}′"} + other{"{0}′"} } arc-second{ dnam{"buesek"} - one{"{0} bsek"} - other{"{0} bsek"} + one{"{0}″"} + other{"{0}″"} } degree{ dnam{"grader"} @@ -1293,7 +1376,7 @@ nb{ } square-inch{ dnam{"tommer²"} - one{"{0} tommer²"} + one{"{0} tomme²"} other{"{0} tommer²"} per{"{0}/tommer²"} } @@ -1310,9 +1393,9 @@ nb{ per{"{0}/m²"} } square-mile{ - dnam{"engelske mil²"} + dnam{"miles²"} one{"{0} mile²"} - other{"{0} mile²"} + other{"{0} miles²"} per{"{0}/mile²"} } square-yard{ @@ -1373,12 +1456,12 @@ nb{ other{"{0} l/km"} } mile-per-gallon{ - dnam{"eng. mil/gal"} + dnam{"miles/gal"} one{"{0} mpg"} other{"{0} mpg"} } mile-per-gallon-imperial{ - dnam{"mile/brit. gal"} + dnam{"miles/brit. gal"} one{"{0} mpg brit."} other{"{0} mpg brit."} } @@ -1437,7 +1520,7 @@ nb{ other{"{0} PB"} } terabit{ - dnam{"Tb"} + dnam{"Tbit"} one{"{0} Tb"} other{"{0} Tb"} } @@ -1613,6 +1696,11 @@ nb{ } } graphics{ + dot{ + dnam{"pkt"} + one{"{0} pkt"} + other{"{0} pkt"} + } dot-per-centimeter{ dnam{"dpcm"} } @@ -1643,9 +1731,9 @@ nb{ } length{ astronomical-unit{ - dnam{"au"} - one{"{0} au"} - other{"{0} au"} + dnam{"AU"} + one{"{0} AU"} + other{"{0} AU"} } centimeter{ dnam{"cm"} @@ -1658,12 +1746,22 @@ nb{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"favner"} + one{"{0} fm"} + other{"{0} fm"} + } foot{ dnam{"fot"} one{"{0} fot"} other{"{0} fot"} per{"{0}/fot"} } + furlong{ + dnam{"furlong"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"tommer"} one{"{0} tomme"} @@ -1693,9 +1791,9 @@ nb{ other{"{0} µm"} } mile{ - dnam{"mile"} + dnam{"miles"} one{"{0} mile"} - other{"{0} mile"} + other{"{0} miles"} } mile-scandinavian{ dnam{"mil"} @@ -1742,6 +1840,16 @@ nb{ } } light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lux"} one{"{0} lx"} @@ -1816,6 +1924,9 @@ nb{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"stone"} + } ton{ dnam{"am. tonn"} one{"{0} am. tonn"} @@ -1911,9 +2022,9 @@ nb{ other{"{0} m/s"} } mile-per-hour{ - dnam{"engelske mil/t"} + dnam{"miles/t"} one{"{0} mile/t"} - other{"{0} mile/t"} + other{"{0} miles/t"} } } temperature{ @@ -1956,6 +2067,11 @@ nb{ one{"{0} fat"} other{"{0} fat"} } + bushel{ + dnam{"bushel"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1974,7 +2090,7 @@ nb{ } cubic-inch{ dnam{"tommer³"} - one{"{0} tommer³"} + one{"{0} tomme³"} other{"{0} tommer³"} } cubic-kilometer{ @@ -1989,9 +2105,9 @@ nb{ per{"{0}/m³"} } cubic-mile{ - dnam{"engelske mil³"} + dnam{"miles³"} one{"{0} mile³"} - other{"{0} mile³"} + other{"{0} miles³"} } cubic-yard{ dnam{"yard³"} @@ -2013,6 +2129,26 @@ nb{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"bs"} + one{"{0} bs"} + other{"{0} bs"} + } + dessert-spoon-imperial{ + dnam{"imp. bs"} + one{"{0} imp. bs"} + other{"{0} imp. bs"} + } + dram{ + dnam{"dram fluid"} + one{"{0} dram fl"} + other{"{0} dram fl"} + } + drop{ + dnam{"dråpe"} + one{"{0} dråpe"} + other{"{0} dråpe"} + } fluid-ounce{ dnam{"væskeunse"} one{"{0} fl oz"} @@ -2040,6 +2176,11 @@ nb{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"shot"} + one{"{0} shot"} + other{"{0} shot"} + } liter{ dnam{"liter"} one{"{0} l"} @@ -2056,6 +2197,11 @@ nb{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"klype"} + one{"{0} klype"} + other{"{0} klype"} + } pint{ dnam{"pint"} one{"{0} pt"} @@ -2071,6 +2217,11 @@ nb{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"imp. quart"} + one{"{0} imp. quart"} + other{"{0} imp. quart"} + } tablespoon{ dnam{"ss"} one{"{0} ss"} diff --git a/intl/icu/source/data/unit/nb_NO.txt b/intl/icu/source/data/unit/nb_NO.txt index fdac28bf658d..15a33c3396f5 100644 --- a/intl/icu/source/data/unit/nb_NO.txt +++ b/intl/icu/source/data/unit/nb_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/nd.txt b/intl/icu/source/data/unit/nd.txt index 57c1537e75db..0f43c83bac34 100644 --- a/intl/icu/source/data/unit/nd.txt +++ b/intl/icu/source/data/unit/nd.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nd{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/nds.txt b/intl/icu/source/data/unit/nds.txt deleted file mode 100644 index 2cf547f2d2cd..000000000000 --- a/intl/icu/source/data/unit/nds.txt +++ /dev/null @@ -1,30 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds{ - Version{"37"} - units{ - duration{ - day{ - other{"{0} Daag"} - } - hour{ - other{"{0} Stünnen"} - } - minute{ - other{"{0} Minuten"} - } - month{ - other{"{0} Maanden"} - } - second{ - other{"{0} Sekunnen"} - } - week{ - other{"{0} Weken"} - } - year{ - other{"{0} Johren"} - } - } - } -} diff --git a/intl/icu/source/data/unit/ne.txt b/intl/icu/source/data/unit/ne.txt index 7bff11185ca1..75a2f0a39c3e 100644 --- a/intl/icu/source/data/unit/ne.txt +++ b/intl/icu/source/data/unit/ne.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ ne{ } } graphics{ + dot{ + dnam{"बिन्‍दु"} + one{"{0}बिन्‍दु"} + other{"{0}बिन्‍दु"} + } dot-per-centimeter{ dnam{"डट प्रति सेन्टिमिटर"} one{"{0} डट प्रति सेन्टिमिटर"} @@ -459,12 +464,27 @@ ne{ one{"{0}डेसिमिटर"} other{"{0}डेसिमिटर"} } + earth-radius{ + dnam{"पृथ्वीको त्रिज्या"} + one{"{0} पृथ्वीको त्रिज्या"} + other{"{0} पृथ्वीको त्रिज्या"} + } + fathom{ + dnam{"फ्यादम"} + one{"{0} फ्यादम"} + other{"{0} फ्यादम"} + } foot{ dnam{"फुट"} one{"{0} फुट"} other{"{0} फुट"} per{"{0} प्रति फुट"} } + furlong{ + dnam{"फर्लंग"} + one{"{0} फर्लंग"} + other{"{0} फर्लंग"} + } inch{ dnam{"इन्च"} one{"{0}इन्च"} @@ -545,6 +565,16 @@ ne{ } } light{ + candela{ + dnam{"क्यान्डेला"} + one{"{0} क्यान्डेला"} + other{"{0} क्यान्डेला"} + } + lumen{ + dnam{"लुमेन"} + one{"{0} लुमेन"} + other{"{0} लुमेन"} + } lux{ dnam{"लक्स"} one{"{0}लक्स"} @@ -572,6 +602,11 @@ ne{ one{"{0} पृथ्वी घन"} other{"{0} पृथ्वी घन"} } + grain{ + dnam{"दाना"} + one{"{0} दाना"} + other{"{0} दाना"} + } gram{ dnam{"ग्राम"} one{"{0} ग्राम"} @@ -621,6 +656,11 @@ ne{ one{"{0} सौर्य घन"} other{"{0} सौर्य घन"} } + stone{ + dnam{"स्टोन"} + one{"{0} स्टोन"} + other{"{0} स्टोन"} + } ton{ dnam{"टन"} one{"{0}टन"} @@ -778,6 +818,11 @@ ne{ one{"{0} ब्यारल"} other{"{0} ब्यारल"} } + bushel{ + dnam{"बुशेल"} + one{"{0} बुशेल"} + other{"{0} बुशेल"} + } centiliter{ dnam{"सेन्टिलिटर"} one{"{0}सेन्टिलिटर"} @@ -835,6 +880,26 @@ ne{ one{"{0}डेसिलिटर"} other{"{0}डेसिलिटर"} } + dessert-spoon{ + dnam{"डेजर्ट चम्चा"} + one{"{0} डेजर्ट चम्चा"} + other{"{0} डेजर्ट चम्चा"} + } + dessert-spoon-imperial{ + dnam{"Imp. डेजर्ट चम्चा"} + one{"{0} Imp. डेजर्ट चम्चा"} + other{"{0} Imp. डेजर्ट चम्चा"} + } + dram{ + dnam{"ड्राम"} + one{"{0} ड्राम"} + other{"{0} ड्राम"} + } + drop{ + dnam{"थोपा"} + one{"{0} थोपा"} + other{"{0} थोपा"} + } fluid-ounce{ dnam{"तरल आउन्स"} one{"{0} तरल आउन्स"} @@ -862,6 +927,11 @@ ne{ one{"{0}हेक्टोलिटर"} other{"{0}हेक्टोलिटर"} } + jigger{ + dnam{"जिगर"} + one{"{0} जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लिटर"} one{"{0} लिटर"} @@ -878,6 +948,11 @@ ne{ one{"{0}मिलिलिटर"} other{"{0}मिलिलिटर"} } + pinch{ + dnam{"चुटकी"} + one{"{0} चुटकी"} + other{"{0} चुटकी"} + } pint{ dnam{"पिन्ट"} one{"{0}पिन्ट"} @@ -893,6 +968,11 @@ ne{ one{"{0}क्वार्ट"} other{"{0}क्वार्ट्स"} } + quart-imperial{ + dnam{"इम्पिरियल चौथाइ"} + one{"{0} इम्पिरियल चौथाइ"} + other{"{0} इम्पिरियल चौथाइ"} + } tablespoon{ dnam{"टेबल चम्चा"} one{"{0} टेबल चम्चा"} @@ -1556,6 +1636,11 @@ ne{ } } graphics{ + dot{ + dnam{"बिन्‍दु"} + one{"{0} बिन्‍दु"} + other{"{0} बिन्‍दु"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1609,12 +1694,27 @@ ne{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"फ्यादम"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"फिट"} one{"{0}फिट"} other{"{0}फिट"} per{"{0}प्रति फिट"} } + furlong{ + dnam{"फर्लंग"} + one{"{0} फर"} + other{"{0} fur"} + } inch{ dnam{"इन्च"} one{"इन्च"} @@ -1693,6 +1793,16 @@ ne{ } } light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"लक्स"} one{"{0} lx"} @@ -1718,6 +1828,11 @@ ne{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"दाना"} + one{"{0} दाना"} + other{"{0} दाना"} + } gram{ dnam{"ग्राम"} one{"{0} ग्राम"} @@ -1765,6 +1880,11 @@ ne{ solar-mass{ dnam{"सौर्य घन"} } + stone{ + dnam{"स्टोन"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"टन"} one{"{0}टन"} @@ -1917,6 +2037,11 @@ ne{ one{"{0} ब्यारल"} other{"{0} ब्यारल"} } + bushel{ + dnam{"बुशेल"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cL"} one{"{0} cL"} @@ -1974,6 +2099,26 @@ ne{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + one{"{0} dstspn Imp"} + other{"{0} dstspn Imp"} + } + dram{ + dnam{"ड्राम तरल पदार्थ"} + one{"{0} ड्राम तरल"} + other{"{0} ड्राम fl"} + } + drop{ + dnam{"थोपा"} + one{"{0} थोपा"} + other{"{0} थोपा"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1996,6 +2141,11 @@ ne{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"जिगर"} + one{"{0} जिगर"} + other{"{0} जिगर"} + } liter{ dnam{"लिटर"} one{"{0} लि."} @@ -2012,6 +2162,11 @@ ne{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"चुटकी"} + one{"{0} चुटकी"} + other{"{0} चुटकी"} + } pint{ dnam{"पिन्ट"} one{"{0} pt"} @@ -2027,6 +2182,11 @@ ne{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/nl.txt b/intl/icu/source/data/unit/nl.txt index a3f31b15a2e8..c2e2b847a19c 100644 --- a/intl/icu/source/data/unit/nl.txt +++ b/intl/icu/source/data/unit/nl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -399,6 +399,11 @@ nl{ } } graphics{ + dot{ + dnam{"punt"} + one{"dot"} + other{"{0} dot"} + } dot-per-centimeter{ dnam{"dots per centimeter"} one{"{0} dot per centimeter"} @@ -575,6 +580,11 @@ nl{ one{"{0} aardmassa"} other{"{0} aardmassa"} } + grain{ + dnam{"grein"} + one{"{0} grein"} + other{"{0} grein"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -588,9 +598,9 @@ nl{ per{"{0} per kilogram"} } metric-ton{ - dnam{"tonne"} - one{"{0} tonne"} - other{"{0} tonnes"} + dnam{"metrische ton"} + one{"{0} metrische ton"} + other{"{0} metrische ton"} } microgram{ dnam{"microgram"} @@ -772,7 +782,7 @@ nl{ pound-force-foot{ dnam{"pound-feet"} one{"{0} pound-force-foot"} - other{"{0} pound-feet"} + other{"{0} pound-force-feet"} } } volume{ @@ -848,6 +858,26 @@ nl{ one{"{0} deciliter"} other{"{0} deciliter"} } + dessert-spoon{ + dnam{"dessertlepel"} + one{"{0} dessertlepel"} + other{"{0} dessertlepels"} + } + dessert-spoon-imperial{ + dnam{"imp. dessertlepel"} + one{"{0} imp. dessertlepel"} + other{"{0} imp. dessertlepels"} + } + dram{ + dnam{"drachme"} + one{"{0} drachme"} + other{"{0} drachme"} + } + drop{ + dnam{"druppel"} + one{"{0} druppel"} + other{"{0} druppels"} + } fluid-ounce{ dnam{"fluid ounce"} one{"{0} fluid ounce"} @@ -875,6 +905,10 @@ nl{ one{"{0} hectoliter"} other{"{0} hectoliter"} } + jigger{ + one{"{0} jigger"} + other{"{0} jiggers"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -891,6 +925,11 @@ nl{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"snufje"} + one{"{0} snufje"} + other{"{0} snufjes"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -906,6 +945,11 @@ nl{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"imp. quart"} + one{"{0} imp. quart"} + other{"{0} imp. quarts"} + } tablespoon{ dnam{"eetlepel"} one{"{0} eetlepel"} @@ -2065,6 +2109,10 @@ nl{ } } graphics{ + dot{ + one{"{0} dot"} + other{"{0} dot"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -2221,6 +2269,11 @@ nl{ one{"{0} CD"} other{"{0} CD"} } + grain{ + dnam{"grein"} + one{"{0} grein"} + other{"{0} grein"} + } gram{ dnam{"g"} one{"{0} g"} @@ -2394,6 +2447,13 @@ nl{ other{"{0} K"} } } + torque{ + newton-meter{ + dnam{"Nm"} + one{"{0} Nm"} + other{"{0} Nm"} + } + } volume{ acre-foot{ dnam{"acre ft"} @@ -2462,6 +2522,26 @@ nl{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"des l"} + one{"{0} des l"} + other{"{0} des l"} + } + dessert-spoon-imperial{ + dnam{"imp. des l"} + one{"{0} imp. des l"} + other{"{0} imp. des lpls"} + } + dram{ + dnam{"drachme"} + one{"{0} fl dr"} + other{"{0} fl dr"} + } + drop{ + dnam{"druppel"} + one{"{0} druppel"} + other{"{0} druppels"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2500,6 +2580,11 @@ nl{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"snufje"} + one{"{0} snufje"} + other{"{0} snufje"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -2515,6 +2600,11 @@ nl{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"imp. qt"} + one{"{0} imp. qt"} + other{"{0} imp. qt"} + } tablespoon{ dnam{"el"} one{"{0} el"} diff --git a/intl/icu/source/data/unit/nmg.txt b/intl/icu/source/data/unit/nmg.txt index 3be5f9b11289..5a8e42a7881e 100644 --- a/intl/icu/source/data/unit/nmg.txt +++ b/intl/icu/source/data/unit/nmg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nmg{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/nn.txt b/intl/icu/source/data/unit/nn.txt index 2935e0c64c91..163a4127ad8d 100644 --- a/intl/icu/source/data/unit/nn.txt +++ b/intl/icu/source/data/unit/nn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -42,7 +42,7 @@ nn{ other{"{0} radianar"} } revolution{ - dnam{"omdreiingar"} + dnam{"omdreiing"} one{"{0} omdreiing"} other{"{0} omdreiingar"} } @@ -101,6 +101,7 @@ nn{ } compound{ per{"{0} per {1}"} + times{"{0}{1}"} } concentr{ karat{ @@ -118,11 +119,26 @@ nn{ one{"{0} millimol per liter"} other{"{0} millimol per liter"} } + percent{ + dnam{"prosent"} + one{"{0} prosent"} + other{"{0} prosent"} + } + permille{ + dnam{"promille"} + one{"{0} promille"} + other{"{0} promille"} + } permillion{ dnam{"milliondelar"} one{"{0} milliondel"} other{"{0} milliondelar"} } + permyriad{ + dnam{"promyriade"} + one{"{0} promyriade"} + other{"{0} promyriade"} + } } consumption{ liter-per-100-kilometer{ @@ -147,7 +163,11 @@ nn{ } } coordinate{ + dnam{"himmelretning"} east{"{0} aust"} + north{"{0} nord"} + south{"{0} sør"} + west{"{0} vest"} } digital{ bit{ @@ -190,6 +210,11 @@ nn{ one{"{0} megabyte"} other{"{0} megabyte"} } + petabyte{ + dnam{"petabyte"} + one{"{0} petabyte"} + other{"{0} petabyte"} + } terabit{ dnam{"terabit"} one{"{0} terabit"} @@ -211,12 +236,17 @@ nn{ dnam{"døgn"} one{"{0} døgn"} other{"{0} døgn"} - per{"{0}/døgn"} + per{"{0} per døgn"} + } + decade{ + dnam{"tiår"} + one{"{0} tiår"} + other{"{0} tiår"} } hour{ dnam{"timar"} one{"{0} time"} - other{"{0} timar"} + other{"{0} timer"} per{"{0} per time"} } microsecond{ @@ -272,7 +302,7 @@ nn{ other{"{0} ampere"} } milliampere{ - dnam{"miliampere"} + dnam{"milliampere"} one{"{0} milliampere"} other{"{0} milliampere"} } @@ -288,11 +318,21 @@ nn{ } } energy{ + british-thermal-unit{ + dnam{"British thermal units"} + one{"{0} British thermal unit"} + other{"{0} British thermal units"} + } calorie{ dnam{"kaloriar"} one{"{0} kalori"} other{"{0} kaloriar"} } + electronvolt{ + dnam{"elektronvolt"} + one{"{0} elektronvolt"} + other{"{0} elektronvolt"} + } foodcalorie{ dnam{"kaloriar"} one{"{0} kalori"} @@ -318,6 +358,23 @@ nn{ one{"{0} kilowattime"} other{"{0} kilowattimar"} } + therm-us{ + dnam{"therm"} + one{"{0} therm"} + other{"{0} therm"} + } + } + force{ + newton{ + dnam{"newton"} + one{"{0} newton"} + other{"{0} newton"} + } + pound-force{ + dnam{"poundforce"} + one{"{0} poundforce"} + other{"{0} poundforce"} + } } frequency{ gigahertz{ @@ -341,6 +398,48 @@ nn{ other{"{0} megahertz"} } } + graphics{ + dot{ + dnam{"punkt"} + one{"{0} punkt"} + other{"{0} punkt"} + } + dot-per-centimeter{ + dnam{"punkt per centimeter"} + one{"{0} punkt per centimeter"} + other{"{0} punkt per centimeter"} + } + dot-per-inch{ + dnam{"punkt per tomme"} + one{"{0} punkt per tomme"} + other{"{0} punkt per tomme"} + } + em{ + dnam{"gefirt"} + one{"{0} gefirt"} + other{"{0} gefirt"} + } + megapixel{ + dnam{"megapikslar"} + one{"{0} megapiksel"} + other{"{0} megapikslar"} + } + pixel{ + dnam{"pikslar"} + one{"{0} piksel"} + other{"{0} pikslar"} + } + pixel-per-centimeter{ + dnam{"pikslar per centimeter"} + one{"{0} piksel per centimeter"} + other{"{0} pikslar per centimeter"} + } + pixel-per-inch{ + dnam{"pikslar per tomme"} + one{"{0} piksel per tomme"} + other{"{0} pikslar per tomme"} + } + } length{ astronomical-unit{ dnam{"astronomiske einingar"} @@ -358,17 +457,32 @@ nn{ one{"{0} desimeter"} other{"{0} desimeter"} } + earth-radius{ + dnam{"jordradius"} + one{"{0} jordradius"} + other{"{0} jordradius"} + } + fathom{ + dnam{"famner"} + one{"{0} famn"} + other{"{0} famner"} + } foot{ dnam{"fot"} one{"{0} fot"} other{"{0} fot"} - per{"{0}/ft"} + per{"{0} per fot"} + } + furlong{ + dnam{"furlong"} + one{"{0} furlong"} + other{"{0} furlong"} } inch{ - dnam{"tommer"} + dnam{"tommar"} one{"{0} tomme"} - other{"{0} tommer"} - per{"{0}/in"} + other{"{0} tommar"} + per{"{0} per tomme"} } kilometer{ dnam{"kilometer"} @@ -389,8 +503,8 @@ nn{ } micrometer{ dnam{"mikrometer"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} mikrometer"} + other{"{0} mikrometer"} } mile{ dnam{"engelske mil"} @@ -428,9 +542,14 @@ nn{ other{"{0} pikometer"} } point{ - dnam{"punkt"} - one{"{0} punkt"} - other{"{0} punkt"} + dnam{"typografiske punkt"} + one{"{0} typografisk punkt"} + other{"{0} typografiske punkt"} + } + solar-radius{ + dnam{"solradius"} + one{"{0} solradius"} + other{"{0} solradius"} } yard{ dnam{"engelske yard"} @@ -439,11 +558,26 @@ nn{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} other{"{0} lux"} } + solar-luminosity{ + dnam{"solluminositetar"} + one{"{0} solluminositet"} + other{"{0} solluminositetar"} + } } mass{ carat{ @@ -451,6 +585,16 @@ nn{ one{"{0} karat"} other{"{0} karat"} } + dalton{ + dnam{"dalton"} + one{"{0} dalton"} + other{"{0} dalton"} + } + earth-mass{ + dnam{"jordmassar"} + one{"{0} jordmasse"} + other{"{0} jordmassar"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -495,6 +639,16 @@ nn{ other{"{0} pund"} per{"{0} per pund"} } + solar-mass{ + dnam{"solmassar"} + one{"{0} solmasse"} + other{"{0} solmassar"} + } + stone{ + dnam{"engelske stones"} + one{"{0} engelsk stone"} + other{"{0} engelske stones"} + } ton{ dnam{"amerikanske tonn"} one{"{0} amerikansk tonn"} @@ -534,6 +688,11 @@ nn{ } } pressure{ + atmosphere{ + dnam{"atmosfærar"} + one{"{0} atmosfære"} + other{"{0} atmosfærar"} + } hectopascal{ dnam{"hektopascal"} one{"{0} hektopascal"} @@ -544,6 +703,16 @@ nn{ one{"{0} tomme kvikksølv"} other{"{0} tommar kvikksølv"} } + kilopascal{ + dnam{"kilopascal"} + one{"{0} kilopascal"} + other{"{0} kilopascal"} + } + megapascal{ + dnam{"megapascal"} + one{"{0} megapascal"} + other{"{0} megapascal"} + } millibar{ dnam{"millibar"} one{"{0} millibar"} @@ -554,6 +723,11 @@ nn{ one{"{0} millimeter kvikksølv"} other{"{0} millimeter kvikksølv"} } + pascal{ + dnam{"pascal"} + one{"{0} pascal"} + other{"{0} pascal"} + } pound-force-per-square-inch{ dnam{"pund per kvadrattomme"} one{"{0} pund per kvadrattomme"} @@ -604,12 +778,34 @@ nn{ other{"{0} kelvin"} } } + torque{ + newton-meter{ + dnam{"newtonmeter"} + one{"{0} newtonmeter"} + other{"{0} newtonmeter"} + } + pound-force-foot{ + dnam{"pound-feet"} + one{"{0} pound-force-foot"} + other{"{0} pound-feet"} + } + } volume{ acre-foot{ dnam{"acre-fot"} one{"{0} acre-fot"} other{"{0} acre-fot"} } + barrel{ + dnam{"fat"} + one{"{0} fat"} + other{"{0} fat"} + } + bushel{ + dnam{"bushels"} + one{"{0} bushel"} + other{"{0} bushels"} + } centiliter{ dnam{"centiliter"} one{"{0} centiliter"} @@ -667,11 +863,36 @@ nn{ one{"{0} desiliter"} other{"{0} desiliter"} } + dessert-spoon{ + dnam{"dessertskei"} + one{"{0} dessertskei"} + other{"{0} dessertskeier"} + } + dessert-spoon-imperial{ + dnam{"britisk dessertskei"} + one{"{0} britisk dessertskei"} + other{"{0} britisk dessertskei"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"drope"} + one{"{0} drope"} + other{"{0} dropar"} + } fluid-ounce{ dnam{"væskeunser"} one{"{0} væskeunse"} other{"{0} væskeunser"} } + fluid-ounce-imperial{ + dnam{"britiske væskeunser"} + one{"{0} britisk væskeunse"} + other{"{0} britiske væskeunser"} + } gallon{ dnam{"gallon"} one{"{0} gallon"} @@ -689,6 +910,11 @@ nn{ one{"{0} hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"shot"} + one{"{0} shot"} + other{"{0} jigger"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -705,6 +931,11 @@ nn{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"klype"} + one{"{0} klype"} + other{"{0} klyper"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -720,6 +951,11 @@ nn{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"britisk quart"} + one{"{0} britisk quart"} + other{"{0} britiske quart"} + } tablespoon{ dnam{"matskeier"} one{"{0} matskei"} @@ -749,6 +985,14 @@ nn{ } compound{ per{"{0}/{1}"} + times{"{0}{1}"} + } + concentr{ + percent{ + dnam{"%"} + one{"{0} %"} + other{"{0} %"} + } } consumption{ liter-per-100-kilometer{ @@ -757,6 +1001,12 @@ nn{ other{"{0} l/100km"} } } + coordinate{ + east{"{0}Ø"} + north{"{0}N"} + south{"{0}S"} + west{"{0}V"} + } duration{ day{ dnam{"døgn"} @@ -970,6 +1220,7 @@ nn{ } compound{ per{"{0}/{1}"} + times{"{0}{1}"} } concentr{ karat{ @@ -987,11 +1238,26 @@ nn{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + percent{ + dnam{"prosent"} + one{"{0} %"} + other{"{0} %"} + } + permille{ + dnam{"promille"} + one{"{0} ‰"} + other{"{0} ‰"} + } permillion{ dnam{"ppm"} one{"{0} ppm"} other{"{0} ppm"} } + permyriad{ + dnam{"promyriade"} + one{"{0} ‱"} + other{"{0} ‱"} + } } consumption{ liter-per-100-kilometer{ @@ -1015,6 +1281,13 @@ nn{ other{"{0} mile/brit. gal"} } } + coordinate{ + dnam{"retning"} + east{"{0} Ø"} + north{"{0} N"} + south{"{0} S"} + west{"{0} V"} + } digital{ bit{ dnam{"bit"} @@ -1056,6 +1329,11 @@ nn{ one{"{0} MB"} other{"{0} MB"} } + petabyte{ + dnam{"PB"} + one{"{0} PB"} + other{"{0} PB"} + } terabit{ dnam{"Tb"} one{"{0} Tb"} @@ -1069,7 +1347,7 @@ nn{ } duration{ century{ - dnam{"hundreår"} + dnam{"årh."} one{"{0} årh."} other{"{0} årh."} } @@ -1079,10 +1357,16 @@ nn{ other{"{0} d"} per{"{0}/d"} } + decade{ + dnam{"tiår"} + one{"{0} tiår"} + other{"{0} tiår"} + } hour{ dnam{"timar"} one{"{0} t"} other{"{0} t"} + per{"{0}/t"} } microsecond{ dnam{"mikrosekund"} @@ -1158,6 +1442,11 @@ nn{ one{"{0} cal"} other{"{0} cal"} } + electronvolt{ + dnam{"elektronvolt"} + one{"{0} eV"} + other{"{0} eV"} + } foodcalorie{ dnam{"cal"} one{"{0} cal"} @@ -1183,6 +1472,15 @@ nn{ one{"{0} kWh"} other{"{0} kWh"} } + therm-us{ + one{"{0} therm"} + other{"{0} therm"} + } + } + force{ + pound-force{ + dnam{"poundforce"} + } } frequency{ gigahertz{ @@ -1206,6 +1504,40 @@ nn{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"pkt"} + one{"{0} pkt"} + other{"{0} pkt"} + } + dot-per-centimeter{ + one{"{0} dpcm"} + other{"{0} dpcm"} + } + dot-per-inch{ + dnam{"ppt"} + one{"{0} ppt"} + other{"{0} ppt"} + } + em{ + dnam{"gefirt"} + one{"{0} gefirt"} + other{"{0} gefirt"} + } + megapixel{ + dnam{"megapikslar"} + one{"{0} MP"} + other{"{0} MP"} + } + pixel{ + dnam{"pikslar"} + } + pixel-per-inch{ + dnam{"ppi"} + one{"{0} ppi"} + other{"{0} ppi"} + } + } length{ astronomical-unit{ dnam{"au"} @@ -1223,17 +1555,27 @@ nn{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"famner"} + one{"{0} fmn"} + other{"{0} fmn"} + } foot{ dnam{"fot"} one{"{0} fot"} other{"{0} fot"} per{"{0}/ft"} } + furlong{ + dnam{"furlong"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ - dnam{"tommer"} + dnam{"tommar"} one{"{0} tomme"} - other{"{0} tommer"} - per{"{0}/in"} + other{"{0} tommar"} + per{"{0}/tomme"} } kilometer{ dnam{"km"} @@ -1297,10 +1639,11 @@ nn{ one{"{0} pt"} other{"{0} pt"} } + solar-radius{ + dnam{"solradius"} + } yard{ dnam{"engelske yard"} - one{"{0} yd"} - other{"{0} yd"} } } light{ @@ -1309,6 +1652,9 @@ nn{ one{"{0} lx"} other{"{0} lx"} } + solar-luminosity{ + dnam{"solluminositetar"} + } } mass{ carat{ @@ -1316,6 +1662,15 @@ nn{ one{"{0} c"} other{"{0} c"} } + dalton{ + one{"{0} Da"} + other{"{0} Da"} + } + earth-mass{ + dnam{"jordmasser"} + one{"{0} M⊕"} + other{"{0} M⊕"} + } gram{ dnam{"gram"} one{"{0} g"} @@ -1360,6 +1715,16 @@ nn{ other{"{0} pund"} per{"{0}/pund"} } + solar-mass{ + dnam{"solmassar"} + one{"{0} M☉"} + other{"{0} M☉"} + } + stone{ + dnam{"stones"} + one{"{0} eng. st."} + other{"{0} eng. st."} + } ton{ dnam{"am. tonn"} one{"{0} am. tonn"} @@ -1399,6 +1764,11 @@ nn{ } } pressure{ + atmosphere{ + dnam{"atm"} + one{"{0} atm"} + other{"{0} atm"} + } hectopascal{ dnam{"hPa"} one{"{0} hPa"} @@ -1442,7 +1812,7 @@ nn{ other{"{0} m/s"} } mile-per-hour{ - dnam{"engelske mil per time"} + dnam{"engelske mil/t"} one{"{0} mile/t"} other{"{0} mile/t"} } @@ -1469,12 +1839,29 @@ nn{ other{"{0} K"} } } + torque{ + newton-meter{ + dnam{"Nm"} + one{"{0} Nm"} + other{"{0} Nm"} + } + } volume{ acre-foot{ dnam{"acre-fot"} one{"{0} ac-fot"} other{"{0} ac-fot"} } + barrel{ + dnam{"fat"} + one{"{0} fat"} + other{"{0} fat"} + } + bushel{ + dnam{"bushels"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1532,11 +1919,31 @@ nn{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"dsskei"} + one{"{0} dsskei"} + other{"{0} dsskei"} + } + dessert-spoon-imperial{ + dnam{"brit. dsskei"} + one{"{0} brit. dsskei"} + other{"{0} brit. dsskei"} + } + drop{ + dnam{"drope"} + one{"{0} drope"} + other{"{0} drop"} + } fluid-ounce{ dnam{"væskeunse"} one{"{0} fl oz"} other{"{0} fl oz"} } + fluid-ounce-imperial{ + dnam{"britisk væskeunse"} + one{"{0} britisk væskeunse"} + other{"{0} britiske væskeunser"} + } gallon{ dnam{"gal"} one{"{0} gal"} @@ -1554,6 +1961,11 @@ nn{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"shot"} + one{"{0} shot"} + other{"{0} jigger"} + } liter{ dnam{"liter"} one{"{0} l"} @@ -1570,6 +1982,11 @@ nn{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"klype"} + one{"{0} klype"} + other{"{0} pinch"} + } pint{ dnam{"pint"} one{"{0} pt"} @@ -1585,6 +2002,11 @@ nn{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"brit. quart"} + one{"{0} b. quart"} + other{"{0} b. quart"} + } tablespoon{ dnam{"ss"} one{"{0} ss"} diff --git a/intl/icu/source/data/unit/nn_NO.txt b/intl/icu/source/data/unit/nn_NO.txt index 4e8a5f78d9b5..9eaa33990d32 100644 --- a/intl/icu/source/data/unit/nn_NO.txt +++ b/intl/icu/source/data/unit/nn_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/nnh.txt b/intl/icu/source/data/unit/nnh.txt index 967ded588d45..9704e9688d08 100644 --- a/intl/icu/source/data/unit/nnh.txt +++ b/intl/icu/source/data/unit/nnh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nnh{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/no.txt b/intl/icu/source/data/unit/no.txt index 097a923cd101..474d0b21b0d9 100644 --- a/intl/icu/source/data/unit/no.txt +++ b/intl/icu/source/data/unit/no.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ "%%ALIAS"{"nb"} } diff --git a/intl/icu/source/data/unit/no_NO.txt b/intl/icu/source/data/unit/no_NO.txt index 188a8a4a680a..5d7f8599c0e5 100644 --- a/intl/icu/source/data/unit/no_NO.txt +++ b/intl/icu/source/data/unit/no_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ "%%ALIAS"{"nb_NO"} } diff --git a/intl/icu/source/data/unit/no_NO_NY.txt b/intl/icu/source/data/unit/no_NO_NY.txt index aa897fe6f515..c900df7fea21 100644 --- a/intl/icu/source/data/unit/no_NO_NY.txt +++ b/intl/icu/source/data/unit/no_NO_NY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO_NY{ "%%ALIAS"{"nn_NO"} } diff --git a/intl/icu/source/data/unit/nus.txt b/intl/icu/source/data/unit/nus.txt index 4ca97791a08c..86c260ba1e00 100644 --- a/intl/icu/source/data/unit/nus.txt +++ b/intl/icu/source/data/unit/nus.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nus{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/nyn.txt b/intl/icu/source/data/unit/nyn.txt index ebf194300495..2b1cd30468b8 100644 --- a/intl/icu/source/data/unit/nyn.txt +++ b/intl/icu/source/data/unit/nyn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nyn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/om.txt b/intl/icu/source/data/unit/om.txt index 2084a3fa206f..4c08c72051c9 100644 --- a/intl/icu/source/data/unit/om.txt +++ b/intl/icu/source/data/unit/om.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/or.txt b/intl/icu/source/data/unit/or.txt index f7415dcb679c..debd4b4f186a 100644 --- a/intl/icu/source/data/unit/or.txt +++ b/intl/icu/source/data/unit/or.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml or{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -402,6 +402,12 @@ or{ other{"{0} ମେଗାହର୍ଜ୍"} } } + graphics{ + dot{ + one{"{0} ବିନ୍ଦୁ"} + other{"{0} ବି"} + } + } length{ astronomical-unit{ dnam{"ଖଗୋଲୀୟ ଏକକ"} @@ -1379,6 +1385,11 @@ or{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"ବି."} + } + } length{ astronomical-unit{ dnam{"ଆୟୁ"} @@ -1550,6 +1561,10 @@ or{ solar-mass{ dnam{"ସୋଲର ମାସେସ"} } + stone{ + one{"{0} ଷ୍ଟ."} + other{"{0} ଷ୍ଟ."} + } ton{ dnam{"ଟନ୍"} one{"{0} ଟନ୍"} diff --git a/intl/icu/source/data/unit/os.txt b/intl/icu/source/data/unit/os.txt index 30bcf88254a1..09c124342f3d 100644 --- a/intl/icu/source/data/unit/os.txt +++ b/intl/icu/source/data/unit/os.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/pa.txt b/intl/icu/source/data/unit/pa.txt index bb4dae3c503e..dc132ed88220 100644 --- a/intl/icu/source/data/unit/pa.txt +++ b/intl/icu/source/data/unit/pa.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -406,6 +406,11 @@ pa{ } } graphics{ + dot{ + dnam{"ਡਾਟ"} + one{"{0} ਡਾਟ"} + other{"{0} ਡਾਟ"} + } dot-per-centimeter{ dnam{"ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ"} one{"{0} ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ"} @@ -459,6 +464,11 @@ pa{ one{"{0} ਡੈਸੀਮੀਟਰ"} other{"{0} ਡੈਸੀਮੀਟਰ"} } + earth-radius{ + dnam{"ਧਰਤੀ ਦਾ ਘੇਰਾ"} + one{"{0} ਧਰਤੀ ਦਾ ਘੇਰਾ"} + other{"{0} ਧਰਤੀ ਦਾ ਘੇਰਾ"} + } fathom{ dnam{"ਫ਼ੈਦਮ"} one{"{0} ਫ਼ੈਦਮ"} @@ -555,6 +565,16 @@ pa{ } } light{ + candela{ + dnam{"ਕੈਂਡੇਲਾ"} + one{"{0} ਕੈਂਡੇਲਾ"} + other{"{0} ਕੈਂਡੇਲਾ"} + } + lumen{ + dnam{"ਲੁਮੇਨ"} + one{"{0} ਲੁਮੇਨ"} + other{"{0} ਲੁਮੇਨ"} + } lux{ dnam{"ਲਕਸ"} one{"{0} ਲਕਸ"} @@ -582,6 +602,11 @@ pa{ one{"{0} ਅਰਥ ਮਾਸ"} other{"{0} ਅਰਥ ਮਾਸ"} } + grain{ + dnam{"ਗ੍ਰੇਨ"} + one{"{0} ਗ੍ਰੇਨ"} + other{"{0} ਗ੍ਰੇਨ"} + } gram{ dnam{"ਗ੍ਰਾਮ"} one{"{0} ਗ੍ਰਾਮ"} @@ -637,9 +662,9 @@ pa{ other{"{0} ਸਟੋਨ"} } ton{ - dnam{"ਟਨ"} - one{"{0} ਟਨ"} - other{"{0} ਟਨ"} + dnam{"ਅਮਰੀਕੀ ਟਨ"} + one{"{0} ਅਮਰੀਕੀ ਟਨ"} + other{"{0} ਅਮਰੀਕੀ ਟਨ"} } } power{ @@ -778,7 +803,7 @@ pa{ } pound-force-foot{ dnam{"ਪੌਂਡ-ਫੁੱਟ"} - one{"{0} ਪੌਂਡ-ਫੁੱਟ"} + one{"{0} ਪੌਂਡ-ਬਲ-ਫੁੱਟ"} other{"{0} ਪੌਂਡ-ਫੁੱਟ"} } } @@ -855,6 +880,26 @@ pa{ one{"{0} ਡੈਸੀਲਿਟਰ"} other{"{0} ਡੈਸੀਲਿਟਰ"} } + dessert-spoon{ + dnam{"ਡੈਜ਼ਰਟ ਸਪੂਨ"} + one{"{0} ਡੈਜ਼ਰਟ ਸਪੂਨ"} + other{"{0} ਡੈਜ਼ਰਟ ਸਪੂਨ"} + } + dessert-spoon-imperial{ + dnam{"ਇੰਪੀਰੀਅਲ ਡੈਜ਼ਰਟ ਸਪੂਨ"} + one{"{0} ਇੰਪੀਰੀਅਲ ਡੈਜ਼ਰਟ ਸਪੂਨ"} + other{"{0} ਇੰਪੀਰੀਅਲ ਡੈਜ਼ਰਟ ਸਪੂਨ"} + } + dram{ + dnam{"ਚੁਸਕੀ"} + one{"{0} ਚੁਸਕੀ"} + other{"{0} ਚੁਸਕੀ"} + } + drop{ + dnam{"ਬੂੰਦ"} + one{"{0} ਬੂੰਦ"} + other{"{0} ਬੂੰਦ"} + } fluid-ounce{ dnam{"ਤਰਲ ਔਂਸ"} one{"{0} ਤਰਲ ਔਂਸ"} @@ -882,6 +927,11 @@ pa{ one{"{0} ਹੈਕਟੋਲਿਟਰ"} other{"{0} ਹੈਕਟੋਲਿਟਰ"} } + jigger{ + dnam{"ਚੱਕਾ"} + one{"{0} ਚੱਕਾ"} + other{"{0} ਚੱਕਾ"} + } liter{ dnam{"ਲਿਟਰ"} one{"{0} ਲਿਟਰ"} @@ -898,6 +948,11 @@ pa{ one{"{0} ਮਿਲੀਲਿਟਰ"} other{"{0} ਮਿਲੀਲਿਟਰ"} } + pinch{ + dnam{"ਚੁਟਕੀ"} + one{"{0} ਚੁਟਕੀ"} + other{"{0} ਚੁਟਕੀ"} + } pint{ dnam{"ਪਿੰਟ"} one{"{0} ਪਿੰਟ"} @@ -913,6 +968,11 @@ pa{ one{"{0} ਕੁਆਟ"} other{"{0} ਕੁਆਟ"} } + quart-imperial{ + dnam{"ਇੰਪੀਰੀਅਲ ਚੁਥਾਈ ਗੈਲਨ"} + one{"{0} ਇੰਪੀਰੀਅਲ ਚੁਥਾਈ ਗੈਲਨ"} + other{"{0} ਇੰਪੀਰੀਅਲ ਚੁਥਾਈ ਗੈਲਨ"} + } tablespoon{ dnam{"ਟੇਬਲ ਸਪੂਨ"} one{"{0} ਟੇਬਲ ਸਪੂਨ"} @@ -1087,6 +1147,8 @@ pa{ } millisecond{ dnam{"ਮਿਲੀਸਕਿੰਟ"} + one{"{0} ਮਿ.ਸ."} + other{"{0} ਮਿ.ਸ."} } minute{ dnam{"ਮਿੰਟ"} @@ -1853,8 +1915,8 @@ pa{ } therm-us{ dnam{"US therm"} - one{"{0} US therm"} - other{"{0} US therm"} + one{"{0} ਯੂ.ਐਸ. ਥੈਰਮ"} + other{"{0} ਯੂ.ਐਸ. ਥੈਰਮ"} } } force{ @@ -1890,6 +1952,11 @@ pa{ } } graphics{ + dot{ + dnam{"ਡਾਟ"} + one{"{0} ਡਾਟ"} + other{"{0} ਡਾਟ"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -2037,6 +2104,11 @@ pa{ } } light{ + lumen{ + dnam{"ਲੁਮੇਨ"} + one{"{0} ਲੁਮੇਨ"} + other{"{0} ਲੁਮੇਨ"} + } lux{ dnam{"ਲਕਸ"} one{"{0} ਲਕਸ"} @@ -2060,6 +2132,11 @@ pa{ earth-mass{ dnam{"ਅਰਥ ਮਾਸ"} } + grain{ + dnam{"ਗ੍ਰੇਨ"} + one{"{0} ਗ੍ਰੇਨ"} + other{"{0} ਗ੍ਰੇਨ"} + } gram{ dnam{"ਗ੍ਰਾਮ"} one{"{0} ਗ੍ਰਾ."} @@ -2113,9 +2190,9 @@ pa{ other{"{0} ਸਟੋਨ"} } ton{ - dnam{"ਟਨ"} - one{"{0} ਟਨ"} - other{"{0} ਟਨ"} + dnam{"ਅਮਰੀਕੀ ਟਨ"} + one{"{0} ਅਮਰੀਕੀ ਟਨ"} + other{"{0} ਅਮਰੀਕੀ ਟਨ"} } } power{ @@ -2326,11 +2403,36 @@ pa{ one{"{0} ਡੈ.ਲਿ."} other{"{0} ਡੈ.ਲਿ."} } + dessert-spoon{ + dnam{"ਡੈਜ਼ਰਟ ਸਪੂਨ"} + one{"{0} ਡੈਜ਼ਰਟ ਸਪੂਨ"} + other{"{0} ਡੈਜ਼ਰਟ ਸਪੂਨ"} + } + dessert-spoon-imperial{ + dnam{"ਇੰਪੀਰੀਅਲ ਡੈਜ਼ਰਟ ਸਪੂਨ"} + one{"{0} ਇੰਪ. ਡੈ. ਸ."} + other{"{0} ਇੰਪ. ਡੈ. ਸ."} + } + dram{ + dnam{"ਚੁਸਕੀ ਭਰ"} + one{"{0} ਚੁਸਕੀ ਭਰ"} + other{"{0} ਚੁਸਕੀ ਭਰ"} + } + drop{ + dnam{"ਬੂੰਦ"} + one{"{0} ਬੂੰਦ"} + other{"{0} ਬੂੰਦ"} + } fluid-ounce{ dnam{"ਤ. ਔਂਸ"} one{"{0} ਤ. ਔਂਸ"} other{"{0} ਤ. ਔਂਸ"} } + fluid-ounce-imperial{ + dnam{"ਇੰਪ. ਫਲੂ. ਔ."} + one{"{0} ਫਲੂ. ਔ. ਇੰਪ."} + other{"{0} ਫਲੂ. ਔ. ਇੰਪ."} + } gallon{ dnam{"ਗੈਲਨ"} one{"{0} ਗੈਲਨ"} @@ -2348,6 +2450,11 @@ pa{ one{"{0} ਹੈ.ਲਿ."} other{"{0} ਹੈ.ਲਿ."} } + jigger{ + dnam{"ਚੱਕਾ"} + one{"{0} ਚੱਕਾ"} + other{"{0} ਚੱਕਾ"} + } liter{ dnam{"ਲਿਟਰ"} one{"{0} ਲਿ."} @@ -2364,6 +2471,11 @@ pa{ one{"{0} ਮਿ.ਲਿ."} other{"{0} ਮਿ.ਲਿ."} } + pinch{ + dnam{"ਚੁਟਕੀ"} + one{"{0} ਚੁਟਕੀ"} + other{"{0} ਚੁਟਕੀ"} + } pint{ dnam{"ਪਿੰਟ"} one{"{0} ਪਿੰਟ"} @@ -2379,6 +2491,11 @@ pa{ one{"{0} ਕੁਆਟ"} other{"{0} ਕੁਆਟ"} } + quart-imperial{ + dnam{"ਇੰਪੀਰੀਅਲ ਚੁਥਾਈ ਗੈਲਨ"} + one{"{0} ਇੰਪ. ਚੁ. ਗੈ."} + other{"{0} ਇੰਪ. ਚੁ. ਗੈ."} + } tablespoon{ dnam{"ਟੇਬਲ ਸਪੂਨ"} one{"{0} ਟੇਬਲ ਸਪੂਨ"} diff --git a/intl/icu/source/data/unit/pa_Arab.txt b/intl/icu/source/data/unit/pa_Arab.txt index bb446359dbb8..1b371d8e8eba 100644 --- a/intl/icu/source/data/unit/pa_Arab.txt +++ b/intl/icu/source/data/unit/pa_Arab.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Arab{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pa_Arab_PK.txt b/intl/icu/source/data/unit/pa_Arab_PK.txt index e6b58610aed6..3b1bc420fabe 100644 --- a/intl/icu/source/data/unit/pa_Arab_PK.txt +++ b/intl/icu/source/data/unit/pa_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/pa_Guru.txt b/intl/icu/source/data/unit/pa_Guru.txt index a0ee56949a68..f10658f06f81 100644 --- a/intl/icu/source/data/unit/pa_Guru.txt +++ b/intl/icu/source/data/unit/pa_Guru.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Guru{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/pa_Guru_IN.txt b/intl/icu/source/data/unit/pa_Guru_IN.txt index adeae3fecc4e..f67b7c32236f 100644 --- a/intl/icu/source/data/unit/pa_Guru_IN.txt +++ b/intl/icu/source/data/unit/pa_Guru_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/pa_IN.txt b/intl/icu/source/data/unit/pa_IN.txt index b18bba68dc7f..0c963d73dff9 100644 --- a/intl/icu/source/data/unit/pa_IN.txt +++ b/intl/icu/source/data/unit/pa_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_IN{ "%%ALIAS"{"pa_Guru_IN"} } diff --git a/intl/icu/source/data/unit/pa_PK.txt b/intl/icu/source/data/unit/pa_PK.txt index 1c66c7b37a41..29612addf4c1 100644 --- a/intl/icu/source/data/unit/pa_PK.txt +++ b/intl/icu/source/data/unit/pa_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_PK{ "%%ALIAS"{"pa_Arab_PK"} } diff --git a/intl/icu/source/data/unit/pcm.txt b/intl/icu/source/data/unit/pcm.txt index d16089799a4e..97aab292a8ef 100644 --- a/intl/icu/source/data/unit/pcm.txt +++ b/intl/icu/source/data/unit/pcm.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pcm{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -409,6 +409,11 @@ pcm{ } } graphics{ + dot{ + dnam{"dọt"} + one{"{0}dọt"} + other{"{0}dọt"} + } dot-per-centimeter{ dnam{"Pọint-dẹm fọ ích sẹntímíta"} one{"{0} Pọint fọ ích sẹntímíta"} @@ -462,12 +467,27 @@ pcm{ one{"{0} Dẹsímíta"} other{"{0} Dẹsímíta"} } + earth-radius{ + dnam{"Wọ́ld Rédiọs"} + one{"{0} Wọ́ld Rédiọs"} + other{"{0} Wọ́ld Rédiọs"} + } + fathom{ + dnam{"Fátọm"} + one{"{0} fátọm"} + other{"{0} fátọm"} + } foot{ dnam{"Fut-dẹm"} one{"{0} Fut"} other{"{0} Fut"} per{"{0} Fọ Ích Fut"} } + furlong{ + dnam{"Fọ́lọng"} + one{"{0} fọ́lọng"} + other{"{0} fọ́lọng"} + } inch{ dnam{"Inch-dẹm"} one{"{0} inch"} @@ -548,6 +568,16 @@ pcm{ } } light{ + candela{ + dnam{"Kandíla"} + one{"{0} Kandíla"} + other{"{0} Kandíla"} + } + lumen{ + dnam{"Lúmẹn"} + one{"{0} Lúmẹn"} + other{"{0} Lúmẹn"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -575,6 +605,11 @@ pcm{ one{"{0} Ẹ́t Mas"} other{"{0} Ẹ́t Mas"} } + grain{ + dnam{"Gren"} + one{"{0} gren"} + other{"{0} gren"} + } gram{ dnam{"Gram-dẹm"} one{"{0} Gram"} @@ -624,6 +659,11 @@ pcm{ one{"{0} Sólá Mas"} other{"{0} Sólá Mas"} } + stone{ + dnam{"Ston"} + one{"{0} ston"} + other{"{0} ston"} + } ton{ dnam{"Tọn-dẹm"} one{"{0} Tọn"} @@ -765,9 +805,9 @@ pcm{ other{"{0} Niúton-Míta"} } pound-force-foot{ - dnam{"Páund-Fut"} - one{"{0} Páund-Fut"} - other{"{0} Páund-Fut"} + dnam{"Paund-Fit"} + one{"{0} Paund-Fọs-Fut"} + other{"{0} Paund-Fit"} } } volume{ @@ -781,6 +821,11 @@ pcm{ one{"{0} Drọm"} other{"{0} Drọm"} } + bushel{ + dnam{"Búshẹl"} + one{"{0} Búshẹl"} + other{"{0} Búshẹl"} + } centiliter{ dnam{"Sẹntílíta-dẹm"} one{"{0} Sẹntílíta"} @@ -820,8 +865,8 @@ pcm{ } cubic-yard{ dnam{"Kúbík Yad-dẹm"} - one{"{0} Kúbík"} - other{"{0} Kúbík"} + one{"{0} Kúbík Yad"} + other{"{0} Kúbík Yad"} } cup{ dnam{"Kọp-dẹm"} @@ -838,6 +883,26 @@ pcm{ one{"{0} Dẹsílíta"} other{"{0} Dẹsílíta"} } + dessert-spoon{ + dnam{"Dizát Spun"} + one{"{0} Dizát Spun"} + other{"{0} Dizát Spun"} + } + dessert-spoon-imperial{ + dnam{"Impẹ́riál Dizát Spun"} + one{"{0} Impẹ́riál Dizát Spun"} + other{"{0} Impẹ́riál Dizát Spun"} + } + dram{ + dnam{"Dram"} + one{"{0} Dram"} + other{"{0} Dram"} + } + drop{ + dnam{"Drọp"} + one{"{0} Drọp"} + other{"{0} Drọp"} + } fluid-ounce{ dnam{"Líkwíd Áuns-dẹm"} one{"{0} Líkwíd Áuns"} @@ -865,6 +930,11 @@ pcm{ one{"{0} Hẹ́któlíta"} other{"{0} Hẹ́któlíta"} } + jigger{ + dnam{"Jigá"} + one{"{0} Jigá"} + other{"{0} Jigá"} + } liter{ dnam{"Líta-dẹm"} one{"{0}Líta"} @@ -881,6 +951,11 @@ pcm{ one{"{0} Milílíta"} other{"{0} Milílíta"} } + pinch{ + dnam{"Pinch"} + one{"{0} Pinch"} + other{"{0} Pinch"} + } pint{ dnam{"Paint-dẹm"} one{"{0} Paint"} @@ -896,6 +971,11 @@ pcm{ one{"{0} Kwọt"} other{"{0} Kwọt"} } + quart-imperial{ + dnam{"Impẹ́riál Kwọt"} + one{"{0} Impẹ́riál Kwọt"} + other{"{0} Impẹ́riál Kwọt"} + } tablespoon{ dnam{"Tébulspun-dẹm"} one{"{0} Tébulspun"} @@ -1434,6 +1514,11 @@ pcm{ } } graphics{ + dot{ + dnam{"dọt"} + one{"{0} dọt"} + other{"{0} dọt"} + } dot-per-centimeter{ dnam{"Pọints fọ ích sẹntímíta"} one{"{0} PFIS"} @@ -1487,12 +1572,22 @@ pcm{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"Fátọm"} + one{"{0} fátọ"} + other{"{0} fátọ"} + } foot{ dnam{"Fut-dẹm"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"Fọ́lọng"} + one{"{0} fọl"} + other{"{0} fọl"} + } inch{ dnam{"Ínchis"} one{"{0} in"} @@ -1573,6 +1668,16 @@ pcm{ } } light{ + candela{ + dnam{"kd"} + one{"{0} kd"} + other{"{0} kd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lux"} one{"{0} lx"} @@ -1600,6 +1705,11 @@ pcm{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"Gren"} + one{"{0} gren"} + other{"{0} gren"} + } gram{ dnam{"Grams"} one{"{0} g"} @@ -1649,6 +1759,11 @@ pcm{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"Ston"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"Tọns"} one{"{0} tn"} @@ -1806,6 +1921,11 @@ pcm{ one{"{0}dr"} other{"{0}dr"} } + bushel{ + dnam{"Búshẹl"} + one{"{0} bú"} + other{"{0} bú"} + } centiliter{ dnam{"sl"} one{"{0} sl"} @@ -1863,6 +1983,26 @@ pcm{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"Dztspn"} + one{"{0} dztspn"} + other{"{0} dztspn"} + } + dessert-spoon-imperial{ + dnam{"Dztspn Imp"} + one{"{0} dzsp Imp"} + other{"{0} dzsp Imp"} + } + dram{ + dnam{"Drám Líkwid"} + one{"{0} Dram lí"} + other{"{0} Dram lí"} + } + drop{ + dnam{"Drọp"} + one{"{0} Drọp"} + other{"{0} Drọp"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1890,6 +2030,11 @@ pcm{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"Jigá"} + one{"{0} Jigá"} + other{"{0} Jigá"} + } liter{ dnam{"Lítas"} one{"{0} L"} @@ -1906,6 +2051,11 @@ pcm{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"Pinch"} + one{"{0} Pinch"} + other{"{0} Pinch"} + } pint{ dnam{"Paints"} one{"{0} pt"} @@ -1921,6 +2071,11 @@ pcm{ one{"{0} kwt"} other{"{0} kwt"} } + quart-imperial{ + dnam{"Kt Impẹ́riál"} + one{"{0} Kt Imp"} + other{"{0} Kt Imp"} + } tablespoon{ dnam{"Tbsp"} one{"{0} Tbsp"} diff --git a/intl/icu/source/data/unit/pl.txt b/intl/icu/source/data/unit/pl.txt index ac0f3d535c2e..9eadfe1f4718 100644 --- a/intl/icu/source/data/unit/pl.txt +++ b/intl/icu/source/data/unit/pl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -213,7 +213,7 @@ pl{ mile-per-gallon{ dnam{"mile na galon"} few{"{0} mile na galon"} - many{"{0} mili na galon"} + many{"{0} mil na galon"} one{"{0} mila na galon"} other{"{0} mili na galon"} } @@ -238,7 +238,7 @@ pl{ few{"{0} bity"} many{"{0} bitów"} one{"{0} bit"} - other{"{0} bitu"} + other{"{0} bita"} } byte{ dnam{"bajty"} @@ -252,7 +252,7 @@ pl{ few{"{0} gigabity"} many{"{0} gigabitów"} one{"{0} gigabit"} - other{"{0} gigabitu"} + other{"{0} gigabita"} } gigabyte{ dnam{"gigabajty"} @@ -266,7 +266,7 @@ pl{ few{"{0} kilobity"} many{"{0} kilobitów"} one{"{0} kilobit"} - other{"{0} kilobitu"} + other{"{0} kilobita"} } kilobyte{ dnam{"kilobajty"} @@ -280,7 +280,7 @@ pl{ few{"{0} megabity"} many{"{0} megabitów"} one{"{0} megabit"} - other{"{0} megabitu"} + other{"{0} megabita"} } megabyte{ dnam{"megabajty"} @@ -301,7 +301,7 @@ pl{ few{"{0} terabity"} many{"{0} terabitów"} one{"{0} terabit"} - other{"{0} terabitu"} + other{"{0} terabita"} } terabyte{ dnam{"terabajty"} @@ -320,12 +320,12 @@ pl{ other{"{0} wieku"} } day{ - dnam{"dni"} - few{"{0} dni"} - many{"{0} dni"} - one{"{0} dzień"} - other{"{0} dnia"} - per{"{0} na dzień"} + dnam{"doby"} + few{"{0} doby"} + many{"{0} dób"} + one{"{0} doba"} + other{"{0} doby"} + per{"{0} na dobę"} } decade{ dnam{"dekady"} @@ -591,6 +591,20 @@ pl{ one{"{0} decymetr"} other{"{0} decymetra"} } + earth-radius{ + dnam{"promień Ziemi"} + few{"{0} promienie Ziemi"} + many{"{0} promieni Ziemi"} + one{"{0} promień Ziemi"} + other{"{0} promienia Ziemi"} + } + fathom{ + dnam{"sążnie"} + few{"{0} sążnie"} + many{"{0} sążni"} + one{"{0} sążeń"} + other{"{0} sążnia"} + } foot{ dnam{"stopy"} few{"{0} stopy"} @@ -599,6 +613,13 @@ pl{ other{"{0} stopy"} per{"{0} na stopę"} } + furlong{ + dnam{"furlongi"} + few{"{0} furlongi"} + many{"{0} furlongów"} + one{"{0} furlong"} + other{"{0} furlonga"} + } inch{ dnam{"cale"} few{"{0} cale"} @@ -709,6 +730,20 @@ pl{ } } light{ + candela{ + dnam{"kandela"} + few{"{0} kandele"} + many{"{0} kandeli"} + one{"{0} kandela"} + other{"{0} kandeli"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumeny"} + many{"{0} lumenów"} + one{"{0} lumen"} + other{"{0} lumena"} + } lux{ dnam{"luksy"} few{"{0} luksy"} @@ -733,18 +768,25 @@ pl{ other{"{0} karata"} } dalton{ - dnam{"daltony"} - few{"{0} daltony"} - many{"{0} daltonów"} - one{"{0} dalton"} - other{"{0} daltona"} + dnam{"jednostki masy atomowej"} + few{"{0} jednostki masy atomowej"} + many{"{0} jednostek masy atomowej"} + one{"{0} jednostka masy atomowej"} + other{"{0} jednostki masy atomowej"} } earth-mass{ dnam{"masy Ziemi"} few{"{0} masy Ziemi"} many{"{0} mas Ziemi"} one{"{0} masa Ziemi"} - other{"{0} masa Ziemi"} + other{"{0} masy Ziemi"} + } + grain{ + dnam{"grany"} + few{"{0} grany"} + many{"{0} granów"} + one{"{0} gran"} + other{"{0} grana"} } gram{ dnam{"gramy"} @@ -813,6 +855,13 @@ pl{ one{"{0} masa Słońca"} other{"{0} masy Słońca"} } + stone{ + dnam{"kamień"} + few{"{0} kamienie"} + many{"{0} kamieni"} + one{"{0} kamień"} + other{"{0} kamienia"} + } ton{ dnam{"krótkie tony"} few{"{0} krótkie tony"} @@ -1010,7 +1059,7 @@ pl{ few{"{0} stopofunty"} many{"{0} stopofuntów"} one{"{0} stopofunt"} - other{"{0} stopofunt"} + other{"{0} stopofunta"} } } volume{ @@ -1028,6 +1077,13 @@ pl{ one{"{0} baryłka"} other{"{0} baryłki"} } + bushel{ + dnam{"buszle"} + few{"{0} buszle"} + many{"{0} buszli"} + one{"{0} buszel"} + other{"{0} buszla"} + } centiliter{ dnam{"centylitry"} few{"{0} centylitry"} @@ -1087,11 +1143,11 @@ pl{ other{"{0} jarda sześciennego"} } cup{ - dnam{"ćwierćkwarty"} - few{"{0} ćwierćkwarty"} - many{"{0} ćwierćkwart"} - one{"{0} ćwierćkwarta"} - other{"{0} ćwierćkwarty"} + dnam{"ćwierćkwarty amerykańske"} + few{"{0} ćwierćkwarty amerykańskie"} + many{"{0} ćwierćkwart amerykańskich"} + one{"{0} ćwierćkwarta amerykańska"} + other{"{0} ćwierćkwarty amerykańskiej"} } cup-metric{ dnam{"ćwierćkwarty metryczne"} @@ -1107,27 +1163,55 @@ pl{ one{"{0} decylitr"} other{"{0} decylitra"} } + dessert-spoon{ + dnam{"łyżki deserowe"} + few{"{0} łyżki deserowe"} + many{"{0} łyżek deserowych"} + one{"{0} łyżka deserowa"} + other{"{0} łyżki deserowej"} + } + dessert-spoon-imperial{ + dnam{"imperialna łyżeczka deserowa"} + few{"{0} imperialne łyżeczki deserowe"} + many{"{0} imperialnych łyżeczek deserowych"} + one{"{0} imperialna łyżeczka deserowa"} + other{"{0} imperialnej łyżeczki deserowej"} + } + dram{ + dnam{"drachmy płynu"} + few{"{0} drachmy płynu"} + many{"{0} drachm płynu"} + one{"{0} drachma płynu"} + other{"{0} drachmy płynu"} + } + drop{ + dnam{"krople"} + few{"{0} krople"} + many{"{0} kropli"} + one{"{0} kropla"} + other{"{0} kropli"} + } fluid-ounce{ - dnam{"uncje płynu"} - few{"{0} uncje płynu"} - many{"{0} uncji płynu"} - one{"{0} uncja płynu"} - other{"{0} uncji płynu"} + dnam{"uncje płynu amerykańskie"} + few{"{0} uncje płynu amerykańskie"} + many{"{0} uncji płynu amerykańskich"} + one{"{0} uncja płynu amerykańska"} + other{"{0} uncji płynu amerykańskiej"} } fluid-ounce-imperial{ - dnam{"uncje płynu imp."} - few{"{0} uncje płynu imp."} - many{"{0} uncji płynu imp."} - one{"{0} uncja płynu imp."} - other{"{0} uncji płynu imp."} + dnam{"uncje płynu angielskie"} + few{"{0} uncje płynu angielskie"} + many{"{0} uncji płynu angielskich"} + one{"{0} uncja płynu angielska"} + other{"{0} uncji płynu angielskiej"} } gallon{ - dnam{"galony"} - few{"{0} galony"} - many{"{0} galonów"} - one{"{0} galon"} - other{"{0} galona"} - per{"{0} na galon"} + dnam{"galony amerykańskie"} + few{"{0} galony amerykańskie"} + many{"{0} galonów amerykańskich"} + one{"{0} galon amerykański"} + other{"{0} galona amerykańskiego"} + per{"{0} na galon amerykański"} } gallon-imperial{ dnam{"galony angielskie"} @@ -1144,6 +1228,13 @@ pl{ one{"{0} hektolitr"} other{"{0} hektolitra"} } + jigger{ + dnam{"jiggery"} + few{"{0} jiggery"} + many{"{0} jiggerów"} + one{"{0} jigger"} + other{"{0} jiggera"} + } liter{ dnam{"litry"} few{"{0} litry"} @@ -1166,12 +1257,19 @@ pl{ one{"{0} mililitr"} other{"{0} mililitra"} } + pinch{ + dnam{"szczypty"} + few{"{0} szczypty"} + many{"{0} szczypt"} + one{"{0} szczypta"} + other{"{0} szczypty"} + } pint{ - dnam{"półkwarty"} - few{"{0} półkwarty"} - many{"{0} półkwart"} - one{"{0} półkwarta"} - other{"{0} półkwarty"} + dnam{"półkwarty amerykańskie"} + few{"{0} półkwarty amerykańskie"} + many{"{0} półkwart amerykańskich"} + one{"{0} półkwarta amerykańska"} + other{"{0} półkwarty amerykańskiej"} } pint-metric{ dnam{"półkwarty metryczne"} @@ -1181,11 +1279,18 @@ pl{ other{"{0} półkwarty metrycznej"} } quart{ - dnam{"kwarty"} - few{"{0} kwarty"} - many{"{0} kwart"} - one{"{0} kwarta"} - other{"{0} kwarty"} + dnam{"kwarty amerykańskie"} + few{"{0} kwarty amerykańskie"} + many{"{0} kwart amerykańskich"} + one{"{0} kwarta amerykańska"} + other{"{0} kwarty amerykańskiej"} + } + quart-imperial{ + dnam{"kwarty angielskie"} + few{"{0} kwarty angielskie"} + many{"{0} kwart angielskich"} + one{"{0} kwarta angielska"} + other{"{0} kwarty angielskiej"} } tablespoon{ dnam{"łyżki stołowe"} @@ -1245,7 +1350,7 @@ pl{ } duration{ day{ - dnam{"dzień"} + dnam{"doba"} few{"{0} d."} many{"{0} d."} one{"{0} d."} @@ -1442,9 +1547,6 @@ pl{ one{"{0} mol"} other{"{0} mola"} } - permillion{ - dnam{"części/milion"} - } permyriad{ few{"{0}‱"} many{"{0}‱"} @@ -1484,6 +1586,10 @@ pl{ } coordinate{ dnam{"kierunek"} + east{"{0}°E"} + north{"{0}°N"} + south{"{0}°S"} + west{"{0}°W"} } digital{ bit{ @@ -1510,12 +1616,12 @@ pl{ other{"{0} w."} } day{ - dnam{"dni"} - few{"{0} dni"} - many{"{0} dni"} - one{"{0} dzień"} - other{"{0} dnia"} - per{"{0}/dzień"} + dnam{"doby"} + few{"{0} doby"} + many{"{0} dób"} + one{"{0} doba"} + other{"{0} doby"} + per{"{0}/dobę"} } decade{ dnam{"dek"} @@ -1640,13 +1746,18 @@ pl{ one{"{0} j.a."} other{"{0} j.a."} } + fathom{ + few{"{0} fm"} + many{"{0} fm"} + one{"{0} fm"} + other{"{0} fm"} + } foot{ dnam{"stopy"} - few{"{0} stopy"} - many{"{0} stóp"} - one{"{0} stopa"} - other{"{0} stopy"} - per{"{0}/stopa"} + few{"{0} ft"} + many{"{0} ft"} + one{"{0} ft"} + other{"{0} ft"} } inch{ dnam{"cale"} @@ -1687,14 +1798,27 @@ pl{ other{"{0} R☉"} } yard{ - dnam{"jardy"} - few{"{0} jardy"} - many{"{0} jardów"} - one{"{0} jard"} - other{"{0} jarda"} + few{"{0} yd"} + many{"{0} yd"} + one{"{0} yd"} + other{"{0} yd"} } } light{ + candela{ + dnam{"cd"} + few{"{0} cd"} + many{"{0} cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + few{"{0} lm"} + many{"{0} lm"} + one{"{0} lm"} + other{"{0} lm"} + } solar-luminosity{ few{"{0} L☉"} many{"{0} L☉"} @@ -1711,7 +1835,6 @@ pl{ other{"{0} kt"} } dalton{ - dnam{"daltony"} few{"{0} Da"} many{"{0} Da"} one{"{0} Da"} @@ -1723,6 +1846,13 @@ pl{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"gr"} + few{"{0} gr"} + many{"{0} gr"} + one{"{0} gr"} + other{"{0} gr"} + } gram{ dnam{"g"} } @@ -1740,6 +1870,12 @@ pl{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + few{"{0} st"} + many{"{0} st"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"krótkie tony"} few{"{0} krótkie tony"} @@ -1775,8 +1911,22 @@ pl{ one{"{0} MPa"} other{"{0} MPa"} } + millimeter-ofhg{ + dnam{"mmHg"} + few{"{0} mmHg"} + many{"{0} mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} + } } speed{ + kilometer-per-hour{ + dnam{"km/godz."} + few{"{0} km/godz."} + many{"{0} km/godz."} + one{"{0} km/godz."} + other{"{0} km/godz."} + } knot{ dnam{"w."} few{"{0} w."} @@ -1868,11 +2018,11 @@ pl{ other{"{0} jarda sześc."} } cup{ - dnam{"ćwierćkwarty"} - few{"{0} ćwierćkwarty"} - many{"{0} ćwierćkwart"} - one{"{0} ćwierćkwarta"} - other{"{0} ćwierćkwarty"} + dnam{"ćwierćkwarty am."} + few{"{0} ćwierćkwarty am."} + many{"{0} ćwierćkwart am."} + one{"{0} ćwierćkwarta am."} + other{"{0} ćwierćkwarty am."} } cup-metric{ dnam{"ćwierćkwarty metr."} @@ -1888,27 +2038,55 @@ pl{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"ł. deser."} + few{"{0} ł. deser."} + many{"{0} ł. deser."} + one{"{0} ł. deser."} + other{"{0} ł. deser."} + } + dessert-spoon-imperial{ + dnam{"ł. deser. ang."} + few{"{0} ł. deser. ang."} + many{"{0} ł. deser. ang."} + one{"{0} ł. deser. ang."} + other{"{0} ł. deser. ang."} + } + dram{ + dnam{"drachmy"} + few{"{0} drachmy"} + many{"{0} drachm"} + one{"{0} drachma"} + other{"{0} drachmy"} + } + drop{ + dnam{"krople"} + few{"{0} krople"} + many{"{0} kropli"} + one{"{0} kropla"} + other{"{0} kropli"} + } fluid-ounce{ - dnam{"fl oz"} - few{"{0} fl oz"} - many{"{0} fl oz"} - one{"{0} fl oz"} - other{"{0} fl oz"} + dnam{"fl oz am."} + few{"{0} fl oz am."} + many{"{0} fl oz am."} + one{"{0} fl oz am."} + other{"{0} fl oz am."} } fluid-ounce-imperial{ - dnam{"fl oz imp."} - few{"{0} fl oz imp."} - many{"{0} fl oz imp."} - one{"{0} fl oz imp."} - other{"{0} fl oz imp."} + dnam{"fl oz ang."} + few{"{0} fl oz ang."} + many{"{0} fl oz ang."} + one{"{0} fl oz ang."} + other{"{0} fl oz ang."} } gallon{ - dnam{"gal"} - few{"{0} gal"} - many{"{0} gal"} - one{"{0} gal"} - other{"{0} gal"} - per{"{0}/gal"} + dnam{"gal am."} + few{"{0} gal am."} + many{"{0} gal am."} + one{"{0} gal am."} + other{"{0} gal am."} + per{"{0}/gal am."} } gallon-imperial{ dnam{"gal ang."} @@ -1925,6 +2103,13 @@ pl{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"jiggery"} + few{"{0} jiggery"} + many{"{0} jiggerów"} + one{"{0} jigger"} + other{"{0} jiggera"} + } liter{ dnam{"litry"} } @@ -1942,12 +2127,19 @@ pl{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"szcz."} + few{"{0} szcz."} + many{"{0} szcz."} + one{"{0} szcz."} + other{"{0} szcz."} + } pint{ - dnam{"półkwarty"} - few{"{0} półkwarty"} - many{"{0} półkwart"} - one{"{0} półkwarta"} - other{"{0} półkwarty"} + dnam{"półkwarty am."} + few{"{0} półkwarty am."} + many{"{0} półkwart am."} + one{"{0} półkwarta am."} + other{"{0} półkwarty am."} } pint-metric{ dnam{"półkwarty metr."} @@ -1957,11 +2149,18 @@ pl{ other{"{0} półkwarty metr."} } quart{ - dnam{"kwarty"} - few{"{0} kwarty"} - many{"{0} kwart"} - one{"{0} kwarta"} - other{"{0} kwarty"} + dnam{"kwarty am."} + few{"{0} kwarty am."} + many{"{0} kwart am."} + one{"{0} kwarta am."} + other{"{0} kwarty am."} + } + quart-imperial{ + dnam{"kwarty ang."} + few{"{0} kwarty ang."} + many{"{0} kwart ang."} + one{"{0} kwarta ang."} + other{"{0} kwarty ang."} } tablespoon{ dnam{"ł. stoł."} diff --git a/intl/icu/source/data/unit/ps.txt b/intl/icu/source/data/unit/ps.txt index 641fc3d1f41f..27db2cb14a45 100644 --- a/intl/icu/source/data/unit/ps.txt +++ b/intl/icu/source/data/unit/ps.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -253,7 +253,7 @@ ps{ other{"{0} لسيزې"} } microsecond{ - dnam{"مايکرو ثانيه"} + dnam{"مايکرو ثانيې"} one{"{0} μs"} other{"{0} μs"} } @@ -312,8 +312,8 @@ ps{ energy{ british-thermal-unit{ dnam{"بريتانوي ترمل يونټس"} - one{"{0} بريتانوي ترمل يونټ"} - other{"{0} بريتانوي ترمل يونټس"} + one{"برتانوي ترمل یونټ"} + other{"{0} برتانوي ترمل يونټس"} } calorie{ dnam{"کيلريز"} @@ -350,6 +350,9 @@ ps{ one{"{0} کيلو واټ ساعت"} other{"{0} کيلو واټ ساعته"} } + therm-us{ + dnam{"متحده ایالاتو ترمامونه"} + } } force{ newton{ @@ -386,6 +389,9 @@ ps{ } } graphics{ + em{ + dnam{"ټايپو ګرافيک em"} + } megapixel{ dnam{"ميګا فکسلسز"} } @@ -407,12 +413,21 @@ ps{ one{"{0} ډيسي متر"} other{"{0} ډيسي متره"} } + fathom{ + dnam{"فتومونه"} + one{"{0} fathom"} + other{"{0} فتومونه"} + } foot{ dnam{"فټه"} one{"{0} فټ"} other{"{0} فټه"} per{"{0}هر فټ"} } + furlong{ + one{"{0} fur"} + other{"{0} فرلانګونه"} + } inch{ dnam{"انچې"} one{"{0} انچ"} @@ -468,6 +483,8 @@ ps{ } parsec{ dnam{"پارسيکس"} + one{"{0} في ثانيه"} + other{"{0} في ثانيې"} } picometer{ dnam{"پيکو متره"} @@ -715,6 +732,10 @@ ps{ one{"{0} بېرل"} other{"{0} بېرلز"} } + bushel{ + one{"{0} bu"} + other{"{0} بوشیل"} + } centiliter{ dnam{"سنټي ليټرز"} one{"{0} سنټي ليټر"} @@ -767,6 +788,21 @@ ps{ one{"{0} ډيسي ليټر"} other{"{0} ډيسي ليټرز"} } + dessert-spoon{ + dnam{"مچ چمچ"} + one{"{0} dessert spoon"} + other{"{0} مچ چمچ"} + } + dram{ + dnam{"ډرام"} + one{"{0} ډرام"} + other{"{0} ډرام"} + } + drop{ + dnam{"څاڅک"} + one{"{0} څاڅک"} + other{"{0} څاڅک"} + } fluid-ounce-imperial{ dnam{"امپيريل مايع اونس"} one{"{0} امپيريل مايع اونس"} @@ -799,11 +835,20 @@ ps{ one{"{0} ملي ليټر"} other{"{0} ملي ليټرز"} } + pinch{ + dnam{"چنه"} + one{"{0} چنه"} + other{"{0} چنه"} + } quart{ dnam{"څلورمه"} one{"{0} څلورمه"} other{"{0} څلورمه"} } + quart-imperial{ + one{"{0} Imp. quart"} + other{"{0} Imp. quart"} + } tablespoon{ dnam{"د ميز کاچوغه"} } @@ -931,6 +976,7 @@ ps{ } volume{ liter{ + dnam{"لیټر"} one{"{0}L"} other{"{0}L"} } @@ -1291,6 +1337,11 @@ ps{ one{"{0} kWh"} other{"{0} kWh"} } + therm-us{ + dnam{"US تهرم"} + one{"{0} US therm"} + other{"{0} US therm"} + } } force{ newton{ @@ -1322,6 +1373,18 @@ ps{ other{"{0} MHz"} } } + graphics{ + dot-per-centimeter{ + dnam{"dpcm"} + } + em{ + dnam{"em"} + } + megapixel{ + one{"{0} MP"} + other{"{0} MP"} + } + } length{ astronomical-unit{ dnam{"au"} @@ -1339,12 +1402,26 @@ ps{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"فتومونه"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"فټه"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"فرلانګونه"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"انچې"} one{"{0} in"} @@ -1399,7 +1476,7 @@ ps{ other{"{0} nmi"} } parsec{ - dnam{"parsecs"} + dnam{"پارسيکس"} one{"{0} pc"} other{"{0} pc"} } @@ -1619,6 +1696,11 @@ ps{ barrel{ dnam{"بېرل"} } + bushel{ + dnam{"بوشیل"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cL"} one{"{0} cL"} @@ -1676,6 +1758,24 @@ ps{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + } + dram{ + dnam{"ډرام مایع"} + one{"{0} dram fl"} + other{"{0} dram fl"} + } + drop{ + dnam{"څاڅک"} + one{"{0} څاڅک"} + other{"{0} څاڅک"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1701,6 +1801,10 @@ ps{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + one{"{0} جګر"} + other{"{0} جګر"} + } liter{ dnam{"ليټرز"} one{"{0} L"} @@ -1717,6 +1821,11 @@ ps{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"چنه"} + one{"{0} چنه"} + other{"{0} چنه"} + } pint{ dnam{"pints"} one{"{0} pt"} @@ -1732,6 +1841,11 @@ ps{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/ps_PK.txt b/intl/icu/source/data/unit/ps_PK.txt index 2c42cb5b1356..dd6f22d5cf7f 100644 --- a/intl/icu/source/data/unit/ps_PK.txt +++ b/intl/icu/source/data/unit/ps_PK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps_PK{ - Version{"37"} units{ acceleration{ g-force{ diff --git a/intl/icu/source/data/unit/pt.txt b/intl/icu/source/data/unit/pt.txt index 4744d654a642..a6146abe4feb 100644 --- a/intl/icu/source/data/unit/pt.txt +++ b/intl/icu/source/data/unit/pt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -407,6 +407,11 @@ pt{ } } graphics{ + dot{ + dnam{"ponto"} + one{"{0} ponto"} + other{"{0} pts"} + } dot-per-centimeter{ dnam{"pontos por centímetro"} one{"{0} ponto por centímetro"} @@ -458,6 +463,11 @@ pt{ one{"{0} decímetro"} other{"{0} decímetros"} } + earth-radius{ + dnam{"raio terrestre"} + one{"{0} raio terrestre"} + other{"{0} raios terrestres"} + } fathom{ dnam{"braças"} one{"{0} braça"} @@ -539,7 +549,7 @@ pt{ } point{ dnam{"pontos"} - one{"{0} ponto"} + one{"{0} ponto tipográfico"} other{"{0} pontos"} } solar-radius{ @@ -554,6 +564,16 @@ pt{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candelas"} + } + lumen{ + dnam{"lúmen"} + one{"{0} lúmen"} + other{"{0} lúmens"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -581,6 +601,11 @@ pt{ one{"{0} massa terrestre"} other{"{0} massas terrestres"} } + grain{ + dnam{"grão"} + one{"{0} grão"} + other{"{0} grãos"} + } gram{ dnam{"gramas"} one{"{0} grama"} @@ -636,9 +661,9 @@ pt{ other{"{0} stones"} } ton{ - dnam{"toneladas"} - one{"{0} tonelada"} - other{"{0} toneladas"} + dnam{"toneladas americanas"} + one{"{0} tonelada americana"} + other{"{0} toneladas americanas"} } } power{ @@ -787,6 +812,11 @@ pt{ one{"{0} barril"} other{"{0} barris"} } + bushel{ + dnam{"bushels"} + one{"{0} bushel"} + other{"{0} bushels"} + } centiliter{ dnam{"centilitros"} one{"{0} centilitro"} @@ -844,6 +874,25 @@ pt{ one{"{0} decilitro"} other{"{0} decilitros"} } + dessert-spoon{ + dnam{"colher de sobremesa"} + one{"{0} colher de sobremesa"} + other{"{0} colheres de sobremesa"} + } + dessert-spoon-imperial{ + one{"{0} colher de sobremesa imperial"} + other{"{0} colheres de sobremesa imperiais"} + } + dram{ + dnam{"dracma"} + one{"{0} dracma líquido"} + other{"{0} dracmas líquidos"} + } + drop{ + dnam{"gota"} + one{"{0} gota"} + other{"{0} gotas"} + } fluid-ounce{ dnam{"onças fluidas"} one{"{0} onça fluida"} @@ -871,6 +920,11 @@ pt{ one{"{0} hectolitro"} other{"{0} hectolitros"} } + jigger{ + dnam{"dosador"} + one{"{0} dosador"} + other{"{0} dosadores"} + } liter{ dnam{"litros"} one{"{0} litro"} @@ -887,6 +941,11 @@ pt{ one{"{0} mililitro"} other{"{0} mililitros"} } + pinch{ + dnam{"pitada"} + one{"{0} pitada"} + other{"{0} pitadas"} + } pint{ dnam{"pints"} one{"{0} pint"} @@ -902,6 +961,11 @@ pt{ one{"{0} quarto"} other{"{0} quartos"} } + quart-imperial{ + dnam{"quarto imperial"} + one{"{0} quarto imperial"} + other{"{0} quartos imperiais"} + } tablespoon{ dnam{"colheres de sopa"} one{"{0} colher de sopa"} @@ -1389,6 +1453,11 @@ pt{ } } graphics{ + dot{ + dnam{"ponto"} + one{"{0} p"} + other{"{0} pts"} + } megapixel{ dnam{"megapixels"} } @@ -1471,6 +1540,11 @@ pt{ earth-mass{ dnam{"massas terrestres"} } + grain{ + dnam{"grão"} + one{"{0} grão"} + other{"{0} grãos"} + } gram{ dnam{"gramas"} } @@ -1492,7 +1566,7 @@ pt{ dnam{"stones"} } ton{ - dnam{"toneladas"} + dnam{"toneladas americanas"} one{"{0} tn"} other{"{0} tn"} } @@ -1559,6 +1633,9 @@ pt{ barrel{ dnam{"barril"} } + bushel{ + dnam{"bushels"} + } centiliter{ dnam{"cl"} one{"{0} cl"} @@ -1590,6 +1667,24 @@ pt{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"csb"} + one{"{0} csb"} + other{"{0} csb"} + } + dessert-spoon-imperial{ + dnam{"csb imp"} + one{"{0} csb imp"} + other{"{0} csb imp"} + } + dram{ + dnam{"dracma líquido"} + } + drop{ + dnam{"gota"} + one{"{0} gota"} + other{"{0} gotas"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -1612,6 +1707,11 @@ pt{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"dosador"} + one{"{0} dosador"} + other{"{0} dosadores"} + } liter{ dnam{"litros"} } @@ -1625,6 +1725,11 @@ pt{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"pitada"} + one{"{0} pitada"} + other{"{0} pitadas"} + } pint{ dnam{"pints"} } @@ -1636,6 +1741,11 @@ pt{ quart{ dnam{"qts"} } + quart-imperial{ + dnam{"impqt"} + one{"{0} impqt"} + other{"{0} impqt"} + } tablespoon{ dnam{"c. sopa"} one{"{0} c. sopa"} diff --git a/intl/icu/source/data/unit/pt_AO.txt b/intl/icu/source/data/unit/pt_AO.txt index 95cf1c6eeb25..c6fcc6bfab1f 100644 --- a/intl/icu/source/data/unit/pt_AO.txt +++ b/intl/icu/source/data/unit/pt_AO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_AO{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_CH.txt b/intl/icu/source/data/unit/pt_CH.txt index 3a679be16d07..67d661e786be 100644 --- a/intl/icu/source/data/unit/pt_CH.txt +++ b/intl/icu/source/data/unit/pt_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CH{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_CV.txt b/intl/icu/source/data/unit/pt_CV.txt index 6d4dd3a184a5..ebaaea839bb3 100644 --- a/intl/icu/source/data/unit/pt_CV.txt +++ b/intl/icu/source/data/unit/pt_CV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CV{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_GQ.txt b/intl/icu/source/data/unit/pt_GQ.txt index 7cbf7717a1ea..9364da966374 100644 --- a/intl/icu/source/data/unit/pt_GQ.txt +++ b/intl/icu/source/data/unit/pt_GQ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GQ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_GW.txt b/intl/icu/source/data/unit/pt_GW.txt index da37fbe5cb59..e28e46c16b08 100644 --- a/intl/icu/source/data/unit/pt_GW.txt +++ b/intl/icu/source/data/unit/pt_GW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GW{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_LU.txt b/intl/icu/source/data/unit/pt_LU.txt index ebead8d520fb..c402ea2ae5ed 100644 --- a/intl/icu/source/data/unit/pt_LU.txt +++ b/intl/icu/source/data/unit/pt_LU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_LU{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_MO.txt b/intl/icu/source/data/unit/pt_MO.txt index cf54f6259212..293d10b8cd3a 100644 --- a/intl/icu/source/data/unit/pt_MO.txt +++ b/intl/icu/source/data/unit/pt_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MO{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_MZ.txt b/intl/icu/source/data/unit/pt_MZ.txt index b99439ce7700..a8cc01a1b6e1 100644 --- a/intl/icu/source/data/unit/pt_MZ.txt +++ b/intl/icu/source/data/unit/pt_MZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MZ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_PT.txt b/intl/icu/source/data/unit/pt_PT.txt index cca555da9b81..11917e1685b0 100644 --- a/intl/icu/source/data/unit/pt_PT.txt +++ b/intl/icu/source/data/unit/pt_PT.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_PT{ - Version{"37"} units{ acceleration{ g-force{ @@ -134,6 +134,12 @@ pt_PT{ other{"{0} picómetros"} } } + light{ + lumen{ + one{"{0} lúmen"} + other{"{0} lúmenes"} + } + } mass{ earth-mass{ one{"{0} massa da Terra"} @@ -179,6 +185,18 @@ pt_PT{ one{"{0} chávena métrica"} other{"{0} chávenas métricas"} } + dessert-spoon-imperial{ + dnam{"colher de sobremesa imperial"} + } + dram{ + one{"{0} dracma"} + other{"{0} dracmas"} + } + jigger{ + dnam{"doseador"} + one{"{0} doseador"} + other{"{0} doseadores"} + } } } unitsNarrow{ @@ -601,6 +619,10 @@ pt_PT{ } } graphics{ + dot{ + one{"{0} p"} + other{"{0} p"} + } dot-per-inch{ dnam{"ppp"} one{"{0} ppp"} @@ -624,6 +646,10 @@ pt_PT{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + one{"{0} fth"} + other{"{0} fth"} + } inch{ dnam{"polegadas"} } @@ -760,21 +786,11 @@ pt_PT{ one{"{0} hPa"} other{"{0} hPa"} } - inch-ofhg{ - dnam{"in Hg"} - one{"{0} inHg"} - other{"{0} inHg"} - } millibar{ dnam{"mbar"} one{"{0} mb"} other{"{0} mb"} } - millimeter-ofhg{ - dnam{"mm Hg"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} - } pound-force-per-square-inch{ dnam{"psi"} one{"{0} psi"} @@ -862,6 +878,11 @@ pt_PT{ one{"{0} chám"} other{"{0} chám"} } + dram{ + dnam{"dracma fluido"} + one{"{0} dram fl"} + other{"{0} dram fl"} + } fluid-ounce-imperial{ dnam{"onças fluidas imp."} one{"{0} onça fluida imp."} @@ -873,6 +894,11 @@ pt_PT{ other{"{0} gal imp."} per{"{0}/gal imp."} } + jigger{ + dnam{"doseador"} + one{"{0} doseadores"} + other{"{0} doseadores"} + } liter{ one{"{0} l"} other{"{0} l"} @@ -890,6 +916,11 @@ pt_PT{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"quarto imp."} + one{"{0} quarto imp."} + other{"{0} quartos imp."} + } tablespoon{ dnam{"cs"} one{"{0} cs"} diff --git a/intl/icu/source/data/unit/pt_ST.txt b/intl/icu/source/data/unit/pt_ST.txt index e4321678d60b..ba0c09e92c58 100644 --- a/intl/icu/source/data/unit/pt_ST.txt +++ b/intl/icu/source/data/unit/pt_ST.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_ST{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/pt_TL.txt b/intl/icu/source/data/unit/pt_TL.txt index b3777b6af6af..0dafd096f317 100644 --- a/intl/icu/source/data/unit/pt_TL.txt +++ b/intl/icu/source/data/unit/pt_TL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_TL{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/qu.txt b/intl/icu/source/data/unit/qu.txt index e362da8cd5d1..2cff334abb0e 100644 --- a/intl/icu/source/data/unit/qu.txt +++ b/intl/icu/source/data/unit/qu.txt @@ -1,13 +1,19 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} ms{"m:ss"} } units{ + acceleration{ + meter-per-square-second{ + dnam{"metros por segundo cuadrado"} + other{"{0} metros por segundo cuadrado"} + } + } area{ acre{ dnam{"acre"} @@ -55,6 +61,21 @@ qu{ other{"{0} yarda cuadrada"} } } + compound{ + per{"{0} sapa {1}"} + } + concentr{ + permillion{ + dnam{"partes por millon"} + other{"{0} partes por millon"} + } + } + consumption{ + liter-per-100-kilometer{ + dnam{"litros por 100 kilometros"} + other{"{0} litros por 100 kilometros"} + } + } duration{ century{ dnam{"siglos"} @@ -109,10 +130,14 @@ qu{ year{ dnam{"wata"} other{"{0} wata"} - per{"{0} por wata"} + per{"{0} sapa wata"} } } graphics{ + dot{ + dnam{"chiku"} + other{"{0} chiku"} + } dot-per-centimeter{ dnam{"puntos por centímetro"} other{"{0} puntos por centímetro"} @@ -156,11 +181,23 @@ qu{ dnam{"decímetro"} other{"{0} decímetro"} } + earth-radius{ + dnam{"radio de la tierra"} + other{"{0} radio de la tierra"} + } + fathom{ + dnam{"fathoms"} + other{"{0} fathoms"} + } foot{ dnam{"pie"} other{"{0} pie"} per{"{0}/pie"} } + furlong{ + dnam{"furlongs"} + other{"{0} furlongs"} + } inch{ dnam{"pulgada"} other{"{0} pulgada"} @@ -225,6 +262,46 @@ qu{ other{"{0} yarda"} } } + light{ + candela{ + dnam{"candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + other{"{0} lumen"} + } + } + mass{ + grain{ + dnam{"grano"} + other{"{0} grano"} + } + stone{ + dnam{"catorce libras"} + other{"{0} catorce libras"} + } + } + pressure{ + inch-ofhg{ + dnam{"pulgadas por mercurio"} + other{"{0} pulgadas por mercurio"} + } + millimeter-ofhg{ + dnam{"milimetros de mercurio"} + other{"{0} milimetros de mercurio"} + } + pound-force-per-square-inch{ + dnam{"libras por pulgada cuadrada"} + other{"{0} libras por pulgada cuadrada"} + } + } + torque{ + pound-force-foot{ + dnam{"libras-pies"} + other{"{0} libras-pies"} + } + } volume{ acre-foot{ dnam{"acre-pie"} @@ -234,6 +311,10 @@ qu{ dnam{"barril"} other{"{0} barril"} } + bushel{ + dnam{"bushels"} + other{"{0} bushels"} + } centiliter{ dnam{"centilitro"} other{"{0} centilitro"} @@ -280,6 +361,22 @@ qu{ dnam{"decilitro"} other{"{0} decilitro"} } + dessert-spoon{ + dnam{"cuchara para postes"} + other{"{0} cuchara para postres"} + } + dessert-spoon-imperial{ + dnam{"Imp. cuchara para postres"} + other{"{0} Imp. cuchara para postres"} + } + dram{ + dnam{"trago"} + other{"{0} trago"} + } + drop{ + dnam{"gota"} + other{"{0} gota"} + } fluid-ounce{ dnam{"Onza líquida"} other{"{0} US Onza líquida"} @@ -302,6 +399,10 @@ qu{ dnam{"hectolitro"} other{"{0} hectolitro"} } + jigger{ + dnam{"medida"} + other{"{0} medida"} + } liter{ dnam{"litro"} other{"{0} litro"} @@ -315,6 +416,10 @@ qu{ dnam{"mililitro"} other{"{0} mililitro"} } + pinch{ + dnam{"pizca"} + other{"{0} pizca"} + } pint{ dnam{"pinta"} other{"{0} pinta"} @@ -327,6 +432,10 @@ qu{ dnam{"cuarto"} other{"{0} cuarto"} } + quart-imperial{ + dnam{"Imp. cuarta"} + other{"{0} Imp. cuarta"} + } tablespoon{ dnam{"cucharada"} other{"{0} cucharada"} @@ -393,4 +502,79 @@ qu{ } } } + unitsShort{ + acceleration{ + meter-per-square-second{ + dnam{"metros/sec²"} + } + } + concentr{ + permillion{ + dnam{"partes/millon"} + } + } + consumption{ + liter-per-100-kilometer{ + dnam{"L/100 km"} + other{"{0} L/100 km"} + } + } + graphics{ + dot{ + dnam{"punto"} + other{"{0} punto"} + } + } + length{ + fathom{ + dnam{"fathom"} + } + furlong{ + dnam{"furlong"} + } + } + mass{ + grain{ + dnam{"grano"} + other{"{0} grano"} + } + stone{ + dnam{"catorce libras"} + other{"{0} catorce libras"} + } + } + volume{ + bushel{ + dnam{"bushel"} + } + dessert-spoon{ + dnam{"cucharilla"} + other{"{0} cucharilla"} + } + dessert-spoon-imperial{ + dnam{"Imp cucharilla"} + other{"{0} Imp cucharilla"} + } + dram{ + dnam{"trago fluido"} + other{"{0} trago fluido"} + } + drop{ + dnam{"gota"} + other{"{0} gota"} + } + jigger{ + dnam{"medida"} + other{"{0} medida"} + } + pinch{ + dnam{"pizca"} + other{"{0} pizca"} + } + quart-imperial{ + dnam{"Imp cuarta"} + other{"{0} Imp. cuarta"} + } + } + } } diff --git a/intl/icu/source/data/unit/rm.txt b/intl/icu/source/data/unit/rm.txt index 524c80a588e9..d47356580a1c 100644 --- a/intl/icu/source/data/unit/rm.txt +++ b/intl/icu/source/data/unit/rm.txt @@ -1,106 +1,436 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rm{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} ms{"m:ss"} } units{ + digital{ + bit{ + dnam{"bits"} + one{"{0} bit"} + other{"{0} bits"} + } + byte{ + dnam{"bytes"} + one{"{0} byte"} + other{"{0} bytes"} + } + gigabit{ + dnam{"gigabits"} + one{"{0} gigabit"} + other{"{0} gigabits"} + } + gigabyte{ + dnam{"gigabytes"} + one{"{0} gigabyte"} + other{"{0} gigabytes"} + } + kilobit{ + dnam{"kilobits"} + one{"{0} kilobit"} + other{"{0} kilobits"} + } + kilobyte{ + dnam{"kilobytes"} + one{"{0} kilobyte"} + other{"{0} kilobytes"} + } + megabit{ + dnam{"megabits"} + one{"{0} megabit"} + other{"{0} megabits"} + } + megabyte{ + dnam{"megabytes"} + one{"{0} megabyte"} + other{"{0} megabytes"} + } + petabyte{ + dnam{"petabytes"} + one{"{0} petabyte"} + other{"{0} petabytes"} + } + terabit{ + dnam{"terabits"} + one{"{0} terabit"} + other{"{0} terabits"} + } + terabyte{ + dnam{"terabytes"} + one{"{0} terabyte"} + other{"{0} terabytes"} + } + } duration{ day{ + dnam{"dis"} one{"{0} di"} other{"{0} dis"} } hour{ + dnam{"uras"} one{"{0} ura"} other{"{0} uras"} } + millisecond{ + dnam{"millisecundas"} + one{"{0} millisecunda"} + other{"{0} millisecundas"} + } minute{ + dnam{"minutas"} one{"{0} minuta"} other{"{0} minutas"} + per{"{0} per minuta"} } month{ + dnam{"mais"} one{"{0} mais"} other{"{0} mais"} } second{ + dnam{"secundas"} one{"{0} secunda"} other{"{0} secundas"} + per{"{0} per secunda"} } week{ + dnam{"emnas"} one{"{0} emna"} other{"{0} emnas"} } year{ + dnam{"onns"} one{"{0} onn"} other{"{0} onns"} } } + graphics{ + pixel{ + dnam{"pixels"} + one{"{0} pixel"} + other{"{0} pixels"} + } + } + length{ + centimeter{ + dnam{"centimeters"} + one{"{0} centimeter"} + other{"{0} centimeters"} + } + kilometer{ + dnam{"kilometers"} + one{"{0} kilometer"} + other{"{0} kilometers"} + } + meter{ + dnam{"meters"} + one{"{0} meter"} + other{"{0} meters"} + } + millimeter{ + dnam{"millimeters"} + one{"{0} millimeter"} + other{"{0} millimeters"} + } + } + mass{ + gram{ + dnam{"grams"} + one{"{0} gram"} + other{"{0} grams"} + } + kilogram{ + dnam{"kilograms"} + one{"{0} kilogram"} + other{"{0} kilograms"} + } + } + speed{ + kilometer-per-hour{ + dnam{"kilometers per ura"} + one{"{0} kilometer per ura"} + other{"{0} kilometers per ura"} + } + } + temperature{ + celsius{ + dnam{"grads celsius"} + one{"{0} grad celsius"} + other{"{0} grads celsius"} + } + } + volume{ + liter{ + dnam{"liters"} + one{"{0} liter"} + other{"{0} liters"} + per{"{0} per liter"} + } + } } unitsNarrow{ duration{ day{ + dnam{"di"} one{"{0} dis"} other{"{0} dis"} } hour{ + dnam{"ura"} one{"{0} uras"} other{"{0} uras"} } + millisecond{ + dnam{"ms"} + one{"{0}ms"} + other{"{0}ms"} + } minute{ + dnam{"min"} one{"{0} mins."} other{"{0} mins."} } month{ + dnam{"mais"} one{"{0} mais"} other{"{0} mais"} } second{ + dnam{"sec"} one{"{0} secs."} other{"{0} secs."} } week{ + dnam{"emna"} one{"{0} emnas"} other{"{0} emnas"} } year{ + dnam{"onn"} one{"{0} onns"} other{"{0} onns"} } } + length{ + centimeter{ + dnam{"cm"} + one{"{0}cm"} + other{"{0}cm"} + } + kilometer{ + dnam{"km"} + one{"{0}km"} + other{"{0}km"} + } + meter{ + dnam{"meter"} + one{"{0}m"} + other{"{0}m"} + } + millimeter{ + dnam{"mm"} + one{"{0}mm"} + other{"{0}mm"} + } + } + mass{ + gram{ + dnam{"gram"} + one{"{0} g"} + other{"{0} g"} + } + kilogram{ + dnam{"kg"} + one{"{0} kg"} + other{"{0} kg"} + } + } + speed{ + kilometer-per-hour{ + dnam{"km/h"} + one{"{0} km/h"} + other{"{0} km/h"} + } + } + temperature{ + celsius{ + dnam{"°C"} + one{"{0}°C"} + other{"{0}°C"} + } + } + volume{ + liter{ + dnam{"liter"} + one{"{0} l"} + other{"{0} l"} + } + } } unitsShort{ + digital{ + bit{ + one{"{0} bit"} + other{"{0} bit"} + } + byte{ + one{"{0} byte"} + other{"{0} byte"} + } + gigabit{ + dnam{"Gbit"} + one{"{0} Gb"} + other{"{0} Gb"} + } + gigabyte{ + dnam{"GByte"} + one{"{0} GB"} + other{"{0} GB"} + } + kilobit{ + dnam{"kbit"} + one{"{0} kb"} + other{"{0} kb"} + } + kilobyte{ + dnam{"kByte"} + one{"{0} kB"} + other{"{0} kB"} + } + megabit{ + dnam{"Mbit"} + one{"{0} Mb"} + other{"{0} Mb"} + } + megabyte{ + dnam{"MByte"} + one{"{0} MB"} + other{"{0} MB"} + } + petabyte{ + dnam{"PByte"} + one{"{0} PB"} + other{"{0} PB"} + } + terabit{ + dnam{"Tbit"} + one{"{0} Tb"} + other{"{0} Tb"} + } + terabyte{ + dnam{"TByte"} + one{"{0} TB"} + other{"{0} TB"} + } + } duration{ day{ + dnam{"dis"} one{"{0} di"} other{"{0} dis"} } hour{ + dnam{"uras"} one{"{0} ura"} other{"{0} uras"} } + millisecond{ + dnam{"ms"} + one{"{0} ms"} + other{"{0} ms"} + } minute{ + dnam{"minutas"} one{"{0} min."} other{"{0} mins."} } month{ + dnam{"mais"} one{"{0} mais"} other{"{0} mais"} } second{ + dnam{"secundas"} one{"{0} sec."} other{"{0} secs."} } week{ + dnam{"emnas"} one{"{0} emna"} other{"{0} emnas"} } year{ + dnam{"onns"} one{"{0} onn"} other{"{0} onns"} } } + graphics{ + pixel{ + dnam{"pixels"} + one{"{0} px"} + other{"{0} px"} + } + } + length{ + centimeter{ + dnam{"cm"} + one{"{0} cm"} + other{"{0} cm"} + } + kilometer{ + dnam{"km"} + one{"{0} km"} + other{"{0} km"} + } + meter{ + dnam{"meters"} + one{"{0} m"} + other{"{0} m"} + } + millimeter{ + dnam{"mm"} + one{"{0} mm"} + other{"{0} mm"} + } + } + mass{ + gram{ + dnam{"grams"} + one{"{0} g"} + other{"{0} g"} + } + kilogram{ + dnam{"kg"} + one{"{0} kg"} + other{"{0} kg"} + } + } + speed{ + kilometer-per-hour{ + dnam{"km/ura"} + one{"{0} km/h"} + other{"{0} km/h"} + } + } + temperature{ + celsius{ + dnam{"°C"} + one{"{0} °C"} + other{"{0} °C"} + } + } + volume{ + liter{ + dnam{"liters"} + one{"{0} l"} + other{"{0} l"} + } + } } } diff --git a/intl/icu/source/data/unit/rn.txt b/intl/icu/source/data/unit/rn.txt index 5a9f4db59134..44771384b223 100644 --- a/intl/icu/source/data/unit/rn.txt +++ b/intl/icu/source/data/unit/rn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ro.txt b/intl/icu/source/data/unit/ro.txt index dbff2f5ad625..b2692de80cb6 100644 --- a/intl/icu/source/data/unit/ro.txt +++ b/intl/icu/source/data/unit/ro.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -479,8 +479,14 @@ ro{ } } graphics{ + dot{ + dnam{"punct"} + few{"{0} puncte"} + one{"{0} punct"} + other{"{0} de puncte"} + } dot-per-centimeter{ - dnam{"puncte pe centimeru"} + dnam{"puncte pe centimetru"} few{"{0} puncte pe centimetru"} one{"{0} punct pe centimetru"} other{"{0} de puncte pe centimetru"} @@ -539,6 +545,18 @@ ro{ one{"{0} decimetru"} other{"{0} de decimetri"} } + earth-radius{ + dnam{"rază terestră"} + few{"{0} raze terestre"} + one{"{0} rază terestră"} + other{"{0} de raze terestre"} + } + fathom{ + dnam{"fathomi"} + few{"{0} fathomi"} + one{"{0} fathom"} + other{"{0} de fathomi"} + } foot{ dnam{"picioare"} few{"{0} picioare"} @@ -546,6 +564,12 @@ ro{ other{"{0} de picioare"} per{"{0} pe picior"} } + furlong{ + dnam{"furlongi"} + few{"{0} furlongi"} + one{"{0} furlong"} + other{"{0} de furlongi"} + } inch{ dnam{"inchi"} few{"{0} inchi"} @@ -623,9 +647,9 @@ ro{ } point{ dnam{"puncte"} - few{"{0} puncte"} - one{"{0} punct"} - other{"{0} de puncte"} + few{"{0} puncte tipografice"} + one{"{0} punct tipografic"} + other{"{0} de puncte tipografice"} } solar-radius{ dnam{"raze solare"} @@ -641,6 +665,18 @@ ro{ } } light{ + candela{ + dnam{"candelă"} + few{"{0} candele"} + one{"{0} candelă"} + other{"{0} de candele"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumeni"} + one{"{0} lumen"} + other{"{0} de lumeni"} + } lux{ dnam{"lucși"} few{"{0} lucși"} @@ -673,6 +709,12 @@ ro{ one{"{0} masă terestră"} other{"{0} de mase terestre"} } + grain{ + dnam{"boabă"} + few{"{0} boabe"} + one{"{0} boabă"} + other{"{0} de boabe"} + } gram{ dnam{"grame"} few{"{0} grame"} @@ -731,6 +773,12 @@ ro{ one{"{0} masă solară"} other{"{0} de mase solare"} } + stone{ + dnam{"stone"} + few{"{0} stone"} + one{"{0} stone"} + other{"{0} de stone"} + } ton{ dnam{"tone scurte"} few{"{0} tone scurte"} @@ -917,6 +965,12 @@ ro{ one{"{0} baril"} other{"{0} de barili"} } + bushel{ + dnam{"banițe"} + few{"{0} banițe"} + one{"{0} baniță"} + other{"{0} de banițe"} + } centiliter{ dnam{"centilitri"} few{"{0} centilitri"} @@ -985,6 +1039,30 @@ ro{ one{"{0} decilitru"} other{"{0} de decilitri"} } + dessert-spoon{ + dnam{"lingură de desert"} + few{"{0} linguri de desert"} + one{"{0} lingură de desert"} + other{"{0} de linguri de desert"} + } + dessert-spoon-imperial{ + dnam{"Lingură de desert imperială"} + few{"{0} linguri de desert imperiale"} + one{"{0} lingură de desert imperială"} + other{"{0} de linguri de desert imperiale"} + } + dram{ + dnam{"dram lichid"} + few{"{0} drami lichizi"} + one{"{0} dram lichid"} + other{"{0} de drami lichizi"} + } + drop{ + dnam{"picătură"} + few{"{0} picături"} + one{"{0} picătură"} + other{"{0} de picături"} + } fluid-ounce{ dnam{"uncii lichide"} few{"{0} uncii lichide"} @@ -1017,6 +1095,12 @@ ro{ one{"{0} hectolitru"} other{"{0} de hectolitri"} } + jigger{ + dnam{"jigger"} + few{"{0} jiggere"} + one{"{0} jigger"} + other{"{0} de jiggere"} + } liter{ dnam{"litri"} few{"{0} litri"} @@ -1036,6 +1120,12 @@ ro{ one{"{0} mililitru"} other{"{0} de mililitri"} } + pinch{ + dnam{"vârf de cuțit"} + few{"{0} vârfuri de cuțit"} + one{"{0} vârf de cuțit"} + other{"{0} de vârfuri de cuțit"} + } pint{ dnam{"pinte"} few{"{0} pinte"} @@ -1054,6 +1144,12 @@ ro{ one{"{0} quart"} other{"{0} de quarte"} } + quart-imperial{ + dnam{"quart imperial"} + few{"{0} quarte imperiale"} + one{"{0} quart imperial"} + other{"{0} de quarte imperiale"} + } tablespoon{ dnam{"linguri"} few{"{0} linguri"} @@ -1997,6 +2093,12 @@ ro{ } } graphics{ + dot{ + dnam{"pct."} + few{"{0} pct."} + one{"{0} pct"} + other{"{0} de pct."} + } dot-per-centimeter{ dnam{"dpc"} few{"{0} dpc"} @@ -2033,6 +2135,9 @@ ro{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"fathomi"} + } foot{ dnam{"ft"} few{"{0} ft"} @@ -2040,6 +2145,9 @@ ro{ other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"furlongi"} + } inch{ dnam{"in"} few{"{0} in"} @@ -2161,6 +2269,12 @@ ro{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"boabă"} + few{"{0} boabe"} + one{"{0} boabă"} + other{"{0} boabe"} + } gram{ dnam{"grame"} few{"{0} g"} @@ -2390,6 +2504,9 @@ ro{ barrel{ dnam{"baril"} } + bushel{ + dnam{"banițe"} + } centiliter{ dnam{"cl"} few{"{0} cl"} @@ -2458,6 +2575,15 @@ ro{ one{"{0} dl"} other{"{0} dl"} } + dram{ + dnam{"dram lichid"} + } + drop{ + dnam{"picătură"} + few{"{0} picături"} + one{"{0} picătură"} + other{"{0} de picături"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -2490,6 +2616,9 @@ ro{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"jigger"} + } liter{ dnam{"litri"} few{"{0} l"} @@ -2509,6 +2638,12 @@ ro{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"vârf"} + few{"{0} vârfuri"} + one{"{0} vârf"} + other{"{0} de vârfuri"} + } pint{ dnam{"pinte"} few{"{0} pt"} diff --git a/intl/icu/source/data/unit/ro_MD.txt b/intl/icu/source/data/unit/ro_MD.txt index 7070a891fe84..8c06ef2da6e5 100644 --- a/intl/icu/source/data/unit/ro_MD.txt +++ b/intl/icu/source/data/unit/ro_MD.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro_MD{ - Version{"37"} unitsNarrow{ duration{ day{ diff --git a/intl/icu/source/data/unit/rof.txt b/intl/icu/source/data/unit/rof.txt index 7f57cbdf0865..589e60d591d4 100644 --- a/intl/icu/source/data/unit/rof.txt +++ b/intl/icu/source/data/unit/rof.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rof{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/root.txt b/intl/icu/source/data/unit/root.txt index 76d938f6ce0f..7ab7a03805e2 100644 --- a/intl/icu/source/data/unit/root.txt +++ b/intl/icu/source/data/unit/root.txt @@ -1,7 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"37"} + Version{"38.1"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -344,6 +345,10 @@ root{ } } graphics{ + dot{ + dnam{"dot"} + other{"{0} dot"} + } dot-per-centimeter{ dnam{"dpcm"} other{"{0} dpcm"} @@ -387,6 +392,10 @@ root{ dnam{"dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + other{"{0} R⊕"} + } fathom{ dnam{"fm"} other{"{0} fth"} @@ -465,6 +474,14 @@ root{ } } light{ + candela{ + dnam{"cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + other{"{0} lm"} + } lux{ dnam{"lx"} other{"{0} lx"} @@ -487,6 +504,10 @@ root{ dnam{"M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"grain"} + other{"{0} grain"} + } gram{ dnam{"gram"} other{"{0} g"} @@ -709,6 +730,22 @@ root{ dnam{"dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + other{"{0} dstspn Imp"} + } + dram{ + dnam{"dram fluid"} + other{"{0} dram fl"} + } + drop{ + dnam{"drop"} + other{"{0} drop"} + } fluid-ounce{ dnam{"US fl oz"} other{"{0} fl oz US"} @@ -731,6 +768,10 @@ root{ dnam{"hL"} other{"{0} hL"} } + jigger{ + dnam{"jigger"} + other{"{0} jigger"} + } liter{ dnam{"liter"} other{"{0} l"} @@ -744,6 +785,10 @@ root{ dnam{"mL"} other{"{0} mL"} } + pinch{ + dnam{"pinch"} + other{"{0} pinch"} + } pint{ dnam{"pt"} other{"{0} pt"} @@ -756,6 +801,10 @@ root{ dnam{"qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} other{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/ru.txt b/intl/icu/source/data/unit/ru.txt index a2d87641d702..54c30610f446 100644 --- a/intl/icu/source/data/unit/ru.txt +++ b/intl/icu/source/data/unit/ru.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -17,11 +17,11 @@ ru{ other{"{0} g"} } meter-per-square-second{ - dnam{"метры в секунду в квадрате"} - few{"{0} метра в секунду в квадрате"} - many{"{0} метров в секунду в квадрате"} - one{"{0} метр в секунду в квадрате"} - other{"{0} метра в секунду в квадрате"} + dnam{"метры на секунду в квадрате"} + few{"{0} метра на секунду в квадрате"} + many{"{0} метров на секунду в квадрате"} + one{"{0} метр на секунду в квадрате"} + other{"{0} метра на секунду в квадрате"} } } angle{ @@ -215,11 +215,11 @@ ru{ other{"{0} литра на километр"} } mile-per-gallon{ - dnam{"мили на галлон"} - few{"{0} мили на галлон"} - many{"{0} миль на галлон"} - one{"{0} миля на галлон"} - other{"{0} мили на галлон"} + dnam{"мили на амер. галлон"} + few{"{0} мили на амер. галлон"} + many{"{0} миль на амер. галлон"} + one{"{0} миля на амер. галлон"} + other{"{0} мили на амер. галлон"} } mile-per-gallon-imperial{ dnam{"мили на имп. галлон"} @@ -461,11 +461,11 @@ ru{ other{"{0} электронвольта"} } foodcalorie{ - dnam{"калории"} - few{"{0} калории"} - many{"{0} калорий"} - one{"{0} калория"} - other{"{0} калории"} + dnam{"килокалории"} + few{"{0} килокалории"} + many{"{0} килокалорий"} + one{"{0} килокалория"} + other{"{0} килокалории"} } joule{ dnam{"джоули"} @@ -550,6 +550,13 @@ ru{ } } graphics{ + dot{ + dnam{"точка"} + few{"{0} точки"} + many{"{0} точек"} + one{"{0} точка"} + other{"{0} точки"} + } dot-per-centimeter{ dnam{"точки на сантиметр"} few{"{0} точки на сантиметр"} @@ -623,6 +630,13 @@ ru{ one{"{0} дециметр"} other{"{0} дециметра"} } + earth-radius{ + dnam{"земной радиус"} + few{"{0} земных радиуса"} + many{"{0} земных радиусов"} + one{"{0} земной радиус"} + other{"{0} земного радиуса"} + } fathom{ dnam{"морские сажени"} few{"{0} морских сажени"} @@ -755,6 +769,20 @@ ru{ } } light{ + candela{ + dnam{"кандела"} + few{"{0} канделы"} + many{"{0} кандел"} + one{"{0} кандела"} + other{"{0} канделы"} + } + lumen{ + dnam{"люмен"} + few{"{0} люмена"} + many{"{0} люменов"} + one{"{0} люмен"} + other{"{0} люмена"} + } lux{ dnam{"люксы"} few{"{0} люкса"} @@ -792,6 +820,13 @@ ru{ one{"{0} масса Земли"} other{"{0} массы Земли"} } + grain{ + dnam{"гран"} + few{"{0} грана"} + many{"{0} гранов"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"граммы"} few{"{0} грамма"} @@ -1037,10 +1072,10 @@ ru{ } generic{ dnam{"°"} - few{"{0}°"} - many{"{0}°"} - one{"{0}°"} - other{"{0}°"} + few{"{0} градуса"} + many{"{0} градусов"} + one{"{0} градус"} + other{"{0} градуса"} } kelvin{ dnam{"кельвины"} @@ -1081,6 +1116,13 @@ ru{ one{"{0} баррель"} other{"{0} барреля"} } + bushel{ + dnam{"бушели"} + few{"{0} бушеля"} + many{"{0} бушелей"} + one{"{0} бушель"} + other{"{0} бушеля"} + } centiliter{ dnam{"сантилитры"} few{"{0} сантилитра"} @@ -1140,11 +1182,11 @@ ru{ other{"{0} кубического ярда"} } cup{ - dnam{"чашки"} - few{"{0} чашки"} - many{"{0} чашек"} - one{"{0} чашка"} - other{"{0} чашки"} + dnam{"амер. чашки"} + few{"{0} амер. чашки"} + many{"{0} амер. чашек"} + one{"{0} амер. чашка"} + other{"{0} амер. чашки"} } cup-metric{ dnam{"метрические чашки"} @@ -1160,27 +1202,54 @@ ru{ one{"{0} децилитр"} other{"{0} децилитра"} } + dessert-spoon{ + dnam{"десертная ложка"} + few{"{0} десертные ложки"} + many{"{0} десертных ложек"} + one{"{0} десертная ложка"} + other{"{0} десертной ложки"} + } + dessert-spoon-imperial{ + dnam{"имп. десертная ложка"} + few{"{0} имп. десертные ложки"} + many{"{0} имп. десертных ложек"} + one{"{0} имп. десертная ложка"} + other{"{0} имп. десертной ложки"} + } + dram{ + few{"{0} жидкие драхмы"} + many{"{0} жидких драхм"} + one{"{0} жидкая драхма"} + other{"{0} жидкой драхмы"} + } + drop{ + dnam{"капля"} + few{"{0} капли"} + many{"{0} капель"} + one{"{0} капля"} + other{"{0} капли"} + } fluid-ounce{ - dnam{"жидкие унции"} - few{"{0} жидкие унции"} - many{"{0} жидких унций"} - one{"{0} жидкая унция"} - other{"{0} жидкой унции"} + dnam{"амер. жидкие унции"} + few{"{0} амер. жидкие унции"} + many{"{0} амер. жидких унций"} + one{"{0} амер. жидкая унция"} + other{"{0} амер. жидкой унции"} } fluid-ounce-imperial{ - dnam{"английские жидкие унции"} - few{"{0} английские жидкие унции"} - many{"{0} английских жидких унций"} - one{"{0} английская жидкая унция"} - other{"{0} английской жидкой унции"} + dnam{"имп. жидкие унции"} + few{"{0} имп. жидкие унции"} + many{"{0} имп. жидких унций"} + one{"{0} имп. жидкая унция"} + other{"{0} имп. жидкой унции"} } gallon{ - dnam{"галлоны"} - few{"{0} галлона"} - many{"{0} галлонов"} - one{"{0} галлон"} - other{"{0} галлона"} - per{"{0} на галлон"} + dnam{"амер. галлоны"} + few{"{0} амер. галлона"} + many{"{0} амер. галлонов"} + one{"{0} амер. галлон"} + other{"{0} амер. галлона"} + per{"{0} на амер. галлон"} } gallon-imperial{ dnam{"имп. галлоны"} @@ -1197,6 +1266,13 @@ ru{ one{"{0} гектолитр"} other{"{0} гектолитра"} } + jigger{ + dnam{"джиггер"} + few{"{0} джиггера"} + many{"{0} джиггеров"} + one{"{0} джиггер"} + other{"{0} джиггера"} + } liter{ dnam{"литры"} few{"{0} литра"} @@ -1219,12 +1295,19 @@ ru{ one{"{0} миллилитр"} other{"{0} миллилитра"} } + pinch{ + dnam{"щепотка"} + few{"{0} щепотки"} + many{"{0} щепот."} + one{"{0} щепотка"} + other{"{0} щепотки"} + } pint{ - dnam{"пинты"} - few{"{0} пинты"} - many{"{0} пинт"} - one{"{0} пинта"} - other{"{0} пинты"} + dnam{"амер. пинты"} + few{"{0} амер. пинты"} + many{"{0} амер. пинт"} + one{"{0} амер. пинта"} + other{"{0} амер. пинты"} } pint-metric{ dnam{"метрические пинты"} @@ -1234,11 +1317,18 @@ ru{ other{"{0} метрической пинты"} } quart{ - dnam{"кварты"} - few{"{0} кварты"} - many{"{0} кварт"} - one{"{0} кварта"} - other{"{0} кварты"} + dnam{"амер. кварты"} + few{"{0} амер. кварты"} + many{"{0} амер. кварт"} + one{"{0} амер. кварта"} + other{"{0} амер. кварты"} + } + quart-imperial{ + dnam{"имп. кварта"} + few{"{0} имп. кварты"} + many{"{0} имп. кварт"} + one{"{0} имп. кварта"} + other{"{0} имп. кварты"} } tablespoon{ dnam{"столовые ложки"} @@ -2021,11 +2111,11 @@ ru{ other{"{0} л/км"} } mile-per-gallon{ - dnam{"миль/гал"} - few{"{0} мили/гал"} - many{"{0} миль/гал"} - one{"{0} миля/гал"} - other{"{0} мили/гал"} + dnam{"миль/ам. гал"} + few{"{0} мили/ам. гал"} + many{"{0} миль/ам. гал"} + one{"{0} миля/ам. гал"} + other{"{0} мили/ам. гал"} } mile-per-gallon-imperial{ dnam{"мили/имп. гал"} @@ -2167,11 +2257,11 @@ ru{ other{"{0} мс"} } minute{ - dnam{"мин."} - few{"{0} мин."} - many{"{0} мин."} - one{"{0} мин."} - other{"{0} мин."} + dnam{"мин"} + few{"{0} мин"} + many{"{0} мин"} + one{"{0} мин"} + other{"{0} мин"} per{"{0}/мин"} } month{ @@ -2190,11 +2280,11 @@ ru{ other{"{0} нс"} } second{ - dnam{"сек."} - few{"{0} сек."} - many{"{0} сек."} - one{"{0} сек."} - other{"{0} сек."} + dnam{"с"} + few{"{0} с"} + many{"{0} с"} + one{"{0} с"} + other{"{0} с"} per{"{0}/c"} } week{ @@ -2267,11 +2357,11 @@ ru{ other{"{0} эВ"} } foodcalorie{ - dnam{"кал"} - few{"{0} кал"} - many{"{0} кал"} - one{"{0} кал"} - other{"{0} кал"} + dnam{"ккал"} + few{"{0} ккал"} + many{"{0} ккал"} + one{"{0} ккал"} + other{"{0} ккал"} } joule{ dnam{"Дж"} @@ -2356,6 +2446,13 @@ ru{ } } graphics{ + dot{ + dnam{"тчк"} + few{"{0} тчк"} + many{"{0} тчк"} + one{"{0} тчк"} + other{"{0} тчк"} + } dot-per-centimeter{ dnam{"тчк/см"} few{"{0} тчк/см"} @@ -2490,11 +2587,11 @@ ru{ other{"{0} мкм"} } mile{ - dnam{"мили"} - few{"{0} мили"} - many{"{0} миль"} - one{"{0} миля"} - other{"{0} мили"} + dnam{"ми"} + few{"{0} ми"} + many{"{0} ми"} + one{"{0} ми"} + other{"{0} ми"} } mile-scandinavian{ dnam{"ск. мил."} @@ -2561,6 +2658,20 @@ ru{ } } light{ + candela{ + dnam{"кд"} + few{"{0} кд"} + many{"{0} кд"} + one{"{0} кд"} + other{"{0} кд"} + } + lumen{ + dnam{"лм"} + few{"{0} лм"} + many{"{0} лм"} + one{"{0} лм"} + other{"{0} лм"} + } lux{ dnam{"лк"} few{"{0} лк"} @@ -2584,6 +2695,13 @@ ru{ one{"{0} Да"} other{"{0} Да"} } + grain{ + dnam{"гран"} + few{"{0} грана"} + many{"{0} гранов"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"г"} few{"{0} г"} @@ -2637,12 +2755,12 @@ ru{ other{"{0} тр. унц."} } pound{ - dnam{"фунт."} - few{"{0} фунт."} - many{"{0} фунт."} - one{"{0} фунт."} - other{"{0} фунт."} - per{"{0}/фунт"} + dnam{"фнт"} + few{"{0} фнт"} + many{"{0} фнт"} + one{"{0} фнт"} + other{"{0} фнт"} + per{"{0}/фнт"} } stone{ dnam{"стоуны"} @@ -2798,11 +2916,11 @@ ru{ other{"{0} м/с"} } mile-per-hour{ - dnam{"мили/час"} - few{"{0} мили/час"} - many{"{0} миль/час"} - one{"{0} миля/час"} - other{"{0} мили/час"} + dnam{"ми/ч"} + few{"{0} ми/ч"} + many{"{0} ми/ч"} + one{"{0} ми/ч"} + other{"{0} ми/ч"} } } temperature{ @@ -2866,6 +2984,13 @@ ru{ one{"{0} барр."} other{"{0} барр."} } + bushel{ + dnam{"буш."} + few{"{0} буш."} + many{"{0} буш."} + one{"{0} буш."} + other{"{0} буш."} + } centiliter{ dnam{"сл"} few{"{0} сл"} @@ -2925,11 +3050,11 @@ ru{ other{"{0} ярд³"} } cup{ - dnam{"чаш."} - few{"{0} чаш."} - many{"{0} чаш."} - one{"{0} чаш."} - other{"{0} чаш."} + dnam{"ам. чаш."} + few{"{0} ам. чаш."} + many{"{0} ам. чаш."} + one{"{0} ам. чаш."} + other{"{0} ам. чаш."} } cup-metric{ dnam{"м. чаш."} @@ -2945,27 +3070,55 @@ ru{ one{"{0} дл"} other{"{0} дл"} } + dessert-spoon{ + dnam{"дес. л."} + few{"{0} дес. л."} + many{"{0} дес. л."} + one{"{0} дес. л."} + other{"{0} дес. л."} + } + dessert-spoon-imperial{ + dnam{"имп. дес. л."} + few{"{0} имп. дес. л."} + many{"{0} имп. дес. л."} + one{"{0} имп. дес. л."} + other{"{0} имп. дес. л."} + } + dram{ + dnam{"жидк. др."} + few{"{0} жидк. др."} + many{"{0} жидк. др."} + one{"{0} жидк. др."} + other{"{0} жидк. др."} + } + drop{ + dnam{"кап."} + few{"{0} кап."} + many{"{0} кап."} + one{"{0} кап."} + other{"{0} кап."} + } fluid-ounce{ - dnam{"жидк. унц."} - few{"{0} жидк. унц."} - many{"{0} жидк. унц."} - one{"{0} жидк. унц."} - other{"{0} жидк. унц."} + dnam{"ам. жидк. унц."} + few{"{0} ам. жидк. унц."} + many{"{0} ам. жидк. унц."} + one{"{0} ам. жидк. унц."} + other{"{0} ам. жидк. унц."} } fluid-ounce-imperial{ - dnam{"англ. жидк. унц."} - few{"{0} англ. жидк. унц."} - many{"{0} англ. жидк. унц."} - one{"{0} англ. жидк. унц."} - other{"{0} англ. жидк. унц."} + dnam{"имп. жидк. унц."} + few{"{0} имп. жидк. унц."} + many{"{0} имп. жидк. унц."} + one{"{0} имп. жидк. унц."} + other{"{0} имп. жидк. унц."} } gallon{ - dnam{"гал."} - few{"{0} гал."} - many{"{0} гал."} - one{"{0} гал."} - other{"{0} гал."} - per{"{0}/гал"} + dnam{"ам. гал."} + few{"{0} ам. гал."} + many{"{0} ам. гал."} + one{"{0} ам. гал."} + other{"{0} ам. гал."} + per{"{0}/ам. гал"} } gallon-imperial{ dnam{"имп. гал."} @@ -2982,6 +3135,13 @@ ru{ one{"{0} гл"} other{"{0} гл"} } + jigger{ + dnam{"джиггер"} + few{"{0} джиггера"} + many{"{0} джиггеров"} + one{"{0} джиггер"} + other{"{0} джиггера"} + } liter{ dnam{"л"} few{"{0} л"} @@ -3004,12 +3164,19 @@ ru{ one{"{0} мл"} other{"{0} мл"} } + pinch{ + dnam{"щепот."} + few{"{0} щепот."} + many{"{0} щепот."} + one{"{0} щепот."} + other{"{0} щепот."} + } pint{ - dnam{"пинт."} - few{"{0} пинт."} - many{"{0} пинт."} - one{"{0} пинт."} - other{"{0} пинт."} + dnam{"ам. пинт."} + few{"{0} ам. пинт."} + many{"{0} ам. пинт."} + one{"{0} ам. пинт."} + other{"{0} ам. пинт."} } pint-metric{ dnam{"мпт"} @@ -3019,11 +3186,18 @@ ru{ other{"{0} мпт"} } quart{ - dnam{"кварт."} - few{"{0} кварт."} - many{"{0} кварт."} - one{"{0} кварт."} - other{"{0} кварт."} + dnam{"ам. кварт."} + few{"{0} ам. кварт."} + many{"{0} ам. кварт."} + one{"{0} ам. кварт."} + other{"{0} ам. кварт."} + } + quart-imperial{ + dnam{"имп. кварт."} + few{"{0} имп. кварт."} + many{"{0} имп. кварт."} + one{"{0} имп. кварт."} + other{"{0} имп. кварт."} } tablespoon{ dnam{"ст. л."} diff --git a/intl/icu/source/data/unit/rw.txt b/intl/icu/source/data/unit/rw.txt index 6b142b14bbe6..5c4ad25e38c2 100644 --- a/intl/icu/source/data/unit/rw.txt +++ b/intl/icu/source/data/unit/rw.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rw{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/rwk.txt b/intl/icu/source/data/unit/rwk.txt index ab5706fb9c6c..d2062467b43b 100644 --- a/intl/icu/source/data/unit/rwk.txt +++ b/intl/icu/source/data/unit/rwk.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rwk{ - Version{"37"} } diff --git a/intl/icu/source/data/curr/nds.txt b/intl/icu/source/data/unit/sa.txt similarity index 63% rename from intl/icu/source/data/curr/nds.txt rename to intl/icu/source/data/unit/sa.txt index ac58836f6f00..2d4f2629872a 100644 --- a/intl/icu/source/data/curr/nds.txt +++ b/intl/icu/source/data/unit/sa.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds{ - Version{"37"} +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +sa{ } diff --git a/intl/icu/source/data/unit/sah.txt b/intl/icu/source/data/unit/sah.txt index ddb5373e26d5..1b51e7f3d8c5 100644 --- a/intl/icu/source/data/unit/sah.txt +++ b/intl/icu/source/data/unit/sah.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sah{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/saq.txt b/intl/icu/source/data/unit/saq.txt index 1aa6942d2d51..781713d8d1f6 100644 --- a/intl/icu/source/data/unit/saq.txt +++ b/intl/icu/source/data/unit/saq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml saq{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sat.txt b/intl/icu/source/data/unit/sat.txt index ded59452dad9..7ee57194fb5e 100644 --- a/intl/icu/source/data/unit/sat.txt +++ b/intl/icu/source/data/unit/sat.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sat_IN.txt b/intl/icu/source/data/unit/sat_IN.txt index c4976b4d7f96..15af3290b576 100644 --- a/intl/icu/source/data/unit/sat_IN.txt +++ b/intl/icu/source/data/unit/sat_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_IN{ "%%ALIAS"{"sat_Olck_IN"} } diff --git a/intl/icu/source/data/unit/sat_Olck.txt b/intl/icu/source/data/unit/sat_Olck.txt index 0d7225f984f0..f09b6a0014dd 100644 --- a/intl/icu/source/data/unit/sat_Olck.txt +++ b/intl/icu/source/data/unit/sat_Olck.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_Olck{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sat_Olck_IN.txt b/intl/icu/source/data/unit/sat_Olck_IN.txt index 8bda43c4ea7c..0a44bdb50245 100644 --- a/intl/icu/source/data/unit/sat_Olck_IN.txt +++ b/intl/icu/source/data/unit/sat_Olck_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sbp.txt b/intl/icu/source/data/unit/sbp.txt index b283c92989f1..6c2e085d6d6f 100644 --- a/intl/icu/source/data/unit/sbp.txt +++ b/intl/icu/source/data/unit/sbp.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sbp{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sd.txt b/intl/icu/source/data/unit/sd.txt index 8b55e19a5870..85924ae334cd 100644 --- a/intl/icu/source/data/unit/sd.txt +++ b/intl/icu/source/data/unit/sd.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -16,13 +16,13 @@ sd{ } meter-per-square-second{ dnam{"ميٽر في سيڪنڊ اسڪوائر"} - one{"{0} m/s²"} + one{"{0} ميٽر في سيڪنڊ اسڪوائر"} other{"{0} ميٽر في سيڪنڊ اسڪوائر"} } } angle{ arc-minute{ - dnam{"آرڪ منٽز"} + dnam{"آرڪ منٽس"} one{"{0} آرڪ منٽز"} other{"{0} آرڪ منٽز"} } @@ -105,7 +105,7 @@ sd{ } } compound{ - per{"في {1} تي {0}"} + per{"{0} في {1}"} times{"{0}⋅{1}"} } concentr{ @@ -141,7 +141,7 @@ sd{ } permillion{ dnam{"حصا في ملين"} - one{"{0} حصا في ملين"} + one{"{0} حصو في ملين"} other{"{0} حصا في ملين"} } permyriad{ @@ -153,7 +153,7 @@ sd{ consumption{ liter-per-100-kilometer{ dnam{"ليٽرز في 100 ڪلو ميٽر"} - one{"{0} L/100km"} + one{"{0} ليٽر في 100 ڪلوميٽر"} other{"{0} ليٽرز في 100 ڪلو ميٽر"} } liter-per-kilometer{ @@ -188,7 +188,7 @@ sd{ byte{ dnam{"بائيٽز"} one{"{0} بائيٽ"} - other{"{0} بائيٽز"} + other{"{0} بائيٽس"} } gigabit{ dnam{"گيگا بٽز"} @@ -201,7 +201,7 @@ sd{ other{"{0} گيگا بائيٽز"} } kilobit{ - dnam{"ڪلو بٽز"} + dnam{"ڪلو بٽس"} one{"{0} ڪلو بٽز"} other{"{0} ڪلو بٽز"} } @@ -312,7 +312,6 @@ sd{ other{"{0} ایمپئیر"} } milliampere{ - dnam{"ملي ايمپئير"} one{"{0} ملي ايمپئير"} other{"{0} ملي ايمپئير"} } @@ -324,7 +323,7 @@ sd{ volt{ dnam{"وولٽز"} one{"{0} وولٽ"} - other{"{0} وولٽز"} + other{"{0} وولٽس"} } } energy{ @@ -365,7 +364,7 @@ sd{ } kilowatt-hour{ dnam{"ڪلو واٽ في ڪلاڪ"} - one{"{0} ڪلو واٽ في ڪلڪ"} + one{"{0} ڪلو واٽ في ڪلاڪ"} other{"{0} ڪلو واٽ في ڪلڪ"} } therm-us{ @@ -425,7 +424,7 @@ sd{ other{"{0} ems"} } megapixel{ - dnam{"ميگا پگزلس"} + dnam{"ميگا پڪسلز"} one{"{0} ميگا پگزل"} other{"{0} ميگا پگزلس"} } @@ -548,6 +547,11 @@ sd{ } } light{ + lumen{ + dnam{"ليومن"} + one{"{0} ليومن"} + other{"{0} ليومن"} + } lux{ dnam{"لڪس"} one{"{0} لڪس"} @@ -575,6 +579,11 @@ sd{ one{"{0} ارٿ ماس"} other{"{0} ارٿ ماسز"} } + grain{ + dnam{"گرين"} + one{"{0} گرين"} + other{"{0} گرين"} + } gram{ dnam{"گرامَ"} one{"{0} گرام"} @@ -642,7 +651,7 @@ sd{ other{"{0} هارس پاور"} } kilowatt{ - dnam{"ڪلو واٽز"} + dnam{"ڪلو واٽس"} one{"{0} ڪلو واٽ"} other{"{0} ڪلو واٽز"} } @@ -680,7 +689,7 @@ sd{ } inch-ofhg{ dnam{"مرڪري جا انچز"} - one{"مرڪري جا {0} انچز"} + one{"مرڪري جو {0} انچ"} other{"مرڪري جا {0} انچز"} } kilopascal{ @@ -710,7 +719,7 @@ sd{ } pound-force-per-square-inch{ dnam{"پائونڊز في اسڪوائر انچ"} - one{"{0} psi"} + one{"{0} پائونڊ في اسڪوائر انچ"} other{"{0} پائونڊز في اسڪوائر انچ"} } } @@ -1001,14 +1010,14 @@ sd{ mass{ gram{ dnam{"گرام"} - one{"{0}گـ."} - other{"{0}گـ."} + one{"{0}g"} + other{"{0}g"} per{"{0}/گـ."} } kilogram{ - dnam{"ڪ.گـ."} - one{"{0}ڪ.گـ."} - other{"{0}ڪ.گـ."} + dnam{"kg"} + one{"{0}kg"} + other{"{0} kg"} per{"{0}/ڪ.گـ."} } metric-ton{ @@ -1031,7 +1040,7 @@ sd{ } temperature{ celsius{ - dnam{"ڊگري سيلسيس"} + dnam{"°C"} one{"{0}°C"} other{"{0}°C"} } @@ -1177,9 +1186,8 @@ sd{ other{"{0}‰"} } permillion{ - dnam{"حصا في ملين"} - one{"{0} حصا في ملين"} - other{"{0} حصا في ملين"} + one{"{0} ppm"} + other{"{0} ppm"} } permyriad{ dnam{"پيرمائيرڊ"} @@ -1200,13 +1208,13 @@ sd{ } mile-per-gallon{ dnam{"ميل في گيلن"} - one{"{0} ميل في گيلن"} - other{"{0} ميل في گيلن"} + one{"{0} mpg"} + other{"{0} mpg"} } mile-per-gallon-imperial{ dnam{"ميل في امپيريل گيلن"} - one{"{0} ميل في امپيريل گيلن"} - other{"{0} ميل في امپيريل گيلن"} + one{"{0} mpg Imp."} + other{"{0} mpg Imp."} } } coordinate{ @@ -1228,14 +1236,12 @@ sd{ other{"{0} بائيٽ"} } gigabit{ - dnam{"گيگا بٽ"} - one{"{0} گيگا بٽز"} - other{"{0} گيگا بٽز"} + one{"{0} Gb"} + other{"{0} Gb"} } gigabyte{ - dnam{"گيگا بائيٽ"} - one{"{0} گيگا بائيٽز"} - other{"{0} گيگا بائيٽز"} + one{"{0} GB"} + other{"{0} GB"} } kilobit{ dnam{"ڪلو بٽ"} @@ -1244,7 +1250,7 @@ sd{ } kilobyte{ dnam{"ڪلو بائيٽ"} - one{"{0} ڪلو بائيٽز"} + one{"{0} ڪلو بائيٽ"} other{"{0} ڪلو بائيٽز"} } megabit{ @@ -1253,24 +1259,20 @@ sd{ other{"{0} ميگا بٽز"} } megabyte{ - dnam{"ميگا بائيٽ"} - one{"{0} ميگا بائيٽز"} - other{"{0} ميگا بائيٽز"} + one{"{0} MB"} + other{"{0} MB"} } petabyte{ - dnam{"پيرا بائيٽس"} - one{"{0} پيرا بائيٽس"} - other{"{0} پيرا بائيٽس"} + one{"{0} PB"} + other{"{0} PB"} } terabit{ - dnam{"ٽيرا بٽز"} - one{"{0} ٽيرا بٽز"} - other{"{0} ٽيرا بٽز"} + one{"{0} Tb"} + other{"{0} Tb"} } terabyte{ - dnam{"ٽيرا بائيٽز"} - one{"{0} ٽيرا بائيٽز"} - other{"{0} ٽيرا بائيٽز"} + one{"{0} TB"} + other{"{0} TB"} } } duration{ @@ -1350,8 +1352,8 @@ sd{ } milliampere{ dnam{"ملي ايمپئير"} - one{"{0} ملي ايمپئير"} - other{"{0} ملي ايمپئير"} + one{"{0} ملي ايمپيئر"} + other{"{0} ملي ايمپيئر"} } ohm{ dnam{"اوهمس"} @@ -1397,8 +1399,8 @@ sd{ } kilojoule{ dnam{"ڪلو جول"} - one{"{0} ڪلو جول"} - other{"{0} ڪلو جول"} + one{"{0} kJ"} + other{"{0} kJ"} } kilowatt-hour{ dnam{"ڪلو واٽ في ڪلاڪ"} @@ -1558,8 +1560,8 @@ sd{ light{ lux{ dnam{"لڪس"} - one{"{0} لڪس"} - other{"{0} لڪس"} + one{"{0} lx"} + other{"{0} lx"} } solar-luminosity{ dnam{"سولر ليومينوسائيٽيز"} @@ -1583,32 +1585,32 @@ sd{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"گرين"} + one{"{0} گرين"} + other{"{0} گرين"} + } gram{ dnam{"گرامَ"} - one{"{0} گـ"} - other{"{0} گـ."} - per{"{0}/گـ."} + one{"{0} g"} + other{"{0} g"} } kilogram{ dnam{"ڪلو گرام"} one{"{0} ڪلو گرام"} - other{"{0} ڪ.گـ."} - per{"{0}/ڪ.گـ."} + other{"{0} kg"} } metric-ton{ - dnam{"ٽَـ"} - one{"{0} ٽَـ"} - other{"{0} ٽَـ"} + one{"{0} t"} + other{"{0} t"} } microgram{ - dnam{"مائڪرو گرام"} - one{"{0} مائڪرو گرام"} - other{"{0} مائڪرو گرام"} + one{"{0} µg"} + other{"{0} µg"} } milligram{ - dnam{"مـ.گـ."} - one{"{0} مـ.گـ."} - other{"{0} مـ.گـ."} + one{"{0} mg"} + other{"{0} mg"} } ounce{ dnam{"اونس"} @@ -1672,9 +1674,8 @@ sd{ } pressure{ atmosphere{ - dnam{"ايٽماس فيئر"} - one{"{0} ايٽماس فيئر"} - other{"{0} ايٽماس فيئر"} + one{"{0} atm"} + other{"{0} atm"} } bar{ dnam{"بار"} @@ -1682,14 +1683,12 @@ sd{ other{"{0} بارس"} } hectopascal{ - dnam{"هيڪٽوپاسڪلز"} - one{"{0} هيڪٽوپاسڪلز"} - other{"{0} هيڪٽوپاسڪلز"} + one{"{0} hPa"} + other{"{0} hPa"} } inch-ofhg{ - dnam{"مرڪري جا انچز"} - one{"مرڪري جا {0} انچز"} - other{"مرڪري جا {0} انچز"} + one{"{0} inHg"} + other{"{0} inHg"} } kilopascal{ dnam{"kPa"} @@ -1702,17 +1701,14 @@ sd{ other{"{0} MPa"} } millibar{ - dnam{"ملي بارز"} - one{"{0} ملي بارز"} - other{"{0} ملي بارز"} + one{"{0} mbar"} + other{"{0} mbar"} } millimeter-ofhg{ - dnam{"مرڪري جو ملي ميٽر"} - one{"مرڪري جو {0} ملي ميٽر"} - other{"مرڪري جو {0} ملي ميٽر"} + one{"{0} mmHg"} + other{"{0} mm Hg"} } pound-force-per-square-inch{ - dnam{"پائونڊز في اسڪوائر انچ"} one{"{0} psi"} other{"{0} psi"} } @@ -1741,24 +1737,20 @@ sd{ } temperature{ celsius{ - dnam{"ڊگري سيلسيس"} - one{"{0} ڊگري سيلسيس"} - other{"{0} ڊگري سيلسيس"} + one{"{0}°C"} + other{"{0}°C"} } fahrenheit{ - dnam{"ڊگريز فارن هائيٽ"} - one{"{0} ڊگريز فارن هائيٽ"} - other{"{0} ڊگريز فارن هائيٽ"} + one{"{0}°F"} + other{"{0}°F"} } generic{ - dnam{"ڊگري"} - one{"{0} ڊگري"} - other{"{0} ڊگري"} + one{"{0}°"} + other{"{0}°"} } kelvin{ - dnam{"ڪيلونز"} - one{"{0} ڪيلونز"} - other{"{0} ڪيلونز"} + one{"{0} K"} + other{"{0} K"} } } torque{ diff --git a/intl/icu/source/data/unit/sd_Arab.txt b/intl/icu/source/data/unit/sd_Arab.txt index 52a97c862438..c089e06d8ec5 100644 --- a/intl/icu/source/data/unit/sd_Arab.txt +++ b/intl/icu/source/data/unit/sd_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sd_Arab_PK.txt b/intl/icu/source/data/unit/sd_Arab_PK.txt index 4a9803a3c859..2e57dba96af5 100644 --- a/intl/icu/source/data/unit/sd_Arab_PK.txt +++ b/intl/icu/source/data/unit/sd_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sd_Deva.txt b/intl/icu/source/data/unit/sd_Deva.txt index 3d793e03272b..fd9d7ccae55d 100644 --- a/intl/icu/source/data/unit/sd_Deva.txt +++ b/intl/icu/source/data/unit/sd_Deva.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Deva{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/sd_PK.txt b/intl/icu/source/data/unit/sd_PK.txt index 766360070b4e..b7def87808ea 100644 --- a/intl/icu/source/data/unit/sd_PK.txt +++ b/intl/icu/source/data/unit/sd_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_PK{ "%%ALIAS"{"sd_Arab_PK"} } diff --git a/intl/icu/source/data/unit/se.txt b/intl/icu/source/data/unit/se.txt index 7ee794795ffc..7991845259eb 100644 --- a/intl/icu/source/data/unit/se.txt +++ b/intl/icu/source/data/unit/se.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/seh.txt b/intl/icu/source/data/unit/seh.txt index d5237e26baee..fa708a39e089 100644 --- a/intl/icu/source/data/unit/seh.txt +++ b/intl/icu/source/data/unit/seh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml seh{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ses.txt b/intl/icu/source/data/unit/ses.txt index f8595e4884e7..05fa5471ccdd 100644 --- a/intl/icu/source/data/unit/ses.txt +++ b/intl/icu/source/data/unit/ses.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ses{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sg.txt b/intl/icu/source/data/unit/sg.txt index 2f001a342704..ad75cb9b87d6 100644 --- a/intl/icu/source/data/unit/sg.txt +++ b/intl/icu/source/data/unit/sg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sg{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sh.txt b/intl/icu/source/data/unit/sh.txt index 74b646a22923..83091b2d0a58 100644 --- a/intl/icu/source/data/unit/sh.txt +++ b/intl/icu/source/data/unit/sh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh{ "%%ALIAS"{"sr_Latn"} } diff --git a/intl/icu/source/data/unit/sh_BA.txt b/intl/icu/source/data/unit/sh_BA.txt index 93bdac63f042..7f73cd515f1a 100644 --- a/intl/icu/source/data/unit/sh_BA.txt +++ b/intl/icu/source/data/unit/sh_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_BA{ "%%ALIAS"{"sr_Latn_BA"} } diff --git a/intl/icu/source/data/unit/sh_CS.txt b/intl/icu/source/data/unit/sh_CS.txt index 224568a08c08..3b2f92bbf46c 100644 --- a/intl/icu/source/data/unit/sh_CS.txt +++ b/intl/icu/source/data/unit/sh_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/unit/sh_YU.txt b/intl/icu/source/data/unit/sh_YU.txt index 8a7d4609802f..dc5a35beadb0 100644 --- a/intl/icu/source/data/unit/sh_YU.txt +++ b/intl/icu/source/data/unit/sh_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/unit/shi.txt b/intl/icu/source/data/unit/shi.txt index 286f25798623..55a0e8d5aa6c 100644 --- a/intl/icu/source/data/unit/shi.txt +++ b/intl/icu/source/data/unit/shi.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/shi_Latn.txt b/intl/icu/source/data/unit/shi_Latn.txt index 1b87df9dcca6..f6f713911b1a 100644 --- a/intl/icu/source/data/unit/shi_Latn.txt +++ b/intl/icu/source/data/unit/shi_Latn.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Latn{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/shi_MA.txt b/intl/icu/source/data/unit/shi_MA.txt index 00de1b1b27a7..c96251db2b7c 100644 --- a/intl/icu/source/data/unit/shi_MA.txt +++ b/intl/icu/source/data/unit/shi_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_MA{ "%%ALIAS"{"shi_Tfng_MA"} } diff --git a/intl/icu/source/data/unit/shi_Tfng.txt b/intl/icu/source/data/unit/shi_Tfng.txt index 397f53f49446..723cdf148de1 100644 --- a/intl/icu/source/data/unit/shi_Tfng.txt +++ b/intl/icu/source/data/unit/shi_Tfng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Tfng{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/shi_Tfng_MA.txt b/intl/icu/source/data/unit/shi_Tfng_MA.txt index 978cd5cab856..3ec81a4f824a 100644 --- a/intl/icu/source/data/unit/shi_Tfng_MA.txt +++ b/intl/icu/source/data/unit/shi_Tfng_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/si.txt b/intl/icu/source/data/unit/si.txt index 99bbd715e6a9..173d2d150718 100644 --- a/intl/icu/source/data/unit/si.txt +++ b/intl/icu/source/data/unit/si.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml si{ - Version{"37"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -151,9 +151,9 @@ si{ } consumption{ liter-per-100-kilometer{ - dnam{"කිලෝ මීටර 100 ට ලීටර"} - one{"කිලෝ මීටර 100 ට ලීටර {0}"} - other{"කිලෝ මීටර 100 ට ලීටර {0}"} + dnam{"කිලෝමීටර 100ට ලීටර"} + one{"කිලෝමීටර 100ට ලීටර {0}"} + other{"කිලෝමීටර 100ට ලීටර {0}"} } liter-per-kilometer{ dnam{"කිලෝ මීටරයට ලීටරය"} @@ -408,6 +408,11 @@ si{ } } graphics{ + dot{ + dnam{"තිත"} + one{"{0}තිත"} + other{"{0}තිත"} + } dot-per-centimeter{ dnam{"සෙන්ටිමීටරයකට තිත්"} one{"සෙන්ටිමීටරයකට තිත් {0}"} @@ -459,12 +464,27 @@ si{ one{"ඩෙසිමීටර {0}"} other{"ඩෙසිමීටර {0}"} } + earth-radius{ + dnam{"පෘථිවි අරය"} + one{"පෘථිවි අර {0}"} + other{"පෘථිවි අර {0}"} + } + fathom{ + dnam{"බඹය"} + one{"{0} බඹය"} + other{"බඹ {0}"} + } foot{ dnam{"අඩි"} one{"අඩි {0}"} other{"අඩි {0}"} per{"අඩියට {0}"} } + furlong{ + dnam{"පර්ලොම"} + one{"{0} පර්ලොමය"} + other{"පර්ලොම {0}"} + } inch{ dnam{"අඟල්"} one{"අඟල් {0}"} @@ -545,6 +565,16 @@ si{ } } light{ + candela{ + dnam{"කැන්ඩෙලා"} + one{"{0} කැන්ඩෙලා"} + other{"කැන්ඩෙලා {0}"} + } + lumen{ + dnam{"ලූමනය"} + one{"{0} ලූමනය"} + other{"ලූමන {0}"} + } lux{ dnam{"ලක්ස්"} one{"ලක්ස් {0}"} @@ -572,6 +602,11 @@ si{ one{"{0} පෘථිවි ස්කන්ධ"} other{"{0} පෘථිවි ස්කන්ධ"} } + grain{ + dnam{"ඇබිත්ත"} + one{"{0} ඇබිත්ත"} + other{"ඇබිති {0}"} + } gram{ dnam{"ග්‍රෑම්"} one{"ග්‍රෑම් {0}"} @@ -621,6 +656,11 @@ si{ one{"{0} සූර්ය ස්කන්ධ"} other{"{0} සූර්ය ස්කන්ධ"} } + stone{ + dnam{"ගල්"} + one{"{0} ගල"} + other{"ගල් {0}"} + } ton{ dnam{"ටොන්"} one{"ටොන් {0}"} @@ -706,9 +746,9 @@ si{ other{"පැස්කල් {0}"} } pound-force-per-square-inch{ - dnam{"වර්ග අලඟකට රාත්තල්"} - one{"වර්ග අලඟකට රාත්තල් {0}"} - other{"වර්ග අලඟකට රාත්තල් {0}"} + dnam{"වර්ග අඟලකට රාත්තල්"} + one{"වර්ග අඟලකට රාත්තල් {0}"} + other{"වර්ග අඟලකට රාත්තල් {0}"} } } speed{ @@ -778,6 +818,11 @@ si{ one{"{0} බැරල්"} other{"{0} බැරල්"} } + bushel{ + dnam{"බුසල්"} + one{"{0} බුසල"} + other{"බුසල් {0}"} + } centiliter{ dnam{"සෙන්ටිලීටරය"} one{"සෙන්ටිලීටරය {0}"} @@ -835,6 +880,26 @@ si{ one{"ඩෙසිලීටරය {0}"} other{"ඩෙසිලීටරය {0}"} } + dessert-spoon{ + dnam{"අතුරුපස හැන්ද"} + one{"{0} අතුරුපස හැන්ද"} + other{"අතුරුපස හැඳි {0}"} + } + dessert-spoon-imperial{ + dnam{"ඉම්පීරියල් අතුරුපස හැන්ද"} + one{"{0} ඉම්පීරියල් අතුරුපස හැන්ද"} + other{"ඉම්පීරියල් අතුරුපස හැඳි {0}"} + } + dram{ + dnam{"ඩ්‍රූම"} + one{"{0} ඩ්‍රූම"} + other{"ඩ්‍රූම {0}"} + } + drop{ + dnam{"බින්දුව"} + one{"{0} බින්දුව"} + other{"බින්දු {0}"} + } fluid-ounce{ dnam{"ද්‍රව අවුන්ස"} one{"ද්‍රව අවුන්ස {0}"} @@ -862,6 +927,11 @@ si{ one{"හෙක්ටොලීටර් {0}"} other{"හෙක්ටොලීටර් {0}"} } + jigger{ + dnam{"තැටි වාහකය"} + one{"{0} තැටි වාහකය"} + other{"තැටි වාහක {0}"} + } liter{ dnam{"ලීටර්"} one{"ලීටර් {0}"} @@ -878,6 +948,11 @@ si{ one{"මිලිලීටර් {0}"} other{"මිලිලීටර් {0}"} } + pinch{ + dnam{"ඩිංග"} + one{"{0} ඩිංග"} + other{"ඩිංග {0}"} + } pint{ dnam{"පයින්ට්"} one{"පයින්ට් {0}"} @@ -893,6 +968,11 @@ si{ one{"ක්වාට් {0}"} other{"ක්වාට් {0}"} } + quart-imperial{ + dnam{"ඉම්පීරියල් නැළිය"} + one{"{0} ඉම්පීරියල් නැළිය"} + other{"ඉම්පීරියල් නැළි {0}"} + } tablespoon{ dnam{"මේස හැදී"} one{"මේස හැදී {0}"} @@ -1556,6 +1636,11 @@ si{ } } graphics{ + dot{ + dnam{"තිත"} + one{"{0} තිත"} + other{"තිත් {0}"} + } dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} @@ -1609,12 +1694,27 @@ si{ one{"ඩෙමී {0}"} other{"ඩෙමී {0}"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"බඹය"} + one{"බඹ {0}"} + other{"බඹ {0}"} + } foot{ dnam{"අඩි"} one{"අඩි {0}"} other{"අඩි {0}"} per{"{0}/අඩි"} } + furlong{ + dnam{"පර්ලොම"} + one{"පර්ලොම {0}"} + other{"පර්ලොම {0}"} + } inch{ dnam{"අඟල්"} one{"අඟල් {0}"} @@ -1695,6 +1795,16 @@ si{ } } light{ + candela{ + dnam{"කැන්ඩෙලා"} + one{"කැන්ඩෙලා {0}"} + other{"කැන්ඩෙලා {0}"} + } + lumen{ + dnam{"ලූමනය"} + one{"ලූමන {0}"} + other{"ලූමන {0}"} + } lux{ dnam{"ලක්ස්"} one{"ලක් {0}"} @@ -1722,6 +1832,11 @@ si{ one{"{0} ස්⊕"} other{"{0} ස්⊕"} } + grain{ + dnam{"ඇබිත්ත"} + one{"ඇබිති {0}"} + other{"ඇබිති {0}"} + } gram{ dnam{"ග්‍රෑම්"} one{"ග්‍රෑ. {0}"} @@ -1771,6 +1886,11 @@ si{ one{"{0} ස්☉"} other{"{0} ස්☉"} } + stone{ + dnam{"ගල්"} + one{"ගල් {0}"} + other{"ගල් {0}"} + } ton{ dnam{"ටොන්"} one{"ටොන් {0}"} @@ -1856,9 +1976,9 @@ si{ other{"පැස් {0}"} } pound-force-per-square-inch{ - dnam{"වඅ රා"} - one{"වඅ රා {0}"} - other{"වඅ රා {0}"} + dnam{"වඅරා"} + one{"වඅරා {0}"} + other{"වඅරා {0}"} } } speed{ @@ -1928,6 +2048,11 @@ si{ one{"{0} බැරල්"} other{"{0} බැරල්"} } + bushel{ + dnam{"බුසල්"} + one{"බුසල් {0}"} + other{"බුසල් {0}"} + } centiliter{ dnam{"සෙලී"} one{"සෙලී {0}"} @@ -1985,6 +2110,26 @@ si{ one{"ඩෙලී {0}"} other{"ඩෙලී {0}"} } + dessert-spoon{ + dnam{"අතුරුපස හැන්ද"} + one{"අතුරුපස හැඳි {0}"} + other{"අතුරුපස හැඳි {0}"} + } + dessert-spoon-imperial{ + dnam{"ඉම්පීරියල් අතුරුපස හැන්ද"} + one{"ඉම්පී. අතුරුපස හැඳි {0}"} + other{"ඉම්පී. අතුරුපස හැඳි {0}"} + } + dram{ + dnam{"ඩ්‍රූම තරල"} + one{"ඩ්‍රූම තරල {0}"} + other{"ඩ්‍රූම තරල {0}"} + } + drop{ + dnam{"බින්දුව"} + one{"බින්දු {0}"} + other{"බින්දු {0}"} + } fluid-ounce{ dnam{"ද්‍රව අවු"} one{"ද්‍රව අවු {0}"} @@ -2012,6 +2157,11 @@ si{ one{"හෙලී {0}"} other{"හෙලී {0}"} } + jigger{ + dnam{"තැටි වාහකය"} + one{"තැටි වාහක {0}"} + other{"තැටි වාහක {0}"} + } liter{ dnam{"ලීටර්"} one{"ලී {0}"} @@ -2028,6 +2178,11 @@ si{ one{"මිලී {0}"} other{"මිලී {0}"} } + pinch{ + dnam{"ඩිංග"} + one{"ඩිංග {0}"} + other{"ඩිංග {0}"} + } pint{ dnam{"පයින්ට්"} one{"පට් {0}"} @@ -2043,6 +2198,11 @@ si{ one{"ක්ට් {0}"} other{"ක්ට් {0}"} } + quart-imperial{ + dnam{"ඉම්පීරියල් නැළිය"} + one{"ඉම්පීරියල් නැළි {0}"} + other{"ඉම්පීරියල් නැළි {0}"} + } tablespoon{ dnam{"මේසහැදී"} one{"මේසහැදී {0}"} diff --git a/intl/icu/source/data/unit/sk.txt b/intl/icu/source/data/unit/sk.txt index c1536201794d..1db88a6e78be 100644 --- a/intl/icu/source/data/unit/sk.txt +++ b/intl/icu/source/data/unit/sk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -551,6 +551,13 @@ sk{ } } graphics{ + dot{ + dnam{"bod"} + few{"{0} body"} + many{"{0} bodu"} + one{"{0} bod"} + other{"{0} bodov"} + } dot-per-centimeter{ dnam{"body na centimeter"} few{"{0} body na centimeter"} @@ -617,6 +624,13 @@ sk{ one{"{0} decimeter"} other{"{0} decimetrov"} } + fathom{ + dnam{"siahy"} + few{"{0} siahy"} + many{"{0} siahy"} + one{"{0} siaha"} + other{"{0} siah"} + } foot{ dnam{"stopy"} few{"{0} stopy"} @@ -625,6 +639,13 @@ sk{ other{"{0} stôp"} per{"{0} na stopu"} } + furlong{ + dnam{"furlongy"} + few{"{0} furlongy"} + many{"{0} furlongu"} + one{"{0} furlong"} + other{"{0} furlongov"} + } inch{ dnam{"palce"} few{"{0} palce"} @@ -713,11 +734,11 @@ sk{ other{"{0} pikometrov"} } point{ - dnam{"body"} - few{"{0} body"} - many{"{0} bodu"} - one{"{0} bod"} - other{"{0} bodov"} + dnam{"typografické body"} + few{"{0} typografické body"} + many{"{0} typografického bodu"} + one{"{0} typografický bod"} + other{"{0} typografických bodov"} } solar-radius{ dnam{"polomer Slnka"} @@ -735,6 +756,20 @@ sk{ } } light{ + candela{ + dnam{"kandely"} + few{"{0} kandely"} + many{"{0} kandely"} + one{"{0} kandela"} + other{"{0} kandel"} + } + lumen{ + dnam{"lúmeny"} + few{"{0} lúmeny"} + many{"{0} lúmenu"} + one{"{0} lúmen"} + other{"{0} lúmenov"} + } lux{ dnam{"luxy"} few{"{0} luxy"} @@ -772,6 +807,13 @@ sk{ one{"{0} hmotnosť Zeme"} other{"{0} hmotností Zeme"} } + grain{ + dnam{"gran"} + few{"{0} grany"} + many{"{0} granu"} + one{"{0} gran"} + other{"{0} granov"} + } gram{ dnam{"gramy"} few{"{0} gramy"} @@ -1061,6 +1103,13 @@ sk{ one{"{0} barel"} other{"{0} barelov"} } + bushel{ + dnam{"bušle"} + few{"{0} bušle"} + many{"{0} bušla"} + one{"{0} bušel"} + other{"{0} bušlov"} + } centiliter{ dnam{"centilitre"} few{"{0} centilitre"} @@ -1140,6 +1189,34 @@ sk{ one{"{0} deciliter"} other{"{0} decilitrov"} } + dessert-spoon{ + dnam{"dezertné lyžičky"} + few{"{0} dezertné lyžičky"} + many{"{0} dezertnej lyžičky"} + one{"{0} dezertná lyžička"} + other{"{0} dezertných lyžičiek"} + } + dessert-spoon-imperial{ + dnam{"britské dezertné lyžičky"} + few{"{0} britské dezertné lyžičky"} + many{"{0} britskej dezertnej lyžičky"} + one{"{0} britská dezertná lyžička"} + other{"{0} britských dezertných lyžičiek"} + } + dram{ + dnam{"drachmy"} + few{"{0} drachmy"} + many{"{0} drachmy"} + one{"{0} drachma"} + other{"{0} drachiem"} + } + drop{ + dnam{"kvapky"} + few{"{0} kvapky"} + many{"{0} kvapky"} + one{"{0} kvapka"} + other{"{0} kvapiek"} + } fluid-ounce{ dnam{"tekuté unce"} few{"{0} tekuté unce"} @@ -1177,6 +1254,13 @@ sk{ one{"{0} hektoliter"} other{"{0} hektolitrov"} } + jigger{ + dnam{"barmanské odmerky"} + few{"{0} barmanské odmerky"} + many{"{0} barmanskej odmerky"} + one{"{0} barmanská odmerka"} + other{"{0} barmanských odmeriek"} + } liter{ dnam{"litre"} few{"{0} litre"} @@ -1199,6 +1283,13 @@ sk{ one{"{0} mililiter"} other{"{0} mililitrov"} } + pinch{ + dnam{"štipky"} + few{"{0} štipky"} + many{"{0} štipky"} + one{"{0} štipka"} + other{"{0} štipiek"} + } pint{ dnam{"pinty"} few{"{0} pinty"} @@ -1220,6 +1311,13 @@ sk{ one{"{0} quart"} other{"{0} quartov"} } + quart-imperial{ + dnam{"britské kvarty"} + few{"{0} britské kvarty"} + many{"{0} britského kvartu"} + one{"{0} britský kvart"} + other{"{0} britských kvartov"} + } tablespoon{ dnam{"polievkové lyžice"} few{"{0} polievkové lyžice"} @@ -2509,6 +2607,13 @@ sk{ } } graphics{ + dot{ + dnam{"bod"} + few{"{0} body"} + many{"{0} bodu"} + one{"{0} bod"} + other{"{0} bodov"} + } dot-per-centimeter{ dnam{"dpcm"} few{"{0} dpcm"} @@ -2582,6 +2687,13 @@ sk{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"fth"} + few{"{0} fth"} + many{"{0} fth"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"ft"} few{"{0} ft"} @@ -2590,6 +2702,13 @@ sk{ other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"fur"} + few{"{0} fur"} + many{"{0} fur"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"in"} few{"{0} in"} @@ -2700,6 +2819,20 @@ sk{ } } light{ + candela{ + dnam{"cd"} + few{"{0} cd"} + many{"{0} cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + few{"{0} lm"} + many{"{0} lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lx"} few{"{0} lx"} @@ -2737,6 +2870,13 @@ sk{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"gran"} + few{"{0} grany"} + many{"{0} granu"} + one{"{0} gran"} + other{"{0} granov"} + } gram{ dnam{"g"} few{"{0} g"} @@ -3012,6 +3152,13 @@ sk{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"bu"} + few{"{0} bu"} + many{"{0} bu"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"cl"} few{"{0} cl"} @@ -3091,6 +3238,34 @@ sk{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"dstspn"} + few{"{0} dstspn"} + many{"{0} dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + few{"{0} dstspn Imp"} + many{"{0} dstspn Imp"} + one{"{0} dstspn Imp"} + other{"{0} dstspn Imp"} + } + dram{ + dnam{"dr"} + few{"{0} dr"} + many{"{0} dr"} + one{"{0} dr"} + other{"{0} dr"} + } + drop{ + dnam{"kvapky"} + few{"{0} kvapky"} + many{"{0} kvapky"} + one{"{0} kvapka"} + other{"{0} kvapiek"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -3128,6 +3303,13 @@ sk{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"odmerky"} + few{"{0} odmerky"} + many{"{0} odmerky"} + one{"{0} odmerka"} + other{"{0} odmeriek"} + } liter{ dnam{"l"} few{"{0} l"} @@ -3150,6 +3332,13 @@ sk{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"štipky"} + few{"{0} štipky"} + many{"{0} štipky"} + one{"{0} štipka"} + other{"{0} štipiek"} + } pint{ dnam{"pt"} few{"{0} pt"} @@ -3171,6 +3360,13 @@ sk{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + few{"{0} qt Imp"} + many{"{0} qt Imp"} + one{"{0} qt Imp"} + other{"{0} qt Imp"} + } tablespoon{ dnam{"tbsp"} few{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/sl.txt b/intl/icu/source/data/unit/sl.txt index cbc1ff226169..4c650093a8ae 100644 --- a/intl/icu/source/data/unit/sl.txt +++ b/intl/icu/source/data/unit/sl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl{ - Version{"37"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -48,7 +48,7 @@ sl{ } radian{ dnam{"radian"} - few{"{0} radianov"} + few{"{0} radiani"} one{"{0} radian"} other{"{0} radianov"} two{"{0} radiana"} @@ -172,21 +172,21 @@ sl{ } percent{ dnam{"odstotek"} - few{"{0} %"} + few{"{0} odstotki"} one{"{0} odstotek"} other{"{0} odstotkov"} - two{"{0} %"} + two{"{0} odstotka"} } permille{ dnam{"promile"} - few{"{0} ‰"} + few{"{0} promili"} one{"{0} promile"} other{"{0} promilov"} - two{"{0} ‰"} + two{"{0} promila"} } permillion{ dnam{"delci na milijon"} - few{"{0} delcev na milijon"} + few{"{0} delci na milijon"} one{"{0} delec na milijon"} other{"{0} delcev na milijon"} two{"{0} delca na milijon"} @@ -208,14 +208,14 @@ sl{ } liter-per-kilometer{ dnam{"litrov na kilometer"} - few{"{0} litrov na kilometer"} + few{"{0} litri na kilometer"} one{"{0} liter na kilometer"} other{"{0} litrov na kilometer"} two{"{0} litra na kilometer"} } mile-per-gallon{ dnam{"milje na galono"} - few{"{0} milj na galono"} + few{"{0} milje na galono"} one{"{0} milja na galono"} other{"{0} milj na galono"} two{"{0} milji na galono"} @@ -238,7 +238,7 @@ sl{ digital{ bit{ dnam{"bit"} - few{"{0} bite"} + few{"{0} biti"} one{"{0} bit"} other{"{0} bitov"} two{"{0} bita"} @@ -294,10 +294,10 @@ sl{ } petabyte{ dnam{"petabajti"} - few{"{0} PB"} + few{"{0} petabajti"} one{"{0} petabajt"} other{"{0} petabajtov"} - two{"{0} PB"} + two{"{0} petabajta"} } terabit{ dnam{"terabiti"} @@ -534,6 +534,15 @@ sl{ two{"{0} megahertza"} } } + graphics{ + dot{ + dnam{"pika"} + few{"{0} pike"} + one{"{0} pika"} + other{"{0} pik"} + two{"{0} piki"} + } + } length{ astronomical-unit{ dnam{"astronomska enota"} @@ -557,11 +566,19 @@ sl{ other{"{0} decimetrov"} two{"{0} decimetra"} } + earth-radius{ + dnam{"Zemljin polmer"} + few{"{0} Zemljini polmeri"} + one{"{0} Zemljin polmer"} + other{"{0} Zemljinih polmerov"} + two{"{0} Zemljina polmera"} + } fathom{ - few{"{0} fth"} - one{"{0} fth"} - other{"{0} fth"} - two{"{0} fth"} + dnam{"sežnji"} + few{"{0} sežnji"} + one{"{0} seženj"} + other{"{0} sežnjev"} + two{"{0} sežnja"} } foot{ dnam{"čevlji"} @@ -571,6 +588,13 @@ sl{ per{"{0} na čevelj"} two{"{0} čevlja"} } + furlong{ + dnam{"furlongi"} + few{"{0} furlongi"} + one{"{0} furlong"} + other{"{0} furlongov"} + two{"{0} furlonga"} + } inch{ dnam{"palec"} few{"{0} palci"} @@ -681,6 +705,20 @@ sl{ } } light{ + candela{ + dnam{"kandela"} + few{"{0} kandele"} + one{"{0} kandela"} + other{"{0} kandel"} + two{"{0} kandeli"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumni"} + one{"{0} lumen"} + other{"{0} lumnov"} + two{"{0} lumna"} + } lux{ dnam{"luks"} few{"{0} luksi"} @@ -718,6 +756,13 @@ sl{ other{"{0} mas Zemlje"} two{"{0} masi Zemlje"} } + grain{ + dnam{"gran"} + few{"{0} grani"} + one{"{0} gran"} + other{"{0} granov"} + two{"{0} grana"} + } gram{ dnam{"grami"} few{"{0} grami"} @@ -785,6 +830,13 @@ sl{ other{"{0} mas sonca"} two{"{0} masi sonca"} } + stone{ + dnam{"stone"} + few{"{0} stoni"} + one{"{0} stone"} + other{"{0} stonov"} + two{"{0} stona"} + } ton{ dnam{"ameriške tone"} few{"{0} ameriške tone"} @@ -999,6 +1051,13 @@ sl{ other{"{0} sodčkov"} two{"{0} sodčka"} } + bushel{ + dnam{"bušel"} + few{"{0} bušli"} + one{"{0} bušel"} + other{"{0} bušlov"} + two{"{0} bušla"} + } centiliter{ dnam{"centilitri"} few{"{0} centilitri"} @@ -1078,6 +1137,34 @@ sl{ other{"{0} decilitrov"} two{"{0} decilitra"} } + dessert-spoon{ + dnam{"desertna žlička"} + few{"{0} desertne žličke"} + one{"{0} desertna žlička"} + other{"{0} desertnih žličk"} + two{"{0} desertni žlički"} + } + dessert-spoon-imperial{ + dnam{"Imp. desertna žlička"} + few{"{0} imp. desertne žličke"} + one{"{0} imp. desertna žlička"} + other{"{0} imp. desertnih žličk"} + two{"{0} imp. desertni žlički"} + } + dram{ + dnam{"drahma"} + few{"{0} drahme"} + one{"{0} drahma"} + other{"{0} drahm"} + two{"{0} drahmi"} + } + drop{ + dnam{"kapljica"} + few{"{0} kapljice"} + one{"{0} kapljica"} + other{"{0} kapljic"} + two{"{0} kapljici"} + } fluid-ounce{ dnam{"tekoče unče"} few{"{0} tekoče unče"} @@ -1094,7 +1181,7 @@ sl{ } gallon{ dnam{"galone"} - few{"{0} galon"} + few{"{0} galone"} one{"{0} galona"} other{"{0} galon"} per{"{0} na galono"} @@ -1104,7 +1191,7 @@ sl{ dnam{"imperialna galona"} few{"{0} imperialne galone"} one{"{0} imperialna galona"} - other{"{0} imperialne galone"} + other{"{0} imperialnih galon"} per{"{0} na imp. gal"} two{"{0} imperialni galoni"} } @@ -1115,6 +1202,13 @@ sl{ other{"{0} hektolitrov"} two{"{0} hektolitra"} } + jigger{ + dnam{"šilce"} + few{"{0} šilci"} + one{"{0} šilce"} + other{"{0} šilcev"} + two{"{0} šilca"} + } liter{ dnam{"litri"} few{"{0} litri"} @@ -1137,6 +1231,13 @@ sl{ other{"{0} militrov"} two{"{0} mililitra"} } + pinch{ + dnam{"ščepec"} + few{"{0} ščepci"} + one{"{0} ščepec"} + other{"{0} ščepcev"} + two{"{0} ščepca"} + } pint{ dnam{"pinte"} few{"{0} pinte"} @@ -1158,6 +1259,13 @@ sl{ other{"{0} četrtin"} two{"{0} četrtini"} } + quart-imperial{ + dnam{"Imp. kvart"} + few{"{0} imp. kvarti"} + one{"{0} imp. kvart"} + other{"{0} imp. kvartov"} + two{"{0} imp. kvarta"} + } tablespoon{ dnam{"jedilne žlice"} few{"{0} jedilne žlice"} @@ -1719,10 +1827,10 @@ sl{ digital{ bit{ dnam{"bit"} - few{"{0} bit"} + few{"{0} biti"} one{"{0} bit"} - other{"{0} bit"} - two{"{0} bit"} + other{"{0} bitov"} + two{"{0} bita"} } byte{ dnam{"bajt"} @@ -2030,6 +2138,13 @@ sl{ } } graphics{ + dot{ + dnam{"pika"} + few{"{0} pike"} + one{"{0} pika"} + other{"{0} pik"} + two{"{0} piki"} + } dot-per-centimeter{ dnam{"dpcm"} few{"{0} dpcm"} @@ -2103,7 +2218,15 @@ sl{ other{"{0} dm"} two{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + few{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + two{"{0} R⊕"} + } fathom{ + dnam{"sežnji"} few{"{0} fth"} one{"{0} fth"} other{"{0} fth"} @@ -2117,6 +2240,13 @@ sl{ per{"{0}/ft"} two{"{0} ft"} } + furlong{ + dnam{"furlongi"} + few{"{0} fur"} + one{"{0} fur"} + other{"{0} fur"} + two{"{0} fur"} + } inch{ dnam{"in"} few{"{0} in"} @@ -2264,6 +2394,13 @@ sl{ other{"{0} M⊕"} two{"{0} M⊕"} } + grain{ + dnam{"gran"} + few{"{0} grani"} + one{"{0} gran"} + other{"{0} granov"} + two{"{0} grana"} + } gram{ dnam{"g"} few{"{0} g"} @@ -2331,6 +2468,13 @@ sl{ other{"{0} M☉"} two{"{0} M☉"} } + stone{ + dnam{"stone"} + few{"{0} st"} + one{"{0} st"} + other{"{0} st"} + two{"{0} st"} + } ton{ dnam{"sh tn"} few{"{0} sh tn"} @@ -2435,10 +2579,10 @@ sl{ } millimeter-ofhg{ dnam{"mmHg"} - few{"{0} mmHG"} - one{"{0} mmHG"} - other{"{0} mmHG"} - two{"{0} mmHG"} + few{"{0} mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} + two{"{0} mmHg"} } pascal{ dnam{"Pa"} @@ -2546,6 +2690,13 @@ sl{ other{"{0} bbl"} two{"{0} bbl"} } + bushel{ + dnam{"bušel"} + few{"{0} bu"} + one{"{0} bu"} + other{"{0} bu"} + two{"{0} bu"} + } centiliter{ dnam{"cl"} few{"{0} cl"} @@ -2625,6 +2776,34 @@ sl{ other{"{0} dl"} two{"{0} dl"} } + dessert-spoon{ + dnam{"desertna žlička"} + few{"{0} desertne žličke"} + one{"{0} desertna žlička"} + other{"{0} desertnih žličk"} + two{"{0} desertni žlički"} + } + dessert-spoon-imperial{ + dnam{"Imp. desertna žlička"} + few{"{0} imp. desertne žličke"} + one{"{0} imp. desertna žlička"} + other{"{0} imp. desertnih žličk"} + two{"{0} imp. desertni žlički"} + } + dram{ + dnam{"tekoča drahma"} + few{"{0} tekoče drahme"} + one{"{0} tekoča drahma"} + other{"{0} tekočih drahm"} + two{"{0} tekoči drahmi"} + } + drop{ + dnam{"kapljica"} + few{"{0} kapljice"} + one{"{0} kapljica"} + other{"{0} kapljic"} + two{"{0} kapljici"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -2662,6 +2841,13 @@ sl{ other{"{0} hl"} two{"{0} hl"} } + jigger{ + dnam{"šilce"} + few{"{0} šilci"} + one{"{0} šilce"} + other{"{0} šilcev"} + two{"{0} šilca"} + } liter{ dnam{"l"} few{"{0} l"} @@ -2684,6 +2870,13 @@ sl{ other{"{0} ml"} two{"{0} ml"} } + pinch{ + dnam{"ščepec"} + few{"{0} ščepci"} + one{"{0} ščepec"} + other{"{0} ščepcev"} + two{"{0} ščepca"} + } pint{ dnam{"pt"} few{"{0} pt"} @@ -2705,6 +2898,13 @@ sl{ other{"{0} qt"} two{"{0} qt"} } + quart-imperial{ + dnam{"Imp. qt"} + few{"{0} imp. qt"} + one{"{0} imp. qt"} + other{"{0} imp. qt"} + two{"{0} imp. qt"} + } tablespoon{ dnam{"žlica"} few{"{0} žlice"} diff --git a/intl/icu/source/data/unit/smn.txt b/intl/icu/source/data/unit/smn.txt index 6f52229905f5..cf2a306dddaa 100644 --- a/intl/icu/source/data/unit/smn.txt +++ b/intl/icu/source/data/unit/smn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml smn{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/sn.txt b/intl/icu/source/data/unit/sn.txt index 96407c526899..33c96eb1303e 100644 --- a/intl/icu/source/data/unit/sn.txt +++ b/intl/icu/source/data/unit/sn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/so.txt b/intl/icu/source/data/unit/so.txt index 13d0239c3573..6c0b88f20e5a 100644 --- a/intl/icu/source/data/unit/so.txt +++ b/intl/icu/source/data/unit/so.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so{ - Version{"37"} units{ acceleration{ g-force{ diff --git a/intl/icu/source/data/unit/sq.txt b/intl/icu/source/data/unit/sq.txt index 15a9885a2f70..430fdc566224 100644 --- a/intl/icu/source/data/unit/sq.txt +++ b/intl/icu/source/data/unit/sq.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ sq{ } } graphics{ + dot{ + dnam{"pika"} + one{"{0} pikë"} + other{"{0} pika"} + } dot-per-centimeter{ dnam{"pika për centimetër"} one{"{0} pikë për centimetër"} @@ -461,6 +466,11 @@ sq{ one{"{0} decimetër"} other{"{0} decimetra"} } + earth-radius{ + dnam{"rreze toke"} + one{"{0} rreze toke"} + other{"{0} rreze toke"} + } foot{ dnam{"këmbë"} one{"{0} këmbë"} @@ -547,6 +557,16 @@ sq{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandelë"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumenë"} + } lux{ dnam{"luks"} one{"{0} luks"} @@ -832,6 +852,11 @@ sq{ one{"{0} decilitër"} other{"{0} decilitra"} } + dram{ + dnam{"drahma të lëngshme"} + one{"{0} drahmë i lëngshëm"} + other{"{0} drahma të lëngshme"} + } fluid-ounce{ dnam{"onsë të lëngshëm"} one{"{0} ons i lëngshëm"} @@ -1566,6 +1591,9 @@ sq{ one{"{0} dm"} other{"{0} dm"} } + fathom{ + dnam{"fth"} + } foot{ dnam{"këmbë"} one{"{0} ft"} @@ -1753,7 +1781,6 @@ sq{ other{"{0} hPa"} } inch-ofhg{ - dnam{"inHg"} one{"{0} inHg"} other{"{0} inHg"} } diff --git a/intl/icu/source/data/unit/sr.txt b/intl/icu/source/data/unit/sr.txt index dcdc62335755..25196d51cb47 100644 --- a/intl/icu/source/data/unit/sr.txt +++ b/intl/icu/source/data/unit/sr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -171,7 +171,7 @@ sr{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100km"} + dnam{"литри на 100 километара"} few{"{0} литра на 100 километара"} one{"{0} литар на 100 километара"} other{"{0} литара на 100 километара"} @@ -219,49 +219,49 @@ sr{ dnam{"гигабитови"} few{"{0} гигабита"} one{"{0} гигабит"} - other{"{0} гигабита"} + other{"{0} гигабитова"} } gigabyte{ dnam{"гигабајти"} few{"{0} гигабајта"} one{"{0} гигабајт"} - other{"{0} гигабајта"} + other{"{0} гигабајтова"} } kilobit{ dnam{"килобитови"} few{"{0} килобита"} one{"{0} килобит"} - other{"{0} килобита"} + other{"{0} килобитова"} } kilobyte{ dnam{"килобајти"} few{"{0} килобајта"} one{"{0} килобајт"} - other{"{0} килобајта"} + other{"{0} килобајтова"} } megabit{ dnam{"мегабитови"} few{"{0} мегабита"} one{"{0} мегабит"} - other{"{0} мегабита"} + other{"{0} мегабитова"} } megabyte{ dnam{"мегабајти"} few{"{0} мегабајта"} one{"{0} мегабајт"} - other{"{0} мегабајта"} + other{"{0} мегабајтова"} } petabyte{ dnam{"петабајти"} few{"{0} петабајта"} one{"{0} петабајт"} - other{"{0} петабајта"} + other{"{0} петабајтова"} } terabit{ dnam{"терабитови"} few{"{0} терабита"} one{"{0} терабит"} - other{"{0} терабита"} + other{"{0} терабитова"} } terabyte{ dnam{"терабајти"} @@ -470,6 +470,14 @@ sr{ other{"{0} мегахерца"} } } + graphics{ + dot{ + dnam{"тачка"} + few{"{0} тачке"} + one{"{0} тачка"} + other{"{0} тачака"} + } + } length{ astronomical-unit{ dnam{"астрономске јединице"} @@ -490,6 +498,18 @@ sr{ one{"{0} дециметар"} other{"{0} дециметара"} } + earth-radius{ + dnam{"полупречник Земље"} + few{"{0} R⊕"} + one{"{0} полупречник Земље"} + other{"{0} полупречника Земље"} + } + fathom{ + dnam{"хвати"} + few{"{0} хвата"} + one{"{0} хват"} + other{"{0} хвати"} + } foot{ dnam{"стопе"} few{"{0} стопе"} @@ -497,6 +517,12 @@ sr{ other{"{0} стопа"} per{"{0}/ft"} } + furlong{ + dnam{"фурлонзи"} + few{"{0} фурлонга"} + one{"{0} фурлонг"} + other{"{0} фурлонга"} + } inch{ dnam{"инчи"} few{"{0} инча"} @@ -592,6 +618,18 @@ sr{ } } light{ + candela{ + dnam{"кандела"} + few{"{0} канделе"} + one{"{0} кандела"} + other{"{0} кандела"} + } + lumen{ + dnam{"лумен"} + few{"{0} лумена"} + one{"{0} лумен"} + other{"{0} лумена"} + } lux{ dnam{"лукс"} few{"{0} лукса"} @@ -618,6 +656,12 @@ sr{ one{"{0} маса земље"} other{"{0} маса земље"} } + grain{ + dnam{"грејн"} + few{"{0} грејна"} + one{"{0} грејн"} + other{"{0} грејна"} + } gram{ dnam{"грами"} few{"{0} грама"} @@ -676,6 +720,12 @@ sr{ one{"{0} маса сунца"} other{"{0} маса сунца"} } + stone{ + dnam{"америчке тоне"} + few{"{0} америчке тоне"} + one{"{0} америчка тона"} + other{"{0} америчких тона"} + } ton{ dnam{"тоне"} few{"{0} тоне"} @@ -843,10 +893,10 @@ sr{ other{"{0} њутн-метара"} } pound-force-foot{ - dnam{"фунта-фити"} - few{"{0} фунта-фита"} - one{"{0} фунта-фит"} - other{"{0} фунта-фита"} + dnam{"фунта-стопе"} + few{"{0} фунте силе стопе"} + one{"{0} фунта силе стопе"} + other{"{0} фунти силе стопе"} } } volume{ @@ -862,6 +912,12 @@ sr{ one{"{0} барел"} other{"{0} барела"} } + bushel{ + dnam{"бушели"} + few{"{0} бушела"} + one{"{0} бушел"} + other{"{0} бушела"} + } centiliter{ dnam{"центилитри"} few{"{0} центилитра"} @@ -930,6 +986,30 @@ sr{ one{"{0} децилитар"} other{"{0} децилитара"} } + dessert-spoon{ + dnam{"десертна кашичица"} + few{"{0} десертне кашичице"} + one{"{0} десертна кашичица"} + other{"{0} десертних кашичица"} + } + dessert-spoon-imperial{ + dnam{"империјска десертна кашичица"} + few{"{0} империјске десертне кашичице"} + one{"{0} империјска десертна кашичица"} + other{"{0} империјских десертних кашичица"} + } + dram{ + dnam{"драм течности"} + few{"{0} драма течности"} + one{"{0} драм течности"} + other{"{0} драма течности"} + } + drop{ + dnam{"кап"} + few{"{0} капи"} + one{"{0} кап"} + other{"{0} капи"} + } fluid-ounce{ dnam{"унце течности"} few{"{0} унце течности"} @@ -962,6 +1042,12 @@ sr{ one{"{0} хектолитар"} other{"{0} хектолитара"} } + jigger{ + dnam{"џигер"} + few{"{0} џигера"} + one{"{0} џигер"} + other{"{0} џигера"} + } liter{ dnam{"литри"} few{"{0} литра"} @@ -981,6 +1067,12 @@ sr{ one{"{0} милилитар"} other{"{0} милилитара"} } + pinch{ + dnam{"прстохват"} + few{"{0} прстохвата"} + one{"{0} прстохват"} + other{"{0} прстохвата"} + } pint{ dnam{"пинте"} few{"{0} пинте"} @@ -999,6 +1091,12 @@ sr{ one{"{0} кварат"} other{"{0} кварата"} } + quart-imperial{ + dnam{"империјска четвртина"} + few{"{0} империјске четвртине"} + one{"{0} империјска четвртина"} + other{"{0} империјских четвртина"} + } tablespoon{ dnam{"кашике"} few{"{0} кашике"} @@ -1758,6 +1856,12 @@ sr{ } } graphics{ + dot{ + dnam{"тачка"} + few{"{0} тачке"} + one{"{0} тачка"} + other{"{0} тачака"} + } dot-per-centimeter{ dnam{"dpcm"} few{"{0} dpcm"} @@ -1821,6 +1925,18 @@ sr{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + few{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"хв"} + few{"{0} fth"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"ft"} few{"{0} ft"} @@ -1828,6 +1944,12 @@ sr{ other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"фурлонзи"} + few{"{0} fur"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"инчи"} few{"{0} инча"} @@ -1931,6 +2053,9 @@ sr{ one{"{0} CD"} other{"{0} CD"} } + grain{ + dnam{"грејн"} + } gram{ dnam{"грами"} few{"{0} g"} @@ -2205,6 +2330,15 @@ sr{ one{"{0} dL"} other{"{0} dL"} } + dram{ + dnam{"драм течности"} + } + drop{ + dnam{"кап"} + few{"{0} капи"} + one{"{0} кап"} + other{"{0} капи"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -2231,6 +2365,9 @@ sr{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"џигер"} + } liter{ dnam{"литри"} few{"{0} l"} @@ -2250,6 +2387,9 @@ sr{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"прстохват"} + } pint{ dnam{"pt"} few{"{0} pt"} diff --git a/intl/icu/source/data/unit/sr_BA.txt b/intl/icu/source/data/unit/sr_BA.txt index edad17f703fe..04f2efd1a7a2 100644 --- a/intl/icu/source/data/unit/sr_BA.txt +++ b/intl/icu/source/data/unit/sr_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_BA{ "%%ALIAS"{"sr_Cyrl_BA"} } diff --git a/intl/icu/source/data/unit/sr_CS.txt b/intl/icu/source/data/unit/sr_CS.txt index 5f8becfab3ed..6a32f49e2a6f 100644 --- a/intl/icu/source/data/unit/sr_CS.txt +++ b/intl/icu/source/data/unit/sr_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_CS{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/unit/sr_Cyrl.txt b/intl/icu/source/data/unit/sr_Cyrl.txt index df3a287587cf..772d8b3da519 100644 --- a/intl/icu/source/data/unit/sr_Cyrl.txt +++ b/intl/icu/source/data/unit/sr_Cyrl.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/sr_Cyrl_BA.txt b/intl/icu/source/data/unit/sr_Cyrl_BA.txt index 51e1655a53af..67a6c16beb79 100644 --- a/intl/icu/source/data/unit/sr_Cyrl_BA.txt +++ b/intl/icu/source/data/unit/sr_Cyrl_BA.txt @@ -1,8 +1,98 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -/** - * generated alias target - */ +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_BA{ - ___{""} + units{ + duration{ + century{ + dnam{"вијекови"} + few{"{0} вијека"} + one{"{0} вијек"} + other{"{0} вијекова"} + } + month{ + dnam{"мјесеци"} + few{"{0} мјесеца"} + one{"{0} мјесец"} + other{"{0} мјесеци"} + per{"{0} мјесечно"} + } + week{ + dnam{"недјеље"} + few{"{0} недјеље"} + one{"{0} недјеља"} + other{"{0} недјеља"} + per{"{0} недјељно"} + } + } + length{ + light-year{ + dnam{"свјетлосне године"} + few{"{0} свјетлосне године"} + one{"{0} свјетлосна година"} + other{"{0} свјетлосних година"} + } + } + mass{ + grain{ + dnam{"гран"} + few{"{0} грана"} + one{"{0} гран"} + other{"{0} гранова"} + } + } + } + unitsNarrow{ + volume{ + barrel{ + dnam{"bbl"} + few{"{0} bbl"} + one{"{0}bbl"} + other{"{0}bbl"} + } + dessert-spoon{ + dnam{"д. каш."} + few{"{0} д. каш."} + one{"{0} д. каш."} + other{"{0} д. каш."} + } + dessert-spoon-imperial{ + dnam{"и. д. к."} + few{"{0} и. д. к."} + one{"{0} и. д. к."} + other{"{0} и. д. к."} + } + } + } + unitsShort{ + duration{ + month{ + dnam{"мјесеци"} + few{"{0} мјес."} + one{"{0} мјес."} + other{"{0} мјес."} + } + } + length{ + light-year{ + dnam{"свјетлосне год."} + } + } + mass{ + grain{ + dnam{"гран"} + few{"{0} грана"} + one{"{0} гран"} + other{"{0} гранова"} + } + } + volume{ + dessert-spoon{ + dnam{"dstspn"} + few{"{0} dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + } + } } diff --git a/intl/icu/source/data/unit/sr_Cyrl_CS.txt b/intl/icu/source/data/unit/sr_Cyrl_CS.txt index 9325e5a76a14..2da82d2d35e0 100644 --- a/intl/icu/source/data/unit/sr_Cyrl_CS.txt +++ b/intl/icu/source/data/unit/sr_Cyrl_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_CS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/unit/sr_Cyrl_RS.txt b/intl/icu/source/data/unit/sr_Cyrl_RS.txt index 7ef8fabce652..c74b8608c8e9 100644 --- a/intl/icu/source/data/unit/sr_Cyrl_RS.txt +++ b/intl/icu/source/data/unit/sr_Cyrl_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sr_Cyrl_XK.txt b/intl/icu/source/data/unit/sr_Cyrl_XK.txt index d7d4a860bd1c..c74bfeecce64 100644 --- a/intl/icu/source/data/unit/sr_Cyrl_XK.txt +++ b/intl/icu/source/data/unit/sr_Cyrl_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sr_Cyrl_YU.txt b/intl/icu/source/data/unit/sr_Cyrl_YU.txt index 806d42c439fb..5874f8cb4091 100644 --- a/intl/icu/source/data/unit/sr_Cyrl_YU.txt +++ b/intl/icu/source/data/unit/sr_Cyrl_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_YU{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/unit/sr_Latn.txt b/intl/icu/source/data/unit/sr_Latn.txt index d2a8760713fa..ed8bb9eda1fa 100644 --- a/intl/icu/source/data/unit/sr_Latn.txt +++ b/intl/icu/source/data/unit/sr_Latn.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn{ %%Parent{"root"} - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -172,7 +172,7 @@ sr_Latn{ } consumption{ liter-per-100-kilometer{ - dnam{"L/100km"} + dnam{"litri na 100 kilometara"} few{"{0} litra na 100 kilometara"} one{"{0} litar na 100 kilometara"} other{"{0} litara na 100 kilometara"} @@ -220,49 +220,49 @@ sr_Latn{ dnam{"gigabitovi"} few{"{0} gigabita"} one{"{0} gigabit"} - other{"{0} gigabita"} + other{"{0} gigabitova"} } gigabyte{ dnam{"gigabajti"} few{"{0} gigabajta"} one{"{0} gigabajt"} - other{"{0} gigabajta"} + other{"{0} gigabajtova"} } kilobit{ dnam{"kilobitovi"} few{"{0} kilobita"} one{"{0} kilobit"} - other{"{0} kilobita"} + other{"{0} kilobitova"} } kilobyte{ dnam{"kilobajti"} few{"{0} kilobajta"} one{"{0} kilobajt"} - other{"{0} kilobajta"} + other{"{0} kilobajtova"} } megabit{ dnam{"megabitovi"} few{"{0} megabita"} one{"{0} megabit"} - other{"{0} megabita"} + other{"{0} megabitova"} } megabyte{ dnam{"megabajti"} few{"{0} megabajta"} one{"{0} megabajt"} - other{"{0} megabajta"} + other{"{0} megabajtova"} } petabyte{ dnam{"petabajti"} few{"{0} petabajta"} one{"{0} petabajt"} - other{"{0} petabajta"} + other{"{0} petabajtova"} } terabit{ dnam{"terabitovi"} few{"{0} terabita"} one{"{0} terabit"} - other{"{0} terabita"} + other{"{0} terabitova"} } terabyte{ dnam{"terabajti"} @@ -471,6 +471,13 @@ sr_Latn{ other{"{0} megaherca"} } } + graphics{ + dot{ + dnam{"tačka"} + few{"{0} tačke"} + one{"{0} tačka"} + } + } length{ astronomical-unit{ dnam{"astronomske jedinice"} @@ -491,6 +498,17 @@ sr_Latn{ one{"{0} decimetar"} other{"{0} decimetara"} } + earth-radius{ + dnam{"poluprečnik Zemlje"} + one{"{0} poluprečnik Zemlje"} + other{"{0} poluprečnika Zemlje"} + } + fathom{ + dnam{"hvati"} + few{"{0} hvata"} + one{"{0} hvat"} + other{"{0} hvati"} + } foot{ dnam{"stope"} few{"{0} stope"} @@ -498,6 +516,12 @@ sr_Latn{ other{"{0} stopa"} per{"{0}/ft"} } + furlong{ + dnam{"furlonzi"} + few{"{0} furlonga"} + one{"{0} furlong"} + other{"{0} furlonga"} + } inch{ dnam{"inči"} few{"{0} inča"} @@ -593,6 +617,18 @@ sr_Latn{ } } light{ + candela{ + dnam{"kandela"} + few{"{0} kandele"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + few{"{0} lumena"} + one{"{0} lumen"} + other{"{0} lumena"} + } lux{ dnam{"luks"} few{"{0} luksa"} @@ -619,6 +655,12 @@ sr_Latn{ one{"{0} masa zemlje"} other{"{0} masa zemlje"} } + grain{ + dnam{"grejn"} + few{"{0} grejna"} + one{"{0} grejn"} + other{"{0} grejna"} + } gram{ dnam{"grami"} few{"{0} grama"} @@ -677,6 +719,12 @@ sr_Latn{ one{"{0} masa sunca"} other{"{0} masa sunca"} } + stone{ + dnam{"američke tone"} + few{"{0} američke tone"} + one{"{0} američka tona"} + other{"{0} američkih tona"} + } ton{ dnam{"tone"} few{"{0} tone"} @@ -844,10 +892,10 @@ sr_Latn{ other{"{0} njutn-metara"} } pound-force-foot{ - dnam{"funta-fiti"} - few{"{0} funta-fita"} - one{"{0} funta-fit"} - other{"{0} funta-fita"} + dnam{"funta-stope"} + few{"{0} funte sile stope"} + one{"{0} funta sile stope"} + other{"{0} funti sile stope"} } } volume{ @@ -863,6 +911,12 @@ sr_Latn{ one{"{0} barel"} other{"{0} barela"} } + bushel{ + dnam{"bušeli"} + few{"{0} bušela"} + one{"{0} bušel"} + other{"{0} bušela"} + } centiliter{ dnam{"centilitri"} few{"{0} centilitra"} @@ -931,6 +985,30 @@ sr_Latn{ one{"{0} decilitar"} other{"{0} decilitara"} } + dessert-spoon{ + dnam{"desertna kašičica"} + few{"{0} desertne kašičice"} + one{"{0} desertna kašičica"} + other{"{0} desertnih kašičica"} + } + dessert-spoon-imperial{ + dnam{"imperijska desertna kašičica"} + few{"{0} imperijske desertne kašičice"} + one{"{0} imperijska desertna kašičica"} + other{"{0} imperijskih desertnih kašičica"} + } + dram{ + dnam{"dram tečnosti"} + few{"{0} drama tečnosti"} + one{"{0} dram tečnosti"} + other{"{0} drama tečnosti"} + } + drop{ + dnam{"kap"} + few{"{0} kapi"} + one{"{0} kap"} + other{"{0} kapi"} + } fluid-ounce{ dnam{"unce tečnosti"} few{"{0} unce tečnosti"} @@ -963,6 +1041,12 @@ sr_Latn{ one{"{0} hektolitar"} other{"{0} hektolitara"} } + jigger{ + dnam{"džiger"} + few{"{0} džigera"} + one{"{0} džiger"} + other{"{0} džigera"} + } liter{ dnam{"litri"} few{"{0} litra"} @@ -982,6 +1066,12 @@ sr_Latn{ one{"{0} mililitar"} other{"{0} mililitara"} } + pinch{ + dnam{"prstohvat"} + few{"{0} prstohvata"} + one{"{0} prstohvat"} + other{"{0} prstohvata"} + } pint{ dnam{"pinte"} few{"{0} pinte"} @@ -1000,6 +1090,12 @@ sr_Latn{ one{"{0} kvarat"} other{"{0} kvarata"} } + quart-imperial{ + dnam{"imperijska četvrtina"} + few{"{0} imperijske četvrtine"} + one{"{0} imperijska četvrtina"} + other{"{0} imperijskih četvrtina"} + } tablespoon{ dnam{"kašike"} few{"{0} kašike"} @@ -1155,12 +1251,24 @@ sr_Latn{ one{"{0} cm"} other{"{0} cm"} } + fathom{ + dnam{"hv"} + few{"{0} fth"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"ft"} few{"{0} ft"} one{"{0} ft"} other{"{0} ft"} } + furlong{ + dnam{"furlonzi"} + few{"{0} fur"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ few{"{0} inča"} one{"{0} inč"} @@ -1759,6 +1867,12 @@ sr_Latn{ } } graphics{ + dot{ + dnam{"tačka"} + few{"{0} tačke"} + one{"{0} tačka"} + other{"{0} tačaka"} + } dot-per-centimeter{ dnam{"dpcm"} other{"{0} dpcm"} @@ -1808,6 +1922,18 @@ sr_Latn{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + few{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"hv"} + few{"{0} fth"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"ft"} few{"{0} ft"} @@ -1815,6 +1941,12 @@ sr_Latn{ other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"furlonzi"} + few{"{0} fur"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"inči"} few{"{0} inča"} @@ -1918,6 +2050,9 @@ sr_Latn{ one{"{0} CD"} other{"{0} CD"} } + grain{ + dnam{"grejn"} + } gram{ dnam{"grami"} few{"{0} g"} @@ -2192,6 +2327,15 @@ sr_Latn{ one{"{0} dL"} other{"{0} dL"} } + dram{ + dnam{"dram tečnosti"} + } + drop{ + dnam{"kap"} + few{"{0} kapi"} + one{"{0} kap"} + other{"{0} kapi"} + } fluid-ounce{ dnam{"fl oz"} few{"{0} fl oz"} @@ -2218,6 +2362,9 @@ sr_Latn{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"džiger"} + } liter{ dnam{"litri"} few{"{0} l"} @@ -2237,6 +2384,9 @@ sr_Latn{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"prstohvat"} + } pint{ dnam{"pt"} few{"{0} pt"} diff --git a/intl/icu/source/data/unit/sr_Latn_BA.txt b/intl/icu/source/data/unit/sr_Latn_BA.txt index f4b62ac33917..f1791c5582a4 100644 --- a/intl/icu/source/data/unit/sr_Latn_BA.txt +++ b/intl/icu/source/data/unit/sr_Latn_BA.txt @@ -1,8 +1,98 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -/** - * generated alias target - */ +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_BA{ - ___{""} + units{ + duration{ + century{ + dnam{"vijekovi"} + few{"{0} vijeka"} + one{"{0} vijek"} + other{"{0} vijekova"} + } + month{ + dnam{"mjeseci"} + few{"{0} mjeseca"} + one{"{0} mjesec"} + other{"{0} mjeseci"} + per{"{0} mjesečno"} + } + week{ + dnam{"nedjelje"} + few{"{0} nedjelje"} + one{"{0} nedjelja"} + other{"{0} nedjelja"} + per{"{0} nedjeljno"} + } + } + length{ + light-year{ + dnam{"svjetlosne godine"} + few{"{0} svjetlosne godine"} + one{"{0} svjetlosna godina"} + other{"{0} svjetlosnih godina"} + } + } + mass{ + grain{ + dnam{"gran"} + few{"{0} grana"} + one{"{0} gran"} + other{"{0} granova"} + } + } + } + unitsNarrow{ + volume{ + barrel{ + dnam{"bbl"} + few{"{0} bbl"} + one{"{0}bbl"} + other{"{0}bbl"} + } + dessert-spoon{ + dnam{"d. kaš."} + few{"{0} d. kaš."} + one{"{0} d. kaš."} + other{"{0} d. kaš."} + } + dessert-spoon-imperial{ + dnam{"i. d. k."} + few{"{0} i. d. k."} + one{"{0} i. d. k."} + other{"{0} i. d. k."} + } + } + } + unitsShort{ + duration{ + month{ + dnam{"mjeseci"} + few{"{0} mjes."} + one{"{0} mjes."} + other{"{0} mjes."} + } + } + length{ + light-year{ + dnam{"svjetlosne god."} + } + } + mass{ + grain{ + dnam{"gran"} + few{"{0} grana"} + one{"{0} gran"} + other{"{0} granova"} + } + } + volume{ + dessert-spoon{ + dnam{"dstspn"} + few{"{0} dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + } + } } diff --git a/intl/icu/source/data/unit/sr_Latn_CS.txt b/intl/icu/source/data/unit/sr_Latn_CS.txt index 0952735a9c87..7204cfd29a04 100644 --- a/intl/icu/source/data/unit/sr_Latn_CS.txt +++ b/intl/icu/source/data/unit/sr_Latn_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/unit/sr_Latn_ME.txt b/intl/icu/source/data/unit/sr_Latn_ME.txt index 4cc6fe9ba48a..489fd5ad85d5 100644 --- a/intl/icu/source/data/unit/sr_Latn_ME.txt +++ b/intl/icu/source/data/unit/sr_Latn_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sr_Latn_RS.txt b/intl/icu/source/data/unit/sr_Latn_RS.txt index 76d38f8b734b..8d63da618417 100644 --- a/intl/icu/source/data/unit/sr_Latn_RS.txt +++ b/intl/icu/source/data/unit/sr_Latn_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sr_Latn_YU.txt b/intl/icu/source/data/unit/sr_Latn_YU.txt index 2747ab210a4c..415a4d892a22 100644 --- a/intl/icu/source/data/unit/sr_Latn_YU.txt +++ b/intl/icu/source/data/unit/sr_Latn_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/unit/sr_ME.txt b/intl/icu/source/data/unit/sr_ME.txt index 32dc91046bc8..aa5162679c6b 100644 --- a/intl/icu/source/data/unit/sr_ME.txt +++ b/intl/icu/source/data/unit/sr_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_ME{ "%%ALIAS"{"sr_Latn_ME"} } diff --git a/intl/icu/source/data/unit/sr_RS.txt b/intl/icu/source/data/unit/sr_RS.txt index 674ff77554b8..84db46919eb6 100644 --- a/intl/icu/source/data/unit/sr_RS.txt +++ b/intl/icu/source/data/unit/sr_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_RS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/unit/sr_XK.txt b/intl/icu/source/data/unit/sr_XK.txt index 9628a2763e54..0d3aa53999a4 100644 --- a/intl/icu/source/data/unit/sr_XK.txt +++ b/intl/icu/source/data/unit/sr_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_XK{ "%%ALIAS"{"sr_Cyrl_XK"} } diff --git a/intl/icu/source/data/unit/sr_YU.txt b/intl/icu/source/data/unit/sr_YU.txt index 26563d041d43..2d67778ecbdc 100644 --- a/intl/icu/source/data/unit/sr_YU.txt +++ b/intl/icu/source/data/unit/sr_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_YU{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/unit/su.txt b/intl/icu/source/data/unit/su.txt index 24e7e64e2bfc..bd24e019f373 100644 --- a/intl/icu/source/data/unit/su.txt +++ b/intl/icu/source/data/unit/su.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su{ - Version{"37"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} diff --git a/intl/icu/source/data/unit/su_ID.txt b/intl/icu/source/data/unit/su_ID.txt index 67dde384e09b..8da0f567d041 100644 --- a/intl/icu/source/data/unit/su_ID.txt +++ b/intl/icu/source/data/unit/su_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_ID{ "%%ALIAS"{"su_Latn_ID"} } diff --git a/intl/icu/source/data/unit/su_Latn.txt b/intl/icu/source/data/unit/su_Latn.txt index 008b42355f21..87ca4fa76d0b 100644 --- a/intl/icu/source/data/unit/su_Latn.txt +++ b/intl/icu/source/data/unit/su_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/su_Latn_ID.txt b/intl/icu/source/data/unit/su_Latn_ID.txt index 462983284c53..d6b42f358c4b 100644 --- a/intl/icu/source/data/unit/su_Latn_ID.txt +++ b/intl/icu/source/data/unit/su_Latn_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/sv.txt b/intl/icu/source/data/unit/sv.txt index 46fd183efc02..d5193ff71893 100644 --- a/intl/icu/source/data/unit/sv.txt +++ b/intl/icu/source/data/unit/sv.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -10,9 +10,9 @@ sv{ units{ acceleration{ g-force{ - dnam{"gånger jordens gravitation"} - one{"{0} gånger jordens gravitation"} - other{"{0} gånger jordens gravitation"} + dnam{"g-kraft"} + one{"{0} g-kraft"} + other{"{0} g-kraft"} } meter-per-square-second{ dnam{"meter per kvadratsekund"} @@ -363,6 +363,10 @@ sv{ one{"{0} kilowattimme"} other{"{0} kilowattimmar"} } + therm-us{ + one{"{0} am. therm"} + other{"{0} am. therms"} + } } force{ newton{ @@ -399,6 +403,9 @@ sv{ } } graphics{ + dot{ + dnam{"punkt"} + } dot-per-centimeter{ dnam{"bildpunkter per centimeter"} one{"{0} bildpunkt per centimeter"} @@ -415,17 +422,17 @@ sv{ megapixel{ dnam{"megapixel"} one{"{0} megapixel"} - other{"{0} megapixel"} + other{"{0} megapixlar"} } pixel{ - dnam{"pixel"} + dnam{"pixlar"} one{"{0} pixel"} - other{"{0} pixel"} + other{"{0} pixlar"} } pixel-per-centimeter{ - dnam{"pixel per centimeter"} + dnam{"pixlar per centimeter"} one{"{0} pixel per centimeter"} - other{"{0} pixel per centimeter"} + other{"{0} pixlar per centimeter"} } pixel-per-inch{ dnam{"pixel per tum"} @@ -450,6 +457,11 @@ sv{ one{"{0} decimeter"} other{"{0} decimeter"} } + earth-radius{ + dnam{"jordradie"} + one{"{0} jordradie"} + other{"{0} jordradie"} + } fathom{ dnam{"famnar"} one{"{0} famn"} @@ -535,9 +547,9 @@ sv{ other{"{0} pt"} } solar-radius{ - dnam{"gånger Solens radie"} - one{"{0} gånger Solens radie"} - other{"{0} gånger Solens radie"} + dnam{"solradier"} + one{"{0} solradie"} + other{"{0} solradier"} } yard{ dnam{"engelska yard"} @@ -546,15 +558,25 @@ sv{ } } light{ + candela{ + dnam{"candela"} + one{"{0} candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} one{"{0} lux"} other{"{0} lux"} } solar-luminosity{ - dnam{"gånger Solens luminositet"} - one{"{0} gånger Solens luminositet"} - other{"{0} gånger Solens luminositet"} + dnam{"solluminositeter"} + one{"{0} solluminositet"} + other{"{0} solluminositeter"} } } mass{ @@ -569,9 +591,13 @@ sv{ other{"{0} dalton"} } earth-mass{ - dnam{"gånger Jordens massa"} - one{"{0} gånger Jordens massa"} - other{"{0} gånger Jordens massa"} + dnam{"jordmassor"} + one{"{0} jordmassa"} + other{"{0} jordmassor"} + } + grain{ + one{"{0} grain"} + other{"{0} grains"} } gram{ dnam{"gram"} @@ -618,9 +644,9 @@ sv{ per{"{0} per pund"} } solar-mass{ - dnam{"gånger Solens massa"} - one{"{0} gånger Solens massa"} - other{"{0} gånger Solens massa"} + dnam{"solmassor"} + one{"{0} solmassa"} + other{"{0} solmassor"} } stone{ dnam{"engelska stenar"} @@ -775,9 +801,7 @@ sv{ other{"{0} engelska tunnland gånger fot"} } barrel{ - dnam{"råoljetunnor"} - one{"{0} tunna"} - other{"{0} tunnor"} + dnam{"fat"} } bushel{ dnam{"skäppor"} @@ -841,6 +865,25 @@ sv{ one{"{0} deciliter"} other{"{0} deciliter"} } + dessert-spoon{ + dnam{"dessertsked"} + one{"{0} dessertsked"} + other{"{0} dessertsked"} + } + dessert-spoon-imperial{ + dnam{"brittisk dessertsked"} + one{"{0} brittiska dessertskedar"} + other{"{0} brittiska dessertskedar"} + } + dram{ + one{"{0} brittisk dram"} + other{"{0} brittiska dramer"} + } + drop{ + dnam{"droppe"} + one{"{0} droppe"} + other{"{0} droppe"} + } fluid-ounce{ dnam{"fluid ounces"} one{"{0} fluid ounce"} @@ -863,6 +906,11 @@ sv{ one{"{0} hektoliter"} other{"{0} hektoliter"} } + jigger{ + dnam{"mätglas"} + one{"{0} mätglas"} + other{"{0} mätglas"} + } liter{ dnam{"liter"} one{"{0} liter"} @@ -879,6 +927,9 @@ sv{ one{"{0} milliliter"} other{"{0} milliliter"} } + pinch{ + dnam{"nypa"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -894,6 +945,11 @@ sv{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"br quart"} + one{"{0} brittisk quart"} + other{"{0} brittiska quarts"} + } tablespoon{ dnam{"matskedar"} one{"{0} matsked"} @@ -1225,6 +1281,10 @@ sv{ one{"{0}kWh"} other{"{0}kWh"} } + therm-us{ + one{"{0} am. therm"} + other{"{0} am. therm"} + } } force{ newton{ @@ -1254,6 +1314,13 @@ sv{ other{"{0}MHz"} } } + graphics{ + dot{ + dnam{"pkt"} + one{"{0} pkt"} + other{"{0} pkt"} + } + } length{ astronomical-unit{ dnam{"AE"} @@ -1641,6 +1708,25 @@ sv{ one{"{0}dL"} other{"{0}dL"} } + dessert-spoon{ + dnam{"dskd"} + one{"{0} dskd"} + other{"{0} dskd"} + } + dessert-spoon-imperial{ + one{"{0} br. dsk"} + other{"{0} br. dsk"} + } + dram{ + dnam{"fl. dram"} + one{"{0} fl. dram"} + other{"{0} fl. dram"} + } + drop{ + dnam{"drp"} + one{"{0} drp"} + other{"{0} drp"} + } fluid-ounce{ dnam{"vätskeuns"} one{"{0} v:euns"} @@ -1654,8 +1740,8 @@ sv{ } gallon-imperial{ dnam{"ämbar à 4,6L"} - one{"{0} äb·4,6L"} - other{"{0} äb·4,6L"} + one{"{0} äb·4,6 l"} + other{"{0} äb·4,6 l"} per{"{0}/äb·4,6L"} } hectoliter{ @@ -1663,6 +1749,11 @@ sv{ one{"{0}hL"} other{"{0}hL"} } + jigger{ + dnam{"mätglas"} + one{"{0} mätglas"} + other{"{0} mätglas"} + } liter{ dnam{"liter"} one{"{0} l"} @@ -1709,7 +1800,7 @@ sv{ unitsShort{ acceleration{ g-force{ - dnam{"G"} + dnam{"g-kraft"} one{"{0} G"} other{"{0} G"} } @@ -2048,6 +2139,11 @@ sv{ one{"{0} kWh"} other{"{0} kWh"} } + therm-us{ + dnam{"am. therm"} + one{"{0} am. therm"} + other{"{0} am. therms"} + } } force{ newton{ @@ -2080,6 +2176,11 @@ sv{ } } graphics{ + dot{ + dnam{"punkt"} + one{"{0} punkt"} + other{"{0} punkt"} + } dot-per-centimeter{ dnam{"d/cm"} one{"{0} d/cm"} @@ -2091,9 +2192,9 @@ sv{ other{"{0} d/tum"} } megapixel{ - dnam{"Mpx"} - one{"{0} Mpx"} - other{"{0} Mpx"} + dnam{"mpx"} + one{"{0} mpx"} + other{"{0} mpx"} } pixel-per-centimeter{ dnam{"px/cm"} @@ -2136,8 +2237,8 @@ sv{ } furlong{ dnam{"eng. plogfårelgd"} - one{"{0} eng. plogfårelgd"} - other{"{0} eng. plogfårelgd"} + one{"{0} fur"} + other{"{0} fur"} } inch{ dnam{"tum"} @@ -2214,6 +2315,11 @@ sv{ } } light{ + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -2392,6 +2498,13 @@ sv{ other{"{0} K"} } } + torque{ + newton-meter{ + dnam{"Nm"} + one{"{0} Nm"} + other{"{0} Nm"} + } + } volume{ acre-foot{ dnam{"eng. t:land·fot"} @@ -2399,7 +2512,7 @@ sv{ other{"{0} eng. t:d·fot"} } barrel{ - dnam{"råoljefat"} + dnam{"fat"} one{"{0} fat"} other{"{0} fat"} } @@ -2465,6 +2578,21 @@ sv{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"des.sked"} + one{"{0} dsk"} + other{"{0} dsk"} + } + dessert-spoon-imperial{ + dnam{"br. dsk"} + one{"br. dsk"} + other{"{0} br. dsk"} + } + drop{ + dnam{"droppe"} + one{"{0} droppe"} + other{"{0} droppe"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2487,6 +2615,11 @@ sv{ one{"{0} hl"} other{"{0} hl"} } + jigger{ + dnam{"mätglas"} + one{"{0} mätglas"} + other{"{0} mätglas"} + } liter{ dnam{"liter"} one{"{0} l"} @@ -2503,6 +2636,11 @@ sv{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"nypa"} + one{"{0} nypa"} + other{"{0} nypa"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -2518,6 +2656,11 @@ sv{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"br. qt"} + one{"{0} br. qt"} + other{"{0} br. qt"} + } tablespoon{ dnam{"msk"} one{"{0} msk"} diff --git a/intl/icu/source/data/unit/sv_FI.txt b/intl/icu/source/data/unit/sv_FI.txt index 3e6d4601ab79..51b02e6bd540 100644 --- a/intl/icu/source/data/unit/sv_FI.txt +++ b/intl/icu/source/data/unit/sv_FI.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv_FI{ - Version{"37"} unitsNarrow{ speed{ kilometer-per-hour{ diff --git a/intl/icu/source/data/unit/sw.txt b/intl/icu/source/data/unit/sw.txt index c04340f9996c..26cbbabf9003 100644 --- a/intl/icu/source/data/unit/sw.txt +++ b/intl/icu/source/data/unit/sw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -64,10 +64,10 @@ sw{ other{"hekta {0}"} } square-centimeter{ - dnam{"sentimita mraba"} - one{"sentimita mraba {0}"} - other{"sentimita mraba {0}"} - per{"{0} kwa kila sentimita mraba"} + dnam{"sentimita za mraba"} + one{"sentimita {0} ya mraba"} + other{"sentimita {0} za mraba"} + per{"{0} kwa kila sentimita ya mraba"} } square-foot{ dnam{"futi za mraba"} @@ -90,13 +90,13 @@ sw{ dnam{"mita za mraba"} one{"mita {0} ya mraba"} other{"mita {0} za mraba"} - per{"{0} kwa kila mita mraba"} + per{"{0} kwa kila mita ya mraba"} } square-mile{ dnam{"maili za mraba"} one{"maili {0} ya mraba"} other{"maili {0} za mraba"} - per{"{0} kwa kila maili mraba"} + per{"{0} kwa kila maili ya mraba"} } square-yard{ dnam{"yadi za mraba"} @@ -139,9 +139,9 @@ sw{ other{"{0} kwa kila elfu"} } permillion{ - dnam{"ppm"} - one{"ppm {0}"} - other{"ppm {0}"} + dnam{"sehemu kwa kila milioni"} + one{"sehemu {0} kwa kila milioni"} + other{"sehemu {0} kwa kila milioni"} } permyriad{ dnam{"permyriadi"} @@ -327,6 +327,11 @@ sw{ } } energy{ + british-thermal-unit{ + dnam{"vipimo vya joto vya Uingereza"} + one{"kipimo {0} cha joto cha Uingereza"} + other{"vipimo {0} vya joto vya Uingereza"} + } calorie{ dnam{"kalori"} one{"kalori {0}"} @@ -403,6 +408,11 @@ sw{ } } graphics{ + dot{ + dnam{"kitone"} + one{"kitone {0}"} + other{"vitone {0}"} + } dot-per-centimeter{ dnam{"vitone kwa kila sentimita"} one{"kitone {0} kwa kila sentimita"} @@ -456,12 +466,27 @@ sw{ one{"desimita {0}"} other{"desimita {0}"} } + earth-radius{ + dnam{"nusu kipenyo cha dunia"} + one{"nusu kipenyo cha dunia {0}"} + other{"nusu kipenyo cha dunia {0}"} + } + fathom{ + dnam{"fathom"} + one{"fathom {0}"} + other{"fathom {0}"} + } foot{ dnam{"futi"} one{"futi {0}"} other{"futi {0}"} per{"{0} kwa kila futi"} } + furlong{ + dnam{"furlong"} + one{"furlong {0}"} + other{"furlong {0}"} + } inch{ dnam{"inchi"} one{"inchi {0}"} @@ -497,8 +522,8 @@ sw{ } mile-scandinavian{ dnam{"maili ya skandinavia"} - one{"maili ya skandinavia"} - other{"{0} smi"} + one{"maili {0} ya skandinavia"} + other{"maili {0} za skandinavia"} } millimeter{ dnam{"milimita"} @@ -530,6 +555,11 @@ sw{ one{"pointi {0}"} other{"pointi {0}"} } + solar-radius{ + dnam{"nusu vipenyo vya jua"} + one{"nusu kipenyo cha jua {0}"} + other{"nusu vipenyo vya jua {0}"} + } yard{ dnam{"yadi"} one{"yadi {0}"} @@ -537,11 +567,26 @@ sw{ } } light{ + candela{ + dnam{"kandela"} + one{"kandela {0}"} + other{"kandela {0}"} + } + lumen{ + dnam{"lumeni"} + one{"lumeni {0}"} + other{"lumeni {0}"} + } lux{ dnam{"lux"} one{"lux {0}"} other{"lux {0}"} } + solar-luminosity{ + dnam{"ung’avu wa jua"} + one{"ung'avu wa jua {0}"} + other{"ung'avu wa jua {0}"} + } } mass{ carat{ @@ -549,6 +594,21 @@ sw{ one{"karati {0}"} other{"karati {0}"} } + dalton{ + dnam{"daltoni"} + one{"daltoni {0}"} + other{"daltoni {0}"} + } + earth-mass{ + dnam{"uzito wa dunia"} + one{"uzito wa dunia {0}"} + other{"uzito wa dunia {0}"} + } + grain{ + dnam{"nafaka"} + one{"nafaka {0}"} + other{"nafaka {0}"} + } gram{ dnam{"gramu"} one{"gramu {0}"} @@ -593,10 +653,20 @@ sw{ other{"ratili {0}"} per{"{0} kwa kila ratili"} } + solar-mass{ + dnam{"uzito wa jua"} + one{"uzito wa jua {0}"} + other{"uzito wa jua {0}"} + } + stone{ + dnam{"mawe"} + one{"jiwe {0}"} + other{"mawe {0}"} + } ton{ - dnam{"tani"} - one{"tani {0}"} - other{"tani {0}"} + dnam{"tani fupi"} + one{"tani fupi {0}"} + other{"tani fupi {0}"} } } power{ @@ -750,6 +820,11 @@ sw{ one{"pipa {0}"} other{"mapipa {0}"} } + bushel{ + dnam{"busheli"} + one{"busheli {0}"} + other{"busheli {0}"} + } centiliter{ dnam{"sentilita"} one{"sentilita {0}"} @@ -807,11 +882,36 @@ sw{ one{"desilita {0}"} other{"desilita {0}"} } + dessert-spoon{ + dnam{"kijiko cha kitindamlo"} + one{"kijiko {0} cha kitindamlo"} + other{"vijiko {0} vya kitindamlo"} + } + dessert-spoon-imperial{ + dnam{"Kijiko cha kitindamlo cha Uingireza"} + one{"kijiko {0} cha kitindamlo cha Uingereza"} + other{"vijiko {0} vya kitindamlo vya Uingereza"} + } + dram{ + dnam{"dramu"} + one{"dramu {0}"} + other{"dramu {0}"} + } + drop{ + dnam{"tone"} + one{"tone {0}"} + other{"matone {0}"} + } fluid-ounce{ dnam{"aunsi za ujazo"} one{"aunsi {0} ya ujazo"} other{"aunsi {0} za ujazo"} } + fluid-ounce-imperial{ + dnam{"aunsi za ujazo za Uingereza"} + one{"aunsi {0} ya ujazo ya Uingereza"} + other{"aunsi {0} za ujazo za Uingereza"} + } gallon{ dnam{"galoni"} one{"galoni {0}"} @@ -820,8 +920,8 @@ sw{ } gallon-imperial{ dnam{"Imp. gal"} - one{"{0} gal Imp."} - other{"{0} gal Imp."} + one{"gal Imp. {0}"} + other{"gal Imp. {0}"} per{"{0}/gal Imp."} } hectoliter{ @@ -829,6 +929,11 @@ sw{ one{"hektolita {0}"} other{"hektolita {0}"} } + jigger{ + dnam{"toti"} + one{"toti {0}"} + other{"toti {0}"} + } liter{ dnam{"lita"} one{"lita {0}"} @@ -845,6 +950,11 @@ sw{ one{"mililita {0}"} other{"mililita {0}"} } + pinch{ + dnam{"mfinyo kwa vidole"} + one{"mfinyo {0} kwa vidole"} + other{"mifinyo {0} kwa vidole"} + } pint{ dnam{"painti"} one{"painti {0}"} @@ -860,6 +970,11 @@ sw{ one{"kwati {0}"} other{"kwati {0}"} } + quart-imperial{ + dnam{"kwati ya Uingereza"} + one{"kwati {0} ya Uingereza"} + other{"kwati {0} za Uingereza"} + } tablespoon{ dnam{"vijiko vikubwa"} one{"kijiko {0} kikubwa"} @@ -932,8 +1047,8 @@ sw{ consumption{ liter-per-100-kilometer{ dnam{"lita kwa kilomita 100"} - one{"{0}L/100km"} - other{"{0}L/100km"} + one{"L/100km {0}"} + other{"L/100km {0}"} } } coordinate{ @@ -961,8 +1076,8 @@ sw{ } minute{ dnam{"dakika"} - one{"dakika {0}"} - other{"dakika {0}"} + one{"dak {0}"} + other{"dak {0}"} } month{ dnam{"mwezi"} @@ -971,8 +1086,8 @@ sw{ } second{ dnam{"sekunde"} - one{"sekunde {0}"} - other{"sekunde {0}"} + one{"sek {0}"} + other{"sek {0}"} } week{ dnam{"wiki"} @@ -993,8 +1108,8 @@ sw{ length{ centimeter{ dnam{"sentimita"} - one{"{0} cm"} - other{"{0} cm"} + one{"cm {0}"} + other{"cm {0}"} } foot{ one{"Futi {0}"} @@ -1025,8 +1140,8 @@ sw{ } millimeter{ dnam{"milimita"} - one{"{0} mm"} - other{"{0} mm"} + one{"mm {0}"} + other{"mm {0}"} } picometer{ one{"pm {0}"} @@ -1185,7 +1300,7 @@ sw{ other{"hekta {0}"} } square-centimeter{ - dnam{"sentimita mraba"} + dnam{"sentimita za mraba"} one{"cm² {0}"} other{"cm² {0}"} per{"{0}/cm²"} @@ -1209,20 +1324,20 @@ sw{ } square-meter{ dnam{"mita za mraba"} - one{"mita {0} ya mraba"} + one{"m² {0}"} other{"m² {0}"} per{"{0}/m²"} } square-mile{ dnam{"maili za mraba"} - one{"maili {0} ya mraba"} - other{"maili {0} za mraba"} + one{"sq mi {0}"} + other{"sq mi {0}"} per{"{0}/mi²"} } square-yard{ dnam{"yadi za mraba"} - one{"yadi {0} ya mraba"} - other{"yadi {0} za mraba"} + one{"yd² {0}"} + other{"yd² {0}"} } } compound{ @@ -1260,7 +1375,7 @@ sw{ other{"{0} kwa elfu"} } permillion{ - dnam{"ppm"} + dnam{"sehemu kwa kila milioni"} one{"ppm {0}"} other{"ppm {0}"} } @@ -1271,8 +1386,8 @@ sw{ consumption{ liter-per-100-kilometer{ dnam{"lita kwa kilomita 100"} - one{"lita {0} kwa kilomita 100"} - other{"lita {0}/km100"} + one{"lita {0}/km 100"} + other{"lita {0}/km 100"} } liter-per-kilometer{ dnam{"lita kwa kila kilomita"} @@ -1281,13 +1396,13 @@ sw{ } mile-per-gallon{ dnam{"maili kwa kila galoni"} - one{"{0} mpg"} - other{"{0} mpg"} + one{"mpg {0}"} + other{"mpg {0}"} } mile-per-gallon-imperial{ dnam{"mpg Imp."} - one{"{0} mpg Imp."} - other{"{0} mpg Imp."} + one{"mpg Imp. {0}"} + other{"mpg Imp. {0}"} } } coordinate{ @@ -1384,8 +1499,8 @@ sw{ } millisecond{ dnam{"millisekunde"} - one{"millisekunde {0}"} - other{"millisekunde {0}"} + one{"ms {0}"} + other{"ms {0}"} } minute{ dnam{"dakika"} @@ -1431,8 +1546,8 @@ sw{ } milliampere{ dnam{"miliampea"} - one{"{0} mA"} - other{"{0} mA"} + one{"mA {0}"} + other{"mA {0}"} } ohm{ dnam{"ohm"} @@ -1446,6 +1561,11 @@ sw{ } } energy{ + british-thermal-unit{ + dnam{"BTU"} + one{"Btu {0}"} + other{"Btu {0}"} + } calorie{ dnam{"kalori"} one{"kalori {0}"} @@ -1453,6 +1573,8 @@ sw{ } electronvolt{ dnam{"elektrovolti"} + one{"eV {0}"} + other{"eV {0}"} } foodcalorie{ dnam{"kalori"} @@ -1476,8 +1598,8 @@ sw{ } kilowatt-hour{ dnam{"kilowati kwa saa"} - one{"{0} kWh"} - other{"{0} kWh"} + one{"kWh {0}"} + other{"kWh {0}"} } therm-us{ dnam{"kipimo cha gesi, Marekani"} @@ -1488,9 +1610,13 @@ sw{ force{ newton{ dnam{"newtoni"} + one{"N {0}"} + other{"N {0}"} } pound-force{ dnam{"paunikani"} + one{"lbf {0}"} + other{"lbf {0}"} } } frequency{ @@ -1516,6 +1642,11 @@ sw{ } } graphics{ + dot{ + dnam{"kitone"} + one{"kitone {0}"} + other{"vitone {0}"} + } dot-per-centimeter{ one{"dpcm {0}"} other{"dpcm {0}"} @@ -1563,12 +1694,26 @@ sw{ one{"desimita {0}"} other{"desimita {0}"} } + earth-radius{ + one{"R⊕ {0}"} + other{"R⊕ {0}"} + } + fathom{ + dnam{"fathom"} + one{"fth {0}"} + other{"fth {0}"} + } foot{ dnam{"futi"} one{"futi {0}"} other{"futi {0}"} per{"{0} kwa kila futi"} } + furlong{ + dnam{"furlong"} + one{"fur {0}"} + other{"fur {0}"} + } inch{ dnam{"inchi"} one{"inchi {0}"} @@ -1604,8 +1749,8 @@ sw{ } mile-scandinavian{ dnam{"smi"} - one{"{0} smi"} - other{"{0} smi"} + one{"smi {0}"} + other{"smi {0}"} } millimeter{ dnam{"milimita"} @@ -1624,8 +1769,8 @@ sw{ } parsec{ dnam{"kila sekunde"} - one{"{0} pc"} - other{"{0} pc"} + one{"pc {0}"} + other{"pc {0}"} } picometer{ dnam{"pikomita"} @@ -1637,6 +1782,11 @@ sw{ one{"pointi {0}"} other{"pointi {0}"} } + solar-radius{ + dnam{"nusu vipenyo vya jua"} + one{"R☉ {0}"} + other{"R☉ {0}"} + } yard{ dnam{"yadi"} one{"yadi {0}"} @@ -1644,11 +1794,24 @@ sw{ } } light{ + candela{ + one{"cd {0}"} + other{"cd {0}"} + } + lumen{ + one{"lm {0}"} + other{"lm {0}"} + } lux{ dnam{"lux"} one{"lx {0}"} other{"lx {0}"} } + solar-luminosity{ + dnam{"ung’avu wa jua"} + one{"L☉ {0}"} + other{"L☉ {0}"} + } } mass{ carat{ @@ -1656,6 +1819,21 @@ sw{ one{"karati {0}"} other{"karati {0}"} } + dalton{ + dnam{"daltoni"} + one{"Da {0}"} + other{"Da {0}"} + } + earth-mass{ + dnam{"uzito wa dunia"} + one{"M⊕ {0}"} + other{"M⊕ {0}"} + } + grain{ + dnam{"nafaka"} + one{"nafaka {0}"} + other{"nafaka {0}"} + } gram{ dnam{"gramu"} one{"gramu {0}"} @@ -1700,10 +1878,20 @@ sw{ other{"ratili {0}"} per{"{0}/lb"} } + solar-mass{ + dnam{"uzito wa jua"} + one{"M☉ {0}"} + other{"M☉ {0}"} + } + stone{ + dnam{"mawe"} + one{"st {0}"} + other{"st {0}"} + } ton{ - dnam{"tani"} - one{"tani {0}"} - other{"tani {0}"} + dnam{"tani fupi"} + one{"tani fupi {0}"} + other{"tani fupi {0}"} } } power{ @@ -1714,8 +1902,8 @@ sw{ } horsepower{ dnam{"kipimo cha hospawa"} - one{"{0} hp"} - other{"{0} hp"} + one{"hp {0}"} + other{"hp {0}"} } kilowatt{ dnam{"kilowati"} @@ -1756,8 +1944,8 @@ sw{ } inch-ofhg{ dnam{"inchi za zebaki"} - one{"{0} inHg"} - other{"{0} inHg"} + one{"inHg {0}"} + other{"inHg {0}"} } kilopascal{ one{"kPa {0}"} @@ -1774,8 +1962,8 @@ sw{ } millimeter-ofhg{ dnam{"milimita za zebaki"} - one{"milimita {0} ya zebaki"} - other{"mm Hg {0}"} + one{"mmHg {0}"} + other{"mmHg {0}"} } pascal{ one{"Pa {0}"} @@ -1800,13 +1988,13 @@ sw{ } meter-per-second{ dnam{"mita kwa kila sekunde"} - one{"{0} m/s"} - other{"{0} m/s"} + one{"m/s {0}"} + other{"m/s {0}"} } mile-per-hour{ dnam{"maili kwa kila saa"} - one{"{0} mph"} - other{"{0} mph"} + one{"mph {0}"} + other{"mph {0}"} } } temperature{ @@ -1831,6 +2019,16 @@ sw{ other{"{0} K"} } } + torque{ + newton-meter{ + one{"N⋅m {0}"} + other{"N⋅m {0}"} + } + pound-force-foot{ + one{"lbf⋅ft {0}"} + other{"lbf⋅ft {0}"} + } + } volume{ acre-foot{ dnam{"ekari futi"} @@ -1842,6 +2040,11 @@ sw{ one{"pipa {0}"} other{"mapipa {0}"} } + bushel{ + dnam{"busheli"} + one{"bu {0}"} + other{"bu {0}"} + } centiliter{ dnam{"sentilita"} one{"sentilita {0}"} @@ -1899,11 +2102,35 @@ sw{ one{"desilita {0}"} other{"desilita {0}"} } + dessert-spoon{ + one{"dstspn {0}"} + other{"dstspn {0}"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + one{"dstspn Imp {0}"} + other{"dstspn Imp {0}"} + } + dram{ + dnam{"ujazo wa dramu"} + one{"ujazo wa dramu {0}"} + other{"ujazo wa dramu {0}"} + } + drop{ + dnam{"tone"} + one{"tone {0}"} + other{"matone {0}"} + } fluid-ounce{ dnam{"aunsi za ujazo"} one{"fl oz {0}"} other{"fl oz {0}"} } + fluid-ounce-imperial{ + dnam{"Imp. fl oz"} + one{"fl oz Imp. {0}"} + other{"fl oz Imp. {0}"} + } gallon{ dnam{"galoni"} one{"galoni {0}"} @@ -1912,8 +2139,8 @@ sw{ } gallon-imperial{ dnam{"Imp. gal"} - one{"{0} gal Imp."} - other{"{0} gal Imp."} + one{"gal Imp. {0}"} + other{"gal Imp. {0}"} per{"{0}/gal Imp."} } hectoliter{ @@ -1921,6 +2148,11 @@ sw{ one{"hektolita {0}"} other{"hektolita {0}"} } + jigger{ + dnam{"toti"} + one{"toti {0}"} + other{"toti {0}"} + } liter{ dnam{"lita"} one{"lita {0}"} @@ -1937,6 +2169,11 @@ sw{ one{"mililita {0}"} other{"mililita {0}"} } + pinch{ + dnam{"mfinyo kwa vidole"} + one{"mfinyo {0} kwa vidole"} + other{"mifinyo {0} kwa vidole"} + } pint{ dnam{"painti"} one{"painti {0}"} @@ -1952,15 +2189,20 @@ sw{ one{"kwati {0}"} other{"kwati {0}"} } + quart-imperial{ + dnam{"qt Imp"} + one{"qt Imp. {0}"} + other{"qt Imp. {0}"} + } tablespoon{ dnam{"vijiko vikubwa"} - one{"kijiko {0} kikubwa"} - other{"vijiko {0} vikubwa"} + one{"tbsp {0}"} + other{"tbsp {0}"} } teaspoon{ dnam{"vijiko vidogo"} - one{"kijiko {0} kidogo"} - other{"vijiko {0} vidogo"} + one{"tsp {0}"} + other{"tsp {0}"} } } } diff --git a/intl/icu/source/data/unit/sw_KE.txt b/intl/icu/source/data/unit/sw_KE.txt index 02458640ab1e..bd6be0b43e34 100644 --- a/intl/icu/source/data/unit/sw_KE.txt +++ b/intl/icu/source/data/unit/sw_KE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_KE{ - Version{"37"} units{ duration{ decade{ @@ -42,12 +42,7 @@ sw_KE{ one{"maikromita {0}"} other{"maikromita {0}"} } - mile-scandinavian{ - one{"maili {0} ya skandinavia"} - other{"maili {0} za skandinavia"} - } solar-radius{ - dnam{"nusu vipenyo vya jua"} one{"nusu kipenyo {0} cha jua"} other{"nusu vipenyo {0} vya jua"} } @@ -106,19 +101,10 @@ sw_KE{ one{"maikromita {0}"} other{"maikromita {0}"} } - mile-scandinavian{ - one{"smi {0}"} - other{"smi {0}"} - } parsec{ - one{"{0} pc"} + one{"pc {0}"} other{"kila sekunde {0}"} } - solar-radius{ - dnam{"nusu vipenyo vya jua"} - one{"R☉ {0}"} - other{"R☉ {0}"} - } } pressure{ bar{ @@ -126,9 +112,9 @@ sw_KE{ one{"baa {0}"} other{"baa {0}"} } - inch-ofhg{ - one{"inHg {0}"} - other{"inHg {0}"} + millimeter-ofhg{ + one{"mmHg {0}"} + other{"mm Hg {0}"} } } } diff --git a/intl/icu/source/data/unit/ta.txt b/intl/icu/source/data/unit/ta.txt index 7c25bc3316f9..c3657928101a 100644 --- a/intl/icu/source/data/unit/ta.txt +++ b/intl/icu/source/data/unit/ta.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ ta{ } } graphics{ + dot{ + dnam{"புள்ளி"} + one{"{0}புள்ளி"} + other{"{0}புள்ளி"} + } dot-per-centimeter{ dnam{"புள்ளிகள் / சென்டிமீட்டர்"} one{"{0} புள்ளி / சென்டிமீட்டர்"} @@ -461,12 +466,27 @@ ta{ one{"{0} டெசிமீட்டர்"} other{"{0} டெசிமீட்டர்கள்"} } + earth-radius{ + dnam{"புவி ஆரம்"} + one{"{0} புவி ஆரம்"} + other{"{0} புவி ஆரம்"} + } + fathom{ + dnam{"ஃபேதம்கள்"} + one{"{0} ஃபேதம்"} + other{"{0} ஃபேதம்கள்"} + } foot{ dnam{"அடி"} one{"{0} அடி"} other{"{0} அடி"} per{"{0}/அடி"} } + furlong{ + dnam{"பர்லாங்குகள்"} + one{"{0} பர்லாங்கு"} + other{"{0} பர்லாங்குகள்"} + } inch{ dnam{"அங்குலங்கள்"} one{"{0} அங்குலம்"} @@ -547,6 +567,16 @@ ta{ } } light{ + candela{ + dnam{"கேண்டலா"} + one{"{0} கேண்டலா"} + other{"{0} கேண்டலா"} + } + lumen{ + dnam{"லூமன்"} + one{"{0} லூமன்"} + other{"{0} லூமன்"} + } lux{ dnam{"லக்ஸ்"} one{"{0} லக்ஸ்"} @@ -574,6 +604,11 @@ ta{ one{"{0} புவித் திணிவு"} other{"{0} புவித் திணிவுகள்"} } + grain{ + dnam{"கிரைன்"} + one{"{0} கிரைன்"} + other{"{0} கிரைன்"} + } gram{ dnam{"கிராம்கள்"} one{"{0} கிராம்"} @@ -785,6 +820,11 @@ ta{ one{"{0} பீப்பாய்"} other{"{0} பீப்பாய்கள்"} } + bushel{ + dnam{"புசல்கள்"} + one{"{0} புசல்"} + other{"{0} புசல்கள்"} + } centiliter{ dnam{"சென்டிலிட்டர்கள்"} one{"{0} சென்டிலிட்டர்"} @@ -842,6 +882,26 @@ ta{ one{"{0} டெசிலிட்டர்"} other{"{0} டெசிலிட்டர்கள்"} } + dessert-spoon{ + dnam{"இனிப்புக் கரண்டி"} + one{"{0} இனிப்புக் கரண்டி"} + other{"{0} இனிப்புக் கரண்டி"} + } + dessert-spoon-imperial{ + dnam{"இம்பீரியல் இனிப்புக் கரண்டி"} + one{"{0} இம்பீரியல் இனிப்புக் கரண்டி"} + other{"{0} இம்பீரியல் இனிப்புக் கரண்டி"} + } + dram{ + dnam{"டிராம்"} + one{"{0} டிராம்"} + other{"{0} டிராம்"} + } + drop{ + dnam{"துளி"} + one{"{0} துளி"} + other{"{0} துளி"} + } fluid-ounce{ dnam{"திரவ அவுன்ஸ்"} one{"{0} திரவ அவுன்ஸ்"} @@ -869,6 +929,11 @@ ta{ one{"{0} ஹெக்டோலிட்டர்"} other{"{0} ஹெக்டோலிட்டர்கள்"} } + jigger{ + dnam{"ஜிகர்"} + one{"{0} ஜிகர்"} + other{"{0} ஜிகர்"} + } liter{ dnam{"லிட்டர்கள்"} one{"{0} லிட்டர்"} @@ -885,6 +950,11 @@ ta{ one{"{0} மில்லிலிட்டர்"} other{"{0} மில்லிலிட்டர்கள்"} } + pinch{ + dnam{"சிட்டிகை"} + one{"{0} சிட்டிகை"} + other{"{0} சிட்டிகை"} + } pint{ dnam{"பின்ட்கள்"} one{"{0} பின்ட்"} @@ -900,6 +970,11 @@ ta{ one{"{0} குவார்ட்"} other{"{0} குவார்ட்ஸ்"} } + quart-imperial{ + dnam{"இம்பீரியல் குவார்ட்"} + one{"{0} இம்பீரியல் குவார்ட்"} + other{"{0} இம்பீரியல் குவார்ட்"} + } tablespoon{ dnam{"மேஜைக்கரண்டி"} one{"{0} மேஜைக்கரண்டி"} @@ -1618,6 +1693,11 @@ ta{ } } graphics{ + dot{ + dnam{"புள்ளி"} + one{"{0} புள்ளி"} + other{"{0} புள்ளி"} + } dot-per-centimeter{ dnam{"பு / செ.மீ"} one{"{0} பு / செ.மீ"} @@ -1671,12 +1751,22 @@ ta{ one{"{0} டெ.மீ"} other{"{0} டெ.மீ"} } + fathom{ + dnam{"ஃபே."} + one{"{0} ஃபே."} + other{"{0} ஃபே."} + } foot{ dnam{"அடி"} one{"{0} அடி"} other{"{0} அடி"} per{"{0}/அடி"} } + furlong{ + dnam{"பர்"} + one{"{0} பர்"} + other{"{0} பர்"} + } inch{ dnam{"அங்குலங்கள்"} one{"{0} அங்."} @@ -1755,6 +1845,16 @@ ta{ } } light{ + candela{ + dnam{"கேண்ட."} + one{"{0} கேண்ட."} + other{"{0} கேண்ட."} + } + lumen{ + dnam{"லூம."} + one{"{0} லூம."} + other{"{0} லூம."} + } lux{ dnam{"லக்ஸ்"} one{"{0} லக்."} @@ -1772,10 +1872,17 @@ ta{ } dalton{ dnam{"டால்ட்டன்ஸ்"} + one{"{0} டா."} + other{"{0} டா."} } earth-mass{ dnam{"புவித் திணிவுகள்"} } + grain{ + dnam{"கிரைன்"} + one{"{0} கிரைன்"} + other{"{0} கிரைன்"} + } gram{ dnam{"கிராம்கள்"} one{"{0} கி."} @@ -1982,6 +2089,13 @@ ta{ } barrel{ dnam{"பீப்பாய்"} + one{"{0} பீப்."} + other{"{0} பீப்."} + } + bushel{ + dnam{"புசல்கள்"} + one{"{0} புச."} + other{"{0} புச."} } centiliter{ dnam{"செ.லி."} @@ -2040,11 +2154,36 @@ ta{ one{"{0} டெ.லி."} other{"{0} டெ.லி."} } + dessert-spoon{ + dnam{"இ.க."} + one{"{0} இ.க."} + other{"{0} இ.க."} + } + dessert-spoon-imperial{ + dnam{"இ.க. இம்பீ."} + one{"{0} இ.க. இம்பீ."} + other{"{0} இ.க. இம்பீ."} + } + dram{ + dnam{"டிரா.தி."} + one{"{0} டிரா.தி."} + other{"{0} டிரா.தி."} + } + drop{ + dnam{"துளி"} + one{"{0} துளி"} + other{"{0} துளி"} + } fluid-ounce{ dnam{"தி. அவு."} one{"{0} தி. அவு."} other{"{0} தி. அவு."} } + fluid-ounce-imperial{ + dnam{"இம்பீ. தி. அவு."} + one{"{0} தி. அவு. இம்பீ."} + other{"{0} தி. அவு. இம்பீ."} + } gallon{ dnam{"கேல."} one{"{0} கேல."} @@ -2062,6 +2201,11 @@ ta{ one{"{0} ஹெ.லி."} other{"{0} ஹெ.லி."} } + jigger{ + dnam{"ஜிக."} + one{"{0} ஜிக."} + other{"{0} ஜிக."} + } liter{ dnam{"லிட்டர்கள்"} one{"{0} லி."} @@ -2078,6 +2222,11 @@ ta{ one{"{0} மிலி"} other{"{0} மிலி"} } + pinch{ + dnam{"சிட்டி"} + one{"{0} சிட்டி"} + other{"{0} சிட்டி"} + } pint{ dnam{"பின்ட்கள்"} one{"{0} பின்."} @@ -2093,6 +2242,11 @@ ta{ one{"{0} குவாட்."} other{"{0} குவாட்."} } + quart-imperial{ + dnam{"குவாட். இம்பீ."} + one{"{0} குவாட். இம்பீ."} + other{"{0} குவாட். இம்பீ."} + } tablespoon{ dnam{"மே.க."} one{"{0} மே.க."} diff --git a/intl/icu/source/data/unit/te.txt b/intl/icu/source/data/unit/te.txt index 30b93bac996f..aed2c5f1c406 100644 --- a/intl/icu/source/data/unit/te.txt +++ b/intl/icu/source/data/unit/te.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml te{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,11 @@ te{ } } graphics{ + dot{ + dnam{"బిందువు"} + one{"{0} బిందువు"} + other{"{0} బిందువు"} + } dot-per-centimeter{ dnam{"బిందువులు ప్రతి సెంటిమీటరుకు"} one{"{0} బిందువు ప్రతి సెంటిమీటరుకు"} @@ -418,6 +423,10 @@ te{ one{"{0} బిందువు ప్రతి అంగుళానికి"} other{"{0} బిందువులు ప్రతి అంగుళానికి"} } + em{ + one{"{0} em"} + other{"{0} emలు"} + } megapixel{ dnam{"మెగా పిక్సెల్స్"} one{"{0} మెగా పిక్సెల్స్"} @@ -425,7 +434,7 @@ te{ } pixel{ dnam{"పిక్సెల్స్"} - one{"{0} px"} + one{"{0} పిక్సెల్"} other{"{0} పిక్సెల్స్"} } pixel-per-centimeter{ @@ -456,12 +465,27 @@ te{ one{"{0} డెసిమీటరు"} other{"{0} డెసిమీటర్లు"} } + earth-radius{ + dnam{"భూమి వ్యాసార్ధం"} + one{"{0} భూమి వ్యాసార్ధం"} + other{"{0} భూమి వ్యాసార్ధం"} + } + fathom{ + dnam{"వ్యామము"} + one{"{0} వ్యామము"} + other{"{0} వ్యామములు"} + } foot{ dnam{"అడుగులు"} one{"{0} అడుగు"} other{"{0} అడుగులు"} per{"అడుగుకి {0}"} } + furlong{ + dnam{"ఫర్లాంగులు"} + one{"{0} ఫర్లాంగు"} + other{"{0} ఫర్లాంగులు"} + } inch{ dnam{"అంగుళాలు"} one{"{0} అంగుళం"} @@ -542,6 +566,16 @@ te{ } } light{ + candela{ + dnam{"క్యాడెలా"} + one{"{0} క్యాడెలా"} + other{"{0} క్యాడెలా"} + } + lumen{ + dnam{"లుమెన్"} + one{"{0} లుమెన్"} + other{"{0} లుమెన్"} + } lux{ dnam{"లక్స్"} one{"{0} లక్స్"} @@ -569,6 +603,11 @@ te{ one{"{0} భూమి ద్రవ్యరాశి"} other{"{0} భూమి ద్రవ్యరాశులు"} } + grain{ + dnam{"ధాన్యము"} + one{"{0} ధాన్యము"} + other{"{0} ధాన్యము"} + } gram{ dnam{"గ్రాములు"} one{"{0} గ్రాము"} @@ -780,6 +819,11 @@ te{ one{"{0} బారెల్‌లు"} other{"{0} బారెల్‌లు"} } + bushel{ + dnam{"బుషెల్"} + one{"{0} బుషెల్"} + other{"{0} బుషెల్‌లు"} + } centiliter{ dnam{"సెంటీలీటర్లు"} one{"{0} సెంటీలీటరు"} @@ -837,6 +881,26 @@ te{ one{"{0} డెసిలీటరు"} other{"{0} డెసిలీటర్లు"} } + dessert-spoon{ + dnam{"డెసర్ట్ స్పూన్"} + one{"{0} డెసర్ట్ స్పూన్"} + other{"{0} డెసర్ట్ స్పూన్"} + } + dessert-spoon-imperial{ + dnam{"ఇంపీరియల్ డెసర్ట్ స్పూన్"} + one{"{0} ఇంపీరియల్ డెసర్ట్ స్పూన్"} + other{"{0} ఇంపీరియల్ డెసర్ట్ స్పూన్"} + } + dram{ + dnam{"డ్రామ్"} + one{"{0} డ్రామ్"} + other{"{0} డ్రామ్"} + } + drop{ + dnam{"తగ్గించు"} + one{"{0} తగ్గించు"} + other{"{0} తగ్గించు"} + } fluid-ounce{ dnam{"ద్రవరూప ఔన్సులు"} one{"{0} ద్రవరూప ఔన్సు"} @@ -864,6 +928,11 @@ te{ one{"{0} హెక్టాలీటరు"} other{"{0} హెక్టాలీటర్లు"} } + jigger{ + dnam{"జిగ్గర్"} + one{"{0} జిగ్గర్"} + other{"{0} జిగ్గర్"} + } liter{ dnam{"లీటర్లు"} one{"{0} లీటరు"} @@ -880,6 +949,11 @@ te{ one{"{0} మిల్లీలీటరు"} other{"{0} మిల్లీలీటర్లు"} } + pinch{ + dnam{"చిటిక"} + one{"{0} చిటిక"} + other{"{0} చిటిక"} + } pint{ dnam{"పింట్లు"} one{"{0} పింట్"} @@ -895,6 +969,11 @@ te{ one{"{0} పావు వంతు"} other{"{0} పావు వంతులు"} } + quart-imperial{ + dnam{"ఇంపీరియల్ చతుర్ధాంశం"} + one{"{0} ఇంపీరియల్ చతుర్ధాంశం"} + other{"{0} ఇంపీరియల్ చతుర్ధాంశం"} + } tablespoon{ dnam{"టేబుల్ స్పూన్లు"} one{"{0} టేబుల్ స్పూన్"} @@ -1605,6 +1684,11 @@ te{ } } graphics{ + dot{ + dnam{"బిందువు"} + one{"{0} బిందువు"} + other{"{0} బిందువు"} + } dot-per-centimeter{ dnam{"బి/సె.మీ."} one{"{0} బి/సె.మీ."} @@ -1651,12 +1735,22 @@ te{ one{"{0} డె.మీ."} other{"{0} డె.మీ."} } + fathom{ + dnam{"వ్యామములు"} + one{"{0} వ్యా."} + other{"{0} వ్యా."} + } foot{ dnam{"అడుగులు"} one{"{0} అ."} other{"{0} అ."} per{"{0}/అ."} } + furlong{ + dnam{"ఫర్లాంగులు"} + one{"{0} ఫర్"} + other{"{0} ఫర్"} + } inch{ dnam{"అంగుళాలు"} one{"{0} అం."} @@ -1735,6 +1829,16 @@ te{ } } light{ + candela{ + dnam{"క్యా."} + one{"{0} క్యా."} + other{"{0} క్యా."} + } + lumen{ + dnam{"లు."} + one{"{0} లు."} + other{"{0} లు."} + } lux{ dnam{"లక్స్"} one{"{0} ల."} @@ -1758,6 +1862,11 @@ te{ earth-mass{ dnam{"భూమి ద్రవ్యరాశులు"} } + grain{ + dnam{"ధాన్యము"} + one{"{0} ధాన్యము"} + other{"{0} ధాన్యము"} + } gram{ dnam{"గ్రాములు"} one{"{0} గ్రా."} @@ -1944,7 +2053,9 @@ te{ other{"{0} N⋅m"} } pound-force-foot{ - dnam{"lbf⋅ft"} + dnam{"పౌం.ఫీ."} + one{"{0} పౌం.ఫీ."} + other{"{0} పౌం.ఫీ."} } } volume{ @@ -1958,6 +2069,11 @@ te{ one{"{0} బారెల్"} other{"{0} బారెల్"} } + bushel{ + dnam{"బుషెల్‌లు"} + one{"{0} బు."} + other{"{0} బు."} + } centiliter{ dnam{"సె.లీ."} one{"{0} సె.లీ."} @@ -2015,6 +2131,26 @@ te{ one{"{0} డె.లీ."} other{"{0} డె.లీ."} } + dessert-spoon{ + dnam{"డె.స్పూ."} + one{"{0} డె.స్పూ."} + other{"{0} డె.స్పూ."} + } + dessert-spoon-imperial{ + dnam{"డె.స్పూ. ఇంపీరియల్"} + one{"{0} డె.స్పూ. ఇంపీరియల్"} + other{"{0} డె.స్పూ. ఇంపీరియల్"} + } + dram{ + dnam{"డ్రామ్ ఫ్లూయిడ్"} + one{"{0} డ్రామ్ ఫ్లూ."} + other{"{0} డ్రామ్ ఫ్లూ."} + } + drop{ + dnam{"తగ్గించు"} + one{"{0} తగ్గించు"} + other{"{0} తగ్గించు"} + } fluid-ounce{ dnam{"ద్ర.ఔ."} one{"{0} ద్ర.ఔ."} @@ -2037,6 +2173,11 @@ te{ one{"{0} హె.లీ."} other{"{0} హె.లీ."} } + jigger{ + dnam{"జిగ్గర్"} + one{"{0} జిగ్గర్"} + other{"{0} జిగ్గర్"} + } liter{ dnam{"లీటర్లు"} one{"{0} లీ."} @@ -2053,6 +2194,11 @@ te{ one{"{0} మి.లీ."} other{"{0} మి.లీ."} } + pinch{ + dnam{"చిటిక"} + one{"{0} చిటిక"} + other{"{0} చిటిక"} + } pint{ dnam{"పింట్లు"} one{"{0} పిం."} @@ -2068,6 +2214,11 @@ te{ one{"{0} పావు వం."} other{"{0} పావు వం."} } + quart-imperial{ + dnam{"చతు. ఇంపీరియల్"} + one{"{0} చతు. ఇంపీరియల్"} + other{"{0} చతు. ఇంపీరియల్"} + } tablespoon{ dnam{"టే.స్పూ."} one{"{0} టే.స్పూ"} diff --git a/intl/icu/source/data/unit/teo.txt b/intl/icu/source/data/unit/teo.txt index 8aec59fa4973..9e0d98e4af56 100644 --- a/intl/icu/source/data/unit/teo.txt +++ b/intl/icu/source/data/unit/teo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/tg.txt b/intl/icu/source/data/unit/tg.txt index d490f61ce19e..b61026fdde5a 100644 --- a/intl/icu/source/data/unit/tg.txt +++ b/intl/icu/source/data/unit/tg.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tg{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/th.txt b/intl/icu/source/data/unit/th.txt index f2566e0addfe..f90b684ae788 100644 --- a/intl/icu/source/data/unit/th.txt +++ b/intl/icu/source/data/unit/th.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -126,8 +126,8 @@ th{ } consumption{ liter-per-100-kilometer{ - dnam{"ลิตรต่อ100 กิโลเมตร"} - other{"{0} ลิตรต่อ100 กิโลเมตร"} + dnam{"ลิตรต่อ 100 กิโลเมตร"} + other{"{0} ลิตรต่อ 100 กิโลเมตร"} } liter-per-kilometer{ dnam{"ลิตรต่อกิโลเมตร"} @@ -337,6 +337,9 @@ th{ } } graphics{ + dot{ + dnam{"ดอท"} + } dot-per-centimeter{ dnam{"จุดต่อเซนติเมตร"} other{"{0} จุดต่อเซนติเมตร"} @@ -376,11 +379,23 @@ th{ dnam{"เดซิเมตร"} other{"{0} เดซิเมตร"} } + earth-radius{ + dnam{"รัศมีของโลก"} + other{"{0} รัศมีของโลก"} + } + fathom{ + dnam{"ฟาทอม"} + other{"{0} ฟาทอม"} + } foot{ dnam{"ฟุต"} other{"{0} ฟุต"} per{"{0} ต่อฟุต"} } + furlong{ + dnam{"เฟอร์ลอง"} + other{"{0} เฟอร์ลอง"} + } inch{ dnam{"นิ้ว"} other{"{0} นิ้ว"} @@ -446,6 +461,14 @@ th{ } } light{ + candela{ + dnam{"แรงเทียน"} + other{"{0} แรงเทียน"} + } + lumen{ + dnam{"ลูเมน"} + other{"{0} ลูเมน"} + } lux{ dnam{"ลักซ์"} other{"{0} ลักซ์"} @@ -468,6 +491,10 @@ th{ dnam{"มวลของโลก"} other{"{0} มวลของโลก"} } + grain{ + dnam{"เกรน"} + other{"{0} เกรน"} + } gram{ dnam{"กรัม"} other{"{0} กรัม"} @@ -508,6 +535,10 @@ th{ dnam{"มวลดวงอาทิตย์"} other{"{0} มวลดวงอาทิตย์"} } + stone{ + dnam{"สโตน"} + other{"{0} สโตน"} + } ton{ dnam{"ตัน"} other{"{0} ตัน"} @@ -636,6 +667,10 @@ th{ dnam{"บาร์เรล"} other{"{0} บาร์เรล"} } + bushel{ + dnam{"บุชเชล"} + other{"{0} บุชเชล"} + } centiliter{ dnam{"เซนติลิตร"} other{"{0} เซนติลิตร"} @@ -682,6 +717,22 @@ th{ dnam{"เดซิลิตร"} other{"{0} เดซิลิตร"} } + dessert-spoon{ + dnam{"ช้อนขนม"} + other{"{0} ช้อนขนม"} + } + dessert-spoon-imperial{ + dnam{"ช้อนขนม - อังกฤษ"} + other{"{0} ช้อนขนม - อังกฤษ"} + } + dram{ + dnam{"แดรม"} + other{"{0} แดรม"} + } + drop{ + dnam{"หยด"} + other{"{0} หยด"} + } fluid-ounce{ dnam{"ฟลูอิดออนซ์"} other{"{0} ฟลูอิดออนซ์"} @@ -704,6 +755,10 @@ th{ dnam{"เฮกโตลิตร"} other{"{0} เฮกโตลิตร"} } + jigger{ + dnam{"จิกเกอร์"} + other{"{0} จิกเกอร์"} + } liter{ dnam{"ลิตร"} other{"{0} ลิตร"} @@ -717,6 +772,10 @@ th{ dnam{"มิลลิลิตร"} other{"{0} มิลลิลิตร"} } + pinch{ + dnam{"หยิบมือ"} + other{"{0} หยิบมือ"} + } pint{ dnam{"ไพนต์"} other{"{0} ไพนต์"} @@ -729,6 +788,10 @@ th{ dnam{"ควอร์ต"} other{"{0} ควอร์ต"} } + quart-imperial{ + dnam{"ควอร์ตอังกฤษ"} + other{"{0} ควอร์ตอังกฤษ"} + } tablespoon{ dnam{"ช้อนโต๊ะ"} other{"{0} ช้อนโต๊ะ"} @@ -781,7 +844,7 @@ th{ } consumption{ liter-per-100-kilometer{ - dnam{"ล. /100 กม."} + dnam{"ล./100กม."} other{"{0} ล./100กม."} } } @@ -1066,7 +1129,7 @@ th{ consumption{ liter-per-100-kilometer{ dnam{"ล./100 กม."} - other{"{0} ล./100กม."} + other{"{0} ล./100 กม."} } liter-per-kilometer{ dnam{"ลิตร/กม."} @@ -1271,6 +1334,12 @@ th{ other{"{0} MHz"} } } + graphics{ + dot{ + dnam{"ดอท"} + other{"{0} ดอท"} + } + } length{ astronomical-unit{ dnam{"หน่วยดาราศาสตร์"} @@ -1285,11 +1354,17 @@ th{ dnam{"ดม."} other{"{0} ดม."} } + fathom{ + dnam{"ฟาทอม"} + } foot{ dnam{"ฟุต"} other{"{0} ฟุต"} per{"{0}/ฟุต"} } + furlong{ + dnam{"เฟอร์ลอง"} + } inch{ dnam{"นิ้ว"} other{"{0} นิ้ว"} @@ -1373,6 +1448,10 @@ th{ earth-mass{ dnam{"มวลของโลก"} } + grain{ + dnam{"เกรน"} + other{"{0} เกรน"} + } gram{ dnam{"กรัม"} other{"{0} ก."} @@ -1412,6 +1491,9 @@ th{ solar-mass{ dnam{"มวลดวงอาทิตย์"} } + stone{ + dnam{"สโตน"} + } ton{ dnam{"ตัน"} other{"{0} ตัน"} @@ -1517,6 +1599,9 @@ th{ barrel{ dnam{"บาร์เรล"} } + bushel{ + dnam{"บุชเชล"} + } centiliter{ dnam{"ซล."} other{"{0} ซล."} @@ -1563,6 +1648,21 @@ th{ dnam{"ดล."} other{"{0} ดล."} } + dessert-spoon{ + dnam{"ช้อนขนม"} + other{"{0} ช้อนขนม"} + } + dessert-spoon-imperial{ + dnam{"ช้อนขนม - อังกฤษ"} + other{"{0} ช้อนขนม - อังกฤษ"} + } + dram{ + dnam{"แดรมของเหลว"} + } + drop{ + dnam{"หยด"} + other{"{0} หยด"} + } fluid-ounce{ dnam{"ฟลูอิดออนซ์"} other{"{0} ฟลูอิดออนซ์"} @@ -1581,6 +1681,10 @@ th{ dnam{"ฮล."} other{"{0} ฮล."} } + jigger{ + dnam{"จิกเกอร์"} + other{"{0} จิกเกอร์"} + } liter{ dnam{"ลิตร"} other{"{0} ล."} @@ -1594,6 +1698,10 @@ th{ dnam{"มล."} other{"{0} มล."} } + pinch{ + dnam{"หยิบมือ"} + other{"{0} หยิบมือ"} + } pint{ dnam{"ไพนต์"} other{"{0} ไพนต์"} diff --git a/intl/icu/source/data/unit/ti.txt b/intl/icu/source/data/unit/ti.txt index 5fd055d387c8..53a0587dce00 100644 --- a/intl/icu/source/data/unit/ti.txt +++ b/intl/icu/source/data/unit/ti.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/tk.txt b/intl/icu/source/data/unit/tk.txt index 51d2d78b0f73..8a01b23c70b6 100644 --- a/intl/icu/source/data/unit/tk.txt +++ b/intl/icu/source/data/unit/tk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tk{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"hh:mm:ss"} @@ -408,6 +408,11 @@ tk{ } } graphics{ + dot{ + dnam{"nokat"} + one{"{0} nokat"} + other{"{0} nokat"} + } dot-per-centimeter{ dnam{"santimetr başyna nokat"} one{"{0} santimetr başyna nokat"} @@ -461,12 +466,27 @@ tk{ one{"{0} desimetr"} other{"{0} desimetr"} } + earth-radius{ + dnam{"ýer togalagynyň radiusy"} + one{"{0} ýer togalagynyň radiusy"} + other{"{0} ýer togalagynyň radiusy"} + } + fathom{ + dnam{"fatom"} + one{"{0} fatom"} + other{"{0} fatom"} + } foot{ dnam{"fut"} one{"{0} fut"} other{"{0} fut"} per{"{0}/fut"} } + furlong{ + dnam{"furlong"} + one{"{0} furlong"} + other{"{0} furlong"} + } inch{ dnam{"dýuým"} one{"{0} dýuým"} @@ -547,6 +567,16 @@ tk{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lýumen"} + one{"{0} lýumen"} + other{"{0} lýumen"} + } lux{ dnam{"lýuks"} one{"{0} lýuks"} @@ -574,6 +604,11 @@ tk{ one{"{0} Ýer massasy"} other{"{0} Ýer massasy"} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} gran"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -623,6 +658,11 @@ tk{ one{"{0} gün massasy"} other{"{0} gün massasy"} } + stone{ + dnam{"stoun"} + one{"{0} stoun"} + other{"{0} stoun"} + } ton{ dnam{"tonna"} one{"{0} tonna"} @@ -748,8 +788,8 @@ tk{ } generic{ dnam{"°"} - one{"{0}°"} - other{"{0}°"} + one{"{0} dereje"} + other{"{0} dereje"} } kelvin{ dnam{"Kelwin gradusy"} @@ -780,6 +820,11 @@ tk{ one{"{0} barrel"} other{"{0} barrel"} } + bushel{ + dnam{"buşel"} + one{"{0} buşel"} + other{"{0} buşel"} + } centiliter{ dnam{"santilitr"} one{"{0} santilitr"} @@ -837,6 +882,26 @@ tk{ one{"{0} desilitr"} other{"{0} desilitr"} } + dessert-spoon{ + dnam{"süýji çemçesi"} + one{"{0} süýji çemçesi"} + other{"{0} süýji çemçesi"} + } + dessert-spoon-imperial{ + dnam{"Imp. süýji çemçesi"} + one{"{0} Imp. süýji çemçesi"} + other{"{0} Imp. süýji çemçesi"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"damja"} + one{"{0} damja"} + other{"{0} damja"} + } fluid-ounce{ dnam{"suwuklyk unsiýasy"} one{"{0} suwuklyk unsiýasy"} @@ -864,6 +929,11 @@ tk{ one{"{0} gektolitr"} other{"{0} gektolitr"} } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jigger"} + } liter{ dnam{"litr"} one{"{0} litr"} @@ -880,6 +950,11 @@ tk{ one{"{0} millilitr"} other{"{0} millilitr"} } + pinch{ + dnam{"çümmük"} + one{"{0} çümmük"} + other{"{0} çümmük"} + } pint{ dnam{"pinta"} one{"{0} pinta"} @@ -895,6 +970,11 @@ tk{ one{"{0} kwarta"} other{"{0} kwarta"} } + quart-imperial{ + dnam{"Imp. kwarta"} + one{"{0} Imp. kwarta"} + other{"{0} Imp. kwarta"} + } tablespoon{ dnam{"nahar çemçesi"} one{"{0} nahar çemçesi"} @@ -1284,9 +1364,9 @@ tk{ per{"{0}/sag"} } microsecond{ - dnam{"μs"} - one{"{0} μs"} - other{"{0} μs"} + dnam{"mks"} + one{"{0} mks"} + other{"{0} mks"} } millisecond{ dnam{"msek"} @@ -1433,6 +1513,11 @@ tk{ } } graphics{ + dot{ + dnam{"nokat"} + one{"{0} nokat"} + other{"{0} nokat"} + } dot-per-centimeter{ dnam{"smbn"} one{"{0} smbn"} @@ -1479,12 +1564,27 @@ tk{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"fatom"} + one{"{0} fth"} + other{"{0} fth"} + } foot{ dnam{"ft"} one{"{0} ft"} other{"{0} ft"} per{"{0}/ft"} } + furlong{ + dnam{"furlong"} + one{"{0} fur"} + other{"{0} fur"} + } inch{ dnam{"dý"} one{"{0} dý"} @@ -1503,7 +1603,7 @@ tk{ other{"{0} ýý"} } meter{ - dnam{"metr"} + dnam{"m"} one{"{0} m"} other{"{0} m"} per{"{0}/m"} @@ -1565,6 +1665,16 @@ tk{ } } light{ + candela{ + dnam{"kd"} + one{"{0} kd"} + other{"{0} kd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lk"} one{"{0} lk"} @@ -1592,6 +1702,11 @@ tk{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} gran"} + } gram{ dnam{"gram"} one{"{0} g"} @@ -1641,6 +1756,11 @@ tk{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"stoun"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"tonna"} one{"{0} tn"} @@ -1788,6 +1908,11 @@ tk{ one{"{0} bbl"} other{"{0} bbl"} } + bushel{ + dnam{"buşel"} + one{"{0} bu"} + other{"{0} bu"} + } centiliter{ dnam{"sl"} one{"{0} sl"} @@ -1845,6 +1970,26 @@ tk{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"dstspn"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + dnam{"dstspn Imp"} + one{"{0} dstspn Imp"} + other{"{0} dstspn Imp"} + } + dram{ + dnam{"dram suwuklyk"} + one{"{0} dram fl"} + other{"{0} dram fl"} + } + drop{ + dnam{"damja"} + one{"{0} damja"} + other{"{0} damja"} + } fluid-ounce{ dnam{"suw. uns."} one{"{0} suw. uns."} @@ -1872,6 +2017,11 @@ tk{ one{"{0} gl"} other{"{0} gl"} } + jigger{ + dnam{"jigger"} + one{"{0} jigger"} + other{"{0} jigger"} + } liter{ dnam{"litr"} one{"{0} l"} @@ -1888,6 +2038,11 @@ tk{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"çümmük"} + one{"{0} çümmük"} + other{"{0} çümmük"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -1903,6 +2058,11 @@ tk{ one{"{0} kwt"} other{"{0} kwt"} } + quart-imperial{ + dnam{"kt Imp"} + one{"{0} kt Imp."} + other{"{0} kt Imp."} + } tablespoon{ dnam{"n. ç."} one{"{0} n. ç."} diff --git a/intl/icu/source/data/unit/tl.txt b/intl/icu/source/data/unit/tl.txt index 4e521f927601..8c39518018d6 100644 --- a/intl/icu/source/data/unit/tl.txt +++ b/intl/icu/source/data/unit/tl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl{ "%%ALIAS"{"fil"} } diff --git a/intl/icu/source/data/unit/tl_PH.txt b/intl/icu/source/data/unit/tl_PH.txt index 07c9f9047edf..59af39479e02 100644 --- a/intl/icu/source/data/unit/tl_PH.txt +++ b/intl/icu/source/data/unit/tl_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl_PH{ "%%ALIAS"{"fil_PH"} } diff --git a/intl/icu/source/data/unit/to.txt b/intl/icu/source/data/unit/to.txt index bfdbb3ce7e6a..3ff1ea2a7355 100644 --- a/intl/icu/source/data/unit/to.txt +++ b/intl/icu/source/data/unit/to.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml to{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -337,6 +337,10 @@ to{ } } graphics{ + dot{ + dnam{"toti"} + other{"toti ʻe {0}"} + } dot-per-centimeter{ dnam{"toti he senitimita"} other{"toti ʻe {0} he senitimita"} @@ -380,6 +384,10 @@ to{ dnam{"tesimita"} other{"tesimita ʻe {0}"} } + earth-radius{ + dnam{"lētiasi fakamāmani"} + other{"lētiasi fakamāmani ʻe {0}"} + } fathom{ dnam{"ofa"} other{"ofa ʻe {0}"} @@ -458,6 +466,14 @@ to{ } } light{ + candela{ + dnam{"kaniteli"} + other{"kaniteli ʻe {0}"} + } + lumen{ + dnam{"lumeni"} + other{"lumeni ʻe {0}"} + } lux{ dnam{"lukisi"} other{"lukisi ʻe {0}"} @@ -480,6 +496,10 @@ to{ dnam{"mamafa ʻo māmani"} other{"mamafa ʻo māmani ʻe {0}"} } + grain{ + dnam{"tenga"} + other{"tenga ʻe {0}"} + } gram{ dnam{"kalami"} other{"kalami ʻe {0}"} @@ -702,6 +722,22 @@ to{ dnam{"tesilita"} other{"tesilita ʻe {0}"} } + dessert-spoon{ + dnam{"sēpuni puteni"} + other{"sēpuni puteni ʻe {0}"} + } + dessert-spoon-imperial{ + dnam{"sēpuni puteni fakaʻemipaea"} + other{"sēpuni puteni fakaʻemipaea ʻe {0}"} + } + dram{ + dnam{"talamu tafe"} + other{"talamu tafe ʻe {0}"} + } + drop{ + dnam{"tulutā"} + other{"tulutā ʻe {0}"} + } fluid-ounce{ dnam{"ʻaunise tafe"} other{"ʻaunise tafe ʻe {0}"} @@ -724,6 +760,10 @@ to{ dnam{"hēkitolita"} other{"hēkitolita ʻe {0}"} } + jigger{ + dnam{"sike"} + other{"sike ʻe {0}"} + } liter{ dnam{"lita"} other{"lita ʻe {0}"} @@ -737,6 +777,10 @@ to{ dnam{"mililita"} other{"mililita ʻe {0}"} } + pinch{ + dnam{"kiʻimeʻi"} + other{"kiʻimeʻi ʻe {0}"} + } pint{ dnam{"painite"} other{"painite ʻe {0}"} @@ -749,6 +793,10 @@ to{ dnam{"kuata"} other{"kuata ʻe {0}"} } + quart-imperial{ + dnam{"kuata fakaʻemipaea"} + other{"kuata fakaʻemipaea ʻe {0}"} + } tablespoon{ dnam{"sēpuni tēpile"} other{"sēpuni tēpile ʻe {0}"} @@ -857,7 +905,7 @@ to{ other{"{0} mi/kā"} } mile-per-gallon-imperial{ - other{"{0}m/kāʻe"} + other{"{0}m/kāʻem"} } } coordinate{ @@ -1438,8 +1486,8 @@ to{ other{"mi ʻe {0}/kā"} } mile-per-gallon-imperial{ - dnam{"mi/kāʻem"} - other{"mi ʻe {0}/kāʻem"} + dnam{"mi/kā-ʻem"} + other{"mi ʻe {0}/kā-ʻem"} } } coordinate{ @@ -1635,6 +1683,10 @@ to{ } } graphics{ + dot{ + dnam{"toti"} + other{"toti ʻe {0}"} + } dot-per-centimeter{ dnam{"toti/sm"} other{"toti ʻe {0}/sm"} @@ -1678,6 +1730,10 @@ to{ dnam{"tm"} other{"tm ʻe {0}"} } + earth-radius{ + dnam{"L⊕"} + other{"L⊕ ʻe {0}"} + } fathom{ dnam{"ofa"} other{"ofa ʻe {0}"} @@ -1756,6 +1812,14 @@ to{ } } light{ + candela{ + dnam{"ktl"} + other{"ktl ʻe {0}"} + } + lumen{ + dnam{"lm"} + other{"lm ʻe {0}"} + } lux{ dnam{"lx"} other{"lx ʻe {0}"} @@ -1778,6 +1842,10 @@ to{ dnam{"mamafa ⊕"} other{"mamafa ⊕ ʻe {0}"} } + grain{ + dnam{"tenga"} + other{"tenga ʻe {0}"} + } gram{ dnam{"k"} other{"k ʻe {0}"} @@ -1996,6 +2064,22 @@ to{ dnam{"tl"} other{"tl ʻe {0}"} } + dessert-spoon{ + dnam{"sēpu"} + other{"sēpu ʻe {0}"} + } + dessert-spoon-imperial{ + dnam{"sēpu-ʻem"} + other{"sēpu-ʻem ʻe {0}"} + } + dram{ + dnam{"tlmu-tf"} + other{"tlmu-tf ʻe {0}"} + } + drop{ + dnam{"tltā"} + other{"tltā ʻe {0}"} + } fluid-ounce{ dnam{"ʻau-tf"} other{"ʻau-tf ʻe {0}"} @@ -2010,14 +2094,18 @@ to{ per{"{0}/kā"} } gallon-imperial{ - dnam{"kāʻem"} - other{"kāʻem ʻe {0}"} - per{"{0} / kāʻem"} + dnam{"kāʻ-em"} + other{"kā-ʻem ʻe {0}"} + per{"{0} / kā-ʻem"} } hectoliter{ dnam{"hl"} other{"hl ʻe {0}"} } + jigger{ + dnam{"sike"} + other{"sike ʻe {0}"} + } liter{ dnam{"l"} other{"l ʻe {0}"} @@ -2031,6 +2119,10 @@ to{ dnam{"ml"} other{"ml ʻe {0}"} } + pinch{ + dnam{"kiʻimeʻi"} + other{"kiʻimeʻi ʻe {0}"} + } pint{ dnam{"pt"} other{"pt ʻe {0}"} @@ -2043,6 +2135,10 @@ to{ dnam{"ku"} other{"ku ʻe {0}"} } + quart-imperial{ + dnam{"ku-ʻem"} + other{"ku-ʻem ʻe {0}"} + } tablespoon{ dnam{"sētē"} other{"sētē ʻe {0}"} diff --git a/intl/icu/source/data/unit/tr.txt b/intl/icu/source/data/unit/tr.txt index 7918ba2e5f07..79b25214f480 100644 --- a/intl/icu/source/data/unit/tr.txt +++ b/intl/icu/source/data/unit/tr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -403,6 +403,11 @@ tr{ } } graphics{ + dot{ + dnam{"nokta"} + one{"{0} nokta"} + other{"{0} nokta"} + } dot-per-centimeter{ dnam{"nokta/santimetre"} one{"{0} nokta/santimetre"} @@ -454,6 +459,11 @@ tr{ one{"{0} desimetre"} other{"{0} desimetre"} } + earth-radius{ + dnam{"Dünya yarıçapı"} + one{"{0} Dünya yarıçapı"} + other{"{0} Dünya yarıçapı"} + } fathom{ dnam{"fathom"} one{"{0} fathom"} @@ -550,6 +560,16 @@ tr{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lümen"} + one{"{0} lümen"} + other{"{0} lümen"} + } lux{ dnam{"lüks"} one{"{0} lüks"} @@ -577,6 +597,11 @@ tr{ one{"{0} Dünya kütlesi"} other{"{0} Dünya kütlesi"} } + grain{ + dnam{"tane"} + one{"{0} tane"} + other{"{0} tane"} + } gram{ dnam{"gram"} one{"{0} gram"} @@ -845,6 +870,26 @@ tr{ one{"{0} desilitre"} other{"{0} desilitre"} } + dessert-spoon{ + dnam{"tatlı kaşığı"} + one{"{0} tatlı kaşığı"} + other{"{0} tatlı kaşığı"} + } + dessert-spoon-imperial{ + dnam{"İng. tatlı kaşığı"} + one{"{0} İng. tatlı kaşığı"} + other{"{0} İng. tatlı kaşığı"} + } + dram{ + dnam{"dram"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"damla"} + one{"{0} damla"} + other{"{0} damla"} + } fluid-ounce{ dnam{"sıvı ons"} one{"{0} sıvı ons"} @@ -888,6 +933,11 @@ tr{ one{"{0} mililitre"} other{"{0} mililitre"} } + pinch{ + dnam{"tutam"} + one{"{0} tutam"} + other{"{0} tutam"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -903,15 +953,20 @@ tr{ one{"{0} quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"İng. quart"} + one{"{0} İng. quart"} + other{"{0} İng. quart"} + } tablespoon{ dnam{"yemek kaşığı"} one{"{0} yemek kaşığı"} other{"{0} yemek kaşığı"} } teaspoon{ - dnam{"tatlı kaşığı"} - one{"{0} tatlı kaşığı"} - other{"{0} tatlı kaşığı"} + dnam{"çay kaşığı"} + one{"{0} çay kaşığı"} + other{"{0} çay kaşığı"} } } } @@ -1294,7 +1349,7 @@ tr{ other{"{0} IY"} } meter{ - dnam{"metre"} + dnam{"m"} one{"{0} m"} other{"{0} m"} per{"{0}/m"} @@ -1999,6 +2054,11 @@ tr{ } } graphics{ + dot{ + dnam{"nokta"} + one{"{0} nokta"} + other{"{0} nokta"} + } megapixel{ dnam{"megapiksel"} } @@ -2146,6 +2206,11 @@ tr{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"tane"} + one{"{0} tane"} + other{"{0} tane"} + } gram{ dnam{"gram"} one{"{0} g"} @@ -2270,9 +2335,9 @@ tr{ other{"{0} mbar"} } millimeter-ofhg{ - dnam{"mm Hg"} - one{"{0} mm Hg"} - other{"{0} mm Hg"} + dnam{"mmHg"} + one{"{0} mmHg"} + other{"{0} mmHg"} } pound-force-per-square-inch{ dnam{"lb/in²"} @@ -2409,6 +2474,26 @@ tr{ one{"{0} dl"} other{"{0} dl"} } + dessert-spoon{ + dnam{"tat. kaşığı"} + one{"{0} tat. kaşığı"} + other{"{0} tat. kaşığı"} + } + dessert-spoon-imperial{ + dnam{"İng. tat. kaşığı"} + one{"{0} İng. tat. kaşığı"} + other{"{0} İng. tat. kaşığı"} + } + dram{ + dnam{"sıvı dram"} + one{"{0} sıvı dram"} + other{"{0} sıvı dram"} + } + drop{ + dnam{"damla"} + one{"{0} damla"} + other{"{0} damla"} + } fluid-ounce{ dnam{"sıvı ons"} one{"{0} sıvı ons"} @@ -2452,6 +2537,11 @@ tr{ one{"{0} ml"} other{"{0} ml"} } + pinch{ + dnam{"tutam"} + one{"{0} tutam"} + other{"{0} tutam"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -2466,15 +2556,20 @@ tr{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"İng quart"} + one{"{0} İng. quart"} + other{"{0} İng. quart"} + } tablespoon{ dnam{"yk"} one{"{0} yk"} other{"{0} yk"} } teaspoon{ - dnam{"tk"} - one{"{0} tk"} - other{"{0} tk"} + dnam{"çk"} + one{"{0} çk"} + other{"{0} çk"} } } } diff --git a/intl/icu/source/data/unit/tt.txt b/intl/icu/source/data/unit/tt.txt index 45ce13b255a3..8f9cceb54665 100644 --- a/intl/icu/source/data/unit/tt.txt +++ b/intl/icu/source/data/unit/tt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tt{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/twq.txt b/intl/icu/source/data/unit/twq.txt index d90e4d48ccf8..12e378b51d6a 100644 --- a/intl/icu/source/data/unit/twq.txt +++ b/intl/icu/source/data/unit/twq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml twq{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/tzm.txt b/intl/icu/source/data/unit/tzm.txt index 9d0747fabba0..ccc6dc385373 100644 --- a/intl/icu/source/data/unit/tzm.txt +++ b/intl/icu/source/data/unit/tzm.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tzm{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/ug.txt b/intl/icu/source/data/unit/ug.txt index 450bceb63551..6322ecbef0d9 100644 --- a/intl/icu/source/data/unit/ug.txt +++ b/intl/icu/source/data/unit/ug.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ug{ - Version{"37"} units{ acceleration{ g-force{ diff --git a/intl/icu/source/data/unit/uk.txt b/intl/icu/source/data/unit/uk.txt index 4bc3cd088b16..2f7d4bffa47e 100644 --- a/intl/icu/source/data/unit/uk.txt +++ b/intl/icu/source/data/unit/uk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -17,11 +17,11 @@ uk{ other{"{0} сили тяжіння"} } meter-per-square-second{ - dnam{"метри на секунду в квадраті"} - few{"{0} метри на секунду в квадраті"} - many{"{0} метрів на секунду в квадраті"} - one{"{0} метр на секунду в квадраті"} - other{"{0} метра на секунду в квадраті"} + dnam{"метри на секунду у квадраті"} + few{"{0} метри на секунду у квадраті"} + many{"{0} метрів на секунду у квадраті"} + one{"{0} метр на секунду у квадраті"} + other{"{0} метра на секунду у квадраті"} } } angle{ @@ -231,10 +231,10 @@ uk{ } coordinate{ dnam{"сторона світу"} - east{"{0} на Схід"} - north{"{0} на Північ"} - south{"{0} на Південь"} - west{"{0} на Захід"} + east{"{0} східної довготи"} + north{"{0} північної широти"} + south{"{0} південної широти"} + west{"{0} західної довготи"} } digital{ bit{ @@ -332,11 +332,11 @@ uk{ per{"{0} на день"} } decade{ - dnam{"декади"} - few{"{0} декади"} - many{"{0} декад"} - one{"{0} декада"} - other{"{0} декади"} + dnam{"десятиріччя"} + few{"{0} десятиріччя"} + many{"{0} десятиріч"} + one{"{0} десятиріччя"} + other{"{0} десятиріччя"} } hour{ dnam{"години"} @@ -366,7 +366,7 @@ uk{ many{"{0} хвилин"} one{"{0} хвилина"} other{"{0} хвилини"} - per{"{0} на хв"} + per{"{0} на хвилину"} } month{ dnam{"місяці"} @@ -461,11 +461,11 @@ uk{ other{"{0} електрон-вольта"} } foodcalorie{ - dnam{"Калорії"} - few{"{0} Калорії"} - many{"{0} Калорій"} - one{"{0} Калорія"} - other{"{0} Калорії"} + dnam{"кілокалорії"} + few{"{0} кілокалорії"} + many{"{0} кілокалорій"} + one{"{0} кілокалорія"} + other{"{0} кілокалорії"} } joule{ dnam{"джоулі"} @@ -550,6 +550,13 @@ uk{ } } graphics{ + dot{ + dnam{"точка"} + few{"{0} точки"} + many{"{0} точок"} + one{"{0} точка"} + other{"{0} точки"} + } megapixel{ dnam{"мегапікселі"} few{"{0} Мп"} @@ -581,6 +588,20 @@ uk{ one{"{0} дециметр"} other{"{0} дециметра"} } + earth-radius{ + dnam{"радіус Землі"} + few{"{0} радіуси Землі"} + many{"{0} радіусів Землі"} + one{"{0} радіус Землі"} + other{"{0} радіуса Землі"} + } + fathom{ + dnam{"фатоми"} + few{"{0} фатоми"} + many{"{0} фатомів"} + one{"{0} фатом"} + other{"{0} фатома"} + } foot{ dnam{"фути"} few{"{0} фути"} @@ -589,6 +610,13 @@ uk{ other{"{0} фута"} per{"{0} на фут"} } + furlong{ + dnam{"фурлонги"} + few{"{0} фурлонги"} + many{"{0} фурлонгів"} + one{"{0} фурлонг"} + other{"{0} фурлонга"} + } inch{ dnam{"дюйми"} few{"{0} дюйми"} @@ -699,6 +727,20 @@ uk{ } } light{ + candela{ + dnam{"кандела"} + few{"{0} кандели"} + many{"{0} кандел"} + one{"{0} кандела"} + other{"{0} кандели"} + } + lumen{ + dnam{"люмен"} + few{"{0} люмени"} + many{"{0} люменів"} + one{"{0} люмен"} + other{"{0} люмена"} + } lux{ dnam{"люкси"} few{"{0} люкси"} @@ -736,6 +778,13 @@ uk{ one{"{0} маса Землі"} other{"{0} маси Землі"} } + grain{ + dnam{"гран"} + few{"{0} грани"} + many{"{0} гранів"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"грами"} few{"{0} грами"} @@ -1111,6 +1160,34 @@ uk{ one{"{0} децилітр"} other{"{0} децилітра"} } + dessert-spoon{ + dnam{"десертна ложка"} + few{"{0} десертні ложки"} + many{"{0} десертних ложок"} + one{"{0} десертна ложка"} + other{"{0} десертної ложки"} + } + dessert-spoon-imperial{ + dnam{"імперська десертна ложка"} + few{"{0} імп. десертні ложки"} + many{"{0} імп. десертних ложок"} + one{"{0} імп. десертна ложка"} + other{"{0} імп. десертної ложки"} + } + dram{ + dnam{"рідинна драхма"} + few{"{0} рідинні драхми"} + many{"{0} рідинних драхм"} + one{"{0} рідинна драхма"} + other{"{0} рідинної драхми"} + } + drop{ + dnam{"крапля"} + few{"{0} краплі"} + many{"{0} крапель"} + one{"{0} крапля"} + other{"{0} краплі"} + } fluid-ounce{ dnam{"рідкі унції"} few{"{0} рідкі унції"} @@ -1148,6 +1225,13 @@ uk{ one{"{0} гектолітр"} other{"{0} гектолітра"} } + jigger{ + dnam{"мірна склянка"} + few{"{0} мірні склянки"} + many{"{0} мірних склянок"} + one{"{0} мірна склянка"} + other{"{0} мірна склянка"} + } liter{ dnam{"літри"} few{"{0} літри"} @@ -1170,6 +1254,13 @@ uk{ one{"{0} мілілітр"} other{"{0} мілілітра"} } + pinch{ + dnam{"дрібка"} + few{"{0} дрібки"} + many{"{0} дрібок"} + one{"{0} дрібка"} + other{"{0} дрібки"} + } pint{ dnam{"пінти"} few{"{0} пінти"} @@ -1191,6 +1282,13 @@ uk{ one{"{0} кварта"} other{"{0} кварти"} } + quart-imperial{ + dnam{"імперська кварта"} + few{"{0} імп. кварти"} + many{"{0} імп. кварт"} + one{"{0} імп. кварта"} + other{"{0} імп. кварти"} + } tablespoon{ dnam{"cтолові ложки"} few{"{0} столові ложки"} @@ -1321,10 +1419,10 @@ uk{ } coordinate{ dnam{"напрям"} - east{"{0} Сх"} - north{"{0} Пн"} - south{"{0} Пд"} - west{"{0} Зх"} + east{"{0}Сх"} + north{"{0}Пн"} + south{"{0}Пд"} + west{"{0}Зх"} } duration{ century{ @@ -1344,10 +1442,10 @@ uk{ } hour{ dnam{"год"} - few{"{0} год"} - many{"{0} год"} - one{"{0} год"} - other{"{0} год"} + few{"{0} год."} + many{"{0} год."} + one{"{0} год."} + other{"{0} год."} per{"{0}/г"} } microsecond{ @@ -1366,10 +1464,10 @@ uk{ } minute{ dnam{"хв"} - few{"{0} хв"} - many{"{0} хв"} - one{"{0} хв"} - other{"{0} хв"} + few{"{0} хв."} + many{"{0} хв."} + one{"{0} хв."} + other{"{0} хв."} per{"{0}/хв"} } month{ @@ -1739,7 +1837,7 @@ uk{ } temperature{ celsius{ - dnam{"° Цельсія"} + dnam{"°C"} few{"{0}°C"} many{"{0}°C"} one{"{0}°C"} @@ -2027,26 +2125,26 @@ uk{ other{"{0} л/км"} } mile-per-gallon{ - dnam{"милі/галон"} - few{"{0} милі/галон"} - many{"{0} миль/галон"} - one{"{0} миля/галон"} - other{"{0} милі/галон"} + dnam{"милі/гал."} + few{"{0} милі/гал."} + many{"{0} миль/гал."} + one{"{0} миля/гал."} + other{"{0} милі/гал."} } mile-per-gallon-imperial{ - dnam{"милі/англ. галон"} - few{"{0} милі/англ. галон"} - many{"{0} миль/англ. галон"} - one{"{0} миля/англ. галон"} - other{"{0} милі/англ. галон"} + dnam{"милі/англ. гал."} + few{"{0} милі/англ. гал."} + many{"{0} миль/англ. гал."} + one{"{0} миля/англ. гал."} + other{"{0} милі/англ. гал."} } } coordinate{ dnam{"напрямок"} - east{"{0} на Сх"} - north{"{0} на Пн"} - south{"{0} на Пд"} - west{"{0} на Зх"} + east{"{0} сх. д."} + north{"{0} пн. ш."} + south{"{0} пд. ш."} + west{"{0} зх. д."} } digital{ bit{ @@ -2273,11 +2371,11 @@ uk{ other{"{0} еВ"} } foodcalorie{ - dnam{"Кал"} - few{"{0} Кал"} - many{"{0} Кал"} - one{"{0} Кал"} - other{"{0} Кал"} + dnam{"ккал"} + few{"{0} ккал"} + many{"{0} ккал"} + one{"{0} ккал"} + other{"{0} ккал"} } joule{ dnam{"джоулі"} @@ -2287,11 +2385,11 @@ uk{ other{"{0} Дж"} } kilocalorie{ - dnam{"Ккал"} - few{"{0} Ккал"} - many{"{0} Ккал"} - one{"{0} Ккал"} - other{"{0} Ккал"} + dnam{"ккал"} + few{"{0} ккал"} + many{"{0} ккал"} + one{"{0} ккал"} + other{"{0} ккал"} } kilojoule{ dnam{"кілоджоуль"} @@ -2362,6 +2460,13 @@ uk{ } } graphics{ + dot{ + dnam{"тчк"} + few{"{0} тчк"} + many{"{0} тчк"} + one{"{0} тчк"} + other{"{0} тчк"} + } dot-per-centimeter{ dnam{"dpcm"} few{"{0} dpcm"} @@ -2435,6 +2540,13 @@ uk{ one{"{0} дм"} other{"{0} дм"} } + fathom{ + dnam{"фатоми"} + few{"{0} фатоми"} + many{"{0} фатомів"} + one{"{0} фатом"} + other{"{0} фатома"} + } foot{ dnam{"фут"} few{"{0} фути"} @@ -2443,6 +2555,9 @@ uk{ other{"{0} фута"} per{"{0}/фут"} } + furlong{ + dnam{"фурлонги"} + } inch{ dnam{"дюйми"} few{"{0} дюйми"} @@ -2467,7 +2582,7 @@ uk{ other{"{0} св. р."} } meter{ - dnam{"метри"} + dnam{"м"} few{"{0} м"} many{"{0} м"} one{"{0} м"} @@ -2549,6 +2664,20 @@ uk{ } } light{ + candela{ + dnam{"кд"} + few{"{0} кд"} + many{"{0} кд"} + one{"{0} кд"} + other{"{0} кд"} + } + lumen{ + dnam{"лм"} + few{"{0} лм"} + many{"{0} лм"} + one{"{0} лм"} + other{"{0} лм"} + } lux{ dnam{"люкс"} few{"{0} лк"} @@ -2578,6 +2707,13 @@ uk{ earth-mass{ dnam{"маси Землі"} } + grain{ + dnam{"гран"} + few{"{0} грани"} + many{"{0} гранів"} + one{"{0} гран"} + other{"{0} грана"} + } gram{ dnam{"грами"} few{"{0} г"} @@ -2641,6 +2777,12 @@ uk{ solar-mass{ dnam{"маси Сонця"} } + stone{ + few{"{0} st"} + many{"{0} st"} + one{"{0} st"} + other{"{0} st"} + } ton{ dnam{"тонни"} few{"{0} т"} @@ -2797,7 +2939,7 @@ uk{ } temperature{ celsius{ - dnam{"градус Цельсія"} + dnam{"град. Цельсія"} few{"{0}°C"} many{"{0}°C"} one{"{0}°C"} @@ -2942,6 +3084,34 @@ uk{ one{"{0} дл"} other{"{0} дл"} } + dessert-spoon{ + dnam{"дес. л."} + few{"{0} дес. л."} + many{"{0} дес. л."} + one{"{0} дес. л."} + other{"{0} дес. л."} + } + dessert-spoon-imperial{ + dnam{"імп. дес. ложка"} + few{"{0} імп. дес. ложки"} + many{"{0} імп. дес. ложок"} + one{"{0} імп. дес. ложка"} + other{"{0} імп. дес. ложки"} + } + dram{ + dnam{"рід. драхма"} + few{"{0} рід. драхми"} + many{"{0} рід. драхм"} + one{"{0} рід. драхма"} + other{"{0} рід. драхми"} + } + drop{ + dnam{"крапля"} + few{"{0} краплі"} + many{"{0} крапель"} + one{"{0} крапля"} + other{"{0} краплі"} + } fluid-ounce{ dnam{"рід. ун."} few{"{0} рід. ун."} @@ -2979,6 +3149,13 @@ uk{ one{"{0} гл"} other{"{0} гл"} } + jigger{ + dnam{"мірка"} + few{"{0} мірки"} + many{"{0} мірок"} + one{"{0} мірка"} + other{"{0} мірки"} + } liter{ dnam{"літри"} few{"{0} л"} @@ -3001,6 +3178,13 @@ uk{ one{"{0} мл"} other{"{0} мл"} } + pinch{ + dnam{"дрібка"} + few{"{0} дрібки"} + many{"{0} дрібок"} + one{"{0} дрібка"} + other{"{0} дрібки"} + } pint{ dnam{"пінти"} few{"{0} пінти"} @@ -3022,6 +3206,13 @@ uk{ one{"{0} квар."} other{"{0} квар."} } + quart-imperial{ + dnam{"імп. квар."} + few{"{0} імп. квар."} + many{"{0} імп. квар."} + one{"{0} імп. квар."} + other{"{0} імп. квар."} + } tablespoon{ dnam{"ст. л."} few{"{0} ст. л."} diff --git a/intl/icu/source/data/unit/ur.txt b/intl/icu/source/data/unit/ur.txt index cc4eaef21a0b..a8d0708d84b2 100644 --- a/intl/icu/source/data/unit/ur.txt +++ b/intl/icu/source/data/unit/ur.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -408,6 +408,9 @@ ur{ } } graphics{ + dot{ + dnam{"ڈاٹ"} + } dot-per-centimeter{ dnam{"ڈاٹس فی سینٹی میٹر"} one{"{0} ڈاٹ فی سینٹی میٹر"} @@ -461,12 +464,27 @@ ur{ one{"{0} ڈیسی میٹر"} other{"{0} ڈیسی میٹر"} } + earth-radius{ + dnam{"زمینی رداس"} + one{"{0} زمینی رداس"} + other{"{0} زمینی رداس"} + } + fathom{ + dnam{"فیدمز"} + one{"{0} فیدم"} + other{"{0} فیدمز"} + } foot{ dnam{"فیٹ"} one{"{0} فیٹ"} other{"{0} فیٹ"} per{"{0} فی فوٹ"} } + furlong{ + dnam{"فرلانگز"} + one{"{0} فرلانگ"} + other{"{0} فرلانگز"} + } inch{ dnam{"انچ"} one{"{0} انچ"} @@ -547,6 +565,16 @@ ur{ } } light{ + candela{ + dnam{"کنڈیلا"} + one{"{0} کنڈیلا"} + other{"{0} کنڈیلا"} + } + lumen{ + dnam{"لیومِن"} + one{"{0} لیومِن"} + other{"{0} لیومِن"} + } lux{ dnam{"lux"} one{"{0} lux"} @@ -574,6 +602,11 @@ ur{ one{"{0} زمینی کمیت"} other{"{0} زمینی کمیتیں"} } + grain{ + dnam{"گرین"} + one{"{0} گرین"} + other{"{0} گرین"} + } gram{ dnam{"گرام"} one{"{0} گرام"} @@ -770,7 +803,7 @@ ur{ } pound-force-foot{ dnam{"پاؤنڈ فٹ"} - one{"{0} پاؤنڈ فٹ"} + one{"{0} پاؤنڈ فورس فوٹ"} other{"{0} پاؤنڈ فٹ"} } } @@ -785,6 +818,11 @@ ur{ one{"{0} بیرل"} other{"{0} بیرلز"} } + bushel{ + dnam{"بُشلز"} + one{"{0} بُشل"} + other{"{0} بُشلز"} + } centiliter{ dnam{"سینٹی لیٹر"} one{"{0} سینٹی لیٹر"} @@ -842,6 +880,26 @@ ur{ one{"{0} ڈیسی لیٹر"} other{"{0} ڈیسی لیٹر"} } + dessert-spoon{ + dnam{"ڈیزرٹ اسپون"} + one{"{0} ڈیزرٹ اسپون"} + other{"{0} ڈیزرٹ اسپون"} + } + dessert-spoon-imperial{ + dnam{"امپیریئل ڈیزرٹ اسپون"} + one{"{0} امپیریئل ڈیزرٹ اسپون"} + other{"{0} امپیریئل ڈیزرٹ اسپون"} + } + dram{ + dnam{"ڈرام"} + one{"{0} ڈرام"} + other{"{0} ڈرام"} + } + drop{ + dnam{"قطرہ"} + one{"{0} قطرہ"} + other{"{0} قطرہ"} + } fluid-ounce{ dnam{"فلوئڈ اونس"} one{"{0} فلوئڈ اونس"} @@ -869,6 +927,11 @@ ur{ one{"{0} ہیکٹو لیٹر"} other{"{0} ہیکٹو لیٹر"} } + jigger{ + dnam{"جگر"} + one{"{0} جگر"} + other{"{0} جگر"} + } liter{ dnam{"لیٹر"} one{"{0} لیٹر"} @@ -885,6 +948,11 @@ ur{ one{"{0} ملی لیٹر"} other{"{0} ملی لیٹر"} } + pinch{ + dnam{"چٹکی"} + one{"{0} چٹکی"} + other{"{0} چٹکی"} + } pint{ dnam{"پائنٹ"} one{"{0} پائنٹ"} @@ -900,6 +968,11 @@ ur{ one{"{0} کوارٹ"} other{"{0} کوارٹ"} } + quart-imperial{ + dnam{"امپیریئل کوارٹ"} + one{"{0} امپیریئل کوارٹ"} + other{"{0} امپیریئل کوارٹ"} + } tablespoon{ dnam{"ٹیبل سپون"} one{"{0} ٹیبل سپون"} @@ -1606,6 +1679,11 @@ ur{ } } graphics{ + dot{ + dnam{"ڈاٹ"} + one{"{0} ڈاٹ"} + other{"{0} ڈاٹ"} + } megapixel{ dnam{"میگا پکسلز"} } @@ -1630,12 +1708,27 @@ ur{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} + } + fathom{ + dnam{"فیدمز"} + one{"{0} فیدم"} + other{"{0} فیدم"} + } foot{ dnam{"فیٹ"} one{"{0} فیٹ"} other{"{0} فیٹ"} per{"{0}/ft"} } + furlong{ + dnam{"فرلانگز"} + one{"{0} فرلانگ"} + other{"{0} فرلانگ"} + } inch{ dnam{"انچ"} one{"{0} انچ"} @@ -1714,6 +1807,16 @@ ur{ } } light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lux"} one{"{0} lx"} @@ -1739,6 +1842,11 @@ ur{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"گرین"} + one{"{0} گرین"} + other{"{0} گرین"} + } gram{ dnam{"گرام"} one{"{0} g"} @@ -1931,6 +2039,11 @@ ur{ barrel{ dnam{"بیرل"} } + bushel{ + dnam{"بُشلز"} + one{"{0} بو"} + other{"{0} بو"} + } centiliter{ dnam{"سینٹی لیٹر"} one{"{0} cL"} @@ -1988,6 +2101,25 @@ ur{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"ڈیزرٹ اسپون"} + one{"{0} dstspn"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + one{"{0} dstspn Imp"} + other{"{0} dstspn Imp"} + } + dram{ + dnam{"ڈرام فلوئیڈ"} + one{"{0} ڈرام فلوئیڈ"} + other{"{0} ڈرام فلوئیڈ"} + } + drop{ + dnam{"قطرہ"} + one{"{0} قطرہ"} + other{"{0} قطرہ"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} @@ -2010,6 +2142,11 @@ ur{ one{"{0} hL"} other{"{0} hL"} } + jigger{ + dnam{"جگر"} + one{"{0} جگر"} + other{"{0} جگر"} + } liter{ dnam{"لیٹر"} one{"{0} لیٹر"} @@ -2026,6 +2163,11 @@ ur{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"چٹکی"} + one{"{0} چٹکی"} + other{"{0} چٹکی"} + } pint{ dnam{"pt"} one{"{0} pt"} @@ -2041,6 +2183,11 @@ ur{ one{"{0} qt"} other{"{0} qt"} } + quart-imperial{ + dnam{"qt Imp"} + one{"{0} qt Imp."} + other{"{0} qt Imp."} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} diff --git a/intl/icu/source/data/unit/ur_IN.txt b/intl/icu/source/data/unit/ur_IN.txt index fbed9da6ced5..f3ec87d7a9cd 100644 --- a/intl/icu/source/data/unit/ur_IN.txt +++ b/intl/icu/source/data/unit/ur_IN.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur_IN{ - Version{"37"} units{ length{ astronomical-unit{ diff --git a/intl/icu/source/data/unit/uz.txt b/intl/icu/source/data/unit/uz.txt index e1511bb2e795..396f5cdb522c 100644 --- a/intl/icu/source/data/unit/uz.txt +++ b/intl/icu/source/data/unit/uz.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -129,9 +129,9 @@ uz{ other{"{0} promille"} } permillion{ - dnam{"millionning ulushi"} - one{"milliondan {0}"} - other{"milliondan {0}"} + dnam{"qism/million"} + one{"{0} qism/million"} + other{"{0} qism/million"} } permyriad{ dnam{"promiriada"} @@ -398,6 +398,11 @@ uz{ } } graphics{ + dot{ + dnam{"piksel"} + one{"{0} piksel"} + other{"{0} piksel"} + } dot-per-centimeter{ dnam{"nuqta/santimetr"} one{"{0} nuqta/santimetr"} @@ -449,12 +454,27 @@ uz{ one{"{0} detsimetr"} other{"{0} detsimetr"} } + earth-radius{ + dnam{"yer radiusi"} + one{"{0} yer radiusi"} + other{"{0} yer radiusi"} + } + fathom{ + dnam{"fatom"} + one{"{0} fatom"} + other{"{0} fatom"} + } foot{ dnam{"fut"} one{"{0} fut"} other{"{0} fut"} per{"{0}/fut"} } + furlong{ + dnam{"farlong"} + one{"{0} farlong"} + other{"{0} farlong"} + } inch{ dnam{"duym"} one{"{0} duym"} @@ -535,6 +555,16 @@ uz{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lumen"} + one{"{0} lumen"} + other{"{0} lumen"} + } lux{ dnam{"lyuks"} one{"{0} lyuks"} @@ -562,6 +592,11 @@ uz{ one{"{0} Yer massasi"} other{"{0} Yer massasi"} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} gran"} + } gram{ dnam{"gramm"} one{"{0} gramm"} @@ -611,6 +646,11 @@ uz{ one{"{0} quyosh massasi"} other{"{0} quyosh massasi"} } + stone{ + dnam{"tosh"} + one{"{0} tosh"} + other{"{0} tosh"} + } ton{ dnam{"amerika tonnasi"} one{"{0} amerika tonnasi"} @@ -691,9 +731,9 @@ uz{ other{"{0} paskal"} } pound-force-per-square-inch{ - dnam{"funt/kvadrat duym"} - one{"{0} funt/kvadrat duym"} - other{"{0} funt/kvadrat duym"} + dnam{"funt/duym kvadrat"} + one{"{0} funt/duym kvadrat"} + other{"{0} funt/duym kvadrat"} } } speed{ @@ -748,7 +788,7 @@ uz{ } pound-force-foot{ dnam{"funt-fut"} - one{"{0} funt-fut"} + one{"{0} funt-kuch-fut"} other{"{0} funt-fut"} } } @@ -763,6 +803,11 @@ uz{ one{"{0} barrel"} other{"{0} barrel"} } + bushel{ + dnam{"bushel"} + one{"{0} bushel"} + other{"{0} bushel"} + } centiliter{ dnam{"santilitr"} one{"{0} santilitr"} @@ -820,6 +865,26 @@ uz{ one{"{0} detsilitr"} other{"{0} detsilitr"} } + dessert-spoon{ + dnam{"desert qoshiq"} + one{"{0} desert qoshiq"} + other{"{0} desert qoshiq"} + } + dessert-spoon-imperial{ + dnam{"imp. desert qoshiq"} + one{"{0} imp. desert qoshiq"} + other{"{0} imp. desert qoshiq"} + } + dram{ + dnam{"draxma"} + one{"{0} draxma"} + other{"{0} draxma"} + } + drop{ + dnam{"tomchi"} + one{"{0} tomchi"} + other{"{0} tomchi"} + } fluid-ounce{ dnam{"suyuq unsiya"} one{"{0} suyuq unsiya"} @@ -847,6 +912,11 @@ uz{ one{"{0} gektolitr"} other{"{0} gektolitr"} } + jigger{ + dnam{"qadah"} + one{"{0} qadah"} + other{"{0} qadah"} + } liter{ dnam{"litr"} one{"{0} litr"} @@ -863,6 +933,11 @@ uz{ one{"{0} millilitr"} other{"{0} millilitr"} } + pinch{ + dnam{"chimdim"} + one{"{0} chimdim"} + other{"{0} chimdim"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -878,6 +953,11 @@ uz{ one{"{0} kvart"} other{"{0} kvart"} } + quart-imperial{ + dnam{"imp kvarta"} + one{"{0} imp. kvarta"} + other{"{0} imp. kvarta"} + } tablespoon{ dnam{"osh qoshiq"} one{"{0} osh qoshiq"} @@ -1003,6 +1083,11 @@ uz{ other{"{0} yil"} } } + graphics{ + dot{ + dnam{"piksel"} + } + } length{ centimeter{ dnam{"sm"} @@ -1272,9 +1357,9 @@ uz{ other{"{0}‰"} } permillion{ - dnam{"ppm"} - one{"{0} ppm"} - other{"{0} ppm"} + dnam{"qism/million"} + one{"{0} qism/million"} + other{"{0} qism/million"} } permyriad{ dnam{"promiriada"} @@ -1541,6 +1626,11 @@ uz{ } } graphics{ + dot{ + dnam{"piksel"} + one{"{0} piksel"} + other{"{0} piksel"} + } dot-per-centimeter{ dnam{"nuqta/sm"} one{"{0} nuqta/sm"} @@ -1594,12 +1684,27 @@ uz{ one{"{0} dm"} other{"{0} dm"} } + earth-radius{ + dnam{"yer radiusi"} + one{"{0} yer radiusi"} + other{"{0} yer radiusi"} + } + fathom{ + dnam{"fatom"} + one{"{0} fatom"} + other{"{0} fatom"} + } foot{ dnam{"fut"} one{"{0} fut"} other{"{0} fut"} per{"{0} fut"} } + furlong{ + dnam{"farlong"} + one{"{0} farlong"} + other{"{0} farlong"} + } inch{ dnam{"duym"} one{"{0} dy"} @@ -1680,6 +1785,16 @@ uz{ } } light{ + candela{ + dnam{"kandela"} + one{"{0} kandela"} + other{"{0} kandela"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } lux{ dnam{"lk"} one{"{0} lk"} @@ -1707,6 +1822,11 @@ uz{ one{"{0} M⊕"} other{"{0} M⊕"} } + grain{ + dnam{"gran"} + one{"{0} gran"} + other{"{0} gran"} + } gram{ dnam{"gramm"} one{"{0} g"} @@ -1756,6 +1876,11 @@ uz{ one{"{0} M☉"} other{"{0} M☉"} } + stone{ + dnam{"tosh"} + one{"{0} tosh"} + other{"{0} tosh"} + } ton{ dnam{"amer. t"} one{"{0} amer. t"} @@ -1811,9 +1936,9 @@ uz{ other{"{0} gPa"} } inch-ofhg{ - dnam{"dy sim.ust"} - one{"{0} dy sim.ust"} - other{"{0} dy sim.ust"} + dnam{"inHg"} + one{"{0} inHg"} + other{"{0} inHg"} } kilopascal{ dnam{"kPa"} @@ -1831,9 +1956,8 @@ uz{ other{"{0} mbar"} } millimeter-ofhg{ - dnam{"mm sim.ust"} - one{"{0} mm sim.ust"} - other{"{0} mm sim.ust"} + one{"{0} mmHg"} + other{"{0} mmHg"} } pascal{ dnam{"Pa"} @@ -1841,9 +1965,9 @@ uz{ other{"{0} Pa"} } pound-force-per-square-inch{ - dnam{"funt/kv.dy"} - one{"{0} funt/kv.dy"} - other{"{0} funt/kv.dy"} + dnam{"funt/dy.kv"} + one{"{0} funt/dy.kv"} + other{"{0} funt/dy.kv"} } } speed{ @@ -1897,9 +2021,9 @@ uz{ other{"{0} N⋅m"} } pound-force-foot{ - dnam{"funt-fut"} - one{"{0} funt-fut"} - other{"{0} funt-fut"} + dnam{"funt-kuch-fut"} + one{"{0} funt-kuch-fut"} + other{"{0} funt-kuch-fut"} } } volume{ @@ -1913,6 +2037,11 @@ uz{ one{"{0} barrel"} other{"{0} barrel"} } + bushel{ + dnam{"bushel"} + one{"{0} bushel"} + other{"{0} bushel"} + } centiliter{ dnam{"sL"} one{"{0} sL"} @@ -1970,6 +2099,26 @@ uz{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + dnam{"desert qoshiq"} + one{"{0} desert qoshiq"} + other{"{0} desert qoshiq"} + } + dessert-spoon-imperial{ + dnam{"imp desert qoshiq"} + one{"{0} imp desert qoshiq"} + other{"{0} imp desert qoshiq"} + } + dram{ + dnam{"suyuqlik draxmasi"} + one{"{0} suyuqlik draxmasi"} + other{"{0} suyuqlik draxmasi"} + } + drop{ + dnam{"tomchi"} + one{"{0} tomchi"} + other{"{0} tomchi"} + } fluid-ounce{ dnam{"suyuq unsiya"} one{"{0} suyuq unsiya"} @@ -1997,6 +2146,11 @@ uz{ one{"{0} gL"} other{"{0} gL"} } + jigger{ + dnam{"qadah"} + one{"{0} qadah"} + other{"{0} qadah"} + } liter{ dnam{"litr"} one{"{0} L"} @@ -2013,6 +2167,11 @@ uz{ one{"{0} mL"} other{"{0} mL"} } + pinch{ + dnam{"chimdim"} + one{"{0} chimdim"} + other{"{0} chimdim"} + } pint{ dnam{"pint"} one{"{0} pint"} @@ -2028,6 +2187,11 @@ uz{ one{"{0} kvart"} other{"{0} kvart"} } + quart-imperial{ + dnam{"imp kvarta"} + one{"{0} imp. kvarta"} + other{"{0} imp. kvarta"} + } tablespoon{ dnam{"osh qoshiq"} one{"{0} osh qoshiq"} diff --git a/intl/icu/source/data/unit/uz_AF.txt b/intl/icu/source/data/unit/uz_AF.txt index 24ca294580df..0e8d20c4cf48 100644 --- a/intl/icu/source/data/unit/uz_AF.txt +++ b/intl/icu/source/data/unit/uz_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_AF{ "%%ALIAS"{"uz_Arab_AF"} } diff --git a/intl/icu/source/data/unit/uz_Arab.txt b/intl/icu/source/data/unit/uz_Arab.txt index 40d0b74b561d..f1546d86aec4 100644 --- a/intl/icu/source/data/unit/uz_Arab.txt +++ b/intl/icu/source/data/unit/uz_Arab.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Arab{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/uz_Arab_AF.txt b/intl/icu/source/data/unit/uz_Arab_AF.txt index e45d70894be0..e2978bbe125b 100644 --- a/intl/icu/source/data/unit/uz_Arab_AF.txt +++ b/intl/icu/source/data/unit/uz_Arab_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/uz_Cyrl.txt b/intl/icu/source/data/unit/uz_Cyrl.txt index 7b5673d139c4..2c1a615b01e0 100644 --- a/intl/icu/source/data/unit/uz_Cyrl.txt +++ b/intl/icu/source/data/unit/uz_Cyrl.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Cyrl{ %%Parent{"root"} - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/uz_Latn.txt b/intl/icu/source/data/unit/uz_Latn.txt index f6035b73d6e3..1ae52daa8f8c 100644 --- a/intl/icu/source/data/unit/uz_Latn.txt +++ b/intl/icu/source/data/unit/uz_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/uz_Latn_UZ.txt b/intl/icu/source/data/unit/uz_Latn_UZ.txt index 2d34effafec3..356e549792c6 100644 --- a/intl/icu/source/data/unit/uz_Latn_UZ.txt +++ b/intl/icu/source/data/unit/uz_Latn_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/uz_UZ.txt b/intl/icu/source/data/unit/uz_UZ.txt index ffac5329b1b6..3a6a14d8072a 100644 --- a/intl/icu/source/data/unit/uz_UZ.txt +++ b/intl/icu/source/data/unit/uz_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_UZ{ "%%ALIAS"{"uz_Latn_UZ"} } diff --git a/intl/icu/source/data/unit/vai.txt b/intl/icu/source/data/unit/vai.txt index 00fb305cdbd7..f1f79bb4cafc 100644 --- a/intl/icu/source/data/unit/vai.txt +++ b/intl/icu/source/data/unit/vai.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/vai_LR.txt b/intl/icu/source/data/unit/vai_LR.txt index 27d42387f34b..f682350b1193 100644 --- a/intl/icu/source/data/unit/vai_LR.txt +++ b/intl/icu/source/data/unit/vai_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_LR{ "%%ALIAS"{"vai_Vaii_LR"} } diff --git a/intl/icu/source/data/unit/vai_Latn.txt b/intl/icu/source/data/unit/vai_Latn.txt index 43baa49cf18b..2a01a5cb962c 100644 --- a/intl/icu/source/data/unit/vai_Latn.txt +++ b/intl/icu/source/data/unit/vai_Latn.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Latn{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/vai_Vaii.txt b/intl/icu/source/data/unit/vai_Vaii.txt index cffa5917afbb..6dc5e995dac4 100644 --- a/intl/icu/source/data/unit/vai_Vaii.txt +++ b/intl/icu/source/data/unit/vai_Vaii.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Vaii{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/vai_Vaii_LR.txt b/intl/icu/source/data/unit/vai_Vaii_LR.txt index a17bc11e00e8..d2845ca31a01 100644 --- a/intl/icu/source/data/unit/vai_Vaii_LR.txt +++ b/intl/icu/source/data/unit/vai_Vaii_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/vi.txt b/intl/icu/source/data/unit/vi.txt index 1943b3906820..e0344f097004 100644 --- a/intl/icu/source/data/unit/vi.txt +++ b/intl/icu/source/data/unit/vi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -281,6 +281,10 @@ vi{ } } graphics{ + dot{ + dnam{"chấm"} + other{"{0} chấm"} + } dot-per-centimeter{ dnam{"chấm/xentimét"} other{"{0} chấm/xentimét"} @@ -319,6 +323,10 @@ vi{ dnam{"đềximét"} other{"{0} đềximét"} } + earth-radius{ + dnam{"bán kính trái đất"} + other{"{0} bán kính trái đất"} + } foot{ dnam{"feet"} other{"{0} feet"} @@ -386,6 +394,14 @@ vi{ } } light{ + candela{ + dnam{"candela"} + other{"{0} candela"} + } + lumen{ + dnam{"lumen"} + other{"{0} lumen"} + } lux{ dnam{"lux"} other{"{0} lux"} @@ -408,6 +424,10 @@ vi{ dnam{"Trọng lượng trái đất"} other{"{0} trọng lượng trái đất"} } + grain{ + dnam{"gren"} + other{"{0} gren"} + } gram{ dnam{"gam"} other{"{0} gam"} @@ -582,6 +602,7 @@ vi{ other{"{0} yard khối"} } cup{ + dnam{"tách"} other{"{0} cup"} } cup-metric{ @@ -592,6 +613,22 @@ vi{ dnam{"đềxilít"} other{"{0} đềxilít"} } + dessert-spoon{ + dnam{"thìa ăn tráng miệng"} + other{"{0} thìa ăn tráng miệng"} + } + dessert-spoon-imperial{ + dnam{"thìa ăn tráng miệng Anh"} + other{"{0} thìa ăn tráng miệng Anh"} + } + dram{ + dnam{"dram"} + other{"{0} dram chất lỏng Anh"} + } + drop{ + dnam{"giọt"} + other{"{0} giọt"} + } fluid-ounce{ dnam{"aoxơ chất lỏng"} other{"{0} aoxơ chất lỏng"} @@ -614,6 +651,10 @@ vi{ dnam{"hectolit"} other{"{0} hectolit"} } + jigger{ + dnam{"jigger"} + other{"{0} jigger"} + } liter{ dnam{"lít"} other{"{0} lít"} @@ -626,6 +667,10 @@ vi{ dnam{"mililít"} other{"{0} mililít"} } + pinch{ + dnam{"nhúm"} + other{"{0} nhúm"} + } pint{ dnam{"panh"} other{"{0} panh"} @@ -638,6 +683,10 @@ vi{ dnam{"quart"} other{"{0} quart"} } + quart-imperial{ + dnam{"lít Anh"} + other{"{0} lít Anh"} + } tablespoon{ dnam{"muỗng canh"} other{"{0} muỗng canh"} @@ -1019,6 +1068,10 @@ vi{ } } graphics{ + dot{ + dnam{"chấm"} + other{"{0} chấm"} + } megapixel{ dnam{"megapixel"} } @@ -1033,6 +1086,10 @@ vi{ decimeter{ dnam{"dm"} } + earth-radius{ + dnam{"R⊕"} + other{"{0} R⊕"} + } inch{ dnam{"inch"} other{"{0} inch"} @@ -1072,6 +1129,14 @@ vi{ } } light{ + candela{ + dnam{"cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + other{"{0} lm"} + } solar-luminosity{ dnam{"độ sáng của mặt trời"} other{"{0} L☉"} @@ -1089,6 +1154,10 @@ vi{ earth-mass{ dnam{"Trọng lượng trái đất"} } + grain{ + dnam{"gren"} + other{"{0} gren"} + } gram{ dnam{"g"} } @@ -1203,6 +1272,7 @@ vi{ } cup{ dnam{"c"} + other{"{0} tách"} } cup-metric{ dnam{"mcup"} @@ -1210,6 +1280,21 @@ vi{ deciliter{ dnam{"dL"} } + dessert-spoon{ + dnam{"thìa tráng miệng"} + other{"{0} thìa tm"} + } + dessert-spoon-imperial{ + dnam{"thìa tráng miệng Anh"} + other{"{0} thìa tm Anh"} + } + dram{ + dnam{"dram chất lỏng"} + } + drop{ + dnam{"giọt"} + other{"{0} giọt"} + } fluid-ounce{ dnam{"fl oz"} other{"{0} fl oz"} @@ -1231,6 +1316,10 @@ vi{ hectoliter{ dnam{"hL"} } + jigger{ + dnam{"jigger"} + other{"{0} jigger"} + } liter{ dnam{"l"} other{"{0} L"} @@ -1242,14 +1331,24 @@ vi{ milliliter{ dnam{"mL"} } + pinch{ + dnam{"nhúm"} + other{"{0} nhúm"} + } pint-metric{ dnam{"mpt"} } + quart-imperial{ + dnam{"lít Anh"} + other{"{0} lít Anh"} + } tablespoon{ dnam{"thìa xúp"} + other{"{0} thìa xúp"} } teaspoon{ dnam{"tsp"} + other{"{0} thìa cà phê"} } } } diff --git a/intl/icu/source/data/unit/vun.txt b/intl/icu/source/data/unit/vun.txt index 8db299d9b5bc..6e8c781ed776 100644 --- a/intl/icu/source/data/unit/vun.txt +++ b/intl/icu/source/data/unit/vun.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vun{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/wae.txt b/intl/icu/source/data/unit/wae.txt index 5efff3262749..976666e7e070 100644 --- a/intl/icu/source/data/unit/wae.txt +++ b/intl/icu/source/data/unit/wae.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wae{ - Version{"37"} units{ duration{ day{ diff --git a/intl/icu/source/data/unit/wo.txt b/intl/icu/source/data/unit/wo.txt index 4864d76db4d8..bdde590124a0 100644 --- a/intl/icu/source/data/unit/wo.txt +++ b/intl/icu/source/data/unit/wo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wo{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/xh.txt b/intl/icu/source/data/unit/xh.txt index a659eb803511..3a7aa5dd55df 100644 --- a/intl/icu/source/data/unit/xh.txt +++ b/intl/icu/source/data/unit/xh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xh{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/xog.txt b/intl/icu/source/data/unit/xog.txt index bd9bdd87a3ae..059ee192c730 100644 --- a/intl/icu/source/data/unit/xog.txt +++ b/intl/icu/source/data/unit/xog.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xog{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/yav.txt b/intl/icu/source/data/unit/yav.txt index 2ad349bfb378..5bbb6b11eccf 100644 --- a/intl/icu/source/data/unit/yav.txt +++ b/intl/icu/source/data/unit/yav.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yav{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/yi.txt b/intl/icu/source/data/unit/yi.txt index 0e8bcf7461e7..97ea9bb302fb 100644 --- a/intl/icu/source/data/unit/yi.txt +++ b/intl/icu/source/data/unit/yi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yi{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/intl/icu/source/data/unit/yo.txt b/intl/icu/source/data/unit/yo.txt index 8ed6ad4dff1b..a154e86490be 100644 --- a/intl/icu/source/data/unit/yo.txt +++ b/intl/icu/source/data/unit/yo.txt @@ -1,13 +1,64 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} ms{"m:ss"} } units{ + concentr{ + permille{ + other{"{0} ìdákan nínú ẹgbẹ̀rún"} + } + } + digital{ + bit{ + dnam{"àwọ́n bíìtì"} + other{"{0} àwọ́n bíìtì"} + } + byte{ + dnam{"àwọ́n báìtì"} + other{"{0} àwọ́n báìtì"} + } + gigabit{ + dnam{"àwọn gígábíìtì"} + other{"{0} àwọn gígábíìtì"} + } + gigabyte{ + dnam{"àwọn gígábáìtì"} + other{"{0} àwọn gígábáìtì"} + } + kilobit{ + dnam{"àwọn kílóbíìtì"} + other{"{0} àwọ́n kílóbíìtì"} + } + kilobyte{ + dnam{"àwọn kílóbáìtì"} + other{"{0} àwọn kílóbáìtì"} + } + megabit{ + dnam{"àwọn mégábíìtì"} + other{"{0} àwọn mégábíìtì"} + } + megabyte{ + dnam{"àwọn mégábáìtì"} + other{"{0} àwọn mégábáìtì"} + } + petabyte{ + dnam{"àwọn pẹ́tábáìtì"} + other{"{0} àwọn pẹ́tábáìtì"} + } + terabit{ + dnam{"àwọn tẹ́rábíìtì"} + other{"{0} àwọn tẹ́rábíìtì"} + } + terabyte{ + dnam{"àwọn tẹ́rábáìtì"} + other{"{0} àwọn tẹ́rábáìtì"} + } + } duration{ century{ dnam{"ọ̀rúndún"} @@ -53,6 +104,64 @@ yo{ per{"{0} ọd"} } } + graphics{ + dot{ + dnam{"dọ́ọ̀tì"} + other{"{0} dọ́ọ̀tì"} + } + } + length{ + earth-radius{ + dnam{"ìdinwọ̀n ayé"} + other{"{0} ìdinwọ̀n ayé"} + } + } + light{ + candela{ + dnam{"kandẹ́là"} + other{"{0} kandẹ́là"} + } + lumen{ + dnam{"lumẹ́ẹ̀nì"} + other{"{0} lumẹ́ẹ̀nì"} + } + } + mass{ + grain{ + dnam{"giréènì"} + other{"{0} gíréènì"} + } + } + volume{ + dessert-spoon{ + dnam{"àmì ṣíbí oúnjẹ́ kékeré"} + other{"{0} àmì ṣíbí oúnjẹ́ kékeré"} + } + dessert-spoon-imperial{ + dnam{"ṣíbí oúnjẹ kékeré"} + other{"{0} àmì oúnjẹ kékeré"} + } + dram{ + dnam{"omi dírámù"} + other{"{0} àmì omi dírámù"} + } + drop{ + dnam{"dírọ́pù"} + other{"{0} dírọ́pù"} + } + jigger{ + dnam{"jígà"} + other{"{0} jígà"} + } + pinch{ + dnam{"píńṣì"} + other{"{0} píńṣì"} + } + quart-imperial{ + dnam{"ìdásímérin"} + other{"{0} ìdásímérin"} + } + } } unitsNarrow{ duration{ @@ -87,6 +196,53 @@ yo{ } } unitsShort{ + concentr{ + permille{ + dnam{"ìdákan nínú ẹgbẹ̀rún"} + other{"{0} àmì ìdákan"} + } + } + digital{ + bit{ + dnam{"bíìtì"} + other{"{0} bíìtì"} + } + byte{ + dnam{"báìtì"} + other{"{0} báìtì"} + } + gigabit{ + dnam{"jíbíìtì"} + other{"{0}jíbíìtì"} + } + gigabyte{ + dnam{"jíbáìtì"} + other{"{0} jíbáìtì"} + } + kilobit{ + dnam{"kébiì"} + other{"{0} kébiì"} + } + kilobyte{ + dnam{"kébáìtì"} + other{"{0} kébáìtì"} + } + megabit{ + dnam{"ẹ́mbíìtì"} + other{"{0} ẹ́mbiì"} + } + megabyte{ + dnam{"ẹ́mbáìtì"} + } + petabyte{ + dnam{"Píbáìtì"} + other{"{0} Píbáìtì"} + } + terabyte{ + dnam{"Tíbáìtì"} + other{"{0} Tíbáìtì"} + } + } duration{ day{ dnam{"ọjọ́"} @@ -128,5 +284,63 @@ yo{ per{"{0}/ọd"} } } + graphics{ + dot{ + dnam{"dọ́ọ̀tì"} + other{"{0} dọ́ọ̀tì"} + } + } + length{ + earth-radius{ + dnam{"àmì ìdínwọ̀n ayé"} + other{"{0} àmì ìdínwọ̀n ayé"} + } + } + light{ + candela{ + dnam{"sídiì"} + other{"{0} sídiì"} + } + lumen{ + dnam{"àmì lumẹ́ẹ̀nì"} + other{"{0} àmi lumẹ́ẹ̀nì"} + } + } + mass{ + grain{ + dnam{"gíréènì"} + other{"{0} gíréènì"} + } + } + volume{ + dessert-spoon{ + dnam{"ṣíbí oúnjẹ́ kékeré"} + other{"{0} ṣíbí oúnjẹ́ kékeré"} + } + dessert-spoon-imperial{ + dnam{"àmì oúnjẹ kékeré"} + other{"{0} àmì oúnjẹ kékeré"} + } + dram{ + dnam{"omi dírámù"} + other{"{0} àmì omi dírámù"} + } + drop{ + dnam{"dírọ́pù"} + other{"{0} dírọ́pù"} + } + jigger{ + dnam{"jígà"} + other{"{0} jígà"} + } + pinch{ + dnam{"píńṣì"} + other{"{0} píńṣì"} + } + quart-imperial{ + dnam{"àmì ìdásímérin"} + other{"{0} àmì ìdásímérin"} + } + } } } diff --git a/intl/icu/source/data/unit/yo_BJ.txt b/intl/icu/source/data/unit/yo_BJ.txt index 5f4213209215..f46277f5779b 100644 --- a/intl/icu/source/data/unit/yo_BJ.txt +++ b/intl/icu/source/data/unit/yo_BJ.txt @@ -1,8 +1,59 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo_BJ{ - Version{"37"} units{ + concentr{ + permille{ + other{"{0} ìdákan nínú ɛgbɛ̀rún"} + } + } + digital{ + bit{ + dnam{"àwɔ́n bíìtì"} + other{"{0} àwɔ́n bíìtì"} + } + byte{ + dnam{"àwɔ́n báìtì"} + other{"{0} àwɔ́n báìtì"} + } + gigabit{ + dnam{"àwɔn gígábíìtì"} + other{"{0} àwɔn gígábíìtì"} + } + gigabyte{ + dnam{"àwɔn gígábáìtì"} + other{"{0} àwɔn gígábáìtì"} + } + kilobit{ + dnam{"àwɔn kílóbíìtì"} + other{"{0} àwɔ́n kílóbíìtì"} + } + kilobyte{ + dnam{"àwɔn kílóbáìtì"} + other{"{0} àwɔn kílóbáìtì"} + } + megabit{ + dnam{"àwɔn mégábíìtì"} + other{"{0} àwɔn mégábíìtì"} + } + megabyte{ + dnam{"àwɔn mégábáìtì"} + other{"{0} àwɔn mégábáìtì"} + } + petabyte{ + dnam{"àwɔn pɛ́tábáìtì"} + other{"{0} àwɔn pɛ́tábáìtì"} + } + terabit{ + dnam{"àwɔn tɛ́rábíìtì"} + other{"{0} àwɔn tɛ́rábíìtì"} + } + terabyte{ + dnam{"àwɔn tɛ́rábáìtì"} + other{"{0} àwɔn tɛ́rábáìtì"} + } + } duration{ century{ dnam{"ɔ̀rúndún"} @@ -43,6 +94,46 @@ yo_BJ{ per{"{0} ɔd"} } } + graphics{ + dot{ + dnam{"dɔ́ɔ̀tì"} + other{"{0} dɔ́ɔ̀tì"} + } + } + length{ + earth-radius{ + dnam{"ìdinwɔ̀n ayé"} + other{"{0} ìdinwɔ̀n ayé"} + } + } + light{ + candela{ + dnam{"kandɛ́là"} + other{"{0} kandɛ́là"} + } + lumen{ + dnam{"lumɛ́ɛ̀nì"} + other{"{0} lumɛ́ɛ̀nì"} + } + } + volume{ + dessert-spoon{ + dnam{"àmì shíbí oúnjɛ́ kékeré"} + other{"{0} àmì shíbí oúnjɛ́ kékeré"} + } + dessert-spoon-imperial{ + dnam{"shíbí oúnjɛ kékeré"} + other{"{0} àmì oúnjɛ kékeré"} + } + drop{ + dnam{"dírɔ́pù"} + other{"{0} dírɔ́pù"} + } + pinch{ + dnam{"píńshì"} + other{"{0} píńshì"} + } + } } unitsNarrow{ duration{ @@ -73,6 +164,20 @@ yo_BJ{ } } unitsShort{ + concentr{ + permille{ + dnam{"ìdákan nínú ɛgbɛ̀rún"} + } + } + digital{ + megabit{ + dnam{"ɛ́mbíìtì"} + other{"{0} ɛ́mbiì"} + } + megabyte{ + dnam{"ɛ́mbáìtì"} + } + } duration{ day{ dnam{"ɔjɔ́"} @@ -109,5 +214,41 @@ yo_BJ{ per{"{0}/ɔd"} } } + graphics{ + dot{ + dnam{"dɔ́ɔ̀tì"} + other{"{0} dɔ́ɔ̀tì"} + } + } + length{ + earth-radius{ + dnam{"àmì ìdínwɔ̀n ayé"} + other{"{0} àmì ìdínwɔ̀n ayé"} + } + } + light{ + lumen{ + dnam{"àmì lumɛ́ɛ̀nì"} + other{"{0} àmi lumɛ́ɛ̀nì"} + } + } + volume{ + dessert-spoon{ + dnam{"shíbí oúnjɛ́ kékeré"} + other{"{0} shíbí oúnjɛ́ kékeré"} + } + dessert-spoon-imperial{ + dnam{"àmì oúnjɛ kékeré"} + other{"{0} àmì oúnjɛ kékeré"} + } + drop{ + dnam{"dírɔ́pù"} + other{"{0} dírɔ́pù"} + } + pinch{ + dnam{"píńshì"} + other{"{0} píńshì"} + } + } } } diff --git a/intl/icu/source/data/unit/yue.txt b/intl/icu/source/data/unit/yue.txt index a755d4e4f6a7..5e907ce47ebd 100644 --- a/intl/icu/source/data/unit/yue.txt +++ b/intl/icu/source/data/unit/yue.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -337,6 +337,10 @@ yue{ } } graphics{ + dot{ + dnam{"圓點"} + other{"{0} 個圓點"} + } dot-per-centimeter{ dnam{"每厘米點數"} other{"{0} 點/厘米"} @@ -380,6 +384,10 @@ yue{ dnam{"公寸"} other{"{0} 公寸"} } + earth-radius{ + dnam{"地球半徑"} + other{"{0} 地球半徑"} + } fathom{ dnam{"英尋"} other{"{0} 英尋"} @@ -458,6 +466,14 @@ yue{ } } light{ + candela{ + dnam{"坎德拉"} + other{"{0} 坎德拉"} + } + lumen{ + dnam{"流明"} + other{"{0} 流明"} + } lux{ dnam{"勒克斯"} other{"{0} 勒克斯"} @@ -480,6 +496,10 @@ yue{ dnam{"地球質量"} other{"{0} 地球質量"} } + grain{ + dnam{"喱"} + other{"{0}格令"} + } gram{ dnam{"克"} other{"{0} 克"} @@ -702,6 +722,22 @@ yue{ dnam{"公合"} other{"{0} 公合"} } + dessert-spoon{ + dnam{"甜品匙"} + other{"{0}甜品匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜品匙"} + other{"英制甜品匙{0}匙"} + } + dram{ + dnam{"英制液量打蘭"} + other{"{0}英制液量打蘭"} + } + drop{ + dnam{"滴"} + other{"{0}滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0} 液盎司"} @@ -724,6 +760,10 @@ yue{ dnam{"公石"} other{"{0} 公石"} } + jigger{ + dnam{"量酒杯"} + other{"量酒器{0}杯"} + } liter{ dnam{"公升"} other{"{0} 公升"} @@ -737,6 +777,10 @@ yue{ dnam{"毫升"} other{"{0} 毫升"} } + pinch{ + dnam{"小撮"} + other{"{0} 小撮"} + } pint{ dnam{"品脫"} other{"{0} 品脫"} @@ -749,6 +793,10 @@ yue{ dnam{"夸脫"} other{"{0} 夸脫"} } + quart-imperial{ + dnam{"英制夸脫"} + other{"{0} 英制夸脫"} + } tablespoon{ dnam{"湯匙"} other{"{0} 湯匙"} @@ -1530,6 +1578,10 @@ yue{ } } graphics{ + dot{ + dnam{"圓點"} + other{"{0} 個圓點"} + } dot-per-centimeter{ dnam{"每厘米點數"} other{"{0} 點/厘米"} @@ -1573,6 +1625,10 @@ yue{ dnam{"公寸"} other{"{0} 公寸"} } + earth-radius{ + dnam{"地球半徑"} + other{"{0} 地球半徑"} + } fathom{ dnam{"fm"} other{"{0} 英尋"} @@ -1651,6 +1707,14 @@ yue{ } } light{ + candela{ + dnam{"坎德拉"} + other{"{0} 坎德拉"} + } + lumen{ + dnam{"流明"} + other{"{0} 流明"} + } lux{ dnam{"勒克斯"} other{"{0} 勒克斯"} @@ -1673,6 +1737,10 @@ yue{ dnam{"地球質量"} other{"{0} 地球質量"} } + grain{ + dnam{"喱"} + other{"{0} 喱"} + } gram{ dnam{"克"} other{"{0} 克"} @@ -1846,7 +1914,7 @@ yue{ other{"{0} 桶"} } bushel{ - dnam{"bu"} + dnam{"蒲式耳"} other{"{0} 蒲式耳"} } centiliter{ @@ -1895,6 +1963,22 @@ yue{ dnam{"公合"} other{"{0} 公合"} } + dessert-spoon{ + dnam{"甜品匙"} + other{"{0}甜品匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜品匙"} + other{"{0}英制甜品匙"} + } + dram{ + dnam{"英制液量打蘭"} + other{"{0}英制液量打蘭"} + } + drop{ + dnam{"滴"} + other{"{0}滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0} 液盎司"} @@ -1917,6 +2001,10 @@ yue{ dnam{"公石"} other{"{0} 公石"} } + jigger{ + dnam{"量酒杯"} + other{"量酒器{0}杯"} + } liter{ dnam{"公升"} other{"{0} 公升"} @@ -1930,6 +2018,10 @@ yue{ dnam{"毫升"} other{"{0} 毫升"} } + pinch{ + dnam{"小撮"} + other{"{0} 小撮"} + } pint{ dnam{"品脫"} other{"{0} 品脫"} @@ -1942,6 +2034,10 @@ yue{ dnam{"夸脫"} other{"{0} 夸脫"} } + quart-imperial{ + dnam{"英制夸脫"} + other{"{0} 英制夸脫"} + } tablespoon{ dnam{"湯匙"} other{"{0} 湯匙"} diff --git a/intl/icu/source/data/unit/yue_CN.txt b/intl/icu/source/data/unit/yue_CN.txt index 26d4356a9eeb..2a3cc8af71ba 100644 --- a/intl/icu/source/data/unit/yue_CN.txt +++ b/intl/icu/source/data/unit/yue_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_CN{ "%%ALIAS"{"yue_Hans_CN"} } diff --git a/intl/icu/source/data/unit/yue_HK.txt b/intl/icu/source/data/unit/yue_HK.txt index 29a7459ef3d9..7bce3c57365e 100644 --- a/intl/icu/source/data/unit/yue_HK.txt +++ b/intl/icu/source/data/unit/yue_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_HK{ "%%ALIAS"{"yue_Hant_HK"} } diff --git a/intl/icu/source/data/unit/yue_Hans.txt b/intl/icu/source/data/unit/yue_Hans.txt index 163e4f7962df..416a2006edd4 100644 --- a/intl/icu/source/data/unit/yue_Hans.txt +++ b/intl/icu/source/data/unit/yue_Hans.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans{ %%Parent{"root"} - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -338,6 +338,10 @@ yue_Hans{ } } graphics{ + dot{ + dnam{"圆点"} + other{"{0} 个圆点"} + } dot-per-centimeter{ dnam{"每厘米点数"} other{"{0} 点/厘米"} @@ -381,6 +385,10 @@ yue_Hans{ dnam{"公寸"} other{"{0} 公寸"} } + earth-radius{ + dnam{"地球半径"} + other{"{0} 地球半径"} + } fathom{ dnam{"英寻"} other{"{0} 英寻"} @@ -459,6 +467,14 @@ yue_Hans{ } } light{ + candela{ + dnam{"坎德拉"} + other{"{0} 坎德拉"} + } + lumen{ + dnam{"流明"} + other{"{0} 流明"} + } lux{ dnam{"勒克斯"} other{"{0} 勒克斯"} @@ -481,6 +497,10 @@ yue_Hans{ dnam{"地球质量"} other{"{0} 地球质量"} } + grain{ + dnam{"喱"} + other{"{0}格令"} + } gram{ dnam{"克"} other{"{0} 克"} @@ -703,6 +723,22 @@ yue_Hans{ dnam{"公合"} other{"{0} 公合"} } + dessert-spoon{ + dnam{"甜品匙"} + other{"{0}甜品匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜品匙"} + other{"英制甜品匙{0}匙"} + } + dram{ + dnam{"英制液量打兰"} + other{"{0}英制液量打兰"} + } + drop{ + dnam{"滴"} + other{"{0}滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0} 液盎司"} @@ -725,6 +761,10 @@ yue_Hans{ dnam{"公石"} other{"{0} 公石"} } + jigger{ + dnam{"量酒杯"} + other{"量酒器{0}杯"} + } liter{ dnam{"公升"} other{"{0} 公升"} @@ -738,6 +778,10 @@ yue_Hans{ dnam{"毫升"} other{"{0} 毫升"} } + pinch{ + dnam{"小撮"} + other{"{0} 小撮"} + } pint{ dnam{"品脱"} other{"{0} 品脱"} @@ -750,6 +794,10 @@ yue_Hans{ dnam{"夸脱"} other{"{0} 夸脱"} } + quart-imperial{ + dnam{"英制夸脱"} + other{"{0} 英制夸脱"} + } tablespoon{ dnam{"汤匙"} other{"{0} 汤匙"} @@ -1531,6 +1579,10 @@ yue_Hans{ } } graphics{ + dot{ + dnam{"圆点"} + other{"{0} 个圆点"} + } dot-per-centimeter{ dnam{"每厘米点数"} other{"{0} 点/厘米"} @@ -1574,6 +1626,10 @@ yue_Hans{ dnam{"公寸"} other{"{0} 公寸"} } + earth-radius{ + dnam{"地球半径"} + other{"{0} 地球半径"} + } fathom{ dnam{"fm"} other{"{0} 英寻"} @@ -1652,6 +1708,14 @@ yue_Hans{ } } light{ + candela{ + dnam{"坎德拉"} + other{"{0} 坎德拉"} + } + lumen{ + dnam{"流明"} + other{"{0} 流明"} + } lux{ dnam{"勒克斯"} other{"{0} 勒克斯"} @@ -1674,6 +1738,10 @@ yue_Hans{ dnam{"地球质量"} other{"{0} 地球质量"} } + grain{ + dnam{"喱"} + other{"{0} 喱"} + } gram{ dnam{"克"} other{"{0} 克"} @@ -1896,6 +1964,22 @@ yue_Hans{ dnam{"公合"} other{"{0} 公合"} } + dessert-spoon{ + dnam{"甜品匙"} + other{"{0}甜品匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜品匙"} + other{"{0}英制甜品匙"} + } + dram{ + dnam{"英制液量打兰"} + other{"{0}英制液量打兰"} + } + drop{ + dnam{"滴"} + other{"{0}滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0} 液盎司"} @@ -1918,6 +2002,10 @@ yue_Hans{ dnam{"公石"} other{"{0} 公石"} } + jigger{ + dnam{"量酒杯"} + other{"量酒器{0}杯"} + } liter{ dnam{"公升"} other{"{0} 升"} @@ -1931,6 +2019,10 @@ yue_Hans{ dnam{"毫升"} other{"{0} 毫升"} } + pinch{ + dnam{"小撮"} + other{"{0} 小撮"} + } pint{ dnam{"品脱"} other{"{0} 品脱"} @@ -1943,6 +2035,10 @@ yue_Hans{ dnam{"夸脱"} other{"{0} 夸脱"} } + quart-imperial{ + dnam{"英制夸脱"} + other{"{0} 英制夸脱"} + } tablespoon{ dnam{"汤匙"} other{"{0} 汤匙"} diff --git a/intl/icu/source/data/unit/yue_Hans_CN.txt b/intl/icu/source/data/unit/yue_Hans_CN.txt index 479d1253cc95..07edcb8320b7 100644 --- a/intl/icu/source/data/unit/yue_Hans_CN.txt +++ b/intl/icu/source/data/unit/yue_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/yue_Hant.txt b/intl/icu/source/data/unit/yue_Hant.txt index 8f398126c061..f1fb01c3f546 100644 --- a/intl/icu/source/data/unit/yue_Hant.txt +++ b/intl/icu/source/data/unit/yue_Hant.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hant{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/yue_Hant_HK.txt b/intl/icu/source/data/unit/yue_Hant_HK.txt index 9adeba7275b4..e2bb01d90d09 100644 --- a/intl/icu/source/data/unit/yue_Hant_HK.txt +++ b/intl/icu/source/data/unit/yue_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/zgh.txt b/intl/icu/source/data/unit/zgh.txt index ffa19b161005..4946cd84d247 100644 --- a/intl/icu/source/data/unit/zgh.txt +++ b/intl/icu/source/data/unit/zgh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zgh{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/zh.txt b/intl/icu/source/data/unit/zh.txt index 7399c30ea9c4..c3331572cf3f 100644 --- a/intl/icu/source/data/unit/zh.txt +++ b/intl/icu/source/data/unit/zh.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -56,7 +56,6 @@ zh{ square-centimeter{ dnam{"平方厘米"} other{"{0}平方厘米"} - per{"每平方厘米{0}"} } square-foot{ dnam{"平方英尺"} @@ -65,22 +64,18 @@ zh{ square-inch{ dnam{"平方英寸"} other{"{0}平方英寸"} - per{"每平方英寸{0}"} } square-kilometer{ dnam{"平方公里"} other{"{0}平方公里"} - per{"每平方公里{0}"} } square-meter{ dnam{"平方米"} other{"{0}平方米"} - per{"每平方米{0}"} } square-mile{ dnam{"平方英里"} other{"{0}平方英里"} - per{"每平方英里{0}"} } square-yard{ dnam{"平方码"} @@ -200,7 +195,6 @@ zh{ day{ dnam{"天"} other{"{0}天"} - per{"每天{0}"} } decade{ dnam{"年代"} @@ -209,7 +203,6 @@ zh{ hour{ dnam{"小时"} other{"{0}小时"} - per{"每小时{0}"} } microsecond{ dnam{"微秒"} @@ -222,12 +215,10 @@ zh{ minute{ dnam{"分钟"} other{"{0}分钟"} - per{"每分钟{0}"} } month{ dnam{"个月"} other{"{0}个月"} - per{"每月{0}"} } nanosecond{ dnam{"纳秒"} @@ -241,12 +232,10 @@ zh{ week{ dnam{"周"} other{"{0}周"} - per{"每周{0}"} } year{ dnam{"年"} other{"{0}年"} - per{"每年{0}"} } } electric{ @@ -334,17 +323,21 @@ zh{ } } graphics{ + dot{ + dnam{"点"} + other{"{0} 点"} + } dot-per-centimeter{ - dnam{"点每厘米"} - other{"{0}点每厘米"} + dnam{"点/厘米"} + other{"{0} 点/厘米"} } dot-per-inch{ - dnam{"点每英寸"} - other{"{0}点每英寸"} + dnam{"点/英寸"} + other{"{0} 点/英寸"} } em{ - dnam{"版式"} - other{"{0}版式"} + dnam{"em"} + other{"{0} em"} } megapixel{ dnam{"百万像素"} @@ -355,12 +348,12 @@ zh{ other{"{0}像素"} } pixel-per-centimeter{ - dnam{"像素每厘米"} - other{"{0}像素每厘米"} + dnam{"像素/厘米"} + other{"{0} 像素/厘米"} } pixel-per-inch{ - dnam{"像素每英寸"} - other{"{0}像素每英寸"} + dnam{"像素/英寸"} + other{"{0} 像素/英寸"} } } length{ @@ -371,12 +364,15 @@ zh{ centimeter{ dnam{"厘米"} other{"{0}厘米"} - per{"每厘米{0}"} } decimeter{ dnam{"分米"} other{"{0}分米"} } + earth-radius{ + dnam{"地球半径"} + other{"{0} 地球半径"} + } fathom{ dnam{"英寻"} other{"{0}英寻"} @@ -384,7 +380,6 @@ zh{ foot{ dnam{"英尺"} other{"{0}英尺"} - per{"每英尺{0}"} } furlong{ dnam{"弗隆"} @@ -393,12 +388,10 @@ zh{ inch{ dnam{"英寸"} other{"{0}英寸"} - per{"每英寸{0}"} } kilometer{ dnam{"公里"} other{"{0}公里"} - per{"每公里{0}"} } light-year{ dnam{"光年"} @@ -407,7 +400,6 @@ zh{ meter{ dnam{"米"} other{"{0}米"} - per{"每米{0}"} } micrometer{ dnam{"微米"} @@ -455,6 +447,14 @@ zh{ } } light{ + candela{ + dnam{"坎德拉"} + other{"{0}坎德拉"} + } + lumen{ + dnam{"流明"} + other{"{0}流明"} + } lux{ dnam{"勒克斯"} other{"{0}勒克斯"} @@ -477,10 +477,13 @@ zh{ dnam{"地球质量"} other{"{0}地球质量"} } + grain{ + dnam{"格令"} + other{"{0}格令"} + } gram{ dnam{"克"} other{"{0}克"} - per{"每克{0}"} } kilogram{ dnam{"千克"} @@ -660,7 +663,6 @@ zh{ cubic-centimeter{ dnam{"立方厘米"} other{"{0}立方厘米"} - per{"每立方厘米{0}"} } cubic-foot{ dnam{"立方英尺"} @@ -677,7 +679,6 @@ zh{ cubic-meter{ dnam{"立方米"} other{"{0}立方米"} - per{"每立方米{0}"} } cubic-mile{ dnam{"立方英里"} @@ -699,6 +700,22 @@ zh{ dnam{"分升"} other{"{0}分升"} } + dessert-spoon{ + dnam{"甜点匙"} + other{"{0}甜点匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜点匙"} + other{"{0}英制甜点匙"} + } + dram{ + dnam{"打兰"} + other{"{0}打兰"} + } + drop{ + dnam{"滴"} + other{"{0}滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0}液盎司"} @@ -710,21 +727,22 @@ zh{ gallon{ dnam{"加仑"} other{"{0}加仑"} - per{"每加仑{0}"} } gallon-imperial{ dnam{"英制加仑"} other{"{0}英制加仑"} - per{"每英制加仑{0}"} } hectoliter{ dnam{"公石"} other{"{0}公石"} } + jigger{ + dnam{"量杯"} + other{"{0}量杯"} + } liter{ dnam{"升"} other{"{0}升"} - per{"每升{0}"} } megaliter{ dnam{"兆升"} @@ -734,6 +752,10 @@ zh{ dnam{"毫升"} other{"{0}毫升"} } + pinch{ + dnam{"撮"} + other{"{0}撮"} + } pint{ dnam{"品脱"} other{"{0}品脱"} @@ -746,6 +768,10 @@ zh{ dnam{"夸脱"} other{"{0}夸脱"} } + quart-imperial{ + dnam{"英制夸脱"} + other{"{0}英制夸脱"} + } tablespoon{ dnam{"汤匙"} other{"{0}汤匙"} @@ -833,7 +859,7 @@ zh{ } consumption{ liter-per-100-kilometer{ - dnam{"升/100千米"} + dnam{"L/100km"} other{"{0}L/100km"} } } @@ -1004,12 +1030,12 @@ zh{ } mass{ gram{ - dnam{"克"} - other{"{0}克"} + dnam{"g"} + other{"{0}g"} } kilogram{ - dnam{"千克"} - other{"{0}千克"} + dnam{"kg"} + other{"{0}kg"} } ounce{ other{"{0}盎司"} @@ -1046,8 +1072,8 @@ zh{ } speed{ kilometer-per-hour{ - dnam{"公里/小时"} - other{"{0}公里/小时"} + dnam{"km/h"} + other{"{0}km/h"} } knot{ dnam{"节"} @@ -1185,10 +1211,6 @@ zh{ dnam{"G力"} other{"{0}G"} } - meter-per-square-second{ - dnam{"米/秒²"} - other{"{0}米/秒²"} - } } angle{ arc-minute{ @@ -1264,22 +1286,6 @@ zh{ times{"{0}⋅{1}"} } concentr{ - karat{ - dnam{"克拉"} - other{"{0}克拉"} - } - milligram-per-deciliter{ - dnam{"毫克/分升"} - other{"{0}毫克/分升"} - } - millimole-per-liter{ - dnam{"毫摩尔/升"} - other{"{0}毫摩尔/升"} - } - mole{ - dnam{"摩尔"} - other{"{0}摩尔"} - } percent{ dnam{"%"} other{"{0}%"} @@ -1293,24 +1299,6 @@ zh{ other{"{0}ppm"} } } - consumption{ - liter-per-100-kilometer{ - dnam{"升/100千米"} - other{"{0}升/100千米"} - } - liter-per-kilometer{ - dnam{"升/公里"} - other{"{0}升/公里"} - } - mile-per-gallon{ - dnam{"英里/加仑"} - other{"{0}英里/加仑"} - } - mile-per-gallon-imperial{ - dnam{"英里/英制加仑"} - other{"{0}英里/英制加仑"} - } - } coordinate{ dnam{"方向"} east{"东经{0}"} @@ -1320,49 +1308,17 @@ zh{ } digital{ bit{ - dnam{"比特"} - other{"{0}比特"} + dnam{"b"} + other{"{0} b"} } byte{ - dnam{"字节"} - other{"{0}字节"} - } - gigabit{ - dnam{"吉比特"} - other{"{0}吉比特"} - } - gigabyte{ - dnam{"吉字节"} - other{"{0}吉字节"} - } - kilobit{ - dnam{"千比特"} - other{"{0}千比特"} - } - kilobyte{ - dnam{"千字节"} - other{"{0}千字节"} - } - megabit{ - dnam{"兆比特"} - other{"{0}兆比特"} - } - megabyte{ - dnam{"兆字节"} - other{"{0}兆字节"} + dnam{"B"} + other{"{0} B"} } petabyte{ dnam{"PB"} other{"{0} PB"} } - terabit{ - dnam{"太比特"} - other{"{0}太比特"} - } - terabyte{ - dnam{"太字节"} - other{"{0}太字节"} - } } duration{ century{ @@ -1423,20 +1379,13 @@ zh{ } electric{ ampere{ - dnam{"安培"} - other{"{0}安"} - } - milliampere{ - dnam{"毫安"} - other{"{0}毫安"} + dnam{"A"} } ohm{ - dnam{"欧姆"} - other{"{0}欧"} + dnam{"Ω"} } volt{ - dnam{"伏特"} - other{"{0}伏"} + dnam{"V"} } } energy{ @@ -1482,28 +1431,6 @@ zh{ dnam{"牛"} other{"{0}牛"} } - pound-force{ - dnam{"磅力"} - other{"{0}磅力"} - } - } - frequency{ - gigahertz{ - dnam{"吉赫"} - other{"{0}吉赫"} - } - hertz{ - dnam{"赫兹"} - other{"{0}赫"} - } - kilohertz{ - dnam{"千赫"} - other{"{0}千赫"} - } - megahertz{ - dnam{"兆赫"} - other{"{0}兆赫"} - } } length{ astronomical-unit{ @@ -1596,76 +1523,13 @@ zh{ other{"{0}码"} } } - light{ - lux{ - dnam{"勒克斯"} - other{"{0}勒克斯"} - } - solar-luminosity{ - dnam{"太阳光度"} - other{"{0}太阳光度"} - } - } mass{ - carat{ - dnam{"克拉"} - other{"{0}克拉"} - } - dalton{ - dnam{"道尔顿"} - other{"{0}道尔顿"} - } - earth-mass{ - dnam{"地球质量"} - other{"{0}地球质量"} + grain{ + dnam{"gr"} + other{"{0} gr"} } gram{ dnam{"克"} - other{"{0}克"} - per{"{0}/克"} - } - kilogram{ - dnam{"千克"} - other{"{0}千克"} - per{"{0}/千克"} - } - metric-ton{ - dnam{"公吨"} - other{"{0}公吨"} - } - microgram{ - dnam{"微克"} - other{"{0}微克"} - } - milligram{ - dnam{"毫克"} - other{"{0}毫克"} - } - ounce{ - dnam{"盎司"} - other{"{0}盎司"} - per{"{0}/盎司"} - } - ounce-troy{ - dnam{"金衡盎司"} - other{"{0}金衡盎司"} - } - pound{ - dnam{"磅"} - other{"{0}磅"} - per{"{0}/磅"} - } - solar-mass{ - dnam{"太阳质量"} - other{"{0}太阳质量"} - } - stone{ - dnam{"英石"} - other{"{0}英石"} - } - ton{ - dnam{"吨"} - other{"{0}吨"} } } power{ @@ -1695,72 +1559,16 @@ zh{ } } pressure{ - atmosphere{ - dnam{"大气压"} - other{"{0}个大气压"} - } - bar{ - dnam{"巴"} - other{"{0}巴"} - } - hectopascal{ - dnam{"百帕"} - other{"{0}百帕"} - } - inch-ofhg{ - dnam{"英寸汞柱"} - other{"{0}英寸汞柱"} - } - kilopascal{ - dnam{"千帕"} - other{"{0}千帕"} - } - megapascal{ - dnam{"兆帕"} - other{"{0}兆帕"} - } - millibar{ - dnam{"毫巴"} - other{"{0}毫巴"} - } millimeter-ofhg{ - dnam{"毫米汞柱"} - other{"{0}毫米汞柱"} - } - pascal{ - dnam{"帕"} - other{"{0}帕"} - } - pound-force-per-square-inch{ - dnam{"磅/平方英寸"} - other{"每平方英寸{0}磅"} - } - } - speed{ - kilometer-per-hour{ - dnam{"公里/小时"} - other{"每小时{0}公里"} - } - knot{ - dnam{"节"} - other{"{0}节"} - } - meter-per-second{ - dnam{"米/秒"} - other{"{0}米/秒"} - } - mile-per-hour{ - dnam{"英里/小时"} - other{"{0}英里/小时"} + dnam{"mmHg"} + other{"{0} mmHg"} } } temperature{ celsius{ - dnam{"摄氏度"} other{"{0}°C"} } fahrenheit{ - dnam{"华氏度"} other{"{0}°F"} } generic{ @@ -1768,7 +1576,6 @@ zh{ other{"{0}°"} } kelvin{ - dnam{"开"} other{"{0}K"} } } @@ -1777,10 +1584,6 @@ zh{ dnam{"牛米"} other{"{0}牛米"} } - pound-force-foot{ - dnam{"磅英尺"} - other{"{0}磅英尺"} - } } volume{ acre-foot{ @@ -1841,6 +1644,18 @@ zh{ dnam{"分升"} other{"{0}分升"} } + dessert-spoon{ + dnam{"甜点匙"} + other{"{0}甜点匙"} + } + dram{ + dnam{"液量打兰"} + other{"{0}液量打兰"} + } + drop{ + dnam{"滴"} + other{"{0}滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0}液盎司"} @@ -1863,6 +1678,10 @@ zh{ dnam{"公石"} other{"{0}公石"} } + jigger{ + dnam{"量杯"} + other{"{0}量杯"} + } liter{ dnam{"升"} other{"{0}升"} @@ -1876,6 +1695,10 @@ zh{ dnam{"毫升"} other{"{0}毫升"} } + pinch{ + dnam{"撮"} + other{"{0}撮"} + } pint{ dnam{"品脱"} other{"{0}品脱"} diff --git a/intl/icu/source/data/unit/zh_CN.txt b/intl/icu/source/data/unit/zh_CN.txt index c9151613a23b..0136d26fa140 100644 --- a/intl/icu/source/data/unit/zh_CN.txt +++ b/intl/icu/source/data/unit/zh_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_CN{ "%%ALIAS"{"zh_Hans_CN"} } diff --git a/intl/icu/source/data/unit/zh_HK.txt b/intl/icu/source/data/unit/zh_HK.txt index fe72a0ea43cd..c34c98fdd21b 100644 --- a/intl/icu/source/data/unit/zh_HK.txt +++ b/intl/icu/source/data/unit/zh_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_HK{ "%%ALIAS"{"zh_Hant_HK"} } diff --git a/intl/icu/source/data/unit/zh_Hans.txt b/intl/icu/source/data/unit/zh_Hans.txt index 72c418ec6990..58a5386534ef 100644 --- a/intl/icu/source/data/unit/zh_Hans.txt +++ b/intl/icu/source/data/unit/zh_Hans.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans{ - Version{"37"} } diff --git a/intl/icu/source/data/unit/zh_Hans_CN.txt b/intl/icu/source/data/unit/zh_Hans_CN.txt index 70a6a77b3aa7..333ba54a7fec 100644 --- a/intl/icu/source/data/unit/zh_Hans_CN.txt +++ b/intl/icu/source/data/unit/zh_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/zh_Hans_HK.txt b/intl/icu/source/data/unit/zh_Hans_HK.txt index 3ba9bf9d526d..b0e4b1afdd0a 100644 --- a/intl/icu/source/data/unit/zh_Hans_HK.txt +++ b/intl/icu/source/data/unit/zh_Hans_HK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_HK{ - Version{"37"} units{ compound{ per{"{0}/{1}"} diff --git a/intl/icu/source/data/unit/zh_Hans_MO.txt b/intl/icu/source/data/unit/zh_Hans_MO.txt index 594fb78212a0..6852b4ce8e42 100644 --- a/intl/icu/source/data/unit/zh_Hans_MO.txt +++ b/intl/icu/source/data/unit/zh_Hans_MO.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_MO{ - Version{"37"} units{ compound{ per{"{0}/{1}"} diff --git a/intl/icu/source/data/unit/zh_Hans_SG.txt b/intl/icu/source/data/unit/zh_Hans_SG.txt index 7e34b6f99db9..4dd0299519cc 100644 --- a/intl/icu/source/data/unit/zh_Hans_SG.txt +++ b/intl/icu/source/data/unit/zh_Hans_SG.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_SG{ - Version{"37"} units{ compound{ per{"{0}/{1}"} diff --git a/intl/icu/source/data/unit/zh_Hant.txt b/intl/icu/source/data/unit/zh_Hant.txt index c50931f730db..643257445110 100644 --- a/intl/icu/source/data/unit/zh_Hant.txt +++ b/intl/icu/source/data/unit/zh_Hant.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ %%Parent{"root"} - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -357,6 +357,10 @@ zh_Hant{ dnam{"公寸"} other{"{0} 公寸"} } + earth-radius{ + dnam{"地球半徑"} + other{"{0} 地球半徑"} + } fathom{ dnam{"英尋"} other{"{0} 英尋"} @@ -435,6 +439,14 @@ zh_Hant{ } } light{ + candela{ + dnam{"燭光"} + other{"{0} 燭光"} + } + lumen{ + dnam{"流明"} + other{"{0} 流明"} + } lux{ dnam{"勒克斯"} other{"{0} 勒克斯"} @@ -457,6 +469,9 @@ zh_Hant{ dnam{"地球質量"} other{"{0} 地球質量"} } + grain{ + dnam{"格林"} + } gram{ dnam{"克"} other{"{0} 克"} @@ -502,8 +517,8 @@ zh_Hant{ other{"{0} 英石"} } ton{ - dnam{"英噸"} - other{"{0} 英噸"} + dnam{"美噸"} + other{"{0} 美噸"} } } power{ @@ -679,6 +694,21 @@ zh_Hant{ dnam{"公合"} other{"{0} 公合"} } + dessert-spoon{ + dnam{"甜品匙"} + other{"{0} 甜品匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜品匙"} + other{"{0} 英制甜品匙"} + } + dram{ + dnam{"打蘭"} + other{"{0} 打蘭"} + } + drop{ + dnam{"滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0} 液盎司"} @@ -701,6 +731,10 @@ zh_Hant{ dnam{"公石"} other{"{0} 公石"} } + jigger{ + dnam{"量酒杯"} + other{"{0} 量酒杯"} + } liter{ dnam{"公升"} other{"{0} 公升"} @@ -714,6 +748,10 @@ zh_Hant{ dnam{"毫升"} other{"{0} 毫升"} } + pinch{ + dnam{"小撮"} + other{"{0} 小撮"} + } pint{ dnam{"品脫"} other{"{0} 品脫"} @@ -726,6 +764,10 @@ zh_Hant{ dnam{"夸脫"} other{"{0} 夸脫"} } + quart-imperial{ + dnam{"英制夸脫"} + other{"{0} 英制夸脫"} + } tablespoon{ dnam{"湯匙"} other{"{0} 湯匙"} @@ -1439,8 +1481,8 @@ zh_Hant{ other{"{0} 毫莫耳/公升"} } mole{ - dnam{"mol"} - other{"{0} mol"} + dnam{"莫耳"} + other{"{0} 莫耳"} } percent{ dnam{"百分比"} @@ -1607,16 +1649,16 @@ zh_Hant{ } energy{ british-thermal-unit{ - dnam{"Btu"} - other{"{0} Btu"} + dnam{"英熱單位"} + other{"{0} 英熱單位"} } calorie{ dnam{"卡路里"} other{"{0} 卡"} } electronvolt{ - dnam{"eV"} - other{"{0} eV"} + dnam{"電子伏特"} + other{"{0} 電子伏特"} } foodcalorie{ dnam{"大卡"} @@ -1686,7 +1728,7 @@ zh_Hant{ other{"{0} 公寸"} } fathom{ - dnam{"fm"} + dnam{"英尋"} other{"{0} 英尋"} } foot{ @@ -1759,6 +1801,14 @@ zh_Hant{ } } light{ + candela{ + dnam{"燭光"} + other{"{0} 燭光"} + } + lumen{ + dnam{"流明"} + other{"{0} 流明"} + } lux{ dnam{"勒克斯"} other{"{0} 勒克斯"} @@ -1774,12 +1824,16 @@ zh_Hant{ other{"{0} 克拉"} } dalton{ - dnam{"Da"} - other{"{0} Da"} + dnam{"達爾頓"} + other{"{0} 達爾頓"} } earth-mass{ - dnam{"M⊕"} - other{"{0} M⊕"} + dnam{"地球質量"} + other{"{0} 地球質量"} + } + grain{ + dnam{"格林"} + other{"{0} 格林"} } gram{ dnam{"克"} @@ -1818,16 +1872,16 @@ zh_Hant{ per{"{0}/磅"} } solar-mass{ - dnam{"M☉"} - other{"{0} M☉"} + dnam{"太陽質量"} + other{"{0} 太陽質量"} } stone{ - dnam{"st"} + dnam{"英石"} other{"{0} 英石"} } ton{ - dnam{"英噸"} - other{"{0} 英噸"} + dnam{"美噸"} + other{"{0} 美噸"} } } power{ @@ -1874,12 +1928,12 @@ zh_Hant{ other{"{0} 英寸汞柱"} } kilopascal{ - dnam{"kPa"} - other{"{0} kPa"} + dnam{"千帕"} + other{"{0} 千帕"} } megapascal{ - dnam{"MPa"} - other{"{0} MPa"} + dnam{"兆帕"} + other{"{0} 兆帕"} } millibar{ dnam{"毫巴"} @@ -1890,8 +1944,8 @@ zh_Hant{ other{"{0} 毫米汞柱"} } pascal{ - dnam{"Pa"} - other{"{0} Pa"} + dnam{"帕"} + other{"{0} 帕"} } pound-force-per-square-inch{ dnam{"磅力/平方英寸"} @@ -1930,18 +1984,18 @@ zh_Hant{ other{"{0}°"} } kelvin{ - dnam{"K"} - other{"{0} K"} + dnam{"克耳文"} + other{"{0} 克耳文"} } } torque{ newton-meter{ - dnam{"N⋅m"} - other{"{0} N⋅m"} + dnam{"牛頓米"} + other{"{0} 牛頓米"} } pound-force-foot{ - dnam{"lbf⋅ft"} - other{"{0} lbf⋅ft"} + dnam{"磅英尺"} + other{"{0} 磅英尺"} } } volume{ @@ -1954,7 +2008,7 @@ zh_Hant{ other{"{0} 桶"} } bushel{ - dnam{"bu"} + dnam{"蒲式耳"} other{"{0} 蒲式耳"} } centiliter{ @@ -2003,6 +2057,22 @@ zh_Hant{ dnam{"公合"} other{"{0} 公合"} } + dessert-spoon{ + dnam{"甜品匙"} + other{"{0} 甜品匙"} + } + dessert-spoon-imperial{ + dnam{"英制甜品匙"} + other{"{0} 英制甜品匙"} + } + dram{ + dnam{"打蘭"} + other{"{0} 打蘭"} + } + drop{ + dnam{"滴"} + other{"{0} 滴"} + } fluid-ounce{ dnam{"液盎司"} other{"{0} 液盎司"} @@ -2025,6 +2095,10 @@ zh_Hant{ dnam{"公石"} other{"{0} 公石"} } + jigger{ + dnam{"量酒杯"} + other{"{0} 量酒杯"} + } liter{ dnam{"公升"} other{"{0} 升"} @@ -2038,6 +2112,10 @@ zh_Hant{ dnam{"毫升"} other{"{0} 毫升"} } + pinch{ + dnam{"小撮"} + other{"{0} 小撮"} + } pint{ dnam{"品脫"} other{"{0} 品脫"} @@ -2050,6 +2128,10 @@ zh_Hant{ dnam{"夸脫"} other{"{0} 夸脫"} } + quart-imperial{ + dnam{"英制夸脫"} + other{"{0} 英制夸脫"} + } tablespoon{ dnam{"湯匙"} other{"{0} 湯匙"} diff --git a/intl/icu/source/data/unit/zh_Hant_HK.txt b/intl/icu/source/data/unit/zh_Hant_HK.txt index ae31d3a7277a..670bcf0adb89 100644 --- a/intl/icu/source/data/unit/zh_Hant_HK.txt +++ b/intl/icu/source/data/unit/zh_Hant_HK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_HK{ - Version{"37"} units{ acceleration{ meter-per-square-second{ @@ -53,9 +53,6 @@ zh_Hant_HK{ dnam{"每公升毫摩爾"} other{"每公升 {0} 毫摩爾"} } - permillion{ - other{"{0} ppm"} - } } consumption{ liter-per-100-kilometer{ @@ -174,11 +171,21 @@ zh_Hant_HK{ other{"{0} pt"} } } + light{ + candela{ + dnam{"坎德拉"} + other{"{0} 坎德拉"} + } + } mass{ dalton{ dnam{"道爾頓"} other{"{0} 道爾頓"} } + grain{ + dnam{"格令"} + other{"{0}格令"} + } gram{ per{"{0} 每克"} } @@ -748,7 +755,17 @@ zh_Hant_HK{ other{"{0} pt"} } } + light{ + candela{ + dnam{"坎德拉"} + other{"{0} 坎德拉"} + } + } mass{ + grain{ + dnam{"格令"} + other{"{0} 格令"} + } gram{ per{"{0} 每克"} } @@ -782,10 +799,6 @@ zh_Hant_HK{ dnam{"英吋汞柱"} other{"{0} 英吋汞柱"} } - pascal{ - dnam{"帕"} - other{"{0} 帕"} - } pound-force-per-square-inch{ dnam{"磅每平方吋"} other{"{0} 磅每平方吋"} diff --git a/intl/icu/source/data/unit/zh_Hant_MO.txt b/intl/icu/source/data/unit/zh_Hant_MO.txt index 670cffc3f25d..1f5fac879191 100644 --- a/intl/icu/source/data/unit/zh_Hant_MO.txt +++ b/intl/icu/source/data/unit/zh_Hant_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_MO{ %%Parent{"zh_Hant_HK"} - Version{"37"} } diff --git a/intl/icu/source/data/unit/zh_Hant_TW.txt b/intl/icu/source/data/unit/zh_Hant_TW.txt index b62ad6927771..b079f20e1385 100644 --- a/intl/icu/source/data/unit/zh_Hant_TW.txt +++ b/intl/icu/source/data/unit/zh_Hant_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/unit/zh_MO.txt b/intl/icu/source/data/unit/zh_MO.txt index 6565bf7c3fc3..c6b2148478d5 100644 --- a/intl/icu/source/data/unit/zh_MO.txt +++ b/intl/icu/source/data/unit/zh_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_MO{ "%%ALIAS"{"zh_Hant_MO"} } diff --git a/intl/icu/source/data/unit/zh_SG.txt b/intl/icu/source/data/unit/zh_SG.txt index bf277736bf8b..14136c339a80 100644 --- a/intl/icu/source/data/unit/zh_SG.txt +++ b/intl/icu/source/data/unit/zh_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_SG{ "%%ALIAS"{"zh_Hans_SG"} } diff --git a/intl/icu/source/data/unit/zh_TW.txt b/intl/icu/source/data/unit/zh_TW.txt index 9372c5067ad4..c54ccbfe8920 100644 --- a/intl/icu/source/data/unit/zh_TW.txt +++ b/intl/icu/source/data/unit/zh_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_TW{ "%%ALIAS"{"zh_Hant_TW"} } diff --git a/intl/icu/source/data/unit/zu.txt b/intl/icu/source/data/unit/zu.txt index cd65d28be93d..6bbca4c60f9a 100644 --- a/intl/icu/source/data/unit/zu.txt +++ b/intl/icu/source/data/unit/zu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zu{ - Version{"37"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -468,6 +468,14 @@ zu{ } } light{ + candela{ + one{"{0} cd"} + other{"{0} candela"} + } + lumen{ + one{"{0} i-lumen"} + other{"{0} lm"} + } lux{ dnam{"lux"} one{"{0} i-lux"} @@ -701,6 +709,14 @@ zu{ one{"{0} dL"} other{"{0} dL"} } + dessert-spoon{ + one{"{0} sipuni dessert"} + other{"{0} dstspn"} + } + dessert-spoon-imperial{ + one{"{0} Imp. isipuni dessert"} + other{"{0} dstspn Imp"} + } fluid-ounce{ dnam{"fl oz"} one{"{0} fl oz"} diff --git a/intl/icu/source/data/zone/LOCALE_DEPS.json b/intl/icu/source/data/zone/LOCALE_DEPS.json index 681e78cf5870..2508537d097a 100644 --- a/intl/icu/source/data/zone/LOCALE_DEPS.json +++ b/intl/icu/source/data/zone/LOCALE_DEPS.json @@ -1,8 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "37", + "cldrVersion": "38.1", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -33,7 +34,7 @@ "sh_YU": "sr_Latn_RS", "shi_MA": "shi_Tfng_MA", "sr_BA": "sr_Cyrl_BA", - "sr_CS": "sr_Cyrl_RS", + "sr_CS": "sr_RS", "sr_Cyrl_CS": "sr_Cyrl_RS", "sr_Cyrl_YU": "sr_Cyrl_RS", "sr_Latn_CS": "sr_Latn_RS", @@ -41,7 +42,7 @@ "sr_ME": "sr_Latn_ME", "sr_RS": "sr_Cyrl_RS", "sr_XK": "sr_Cyrl_XK", - "sr_YU": "sr_Cyrl_RS", + "sr_YU": "sr_RS", "su_ID": "su_Latn_ID", "tl": "fil", "tl_PH": "fil_PH", diff --git a/intl/icu/source/data/zone/af.txt b/intl/icu/source/data/zone/af.txt index 39a84346f640..5dddb69dcc29 100644 --- a/intl/icu/source/data/zone/af.txt +++ b/intl/icu/source/data/zone/af.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml af{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -730,7 +730,7 @@ af{ ec{"Hovd"} } "Asia:Irkutsk"{ - ec{"Irkutsk"} + ec{"Irkoetsk"} } "Asia:Jakarta"{ ec{"Djakarta"} @@ -1419,7 +1419,7 @@ af{ ls{"Bhoetan-tyd"} } "meta:Bolivia"{ - ls{"Bolivia-tyd"} + ls{"Bolivië-tyd"} } "meta:Brasilia"{ ld{"Brasilia-somertyd"} @@ -1560,7 +1560,7 @@ af{ ls{"Persiese Golf-standaardtyd"} } "meta:Guyana"{ - ls{"Guyana-tyd"} + ls{"Guiana-tyd"} } "meta:Hawaii_Aleutian"{ ld{"Hawaii-Aleoete-dagligtyd"} @@ -1601,9 +1601,9 @@ af{ ls{"Iran-standaardtyd"} } "meta:Irkutsk"{ - ld{"Irkutsk-somertyd"} - lg{"Irkutsk-tyd"} - ls{"Irkutsk-standaardtyd"} + ld{"Irkoetsk-somertyd"} + lg{"Irkoetsk-tyd"} + ls{"Irkoetsk-standaardtyd"} } "meta:Israel"{ ld{"Israel-dagligtyd"} diff --git a/intl/icu/source/data/zone/agq.txt b/intl/icu/source/data/zone/agq.txt index b54dffaac06d..a75f2528f564 100644 --- a/intl/icu/source/data/zone/agq.txt +++ b/intl/icu/source/data/zone/agq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml agq{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ak.txt b/intl/icu/source/data/zone/ak.txt index 5057e2a0be4b..9e5c5d1786b0 100644 --- a/intl/icu/source/data/zone/ak.txt +++ b/intl/icu/source/data/zone/ak.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ak{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/am.txt b/intl/icu/source/data/zone/am.txt index f29976f3f1ae..ab1b0c2bc5b9 100644 --- a/intl/icu/source/data/zone/am.txt +++ b/intl/icu/source/data/zone/am.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml am{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"አቢጃን"} diff --git a/intl/icu/source/data/zone/ar.txt b/intl/icu/source/data/zone/ar.txt index 09b69167bcdf..d1d9f5a1df39 100644 --- a/intl/icu/source/data/zone/ar.txt +++ b/intl/icu/source/data/zone/ar.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ar{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"أبيدجان"} @@ -646,7 +646,7 @@ ar{ ec{"ألماتي"} } "Asia:Amman"{ - ec{"عمان"} + ec{"عمّان"} } "Asia:Anadyr"{ ec{"أندير"} diff --git a/intl/icu/source/data/zone/ar_SA.txt b/intl/icu/source/data/zone/ar_SA.txt index d65944bd1360..a848e8bc9ce7 100644 --- a/intl/icu/source/data/zone/ar_SA.txt +++ b/intl/icu/source/data/zone/ar_SA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ars.txt b/intl/icu/source/data/zone/ars.txt index 1f49ca1608ea..92183f58d797 100644 --- a/intl/icu/source/data/zone/ars.txt +++ b/intl/icu/source/data/zone/ars.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ars{ "%%ALIAS"{"ar_SA"} } diff --git a/intl/icu/source/data/zone/as.txt b/intl/icu/source/data/zone/as.txt index ced8d9e1e08d..669ea51e7c1d 100644 --- a/intl/icu/source/data/zone/as.txt +++ b/intl/icu/source/data/zone/as.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml as{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"আবিডজান"} @@ -1705,9 +1705,9 @@ as{ ls{"নিয়ুৰ সময়"} } "meta:Norfolk"{ - ld{"ন’ৰফ’ক দ্বীপৰ সময় গ্ৰীষ্মকালীন সময়"} + ld{"ন’ৰফ’ক দ্বীপৰ গ্ৰীষ্মকালীন সময়"} lg{"ন’ৰফ’ক দ্বীপৰ সময়"} - ls{"ন’ৰফ’ক দ্বীপৰ মান সময়"} + ls{"ন’ৰফ’ক দ্বীপৰ মান্য সময়"} } "meta:Noronha"{ ld{"ফাৰ্নাণ্ডো ডে নোৰোন্‌হাৰ গ্ৰীষ্মকালীন সময়"} diff --git a/intl/icu/source/data/zone/asa.txt b/intl/icu/source/data/zone/asa.txt index 6a30986cbe23..5389fa3e3dc6 100644 --- a/intl/icu/source/data/zone/asa.txt +++ b/intl/icu/source/data/zone/asa.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml asa{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ast.txt b/intl/icu/source/data/zone/ast.txt index b60c2b633af7..297ec72b019b 100644 --- a/intl/icu/source/data/zone/ast.txt +++ b/intl/icu/source/data/zone/ast.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ast{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/az.txt b/intl/icu/source/data/zone/az.txt index 2df60c4bf2da..bd371ef5eb77 100644 --- a/intl/icu/source/data/zone/az.txt +++ b/intl/icu/source/data/zone/az.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abican"} diff --git a/intl/icu/source/data/zone/az_AZ.txt b/intl/icu/source/data/zone/az_AZ.txt index caf84c09534a..8932e86db2ee 100644 --- a/intl/icu/source/data/zone/az_AZ.txt +++ b/intl/icu/source/data/zone/az_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_AZ{ "%%ALIAS"{"az_Latn_AZ"} } diff --git a/intl/icu/source/data/zone/az_Cyrl.txt b/intl/icu/source/data/zone/az_Cyrl.txt index bd374aea67f7..f09e5a620607 100644 --- a/intl/icu/source/data/zone/az_Cyrl.txt +++ b/intl/icu/source/data/zone/az_Cyrl.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Cyrl{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/az_Latn.txt b/intl/icu/source/data/zone/az_Latn.txt index 6022c58dbe02..6464d2e841f3 100644 --- a/intl/icu/source/data/zone/az_Latn.txt +++ b/intl/icu/source/data/zone/az_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml az_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/az_Latn_AZ.txt b/intl/icu/source/data/zone/az_Latn_AZ.txt index 36c6e61ba045..3963c91e61c2 100644 --- a/intl/icu/source/data/zone/az_Latn_AZ.txt +++ b/intl/icu/source/data/zone/az_Latn_AZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/bas.txt b/intl/icu/source/data/zone/bas.txt index c1c65dd01bef..a18120afb8b9 100644 --- a/intl/icu/source/data/zone/bas.txt +++ b/intl/icu/source/data/zone/bas.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bas{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/be.txt b/intl/icu/source/data/zone/be.txt index 05b844e7e085..1b82e5ebcecc 100644 --- a/intl/icu/source/data/zone/be.txt +++ b/intl/icu/source/data/zone/be.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml be{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абіджан"} diff --git a/intl/icu/source/data/zone/bem.txt b/intl/icu/source/data/zone/bem.txt index 9b64218ac30a..c874e0ede7b3 100644 --- a/intl/icu/source/data/zone/bem.txt +++ b/intl/icu/source/data/zone/bem.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bem{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/bez.txt b/intl/icu/source/data/zone/bez.txt index c7543782ac81..0884fce79e7e 100644 --- a/intl/icu/source/data/zone/bez.txt +++ b/intl/icu/source/data/zone/bez.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bez{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/bg.txt b/intl/icu/source/data/zone/bg.txt index 80515d9d41f4..1de6de3cd9d4 100644 --- a/intl/icu/source/data/zone/bg.txt +++ b/intl/icu/source/data/zone/bg.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bg{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} @@ -958,7 +958,7 @@ bg{ ls{"Координирано универсално време"} } "Etc:Unknown"{ - ec{"неизвестен"} + ec{"неизвестен град"} } "Europe:Amsterdam"{ ec{"Амстердам"} @@ -1903,7 +1903,7 @@ bg{ gmtZeroFormat{"Гринуич"} hourFormat{"+HH:mm;-HH:mm"} regionFormat{"{0}"} - regionFormatDaylight{"{0}, лятно часово време"} + regionFormatDaylight{"{0} – лятно часово време"} regionFormatStandard{"{0} – стандартно време"} } } diff --git a/intl/icu/source/data/zone/bm.txt b/intl/icu/source/data/zone/bm.txt index 92cb478b8a09..94e42a41ef2a 100644 --- a/intl/icu/source/data/zone/bm.txt +++ b/intl/icu/source/data/zone/bm.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bm{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/bn.txt b/intl/icu/source/data/zone/bn.txt index 1229834d13f8..24fc8d389d3f 100644 --- a/intl/icu/source/data/zone/bn.txt +++ b/intl/icu/source/data/zone/bn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bn{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"আবিদজান"} @@ -1292,6 +1292,11 @@ bn{ "Pacific:Wallis"{ ec{"ওলিস"} } + "meta:Acre"{ + ld{"একর গ্রীষ্মকাল সময়"} + lg{"একর সময়"} + ls{"একর মানক সময়"} + } "meta:Afghanistan"{ ls{"আফগানিস্তান সময়"} } @@ -1500,7 +1505,7 @@ bn{ ls{"পূর্ব ইউরোপীয় মানক সময়"} } "meta:Europe_Further_Eastern"{ - ls{"অতিরিক্ত-পূর্ব ইউরোপীয় সময়"} + ls{"প্রান্তীয় পূর্ব ইউরোপীয় সময়"} } "meta:Europe_Western"{ ld{"পশ্চিম ইউরোপীয় গ্রীষ্মকালীন সময়"} diff --git a/intl/icu/source/data/zone/bo.txt b/intl/icu/source/data/zone/bo.txt index 83d5cc6e7c9a..422585187769 100644 --- a/intl/icu/source/data/zone/bo.txt +++ b/intl/icu/source/data/zone/bo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bo{ - Version{"37"} zoneStrings{ "Etc:Unknown"{ ec{"མ་རྟོགས་པ"} diff --git a/intl/icu/source/data/zone/br.txt b/intl/icu/source/data/zone/br.txt index b001c575039b..e571b9e77b4f 100644 --- a/intl/icu/source/data/zone/br.txt +++ b/intl/icu/source/data/zone/br.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml br{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1015,6 +1015,9 @@ br{ lg{"eur Europa ar Reter"} ls{"eur cʼhoañv Europa ar Reter"} } + "meta:Europe_Further_Eastern"{ + ls{"eur Kaliningrad"} + } "meta:Europe_Western"{ ld{"eur hañv Europa ar Cʼhornôg"} lg{"eur Europa ar Cʼhornôg"} @@ -1072,6 +1075,11 @@ br{ "meta:Guyana"{ ls{"eur Guyana"} } + "meta:Hawaii_Aleutian"{ + ld{"eur hañv Hawaii hag an Aleouted"} + lg{"eur Hawaii hag an Aleouted"} + ls{"eur cʼhoañv Hawaii hag an Aleouted"} + } "meta:Hong_Kong"{ ld{"eur hañv Hong Kong"} lg{"eur Hong Kong"} @@ -1148,6 +1156,11 @@ br{ "meta:Line_Islands"{ ls{"eur Line Islands"} } + "meta:Lord_Howe"{ + ld{"eur hañv Lord Howe"} + lg{"eur Lord Howe"} + ls{"eur cʼhoañv Lord Howe"} + } "meta:Macau"{ ld{"eur hañv Macau"} lg{"eur Macau"} @@ -1186,6 +1199,11 @@ br{ lg{"eur Gwalarn Mecʼhiko"} ls{"eur cʼhoañv Gwalarn Mecʼhiko"} } + "meta:Mexico_Pacific"{ + ld{"eur hañv an Habask mecʼhikan"} + lg{"eur an Habask mecʼhikan"} + ls{"eur cʼhoañv an Habask mecʼhikan"} + } "meta:Mongolia"{ ld{"eur hañv Ulaanbaatar"} lg{"eur Ulaanbaatar"} @@ -1233,6 +1251,9 @@ br{ lg{"eur Fernando de Noronha"} ls{"eur cʼhoañv Fernando de Noronha"} } + "meta:North_Mariana"{ + ls{"eur Mariana an Norzh"} + } "meta:Novosibirsk"{ ld{"eur hañv Novosibirsk"} lg{"eur Novosibirsk"} @@ -1280,6 +1301,9 @@ br{ "meta:Pitcairn"{ ls{"eur Pitcairn"} } + "meta:Ponape"{ + ls{"eur Pohnpei"} + } "meta:Pyongyang"{ ls{"eur Pʼyongyang"} } diff --git a/intl/icu/source/data/zone/brx.txt b/intl/icu/source/data/zone/brx.txt index 93836024f2ab..8f99fb6cd485 100644 --- a/intl/icu/source/data/zone/brx.txt +++ b/intl/icu/source/data/zone/brx.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml brx{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"अबिद्जान"} diff --git a/intl/icu/source/data/zone/bs.txt b/intl/icu/source/data/zone/bs.txt index cd97a5e867e1..7558b334a8df 100644 --- a/intl/icu/source/data/zone/bs.txt +++ b/intl/icu/source/data/zone/bs.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1513,11 +1513,17 @@ bs{ ld{"Centralnoevropsko ljetno vrijeme"} lg{"Centralnoevropsko vrijeme"} ls{"Centralnoevropsko standardno vrijeme"} + sd{"CEST"} + sg{"CET"} + ss{"CET"} } "meta:Europe_Eastern"{ ld{"Istočnoevropsko ljetno vrijeme"} lg{"Istočnoevropsko vrijeme"} ls{"Istočnoevropsko standardno vrijeme"} + sd{"EEST"} + sg{"EET"} + ss{"EET"} } "meta:Europe_Further_Eastern"{ ls{"Dalekoistočnoevropsko vrijeme"} @@ -1526,6 +1532,9 @@ bs{ ld{"Zapadnoevropsko ljetno vrijeme"} lg{"Zapadnoevropsko vrijeme"} ls{"Zapadnoevropsko standardno vrijeme"} + sd{"WEST"} + sg{"WET"} + ss{"WET"} } "meta:Falkland"{ ld{"Folklandsko ljetno vrijeme"} @@ -1545,6 +1554,7 @@ bs{ } "meta:GMT"{ ls{"Griničko vrijeme"} + ss{"GMT"} } "meta:Galapagos"{ ls{"Galapagosko vrijeme"} diff --git a/intl/icu/source/data/zone/bs_BA.txt b/intl/icu/source/data/zone/bs_BA.txt index e5e3a465740d..70619a1bff37 100644 --- a/intl/icu/source/data/zone/bs_BA.txt +++ b/intl/icu/source/data/zone/bs_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_BA{ "%%ALIAS"{"bs_Latn_BA"} } diff --git a/intl/icu/source/data/zone/bs_Cyrl.txt b/intl/icu/source/data/zone/bs_Cyrl.txt index 45ef56098c49..1363ea2a85cf 100644 --- a/intl/icu/source/data/zone/bs_Cyrl.txt +++ b/intl/icu/source/data/zone/bs_Cyrl.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Cyrl{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиџан"} diff --git a/intl/icu/source/data/zone/bs_Latn.txt b/intl/icu/source/data/zone/bs_Latn.txt index d1a6b5e7fa79..f2561126b44d 100644 --- a/intl/icu/source/data/zone/bs_Latn.txt +++ b/intl/icu/source/data/zone/bs_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml bs_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/bs_Latn_BA.txt b/intl/icu/source/data/zone/bs_Latn_BA.txt index 3ef1cc4058e9..04342dc0ad7c 100644 --- a/intl/icu/source/data/zone/bs_Latn_BA.txt +++ b/intl/icu/source/data/zone/bs_Latn_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ca.txt b/intl/icu/source/data/zone/ca.txt index cf2a07bbd6d7..74f978902903 100644 --- a/intl/icu/source/data/zone/ca.txt +++ b/intl/icu/source/data/zone/ca.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ca{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -868,7 +868,7 @@ ca{ ec{"Ulan Bator"} } "Asia:Urumqi"{ - ec{"Urumchi"} + ec{"Ürümchi"} } "Asia:Ust-Nera"{ ec{"Ust’-Nera"} @@ -1049,9 +1049,6 @@ ca{ "Europe:Malta"{ ec{"Malta"} } - "Europe:Mariehamn"{ - ec{"Maarianhamina"} - } "Europe:Minsk"{ ec{"Minsk"} } @@ -1092,7 +1089,7 @@ ca{ ec{"Saràtov"} } "Europe:Simferopol"{ - ec{"Simferopol"} + ec{"Simferòpol"} } "Europe:Skopje"{ ec{"Skopje"} @@ -1395,9 +1392,9 @@ ca{ ls{"Hora estàndard d’Austràlia Occidental"} } "meta:Azerbaijan"{ - ld{"Hora d’estiu d’Azerbaidjan"} - lg{"Hora d’Azerbaidjan"} - ls{"Hora estàndard d’Azerbaidjan"} + ld{"Hora d’estiu de l’Azerbaidjan"} + lg{"Hora de l’Azerbaidjan"} + ls{"Hora estàndard de l’Azerbaidjan"} } "meta:Azores"{ ld{"Hora d’estiu de les Açores"} @@ -1405,9 +1402,9 @@ ca{ ls{"Hora estàndard de les Açores"} } "meta:Bangladesh"{ - ld{"Hora d’estiu de Bangla Desh"} - lg{"Hora de Bangla Desh"} - ls{"Hora estàndard de Bangla Desh"} + ld{"Hora d’estiu de Bangladesh"} + lg{"Hora de Bangladesh"} + ls{"Hora estàndard de Bangladesh"} } "meta:Bhutan"{ ls{"Hora de Bhutan"} @@ -1429,7 +1426,7 @@ ca{ ls{"Hora estàndard de Cap Verd"} } "meta:Chamorro"{ - ls{"Hora de Chamorro"} + ls{"Hora estàndard de Chamorro"} } "meta:Chatham"{ ld{"Hora d’estiu de Chatham"} @@ -1561,7 +1558,7 @@ ca{ ls{"Hora estàndard de l’Oest de Groenlàndia"} } "meta:Gulf"{ - ls{"Hora del Golf"} + ls{"Hora estàndard del Golf"} } "meta:Guyana"{ ls{"Hora de Guyana"} @@ -1588,7 +1585,7 @@ ca{ ls{"Hora de l’oceà Índic"} } "meta:Indochina"{ - ls{"Hora d’Indoxina"} + ls{"Hora de l’Indoxina"} } "meta:Indonesia_Central"{ ls{"Hora central d’Indonèsia"} @@ -1600,9 +1597,9 @@ ca{ ls{"Hora de l’oest d’Indonèsia"} } "meta:Iran"{ - ld{"Hora d’estiu d’Iran"} - lg{"Hora d’Iran"} - ls{"Hora estàndard d’Iran"} + ld{"Hora d’estiu de l’Iran"} + lg{"Hora de l’Iran"} + ls{"Hora estàndard de l’Iran"} } "meta:Irkutsk"{ ld{"Hora d’estiu d’Irkutsk"} @@ -1776,9 +1773,9 @@ ca{ ls{"Hora estàndard del Perú"} } "meta:Philippines"{ - ld{"Hora d’estiu de Filipines"} - lg{"Hora de Filipines"} - ls{"Hora estàndard de Filipines"} + ld{"Hora d’estiu de les Filipines"} + lg{"Hora de les Filipines"} + ls{"Hora estàndard de les Filipines"} } "meta:Phoenix_Islands"{ ls{"Hora de les illes Phoenix"} @@ -1825,7 +1822,7 @@ ca{ ls{"Hora de Singapur"} } "meta:Solomon"{ - ls{"Hora de Salomó"} + ls{"Hora de les illes Salomó"} } "meta:South_Georgia"{ ls{"Hora de Geòrgia del Sud"} @@ -1898,7 +1895,7 @@ ca{ ls{"Hora de Vostok"} } "meta:Wake"{ - ls{"Hora de Wake"} + ls{"Hora de les illes Wake"} } "meta:Wallis"{ ls{"Hora de Wallis i Futuna"} diff --git a/intl/icu/source/data/zone/ccp.txt b/intl/icu/source/data/zone/ccp.txt index 3bcb5e4ed35c..55b9510fb458 100644 --- a/intl/icu/source/data/zone/ccp.txt +++ b/intl/icu/source/data/zone/ccp.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ccp{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"𑄃𑄝𑄨𑄘𑄴𑄎𑄚𑄴"} diff --git a/intl/icu/source/data/zone/ce.txt b/intl/icu/source/data/zone/ce.txt index 65d96244bf98..4a74c2902dec 100644 --- a/intl/icu/source/data/zone/ce.txt +++ b/intl/icu/source/data/zone/ce.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ce{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} diff --git a/intl/icu/source/data/zone/ceb.txt b/intl/icu/source/data/zone/ceb.txt index 880c9a481eeb..64ea9e5bb8c4 100644 --- a/intl/icu/source/data/zone/ceb.txt +++ b/intl/icu/source/data/zone/ceb.txt @@ -1,8 +1,11 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ceb{ - Version{"37"} zoneStrings{ + "Asia:Saigon"{ + ec{"Siyudad sa Ho Chi Minh"} + } "Etc:UTC"{ ls{"Gikoordinar nga Kinatibuk-ang Oras"} } @@ -68,7 +71,7 @@ ceb{ ls{"Tamdanang Oras sa Apia"} } "meta:Arabian"{ - ld{"Oras sa Adlawan sa Arabia"} + ld{"Oras sa Tag-init sa Arabia"} lg{"Oras sa Arabia"} ls{"Tamdanang Oras sa Arabia"} } @@ -160,9 +163,9 @@ ceb{ ls{"Tamdanang Oras sa Chile"} } "meta:China"{ - ld{"Oras sa Adlawan sa China"} - lg{"Oras sa China"} - ls{"Tamdanang Oras sa China"} + ld{"Oras sa Tag-init sa Tsina"} + lg{"Oras sa Tsina"} + ls{"Tamdanang Oras sa Tsina"} } "meta:Choibalsan"{ ld{"Oras sa Tag-init sa Choibalsan"} @@ -308,7 +311,7 @@ ceb{ ls{"Oras sa Western Indonesia"} } "meta:Iran"{ - ld{"Oras sa Adlawan sa Iran"} + ld{"Oras sa Tag-init sa Iran"} lg{"Oras sa Iran"} ls{"Tamdanang Oras sa Iran"} } @@ -318,7 +321,7 @@ ceb{ ls{"Tamdanang Oras sa Irkutsk"} } "meta:Israel"{ - ld{"Oras sa Adlawan sa Israel"} + ld{"Oras sa Tag-init sa Israel"} lg{"Oras sa Israel"} ls{"Tamdanang Oras sa Israel"} } @@ -334,7 +337,7 @@ ceb{ ls{"Oras sa West Kazakhstan"} } "meta:Korea"{ - ld{"Oras sa Adlawan sa Korea"} + ld{"Oras sa Tag-init sa Korea"} lg{"Oras sa Korea"} ls{"Tamdanang Oras sa Korea"} } @@ -533,7 +536,7 @@ ceb{ ls{"Oras sa Tahiti"} } "meta:Taipei"{ - ld{"Oras sa Adlawan sa Taipei"} + ld{"Oras sa Tag-init sa Taipei"} lg{"Oras sa Taipei"} ls{"Tamdanang Oras sa Taipei"} } diff --git a/intl/icu/source/data/zone/cgg.txt b/intl/icu/source/data/zone/cgg.txt index 25daf6b28b8b..61aa5e5b3a65 100644 --- a/intl/icu/source/data/zone/cgg.txt +++ b/intl/icu/source/data/zone/cgg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cgg{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/chr.txt b/intl/icu/source/data/zone/chr.txt index b5e0e468e8f2..a905054b3a94 100644 --- a/intl/icu/source/data/zone/chr.txt +++ b/intl/icu/source/data/zone/chr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml chr{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ᎠᏈᏣᏂ"} diff --git a/intl/icu/source/data/zone/ckb.txt b/intl/icu/source/data/zone/ckb.txt index 8400cf4cd20e..ddfecf28d140 100644 --- a/intl/icu/source/data/zone/ckb.txt +++ b/intl/icu/source/data/zone/ckb.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ckb{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/cs.txt b/intl/icu/source/data/zone/cs.txt index 6ca4db764a59..25e4f6397a3e 100644 --- a/intl/icu/source/data/zone/cs.txt +++ b/intl/icu/source/data/zone/cs.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cs{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžan"} diff --git a/intl/icu/source/data/zone/cy.txt b/intl/icu/source/data/zone/cy.txt index cc2e6f478ecd..a407baf3a102 100644 --- a/intl/icu/source/data/zone/cy.txt +++ b/intl/icu/source/data/zone/cy.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml cy{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -547,7 +547,7 @@ cy{ ec{"Sitka"} } "America:St_Barthelemy"{ - ec{"St. Barthelemy"} + ec{"St. Barthélemy"} } "America:St_Johns"{ ec{"St. John’s"} @@ -1052,9 +1052,6 @@ cy{ "Europe:Monaco"{ ec{"Monaco"} } - "Europe:Moscow"{ - ec{"Moscfa"} - } "Europe:Oslo"{ ec{"Oslo"} } @@ -1399,7 +1396,7 @@ cy{ ls{"Amser Bhutan"} } "meta:Bolivia"{ - ls{"Amser Bolivia"} + ls{"Amser Bolifia"} } "meta:Brasilia"{ ld{"Amser Haf Brasília"} @@ -1454,9 +1451,9 @@ cy{ ls{"Amser Safonol Ynysoedd Cook"} } "meta:Cuba"{ - ld{"Amser Haf Cuba"} - lg{"Amser Cuba"} - ls{"Amser Safonol Cuba"} + ld{"Amser Haf Ciwa"} + lg{"Amser Ciwba"} + ls{"Amser Safonol Ciwba"} } "meta:Davis"{ ls{"Amser Davis"} @@ -1601,9 +1598,9 @@ cy{ ls{"Amser Safonol Israel"} } "meta:Japan"{ - ld{"Amser Haf Siapan"} - lg{"Amser Siapan"} - ls{"Amser Safonol Siapan"} + ld{"Amser Haf Japan"} + lg{"Amser Japan"} + ls{"Amser Safonol Japan"} } "meta:Kazakhstan_Eastern"{ ls{"Amser Dwyrain Kazakhstan"} diff --git a/intl/icu/source/data/zone/da.txt b/intl/icu/source/data/zone/da.txt index ec3656194e2f..5d3852624d50 100644 --- a/intl/icu/source/data/zone/da.txt +++ b/intl/icu/source/data/zone/da.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml da{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/dav.txt b/intl/icu/source/data/zone/dav.txt index 6894cef6142e..d2d0189009ea 100644 --- a/intl/icu/source/data/zone/dav.txt +++ b/intl/icu/source/data/zone/dav.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dav{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/de.txt b/intl/icu/source/data/zone/de.txt index f6ec00ed36b6..ca6ec515b808 100644 --- a/intl/icu/source/data/zone/de.txt +++ b/intl/icu/source/data/zone/de.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1553,7 +1553,7 @@ de{ ls{"Französisch-Guayana-Zeit"} } "meta:French_Southern"{ - ls{"Französische Süd- und Antarktisgebiete-Zeit"} + ls{"Französische-Süd-und-Antarktisgebiete-Zeit"} } "meta:GMT"{ ls{"Mittlere Greenwich-Zeit"} @@ -1607,10 +1607,10 @@ de{ ls{"Chowd-Normalzeit"} } "meta:India"{ - ls{"Indische Zeit"} + ls{"Indische Normalzeit"} } "meta:Indian_Ocean"{ - ls{"Indischer Ozean-Zeit"} + ls{"Indischer-Ozean-Zeit"} } "meta:Indochina"{ ls{"Indochina-Zeit"} @@ -1768,9 +1768,9 @@ de{ ls{"Norfolkinsel-Normalzeit"} } "meta:Noronha"{ - ld{"Fernando de Noronha-Sommerzeit"} - lg{"Fernando de Noronha-Zeit"} - ls{"Fernando de Noronha-Normalzeit"} + ld{"Fernando-de-Noronha-Sommerzeit"} + lg{"Fernando-de-Noronha-Zeit"} + ls{"Fernando-de-Noronha-Normalzeit"} } "meta:North_Mariana"{ ls{"Nördliche-Marianen-Zeit"} @@ -1781,9 +1781,9 @@ de{ ls{"Nowosibirsk-Normalzeit"} } "meta:Omsk"{ - ld{"Omsk-Sommerzeit"} - lg{"Omsk-Zeit"} - ls{"Omsk-Normalzeit"} + ld{"Omsker Sommerzeit"} + lg{"Omsker Zeit"} + ls{"Omsker Normalzeit"} } "meta:Pakistan"{ ld{"Pakistanische Sommerzeit"} @@ -1858,7 +1858,7 @@ de{ ls{"Seychellen-Zeit"} } "meta:Singapore"{ - ls{"Singapur-Zeit"} + ls{"Singapurische Normalzeit"} } "meta:Solomon"{ ls{"Salomonen-Zeit"} @@ -1940,9 +1940,9 @@ de{ ls{"Wallis-und-Futuna-Zeit"} } "meta:Yakutsk"{ - ld{"Jakutsk-Sommerzeit"} - lg{"Jakutsk-Zeit"} - ls{"Jakutsk-Normalzeit"} + ld{"Jakutsker Sommerzeit"} + lg{"Jakutsker Zeit"} + ls{"Jakutsker Normalzeit"} } "meta:Yekaterinburg"{ ld{"Jekaterinburg-Sommerzeit"} diff --git a/intl/icu/source/data/zone/de_CH.txt b/intl/icu/source/data/zone/de_CH.txt index f8b1eef090e9..885bf60107e8 100644 --- a/intl/icu/source/data/zone/de_CH.txt +++ b/intl/icu/source/data/zone/de_CH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml de_CH{ - Version{"37"} zoneStrings{ "Asia:Brunei"{ ec{"Brunei"} diff --git a/intl/icu/source/data/zone/dje.txt b/intl/icu/source/data/zone/dje.txt index 63575f595a17..acff366bc42b 100644 --- a/intl/icu/source/data/zone/dje.txt +++ b/intl/icu/source/data/zone/dje.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dje{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/doi.txt b/intl/icu/source/data/zone/doi.txt new file mode 100644 index 000000000000..e45c5d284bfe --- /dev/null +++ b/intl/icu/source/data/zone/doi.txt @@ -0,0 +1,69 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +doi{ + zoneStrings{ + "Etc:UTC"{ + ls{"तालमेली आलमी समां"} + } + "Etc:Unknown"{ + ec{"अनजांता शैह्‌र"} + } + "Europe:Dublin"{ + ld{"आयरिश मानक समां"} + } + "Europe:London"{ + ld{"ब्रिटिश गर्मियें दा समां"} + } + "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:Atlantic"{ + ld{"अटलांटिक डेलाइट समां"} + lg{"अटलांटिक समां"} + ls{"अटलांटिक मानक समां"} + } + "meta:Europe_Central"{ + ld{"केंदरी यूरोपी गर्मियें दा समां"} + lg{"केंदरी यूरोपी समां"} + ls{"केंदरी यूरोपी मानक समां"} + } + "meta:Europe_Eastern"{ + ld{"उत्तरी यूरोपी गर्मियें दा समां"} + lg{"उत्तरी यूरोपी समां"} + ls{"उत्तरी यूरोपी मानक समां"} + } + "meta:Europe_Western"{ + ld{"पच्छमी यूरोपी गर्मियें दा समां"} + lg{"पच्छमी यूरोपी समां"} + ls{"पच्छमी यूरोपी मानक समां"} + } + "meta:GMT"{ + ls{"ग्रीनविच मीन टाइम"} + } + fallbackFormat{"{1} ({0})"} + gmtFormat{"GMT{0}"} + gmtZeroFormat{"GMT"} + hourFormat{"+HH:mm;-HH:mm"} + regionFormat{"{0} समां"} + regionFormatDaylight{"{0} डेलाइट समां"} + regionFormatStandard{"{0} मानक समां"} + } +} diff --git a/intl/icu/source/data/zone/dsb.txt b/intl/icu/source/data/zone/dsb.txt index 91f39ef359aa..b64eab128b04 100644 --- a/intl/icu/source/data/zone/dsb.txt +++ b/intl/icu/source/data/zone/dsb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dsb{ - Version{"37"} zoneStrings{ "Africa:Accra"{ ec{"Akkra"} diff --git a/intl/icu/source/data/zone/dua.txt b/intl/icu/source/data/zone/dua.txt index ba39bd9e0a5c..bf646aae9786 100644 --- a/intl/icu/source/data/zone/dua.txt +++ b/intl/icu/source/data/zone/dua.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dua{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/dyo.txt b/intl/icu/source/data/zone/dyo.txt index d9da7c43092b..5fbeb3b29df0 100644 --- a/intl/icu/source/data/zone/dyo.txt +++ b/intl/icu/source/data/zone/dyo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dyo{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/dz.txt b/intl/icu/source/data/zone/dz.txt index 4c36f4a5924e..6b5e4cb46459 100644 --- a/intl/icu/source/data/zone/dz.txt +++ b/intl/icu/source/data/zone/dz.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml dz{ - Version{"37"} zoneStrings{ "Africa:Cairo"{ ec{"ཀཱའི་རོ"} diff --git a/intl/icu/source/data/zone/ebu.txt b/intl/icu/source/data/zone/ebu.txt index bfefc7921072..510053d4dfee 100644 --- a/intl/icu/source/data/zone/ebu.txt +++ b/intl/icu/source/data/zone/ebu.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ebu{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ee.txt b/intl/icu/source/data/zone/ee.txt index 2f3793f645d4..b8ad9ed47076 100644 --- a/intl/icu/source/data/zone/ee.txt +++ b/intl/icu/source/data/zone/ee.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ee{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/el.txt b/intl/icu/source/data/zone/el.txt index e1b8b7d67031..ce84a4caf352 100644 --- a/intl/icu/source/data/zone/el.txt +++ b/intl/icu/source/data/zone/el.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml el{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Αμπιτζάν"} diff --git a/intl/icu/source/data/zone/en.txt b/intl/icu/source/data/zone/en.txt index 8ee8d1ba1808..3aef6addf850 100644 --- a/intl/icu/source/data/zone/en.txt +++ b/intl/icu/source/data/zone/en.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ - Version{"37"} zoneStrings{ "Africa:Sao_Tome"{ ec{"São Tomé"} diff --git a/intl/icu/source/data/zone/en_001.txt b/intl/icu/source/data/zone/en_001.txt index 0271d609479f..351504a98e48 100644 --- a/intl/icu/source/data/zone/en_001.txt +++ b/intl/icu/source/data/zone/en_001.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_001{ - Version{"37"} zoneStrings{ "America:St_Barthelemy"{ ec{"St Barthélemy"} @@ -21,6 +21,9 @@ en_001{ "America:St_Vincent"{ ec{"St Vincent"} } + "Asia:Aqtau"{ + ec{"Aktau"} + } "Atlantic:St_Helena"{ ec{"St Helena"} } diff --git a/intl/icu/source/data/zone/en_150.txt b/intl/icu/source/data/zone/en_150.txt index cc273ad52278..e6dd944c5264 100644 --- a/intl/icu/source/data/zone/en_150.txt +++ b/intl/icu/source/data/zone/en_150.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_150{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Europe_Central"{ sd{"CEST"} diff --git a/intl/icu/source/data/zone/en_AE.txt b/intl/icu/source/data/zone/en_AE.txt index 042856ed7180..dfe479693ee8 100644 --- a/intl/icu/source/data/zone/en_AE.txt +++ b/intl/icu/source/data/zone/en_AE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AE{ - Version{"37"} zoneStrings{ "Pacific:Honolulu"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/en_AG.txt b/intl/icu/source/data/zone/en_AG.txt index 15f4f3b2f146..95a979e89b03 100644 --- a/intl/icu/source/data/zone/en_AG.txt +++ b/intl/icu/source/data/zone/en_AG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_AI.txt b/intl/icu/source/data/zone/en_AI.txt index ec4deb24332a..e1cf7517e8af 100644 --- a/intl/icu/source/data/zone/en_AI.txt +++ b/intl/icu/source/data/zone/en_AI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_AT.txt b/intl/icu/source/data/zone/en_AT.txt index e4a6465fadcf..075c742b8e80 100644 --- a/intl/icu/source/data/zone/en_AT.txt +++ b/intl/icu/source/data/zone/en_AT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AT{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_AU.txt b/intl/icu/source/data/zone/en_AU.txt index 64b0cfe3d8f8..3a12c4221c27 100644 --- a/intl/icu/source/data/zone/en_AU.txt +++ b/intl/icu/source/data/zone/en_AU.txt @@ -1,12 +1,9 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AU{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ - "Asia:Rangoon"{ - ec{"Rangoon"} - } "Pacific:Johnston"{ ec{"Johnston"} } diff --git a/intl/icu/source/data/zone/en_BB.txt b/intl/icu/source/data/zone/en_BB.txt index 814000f3539c..d62d19252e08 100644 --- a/intl/icu/source/data/zone/en_BB.txt +++ b/intl/icu/source/data/zone/en_BB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_BE.txt b/intl/icu/source/data/zone/en_BE.txt index ded640548a45..0e5fffa332ea 100644 --- a/intl/icu/source/data/zone/en_BE.txt +++ b/intl/icu/source/data/zone/en_BE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_BM.txt b/intl/icu/source/data/zone/en_BM.txt index 1f9a62c1ac63..d45a1f99e2f1 100644 --- a/intl/icu/source/data/zone/en_BM.txt +++ b/intl/icu/source/data/zone/en_BM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_BS.txt b/intl/icu/source/data/zone/en_BS.txt index 115d86885a11..fa71936df178 100644 --- a/intl/icu/source/data/zone/en_BS.txt +++ b/intl/icu/source/data/zone/en_BS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_BW.txt b/intl/icu/source/data/zone/en_BW.txt index b7792aa21d4a..83ede1ce684d 100644 --- a/intl/icu/source/data/zone/en_BW.txt +++ b/intl/icu/source/data/zone/en_BW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BW{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_BZ.txt b/intl/icu/source/data/zone/en_BZ.txt index 226183af7d00..fbf69779811b 100644 --- a/intl/icu/source/data/zone/en_BZ.txt +++ b/intl/icu/source/data/zone/en_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_BZ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_CA.txt b/intl/icu/source/data/zone/en_CA.txt index 86a4e3d50085..5e12327c66af 100644 --- a/intl/icu/source/data/zone/en_CA.txt +++ b/intl/icu/source/data/zone/en_CA.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CA{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "Asia:Rangoon"{ ec{"Rangoon"} diff --git a/intl/icu/source/data/zone/en_CC.txt b/intl/icu/source/data/zone/en_CC.txt index bce9886347ba..906cf1e9307e 100644 --- a/intl/icu/source/data/zone/en_CC.txt +++ b/intl/icu/source/data/zone/en_CC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_CH.txt b/intl/icu/source/data/zone/en_CH.txt index 244edf251572..23629216bb2e 100644 --- a/intl/icu/source/data/zone/en_CH.txt +++ b/intl/icu/source/data/zone/en_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CH{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_CK.txt b/intl/icu/source/data/zone/en_CK.txt index ad52b0e60e4d..dc1c0652a0aa 100644 --- a/intl/icu/source/data/zone/en_CK.txt +++ b/intl/icu/source/data/zone/en_CK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_CM.txt b/intl/icu/source/data/zone/en_CM.txt index 2604e7ff116e..a863994de31c 100644 --- a/intl/icu/source/data/zone/en_CM.txt +++ b/intl/icu/source/data/zone/en_CM.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CM{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_CX.txt b/intl/icu/source/data/zone/en_CX.txt index 702f22b69973..58ff41550186 100644 --- a/intl/icu/source/data/zone/en_CX.txt +++ b/intl/icu/source/data/zone/en_CX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_CY.txt b/intl/icu/source/data/zone/en_CY.txt index 21b11b75693b..d4e75c0ad7c6 100644 --- a/intl/icu/source/data/zone/en_CY.txt +++ b/intl/icu/source/data/zone/en_CY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_CY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_DE.txt b/intl/icu/source/data/zone/en_DE.txt index 262361402a19..0147e016a82c 100644 --- a/intl/icu/source/data/zone/en_DE.txt +++ b/intl/icu/source/data/zone/en_DE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_DG.txt b/intl/icu/source/data/zone/en_DG.txt index 95b8e88b2410..10bd8d9f5c7b 100644 --- a/intl/icu/source/data/zone/en_DG.txt +++ b/intl/icu/source/data/zone/en_DG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_DK.txt b/intl/icu/source/data/zone/en_DK.txt index d98349b1211f..d694bb01d391 100644 --- a/intl/icu/source/data/zone/en_DK.txt +++ b/intl/icu/source/data/zone/en_DK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DK{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_DM.txt b/intl/icu/source/data/zone/en_DM.txt index 5bfedb7bc574..224df76b66c2 100644 --- a/intl/icu/source/data/zone/en_DM.txt +++ b/intl/icu/source/data/zone/en_DM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_DM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_ER.txt b/intl/icu/source/data/zone/en_ER.txt index ea5b75fbeb87..b386ab145d31 100644 --- a/intl/icu/source/data/zone/en_ER.txt +++ b/intl/icu/source/data/zone/en_ER.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ER{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_FI.txt b/intl/icu/source/data/zone/en_FI.txt index ae4b5178a0fa..0b93a7e23208 100644 --- a/intl/icu/source/data/zone/en_FI.txt +++ b/intl/icu/source/data/zone/en_FI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_FJ.txt b/intl/icu/source/data/zone/en_FJ.txt index 0c4ca01ddb12..65b19ac752d1 100644 --- a/intl/icu/source/data/zone/en_FJ.txt +++ b/intl/icu/source/data/zone/en_FJ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FJ{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_FK.txt b/intl/icu/source/data/zone/en_FK.txt index 9c92bfddf150..1fca5161ce21 100644 --- a/intl/icu/source/data/zone/en_FK.txt +++ b/intl/icu/source/data/zone/en_FK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_FM.txt b/intl/icu/source/data/zone/en_FM.txt index 352f324e9718..ad38147c27bf 100644 --- a/intl/icu/source/data/zone/en_FM.txt +++ b/intl/icu/source/data/zone/en_FM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_FM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_GB.txt b/intl/icu/source/data/zone/en_GB.txt index cde195e8a2a7..f37c95f4ff47 100644 --- a/intl/icu/source/data/zone/en_GB.txt +++ b/intl/icu/source/data/zone/en_GB.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GB{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -613,9 +613,6 @@ en_GB{ "Asia:Anadyr"{ ec{"Anadyr"} } - "Asia:Aqtau"{ - ec{"Aqtau"} - } "Asia:Aqtobe"{ ec{"Aqtobe"} } diff --git a/intl/icu/source/data/zone/en_GD.txt b/intl/icu/source/data/zone/en_GD.txt index 98ca5e43fb1e..5aadd228902a 100644 --- a/intl/icu/source/data/zone/en_GD.txt +++ b/intl/icu/source/data/zone/en_GD.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GD{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_GG.txt b/intl/icu/source/data/zone/en_GG.txt index 8bee533ca6ed..6d63e5509c60 100644 --- a/intl/icu/source/data/zone/en_GG.txt +++ b/intl/icu/source/data/zone/en_GG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_GH.txt b/intl/icu/source/data/zone/en_GH.txt index f311ddc68042..99ba64853ef5 100644 --- a/intl/icu/source/data/zone/en_GH.txt +++ b/intl/icu/source/data/zone/en_GH.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GH{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_GI.txt b/intl/icu/source/data/zone/en_GI.txt index 5afa54f0b21a..809590db2c12 100644 --- a/intl/icu/source/data/zone/en_GI.txt +++ b/intl/icu/source/data/zone/en_GI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_GM.txt b/intl/icu/source/data/zone/en_GM.txt index 226ac2343489..67278f67e3cd 100644 --- a/intl/icu/source/data/zone/en_GM.txt +++ b/intl/icu/source/data/zone/en_GM.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GM{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_GU.txt b/intl/icu/source/data/zone/en_GU.txt index fa8f727bd882..df0b07523a1e 100644 --- a/intl/icu/source/data/zone/en_GU.txt +++ b/intl/icu/source/data/zone/en_GU.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GU{ - Version{"37"} zoneStrings{ "meta:Chamorro"{ ss{"ChST"} diff --git a/intl/icu/source/data/zone/en_GY.txt b/intl/icu/source/data/zone/en_GY.txt index 43ae552a673c..75974582bc97 100644 --- a/intl/icu/source/data/zone/en_GY.txt +++ b/intl/icu/source/data/zone/en_GY.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_GY{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Guyana"{ ss{"GYT"} diff --git a/intl/icu/source/data/zone/en_HK.txt b/intl/icu/source/data/zone/en_HK.txt index 1e3b1807555a..645bbe1ed40e 100644 --- a/intl/icu/source/data/zone/en_HK.txt +++ b/intl/icu/source/data/zone/en_HK.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_HK{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Hong_Kong"{ sd{"HKST"} diff --git a/intl/icu/source/data/zone/en_IE.txt b/intl/icu/source/data/zone/en_IE.txt index 1c12745f5645..1ab2d0db0bca 100644 --- a/intl/icu/source/data/zone/en_IE.txt +++ b/intl/icu/source/data/zone/en_IE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IE{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "Europe:Dublin"{ sd{"IST"} diff --git a/intl/icu/source/data/zone/en_IL.txt b/intl/icu/source/data/zone/en_IL.txt index 2d329190ae66..39fe76349fde 100644 --- a/intl/icu/source/data/zone/en_IL.txt +++ b/intl/icu/source/data/zone/en_IL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IL{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_IM.txt b/intl/icu/source/data/zone/en_IM.txt index 15a218b34593..d6e869d81edb 100644 --- a/intl/icu/source/data/zone/en_IM.txt +++ b/intl/icu/source/data/zone/en_IM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_IN.txt b/intl/icu/source/data/zone/en_IN.txt index c15c1cb46d00..1db9ea3227f9 100644 --- a/intl/icu/source/data/zone/en_IN.txt +++ b/intl/icu/source/data/zone/en_IN.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IN{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "Asia:Rangoon"{ ec{"Rangoon"} diff --git a/intl/icu/source/data/zone/en_IO.txt b/intl/icu/source/data/zone/en_IO.txt index 5cd721054613..5b70c5ab66ad 100644 --- a/intl/icu/source/data/zone/en_IO.txt +++ b/intl/icu/source/data/zone/en_IO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_IO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_JE.txt b/intl/icu/source/data/zone/en_JE.txt index d8e0823c1652..715ff18d66ba 100644 --- a/intl/icu/source/data/zone/en_JE.txt +++ b/intl/icu/source/data/zone/en_JE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JE{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_JM.txt b/intl/icu/source/data/zone/en_JM.txt index 695ae1a18125..08a51274d409 100644 --- a/intl/icu/source/data/zone/en_JM.txt +++ b/intl/icu/source/data/zone/en_JM.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_JM{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_KE.txt b/intl/icu/source/data/zone/en_KE.txt index d577a5e11abe..433cac2dedc6 100644 --- a/intl/icu/source/data/zone/en_KE.txt +++ b/intl/icu/source/data/zone/en_KE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KE{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_KI.txt b/intl/icu/source/data/zone/en_KI.txt index 6c68a9fa83d5..8cd023d08082 100644 --- a/intl/icu/source/data/zone/en_KI.txt +++ b/intl/icu/source/data/zone/en_KI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KI{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_KN.txt b/intl/icu/source/data/zone/en_KN.txt index 35ebc91eb17e..092c41e9eb64 100644 --- a/intl/icu/source/data/zone/en_KN.txt +++ b/intl/icu/source/data/zone/en_KN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_KY.txt b/intl/icu/source/data/zone/en_KY.txt index 71fa196b611a..a0c571e78e8b 100644 --- a/intl/icu/source/data/zone/en_KY.txt +++ b/intl/icu/source/data/zone/en_KY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_KY{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_LC.txt b/intl/icu/source/data/zone/en_LC.txt index 5e248adcff89..ce2445292795 100644 --- a/intl/icu/source/data/zone/en_LC.txt +++ b/intl/icu/source/data/zone/en_LC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_LR.txt b/intl/icu/source/data/zone/en_LR.txt index 4d85249dbd8f..348cd514ea5e 100644 --- a/intl/icu/source/data/zone/en_LR.txt +++ b/intl/icu/source/data/zone/en_LR.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LR{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_LS.txt b/intl/icu/source/data/zone/en_LS.txt index 3fc245318a8f..99c9dadf820f 100644 --- a/intl/icu/source/data/zone/en_LS.txt +++ b/intl/icu/source/data/zone/en_LS.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_LS{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_MG.txt b/intl/icu/source/data/zone/en_MG.txt index e9cf845557be..266fbf3ccaec 100644 --- a/intl/icu/source/data/zone/en_MG.txt +++ b/intl/icu/source/data/zone/en_MG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MG{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_MH.txt b/intl/icu/source/data/zone/en_MH.txt index 7a6e5410359b..64737ba0913a 100644 --- a/intl/icu/source/data/zone/en_MH.txt +++ b/intl/icu/source/data/zone/en_MH.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MH{ - Version{"37"} zoneStrings{ "Pacific:Honolulu"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/en_MO.txt b/intl/icu/source/data/zone/en_MO.txt index 2ab8b741a221..4541e006fc41 100644 --- a/intl/icu/source/data/zone/en_MO.txt +++ b/intl/icu/source/data/zone/en_MO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MO{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Hong_Kong"{ sd{"HKST"} diff --git a/intl/icu/source/data/zone/en_MP.txt b/intl/icu/source/data/zone/en_MP.txt index 0604749c2d19..1721cab98018 100644 --- a/intl/icu/source/data/zone/en_MP.txt +++ b/intl/icu/source/data/zone/en_MP.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MP{ - Version{"37"} zoneStrings{ "Pacific:Honolulu"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/en_MS.txt b/intl/icu/source/data/zone/en_MS.txt index fbedac5bdeff..e0028aa3cb1b 100644 --- a/intl/icu/source/data/zone/en_MS.txt +++ b/intl/icu/source/data/zone/en_MS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_MT.txt b/intl/icu/source/data/zone/en_MT.txt index a3af9271389a..a21782743294 100644 --- a/intl/icu/source/data/zone/en_MT.txt +++ b/intl/icu/source/data/zone/en_MT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_MU.txt b/intl/icu/source/data/zone/en_MU.txt index fde9ccfc275b..01c1b075eb22 100644 --- a/intl/icu/source/data/zone/en_MU.txt +++ b/intl/icu/source/data/zone/en_MU.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MU{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_MW.txt b/intl/icu/source/data/zone/en_MW.txt index 49e0438eb1c3..1bc72a6f2125 100644 --- a/intl/icu/source/data/zone/en_MW.txt +++ b/intl/icu/source/data/zone/en_MW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MW{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_MY.txt b/intl/icu/source/data/zone/en_MY.txt index 012e5ecf90b0..be50366e1378 100644 --- a/intl/icu/source/data/zone/en_MY.txt +++ b/intl/icu/source/data/zone/en_MY.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_MY{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Malaysia"{ ss{"MYT"} diff --git a/intl/icu/source/data/zone/en_NA.txt b/intl/icu/source/data/zone/en_NA.txt index f2771e30ce13..f414a0dfe043 100644 --- a/intl/icu/source/data/zone/en_NA.txt +++ b/intl/icu/source/data/zone/en_NA.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NA{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_NF.txt b/intl/icu/source/data/zone/en_NF.txt index e264ade967b9..514d0d9c3ea2 100644 --- a/intl/icu/source/data/zone/en_NF.txt +++ b/intl/icu/source/data/zone/en_NF.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NF{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_NG.txt b/intl/icu/source/data/zone/en_NG.txt index 15a8f0c31370..fbb72d7b11c5 100644 --- a/intl/icu/source/data/zone/en_NG.txt +++ b/intl/icu/source/data/zone/en_NG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NG{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_NH.txt b/intl/icu/source/data/zone/en_NH.txt index 958b96bdad8e..5dc995b2118b 100644 --- a/intl/icu/source/data/zone/en_NH.txt +++ b/intl/icu/source/data/zone/en_NH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NH{ "%%ALIAS"{"en_VU"} } diff --git a/intl/icu/source/data/zone/en_NL.txt b/intl/icu/source/data/zone/en_NL.txt index 5b5436b9dc60..0b352bd44db3 100644 --- a/intl/icu/source/data/zone/en_NL.txt +++ b/intl/icu/source/data/zone/en_NL.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NL{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_NR.txt b/intl/icu/source/data/zone/en_NR.txt index 4377e15a6568..89304ca9b0da 100644 --- a/intl/icu/source/data/zone/en_NR.txt +++ b/intl/icu/source/data/zone/en_NR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NR{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_NU.txt b/intl/icu/source/data/zone/en_NU.txt index 56d9b22ea29c..830320b281b0 100644 --- a/intl/icu/source/data/zone/en_NU.txt +++ b/intl/icu/source/data/zone/en_NU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_NZ.txt b/intl/icu/source/data/zone/en_NZ.txt index a1c15d5a89cc..367acf6631d1 100644 --- a/intl/icu/source/data/zone/en_NZ.txt +++ b/intl/icu/source/data/zone/en_NZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_NZ{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Australia_Central"{ sd{"ACDT"} diff --git a/intl/icu/source/data/zone/en_PG.txt b/intl/icu/source/data/zone/en_PG.txt index ffddbf48a87f..217c90f4dd6b 100644 --- a/intl/icu/source/data/zone/en_PG.txt +++ b/intl/icu/source/data/zone/en_PG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_PH.txt b/intl/icu/source/data/zone/en_PH.txt index 96578848ab80..1b59777cecbf 100644 --- a/intl/icu/source/data/zone/en_PH.txt +++ b/intl/icu/source/data/zone/en_PH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_PK.txt b/intl/icu/source/data/zone/en_PK.txt index 874a3eeda131..909315766bb5 100644 --- a/intl/icu/source/data/zone/en_PK.txt +++ b/intl/icu/source/data/zone/en_PK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_PN.txt b/intl/icu/source/data/zone/en_PN.txt index 7f93228000e3..975dcb4418f7 100644 --- a/intl/icu/source/data/zone/en_PN.txt +++ b/intl/icu/source/data/zone/en_PN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PN{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_PW.txt b/intl/icu/source/data/zone/en_PW.txt index ed60f26fed87..89ef3e6c9463 100644 --- a/intl/icu/source/data/zone/en_PW.txt +++ b/intl/icu/source/data/zone/en_PW.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_PW{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_RH.txt b/intl/icu/source/data/zone/en_RH.txt index b60f708fb284..24bad293f695 100644 --- a/intl/icu/source/data/zone/en_RH.txt +++ b/intl/icu/source/data/zone/en_RH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RH{ "%%ALIAS"{"en_ZW"} } diff --git a/intl/icu/source/data/zone/en_RW.txt b/intl/icu/source/data/zone/en_RW.txt index 6357e0ec3db9..f79bb4936324 100644 --- a/intl/icu/source/data/zone/en_RW.txt +++ b/intl/icu/source/data/zone/en_RW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_RW{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_SB.txt b/intl/icu/source/data/zone/en_SB.txt index 7e736c28dae8..99071572dc6c 100644 --- a/intl/icu/source/data/zone/en_SB.txt +++ b/intl/icu/source/data/zone/en_SB.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SB{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_SC.txt b/intl/icu/source/data/zone/en_SC.txt index df04930ee040..9d503c4f86b8 100644 --- a/intl/icu/source/data/zone/en_SC.txt +++ b/intl/icu/source/data/zone/en_SC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_SD.txt b/intl/icu/source/data/zone/en_SD.txt index c43e3d7174ca..700a5ba31ec6 100644 --- a/intl/icu/source/data/zone/en_SD.txt +++ b/intl/icu/source/data/zone/en_SD.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SD{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_SE.txt b/intl/icu/source/data/zone/en_SE.txt index c2a72c0820b6..ec7d34ecf478 100644 --- a/intl/icu/source/data/zone/en_SE.txt +++ b/intl/icu/source/data/zone/en_SE.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SE{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_SG.txt b/intl/icu/source/data/zone/en_SG.txt index fa15aad549ea..0c42cdd616f0 100644 --- a/intl/icu/source/data/zone/en_SG.txt +++ b/intl/icu/source/data/zone/en_SG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SG{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Malaysia"{ ss{"MYT"} diff --git a/intl/icu/source/data/zone/en_SH.txt b/intl/icu/source/data/zone/en_SH.txt index 0e6c3dc082d3..09e4765ae382 100644 --- a/intl/icu/source/data/zone/en_SH.txt +++ b/intl/icu/source/data/zone/en_SH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SH{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_SI.txt b/intl/icu/source/data/zone/en_SI.txt index a69030ee8795..6fb107aec3d0 100644 --- a/intl/icu/source/data/zone/en_SI.txt +++ b/intl/icu/source/data/zone/en_SI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SI{ %%Parent{"en_150"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_SL.txt b/intl/icu/source/data/zone/en_SL.txt index 162236d0abb4..62f2c532f7ee 100644 --- a/intl/icu/source/data/zone/en_SL.txt +++ b/intl/icu/source/data/zone/en_SL.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SL{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_SS.txt b/intl/icu/source/data/zone/en_SS.txt index 2363f4de1658..0d4cddeaacfd 100644 --- a/intl/icu/source/data/zone/en_SS.txt +++ b/intl/icu/source/data/zone/en_SS.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SS{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_SX.txt b/intl/icu/source/data/zone/en_SX.txt index 28da271484bb..11fa700ebcd0 100644 --- a/intl/icu/source/data/zone/en_SX.txt +++ b/intl/icu/source/data/zone/en_SX.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SX{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_SZ.txt b/intl/icu/source/data/zone/en_SZ.txt index b5cf4053541d..9c42b88b0c4f 100644 --- a/intl/icu/source/data/zone/en_SZ.txt +++ b/intl/icu/source/data/zone/en_SZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_SZ{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_TC.txt b/intl/icu/source/data/zone/en_TC.txt index 4129b99aedf9..181633bb547b 100644 --- a/intl/icu/source/data/zone/en_TC.txt +++ b/intl/icu/source/data/zone/en_TC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_TK.txt b/intl/icu/source/data/zone/en_TK.txt index 11010f35ad4c..e50d57245622 100644 --- a/intl/icu/source/data/zone/en_TK.txt +++ b/intl/icu/source/data/zone/en_TK.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TK{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_TO.txt b/intl/icu/source/data/zone/en_TO.txt index 6b63ad24fc11..d21d084e934f 100644 --- a/intl/icu/source/data/zone/en_TO.txt +++ b/intl/icu/source/data/zone/en_TO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TO{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_TT.txt b/intl/icu/source/data/zone/en_TT.txt index d91ebb5a6aa4..d375378a8bf3 100644 --- a/intl/icu/source/data/zone/en_TT.txt +++ b/intl/icu/source/data/zone/en_TT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TT{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_TV.txt b/intl/icu/source/data/zone/en_TV.txt index 2d0ae8f9f059..62477529f574 100644 --- a/intl/icu/source/data/zone/en_TV.txt +++ b/intl/icu/source/data/zone/en_TV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TV{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_TZ.txt b/intl/icu/source/data/zone/en_TZ.txt index 2f824e4caadc..0aa61d8b7b2c 100644 --- a/intl/icu/source/data/zone/en_TZ.txt +++ b/intl/icu/source/data/zone/en_TZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_TZ{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_UG.txt b/intl/icu/source/data/zone/en_UG.txt index 1ec09fa06b7d..68af9cdc5802 100644 --- a/intl/icu/source/data/zone/en_UG.txt +++ b/intl/icu/source/data/zone/en_UG.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_UG{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_VC.txt b/intl/icu/source/data/zone/en_VC.txt index 45b455da495d..a0187543234c 100644 --- a/intl/icu/source/data/zone/en_VC.txt +++ b/intl/icu/source/data/zone/en_VC.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VC{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_VG.txt b/intl/icu/source/data/zone/en_VG.txt index 3e84e3013cc5..1a001d05daa8 100644 --- a/intl/icu/source/data/zone/en_VG.txt +++ b/intl/icu/source/data/zone/en_VG.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VG{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_VU.txt b/intl/icu/source/data/zone/en_VU.txt index 6229365b1f91..91d6b819ccf7 100644 --- a/intl/icu/source/data/zone/en_VU.txt +++ b/intl/icu/source/data/zone/en_VU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_VU{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_WS.txt b/intl/icu/source/data/zone/en_WS.txt index 5d2f739b8e3e..f197bb1f1507 100644 --- a/intl/icu/source/data/zone/en_WS.txt +++ b/intl/icu/source/data/zone/en_WS.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_WS{ %%Parent{"en_001"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/en_ZA.txt b/intl/icu/source/data/zone/en_ZA.txt index 9e7646fa6a5b..98d330134e92 100644 --- a/intl/icu/source/data/zone/en_ZA.txt +++ b/intl/icu/source/data/zone/en_ZA.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZA{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_ZM.txt b/intl/icu/source/data/zone/en_ZM.txt index a3e802da4613..55759102b866 100644 --- a/intl/icu/source/data/zone/en_ZM.txt +++ b/intl/icu/source/data/zone/en_ZM.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZM{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/en_ZW.txt b/intl/icu/source/data/zone/en_ZW.txt index 93f56693d3a0..0b0016e44b69 100644 --- a/intl/icu/source/data/zone/en_ZW.txt +++ b/intl/icu/source/data/zone/en_ZW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_ZW{ %%Parent{"en_001"} - Version{"37"} zoneStrings{ "meta:Africa_Central"{ ss{"CAT"} diff --git a/intl/icu/source/data/zone/eo.txt b/intl/icu/source/data/zone/eo.txt index b190ca7bca94..ffc275e6ebbe 100644 --- a/intl/icu/source/data/zone/eo.txt +++ b/intl/icu/source/data/zone/eo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eo{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/es.txt b/intl/icu/source/data/zone/es.txt index 980630d4ab00..44fccc5d2005 100644 --- a/intl/icu/source/data/zone/es.txt +++ b/intl/icu/source/data/zone/es.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abiyán"} @@ -958,7 +958,7 @@ es{ ls{"tiempo universal coordinado"} } "Etc:Unknown"{ - ec{"ciudad desconocida"} + ec{"Ciudad desconocida"} } "Europe:Amsterdam"{ ec{"Ámsterdam"} @@ -1007,7 +1007,7 @@ es{ ec{"Gibraltar"} } "Europe:Guernsey"{ - ec{"Guernsey"} + ec{"Guernesey"} } "Europe:Helsinki"{ ec{"Helsinki"} diff --git a/intl/icu/source/data/zone/es_419.txt b/intl/icu/source/data/zone/es_419.txt index b4e95faf413e..1415ef299734 100644 --- a/intl/icu/source/data/zone/es_419.txt +++ b/intl/icu/source/data/zone/es_419.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_419{ - Version{"37"} zoneStrings{ "America:Fort_Nelson"{ ec{"Fuerte Nelson"} @@ -19,7 +19,10 @@ es_419{ ec{"Islas Canarias"} } "Etc:UTC"{ - ls{"Hora Universal Coordinada"} + ls{"hora universal coordinada"} + } + "Etc:Unknown"{ + ec{"ciudad desconocida"} } "Europe:Busingen"{ ec{"Büsingen"} @@ -27,6 +30,9 @@ es_419{ "Europe:Dublin"{ ld{"hora estándar de Irlanda"} } + "Europe:Guernsey"{ + ec{"Guernsey"} + } "Pacific:Wake"{ ec{"Isla Wake"} } diff --git a/intl/icu/source/data/zone/es_AR.txt b/intl/icu/source/data/zone/es_AR.txt index 52775effcf3c..ecb79bc4f5c9 100644 --- a/intl/icu/source/data/zone/es_AR.txt +++ b/intl/icu/source/data/zone/es_AR.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_AR{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Argentina"{ sd{"ARST"} diff --git a/intl/icu/source/data/zone/es_BO.txt b/intl/icu/source/data/zone/es_BO.txt index 41fd1c98f9b2..627a10cd47bb 100644 --- a/intl/icu/source/data/zone/es_BO.txt +++ b/intl/icu/source/data/zone/es_BO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BO{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Bolivia"{ ss{"BOT"} diff --git a/intl/icu/source/data/zone/es_BR.txt b/intl/icu/source/data/zone/es_BR.txt index a8d655c2c505..a18c09fbb9ad 100644 --- a/intl/icu/source/data/zone/es_BR.txt +++ b/intl/icu/source/data/zone/es_BR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_BZ.txt b/intl/icu/source/data/zone/es_BZ.txt index f7034128e3b6..471108e8d7a7 100644 --- a/intl/icu/source/data/zone/es_BZ.txt +++ b/intl/icu/source/data/zone/es_BZ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_BZ{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_CL.txt b/intl/icu/source/data/zone/es_CL.txt index 419e010f4850..41afb4859b13 100644 --- a/intl/icu/source/data/zone/es_CL.txt +++ b/intl/icu/source/data/zone/es_CL.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CL{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Chile"{ sd{"CLST"} diff --git a/intl/icu/source/data/zone/es_CO.txt b/intl/icu/source/data/zone/es_CO.txt index 6bbe0f364a82..7e861d8aa360 100644 --- a/intl/icu/source/data/zone/es_CO.txt +++ b/intl/icu/source/data/zone/es_CO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CO{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Colombia"{ sd{"COST"} diff --git a/intl/icu/source/data/zone/es_CR.txt b/intl/icu/source/data/zone/es_CR.txt index 209ac6c86245..6164236e1d3f 100644 --- a/intl/icu/source/data/zone/es_CR.txt +++ b/intl/icu/source/data/zone/es_CR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_CU.txt b/intl/icu/source/data/zone/es_CU.txt index a316a0d43e0b..1a3a70a76b8d 100644 --- a/intl/icu/source/data/zone/es_CU.txt +++ b/intl/icu/source/data/zone/es_CU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_CU{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_DO.txt b/intl/icu/source/data/zone/es_DO.txt index f1713d4264ad..b5f781004f55 100644 --- a/intl/icu/source/data/zone/es_DO.txt +++ b/intl/icu/source/data/zone/es_DO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_DO{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_EC.txt b/intl/icu/source/data/zone/es_EC.txt index 5aa7341c60fb..77c9040bbb4e 100644 --- a/intl/icu/source/data/zone/es_EC.txt +++ b/intl/icu/source/data/zone/es_EC.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_EC{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Ecuador"{ ss{"ECT"} diff --git a/intl/icu/source/data/zone/es_GT.txt b/intl/icu/source/data/zone/es_GT.txt index 3b1fecec3c79..76889af52738 100644 --- a/intl/icu/source/data/zone/es_GT.txt +++ b/intl/icu/source/data/zone/es_GT.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_GT{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_HN.txt b/intl/icu/source/data/zone/es_HN.txt index cd727c1cb014..4446521396e7 100644 --- a/intl/icu/source/data/zone/es_HN.txt +++ b/intl/icu/source/data/zone/es_HN.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_HN{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_MX.txt b/intl/icu/source/data/zone/es_MX.txt index 3f0c621fac40..715757d16f5c 100644 --- a/intl/icu/source/data/zone/es_MX.txt +++ b/intl/icu/source/data/zone/es_MX.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_MX{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "Africa:Bujumbura"{ ec{"Buyumbura"} @@ -34,9 +34,6 @@ es_MX{ "Asia:Atyrau"{ ec{"Atirau"} } - "Etc:UTC"{ - ls{"hora universal coordinada"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } @@ -85,22 +82,12 @@ es_MX{ "meta:Gilbert_Islands"{ ls{"hora de las Islas Gilbert"} } - "meta:Irkutsk"{ - ld{"hora de verano de Irkutsh"} - lg{"hora de Irkutsk"} - ls{"hora estándar de Irkutsh"} - } "meta:Macquarie"{ ls{"hora de la isla Macquarie"} } "meta:Marshall_Islands"{ ls{"hora de las Islas Marshall"} } - "meta:Norfolk"{ - ld{"hora de verano de la isla Norfolk"} - lg{"hora de la isla Norfolk"} - ls{"hora estándar de la isla Norfolk"} - } "meta:Pyongyang"{ ls{"hora de Pyongyang"} } diff --git a/intl/icu/source/data/zone/es_NI.txt b/intl/icu/source/data/zone/es_NI.txt index e711c11e2cbb..a58e4ec5bd74 100644 --- a/intl/icu/source/data/zone/es_NI.txt +++ b/intl/icu/source/data/zone/es_NI.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_NI{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_PA.txt b/intl/icu/source/data/zone/es_PA.txt index aa4811456c40..248e10036819 100644 --- a/intl/icu/source/data/zone/es_PA.txt +++ b/intl/icu/source/data/zone/es_PA.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PA{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_PE.txt b/intl/icu/source/data/zone/es_PE.txt index 5e74bb54254b..76fa3c1cb3fd 100644 --- a/intl/icu/source/data/zone/es_PE.txt +++ b/intl/icu/source/data/zone/es_PE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PE{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Peru"{ sd{"PEST"} diff --git a/intl/icu/source/data/zone/es_PR.txt b/intl/icu/source/data/zone/es_PR.txt index d5753dfdbc86..b7a1b11bb9b8 100644 --- a/intl/icu/source/data/zone/es_PR.txt +++ b/intl/icu/source/data/zone/es_PR.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PR{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_PY.txt b/intl/icu/source/data/zone/es_PY.txt index 69d004299e0f..5305115ad0e6 100644 --- a/intl/icu/source/data/zone/es_PY.txt +++ b/intl/icu/source/data/zone/es_PY.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_PY{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_SV.txt b/intl/icu/source/data/zone/es_SV.txt index 426c56d5b5f9..b4ed59588d5a 100644 --- a/intl/icu/source/data/zone/es_SV.txt +++ b/intl/icu/source/data/zone/es_SV.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_SV{ %%Parent{"es_419"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/es_US.txt b/intl/icu/source/data/zone/es_US.txt index 61349634302d..a446ed1cd4c2 100644 --- a/intl/icu/source/data/zone/es_US.txt +++ b/intl/icu/source/data/zone/es_US.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_US{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "America:Fort_Nelson"{ ec{"Fort Nelson"} @@ -10,24 +10,12 @@ es_US{ "America:Nassau"{ ec{"Nassau"} } - "America:Rio_Branco"{ - ec{"Rio Branco"} - } "America:St_Thomas"{ ec{"St. Thomas"} } - "Asia:Almaty"{ - ec{"Almatý"} - } - "Asia:Barnaul"{ - ec{"Barnaul"} - } "Asia:Pyongyang"{ ec{"Piongyang"} } - "Etc:UTC"{ - ls{"hora universal coordinada"} - } "Europe:Astrakhan"{ ec{"Astrakhan"} } @@ -87,9 +75,6 @@ es_US{ "meta:Chamorro"{ ls{"hora de Chamorro"} } - "meta:Christmas"{ - ls{"hora de la isla de Navidad"} - } "meta:Cocos"{ ls{"hora de las Islas Cocos"} } @@ -132,11 +117,6 @@ es_US{ "meta:Indian_Ocean"{ ls{"hora del Océano Índico"} } - "meta:Irkutsk"{ - ld{"hora de verano de Irkutsh"} - lg{"hora de Irkutsk"} - ls{"hora estándar de Irkutsh"} - } "meta:Macquarie"{ ls{"hora de la isla Macquarie"} } diff --git a/intl/icu/source/data/zone/es_UY.txt b/intl/icu/source/data/zone/es_UY.txt index ba7a664a63d3..535b375954b1 100644 --- a/intl/icu/source/data/zone/es_UY.txt +++ b/intl/icu/source/data/zone/es_UY.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_UY{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Uruguay"{ sd{"UYST"} diff --git a/intl/icu/source/data/zone/es_VE.txt b/intl/icu/source/data/zone/es_VE.txt index 738c1d637329..a1553f865f01 100644 --- a/intl/icu/source/data/zone/es_VE.txt +++ b/intl/icu/source/data/zone/es_VE.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml es_VE{ %%Parent{"es_419"} - Version{"37"} zoneStrings{ "meta:Venezuela"{ ss{"VET"} diff --git a/intl/icu/source/data/zone/et.txt b/intl/icu/source/data/zone/et.txt index b49e9657b741..c7c041190c45 100644 --- a/intl/icu/source/data/zone/et.txt +++ b/intl/icu/source/data/zone/et.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml et{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1754,9 +1754,9 @@ et{ ls{"Niue aeg"} } "meta:Norfolk"{ - ld{"Norfolki saarte suveaeg"} - lg{"Norfolki saarte aeg"} - ls{"Norfolki saarte standardaeg"} + ld{"Norfolki saare suveaeg"} + lg{"Norfolki saare aeg"} + ls{"Norfolki saare standardaeg"} } "meta:Noronha"{ ld{"Fernando de Noronha suveaeg"} diff --git a/intl/icu/source/data/zone/eu.txt b/intl/icu/source/data/zone/eu.txt index 0a962de4b0bf..e224440e074e 100644 --- a/intl/icu/source/data/zone/eu.txt +++ b/intl/icu/source/data/zone/eu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml eu{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -768,6 +768,9 @@ eu{ "Asia:Kuwait"{ ec{"Kuwait"} } + "Asia:Macau"{ + ec{"Macau"} + } "Asia:Magadan"{ ec{"Magadan"} } @@ -1729,7 +1732,7 @@ eu{ "meta:Norfolk"{ ld{"Norfolk uharteetako udako ordua"} lg{"Norfolk uharteetako ordua"} - ls{"Norfolk uharteetako ordua estandarra"} + ls{"Norfolk uharteetako ordu estandarra"} } "meta:Noronha"{ ld{"Fernando de Noronhako udako ordua"} diff --git a/intl/icu/source/data/zone/ewo.txt b/intl/icu/source/data/zone/ewo.txt index 9fd55df66cb8..c522c9411d8c 100644 --- a/intl/icu/source/data/zone/ewo.txt +++ b/intl/icu/source/data/zone/ewo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ewo{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/fa.txt b/intl/icu/source/data/zone/fa.txt index d90bf5c0d6b5..d97de9d4bf72 100644 --- a/intl/icu/source/data/zone/fa.txt +++ b/intl/icu/source/data/zone/fa.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fa{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"آبیجان"} diff --git a/intl/icu/source/data/zone/ff.txt b/intl/icu/source/data/zone/ff.txt index b51bbce2161b..91de86239878 100644 --- a/intl/icu/source/data/zone/ff.txt +++ b/intl/icu/source/data/zone/ff.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ff_Adlm.txt b/intl/icu/source/data/zone/ff_Adlm.txt index 846ffc4f2dee..06690f85f7d9 100644 --- a/intl/icu/source/data/zone/ff_Adlm.txt +++ b/intl/icu/source/data/zone/ff_Adlm.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Adlm{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"𞤀𞤦𞤭𞤶𞤢𞤲"} @@ -164,7 +164,7 @@ ff_Adlm{ ec{"𞤀𞤣𞤢𞤳"} } "America:Anchorage"{ - ec{"𞤀𞤲𞤳𞤮𞤪𞤢𞥄𞤶"} + ec{"𞤀𞤲𞤧𞤮𞤪𞤢𞥄𞤶𞤵"} } "America:Anguilla"{ ec{"𞤀𞤲𞤺𞤭𞤤𞤢𞥄"} @@ -197,7 +197,7 @@ ff_Adlm{ ec{"𞤓𞤧𞤱𞤢𞤭𞥅𞤶"} } "America:Aruba"{ - ec{"𞤀𞤪𞤵𞤦𞤢"} + ec{"𞤀𞤪𞤵𞥅𞤦𞤢"} } "America:Asuncion"{ ec{"𞤀𞤧𞤵𞤲𞤧𞤭𞤴𞤮𞤲"} @@ -206,19 +206,19 @@ ff_Adlm{ ec{"𞤄𞤢𞤸𞤭𞤴𞤢"} } "America:Bahia_Banderas"{ - ec{"𞤄𞤢𞤸𞤭𞤴𞤢𞥄 𞤣𞤫 𞤄𞤢𞤲𞤣𞤫𞤪𞤢𞥄𞤧"} + ec{"𞤄𞤢𞤸𞤭𞤴𞤢𞥄 𞤄𞤢𞤲𞤣𞤫𞤪𞤢𞥄𞤧"} } "America:Barbados"{ - ec{"𞤄𞤢𞤪𞤦𞤫𞤣𞤮𞥅𞤧"} + ec{"𞤄𞤢𞤪𞤦𞤢𞥄𞤣𞤮𞤧"} } "America:Belem"{ ec{"𞤄𞤫𞤤𞤫𞤥"} } "America:Belize"{ - ec{"𞤄𞤫𞤤𞤭𞥅𞤶"} + ec{"𞤄𞤫𞤤𞤭𞥅𞥁"} } "America:Blanc-Sablon"{ - ec{"𞤄𞤢𞤤𞤢𞤲𞤳-𞤅𞤢𞤦𞤢𞤤𞤮𞤲"} + ec{"𞤄𞤵𞤤𞤢𞤲 𞤅𞤢𞤦𞤵𞤤𞤮𞤲"} } "America:Boa_Vista"{ ec{"𞤄𞤮𞤱𞤢-𞤜𞤭𞤧𞤼𞤢"} @@ -227,13 +227,13 @@ ff_Adlm{ ec{"𞤄𞤮𞤺𞤮𞤼𞤢"} } "America:Boise"{ - ec{"𞤄𞤮𞤴𞤶𞤭𞥅"} + ec{"𞤄𞤮𞤴𞥁𞤭𞥅"} } "America:Buenos_Aires"{ ec{"𞤄𞤭𞤴𞤲𞤮𞤧-𞤉𞥅𞤶𞤫𞤪𞤫𞥅𞤧"} } "America:Cambridge_Bay"{ - ec{"𞤑𞤢𞤥𞤦𞤭𞤪𞤭𞥅𞤶-𞤄𞤫𞥅"} + ec{"𞤑𞤢𞤥𞤦𞤭𞤪𞤭𞥅𞤶 𞤄𞤫𞥅"} } "America:Campo_Grande"{ ec{"𞤑𞤢𞤥𞤨𞤮-𞤘𞤪𞤢𞤲𞤣𞤫"} @@ -251,22 +251,22 @@ ff_Adlm{ ec{"𞤑𞤢𞤴𞤫𞥅𞤲"} } "America:Cayman"{ - ec{"𞤑𞤫𞤴𞤥𞤢𞥄𞤲"} + ec{"𞤑𞤢𞤴𞤥𞤢𞥄𞤲"} } "America:Chicago"{ ec{"𞤕𞤭𞤳𞤢𞥄𞤺𞤮𞥅"} } "America:Chihuahua"{ - ec{"𞤕𞤭𞤱𞤢𞥄𞤱𞤢"} + ec{"𞤕𞤋𞤱𞤢𞥄𞤱𞤢𞥄"} } "America:Coral_Harbour"{ - ec{"𞤀𞤼𞤭𞤳𞤮𞤳𞤢𞤲"} + ec{"𞤀𞤼𞤭𞤳𞤮𞥅𞤳𞤢𞤲"} } "America:Cordoba"{ ec{"𞤑𞤮𞤪𞤣𞤮𞤦𞤢𞥄"} } "America:Costa_Rica"{ - ec{"𞤑𞤮𞤧𞤼𞤢-𞤈𞤭𞤳𞥆𞤢𞥄"} + ec{"𞤑𞤮𞤧𞤼𞤢 𞤈𞤭𞤳𞤢𞥄"} } "America:Creston"{ ec{"𞤑𞤪𞤫𞤧𞤼𞤮𞤲"} @@ -275,7 +275,7 @@ ff_Adlm{ ec{"𞤑𞤵𞤶𞤢𞤦𞤢𞥄"} } "America:Curacao"{ - ec{"𞤑𞤵𞤪𞤢𞤧𞤢𞥄𞤱"} + ec{"𞤑𞤵𞤪𞤢𞤧𞤢𞤱𞤮𞥅"} } "America:Danmarkshavn"{ ec{"𞤁𞤢𞥄𞤲𞤥𞤢𞤪𞤳𞥃𞤢𞥄𞤾𞤲"} @@ -704,7 +704,7 @@ ff_Adlm{ ec{"𞤁𞤢𞤳𞤢𞥄"} } "Asia:Dili"{ - ec{"𞤁𞤫𞤤𞤭"} + ec{"𞤁𞤫𞤤𞤭𞥅"} } "Asia:Dubai"{ ec{"𞤁𞤵𞤦𞤢𞤴"} @@ -722,7 +722,7 @@ ff_Adlm{ ec{"𞤝𞤭𞤤𞤢𞥄𞤤𞤵"} } "Asia:Hong_Kong"{ - ec{"𞤖𞤮𞤲𞤳𞤮𞤲"} + ec{"𞤖𞤮𞤲𞤺 𞤑𞤮𞤲𞤺"} } "Asia:Hovd"{ ec{"𞤖𞤮𞤬𞤣𞤵"} @@ -890,7 +890,7 @@ ff_Adlm{ ec{"𞤀𞥁𞤮𞤪𞤫𞥅𞤧"} } "Atlantic:Bermuda"{ - ec{"𞤄𞤢𞥄𞤪𞤥𞤵𞥅𞤣𞤢"} + ec{"𞤄𞤢𞤪𞤥𞤵𞥅𞤣𞤢"} } "Atlantic:Canary"{ ec{"𞤑𞤢𞤲𞤢𞤪𞤭"} @@ -950,10 +950,10 @@ ff_Adlm{ ec{"𞤆𞤫𞤪𞤧𞤭"} } "Australia:Sydney"{ - ec{"𞤅𞤭𞤣𞤭𞤲𞤫𞥅"} + ec{"𞤅𞤭𞤣𞤲𞤫𞥅"} } "Etc:UTC"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤏𞤭𞤲𞤣𞤫𞤪𞤫𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤊𞤮𞤼𞥆𞤢𞤲𞤢𞥄𞤲𞤣𞤫"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞤤𞥆𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤊𞤮𞤲𞤣𞤢𞥄𞤲𞤣𞤫"} } "Etc:Unknown"{ ec{"𞤅𞤢𞤸𞤪𞤫 𞤀𞤧-𞤢𞤲𞤣𞤢𞥄𞤲𞤣𞤫"} @@ -999,7 +999,7 @@ ff_Adlm{ } "Europe:Dublin"{ ec{"𞤁𞤵𞤦𞤵𞤤𞤫𞤲"} - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤪𞤤𞤢𞤲𞤣𞤭𞥅𞤳𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤪𞤤𞤢𞤲𞤣𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫"} } "Europe:Gibraltar"{ ec{"𞤔𞤭𞤦𞤢𞤪𞤢𞤤𞤼𞤢𞤪"} @@ -1174,7 +1174,7 @@ ff_Adlm{ ec{"𞤈𞤫𞥅𞤲𞤭𞤴𞤮𞤲"} } "Pacific:Apia"{ - ec{"𞤀𞤨𞤭𞤴𞤢"} + ec{"𞤀𞥄𞤨𞤭𞤴𞤢"} } "Pacific:Auckland"{ ec{"𞤌𞤳𞤤𞤢𞤲𞤣𞤭"} @@ -1198,10 +1198,10 @@ ff_Adlm{ ec{"𞤊𞤢𞤳𞤢𞤱𞤬𞤮"} } "Pacific:Fiji"{ - ec{"𞤊𞤭𞤶𞤭"} + ec{"𞤊𞤭𞤶𞤭𞥅"} } "Pacific:Funafuti"{ - ec{"𞤊𞤵𞤲𞤢𞤬𞤵𞤼𞤭"} + ec{"𞤊𞤵𞤲𞤢𞤬𞤵𞤼𞤭𞥅"} } "Pacific:Galapagos"{ ec{"𞤘𞤢𞤤𞤢𞤨𞤢𞤺𞤮𞤧"} @@ -1213,34 +1213,34 @@ ff_Adlm{ ec{"𞤘𞤵𞤱𞤢𞤣𞤢𞤤𞤳𞤢𞤲𞤢𞤤"} } "Pacific:Guam"{ - ec{"𞤘𞤵𞤱𞤢𞤥"} + ec{"𞤘𞤵𞤱𞤢𞥄𞤥"} } "Pacific:Johnston"{ - ec{"𞤔𞤮𞤲𞤧𞤵𞤼𞤮𞤲"} + ec{"𞤔𞤮𞤲𞤧𞤼𞤮𞤲"} } "Pacific:Kiritimati"{ ec{"𞤑𞤭𞤪𞤭𞤼𞤭𞤥𞤢𞤼𞤭"} } "Pacific:Kosrae"{ - ec{"𞤑𞤮𞤧𞤪𞤢𞤴"} + ec{"𞤑𞤮𞤧𞤪𞤫𞤴"} } "Pacific:Kwajalein"{ ec{"𞤑𞤢𞤱𞤢𞤶𞤢𞤤𞤭𞥅𞤲"} } "Pacific:Majuro"{ - ec{"𞤃𞤢𞤶𞤵𞥅𞤪𞤮"} + ec{"𞤃𞤢𞤶𞤵𞤪𞤮𞥅"} } "Pacific:Marquesas"{ - ec{"𞤃𞤢𞤪𞤳𞤫𞤧𞤢𞤧"} + ec{"𞤃𞤢𞤪𞤳𞤫𞤧𞤢𞥄𞤧"} } "Pacific:Midway"{ ec{"𞤃𞤭𞤣𞤱𞤫𞥅"} } "Pacific:Nauru"{ - ec{"𞤐𞤵𞥅𞤪𞤵"} + ec{"𞤐𞤢𞤱𞤪𞤵"} } "Pacific:Niue"{ - ec{"𞤐𞤭𞥅𞤴𞤵"} + ec{"𞤐𞤵𞥅𞤱𞤭"} } "Pacific:Norfolk"{ ec{"𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵"} @@ -1252,13 +1252,13 @@ ff_Adlm{ ec{"𞤆𞤢𞤺𞤮-𞤆𞤢𞤺𞤮"} } "Pacific:Palau"{ - ec{"𞤆𞤮𞤤𞤢𞥄𞤱𞤮"} + ec{"𞤆𞤢𞤤𞤢𞤱"} } "Pacific:Pitcairn"{ - ec{"𞤆𞤭𞤼𞤭𞤳𞤫𞤪𞤲𞤵"} + ec{"𞤆𞤭𞤼𞤳𞤭𞥅𞤪𞤲𞤵"} } "Pacific:Ponape"{ - ec{"𞤆𞤮𞤲𞤢𞤨𞤫"} + ec{"𞤆𞤮𞤥𞤨𞤫𞥅"} } "Pacific:Port_Moresby"{ ec{"𞤆𞤮𞤪𞤼𞤵-𞤃𞤮𞤪𞤫𞤧𞤦𞤭"} @@ -1267,16 +1267,16 @@ ff_Adlm{ ec{"𞤈𞤢𞤪𞤮𞤼𞤮𞤲𞤺𞤢"} } "Pacific:Saipan"{ - ec{"𞤅𞤢𞤴𞤨𞤢𞤲"} + ec{"𞤅𞤢𞤴𞤨𞤢𞥄𞤲"} } "Pacific:Tahiti"{ - ec{"𞤚𞤢𞤸𞤭𞤼𞤭"} + ec{"𞤚𞤢𞤸𞤭𞤼𞤭𞥅"} } "Pacific:Tarawa"{ - ec{"𞤚𞤢𞤪𞤢𞤱𞤢"} + ec{"𞤚𞤫𞥅𞤪𞤢𞤱𞤢"} } "Pacific:Tongatapu"{ - ec{"𞤚𞤮𞤲𞤺𞤢𞤼𞤢𞤨𞤵"} + ec{"𞤚𞤮𞤲𞤺𞤢𞤼𞤢𞥄𞤨𞤵"} } "Pacific:Truk"{ ec{"𞤕𞤵𞥅𞤳𞤵"} @@ -1285,32 +1285,32 @@ ff_Adlm{ ec{"𞤏𞤫𞥅𞤳𞤵"} } "Pacific:Wallis"{ - ec{"𞤏𞤢𞤤𞤭𞥅𞤧"} + ec{"𞤏𞤢𞤤𞥆𞤭𞥅𞤧"} } "meta:Afghanistan"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤬𞤺𞤢𞤲𞤭𞤧𞤼𞤢𞥄𞤲"} } "meta:Africa_Central"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤬𞤪𞤭𞤳𞤭 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} } "meta:Africa_Eastern"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤣𞤫 𞤀𞤬𞤪𞤭𞤳𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} } "meta:Africa_Southern"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤂𞤫𞤧𞤮-𞤀𞤬𞤪𞤭𞤳𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} } "meta:Africa_Western"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤭"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤭"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤀𞤬𞤪𞤭𞤳𞤭" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤬𞤪𞤭𞤳𞤢𞥄" } } "meta:Alaska"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤤𞤢𞤧𞤳𞤢𞥄"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤤𞤢𞤧𞤳𞤢𞥄 𞤲𞤣𞤫𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤤𞤢𞤧𞤳𞤢𞥄"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞤤𞤢𞤧𞤳𞤢𞥄"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞤤𞤢𞤧𞤳𞤢𞥄 𞤲𞤣𞤫𞤲"} } "meta:Amazon"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤥𞤢𞥁𞤮𞥅𞤲"} @@ -1318,43 +1318,61 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞤥𞤢𞥁𞤮𞥅𞤲"} } "meta:America_Central"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤳𞤢 𞤚𞤵𞤥𞤦𞤮"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤳𞤢 𞤚𞤵𞤥𞤦𞤮 𞤈𞤫𞤱𞤮-𞤀𞤥𞤫𞤪𞤭𞤳"} + ld{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤥𞤦𞤮 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" + } + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤳𞤢 𞤚𞤵𞤥𞤦𞤮 𞤈𞤫𞤱𞤮-" - "𞤀𞤥𞤫𞤪𞤭𞤳" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" } } "meta:America_Eastern"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤳𞤢 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤁𞤮𞤱𞤪𞤭-𞤀𞤥𞤫𞤪𞤭𞤳"} + ld{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" + } + lg{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" + } ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤁𞤮𞤱𞤪𞤭-𞤀𞤥𞤫𞤪𞤭𞤳" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" } } "meta:America_Mountain"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤆𞤫𞤤𞤫 𞤯𞤫𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤫𞤤𞤫 𞤯𞤫𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤆𞤫𞤤𞤫 𞤯𞤫𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} + lg{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤫𞤤𞥆𞤭𞤲𞤳𞤮𞥅𞤪𞤫 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" + } + ls{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤆𞤫𞤤𞥆𞤭𞤲𞤳𞤮𞥅𞤪𞤫 " + "𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" + } } "meta:America_Pacific"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 𞤁𞤮𞤱𞤪𞤭-𞤀𞤥𞤫𞤪𞤭𞤳"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 𞤁𞤮𞤱𞤪𞤭-𞤀𞤥𞤫𞤪𞤭𞤳"} + ld{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤫𞤰𞥆𞤮 𞤕𞤫𞥅𞤯𞤵 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" + } + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤫𞤰𞥆𞤮 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤁𞤮𞤱𞤪𞤭-" - "𞤀𞤥𞤫𞤪𞤭𞤳" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤫𞤰𞥆𞤮 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤢𞤲𞥆𞤢𞥄𞤲𞤺𞤫 " + "𞤀𞤥𞤫𞤪𞤭𞤳𞤢𞥄" } } "meta:Apia"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤨𞤭𞤴𞤢"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤨𞤭𞤴𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞤨𞤭𞤴𞤢"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞥄𞤨𞤭𞤴𞤢"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞥄𞤨𞤭𞤴𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞥄𞤨𞤭𞤴𞤢"} } "meta:Arabian"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞥄𞤪𞤢𞤦𞤭𞤴𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞥄𞤪𞤢𞤦𞤭𞤴𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞥄𞤪𞤢𞤦𞤭𞤴𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞥄𞤪𞤢𞤦𞤭𞤴𞤢"} } "meta:Argentina"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤪𞤶𞤢𞤲𞤼𞤭𞤲𞤢𞥄"} @@ -1375,68 +1393,71 @@ ff_Adlm{ "meta:Armenia"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤪𞤥𞤫𞤲𞤭𞤴𞤢𞥄"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤪𞤥𞤫𞤲𞤭𞤴𞤢𞥄"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞤪𞤥𞤫𞤲𞤭𞤴𞤢𞥄"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞤪𞤥𞤫𞤲𞤭𞤴𞤢𞥄"} } "meta:Atlantic"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤳𞤢 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤳𞤢 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 𞤁𞤮𞤱𞤪𞤭-𞤀𞤥𞤫𞤪𞤭𞤳"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤳𞤢 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 " - "𞤁𞤮𞤱𞤪𞤭-𞤀𞤥𞤫𞤪𞤭𞤳" - } + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤫𞤳𞤵"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤫𞤳𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤫𞤳𞤵 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫"} } "meta:Australia_Central"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 " - "𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" } } "meta:Australia_CentralWestern"{ ld{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤥𞤦𞤮 𞤖𞤭𞥅𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤥𞤦𞤮 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" + } + lg{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" } - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮 𞤖𞤭𞥅𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮 " - "𞤖𞤭𞥅𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮 " + "𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" } } "meta:Australia_Eastern"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄"} + ld{ + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" + } + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" } } "meta:Australia_Western"{ ld{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" } - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤌𞤧𞤼𞤪𞤢𞤤𞤭𞤴𞤢𞥄" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫𞥅𞤪𞤭 " + "𞤌𞤧𞤼𞤢𞤪𞤤𞤭𞤴𞤢𞥄" } } "meta:Azerbaijan"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤶𞤫𞤪𞤦𞤢𞤴𞤶𞤢𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤶𞤫𞤪𞤦𞤢𞤴𞤶𞤢𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞤶𞤫𞤪𞤦𞤢𞤴𞤶𞤢𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞤶𞤫𞤪𞤦𞤢𞤴𞤶𞤢𞤲"} } "meta:Azores"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞥁𞤮𞤪𞤫𞤧"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞥁𞤮𞤪𞤫𞤧"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤀𞥁𞤮𞤪𞤫𞤧"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞥁𞤮𞤪𞤫𞤧"} } "meta:Bangladesh"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤄𞤢𞤲𞤺𞤭𞤤𞤢𞤣𞤫𞥅𞤧"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤄𞤢𞤲𞤺𞤭𞤤𞤢𞤣𞤫𞥅𞤧"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤄𞤢𞤲𞤺𞤭𞤤𞤢𞤣𞤫𞥅𞤧"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤄𞤢𞤲𞤺𞤭𞤤𞤢𞤣𞤫𞥅𞤧"} } "meta:Bhutan"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤄𞤵𞤼𞤢𞥄𞤲"} @@ -1455,15 +1476,15 @@ ff_Adlm{ "meta:Cape_Verde"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤢𞥄𞤦𞤮-𞤜𞤫𞤪𞤣𞤫"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤢𞥄𞤦𞤮-𞤜𞤫𞤪𞤣𞤫"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤑𞤢𞥄𞤦𞤮-𞤜𞤫𞤪𞤣𞤫"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤑𞤢𞥄𞤦𞤮 𞤜𞤫𞤪𞤣𞤫"} } "meta:Chamorro"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤕𞤢𞤥𞤮𞤪𞤮"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤕𞤮𞤥𞤮𞥅𞤪𞤮"} } "meta:Chatham"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤕𞤢𞤼𞤢𞤥"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤢𞤼𞤢𞤥"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤕𞤢𞤼𞤢𞤥"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤕𞤢𞥄𞤼𞤢𞤥"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤢𞤼𞤢𞥄𞤥"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤕𞤢𞤼𞤢𞥄𞤥"} } "meta:Chile"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤕𞤭𞤤𞤫𞥅"} @@ -1473,7 +1494,7 @@ ff_Adlm{ "meta:China"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤕𞤢𞤴𞤲𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤢𞤴𞤲𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤕𞤢𞤴𞤲𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤕𞤢𞤴𞤲𞤢"} } "meta:Choibalsan"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤮𞤴𞤦𞤢𞤤𞤧𞤢𞤲"} @@ -1492,14 +1513,14 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤑𞤮𞤤𞤮𞤥𞤦𞤭𞤴𞤢𞥄"} } "meta:Cook"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤫𞤷𞥆𞤫𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤮𞤪𞤭𞥅𞤶𞤫 𞤑𞤵𞥅𞤳"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤮𞤪𞤭𞥅𞤶𞤫 𞤑𞤵𞥅𞤳"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤮𞤪𞤭𞥅𞤶𞤫 𞤑𞤵𞥅𞤳"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤫𞤷𞥆𞤵 𞤕𞤫𞥅𞤯𞤵 𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤑𞤵𞥅𞤳"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤑𞤵𞥅𞤳"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤑𞤵𞥅𞤳"} } "meta:Cuba"{ - ld{"𞤑𞤫𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤵𞤦𞤢𞥄"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤵𞤦𞤢𞥄"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤑𞤵𞤦𞤢𞥄"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤵𞥅𞤦𞤢𞥄"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤵𞥅𞤦𞤢𞥄"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤑𞤵𞥅𞤦𞤢𞥄"} } "meta:Davis"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤫𞥅𞤾𞤭𞤧"} @@ -1521,15 +1542,12 @@ ff_Adlm{ "meta:Europe_Central"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞤪𞤮𞥅𞤦𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞤪𞤮𞥅𞤦𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞤪𞤮𞥅𞤦𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤥𞤦𞤮𞥅𞤪𞤭 𞤀𞤪𞤮𞥅𞤦𞤢"} } "meta:Europe_Eastern"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤪𞤮𞥅𞤦𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤪𞤮𞥅𞤦𞤢"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤀𞤪𞤮𞥅𞤦𞤢" - } + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤪𞤮𞥅𞤦𞤢"} } "meta:Europe_Further_Eastern"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫𞥅𞤪𞤭 𞤀𞤪𞤮𞥅𞤦𞤢"} @@ -1538,7 +1556,7 @@ ff_Adlm{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤪𞤮𞥅𞤦𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤀𞤪𞤮𞥅𞤦𞤢"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " "𞤀𞤪𞤮𞥅𞤦𞤢" } } @@ -1548,9 +1566,9 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤮𞤤𞤳𞤤𞤢𞤲𞤣-𞤀𞤴𞤤𞤢𞤲𞤣"} } "meta:Fiji"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤭𞤶𞤭"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤭𞤶𞤭"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤭𞤶𞤭"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤭𞤶𞤭𞥅"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤭𞤶𞤭𞥅"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤊𞤭𞤶𞤭𞥅"} } "meta:French_Guiana"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤘𞤢𞤴𞤢𞤲𞤢𞥄-𞤊𞤪𞤢𞤲𞤧𞤭"} @@ -1570,62 +1588,53 @@ ff_Adlm{ "meta:Georgia"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤔𞤮𞤪𞤶𞤭𞤴𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤔𞤮𞤪𞤶𞤭𞤴𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤔𞤮𞤪𞤶𞤭𞤴𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤔𞤮𞤪𞤶𞤭𞤴𞤢"} } "meta:Gilbert_Islands"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤶𞤫 𞤘𞤭𞤤𞤦𞤫𞤪𞤼𞤵"} } "meta:Greenland_Eastern"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤘𞤪𞤭𞤲𞤤𞤢𞤲𞤣"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤘𞤪𞤭𞤲𞤤𞤢𞤲𞤣"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤘𞤪𞤭𞤲𞤤𞤢𞤲𞤣" - } + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫 𞤘𞤭𞤪𞤤𞤢𞤲𞤣"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫 𞤘𞤭𞤪𞤤𞤢𞤲𞤣"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤬𞤵𞤯𞤲𞤢𞥄𞤲𞤺𞤫 𞤘𞤭𞤪𞤤𞤢𞤲𞤣"} } "meta:Greenland_Western"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤘𞤪𞤭𞤲𞤤𞤢𞤲𞤣"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤘𞤪𞤭𞤲𞤤𞤢𞤲𞤣"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤘𞤭𞤪𞤤𞤢𞤲𞤣"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤘𞤭𞤪𞤤𞤢𞤲𞤣"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " - "𞤘𞤪𞤭𞤲𞤤𞤢𞤲𞤣" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 " + "𞤘𞤭𞤪𞤤𞤢𞤲𞤣" } } "meta:Gulf"{ - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤂𞤮𞥅𞤻𞤮𞤤𞤣𞤵 " - "𞤀𞤪𞤢𞤦𞤭𞤴𞤢" - } + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤂𞤮𞥅𞤻𞤵"} } "meta:Guyana"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤘𞤢𞤴𞤢𞤲𞤢𞥄"} } "meta:Hawaii_Aleutian"{ - ld{"𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-" - "𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲" - } + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲"} } "meta:Hong_Kong"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤮𞤲𞤳𞤮𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤮𞤲𞤳𞤮𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤮𞤲𞤳𞤮𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤮𞤲𞤺 𞤑𞤮𞤲𞤺"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤮𞤲𞤺 𞤑𞤮𞤲𞤺"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤮𞤲𞤺 𞤑𞤮𞤲𞤺"} } "meta:Hovd"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤮𞤬𞤣𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤮𞤬𞤣𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤮𞤬𞤣𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤮𞤬𞤣𞤵"} } "meta:India"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞤲𞤣𞤵𞤼𞤢𞥄𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤋𞤲𞤣𞤭𞤴𞤢"} } "meta:Indian_Ocean"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞥄𞤴𞤮 𞤋𞤲𞤣𞤭𞤴𞤢𞤱𞤮"} } "meta:Indochina"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞤲𞤣𞤵𞤷𞤢𞤴𞤲𞤢𞥄"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤲𞤣𞤮𞤧𞤭𞥅𞤲"} } "meta:Indonesia_Central"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤮𞤥𞤦𞤮𞥅𞤪𞤭 𞤋𞤲𞤣𞤮𞤲𞤭𞥅𞤧𞤭𞤴𞤢"} @@ -1639,22 +1648,22 @@ ff_Adlm{ "meta:Iran"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤋𞤪𞤢𞥄𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤪𞤢𞥄𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤋𞤪𞤢𞥄𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤋𞤪𞤢𞥄𞤲"} } "meta:Irkutsk"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤋𞤪𞤳𞤵𞤼𞤭𞤧𞤳𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤪𞤳𞤵𞤼𞤭𞤧𞤳𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤋𞤪𞤳𞤵𞤼𞤭𞤧𞤳𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤋𞤪𞤳𞤵𞤼𞤭𞤧𞤳𞤵"} } "meta:Israel"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤋𞤧𞤪𞤢𞥄𞤭𞥅𞤤𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤧𞤪𞤢𞥄𞤭𞥅𞤤𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤋𞤧𞤪𞤢𞥄𞤭𞥅𞤤𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤋𞤧𞤪𞤢𞥄𞤭𞥅𞤤𞤵"} } "meta:Japan"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤔𞤢𞤨𞤢𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤔𞤢𞤨𞤢𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤔𞤢𞤨𞤢𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤭𞤨𞥆𞤮𞤲"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤭𞤨𞥆𞤮𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤭𞤨𞥆𞤮𞤲"} } "meta:Kazakhstan_Eastern"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤢𞥁𞤢𞤿𞤢𞤧𞤼𞤢𞥄𞤲"} @@ -1665,7 +1674,7 @@ ff_Adlm{ "meta:Korea"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤮𞥅𞤪𞤫𞤴𞤢𞥄"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤮𞥅𞤪𞤫𞤴𞤢𞥄"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤑𞤮𞥅𞤪𞤫𞤴𞤢𞥄"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤑𞤮𞥅𞤪𞤫𞤴𞤢𞥄"} } "meta:Kosrae"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤮𞤧𞤪𞤢𞤴"} @@ -1673,18 +1682,18 @@ ff_Adlm{ "meta:Krasnoyarsk"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤢𞤪𞤢𞤧𞤲𞤮𞤴𞤢𞤪𞤧𞤭𞤳"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤢𞤪𞤢𞤧𞤲𞤮𞤴𞤢𞤪𞤧𞤭𞤳"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤑𞤢𞤪𞤢𞤧𞤲𞤮𞤴𞤢𞤪𞤧𞤭𞤳"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤑𞤪𞤢𞤧𞤲𞤮𞤴𞤢𞤪𞤧𞤭𞤳"} } "meta:Kyrgystan"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤭𞤪𞤺𞤭𞤧𞤼𞤢𞥄𞤲"} } "meta:Line_Islands"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤶𞤫 𞤂𞤢𞤴𞤲𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤂𞤢𞤴𞤲𞤵"} } "meta:Lord_Howe"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤂𞤮𞤪𞤣𞤵-𞤖𞤮𞤱𞤫"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤂𞤮𞤪𞤣𞤵-𞤖𞤮𞤱𞤫"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤂𞤮𞤪𞤣𞤵-𞤖𞤮𞤱𞤫"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤂𞤮𞤪𞤣𞤵-𞤖𞤮𞤱𞤫"} } "meta:Macquarie"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤢𞤳𞤢𞥄𞤪𞤭"} @@ -1692,7 +1701,7 @@ ff_Adlm{ "meta:Magadan"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤃𞤢𞤺𞤢𞤣𞤢𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤺𞤢𞤣𞤢𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤃𞤢𞤺𞤢𞤣𞤢𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤃𞤢𞤺𞤢𞤣𞤢𞤲"} } "meta:Malaysia"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤤𞤫𞥅𞤧𞤭𞤴𞤢"} @@ -1709,39 +1718,36 @@ ff_Adlm{ "meta:Mauritius"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤃𞤮𞤪𞤭𞥅𞤧𞤭"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤮𞤪𞤭𞥅𞤧𞤭"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤃𞤮𞤪𞤭𞥅𞤧𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤃𞤮𞤪𞤭𞥅𞤧𞤭"} } "meta:Mawson"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤱𞤧𞤮𞤲"} } "meta:Mexico_Northwest"{ ld{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤁𞤮𞤱𞤪𞤭-𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 " + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤢𞤲𞤮-𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 " "𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅" } - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤮𞤱𞤪𞤭-𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤢𞤲𞤮-𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤁𞤮𞤱𞤪𞤭-" - "𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞥋𞤺𞤫 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅" + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤢𞤲𞤮-𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 " + "𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅" } } "meta:Mexico_Pacific"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 𞤃𞤫𞤳𞤧𞤭𞤲𞤳𞤮"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 𞤃𞤫𞤳𞤧𞤭𞤲𞤳𞤮"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤆𞤢𞥄𞤧𞤫𞤬𞤭𞤳 " - "𞤃𞤫𞤳𞤧𞤭𞤲𞤳𞤮" - } + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤁𞤫𞤰𞥆𞤮 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤫𞤰𞥆𞤮 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤁𞤫𞤰𞥆𞤮 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅"} } "meta:Mongolia"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤓𞤤𞤢𞤲𞤦𞤢𞤼𞤢𞤪"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤓𞤤𞤢𞤲𞤦𞤢𞤼𞤢𞤪"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤓𞤤𞤢𞤲𞤦𞤢𞤼𞤢𞤪"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤓𞤤𞤢𞤲𞤦𞤢𞤼𞤢𞤪"} } "meta:Moscow"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤃𞤮𞤧𞤳𞤮"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤮𞤧𞤳𞤮"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤃𞤮𞤧𞤳𞤮"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤃𞤮𞤧𞤳𞤮"} } "meta:Myanmar"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤭𞤴𞤢𞤥𞤢𞥄𞤪"} @@ -1753,33 +1759,27 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤫𞤨𞤢𞤤"} } "meta:New_Caledonia"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤢𞤤𞤭𞤣𞤮𞤲𞤭𞤴𞤢𞥄 𞤖𞤫𞤴𞤯𞤮"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤢𞤤𞤭𞤣𞤮𞤲𞤭𞤴𞤢𞥄 𞤖𞤫𞤴𞤯𞤮"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤑𞤢𞤤𞤭𞤣𞤮𞤲𞤭𞤴𞤢𞥄 " - "𞤖𞤫𞤴𞤯𞤮" - } + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤢𞤤𞤭𞤣𞤮𞤲𞤭𞤴𞤢𞥄 𞤖𞤫𞤧𞤮"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤢𞤤𞤭𞤣𞤮𞤲𞤭𞤴𞤢𞥄 𞤖𞤫𞤧𞤮"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤑𞤢𞤤𞤭𞤣𞤮𞤲𞤭𞤴𞤢𞥄 𞤖𞤫𞤧𞤮"} } "meta:New_Zealand"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤫𞤱-𞤟𞤫𞤤𞤢𞤲𞤣𞤭"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤫𞤱-𞤟𞤫𞤤𞤢𞤲𞤣𞤭"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤐𞤫𞤱-𞤟𞤫𞤤𞤢𞤲𞤣𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤫𞤱-𞤟𞤫𞤤𞤢𞤲𞤣𞤭"} } "meta:Newfoundland"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤫𞤱𞤬𞤵𞤲𞤤𞤢𞤲𞤣"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤫𞤱𞤬𞤵𞤲𞤤𞤢𞤲𞤣"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤐𞤫𞤱𞤬𞤵𞤲𞤤𞤢𞤲𞤣"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤫𞤱-𞤊𞤵𞤲𞤣𞤵𞤤𞤢𞤲𞤣"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤫𞤱-𞤊𞤵𞤲𞤣𞤵𞤤𞤢𞤲𞤣"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤫𞤱-𞤊𞤵𞤲𞤣𞤵𞤤𞤢𞤲𞤣"} } "meta:Niue"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤭𞥅𞤴𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤵𞥅𞤱𞤭"} } "meta:Norfolk"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵"} - ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 " - "𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵" - } + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵"} } "meta:Noronha"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤫𞤪𞤲𞤢𞤲𞤣𞤮𞥅 𞤣𞤫 𞤐𞤮𞤪𞤮𞤲𞤽𞤢𞥄"} @@ -1792,23 +1792,23 @@ ff_Adlm{ "meta:Novosibirsk"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤮𞤾𞤮𞤧𞤦𞤭𞤪𞤧𞤭𞤳"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤮𞤾𞤮𞤧𞤦𞤭𞤪𞤧𞤭𞤳"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤐𞤮𞤾𞤮𞤧𞤦𞤭𞤪𞤧𞤭𞤳"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤮𞤾𞤮𞤧𞤦𞤭𞤪𞤧𞤭𞤳"} } "meta:Omsk"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤌𞤥𞤧𞤵𞤳𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤌𞤥𞤧𞤵𞤳𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤌𞤥𞤧𞤵𞤳𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤌𞤥𞤧𞤵𞤳𞤵"} } "meta:Pakistan"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤆𞤢𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤢𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤆𞤢𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤆𞤢𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} } "meta:Palau"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤮𞤤𞤢𞥄𞤱𞤮"} } "meta:Papua_New_Guinea"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤢𞤨𞤵𞤱𞤢 𞤘𞤭𞤲𞤫 𞤖𞤫𞤴𞤯𞤮"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤢𞤨𞤵𞤱𞤢 𞤘𞤭𞤲𞤫 𞤖𞤫𞤧𞤮"} } "meta:Paraguay"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤆𞤢𞥄𞤪𞤢𞤺𞤮𞤴"} @@ -1821,26 +1821,26 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤆𞤫𞤪𞤵𞥅"} } "meta:Philippines"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤭𞤤𞤭𞤨𞥆𞤭𞥅𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤭𞤤𞤭𞤨𞥆𞤭𞥅𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤊𞤭𞤤𞤭𞤨𞥆𞤭𞥅𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤊𞤭𞤤𞤭𞤨𞤭𞥅𞤲"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤊𞤭𞤤𞤭𞤨𞤭𞥅𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤊𞤭𞤤𞤭𞤨𞤭𞥅𞤲"} } "meta:Phoenix_Islands"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤶𞤫 𞤊𞤫𞤲𞤭𞤳𞤧𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤊𞤫𞤲𞤭𞤳𞤧𞤭"} } "meta:Pierre_Miquelon"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤫𞤲-𞤆𞤭𞤴𞤫𞥅𞤪 & 𞤃𞤭𞤳𞤫𞤤𞤮𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤫𞤲-𞤆𞤭𞤴𞤫𞥅𞤪 & 𞤃𞤭𞤳𞤫𞤤𞤮𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤼. 𞤆𞤭𞤴𞤫𞥅𞤪 & 𞤃𞤭𞤳𞤫𞤤𞤮𞤲"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤼. 𞤆𞤭𞤪𞤫𞥅𞤴 & 𞤃𞤭𞤳𞤫𞤤𞤮𞤲"} ls{ - "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤫𞤲-𞤆𞤭𞤴𞤫𞥅𞤪 & " + "𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤅𞤼. 𞤆𞤭𞤴𞤫𞥅𞤪 & " "𞤃𞤭𞤳𞤫𞤤𞤮𞤲" } } "meta:Pitcairn"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤭𞤼𞤭𞤳𞤫𞤪𞤲𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤭𞤼𞤳𞤭𞥅𞤪𞤲𞤵"} } "meta:Ponape"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤮𞤲𞤢𞤨𞤫"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤮𞤲𞤢𞥄𞤨𞤫"} } "meta:Pyongyang"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤭𞤴𞤮𞤲𞤴𞤢𞤲"} @@ -1854,21 +1854,21 @@ ff_Adlm{ "meta:Sakhalin"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤢𞤿𞤢𞤤𞤭𞥅𞤲"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤢𞤿𞤢𞤤𞤭𞥅𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤢𞤿𞤢𞤤𞤭𞥅𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤅𞤢𞤿𞤢𞤤𞤭𞥅𞤲"} } "meta:Samoa"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤢𞤥𞤮𞤱𞤢"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤢𞤥𞤮𞤱𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤢𞤥𞤮𞤱𞤢"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤢𞤥𞤵𞤱𞤢"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤢𞤥𞤵𞤱𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤅𞤢𞤥𞤵𞤱𞤢"} } "meta:Seychelles"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤫𞤴𞤭𞤧𞤫𞤤"} } "meta:Singapore"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤭𞤲𞤺𞤢𞤨𞤵𞥅𞤪"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤅𞤭𞤲𞤺𞤢𞤨𞤵𞥅𞤪"} } "meta:Solomon"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤶𞤫 𞤅𞤵𞤤𞤫𞤴𞤥𞤢𞥄𞤲𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤵𞤪𞤭𞥅𞤶𞤫 𞤅𞤵𞤤𞤢𞤴𞤥𞤢𞥄𞤲"} } "meta:South_Georgia"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤢𞤱𞤬-𞤔𞤮𞤪𞤶𞤭𞤴𞤢𞥄"} @@ -1880,34 +1880,34 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤢𞥄𞤴𞤵𞤱𞤢"} } "meta:Tahiti"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤢𞤸𞤭𞤼𞤭"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤢𞤸𞤭𞤼𞤭𞥅"} } "meta:Taipei"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤢𞤴𞤨𞤫𞥅"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤢𞤴𞤨𞤫𞥅"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤚𞤢𞤴𞤨𞤫𞥅"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤚𞤢𞤴𞤨𞤫𞥅"} } "meta:Tajikistan"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤢𞤶𞤭𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} } "meta:Tokelau"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤮𞤳𞤫𞤤𞤮𞤱𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤮𞥅𞤳𞤮𞤤𞤢𞥄𞤱𞤵"} } "meta:Tonga"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤮𞤲𞤺𞤢"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤮𞤲𞤺𞤢"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤚𞤮𞤲𞤺𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤮𞤲𞤺𞤢 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫"} } "meta:Truk"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤵𞥅𞤳𞤵"} } "meta:Turkmenistan"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤪𞤳𞤭𞤥𞤫𞤧𞤼𞤢𞥄𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤪𞤳𞤭𞤥𞤫𞤧𞤼𞤢𞥄𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤪𞤳𞤭𞤥𞤫𞤧𞤼𞤢𞥄𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤚𞤵𞤪𞤳𞤵𞤥𞤫𞤲𞤭𞤧𞤼𞤢𞥄𞤲"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤪𞤳𞤵𞤥𞤫𞤲𞤭𞤧𞤼𞤢𞥄𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤚𞤵𞤪𞤳𞤵𞤥𞤫𞤲𞤭𞤧𞤼𞤢𞥄𞤲"} } "meta:Tuvalu"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞤾𞤢𞤤𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤚𞤵𞥅𞤾𞤢𞤤𞤵"} } "meta:Uruguay"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤒𞤵𞥅𞤪𞤺𞤮𞤴"} @@ -1915,14 +1915,14 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤒𞤵𞥅𞤪𞤺𞤮𞤴"} } "meta:Uzbekistan"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤓𞥅𞤶𞤵𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤓𞥅𞤶𞤵𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤓𞥅𞤶𞤵𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤓𞥁𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤓𞥁𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤓𞥁𞤦𞤫𞤳𞤭𞤧𞤼𞤢𞥄𞤲"} } "meta:Vanuatu"{ - ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤜𞤢𞤲𞤵𞥅𞤼𞤵"} - lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤜𞤢𞤲𞤵𞥅𞤼𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤜𞤢𞤲𞤵𞥅𞤼𞤵"} + ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤜𞤢𞤲𞤵𞤱𞤢𞥄𞤼𞤵"} + lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤜𞤢𞤲𞤵𞤱𞤢𞥄𞤼𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤜𞤢𞤲𞤵𞤱𞤢𞥄𞤼𞤵"} } "meta:Venezuela"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤜𞤫𞤲𞤭𞥅𞥁𞤮𞥅𞤤𞤢"} @@ -1930,12 +1930,12 @@ ff_Adlm{ "meta:Vladivostok"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤜𞤭𞤤𞤢𞤾𞤮𞤧𞤼𞤮𞤳"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤜𞤭𞤤𞤢𞤾𞤮𞤧𞤼𞤮𞤳"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤜𞤭𞤤𞤢𞤾𞤮𞤧𞤼𞤮𞤳"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤜𞤭𞤤𞤢𞤾𞤮𞤧𞤼𞤮𞤳"} } "meta:Volgograd"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤜𞤮𞤤𞤺𞤮𞤺𞤢𞤪𞤢𞥄𞤣"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤜𞤮𞤤𞤺𞤮𞤺𞤢𞤪𞤢𞥄𞤣"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤜𞤮𞤤𞤺𞤮𞤺𞤢𞤪𞤢𞥄𞤣"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤜𞤮𞤤𞤺𞤮𞤺𞤢𞤪𞤢𞥄𞤣"} } "meta:Vostok"{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤜𞤮𞤧𞤼𞤮𞤳"} @@ -1944,22 +1944,22 @@ ff_Adlm{ ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤏𞤫𞥅𞤳𞤵"} } "meta:Wallis"{ - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤏𞤢𞤤𞤭𞥅𞤧 & 𞤊𞤵𞤼𞤵𞤲𞤢"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤏𞤢𞤤𞥆𞤭𞥅𞤧 & 𞤊𞤵𞤼𞤵𞤲𞤢"} } "meta:Yakutsk"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤒𞤢𞤳𞤢𞤼𞤭𞤧𞤳𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤒𞤢𞤳𞤢𞤼𞤭𞤧𞤳𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤒𞤢𞤳𞤢𞤼𞤭𞤧𞤳𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤒𞤢𞤳𞤢𞤼𞤭𞤧𞤳𞤵"} } "meta:Yekaterinburg"{ ld{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤒𞤫𞤳𞤢𞤼𞤫𞤪𞤭𞤲𞤦𞤵𞤪𞤺𞤵"} lg{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤒𞤫𞤳𞤢𞤼𞤫𞤪𞤭𞤲𞤦𞤵𞤪𞤺𞤵"} - ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤒𞤫𞤳𞤢𞤼𞤫𞤪𞤭𞤲𞤦𞤵𞤪𞤺𞤵"} + ls{"𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤒𞤫𞤳𞤢𞤼𞤫𞤪𞤭𞤲𞤦𞤵𞤪𞤺𞤵"} } - gmtFormat{"𞤑𞤖𞤏{0}"} - gmtZeroFormat{"𞤑𞤖𞤏"} + gmtFormat{"𞤑𞤖𞤘{0}"} + gmtZeroFormat{"𞤑𞤖𞤘"} regionFormat{"{0} 𞤑𞤭𞤶𞤮𞥅𞤪𞤫"} - regionFormatDaylight{"{0} 𞤐𞥋𞤔𞤢𞤥𞤲𞥋𞤣𞤭 𞤕𞤫𞥅𞤯𞤵"} + regionFormatDaylight{"{0} 𞤐𞤶𞤢𞤥𞤲𞤣𞤭 𞤕𞤫𞥅𞤯𞤵"} regionFormatStandard{"{0} 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫"} } } diff --git a/intl/icu/source/data/zone/ff_CM.txt b/intl/icu/source/data/zone/ff_CM.txt index c381f6cd740d..0bf68ef91987 100644 --- a/intl/icu/source/data/zone/ff_CM.txt +++ b/intl/icu/source/data/zone/ff_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_CM{ "%%ALIAS"{"ff_Latn_CM"} } diff --git a/intl/icu/source/data/zone/ff_GN.txt b/intl/icu/source/data/zone/ff_GN.txt index c3a0bf3d7bf3..433db4db3d8d 100644 --- a/intl/icu/source/data/zone/ff_GN.txt +++ b/intl/icu/source/data/zone/ff_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_GN{ "%%ALIAS"{"ff_Latn_GN"} } diff --git a/intl/icu/source/data/zone/ff_Latn.txt b/intl/icu/source/data/zone/ff_Latn.txt index 3d8715b562c7..d30cb6250832 100644 --- a/intl/icu/source/data/zone/ff_Latn.txt +++ b/intl/icu/source/data/zone/ff_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ff_Latn_CM.txt b/intl/icu/source/data/zone/ff_Latn_CM.txt index a141c2f858f1..123bc57aeef0 100644 --- a/intl/icu/source/data/zone/ff_Latn_CM.txt +++ b/intl/icu/source/data/zone/ff_Latn_CM.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ff_Latn_GN.txt b/intl/icu/source/data/zone/ff_Latn_GN.txt index b37284e2b028..54b7546ef6ba 100644 --- a/intl/icu/source/data/zone/ff_Latn_GN.txt +++ b/intl/icu/source/data/zone/ff_Latn_GN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ff_Latn_MR.txt b/intl/icu/source/data/zone/ff_Latn_MR.txt index 9b83c9511093..dd6364bc3bdf 100644 --- a/intl/icu/source/data/zone/ff_Latn_MR.txt +++ b/intl/icu/source/data/zone/ff_Latn_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ff_Latn_SN.txt b/intl/icu/source/data/zone/ff_Latn_SN.txt index 6112f6fdf109..33ed4073beb5 100644 --- a/intl/icu/source/data/zone/ff_Latn_SN.txt +++ b/intl/icu/source/data/zone/ff_Latn_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ff_MR.txt b/intl/icu/source/data/zone/ff_MR.txt index 17a887321fa0..1da6e5116ae4 100644 --- a/intl/icu/source/data/zone/ff_MR.txt +++ b/intl/icu/source/data/zone/ff_MR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_MR{ "%%ALIAS"{"ff_Latn_MR"} } diff --git a/intl/icu/source/data/zone/ff_SN.txt b/intl/icu/source/data/zone/ff_SN.txt index c6908546784d..ca2f4ec58333 100644 --- a/intl/icu/source/data/zone/ff_SN.txt +++ b/intl/icu/source/data/zone/ff_SN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ff_SN{ "%%ALIAS"{"ff_Latn_SN"} } diff --git a/intl/icu/source/data/zone/fi.txt b/intl/icu/source/data/zone/fi.txt index 86dbac2f5528..1340fb3578c3 100644 --- a/intl/icu/source/data/zone/fi.txt +++ b/intl/icu/source/data/zone/fi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fi{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -813,6 +813,9 @@ fi{ "Asia:Qatar"{ ec{"Qatar"} } + "Asia:Qostanay"{ + ec{"Kostanai"} + } "Asia:Qyzylorda"{ ec{"Qızılorda"} } diff --git a/intl/icu/source/data/zone/fil.txt b/intl/icu/source/data/zone/fil.txt index 7f52e30e5c0f..945f054bc358 100644 --- a/intl/icu/source/data/zone/fil.txt +++ b/intl/icu/source/data/zone/fil.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fil{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1322,7 +1322,7 @@ fil{ "meta:America_Central"{ ld{"Sentral na Daylight Time"} lg{"Sentral na Oras"} - ls{"Sentral na Karaniwang Oras"} + ls{"Sentral na Standard na Oras"} } "meta:America_Eastern"{ ld{"Eastern Daylight Time"} @@ -1722,7 +1722,7 @@ fil{ "meta:Norfolk"{ ld{"Daylight Time sa Norfolk Island"} lg{"Oras sa Norfolk Island"} - ls{"Standard na Norfolk Island"} + ls{"Standard na Oras sa Norfolk Island"} } "meta:Noronha"{ ld{"Oras sa Tag-init ng Fernando de Noronha"} diff --git a/intl/icu/source/data/zone/fil_PH.txt b/intl/icu/source/data/zone/fil_PH.txt index 5b83d8215fcb..481c955f9053 100644 --- a/intl/icu/source/data/zone/fil_PH.txt +++ b/intl/icu/source/data/zone/fil_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/fo.txt b/intl/icu/source/data/zone/fo.txt index e956b45dc8ed..ad8d337d86a9 100644 --- a/intl/icu/source/data/zone/fo.txt +++ b/intl/icu/source/data/zone/fo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fo{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1038,7 +1038,7 @@ fo{ } "Europe:London"{ ec{"London"} - ld{"Stóra Bretland summartíð"} + ld{"Bretsk summartíð"} } "Europe:Luxembourg"{ ec{"Luksemborg"} @@ -1710,9 +1710,9 @@ fo{ ls{"Niue tíð"} } "meta:Norfolk"{ - ld{"Norfolksoyggj summartíð"} - lg{"Norfolksoyggj tíð"} - ls{"Norfolksoyggj vanlig tíð"} + ld{"Norfolkoyggj summartíð"} + lg{"Norfolkoyggj tíð"} + ls{"Norfolkoyggj vanlig tíð"} } "meta:Noronha"{ ld{"Fernando de Noronha summartíð"} diff --git a/intl/icu/source/data/zone/fr.txt b/intl/icu/source/data/zone/fr.txt index 1ec6a94601f1..a1138404f8d4 100644 --- a/intl/icu/source/data/zone/fr.txt +++ b/intl/icu/source/data/zone/fr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -901,7 +901,7 @@ fr{ ec{"Cap-Vert"} } "Atlantic:Faeroe"{ - ec{"Féroé"} + ec{"Îles Féroé"} } "Atlantic:Madeira"{ ec{"Madère"} diff --git a/intl/icu/source/data/zone/fr_CA.txt b/intl/icu/source/data/zone/fr_CA.txt index d184a0bda082..bd09d58aa953 100644 --- a/intl/icu/source/data/zone/fr_CA.txt +++ b/intl/icu/source/data/zone/fr_CA.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_CA{ - Version{"37"} zoneStrings{ "Africa:Ndjamena"{ ec{"Ndjamena"} @@ -216,11 +216,6 @@ fr_CA{ lg{"heure du Cap-Vert"} ls{"heure normale du Cap-Vert"} } - "meta:Chatham"{ - ld{"heure avancée des Îles Chatham"} - lg{"heure des îles Chatham"} - ls{"heure normale des Îles Chatham"} - } "meta:Chile"{ ld{"heure avancée du Chili"} lg{"heure du Chili"} @@ -257,19 +252,19 @@ fr_CA{ ls{"heure normale de l’île de Pâques"} } "meta:Europe_Central"{ - ld{"heure avancée d’Europe centrale"} - lg{"heure d’Europe centrale"} - ls{"heure normale d’Europe centrale"} + ld{"heure avancée de l’Europe centrale"} + lg{"heure de l’Europe centrale"} + ls{"heure normale de l’Europe centrale"} } "meta:Europe_Eastern"{ - ld{"heure avancée d’Europe de l’Est"} - lg{"heure d’Europe de l’Est"} - ls{"heure normale d’Europe de l’Est"} + ld{"heure avancée de l’Europe de l’Est"} + lg{"heure de l’Europe de l’Est"} + ls{"heure normale de l’Europe de l’Est"} } "meta:Europe_Western"{ - ld{"heure avancée d’Europe de l’Ouest"} - lg{"heure d’Europe de l’Ouest"} - ls{"heure normale d’Europe de l’Ouest"} + ld{"heure avancée de l’Europe de l’Ouest"} + lg{"heure de l’Europe de l’Ouest"} + ls{"heure normale de l’Europe de l’Ouest"} } "meta:Falkland"{ ld{"heure avancée des îles Malouines"} diff --git a/intl/icu/source/data/zone/fr_GF.txt b/intl/icu/source/data/zone/fr_GF.txt index 9d0e1fff46ef..c227e7ffd23c 100644 --- a/intl/icu/source/data/zone/fr_GF.txt +++ b/intl/icu/source/data/zone/fr_GF.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fr_GF{ - Version{"37"} zoneStrings{ "meta:French_Guiana"{ ss{"GFT"} diff --git a/intl/icu/source/data/zone/fur.txt b/intl/icu/source/data/zone/fur.txt index 9673612ebe97..23942d2c2fb7 100644 --- a/intl/icu/source/data/zone/fur.txt +++ b/intl/icu/source/data/zone/fur.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fur{ - Version{"37"} zoneStrings{ "America:New_York"{ ec{"Gnove York"} diff --git a/intl/icu/source/data/zone/fy.txt b/intl/icu/source/data/zone/fy.txt index 45808ce204e7..0cacddd01d04 100644 --- a/intl/icu/source/data/zone/fy.txt +++ b/intl/icu/source/data/zone/fy.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml fy{ - Version{"37"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/intl/icu/source/data/zone/ga.txt b/intl/icu/source/data/zone/ga.txt index 1dfa8fed2dc7..6738191ad4e3 100644 --- a/intl/icu/source/data/zone/ga.txt +++ b/intl/icu/source/data/zone/ga.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ga{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1106,7 +1106,7 @@ ga{ ec{"Taillinn"} } "Europe:Tirane"{ - ec{"Tirane"} + ec{"Tiorána"} } "Europe:Ulyanovsk"{ ec{"Ulyanovsk"} @@ -1306,7 +1306,7 @@ ga{ ls{"Am Oirthear na hAfraice"} } "meta:Africa_Southern"{ - ls{"Am Caighdeánach na hAfraice Theas"} + ls{"Am na hAfraice Theas"} } "meta:Africa_Western"{ ld{"Am Samhraidh Iarthar na hAfraice"} @@ -1329,19 +1329,19 @@ ga{ ls{"Am Caighdeánach na hAmasóine"} } "meta:America_Central"{ - ld{"Am Samhraidh Lárnach"} - lg{"Am Lárnach"} - ls{"Am Caighdeánach Lárnach"} + ld{"Am Samhraidh Lárnach Mheiriceá Thuaidh"} + lg{"Am Lárnach Mheiriceá Thuaidh"} + ls{"Am Caighdeánach Lárnach Mheiriceá Thuaidh"} } "meta:America_Eastern"{ - ld{"Am Samhraidh an Oirthir"} - lg{"Am an Oirthir"} - ls{"Am Caighdeánach an Oirthir"} + ld{"Am Samhraidh Oirthear Mheiriceá Thuaidh"} + lg{"Am Oirthear Mheiriceá Thuaidh"} + ls{"Am Caighdeánach Oirthear Mheiriceá Thuaidh"} } "meta:America_Mountain"{ - ld{"Am Samhraidh na Sléibhte"} - lg{"Am na Sléibhte"} - ls{"Am Caighdeánach na Sléibhte"} + ld{"Am Samhraidh Sléibhte Mheiriceá Thuaidh"} + lg{"Am Sléibhte Mheiriceá Thuaidh"} + ls{"Am Caighdeánach Sléibhte Mheiriceá Thuaidh"} } "meta:America_Pacific"{ ld{"Am Samhraidh an Aigéin Chiúin"} @@ -1864,7 +1864,7 @@ ga{ ls{"Am Caighdeánach Shingeapór"} } "meta:Solomon"{ - ls{"Am Oileáin Sholomón"} + ls{"Am Oileáin Sholaimh"} } "meta:South_Georgia"{ ls{"Am na Seoirsia Theas"} @@ -1903,7 +1903,7 @@ ga{ ls{"Am Caighdeánach na Tuircméanastáine"} } "meta:Tuvalu"{ - ls{"Am Thuvalu"} + ls{"Am Thúvalú"} } "meta:Uruguay"{ ld{"Am Samhraidh Uragua"} @@ -1940,7 +1940,7 @@ ga{ ls{"Am Oileán Wake"} } "meta:Wallis"{ - ls{"Am Vailís agus Futúna"} + ls{"Am Wallis agus Futuna"} } "meta:Yakutsk"{ ld{"Am Samhraidh Iacútsc"} diff --git a/intl/icu/source/data/zone/gd.txt b/intl/icu/source/data/zone/gd.txt index dc873d0d40fb..a0569d561eb5 100644 --- a/intl/icu/source/data/zone/gd.txt +++ b/intl/icu/source/data/zone/gd.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gd{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -682,7 +682,7 @@ gd{ ec{"Beirut"} } "Asia:Bishkek"{ - ec{"Bishkek"} + ec{"Biškek"} } "Asia:Brunei"{ ec{"Brùnaigh"} @@ -712,7 +712,7 @@ gd{ ec{"Dubai"} } "Asia:Dushanbe"{ - ec{"Dushanbe"} + ec{"Dušanbe"} } "Asia:Famagusta"{ ec{"Famagusta"} @@ -847,10 +847,10 @@ gd{ ec{"Taipei"} } "Asia:Tashkent"{ - ec{"Tashkent"} + ec{"Toškent"} } "Asia:Tbilisi"{ - ec{"Tbilisi"} + ec{"T’bilisi"} } "Asia:Tehran"{ ec{"Tehrān"} @@ -1460,9 +1460,9 @@ gd{ ls{"Àm Boilibhia"} } "meta:Brasilia"{ - ld{"Tìde samhraidh Bhrasilia"} - lg{"Àm Bhrasilia"} - ls{"Bun-àm Bhrasilia"} + ld{"Tìde samhraidh Bhrasília"} + lg{"Àm Bhrasília"} + ls{"Bun-àm Bhrasília"} } "meta:Brunei"{ ls{"Àm Bhrùnaigh Dàr as-Salàm"} diff --git a/intl/icu/source/data/zone/gl.txt b/intl/icu/source/data/zone/gl.txt index 1d14aa169b8b..9741d637aacb 100644 --- a/intl/icu/source/data/zone/gl.txt +++ b/intl/icu/source/data/zone/gl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gl{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/gsw.txt b/intl/icu/source/data/zone/gsw.txt index ace3bc0b771b..e7e4e14683d7 100644 --- a/intl/icu/source/data/zone/gsw.txt +++ b/intl/icu/source/data/zone/gsw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gsw{ - Version{"37"} zoneStrings{ "Africa:Accra"{ ec{"Akkra"} diff --git a/intl/icu/source/data/zone/gu.txt b/intl/icu/source/data/zone/gu.txt index 3ec3ddb7b1c0..d05c8b71318f 100644 --- a/intl/icu/source/data/zone/gu.txt +++ b/intl/icu/source/data/zone/gu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gu{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"આબિદ્જાન"} @@ -1752,7 +1752,7 @@ gu{ ls{"નીયુ સમય"} } "meta:Norfolk"{ - ld{"નોરફૉક આઇલેન્ડ ગ્રીષ્મ સમય"} + ld{"નોરફૉક આઇલેન્ડ દિવસ સમય"} lg{"નોરફૉક આઇલેન્ડ સમય"} ls{"નોરફૉક આઇલેન્ડ માનક સમય"} } diff --git a/intl/icu/source/data/zone/guz.txt b/intl/icu/source/data/zone/guz.txt index b50d5beca2a0..c9a66de72e52 100644 --- a/intl/icu/source/data/zone/guz.txt +++ b/intl/icu/source/data/zone/guz.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml guz{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/gv.txt b/intl/icu/source/data/zone/gv.txt index 63c855d28749..87aeded149e1 100644 --- a/intl/icu/source/data/zone/gv.txt +++ b/intl/icu/source/data/zone/gv.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml gv{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ha.txt b/intl/icu/source/data/zone/ha.txt index 123b6f7de051..cf5ce2922325 100644 --- a/intl/icu/source/data/zone/ha.txt +++ b/intl/icu/source/data/zone/ha.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ha{ - Version{"37"} zoneStrings{ "America:North_Dakota:Beulah"{ ec{"Beulah, Arewacin Dakota"} @@ -39,28 +39,39 @@ ha{ "Etc:Unknown"{ ec{"Birni da ba a sani ba"} } + "Europe:Dublin"{ + ld{"Tsayayyen Lokacin Irish"} + } + "Europe:London"{ + ld{"Lokacin Bazara na Birtaniya"} + } "meta:Afghanistan"{ - ls{"Afghanistan Time"} + ls{"Lokacin Afghanistan"} } "meta:Africa_Central"{ - ls{"Central Africa Time"} + ls{"Lokacin Afirka ta Tsakiya"} } "meta:Africa_Eastern"{ - ls{"East Africa Time"} + ls{"Lokacin Gabashin Afirka"} } "meta:Africa_Southern"{ ls{"South Africa Standard Time"} } "meta:Africa_Western"{ - ld{"West Africa Summer Time"} - lg{"West Africa Time"} - ls{"West Africa Standard Time"} + ld{"Lokacin Bazara na Afirka ta Yamma"} + lg{"Lokacin Afirka ta Yamma"} + ls{"Tsayayyen Lokacin Afirka ta Yamma"} } "meta:Alaska"{ ld{"Lokacin Rana na Alaska"} lg{"Lokacin Alaska"} ls{"Tsayayyen Lokacin Alaska"} } + "meta:Amazon"{ + ld{"Lokacin Bazara na Amazon"} + lg{"Lokacin Amazon"} + ls{"Tsayayyen Lokacin Amazon"} + } "meta:America_Central"{ ld{"Lokacin Rana dake Arewacin Amurika ta Tsakiya"} lg{"Lokaci dake Amurika arewa ta tsakiyar"} @@ -72,123 +83,159 @@ ha{ ls{"Tsayayyen Lokacin Gabas dake Arewacin Amurika"} } "meta:America_Mountain"{ - ld{"Lokaci rana tsauni a arewacin da Amirka"} - lg{"Lokaci tsauni a arewacin da Amirka"} + ld{"Lokacin Rana na Tsaunin Arewacin Amurka"} + lg{"Lokacin Tsauni na Arewacin Amurka"} ls{"Lokaci tsayayye na tsauni a Arewacin Amurica"} } "meta:America_Pacific"{ - ld{"Lokaci da rana a Arewacin Amurika"} + ld{"Lokacin Rana na Arewacin Amurka"} lg{"Lokacin Arewacin Amurika"} ls{"Lokaci Tsayayye na Arewacin Amurika"} } "meta:Apia"{ - ld{"Apia Daylight Time"} - lg{"Apia Time"} - ls{"Apia Standard Time"} + ld{"Lokacin Rana na Apia"} + lg{"Lokacin Apia"} + ls{"Tsayayyen Lokacin Apia"} } "meta:Arabian"{ - ld{"Arabian Daylight Time"} - lg{"Arabian Time"} + ld{"Lokacin Rana na Arebiya"} + lg{"Lokacin Arebiya"} ls{"Arabian Standard Time"} } + "meta:Argentina"{ + ld{"Lokacin Bazara na Argentina"} + lg{"Lokacin Argentina"} + ls{"Tsayayyen Lokacin Argentina"} + } + "meta:Argentina_Western"{ + ld{"Lokacin Bazara na Yammacin Argentina"} + lg{"Lokacin Yammacin Argentina"} + ls{"Tsayayyen Lokacin Yammacin Argentina"} + } "meta:Armenia"{ - ld{"Armenia Summer Time"} - lg{"Armenia Time"} - ls{"Armenia Standard Time"} + ld{"Lokacin Bazara na Armenia"} + lg{"Lokacin Armenia"} + ls{"Tsayayyen Lokacin Armenia"} } "meta:Atlantic"{ ld{"Lokacin Rana na Kanada, Puerto Rico da Virgin Islands"} lg{"Lokacin Kanada, Puerto Rico da Virgin Islands"} - ls{"Lokaci Tsayayye na Kanada, Puerto Rico da Virgin Islands"} + ls{"Tsayayyen Lokacin Kanada, Puerto Rico da Virgin Islands"} } "meta:Australia_Central"{ - ld{"Australian Central Daylight Time"} + ld{"Lokacin Rana na Tsakiyar Austiraliya"} lg{"Central Australia Time"} - ls{"Australian Central Standard Time"} + ls{"Tsayayyen Lokacin Tsakiyar Austiraliya"} } "meta:Australia_CentralWestern"{ - ld{"Australian Central Western Daylight Time"} - lg{"Australian Central Western Time"} - ls{"Australian Central Western Standard Time"} + ld{"Lokacin Rana na Yammacin Tsakiyar Austiraliya"} + lg{"Lokacin Yammacin Tsakiyar Austiraliya"} + ls{"Tsayayyen Lokacin Yammacin Tsakiyar Austiraliya"} } "meta:Australia_Eastern"{ - ld{"Australian Eastern Daylight Time"} - lg{"Eastern Australia Time"} + ld{"Lokacin Rana na Gabashin Austiraliya"} + lg{"Lokacin Gabashin Austiraliya"} ls{"Australian Eastern Standard Time"} } "meta:Australia_Western"{ - ld{"Australian Western Daylight Time"} - lg{"Western Australia Time"} - ls{"Australian Western Standard Time"} + ld{"Lokacin Rana na Yammacin Austiralia"} + lg{"Lokacin Yammacin Austiralia"} + ls{"Tsayayyen Lokacin Yammacin Austiralia"} } "meta:Azerbaijan"{ - ld{"Azerbaijan Summer Time"} - lg{"Azerbaijan Time"} - ls{"Azerbaijan Standard Time"} + ld{"Lokacin Bazara na Azerbaijan"} + lg{"Lokacin Azerbaijan"} + ls{"Tsayayyen Lokacin Azerbaijan"} } "meta:Azores"{ - ld{"Azores Summer Time"} - lg{"Azores Time"} - ls{"Azores Standard Time"} + ld{"Lokacin Azure na Bazara"} + lg{"Lokacin Azores"} + ls{"Lokacin Azores Daidaitacce"} } "meta:Bangladesh"{ - ld{"Bangladesh Summer Time"} - lg{"Bangladesh Time"} - ls{"Bangladesh Standard Time"} + ld{"Lokacin Bazara na Bangladesh"} + lg{"Lokacin Bangladesh"} + ls{"Tsayayyen Lokacin Bangladesh"} } "meta:Bhutan"{ ls{"Bhutan Time"} } + "meta:Bolivia"{ + ls{"Lokacin Bolivia"} + } + "meta:Brasilia"{ + ld{"Lokacin Bazara na Brasillia"} + lg{"Lokacin Brasillia"} + ls{"Tsayayyen Lokacin Brasillia"} + } "meta:Brunei"{ - ls{"Brunei Darussalam Time"} + ls{"Lokacin Brunei Darussalam"} } "meta:Cape_Verde"{ - ld{"Cape Verde Summer Time"} - lg{"Cape Verde Time"} + ld{"Lokacin Bazara na Cape Verde"} + lg{"Lokacin Cape Verde"} ls{"Cape Verde Standard Time"} } "meta:Chamorro"{ - ls{"Chamorro Standard Time"} + ls{"Tsayayyen Lokacin Chamorro"} } "meta:Chatham"{ - ld{"Chatham Daylight Time"} - lg{"Chatham Time"} - ls{"Chatham Standard Time"} + ld{"Lokacin Rana na Chatham"} + lg{"Lokacin Chatham"} + ls{"Tsayayyen Lokacin Chatham"} + } + "meta:Chile"{ + ld{"Lokacin Bazara na Chile"} + lg{"Lokacin Chile"} + ls{"Tsayayyen Lokacin Chile"} } "meta:China"{ - ld{"China Daylight Time"} - lg{"China Time"} - ls{"China Standard Time"} + ld{"Lokacin Rana na Sin"} + lg{"Lokacin Sin"} + ls{"Tsayayyen Lokacin Sin"} } "meta:Choibalsan"{ - ld{"Choibalsan Summer Time"} - lg{"Choibalsan Time"} - ls{"Choibalsan Standard Time"} + ld{"Lokacin Bazara na Choibalsan"} + lg{"Lokacin Choibalsan"} + ls{"Tsayayyen Lokacin Choibalsan"} } "meta:Christmas"{ - ls{"Christmas Island Time"} + ls{"Lokacin Christmas Island"} } "meta:Cocos"{ - ls{"Cocos Islands Time"} + ls{"Lokacin Cocos Islands"} + } + "meta:Colombia"{ + ld{"Lokacin Bazara na Colombia"} + lg{"Lokacin Colombia"} + ls{"Tsayayyen Lokacin Colombia"} } "meta:Cook"{ - ld{"Cook Islands Half Summer Time"} - lg{"Cook Islands Time"} - ls{"Cook Islands Standard Time"} + ld{"Rabin Lokacin Bazara na Cook Islands"} + lg{"Lokacin Cook Islands"} + ls{"Tsayayyen Lokacin Cook Islands"} } "meta:Cuba"{ - ld{"Lokaci rana ta Kuba"} - lg{"Lokaci ta Kuba"} - ls{"Lokaci Tsayayye na Kuba"} + ld{"Lokacin Rana na Kuba"} + lg{"Lokaci na Kuba"} + ls{"Tsayayyen Lokacin Kuba"} } "meta:Davis"{ - ls{"Davis Time"} + ls{"Lokacin Davis"} } "meta:DumontDUrville"{ - ls{"Dumont-d’Urville Time"} + ls{"Lokacin Dumont-d’Urville"} } "meta:East_Timor"{ - ls{"East Timor Time"} + ls{"Lokacin East Timor"} + } + "meta:Easter"{ + ld{"Lokacin Bazara na Easter Island"} + lg{"Lokacin Easter Island"} + ls{"Tsayayyen Lokacin Easter Island"} + } + "meta:Ecuador"{ + ls{"Lokacin Ecuador"} } "meta:Europe_Central"{ ld{"Tsakiyar bazara a lokaci turai"} @@ -200,354 +247,397 @@ ha{ lg{"Lokaci a turai gabas"} ls{"Ida lokaci a turai gabas"} } + "meta:Europe_Further_Eastern"{ + ls{"Lokacin Gabashin Turai mai Nisa"} + } "meta:Europe_Western"{ ld{"Ida lokaci ta yammacin turai da bazara"} lg{"Lokaci ta yammacin turai"} ls{"Ida lokaci ta yammacin turai"} } + "meta:Falkland"{ + ld{"Lokacin Bazara na Falkland Islands"} + lg{"Lokacin Falkland Islands"} + ls{"Tsayayyen Lokacin Falkland Islands"} + } "meta:Fiji"{ - ld{"Fiji Summer Time"} - lg{"Fiji Time"} - ls{"Fiji Standard Time"} + ld{"Lokacin Bazara na Fiji"} + lg{"Lokacin Fiji"} + ls{"Tsayayyen Lokacin Fiji"} + } + "meta:French_Guiana"{ + ls{"Lokacin French Guiana"} } "meta:French_Southern"{ - ls{"French Southern & Antarctic Time"} + ls{"Lokacin Kudancin Faransa da Antarctic"} } "meta:GMT"{ ls{"Lokacin Greenwhich a London"} } + "meta:Galapagos"{ + ls{"Lokacin Galapagos"} + } "meta:Gambier"{ - ls{"Gambier Time"} + ls{"Lokacin Gambier"} } "meta:Georgia"{ ld{"Georgia Summer Time"} - lg{"Georgia Time"} - ls{"Georgia Standard Time"} + lg{"Lokacin Georgia"} + ls{"Tsayayyen Lokacin Georgia"} } "meta:Gilbert_Islands"{ - ls{"Gilbert Islands Time"} + ls{"Lokacin Gilbert Islands"} } "meta:Greenland_Eastern"{ - ld{"Lokaci rana a gabas ta Greeland"} - lg{"Lokaci a gabas ta Greeland"} - ls{"Lokaci Tsayayye a gabashin ta Greenland"} + ld{"Lokacin Rana na Gabashin Greenland"} + lg{"Lokacin Gabas na Greenland"} + ls{"Tsayayyen Lokacin Gabashin Greenland"} } "meta:Greenland_Western"{ - ld{"Lokacin rana a yammacin Greeland"} - lg{"Lokaci a yammacin Greeland"} - ls{"Lokaci Tsayayye a yammacin Greeland"} + ld{"Lokacin Rana na Yammacin Greenland"} + lg{"Lokacin Yammacin Greenland"} + ls{"Tsayayyen Lokacin Yammacin Greenland"} } "meta:Gulf"{ - ls{ - "Gulf Standard Time [translation hint: translate as just \u0022Gulf T" - "ime\u0022]" - } + ls{"Lokacin Golf"} + } + "meta:Guyana"{ + ls{"Lokacin Guyana"} } "meta:Hawaii_Aleutian"{ - ld{"Lokaci rana ta Hawaii-Aleutian"} - lg{"Lokaci ta Hawaii-Aleutian"} - ls{"Ida Lokaci ta Hawaii-Aleutian"} + ld{"Lokacin Rana na Hawaii-Aleutian"} + lg{"Lokaci na Hawaii-Aleutian"} + ls{"Tsayayyen Lokacin Hawaii-Aleutian"} } "meta:Hong_Kong"{ - ld{"Hong Kong Summer Time"} - lg{"Hong Kong Time"} - ls{"Hong Kong Standard Time"} + ld{"Lokacin Bazara na Hong Kong"} + lg{"Lokacin Hong Kong"} + ls{"Tsayayyen Lokacin Hong Kong"} } "meta:Hovd"{ - ld{"Hovd Summer Time"} - lg{"Hovd Time"} - ls{"Hovd Standard Time"} + ld{"Lokacin Bazara na Hovd"} + lg{"Lokacin Hovd"} + ls{"Tsayayyen Lokacin Hovd"} } "meta:India"{ ls{"India Standard Time"} } "meta:Indian_Ocean"{ - ls{"Indian Ocean Time"} + ls{"Lokacin Tekun Indiya"} } "meta:Indochina"{ - ls{"Indochina Time"} + ls{"Lokacin Indochina"} } "meta:Indonesia_Central"{ - ls{"Central Indonesia Time"} + ls{"Lokacin Indonesia ta Tsakiya"} } "meta:Indonesia_Eastern"{ ls{"Eastern Indonesia Time"} } "meta:Indonesia_Western"{ - ls{"Western Indonesia Time"} + ls{"Lokacin Yammacin Indonesia"} } "meta:Iran"{ - ld{"Iran Daylight Time"} - lg{"Iran Time"} - ls{"Iran Standard Time"} + ld{"Lokacin Rana na Iran"} + lg{"Lokacin Iran"} + ls{"Tsayayyen Lokacin Iran"} } "meta:Irkutsk"{ - ld{"Irkutsk Summer Time"} - lg{"Irkutsk Time"} - ls{"Irkutsk Standard Time"} + ld{"Lokacin Bazara na Irkutsk"} + lg{"Lokacin Irkutsk"} + ls{"Tsayayyen Lokacin Irkutsk"} } "meta:Israel"{ ld{"Israel Daylight Time"} - lg{"Israel Time"} + lg{"Lokacin Israʼila"} ls{"Israel Standard Time"} } "meta:Japan"{ ld{"Japan Daylight Time"} - lg{"Japan Time"} + lg{"Lokacin Japan"} ls{"Japan Standard Time"} } "meta:Kazakhstan_Eastern"{ - ls{"East Kazakhstan Time"} + ls{"Lokacin Gabashin Kazakhstan"} } "meta:Kazakhstan_Western"{ - ls{"West Kazakhstan Time"} + ls{"Lokacin Yammacin Kazakhstan"} } "meta:Korea"{ - ld{"Korean Daylight Time"} - lg{"Korean Time"} - ls{"Korean Standard Time"} + ld{"Lokacin Rana na Koriya"} + lg{"Lokacin Koriya"} + ls{"Tsayayyen Lokacin Koriya"} } "meta:Kosrae"{ - ls{"Kosrae Time"} + ls{"Lokacin Kosrae"} } "meta:Krasnoyarsk"{ - ld{"Krasnoyarsk Summer Time"} - lg{"Krasnoyarsk Time"} - ls{"Krasnoyarsk Standard Time"} + ld{"Lokacin Bazara na Krasnoyarsk"} + lg{"Lokacin Krasnoyarsk"} + ls{"Tsayayyen Lokacin Krasnoyarsk"} } "meta:Kyrgystan"{ - ls{"Kyrgyzstan Time"} + ls{"Lokacin Kazakhstan"} } "meta:Line_Islands"{ - ls{"Line Islands Time"} + ls{"Lokacin Line Islands"} } "meta:Lord_Howe"{ - ld{"Lord Howe Daylight Time"} - lg{"Lord Howe Time"} - ls{"Lord Howe Standard Time"} + ld{"Lokacin Rana na Vote Lord Howe"} + lg{"Lokacin Lord Howe"} + ls{"Tsayayyen Lokacin Lord Howe"} } "meta:Macquarie"{ - ls{"Macquarie Island Time"} + ls{"Lokacin Macquarie Island"} } "meta:Magadan"{ - ld{"Magadan Summer Time"} - lg{"Magadan Time"} - ls{"Magadan Standard Time"} + ld{"Lokacin Bazara na Magadan"} + lg{"Lokacin Magadan"} + ls{"Tsayayyen Lokacin Magadan"} } "meta:Malaysia"{ - ls{"Malaysia Time"} + ls{"Lokacin Malaysia"} } "meta:Maldives"{ - ls{"Maldives Time"} + ls{"Lokacin Maldives"} } "meta:Marquesas"{ - ls{"Marquesas Time"} + ls{"Lokacin Marquesas"} } "meta:Marshall_Islands"{ - ls{"Marshall Islands Time"} + ls{"Lokacin Marshall Islands"} } "meta:Mauritius"{ - ld{"Bazarar Mauritius"} + ld{"Lokacin Bazara na Mauritius"} lg{"Lokacin Mauritius"} - ls{"TsaTsayayyar Lokacin Mauritius"} + ls{"Tsayayyen Lokacin Mauritius"} } "meta:Mawson"{ - ls{"Mawson Time"} + ls{"Lokacin Mawson"} } "meta:Mexico_Northwest"{ - ld{"Lokacin rana na arewa maso gabashin Mesiko"} - lg{"Lokacin arewa maso gabashin mesiko"} - ls{"Lokaci Tsayayye na arewa maso gabashin Mesiko"} + ld{"Lokacin Rana na Arewa Maso Yammacin Mekziko"} + lg{"Lokacin Arewa Maso Yammacin Mekziko"} + ls{"Tsayayyen Lokacin Arewa Maso Yammacin Mekziko"} } "meta:Mexico_Pacific"{ - ld{"Lokaci na rana na Mesiko Pacific"} - lg{"Lokaci na Mesiko Pacific"} - ls{"Lokaci Tsayayye na Mesiko Pacific"} + ld{"Lokacin Rana na Mekziko Pacific"} + lg{"Lokacin Mekziko Pacific"} + ls{"Tsayayyen Lokacin Mekziko Pacific"} } "meta:Mongolia"{ - ld{"Ulaanbaatar Summer Time"} - lg{"Ulaanbaatar Time"} - ls{"Ulaanbaatar Standard Time"} + ld{"Lokacin Bazara na Ulaanbaatar"} + lg{"Lokacin Ulaanbaatar"} + ls{"Tsayayyen Lokacin Ulaanbaatar"} } "meta:Moscow"{ - ld{"Moscow Summer Time"} - lg{"Moscow Time"} - ls{"Moscow Standard Time"} + ld{"Lokacin Bazara na Moscow"} + lg{"Lokacin Moscow"} + ls{"Tsayayyen Lokacin Moscow"} } "meta:Myanmar"{ - ls{"Myanmar Time"} + ls{"Lokacin Myanmar"} } "meta:Nauru"{ - ls{"Nauru Time"} + ls{"Lokacin Nauru"} } "meta:Nepal"{ - ls{"Nepal Time"} + ls{"Lokacin Nepal"} } "meta:New_Caledonia"{ - ld{"New Caledonia Summer Time"} - lg{"New Caledonia Time"} - ls{"New Caledonia Standard Time"} + ld{"Lokacin Bazara na New Caledonia"} + lg{"Lokacin New Caledonia"} + ls{"Tsayayyen Lokacin New Caledonia"} } "meta:New_Zealand"{ - ld{"New Zealand Daylight Time"} - lg{"New Zealand Time"} - ls{"New Zealand Standard Time"} + ld{"Lokacin Rana na New Zealand"} + lg{"Lokacin New Zealand"} + ls{"Tsayayyen Lokacin New Zealand"} } "meta:Newfoundland"{ ld{"Lokaci rana ta Newfoundland"} - lg{"Lokaci ta Newfoundland"} + lg{"Lokacin Newfoundland"} ls{"Lokaci Tsayayye ta Newfoundland"} } "meta:Niue"{ - ls{"Niue Time"} + ls{"Lokacin Niue"} } "meta:Norfolk"{ - ld{"Norfolk Island Daylight Time"} - lg{"Norfolk Island Time"} - ls{"Norfolk Island Standard Time"} + ld{"Lokacin Rana na Norfolk Island"} + lg{"Lokacin Norfolk Island"} + ls{"Tsayayyen Lokacin Norfolk Island"} + } + "meta:Noronha"{ + ld{"Lokacin Bazara na Fernando de Noronha"} + lg{"Lokacin Fernando de Noronha"} + ls{"Tsayayyen Lokacin Fernando de Noronha"} } "meta:Novosibirsk"{ - ld{"Novosibirsk Summer Time"} - lg{"Novosibirsk Time"} + ld{"Lokacin Bazara na Novosibirsk"} + lg{"Lokacin Novosibirsk"} ls{"Novosibirsk Standard Time"} } "meta:Omsk"{ - ld{"Omsk Summer Time"} - lg{"Omsk Time"} - ls{"Omsk Standard Time"} + ld{"Lokacin Bazara na Omsk"} + lg{"Lokacin Omsk"} + ls{"Tsayayyen Lokacin Omsk"} } "meta:Pakistan"{ - ld{"Pakistan Summer Time"} - lg{"Pakistan Time"} - ls{"Pakistan Standard Time"} + ld{"Lokacin Bazara na Pakistan"} + lg{"Lokacin Pakistan"} + ls{"Tsayayyen Lokacin Pakistan"} } "meta:Palau"{ - ls{"Palau Time"} + ls{"Lokacin Palau"} } "meta:Papua_New_Guinea"{ - ls{"Papua New Guinea Time"} + ls{"Lokacin Papua New Guinea"} + } + "meta:Paraguay"{ + ld{"Lokacin Bazara na Paraguay"} + lg{"Lokacin Paraguay"} + ls{"Tsayayyen Lokacin Paraguay"} + } + "meta:Peru"{ + ld{"Lokacin Bazara na Peru"} + lg{"Lokacin Peru"} + ls{"Tsayayyen Lokacin Peru"} } "meta:Philippines"{ - ld{"Philippine Summer Time"} - lg{"Philippine Time"} - ls{"Philippine Standard Time"} + ld{"Lokacin Bazara na Philippine"} + lg{"Lokacin Philippine"} + ls{"Tsayayyen Lokacin Philippine"} } "meta:Phoenix_Islands"{ - ls{"Phoenix Islands Time"} + ls{"Lokacin Phoenix Islands"} } "meta:Pierre_Miquelon"{ - ld{"Lokaci rana ta St. Pierre da Miquelon"} - lg{"Lokaci ta St. Pierre da Miquelon"} - ls{"Lokaci tsayayye St. Pierre da Miquelon"} + ld{"Lokacin Rana na St. Pierre da Miquelon"} + lg{"Lokacin St. Pierre da Miquelon"} + ls{"Tsayayyen Lokacin St. Pierre da Miquelon"} } "meta:Pitcairn"{ - ls{"Pitcairn Time"} + ls{"Lokacin Pitcairn"} } "meta:Ponape"{ - ls{"Ponape Time"} + ls{"Lokacin Ponape"} } "meta:Pyongyang"{ - ls{"Pyongyang Time"} + ls{"Lokacin Pyongyang"} } "meta:Reunion"{ - ls{"Réunion Time"} + ls{"Lokacin Réunion"} } "meta:Rothera"{ - ls{"Rothera Time"} + ls{"Lokacin Rothera"} } "meta:Sakhalin"{ - ld{"Sakhalin Summer Time"} - lg{"Sakhalin Time"} - ls{"Sakhalin Standard Time"} + ld{"Lokacin Bazara na Sakhalin"} + lg{"Lokacin Sakhalin"} + ls{"Tsayayyen Lokacin Sakhalin"} } "meta:Samoa"{ - ld{"Samoa Daylight Time"} - lg{"Samoa Time"} - ls{"Samoa Standard Time"} + ld{"Lokacin Rana na Vote Samoa"} + lg{"Lokacin Samoa"} + ls{"Tsayayyen Lokacin Samoa"} } "meta:Seychelles"{ - ls{"Seychelles Time"} + ls{"Lokacin Seychelles"} } "meta:Singapore"{ - ls{"Singapore Standard Time"} + ls{"Tsayayyen Lokacin Singapore"} } "meta:Solomon"{ - ls{"Solomon Islands Time"} + ls{"Lokacin Rana na Solomon"} + } + "meta:South_Georgia"{ + ls{"Lokacin Kudancin Georgia"} + } + "meta:Suriname"{ + ls{"Lokacin Suriname"} } "meta:Syowa"{ - ls{"Syowa Time"} + ls{"Lokacin Syowa"} } "meta:Tahiti"{ - ls{"Tahiti Time"} + ls{"Lokacin Tahiti"} } "meta:Taipei"{ - ld{"Taipei Daylight Time"} - lg{"Taipei Time"} - ls{"Taipei Standard Time"} + ld{"Lokacin Rana na Taipei"} + lg{"Lokacin Taipei"} + ls{"Tsayayyen Lokacin Taipei"} } "meta:Tajikistan"{ - ls{"Tajikistan Time"} + ls{"Lokacin Tajikistan"} } "meta:Tokelau"{ ls{"Tokelau Time"} } "meta:Tonga"{ - ld{"Tonga Summer Time"} - lg{"Tonga Time"} - ls{"Tonga Standard Time"} + ld{"Lokacin Bazara na Tonga"} + lg{"Lokacin Tonga"} + ls{"Tsayayyen Lokacin Tonga"} } "meta:Truk"{ - ls{"Chuuk Time"} + ls{"Lokacin Chuuk"} } "meta:Turkmenistan"{ ld{"Turkmenistan Summer Time"} - lg{"Turkmenistan Time"} - ls{"Turkmenistan Standard Time"} + lg{"Lokacin Turkmenistan"} + ls{"Tsayayyen Lokacin Turkmenistan"} } "meta:Tuvalu"{ - ls{"Tuvalu Time"} + ls{"Lokacin Tuvalu"} + } + "meta:Uruguay"{ + ld{"Lokacin Bazara na Uruguay"} + lg{"Lokacin Uruguay"} + ls{"Tsayayyen Lokacin Uruguay"} } "meta:Uzbekistan"{ - ld{"Uzbekistan Summer Time"} - lg{"Uzbekistan Time"} - ls{"Uzbekistan Standard Time"} + ld{"Lokacin Bazara na Uzbekistan"} + lg{"Lokacin Uzbekistan"} + ls{"Tsayayyen Lokacin Uzbekistan"} } "meta:Vanuatu"{ - ld{"Vanuatu Summer Time"} - lg{"Vanuatu Time"} - ls{"Vanuatu Standard Time"} + ld{"Lokacin Bazara na Vanuatu"} + lg{"Lokacin Vanuatu"} + ls{"Tsayayyen Lokacin Vanuatu"} + } + "meta:Venezuela"{ + ls{"Lokacin Venezuela"} } "meta:Vladivostok"{ - ld{"Vladivostok Summer Time"} - lg{"Vladivostok Time"} - ls{"Vladivostok Standard Time"} + ld{"Lokacin Bazara na Vladivostok"} + lg{"Lokacin Vladivostok"} + ls{"Tsayayyen Lokacin Vladivostok"} } "meta:Volgograd"{ - ld{"Volgograd Summer Time"} - lg{"Volgograd Time"} - ls{"Volgograd Standard Time"} + ld{"Lokacin Bazara na Volgograd"} + lg{"Lokacin Volgograd"} + ls{"Tsayayyen Lokacin Volgograd"} } "meta:Vostok"{ - ls{"Vostok Time"} + ls{"Lokacin Vostok"} } "meta:Wake"{ - ls{"Wake Island Time"} + ls{"Lokacin Wake Island"} } "meta:Wallis"{ - ls{"Wallis & Futuna Time"} + ls{"Lokacin Wallis da Futuna"} } "meta:Yakutsk"{ - ld{"Yakutsk Summer Time"} - lg{"Yakutsk Time"} - ls{"Yakutsk Standard Time"} + ld{"Lokacin Bazara na Yakutsk"} + lg{"Lokacin Yakutsk"} + ls{"Tsayayyen Lokacin Yakutsk"} } "meta:Yekaterinburg"{ - ld{"Yekaterinburg Summer Time"} - lg{"Yekaterinburg Time"} - ls{"Yekaterinburg Standard Time"} + ld{"Lokacin Bazara na Yekaterinburg"} + lg{"Lokacin Yekaterinburg"} + ls{"Tsayayyen Lokacin Yekaterinburg"} } regionFormat{"{0} Lokaci"} - regionFormatDaylight{"{0} Lokacin rana"} - regionFormatStandard{"{0} Daidai ta ce lokaci"} + regionFormatDaylight{"{0} Lokacin Rana"} + regionFormatStandard{"{0} Daidaitaccen Lokaci"} } } diff --git a/intl/icu/source/data/zone/haw.txt b/intl/icu/source/data/zone/haw.txt index 53439a6963e4..f0f669a69487 100644 --- a/intl/icu/source/data/zone/haw.txt +++ b/intl/icu/source/data/zone/haw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml haw{ - Version{"37"} zoneStrings{ "Pacific:Honolulu"{ sd{"HDT"} diff --git a/intl/icu/source/data/zone/he.txt b/intl/icu/source/data/zone/he.txt index 0490cd4897d8..692c326d14c9 100644 --- a/intl/icu/source/data/zone/he.txt +++ b/intl/icu/source/data/zone/he.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml he{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"אביג׳אן"} @@ -613,7 +613,7 @@ he{ ec{"דומון ד׳אורוויל"} } "Antarctica:Macquarie"{ - ec{"מקרי"} + ec{"מקווארי"} } "Antarctica:Mawson"{ ec{"מוסון"} diff --git a/intl/icu/source/data/zone/he_IL.txt b/intl/icu/source/data/zone/he_IL.txt index 71039533a130..21ee915c5e3d 100644 --- a/intl/icu/source/data/zone/he_IL.txt +++ b/intl/icu/source/data/zone/he_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/hi.txt b/intl/icu/source/data/zone/hi.txt index 67632817e3be..f9051bbed62a 100644 --- a/intl/icu/source/data/zone/hi.txt +++ b/intl/icu/source/data/zone/hi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hi{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"अबिदजान"} @@ -1219,6 +1219,8 @@ hi{ } "Pacific:Honolulu"{ ec{"होनोलुलु"} + sg{"एचएसटी"} + ss{"एचएसटी"} } "Pacific:Johnston"{ ec{"जॉनस्टन"} diff --git a/intl/icu/source/data/zone/hr.txt b/intl/icu/source/data/zone/hr.txt index 113cc648fc2a..064b41cbe889 100644 --- a/intl/icu/source/data/zone/hr.txt +++ b/intl/icu/source/data/zone/hr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hr{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -898,7 +898,7 @@ hr{ ec{"Kanari"} } "Atlantic:Cape_Verde"{ - ec{"Zelenortski Otoci"} + ec{"Cape Verde"} } "Atlantic:Faeroe"{ ec{"Ferojski otoci"} @@ -1149,13 +1149,13 @@ hr{ ec{"Chagos"} } "Indian:Christmas"{ - ec{"Božićni otok"} + ec{"Christmas"} } "Indian:Cocos"{ - ec{"Kokosovi otoci"} + ec{"Cocos"} } "Indian:Comoro"{ - ec{"Komori"} + ec{"Comoro"} } "Indian:Kerguelen"{ ec{"Kerguelen"} @@ -1188,7 +1188,7 @@ hr{ ec{"Chatham"} } "Pacific:Easter"{ - ec{"Uskršnji otok"} + ec{"Easter"} } "Pacific:Efate"{ ec{"Efate"} @@ -1821,10 +1821,10 @@ hr{ ls{"standardno vrijeme za Sveti Petar i Mikelon"} } "meta:Pitcairn"{ - ls{"vrijeme Pitcairna"} + ls{"pitcairnsko vrijeme"} } "meta:Ponape"{ - ls{"vrijeme Ponapea"} + ls{"ponapejsko vrijeme"} } "meta:Pyongyang"{ ls{"pjongjanško vrijeme"} diff --git a/intl/icu/source/data/zone/hsb.txt b/intl/icu/source/data/zone/hsb.txt index 53928ace93cb..3e13da241b09 100644 --- a/intl/icu/source/data/zone/hsb.txt +++ b/intl/icu/source/data/zone/hsb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hsb{ - Version{"37"} zoneStrings{ "Africa:Accra"{ ec{"Akkra"} diff --git a/intl/icu/source/data/zone/hu.txt b/intl/icu/source/data/zone/hu.txt index 753ce49d4489..611c88c67d18 100644 --- a/intl/icu/source/data/zone/hu.txt +++ b/intl/icu/source/data/zone/hu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hu{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -955,7 +955,7 @@ hu{ ec{"Sydney"} } "Etc:UTC"{ - ls{"Koordinált világidő"} + ls{"koordinált világidő"} } "Etc:Unknown"{ ec{"Ismeretlen város"} diff --git a/intl/icu/source/data/zone/hy.txt b/intl/icu/source/data/zone/hy.txt index c3f5abfc9de7..22b2747923b9 100644 --- a/intl/icu/source/data/zone/hy.txt +++ b/intl/icu/source/data/zone/hy.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml hy{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Աբիջան"} diff --git a/intl/icu/source/data/zone/ia.txt b/intl/icu/source/data/zone/ia.txt index 6e38b761dfa7..be55659cbd04 100644 --- a/intl/icu/source/data/zone/ia.txt +++ b/intl/icu/source/data/zone/ia.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ia{ - Version{"37"} zoneStrings{ "Africa:Ceuta"{ ec{"Ceuta"} diff --git a/intl/icu/source/data/zone/id.txt b/intl/icu/source/data/zone/id.txt index f71089c3ab11..bfd5f1d37dc0 100644 --- a/intl/icu/source/data/zone/id.txt +++ b/intl/icu/source/data/zone/id.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml id{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1663,7 +1663,7 @@ id{ ls{"Waktu Standar Krasnoyarsk"} } "meta:Kyrgystan"{ - ls{"Waktu Kirghizia"} + ls{"Waktu Kirgizstan"} } "meta:Lanka"{ ls{"Waktu Lanka"} @@ -1725,9 +1725,9 @@ id{ ls{"Waktu Standar Ulan Bator"} } "meta:Moscow"{ - ld{"Waktu Musim Panas Moskwa"} - lg{"Waktu Moskwa"} - ls{"Waktu Standar Moskwa"} + ld{"Waktu Musim Panas Moskow"} + lg{"Waktu Moskow"} + ls{"Waktu Standar Moskow"} } "meta:Myanmar"{ ls{"Waktu Myanmar"} @@ -1757,9 +1757,9 @@ id{ ls{"Waktu Niue"} } "meta:Norfolk"{ - ld{"Waktu Musim Panas Kepulauan Norfolk"} - lg{"Waktu Kepulauan Norfolk"} - ls{"Waktu Standar Kepulauan Norfolk"} + ld{"Waktu Musim Panas Pulau Norfolk"} + lg{"Waktu Pulau Norfolk"} + ls{"Waktu Standar Pulau Norfolk"} } "meta:Noronha"{ ld{"Waktu Musim Panas Fernando de Noronha"} diff --git a/intl/icu/source/data/zone/id_ID.txt b/intl/icu/source/data/zone/id_ID.txt index 20daa236ee75..63f19a21aa60 100644 --- a/intl/icu/source/data/zone/id_ID.txt +++ b/intl/icu/source/data/zone/id_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ig.txt b/intl/icu/source/data/zone/ig.txt index 863520b5c590..76744f55188c 100644 --- a/intl/icu/source/data/zone/ig.txt +++ b/intl/icu/source/data/zone/ig.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ig{ - Version{"37"} zoneStrings{ "America:Araguaina"{ ec{"Araguaina"} @@ -220,6 +220,9 @@ ig{ lg{"Oge Mpaghara Ọwụwa Anyanwụ Europe"} ls{"Oge Izugbe Mpaghara Ọwụwa Anyanwụ Europe"} } + "meta:Europe_Further_Eastern"{ + ls{"Further-eastern European Time"} + } "meta:Europe_Western"{ ld{"Oge Okpomọkụ Mpaghara Ọdịda Anyanwụ Europe"} lg{"Oge Mpaghara Ọdịda Anyanwụ Europe"} diff --git a/intl/icu/source/data/zone/ii.txt b/intl/icu/source/data/zone/ii.txt index 6eb8addea76c..0d48243f7f68 100644 --- a/intl/icu/source/data/zone/ii.txt +++ b/intl/icu/source/data/zone/ii.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ii{ - Version{"37"} zoneStrings{ "Etc:Unknown"{ ec{"ꅉꀋꐚꌠ"} diff --git a/intl/icu/source/data/zone/in.txt b/intl/icu/source/data/zone/in.txt index 02335238ad02..e2df1690e399 100644 --- a/intl/icu/source/data/zone/in.txt +++ b/intl/icu/source/data/zone/in.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in{ "%%ALIAS"{"id"} } diff --git a/intl/icu/source/data/zone/in_ID.txt b/intl/icu/source/data/zone/in_ID.txt index acec72c6e987..03f238793675 100644 --- a/intl/icu/source/data/zone/in_ID.txt +++ b/intl/icu/source/data/zone/in_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml in_ID{ "%%ALIAS"{"id_ID"} } diff --git a/intl/icu/source/data/zone/is.txt b/intl/icu/source/data/zone/is.txt index 8804f37a99c3..8fc3b113790b 100644 --- a/intl/icu/source/data/zone/is.txt +++ b/intl/icu/source/data/zone/is.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml is{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1107,7 +1107,7 @@ is{ ec{"Tallinn"} } "Europe:Tirane"{ - ec{"Tirane"} + ec{"Tírana"} } "Europe:Ulyanovsk"{ ec{"Ulyanovsk"} diff --git a/intl/icu/source/data/zone/it.txt b/intl/icu/source/data/zone/it.txt index 217a7148367d..88ee9bc6582b 100644 --- a/intl/icu/source/data/zone/it.txt +++ b/intl/icu/source/data/zone/it.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml it{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/iw.txt b/intl/icu/source/data/zone/iw.txt index d59865d1cdb7..4aa2f62d2681 100644 --- a/intl/icu/source/data/zone/iw.txt +++ b/intl/icu/source/data/zone/iw.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw{ "%%ALIAS"{"he"} } diff --git a/intl/icu/source/data/zone/iw_IL.txt b/intl/icu/source/data/zone/iw_IL.txt index cf1666a681ee..984aefd0f82d 100644 --- a/intl/icu/source/data/zone/iw_IL.txt +++ b/intl/icu/source/data/zone/iw_IL.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml iw_IL{ "%%ALIAS"{"he_IL"} } diff --git a/intl/icu/source/data/zone/ja.txt b/intl/icu/source/data/zone/ja.txt index b593bb0f3d02..8f693533ecc2 100644 --- a/intl/icu/source/data/zone/ja.txt +++ b/intl/icu/source/data/zone/ja.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ja{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"アビジャン"} diff --git a/intl/icu/source/data/zone/jgo.txt b/intl/icu/source/data/zone/jgo.txt index 4ee7feccf358..acc553a9dfdf 100644 --- a/intl/icu/source/data/zone/jgo.txt +++ b/intl/icu/source/data/zone/jgo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jgo{ - Version{"37"} zoneStrings{ fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} diff --git a/intl/icu/source/data/zone/jmc.txt b/intl/icu/source/data/zone/jmc.txt index a67dfa46d809..425a4ab91030 100644 --- a/intl/icu/source/data/zone/jmc.txt +++ b/intl/icu/source/data/zone/jmc.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jmc{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/jv.txt b/intl/icu/source/data/zone/jv.txt index 233e6732c178..92c5792e4414 100644 --- a/intl/icu/source/data/zone/jv.txt +++ b/intl/icu/source/data/zone/jv.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml jv{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/ka.txt b/intl/icu/source/data/zone/ka.txt index 45bde00e975b..25bb41d39a40 100644 --- a/intl/icu/source/data/zone/ka.txt +++ b/intl/icu/source/data/zone/ka.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ka{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"აბიჯანი"} @@ -985,7 +985,7 @@ ka{ ec{"ბრიუსელი"} } "Europe:Bucharest"{ - ec{"ბუხარესტი"} + ec{"ბუქარესტი"} } "Europe:Budapest"{ ec{"ბუდაპეშტი"} @@ -1116,7 +1116,7 @@ ka{ ec{"უჟგოროდი"} } "Europe:Vaduz"{ - ec{"ვადუზი"} + ec{"ვადუცი"} } "Europe:Vatican"{ ec{"ვატიკანი"} diff --git a/intl/icu/source/data/zone/kab.txt b/intl/icu/source/data/zone/kab.txt index 75a697e6112a..f76905a5be77 100644 --- a/intl/icu/source/data/zone/kab.txt +++ b/intl/icu/source/data/zone/kab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kab{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kam.txt b/intl/icu/source/data/zone/kam.txt index f9443d0603d6..26e23bcd3190 100644 --- a/intl/icu/source/data/zone/kam.txt +++ b/intl/icu/source/data/zone/kam.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kam{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kde.txt b/intl/icu/source/data/zone/kde.txt index a7179f73f769..ce04321a8194 100644 --- a/intl/icu/source/data/zone/kde.txt +++ b/intl/icu/source/data/zone/kde.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kde{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kea.txt b/intl/icu/source/data/zone/kea.txt index f1c39b555ccc..ce9fe08878bf 100644 --- a/intl/icu/source/data/zone/kea.txt +++ b/intl/icu/source/data/zone/kea.txt @@ -1,14 +1,38 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kea{ - Version{"37"} zoneStrings{ + "America:Adak"{ + ec{"Adaki"} + } + "America:Anchorage"{ + ec{"Ankoraji"} + } + "America:Anguilla"{ + ec{"Angila"} + } + "America:Bahia_Banderas"{ + ec{"Baía di Banderas"} + } + "America:Barbados"{ + ec{"Barbadus"} + } + "America:Belize"{ + ec{"Belizi"} + } "America:Blanc-Sablon"{ ec{"Blank-Sablon"} } + "America:Boise"{ + ec{"Boiz"} + } "America:Cancun"{ ec{"Kankun"} } + "America:Cayman"{ + ec{"Kaiman"} + } "America:Chicago"{ ec{"Xikagu"} } @@ -18,8 +42,92 @@ kea{ "America:Costa_Rica"{ ec{"Kosta Rika"} } + "America:Creston"{ + ec{"Kréston"} + } + "America:Curacao"{ + ec{"Kurasau"} + } + "America:Dominica"{ + ec{"Dominika"} + } + "America:Grenada"{ + ec{"Granada"} + } + "America:Guadeloupe"{ + ec{"Guadalupi"} + } + "America:Guatemala"{ + ec{"Guatimala"} + } + "America:Havana"{ + ec{"Avana"} + } "America:Indianapolis"{ - ec{"Indianapolis"} + ec{"Indianápolis"} + } + "America:Jamaica"{ + ec{"Jamaika"} + } + "America:Managua"{ + ec{"Manágua"} + } + "America:Martinique"{ + ec{"Martinika"} + } + "America:Merida"{ + ec{"Mérida"} + } + "America:Mexico_City"{ + ec{"Sidadi di Méxiku"} + } + "America:Miquelon"{ + ec{"Mikelon"} + } + "America:New_York"{ + ec{"Nova Iorki"} + } + "America:North_Dakota:Beulah"{ + ec{"Beulah, Dakota di Norti"} + } + "America:North_Dakota:Center"{ + ec{"Center, Dakota di Norti"} + } + "America:North_Dakota:New_Salem"{ + ec{"New Salem, Dakota di Norti"} + } + "America:Panama"{ + ec{"Panamá"} + } + "America:Port_of_Spain"{ + ec{"Portu di Spanha"} + } + "America:Puerto_Rico"{ + ec{"Portu Riku"} + } + "America:Santo_Domingo"{ + ec{"Santu Dumingu"} + } + "America:St_Barthelemy"{ + ec{"San Bartolomeu"} + } + "America:St_Kitts"{ + ec{"San Kristovan"} + } + "America:St_Lucia"{ + ec{"Santa Lúsia"} + } + "America:St_Vincent"{ + ec{"San Bisenti"} + } + "America:Toronto"{ + ec{"Torontu"} + } + "America:Vancouver"{ + ec{"Vankuver"} + } + "America:Winnipeg"{ + ec{"Uínipeg"} } "Atlantic:Bermuda"{ ec{"Bermuda"} @@ -128,6 +236,41 @@ kea{ "meta:GMT"{ ls{"Ora Médiu di Greenwich"} } + "meta:Greenland_Eastern"{ + ld{"Ora di Veron di Gronelándia Oriental"} + lg{"Ora di Gronelándia Oriental"} + ls{"Ora Padron di Gronelándia Oriental"} + } + "meta:Greenland_Western"{ + ld{"Ora di Veron di Gronelándia Osidental"} + lg{"Ora di Gronelándia Osidental"} + ls{"Ora Padron di Gronelándia Osidental"} + } + "meta:Hawaii_Aleutian"{ + ld{"Ora di Veron di Avaí i Aleutas"} + lg{"Ora di Avaí i Aleutas"} + ls{"Ora Padron di Avaí i Aleutas"} + } + "meta:Mexico_Northwest"{ + ld{"Ora di Veron di Noroesti di Méxiku"} + lg{"Ora di Noroesti di Méxiku"} + ls{"Ora Padron di Noroesti di Méxiku"} + } + "meta:Mexico_Pacific"{ + ld{"Ora di Veron di Pasífiku Mexikanu"} + lg{"Ora di Pasífiku Mexikanu"} + ls{"Ora Padron di Pasífiku Mexikanu"} + } + "meta:Newfoundland"{ + ld{"Ora di Veron di Tera Nova"} + lg{"Ora di Tera Nova"} + ls{"Ora Padron di Tera Nova"} + } + "meta:Pierre_Miquelon"{ + ld{"Ora di Veron di San Pedru i Mikelon"} + lg{"Ora di San Pedru i Mikelon"} + ls{"Ora Padron di San Pedru i Mikelon"} + } fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} gmtZeroFormat{"GMT"} diff --git a/intl/icu/source/data/zone/khq.txt b/intl/icu/source/data/zone/khq.txt index a1314c46e8c1..a225321ade69 100644 --- a/intl/icu/source/data/zone/khq.txt +++ b/intl/icu/source/data/zone/khq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml khq{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ki.txt b/intl/icu/source/data/zone/ki.txt index 9d196a41067c..b48183819162 100644 --- a/intl/icu/source/data/zone/ki.txt +++ b/intl/icu/source/data/zone/ki.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ki{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kk.txt b/intl/icu/source/data/zone/kk.txt index 1a493b7d92ff..57ab2d0949fc 100644 --- a/intl/icu/source/data/zone/kk.txt +++ b/intl/icu/source/data/zone/kk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kk{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} diff --git a/intl/icu/source/data/zone/kkj.txt b/intl/icu/source/data/zone/kkj.txt index 4eaaba5f17c1..dd77640ec5a7 100644 --- a/intl/icu/source/data/zone/kkj.txt +++ b/intl/icu/source/data/zone/kkj.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kkj{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kl.txt b/intl/icu/source/data/zone/kl.txt index c29bc16f9ff2..b9e616809eb6 100644 --- a/intl/icu/source/data/zone/kl.txt +++ b/intl/icu/source/data/zone/kl.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kl{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kln.txt b/intl/icu/source/data/zone/kln.txt index 6ac43c271ceb..0db23ba9ec63 100644 --- a/intl/icu/source/data/zone/kln.txt +++ b/intl/icu/source/data/zone/kln.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kln{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/km.txt b/intl/icu/source/data/zone/km.txt index 64d692787726..899c7fa34413 100644 --- a/intl/icu/source/data/zone/km.txt +++ b/intl/icu/source/data/zone/km.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml km{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"អាប៊ីដ្យាន"} @@ -1010,7 +1010,7 @@ km{ ec{"ហ្គេនស៊ី"} } "Europe:Helsinki"{ - ec{"ហែលស៊ិងគី"} + ec{"ហែលស៊ិនគី"} } "Europe:Isle_of_Man"{ ec{"អែលអុហ្វម៉ែន"} @@ -1074,7 +1074,7 @@ km{ ec{"ប្រាក"} } "Europe:Riga"{ - ec{"រីហ្គា"} + ec{"រីហ្កា"} } "Europe:Rome"{ ec{"រ៉ូម"} @@ -1335,9 +1335,9 @@ km{ ls{"ម៉ោងស្តង់ដារ​នៅតំបន់ភ្នំនៃទ្វីប​អាមេរិក​​​ខាង​ជើង"} } "meta:America_Pacific"{ - ld{"ម៉ោង​​ពេលថ្ងៃនៅទ្វីប​អាមរិក​ខាង​ជើងភាគខាងលិច"} - lg{"ម៉ោង​​នៅទ្វីប​អាមរិក​ខាង​ជើងភាគខាងលិច"} - ls{"ម៉ោងស្តង់ដារ​​​នៅទ្វីប​អាមរិក​ខាង​ជើងភាគខាងលិច"} + ld{"ម៉ោងពេលថ្ងៃនៅប៉ាស៊ីហ្វិកអាមេរិក"} + lg{"ម៉ោងនៅប៉ាស៊ីហ្វិកអាមេរិក"} + ls{"ម៉ោងស្ដង់ដារនៅប៉ាស៊ីហ្វិកអាមេរិក"} } "meta:Apia"{ ld{"ម៉ោង​ពេល​ថ្ងៃ​នៅ​អាប្យា"} @@ -1711,7 +1711,7 @@ km{ } "meta:Norfolk"{ ld{"ម៉ោងនៅ​ណ័រហ្វក់នា​រដូវ​ក្ដៅ"} - lg{"ម៉ោង​នៅ​កោះ​ន័រហ្វក់"} + lg{"ម៉ោង​នៅ​កោះ​ណ័រហ្វក់"} ls{"ម៉ោង​ស្ដង់ដារ​នៅ​ណ័រហ្វក់"} } "meta:Noronha"{ diff --git a/intl/icu/source/data/zone/kn.txt b/intl/icu/source/data/zone/kn.txt index 02c0bd84ddef..6e034f5c82b2 100644 --- a/intl/icu/source/data/zone/kn.txt +++ b/intl/icu/source/data/zone/kn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kn{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ಅಬಿದ್‌ಜನ್"} @@ -850,7 +850,7 @@ kn{ ec{"ತಾಶ್ಕೆಂಟ್"} } "Asia:Tbilisi"{ - ec{"ತಿಬಿಲಿಸಿ"} + ec{"ಟಿಬಿಲಿಸಿ"} } "Asia:Tehran"{ ec{"ತೆಹ್ರಾನ್"} @@ -865,7 +865,7 @@ kn{ ec{"ಟೋಮ್‌ಸ್ಕ್"} } "Asia:Ulaanbaatar"{ - ec{"ಉಲಾನ್‍ಬಾತರ್"} + ec{"ಉಲಾನ್ ಬತೊರ್"} } "Asia:Urumqi"{ ec{"ಉರುಮ್‍ಕಿ"} @@ -886,7 +886,7 @@ kn{ ec{"ಎಕ್ಯಾಟೆರಿನ್ಬರ್ಗ್"} } "Asia:Yerevan"{ - ec{"ಯೆರಿವಾನ್"} + ec{"ಯೆರೆವಾನ್"} } "Atlantic:Azores"{ ec{"ಅಝೋರಿಸ್"} @@ -1086,7 +1086,7 @@ kn{ ec{"ಸ್ಯಾನ್ ಮರೀನೊ"} } "Europe:Sarajevo"{ - ec{"ಸರಜೆವೊ"} + ec{"ಸರಯೇವೊ"} } "Europe:Saratov"{ ec{"ಸರಾಟೋವ್"} @@ -1292,6 +1292,11 @@ kn{ "Pacific:Wallis"{ ec{"ವ್ಯಾಲಿಸ್"} } + "meta:Acre"{ + ld{"ಏಕರ್ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಏಕರ್ ಸಮಯ"} + ls{"ಏಕರ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } "meta:Afghanistan"{ ls{"ಅಫಘಾನಿಸ್ತಾನ ಸಮಯ"} } @@ -1314,6 +1319,11 @@ kn{ lg{"ಅಲಾಸ್ಕಾ ಸಮಯ"} ls{"ಅಲಸ್ಕಾ ಪ್ರಮಾಣಿತ ಸಮಯ"} } + "meta:Almaty"{ + ld{"ಆಲ್ಮೇಟಿ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಆಲ್ಮೇಟಿ ಸಮಯ"} + ls{"ಆಲ್ಮೇಟಿ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } "meta:Amazon"{ ld{"ಅಮೆಜಾನ್ ಬೇಸಿಗೆ ಸಮಯ"} lg{"ಅಮೆಜಾನ್ ಸಮಯ"} @@ -1349,6 +1359,16 @@ kn{ lg{"ಅಪಿಯಾ ಸಮಯ"} ls{"ಅಪಿಯಾ ಪ್ರಮಾಣಿತ ಸಮಯ"} } + "meta:Aqtau"{ + ld{"ಅಕ್ಟೌ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಅಕ್ಟೌ ಸಮಯ"} + ls{"ಅಕ್ಟೌ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } + "meta:Aqtobe"{ + ld{"ಅಕ್ಟೋಬೆ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಅಕ್ಟೋಬೆ ಸಮಯ"} + ls{"ಅಕ್ಟೋಬೆ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } "meta:Arabian"{ ld{"ಅರೇಬಿಯನ್ ಹಗಲು ಸಮಯ"} lg{"ಅರೇಬಿಯನ್ ಸಮಯ"} @@ -1508,9 +1528,9 @@ kn{ ls{"ಪಶ್ಚಿಮ ಯುರೋಪಿಯನ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} } "meta:Falkland"{ - ld{"ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಬೇಸಿಗೆ ಸಮಯ"} - lg{"ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಸಮಯ"} - ls{"ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪ್ರಮಾಣಿತ ಸಮಯ"} + ld{"ಫಾಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಫಾಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಸಮಯ"} + ls{"ಫಾಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪ್ರಮಾಣಿತ ಸಮಯ"} } "meta:Fiji"{ ld{"ಫಿಜಿ ಬೇಸಿಗೆ ಸಮಯ"} @@ -1550,6 +1570,9 @@ kn{ lg{"ಪಶ್ಚಿಮ ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಸಮಯ"} ls{"ಪಶ್ಚಿಮ ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} } + "meta:Guam"{ + ls{"ಗುವಾಮ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } "meta:Gulf"{ ls{"ಗಲ್ಫ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} } @@ -1637,6 +1660,9 @@ kn{ "meta:Kyrgystan"{ ls{"ಕಿರ್ಗಿಸ್ತಾನ್ ಸಮಯ"} } + "meta:Lanka"{ + ls{"ಲಂಕಾ ಸಮಯ"} + } "meta:Line_Islands"{ ls{"ಲೈನ್ ದ್ವೀಪಗಳ ಸಮಯ"} } @@ -1645,6 +1671,11 @@ kn{ lg{"ಲಾರ್ಡ್ ಹೋವ್ ಸಮಯ"} ls{"ಲಾರ್ಡ್ ಹೋವ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} } + "meta:Macau"{ + ld{"ಮಕಾವ್ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಮಕಾವ್ ಸಮಯ"} + ls{"ಮಕಾವ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } "meta:Macquarie"{ ls{"ಮ್ಯಾಕ್‌ಕ್ಯುರೈ ದ್ವೀಪ ಸಮಯ"} } @@ -1684,9 +1715,9 @@ kn{ ls{"ಮೆಕ್ಸಿಕನ್ ಪೆಸಿಫಿಕ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} } "meta:Mongolia"{ - ld{"ಉಲನ್ ಬ್ಯಾಟರ್ ಬೇಸಿಗೆ ಸಮಯ"} - lg{"ಉಲನ್ ಬ್ಯಾಟರ್ ಸಮಯ"} - ls{"ಉಲನ್ ಬ್ಯಾಟರ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} + ld{"ಉಲಾನ್ ಬತೊರ್ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಉಲಾನ್ ಬತೊರ್ ಸಮಯ"} + ls{"ಉಲಾನ್ ಬತೊರ್ ಪ್ರಮಾಣಿತ ಸಮಯ"} } "meta:Moscow"{ ld{"ಮಾಸ್ಕೋ ಬೇಸಿಗೆ ಸಮಯ"} @@ -1730,6 +1761,9 @@ kn{ lg{"ಫೆರ್ನಾಂಡೋ ಡೆ ನೊರೊನ್ಹಾ ಸಮಯ"} ls{"ಫೆರ್ನಾಂಡೋ ಡೆ ನೊರೊನ್ಹಾ ಪ್ರಮಾಣಿತ ಸಮಯ"} } + "meta:North_Mariana"{ + ls{"ಉತ್ತರ ಮರಿಯಾನಾ ದ್ವೀಪಗಳ ಸಮಯ"} + } "meta:Novosibirsk"{ ld{"ನೊವೊಸಿಬಿರ್‌ಸ್ಕ್ ಬೇಸಿಗೆ ಸಮಯ"} lg{"ನೊವೊಸಿಬಿರ್‌ಸ್ಕ್ ಸಮಯ"} @@ -1783,6 +1817,11 @@ kn{ "meta:Pyongyang"{ ls{"ಪ್ಯೊಂಗ್ಯಾಂಗ್ ಸಮಯ"} } + "meta:Qyzylorda"{ + ld{"ಕೋಜಿಲೋರ್ಡಾ ಬೇಸಿಗೆ ಸಮಯ"} + lg{"ಕೋಜಿಲೋರ್ಡಾ ಸಮಯ"} + ls{"ಕೋಜಿಲೋರ್ಡಾ ಪ್ರಮಾಣಿತ ಸಮಯ"} + } "meta:Reunion"{ ls{"ರಿಯೂನಿಯನ್ ಸಮಯ"} } diff --git a/intl/icu/source/data/zone/ko.txt b/intl/icu/source/data/zone/ko.txt index b23a41dd9f16..ecd9f4baf15d 100644 --- a/intl/icu/source/data/zone/ko.txt +++ b/intl/icu/source/data/zone/ko.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"아비장"} @@ -346,25 +346,25 @@ ko{ ec{"에르모시요"} } "America:Indiana:Knox"{ - ec{"인디애나주 녹스"} + ec{"인디애나주, 녹스"} } "America:Indiana:Marengo"{ - ec{"인디애나주, 마렝고"} + ec{"인디애나주, 머렝고"} } "America:Indiana:Petersburg"{ ec{"인디애나주, 피츠버그"} } "America:Indiana:Tell_City"{ - ec{"인디아나주, 텔시티"} + ec{"인디애나주, 텔시티"} } "America:Indiana:Vevay"{ - ec{"비비"} + ec{"인디애나주, 비비"} } "America:Indiana:Vincennes"{ - ec{"인디아나주, 뱅센"} + ec{"인디애나주, 빈센스"} } "America:Indiana:Winamac"{ - ec{"인디아나주, 워너맥"} + ec{"인디애나주, 위너맥"} } "America:Indianapolis"{ ec{"인디애나폴리스"} @@ -478,7 +478,7 @@ ko{ ec{"중부, 노스다코타"} } "America:North_Dakota:New_Salem"{ - ec{"노스 다코타주, 뉴살렘"} + ec{"노스다코타주, 뉴살렘"} } "America:Ojinaga"{ ec{"오히나가"} @@ -556,16 +556,16 @@ ko{ ec{"세인트존스"} } "America:St_Kitts"{ - ec{"세인트 키츠"} + ec{"세인트키츠"} } "America:St_Lucia"{ - ec{"세인트 루시아"} + ec{"세인트루시아"} } "America:St_Thomas"{ - ec{"세인트 토마스"} + ec{"세인트토마스"} } "America:St_Vincent"{ - ec{"세인트 빈센트"} + ec{"세인트빈센트"} } "America:Swift_Current"{ ec{"스위프트커런트"} @@ -1513,9 +1513,9 @@ ko{ ls{"에콰도르 시간"} } "meta:Europe_Central"{ - ld{"중부 유럽 하계 표준시"} - lg{"중부 유럽 시간"} - ls{"중부 유럽 표준시"} + ld{"중부유럽 하계 표준시"} + lg{"중부유럽 시간"} + ls{"중부유럽 표준시"} } "meta:Europe_Eastern"{ ld{"동유럽 하계 표준시"} @@ -1523,7 +1523,7 @@ ko{ ls{"동유럽 표준시"} } "meta:Europe_Further_Eastern"{ - ls{"극동 유럽 표준시"} + ls{"극동유럽 표준시"} } "meta:Europe_Western"{ ld{"서유럽 하계 표준시"} diff --git a/intl/icu/source/data/zone/ko_KP.txt b/intl/icu/source/data/zone/ko_KP.txt index be396ca5f5ca..37fcc4a30faf 100644 --- a/intl/icu/source/data/zone/ko_KP.txt +++ b/intl/icu/source/data/zone/ko_KP.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ko_KP{ - Version{"37"} zoneStrings{ "meta:Korea"{ ld{"조선 하계 표준시"} diff --git a/intl/icu/source/data/zone/kok.txt b/intl/icu/source/data/zone/kok.txt index 65fef2b242b4..5411497a29f3 100644 --- a/intl/icu/source/data/zone/kok.txt +++ b/intl/icu/source/data/zone/kok.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kok{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"अबिदजान"} diff --git a/intl/icu/source/data/zone/ks.txt b/intl/icu/source/data/zone/ks.txt index 0fc40469ad5c..7e3d06ac4dcd 100644 --- a/intl/icu/source/data/zone/ks.txt +++ b/intl/icu/source/data/zone/ks.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"عابِدجان"} diff --git a/intl/icu/source/data/zone/ks_Arab.txt b/intl/icu/source/data/zone/ks_Arab.txt index aafa093f1849..f3d2206e1162 100644 --- a/intl/icu/source/data/zone/ks_Arab.txt +++ b/intl/icu/source/data/zone/ks_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ks_Arab_IN.txt b/intl/icu/source/data/zone/ks_Arab_IN.txt index a13c0c960582..2d29f4c5e86f 100644 --- a/intl/icu/source/data/zone/ks_Arab_IN.txt +++ b/intl/icu/source/data/zone/ks_Arab_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/ks_IN.txt b/intl/icu/source/data/zone/ks_IN.txt index fd8b52d9b4a2..bd1a22537a8f 100644 --- a/intl/icu/source/data/zone/ks_IN.txt +++ b/intl/icu/source/data/zone/ks_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ks_IN{ "%%ALIAS"{"ks_Arab_IN"} } diff --git a/intl/icu/source/data/zone/ksb.txt b/intl/icu/source/data/zone/ksb.txt index f4818ce459be..77a38c1650ab 100644 --- a/intl/icu/source/data/zone/ksb.txt +++ b/intl/icu/source/data/zone/ksb.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksb{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ksf.txt b/intl/icu/source/data/zone/ksf.txt index bf1a877221f0..710fb8ba9cf4 100644 --- a/intl/icu/source/data/zone/ksf.txt +++ b/intl/icu/source/data/zone/ksf.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksf{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ksh.txt b/intl/icu/source/data/zone/ksh.txt index d4661c4ad022..f1a0cf549493 100644 --- a/intl/icu/source/data/zone/ksh.txt +++ b/intl/icu/source/data/zone/ksh.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ksh{ - Version{"37"} zoneStrings{ "Africa:Cairo"{ ec{"Kaijro"} diff --git a/intl/icu/source/data/zone/ku.txt b/intl/icu/source/data/zone/ku.txt index 3da099f6783a..a05d1d1162c7 100644 --- a/intl/icu/source/data/zone/ku.txt +++ b/intl/icu/source/data/zone/ku.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ku{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/kw.txt b/intl/icu/source/data/zone/kw.txt index 5e7c801cafc6..c7bcb9f14bcd 100644 --- a/intl/icu/source/data/zone/kw.txt +++ b/intl/icu/source/data/zone/kw.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml kw{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ky.txt b/intl/icu/source/data/zone/ky.txt index ab202b39ba21..33935d4917da 100644 --- a/intl/icu/source/data/zone/ky.txt +++ b/intl/icu/source/data/zone/ky.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ky{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} @@ -1320,7 +1320,7 @@ ky{ ls{"Амазон кышкы убактысы"} } "meta:America_Central"{ - ld{"Түндүк Америка, борбордук жайкы убакыт"} + ld{"Түндүк Америка, борбордук жайкы убактысы"} lg{"Түндүк Америка, борбордук убакыт"} ls{"Түндүк Америка, борбордук кышкы убактысы"} } @@ -1342,7 +1342,7 @@ ky{ "meta:Apia"{ ld{"Апиа жайкы убактысы"} lg{"Апиа убактысы"} - ls{"Апиа кышкы убакыты"} + ls{"Апиа кышкы убактысы"} } "meta:Arabian"{ ld{"Арабия жайкы убакыты"} @@ -1460,7 +1460,7 @@ ky{ "meta:Cook"{ ld{"Кук аралдарынын жарым жайкы убактысы"} lg{"Кук аралдарынын убактысы"} - ls{"Кук аралдарынын кышкы убакыты"} + ls{"Кук аралдарынын кышкы убактысы"} } "meta:Cuba"{ ld{"Куба жайкы убактысы"} @@ -1611,7 +1611,7 @@ ky{ ls{"Батыш Казакстан убактысы"} } "meta:Korea"{ - ld{"Корея жайкы убакыты"} + ld{"Корея жайкы убактысы"} lg{"Корея убактысы"} ls{"Корея кышкы убакыты"} } @@ -1694,7 +1694,7 @@ ky{ "meta:New_Caledonia"{ ld{"Жаңы Каледония жайкы убактысы"} lg{"Жаңы Каледония убактысы"} - ls{"Жаңы Каледония кышкы убакыты"} + ls{"Жаңы Каледония кышкы убактысы"} } "meta:New_Zealand"{ ld{"Жаңы Зеландия жайкы убакыты"} @@ -1786,7 +1786,7 @@ ky{ "meta:Samoa"{ ld{"Самоа жайкы убактысы"} lg{"Самоа убактысы"} - ls{"Самоа кышкы убакыты"} + ls{"Самоа кышкы убактысы"} } "meta:Seychelles"{ ls{"Сейшел убактысы"} @@ -1823,7 +1823,7 @@ ky{ "meta:Tonga"{ ld{"Тонга жайкы убактысы"} lg{"Тонга убактысы"} - ls{"Тонга кышкы убакыты"} + ls{"Тонга кышкы убактысы"} } "meta:Truk"{ ls{"Чуук убактысы"} diff --git a/intl/icu/source/data/zone/lag.txt b/intl/icu/source/data/zone/lag.txt index c34bb7fb1c78..b382d6ddf32e 100644 --- a/intl/icu/source/data/zone/lag.txt +++ b/intl/icu/source/data/zone/lag.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lag{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/lb.txt b/intl/icu/source/data/zone/lb.txt index 442114f73856..f0ca6cdf55da 100644 --- a/intl/icu/source/data/zone/lb.txt +++ b/intl/icu/source/data/zone/lb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lb{ - Version{"37"} zoneStrings{ "Africa:Accra"{ ec{"Accra"} diff --git a/intl/icu/source/data/zone/lg.txt b/intl/icu/source/data/zone/lg.txt index 0f448ef91717..d511f9e793fb 100644 --- a/intl/icu/source/data/zone/lg.txt +++ b/intl/icu/source/data/zone/lg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lg{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/lkt.txt b/intl/icu/source/data/zone/lkt.txt index 4126b05036bf..766350734b6a 100644 --- a/intl/icu/source/data/zone/lkt.txt +++ b/intl/icu/source/data/zone/lkt.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lkt{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ln.txt b/intl/icu/source/data/zone/ln.txt index af66a4099d0f..33510ac52575 100644 --- a/intl/icu/source/data/zone/ln.txt +++ b/intl/icu/source/data/zone/ln.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ln{ - Version{"37"} zoneStrings{ fallbackFormat{"{1} ({0})"} regionFormat{"Ngonga ya {0}"} diff --git a/intl/icu/source/data/zone/lo.txt b/intl/icu/source/data/zone/lo.txt index 0b9be941767d..301784d7a156 100644 --- a/intl/icu/source/data/zone/lo.txt +++ b/intl/icu/source/data/zone/lo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lo{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ອາບິດແຈນ"} diff --git a/intl/icu/source/data/zone/lrc.txt b/intl/icu/source/data/zone/lrc.txt index 26e127d47fbe..c4be0735a53c 100644 --- a/intl/icu/source/data/zone/lrc.txt +++ b/intl/icu/source/data/zone/lrc.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lrc{ - Version{"37"} zoneStrings{ "Etc:Unknown"{ ec{"نادیار"} diff --git a/intl/icu/source/data/zone/lt.txt b/intl/icu/source/data/zone/lt.txt index e275248aba5d..11c7c1f9ffc6 100644 --- a/intl/icu/source/data/zone/lt.txt +++ b/intl/icu/source/data/zone/lt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lt{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžanas"} diff --git a/intl/icu/source/data/zone/lu.txt b/intl/icu/source/data/zone/lu.txt index abe800139f7a..593232707c04 100644 --- a/intl/icu/source/data/zone/lu.txt +++ b/intl/icu/source/data/zone/lu.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lu{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/luo.txt b/intl/icu/source/data/zone/luo.txt index 4a1add62ec6d..47bd822be0cc 100644 --- a/intl/icu/source/data/zone/luo.txt +++ b/intl/icu/source/data/zone/luo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luo{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/luy.txt b/intl/icu/source/data/zone/luy.txt index a1e374c07371..b3fda2108d53 100644 --- a/intl/icu/source/data/zone/luy.txt +++ b/intl/icu/source/data/zone/luy.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml luy{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/lv.txt b/intl/icu/source/data/zone/lv.txt index 810631da234f..15f2aa8181b9 100644 --- a/intl/icu/source/data/zone/lv.txt +++ b/intl/icu/source/data/zone/lv.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml lv{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžana"} diff --git a/intl/icu/source/data/zone/mai.txt b/intl/icu/source/data/zone/mai.txt index abe5d6ad075e..5d4b6eb680f8 100644 --- a/intl/icu/source/data/zone/mai.txt +++ b/intl/icu/source/data/zone/mai.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mai{ - Version{"37"} zoneStrings{ "Etc:UTC"{ ls{"समन्वित वैश्विक समय"} diff --git a/intl/icu/source/data/zone/mas.txt b/intl/icu/source/data/zone/mas.txt index e679bf522c3b..b1e1c71b2bca 100644 --- a/intl/icu/source/data/zone/mas.txt +++ b/intl/icu/source/data/zone/mas.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mas{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/mer.txt b/intl/icu/source/data/zone/mer.txt index 9f20f6d4a60a..9092e9a54e92 100644 --- a/intl/icu/source/data/zone/mer.txt +++ b/intl/icu/source/data/zone/mer.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mer{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/mfe.txt b/intl/icu/source/data/zone/mfe.txt index a48151104b1d..876eff6d0ab0 100644 --- a/intl/icu/source/data/zone/mfe.txt +++ b/intl/icu/source/data/zone/mfe.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mfe{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/mg.txt b/intl/icu/source/data/zone/mg.txt index 95608d1d56b3..178591fc5d20 100644 --- a/intl/icu/source/data/zone/mg.txt +++ b/intl/icu/source/data/zone/mg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mg{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/mgh.txt b/intl/icu/source/data/zone/mgh.txt index 315912dc2452..3d1d29cacb6a 100644 --- a/intl/icu/source/data/zone/mgh.txt +++ b/intl/icu/source/data/zone/mgh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgh{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/mgo.txt b/intl/icu/source/data/zone/mgo.txt index 07bef3fc2ae7..3f0302920360 100644 --- a/intl/icu/source/data/zone/mgo.txt +++ b/intl/icu/source/data/zone/mgo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mgo{ - Version{"37"} zoneStrings{ fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} diff --git a/intl/icu/source/data/zone/mi.txt b/intl/icu/source/data/zone/mi.txt index 4b77a054486c..4e07ab41f8fc 100644 --- a/intl/icu/source/data/zone/mi.txt +++ b/intl/icu/source/data/zone/mi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mi{ - Version{"37"} zoneStrings{ "America:Araguaina"{ ec{"Araguaina"} diff --git a/intl/icu/source/data/zone/mk.txt b/intl/icu/source/data/zone/mk.txt index 5038a9c33f0c..6091bf03a704 100644 --- a/intl/icu/source/data/zone/mk.txt +++ b/intl/icu/source/data/zone/mk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mk{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиџан"} @@ -637,7 +637,7 @@ mk{ ec{"Восток"} } "Arctic:Longyearbyen"{ - ec{"Лонгјирбјен"} + ec{"Лонгјербијен"} } "Asia:Aden"{ ec{"Аден"} @@ -991,7 +991,7 @@ mk{ ec{"Будимпешта"} } "Europe:Busingen"{ - ec{"Бисинген"} + ec{"Бизинген"} } "Europe:Chisinau"{ ec{"Кишинау"} @@ -1113,7 +1113,7 @@ mk{ ec{"Улјановск"} } "Europe:Uzhgorod"{ - ec{"Ужхород"} + ec{"Ужгород"} } "Europe:Vaduz"{ ec{"Вадуц"} @@ -1325,24 +1325,24 @@ mk{ ls{"Стандардно време во Амазон"} } "meta:America_Central"{ - ld{"Централно летно сметање на времето"} + 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{"Анадирско летно време"} diff --git a/intl/icu/source/data/zone/ml.txt b/intl/icu/source/data/zone/ml.txt index fd84e1c7772e..1cf9d7b34b26 100644 --- a/intl/icu/source/data/zone/ml.txt +++ b/intl/icu/source/data/zone/ml.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ml{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"അബിദ്‌ജാൻ‌"} @@ -1752,9 +1752,9 @@ ml{ ls{"ന്യൂയി സമയം"} } "meta:Norfolk"{ - ld{"നോർഫാക്ക് ദ്വീപുകൾ ഡേലൈറ്റ് സമയം"} - lg{"നോർഫാക്ക് ദ്വീപുകൾ സമയം"} - ls{"നോർഫാക്ക് ദ്വീപുകൾ സ്റ്റാൻഡേർഡ് സമയം"} + ld{"നോർഫാക്ക് ദ്വീപ് ഡേലൈറ്റ് സമയം"} + lg{"നോർഫാക്ക് ദ്വീപ് സമയം"} + ls{"നോർഫാക്ക് ദ്വീപ് സ്റ്റാൻഡേർഡ് സമയം"} } "meta:Noronha"{ ld{"ഫെർണാഡോ ഡി നൊറോൻഹ ഗ്രീഷ്‌മകാല സമയം"} diff --git a/intl/icu/source/data/zone/mn.txt b/intl/icu/source/data/zone/mn.txt index 4c5dab2671c6..66c1ef7e5a3c 100644 --- a/intl/icu/source/data/zone/mn.txt +++ b/intl/icu/source/data/zone/mn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mn{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абижан"} diff --git a/intl/icu/source/data/zone/mni.txt b/intl/icu/source/data/zone/mni.txt index e47934041a88..830ae0e0c1b8 100644 --- a/intl/icu/source/data/zone/mni.txt +++ b/intl/icu/source/data/zone/mni.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni{ - Version{"37"} zoneStrings{ "Etc:UTC"{ ls{"কোওর্দিনেটেদ য়ুনিভর্সেল টাইম"} diff --git a/intl/icu/source/data/zone/mni_Beng.txt b/intl/icu/source/data/zone/mni_Beng.txt index e861947a77ff..08de0f17e1f1 100644 --- a/intl/icu/source/data/zone/mni_Beng.txt +++ b/intl/icu/source/data/zone/mni_Beng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_Beng{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/mni_Beng_IN.txt b/intl/icu/source/data/zone/mni_Beng_IN.txt index fee698999256..c896779f2ba3 100644 --- a/intl/icu/source/data/zone/mni_Beng_IN.txt +++ b/intl/icu/source/data/zone/mni_Beng_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/mni_IN.txt b/intl/icu/source/data/zone/mni_IN.txt index 00d8c00a15b3..99173b141555 100644 --- a/intl/icu/source/data/zone/mni_IN.txt +++ b/intl/icu/source/data/zone/mni_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mni_IN{ "%%ALIAS"{"mni_Beng_IN"} } diff --git a/intl/icu/source/data/zone/mo.txt b/intl/icu/source/data/zone/mo.txt index 01049c8f3c89..6ef831378395 100644 --- a/intl/icu/source/data/zone/mo.txt +++ b/intl/icu/source/data/zone/mo.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mo{ "%%ALIAS"{"ro"} } diff --git a/intl/icu/source/data/zone/mr.txt b/intl/icu/source/data/zone/mr.txt index f0c7ba1717c7..944ba83d64c4 100644 --- a/intl/icu/source/data/zone/mr.txt +++ b/intl/icu/source/data/zone/mr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mr{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"अबिद्जान"} @@ -1013,7 +1013,7 @@ mr{ ec{"हेलसिंकी"} } "Europe:Isle_of_Man"{ - ec{"आइल ऑफ मॅन"} + ec{"आयल ऑफ मॅन"} } "Europe:Istanbul"{ ec{"इस्तंबूल"} @@ -1140,7 +1140,7 @@ mr{ ec{"झापोरोझे"} } "Europe:Zurich"{ - ec{"झुरिच"} + ec{"झुरिक"} } "Indian:Antananarivo"{ ec{"अंटानानारिवो"} @@ -1326,7 +1326,7 @@ mr{ } "meta:Amazon"{ ld{"अ‍ॅमेझॉन उन्हाळी वेळ"} - lg{"अॅमेझॉन वेळ"} + lg{"अ‍ॅमेझॉन वेळ"} ls{"अ‍ॅमेझॉन प्रमाण वेळ"} } "meta:America_Central"{ @@ -1520,7 +1520,7 @@ mr{ ls{"पूर्व युरोपियन प्रमाण वेळ"} } "meta:Europe_Further_Eastern"{ - ls{"अग्र-पौर्वात्य यूरोपीयन वेळ"} + ls{"अग्र-पौर्वात्य युरोपीयन वेळ"} } "meta:Europe_Western"{ ld{"पश्चिम युरोपियन उन्हाळी वेळ"} diff --git a/intl/icu/source/data/zone/ms.txt b/intl/icu/source/data/zone/ms.txt index 4631ee6099d4..6baa33ce4176 100644 --- a/intl/icu/source/data/zone/ms.txt +++ b/intl/icu/source/data/zone/ms.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1292,6 +1292,11 @@ ms{ "Pacific:Wallis"{ ec{"Wallis"} } + "meta:Acre"{ + ld{"Waktu Musim Panas Acre"} + lg{"Waktu Acre"} + ls{"Waktu Piawai Acre"} + } "meta:Afghanistan"{ ls{"Waktu Afghanistan"} } @@ -1314,6 +1319,11 @@ ms{ lg{"Waktu Alaska"} ls{"Waktu Piawai Alaska"} } + "meta:Almaty"{ + ld{"Waktu Musim Panas Almaty"} + lg{"Waktu Almaty"} + ls{"Waktu Piawai Almaty"} + } "meta:Amazon"{ ld{"Waktu Musim Panas Amazon"} lg{"Waktu Amazon"} @@ -1354,6 +1364,11 @@ ms{ lg{"Waktu Aqtau"} ls{"Waktu Standard Aqtau"} } + "meta:Aqtobe"{ + ld{"Waktu Musim Panas Aqtobe"} + lg{"Waktu Aqtobe"} + ls{"Waktu Piawai Aqtobe"} + } "meta:Arabian"{ ld{"Waktu Siang Arab"} lg{"Waktu Arab"} @@ -1650,6 +1665,11 @@ ms{ lg{"Waktu Lord Howe"} ls{"Waktu Piawai Lord Howe"} } + "meta:Macau"{ + ld{"Waktu Musim Panas Macao"} + lg{"Waktu Macao"} + ls{"Waktu Piawai Macao"} + } "meta:Macquarie"{ ls{"Waktu Pulau Macquarie"} } @@ -1727,7 +1747,7 @@ ms{ ls{"Waktu Niue"} } "meta:Norfolk"{ - ld{"Waktu Musim Panas Kepulauan Norfolk"} + ld{"Waktu Siang Kepulauan Norfolk"} lg{"Waktu Kepulauan Norfolk"} ls{"Waktu Piawai Kepulauan Norfolk"} } @@ -1736,6 +1756,9 @@ ms{ lg{"Waktu Fernando de Noronha"} ls{"Waktu Piawai Fernando de Noronha"} } + "meta:North_Mariana"{ + ls{"Waktu Kepulauan Mariana Utara"} + } "meta:Novosibirsk"{ ld{"Waktu Musim Panas Novosibirsk"} lg{"Waktu Novosibirsk"} @@ -1789,6 +1812,11 @@ ms{ "meta:Pyongyang"{ ls{"Waktu Pyongyang"} } + "meta:Qyzylorda"{ + ld{"Waktu Musim Panas Qyzylorda"} + lg{"Waktu Qyzylorda"} + ls{"Waktu Piawai Qyzylorda"} + } "meta:Reunion"{ ls{"Waktu Reunion"} } diff --git a/intl/icu/source/data/zone/ms_ID.txt b/intl/icu/source/data/zone/ms_ID.txt index 51068c20251b..bfd2ae34011f 100644 --- a/intl/icu/source/data/zone/ms_ID.txt +++ b/intl/icu/source/data/zone/ms_ID.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ms_ID{ - Version{"37"} zoneStrings{ hourFormat{"+HH.mm;-HH.mm"} } diff --git a/intl/icu/source/data/zone/mt.txt b/intl/icu/source/data/zone/mt.txt index b58f1b49ef01..686937df87b1 100644 --- a/intl/icu/source/data/zone/mt.txt +++ b/intl/icu/source/data/zone/mt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mt{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/mua.txt b/intl/icu/source/data/zone/mua.txt index 707d8967e3c0..75276ce50a1c 100644 --- a/intl/icu/source/data/zone/mua.txt +++ b/intl/icu/source/data/zone/mua.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mua{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/my.txt b/intl/icu/source/data/zone/my.txt index 8b36d3e33d19..42e28f802fa5 100644 --- a/intl/icu/source/data/zone/my.txt +++ b/intl/icu/source/data/zone/my.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml my{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"အာဘီဂျန်"} @@ -1477,9 +1477,9 @@ my{ ls{"အရှေ့တီမော အချိန်"} } "meta:Easter"{ - ld{"အီစတာကျွန်းနွေရာသီအချိန်"} - lg{"အီစတာကျွန်းအချိန်"} - ls{"အီစတာကျွန်းစံတော်ချိန်"} + ld{"အီစတာကျွန်း နွေရာသီ အချိန်"} + lg{"အီစတာကျွန်း အချိန်"} + ls{"အီစတာကျွန်း စံတော်ချိန်"} } "meta:Ecuador"{ ls{"အီကွေဒေါ အချိန်"} @@ -1522,7 +1522,7 @@ my{ ls{"ဂရင်းနစ် စံတော်ချိန်"} } "meta:Galapagos"{ - ls{"ဂါလားပါဂိုးစ်အချိန်"} + ls{"ဂါလားပါဂိုးစ် အချိန်"} } "meta:Gambier"{ ls{"ဂမ်ဘီယာ အချိန်"} @@ -1723,7 +1723,7 @@ my{ ls{"နောဖော့ခ်ကျွန်း စံတော်ချိန်"} } "meta:Noronha"{ - ld{"ဖာနန်ဒိုးဒီနိုးရိုးညာ နွေရာသီအချိန်"} + ld{"ဖာနန်ဒိုးဒီနိုးရိုးညာ နွေရာသီ အချိန်"} lg{"ဖာနန်ဒိုးဒီနိုးရိုးညာ အချိန်"} ls{"ဖာနန်ဒိုးဒီနိုးရိုးညာ စံတော်ချိန်"} } diff --git a/intl/icu/source/data/zone/mzn.txt b/intl/icu/source/data/zone/mzn.txt index f7d3e77cd7eb..736da7fc868e 100644 --- a/intl/icu/source/data/zone/mzn.txt +++ b/intl/icu/source/data/zone/mzn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml mzn{ - Version{"37"} zoneStrings{ fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} diff --git a/intl/icu/source/data/zone/naq.txt b/intl/icu/source/data/zone/naq.txt index b5a2a9ba5b98..3295d391ef0f 100644 --- a/intl/icu/source/data/zone/naq.txt +++ b/intl/icu/source/data/zone/naq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml naq{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/nb.txt b/intl/icu/source/data/zone/nb.txt index 7257eea16540..6eccb516bbfa 100644 --- a/intl/icu/source/data/zone/nb.txt +++ b/intl/icu/source/data/zone/nb.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/nb_NO.txt b/intl/icu/source/data/zone/nb_NO.txt index fdac28bf658d..15a33c3396f5 100644 --- a/intl/icu/source/data/zone/nb_NO.txt +++ b/intl/icu/source/data/zone/nb_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/nd.txt b/intl/icu/source/data/zone/nd.txt index 57c1537e75db..0f43c83bac34 100644 --- a/intl/icu/source/data/zone/nd.txt +++ b/intl/icu/source/data/zone/nd.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nd{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/nds.txt b/intl/icu/source/data/zone/nds.txt deleted file mode 100644 index ac58836f6f00..000000000000 --- a/intl/icu/source/data/zone/nds.txt +++ /dev/null @@ -1,5 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -nds{ - Version{"37"} -} diff --git a/intl/icu/source/data/zone/ne.txt b/intl/icu/source/data/zone/ne.txt index f6e552fd5ac0..c90abbf7cedb 100644 --- a/intl/icu/source/data/zone/ne.txt +++ b/intl/icu/source/data/zone/ne.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"अविड्जान"} @@ -1710,9 +1710,9 @@ ne{ ls{"निउए समय"} } "meta:Norfolk"{ - ld{"नोर्फल्क टापू ग्रीष्मकालीन समय"} - lg{"नोर्फल्क टापू समय"} - ls{"नोर्फल्क टापू मानक समय"} + ld{"नोर्फोक टापूको ग्रीष्मकालीन समय"} + lg{"नोर्फोक टापूको समय"} + ls{"नोर्फोक टापूको मानक समय"} } "meta:Noronha"{ ld{"फर्नान्डो डे नोरोन्हा ग्रीष्मकालीन समय"} diff --git a/intl/icu/source/data/zone/ne_IN.txt b/intl/icu/source/data/zone/ne_IN.txt index abdaeb06a9f5..8af52595db71 100644 --- a/intl/icu/source/data/zone/ne_IN.txt +++ b/intl/icu/source/data/zone/ne_IN.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ne_IN{ - Version{"37"} zoneStrings{ "meta:India"{ ss{"IST"} diff --git a/intl/icu/source/data/zone/nl.txt b/intl/icu/source/data/zone/nl.txt index 20b31b99afd6..d1dfc19f3ce1 100644 --- a/intl/icu/source/data/zone/nl.txt +++ b/intl/icu/source/data/zone/nl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -799,7 +799,7 @@ nl{ ec{"Oral"} } "Asia:Phnom_Penh"{ - ec{"Phnom-Penh"} + ec{"Phnom Penh"} } "Asia:Pontianak"{ ec{"Pontianak"} @@ -955,7 +955,7 @@ nl{ ec{"Sydney"} } "Etc:UTC"{ - ls{"Gecoördineerde wereldtijd"} + ls{"gecoördineerde wereldtijd"} ss{"UTC"} } "Etc:Unknown"{ diff --git a/intl/icu/source/data/zone/nl_SR.txt b/intl/icu/source/data/zone/nl_SR.txt index 5a40ba707c85..97129e51f616 100644 --- a/intl/icu/source/data/zone/nl_SR.txt +++ b/intl/icu/source/data/zone/nl_SR.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nl_SR{ - Version{"37"} zoneStrings{ "meta:Suriname"{ ss{"SRT"} diff --git a/intl/icu/source/data/zone/nmg.txt b/intl/icu/source/data/zone/nmg.txt index 3be5f9b11289..5a8e42a7881e 100644 --- a/intl/icu/source/data/zone/nmg.txt +++ b/intl/icu/source/data/zone/nmg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nmg{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/nn.txt b/intl/icu/source/data/zone/nn.txt index 8ef3fca74e1c..4cb9a2906972 100644 --- a/intl/icu/source/data/zone/nn.txt +++ b/intl/icu/source/data/zone/nn.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -807,6 +807,9 @@ nn{ "Asia:Qatar"{ ec{"Qatar"} } + "Asia:Qostanay"{ + ec{"Kostanaj"} + } "Asia:Qyzylorda"{ ec{"Kyzylorda"} } @@ -850,7 +853,7 @@ nn{ ec{"Teheran"} } "Asia:Thimphu"{ - ec{"Thimphu"} + ec{"Thimpu"} } "Asia:Tokyo"{ ec{"Tokyo"} @@ -995,7 +998,7 @@ nn{ } "Europe:Dublin"{ ec{"Dublin"} - ld{"irsk sumartid"} + ld{"irsk sommartid"} } "Europe:Gibraltar"{ ec{"Gibraltar"} @@ -1032,7 +1035,7 @@ nn{ } "Europe:London"{ ec{"London"} - ld{"britisk sumartid"} + ld{"britisk sommartid"} } "Europe:Luxembourg"{ ec{"Luxemburg"} @@ -1149,7 +1152,7 @@ nn{ ec{"Kokosøyane"} } "Indian:Comoro"{ - ec{"Komorene"} + ec{"Komorane"} } "Indian:Kerguelen"{ ec{"Kerguelen"} @@ -1214,6 +1217,9 @@ nn{ "Pacific:Honolulu"{ ec{"Honolulu"} } + "Pacific:Johnston"{ + ec{"Johnston"} + } "Pacific:Kiritimati"{ ec{"Kiritimati"} } @@ -1301,62 +1307,62 @@ nn{ ls{"vestafrikansk standardtid"} } "meta:Alaska"{ - ld{"alaskisk sumartid"} + ld{"alaskisk sommartid"} lg{"alaskisk tid"} ls{"alaskisk normaltid"} } "meta:Amazon"{ - ld{"sumartid for Amazonas"} + ld{"sommartid for Amazonas"} lg{"tidssone for Amazonas"} ls{"normaltid for Amazonas"} } "meta:America_Central"{ - ld{"sumartid for sentrale Nord-Amerika"} + ld{"sommartid for sentrale Nord-Amerika"} lg{"tidssone for sentrale Nord-Amerika"} ls{"normaltid for sentrale Nord-Amerika"} } "meta:America_Eastern"{ - ld{"sumartid for den nordamerikansk austkysten"} - lg{"tidssone for den nordamerikansk austkysten"} - ls{"normaltid for den nordamerikansk austkysten"} + ld{"sommartid for den nordamerikansk austkysten"} + lg{"tidssone for den nordamerikanske austkysten"} + ls{"normaltid for den nordamerikanske austkysten"} } "meta:America_Mountain"{ - ld{"sumartid for Rocky Mountains (USA)"} + ld{"sommartid for Rocky Mountains (USA)"} lg{"tidssone for Rocky Mountains (USA)"} ls{"normaltid for Rocky Mountains (USA)"} } "meta:America_Pacific"{ - ld{"sumartid for den nordamerikanske stillehavskysten"} + ld{"sommartid for den nordamerikanske stillehavskysten"} lg{"tidssone for den nordamerikanske stillehavskysten"} ls{"normaltid for den nordamerikanske stillehavskysten"} } "meta:Apia"{ - ld{"sumartid for Apia"} + ld{"sommartid for Apia"} lg{"tidssone for Apia"} ls{"normaltid for Apia"} } "meta:Arabian"{ - ld{"arabisk sumartid"} + ld{"arabisk sommartid"} lg{"arabisk tid"} ls{"arabisk normaltid"} } "meta:Argentina"{ - ld{"argentinsk sumartid"} + ld{"argentinsk sommartid"} lg{"argentinsk tid"} ls{"argentinsk normaltid"} } "meta:Argentina_Western"{ - ld{"vestargentinsk sumartid"} + ld{"vestargentinsk sommartid"} lg{"vestargentinsk tid"} ls{"vestargentinsk normaltid"} } "meta:Armenia"{ - ld{"armensk sumartid"} + ld{"armensk sommartid"} lg{"armensk tid"} ls{"armensk normaltid"} } "meta:Atlantic"{ - ld{"sumartid for den nordamerikanske atlanterhavskysten"} + ld{"sommartid for den nordamerikanske atlanterhavskysten"} lg{"tidssone for den nordamerikanske atlanterhavskysten"} ls{"normaltid for den nordamerikanske atlanterhavskysten"} } @@ -1381,17 +1387,17 @@ nn{ ls{"vestaustralsk standardtid"} } "meta:Azerbaijan"{ - ld{"aserbajdsjansk sumartid"} + ld{"aserbajdsjansk sommartid"} lg{"aserbajdsjansk tid"} ls{"aserbajdsjansk normaltid"} } "meta:Azores"{ - ld{"asorisk sumartid"} + ld{"asorisk sommartid"} lg{"asorisk tid"} ls{"asorisk normaltid"} } "meta:Bangladesh"{ - ld{"bangladeshisk sumartid"} + ld{"bangladeshisk sommartid"} lg{"bangladeshisk tid"} ls{"bangladeshisk normaltid"} } @@ -1402,7 +1408,7 @@ nn{ ls{"boliviansk tid"} } "meta:Brasilia"{ - ld{"sumartid for Brasilia"} + ld{"sommartid for Brasilia"} lg{"tidssone for Brasilia"} ls{"normaltid for Brasilia"} } @@ -1410,7 +1416,7 @@ nn{ ls{"tidssone for Brunei Darussalam"} } "meta:Cape_Verde"{ - ld{"kappverdisk sumartid"} + ld{"kappverdisk sommartid"} lg{"kappverdisk tid"} ls{"kappverdisk normaltid"} } @@ -1418,22 +1424,22 @@ nn{ ls{"tidssone for Chamorro"} } "meta:Chatham"{ - ld{"sumartid for Chatham"} + ld{"sommartid for Chatham"} lg{"tidssone for Chatham"} ls{"normaltid for Chatham"} } "meta:Chile"{ - ld{"chilensk sumartid"} + ld{"chilensk sommartid"} lg{"chilensk tid"} ls{"chilensk normaltid"} } "meta:China"{ - ld{"kinesisk sumartid"} + ld{"kinesisk sommartid"} lg{"kinesisk tid"} ls{"kinesisk normaltid"} } "meta:Choibalsan"{ - ld{"sumartid for Tsjojbalsan"} + ld{"sommartid for Tsjojbalsan"} lg{"tidssone for Tsjojbalsan"} ls{"normaltid for Tsjojbalsan"} } @@ -1444,17 +1450,17 @@ nn{ ls{"tidssone for Kokosøyane"} } "meta:Colombia"{ - ld{"kolombiansk sumartid"} + ld{"kolombiansk sommartid"} lg{"kolombiansk tid"} ls{"kolombiansk normaltid"} } "meta:Cook"{ - ld{"sumartid for Cookøyane"} + ld{"sommartid for Cookøyane"} lg{"tidssone for Cookøyane"} ls{"normaltid for Cookøyane"} } "meta:Cuba"{ - ld{"kubansk sumartid"} + ld{"kubansk sommartid"} lg{"kubansk tid"} ls{"kubansk normaltid"} } @@ -1468,7 +1474,7 @@ nn{ ls{"austtimoresisk tid"} } "meta:Easter"{ - ld{"sumartid for Påskeøya"} + ld{"sommartid for Påskeøya"} lg{"tidssone for Påskeøya"} ls{"normaltid for Påskeøya"} } @@ -1503,12 +1509,12 @@ nn{ ss{"WET"} } "meta:Falkland"{ - ld{"sumartid for Falklandsøyane"} + ld{"sommartid for Falklandsøyane"} lg{"tidssone for Falklandsøyane"} ls{"normaltid for Falklandsøyane"} } "meta:Fiji"{ - ld{"fijiansk sumartid"} + ld{"fijiansk sommartid"} lg{"fijiansk tid"} ls{"fijiansk normaltid"} } @@ -1529,7 +1535,7 @@ nn{ ls{"tidssone for Gambier"} } "meta:Georgia"{ - ld{"georgisk sumartid"} + ld{"georgisk sommartid"} lg{"georgisk tid"} ls{"georgisk normaltid"} } @@ -1537,12 +1543,12 @@ nn{ ls{"tidssone for Gilbertøyane"} } "meta:Greenland_Eastern"{ - ld{"austgrønlandsk sumartid"} + ld{"austgrønlandsk sommartid"} lg{"austgrønlandsk tid"} ls{"austgrønlandsk normaltid"} } "meta:Greenland_Western"{ - ld{"vestgrønlandsk sumartid"} + ld{"vestgrønlandsk sommartid"} lg{"vestgrønlandsk tid"} ls{"vestgrønlandsk normaltid"} } @@ -1553,17 +1559,17 @@ nn{ ls{"guyansk tid"} } "meta:Hawaii_Aleutian"{ - ld{"sumartid for Hawaii og Aleutene"} + ld{"sommartid for Hawaii og Aleutene"} lg{"tidssone for Hawaii og Aleutene"} ls{"normaltid for Hawaii og Aleutene"} } "meta:Hong_Kong"{ - ld{"hongkongkinesisk sumartid"} + ld{"hongkongkinesisk sommartid"} lg{"hongkongkinesisk tid"} ls{"hongkongkinesisk normaltid"} } "meta:Hovd"{ - ld{"sumartid for Khovd"} + ld{"sommartid for Khovd"} lg{"tidssone for Khovd"} ls{"normaltid for Khovd"} } @@ -1586,22 +1592,22 @@ nn{ ls{"vestindonesisk tid"} } "meta:Iran"{ - ld{"iransk sumartid"} + ld{"iransk sommartid"} lg{"iransk tid"} ls{"iransk normaltid"} } "meta:Irkutsk"{ - ld{"sumartid for Irkutsk"} + ld{"sommartid for Irkutsk"} lg{"tidssone for Irkutsk"} ls{"normaltid for Irkutsk"} } "meta:Israel"{ - ld{"israelsk sumartid"} + ld{"israelsk sommartid"} lg{"israelsk tid"} ls{"israelsk normaltid"} } "meta:Japan"{ - ld{"japansk sumartid"} + ld{"japansk sommartid"} lg{"japansk tid"} ls{"japansk normaltid"} } @@ -1612,7 +1618,7 @@ nn{ ls{"vestkasakhstansk tid"} } "meta:Korea"{ - ld{"koreansk sumartid"} + ld{"koreansk sommartid"} lg{"koreansk tid"} ls{"koreansk normaltid"} } @@ -1620,7 +1626,7 @@ nn{ ls{"tidssone for Kosrae"} } "meta:Krasnoyarsk"{ - ld{"sumartid for Krasnojarsk"} + ld{"sommartid for Krasnojarsk"} lg{"tidssone for Krasnojarsk"} ls{"normaltid for Krasnojarsk"} } @@ -1631,7 +1637,7 @@ nn{ ls{"tidssone for Lineøyane"} } "meta:Lord_Howe"{ - ld{"sumartid for Lord Howe-øya"} + ld{"sommartid for Lord Howe-øya"} lg{"tidssone for Lord Howe-øya"} ls{"normaltid for Lord Howe-øya"} } @@ -1639,7 +1645,7 @@ nn{ ls{"tidssone for Macquarieøya"} } "meta:Magadan"{ - ld{"sumartid for Magadan"} + ld{"sommartid for Magadan"} lg{"tidssone for Magadan"} ls{"normaltid for Magadan"} } @@ -1656,7 +1662,7 @@ nn{ ls{"marshallesisk tid"} } "meta:Mauritius"{ - ld{"mauritisk sumartid"} + ld{"mauritisk sommartid"} lg{"mauritisk tid"} ls{"mauritisk normaltid"} } @@ -1664,22 +1670,22 @@ nn{ ls{"tidssone for Mawson"} } "meta:Mexico_Northwest"{ - ld{"sumartid for nordvestlege Mexico"} + ld{"sommartid for nordvestlege Mexico"} lg{"tidssone for nordvestlege Mexico"} ls{"normaltid for nordvestlege Mexico"} } "meta:Mexico_Pacific"{ - ld{"sumartid for den meksikanske stillehavskysten"} + ld{"sommartid for den meksikanske stillehavskysten"} lg{"tidssone for den meksikanske stillehavskysten"} ls{"normaltid for den meksikanske stillehavskysten"} } "meta:Mongolia"{ - ld{"sumartid"} + ld{"sommartid for Ulan Bator"} lg{"tidssone for Ulan Bator"} ls{"normaltid for Ulan Bator"} } "meta:Moscow"{ - ld{"sumartid for Moskva"} + ld{"sommartid for Moskva"} lg{"tidssone for Moskva"} ls{"normaltid for Moskva"} } @@ -1693,7 +1699,7 @@ nn{ ls{"nepalsk tid"} } "meta:New_Caledonia"{ - ld{"kaledonsk sumartid"} + ld{"kaledonsk sommartid"} lg{"kaledonsk tid"} ls{"kaledonsk normaltid"} } @@ -1703,7 +1709,7 @@ nn{ ls{"nyzealandsk normaltid"} } "meta:Newfoundland"{ - ld{"sumartid for Newfoundland"} + ld{"sommartid for Newfoundland"} lg{"tidssone for Newfoundland"} ls{"normaltid for Newfoundland"} } @@ -1711,27 +1717,27 @@ nn{ ls{"tidssone for Niue"} } "meta:Norfolk"{ - ld{"sumartid for Norfolkøya"} + ld{"sommartid for Norfolkøya"} lg{"tidssone for Norfolkøya"} ls{"normaltid for Norfolkøya"} } "meta:Noronha"{ - ld{"sumartid for Fernando de Noronha"} + ld{"sommartid for Fernando de Noronha"} lg{"tidssone for Fernando de Noronha"} ls{"normaltid for Fernando de Noronha"} } "meta:Novosibirsk"{ - ld{"sumartid for Novosibirsk"} + ld{"sommartid for Novosibirsk"} lg{"tidssone for Novosibirsk"} ls{"normaltid for Novosibirsk"} } "meta:Omsk"{ - ld{"sumartid for Omsk"} + ld{"sommartid for Omsk"} lg{"tidssone for Omsk"} ls{"normaltid for Omsk"} } "meta:Pakistan"{ - ld{"pakistansk sumartid"} + ld{"pakistansk sommartid"} lg{"pakistansk tid"} ls{"pakistansk normaltid"} } @@ -1742,17 +1748,17 @@ nn{ ls{"papuansk tid"} } "meta:Paraguay"{ - ld{"paraguayansk sumartid"} + ld{"paraguayansk sommartid"} lg{"paraguayansk tid"} ls{"paraguayansk normaltid"} } "meta:Peru"{ - ld{"peruansk sumartid"} + ld{"peruansk sommartid"} lg{"peruansk tid"} ls{"peruansk normaltid"} } "meta:Philippines"{ - ld{"filippinsk sumartid"} + ld{"filippinsk sommartid"} lg{"filippinsk tid"} ls{"filippinsk normaltid"} } @@ -1760,7 +1766,7 @@ nn{ ls{"tidssone for Phoenixøyane"} } "meta:Pierre_Miquelon"{ - ld{"sumartid for Saint-Pierre-et-Miquelon"} + ld{"sommartid for Saint-Pierre-et-Miquelon"} lg{"tidssone for Saint-Pierre-et-Miquelon"} ls{"normaltid for Saint-Pierre-et-Miquelon"} } @@ -1780,12 +1786,12 @@ nn{ ls{"tidssone for Rothera"} } "meta:Sakhalin"{ - ld{"sumartid for Sakhalin"} + ld{"sommartid for Sakhalin"} lg{"tidssone for Sakhalin"} ls{"normaltid for Sakhalin"} } "meta:Samoa"{ - ld{"samoansk sumartid"} + ld{"samoansk sommartid"} lg{"samoansk tid"} ls{"samoansk normaltid"} } @@ -1811,7 +1817,7 @@ nn{ ls{"tahitisk tid"} } "meta:Taipei"{ - ld{"sumartid for Taipei"} + ld{"sommartid for Taipei"} lg{"tidssone for Taipei"} ls{"normaltid for Taipei"} } @@ -1822,7 +1828,7 @@ nn{ ls{"tidssone for Tokelau"} } "meta:Tonga"{ - ld{"tongansk sumartid"} + ld{"tongansk sommartid"} lg{"tongansk tid"} ls{"tongansk normaltid"} } @@ -1830,7 +1836,7 @@ nn{ ls{"tidssone for Chuukøyane"} } "meta:Turkmenistan"{ - ld{"turkmensk sumartid"} + ld{"turkmensk sommartid"} lg{"turkmensk tid"} ls{"turkmensk normaltid"} } @@ -1838,17 +1844,17 @@ nn{ ls{"tuvalsk tid"} } "meta:Uruguay"{ - ld{"uruguayansk sumartid"} + ld{"uruguayansk sommartid"} lg{"uruguayansk tid"} ls{"uruguayansk normaltid"} } "meta:Uzbekistan"{ - ld{"usbekisk sumartid"} + ld{"usbekisk sommartid"} lg{"usbekisk tid"} ls{"usbekisk normaltid"} } "meta:Vanuatu"{ - ld{"vanuatisk sumartid"} + ld{"vanuatisk sommartid"} lg{"vanuatisk tid"} ls{"vanuatisk normaltid"} } @@ -1856,12 +1862,12 @@ nn{ ls{"venezuelansk tid"} } "meta:Vladivostok"{ - ld{"sumartid for Vladivostok"} + ld{"sommartid for Vladivostok"} lg{"tidssone for Vladivostok"} ls{"normaltid for Vladivostok"} } "meta:Volgograd"{ - ld{"sumartid for Volgograd"} + ld{"sommartid for Volgograd"} lg{"tidssone for Volgograd"} ls{"normaltid for Volgograd"} } @@ -1875,12 +1881,12 @@ nn{ ls{"tidssone for Wallis- og Futunaøyane"} } "meta:Yakutsk"{ - ld{"sumartid for Jakutsk"} + ld{"sommartid for Jakutsk"} lg{"tidssone for Jakutsk"} ls{"normaltid for Jakutsk"} } "meta:Yekaterinburg"{ - ld{"sumartid for Jekaterinburg"} + ld{"sommartid for Jekaterinburg"} lg{"tidssone for Jekaterinburg"} ls{"normaltid for Jekaterinburg"} } @@ -1889,7 +1895,7 @@ nn{ gmtZeroFormat{"GMT"} hourFormat{"+HH:mm;-HH:mm"} regionFormat{"tidssone for {0}"} - regionFormatDaylight{"sumartid – {0}"} + regionFormatDaylight{"sommartid – {0}"} regionFormatStandard{"normaltid – {0}"} } } diff --git a/intl/icu/source/data/zone/nn_NO.txt b/intl/icu/source/data/zone/nn_NO.txt index 4e8a5f78d9b5..9eaa33990d32 100644 --- a/intl/icu/source/data/zone/nn_NO.txt +++ b/intl/icu/source/data/zone/nn_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/nnh.txt b/intl/icu/source/data/zone/nnh.txt index 967ded588d45..9704e9688d08 100644 --- a/intl/icu/source/data/zone/nnh.txt +++ b/intl/icu/source/data/zone/nnh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nnh{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/no.txt b/intl/icu/source/data/zone/no.txt index 097a923cd101..474d0b21b0d9 100644 --- a/intl/icu/source/data/zone/no.txt +++ b/intl/icu/source/data/zone/no.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ "%%ALIAS"{"nb"} } diff --git a/intl/icu/source/data/zone/no_NO.txt b/intl/icu/source/data/zone/no_NO.txt index 188a8a4a680a..5d7f8599c0e5 100644 --- a/intl/icu/source/data/zone/no_NO.txt +++ b/intl/icu/source/data/zone/no_NO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ "%%ALIAS"{"nb_NO"} } diff --git a/intl/icu/source/data/zone/no_NO_NY.txt b/intl/icu/source/data/zone/no_NO_NY.txt index aa897fe6f515..c900df7fea21 100644 --- a/intl/icu/source/data/zone/no_NO_NY.txt +++ b/intl/icu/source/data/zone/no_NO_NY.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO_NY{ "%%ALIAS"{"nn_NO"} } diff --git a/intl/icu/source/data/zone/nus.txt b/intl/icu/source/data/zone/nus.txt index 4ca97791a08c..86c260ba1e00 100644 --- a/intl/icu/source/data/zone/nus.txt +++ b/intl/icu/source/data/zone/nus.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nus{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/nyn.txt b/intl/icu/source/data/zone/nyn.txt index ebf194300495..2b1cd30468b8 100644 --- a/intl/icu/source/data/zone/nyn.txt +++ b/intl/icu/source/data/zone/nyn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nyn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/om.txt b/intl/icu/source/data/zone/om.txt index 5bf988a9b230..c4f5b4e14df9 100644 --- a/intl/icu/source/data/zone/om.txt +++ b/intl/icu/source/data/zone/om.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml om{ - Version{"37"} zoneStrings{ gmtFormat{"GMT{0}"} hourFormat{"+HH:mm;-HH:mm"} diff --git a/intl/icu/source/data/zone/or.txt b/intl/icu/source/data/zone/or.txt index 62951d39e48b..ef8def6bc033 100644 --- a/intl/icu/source/data/zone/or.txt +++ b/intl/icu/source/data/zone/or.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml or{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ଆବିଦଜାନ"} diff --git a/intl/icu/source/data/zone/os.txt b/intl/icu/source/data/zone/os.txt index 0984ce9af149..1e24c969fc41 100644 --- a/intl/icu/source/data/zone/os.txt +++ b/intl/icu/source/data/zone/os.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml os{ - Version{"37"} zoneStrings{ "Asia:Tbilisi"{ ec{"Тбилис"} diff --git a/intl/icu/source/data/zone/pa.txt b/intl/icu/source/data/zone/pa.txt index a859350c922a..f9b6944fde9e 100644 --- a/intl/icu/source/data/zone/pa.txt +++ b/intl/icu/source/data/zone/pa.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ਅਬੀਦਜਾਨ"} @@ -1740,7 +1740,7 @@ pa{ ls{"ਨੀਊ ਵੇਲਾ"} } "meta:Norfolk"{ - ld{"ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ"} + ld{"ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ"} lg{"ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਵੇਲਾ"} ls{"ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਮਿਆਰੀ ਵੇਲਾ"} } diff --git a/intl/icu/source/data/zone/pa_Arab.txt b/intl/icu/source/data/zone/pa_Arab.txt index bb446359dbb8..1b371d8e8eba 100644 --- a/intl/icu/source/data/zone/pa_Arab.txt +++ b/intl/icu/source/data/zone/pa_Arab.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Arab{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/pa_Arab_PK.txt b/intl/icu/source/data/zone/pa_Arab_PK.txt index e6b58610aed6..3b1bc420fabe 100644 --- a/intl/icu/source/data/zone/pa_Arab_PK.txt +++ b/intl/icu/source/data/zone/pa_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/pa_Guru.txt b/intl/icu/source/data/zone/pa_Guru.txt index a0ee56949a68..f10658f06f81 100644 --- a/intl/icu/source/data/zone/pa_Guru.txt +++ b/intl/icu/source/data/zone/pa_Guru.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_Guru{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/pa_Guru_IN.txt b/intl/icu/source/data/zone/pa_Guru_IN.txt index adeae3fecc4e..f67b7c32236f 100644 --- a/intl/icu/source/data/zone/pa_Guru_IN.txt +++ b/intl/icu/source/data/zone/pa_Guru_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/pa_IN.txt b/intl/icu/source/data/zone/pa_IN.txt index b18bba68dc7f..0c963d73dff9 100644 --- a/intl/icu/source/data/zone/pa_IN.txt +++ b/intl/icu/source/data/zone/pa_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_IN{ "%%ALIAS"{"pa_Guru_IN"} } diff --git a/intl/icu/source/data/zone/pa_PK.txt b/intl/icu/source/data/zone/pa_PK.txt index 1c66c7b37a41..29612addf4c1 100644 --- a/intl/icu/source/data/zone/pa_PK.txt +++ b/intl/icu/source/data/zone/pa_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pa_PK{ "%%ALIAS"{"pa_Arab_PK"} } diff --git a/intl/icu/source/data/zone/pcm.txt b/intl/icu/source/data/zone/pcm.txt index cfd70186223b..1f9117b911e4 100644 --- a/intl/icu/source/data/zone/pcm.txt +++ b/intl/icu/source/data/zone/pcm.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pcm{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Ábijan"} @@ -1704,7 +1704,7 @@ pcm{ ls{"Niúẹ Taim"} } "meta:Norfolk"{ - ld{"Nọ́rfọ́lk Aíland Họ́t Sízin Taim"} + ld{"Nọ́rfọ́lk Aíland Délaít Taim"} lg{"Nọ́rfọ́lk Aíland Taim"} ls{"Nọ́rfọ́lk Aíland Fíksd Taim"} } diff --git a/intl/icu/source/data/zone/pl.txt b/intl/icu/source/data/zone/pl.txt index 398ee00ff815..6c087aaa35d9 100644 --- a/intl/icu/source/data/zone/pl.txt +++ b/intl/icu/source/data/zone/pl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pl{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidżan"} @@ -1409,6 +1409,9 @@ pl{ lg{"czas Bangladesz"} ls{"Bangladesz (czas standardowy)"} } + "meta:Bhutan"{ + ls{"czas Bhutan"} + } "meta:Bolivia"{ ls{"czas Boliwia"} } @@ -1417,6 +1420,9 @@ pl{ lg{"czas Brasília"} ls{"Brasília (czas standardowy)"} } + "meta:Brunei"{ + ls{"czas Brunei"} + } "meta:Cape_Verde"{ ld{"Wyspy Zielonego Przylądka (czas letni)"} lg{"czas Wyspy Zielonego Przylądka"} @@ -1466,6 +1472,9 @@ pl{ lg{"czas Kuba"} ls{"Kuba (czas standardowy)"} } + "meta:Davis"{ + ls{"czas Davis"} + } "meta:DumontDUrville"{ ls{"czas Dumont-d’Urville"} } @@ -1526,6 +1535,9 @@ pl{ "meta:GMT"{ ls{"czas uniwersalny"} } + "meta:Galapagos"{ + ls{"czas Galapagos"} + } "meta:Gambier"{ ls{"czas Wyspy Gambiera"} } @@ -1622,6 +1634,9 @@ pl{ lg{"czas Korea"} ls{"Korea (czas standardowy)"} } + "meta:Kosrae"{ + ls{"czas Kosrae"} + } "meta:Krasnoyarsk"{ ld{"Krasnojarsk (czas letni)"} lg{"czas Krasnojarsk"} @@ -1638,6 +1653,9 @@ pl{ lg{"czas Lord Howe"} ls{"Lord Howe (czas standardowy)"} } + "meta:Macquarie"{ + ls{"czas Macquarie"} + } "meta:Magadan"{ ld{"Magadan (czas letni)"} lg{"czas Magadan"} @@ -1660,6 +1678,9 @@ pl{ lg{"czas Mauritius"} ls{"Mauritius (czas standardowy)"} } + "meta:Mawson"{ + ls{"czas Mawson"} + } "meta:Mexico_Northwest"{ ld{"Meksyk Północno-Zachodni (czas letni)"} lg{"czas Meksyk Północno-Zachodni"} @@ -1683,6 +1704,12 @@ pl{ "meta:Myanmar"{ ls{"czas Mjanma"} } + "meta:Nauru"{ + ls{"czas Nauru"} + } + "meta:Nepal"{ + ls{"czas Nepal"} + } "meta:New_Caledonia"{ ld{"Nowa Kaledonia (czas letni)"} lg{"czas Nowa Kaledonia"} @@ -1698,6 +1725,14 @@ pl{ lg{"czas Nowa Fundlandia"} ls{"Nowa Fundlandia (czas standardowy)"} } + "meta:Niue"{ + ls{"czas Niue"} + } + "meta:Norfolk"{ + ld{"Norfolk (czas letni)"} + lg{"czas Norfolk"} + ls{"Norfolk (czas standardowy)"} + } "meta:Noronha"{ ld{"Fernando de Noronha (czas letni)"} lg{"czas Fernando de Noronha"} @@ -1718,6 +1753,9 @@ pl{ lg{"czas Pakistan"} ls{"Pakistan (czas standardowy)"} } + "meta:Palau"{ + ls{"czas Palau"} + } "meta:Papua_New_Guinea"{ ls{"czas Papua-Nowa Gwinea"} } @@ -1744,12 +1782,21 @@ pl{ lg{"czas Saint-Pierre i Miquelon"} ls{"Saint-Pierre i Miquelon (czas standardowy)"} } + "meta:Pitcairn"{ + ls{"czas Pitcairn"} + } "meta:Ponape"{ ls{"czas Pohnpei"} } "meta:Pyongyang"{ ls{"czas Pjongjang"} } + "meta:Reunion"{ + ls{"czas Reunion"} + } + "meta:Rothera"{ + ls{"czas Rothera"} + } "meta:Sakhalin"{ ld{"Sachalin (czas letni)"} lg{"czas Sachalin"} @@ -1780,6 +1827,12 @@ pl{ "meta:Suriname"{ ls{"czas Surinam"} } + "meta:Syowa"{ + ls{"czas Syowa"} + } + "meta:Tahiti"{ + ls{"czas Tahiti"} + } "meta:Taipei"{ ld{"Tajpej (czas letni)"} lg{"czas Tajpej"} @@ -1788,6 +1841,9 @@ pl{ "meta:Tajikistan"{ ls{"czas Tadżykistan"} } + "meta:Tokelau"{ + ls{"czas Tokelau"} + } "meta:Tonga"{ ld{"Tonga (czas letni)"} lg{"czas Tonga"} @@ -1801,6 +1857,9 @@ pl{ lg{"czas Turkmenistan"} ls{"Turkmenistan (czas standardowy)"} } + "meta:Tuvalu"{ + ls{"czas Tuvalu"} + } "meta:Uruguay"{ ld{"Urugwaj (czas letni)"} lg{"czas Urugwaj"} @@ -1832,6 +1891,9 @@ pl{ "meta:Vostok"{ ls{"czas Wostok"} } + "meta:Wake"{ + ls{"czas Wake"} + } "meta:Wallis"{ ls{"czas Wallis i Futuna"} } diff --git a/intl/icu/source/data/zone/ps.txt b/intl/icu/source/data/zone/ps.txt index 66174c1a7b45..d3b655bd0c8b 100644 --- a/intl/icu/source/data/zone/ps.txt +++ b/intl/icu/source/data/zone/ps.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ابيجان"} @@ -964,7 +964,7 @@ ps{ ec{"اندورا"} } "Europe:Astrakhan"{ - ec{"آسترخان"} + ec{"استرا خان"} } "Europe:Athens"{ ec{"ايتنز"} @@ -1482,7 +1482,7 @@ ps{ ls{"د اکوادور وخت"} } "meta:Europe_Central"{ - ld{"وسطي اروپايي د اوړي وخت"} + ld{"مرکزي اروپايياوړي وخت"} lg{"مرکزي اروپايي وخت"} ls{"د مرکزي اروپا معیاري وخت"} } @@ -1708,7 +1708,7 @@ ps{ } "meta:Norfolk"{ ld{"د نورفکاس ټاپو اوړي وخت"} - lg{"د نورفکاس ټاپو وخت"} + lg{"نورفوک ټاپو وخت"} ls{"د نورفکاس ټاپو معياري وخت"} } "meta:Noronha"{ @@ -1877,7 +1877,7 @@ ps{ } "meta:Yekaterinburg"{ ld{"د ياکټرنبرګ د اوړي وخت"} - lg{"د ياکيټرنبرګ وخت"} + lg{"یکاټیرینبرګ وخت"} ls{"د ياکيټرنبرګ معياري وخت"} } fallbackFormat{"{1} ({0})"} diff --git a/intl/icu/source/data/zone/ps_PK.txt b/intl/icu/source/data/zone/ps_PK.txt index d98c89f8bf47..816823d2aae1 100644 --- a/intl/icu/source/data/zone/ps_PK.txt +++ b/intl/icu/source/data/zone/ps_PK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ps_PK{ - Version{"37"} zoneStrings{ "Africa:Harare"{ ec{"هرارے"} diff --git a/intl/icu/source/data/zone/pt.txt b/intl/icu/source/data/zone/pt.txt index 413d42608c78..c86aa8177445 100644 --- a/intl/icu/source/data/zone/pt.txt +++ b/intl/icu/source/data/zone/pt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -816,6 +816,9 @@ pt{ "Asia:Riyadh"{ ec{"Riade"} } + "Asia:Saigon"{ + ec{"Cidade de Ho Chi Minh"} + } "Asia:Sakhalin"{ ec{"Sacalina"} } @@ -892,7 +895,7 @@ pt{ ec{"Cabo Verde"} } "Atlantic:Faeroe"{ - ec{"Ilhas Faroe"} + ec{"Ilhas Faroé"} } "Atlantic:Madeira"{ ec{"Madeira"} @@ -1840,7 +1843,7 @@ pt{ ls{"Horário de Seicheles"} } "meta:Singapore"{ - ls{"Horário Padrão de Cingapura"} + ls{"Horário Padrão de Singapura"} } "meta:Solomon"{ ls{"Horário das Ilhas Salomão"} diff --git a/intl/icu/source/data/zone/pt_AO.txt b/intl/icu/source/data/zone/pt_AO.txt index 00495fbd41af..acafe58c5176 100644 --- a/intl/icu/source/data/zone/pt_AO.txt +++ b/intl/icu/source/data/zone/pt_AO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_AO{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/pt_CH.txt b/intl/icu/source/data/zone/pt_CH.txt index 3a679be16d07..67d661e786be 100644 --- a/intl/icu/source/data/zone/pt_CH.txt +++ b/intl/icu/source/data/zone/pt_CH.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CH{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/pt_CV.txt b/intl/icu/source/data/zone/pt_CV.txt index 6faee2225a56..ec15ca215272 100644 --- a/intl/icu/source/data/zone/pt_CV.txt +++ b/intl/icu/source/data/zone/pt_CV.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_CV{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/pt_GQ.txt b/intl/icu/source/data/zone/pt_GQ.txt index 7cbf7717a1ea..9364da966374 100644 --- a/intl/icu/source/data/zone/pt_GQ.txt +++ b/intl/icu/source/data/zone/pt_GQ.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GQ{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/pt_GW.txt b/intl/icu/source/data/zone/pt_GW.txt index faf8977c174a..3551ac5c7272 100644 --- a/intl/icu/source/data/zone/pt_GW.txt +++ b/intl/icu/source/data/zone/pt_GW.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_GW{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/pt_LU.txt b/intl/icu/source/data/zone/pt_LU.txt index ebead8d520fb..c402ea2ae5ed 100644 --- a/intl/icu/source/data/zone/pt_LU.txt +++ b/intl/icu/source/data/zone/pt_LU.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_LU{ %%Parent{"pt_PT"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/pt_MO.txt b/intl/icu/source/data/zone/pt_MO.txt index b23eb841fb45..513b9112c277 100644 --- a/intl/icu/source/data/zone/pt_MO.txt +++ b/intl/icu/source/data/zone/pt_MO.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MO{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/pt_MZ.txt b/intl/icu/source/data/zone/pt_MZ.txt index 451ddf5fd859..00ac52ed23e4 100644 --- a/intl/icu/source/data/zone/pt_MZ.txt +++ b/intl/icu/source/data/zone/pt_MZ.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_MZ{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/pt_PT.txt b/intl/icu/source/data/zone/pt_PT.txt index 4d22d557f3d2..e34021f7bf77 100644 --- a/intl/icu/source/data/zone/pt_PT.txt +++ b/intl/icu/source/data/zone/pt_PT.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_PT{ - Version{"37"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Adis-Abeba"} @@ -129,9 +129,6 @@ pt_PT{ "Asia:Rangoon"{ ec{"Yangon"} } - "Asia:Saigon"{ - ec{"Cidade de Ho Chi Minh"} - } "Asia:Taipei"{ ec{"Taipé"} } @@ -189,6 +186,9 @@ pt_PT{ "Europe:San_Marino"{ ec{"São Marinho"} } + "Europe:Tallinn"{ + ec{"Talim"} + } "Indian:Christmas"{ ec{"Ilha do Natal"} } @@ -702,7 +702,9 @@ pt_PT{ ls{"Hora de Niuê"} } "meta:Norfolk"{ - ls{"Hora da Ilha Norfolk"} + ld{"Hora de verão da Ilha Norfolk"} + lg{"Hora da Ilha Norfolk"} + ls{"Hora padrão da Ilha Norfolk"} } "meta:Noronha"{ ld{"Hora de verão de Fernando de Noronha"} diff --git a/intl/icu/source/data/zone/pt_ST.txt b/intl/icu/source/data/zone/pt_ST.txt index 1816386e9167..c06bfee5771b 100644 --- a/intl/icu/source/data/zone/pt_ST.txt +++ b/intl/icu/source/data/zone/pt_ST.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_ST{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/pt_TL.txt b/intl/icu/source/data/zone/pt_TL.txt index bd68cce9b74a..b09d1d31b8c9 100644 --- a/intl/icu/source/data/zone/pt_TL.txt +++ b/intl/icu/source/data/zone/pt_TL.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml pt_TL{ %%Parent{"pt_PT"} - Version{"37"} zoneStrings{ "meta:Azores"{ sd{"∅∅∅"} diff --git a/intl/icu/source/data/zone/qu.txt b/intl/icu/source/data/zone/qu.txt index abd6b3b417a3..13b05e6c28b9 100644 --- a/intl/icu/source/data/zone/qu.txt +++ b/intl/icu/source/data/zone/qu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abiyán"} diff --git a/intl/icu/source/data/zone/qu_BO.txt b/intl/icu/source/data/zone/qu_BO.txt index 935df6441003..92ab58d3b5d3 100644 --- a/intl/icu/source/data/zone/qu_BO.txt +++ b/intl/icu/source/data/zone/qu_BO.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu_BO{ - Version{"37"} zoneStrings{ "meta:Bolivia"{ ss{"BOT"} diff --git a/intl/icu/source/data/zone/qu_EC.txt b/intl/icu/source/data/zone/qu_EC.txt index b3fca820227c..066716295951 100644 --- a/intl/icu/source/data/zone/qu_EC.txt +++ b/intl/icu/source/data/zone/qu_EC.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml qu_EC{ - Version{"37"} zoneStrings{ "meta:Ecuador"{ ss{"ECT"} diff --git a/intl/icu/source/data/zone/rm.txt b/intl/icu/source/data/zone/rm.txt index 76ab442cba24..9a9ae3454992 100644 --- a/intl/icu/source/data/zone/rm.txt +++ b/intl/icu/source/data/zone/rm.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rm{ - Version{"37"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} @@ -19,7 +19,7 @@ rm{ ec{"Dschibuti"} } "Africa:El_Aaiun"{ - ec{"El Ayun"} + ec{"El Aaiún"} } "Africa:Khartoum"{ ec{"Khartum"} @@ -72,9 +72,6 @@ rm{ "America:Cordoba"{ ec{"Córdoba"} } - "America:Costa_Rica"{ - ec{"San José"} - } "America:Cuiaba"{ ec{"Cuiabá"} } @@ -150,9 +147,6 @@ rm{ "America:North_Dakota:New_Salem"{ ec{"North Dakota (New Salem)"} } - "America:Port_of_Spain"{ - ec{"Port-of-Spain"} - } "America:Sao_Paulo"{ ec{"São Paulo"} } @@ -232,7 +226,7 @@ rm{ ec{"Riyad"} } "Asia:Saigon"{ - ec{"Ho Chi Minh"} + ec{"Citad da Ho Chi Minh"} } "Asia:Sakhalin"{ ec{"Sachalin"} @@ -291,8 +285,11 @@ rm{ "Atlantic:Stanley"{ ec{"Port Stanley"} } + "Etc:UTC"{ + ls{"Temp universal coordinà"} + } "Etc:Unknown"{ - ec{"zona betg enconuschenta"} + ec{"citad nunenconuschenta"} } "Europe:Athens"{ ec{"Athen"} @@ -303,9 +300,6 @@ rm{ "Europe:Bucharest"{ ec{"Bucarest"} } - "Europe:Copenhagen"{ - ec{"Copenhaghen"} - } "Europe:Guernsey"{ ec{"Saint Peter Port"} } @@ -334,10 +328,7 @@ rm{ ec{"Tirana"} } "Europe:Uzhgorod"{ - ec{"Uschgorod"} - } - "Europe:Vatican"{ - ec{"Citad dal Vatican"} + ec{"Uschhorod"} } "Europe:Warsaw"{ ec{"Varsovia"} @@ -348,9 +339,6 @@ rm{ "Europe:Zurich"{ ec{"Turitg"} } - "Indian:Chagos"{ - ec{"Diego Garcia"} - } "Indian:Christmas"{ ec{"Flying Fish Cove"} } @@ -360,9 +348,6 @@ rm{ "Indian:Comoro"{ ec{"Comoras"} } - "Indian:Kerguelen"{ - ec{"Port-aux-Français"} - } "Indian:Maldives"{ ec{"Maldivas"} } @@ -420,8 +405,54 @@ rm{ "Pacific:Wallis"{ ec{"Matāʻutu"} } + "meta:America_Central"{ + ld{"Temp da stad central"} + lg{"Temp central"} + ls{"Temp da standard central"} + } + "meta:America_Eastern"{ + ld{"Temp da stad oriental"} + lg{"Temp oriental"} + ls{"Temp da standard oriental"} + } + "meta:America_Mountain"{ + ld{"Temp da stad da muntogna"} + lg{"Temp da muntogna"} + ls{"Temp da standard da muntogna"} + } + "meta:America_Pacific"{ + ld{"Temp da stad pacific"} + lg{"Temp pacific"} + ls{"Temp da standard pacific"} + } + "meta:Atlantic"{ + ld{"Temp da stad atlantic"} + lg{"Temp atlantic"} + ls{"Temp da standard atlantic"} + } + "meta:Europe_Central"{ + ld{"Temp da stad da l’Europa Centrala"} + lg{"Temp da l’Europa Centrala"} + ls{"Temp da standard da l’Europa Centrala"} + } + "meta:Europe_Eastern"{ + ld{"Temp da stad da l’Europa Orientala"} + lg{"Temp da l’Europa Orientala"} + ls{"Temp da standard da l’Europa Orientala"} + } + "meta:Europe_Western"{ + ld{"Temp da stad da l’Europa dal Vest"} + lg{"Temp da l’Europa dal Vest"} + ls{"Temp da standard da l’Europa dal Vest"} + } + "meta:GMT"{ + ls{"Temp Greenwich"} + } fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} hourFormat{"+HH:mm;-HH:mm"} + regionFormat{"temp: {0}"} + regionFormatDaylight{"temp da stad: {0}"} + regionFormatStandard{"temp normal: {0}"} } } diff --git a/intl/icu/source/data/zone/rn.txt b/intl/icu/source/data/zone/rn.txt index 5a9f4db59134..44771384b223 100644 --- a/intl/icu/source/data/zone/rn.txt +++ b/intl/icu/source/data/zone/rn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ro.txt b/intl/icu/source/data/zone/ro.txt index 62c05311d388..cbc4d9d520a9 100644 --- a/intl/icu/source/data/zone/ro.txt +++ b/intl/icu/source/data/zone/ro.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ro{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -898,7 +898,7 @@ ro{ ec{"Capul Verde"} } "Atlantic:Faeroe"{ - ec{"Faroe"} + ec{"Feroe"} } "Atlantic:Madeira"{ ec{"Madeira"} @@ -1065,7 +1065,7 @@ ro{ ec{"Paris"} } "Europe:Podgorica"{ - ec{"Podgorica"} + ec{"Podgorița"} } "Europe:Prague"{ ec{"Praga"} @@ -1316,6 +1316,11 @@ ro{ lg{"Ora din Alaska"} ls{"Ora standard din Alaska"} } + "meta:Almaty"{ + ld{"Ora de vară Almaty"} + lg{"Ora Almaty"} + ls{"Ora standard Almaty"} + } "meta:Amazon"{ ld{"Ora de vară a Amazonului"} lg{"Ora Amazonului"} @@ -1351,6 +1356,16 @@ ro{ lg{"Ora din Apia"} ls{"Ora standard din Apia"} } + "meta:Aqtau"{ + ld{"Ora de vară a zonei Aqtau"} + lg{"Ora Aqtau"} + ls{"Ora standard Aqtau"} + } + "meta:Aqtobe"{ + ld{"Ora de vară a zonei Aqtobe"} + lg{"Ora Aqtobe"} + ls{"Ora standard Aqtobe"} + } "meta:Arabian"{ ld{"Ora de vară arabă"} lg{"Ora arabă"} @@ -1732,9 +1747,9 @@ ro{ ls{"Ora din Niue"} } "meta:Norfolk"{ - ld{"Ora de vară Insulelor Norfolk"} - lg{"Ora Insulelor Norfolk"} - ls{"Ora standard Insulelor Norfolk"} + ld{"Ora de vară a Insulei Norfolk"} + lg{"Ora Insulei Norfolk"} + ls{"Ora standard a Insulei Norfolk"} } "meta:Noronha"{ ld{"Ora de vară din Fernando de Noronha"} diff --git a/intl/icu/source/data/zone/rof.txt b/intl/icu/source/data/zone/rof.txt index 7f57cbdf0865..589e60d591d4 100644 --- a/intl/icu/source/data/zone/rof.txt +++ b/intl/icu/source/data/zone/rof.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rof{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/root.txt b/intl/icu/source/data/zone/root.txt index 4552cd4f056d..508959314c5d 100644 --- a/intl/icu/source/data/zone/root.txt +++ b/intl/icu/source/data/zone/root.txt @@ -1,7 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"37"} + Version{"38.1"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} diff --git a/intl/icu/source/data/zone/ru.txt b/intl/icu/source/data/zone/ru.txt index 382d51ae650d..58412d2967df 100644 --- a/intl/icu/source/data/zone/ru.txt +++ b/intl/icu/source/data/zone/ru.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ru{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} @@ -1523,7 +1523,7 @@ ru{ ls{"Восточная Европа, стандартное время"} } "meta:Europe_Further_Eastern"{ - ls{"Минское время"} + ls{"Московское время"} } "meta:Europe_Western"{ ld{"Западная Европа, летнее время"} diff --git a/intl/icu/source/data/zone/rw.txt b/intl/icu/source/data/zone/rw.txt index 2836457928f9..853dad784159 100644 --- a/intl/icu/source/data/zone/rw.txt +++ b/intl/icu/source/data/zone/rw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rw{ - Version{"37"} zoneStrings{ gmtFormat{"GMT{0}"} hourFormat{"+HH:mm;-HH:mm"} diff --git a/intl/icu/source/data/zone/rwk.txt b/intl/icu/source/data/zone/rwk.txt index ab5706fb9c6c..d2062467b43b 100644 --- a/intl/icu/source/data/zone/rwk.txt +++ b/intl/icu/source/data/zone/rwk.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml rwk{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sa.txt b/intl/icu/source/data/zone/sa.txt new file mode 100644 index 000000000000..75c16acf3248 --- /dev/null +++ b/intl/icu/source/data/zone/sa.txt @@ -0,0 +1,59 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +sa{ + zoneStrings{ + "Etc:UTC"{ + ls{"समन्वितः वैश्विक समय:"} + } + "Etc:Unknown"{ + ec{"अज्ञात नगरी"} + } + "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:Atlantic"{ + ld{"अटलाण्टिक अयाम समयः"} + lg{"अटलाण्टिक समयः"} + ls{"अटलाण्टिक आदर्श समयः"} + } + "meta:Europe_Central"{ + ld{"मध्य यूरोपीय ग्रीष्म समयः"} + lg{"मध्य यूरोपीय समयः"} + ls{"मध्य यूरोपीय आदर्श समयः"} + } + "meta:Europe_Eastern"{ + ld{"पौर्व यूरोपीय ग्रीष्म समयः"} + lg{"पौर्व यूरोपीय समयः"} + ls{"पौर्व यूरोपीय आदर्श समयः"} + } + "meta:Europe_Western"{ + ld{"पाश्चात्य यूरोपीय ग्रीष्म समयः"} + lg{"पाश्चात्य यूरोपीय समयः"} + ls{"पाश्चात्य यूरोपीय आदर्श समयः"} + } + "meta:GMT"{ + ls{"ग्रीनविच मीन समयः"} + } + regionFormat{"{0} समय:"} + regionFormatDaylight{"{0} डेलाइट समय:"} + regionFormatStandard{"{0} मानक समय:"} + } +} diff --git a/intl/icu/source/data/zone/sah.txt b/intl/icu/source/data/zone/sah.txt index 5db44ca25866..8830d9d8fd67 100644 --- a/intl/icu/source/data/zone/sah.txt +++ b/intl/icu/source/data/zone/sah.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sah{ - Version{"37"} zoneStrings{ "Asia:Almaty"{ ec{"Алматы"} diff --git a/intl/icu/source/data/zone/saq.txt b/intl/icu/source/data/zone/saq.txt index 1aa6942d2d51..781713d8d1f6 100644 --- a/intl/icu/source/data/zone/saq.txt +++ b/intl/icu/source/data/zone/saq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml saq{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sat.txt b/intl/icu/source/data/zone/sat.txt index 9cbb214c226a..5da992c6dd2a 100644 --- a/intl/icu/source/data/zone/sat.txt +++ b/intl/icu/source/data/zone/sat.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat{ - Version{"37"} zoneStrings{ "Etc:UTC"{ ls{"ᱠᱚᱨᱰᱤᱱᱮᱴᱮᱰ ᱭᱩᱱᱤᱣᱟᱨᱥᱟᱞ ᱚᱠᱛᱚ"} diff --git a/intl/icu/source/data/zone/sat_IN.txt b/intl/icu/source/data/zone/sat_IN.txt index c4976b4d7f96..15af3290b576 100644 --- a/intl/icu/source/data/zone/sat_IN.txt +++ b/intl/icu/source/data/zone/sat_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_IN{ "%%ALIAS"{"sat_Olck_IN"} } diff --git a/intl/icu/source/data/zone/sat_Olck.txt b/intl/icu/source/data/zone/sat_Olck.txt index 0d7225f984f0..f09b6a0014dd 100644 --- a/intl/icu/source/data/zone/sat_Olck.txt +++ b/intl/icu/source/data/zone/sat_Olck.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sat_Olck{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sat_Olck_IN.txt b/intl/icu/source/data/zone/sat_Olck_IN.txt index 8bda43c4ea7c..0a44bdb50245 100644 --- a/intl/icu/source/data/zone/sat_Olck_IN.txt +++ b/intl/icu/source/data/zone/sat_Olck_IN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sbp.txt b/intl/icu/source/data/zone/sbp.txt index b283c92989f1..6c2e085d6d6f 100644 --- a/intl/icu/source/data/zone/sbp.txt +++ b/intl/icu/source/data/zone/sbp.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sbp{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sd.txt b/intl/icu/source/data/zone/sd.txt index e9adca4d9f5d..260087c992ba 100644 --- a/intl/icu/source/data/zone/sd.txt +++ b/intl/icu/source/data/zone/sd.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"ابي جان"} @@ -757,7 +757,7 @@ sd{ ec{"ڪريسنويارسڪ"} } "Asia:Kuala_Lumpur"{ - ec{"ڪوللمپور"} + ec{"ڪوالالمپور"} } "Asia:Kuching"{ ec{"کوچنگ"} @@ -916,7 +916,7 @@ sd{ ec{"اسٽينلي"} } "Australia:Adelaide"{ - ec{"ايڊيلينڊ"} + ec{"ايڊيليڊ"} } "Australia:Brisbane"{ ec{"برسبين"} @@ -1023,7 +1023,7 @@ sd{ ec{"ڪلينن گراڊ"} } "Europe:Kiev"{ - ec{"ڪيف"} + ec{"ڪِيو"} } "Europe:Kirov"{ ec{"ڪيروف"} @@ -1105,7 +1105,7 @@ sd{ ec{"ٽالن"} } "Europe:Tirane"{ - ec{"اراني"} + ec{"تراني"} } "Europe:Ulyanovsk"{ ec{"اليانوسڪ"} @@ -1349,13 +1349,13 @@ sd{ } "meta:Argentina"{ ld{"ارجنٽائن جي اونهاري جو وقت"} - lg{"ارجنٽائن وقت"} + lg{"ارجنٽينا جو وقت"} ls{"ارجنٽائن معياري وقت"} } "meta:Argentina_Western"{ - ld{"مغربي ارجنٽائن جي اونهاري جو وقت"} - lg{"مغربي ارجنٽائن وقت"} - ls{"مغربي ارجنٽائن جو معياري وقت"} + ld{"اولهه ارجنٽينا جي اونهاري جو وقت"} + lg{"اولهه ارجنٽينا جو وقت"} + ls{"اولهه ارجنٽينا جو معياري وقت"} } "meta:Armenia"{ ld{"آرمينيا جي اونهاري جو وقت"} @@ -1414,7 +1414,7 @@ sd{ ls{"براسيليا جو معياري وقت"} } "meta:Brunei"{ - ls{"برونائي داروالسلام جو وقت"} + ls{"برونائي دارالسلام جو وقت"} } "meta:Cape_Verde"{ ld{"ڪيپ ورڊ جي اونهاري جو وقت"} @@ -1436,7 +1436,7 @@ sd{ } "meta:China"{ ld{"چائنا جي ڏينهن جو وقت"} - lg{"چائنا جو وقت"} + lg{"چين جو وقت"} ls{"چائنا جو معياري وقت"} } "meta:Choibalsan"{ @@ -1496,9 +1496,9 @@ sd{ ls{"وڌيڪ مشرقي يورپي وقت"} } "meta:Europe_Western"{ - ld{"مغربي يورپي ڏينهن جو وقت"} - lg{"مغربي يورپي وقت"} - ls{"مغربي يورپي معياري وقت"} + ld{"اولهه يورپي ڏينهن جو وقت"} + lg{"اولهه يورپي وقت"} + ls{"اولهه يورپي معياري وقت"} } "meta:Falkland"{ ld{"فاڪ لينڊ آئي لينڊ جي اونهاري جو وقت"} @@ -1514,7 +1514,7 @@ sd{ ls{"فرانسيسي گيانا جو وقت"} } "meta:French_Southern"{ - ls{"فرانسيسي ڏاکڻي ۽ انٽارڪٽڪ جو وقت"} + ls{"فرانسيسي ڏاکڻيو ۽ انٽارڪٽڪ وقت"} } "meta:GMT"{ ls{"گرين وچ مين ٽائيم"} @@ -1544,7 +1544,7 @@ sd{ ls{"مغربي گرين لينڊ جو معياري وقت"} } "meta:Gulf"{ - ls{"خلج معياري وقت"} + ls{"خليجي معياري وقت"} } "meta:Guyana"{ ls{"گيانائي وقت"} @@ -1606,7 +1606,7 @@ sd{ ls{"اوڀر قزاقستان جو وقت"} } "meta:Kazakhstan_Western"{ - ls{"اولهه قزاقستان جو وقت"} + ls{"اولهه قازقستان جو وقت"} } "meta:Korea"{ ld{"ڪوريا جي ڏينهن جو وقت"} @@ -1622,7 +1622,7 @@ sd{ ls{"ڪریسنویارسڪ جو معياري وقت"} } "meta:Kyrgystan"{ - ls{"ڪرگزستان جو وقت"} + ls{"ڪرغزستان جو وقت"} } "meta:Line_Islands"{ ls{"لائن آئي لينڊ جو وقت"} @@ -1757,9 +1757,9 @@ sd{ ls{"فونيڪس آئي لينڊ جو وقت"} } "meta:Pierre_Miquelon"{ - ld{"سینٽ پیئر و میڪوئیلون جي ڏينهن جو وقت"} - lg{"سينٽ پيئر ائن ميڪوئلون جو وقت"} - ls{"سینٽ پیئر اَئن میڪوئلون جو مانائتو وقت"} + ld{"سينٽ پيئر ۽ ميڪلون جي ڏينهن جو وقت"} + lg{"سينٽ پيئر ۽ ميڪلون جو وقت"} + ls{"سينٽ پيئر ۽ ميڪلون جو معياري وقت"} } "meta:Pitcairn"{ ls{"پٽڪيرن جو وقت"} @@ -1768,7 +1768,7 @@ sd{ ls{"پوناپي جو وقت"} } "meta:Pyongyang"{ - ls{"شيانگ يانگ جو وقت"} + ls{"پيانگ يانگ جو وقت"} } "meta:Reunion"{ ls{"ري يونين جو وقت"} diff --git a/intl/icu/source/data/zone/sd_Arab.txt b/intl/icu/source/data/zone/sd_Arab.txt index 52a97c862438..c089e06d8ec5 100644 --- a/intl/icu/source/data/zone/sd_Arab.txt +++ b/intl/icu/source/data/zone/sd_Arab.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Arab{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sd_Arab_PK.txt b/intl/icu/source/data/zone/sd_Arab_PK.txt index 4a9803a3c859..2e57dba96af5 100644 --- a/intl/icu/source/data/zone/sd_Arab_PK.txt +++ b/intl/icu/source/data/zone/sd_Arab_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sd_Deva.txt b/intl/icu/source/data/zone/sd_Deva.txt index 1d5015e7646b..9931bc2dc193 100644 --- a/intl/icu/source/data/zone/sd_Deva.txt +++ b/intl/icu/source/data/zone/sd_Deva.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_Deva{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Etc:UTC"{ ls{"आस्थानी चालू टाइमु"} diff --git a/intl/icu/source/data/zone/sd_PK.txt b/intl/icu/source/data/zone/sd_PK.txt index 766360070b4e..b7def87808ea 100644 --- a/intl/icu/source/data/zone/sd_PK.txt +++ b/intl/icu/source/data/zone/sd_PK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sd_PK{ "%%ALIAS"{"sd_Arab_PK"} } diff --git a/intl/icu/source/data/zone/se.txt b/intl/icu/source/data/zone/se.txt index e07be54a1592..0cbfe80b1000 100644 --- a/intl/icu/source/data/zone/se.txt +++ b/intl/icu/source/data/zone/se.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se{ - Version{"37"} zoneStrings{ "America:Curacao"{ ec{"Curaçao"} diff --git a/intl/icu/source/data/zone/se_FI.txt b/intl/icu/source/data/zone/se_FI.txt index 02bf7d7c2930..d472d0b6d022 100644 --- a/intl/icu/source/data/zone/se_FI.txt +++ b/intl/icu/source/data/zone/se_FI.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml se_FI{ - Version{"37"} zoneStrings{ "Africa:Cairo"{ ec{"Kairo"} diff --git a/intl/icu/source/data/zone/seh.txt b/intl/icu/source/data/zone/seh.txt index d5237e26baee..fa708a39e089 100644 --- a/intl/icu/source/data/zone/seh.txt +++ b/intl/icu/source/data/zone/seh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml seh{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ses.txt b/intl/icu/source/data/zone/ses.txt index f8595e4884e7..05fa5471ccdd 100644 --- a/intl/icu/source/data/zone/ses.txt +++ b/intl/icu/source/data/zone/ses.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ses{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sg.txt b/intl/icu/source/data/zone/sg.txt index 2f001a342704..ad75cb9b87d6 100644 --- a/intl/icu/source/data/zone/sg.txt +++ b/intl/icu/source/data/zone/sg.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sg{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sh.txt b/intl/icu/source/data/zone/sh.txt index 74b646a22923..83091b2d0a58 100644 --- a/intl/icu/source/data/zone/sh.txt +++ b/intl/icu/source/data/zone/sh.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh{ "%%ALIAS"{"sr_Latn"} } diff --git a/intl/icu/source/data/zone/sh_BA.txt b/intl/icu/source/data/zone/sh_BA.txt index 93bdac63f042..7f73cd515f1a 100644 --- a/intl/icu/source/data/zone/sh_BA.txt +++ b/intl/icu/source/data/zone/sh_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_BA{ "%%ALIAS"{"sr_Latn_BA"} } diff --git a/intl/icu/source/data/zone/sh_CS.txt b/intl/icu/source/data/zone/sh_CS.txt index 224568a08c08..3b2f92bbf46c 100644 --- a/intl/icu/source/data/zone/sh_CS.txt +++ b/intl/icu/source/data/zone/sh_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/zone/sh_YU.txt b/intl/icu/source/data/zone/sh_YU.txt index 8a7d4609802f..dc5a35beadb0 100644 --- a/intl/icu/source/data/zone/sh_YU.txt +++ b/intl/icu/source/data/zone/sh_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sh_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/zone/shi.txt b/intl/icu/source/data/zone/shi.txt index 286f25798623..55a0e8d5aa6c 100644 --- a/intl/icu/source/data/zone/shi.txt +++ b/intl/icu/source/data/zone/shi.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/shi_Latn.txt b/intl/icu/source/data/zone/shi_Latn.txt index 1b87df9dcca6..f6f713911b1a 100644 --- a/intl/icu/source/data/zone/shi_Latn.txt +++ b/intl/icu/source/data/zone/shi_Latn.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Latn{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/shi_MA.txt b/intl/icu/source/data/zone/shi_MA.txt index 00de1b1b27a7..c96251db2b7c 100644 --- a/intl/icu/source/data/zone/shi_MA.txt +++ b/intl/icu/source/data/zone/shi_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_MA{ "%%ALIAS"{"shi_Tfng_MA"} } diff --git a/intl/icu/source/data/zone/shi_Tfng.txt b/intl/icu/source/data/zone/shi_Tfng.txt index 397f53f49446..723cdf148de1 100644 --- a/intl/icu/source/data/zone/shi_Tfng.txt +++ b/intl/icu/source/data/zone/shi_Tfng.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml shi_Tfng{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/shi_Tfng_MA.txt b/intl/icu/source/data/zone/shi_Tfng_MA.txt index 978cd5cab856..3ec81a4f824a 100644 --- a/intl/icu/source/data/zone/shi_Tfng_MA.txt +++ b/intl/icu/source/data/zone/shi_Tfng_MA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/si.txt b/intl/icu/source/data/zone/si.txt index 77704113369a..b811006cfa8f 100644 --- a/intl/icu/source/data/zone/si.txt +++ b/intl/icu/source/data/zone/si.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml si{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"අබිජාන්"} diff --git a/intl/icu/source/data/zone/sk.txt b/intl/icu/source/data/zone/sk.txt index c9b4aa792454..35e19cb4af1c 100644 --- a/intl/icu/source/data/zone/sk.txt +++ b/intl/icu/source/data/zone/sk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sk{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/sl.txt b/intl/icu/source/data/zone/sl.txt index 3c6bc9ad70fb..85f22db1549e 100644 --- a/intl/icu/source/data/zone/sl.txt +++ b/intl/icu/source/data/zone/sl.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sl{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžan"} @@ -901,7 +901,7 @@ sl{ ec{"Zelenortski otoki"} } "Atlantic:Faeroe"{ - ec{"Faroe"} + ec{"Ferski otoki"} } "Atlantic:Madeira"{ ec{"Madeira"} @@ -1720,9 +1720,9 @@ sl{ ls{"Niuejski čas"} } "meta:Norfolk"{ - ld{"Norfolški otoki poletni čas"} - lg{"Norfolški otoki čas"} - ls{"Norfolški otoki standardni čas"} + ld{"Poletni čas: Norfolški otoki"} + lg{"Čas: Norfolški otoki"} + ls{"Standardni čas: Norfolški otoki"} } "meta:Noronha"{ ld{"Fernando de Noronški poletni čas"} diff --git a/intl/icu/source/data/zone/smn.txt b/intl/icu/source/data/zone/smn.txt index e434d613e3e9..21626638ca3d 100644 --- a/intl/icu/source/data/zone/smn.txt +++ b/intl/icu/source/data/zone/smn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml smn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sn.txt b/intl/icu/source/data/zone/sn.txt index 96407c526899..33c96eb1303e 100644 --- a/intl/icu/source/data/zone/sn.txt +++ b/intl/icu/source/data/zone/sn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/so.txt b/intl/icu/source/data/zone/so.txt index 56c367289f20..07c16e0661e3 100644 --- a/intl/icu/source/data/zone/so.txt +++ b/intl/icu/source/data/zone/so.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml so{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjaan"} @@ -787,7 +787,7 @@ so{ ec{"Farow"} } "Atlantic:Madeira"{ - ec{"Madeera"} + ec{"Madira"} } "Atlantic:Reykjavik"{ ec{"Reykjafik"} @@ -848,7 +848,7 @@ so{ ec{"Atens"} } "Europe:Belgrade"{ - ec{"Bilgaraydh"} + ec{"Belgaraydh"} } "Europe:Berlin"{ ec{"Barliin"} @@ -894,7 +894,7 @@ so{ ec{"Jaarsey"} } "Europe:Kiev"{ - ec{"Kiyf"} + ec{"Kiyeef"} } "Europe:Kirov"{ ec{"Kiroof"} @@ -907,10 +907,10 @@ so{ ld{"Waqtiga Xagaaga ee Biritishka"} } "Europe:Luxembourg"{ - ec{"Luksembaag"} + ec{"Luksemberg"} } "Europe:Madrid"{ - ec{"Maadriid"} + ec{"Madriid"} } "Europe:Mariehamn"{ ec{"Maarihaam"} @@ -979,7 +979,7 @@ so{ ec{"Fatikaan"} } "Europe:Vienna"{ - ec{"Fiyaana"} + ec{"Fiyeena"} } "Europe:Vilnius"{ ec{"Finiyuus"} @@ -988,13 +988,13 @@ so{ ec{"Folgograd"} } "Europe:Zagreb"{ - ec{"Sagreb"} + ec{"Saqrib"} } "Europe:Zaporozhye"{ ec{"Saborosey"} } "Europe:Zurich"{ - ec{"Surij"} + ec{"Suurikh"} } "Indian:Antananarivo"{ ec{"Antananarifo"} @@ -1368,7 +1368,7 @@ so{ ls{"Waqtiga Koonfurta Faransiiska & Antaarktik"} } "meta:GMT"{ - ls{"Waqtiga Celceliska Giriinwij"} + ls{"Wakhtiga Giriinwij"} } "meta:Galapagos"{ ls{"Waqtiga Galabagos"} diff --git a/intl/icu/source/data/zone/sq.txt b/intl/icu/source/data/zone/sq.txt index cbe92319f135..f0e534278b5e 100644 --- a/intl/icu/source/data/zone/sq.txt +++ b/intl/icu/source/data/zone/sq.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sq{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abixhan"} diff --git a/intl/icu/source/data/zone/sr.txt b/intl/icu/source/data/zone/sr.txt index e5af0c27a451..436d7948a4ca 100644 --- a/intl/icu/source/data/zone/sr.txt +++ b/intl/icu/source/data/zone/sr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиџан"} @@ -1019,7 +1019,7 @@ sr{ ec{"Истанбул"} } "Europe:Jersey"{ - ec{"Џерси"} + ec{"Џерзи"} } "Europe:Kaliningrad"{ ec{"Калињинград"} @@ -1526,7 +1526,7 @@ sr{ ss{"EET"} } "meta:Europe_Further_Eastern"{ - ls{"Даљи исток Европе"} + ls{"Време даљег истока Европе"} } "meta:Europe_Western"{ ld{"Западноевропско летње време"} diff --git a/intl/icu/source/data/zone/sr_BA.txt b/intl/icu/source/data/zone/sr_BA.txt index edad17f703fe..04f2efd1a7a2 100644 --- a/intl/icu/source/data/zone/sr_BA.txt +++ b/intl/icu/source/data/zone/sr_BA.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_BA{ "%%ALIAS"{"sr_Cyrl_BA"} } diff --git a/intl/icu/source/data/zone/sr_CS.txt b/intl/icu/source/data/zone/sr_CS.txt index 5f8becfab3ed..6a32f49e2a6f 100644 --- a/intl/icu/source/data/zone/sr_CS.txt +++ b/intl/icu/source/data/zone/sr_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_CS{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/zone/sr_Cyrl.txt b/intl/icu/source/data/zone/sr_Cyrl.txt index df3a287587cf..772d8b3da519 100644 --- a/intl/icu/source/data/zone/sr_Cyrl.txt +++ b/intl/icu/source/data/zone/sr_Cyrl.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/sr_Cyrl_BA.txt b/intl/icu/source/data/zone/sr_Cyrl_BA.txt index 51e1655a53af..400914477e36 100644 --- a/intl/icu/source/data/zone/sr_Cyrl_BA.txt +++ b/intl/icu/source/data/zone/sr_Cyrl_BA.txt @@ -1,8 +1,669 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -/** - * generated alias target - */ +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_BA{ - ___{""} + zoneStrings{ + "America:Indiana:Vevay"{ + ec{"Виви, Индијана"} + } + "America:Indiana:Vincennes"{ + ec{"Винсенс, Индијана"} + } + "America:Indianapolis"{ + ec{"Индијанаполис"} + } + "America:Louisville"{ + ec{"Луивил"} + } + "America:North_Dakota:Beulah"{ + ec{"Бјула, Сјеверна Дакота"} + } + "America:North_Dakota:Center"{ + ec{"Центар, Сјеверна Дакота"} + } + "America:North_Dakota:New_Salem"{ + ec{"Нови Салем, Сјеверна Дакота"} + } + "America:Port-au-Prince"{ + ec{"Порт-о-Пренс"} + } + "America:Port_of_Spain"{ + ec{"Порт ов Спејн"} + } + "America:Puerto_Rico"{ + ec{"Порторико"} + } + "America:Regina"{ + ec{"Реџајна"} + } + "America:Resolute"{ + ec{"Резолут"} + } + "America:Scoresbysund"{ + ec{"Итокортормит"} + } + "America:St_Barthelemy"{ + ec{"Сен Бартелеми"} + } + "America:St_Johns"{ + ec{"Сент Џонс"} + } + "America:St_Thomas"{ + ec{"Сент Томас"} + } + "America:Swift_Current"{ + ec{"Свифт Карент"} + } + "Antarctica:DumontDUrville"{ + ec{"Димон д’Ирвил"} + } + "Antarctica:Macquarie"{ + ec{"Маквори"} + } + "Arctic:Longyearbyen"{ + ec{"Лонгјир"} + } + "Etc:UTC"{ + ls{"Координисано универзално вријеме"} + } + "Europe:Dublin"{ + ld{"Ирска, стандардно вријеме"} + } + "Europe:London"{ + ld{"Британија, љетње вријеме"} + } + "Pacific:Niue"{ + 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:Apia"{ + 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:Mexico_Northwest"{ + ld{"Сјеверозападни Мексико, летње вријеме"} + lg{"Сјеверозападни Мексико"} + ls{"Сјеверозападни Мексико, стандардно вријеме"} + } + "meta:Mexico_Pacific"{ + ld{"Мексички Пацифик, љетње вријеме"} + lg{"Мексички Пацифик"} + 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"{ + ld{"острво Норфолк, љетње вријеме"} + lg{"острво Норфолк вријеме"} + 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:Pyongyang"{ + 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:Suriname"{ + 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{"Јекатеринбург, стандардно вријеме"} + } + regionFormatDaylight{"{0}, љетње вријеме"} + regionFormatStandard{"{0}, стандардно вријеме"} + } } diff --git a/intl/icu/source/data/zone/sr_Cyrl_CS.txt b/intl/icu/source/data/zone/sr_Cyrl_CS.txt index 9325e5a76a14..2da82d2d35e0 100644 --- a/intl/icu/source/data/zone/sr_Cyrl_CS.txt +++ b/intl/icu/source/data/zone/sr_Cyrl_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_CS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/zone/sr_Cyrl_RS.txt b/intl/icu/source/data/zone/sr_Cyrl_RS.txt index 7ef8fabce652..c74b8608c8e9 100644 --- a/intl/icu/source/data/zone/sr_Cyrl_RS.txt +++ b/intl/icu/source/data/zone/sr_Cyrl_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sr_Cyrl_XK.txt b/intl/icu/source/data/zone/sr_Cyrl_XK.txt index d7d4a860bd1c..c74bfeecce64 100644 --- a/intl/icu/source/data/zone/sr_Cyrl_XK.txt +++ b/intl/icu/source/data/zone/sr_Cyrl_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sr_Cyrl_YU.txt b/intl/icu/source/data/zone/sr_Cyrl_YU.txt index 806d42c439fb..5874f8cb4091 100644 --- a/intl/icu/source/data/zone/sr_Cyrl_YU.txt +++ b/intl/icu/source/data/zone/sr_Cyrl_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Cyrl_YU{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/zone/sr_Latn.txt b/intl/icu/source/data/zone/sr_Latn.txt index 08216a5ac3bb..6fe03ebfae78 100644 --- a/intl/icu/source/data/zone/sr_Latn.txt +++ b/intl/icu/source/data/zone/sr_Latn.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžan"} @@ -1020,7 +1020,7 @@ sr_Latn{ ec{"Istanbul"} } "Europe:Jersey"{ - ec{"Džersi"} + ec{"Džerzi"} } "Europe:Kaliningrad"{ ec{"Kalinjingrad"} @@ -1527,7 +1527,7 @@ sr_Latn{ ss{"EET"} } "meta:Europe_Further_Eastern"{ - ls{"Dalji istok Evrope"} + ls{"Vreme daljeg istoka Evrope"} } "meta:Europe_Western"{ ld{"Zapadnoevropsko letnje vreme"} diff --git a/intl/icu/source/data/zone/sr_Latn_BA.txt b/intl/icu/source/data/zone/sr_Latn_BA.txt index f4b62ac33917..5cb7849fa617 100644 --- a/intl/icu/source/data/zone/sr_Latn_BA.txt +++ b/intl/icu/source/data/zone/sr_Latn_BA.txt @@ -1,8 +1,662 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License -/** - * generated alias target - */ +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_BA{ - ___{""} + zoneStrings{ + "America:Indiana:Vevay"{ + ec{"Vivi, Indijana"} + } + "America:Indiana:Vincennes"{ + ec{"Vinsens, Indijana"} + } + "America:Indianapolis"{ + ec{"Indijanapolis"} + } + "America:Louisville"{ + ec{"Luivil"} + } + "America:North_Dakota:Beulah"{ + ec{"Bjula, Sjeverna Dakota"} + } + "America:North_Dakota:Center"{ + ec{"Centar, Sjeverna Dakota"} + } + "America:North_Dakota:New_Salem"{ + ec{"Novi Salem, Sjeverna Dakota"} + } + "America:Port-au-Prince"{ + ec{"Port-o-Prens"} + } + "America:Port_of_Spain"{ + ec{"Port ov Spejn"} + } + "America:Puerto_Rico"{ + ec{"Portoriko"} + } + "America:Regina"{ + ec{"Redžajna"} + } + "America:Resolute"{ + ec{"Rezolut"} + } + "America:Scoresbysund"{ + ec{"Itokortormit"} + } + "America:St_Barthelemy"{ + ec{"Sen Bartelemi"} + } + "America:St_Johns"{ + ec{"Sent Džons"} + } + "America:St_Thomas"{ + ec{"Sent Tomas"} + } + "America:Swift_Current"{ + ec{"Svift Karent"} + } + "Antarctica:DumontDUrville"{ + ec{"Dimon d’Irvil"} + } + "Antarctica:Macquarie"{ + ec{"Makvori"} + } + "Arctic:Longyearbyen"{ + ec{"Longjir"} + } + "Etc:UTC"{ + ls{"Koordinisano univerzalno vrijeme"} + } + "Europe:Dublin"{ + ld{"Irska, standardno vrijeme"} + } + "Europe:London"{ + ld{"Britanija, ljetnje vrijeme"} + } + "Pacific:Niue"{ + ec{"Nijue"} + } + "meta:Afghanistan"{ + ls{"Avganistan vrijeme"} + } + "meta:Africa_Central"{ + ls{"Centralno-afričko vrijeme"} + } + "meta:Africa_Eastern"{ + ls{"Istočno-afričko vrijeme"} + } + "meta:Africa_Southern"{ + ls{"Južno-afričko vrijeme"} + } + "meta:Africa_Western"{ + ld{"Zapadno-afričko ljetnje vrijeme"} + lg{"Zapadno-afričko vrijeme"} + ls{"Zapadno-afričko standardno vrijeme"} + } + "meta:Alaska"{ + ld{"Aljaska, ljetnje vrijeme"} + ls{"Aljaska, standardno vrijeme"} + } + "meta:Amazon"{ + ld{"Amazon, ljetnje vrijeme"} + lg{"Amazon vrijeme"} + ls{"Amazon, standardno vrijeme"} + } + "meta:America_Central"{ + ld{"Sjevernoameričko centralno ljetnje vrijeme"} + lg{"Sjevernoameričko centralno vrijeme"} + ls{"Sjevernoameričko centralno standardno vrijeme"} + } + "meta:America_Eastern"{ + ld{"Sjevernoameričko istočno ljetnje vrijeme"} + lg{"Sjevernoameričko istočno vrijeme"} + ls{"Sjevernoameričko istočno standardno vrijeme"} + } + "meta:America_Mountain"{ + ld{"Sjevernoameričko planinsko ljetnje vrijeme"} + lg{"Sjevernoameričko planinsko vrijeme"} + ls{"Sjevernoameričko planinsko standardno vrijeme"} + } + "meta:America_Pacific"{ + ld{"Sjevernoameričko pacifičko letnje vrijeme"} + lg{"Sjevernoameričko pacifičko vrijeme"} + ls{"Sjevernoameričko pacifičko standardno vrijeme"} + } + "meta:Apia"{ + ld{"Apija, ljetnje vrijeme"} + lg{"Apija vrijeme"} + ls{"Apija, standardno vrijeme"} + } + "meta:Arabian"{ + ld{"Arabijsko ljetnje vrijeme"} + lg{"Arabijsko vrijeme"} + ls{"Arabijsko standardno vrijeme"} + } + "meta:Argentina"{ + ld{"Argentina, ljetnje vrijeme"} + lg{"Argentina vrijeme"} + ls{"Argentina, standardno vrijeme"} + } + "meta:Argentina_Western"{ + ld{"Zapadna Argentina, ljetnje vrijeme"} + lg{"Zapadna Argentina vrijeme"} + ls{"Zapadna Argentina, standardno vrijeme"} + } + "meta:Armenia"{ + ld{"Jermenija, ljetnje vrijeme"} + lg{"Jermenija vrijeme"} + ls{"Jermenija, standardno vrijeme"} + } + "meta:Atlantic"{ + ld{"Atlantsko ljetnje vrijeme"} + lg{"Atlantsko vrijeme"} + ls{"Atlantsko standardno vrijeme"} + } + "meta:Australia_Central"{ + ld{"Australijsko centralno ljetnje vrijeme"} + lg{"Australijsko centralno vrijeme"} + ls{"Australijsko centralno standardno vrijeme"} + } + "meta:Australia_CentralWestern"{ + ld{"Australijsko centralno zapadno ljetnje vrijeme"} + lg{"Australijsko centralno zapadno vrijeme"} + ls{"Australijsko centralno zapadno standardno vrijeme"} + } + "meta:Australia_Eastern"{ + ld{"Australijsko istočno ljetnje vrijeme"} + lg{"Australijsko istočno vrijeme"} + ls{"Australijsko istočno standardno vrijeme"} + } + "meta:Australia_Western"{ + ld{"Australijsko zapadno ljetnje vrijeme"} + lg{"Australijsko zapadno vrijeme"} + ls{"Australijsko zapadno standardno vrijeme"} + } + "meta:Azerbaijan"{ + ld{"Azerbejdžan, ljetnje vrijeme"} + lg{"Azerbejdžan vrijeme"} + ls{"Azerbejdžan, standardno vrijeme"} + } + "meta:Azores"{ + ld{"Azori, ljetnje vrijeme"} + lg{"Azori vrijeme"} + ls{"Azori, standardno vrijeme"} + } + "meta:Bangladesh"{ + ld{"Bangladeš, ljetnje vrijeme"} + lg{"Bangladeš vrijeme"} + ls{"Bangladeš, standardno vrijeme"} + } + "meta:Bhutan"{ + ls{"Butan vrijeme"} + } + "meta:Bolivia"{ + ls{"Bolivija vrijeme"} + } + "meta:Brasilia"{ + ld{"Brazilija, ljetnje vrijeme"} + lg{"Brazilija vrijeme"} + ls{"Brazilija, standardno vrijeme"} + } + "meta:Brunei"{ + ls{"Brunej Darusalum vrijeme"} + } + "meta:Cape_Verde"{ + ld{"Zelenortska Ostrva, ljetnje vrijeme"} + lg{"Zelenortska Ostrva vrijeme"} + ls{"Zelenortska Ostrva, standardno vrijeme"} + } + "meta:Chamorro"{ + ls{"Čamoro vrijeme"} + } + "meta:Chatham"{ + ld{"Čatam, ljetnje vrijeme"} + lg{"Čatam vrijeme"} + ls{"Čatam, standardno vrijeme"} + } + "meta:Chile"{ + ld{"Čile, ljetnje vrijeme"} + lg{"Čile vrijeme"} + ls{"Čile, standardno vrijeme"} + } + "meta:China"{ + ld{"Kina, ljetnje vrijeme"} + lg{"Kina vrijeme"} + ls{"Kinesko standardno vrijeme"} + } + "meta:Choibalsan"{ + ld{"Čojbalsan, ljetnje vrijeme"} + lg{"Čojbalsan vrijeme"} + ls{"Čojbalsan, standardno vrijeme"} + } + "meta:Christmas"{ + ls{"Božićno ostrvo vrijeme"} + } + "meta:Cocos"{ + ls{"Kokosova (Kiling) ostrva vrijeme"} + } + "meta:Colombia"{ + ld{"Kolumbija, ljetnje vrijeme"} + lg{"Kolumbija vrijeme"} + ls{"Kolumbija, standardno vrijeme"} + } + "meta:Cook"{ + ld{"Kukova Ostrva, poluljetnje vrijeme"} + lg{"Kukova Ostrva vrijeme"} + ls{"Kukova Ostrva, standardno vrijeme"} + } + "meta:Cuba"{ + ld{"Kuba, ljetnje vrijeme"} + ls{"Kuba, standardno vrijeme"} + } + "meta:Davis"{ + ls{"Dejvis vrijeme"} + } + "meta:DumontDUrville"{ + ls{"Dimon d’Irvil vrijeme"} + } + "meta:East_Timor"{ + ls{"Istočni Timor vrijeme"} + } + "meta:Easter"{ + ld{"Uskršnja ostrva, ljetnje vrijeme"} + lg{"Uskršnja ostrva vrijeme"} + ls{"Uskršnja ostrva, standardno vrijeme"} + } + "meta:Ecuador"{ + ls{"Ekvador vrijeme"} + } + "meta:Europe_Central"{ + ld{"Srednjoevropsko ljetnje vrijeme"} + lg{"Srednjoevropsko vrijeme"} + ls{"Srednjoevropsko standardno vrijeme"} + } + "meta:Europe_Eastern"{ + ld{"Istočnoevropsko ljetnje vrijeme"} + lg{"Istočnoevropsko vrijeme"} + ls{"Istočnoevropsko standardno vrijeme"} + } + "meta:Europe_Western"{ + ld{"Zapadnoevropsko ljetnje vrijeme"} + lg{"Zapadnoevropsko vrijeme"} + ls{"Zapadnoevropsko standardno vrijeme"} + } + "meta:Falkland"{ + ld{"Folklandska Ostrva, ljetnje vrijeme"} + lg{"Folklandska Ostrva vrijeme"} + ls{"Folklandska Ostrva, standardno vrijeme"} + } + "meta:Fiji"{ + ld{"Fidži, ljetnje vrijeme"} + lg{"Fidži vrijeme"} + ls{"Fidži, standardno vrijeme"} + } + "meta:French_Guiana"{ + ls{"Francuska Gvajana vrijeme"} + } + "meta:French_Southern"{ + ls{"Francusko južno i antarktičko vrijeme"} + } + "meta:GMT"{ + ls{"Srednje vrijeme po Griniču"} + } + "meta:Galapagos"{ + ls{"Galapagos vrijeme"} + } + "meta:Gambier"{ + ls{"Gambije vrijeme"} + } + "meta:Georgia"{ + ld{"Gruzija, ljetnje vrijeme"} + lg{"Gruzija vrijeme"} + ls{"Gruzija, standardno vrijeme"} + } + "meta:Gilbert_Islands"{ + ls{"Gilbertova ostrva vrijeme"} + } + "meta:Greenland_Eastern"{ + ld{"Istočni Grenland, ljetnje vrijeme"} + ls{"Istočni Grenland, standardno vrijeme"} + } + "meta:Greenland_Western"{ + ld{"Zapadni Grenland, ljetnje vrijeme"} + ls{"Zapadni Grenland, standardno vrijeme"} + } + "meta:Gulf"{ + ls{"Zalivsko vrijeme"} + } + "meta:Guyana"{ + ls{"Gvajana vrijeme"} + } + "meta:Hawaii_Aleutian"{ + ld{"Havajsko-aleutsko ljetnje vrijeme"} + lg{"Havajsko-aleutsko vrijeme"} + ls{"Havajsko-aleutsko standardno vrijeme"} + } + "meta:Hong_Kong"{ + ld{"Hong Kong, ljetnje vrijeme"} + lg{"Hong Kong vrijeme"} + ls{"Hong Kong, standardno vrijeme"} + } + "meta:Hovd"{ + ld{"Hovd, ljetnje vrijeme"} + lg{"Hovd vrijeme"} + ls{"Hovd, standardno vrijeme"} + } + "meta:India"{ + ls{"Indijsko standardno vrijeme"} + } + "meta:Indian_Ocean"{ + ls{"Indijsko okeansko vrijeme"} + } + "meta:Indochina"{ + ls{"Indokina vrijeme"} + } + "meta:Indonesia_Central"{ + ls{"Centralno-indonezijsko vrijeme"} + } + "meta:Indonesia_Eastern"{ + ls{"Istočno-indonezijsko vrijeme"} + } + "meta:Indonesia_Western"{ + ls{"Zapadno-indonezijsko vrijeme"} + } + "meta:Iran"{ + ld{"Iran, ljetnje vrijeme"} + lg{"Iran vrijeme"} + ls{"Iran, standardno vrijeme"} + } + "meta:Irkutsk"{ + ld{"Irkuck, ljetnje vrijeme"} + lg{"Irkuck vrijeme"} + ls{"Irkuck, standardno vrijeme"} + } + "meta:Israel"{ + ld{"Izraelsko ljetnje vrijeme"} + lg{"Izraelsko vrijeme"} + ls{"Izraelsko standardno vrijeme"} + } + "meta:Japan"{ + ld{"Japansko ljetnje vrijeme"} + lg{"Japansko vrijeme"} + ls{"Japansko standardno vrijeme"} + } + "meta:Kazakhstan_Eastern"{ + ls{"Istočno-kazahstansko vrijeme"} + } + "meta:Kazakhstan_Western"{ + ls{"Zapadno-kazahstansko vrijeme"} + } + "meta:Korea"{ + ld{"Korejsko ljetnje vrijeme"} + lg{"Korejsko vrijeme"} + ls{"Korejsko standardno vrijeme"} + } + "meta:Kosrae"{ + ls{"Košre vrijeme"} + } + "meta:Krasnoyarsk"{ + ld{"Krasnojarsk, ljetnje vrijeme"} + lg{"Krasnojarsk vrijeme"} + ls{"Krasnojarsk, standardno vrijeme"} + } + "meta:Kyrgystan"{ + ls{"Kirgistan vrijeme"} + } + "meta:Line_Islands"{ + ls{"Linijska ostrva vrijeme"} + } + "meta:Lord_Howe"{ + ld{"Lord Hov, ljetnje vrijeme"} + lg{"Lord Hov vrijeme"} + ls{"Lord Hov, standardno vrijeme"} + } + "meta:Macquarie"{ + ls{"ostrvo Makvori vrijeme"} + } + "meta:Magadan"{ + ld{"Magadan, ljetnje vrijeme"} + lg{"Magadan vrijeme"} + ls{"Magadan, standardno vrijeme"} + } + "meta:Malaysia"{ + ls{"Malezija vrijeme"} + } + "meta:Maldives"{ + ls{"Maldivi vrijeme"} + } + "meta:Marquesas"{ + ls{"Markiz vrijeme"} + } + "meta:Marshall_Islands"{ + ls{"Maršalska Ostrva vrijeme"} + } + "meta:Mauritius"{ + ld{"Mauricijus, ljetnje vrijeme"} + lg{"Mauricijus vrijeme"} + ls{"Mauricijus, standardno vrijeme"} + } + "meta:Mawson"{ + ls{"Moson vrijeme"} + } + "meta:Mexico_Northwest"{ + ld{"Sjeverozapadni Meksiko, letnje vrijeme"} + lg{"Sjeverozapadni Meksiko"} + ls{"Sjeverozapadni Meksiko, standardno vrijeme"} + } + "meta:Mexico_Pacific"{ + ld{"Meksički Pacifik, ljetnje vrijeme"} + ls{"Meksički Pacifik, standardno vrijeme"} + } + "meta:Mongolia"{ + ld{"Ulan Bator, ljetnje vrijeeme"} + lg{"Ulan Bator vrijeme"} + ls{"Ulan Bator, standardno vrijeme"} + } + "meta:Moscow"{ + ld{"Moskva, ljetnje vrijeme"} + lg{"Moskva vrijeme"} + ls{"Moskva, standardno vrijeme"} + } + "meta:Myanmar"{ + ls{"Mjanmar vrijeme"} + } + "meta:Nauru"{ + ls{"Nauru vrijeme"} + } + "meta:Nepal"{ + ls{"Nepal vrijeme"} + } + "meta:New_Caledonia"{ + ld{"Nova Kaledonija, ljetnje vrijeme"} + lg{"Nova Kaledonija vrijeme"} + ls{"Nova Kaledonija, standardno vrijeme"} + } + "meta:New_Zealand"{ + ld{"Novi Zeland, ljetnje vrijeme"} + lg{"Novi Zeland vrijeme"} + ls{"Novi Zeland, standardno vrijeme"} + } + "meta:Newfoundland"{ + ld{"Njufaundlend, ljetnje vrijeme"} + ls{"Njufaundlend, standardno vrijeme"} + } + "meta:Niue"{ + ls{"Nijue vrijeme"} + } + "meta:Norfolk"{ + ld{"ostrvo Norfolk, ljetnje vrijeme"} + lg{"ostrvo Norfolk vrijeme"} + ls{"ostrvo Norfolk, standardno vrijeme"} + } + "meta:Noronha"{ + ld{"Fernando de Noronja, ljetnje vrijeme"} + lg{"Fernando de Noronja vrijeme"} + ls{"Fernando de Noronja, standardno vrijeme"} + } + "meta:Novosibirsk"{ + ld{"Novosibirsk, ljetnje vrijeme"} + lg{"Novosibirsk vrijeme"} + ls{"Novosibirsk, standardno vrijeme"} + } + "meta:Omsk"{ + ld{"Omsk, ljetnje vrijeme"} + lg{"Omsk vrijeme"} + ls{"Omsk, standardno vrijeme"} + } + "meta:Pakistan"{ + ld{"Pakistan, ljetnje vrijeme"} + lg{"Pakistan vrijeme"} + ls{"Pakistan, standardno vrijeme"} + } + "meta:Palau"{ + ls{"Palau vrijeme"} + } + "meta:Papua_New_Guinea"{ + ls{"Papua Nova Gvineja vrijeme"} + } + "meta:Paraguay"{ + ld{"Paragvaj, ljetnje vrijeme"} + lg{"Paragvaj vrijeme"} + ls{"Paragvaj, standardno vrijeme"} + } + "meta:Peru"{ + ld{"Peru, ljetnje vrijeme"} + lg{"Peru vrijeme"} + ls{"Peru, standardno vrijeme"} + } + "meta:Philippines"{ + ld{"Filipini, ljetnje vrijeme"} + lg{"Filipini vrijeme"} + ls{"Filipini, standardno vrijeme"} + } + "meta:Phoenix_Islands"{ + ls{"Feniks ostrva vrijeme"} + } + "meta:Pierre_Miquelon"{ + ld{"Sen Pjer i Mikelon, ljetnje vrijeme"} + ls{"Sen Pjer i Mikelon, standardno vrijeme"} + } + "meta:Pitcairn"{ + ls{"Pitkern vrijeme"} + } + "meta:Ponape"{ + ls{"Ponpej vrijeme"} + } + "meta:Pyongyang"{ + ls{"Pjongjanško vrijeme"} + } + "meta:Reunion"{ + ls{"Reunion vrijeme"} + } + "meta:Rothera"{ + ls{"Rotera vrijeme"} + } + "meta:Sakhalin"{ + ld{"Sahalin, ljetnje vrijeme"} + lg{"Sahalin vrijeme"} + ls{"Sahalin, standardno vrijeme"} + } + "meta:Samoa"{ + ld{"Samoa, ljetnje vrijeme"} + lg{"Samoa vrijeme"} + ls{"Samoa, standardno vrijeme"} + } + "meta:Seychelles"{ + ls{"Sejšeli vrijeme"} + } + "meta:Singapore"{ + ls{"Singapur, standardno vrijeme"} + } + "meta:Solomon"{ + ls{"Solomonska Ostrva vrijeme"} + } + "meta:South_Georgia"{ + ls{"Južna Džordžija vrijeme"} + } + "meta:Suriname"{ + ls{"Surinam vrijeme"} + } + "meta:Syowa"{ + ls{"Šova vrijeme"} + } + "meta:Tahiti"{ + ls{"Tahiti vrijeme"} + } + "meta:Taipei"{ + ld{"Tajpej, ljetnje vrijeme"} + lg{"Tajpej vrijeme"} + ls{"Tajpej, standardno vrijeme"} + } + "meta:Tajikistan"{ + ls{"Tadžikistan vrijeme"} + } + "meta:Tokelau"{ + ls{"Tokelau vrijeme"} + } + "meta:Tonga"{ + ld{"Tonga, ljetnje vrijeme"} + lg{"Tonga vrijeme"} + ls{"Tonga, standardno vrijeme"} + } + "meta:Truk"{ + ls{"Čuk vrijeme"} + } + "meta:Turkmenistan"{ + ld{"Turkmenistan, ljetnje vrijeme"} + lg{"Turkmenistan vrijeme"} + ls{"Turkmenistan, standardno vrijeme"} + } + "meta:Tuvalu"{ + ls{"Tuvalu vrijeme"} + } + "meta:Uruguay"{ + ld{"Urugvaj, ljetnje vrijeme"} + lg{"Urugvaj vrijeme"} + ls{"Urugvaj, standardno vrijeme"} + } + "meta:Uzbekistan"{ + ld{"Uzbekistan, ljetnje vrijeme"} + lg{"Uzbekistan vrijeme"} + ls{"Uzbekistan, standardno vrijeme"} + } + "meta:Vanuatu"{ + ld{"Vanuatu, ljetnje vrijeme"} + lg{"Vanuatu vrijeme"} + ls{"Vanuatu, standardno vrijeme"} + } + "meta:Venezuela"{ + ls{"Venecuela vrijeme"} + } + "meta:Vladivostok"{ + ld{"Vladivostok, ljetnje vrijeme"} + lg{"Vladivostok vrijeme"} + ls{"Vladivostok, standardno vrijeme"} + } + "meta:Volgograd"{ + ld{"Volgograd, ljetnje vrijeme"} + lg{"Volgograd vrijeme"} + ls{"Volgograd, standardno vrijeme"} + } + "meta:Vostok"{ + ls{"Vostok vrijeme"} + } + "meta:Wake"{ + ls{"ostrvo Vejk vrijeme"} + } + "meta:Wallis"{ + ls{"ostrva Valis i Futuna vrijeme"} + } + "meta:Yakutsk"{ + ld{"Jakutsk, ljetnje vrijeme"} + lg{"Jakutsk vrijeme"} + ls{"Jakutsk, standardno vrijeme"} + } + "meta:Yekaterinburg"{ + ld{"Jekaterinburg, ljetnje vrijeme"} + lg{"Jekaterinburg vrijeme"} + ls{"Jekaterinburg, standardno vrijeme"} + } + regionFormatDaylight{"{0}, ljetnje vrijeme"} + regionFormatStandard{"{0}, standardno vrijeme"} + } } diff --git a/intl/icu/source/data/zone/sr_Latn_CS.txt b/intl/icu/source/data/zone/sr_Latn_CS.txt index 0952735a9c87..7204cfd29a04 100644 --- a/intl/icu/source/data/zone/sr_Latn_CS.txt +++ b/intl/icu/source/data/zone/sr_Latn_CS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_CS{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/zone/sr_Latn_ME.txt b/intl/icu/source/data/zone/sr_Latn_ME.txt index 4cc6fe9ba48a..489fd5ad85d5 100644 --- a/intl/icu/source/data/zone/sr_Latn_ME.txt +++ b/intl/icu/source/data/zone/sr_Latn_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sr_Latn_RS.txt b/intl/icu/source/data/zone/sr_Latn_RS.txt index 76d38f8b734b..8d63da618417 100644 --- a/intl/icu/source/data/zone/sr_Latn_RS.txt +++ b/intl/icu/source/data/zone/sr_Latn_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sr_Latn_YU.txt b/intl/icu/source/data/zone/sr_Latn_YU.txt index 2747ab210a4c..415a4d892a22 100644 --- a/intl/icu/source/data/zone/sr_Latn_YU.txt +++ b/intl/icu/source/data/zone/sr_Latn_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_Latn_YU{ "%%ALIAS"{"sr_Latn_RS"} } diff --git a/intl/icu/source/data/zone/sr_ME.txt b/intl/icu/source/data/zone/sr_ME.txt index 32dc91046bc8..aa5162679c6b 100644 --- a/intl/icu/source/data/zone/sr_ME.txt +++ b/intl/icu/source/data/zone/sr_ME.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_ME{ "%%ALIAS"{"sr_Latn_ME"} } diff --git a/intl/icu/source/data/zone/sr_RS.txt b/intl/icu/source/data/zone/sr_RS.txt index 674ff77554b8..84db46919eb6 100644 --- a/intl/icu/source/data/zone/sr_RS.txt +++ b/intl/icu/source/data/zone/sr_RS.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_RS{ "%%ALIAS"{"sr_Cyrl_RS"} } diff --git a/intl/icu/source/data/zone/sr_XK.txt b/intl/icu/source/data/zone/sr_XK.txt index 9628a2763e54..0d3aa53999a4 100644 --- a/intl/icu/source/data/zone/sr_XK.txt +++ b/intl/icu/source/data/zone/sr_XK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_XK{ "%%ALIAS"{"sr_Cyrl_XK"} } diff --git a/intl/icu/source/data/zone/sr_YU.txt b/intl/icu/source/data/zone/sr_YU.txt index 26563d041d43..2d67778ecbdc 100644 --- a/intl/icu/source/data/zone/sr_YU.txt +++ b/intl/icu/source/data/zone/sr_YU.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sr_YU{ - "%%ALIAS"{"sr_Cyrl_RS"} + "%%ALIAS"{"sr_RS"} } diff --git a/intl/icu/source/data/zone/su.txt b/intl/icu/source/data/zone/su.txt index 93f2ed1f4cd0..37393b85a8fe 100644 --- a/intl/icu/source/data/zone/su.txt +++ b/intl/icu/source/data/zone/su.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su{ - Version{"37"} zoneStrings{ "Etc:UTC"{ ls{"Waktu Universal Terkoordinasi"} diff --git a/intl/icu/source/data/zone/su_ID.txt b/intl/icu/source/data/zone/su_ID.txt index 67dde384e09b..8da0f567d041 100644 --- a/intl/icu/source/data/zone/su_ID.txt +++ b/intl/icu/source/data/zone/su_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_ID{ "%%ALIAS"{"su_Latn_ID"} } diff --git a/intl/icu/source/data/zone/su_Latn.txt b/intl/icu/source/data/zone/su_Latn.txt index 008b42355f21..87ca4fa76d0b 100644 --- a/intl/icu/source/data/zone/su_Latn.txt +++ b/intl/icu/source/data/zone/su_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml su_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/su_Latn_ID.txt b/intl/icu/source/data/zone/su_Latn_ID.txt index 462983284c53..d6b42f358c4b 100644 --- a/intl/icu/source/data/zone/su_Latn_ID.txt +++ b/intl/icu/source/data/zone/su_Latn_ID.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/sv.txt b/intl/icu/source/data/zone/sv.txt index 9ffc11443088..fa048fc9ddcd 100644 --- a/intl/icu/source/data/zone/sv.txt +++ b/intl/icu/source/data/zone/sv.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sv{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -955,7 +955,7 @@ sv{ ec{"Sydney"} } "Etc:UTC"{ - ls{"Koordinerad universell tid"} + ls{"koordinerad universell tid"} ss{"UTC"} } "Etc:Unknown"{ diff --git a/intl/icu/source/data/zone/sw.txt b/intl/icu/source/data/zone/sw.txt index 77bea502c611..a71f788cca54 100644 --- a/intl/icu/source/data/zone/sw.txt +++ b/intl/icu/source/data/zone/sw.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -1452,15 +1452,15 @@ sw{ ls{"Saa za Wastani za Choibalsan"} } "meta:Christmas"{ - ls{"Saa za Kisiwa cha Christmas"} + ls{"Saa za Kisiwa cha Krismasi"} } "meta:Cocos"{ ls{"Saa za Visiwa vya Cocos"} } "meta:Colombia"{ - ld{"Saa za Majira ya joto za Colombia"} - lg{"Saa za Colombia"} - ls{"Saa za Wastani za Colombia"} + ld{"Saa za Majira ya joto za Kolombia"} + lg{"Saa za Kolombia"} + ls{"Saa za Wastani za Kolombia"} } "meta:Cook"{ ld{"Saa za Majira nusu ya joto za Visiwa Cook"} @@ -1468,9 +1468,9 @@ sw{ ls{"Saa za Wastani za Visiwa vya Cook"} } "meta:Cuba"{ - ld{"Saa za Mchana za Cuba"} - lg{"Saa za Cuba"} - ls{"Saa za Wastani ya Cuba"} + ld{"Saa za Mchana za Kuba"} + lg{"Saa za Kuba"} + ls{"Saa za Wastani ya Kuba"} } "meta:Davis"{ ls{"Saa za Davis"} @@ -1487,12 +1487,12 @@ sw{ ls{"Saa za Wastani za Kisiwa cha Easter"} } "meta:Ecuador"{ - ls{"Saa za Ecuador"} + ls{"Saa za Ekwado"} } "meta:Europe_Central"{ ld{"Saa za Majira ya joto za Ulaya ya Kati"} lg{"Saa za Ulaya ya Kati"} - ls{"Saa za Wastani za Ulaya ya kati"} + ls{"Saa za Wastani za Ulaya ya Kati"} } "meta:Europe_Eastern"{ ld{"Saa za Majira ya joto za Mashariki mwa Ulaya"} @@ -1533,9 +1533,9 @@ sw{ ls{"Saa za Gambier"} } "meta:Georgia"{ - ld{"Saa za Majira ya joto za Georgia"} - lg{"Saa za Georgia"} - ls{"Saa za Wastani za Georgia"} + ld{"Saa za Majira ya joto za Jojia"} + lg{"Saa za Jojia"} + ls{"Saa za Wastani za Jojia"} } "meta:Gilbert_Islands"{ ls{"Saa za Visiwa vya Gilbert"} @@ -1572,7 +1572,7 @@ sw{ ls{"Saa za Wastani za Hovd"} } "meta:India"{ - ls{"Saa Wastani za India"} + ls{"Saa za Wastani za India"} } "meta:Indian_Ocean"{ ls{"Saa za Bahari Hindi"} @@ -1607,7 +1607,7 @@ sw{ "meta:Japan"{ ld{"Saa za Mchana za Japan"} lg{"Saa za Japan"} - ls{"Saa Wastani za Japan"} + ls{"Saa za Wastani za Japani"} } "meta:Kamchatka"{ ld{"Saa za Kiangazi za Petropavlovsk-Kamchatski"} @@ -1665,22 +1665,22 @@ sw{ ls{"Saa za Visiwa vya Marshall"} } "meta:Mauritius"{ - ld{"Saa za Majira ya joto za Mauritius"} - lg{"Saa za Mauritius"} - ls{"Saa za Wastani za Mauritius"} + ld{"Saa za Majira ya joto za Morisi"} + lg{"Saa za Morisi"} + ls{"Saa za Wastani za Morisi"} } "meta:Mawson"{ ls{"Saa za Mawson"} } "meta:Mexico_Northwest"{ - ld{"Saa za mchana za Mexico Kaskazini Magharibi"} - lg{"Saa za Mexico Kaskazini Magharibi"} - ls{"Saa za Wastani za Mexico Kaskazini Magharibi"} + ld{"Saa za mchana za Meksiko Kaskazini Magharibi"} + lg{"Saa za Meksiko Kaskazini Magharibi"} + ls{"Saa za Wastani za Meksiko Kaskazini Magharibi"} } "meta:Mexico_Pacific"{ - ld{"Saa za mchana za pasifiki za Mexico"} - lg{"Saa za pasifiki za Mexico"} - ls{"Saa za wastani za pasifiki za Mexico"} + ld{"Saa za mchana za pasifiki za Meksiko"} + lg{"Saa za pasifiki za Meksiko"} + ls{"Saa za wastani za pasifiki za Meksiko"} } "meta:Mongolia"{ ld{"Saa za Majira ya joto za Ulan Bator"} @@ -1751,9 +1751,9 @@ sw{ ls{"Saa za Papua New Guinea"} } "meta:Paraguay"{ - ld{"Saa za Majira ya joto za Paraguay"} - lg{"Saa za Paraguay"} - ls{"Saa za Wastani za Paraguay"} + ld{"Saa za Majira ya joto za Paragwai"} + lg{"Saa za Paragwai"} + ls{"Saa za Wastani za Paragwai"} } "meta:Peru"{ ld{"Saa za Majira ya joto za Peru"} @@ -1852,9 +1852,9 @@ sw{ ls{"Saa za Tuvalu"} } "meta:Uruguay"{ - ld{"Saa za Majira ya joto za Uruguay"} - lg{"Saa za Uruguay"} - ls{"Saa za Wastani za Uruguay"} + ld{"Saa za Majira ya joto za Urugwai"} + lg{"Saa za Urugwai"} + ls{"Saa za Wastani za Urugwai"} } "meta:Uzbekistan"{ ld{"Saa za Majira ya joto za Uzbekistan"} diff --git a/intl/icu/source/data/zone/sw_KE.txt b/intl/icu/source/data/zone/sw_KE.txt index ae690849e525..690a37d7c314 100644 --- a/intl/icu/source/data/zone/sw_KE.txt +++ b/intl/icu/source/data/zone/sw_KE.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml sw_KE{ - Version{"37"} zoneStrings{ "America:Barbados"{ ec{"Babadosi"} @@ -113,9 +113,6 @@ sw_KE{ lg{"Saa za Kepuvede"} ls{"Saa za Wastani za Kepuvede"} } - "meta:Christmas"{ - ls{"Saa za Kisiwa cha Krismasi"} - } "meta:Colombia"{ ld{"Saa za Majira ya Joto za Kolombia"} lg{"Saa za Kolombia"} @@ -136,9 +133,6 @@ sw_KE{ lg{"Saa za Kisiwa cha Easter"} ls{"Saa za Wastani za Kisiwa cha Easter"} } - "meta:Ecuador"{ - ls{"Saa za Ekwado"} - } "meta:French_Guiana"{ ls{"Saa za Guiana"} } @@ -150,9 +144,6 @@ sw_KE{ "meta:Gulf"{ ls{"Saa za Wastani za Ghuba"} } - "meta:India"{ - ls{"Saa za Wastani za India"} - } "meta:Iran"{ ld{"Saa za Mchana za Irani"} lg{"Saa za Irani"} diff --git a/intl/icu/source/data/zone/ta.txt b/intl/icu/source/data/zone/ta.txt index 15ff28428cc1..7909bffea1e0 100644 --- a/intl/icu/source/data/zone/ta.txt +++ b/intl/icu/source/data/zone/ta.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"அபிட்ஜான்"} @@ -1752,7 +1752,7 @@ ta{ ls{"நியு நேரம்"} } "meta:Norfolk"{ - ld{"நார்ஃபோக் தீவு கோடை நேரம்"} + ld{"நார்ஃபோக் தீவு பகலொளி நேரம்"} lg{"நார்ஃபோக் தீவு நேரம்"} ls{"நார்ஃபோக் தீவு நிலையான நேரம்"} } diff --git a/intl/icu/source/data/zone/ta_MY.txt b/intl/icu/source/data/zone/ta_MY.txt index 930a97d2ce98..455100f8886b 100644 --- a/intl/icu/source/data/zone/ta_MY.txt +++ b/intl/icu/source/data/zone/ta_MY.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta_MY{ - Version{"37"} zoneStrings{ "meta:India"{ ss{"∅∅∅"} diff --git a/intl/icu/source/data/zone/ta_SG.txt b/intl/icu/source/data/zone/ta_SG.txt index 8ec52a484d4b..9d3b78583337 100644 --- a/intl/icu/source/data/zone/ta_SG.txt +++ b/intl/icu/source/data/zone/ta_SG.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ta_SG{ - Version{"37"} zoneStrings{ "meta:India"{ ss{"∅∅∅"} diff --git a/intl/icu/source/data/zone/te.txt b/intl/icu/source/data/zone/te.txt index c71eed7529c8..f57430c48b1a 100644 --- a/intl/icu/source/data/zone/te.txt +++ b/intl/icu/source/data/zone/te.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml te{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"అబిడ్జాన్"} @@ -1752,7 +1752,7 @@ te{ ls{"నియూ సమయం"} } "meta:Norfolk"{ - ld{"నార్ఫోక్ దీవి వేసవి సమయం"} + ld{"నార్ఫోక్ దీవి పగటి సమయం"} lg{"నార్ఫోక్ దీవి సమయం"} ls{"నార్ఫోక్ దీవి ప్రామాణిక సమయం"} } diff --git a/intl/icu/source/data/zone/teo.txt b/intl/icu/source/data/zone/teo.txt index 8aec59fa4973..9e0d98e4af56 100644 --- a/intl/icu/source/data/zone/teo.txt +++ b/intl/icu/source/data/zone/teo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml teo{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/tg.txt b/intl/icu/source/data/zone/tg.txt index b642d86505e6..6f647281cb81 100644 --- a/intl/icu/source/data/zone/tg.txt +++ b/intl/icu/source/data/zone/tg.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tg{ - Version{"37"} zoneStrings{ "Asia:Dushanbe"{ ec{"Душанбе"} diff --git a/intl/icu/source/data/zone/th.txt b/intl/icu/source/data/zone/th.txt index 1bed16b730fa..60d7163ab26e 100644 --- a/intl/icu/source/data/zone/th.txt +++ b/intl/icu/source/data/zone/th.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml th{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"อาบีจาน"} @@ -1754,7 +1754,7 @@ th{ ls{"เวลานีอูเอ"} } "meta:Norfolk"{ - ld{"เวลาฤดูร้อนเกาะนอร์ฟอล์ก"} + ld{"เวลาออมแสงเกาะนอร์ฟอล์ก"} lg{"เวลาเกาะนอร์ฟอล์ก"} ls{"เวลามาตรฐานเกาะนอร์ฟอล์ก"} } diff --git a/intl/icu/source/data/zone/ti.txt b/intl/icu/source/data/zone/ti.txt index 894e20bb34ff..d482793972ca 100644 --- a/intl/icu/source/data/zone/ti.txt +++ b/intl/icu/source/data/zone/ti.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ti{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -807,6 +807,9 @@ ti{ "Asia:Qatar"{ ec{"Qatar"} } + "Asia:Qostanay"{ + ec{"Kostanay"} + } "Asia:Qyzylorda"{ ec{"Qyzylorda"} } @@ -948,6 +951,9 @@ ti{ "Australia:Sydney"{ ec{"Sydney"} } + "Etc:UTC"{ + ls{"Coordinated Universal Time"} + } "Etc:Unknown"{ ec{"Unknown"} } @@ -992,6 +998,7 @@ ti{ } "Europe:Dublin"{ ec{"Dublin"} + ld{"Irish Standard Time"} } "Europe:Gibraltar"{ ec{"Gibraltar"} @@ -1028,6 +1035,7 @@ ti{ } "Europe:London"{ ec{"London"} + ld{"British Summer Time"} } "Europe:Luxembourg"{ ec{"Luxembourg"} @@ -1209,6 +1217,9 @@ ti{ "Pacific:Honolulu"{ ec{"Honolulu"} } + "Pacific:Johnston"{ + ec{"Johnston"} + } "Pacific:Kiritimati"{ ec{"Kiritimati"} } @@ -1278,6 +1289,21 @@ ti{ "Pacific:Wallis"{ ec{"Wallis"} } + "meta:Indonesia_Central"{ + ls{"Central Indonesia Time"} + } + "meta:Indonesia_Eastern"{ + ls{"Eastern Indonesia Time"} + } + "meta:Indonesia_Western"{ + ls{"Western Indonesia Time"} + } + "meta:Malaysia"{ + ls{"Malaysia Time"} + } + "meta:Singapore"{ + ls{"Singapore Standard Time"} + } fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} gmtZeroFormat{"GMT"} diff --git a/intl/icu/source/data/zone/tk.txt b/intl/icu/source/data/zone/tk.txt index 394a99d785f6..292c1d7e9a20 100644 --- a/intl/icu/source/data/zone/tk.txt +++ b/intl/icu/source/data/zone/tk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tk{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abijan"} @@ -588,6 +588,9 @@ tk{ "America:Whitehorse"{ ec{"Waýthors"} } + "America:Winnipeg"{ + ec{"Winnipeg"} + } "America:Yakutat"{ ec{"Ýakutat"} } @@ -1510,7 +1513,7 @@ tk{ ls{"Fransuz Günorta we Antarktika ýerleri wagty"} } "meta:GMT"{ - ls{"Grinwiç boýunça orta wagt"} + ls{"Grinwiç ortaça wagty"} } "meta:Galapagos"{ ls{"Galapagos adalary wagty"} diff --git a/intl/icu/source/data/zone/tl.txt b/intl/icu/source/data/zone/tl.txt index 4e521f927601..8c39518018d6 100644 --- a/intl/icu/source/data/zone/tl.txt +++ b/intl/icu/source/data/zone/tl.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl{ "%%ALIAS"{"fil"} } diff --git a/intl/icu/source/data/zone/tl_PH.txt b/intl/icu/source/data/zone/tl_PH.txt index 07c9f9047edf..59af39479e02 100644 --- a/intl/icu/source/data/zone/tl_PH.txt +++ b/intl/icu/source/data/zone/tl_PH.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tl_PH{ "%%ALIAS"{"fil_PH"} } diff --git a/intl/icu/source/data/zone/to.txt b/intl/icu/source/data/zone/to.txt index 506f90e86cbc..bbc232753034 100644 --- a/intl/icu/source/data/zone/to.txt +++ b/intl/icu/source/data/zone/to.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml to{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/tr.txt b/intl/icu/source/data/zone/tr.txt index cdb913a05cea..04b9e44ece08 100644 --- a/intl/icu/source/data/zone/tr.txt +++ b/intl/icu/source/data/zone/tr.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tr{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/tt.txt b/intl/icu/source/data/zone/tt.txt index 51be446ac885..7b917bd7dd62 100644 --- a/intl/icu/source/data/zone/tt.txt +++ b/intl/icu/source/data/zone/tt.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tt{ - Version{"37"} zoneStrings{ "Etc:UTC"{ ls{"Бөтендөнья килештерелгән вакыты"} diff --git a/intl/icu/source/data/zone/twq.txt b/intl/icu/source/data/zone/twq.txt index d90e4d48ccf8..12e378b51d6a 100644 --- a/intl/icu/source/data/zone/twq.txt +++ b/intl/icu/source/data/zone/twq.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml twq{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/tzm.txt b/intl/icu/source/data/zone/tzm.txt index 9d0747fabba0..ccc6dc385373 100644 --- a/intl/icu/source/data/zone/tzm.txt +++ b/intl/icu/source/data/zone/tzm.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml tzm{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/ug.txt b/intl/icu/source/data/zone/ug.txt index 9182f209e258..ca66ea5c6028 100644 --- a/intl/icu/source/data/zone/ug.txt +++ b/intl/icu/source/data/zone/ug.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ug{ - Version{"37"} zoneStrings{ "Africa:Sao_Tome"{ ec{"سان-تومې"} diff --git a/intl/icu/source/data/zone/uk.txt b/intl/icu/source/data/zone/uk.txt index 09ba82531cf2..34edaed747cc 100644 --- a/intl/icu/source/data/zone/uk.txt +++ b/intl/icu/source/data/zone/uk.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uk{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Абіджан"} @@ -637,7 +637,7 @@ uk{ ec{"Восток"} } "Arctic:Longyearbyen"{ - ec{"Лонґйїр"} + ec{"Лонгʼїр"} } "Asia:Aden"{ ec{"Аден"} @@ -673,7 +673,7 @@ uk{ ec{"Баку"} } "Asia:Bangkok"{ - ec{"Банґкок"} + ec{"Бангкок"} } "Asia:Barnaul"{ ec{"Барнаул"} @@ -763,7 +763,7 @@ uk{ ec{"Куала-Лумпур"} } "Asia:Kuching"{ - ec{"Кучінґ"} + ec{"Кучинг"} } "Asia:Kuwait"{ ec{"Кувейт"} @@ -817,7 +817,7 @@ uk{ ec{"Кизилорда"} } "Asia:Rangoon"{ - ec{"Янґон"} + ec{"Янгон"} } "Asia:Riyadh"{ ec{"Ер-Ріяд"} @@ -973,7 +973,7 @@ uk{ ec{"Афіни"} } "Europe:Belgrade"{ - ec{"Белґрад"} + ec{"Белград"} } "Europe:Berlin"{ ec{"Берлін"} @@ -997,17 +997,17 @@ uk{ ec{"Кишинів"} } "Europe:Copenhagen"{ - ec{"Копенгаґен"} + ec{"Копенгаген"} } "Europe:Dublin"{ ec{"Дублін"} ld{"за літнім часом в Ірландії"} } "Europe:Gibraltar"{ - ec{"Ґібралтар"} + ec{"Гібралтар"} } "Europe:Guernsey"{ - ec{"Ґернсі"} + ec{"Гернсі"} } "Europe:Helsinki"{ ec{"Гельсінкі"} @@ -1041,7 +1041,7 @@ uk{ ld{"за літнім часом у Великій Британії"} } "Europe:Luxembourg"{ - ec{"Люксембурґ"} + ec{"Люксембург"} } "Europe:Madrid"{ ec{"Мадрид"} @@ -1083,7 +1083,7 @@ uk{ ec{"Самара"} } "Europe:San_Marino"{ - ec{"Сан-Маріно"} + ec{"Сан-Марино"} } "Europe:Sarajevo"{ ec{"Сараєво"} @@ -1134,7 +1134,7 @@ uk{ ec{"Варшава"} } "Europe:Zagreb"{ - ec{"Заґреб"} + ec{"Загреб"} } "Europe:Zaporozhye"{ ec{"Запоріжжя"} @@ -1209,13 +1209,13 @@ uk{ ec{"Ґалапаґос"} } "Pacific:Gambier"{ - ec{"Ґамбʼєр"} + ec{"Гамбʼє"} } "Pacific:Guadalcanal"{ - ec{"Ґуадалканал"} + ec{"Гуадалканал"} } "Pacific:Guam"{ - ec{"Ґуам"} + ec{"Гуам"} } "Pacific:Honolulu"{ ec{"Гонолулу"} @@ -1269,7 +1269,7 @@ uk{ ec{"Порт-Морсбі"} } "Pacific:Rarotonga"{ - ec{"Раротонґа"} + ec{"Раротонга"} } "Pacific:Saipan"{ ec{"Сайпан"} @@ -1281,7 +1281,7 @@ uk{ ec{"Тарава"} } "Pacific:Tongatapu"{ - ec{"Тонґатапу"} + ec{"Тонгатапу"} } "Pacific:Truk"{ ec{"Чуук"} @@ -1529,7 +1529,7 @@ uk{ ls{"за часом на Французьких Південних і Антарктичних територіях"} } "meta:GMT"{ - ls{"за Ґрінвічем"} + ls{"за Гринвічем"} } "meta:Galapagos"{ ls{"за часом Ґалапаґосу"} @@ -1820,7 +1820,7 @@ uk{ ls{"за часом на Сейшельських Островах"} } "meta:Singapore"{ - ls{"за часом у Сінґапурі"} + ls{"за часом у Сінгапурі"} } "meta:Solomon"{ ls{"за часом на Соломонових Островах"} @@ -1849,9 +1849,9 @@ uk{ ls{"за часом на островах Токелау"} } "meta:Tonga"{ - ld{"за літнім часом на островах Тонґа"} - lg{"за часом на островах Тонґа"} - ls{"за стандартним часом на островах Тонґа"} + ld{"за літнім часом на островах Тонга"} + lg{"за часом на островах Тонга"} + ls{"за стандартним часом на островах Тонга"} } "meta:Truk"{ ls{"за часом на островах Чуук"} diff --git a/intl/icu/source/data/zone/ur.txt b/intl/icu/source/data/zone/ur.txt index f1dda9a4c0c4..f20905f1e3ec 100644 --- a/intl/icu/source/data/zone/ur.txt +++ b/intl/icu/source/data/zone/ur.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"عابدجان"} @@ -1720,7 +1720,7 @@ ur{ ls{"نیئو ٹائم"} } "meta:Norfolk"{ - ld{"نارفوک آئلینڈ کا موسم گرما کا وقت"} + ld{"نارفوک آئلینڈ ڈے لائٹ وقت"} lg{"نارفوک آئلینڈ کا وقت"} ls{"نارفوک آئلینڈ کا معیاری وقت"} } diff --git a/intl/icu/source/data/zone/ur_IN.txt b/intl/icu/source/data/zone/ur_IN.txt index b0cfb3c8f81c..6e43160c4e4e 100644 --- a/intl/icu/source/data/zone/ur_IN.txt +++ b/intl/icu/source/data/zone/ur_IN.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml ur_IN{ - Version{"37"} zoneStrings{ "Africa:Accra"{ ec{"اکرا"} diff --git a/intl/icu/source/data/zone/uz.txt b/intl/icu/source/data/zone/uz.txt index c2b99f7c4340..946e744e2591 100644 --- a/intl/icu/source/data/zone/uz.txt +++ b/intl/icu/source/data/zone/uz.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/intl/icu/source/data/zone/uz_AF.txt b/intl/icu/source/data/zone/uz_AF.txt index 24ca294580df..0e8d20c4cf48 100644 --- a/intl/icu/source/data/zone/uz_AF.txt +++ b/intl/icu/source/data/zone/uz_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_AF{ "%%ALIAS"{"uz_Arab_AF"} } diff --git a/intl/icu/source/data/zone/uz_Arab.txt b/intl/icu/source/data/zone/uz_Arab.txt index fbe5126cc0c4..a78e525e068e 100644 --- a/intl/icu/source/data/zone/uz_Arab.txt +++ b/intl/icu/source/data/zone/uz_Arab.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Arab{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Asia:Kabul"{ ec{"کابل"} diff --git a/intl/icu/source/data/zone/uz_Arab_AF.txt b/intl/icu/source/data/zone/uz_Arab_AF.txt index e45d70894be0..e2978bbe125b 100644 --- a/intl/icu/source/data/zone/uz_Arab_AF.txt +++ b/intl/icu/source/data/zone/uz_Arab_AF.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/uz_Cyrl.txt b/intl/icu/source/data/zone/uz_Cyrl.txt index 724127da91fd..03d603615971 100644 --- a/intl/icu/source/data/zone/uz_Cyrl.txt +++ b/intl/icu/source/data/zone/uz_Cyrl.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Cyrl{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} diff --git a/intl/icu/source/data/zone/uz_Latn.txt b/intl/icu/source/data/zone/uz_Latn.txt index f6035b73d6e3..1ae52daa8f8c 100644 --- a/intl/icu/source/data/zone/uz_Latn.txt +++ b/intl/icu/source/data/zone/uz_Latn.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_Latn{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/uz_Latn_UZ.txt b/intl/icu/source/data/zone/uz_Latn_UZ.txt index 2d34effafec3..356e549792c6 100644 --- a/intl/icu/source/data/zone/uz_Latn_UZ.txt +++ b/intl/icu/source/data/zone/uz_Latn_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/uz_UZ.txt b/intl/icu/source/data/zone/uz_UZ.txt index ffac5329b1b6..3a6a14d8072a 100644 --- a/intl/icu/source/data/zone/uz_UZ.txt +++ b/intl/icu/source/data/zone/uz_UZ.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml uz_UZ{ "%%ALIAS"{"uz_Latn_UZ"} } diff --git a/intl/icu/source/data/zone/vai.txt b/intl/icu/source/data/zone/vai.txt index 00fb305cdbd7..f1f79bb4cafc 100644 --- a/intl/icu/source/data/zone/vai.txt +++ b/intl/icu/source/data/zone/vai.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/vai_LR.txt b/intl/icu/source/data/zone/vai_LR.txt index 27d42387f34b..f682350b1193 100644 --- a/intl/icu/source/data/zone/vai_LR.txt +++ b/intl/icu/source/data/zone/vai_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_LR{ "%%ALIAS"{"vai_Vaii_LR"} } diff --git a/intl/icu/source/data/zone/vai_Latn.txt b/intl/icu/source/data/zone/vai_Latn.txt index 43baa49cf18b..2a01a5cb962c 100644 --- a/intl/icu/source/data/zone/vai_Latn.txt +++ b/intl/icu/source/data/zone/vai_Latn.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Latn{ %%Parent{"root"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/vai_Vaii.txt b/intl/icu/source/data/zone/vai_Vaii.txt index cffa5917afbb..6dc5e995dac4 100644 --- a/intl/icu/source/data/zone/vai_Vaii.txt +++ b/intl/icu/source/data/zone/vai_Vaii.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vai_Vaii{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/vai_Vaii_LR.txt b/intl/icu/source/data/zone/vai_Vaii_LR.txt index a17bc11e00e8..d2845ca31a01 100644 --- a/intl/icu/source/data/zone/vai_Vaii_LR.txt +++ b/intl/icu/source/data/zone/vai_Vaii_LR.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/vi.txt b/intl/icu/source/data/zone/vi.txt index cf0e8a11d640..8c3922fd8da1 100644 --- a/intl/icu/source/data/zone/vi.txt +++ b/intl/icu/source/data/zone/vi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vi{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} @@ -958,7 +958,7 @@ vi{ ls{"Giờ Phối hợp Quốc tế"} } "Etc:Unknown"{ - ec{"Thành phố Không xác định"} + ec{"Thành phố không xác định"} } "Europe:Amsterdam"{ ec{"Amsterdam"} @@ -1441,9 +1441,9 @@ vi{ ls{"Giờ Chuẩn Azerbaijan"} } "meta:Azores"{ - ld{"Giờ Mùa Hè Azores"} + ld{"Giờ mùa hè Azores"} lg{"Giờ Azores"} - ls{"Giờ Chuẩn Azores"} + ls{"Giờ chuẩn Azores"} } "meta:Bangladesh"{ ld{"Giờ Mùa Hè Bangladesh"} @@ -1544,7 +1544,7 @@ vi{ ls{"Giờ chuẩn Đông Âu"} } "meta:Europe_Further_Eastern"{ - ls{"Giờ Châu Âu Viễn Đông"} + ls{"Giờ Viễn đông Châu Âu"} } "meta:Europe_Western"{ ld{"Giờ mùa hè Tây Âu"} diff --git a/intl/icu/source/data/zone/vun.txt b/intl/icu/source/data/zone/vun.txt index 8db299d9b5bc..6e8c781ed776 100644 --- a/intl/icu/source/data/zone/vun.txt +++ b/intl/icu/source/data/zone/vun.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml vun{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/wae.txt b/intl/icu/source/data/zone/wae.txt index 4df39dd77873..688ae3b5aef1 100644 --- a/intl/icu/source/data/zone/wae.txt +++ b/intl/icu/source/data/zone/wae.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wae{ - Version{"37"} zoneStrings{ "Africa:Accra"{ ec{"Akra"} diff --git a/intl/icu/source/data/zone/wo.txt b/intl/icu/source/data/zone/wo.txt index e0b2d698ecb6..08c265f3462d 100644 --- a/intl/icu/source/data/zone/wo.txt +++ b/intl/icu/source/data/zone/wo.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml wo{ - Version{"37"} zoneStrings{ "Africa:Dakar"{ ec{"Dakar"} diff --git a/intl/icu/source/data/zone/xh.txt b/intl/icu/source/data/zone/xh.txt index a659eb803511..3a7aa5dd55df 100644 --- a/intl/icu/source/data/zone/xh.txt +++ b/intl/icu/source/data/zone/xh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xh{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/xog.txt b/intl/icu/source/data/zone/xog.txt index bd9bdd87a3ae..059ee192c730 100644 --- a/intl/icu/source/data/zone/xog.txt +++ b/intl/icu/source/data/zone/xog.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml xog{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/yav.txt b/intl/icu/source/data/zone/yav.txt index 2ad349bfb378..5bbb6b11eccf 100644 --- a/intl/icu/source/data/zone/yav.txt +++ b/intl/icu/source/data/zone/yav.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yav{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/yi.txt b/intl/icu/source/data/zone/yi.txt index 119fbf1171da..11457dc208b9 100644 --- a/intl/icu/source/data/zone/yi.txt +++ b/intl/icu/source/data/zone/yi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yi{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"אַבידזשאַן"} diff --git a/intl/icu/source/data/zone/yo.txt b/intl/icu/source/data/zone/yo.txt index ec57ca33fd53..e878b1b7a0fd 100644 --- a/intl/icu/source/data/zone/yo.txt +++ b/intl/icu/source/data/zone/yo.txt @@ -1,8 +1,332 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo{ - Version{"37"} zoneStrings{ + "America:Adak"{ + ec{"ìlú Adákì"} + } + "America:Anchorage"{ + ec{"ìlú Ankọ́réèjì"} + } + "America:Anguilla"{ + ec{"ìlú Angúílà"} + } + "America:Antigua"{ + ec{"ìlú Antígùà"} + } + "America:Aruba"{ + ec{"ìlú Arúbá"} + } + "America:Bahia_Banderas"{ + ec{"ìlú Báhì Bándẹ́rásì"} + } + "America:Barbados"{ + ec{"ìlú Bábádọ́ọ̀sì"} + } + "America:Belize"{ + ec{"ìlú Bẹ̀líìsì"} + } + "America:Blanc-Sablon"{ + ec{"ìlú Blank Sabulọ́ọ̀nì"} + } + "America:Boise"{ + ec{"ìlú Bọ́isè"} + } + "America:Cambridge_Bay"{ + ec{"ìlú òkun kambíríìjì"} + } + "America:Cancun"{ + ec{"ìlú Kancun"} + } + "America:Cayman"{ + ec{"ilú Kayman"} + } + "America:Chicago"{ + ec{"ìlú Chicago"} + } + "America:Chihuahua"{ + ec{"ìlú Ṣihuahua"} + } + "America:Coral_Harbour"{ + ec{"ìlú àtikọkàn"} + } + "America:Costa_Rica"{ + ec{"ìlú Kosta Ríkà"} + } + "America:Creston"{ + ec{"ìlú Kírẹstọ́ọ̀nù"} + } + "America:Curacao"{ + ec{"ìlú Kuraṣao"} + } + "America:Danmarkshavn"{ + ec{"ìlú Banmarkshan"} + } + "America:Dawson"{ + ec{"ìlú Dawson"} + } + "America:Dawson_Creek"{ + ec{"ìlú Dawson Creek"} + } + "America:Denver"{ + ec{"ìlú Denver"} + } + "America:Detroit"{ + ec{"ìlú Detroit"} + } + "America:Dominica"{ + ec{"ìlú Dominika"} + } + "America:Edmonton"{ + ec{"ìlú Edmonton"} + } + "America:El_Salvador"{ + ec{"ìlú El Savador"} + } + "America:Fort_Nelson"{ + ec{"ìlú Fort Nelson"} + } + "America:Glace_Bay"{ + ec{"ìlú omi Glace"} + } + "America:Godthab"{ + ec{"ìlú Nuuk"} + } + "America:Goose_Bay"{ + ec{"ìlú omi Goosù"} + } + "America:Grand_Turk"{ + ec{"ìlú Grand Turk"} + } + "America:Grenada"{ + ec{"ìlú Grenada"} + } + "America:Guadeloupe"{ + ec{"ìlú Guadeloupe"} + } + "America:Guatemala"{ + ec{"ìlú Guatemala"} + } + "America:Halifax"{ + ec{"ìlú Halifásì"} + } + "America:Havana"{ + ec{"ìlú Havana"} + } + "America:Hermosillo"{ + ec{"ìlú Hermosilo"} + } + "America:Indiana:Knox"{ + ec{"ìlú nọ́sì"} + } + "America:Indiana:Marengo"{ + ec{"ìlú Marẹ́ngo"} + } + "America:Indiana:Petersburg"{ + ec{"ìlú Petersburg"} + } + "America:Indiana:Tell_City"{ + ec{"ìlú Tell City"} + } + "America:Indiana:Vevay"{ + ec{"ìlú Vevay"} + } + "America:Indiana:Vincennes"{ + ec{"ìlú Vincennes ní Indiana"} + } + "America:Indiana:Winamac"{ + ec{"ìlú Winamak ní Indiana"} + } + "America:Indianapolis"{ + ec{"ìlú Indianapolis"} + } + "America:Inuvik"{ + ec{"ìlú Inuvik"} + } + "America:Iqaluit"{ + ec{"ìlú Iqaluit"} + } + "America:Jamaica"{ + ec{"ìlú Jamaikà"} + } + "America:Juneau"{ + ec{"ìlú Junu"} + } + "America:Kentucky:Monticello"{ + ec{"ìlú Montisẹ́lò"} + } + "America:Kralendijk"{ + ec{"ìlú Kíralẹ́ndáikì"} + } + "America:Los_Angeles"{ + ec{"ìlú Los Angeles"} + } + "America:Louisville"{ + ec{"ìlú Lúífíìlì"} + } + "America:Lower_Princes"{ + ec{"ìlú Lower Prince’s Quarter"} + } + "America:Managua"{ + ec{"ìlú Managua"} + } + "America:Marigot"{ + ec{"ìlú Marigọ́ọ̀tì"} + } + "America:Martinique"{ + ec{"ìlú Mátíníkì"} + } + "America:Matamoros"{ + ec{"ìlú Matamorosì"} + } + "America:Mazatlan"{ + ec{"ìlú Masatiani"} + } + "America:Menominee"{ + ec{"ìlú Menominì"} + } + "America:Merida"{ + ec{"ìlú Merida"} + } + "America:Metlakatla"{ + ec{"ìlú Metilakatila"} + } + "America:Mexico_City"{ + ec{"ìlú Mẹ́síkò"} + } + "America:Miquelon"{ + ec{"ìlú Mikulọ́nì"} + } + "America:Moncton"{ + ec{"ìlú Montoni"} + } + "America:Monterrey"{ + ec{"ìlú Monteri"} + } + "America:Montserrat"{ + ec{"ìlú Monseratì"} + } + "America:Nassau"{ + ec{"ìlú Nasaò"} + } + "America:New_York"{ + ec{"ìlú New York"} + } + "America:Nipigon"{ + ec{"ìlú Nipigoni"} + } + "America:Nome"{ + ec{"ìlú Nomi"} + } + "America:North_Dakota:Beulah"{ + ec{"ìlú Beulà ní North Dakota"} + } + "America:North_Dakota:Center"{ + ec{"ìlú Senta North Dakota"} + } + "America:North_Dakota:New_Salem"{ + ec{"ìlú New Salem ni North Dakota"} + } + "America:Ojinaga"{ + ec{"ìlú Ojinaga"} + } + "America:Panama"{ + ec{"ìlú Panama"} + } + "America:Pangnirtung"{ + ec{"ìlú Panituni"} + } + "America:Phoenix"{ + ec{"ìlú Fínísì"} + } + "America:Port-au-Prince"{ + ec{"ìlú Port-au-Prince"} + } + "America:Port_of_Spain"{ + ec{"ìlú etí omi Sípéènì"} + } + "America:Puerto_Rico"{ + ec{"ìlú Puerto Riko"} + } + "America:Rainy_River"{ + ec{"ìlú Raini Rifà"} + } + "America:Rankin_Inlet"{ + ec{"ìlú Rankin Inlet"} + } + "America:Regina"{ + ec{"ìlú Regina"} + } + "America:Resolute"{ + ec{"ìlú Resolútì"} + } + "America:Santo_Domingo"{ + ec{"ìlú Santo Domigo"} + } + "America:Scoresbysund"{ + ec{"ìlú Itokotomiti"} + } + "America:Sitka"{ + ec{"ìlú Sika"} + } + "America:St_Barthelemy"{ + ec{"ìlú Batilemì"} + } + "America:St_Johns"{ + ec{"ìlú St Jọ́ọ̀nù"} + } + "America:St_Kitts"{ + ec{"ìlú St kitisì"} + } + "America:St_Lucia"{ + ec{"ìlú St Lusia"} + } + "America:St_Thomas"{ + ec{"ìlú St Tọ́màsì"} + } + "America:St_Vincent"{ + ec{"ìlú Finsentì"} + } + "America:Swift_Current"{ + ec{"ìlú Súfítù Kọ̀rentì"} + } + "America:Tegucigalpa"{ + ec{"ìlú Tegusigapà"} + } + "America:Thule"{ + ec{"ìlú Tulè"} + } + "America:Thunder_Bay"{ + ec{"ìlú Omi Thunder"} + } + "America:Tijuana"{ + ec{"ìlú Tíjúana"} + } + "America:Toronto"{ + ec{"ìlú Toronto"} + } + "America:Tortola"{ + ec{"ìlú Totola"} + } + "America:Vancouver"{ + ec{"ìlú Vankuva"} + } + "America:Whitehorse"{ + ec{"ìlú Whitehosì"} + } + "America:Winnipeg"{ + ec{"ìlú Winipegì"} + } + "America:Yakutat"{ + ec{"ìlú Yakuta"} + } + "America:Yellowknife"{ + ec{"ìlú Yelonáfù"} + } + "Atlantic:Bermuda"{ + ec{"ìlú Bẹ̀múdà"} + } "Etc:UTC"{ ls{"Àpapọ̀ Àkókò Àgbáyé"} } @@ -73,9 +397,9 @@ yo{ ls{"Arabian Standard Time"} } "meta:Argentina"{ - ld{"Argentina Summer Time"} - lg{"Argentina Time"} - ls{"Argentina Standard Time"} + ld{"Aago Soma Argentina"} + lg{"Aago Ajẹntìnà"} + ls{"Aago àsìkò Argentina"} } "meta:Argentina_Western"{ ld{"Western Argentina Summer Time"} @@ -131,12 +455,12 @@ yo{ ls{"Bhutan Time"} } "meta:Bolivia"{ - ls{"Bolivia Time"} + ls{"Aago Bolivia"} } "meta:Brasilia"{ - ld{"Brasilia Summer Time"} - lg{"Brasilia Time"} - ls{"Brasilia Standard Time"} + ld{"Aago Soma Brasilia"} + lg{"Aago Bùràsílíà"} + ls{"Aago àsìkò Bùràsílíà"} } "meta:Brunei"{ ls{"Brunei Darussalam Time"} @@ -176,9 +500,9 @@ yo{ ls{"Cocos Islands Time"} } "meta:Colombia"{ - ld{"Colombia Summer Time"} - lg{"Colombia Time"} - ls{"Colombia Standard Time"} + ld{"Aago Soma Colombia"} + lg{"Aago Kolombia"} + ls{"Aago àsìkò Kolombia"} } "meta:Cook"{ ld{"Cook Islands Half Summer Time"} @@ -200,12 +524,12 @@ yo{ ls{"Àkókò Ìlà oorùn Timor"} } "meta:Easter"{ - ld{"Easter Island Summer Time"} - lg{"Easter Island Time"} - ls{"Easter Island Standard Time"} + ld{"Aago Soma Easter Island"} + lg{"Aago Ajnde Ibùgbé Omi"} + ls{"Aago àsìkò Easter Island"} } "meta:Ecuador"{ - ls{"Ecuador Time"} + ls{"Aago Ecuador"} } "meta:Europe_Central"{ ld{"Àkókò Àárin Sọmà Europe"} @@ -245,7 +569,7 @@ yo{ ls{"Greenwich Mean Time"} } "meta:Galapagos"{ - ls{"Galapagos Time"} + ls{"Aago Galapago"} } "meta:Gambier"{ ls{"Gambier Time"} @@ -441,9 +765,9 @@ yo{ ls{"Norfolk Island Standard Time"} } "meta:Noronha"{ - ld{"Fernando de Noronha Summer Time"} - lg{"Fernando de Noronha Time"} - ls{"Fernando de Noronha Standard Time"} + ld{"Aago Soma Fernando de Noronha"} + lg{"Aago Fenando de Norona"} + ls{"Aago àsìkò Fenando de Norona"} } "meta:Novosibirsk"{ ld{"Novosibirsk Summer Time"} @@ -563,8 +887,8 @@ yo{ ls{"Tuvalu Time"} } "meta:Uruguay"{ - ld{"Uruguay Summer Time"} - lg{"Uruguay Time"} + ld{"Aago Soma Uruguay"} + lg{"Aago Uruguay"} ls{"Uruguay Standard Time"} } "meta:Uzbekistan"{ @@ -578,7 +902,7 @@ yo{ ls{"Vanuatu Standard Time"} } "meta:Venezuela"{ - ls{"Venezuela Time"} + ls{"Aago Venezuela"} } "meta:Vladivostok"{ ld{"Vladivostok Summer Time"} diff --git a/intl/icu/source/data/zone/yo_BJ.txt b/intl/icu/source/data/zone/yo_BJ.txt index 05fa8d581ea4..b391e3fad4cf 100644 --- a/intl/icu/source/data/zone/yo_BJ.txt +++ b/intl/icu/source/data/zone/yo_BJ.txt @@ -1,8 +1,71 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yo_BJ{ - Version{"37"} zoneStrings{ + "America:Anchorage"{ + ec{"ìlú Ankɔ́réèjì"} + } + "America:Bahia_Banderas"{ + ec{"ìlú Báhì Bándɛ́rásì"} + } + "America:Barbados"{ + ec{"ìlú Bábádɔ́ɔ̀sì"} + } + "America:Belize"{ + ec{"ìlú Bɛ̀líìsì"} + } + "America:Blanc-Sablon"{ + ec{"ìlú Blank Sabulɔ́ɔ̀nì"} + } + "America:Boise"{ + ec{"ìlú Bɔ́isè"} + } + "America:Chihuahua"{ + ec{"ìlú Shihuahua"} + } + "America:Coral_Harbour"{ + ec{"ìlú àtikɔkàn"} + } + "America:Creston"{ + ec{"ìlú Kírɛstɔ́ɔ̀nù"} + } + "America:Curacao"{ + ec{"ìlú Kurashao"} + } + "America:Indiana:Knox"{ + ec{"ìlú nɔ́sì"} + } + "America:Indiana:Marengo"{ + ec{"ìlú Marɛ́ngo"} + } + "America:Kentucky:Monticello"{ + ec{"ìlú Montisɛ́lò"} + } + "America:Kralendijk"{ + ec{"ìlú Kíralɛ́ndáikì"} + } + "America:Marigot"{ + ec{"ìlú Marigɔ́ɔ̀tì"} + } + "America:Mexico_City"{ + ec{"ìlú Mɛ́síkò"} + } + "America:Miquelon"{ + ec{"ìlú Mikulɔ́nì"} + } + "America:St_Johns"{ + ec{"ìlú St Jɔ́ɔ̀nù"} + } + "America:St_Thomas"{ + ec{"ìlú St Tɔ́màsì"} + } + "America:Swift_Current"{ + ec{"ìlú Súfítù Kɔ̀rentì"} + } + "Atlantic:Bermuda"{ + ec{"ìlú Bɛ̀múdà"} + } "Etc:UTC"{ ls{"Àpapɔ̀ Àkókò Àgbáyé"} } @@ -29,6 +92,11 @@ yo_BJ{ lg{"Àkókò Pàsífíìkì"} ls{"Àkókò àsikò Pàsífíìkì"} } + "meta:Argentina"{ + ld{"Aago Soma Argentina"} + lg{"Aago Ajɛntìnà"} + ls{"Aago àsìkò Argentina"} + } "meta:Atlantic"{ ld{"Àkókò Ìyálɛta Àtìláńtíìkì"} lg{"Àkókò Àtìláńtíìkì"} diff --git a/intl/icu/source/data/zone/yue.txt b/intl/icu/source/data/zone/yue.txt index 9b65ff90b9c1..cfbfc29aef2c 100644 --- a/intl/icu/source/data/zone/yue.txt +++ b/intl/icu/source/data/zone/yue.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比讓"} diff --git a/intl/icu/source/data/zone/yue_CN.txt b/intl/icu/source/data/zone/yue_CN.txt index 26d4356a9eeb..2a3cc8af71ba 100644 --- a/intl/icu/source/data/zone/yue_CN.txt +++ b/intl/icu/source/data/zone/yue_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_CN{ "%%ALIAS"{"yue_Hans_CN"} } diff --git a/intl/icu/source/data/zone/yue_HK.txt b/intl/icu/source/data/zone/yue_HK.txt index 29a7459ef3d9..7bce3c57365e 100644 --- a/intl/icu/source/data/zone/yue_HK.txt +++ b/intl/icu/source/data/zone/yue_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_HK{ "%%ALIAS"{"yue_Hant_HK"} } diff --git a/intl/icu/source/data/zone/yue_Hans.txt b/intl/icu/source/data/zone/yue_Hans.txt index dff7af51a052..a62d8dc859d9 100644 --- a/intl/icu/source/data/zone/yue_Hans.txt +++ b/intl/icu/source/data/zone/yue_Hans.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hans{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比让"} diff --git a/intl/icu/source/data/zone/yue_Hans_CN.txt b/intl/icu/source/data/zone/yue_Hans_CN.txt index 479d1253cc95..07edcb8320b7 100644 --- a/intl/icu/source/data/zone/yue_Hans_CN.txt +++ b/intl/icu/source/data/zone/yue_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/yue_Hant.txt b/intl/icu/source/data/zone/yue_Hant.txt index 8f398126c061..f1fb01c3f546 100644 --- a/intl/icu/source/data/zone/yue_Hant.txt +++ b/intl/icu/source/data/zone/yue_Hant.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml yue_Hant{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/yue_Hant_HK.txt b/intl/icu/source/data/zone/yue_Hant_HK.txt index 9adeba7275b4..e2bb01d90d09 100644 --- a/intl/icu/source/data/zone/yue_Hant_HK.txt +++ b/intl/icu/source/data/zone/yue_Hant_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/zgh.txt b/intl/icu/source/data/zone/zgh.txt index ffa19b161005..4946cd84d247 100644 --- a/intl/icu/source/data/zone/zgh.txt +++ b/intl/icu/source/data/zone/zgh.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zgh{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/zh.txt b/intl/icu/source/data/zone/zh.txt index 7c50bcca4ddf..ca469f5ee30d 100644 --- a/intl/icu/source/data/zone/zh.txt +++ b/intl/icu/source/data/zone/zh.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比让"} @@ -991,7 +991,7 @@ zh{ ec{"布达佩斯"} } "Europe:Busingen"{ - ec{"比辛根"} + ec{"布辛根"} } "Europe:Chisinau"{ ec{"基希讷乌"} @@ -1523,7 +1523,7 @@ zh{ ls{"东欧标准时间"} } "meta:Europe_Further_Eastern"{ - ls{"远东标准时间"} + ls{"欧洲极东时间"} } "meta:Europe_Western"{ ld{"西欧夏令时间"} diff --git a/intl/icu/source/data/zone/zh_CN.txt b/intl/icu/source/data/zone/zh_CN.txt index c9151613a23b..0136d26fa140 100644 --- a/intl/icu/source/data/zone/zh_CN.txt +++ b/intl/icu/source/data/zone/zh_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_CN{ "%%ALIAS"{"zh_Hans_CN"} } diff --git a/intl/icu/source/data/zone/zh_HK.txt b/intl/icu/source/data/zone/zh_HK.txt index fe72a0ea43cd..c34c98fdd21b 100644 --- a/intl/icu/source/data/zone/zh_HK.txt +++ b/intl/icu/source/data/zone/zh_HK.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_HK{ "%%ALIAS"{"zh_Hant_HK"} } diff --git a/intl/icu/source/data/zone/zh_Hans.txt b/intl/icu/source/data/zone/zh_Hans.txt index 72c418ec6990..58a5386534ef 100644 --- a/intl/icu/source/data/zone/zh_Hans.txt +++ b/intl/icu/source/data/zone/zh_Hans.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans{ - Version{"37"} } diff --git a/intl/icu/source/data/zone/zh_Hans_CN.txt b/intl/icu/source/data/zone/zh_Hans_CN.txt index 70a6a77b3aa7..333ba54a7fec 100644 --- a/intl/icu/source/data/zone/zh_Hans_CN.txt +++ b/intl/icu/source/data/zone/zh_Hans_CN.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/zh_Hans_SG.txt b/intl/icu/source/data/zone/zh_Hans_SG.txt index 824e1b5a2315..f89f519c793f 100644 --- a/intl/icu/source/data/zone/zh_Hans_SG.txt +++ b/intl/icu/source/data/zone/zh_Hans_SG.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hans_SG{ - Version{"37"} zoneStrings{ "America:Scoresbysund"{ ec{"斯考斯伯松德"} diff --git a/intl/icu/source/data/zone/zh_Hant.txt b/intl/icu/source/data/zone/zh_Hant.txt index d7dadab2fd9d..f0aa4d898f01 100644 --- a/intl/icu/source/data/zone/zh_Hant.txt +++ b/intl/icu/source/data/zone/zh_Hant.txt @@ -1,8 +1,8 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant{ %%Parent{"root"} - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比讓"} diff --git a/intl/icu/source/data/zone/zh_Hant_HK.txt b/intl/icu/source/data/zone/zh_Hant_HK.txt index 2616554645ff..fe44f288cc6b 100644 --- a/intl/icu/source/data/zone/zh_Hant_HK.txt +++ b/intl/icu/source/data/zone/zh_Hant_HK.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_HK{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比贊"} diff --git a/intl/icu/source/data/zone/zh_Hant_MO.txt b/intl/icu/source/data/zone/zh_Hant_MO.txt index 670cffc3f25d..1f5fac879191 100644 --- a/intl/icu/source/data/zone/zh_Hant_MO.txt +++ b/intl/icu/source/data/zone/zh_Hant_MO.txt @@ -1,6 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_Hant_MO{ %%Parent{"zh_Hant_HK"} - Version{"37"} } diff --git a/intl/icu/source/data/zone/zh_Hant_TW.txt b/intl/icu/source/data/zone/zh_Hant_TW.txt index b62ad6927771..b079f20e1385 100644 --- a/intl/icu/source/data/zone/zh_Hant_TW.txt +++ b/intl/icu/source/data/zone/zh_Hant_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml /** * generated alias target */ diff --git a/intl/icu/source/data/zone/zh_MO.txt b/intl/icu/source/data/zone/zh_MO.txt index 6565bf7c3fc3..c6b2148478d5 100644 --- a/intl/icu/source/data/zone/zh_MO.txt +++ b/intl/icu/source/data/zone/zh_MO.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_MO{ "%%ALIAS"{"zh_Hant_MO"} } diff --git a/intl/icu/source/data/zone/zh_SG.txt b/intl/icu/source/data/zone/zh_SG.txt index bf277736bf8b..14136c339a80 100644 --- a/intl/icu/source/data/zone/zh_SG.txt +++ b/intl/icu/source/data/zone/zh_SG.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_SG{ "%%ALIAS"{"zh_Hans_SG"} } diff --git a/intl/icu/source/data/zone/zh_TW.txt b/intl/icu/source/data/zone/zh_TW.txt index 9372c5067ad4..c54ccbfe8920 100644 --- a/intl/icu/source/data/zone/zh_TW.txt +++ b/intl/icu/source/data/zone/zh_TW.txt @@ -1,5 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zh_TW{ "%%ALIAS"{"zh_Hant_TW"} } diff --git a/intl/icu/source/data/zone/zu.txt b/intl/icu/source/data/zone/zu.txt index 53c1a8fd5a9b..9f232363406e 100644 --- a/intl/icu/source/data/zone/zu.txt +++ b/intl/icu/source/data/zone/zu.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html#License +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml zu{ - Version{"37"} zoneStrings{ "Africa:Abidjan"{ ec{"i-Abidjan"} diff --git a/intl/icu/source/extra/scrptrun/Makefile.in b/intl/icu/source/extra/scrptrun/Makefile.in index 6712c43564b5..f3f89431dfd7 100644 --- a/intl/icu/source/extra/scrptrun/Makefile.in +++ b/intl/icu/source/extra/scrptrun/Makefile.in @@ -12,9 +12,6 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## Platform-specific setup -include @platform_make_fragment@ - ## Build directory information subdir = extra/scrptrun @@ -22,7 +19,7 @@ subdir = extra/scrptrun CLEANFILES = *~ $(DEPS) ## Target information -TARGET = srtest +TARGET = srtest$(EXEEXT) DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/common -I$(top_srcdir) @@ -33,9 +30,10 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -LIBS = $(LIBICUUC) @LIBS@ @LIB_M@ +LIBS = $(LIBICUUC) $(LIB_M) -OBJECTS = scrptrun.o srtest.o +SOURCES = $(shell cat $(srcdir)/sources.txt) +OBJECTS = $(SOURCES:.cpp=.o) DEPS = $(OBJECTS:.o=.d) @@ -74,7 +72,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) -o $@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) $(POST_BUILD_STEP) invoke: diff --git a/intl/icu/source/extra/scrptrun/sources.txt b/intl/icu/source/extra/scrptrun/sources.txt new file mode 100644 index 000000000000..a4b20b713028 --- /dev/null +++ b/intl/icu/source/extra/scrptrun/sources.txt @@ -0,0 +1,2 @@ +scrptrun.cpp +srtest.cpp diff --git a/intl/icu/source/extra/uconv/Makefile.in b/intl/icu/source/extra/uconv/Makefile.in index b6144619d00a..30e27fdd5642 100644 --- a/intl/icu/source/extra/uconv/Makefile.in +++ b/intl/icu/source/extra/uconv/Makefile.in @@ -74,7 +74,8 @@ PKGMODE=dll INSTALLTO=$(libdir) endif -OBJECTS = uconv.o uwmsg.o +SOURCES = $(shell cat $(srcdir)/sources.txt) +OBJECTS = $(patsubst %.cpp,%.o,$(patsubst %.c,%.o, $(SOURCES))) DEPS = $(OBJECTS:.o=.d) diff --git a/intl/icu/source/extra/uconv/sources.txt b/intl/icu/source/extra/uconv/sources.txt new file mode 100644 index 000000000000..ed227fe3b101 --- /dev/null +++ b/intl/icu/source/extra/uconv/sources.txt @@ -0,0 +1,2 @@ +uconv.cpp +uwmsg.c diff --git a/intl/icu/source/extra/uconv/uconv.cpp b/intl/icu/source/extra/uconv/uconv.cpp index c3dca05ad8b3..3be4e8ec5751 100644 --- a/intl/icu/source/extra/uconv/uconv.cpp +++ b/intl/icu/source/extra/uconv/uconv.cpp @@ -323,7 +323,7 @@ static int printConverters(const char *pname, const char *lookfor, if (U_SUCCESS(err)) { /* List the standard tags */ const char *standardName; - UBool isFirst = TRUE; + UBool isFirst = true; UErrorCode enumError = U_ZERO_ERROR; while ((standardName = uenum_next(nameEnum, NULL, &enumError))) { /* See if this alias is supported by this standard. */ @@ -335,7 +335,7 @@ static int printConverters(const char *pname, const char *lookfor, /* Print a * after the default standard name */ printf(" %s%s", stds[s], (isFirst ? "*" : "")); } - isFirst = FALSE; + isFirst = false; } } } @@ -518,7 +518,7 @@ cnvSigType(UConverter *cnv) { ucnv_fromUnicode(cnv, &out, buffer + sizeof(buffer), &in, a + 1, - NULL, TRUE, &err); + NULL, true, &err); ucnv_resetFromUnicode(cnv); if (NULL != ucnv_detectUnicodeSignature(buffer, (int32_t)(out - buffer), NULL, &err) && @@ -589,12 +589,12 @@ ConvertFile::convertFile(const char *pname, FILE * outfile, int verbose) { FILE *infile; - UBool ret = TRUE; + UBool ret = true; UConverter *convfrom = 0; UConverter *convto = 0; UErrorCode err = U_ZERO_ERROR; UBool flush; - UBool closeFile = FALSE; + UBool closeFile = false; const char *cbufp, *prevbufp; char *bufp; @@ -615,7 +615,7 @@ ConvertFile::convertFile(const char *pname, // use conversion offsets for error messages // unless a transliterator is used - // a text transformation will reorder characters in unpredictable ways - UBool useOffsets = TRUE; + UBool useOffsets = true; // Open the correct input file or connect to stdin for reading input @@ -628,9 +628,9 @@ ConvertFile::convertFile(const char *pname, str2.append((UChar32) 0); initMsg(pname); u_wmsg(stderr, "cantOpenInputF", str1.getBuffer(), str2.getBuffer()); - return FALSE; + return false; } - closeFile = TRUE; + closeFile = true; } else { infilestr = "-"; infile = stdin; @@ -638,7 +638,7 @@ ConvertFile::convertFile(const char *pname, if (setmode(fileno(stdin), O_BINARY) == -1) { initMsg(pname); u_wmsg(stderr, "cantSetInBinMode"); - return FALSE; + return false; } #endif } @@ -686,7 +686,7 @@ ConvertFile::convertFile(const char *pname, goto error_exit; } - useOffsets = FALSE; + useOffsets = false; } #endif @@ -733,7 +733,7 @@ ConvertFile::convertFile(const char *pname, rd = 0; do { - willexit = FALSE; + willexit = false; // input file offset at the beginning of the next buffer infoffset += static_cast(rd); @@ -823,7 +823,7 @@ ConvertFile::convertFile(const char *pname, str.getTerminatedBuffer(), u_wmsg_errorName(err)); - willexit = TRUE; + willexit = true; err = U_ZERO_ERROR; /* reset the error for the rest of the conversion. */ } @@ -1013,7 +1013,7 @@ ConvertFile::convertFile(const char *pname, u_wmsg_errorName(err)); u_wmsg(stderr, "errorUnicode", str.getTerminatedBuffer()); - willexit = TRUE; + willexit = true; err = U_ZERO_ERROR; /* reset the error for the rest of the conversion. */ } @@ -1027,7 +1027,7 @@ ConvertFile::convertFile(const char *pname, UnicodeString str(strerror(errno)); initMsg(pname); u_wmsg(stderr, "cantWrite", str.getTerminatedBuffer()); - willexit = TRUE; + willexit = true; } if (willexit) { @@ -1042,7 +1042,7 @@ ConvertFile::convertFile(const char *pname, goto normal_exit; error_exit: - ret = FALSE; + ret = false; normal_exit: // Cleanup. @@ -1107,7 +1107,7 @@ main(int argc, char **argv) const char *tocpage = 0; const char *translit = 0; const char *outfilestr = 0; - UBool fallback = FALSE; + UBool fallback = false; UConverterFromUCallback fromucallback = UCNV_FROM_U_CALLBACK_STOP; const void *fromuctxt = 0; @@ -1119,10 +1119,10 @@ main(int argc, char **argv) const char *pname; - UBool printConvs = FALSE, printCanon = FALSE, printTranslits = FALSE; + UBool printConvs = false, printCanon = false, printTranslits = false; const char *printName = 0; - UBool verbose = FALSE; + UBool verbose = false; UErrorCode status = U_ZERO_ERROR; ConvertFile cf; @@ -1173,9 +1173,9 @@ main(int argc, char **argv) else usage(pname, 1); } else if (!strcmp("--fallback", *iter)) { - fallback = TRUE; + fallback = true; } else if (!strcmp("--no-fallback", *iter)) { - fallback = FALSE; + fallback = false; } else if (strcmp("-b", *iter) == 0 || !strcmp("--block-size", *iter)) { iter++; if (iter != end) { @@ -1194,7 +1194,7 @@ main(int argc, char **argv) if (printTranslits) { usage(pname, 1); } - printConvs = TRUE; + printConvs = true; } else if (strcmp("--default-code", *iter) == 0) { if (printTranslits) { usage(pname, 1); @@ -1218,13 +1218,13 @@ main(int argc, char **argv) } else usage(pname, 1); } else if (strcmp("--canon", *iter) == 0) { - printCanon = TRUE; + printCanon = true; } else if (strcmp("-L", *iter) == 0 || !strcmp("--list-transliterators", *iter)) { if (printConvs) { usage(pname, 1); } - printTranslits = TRUE; + printTranslits = true; } else if (strcmp("-h", *iter) == 0 || !strcmp("-?", *iter) || !strcmp("--help", *iter)) { usage(pname, 0); @@ -1283,9 +1283,9 @@ main(int argc, char **argv) usage(pname, 1); } } else if (!strcmp("-s", *iter) || !strcmp("--silent", *iter)) { - verbose = FALSE; + verbose = false; } else if (!strcmp("-v", *iter) || !strcmp("--verbose", *iter)) { - verbose = TRUE; + verbose = true; } else if (!strcmp("-V", *iter) || !strcmp("--version", *iter)) { printf("%s v2.1 ICU " U_ICU_VERSION "\n", pname); return 0; diff --git a/intl/icu/source/extra/uconv/uconv.vcxproj b/intl/icu/source/extra/uconv/uconv.vcxproj index 1929ac470f91..e00a288f4d38 100644 --- a/intl/icu/source/extra/uconv/uconv.vcxproj +++ b/intl/icu/source/extra/uconv/uconv.vcxproj @@ -14,22 +14,6 @@ - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 diff --git a/intl/icu/source/extra/uconv/uwmsg.c b/intl/icu/source/extra/uconv/uwmsg.c index fdfb1c863f9e..2f611e94eb7d 100644 --- a/intl/icu/source/extra/uconv/uwmsg.c +++ b/intl/icu/source/extra/uconv/uwmsg.c @@ -24,6 +24,7 @@ #include "cmemory.h" #include "cstring.h" +#include #include #include #include @@ -68,7 +69,7 @@ uprint(const UChar *s, /* perform the conversion */ ucnv_fromUnicode(converter, &myTarget, myTarget + arraySize, &mySource, mySourceEnd, NULL, - TRUE, status); + true, status); /* Write the converted data to the FILE* */ fwrite(buf, sizeof(char), myTarget - buf, f); diff --git a/intl/icu/source/i18n/Makefile.in b/intl/icu/source/i18n/Makefile.in index ae2c71a24ff1..ce7fe006e6cc 100644 --- a/intl/icu/source/i18n/Makefile.in +++ b/intl/icu/source/i18n/Makefile.in @@ -64,57 +64,8 @@ DEFS += -DU_I18N_IMPLEMENTATION LDFLAGS += $(LDFLAGSICUI18N) LIBS = $(LIBICUUC) $(DEFAULT_LIBS) -OBJECTS = ucln_in.o \ -fmtable.o format.o msgfmt.o umsg.o numfmt.o unum.o decimfmt.o dcfmtsym.o \ -fmtable_cnv.o \ -choicfmt.o datefmt.o smpdtfmt.o reldtfmt.o dtfmtsym.o udat.o dtptngen.o udatpg.o \ -nfrs.o nfrule.o nfsubs.o rbnf.o numsys.o unumsys.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 dangical.o ethpccal.o \ -coleitr.o coll.o sortkey.o bocsu.o ucoleitr.o \ -ucol.o ucol_res.o ucol_sit.o \ -collation.o collationsettings.o collationdata.o collationtailoring.o \ -collationdatareader.o collationdatawriter.o collationfcd.o \ -collationiterator.o utf16collationiterator.o utf8collationiterator.o uitercollationiterator.o \ -collationsets.o \ -collationcompare.o collationfastlatin.o collationkeys.o rulebasedcollator.o collationroot.o \ -collationrootelements.o collationdatabuilder.o \ -collationweights.o collationruleparser.o collationbuilder.o collationfastlatinbuilder.o \ -listformatter.o ulistformatter.o \ -strmatch.o usearch.o search.o stsearch.o \ -translit.o utrans.o esctrn.o unesctrn.o funcrepl.o strrepl.o tridpars.o \ -cpdtrans.o rbt.o rbt_data.o rbt_pars.o rbt_rule.o rbt_set.o \ -nultrans.o remtrans.o casetrn.o titletrn.o tolowtrn.o toupptrn.o anytrans.o \ -name2uni.o uni2name.o nortrans.o quant.o transreg.o brktrans.o \ -regexcmp.o rematch.o repattrn.o regexst.o regextxt.o regeximp.o uregex.o uregexc.o \ -ulocdata.o measfmt.o currfmt.o curramt.o currunit.o measure.o utmscale.o \ -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 \ -standardplural.o upluralrules.o plurrule.o plurfmt.o selfmt.o dtitvfmt.o dtitvinf.o udateintervalformat.o \ -tmunit.o tmutamt.o tmutfmt.o currpinf.o \ -uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o smpdtfst.o \ -ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o ufieldpositer.o \ -decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \ -tzfmt.o compactdecimalformat.o gender.o region.o scriptset.o \ -uregion.o reldatefmt.o quantityformatter.o measunit.o measunit_extra.o \ -sharedbreakiterator.o scientificnumberformatter.o dayperiodrules.o nounit.o \ -number_affixutils.o number_compact.o number_decimalquantity.o \ -number_decimfmtprops.o number_fluent.o number_formatimpl.o number_grouping.o \ -number_integerwidth.o number_longnames.o number_modifiers.o number_notation.o number_output.o \ -number_padding.o number_patternmodifier.o number_patternstring.o \ -number_rounding.o number_scientific.o number_utils.o number_asformat.o \ -number_mapper.o number_multiplier.o number_currencysymbols.o number_skeletons.o number_capi.o \ -double-conversion-string-to-double.o double-conversion-double-to-string.o \ -double-conversion-bignum-dtoa.o double-conversion-bignum.o \ -double-conversion-cached-powers.o \ -double-conversion-fast-dtoa.o double-conversion-strtod.o \ -string_segment.o numparse_parsednumber.o numparse_impl.o \ -numparse_symbols.o numparse_decimal.o numparse_scientific.o numparse_currency.o \ -numparse_affixes.o numparse_compositions.o numparse_validators.o \ -numrange_fluent.o numrange_impl.o \ -erarules.o \ -formattedvalue.o formattedval_iterimpl.o formattedval_sbimpl.o formatted_string_builder.o +SOURCES = $(shell cat $(srcdir)/sources.txt) +OBJECTS = $(SOURCES:.cpp=.o) ## Header files to install HEADERS = $(srcdir)/unicode/*.h diff --git a/intl/icu/source/i18n/buddhcal.h b/intl/icu/source/i18n/buddhcal.h index 0ad0886df120..7fc686dcde27 100644 --- a/intl/icu/source/i18n/buddhcal.h +++ b/intl/icu/source/i18n/buddhcal.h @@ -174,7 +174,7 @@ private: UBool useMonth) const; /** - * Returns TRUE because the Buddhist Calendar does have a default century + * Returns true because the Buddhist Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/calendar.cpp b/intl/icu/source/i18n/calendar.cpp index 981f09c57406..c3e5e8c4f662 100644 --- a/intl/icu/source/i18n/calendar.cpp +++ b/intl/icu/source/i18n/calendar.cpp @@ -266,7 +266,7 @@ static ECalType getCalendarTypeForLocale(const char *locid) { //TODO: ULOC_FULL_NAME is out of date and too small.. char canonicalName[256]; - // canonicalize, so grandfathered variant will be transformed to keywords + // Canonicalize, so that an old-style variant will be transformed to keywords. // e.g ja_JP_TRADITIONAL -> ja_JP@calendar=japanese // NOTE: Since ICU-20187, ja_JP_TRADITIONAL no longer canonicalizes, and // the Gregorian calendar is returned instead. @@ -870,7 +870,7 @@ Calendar::createInstance(const TimeZone& zone, UErrorCode& success) Calendar* U_EXPORT2 Calendar::createInstance(const Locale& aLocale, UErrorCode& success) { - return createInstance(TimeZone::createDefault(), aLocale, success); + return createInstance(TimeZone::forLocaleOrDefault(aLocale), aLocale, success); } // ------------------------------------- Adopting diff --git a/intl/icu/source/i18n/cecal.cpp b/intl/icu/source/i18n/cecal.cpp index 00faa8ac07a0..cb97c40a3c74 100644 --- a/intl/icu/source/i18n/cecal.cpp +++ b/intl/icu/source/i18n/cecal.cpp @@ -49,7 +49,7 @@ static const int32_t LIMITS[UCAL_FIELD_COUNT][4] = { //------------------------------------------------------------------------- CECalendar::CECalendar(const Locale& aLocale, UErrorCode& success) -: Calendar(TimeZone::createDefault(), aLocale, success) +: Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success) { setTimeInMillis(getNow(), success); } diff --git a/intl/icu/source/i18n/cecal.h b/intl/icu/source/i18n/cecal.h index c380f0bea305..80dab70f6ff0 100644 --- a/intl/icu/source/i18n/cecal.h +++ b/intl/icu/source/i18n/cecal.h @@ -88,7 +88,7 @@ protected: virtual UBool inDaylightTime(UErrorCode&) const; /** - * Returns TRUE because Coptic/Ethiopic Calendar does have a default century + * Returns true because Coptic/Ethiopic Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/chnsecal.cpp b/intl/icu/source/i18n/chnsecal.cpp index 4c0381271592..f8fb4a40f142 100644 --- a/intl/icu/source/i18n/chnsecal.cpp +++ b/intl/icu/source/i18n/chnsecal.cpp @@ -123,7 +123,7 @@ ChineseCalendar* ChineseCalendar::clone() const { } ChineseCalendar::ChineseCalendar(const Locale& aLocale, UErrorCode& success) -: Calendar(TimeZone::createDefault(), aLocale, success), +: Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success), isLeapYear(FALSE), fEpochYear(CHINESE_EPOCH_YEAR), fZoneAstroCalc(getChineseCalZoneAstroCalc()) @@ -133,7 +133,7 @@ ChineseCalendar::ChineseCalendar(const Locale& aLocale, UErrorCode& success) ChineseCalendar::ChineseCalendar(const Locale& aLocale, int32_t epochYear, const TimeZone* zoneAstroCalc, UErrorCode &success) -: Calendar(TimeZone::createDefault(), aLocale, success), +: Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success), isLeapYear(FALSE), fEpochYear(epochYear), fZoneAstroCalc(zoneAstroCalc) diff --git a/intl/icu/source/i18n/chnsecal.h b/intl/icu/source/i18n/chnsecal.h index a0c21b6b5c2f..910afd2f5999 100644 --- a/intl/icu/source/i18n/chnsecal.h +++ b/intl/icu/source/i18n/chnsecal.h @@ -242,7 +242,7 @@ class U_I18N_API ChineseCalendar : public Calendar { /** - * Returns TRUE because the Islamic Calendar does have a default century + * Returns true because the Islamic Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/collation.h b/intl/icu/source/i18n/collation.h index e9256c9c12c5..ecbba29057f0 100644 --- a/intl/icu/source/i18n/collation.h +++ b/intl/icu/source/i18n/collation.h @@ -356,7 +356,7 @@ public: } /** - * @return TRUE if the ce32 yields one or more CEs without further data lookups + * @return true if the ce32 yields one or more CEs without further data lookups */ static UBool isSelfContainedCE32(uint32_t ce32) { return !isSpecialCE32(ce32) || diff --git a/intl/icu/source/i18n/collationbuilder.h b/intl/icu/source/i18n/collationbuilder.h index 2f20050f93ba..82f0459748f0 100644 --- a/intl/icu/source/i18n/collationbuilder.h +++ b/intl/icu/source/i18n/collationbuilder.h @@ -42,7 +42,7 @@ public: CollationBuilder(const CollationTailoring *base, UErrorCode &errorCode); virtual ~CollationBuilder(); - void disableFastLatin() { fastLatinEnabled = FALSE; } + void disableFastLatin() { fastLatinEnabled = false; } CollationTailoring *parseAndBuild(const UnicodeString &ruleString, const UVersionInfo rulesVersion, diff --git a/intl/icu/source/i18n/collationdatabuilder.h b/intl/icu/source/i18n/collationdatabuilder.h index fee444deee77..6ae77772fd5a 100644 --- a/intl/icu/source/i18n/collationdatabuilder.h +++ b/intl/icu/source/i18n/collationdatabuilder.h @@ -73,12 +73,12 @@ public: } /** - * @return TRUE if this builder has mappings (e.g., add() has been called) + * @return true if this builder has mappings (e.g., add() has been called) */ UBool hasMappings() const { return modified; } /** - * @return TRUE if c has CEs in this builder + * @return true if c has CEs in this builder */ UBool isAssigned(UChar32 c) const; @@ -118,7 +118,7 @@ public: * @param primary primary weight for 'start' * @param step per-code point primary-weight increment * @param errorCode ICU in/out error code - * @return TRUE if an OFFSET_TAG range was used for start..end + * @return true if an OFFSET_TAG range was used for start..end */ UBool maybeSetPrimaryRange(UChar32 start, UChar32 end, uint32_t primary, int32_t step, @@ -150,7 +150,7 @@ public: void optimize(const UnicodeSet &set, UErrorCode &errorCode); void suppressContractions(const UnicodeSet &set, UErrorCode &errorCode); - void enableFastLatin() { fastLatinEnabled = TRUE; } + void enableFastLatin() { fastLatinEnabled = true; } virtual void build(CollationData &data, UErrorCode &errorCode); /** diff --git a/intl/icu/source/i18n/collationfcd.h b/intl/icu/source/i18n/collationfcd.h index ec7167d76bab..3a5738efb24a 100644 --- a/intl/icu/source/i18n/collationfcd.h +++ b/intl/icu/source/i18n/collationfcd.h @@ -84,7 +84,7 @@ public: // Handles all of Unicode 0..10FFFF. // c can be negative, e.g., U_SENTINEL. // U+0300 is the first character with lccc!=0. - if(c < 0x300) { return FALSE; } + if(c < 0x300) { return false; } if(c > 0xffff) { c = U16_LEAD(c); } int32_t i; return @@ -101,7 +101,7 @@ public: * This is a fast and imprecise test. * * @param c a code point - * @return TRUE if c is U+0F73, U+0F75 or U+0F81 or one of several other Tibetan characters + * @return true if c is U+0F73, U+0F75 or U+0F81 or one of several other Tibetan characters */ static inline UBool maybeTibetanCompositeVowel(UChar32 c) { return (c & 0x1fff01) == 0xf01; @@ -116,7 +116,7 @@ public: * They have distinct lccc/tccc combinations: 129/130 or 129/132. * * @param fcd16 the FCD value (lccc/tccc combination) of a code point - * @return TRUE if fcd16 is from U+0F73, U+0F75 or U+0F81 + * @return true if fcd16 is from U+0F73, U+0F75 or U+0F81 */ static inline UBool isFCD16OfTibetanCompositeVowel(uint16_t fcd16) { return fcd16 == 0x8182 || fcd16 == 0x8184; diff --git a/intl/icu/source/i18n/collationiterator.h b/intl/icu/source/i18n/collationiterator.h index 12e05b4482fa..869f0956c34d 100644 --- a/intl/icu/source/i18n/collationiterator.h +++ b/intl/icu/source/i18n/collationiterator.h @@ -76,9 +76,9 @@ private: // (Rather than buffer.getCapacity().) if(length < INITIAL_CAPACITY || ensureAppendCapacity(1, errorCode)) { ++length; - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -251,9 +251,9 @@ protected: virtual UBool foundNULTerminator(); /** - * @return FALSE if surrogate code points U+D800..U+DFFF + * @return false if surrogate code points U+D800..U+DFFF * map to their own implicit primary weights (for UTF-16), - * or TRUE if they map to CE(U+FFFD) (for UTF-8) + * or true if they map to CE(U+FFFD) (for UTF-8) */ virtual UBool forbidSurrogateCodePoints() const; diff --git a/intl/icu/source/i18n/collationkeys.h b/intl/icu/source/i18n/collationkeys.h index 60d9e50c0d91..c526a4f14f2d 100644 --- a/intl/icu/source/i18n/collationkeys.h +++ b/intl/icu/source/i18n/collationkeys.h @@ -65,7 +65,7 @@ public: } UBool Overflowed() const { return appended_ > capacity_; } - /** @return FALSE if memory allocation failed */ + /** @return false if memory allocation failed */ UBool IsOk() const { return buffer_ != NULL; } protected: @@ -94,8 +94,8 @@ public: virtual ~LevelCallback(); /** * @param level The next level about to be written to the ByteSink. - * @return TRUE if the level is to be written - * (the base class implementation always returns TRUE) + * @return true if the level is to be written + * (the base class implementation always returns true) */ virtual UBool needToWrite(Collation::Level level); }; @@ -103,7 +103,7 @@ public: /** * Writes the sort key bytes for minLevel up to the iterator data's strength. * Optionally writes the case level. - * Stops writing levels when callback.needToWrite(level) returns FALSE. + * Stops writing levels when callback.needToWrite(level) returns false. * Separates levels with the LEVEL_SEPARATOR_BYTE * but does not write a TERMINATOR_BYTE. */ diff --git a/intl/icu/source/i18n/collationtailoring.h b/intl/icu/source/i18n/collationtailoring.h index e1bc34c7d768..5fc2bac2d307 100644 --- a/intl/icu/source/i18n/collationtailoring.h +++ b/intl/icu/source/i18n/collationtailoring.h @@ -50,7 +50,7 @@ struct U_I18N_API CollationTailoring : public SharedObject { virtual ~CollationTailoring(); /** - * Returns TRUE if the constructor could not initialize properly. + * Returns true if the constructor could not initialize properly. */ UBool isBogus() { return settings == NULL; } diff --git a/intl/icu/source/i18n/collationweights.h b/intl/icu/source/i18n/collationweights.h index b41588218447..0d20b927b269 100644 --- a/intl/icu/source/i18n/collationweights.h +++ b/intl/icu/source/i18n/collationweights.h @@ -62,7 +62,7 @@ public: * weights less than this one. * @param n The number of collation element weights w necessary such that * lowerLimitclone(): nullptr; fTimePattern = (itvfmt.fTimePattern)? itvfmt.fTimePattern->clone(): nullptr; fDateTimeFormat = (itvfmt.fDateTimeFormat)? itvfmt.fDateTimeFormat->clone(): nullptr; + fCapitalizationContext = itvfmt.fCapitalizationContext; } return *this; } @@ -239,7 +243,7 @@ DateIntervalFormat::operator==(const Format& other) const { if (fDateFormat && fmt->fDateFormat && (*fDateFormat != *fmt->fDateFormat)) {return FALSE;} } // note: fFromCalendar and fToCalendar hold no persistent state, and therefore do not participate in operator ==. - // fDateFormat has the master calendar for the DateIntervalFormat. + // fDateFormat has the primary calendar for the DateIntervalFormat. if (fSkeleton != fmt->fSkeleton) {return FALSE;} if (fDatePattern != fmt->fDatePattern && (fDatePattern == nullptr || fmt->fDatePattern == nullptr)) {return FALSE;} if (fDatePattern && fmt->fDatePattern && (*fDatePattern != *fmt->fDatePattern)) {return FALSE;} @@ -254,6 +258,7 @@ DateIntervalFormat::operator==(const Format& other) const { if (fIntervalPatterns[i].secondPart != fmt->fIntervalPatterns[i].secondPart ) {return FALSE;} if (fIntervalPatterns[i].laterDateFirst != fmt->fIntervalPatterns[i].laterDateFirst) {return FALSE;} } + if (fCapitalizationContext != fmt->fCapitalizationContext) {return FALSE;} return TRUE; } @@ -409,6 +414,7 @@ UnicodeString& DateIntervalFormat::formatIntervalImpl( } +// The following is only called from within the gFormatterMutex lock UnicodeString& DateIntervalFormat::formatImpl(Calendar& fromCalendar, Calendar& toCalendar, @@ -464,6 +470,11 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, if ( U_FAILURE(status) ) { return appendTo; } + UErrorCode tempStatus = U_ZERO_ERROR; // for setContext, ignored + // Set up fDateFormat to handle the first or only part of the interval + // (override later for any second part). Inside lock, OK to modify fDateFormat. + fDateFormat->setContext(fCapitalizationContext, tempStatus); + if ( field == UCAL_FIELD_COUNT ) { /* ignore the millisecond etc. small fields' difference. * use single date when all the above are the same. @@ -521,6 +532,9 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, if ( !intervalPattern.secondPart.isEmpty() ) { fDateFormat->applyPattern(intervalPattern.secondPart); + // No capitalization for second part of interval + tempStatus = U_ZERO_ERROR; + fDateFormat->setContext(UDISPCTX_CAPITALIZATION_NONE, tempStatus); fDateFormat->_format(*secondCal, appendTo, fphandler, status); } fDateFormat->applyPattern(originalPattern); @@ -583,7 +597,7 @@ DateIntervalFormat::adoptTimeZone(TimeZone* zone) if (fDateFormat != nullptr) { fDateFormat->adoptTimeZone(zone); } - // The fDateFormat has the master calendar for the DateIntervalFormat and has + // The fDateFormat has the primary calendar for the DateIntervalFormat and has // ownership of any adopted TimeZone; fFromCalendar and fToCalendar are internal // work clones of that calendar (and should not also be given ownership of the // adopted TimeZone). @@ -601,7 +615,7 @@ DateIntervalFormat::setTimeZone(const TimeZone& zone) if (fDateFormat != nullptr) { fDateFormat->setTimeZone(zone); } - // The fDateFormat has the master calendar for the DateIntervalFormat; + // The fDateFormat has the primary calendar for the DateIntervalFormat; // fFromCalendar and fToCalendar are internal work clones of that calendar. if (fFromCalendar) { fFromCalendar->setTimeZone(zone); @@ -622,6 +636,30 @@ DateIntervalFormat::getTimeZone() const return *(TimeZone::createDefault()); } +void +DateIntervalFormat::setContext(UDisplayContext value, UErrorCode& status) +{ + if (U_FAILURE(status)) + return; + if ( (UDisplayContextType)((uint32_t)value >> 8) == UDISPCTX_TYPE_CAPITALIZATION ) { + fCapitalizationContext = value; + } else { + status = U_ILLEGAL_ARGUMENT_ERROR; + } +} + +UDisplayContext +DateIntervalFormat::getContext(UDisplayContextType type, UErrorCode& status) const +{ + if (U_FAILURE(status)) + return (UDisplayContext)0; + if (type != UDISPCTX_TYPE_CAPITALIZATION) { + status = U_ILLEGAL_ARGUMENT_ERROR; + return (UDisplayContext)0; + } + return fCapitalizationContext; +} + DateIntervalFormat::DateIntervalFormat(const Locale& locale, DateIntervalInfo* dtItvInfo, const UnicodeString* skeleton, @@ -633,7 +671,8 @@ DateIntervalFormat::DateIntervalFormat(const Locale& locale, fLocale(locale), fDatePattern(nullptr), fTimePattern(nullptr), - fDateTimeFormat(nullptr) + fDateTimeFormat(nullptr), + fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE) { LocalPointer info(dtItvInfo, status); LocalPointer dtfmt(static_cast( @@ -751,7 +790,7 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { /* the difference between time skeleton and normalizedTimeSkeleton are: * 1. (Formerly, normalized time skeleton folded 'H' to 'h'; no longer true) - * 2. 'a' is omitted in normalized time skeleton. + * 2. (Formerly, 'a' was omitted in normalized time skeleton; this is now handled elsewhere) * 3. there is only one appearance for 'h' or 'H', 'm','v', 'z' in normalized * time skeleton * @@ -760,7 +799,8 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { * 2. 'E' and 'EE' are normalized into 'EEE' * 3. 'MM' is normalized into 'M' */ - getDateTimeSkeleton(fSkeleton, dateSkeleton, normalizedDateSkeleton, + UnicodeString convertedSkeleton = normalizeHourMetacharacters(fSkeleton); + getDateTimeSkeleton(convertedSkeleton, dateSkeleton, normalizedDateSkeleton, timeSkeleton, normalizedTimeSkeleton); #ifdef DTITVFMT_DEBUG @@ -899,6 +939,91 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { +UnicodeString +DateIntervalFormat::normalizeHourMetacharacters(const UnicodeString& skeleton) const { + UnicodeString result = skeleton; + + UChar hourMetachar = u'\0'; + int32_t metacharStart = 0; + int32_t metacharCount = 0; + for (int32_t i = 0; i < result.length(); i++) { + UChar c = result[i]; + if (c == LOW_J || c == CAP_J || c == CAP_C) { + if (hourMetachar == u'\0') { + hourMetachar = c; + metacharStart = i; + } + ++metacharCount; + } else { + if (hourMetachar != u'\0') { + break; + } + } + } + + if (hourMetachar != u'\0') { + UErrorCode err = U_ZERO_ERROR; + UChar hourChar = CAP_H; + UChar dayPeriodChar = LOW_A; + UnicodeString convertedPattern = DateFormat::getBestPattern(fLocale, UnicodeString(hourMetachar), err); + + if (U_SUCCESS(err)) { + // strip literal text from the pattern (so literal characters don't get mistaken for pattern + // characters-- such as the 'h' in 'Uhr' in Germam) + int32_t firstQuotePos; + while ((firstQuotePos = convertedPattern.indexOf(u'\'')) != -1) { + int32_t secondQuotePos = convertedPattern.indexOf(u'\'', firstQuotePos + 1); + if (secondQuotePos == -1) { + secondQuotePos = firstQuotePos; + } + convertedPattern.replace(firstQuotePos, (secondQuotePos - firstQuotePos) + 1, UnicodeString()); + } + + if (convertedPattern.indexOf(LOW_H) != -1) { + hourChar = LOW_H; + } else if (convertedPattern.indexOf(CAP_K) != -1) { + hourChar = CAP_K; + } else if (convertedPattern.indexOf(LOW_K) != -1) { + hourChar = LOW_K; + } + + if (convertedPattern.indexOf(LOW_B) != -1) { + dayPeriodChar = LOW_B; + } else if (convertedPattern.indexOf(CAP_B) != -1) { + dayPeriodChar = CAP_B; + } + } + + if (hourChar == CAP_H || hourChar == LOW_K) { + result.replace(metacharStart, metacharCount, hourChar); + } else { + UnicodeString hourAndDayPeriod(hourChar); + switch (metacharCount) { + case 1: + case 2: + default: + hourAndDayPeriod.append(UnicodeString(dayPeriodChar)); + break; + case 3: + case 4: + for (int32_t i = 0; i < 4; i++) { + hourAndDayPeriod.append(dayPeriodChar); + } + break; + case 5: + case 6: + for (int32_t i = 0; i < 5; i++) { + hourAndDayPeriod.append(dayPeriodChar); + } + break; + } + result.replace(metacharStart, metacharCount, hourAndDayPeriod); + } + } + return result; +} + + void U_EXPORT2 DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, UnicodeString& dateSkeleton, @@ -911,11 +1036,10 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, int32_t dCount = 0; int32_t MCount = 0; int32_t yCount = 0; - int32_t hCount = 0; - int32_t HCount = 0; int32_t mCount = 0; int32_t vCount = 0; int32_t zCount = 0; + UChar hourChar = u'\0'; int32_t i; for (i = 0; i < skeleton.length(); ++i) { @@ -956,17 +1080,14 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, normalizedDateSkeleton.append(ch); dateSkeleton.append(ch); break; - case LOW_A: - // 'a' is implicitly handled - timeSkeleton.append(ch); - break; case LOW_H: - timeSkeleton.append(ch); - ++hCount; - break; case CAP_H: + case LOW_K: + case CAP_K: timeSkeleton.append(ch); - ++HCount; + if (hourChar == u'\0') { + hourChar = ch; + } break; case LOW_M: timeSkeleton.append(ch); @@ -980,14 +1101,15 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, ++vCount; timeSkeleton.append(ch); break; + case LOW_A: case CAP_V: case CAP_Z: - case LOW_K: - case CAP_K: case LOW_J: case LOW_S: case CAP_S: case CAP_A: + case LOW_B: + case CAP_B: timeSkeleton.append(ch); normalizedTimeSkeleton.append(ch); break; @@ -1023,11 +1145,8 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, } /* generate normalized form for time */ - if ( HCount != 0 ) { - normalizedTimeSkeleton.append(CAP_H); - } - else if ( hCount != 0 ) { - normalizedTimeSkeleton.append(LOW_H); + if ( hourChar != u'\0' ) { + normalizedTimeSkeleton.append(hourChar); } if ( mCount != 0 ) { normalizedTimeSkeleton.append(LOW_M); @@ -1303,7 +1422,11 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, if ( field == UCAL_AM_PM ) { fInfo->getIntervalPattern(*bestSkeleton, UCAL_HOUR, pattern,status); if ( !pattern.isEmpty() ) { - setIntervalPattern(field, pattern); + UBool suppressDayPeriodField = fSkeleton.indexOf(CAP_J) != -1; + UnicodeString adjustIntervalPattern; + adjustFieldWidth(*skeleton, *bestSkeleton, pattern, differenceInfo, + suppressDayPeriodField, adjustIntervalPattern); + setIntervalPattern(field, adjustIntervalPattern); } return false; } @@ -1335,10 +1458,11 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, } } if ( !pattern.isEmpty() ) { - if ( differenceInfo != 0 ) { + UBool suppressDayPeriodField = fSkeleton.indexOf(CAP_J) != -1; + if ( differenceInfo != 0 || suppressDayPeriodField) { UnicodeString adjustIntervalPattern; adjustFieldWidth(*skeleton, *bestSkeleton, pattern, differenceInfo, - adjustIntervalPattern); + suppressDayPeriodField, adjustIntervalPattern); setIntervalPattern(field, adjustIntervalPattern); } else { setIntervalPattern(field, pattern); @@ -1425,6 +1549,7 @@ DateIntervalFormat::splitPatternInto2Part(const UnicodeString& intervalPattern) return (i - count); } +// The following is only called from fallbackFormat, i.e. within the gFormatterMutex lock void DateIntervalFormat::fallbackFormatRange( Calendar& fromCalendar, Calendar& toCalendar, @@ -1441,12 +1566,15 @@ void DateIntervalFormat::fallbackFormatRange( int32_t offsets[2]; UnicodeString patternBody = sf.getTextWithNoArguments(offsets, 2); + UErrorCode tempStatus = U_ZERO_ERROR; // for setContext, ignored // TODO(ICU-20406): Use SimpleFormatter Iterator interface when available. if (offsets[0] < offsets[1]) { firstIndex = 0; appendTo.append(patternBody.tempSubStringBetween(0, offsets[0])); fDateFormat->_format(fromCalendar, appendTo, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[0], offsets[1])); + // No capitalization for second part of interval + fDateFormat->setContext(UDISPCTX_CAPITALIZATION_NONE, tempStatus); fDateFormat->_format(toCalendar, appendTo, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[1])); } else { @@ -1454,11 +1582,14 @@ void DateIntervalFormat::fallbackFormatRange( appendTo.append(patternBody.tempSubStringBetween(0, offsets[1])); fDateFormat->_format(toCalendar, appendTo, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[1], offsets[0])); + // No capitalization for second part of interval + fDateFormat->setContext(UDISPCTX_CAPITALIZATION_NONE, tempStatus); fDateFormat->_format(fromCalendar, appendTo, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[0])); } } +// The following is only called from formatImpl, i.e. within the gFormatterMutex lock UnicodeString& DateIntervalFormat::fallbackFormat(Calendar& fromCalendar, Calendar& toCalendar, @@ -1483,6 +1614,7 @@ DateIntervalFormat::fallbackFormat(Calendar& fromCalendar, UnicodeString fullPattern; // for saving the pattern in fDateFormat fDateFormat->toPattern(fullPattern); // save current pattern, restore later + UErrorCode tempStatus = U_ZERO_ERROR; // for setContext, ignored // {0} is time range // {1} is single date portion // TODO(ICU-20406): Use SimpleFormatter Iterator interface when available. @@ -1492,6 +1624,8 @@ DateIntervalFormat::fallbackFormat(Calendar& fromCalendar, fallbackFormatRange(fromCalendar, toCalendar, appendTo, firstIndex, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[0], offsets[1])); fDateFormat->applyPattern(*fDatePattern); + // No capitalization for second portion + fDateFormat->setContext(UDISPCTX_CAPITALIZATION_NONE, tempStatus); fDateFormat->_format(fromCalendar, appendTo, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[1])); } else { @@ -1500,6 +1634,8 @@ DateIntervalFormat::fallbackFormat(Calendar& fromCalendar, fDateFormat->_format(fromCalendar, appendTo, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[1], offsets[0])); fDateFormat->applyPattern(*fTimePattern); + // No capitalization for second portion + fDateFormat->setContext(UDISPCTX_CAPITALIZATION_NONE, tempStatus); fallbackFormatRange(fromCalendar, toCalendar, appendTo, firstIndex, fphandler, status); appendTo.append(patternBody.tempSubStringBetween(offsets[0])); } @@ -1530,6 +1666,7 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, const UnicodeString& bestMatchSkeleton, const UnicodeString& bestIntervalPattern, int8_t differenceInfo, + UBool suppressDayPeriodField, UnicodeString& adjustedPtn) { adjustedPtn = bestIntervalPattern; int32_t inputSkeletonFieldWidth[] = @@ -1556,19 +1693,40 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + const int8_t PATTERN_CHAR_BASE = 0x41; + DateIntervalInfo::parseSkeleton(inputSkeleton, inputSkeletonFieldWidth); DateIntervalInfo::parseSkeleton(bestMatchSkeleton, bestMatchSkeletonFieldWidth); - if ( differenceInfo == 2 ) { - adjustedPtn.findAndReplace(UnicodeString((UChar)0x76 /* v */), - UnicodeString((UChar)0x7a /* z */)); + if (suppressDayPeriodField) { + findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString()); + findReplaceInPattern(adjustedPtn, UnicodeString(" "), UnicodeString(" ")); + adjustedPtn.trim(); } + if ( differenceInfo == 2 ) { + if (inputSkeleton.indexOf(LOW_Z) != -1) { + findReplaceInPattern(adjustedPtn, UnicodeString(LOW_V), UnicodeString(LOW_Z)); + } + if (inputSkeleton.indexOf(CAP_K) != -1) { + findReplaceInPattern(adjustedPtn, UnicodeString(LOW_H), UnicodeString(CAP_K)); + } + if (inputSkeleton.indexOf(LOW_K) != -1) { + findReplaceInPattern(adjustedPtn, UnicodeString(CAP_H), UnicodeString(LOW_K)); + } + if (inputSkeleton.indexOf(LOW_B) != -1) { + findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString(LOW_B)); + } + } + if (adjustedPtn.indexOf(LOW_A) != -1 && bestMatchSkeletonFieldWidth[LOW_A - PATTERN_CHAR_BASE] == 0) { + bestMatchSkeletonFieldWidth[LOW_A - PATTERN_CHAR_BASE] = 1; + } + if (adjustedPtn.indexOf(LOW_B) != -1 && bestMatchSkeletonFieldWidth[LOW_B - PATTERN_CHAR_BASE] == 0) { + bestMatchSkeletonFieldWidth[LOW_B - PATTERN_CHAR_BASE] = 1; + } UBool inQuote = false; UChar prevCh = 0; int32_t count = 0; - const int8_t PATTERN_CHAR_BASE = 0x41; - // loop through the pattern string character by character int32_t adjustedPtnLength = adjustedPtn.length(); int32_t i; @@ -1634,6 +1792,39 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, } } +void +DateIntervalFormat::findReplaceInPattern(UnicodeString& targetString, + const UnicodeString& strToReplace, + const UnicodeString& strToReplaceWith) { + int32_t firstQuoteIndex = targetString.indexOf(u'\''); + if (firstQuoteIndex == -1) { + targetString.findAndReplace(strToReplace, strToReplaceWith); + } else { + UnicodeString result; + UnicodeString source = targetString; + + while (firstQuoteIndex >= 0) { + int32_t secondQuoteIndex = source.indexOf(u'\'', firstQuoteIndex + 1); + if (secondQuoteIndex == -1) { + secondQuoteIndex = source.length() - 1; + } + + UnicodeString unquotedText(source, 0, firstQuoteIndex); + UnicodeString quotedText(source, firstQuoteIndex, secondQuoteIndex - firstQuoteIndex + 1); + + unquotedText.findAndReplace(strToReplace, strToReplaceWith); + result += unquotedText; + result += quotedText; + + source.remove(0, secondQuoteIndex + 1); + firstQuoteIndex = source.indexOf(u'\''); + } + source.findAndReplace(strToReplace, strToReplaceWith); + result += source; + targetString = result; + } +} + void diff --git a/intl/icu/source/i18n/dtitvinf.cpp b/intl/icu/source/i18n/dtitvinf.cpp index 25536346ec74..39fd44a392d6 100644 --- a/intl/icu/source/i18n/dtitvinf.cpp +++ b/intl/icu/source/i18n/dtitvinf.cpp @@ -339,6 +339,9 @@ struct DateIntervalInfo::DateIntervalSink : public ResourceSink { return UCAL_DATE; } else if (c0 == 'a') { return UCAL_AM_PM; + } else if (c0 == 'B') { + // TODO: Using AM/PM as a proxy for flexible day period isn't really correct, but it's close + return UCAL_AM_PM; } else if (c0 == 'h' || c0 == 'H') { return UCAL_HOUR; } else if (c0 == 'm') { @@ -594,20 +597,23 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton, const int32_t DIFFERENT_FIELD = 0x1000; const int32_t STRING_NUMERIC_DIFFERENCE = 0x100; const int32_t BASE = 0x41; - const UChar CHAR_V = 0x0076; - const UChar CHAR_Z = 0x007A; - // hack for 'v' and 'z'. - // resource bundle only have time skeletons ending with 'v', - // but not for time skeletons ending with 'z'. - UBool replaceZWithV = false; + // hack for certain alternate characters + // resource bundles only have time skeletons containing 'v', 'h', and 'H' + // but not time skeletons containing 'z', 'K', or 'k' + // the skeleton may also include 'a' or 'b', which never occur in the resource bundles, so strip them out too + UBool replacedAlternateChars = false; const UnicodeString* inputSkeleton = &skeleton; UnicodeString copySkeleton; - if ( skeleton.indexOf(CHAR_Z) != -1 ) { + if ( skeleton.indexOf(LOW_Z) != -1 || skeleton.indexOf(LOW_K) != -1 || skeleton.indexOf(CAP_K) != -1 || skeleton.indexOf(LOW_A) != -1 || skeleton.indexOf(LOW_B) != -1 ) { copySkeleton = skeleton; - copySkeleton.findAndReplace(UnicodeString(CHAR_Z), UnicodeString(CHAR_V)); + copySkeleton.findAndReplace(UnicodeString(LOW_Z), UnicodeString(LOW_V)); + copySkeleton.findAndReplace(UnicodeString(LOW_K), UnicodeString(CAP_H)); + copySkeleton.findAndReplace(UnicodeString(CAP_K), UnicodeString(LOW_H)); + copySkeleton.findAndReplace(UnicodeString(LOW_A), UnicodeString()); + copySkeleton.findAndReplace(UnicodeString(LOW_B), UnicodeString()); inputSkeleton = ©Skeleton; - replaceZWithV = true; + replacedAlternateChars = true; } parseSkeleton(*inputSkeleton, inputSkeletonFieldWidth); @@ -616,7 +622,7 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton, // 0 means exact the same skeletons; // 1 means having the same field, but with different length, - // 2 means only z/v differs + // 2 means only z/v, h/K, or H/k differs // -1 means having different field. bestMatchDistanceInfo = 0; int8_t fieldLength = UPRV_LENGTHOF(skeletonFieldWidth); @@ -672,7 +678,7 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton, break; } } - if ( replaceZWithV && bestMatchDistanceInfo != -1 ) { + if ( replacedAlternateChars && bestMatchDistanceInfo != -1 ) { bestMatchDistanceInfo = 2; } return bestSkeleton; diff --git a/intl/icu/source/i18n/dtptngen.cpp b/intl/icu/source/i18n/dtptngen.cpp index 9315bd05ff6f..6fd44bdfc112 100644 --- a/intl/icu/source/i18n/dtptngen.cpp +++ b/intl/icu/source/i18n/dtptngen.cpp @@ -311,6 +311,16 @@ DateTimePatternGenerator::createInstance(const Locale& locale, UErrorCode& statu return U_SUCCESS(status) ? result.orphan() : nullptr; } +DateTimePatternGenerator* U_EXPORT2 +DateTimePatternGenerator::createInstanceNoStdPat(const Locale& locale, UErrorCode& status) { + if (U_FAILURE(status)) { + return nullptr; + } + LocalPointer result( + new DateTimePatternGenerator(locale, status, true), status); + return U_SUCCESS(status) ? result.orphan() : nullptr; +} + DateTimePatternGenerator* U_EXPORT2 DateTimePatternGenerator::createEmptyInstance(UErrorCode& status) { if (U_FAILURE(status)) { @@ -336,7 +346,7 @@ DateTimePatternGenerator::DateTimePatternGenerator(UErrorCode &status) : } } -DateTimePatternGenerator::DateTimePatternGenerator(const Locale& locale, UErrorCode &status) : +DateTimePatternGenerator::DateTimePatternGenerator(const Locale& locale, UErrorCode &status, UBool skipStdPatterns) : skipMatcher(nullptr), fAvailableFormatKeyHash(nullptr), fDefaultHourFormatChar(0), @@ -350,7 +360,7 @@ DateTimePatternGenerator::DateTimePatternGenerator(const Locale& locale, UErrorC internalErrorCode = status = U_MEMORY_ALLOCATION_ERROR; } else { - initData(locale, status); + initData(locale, status, skipStdPatterns); } } @@ -489,13 +499,15 @@ enum AllowedHourFormat{ } // namespace void -DateTimePatternGenerator::initData(const Locale& locale, UErrorCode &status) { +DateTimePatternGenerator::initData(const Locale& locale, UErrorCode &status, UBool skipStdPatterns) { //const char *baseLangName = locale.getBaseName(); // unused skipMatcher = nullptr; fAvailableFormatKeyHash=nullptr; addCanonicalItems(status); - addICUPatterns(locale, status); + if (!skipStdPatterns) { // skip to prevent circular dependency when called from SimpleDateFormat::construct + addICUPatterns(locale, status); + } addCLDRData(locale, status); setDateTimeFromCalendar(locale, status); setDecimalSymbols(locale, status); @@ -893,7 +905,7 @@ DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, CharString& err = localStatus; return; } - if (calendarTypeLen < ULOC_KEYWORDS_CAPACITY) { + if (calendarTypeLen > 0 && calendarTypeLen < ULOC_KEYWORDS_CAPACITY) { destination.clear().append(calendarType, -1, err); if (U_FAILURE(err)) { return; } } diff --git a/intl/icu/source/i18n/dtptngen_impl.h b/intl/icu/source/i18n/dtptngen_impl.h index ade9f57331e7..9b9442d57871 100644 --- a/intl/icu/source/i18n/dtptngen_impl.h +++ b/intl/icu/source/i18n/dtptngen_impl.h @@ -195,7 +195,7 @@ public: void getQuoteLiteral(UnicodeString& quote, int32_t *itemIndex); UBool isPatternSeparator(const UnicodeString& field) const; static UBool isQuoteLiteral(const UnicodeString& s); - static int32_t getCanonicalIndex(const UnicodeString& s) { return getCanonicalIndex(s, TRUE); } + static int32_t getCanonicalIndex(const UnicodeString& s) { return getCanonicalIndex(s, true); } static int32_t getCanonicalIndex(const UnicodeString& s, UBool strict); private: diff --git a/intl/icu/source/i18n/fmtable.cpp b/intl/icu/source/i18n/fmtable.cpp index dbfd3c26bad8..ea27246f16e4 100644 --- a/intl/icu/source/i18n/fmtable.cpp +++ b/intl/icu/source/i18n/fmtable.cpp @@ -895,7 +895,7 @@ U_NAMESPACE_END U_NAMESPACE_USE -U_DRAFT UFormattable* U_EXPORT2 +U_CAPI UFormattable* U_EXPORT2 ufmt_open(UErrorCode *status) { if( U_FAILURE(*status) ) { return NULL; @@ -908,14 +908,14 @@ ufmt_open(UErrorCode *status) { return fmt; } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 ufmt_close(UFormattable *fmt) { Formattable *obj = Formattable::fromUFormattable(fmt); delete obj; } -U_INTERNAL UFormattableType U_EXPORT2 +U_CAPI UFormattableType U_EXPORT2 ufmt_getType(const UFormattable *fmt, UErrorCode *status) { if(U_FAILURE(*status)) { return (UFormattableType)UFMT_COUNT; @@ -925,27 +925,27 @@ ufmt_getType(const UFormattable *fmt, UErrorCode *status) { } -U_INTERNAL UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ufmt_isNumeric(const UFormattable *fmt) { const Formattable *obj = Formattable::fromUFormattable(fmt); return obj->isNumeric(); } -U_DRAFT UDate U_EXPORT2 +U_CAPI UDate U_EXPORT2 ufmt_getDate(const UFormattable *fmt, UErrorCode *status) { const Formattable *obj = Formattable::fromUFormattable(fmt); return obj->getDate(*status); } -U_DRAFT double U_EXPORT2 +U_CAPI double U_EXPORT2 ufmt_getDouble(UFormattable *fmt, UErrorCode *status) { Formattable *obj = Formattable::fromUFormattable(fmt); return obj->getDouble(*status); } -U_DRAFT int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ufmt_getLong(UFormattable *fmt, UErrorCode *status) { Formattable *obj = Formattable::fromUFormattable(fmt); @@ -953,7 +953,7 @@ ufmt_getLong(UFormattable *fmt, UErrorCode *status) { } -U_DRAFT const void *U_EXPORT2 +U_CAPI const void *U_EXPORT2 ufmt_getObject(const UFormattable *fmt, UErrorCode *status) { const Formattable *obj = Formattable::fromUFormattable(fmt); @@ -966,7 +966,7 @@ ufmt_getObject(const UFormattable *fmt, UErrorCode *status) { return ret; } -U_DRAFT const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ufmt_getUChars(UFormattable *fmt, int32_t *len, UErrorCode *status) { Formattable *obj = Formattable::fromUFormattable(fmt); @@ -986,7 +986,7 @@ ufmt_getUChars(UFormattable *fmt, int32_t *len, UErrorCode *status) { return str.getTerminatedBuffer(); } -U_DRAFT int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status) { const Formattable *obj = Formattable::fromUFormattable(fmt); @@ -995,7 +995,7 @@ ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status) { return count; } -U_DRAFT UFormattable * U_EXPORT2 +U_CAPI UFormattable * U_EXPORT2 ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status) { Formattable *obj = Formattable::fromUFormattable(fmt); int32_t count; @@ -1010,7 +1010,7 @@ ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status) { } } -U_DRAFT const char * U_EXPORT2 +U_CAPI const char * U_EXPORT2 ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status) { if(U_FAILURE(*status)) { return ""; @@ -1031,7 +1031,7 @@ ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status) { } } -U_DRAFT int64_t U_EXPORT2 +U_CAPI int64_t U_EXPORT2 ufmt_getInt64(UFormattable *fmt, UErrorCode *status) { Formattable *obj = Formattable::fromUFormattable(fmt); return obj->getInt64(*status); diff --git a/intl/icu/source/i18n/fmtable_cnv.cpp b/intl/icu/source/i18n/fmtable_cnv.cpp index 9a647927797d..bc3847b6963e 100644 --- a/intl/icu/source/i18n/fmtable_cnv.cpp +++ b/intl/icu/source/i18n/fmtable_cnv.cpp @@ -30,8 +30,6 @@ U_NAMESPACE_BEGIN // ------------------------------------- // Creates a formattable object with a char* string. // This API is useless. The API that takes a UnicodeString is actually just as good. -// This is just a grandfathered API. - Formattable::Formattable(const char* stringToCopy) { init(); diff --git a/intl/icu/source/i18n/format.cpp b/intl/icu/source/i18n/format.cpp index e5abbe9eb0fa..a010defff93c 100644 --- a/intl/icu/source/i18n/format.cpp +++ b/intl/icu/source/i18n/format.cpp @@ -26,7 +26,7 @@ #include "unicode/utypes.h" #ifndef U_I18N_IMPLEMENTATION -#error U_I18N_IMPLEMENTATION not set - must be set for all ICU source files in i18n/ - see http://userguide.icu-project.org/howtouseicu +#error U_I18N_IMPLEMENTATION not set - must be set for all ICU source files in i18n/ - see https://unicode-org.github.io/icu/userguide/howtouseicu #endif /* diff --git a/intl/icu/source/i18n/formatted_string_builder.cpp b/intl/icu/source/i18n/formatted_string_builder.cpp index 5aabc31cc439..b370f14f2ac4 100644 --- a/intl/icu/source/i18n/formatted_string_builder.cpp +++ b/intl/icu/source/i18n/formatted_string_builder.cpp @@ -276,6 +276,11 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co char16_t *oldChars = getCharPtr(); Field *oldFields = getFieldPtr(); if (fLength + count > oldCapacity) { + if ((fLength + count) > INT32_MAX / 2) { + // If we continue, then newCapacity will overlow int32_t in the next line. + status = U_INPUT_TOO_LONG_ERROR; + return -1; + } int32_t newCapacity = (fLength + count) * 2; int32_t newZero = newCapacity / 2 - (fLength + count) / 2; @@ -330,12 +335,14 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co fZero = newZero; fLength += count; } + U_ASSERT((fZero + index) >= 0); return fZero + index; } int32_t FormattedStringBuilder::remove(int32_t index, int32_t count) { // TODO: Reset the heap here? (If the string after removal can fit on stack?) int32_t position = index + fZero; + U_ASSERT(position >= 0); uprv_memmove2(getCharPtr() + position, getCharPtr() + position + count, sizeof(char16_t) * (fLength - index - count)); diff --git a/intl/icu/source/i18n/formatted_string_builder.h b/intl/icu/source/i18n/formatted_string_builder.h index 4567dc1d66b0..92bcf07d782c 100644 --- a/intl/icu/source/i18n/formatted_string_builder.h +++ b/intl/icu/source/i18n/formatted_string_builder.h @@ -25,7 +25,7 @@ class FormattedValueStringBuilderImpl; * *

      *
    1. Efficient prepend as well as append. - *
    2. Keeps tracks of Fields in an efficient manner. + *
    3. Keeps track of Fields in an efficient manner. *
    * * See also FormattedValueStringBuilderImpl. @@ -55,7 +55,6 @@ class U_I18N_API FormattedStringBuilder : public UMemory { // Convention: bottom 4 bits for field, top 4 bits for field category. // Field category 0 implies the number category so that the number field // literals can be directly passed as a Field type. - // See the helper functions in "StringBuilderFieldUtils" below. // Exported as U_I18N_API so it can be used by other exports on Windows. struct U_I18N_API Field { uint8_t bits; diff --git a/intl/icu/source/i18n/formattedval_impl.h b/intl/icu/source/i18n/formattedval_impl.h index 7bee37428694..c0dec83ba1eb 100644 --- a/intl/icu/source/i18n/formattedval_impl.h +++ b/intl/icu/source/i18n/formattedval_impl.h @@ -69,6 +69,9 @@ U_NAMESPACE_BEGIN /** * Implementation of FormattedValue using FieldPositionHandler to accept fields. + * + * TODO(ICU-20897): This class is unused. If it is not needed when fixing ICU-20897, + * it should be deleted. */ class FormattedValueFieldPositionIteratorImpl : public UMemory, public FormattedValue { public: @@ -114,6 +117,24 @@ private: }; +// Internal struct that must be exported for MSVC +struct U_I18N_API SpanInfo { + int32_t spanValue; + int32_t length; +}; + +// Export an explicit template instantiation of the MaybeStackArray that +// is used as a data member of CEBuffer. +// +// When building DLLs for Windows this is required even though +// no direct access to the MaybeStackArray leaks out of the i18n library. +// +// See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples. +// +#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN +template class U_I18N_API MaybeStackArray; +#endif + /** * Implementation of FormattedValue based on FormattedStringBuilder. * @@ -147,12 +168,23 @@ public: return fString; } + /** + * Adds additional metadata used for span fields. + * + * spanValue: the index of the list item, for example. + * length: the length of the span, used to split adjacent fields. + */ + void appendSpanInfo(int32_t spanValue, int32_t length, UErrorCode& status); + void prependSpanInfo(int32_t spanValue, int32_t length, UErrorCode& status); + private: FormattedStringBuilder fString; FormattedStringBuilder::Field fNumericField; + MaybeStackArray spanIndices; bool nextPositionImpl(ConstrainedFieldPosition& cfpos, FormattedStringBuilder::Field numericField, UErrorCode& status) const; static bool isIntOrGroup(FormattedStringBuilder::Field field); + static bool isTrimmable(FormattedStringBuilder::Field field); int32_t trimBack(int32_t limit) const; int32_t trimFront(int32_t start) const; }; @@ -211,7 +243,7 @@ struct UFormattedValueImpl : public UMemory, public UFormattedValueApiHelper { return fData->appendTo(appendable, status); \ } \ UBool Name::nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const { \ - UPRV_FORMATTED_VALUE_METHOD_GUARD(FALSE) \ + UPRV_FORMATTED_VALUE_METHOD_GUARD(false) \ return fData->nextPosition(cfpos, status); \ } @@ -230,7 +262,7 @@ struct UFormattedValueImpl : public UMemory, public UFormattedValueApiHelper { } \ return static_cast(impl)->exportForC(); \ } \ - U_DRAFT const UFormattedValue* U_EXPORT2 \ + U_CAPI const UFormattedValue* U_EXPORT2 \ Prefix ## _resultAsValue (const CType* uresult, UErrorCode* ec) { \ const ImplType* result = HelperType::validate(uresult, *ec); \ if (U_FAILURE(*ec)) { return nullptr; } \ diff --git a/intl/icu/source/i18n/formattedval_sbimpl.cpp b/intl/icu/source/i18n/formattedval_sbimpl.cpp index dfe3af6686df..84c2d00666c2 100644 --- a/intl/icu/source/i18n/formattedval_sbimpl.cpp +++ b/intl/icu/source/i18n/formattedval_sbimpl.cpp @@ -15,6 +15,7 @@ #include "formatted_string_builder.h" #include "number_utils.h" #include "static_unicode_sets.h" +#include "unicode/listformatter.h" U_NAMESPACE_BEGIN @@ -45,19 +46,19 @@ Appendable& FormattedValueStringBuilderImpl::appendTo(Appendable& appendable, UE UBool FormattedValueStringBuilderImpl::nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const { // NOTE: MSVC sometimes complains when implicitly converting between bool and UBool - return nextPositionImpl(cfpos, fNumericField, status) ? TRUE : FALSE; + return nextPositionImpl(cfpos, fNumericField, status) ? true : false; } UBool FormattedValueStringBuilderImpl::nextFieldPosition(FieldPosition& fp, UErrorCode& status) const { int32_t rawField = fp.getField(); if (rawField == FieldPosition::DONT_CARE) { - return FALSE; + return false; } if (rawField < 0 || rawField >= UNUM_FIELD_COUNT) { status = U_ILLEGAL_ARGUMENT_ERROR; - return FALSE; + return false; } ConstrainedFieldPosition cfpos; @@ -66,7 +67,7 @@ UBool FormattedValueStringBuilderImpl::nextFieldPosition(FieldPosition& fp, UErr if (nextPositionImpl(cfpos, kUndefinedField, status)) { fp.setBeginIndex(cfpos.getStart()); fp.setEndIndex(cfpos.getLimit()); - return TRUE; + return true; } // Special case: fraction should start after integer if fraction is not present @@ -84,7 +85,7 @@ UBool FormattedValueStringBuilderImpl::nextFieldPosition(FieldPosition& fp, UErr fp.setEndIndex(i - fString.fZero); } - return FALSE; + return false; } void FormattedValueStringBuilderImpl::getAllFieldPositions(FieldPositionIteratorHandler& fpih, @@ -109,7 +110,7 @@ bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& if (currField != _field) { int32_t end = i - fString.fZero; // Grouping separators can be whitespace; don't throw them out! - if (currField != Field(UFIELD_CATEGORY_NUMBER, UNUM_GROUPING_SEPARATOR_FIELD)) { + if (isTrimmable(currField)) { end = trimBack(i - fString.fZero); } if (end <= fieldStart) { @@ -120,7 +121,7 @@ bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& continue; } int32_t start = fieldStart; - if (currField != Field(UFIELD_CATEGORY_NUMBER, UNUM_GROUPING_SEPARATOR_FIELD)) { + if (isTrimmable(currField)) { start = trimFront(start); } cfpos.setState(currField.getCategory(), currField.getField(), start, end); @@ -154,7 +155,8 @@ bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& || cfpos.getField() != numericField.getField()) && fString.getFieldPtr()[i - 1].isNumeric() && !_field.isNumeric()) { - int j = i - 1; + // Re-wind to the beginning of the field and then emit it + int32_t j = i - 1; for (; j >= fString.fZero && fString.getFieldPtr()[j].isNumeric(); j--) {} cfpos.setState( numericField.getCategory(), @@ -163,6 +165,21 @@ bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& i - fString.fZero); return true; } + // Special case: emit normalField if we are pointing at the end of spanField. + if (i > fString.fZero) { + auto elementField = fString.getFieldPtr()[i-1]; + if (elementField == Field(UFIELD_CATEGORY_LIST, ULISTFMT_ELEMENT_FIELD) + && cfpos.matchesField(elementField.getCategory(), elementField.getField()) + && (cfpos.getLimit() < i - fString.fZero || cfpos.getCategory() != elementField.getCategory())) { + int64_t si = cfpos.getInt64IterationContext() - 1; + cfpos.setState( + elementField.getCategory(), + elementField.getField(), + i - fString.fZero - spanIndices[si].length, + i - fString.fZero); + return true; + } + } // Special case: skip over INTEGER; will be coalesced later. if (_field == Field(UFIELD_CATEGORY_NUMBER, UNUM_INTEGER_FIELD)) { _field = kUndefinedField; @@ -172,6 +189,29 @@ bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& continue; } // Case 3: check for field starting at this position + // Case 3a: Need to add a SpanField + if (_field == Field(UFIELD_CATEGORY_LIST, ULISTFMT_ELEMENT_FIELD)) { + int64_t si = cfpos.getInt64IterationContext(); + int32_t spanValue = spanIndices[si].spanValue; + int32_t length = spanIndices[si].length; + cfpos.setInt64IterationContext(si + 1); + if (cfpos.matchesField(UFIELD_CATEGORY_LIST_SPAN, spanValue)) { + UFieldCategory spanCategory = UFIELD_CATEGORY_LIST_SPAN; + fieldStart = i - fString.fZero; + int32_t end = fieldStart + length; + cfpos.setState( + spanCategory, + spanValue, + fieldStart, + end); + return true; + } else { + // Failed to match; jump ahead + i += length - 1; + continue; + } + } + // Case 3b: No SpanField if (cfpos.matchesField(_field.getCategory(), _field.getField())) { fieldStart = i - fString.fZero; currField = _field; @@ -179,14 +219,52 @@ bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& } U_ASSERT(currField == kUndefinedField); + // Always set the position to the end so that we don't revisit previous sections + cfpos.setState( + cfpos.getCategory(), + cfpos.getField(), + fString.fLength, + fString.fLength); return false; } +void FormattedValueStringBuilderImpl::appendSpanInfo(int32_t spanValue, int32_t length, UErrorCode& status) { + if (U_FAILURE(status)) { return; } + U_ASSERT(spanIndices.getCapacity() >= spanValue); + if (spanIndices.getCapacity() == spanValue) { + if (!spanIndices.resize(spanValue * 2, spanValue)) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + } + spanIndices[spanValue] = {spanValue, length}; +} + +void FormattedValueStringBuilderImpl::prependSpanInfo(int32_t spanValue, int32_t length, UErrorCode& status) { + if (U_FAILURE(status)) { return; } + U_ASSERT(spanIndices.getCapacity() >= spanValue); + if (spanIndices.getCapacity() == spanValue) { + if (!spanIndices.resize(spanValue * 2, spanValue)) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + } + for (int32_t i = spanValue - 1; i >= 0; i--) { + spanIndices[i+1] = spanIndices[i]; + } + spanIndices[0] = {spanValue, length}; +} + bool FormattedValueStringBuilderImpl::isIntOrGroup(Field field) { return field == Field(UFIELD_CATEGORY_NUMBER, UNUM_INTEGER_FIELD) || field == Field(UFIELD_CATEGORY_NUMBER, UNUM_GROUPING_SEPARATOR_FIELD); } +bool FormattedValueStringBuilderImpl::isTrimmable(Field field) { + return field != Field(UFIELD_CATEGORY_NUMBER, UNUM_GROUPING_SEPARATOR_FIELD) + && field.getCategory() != UFIELD_CATEGORY_LIST; +} + int32_t FormattedValueStringBuilderImpl::trimBack(int32_t limit) const { return unisets::get(unisets::DEFAULT_IGNORABLES)->spanBack( fString.getCharPtr() + fString.fZero, diff --git a/intl/icu/source/i18n/formattedvalue.cpp b/intl/icu/source/i18n/formattedvalue.cpp index e2c9c42fc88a..79ecf0a841cf 100644 --- a/intl/icu/source/i18n/formattedvalue.cpp +++ b/intl/icu/source/i18n/formattedvalue.cpp @@ -193,7 +193,7 @@ ucfpos_close(UConstrainedFieldPosition* ptr) { } -U_DRAFT const UChar* U_EXPORT2 +U_CAPI const UChar* U_EXPORT2 ufmtval_getString( const UFormattedValue* ufmtval, int32_t* pLength, @@ -213,7 +213,7 @@ ufmtval_getString( } -U_DRAFT UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ufmtval_nextPosition( const UFormattedValue* ufmtval, UConstrainedFieldPosition* ucfpos, diff --git a/intl/icu/source/i18n/fphdlimp.h b/intl/icu/source/i18n/fphdlimp.h index b9fa9b218149..4fb0c7b6fe68 100644 --- a/intl/icu/source/i18n/fphdlimp.h +++ b/intl/icu/source/i18n/fphdlimp.h @@ -41,8 +41,8 @@ class U_I18N_API FieldPositionHandler: public UMemory { class FieldPositionOnlyHandler : public FieldPositionHandler { FieldPosition& pos; - UBool acceptFirstOnly = FALSE; - UBool seenFirst = FALSE; + UBool acceptFirstOnly = false; + UBool seenFirst = false; public: FieldPositionOnlyHandler(FieldPosition& pos); diff --git a/intl/icu/source/i18n/gregocal.cpp b/intl/icu/source/i18n/gregocal.cpp index 6b15171c12b9..7ca58268456e 100644 --- a/intl/icu/source/i18n/gregocal.cpp +++ b/intl/icu/source/i18n/gregocal.cpp @@ -185,7 +185,7 @@ fIsGregorian(TRUE), fInvertGregorian(FALSE) // ------------------------------------- GregorianCalendar::GregorianCalendar(const Locale& aLocale, UErrorCode& status) -: Calendar(TimeZone::createDefault(), aLocale, status), +: Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, status), fGregorianCutover(kPapalCutover), fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582), fIsGregorian(TRUE), fInvertGregorian(FALSE) diff --git a/intl/icu/source/i18n/gregoimp.h b/intl/icu/source/i18n/gregoimp.h index 06eb32384511..aec33c48c802 100644 --- a/intl/icu/source/i18n/gregoimp.h +++ b/intl/icu/source/i18n/gregoimp.h @@ -148,9 +148,9 @@ class ClockMath { class Grego { public: /** - * Return TRUE if the given year is a leap year. + * Return true if the given year is a leap year. * @param year Gregorian year, with 0 == 1 BCE, -1 == 2 BCE, etc. - * @return TRUE if the year is a leap year + * @return true if the year is a leap year */ static inline UBool isLeapYear(int32_t year); diff --git a/intl/icu/source/i18n/hebrwcal.cpp b/intl/icu/source/i18n/hebrwcal.cpp index c8fb8a167958..4d8e59cef95a 100644 --- a/intl/icu/source/i18n/hebrwcal.cpp +++ b/intl/icu/source/i18n/hebrwcal.cpp @@ -155,7 +155,7 @@ U_NAMESPACE_BEGIN * @internal */ HebrewCalendar::HebrewCalendar(const Locale& aLocale, UErrorCode& success) -: Calendar(TimeZone::createDefault(), aLocale, success) +: Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success) { setTimeInMillis(getNow(), success); // Call this again now that the vtable is set up properly. @@ -393,7 +393,8 @@ int32_t HebrewCalendar::startOfYear(int32_t year, UErrorCode &status) int32_t day = CalendarCache::get(&gCache, year, status); if (day == 0) { - int32_t months = (235 * year - 234) / 19; // # of months before year + // # of months before year + int32_t months = (int32_t)ClockMath::floorDivide((235 * (int64_t)year - 234), (int64_t)19); int64_t frac = (int64_t)months * MONTH_FRACT + BAHARAD; // Fractional part of day # day = months * 29 + (int32_t)(frac / DAY_PARTS); // Whole # part of calculation @@ -566,8 +567,8 @@ void HebrewCalendar::validateField(UCalendarDateFields field, UErrorCode &status */ void HebrewCalendar::handleComputeFields(int32_t julianDay, UErrorCode &status) { int32_t d = julianDay - 347997; - double m = ((d * (double)DAY_PARTS)/ (double) MONTH_PARTS); // Months (approx) - int32_t year = (int32_t)( ((19. * m + 234.) / 235.) + 1.); // Years (approx) + double m = ClockMath::floorDivide((d * (double)DAY_PARTS), (double) MONTH_PARTS); // Months (approx) + int32_t year = (int32_t)(ClockMath::floorDivide((19. * m + 234.), 235.) + 1.); // Years (approx) int32_t ys = startOfYear(year, status); // 1st day of year int32_t dayOfYear = (d - ys); diff --git a/intl/icu/source/i18n/hebrwcal.h b/intl/icu/source/i18n/hebrwcal.h index 08136de32a93..d27e6b879d61 100644 --- a/intl/icu/source/i18n/hebrwcal.h +++ b/intl/icu/source/i18n/hebrwcal.h @@ -386,7 +386,7 @@ public: virtual UBool inDaylightTime(UErrorCode& status) const; /** - * Returns TRUE because the Hebrew Calendar does have a default century + * Returns true because the Hebrew Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/i18n.vcxproj b/intl/icu/source/i18n/i18n.vcxproj index e009e214122f..218772f99742 100644 --- a/intl/icu/source/i18n/i18n.vcxproj +++ b/intl/icu/source/i18n/i18n.vcxproj @@ -16,22 +16,6 @@ - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 @@ -76,7 +60,7 @@ icuucd.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuin67d.dll + ..\..\$(IcuBinOutputDir)\icuin68d.dll .\..\..\$(IcuLibOutputDir)\icuind.pdb ..\..\$(IcuLibOutputDir)\icuind.lib @@ -89,7 +73,7 @@ icuuc.lib;%(AdditionalDependencies) - ..\..\$(IcuBinOutputDir)\icuin67.dll + ..\..\$(IcuBinOutputDir)\icuin68.dll .\..\..\$(IcuLibOutputDir)\icuin.pdb ..\..\$(IcuLibOutputDir)\icuin.lib @@ -193,7 +177,6 @@ - @@ -213,11 +196,13 @@ + + @@ -229,12 +214,14 @@ + + @@ -266,6 +253,10 @@ + + + + @@ -401,6 +392,7 @@ + @@ -481,12 +473,14 @@ + + @@ -500,6 +494,10 @@ + + + + diff --git a/intl/icu/source/i18n/i18n.vcxproj.filters b/intl/icu/source/i18n/i18n.vcxproj.filters index 50a06ee014e7..2fc88e060616 100644 --- a/intl/icu/source/i18n/i18n.vcxproj.filters +++ b/intl/icu/source/i18n/i18n.vcxproj.filters @@ -234,6 +234,9 @@ formatting + + formatting + formatting @@ -531,9 +534,6 @@ formatting - - misc - formatting @@ -591,6 +591,9 @@ formatting + + formatting + formatting @@ -606,6 +609,9 @@ formatting + + formatting + formatting @@ -639,6 +645,9 @@ formatting + + formatting + formatting @@ -651,6 +660,18 @@ formatting + + formatting + + + formatting + + + formatting + + + formatting + @@ -902,6 +923,9 @@ formatting + + formatting + formatting @@ -917,6 +941,9 @@ formatting + + formatting + formatting @@ -959,6 +986,9 @@ formatting + + formatting + formatting @@ -995,6 +1025,18 @@ formatting + + formatting + + + formatting + + + formatting + + + formatting + formatting @@ -1235,4 +1277,4 @@ misc - \ No newline at end of file + diff --git a/intl/icu/source/i18n/i18n_uwp.vcxproj b/intl/icu/source/i18n/i18n_uwp.vcxproj index b4fd2459d95e..f836aeb07263 100644 --- a/intl/icu/source/i18n/i18n_uwp.vcxproj +++ b/intl/icu/source/i18n/i18n_uwp.vcxproj @@ -52,10 +52,6 @@ - - - - <_ProjectFileVersion>10.0.30319.1 @@ -190,7 +186,7 @@ .\x86\ReleaseUWP/ - ..\..\bin32uwp\icuin67.dll + ..\..\bin32uwp\icuin68.dll .\..\..\lib32uwp\icuin.pdb ..\..\lib32uwp\icuin.lib ..\..\lib32uwp\icuuc.lib;%(AdditionalDependencies) @@ -207,7 +203,7 @@ .\x86\DebugUWP/ - ..\..\bin32uwp\icuin67d.dll + ..\..\bin32uwp\icuin68d.dll .\..\..\lib32uwp\icuind.pdb ..\..\lib32uwp\icuind.lib ..\..\lib32uwp\icuucd.lib;%(AdditionalDependencies) @@ -224,7 +220,7 @@ .\x64\ReleaseUWP/ - ..\..\bin64uwp\icuin67.dll + ..\..\bin64uwp\icuin68.dll .\..\..\lib64uwp\icuin.pdb ..\..\lib64uwp\icuin.lib ..\..\lib64uwp\icuuc.lib;%(AdditionalDependencies) @@ -241,7 +237,7 @@ .\x64\DebugUWP/ - ..\..\bin64uwp\icuin67d.dll + ..\..\bin64uwp\icuin68d.dll .\..\..\lib64uwp\icuind.pdb ..\..\lib64uwp\icuind.lib ..\..\lib64uwp\icuucd.lib;%(AdditionalDependencies) @@ -258,7 +254,7 @@ .\ARM\ReleaseUWP/ - ..\..\binARMuwp\icuin67.dll + ..\..\binARMuwp\icuin68.dll .\..\..\libARMuwp\icuin.pdb ..\..\libARMuwp\icuin.lib ..\..\libARMuwp\icuuc.lib;%(AdditionalDependencies) @@ -275,7 +271,7 @@ .\ARM\DebugUWP/ - ..\..\binARMuwp\icuin67d.dll + ..\..\binARMuwp\icuin68d.dll .\..\..\libARMuwp\icuind.pdb ..\..\libARMuwp\icuind.lib ..\..\libARMuwp\icuucd.lib;%(AdditionalDependencies) @@ -292,7 +288,7 @@ .\ARM64\ReleaseUWP/ - ..\..\binARM64uwp\icuin67.dll + ..\..\binARM64uwp\icuin68.dll .\..\..\libARM64uwp\icuin.pdb ..\..\libARM64uwp\icuin.lib ..\..\libARM64uwp\icuuc.lib;%(AdditionalDependencies) @@ -309,7 +305,7 @@ .\ARM64\DebugUWP/ - ..\..\binARM64uwp\icuin67d.dll + ..\..\binARM64uwp\icuin68d.dll .\..\..\libARM64uwp\icuind.pdb ..\..\libARM64uwp\icuind.lib ..\..\libARM64uwp\icuucd.lib;%(AdditionalDependencies) @@ -414,7 +410,6 @@ - @@ -434,11 +429,13 @@ + + @@ -450,12 +447,14 @@ + + @@ -485,6 +484,10 @@ + + + + @@ -620,6 +623,7 @@ + @@ -700,12 +704,14 @@ + + @@ -719,6 +725,10 @@ + + + + @@ -729,4 +739,4 @@ - \ No newline at end of file + diff --git a/intl/icu/source/i18n/indiancal.cpp b/intl/icu/source/i18n/indiancal.cpp index f1ab853b948c..9d9df58f13d1 100644 --- a/intl/icu/source/i18n/indiancal.cpp +++ b/intl/icu/source/i18n/indiancal.cpp @@ -40,7 +40,7 @@ IndianCalendar* IndianCalendar::clone() const { } IndianCalendar::IndianCalendar(const Locale& aLocale, UErrorCode& success) - : Calendar(TimeZone::createDefault(), aLocale, success) + : Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success) { setTimeInMillis(getNow(), success); // Call this again now that the vtable is set up properly. } @@ -83,7 +83,6 @@ static const int32_t LIMITS[UCAL_FIELD_COUNT][4] = { {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // IS_LEAP_MONTH }; -static const double JULIAN_EPOCH = 1721425.5; static const int32_t INDIAN_ERA_START = 78; static const int32_t INDIAN_YEAR_START = 80; @@ -96,7 +95,7 @@ int32_t IndianCalendar::handleGetLimit(UCalendarDateFields field, ELimitType lim */ static UBool isGregorianLeap(int32_t year) { - return ((year % 4) == 0) && (!(((year % 100) == 0) && ((year % 400) != 0))); + return Grego::isLeapYear(year); } //---------------------------------------------------------------------- @@ -137,56 +136,22 @@ int32_t IndianCalendar::handleGetYearLength(int32_t eyear) const { * Returns the Julian Day corresponding to gregorian date * * @param year The Gregorian year - * @param month The month in Gregorian Year + * @param month The month in Gregorian Year, 0 based. * @param date The date in Gregorian day in month */ static double gregorianToJD(int32_t year, int32_t month, int32_t date) { - double julianDay = (JULIAN_EPOCH - 1) + - (365 * (year - 1)) + - uprv_floor((year - 1) / 4) + - (-uprv_floor((year - 1) / 100)) + - uprv_floor((year - 1) / 400) + - uprv_floor((((367 * month) - 362) / 12) + - ((month <= 2) ? 0 : - (isGregorianLeap(year) ? -1 : -2) - ) + - date); - - return julianDay; + return Grego::fieldsToDay(year, month, date) + kEpochStartAsJulianDay - 0.5; } /* * Returns the Gregorian Date corresponding to a given Julian Day + * Month is 0 based. * @param jd The Julian Day */ static int32_t* jdToGregorian(double jd, int32_t gregorianDate[3]) { - double wjd, depoch, quadricent, dqc, cent, dcent, quad, dquad, yindex, yearday, leapadj; - int32_t year, month, day; - wjd = uprv_floor(jd - 0.5) + 0.5; - depoch = wjd - JULIAN_EPOCH; - quadricent = uprv_floor(depoch / 146097); - dqc = (int32_t)uprv_floor(depoch) % 146097; - cent = uprv_floor(dqc / 36524); - dcent = (int32_t)uprv_floor(dqc) % 36524; - quad = uprv_floor(dcent / 1461); - dquad = (int32_t)uprv_floor(dcent) % 1461; - yindex = uprv_floor(dquad / 365); - year = (int32_t)((quadricent * 400) + (cent * 100) + (quad * 4) + yindex); - if (!((cent == 4) || (yindex == 4))) { - year++; - } - yearday = wjd - gregorianToJD(year, 1, 1); - leapadj = ((wjd < gregorianToJD(year, 3, 1)) ? 0 - : - (isGregorianLeap(year) ? 1 : 2) - ); - month = (int32_t)uprv_floor((((yearday + leapadj) * 12) + 373) / 367); - day = (int32_t)(wjd - gregorianToJD(year, month, 1)) + 1; - - gregorianDate[0] = year; - gregorianDate[1] = month; - gregorianDate[2] = day; - + int32_t gdow; + Grego::dayToFields(jd - kEpochStartAsJulianDay, + gregorianDate[0], gregorianDate[1], gregorianDate[2], gdow); return gregorianDate; } @@ -203,11 +168,11 @@ static double IndianToJD(int32_t year, int32_t month, int32_t date) { if(isGregorianLeap(gyear)) { leapMonth = 31; - start = gregorianToJD(gyear, 3, 21); + start = gregorianToJD(gyear, 2 /* The third month in 0 based month */, 21); } else { leapMonth = 30; - start = gregorianToJD(gyear, 3, 22); + start = gregorianToJD(gyear, 2 /* The third month in 0 based month */, 22); } if (month == 1) { @@ -297,7 +262,7 @@ void IndianCalendar::handleComputeFields(int32_t julianDay, UErrorCode& /* stat gregorianYear = jdToGregorian(julianDay, gd)[0]; // Gregorian date for Julian day IndianYear = gregorianYear - INDIAN_ERA_START; // Year in Saka era - jdAtStartOfGregYear = gregorianToJD(gregorianYear, 1, 1); // JD at start of Gregorian year + jdAtStartOfGregYear = gregorianToJD(gregorianYear, 0, 1); // JD at start of Gregorian year yday = (int32_t)(julianDay - jdAtStartOfGregYear); // Day number in Gregorian year (starting from 0) if (yday < INDIAN_YEAR_START) { diff --git a/intl/icu/source/i18n/indiancal.h b/intl/icu/source/i18n/indiancal.h index e259d9bc1742..3981ea58512b 100644 --- a/intl/icu/source/i18n/indiancal.h +++ b/intl/icu/source/i18n/indiancal.h @@ -147,7 +147,7 @@ public: * @param aLocale The given locale. * @param success Indicates the status of IndianCalendar object construction. * Returns U_ZERO_ERROR if constructed successfully. - * @param beCivil Whether the calendar should be civil (default-TRUE) or religious (FALSE) + * @param beCivil Whether the calendar should be civil (default-true) or religious (false) * @internal */ IndianCalendar(const Locale& aLocale, UErrorCode &success); @@ -303,7 +303,7 @@ protected: /** - * Returns TRUE because the Indian Calendar does have a default century + * Returns true because the Indian Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/islamcal.cpp b/intl/icu/source/i18n/islamcal.cpp index 582b3365a64a..982b3ad2d1c2 100644 --- a/intl/icu/source/i18n/islamcal.cpp +++ b/intl/icu/source/i18n/islamcal.cpp @@ -232,7 +232,7 @@ IslamicCalendar* IslamicCalendar::clone() const { } IslamicCalendar::IslamicCalendar(const Locale& aLocale, UErrorCode& success, ECalculationType type) -: Calendar(TimeZone::createDefault(), aLocale, success), +: Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success), cType(type) { setTimeInMillis(getNow(), success); // Call this again now that the vtable is set up properly. @@ -368,7 +368,7 @@ int32_t IslamicCalendar::yearStart(int32_t year) const{ if (cType == CIVIL || cType == TBLA || (cType == UMALQURA && (year < UMALQURA_YEAR_START || year > UMALQURA_YEAR_END))) { - return (year-1)*354 + ClockMath::floorDivide((3+11*year),30); + return (year-1)*354 + ClockMath::floorDivide((3+11*(int64_t)year),(int64_t)30); } else if(cType==ASTRONOMICAL){ return trueMonthStart(12*(year-1)); } else { @@ -391,7 +391,7 @@ int32_t IslamicCalendar::monthStart(int32_t year, int32_t month) const { if (cType == CIVIL || cType == TBLA) { // This does not handle months out of the range 0..11 return (int32_t)uprv_ceil(29.5*month) - + (year-1)*354 + (int32_t)ClockMath::floorDivide((3+11*year),30); + + (year-1)*354 + (int32_t)ClockMath::floorDivide((3+11*(int64_t)year),(int64_t)30); } else if(cType==ASTRONOMICAL){ return trueMonthStart(12*(year-1) + month); } else { @@ -447,7 +447,8 @@ int32_t IslamicCalendar::trueMonthStart(int32_t month) const } } while (age < 0); } - start = (int32_t)ClockMath::floorDivide((origin - HIJRA_MILLIS), (double)kOneDay) + 1; + start = (int32_t)(ClockMath::floorDivide( + (int64_t)((int64_t)origin - HIJRA_MILLIS), (int64_t)kOneDay) + 1); CalendarCache::put(&gMonthCache, month, start, status); } trueMonthStartEnd : @@ -639,13 +640,14 @@ void IslamicCalendar::handleComputeFields(int32_t julianDay, UErrorCode &status) months--; } - year = months / 12 + 1; - month = months % 12; + year = months >= 0 ? ((months / 12) + 1) : ((months + 1 ) / 12); + month = ((months % 12) + 12 ) % 12; } else if(cType == UMALQURA) { int32_t umalquraStartdays = yearStart(UMALQURA_YEAR_START) ; if( days < umalquraStartdays){ //Use Civil calculation - year = (int)ClockMath::floorDivide( (double)(30 * days + 10646) , 10631.0 ); + year = (int32_t)ClockMath::floorDivide( + (30 * (int64_t)days + 10646) , (int64_t)10631.0 ); month = (int32_t)uprv_ceil((days - 29 - yearStart(year)) / 29.5 ); month = month<11?month:11; startDate = monthStart(year, month); diff --git a/intl/icu/source/i18n/islamcal.h b/intl/icu/source/i18n/islamcal.h index fde58478c0ab..d324c6e409bd 100644 --- a/intl/icu/source/i18n/islamcal.h +++ b/intl/icu/source/i18n/islamcal.h @@ -395,7 +395,7 @@ class U_I18N_API IslamicCalendar : public Calendar { /** - * Returns TRUE because the Islamic Calendar does have a default century + * Returns true because the Islamic Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/japancal.h b/intl/icu/source/i18n/japancal.h index 03e6361c9f9a..e5b95d732c03 100644 --- a/intl/icu/source/i18n/japancal.h +++ b/intl/icu/source/i18n/japancal.h @@ -167,7 +167,7 @@ public: virtual const char * getType() const; /** - * @return FALSE - no default century in Japanese + * @return false - no default century in Japanese * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/listformatter.cpp b/intl/icu/source/i18n/listformatter.cpp index da99c9291d1b..be0d16bc7f52 100644 --- a/intl/icu/source/i18n/listformatter.cpp +++ b/intl/icu/source/i18n/listformatter.cpp @@ -16,6 +16,10 @@ * created by: Umesh P. Nair */ +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING + #include "cmemory.h" #include "unicode/fpositer.h" // FieldPositionIterator #include "unicode/listformatter.h" @@ -52,10 +56,12 @@ public: virtual PatternHandler* clone() const { return new PatternHandler(twoPattern, endPattern); } + /** Argument: final string in the list. */ virtual const SimpleFormatter& getTwoPattern(const UnicodeString&) const { return twoPattern; } + /** Argument: final string in the list. */ virtual const SimpleFormatter& getEndPattern(const UnicodeString&) const { return endPattern; } @@ -169,21 +175,21 @@ PatternHandler* createPatternHandler( UErrorCode& status) { if (uprv_strcmp(lang, "es") == 0) { // Spanish - UnicodeString spanishYStr(TRUE, spanishY, -1); + UnicodeString spanishYStr(true, spanishY, -1); bool twoIsY = two == spanishYStr; bool endIsY = end == spanishYStr; if (twoIsY || endIsY) { - UnicodeString replacement(TRUE, spanishE, -1); + UnicodeString replacement(true, spanishE, -1); return new ContextualHandler( shouldChangeToE, twoIsY ? replacement : two, two, endIsY ? replacement : end, end, status); } - UnicodeString spanishOStr(TRUE, spanishO, -1); + UnicodeString spanishOStr(true, spanishO, -1); bool twoIsO = two == spanishOStr; bool endIsO = end == spanishOStr; if (twoIsO || endIsO) { - UnicodeString replacement(TRUE, spanishU, -1); + UnicodeString replacement(true, spanishU, -1); return new ContextualHandler( shouldChangeToU, twoIsO ? replacement : two, two, @@ -191,11 +197,11 @@ PatternHandler* createPatternHandler( } } else if (uprv_strcmp(lang, "he") == 0 || uprv_strcmp(lang, "iw") == 0) { // Hebrew - UnicodeString hebrewVavStr(TRUE, hebrewVav, -1); + UnicodeString hebrewVavStr(true, hebrewVav, -1); bool twoIsVav = two == hebrewVavStr; bool endIsVav = end == hebrewVavStr; if (twoIsVav || endIsVav) { - UnicodeString replacement(TRUE, hebrewVavDash, -1); + UnicodeString replacement(true, hebrewVavDash, -1); return new ContextualHandler( shouldChangeToVavDash, twoIsVav ? replacement : two, two, @@ -236,17 +242,15 @@ ListFormatInternal(const ListFormatInternal &other) : }; -#if !UCONFIG_NO_FORMATTING -class FormattedListData : public FormattedValueFieldPositionIteratorImpl { +class FormattedListData : public FormattedValueStringBuilderImpl { public: - FormattedListData(UErrorCode& status) : FormattedValueFieldPositionIteratorImpl(5, status) {} + FormattedListData(UErrorCode&) : FormattedValueStringBuilderImpl(kUndefinedField) {} virtual ~FormattedListData(); }; FormattedListData::~FormattedListData() = default; UPRV_FORMATTED_VALUE_SUBCLASS_AUTO_IMPL(FormattedList) -#endif static Hashtable* listPatternHash = nullptr; @@ -255,7 +259,7 @@ U_CDECL_BEGIN static UBool U_CALLCONV uprv_listformatter_cleanup() { delete listPatternHash; listPatternHash = nullptr; - return TRUE; + return true; } static void U_CALLCONV @@ -348,7 +352,6 @@ const ListFormatInternal* ListFormatter::getListFormatInternal( return result; } -#if !UCONFIG_NO_FORMATTING static const char* typeWidthToStyleString(UListFormatterType type, UListFormatterWidth width) { switch (type) { case ULISTFMT_TYPE_AND: @@ -392,7 +395,6 @@ static const char* typeWidthToStyleString(UListFormatterType type, UListFormatte return nullptr; } -#endif static const UChar solidus = 0x2F; static const UChar aliasPrefix[] = { 0x6C,0x69,0x73,0x74,0x50,0x61,0x74,0x74,0x65,0x72,0x6E,0x2F }; // "listPattern/" @@ -513,14 +515,9 @@ ListFormatter* ListFormatter::createInstance(UErrorCode& errorCode) { } ListFormatter* ListFormatter::createInstance(const Locale& locale, UErrorCode& errorCode) { -#if !UCONFIG_NO_FORMATTING return createInstance(locale, ULISTFMT_TYPE_AND, ULISTFMT_WIDTH_WIDE, errorCode); -#else - return createInstance(locale, "standard", errorCode); -#endif } -#if !UCONFIG_NO_FORMATTING ListFormatter* ListFormatter::createInstance( const Locale& locale, UListFormatterType type, UListFormatterWidth width, UErrorCode& errorCode) { const char* style = typeWidthToStyleString(type, width); @@ -530,7 +527,6 @@ ListFormatter* ListFormatter::createInstance( } return createInstance(locale, style, errorCode); } -#endif ListFormatter* ListFormatter::createInstance(const Locale& locale, const char *style, UErrorCode& errorCode) { const ListFormatInternal* listFormatInternal = getListFormatInternal(locale, style, errorCode); @@ -557,50 +553,89 @@ ListFormatter::~ListFormatter() { delete owned; } -/** - * Joins first and second using the pattern pat. - * On entry offset is an offset into first or -1 if offset unspecified. - * On exit offset is offset of second in result if recordOffset was set - * Otherwise if it was >=0 it is set to point into result where it used - * to point into first. On exit, result is the join of first and second - * according to pat. Any previous value of result gets replaced. - */ -static void joinStringsAndReplace( - const SimpleFormatter& pat, - const UnicodeString& first, - const UnicodeString& second, - UnicodeString &result, - UBool recordOffset, - int32_t &offset, - int32_t *offsetFirst, - int32_t *offsetSecond, - UErrorCode& errorCode) { - if (U_FAILURE(errorCode)) { - return; +namespace { + +class FormattedListBuilder { +public: + LocalPointer data; + + /** For lists of length 1+ */ + FormattedListBuilder(const UnicodeString& start, UErrorCode& status) + : data(new FormattedListData(status), status) { + if (U_SUCCESS(status)) { + data->getStringRef().append( + start, + {UFIELD_CATEGORY_LIST, ULISTFMT_ELEMENT_FIELD}, + status); + data->appendSpanInfo(0, start.length(), status); + } } - const UnicodeString *params[2] = {&first, &second}; - int32_t offsets[2]; - pat.formatAndReplace( - params, - UPRV_LENGTHOF(params), - result, - offsets, - UPRV_LENGTHOF(offsets), - errorCode); - if (U_FAILURE(errorCode)) { - return; + + /** For lists of length 0 */ + FormattedListBuilder(UErrorCode& status) + : data(new FormattedListData(status), status) { } - if (offsets[0] == -1 || offsets[1] == -1) { - errorCode = U_INVALID_FORMAT_ERROR; - return; + + void append(const SimpleFormatter& pattern, const UnicodeString& next, int32_t position, UErrorCode& status) { + if (U_FAILURE(status)) { + return; + } + if (pattern.getArgumentLimit() != 2) { + status = U_INTERNAL_PROGRAM_ERROR; + return; + } + // In the pattern, {0} are the pre-existing elements and {1} is the new element. + int32_t offsets[] = {0, 0}; + UnicodeString temp = pattern.getTextWithNoArguments(offsets, 2); + if (offsets[0] <= offsets[1]) { + // prefix{0}infix{1}suffix + // Prepend prefix, then append infix, element, and suffix + data->getStringRef().insert( + 0, + temp.tempSubStringBetween(0, offsets[0]), + {UFIELD_CATEGORY_LIST, ULISTFMT_LITERAL_FIELD}, + status); + data->getStringRef().append( + temp.tempSubStringBetween(offsets[0], offsets[1]), + {UFIELD_CATEGORY_LIST, ULISTFMT_LITERAL_FIELD}, + status); + data->getStringRef().append( + next, + {UFIELD_CATEGORY_LIST, ULISTFMT_ELEMENT_FIELD}, + status); + data->appendSpanInfo(position, next.length(), status); + data->getStringRef().append( + temp.tempSubString(offsets[1]), + {UFIELD_CATEGORY_LIST, ULISTFMT_LITERAL_FIELD}, + status); + } else { + // prefix{1}infix{0}suffix + // Prepend infix, element, and prefix, then append suffix. + // (We prepend in reverse order because prepending at index 0 is fast.) + data->getStringRef().insert( + 0, + temp.tempSubStringBetween(offsets[1], offsets[0]), + {UFIELD_CATEGORY_LIST, ULISTFMT_LITERAL_FIELD}, + status); + data->getStringRef().insert( + 0, + next, + {UFIELD_CATEGORY_LIST, ULISTFMT_ELEMENT_FIELD}, + status); + data->prependSpanInfo(position, next.length(), status); + data->getStringRef().insert( + 0, + temp.tempSubStringBetween(0, offsets[1]), + {UFIELD_CATEGORY_LIST, ULISTFMT_LITERAL_FIELD}, + status); + data->getStringRef().append( + temp.tempSubString(offsets[0]), + {UFIELD_CATEGORY_LIST, ULISTFMT_LITERAL_FIELD}, + status); + } } - if (recordOffset) { - offset = offsets[1]; - } else if (offset >= 0) { - offset += offsets[0]; - } - if (offsetFirst != nullptr) *offsetFirst = offsets[0]; - if (offsetSecond != nullptr) *offsetSecond = offsets[1]; +}; + } UnicodeString& ListFormatter::format( @@ -619,190 +654,86 @@ UnicodeString& ListFormatter::format( int32_t index, int32_t &offset, UErrorCode& errorCode) const { - return format_(items, nItems, appendTo, index, offset, nullptr, errorCode); + int32_t initialOffset = appendTo.length(); + auto result = formatStringsToValue(items, nItems, errorCode); + UnicodeStringAppendable appendable(appendTo); + result.appendTo(appendable, errorCode); + if (index >= 0) { + ConstrainedFieldPosition cfpos; + cfpos.constrainField(UFIELD_CATEGORY_LIST_SPAN, index); + result.nextPosition(cfpos, errorCode); + offset = initialOffset + cfpos.getStart(); + } + return appendTo; } -#if !UCONFIG_NO_FORMATTING FormattedList ListFormatter::formatStringsToValue( const UnicodeString items[], int32_t nItems, UErrorCode& errorCode) const { - LocalPointer result(new FormattedListData(errorCode), errorCode); - if (U_FAILURE(errorCode)) { - return FormattedList(errorCode); - } - UnicodeString string; - int32_t offset; - auto handler = result->getHandler(errorCode); - handler.setCategory(UFIELD_CATEGORY_LIST); - format_(items, nItems, string, -1, offset, &handler, errorCode); - handler.getError(errorCode); - result->appendString(string, errorCode); - if (U_FAILURE(errorCode)) { - return FormattedList(errorCode); - } - - // Add span fields and sort - ConstrainedFieldPosition cfpos; - cfpos.constrainField(UFIELD_CATEGORY_LIST, ULISTFMT_ELEMENT_FIELD); - int32_t i = 0; - handler.setCategory(UFIELD_CATEGORY_LIST_SPAN); - while (result->nextPosition(cfpos, errorCode)) { - handler.addAttribute(i++, cfpos.getStart(), cfpos.getLimit()); - } - handler.getError(errorCode); - if (U_FAILURE(errorCode)) { - return FormattedList(errorCode); - } - result->sort(); - - return FormattedList(result.orphan()); -} -#endif - -UnicodeString& ListFormatter::format_( - const UnicodeString items[], - int32_t nItems, - UnicodeString& appendTo, - int32_t index, - int32_t &offset, - FieldPositionHandler* handler, - UErrorCode& errorCode) const { -#if !UCONFIG_NO_FORMATTING - offset = -1; - if (U_FAILURE(errorCode)) { - return appendTo; - } - if (data == nullptr) { - errorCode = U_INVALID_STATE_ERROR; - return appendTo; - } - - if (nItems <= 0) { - return appendTo; - } - if (nItems == 1) { - if (index == 0) { - offset = appendTo.length(); + if (nItems == 0) { + FormattedListBuilder result(errorCode); + if (U_FAILURE(errorCode)) { + return FormattedList(errorCode); + } else { + return FormattedList(result.data.orphan()); } - if (handler != nullptr) { - handler->addAttribute(ULISTFMT_ELEMENT_FIELD, - appendTo.length(), - appendTo.length() + items[0].length()); + } else if (nItems == 1) { + FormattedListBuilder result(items[0], errorCode); + result.data->getStringRef().writeTerminator(errorCode); + if (U_FAILURE(errorCode)) { + return FormattedList(errorCode); + } else { + return FormattedList(result.data.orphan()); + } + } else if (nItems == 2) { + FormattedListBuilder result(items[0], errorCode); + if (U_FAILURE(errorCode)) { + return FormattedList(errorCode); + } + result.append( + data->patternHandler->getTwoPattern(items[1]), + items[1], + 1, + errorCode); + result.data->getStringRef().writeTerminator(errorCode); + if (U_FAILURE(errorCode)) { + return FormattedList(errorCode); + } else { + return FormattedList(result.data.orphan()); } - appendTo.append(items[0]); - return appendTo; } - UnicodeString result(items[0]); - if (index == 0) { - offset = 0; + + FormattedListBuilder result(items[0], errorCode); + if (U_FAILURE(errorCode)) { + return FormattedList(errorCode); } - int32_t offsetFirst = 0; - int32_t offsetSecond = 0; - int32_t prefixLength = 0; - // for n items, there are 2 * (n + 1) boundary including 0 and the upper - // edge. - MaybeStackArray offsets((handler != nullptr) ? 2 * (nItems + 1): 0); - if (nItems == 2) { - joinStringsAndReplace( - data->patternHandler->getTwoPattern(items[1]), - result, - items[1], - result, - index == 1, - offset, - &offsetFirst, - &offsetSecond, - errorCode); + result.append( + data->startPattern, + items[1], + 1, + errorCode); + for (int32_t i = 2; i < nItems - 1; i++) { + result.append( + data->middlePattern, + items[i], + i, + errorCode); + } + result.append( + data->patternHandler->getEndPattern(items[nItems-1]), + items[nItems-1], + nItems-1, + errorCode); + result.data->getStringRef().writeTerminator(errorCode); + if (U_FAILURE(errorCode)) { + return FormattedList(errorCode); } else { - joinStringsAndReplace( - data->startPattern, - result, - items[1], - result, - index == 1, - offset, - &offsetFirst, - &offsetSecond, - errorCode); + return FormattedList(result.data.orphan()); } - if (handler != nullptr) { - offsets[0] = 0; - prefixLength += offsetFirst; - offsets[1] = offsetSecond - prefixLength; - } - if (nItems > 2) { - for (int32_t i = 2; i < nItems - 1; ++i) { - joinStringsAndReplace( - data->middlePattern, - result, - items[i], - result, - index == i, - offset, - &offsetFirst, - &offsetSecond, - errorCode); - if (handler != nullptr) { - prefixLength += offsetFirst; - offsets[i] = offsetSecond - prefixLength; - } - } - joinStringsAndReplace( - data->patternHandler->getEndPattern(items[nItems - 1]), - result, - items[nItems - 1], - result, - index == nItems - 1, - offset, - &offsetFirst, - &offsetSecond, - errorCode); - if (handler != nullptr) { - prefixLength += offsetFirst; - offsets[nItems - 1] = offsetSecond - prefixLength; - } - } - if (handler != nullptr) { - // If there are already some data in appendTo, we need to adjust the index - // by shifting that lenght while insert into handler. - int32_t shift = appendTo.length() + prefixLength; - // Output the ULISTFMT_ELEMENT_FIELD in the order of the input elements - for (int32_t i = 0; i < nItems; ++i) { - offsets[i + nItems] = offsets[i] + items[i].length() + shift; - offsets[i] += shift; - handler->addAttribute( - ULISTFMT_ELEMENT_FIELD, // id - offsets[i], // index - offsets[i + nItems]); // limit - } - // The locale pattern may reorder the items (such as in ur-IN locale), - // so we cannot assume the array is in accendning order. - // To handle the edging case, just insert the two ends into the array - // and sort. Then we output ULISTFMT_LITERAL_FIELD if the indecies - // between the even and odd position are not the same in the sorted array. - offsets[2 * nItems] = shift - prefixLength; - offsets[2 * nItems + 1] = result.length() + shift - prefixLength; - uprv_sortArray(offsets.getAlias(), 2 * (nItems + 1), sizeof(int32_t), - uprv_int32Comparator, nullptr, - false, &errorCode); - for (int32_t i = 0; i <= nItems; ++i) { - if (offsets[i * 2] != offsets[i * 2 + 1]) { - handler->addAttribute( - ULISTFMT_LITERAL_FIELD, // id - offsets[i * 2], // index - offsets[i * 2 + 1]); // limit - } - } - } - if (U_SUCCESS(errorCode)) { - if (offset >= 0) { - offset += appendTo.length(); - } - appendTo += result; - } -#endif - return appendTo; } - + + U_NAMESPACE_END + +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/measfmt.cpp b/intl/icu/source/i18n/measfmt.cpp index e05d66d4135e..08e6f6639126 100644 --- a/intl/icu/source/i18n/measfmt.cpp +++ b/intl/icu/source/i18n/measfmt.cpp @@ -861,7 +861,7 @@ UnicodeString &MeasureFormat::formatMeasuresSlowTrack( return appendTo; } // Fix up FieldPosition indexes if our field is found. - if (offset != -1) { + if (fieldPositionFoundIndex != -1 && offset != -1) { pos.setBeginIndex(fpos.getBeginIndex() + offset); pos.setEndIndex(fpos.getEndIndex() + offset); } diff --git a/intl/icu/source/i18n/measunit.cpp b/intl/icu/source/i18n/measunit.cpp index 4edf130b7e97..70b7a453adb0 100644 --- a/intl/icu/source/i18n/measunit.cpp +++ b/intl/icu/source/i18n/measunit.cpp @@ -34,8 +34,9 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MeasureUnit) // http://site.icu-project.org/design/formatting/measureformat/updating-measure-unit // // Start generated code +// TODO(ICU-21076): improve how this generated code is produced. - +// Maps from Type ID to offset in gSubTypes. static const int32_t gOffsets[] = { 0, 2, @@ -50,45 +51,49 @@ static const int32_t gOffsets[] = { 368, 370, 374, - 381, - 402, + 382, 404, - 418, - 421, - 427, - 437, - 441, - 445, - 447, - 474 + 408, + 423, + 426, + 432, + 442, + 446, + 450, + 452, + 486 }; -static const int32_t gIndexes[] = { - 0, - 2, - 7, - 17, - 25, - 29, - 29, - 40, - 56, - 60, - 69, - 71, - 75, - 82, - 103, - 105, - 119, - 122, - 128, - 138, - 142, - 146, - 148, - 175 -}; +// TODO: FIX CODE GENERATION - leaving this here but commented-out to make it +// clear that we no longer want this array. We needed it for only one thing: efficient checking of "currency". +// +// static const int32_t gIndexes[] = { +// 0, +// 2, +// 7, +// 17, +// 25, +// 29, +// 29, +// 40, +// 56, +// 60, +// 69, +// 71, +// 75, +// 83, +// 105, +// 109, +// 124, +// 127, +// 133, +// 143, +// 147, +// 151, +// 153, +// 187 +// }; +static const int32_t kCurrencyOffset = 5; // Must be sorted alphabetically. static const char * const gTypes[] = { @@ -493,6 +498,7 @@ static const char * const gSubTypes[] = { "hertz", "kilohertz", "megahertz", + "dot", "dot-per-centimeter", "dot-per-inch", "em", @@ -503,6 +509,7 @@ static const char * const gSubTypes[] = { "astronomical-unit", "centimeter", "decimeter", + "earth-radius", "fathom", "foot", "furlong", @@ -521,11 +528,14 @@ static const char * const gSubTypes[] = { "point", "solar-radius", "yard", + "candela", + "lumen", "lux", "solar-luminosity", "carat", "dalton", "earth-mass", + "grain", "gram", "kilogram", "metric-ton", @@ -580,34 +590,29 @@ static const char * const gSubTypes[] = { "cup", "cup-metric", "deciliter", + "dessert-spoon", + "dessert-spoon-imperial", + "dram", + "drop", "fluid-ounce", "fluid-ounce-imperial", "gallon", "gallon-imperial", "hectoliter", + "jigger", "liter", "megaliter", "milliliter", + "pinch", "pint", "pint-metric", "quart", + "quart-imperial", "tablespoon", "teaspoon" }; -// Must be sorted by first value and then second value. -static int32_t unitPerUnitToSingleUnit[][4] = { - {378, 382, 12, 5}, - {378, 387, 12, 6}, - {388, 343, 19, 0}, - {390, 350, 19, 2}, - {392, 343, 19, 3}, - {392, 463, 4, 2}, - {392, 464, 4, 3}, - {411, 460, 3, 1}, - {414, 12, 18, 9}, - {466, 388, 4, 1} -}; +// unitPerUnitToSingleUnit no longer in use! TODO: remove from code-generation code. // Shortcuts to the base unit in order to make the default constructor fast static const int32_t kBaseTypeIdx = 16; @@ -781,14 +786,6 @@ MeasureUnit MeasureUnit::getMole() { return MeasureUnit(3, 3); } -MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) { - return MeasureUnit::create(3, 6, status); -} - -MeasureUnit MeasureUnit::getPartPerMillion() { - return MeasureUnit(3, 6); -} - MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) { return MeasureUnit::create(3, 4, status); } @@ -805,6 +802,14 @@ MeasureUnit MeasureUnit::getPermille() { return MeasureUnit(3, 5); } +MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) { + return MeasureUnit::create(3, 6, status); +} + +MeasureUnit MeasureUnit::getPartPerMillion() { + return MeasureUnit(3, 6); +} + MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) { return MeasureUnit::create(3, 7, status); } @@ -1213,62 +1218,70 @@ MeasureUnit MeasureUnit::getMegahertz() { return MeasureUnit(11, 3); } -MeasureUnit *MeasureUnit::createDotPerCentimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDot(UErrorCode &status) { return MeasureUnit::create(12, 0, status); } -MeasureUnit MeasureUnit::getDotPerCentimeter() { +MeasureUnit MeasureUnit::getDot() { return MeasureUnit(12, 0); } -MeasureUnit *MeasureUnit::createDotPerInch(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDotPerCentimeter(UErrorCode &status) { return MeasureUnit::create(12, 1, status); } -MeasureUnit MeasureUnit::getDotPerInch() { +MeasureUnit MeasureUnit::getDotPerCentimeter() { return MeasureUnit(12, 1); } -MeasureUnit *MeasureUnit::createEm(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDotPerInch(UErrorCode &status) { return MeasureUnit::create(12, 2, status); } -MeasureUnit MeasureUnit::getEm() { +MeasureUnit MeasureUnit::getDotPerInch() { return MeasureUnit(12, 2); } -MeasureUnit *MeasureUnit::createMegapixel(UErrorCode &status) { +MeasureUnit *MeasureUnit::createEm(UErrorCode &status) { return MeasureUnit::create(12, 3, status); } -MeasureUnit MeasureUnit::getMegapixel() { +MeasureUnit MeasureUnit::getEm() { return MeasureUnit(12, 3); } -MeasureUnit *MeasureUnit::createPixel(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegapixel(UErrorCode &status) { return MeasureUnit::create(12, 4, status); } -MeasureUnit MeasureUnit::getPixel() { +MeasureUnit MeasureUnit::getMegapixel() { return MeasureUnit(12, 4); } -MeasureUnit *MeasureUnit::createPixelPerCentimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPixel(UErrorCode &status) { return MeasureUnit::create(12, 5, status); } -MeasureUnit MeasureUnit::getPixelPerCentimeter() { +MeasureUnit MeasureUnit::getPixel() { return MeasureUnit(12, 5); } -MeasureUnit *MeasureUnit::createPixelPerInch(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPixelPerCentimeter(UErrorCode &status) { return MeasureUnit::create(12, 6, status); } -MeasureUnit MeasureUnit::getPixelPerInch() { +MeasureUnit MeasureUnit::getPixelPerCentimeter() { return MeasureUnit(12, 6); } +MeasureUnit *MeasureUnit::createPixelPerInch(UErrorCode &status) { + return MeasureUnit::create(12, 7, status); +} + +MeasureUnit MeasureUnit::getPixelPerInch() { + return MeasureUnit(12, 7); +} + MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) { return MeasureUnit::create(13, 0, status); } @@ -1293,166 +1306,190 @@ MeasureUnit MeasureUnit::getDecimeter() { return MeasureUnit(13, 2); } -MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { +MeasureUnit *MeasureUnit::createEarthRadius(UErrorCode &status) { return MeasureUnit::create(13, 3, status); } -MeasureUnit MeasureUnit::getFathom() { +MeasureUnit MeasureUnit::getEarthRadius() { return MeasureUnit(13, 3); } -MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { return MeasureUnit::create(13, 4, status); } -MeasureUnit MeasureUnit::getFoot() { +MeasureUnit MeasureUnit::getFathom() { return MeasureUnit(13, 4); } -MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { return MeasureUnit::create(13, 5, status); } -MeasureUnit MeasureUnit::getFurlong() { +MeasureUnit MeasureUnit::getFoot() { return MeasureUnit(13, 5); } -MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { return MeasureUnit::create(13, 6, status); } -MeasureUnit MeasureUnit::getInch() { +MeasureUnit MeasureUnit::getFurlong() { return MeasureUnit(13, 6); } -MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { return MeasureUnit::create(13, 7, status); } -MeasureUnit MeasureUnit::getKilometer() { +MeasureUnit MeasureUnit::getInch() { return MeasureUnit(13, 7); } -MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) { return MeasureUnit::create(13, 8, status); } -MeasureUnit MeasureUnit::getLightYear() { +MeasureUnit MeasureUnit::getKilometer() { return MeasureUnit(13, 8); } -MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) { return MeasureUnit::create(13, 9, status); } -MeasureUnit MeasureUnit::getMeter() { +MeasureUnit MeasureUnit::getLightYear() { return MeasureUnit(13, 9); } -MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) { return MeasureUnit::create(13, 10, status); } -MeasureUnit MeasureUnit::getMicrometer() { +MeasureUnit MeasureUnit::getMeter() { return MeasureUnit(13, 10); } -MeasureUnit *MeasureUnit::createMile(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) { return MeasureUnit::create(13, 11, status); } -MeasureUnit MeasureUnit::getMile() { +MeasureUnit MeasureUnit::getMicrometer() { return MeasureUnit(13, 11); } -MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMile(UErrorCode &status) { return MeasureUnit::create(13, 12, status); } -MeasureUnit MeasureUnit::getMileScandinavian() { +MeasureUnit MeasureUnit::getMile() { return MeasureUnit(13, 12); } -MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) { return MeasureUnit::create(13, 13, status); } -MeasureUnit MeasureUnit::getMillimeter() { +MeasureUnit MeasureUnit::getMileScandinavian() { return MeasureUnit(13, 13); } -MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) { return MeasureUnit::create(13, 14, status); } -MeasureUnit MeasureUnit::getNanometer() { +MeasureUnit MeasureUnit::getMillimeter() { return MeasureUnit(13, 14); } -MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) { +MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) { return MeasureUnit::create(13, 15, status); } -MeasureUnit MeasureUnit::getNauticalMile() { +MeasureUnit MeasureUnit::getNanometer() { return MeasureUnit(13, 15); } -MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) { +MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) { return MeasureUnit::create(13, 16, status); } -MeasureUnit MeasureUnit::getParsec() { +MeasureUnit MeasureUnit::getNauticalMile() { return MeasureUnit(13, 16); } -MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) { return MeasureUnit::create(13, 17, status); } -MeasureUnit MeasureUnit::getPicometer() { +MeasureUnit MeasureUnit::getParsec() { return MeasureUnit(13, 17); } -MeasureUnit *MeasureUnit::createPoint(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) { return MeasureUnit::create(13, 18, status); } -MeasureUnit MeasureUnit::getPoint() { +MeasureUnit MeasureUnit::getPicometer() { return MeasureUnit(13, 18); } -MeasureUnit *MeasureUnit::createSolarRadius(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPoint(UErrorCode &status) { return MeasureUnit::create(13, 19, status); } -MeasureUnit MeasureUnit::getSolarRadius() { +MeasureUnit MeasureUnit::getPoint() { return MeasureUnit(13, 19); } -MeasureUnit *MeasureUnit::createYard(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSolarRadius(UErrorCode &status) { return MeasureUnit::create(13, 20, status); } -MeasureUnit MeasureUnit::getYard() { +MeasureUnit MeasureUnit::getSolarRadius() { return MeasureUnit(13, 20); } -MeasureUnit *MeasureUnit::createLux(UErrorCode &status) { +MeasureUnit *MeasureUnit::createYard(UErrorCode &status) { + return MeasureUnit::create(13, 21, status); +} + +MeasureUnit MeasureUnit::getYard() { + return MeasureUnit(13, 21); +} + +MeasureUnit *MeasureUnit::createCandela(UErrorCode &status) { return MeasureUnit::create(14, 0, status); } -MeasureUnit MeasureUnit::getLux() { +MeasureUnit MeasureUnit::getCandela() { return MeasureUnit(14, 0); } -MeasureUnit *MeasureUnit::createSolarLuminosity(UErrorCode &status) { +MeasureUnit *MeasureUnit::createLumen(UErrorCode &status) { return MeasureUnit::create(14, 1, status); } -MeasureUnit MeasureUnit::getSolarLuminosity() { +MeasureUnit MeasureUnit::getLumen() { return MeasureUnit(14, 1); } +MeasureUnit *MeasureUnit::createLux(UErrorCode &status) { + return MeasureUnit::create(14, 2, status); +} + +MeasureUnit MeasureUnit::getLux() { + return MeasureUnit(14, 2); +} + +MeasureUnit *MeasureUnit::createSolarLuminosity(UErrorCode &status) { + return MeasureUnit::create(14, 3, status); +} + +MeasureUnit MeasureUnit::getSolarLuminosity() { + return MeasureUnit(14, 3); +} + MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) { return MeasureUnit::create(15, 0, status); } @@ -1477,94 +1514,102 @@ MeasureUnit MeasureUnit::getEarthMass() { return MeasureUnit(15, 2); } -MeasureUnit *MeasureUnit::createGram(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGrain(UErrorCode &status) { return MeasureUnit::create(15, 3, status); } -MeasureUnit MeasureUnit::getGram() { +MeasureUnit MeasureUnit::getGrain() { return MeasureUnit(15, 3); } -MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGram(UErrorCode &status) { return MeasureUnit::create(15, 4, status); } -MeasureUnit MeasureUnit::getKilogram() { +MeasureUnit MeasureUnit::getGram() { return MeasureUnit(15, 4); } -MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) { return MeasureUnit::create(15, 5, status); } -MeasureUnit MeasureUnit::getMetricTon() { +MeasureUnit MeasureUnit::getKilogram() { return MeasureUnit(15, 5); } -MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { return MeasureUnit::create(15, 6, status); } -MeasureUnit MeasureUnit::getMicrogram() { +MeasureUnit MeasureUnit::getMetricTon() { return MeasureUnit(15, 6); } -MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { return MeasureUnit::create(15, 7, status); } -MeasureUnit MeasureUnit::getMilligram() { +MeasureUnit MeasureUnit::getMicrogram() { return MeasureUnit(15, 7); } -MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { return MeasureUnit::create(15, 8, status); } -MeasureUnit MeasureUnit::getOunce() { +MeasureUnit MeasureUnit::getMilligram() { return MeasureUnit(15, 8); } -MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { +MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { return MeasureUnit::create(15, 9, status); } -MeasureUnit MeasureUnit::getOunceTroy() { +MeasureUnit MeasureUnit::getOunce() { return MeasureUnit(15, 9); } -MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { +MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { return MeasureUnit::create(15, 10, status); } -MeasureUnit MeasureUnit::getPound() { +MeasureUnit MeasureUnit::getOunceTroy() { return MeasureUnit(15, 10); } -MeasureUnit *MeasureUnit::createSolarMass(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { return MeasureUnit::create(15, 11, status); } -MeasureUnit MeasureUnit::getSolarMass() { +MeasureUnit MeasureUnit::getPound() { return MeasureUnit(15, 11); } -MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSolarMass(UErrorCode &status) { return MeasureUnit::create(15, 12, status); } -MeasureUnit MeasureUnit::getStone() { +MeasureUnit MeasureUnit::getSolarMass() { return MeasureUnit(15, 12); } -MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { return MeasureUnit::create(15, 13, status); } -MeasureUnit MeasureUnit::getTon() { +MeasureUnit MeasureUnit::getStone() { return MeasureUnit(15, 13); } +MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { + return MeasureUnit::create(15, 14, status); +} + +MeasureUnit MeasureUnit::getTon() { + return MeasureUnit(15, 14); +} + MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) { return MeasureUnit::create(17, 0, status); } @@ -1885,110 +1930,166 @@ MeasureUnit MeasureUnit::getDeciliter() { return MeasureUnit(22, 13); } -MeasureUnit *MeasureUnit::createFluidOunce(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDessertSpoon(UErrorCode &status) { return MeasureUnit::create(22, 14, status); } -MeasureUnit MeasureUnit::getFluidOunce() { +MeasureUnit MeasureUnit::getDessertSpoon() { return MeasureUnit(22, 14); } -MeasureUnit *MeasureUnit::createFluidOunceImperial(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDessertSpoonImperial(UErrorCode &status) { return MeasureUnit::create(22, 15, status); } -MeasureUnit MeasureUnit::getFluidOunceImperial() { +MeasureUnit MeasureUnit::getDessertSpoonImperial() { return MeasureUnit(22, 15); } -MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDram(UErrorCode &status) { return MeasureUnit::create(22, 16, status); } -MeasureUnit MeasureUnit::getGallon() { +MeasureUnit MeasureUnit::getDram() { return MeasureUnit(22, 16); } -MeasureUnit *MeasureUnit::createGallonImperial(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDrop(UErrorCode &status) { return MeasureUnit::create(22, 17, status); } -MeasureUnit MeasureUnit::getGallonImperial() { +MeasureUnit MeasureUnit::getDrop() { return MeasureUnit(22, 17); } -MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFluidOunce(UErrorCode &status) { return MeasureUnit::create(22, 18, status); } -MeasureUnit MeasureUnit::getHectoliter() { +MeasureUnit MeasureUnit::getFluidOunce() { return MeasureUnit(22, 18); } -MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFluidOunceImperial(UErrorCode &status) { return MeasureUnit::create(22, 19, status); } -MeasureUnit MeasureUnit::getLiter() { +MeasureUnit MeasureUnit::getFluidOunceImperial() { return MeasureUnit(22, 19); } -MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) { return MeasureUnit::create(22, 20, status); } -MeasureUnit MeasureUnit::getMegaliter() { +MeasureUnit MeasureUnit::getGallon() { return MeasureUnit(22, 20); } -MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGallonImperial(UErrorCode &status) { return MeasureUnit::create(22, 21, status); } -MeasureUnit MeasureUnit::getMilliliter() { +MeasureUnit MeasureUnit::getGallonImperial() { return MeasureUnit(22, 21); } -MeasureUnit *MeasureUnit::createPint(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) { return MeasureUnit::create(22, 22, status); } -MeasureUnit MeasureUnit::getPint() { +MeasureUnit MeasureUnit::getHectoliter() { return MeasureUnit(22, 22); } -MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) { +MeasureUnit *MeasureUnit::createJigger(UErrorCode &status) { return MeasureUnit::create(22, 23, status); } -MeasureUnit MeasureUnit::getPintMetric() { +MeasureUnit MeasureUnit::getJigger() { return MeasureUnit(22, 23); } -MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) { +MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) { return MeasureUnit::create(22, 24, status); } -MeasureUnit MeasureUnit::getQuart() { +MeasureUnit MeasureUnit::getLiter() { return MeasureUnit(22, 24); } -MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) { return MeasureUnit::create(22, 25, status); } -MeasureUnit MeasureUnit::getTablespoon() { +MeasureUnit MeasureUnit::getMegaliter() { return MeasureUnit(22, 25); } -MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) { return MeasureUnit::create(22, 26, status); } -MeasureUnit MeasureUnit::getTeaspoon() { +MeasureUnit MeasureUnit::getMilliliter() { return MeasureUnit(22, 26); } +MeasureUnit *MeasureUnit::createPinch(UErrorCode &status) { + return MeasureUnit::create(22, 27, status); +} + +MeasureUnit MeasureUnit::getPinch() { + return MeasureUnit(22, 27); +} + +MeasureUnit *MeasureUnit::createPint(UErrorCode &status) { + return MeasureUnit::create(22, 28, status); +} + +MeasureUnit MeasureUnit::getPint() { + return MeasureUnit(22, 28); +} + +MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) { + return MeasureUnit::create(22, 29, status); +} + +MeasureUnit MeasureUnit::getPintMetric() { + return MeasureUnit(22, 29); +} + +MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) { + return MeasureUnit::create(22, 30, status); +} + +MeasureUnit MeasureUnit::getQuart() { + return MeasureUnit(22, 30); +} + +MeasureUnit *MeasureUnit::createQuartImperial(UErrorCode &status) { + return MeasureUnit::create(22, 31, status); +} + +MeasureUnit MeasureUnit::getQuartImperial() { + return MeasureUnit(22, 31); +} + +MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) { + return MeasureUnit::create(22, 32, status); +} + +MeasureUnit MeasureUnit::getTablespoon() { + return MeasureUnit(22, 32); +} + +MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) { + return MeasureUnit::create(22, 33, status); +} + +MeasureUnit MeasureUnit::getTeaspoon() { + return MeasureUnit(22, 33); +} + // End generated code static int32_t binarySearch( @@ -2038,7 +2139,9 @@ MeasureUnit &MeasureUnit::operator=(const MeasureUnit &other) { if (this == &other) { return *this; } - delete fImpl; + if (fImpl != nullptr) { + delete fImpl; + } if (other.fImpl) { ErrorCode localStatus; fImpl = new MeasureUnitImpl(other.fImpl->copy(localStatus)); @@ -2059,7 +2162,9 @@ MeasureUnit &MeasureUnit::operator=(MeasureUnit &&other) noexcept { if (this == &other) { return *this; } - delete fImpl; + if (fImpl != nullptr) { + delete fImpl; + } fImpl = other.fImpl; other.fImpl = nullptr; fTypeId = other.fTypeId; @@ -2072,8 +2177,10 @@ MeasureUnit *MeasureUnit::clone() const { } MeasureUnit::~MeasureUnit() { - delete fImpl; - fImpl = nullptr; + if (fImpl != nullptr) { + delete fImpl; + fImpl = nullptr; + } } const char *MeasureUnit::getType() const { @@ -2107,10 +2214,6 @@ UBool MeasureUnit::operator==(const UObject& other) const { return uprv_strcmp(getIdentifier(), rhs.getIdentifier()) == 0; } -int32_t MeasureUnit::getIndex() const { - return gIndexes[fTypeId] + fSubTypeId; -} - int32_t MeasureUnit::getAvailable( MeasureUnit *dest, int32_t destCapacity, @@ -2173,26 +2276,12 @@ StringEnumeration* MeasureUnit::getAvailableTypes(UErrorCode &errorCode) { return result; } -int32_t MeasureUnit::getIndexCount() { - return gIndexes[UPRV_LENGTHOF(gIndexes) - 1]; -} - -int32_t MeasureUnit::internalGetIndexForTypeAndSubtype(const char *type, const char *subtype) { - int32_t t = binarySearch(gTypes, 0, UPRV_LENGTHOF(gTypes), type); - if (t < 0) { - return t; - } - int32_t st = binarySearch(gSubTypes, gOffsets[t], gOffsets[t + 1], subtype); - if (st < 0) { - return st; - } - return gIndexes[t] + st - gOffsets[t]; -} - bool MeasureUnit::findBySubType(StringPiece subType, MeasureUnit* output) { for (int32_t t = 0; t < UPRV_LENGTHOF(gOffsets) - 1; t++) { + // Ensure kCurrencyOffset is set correctly + U_ASSERT(uprv_strcmp(gTypes[kCurrencyOffset], "currency") == 0); // Skip currency units - if (gIndexes[t] == gIndexes[t + 1]) { + if (t == kCurrencyOffset) { continue; } int32_t st = binarySearch(gSubTypes, gOffsets[t], gOffsets[t + 1], subType); @@ -2204,41 +2293,6 @@ bool MeasureUnit::findBySubType(StringPiece subType, MeasureUnit* output) { return false; } -MeasureUnit MeasureUnit::resolveUnitPerUnit( - const MeasureUnit &unit, const MeasureUnit &perUnit, bool* isResolved) { - int32_t unitOffset = unit.getOffset(); - int32_t perUnitOffset = perUnit.getOffset(); - if (unitOffset == -1 || perUnitOffset == -1) { - *isResolved = false; - return MeasureUnit(); - } - - // binary search for (unitOffset, perUnitOffset) - int32_t start = 0; - int32_t end = UPRV_LENGTHOF(unitPerUnitToSingleUnit); - while (start < end) { - int32_t mid = (start + end) / 2; - int32_t *midRow = unitPerUnitToSingleUnit[mid]; - if (unitOffset < midRow[0]) { - end = mid; - } else if (unitOffset > midRow[0]) { - start = mid + 1; - } else if (perUnitOffset < midRow[1]) { - end = mid; - } else if (perUnitOffset > midRow[1]) { - start = mid + 1; - } else { - // We found a resolution for our unit / per-unit combo - // return it. - *isResolved = true; - return MeasureUnit(midRow[2], midRow[3]); - } - } - - *isResolved = false; - return MeasureUnit(); -} - MeasureUnit *MeasureUnit::create(int typeId, int subTypeId, UErrorCode &status) { if (U_FAILURE(status)) { return NULL; @@ -2279,20 +2333,13 @@ void MeasureUnit::initCurrency(StringPiece isoCurrency) { fSubTypeId = result - gOffsets[fTypeId]; } -void MeasureUnit::initNoUnit(const char *subtype) { - int32_t result = binarySearch(gTypes, 0, UPRV_LENGTHOF(gTypes), "none"); - U_ASSERT(result != -1); - fTypeId = result; - result = binarySearch(gSubTypes, gOffsets[fTypeId], gOffsets[fTypeId + 1], subtype); - U_ASSERT(result != -1); - fSubTypeId = result - gOffsets[fTypeId]; -} - void MeasureUnit::setTo(int32_t typeId, int32_t subTypeId) { fTypeId = typeId; fSubTypeId = subTypeId; - delete fImpl; - fImpl = nullptr; + if (fImpl != nullptr) { + delete fImpl; + fImpl = nullptr; + } } int32_t MeasureUnit::getOffset() const { @@ -2302,6 +2349,20 @@ int32_t MeasureUnit::getOffset() const { return gOffsets[fTypeId] + fSubTypeId; } +MeasureUnitImpl MeasureUnitImpl::copy(UErrorCode &status) const { + MeasureUnitImpl result; + result.complexity = complexity; + result.identifier.append(identifier, status); + for (int32_t i = 0; i < units.length(); i++) { + SingleUnitImpl *item = result.units.emplaceBack(*units[i]); + if (!item) { + status = U_MEMORY_ALLOCATION_ERROR; + return result; + } + } + return result; +} + U_NAMESPACE_END #endif /* !UNCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/measunit_extra.cpp b/intl/icu/source/i18n/measunit_extra.cpp index aeb60017a18f..2eb3f0661429 100644 --- a/intl/icu/source/i18n/measunit_extra.cpp +++ b/intl/icu/source/i18n/measunit_extra.cpp @@ -12,20 +12,25 @@ // Helpful in toString methods and elsewhere. #define UNISTR_FROM_STRING_EXPLICIT -#include +#include "charstr.h" +#include "cmemory.h" #include "cstring.h" #include "measunit_impl.h" +#include "resource.h" #include "uarrsort.h" #include "uassert.h" #include "ucln_in.h" #include "umutex.h" -#include "unicode/errorcode.h" +#include "unicode/bytestrie.h" +#include "unicode/bytestriebuilder.h" #include "unicode/localpointer.h" #include "unicode/measunit.h" -#include "unicode/ucharstrie.h" -#include "unicode/ucharstriebuilder.h" - -#include "cstr.h" +#include "unicode/stringpiece.h" +#include "unicode/stringtriebuilder.h" +#include "unicode/ures.h" +#include "unicode/ustringtrie.h" +#include "uresimp.h" +#include U_NAMESPACE_BEGIN @@ -60,7 +65,7 @@ enum InitialCompoundPart { INITIAL_COMPOUND_PART_PER = kInitialCompoundPartOffset, }; -// Trie value offset for powers like "square-", "cubic-", "p2-" etc. +// Trie value offset for powers like "square-", "cubic-", "pow2-" etc. constexpr int32_t kPowerPartOffset = 256; enum PowerPart { @@ -110,119 +115,101 @@ const struct SIPrefixStrings { { "yocto", UMEASURE_SI_PREFIX_YOCTO }, }; -// TODO(ICU-21059): Get this list from data -const char16_t* const gSimpleUnits[] = { - u"candela", - u"carat", - u"gram", - u"ounce", - u"ounce-troy", - u"pound", - u"kilogram", - u"stone", - u"ton", - u"metric-ton", - u"earth-mass", - u"solar-mass", - u"point", - u"inch", - u"foot", - u"yard", - u"meter", - u"fathom", - u"furlong", - u"mile", - u"nautical-mile", - u"mile-scandinavian", - u"100-kilometer", - u"earth-radius", - u"solar-radius", - u"astronomical-unit", - u"light-year", - u"parsec", - u"second", - u"minute", - u"hour", - u"day", - u"day-person", - u"week", - u"week-person", - u"month", - u"month-person", - u"year", - u"year-person", - u"decade", - u"century", - u"ampere", - u"fahrenheit", - u"kelvin", - u"celsius", - u"arc-second", - u"arc-minute", - u"degree", - u"radian", - u"revolution", - u"item", - u"mole", - u"permillion", - u"permyriad", - u"permille", - u"percent", - u"karat", - u"portion", - u"bit", - u"byte", - u"dot", - u"pixel", - u"em", - u"hertz", - u"newton", - u"pound-force", - u"pascal", - u"bar", - u"atmosphere", - u"ofhg", - u"electronvolt", - u"dalton", - u"joule", - u"calorie", - u"british-thermal-unit", - u"foodcalorie", - u"therm-us", - u"watt", - u"horsepower", - u"solar-luminosity", - u"volt", - u"ohm", - u"dunam", - u"acre", - u"hectare", - u"teaspoon", - u"tablespoon", - u"fluid-ounce-imperial", - u"fluid-ounce", - u"cup", - u"cup-metric", - u"pint", - u"pint-metric", - u"quart", - u"liter", - u"gallon", - u"gallon-imperial", - u"bushel", - u"barrel", - u"knot", - u"g-force", - u"lux", +/** + * A ResourceSink that collects simple unit identifiers from the keys of the + * convertUnits table into an array, and adds these values to a TrieBuilder, + * with associated values being their index into this array plus a specified + * offset, to a trie. + * + * Example code: + * + * UErrorCode status = U_ZERO_ERROR; + * BytesTrieBuilder b(status); + * const char *unitIdentifiers[200]; + * SimpleUnitIdentifiersSink identifierSink(unitIdentifiers, 200, b, kTrieValueOffset); + * LocalUResourceBundlePointer unitsBundle(ures_openDirect(NULL, "units", &status)); + * ures_getAllItemsWithFallback(unitsBundle.getAlias(), "convertUnits", identifierSink, status); + */ +class SimpleUnitIdentifiersSink : public icu::ResourceSink { + public: + /** + * Constructor. + * @param out Array of char* to which the simple unit identifiers will be + * saved. + * @param outSize The size of `out`. + * @param trieBuilder The trie builder to which the simple unit identifier + * should be added. The trie builder must outlive this resource sink. + * @param trieValueOffset This is added to the index of the identifier in + * the `out` array, before adding to `trieBuilder` as the value + * associated with the identifier. + */ + explicit SimpleUnitIdentifiersSink(const char **out, int32_t outSize, BytesTrieBuilder &trieBuilder, + int32_t trieValueOffset) + : outArray(out), outSize(outSize), trieBuilder(trieBuilder), trieValueOffset(trieValueOffset), + outIndex(0) { + } + + /** + * Adds the table keys found in value to the output vector. + * @param key The key of the resource passed to `value`: the second + * parameter of the ures_getAllItemsWithFallback() call. + * @param value Should be a ResourceTable value, if + * ures_getAllItemsWithFallback() was called correctly for this sink. + * @param noFallback Ignored. + * @param status The standard ICU error code output parameter. + */ + void put(const char * /*key*/, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) { + ResourceTable table = value.getTable(status); + if (U_FAILURE(status)) return; + + if (outIndex + table.getSize() > outSize) { + status = U_INDEX_OUTOFBOUNDS_ERROR; + return; + } + + // Collect keys from the table resource. + const char *key; + for (int32_t i = 0; table.getKeyAndValue(i, key, value); ++i) { + U_ASSERT(i < table.getSize()); + U_ASSERT(outIndex < outSize); + if (uprv_strcmp(key, "kilogram") == 0) { + // For parsing, we use "gram", the prefixless metric mass unit. We + // thus ignore the SI Base Unit of Mass: it exists due to being the + // mass conversion target unit, but not needed for MeasureUnit + // parsing. + continue; + } + outArray[outIndex] = key; + trieBuilder.add(key, trieValueOffset + outIndex, status); + outIndex++; + } + } + + private: + const char **outArray; + int32_t outSize; + BytesTrieBuilder &trieBuilder; + int32_t trieValueOffset; + + int32_t outIndex; }; icu::UInitOnce gUnitExtrasInitOnce = U_INITONCE_INITIALIZER; -char16_t* kSerializedUnitExtrasStemTrie = nullptr; +// Array of simple unit IDs. +// +// The array memory itself is owned by this pointer, but the individual char* in +// that array point at static memory. (Note that these char* are also returned +// by SingleUnitImpl::getSimpleUnitID().) +const char **gSimpleUnits = nullptr; + +char *gSerializedUnitExtrasStemTrie = nullptr; UBool U_CALLCONV cleanupUnitExtras() { - uprv_free(kSerializedUnitExtrasStemTrie); - kSerializedUnitExtrasStemTrie = nullptr; + uprv_free(gSerializedUnitExtrasStemTrie); + gSerializedUnitExtrasStemTrie = nullptr; + uprv_free(gSimpleUnits); + gSimpleUnits = nullptr; gUnitExtrasInitOnce.reset(); return TRUE; } @@ -230,55 +217,75 @@ UBool U_CALLCONV cleanupUnitExtras() { void U_CALLCONV initUnitExtras(UErrorCode& status) { ucln_i18n_registerCleanup(UCLN_I18N_UNIT_EXTRAS, cleanupUnitExtras); - UCharsTrieBuilder b(status); + BytesTrieBuilder b(status); if (U_FAILURE(status)) { return; } // Add SI prefixes for (const auto& siPrefixInfo : gSIPrefixStrings) { - UnicodeString uSIPrefix(siPrefixInfo.string, -1, US_INV); - b.add(uSIPrefix, siPrefixInfo.value + kSIPrefixOffset, status); + b.add(siPrefixInfo.string, siPrefixInfo.value + kSIPrefixOffset, status); } if (U_FAILURE(status)) { return; } // Add syntax parts (compound, power prefixes) - b.add(u"-per-", COMPOUND_PART_PER, status); - b.add(u"-", COMPOUND_PART_TIMES, status); - b.add(u"-and-", COMPOUND_PART_AND, status); - b.add(u"per-", INITIAL_COMPOUND_PART_PER, status); - b.add(u"square-", POWER_PART_P2, status); - b.add(u"cubic-", POWER_PART_P3, status); - b.add(u"p2-", POWER_PART_P2, status); - b.add(u"p3-", POWER_PART_P3, status); - b.add(u"p4-", POWER_PART_P4, status); - b.add(u"p5-", POWER_PART_P5, status); - b.add(u"p6-", POWER_PART_P6, status); - b.add(u"p7-", POWER_PART_P7, status); - b.add(u"p8-", POWER_PART_P8, status); - b.add(u"p9-", POWER_PART_P9, status); - b.add(u"p10-", POWER_PART_P10, status); - b.add(u"p11-", POWER_PART_P11, status); - b.add(u"p12-", POWER_PART_P12, status); - b.add(u"p13-", POWER_PART_P13, status); - b.add(u"p14-", POWER_PART_P14, status); - b.add(u"p15-", POWER_PART_P15, status); + b.add("-per-", COMPOUND_PART_PER, status); + b.add("-", COMPOUND_PART_TIMES, status); + b.add("-and-", COMPOUND_PART_AND, status); + b.add("per-", INITIAL_COMPOUND_PART_PER, status); + b.add("square-", POWER_PART_P2, status); + b.add("cubic-", POWER_PART_P3, status); + b.add("pow2-", POWER_PART_P2, status); + b.add("pow3-", POWER_PART_P3, status); + b.add("pow4-", POWER_PART_P4, status); + b.add("pow5-", POWER_PART_P5, status); + b.add("pow6-", POWER_PART_P6, status); + b.add("pow7-", POWER_PART_P7, status); + b.add("pow8-", POWER_PART_P8, status); + b.add("pow9-", POWER_PART_P9, status); + b.add("pow10-", POWER_PART_P10, status); + b.add("pow11-", POWER_PART_P11, status); + b.add("pow12-", POWER_PART_P12, status); + b.add("pow13-", POWER_PART_P13, status); + b.add("pow14-", POWER_PART_P14, status); + b.add("pow15-", POWER_PART_P15, status); if (U_FAILURE(status)) { return; } - // Add sanctioned simple units by offset - int32_t simpleUnitOffset = kSimpleUnitOffset; - for (auto simpleUnit : gSimpleUnits) { - b.add(simpleUnit, simpleUnitOffset++, status); + // Add sanctioned simple units by offset: simple units all have entries in + // units/convertUnits resources. + // TODO(ICU-21059): confirm whether this is clean enough, or whether we need to + // filter units' validity list instead. + LocalUResourceBundlePointer unitsBundle(ures_openDirect(NULL, "units", &status)); + LocalUResourceBundlePointer convertUnits( + ures_getByKey(unitsBundle.getAlias(), "convertUnits", NULL, &status)); + if (U_FAILURE(status)) { return; } + + // Allocate enough space: with identifierSink below skipping kilogram, we're + // probably allocating one more than needed. + int32_t simpleUnitsCount = convertUnits.getAlias()->fSize; + int32_t arrayMallocSize = sizeof(char *) * simpleUnitsCount; + gSimpleUnits = static_cast(uprv_malloc(arrayMallocSize)); + if (gSimpleUnits == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; } + uprv_memset(gSimpleUnits, 0, arrayMallocSize); + + // Populate gSimpleUnits and build the associated trie. + SimpleUnitIdentifiersSink identifierSink(gSimpleUnits, simpleUnitsCount, b, kSimpleUnitOffset); + ures_getAllItemsWithFallback(unitsBundle.getAlias(), "convertUnits", identifierSink, status); // Build the CharsTrie // TODO: Use SLOW or FAST here? - UnicodeString result; - b.buildUnicodeString(USTRINGTRIE_BUILD_FAST, result, status); + StringPiece result = b.buildStringPiece(USTRINGTRIE_BUILD_FAST, status); if (U_FAILURE(status)) { return; } // Copy the result into the global constant pointer - size_t numBytes = result.length() * sizeof(char16_t); - kSerializedUnitExtrasStemTrie = static_cast(uprv_malloc(numBytes)); - uprv_memcpy(kSerializedUnitExtrasStemTrie, result.getBuffer(), numBytes); + size_t numBytes = result.length(); + gSerializedUnitExtrasStemTrie = static_cast(uprv_malloc(numBytes)); + if (gSerializedUnitExtrasStemTrie == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + uprv_memcpy(gSerializedUnitExtrasStemTrie, result.data(), numBytes); } class Token { @@ -385,7 +392,7 @@ private: // should live longer than this Parser - and the parser shouldn't return any // references to that string. StringPiece fSource; - UCharsTrie fTrie; + BytesTrie fTrie; // Set to true when we've seen a "-per-" or a "per-", after which all units // are in the denominator. Until we find an "-and-", at which point the @@ -395,7 +402,7 @@ private: Parser() : fSource(""), fTrie(u"") {} Parser(StringPiece source) - : fSource(source), fTrie(kSerializedUnitExtrasStemTrie) {} + : fSource(source), fTrie(gSerializedUnitExtrasStemTrie) {} inline bool hasNext() const { return fIndex < fSource.length(); @@ -640,11 +647,11 @@ void serializeSingle(const SingleUnitImpl& singleUnit, bool first, CharString& o } else if (posPower == 3) { output.append("cubic-", status); } else if (posPower < 10) { - output.append('p', status); + output.append("pow", status); output.append(posPower + '0', status); output.append('-', status); } else if (posPower <= 15) { - output.append("p1", status); + output.append("pow1", status); output.append('0' + (posPower % 10), status); output.append('-', status); } else { @@ -666,7 +673,7 @@ void serializeSingle(const SingleUnitImpl& singleUnit, bool first, CharString& o return; } - output.appendInvariantChars(gSimpleUnits[singleUnit.index], status); + output.append(singleUnit.getSimpleUnitID(), status); } /** @@ -777,6 +784,17 @@ MeasureUnit SingleUnitImpl::build(UErrorCode& status) const { return std::move(temp).build(status); } +const char *SingleUnitImpl::getSimpleUnitID() const { + return gSimpleUnits[index]; +} + +MeasureUnitImpl::MeasureUnitImpl(const MeasureUnitImpl &other, UErrorCode &status) { + *this = other.copy(status); +} + +MeasureUnitImpl::MeasureUnitImpl(const SingleUnitImpl &singleUnit, UErrorCode &status) { + this->append(singleUnit, status); +} MeasureUnitImpl MeasureUnitImpl::forIdentifier(StringPiece identifier, UErrorCode& status) { return Parser::from(identifier, status).parse(status); @@ -813,12 +831,26 @@ bool MeasureUnitImpl::append(const SingleUnitImpl& singleUnit, UErrorCode& statu return appendImpl(*this, singleUnit, status); } +MaybeStackVector MeasureUnitImpl::extractIndividualUnits(UErrorCode &status) const { + MaybeStackVector result; + + if (this->complexity != UMeasureUnitComplexity::UMEASURE_UNIT_MIXED) { + result.emplaceBackAndCheckErrorCode(status, *this, status); + return result; + } + + for (int32_t i = 0; i < units.length(); i++) { + result.emplaceBackAndCheckErrorCode(status, *units[i], status); + } + + return result; +} + MeasureUnit MeasureUnitImpl::build(UErrorCode& status) && { serialize(*this, status); return MeasureUnit(std::move(*this)); } - MeasureUnit MeasureUnit::forIdentifier(StringPiece identifier, UErrorCode& status) { return Parser::from(identifier, status).parse(status).build(status); } @@ -876,11 +908,15 @@ MeasureUnit MeasureUnit::product(const MeasureUnit& other, UErrorCode& status) c return std::move(impl).build(status); } -LocalArray MeasureUnit::splitToSingleUnits(int32_t& outCount, UErrorCode& status) const { +LocalArray MeasureUnit::splitToSingleUnitsImpl(int32_t& outCount, UErrorCode& status) const { MeasureUnitImpl temp; const MeasureUnitImpl& impl = MeasureUnitImpl::forMeasureUnit(*this, temp, status); outCount = impl.units.length(); MeasureUnit* arr = new MeasureUnit[outCount]; + if (arr == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return LocalArray(); + } for (int32_t i = 0; i < outCount; i++) { arr[i] = impl.units[i]->build(status); } diff --git a/intl/icu/source/i18n/measunit_impl.h b/intl/icu/source/i18n/measunit_impl.h index c69d243b3b8a..3cc2cd0476f7 100644 --- a/intl/icu/source/i18n/measunit_impl.h +++ b/intl/icu/source/i18n/measunit_impl.h @@ -22,7 +22,7 @@ static const char kDefaultCurrency8[] = "XXX"; /** * A struct representing a single unit (optional SI prefix and dimensionality). */ -struct SingleUnitImpl : public UMemory { +struct U_I18N_API SingleUnitImpl : public UMemory { /** * Gets a single unit from the MeasureUnit. If there are multiple single units, sets an error * code and returns the base dimensionless unit. Parses if necessary. @@ -32,6 +32,16 @@ struct SingleUnitImpl : public UMemory { /** Transform this SingleUnitImpl into a MeasureUnit, simplifying if possible. */ MeasureUnit build(UErrorCode& status) const; + /** + * Returns the "simple unit ID", without SI or dimensionality prefix: this + * instance may represent a square-kilometer, but only "meter" will be + * returned. + * + * The returned pointer points at memory that exists for the duration of the + * program's running. + */ + const char *getSimpleUnitID() const; + /** * Compare this SingleUnitImpl to another SingleUnitImpl for the sake of * sorting and coalescing. @@ -110,12 +120,27 @@ struct SingleUnitImpl : public UMemory { int32_t dimensionality = 1; }; +// Export explicit template instantiations of MaybeStackArray, MemoryPool and +// MaybeStackVector. This is required when building DLLs for Windows. (See +// datefmt.h, collationiterator.h, erarules.h and others for similar examples.) +#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN +template class U_I18N_API MaybeStackArray; +template class U_I18N_API MemoryPool; +template class U_I18N_API MaybeStackVector; +#endif /** * Internal representation of measurement units. Capable of representing all complexities of units, * including mixed and compound units. */ -struct MeasureUnitImpl : public UMemory { +struct U_I18N_API MeasureUnitImpl : public UMemory { + MeasureUnitImpl() = default; + MeasureUnitImpl(MeasureUnitImpl &&other) = default; + MeasureUnitImpl(const MeasureUnitImpl &other, UErrorCode &status); + MeasureUnitImpl(const SingleUnitImpl &singleUnit, UErrorCode &status); + + MeasureUnitImpl &operator=(MeasureUnitImpl &&other) noexcept = default; + /** Extract the MeasureUnitImpl from a MeasureUnit. */ static inline const MeasureUnitImpl* get(const MeasureUnit& measureUnit) { return measureUnit.fImpl; @@ -169,13 +194,17 @@ struct MeasureUnitImpl : public UMemory { /** * Create a copy of this MeasureUnitImpl. Don't use copy constructor to make this explicit. */ - inline MeasureUnitImpl copy(UErrorCode& status) const { - MeasureUnitImpl result; - result.complexity = complexity; - result.units.appendAll(units, status); - result.identifier.append(identifier, status); - return result; - } + MeasureUnitImpl copy(UErrorCode& status) const; + + /** + * Extracts the list of all the individual units inside the `MeasureUnitImpl`. + * For example: + * - if the `MeasureUnitImpl` is `foot-per-hour` + * it will return a list of 1 {`foot-per-hour`} + * - if the `MeasureUnitImpl` is `foot-and-inch` + * it will return a list of 2 { `foot`, `inch`} + */ + MaybeStackVector extractIndividualUnits(UErrorCode &status) const; /** Mutates this MeasureUnitImpl to take the reciprocal. */ void takeReciprocal(UErrorCode& status); @@ -206,7 +235,6 @@ struct MeasureUnitImpl : public UMemory { CharString identifier; }; - U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/measure.cpp b/intl/icu/source/i18n/measure.cpp index bffa44215e3c..23adba100707 100644 --- a/intl/icu/source/i18n/measure.cpp +++ b/intl/icu/source/i18n/measure.cpp @@ -23,7 +23,7 @@ U_NAMESPACE_BEGIN UOBJECT_DEFINE_RTTI_IMPLEMENTATION(Measure) -Measure::Measure() {} +Measure::Measure() : unit(nullptr) {} Measure::Measure(const Formattable& _number, MeasureUnit* adoptedUnit, UErrorCode& ec) : @@ -35,7 +35,7 @@ Measure::Measure(const Formattable& _number, MeasureUnit* adoptedUnit, } Measure::Measure(const Measure& other) : - UObject(other), unit(0) { + UObject(other), unit(nullptr) { *this = other; } @@ -43,7 +43,11 @@ Measure& Measure::operator=(const Measure& other) { if (this != &other) { delete unit; number = other.number; - unit = other.unit->clone(); + if (other.unit != nullptr) { + unit = other.unit->clone(); + } else { + unit = nullptr; + } } return *this; } diff --git a/intl/icu/source/i18n/nfrs.cpp b/intl/icu/source/i18n/nfrs.cpp index e7b17b46c3a0..1510d885094e 100644 --- a/intl/icu/source/i18n/nfrs.cpp +++ b/intl/icu/source/i18n/nfrs.cpp @@ -37,7 +37,7 @@ enum { /** 0.x */ PROPER_FRACTION_RULE_INDEX = 2, /** x.0 */ - MASTER_RULE_INDEX = 3, + DEFAULT_RULE_INDEX = 3, /** Inf */ INFINITY_RULE_INDEX = 4, /** NaN */ @@ -278,8 +278,8 @@ void NFRuleSet::setNonNumericalRule(NFRule *rule) { else if (baseValue == NFRule::kProperFractionRule) { setBestFractionRule(PROPER_FRACTION_RULE_INDEX, rule, TRUE); } - else if (baseValue == NFRule::kMasterRule) { - setBestFractionRule(MASTER_RULE_INDEX, rule, TRUE); + else if (baseValue == NFRule::kDefaultRule) { + setBestFractionRule(DEFAULT_RULE_INDEX, rule, TRUE); } else if (baseValue == NFRule::kInfinityRule) { delete nonNumericalRules[INFINITY_RULE_INDEX]; @@ -323,7 +323,7 @@ NFRuleSet::~NFRuleSet() for (int i = 0; i < NON_NUMERICAL_RULE_LENGTH; i++) { if (i != IMPROPER_FRACTION_RULE_INDEX && i != PROPER_FRACTION_RULE_INDEX - && i != MASTER_RULE_INDEX) + && i != DEFAULT_RULE_INDEX) { delete nonNumericalRules[i]; } @@ -375,7 +375,7 @@ NFRuleSet::setDecimalFormatSymbols(const DecimalFormatSymbols &newSymbols, UErro rules[i]->setDecimalFormatSymbols(newSymbols, status); } // Switch the fraction rules to mirror the DecimalFormatSymbols. - for (int32_t nonNumericalIdx = IMPROPER_FRACTION_RULE_INDEX; nonNumericalIdx <= MASTER_RULE_INDEX; nonNumericalIdx++) { + for (int32_t nonNumericalIdx = IMPROPER_FRACTION_RULE_INDEX; nonNumericalIdx <= DEFAULT_RULE_INDEX; nonNumericalIdx++) { if (nonNumericalRules[nonNumericalIdx]) { for (uint32_t fIdx = 0; fIdx < fractionRules.size(); fIdx++) { NFRule *fractionRule = fractionRules[fIdx]; @@ -472,9 +472,9 @@ NFRuleSet::findDoubleRule(double number) const } } - // if there's a master rule, use it to format the number - if (nonNumericalRules[MASTER_RULE_INDEX]) { - return nonNumericalRules[MASTER_RULE_INDEX]; + // if there's a default rule, use it to format the number + if (nonNumericalRules[DEFAULT_RULE_INDEX]) { + return nonNumericalRules[DEFAULT_RULE_INDEX]; } // and if we haven't yet returned a rule, use findNormalRule() @@ -507,13 +507,13 @@ NFRuleSet::findNormalRule(int64_t number) const // do them in findRule(), because the version of format() that // takes a long bypasses findRule() and goes straight to this // function. This function does skip the fraction rules since - // we know the value is an integer (it also skips the master + // we know the value is an integer (it also skips the default // rule, since it's considered a fraction rule. Skipping the - // master rule in this function is also how we avoid infinite + // default rule in this function is also how we avoid infinite // recursion) // {dlf} unfortunately this fails if there are no rules except - // special rules. If there are no rules, use the master rule. + // special rules. If there are no rules, use the default rule. // binary-search the rule list for the applicable rule // (a rule is used for all values from its base value to @@ -553,8 +553,8 @@ NFRuleSet::findNormalRule(int64_t number) const } return result; } - // else use the master rule - return nonNumericalRules[MASTER_RULE_INDEX]; + // else use the default rule + return nonNumericalRules[DEFAULT_RULE_INDEX]; } /** @@ -792,7 +792,7 @@ NFRuleSet::appendRules(UnicodeString& result) const if (nonNumericalRules[i]) { if (rule->getBaseValue() == NFRule::kImproperFractionRule || rule->getBaseValue() == NFRule::kProperFractionRule - || rule->getBaseValue() == NFRule::kMasterRule) + || rule->getBaseValue() == NFRule::kDefaultRule) { for (uint32_t fIdx = 0; fIdx < fractionRules.size(); fIdx++) { NFRule *fractionRule = fractionRules[fIdx]; diff --git a/intl/icu/source/i18n/nfrs.h b/intl/icu/source/i18n/nfrs.h index db03c9039ded..3232ab217a98 100644 --- a/intl/icu/source/i18n/nfrs.h +++ b/intl/icu/source/i18n/nfrs.h @@ -36,7 +36,7 @@ public: void parseRules(UnicodeString& rules, UErrorCode& status); void setNonNumericalRule(NFRule *rule); void setBestFractionRule(int32_t originalIndex, NFRule *newRule, UBool rememberRule); - void makeIntoFractionRuleSet() { fIsFractionRuleSet = TRUE; } + void makeIntoFractionRuleSet() { fIsFractionRuleSet = true; } ~NFRuleSet(); @@ -93,11 +93,11 @@ int64_t util64_fromDouble(double d); uint64_t util64_pow(uint32_t radix, uint16_t exponent); // convert n to digit string in buffer, return length of string -uint32_t util64_tou(int64_t n, UChar* buffer, uint32_t buflen, uint32_t radix = 10, UBool raw = FALSE); +uint32_t util64_tou(int64_t n, UChar* buffer, uint32_t buflen, uint32_t radix = 10, UBool raw = false); #ifdef RBNF_DEBUG int64_t util64_utoi(const UChar* str, uint32_t radix = 10); -uint32_t util64_toa(int64_t n, char* buffer, uint32_t buflen, uint32_t radix = 10, UBool raw = FALSE); +uint32_t util64_toa(int64_t n, char* buffer, uint32_t buflen, uint32_t radix = 10, UBool raw = false); int64_t util64_atoi(const char* str, uint32_t radix); #endif diff --git a/intl/icu/source/i18n/nfrule.cpp b/intl/icu/source/i18n/nfrule.cpp index 3ad0291649e6..a9b84eda1828 100644 --- a/intl/icu/source/i18n/nfrule.cpp +++ b/intl/icu/source/i18n/nfrule.cpp @@ -153,7 +153,7 @@ NFRule::makeRules(UnicodeString& description, if ((rule1->baseValue > 0 && (rule1->baseValue % util64_pow(rule1->radix, rule1->exponent)) == 0) || rule1->getType() == kImproperFractionRule - || rule1->getType() == kMasterRule) { + || rule1->getType() == kDefaultRule) { // if it passes that test, new up the second rule. If the // rule set both rules will belong to is a fraction rule @@ -181,9 +181,9 @@ NFRule::makeRules(UnicodeString& description, } // if the description began with "x.0" and contains bracketed - // text, it describes both the master rule and the + // text, it describes both the default rule and the // improper fraction rule - else if (rule1->getType() == kMasterRule) { + else if (rule1->getType() == kDefaultRule) { rule2->baseValue = rule1->baseValue; rule1->setType(kImproperFractionRule); } @@ -376,7 +376,7 @@ NFRule::parseRuleDescriptor(UnicodeString& description, UErrorCode& status) decimalPoint = descriptor.charAt(1); } else if (firstChar == gX && lastChar == gZero) { - setBaseValue(kMasterRule, status); + setBaseValue(kDefaultRule, status); decimalPoint = descriptor.charAt(1); } else if (descriptor.compare(gNaN, 3) == 0) { @@ -663,7 +663,7 @@ NFRule::_appendRuleText(UnicodeString& result) const case kNegativeNumberRule: result.append(gMinusX, 2); break; case kImproperFractionRule: result.append(gX).append(decimalPoint == 0 ? gDot : decimalPoint).append(gX); break; case kProperFractionRule: result.append(gZero).append(decimalPoint == 0 ? gDot : decimalPoint).append(gX); break; - case kMasterRule: result.append(gX).append(decimalPoint == 0 ? gDot : decimalPoint).append(gZero); break; + case kDefaultRule: result.append(gX).append(decimalPoint == 0 ? gDot : decimalPoint).append(gZero); break; case kInfinityRule: result.append(gInf, 3); break; case kNaNRule: result.append(gNaN, 3); break; default: @@ -1297,6 +1297,10 @@ NFRule::prefixLength(const UnicodeString& str, const UnicodeString& prefix, UErr #if !UCONFIG_NO_COLLATION // go through all this grief if we're in lenient-parse mode if (formatter->isLenient()) { + // Check if non-lenient rule finds the text before call lenient parsing + if (str.startsWith(prefix)) { + return prefix.length(); + } // get the formatter's collator and use it to create two // collation element iterators, one over the target string // and another over the prefix (right now, we'll throw an @@ -1505,9 +1509,15 @@ NFRule::findText(const UnicodeString& str, return str.indexOf(key, startingAt); } else { - // but if lenient parsing is turned ON, we've got some work - // ahead of us - return findTextLenient(str, key, startingAt, length); + // Check if non-lenient rule finds the text before call lenient parsing + *length = key.length(); + int32_t pos = str.indexOf(key, startingAt); + if(pos >= 0) { + return pos; + } else { + // but if lenient parsing is turned ON, we've got some work ahead of us + return findTextLenient(str, key, startingAt, length); + } } } diff --git a/intl/icu/source/i18n/nfrule.h b/intl/icu/source/i18n/nfrule.h index ed33eaa5af76..989fbaa8f9b3 100644 --- a/intl/icu/source/i18n/nfrule.h +++ b/intl/icu/source/i18n/nfrule.h @@ -38,7 +38,7 @@ public: kNegativeNumberRule = -1, kImproperFractionRule = -2, kProperFractionRule = -3, - kMasterRule = -4, + kDefaultRule = -4, kInfinityRule = -5, kNaNRule = -6, kOtherRule = -7 diff --git a/intl/icu/source/i18n/nfsubs.cpp b/intl/icu/source/i18n/nfsubs.cpp index 208543d1acd4..e3d1fc144fa9 100644 --- a/intl/icu/source/i18n/nfsubs.cpp +++ b/intl/icu/source/i18n/nfsubs.cpp @@ -342,7 +342,7 @@ NFSubstitution::makeSubstitution(int32_t pos, // IntegralPartSubstitution else if (rule->getBaseValue() == NFRule::kImproperFractionRule || rule->getBaseValue() == NFRule::kProperFractionRule - || rule->getBaseValue() == NFRule::kMasterRule) { + || rule->getBaseValue() == NFRule::kDefaultRule) { return new IntegralPartSubstitution(pos, ruleSet, description, status); } @@ -371,7 +371,7 @@ NFSubstitution::makeSubstitution(int32_t pos, // FractionalPartSubstitution else if (rule->getBaseValue() == NFRule::kImproperFractionRule || rule->getBaseValue() == NFRule::kProperFractionRule - || rule->getBaseValue() == NFRule::kMasterRule) { + || rule->getBaseValue() == NFRule::kDefaultRule) { return new FractionalPartSubstitution(pos, ruleSet, description, status); } diff --git a/intl/icu/source/i18n/nounit.cpp b/intl/icu/source/i18n/nounit.cpp deleted file mode 100644 index 1d4aa05506e9..000000000000 --- a/intl/icu/source/i18n/nounit.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// © 2017 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html - -#include "unicode/nounit.h" -#include "uassert.h" - -#if !UCONFIG_NO_FORMATTING - -U_NAMESPACE_BEGIN - -UOBJECT_DEFINE_RTTI_IMPLEMENTATION(NoUnit) - -NoUnit U_EXPORT2 NoUnit::base() { - return NoUnit(""); -} - -NoUnit U_EXPORT2 NoUnit::percent() { - return NoUnit("percent"); -} - -NoUnit U_EXPORT2 NoUnit::permille() { - return NoUnit("permille"); -} - -NoUnit::NoUnit(const char* subtype) { - initNoUnit(subtype); -} - -NoUnit::NoUnit(const NoUnit& other) : MeasureUnit(other) { -} - -NoUnit* NoUnit::clone() const { - return new NoUnit(*this); -} - -NoUnit::~NoUnit() { -} - - -U_NAMESPACE_END - -#endif diff --git a/intl/icu/source/i18n/number_asformat.h b/intl/icu/source/i18n/number_asformat.h index 7b0a1dee6f43..3a2fe3185bee 100644 --- a/intl/icu/source/i18n/number_asformat.h +++ b/intl/icu/source/i18n/number_asformat.h @@ -25,7 +25,6 @@ namespace impl { * A wrapper around LocalizedNumberFormatter implementing the Format interface, enabling improved * compatibility with other APIs. * - * @draft ICU 62 * @see NumberFormatter */ class U_I18N_API LocalizedNumberFormatterAsFormat : public Format { diff --git a/intl/icu/source/i18n/number_capi.cpp b/intl/icu/source/i18n/number_capi.cpp index 21a600d6ab1e..4cb56253628d 100644 --- a/intl/icu/source/i18n/number_capi.cpp +++ b/intl/icu/source/i18n/number_capi.cpp @@ -13,6 +13,7 @@ #include "number_utypes.h" #include "numparse_types.h" #include "formattedval_impl.h" +#include "number_decnum.h" #include "unicode/numberformatter.h" #include "unicode/unumberformatter.h" @@ -196,6 +197,23 @@ unumf_resultGetAllFieldPositions(const UFormattedNumber* uresult, UFieldPosition result->fData.getAllFieldPositions(fpih, *ec); } +U_CAPI int32_t U_EXPORT2 +unumf_resultToDecimalNumber( + const UFormattedNumber* uresult, + char* dest, + int32_t destCapacity, + UErrorCode* ec) { + const auto* result = UFormattedNumberApiHelper::validate(uresult, *ec); + if (U_FAILURE(*ec)) { + return 0; + } + DecNum decnum; + return result->fData.quantity + .toDecNum(decnum, *ec) + .toCharString(*ec) + .extract(dest, destCapacity, *ec); +} + U_CAPI void U_EXPORT2 unumf_close(UNumberFormatter* f) { UErrorCode localStatus = U_ZERO_ERROR; diff --git a/intl/icu/source/i18n/number_compact.cpp b/intl/icu/source/i18n/number_compact.cpp index e1fef8feb522..d781b6fada23 100644 --- a/intl/icu/source/i18n/number_compact.cpp +++ b/intl/icu/source/i18n/number_compact.cpp @@ -167,6 +167,11 @@ void CompactData::CompactDataSink::put(const char *key, ResourceValue &value, UB if (U_FAILURE(status)) { return; } for (int i4 = 0; pluralVariantsTable.getKeyAndValue(i4, key, value); ++i4) { + if (uprv_strcmp(key, "0") == 0 || uprv_strcmp(key, "1") == 0) { + // TODO(ICU-21258): Handle this case. For now, skip. + continue; + } + // Skip this magnitude/plural if we already have it from a child locale. // Note: This also skips USE_FALLBACK entries. StandardPlural::Form plural = StandardPlural::fromString(key, status); diff --git a/intl/icu/source/i18n/number_currencysymbols.cpp b/intl/icu/source/i18n/number_currencysymbols.cpp index 4d6fb2cb1d8d..9208427904cc 100644 --- a/intl/icu/source/i18n/number_currencysymbols.cpp +++ b/intl/icu/source/i18n/number_currencysymbols.cpp @@ -44,6 +44,16 @@ UnicodeString CurrencySymbols::getNarrowCurrencySymbol(UErrorCode& status) const return loadSymbol(UCURR_NARROW_SYMBOL_NAME, status); } +UnicodeString CurrencySymbols::getFormalCurrencySymbol(UErrorCode& status) const { + // Note: currently no override is available for formal currency symbol + return loadSymbol(UCURR_FORMAL_SYMBOL_NAME, status); +} + +UnicodeString CurrencySymbols::getVariantCurrencySymbol(UErrorCode& status) const { + // Note: currently no override is available for variant currency symbol + return loadSymbol(UCURR_VARIANT_SYMBOL_NAME, status); +} + UnicodeString CurrencySymbols::getCurrencySymbol(UErrorCode& status) const { if (!fCurrencySymbol.isBogus()) { return fCurrencySymbol; diff --git a/intl/icu/source/i18n/number_currencysymbols.h b/intl/icu/source/i18n/number_currencysymbols.h index 9996bf96ae08..7e38fdf8287e 100644 --- a/intl/icu/source/i18n/number_currencysymbols.h +++ b/intl/icu/source/i18n/number_currencysymbols.h @@ -31,6 +31,10 @@ class U_I18N_API CurrencySymbols : public UMemory { UnicodeString getNarrowCurrencySymbol(UErrorCode& status) const; + UnicodeString getFormalCurrencySymbol(UErrorCode& status) const; + + UnicodeString getVariantCurrencySymbol(UErrorCode& status) const; + UnicodeString getCurrencySymbol(UErrorCode& status) const; UnicodeString getIntlCurrencySymbol(UErrorCode& status) const; diff --git a/intl/icu/source/i18n/number_decimalquantity.cpp b/intl/icu/source/i18n/number_decimalquantity.cpp index 482e93dc7a1a..74547c1842d1 100644 --- a/intl/icu/source/i18n/number_decimalquantity.cpp +++ b/intl/icu/source/i18n/number_decimalquantity.cpp @@ -20,6 +20,7 @@ #include "charstr.h" #include "number_utils.h" #include "uassert.h" +#include "util.h" using namespace icu; using namespace icu::number; @@ -626,7 +627,7 @@ double DecimalQuantity::toDouble() const { &count); } -void DecimalQuantity::toDecNum(DecNum& output, UErrorCode& status) const { +DecNum& DecimalQuantity::toDecNum(DecNum& output, UErrorCode& status) const { // Special handling for zero if (precision == 0) { output.setTo("0", status); @@ -634,11 +635,15 @@ void DecimalQuantity::toDecNum(DecNum& output, UErrorCode& status) const { // Use the BCD constructor. We need to do a little bit of work to convert, though. // The decNumber constructor expects most-significant first, but we store least-significant first. - MaybeStackArray ubcd(precision); + MaybeStackArray ubcd(precision, status); + if (U_FAILURE(status)) { + return output; + } for (int32_t m = 0; m < precision; m++) { ubcd[precision - m - 1] = static_cast(getDigitPos(m)); } output.setTo(ubcd.getAlias(), precision, scale, isNegative(), status); + return output; } void DecimalQuantity::truncate() { @@ -1004,13 +1009,8 @@ void DecimalQuantity::shiftLeft(int32_t numDigits) { } if (usingBytes) { ensureCapacity(precision + numDigits); - int i = precision + numDigits - 1; - for (; i >= numDigits; i--) { - fBCD.bcdBytes.ptr[i] = fBCD.bcdBytes.ptr[i - numDigits]; - } - for (; i >= 0; i--) { - fBCD.bcdBytes.ptr[i] = 0; - } + uprv_memmove(fBCD.bcdBytes.ptr + numDigits, fBCD.bcdBytes.ptr, precision); + uprv_memset(fBCD.bcdBytes.ptr, 0, numDigits); } else { fBCD.bcdLong <<= (numDigits * 4); } @@ -1324,7 +1324,11 @@ bool DecimalQuantity::operator==(const DecimalQuantity& other) const { } UnicodeString DecimalQuantity::toString() const { - MaybeStackArray digits(precision + 1); + UErrorCode localStatus = U_ZERO_ERROR; + MaybeStackArray digits(precision + 1, localStatus); + if (U_FAILURE(localStatus)) { + return ICU_Utility::makeBogusString(); + } for (int32_t i = 0; i < precision; i++) { digits[i] = getDigitPos(precision - i - 1) + '0'; } diff --git a/intl/icu/source/i18n/number_decimalquantity.h b/intl/icu/source/i18n/number_decimalquantity.h index d9b35c033668..5ab680e6d734 100644 --- a/intl/icu/source/i18n/number_decimalquantity.h +++ b/intl/icu/source/i18n/number_decimalquantity.h @@ -20,7 +20,7 @@ namespace impl { class DecNum; /** - * An class for representing a number to be processed by the decimal formatting pipeline. Includes + * A class for representing a number to be processed by the decimal formatting pipeline. Includes * methods for rounding, plural rules, and decimal digit extraction. * *

    By design, this is NOT IMMUTABLE and NOT THREAD SAFE. It is intended to be an intermediate @@ -209,7 +209,7 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory { double toDouble() const; /** Computes a DecNum representation of this DecimalQuantity, saving it to the output parameter. */ - void toDecNum(DecNum& output, UErrorCode& status) const; + DecNum& toDecNum(DecNum& output, UErrorCode& status) const; DecimalQuantity &setToInt(int32_t n); @@ -217,7 +217,13 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory { DecimalQuantity &setToDouble(double n); - /** decNumber is similar to BigDecimal in Java. */ + /** + * Produces a DecimalQuantity that was parsed from a string by the decNumber + * C Library. + * + * decNumber is similar to BigDecimal in Java, and supports parsing strings + * such as "123.456621E+40". + */ DecimalQuantity &setToDecNumber(StringPiece n, UErrorCode& status); /** Internal method if the caller already has a DecNum. */ diff --git a/intl/icu/source/i18n/number_decnum.h b/intl/icu/source/i18n/number_decnum.h index 0c7399dbddd4..3bb8d1078079 100644 --- a/intl/icu/source/i18n/number_decnum.h +++ b/intl/icu/source/i18n/number_decnum.h @@ -9,6 +9,7 @@ #include "decNumber.h" #include "charstr.h" +#include "bytesinkutil.h" U_NAMESPACE_BEGIN @@ -57,6 +58,13 @@ class U_I18N_API DecNum : public UMemory { void toString(ByteSink& output, UErrorCode& status) const; + inline CharString toCharString(UErrorCode& status) const { + CharString cstr; + CharStringByteSink sink(&cstr); + toString(sink, status); + return cstr; + } + inline const decNumber* getRawDecNumber() const { return fData.getAlias(); } diff --git a/intl/icu/source/i18n/number_fluent.cpp b/intl/icu/source/i18n/number_fluent.cpp index 9cdb8b7156e6..8569a36e5b26 100644 --- a/intl/icu/source/i18n/number_fluent.cpp +++ b/intl/icu/source/i18n/number_fluent.cpp @@ -13,6 +13,7 @@ #include "number_asformat.h" #include "number_utils.h" #include "number_utypes.h" +#include "number_mapper.h" #include "util.h" #include "fphdlimp.h" @@ -273,6 +274,20 @@ Derived NumberFormatterSettings::scale(const Scale& scale)&& { return move; } +template +Derived NumberFormatterSettings::usage(const StringPiece usage) const& { + Derived copy(*this); + copy.fMacros.usage.set(usage); + return copy; +} + +template +Derived NumberFormatterSettings::usage(const StringPiece usage)&& { + Derived move(std::move(*this)); + move.fMacros.usage.set(usage); + return move; +} + template Derived NumberFormatterSettings::padding(const Padder& padder) const& { Derived copy(*this); @@ -400,7 +415,8 @@ LocalizedNumberFormatter::LocalizedNumberFormatter(const LNF& other) LocalizedNumberFormatter::LocalizedNumberFormatter(const NFS& other) : NFS(other) { - // No additional fields to assign (let call count and compiled formatter reset to defaults) + UErrorCode localStatus = U_ZERO_ERROR; // Can't bubble up the error + lnfCopyHelper(static_cast(other), localStatus); } LocalizedNumberFormatter::LocalizedNumberFormatter(LocalizedNumberFormatter&& src) U_NOEXCEPT @@ -408,38 +424,25 @@ LocalizedNumberFormatter::LocalizedNumberFormatter(LocalizedNumberFormatter&& sr LocalizedNumberFormatter::LocalizedNumberFormatter(NFS&& src) U_NOEXCEPT : NFS(std::move(src)) { - // For the move operators, copy over the compiled formatter. - // Note: if the formatter is not compiled, call count information is lost. - if (static_cast(src).fCompiled != nullptr) { - lnfMoveHelper(static_cast(src)); - } + lnfMoveHelper(std::move(static_cast(src))); } LocalizedNumberFormatter& LocalizedNumberFormatter::operator=(const LNF& other) { NFS::operator=(static_cast&>(other)); - // Reset to default values. - clear(); + UErrorCode localStatus = U_ZERO_ERROR; // Can't bubble up the error + lnfCopyHelper(other, localStatus); return *this; } LocalizedNumberFormatter& LocalizedNumberFormatter::operator=(LNF&& src) U_NOEXCEPT { NFS::operator=(static_cast&&>(src)); - // For the move operators, copy over the compiled formatter. - // Note: if the formatter is not compiled, call count information is lost. - if (static_cast(src).fCompiled != nullptr) { - // Formatter is compiled - lnfMoveHelper(static_cast(src)); - } else { - clear(); - } + lnfMoveHelper(std::move(src)); return *this; } -void LocalizedNumberFormatter::clear() { - // Reset to default values. +void LocalizedNumberFormatter::resetCompiled() { auto* callCount = reinterpret_cast(fUnsafeCallCount); umtx_storeRelease(*callCount, 0); - delete fCompiled; fCompiled = nullptr; } @@ -447,19 +450,56 @@ void LocalizedNumberFormatter::lnfMoveHelper(LNF&& src) { // Copy over the compiled formatter and set call count to INT32_MIN as in computeCompiled(). // Don't copy the call count directly because doing so requires a loadAcquire/storeRelease. // The bits themselves appear to be platform-dependent, so copying them might not be safe. - auto* callCount = reinterpret_cast(fUnsafeCallCount); - umtx_storeRelease(*callCount, INT32_MIN); delete fCompiled; - fCompiled = src.fCompiled; - // Reset the source object to leave it in a safe state. - auto* srcCallCount = reinterpret_cast(src.fUnsafeCallCount); - umtx_storeRelease(*srcCallCount, 0); - src.fCompiled = nullptr; + if (src.fCompiled != nullptr) { + auto* callCount = reinterpret_cast(fUnsafeCallCount); + umtx_storeRelease(*callCount, INT32_MIN); + fCompiled = src.fCompiled; + // Reset the source object to leave it in a safe state. + src.resetCompiled(); + } else { + resetCompiled(); + } + + // Unconditionally move the warehouse + delete fWarehouse; + fWarehouse = src.fWarehouse; + src.fWarehouse = nullptr; +} + +void LocalizedNumberFormatter::lnfCopyHelper(const LNF&, UErrorCode& status) { + // When copying, always reset the compiled formatter. + delete fCompiled; + resetCompiled(); + + // If MacroProps has a reference to AffixPatternProvider, we need to copy it. + // If MacroProps has a reference to PluralRules, copy that one, too. + delete fWarehouse; + if (fMacros.affixProvider || fMacros.rules) { + LocalPointer warehouse(new DecimalFormatWarehouse(), status); + if (U_FAILURE(status)) { + fWarehouse = nullptr; + return; + } + if (fMacros.affixProvider) { + warehouse->affixProvider.setTo(fMacros.affixProvider, status); + fMacros.affixProvider = &warehouse->affixProvider.get(); + } + if (fMacros.rules) { + warehouse->rules.adoptInsteadAndCheckErrorCode( + new PluralRules(*fMacros.rules), status); + fMacros.rules = warehouse->rules.getAlias(); + } + fWarehouse = warehouse.orphan(); + } else { + fWarehouse = nullptr; + } } LocalizedNumberFormatter::~LocalizedNumberFormatter() { delete fCompiled; + delete fWarehouse; } LocalizedNumberFormatter::LocalizedNumberFormatter(const MacroProps& macros, const Locale& locale) { @@ -480,123 +520,6 @@ LocalizedNumberFormatter UnlocalizedNumberFormatter::locale(const Locale& locale return LocalizedNumberFormatter(std::move(fMacros), locale); } -SymbolsWrapper::SymbolsWrapper(const SymbolsWrapper& other) { - doCopyFrom(other); -} - -SymbolsWrapper::SymbolsWrapper(SymbolsWrapper&& src) U_NOEXCEPT { - doMoveFrom(std::move(src)); -} - -SymbolsWrapper& SymbolsWrapper::operator=(const SymbolsWrapper& other) { - if (this == &other) { - return *this; - } - doCleanup(); - doCopyFrom(other); - return *this; -} - -SymbolsWrapper& SymbolsWrapper::operator=(SymbolsWrapper&& src) U_NOEXCEPT { - if (this == &src) { - return *this; - } - doCleanup(); - doMoveFrom(std::move(src)); - return *this; -} - -SymbolsWrapper::~SymbolsWrapper() { - doCleanup(); -} - -void SymbolsWrapper::setTo(const DecimalFormatSymbols& dfs) { - doCleanup(); - fType = SYMPTR_DFS; - fPtr.dfs = new DecimalFormatSymbols(dfs); -} - -void SymbolsWrapper::setTo(const NumberingSystem* ns) { - doCleanup(); - fType = SYMPTR_NS; - fPtr.ns = ns; -} - -void SymbolsWrapper::doCopyFrom(const SymbolsWrapper& other) { - fType = other.fType; - switch (fType) { - case SYMPTR_NONE: - // No action necessary - break; - case SYMPTR_DFS: - // Memory allocation failures are exposed in copyErrorTo() - if (other.fPtr.dfs != nullptr) { - fPtr.dfs = new DecimalFormatSymbols(*other.fPtr.dfs); - } else { - fPtr.dfs = nullptr; - } - break; - case SYMPTR_NS: - // Memory allocation failures are exposed in copyErrorTo() - if (other.fPtr.ns != nullptr) { - fPtr.ns = new NumberingSystem(*other.fPtr.ns); - } else { - fPtr.ns = nullptr; - } - break; - } -} - -void SymbolsWrapper::doMoveFrom(SymbolsWrapper&& src) { - fType = src.fType; - switch (fType) { - case SYMPTR_NONE: - // No action necessary - break; - case SYMPTR_DFS: - fPtr.dfs = src.fPtr.dfs; - src.fPtr.dfs = nullptr; - break; - case SYMPTR_NS: - fPtr.ns = src.fPtr.ns; - src.fPtr.ns = nullptr; - break; - } -} - -void SymbolsWrapper::doCleanup() { - switch (fType) { - case SYMPTR_NONE: - // No action necessary - break; - case SYMPTR_DFS: - delete fPtr.dfs; - break; - case SYMPTR_NS: - delete fPtr.ns; - break; - } -} - -bool SymbolsWrapper::isDecimalFormatSymbols() const { - return fType == SYMPTR_DFS; -} - -bool SymbolsWrapper::isNumberingSystem() const { - return fType == SYMPTR_NS; -} - -const DecimalFormatSymbols* SymbolsWrapper::getDecimalFormatSymbols() const { - U_ASSERT(fType == SYMPTR_DFS); - return fPtr.dfs; -} - -const NumberingSystem* SymbolsWrapper::getNumberingSystem() const { - U_ASSERT(fType == SYMPTR_NS); - return fPtr.ns; -} - - FormattedNumber LocalizedNumberFormatter::formatInt(int64_t value, UErrorCode& status) const { if (U_FAILURE(status)) { return FormattedNumber(U_ILLEGAL_ARGUMENT_ERROR); } auto results = new UFormattedNumberData(); @@ -676,9 +599,9 @@ LocalizedNumberFormatter::formatDecimalQuantity(const DecimalQuantity& dq, UErro void LocalizedNumberFormatter::formatImpl(impl::UFormattedNumberData* results, UErrorCode& status) const { if (computeCompiled(status)) { - fCompiled->format(results->quantity, results->getStringRef(), status); + fCompiled->format(results, status); } else { - NumberFormatterImpl::formatStatic(fMacros, results->quantity, results->getStringRef(), status); + NumberFormatterImpl::formatStatic(fMacros, results, status); } if (U_FAILURE(status)) { return; diff --git a/intl/icu/source/i18n/number_formatimpl.cpp b/intl/icu/source/i18n/number_formatimpl.cpp index 5bba09cfb529..9a9f3c8b71e0 100644 --- a/intl/icu/source/i18n/number_formatimpl.cpp +++ b/intl/icu/source/i18n/number_formatimpl.cpp @@ -25,20 +25,20 @@ using namespace icu::number; using namespace icu::number::impl; -MicroPropsGenerator::~MicroPropsGenerator() = default; - - NumberFormatterImpl::NumberFormatterImpl(const MacroProps& macros, UErrorCode& status) : NumberFormatterImpl(macros, true, status) { } -int32_t NumberFormatterImpl::formatStatic(const MacroProps& macros, DecimalQuantity& inValue, - FormattedStringBuilder& outString, UErrorCode& status) { +int32_t NumberFormatterImpl::formatStatic(const MacroProps ¯os, UFormattedNumberData *results, + UErrorCode &status) { + DecimalQuantity &inValue = results->quantity; + FormattedStringBuilder &outString = results->getStringRef(); NumberFormatterImpl impl(macros, false, status); MicroProps& micros = impl.preProcessUnsafe(inValue, status); if (U_FAILURE(status)) { return 0; } int32_t length = writeNumber(micros, inValue, outString, 0, status); length += writeAffixes(micros, outString, 0, length, status); + results->outputUnit = std::move(micros.outputUnit); return length; } @@ -54,13 +54,15 @@ int32_t NumberFormatterImpl::getPrefixSuffixStatic(const MacroProps& macros, Sig // The "unsafe" method simply re-uses fMicros, eliminating the extra copy operation. // See MicroProps::processQuantity() for details. -int32_t NumberFormatterImpl::format(DecimalQuantity& inValue, FormattedStringBuilder& outString, - UErrorCode& status) const { +int32_t NumberFormatterImpl::format(UFormattedNumberData *results, UErrorCode &status) const { + DecimalQuantity &inValue = results->quantity; + FormattedStringBuilder &outString = results->getStringRef(); MicroProps micros; preProcess(inValue, micros, status); if (U_FAILURE(status)) { return 0; } int32_t length = writeNumber(micros, inValue, outString, 0, status); length += writeAffixes(micros, outString, 0, length, status); + results->outputUnit = std::move(micros.outputUnit); return length; } @@ -130,9 +132,10 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, // Pre-compute a few values for efficiency. bool isCurrency = utils::unitIsCurrency(macros.unit); - bool isNoUnit = utils::unitIsNoUnit(macros.unit); + bool isBaseUnit = utils::unitIsBaseUnit(macros.unit); bool isPercent = utils::unitIsPercent(macros.unit); bool isPermille = utils::unitIsPermille(macros.unit); + bool isCompactNotation = macros.notation.fType == Notation::NTN_COMPACT; bool isAccounting = macros.sign == UNUM_SIGN_ACCOUNTING || macros.sign == UNUM_SIGN_ACCOUNTING_ALWAYS || macros.sign == UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO; @@ -144,8 +147,20 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, if (macros.unitWidth != UNUM_UNIT_WIDTH_COUNT) { unitWidth = macros.unitWidth; } - bool isCldrUnit = !isCurrency && !isNoUnit && - (unitWidth == UNUM_UNIT_WIDTH_FULL_NAME || !(isPercent || isPermille)); + // Use CLDR unit data for all MeasureUnits (not currency and not + // no-unit), except use the dedicated percent pattern for percent and + // permille. However, use the CLDR unit data for percent/permille if a + // long name was requested OR if compact notation is being used, since + // compact notation overrides the middle modifier (micros.modMiddle) + // normally used for the percent pattern. + bool isCldrUnit = !isCurrency + && !isBaseUnit + && (unitWidth == UNUM_UNIT_WIDTH_FULL_NAME + || !(isPercent || isPermille) + || isCompactNotation + ); + bool isMixedUnit = isCldrUnit && (uprv_strcmp(macros.unit.getType(), "") == 0) && + macros.unit.getComplexity(status) == UMEASURE_UNIT_MIXED; // Select the numbering system. LocalPointer nsLocal; @@ -222,6 +237,27 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, /// START POPULATING THE DEFAULT MICROPROPS AND BUILDING THE MICROPROPS GENERATOR /// ///////////////////////////////////////////////////////////////////////////////////// + // Unit Preferences and Conversions as our first step + if (macros.usage.isSet()) { + if (!isCldrUnit) { + // We only support "usage" when the input unit is specified, and is + // a CLDR Unit. + status = U_ILLEGAL_ARGUMENT_ERROR; + return nullptr; + } + auto usagePrefsHandler = + new UsagePrefsHandler(macros.locale, macros.unit, macros.usage.fUsage, chain, status); + fUsagePrefsHandler.adoptInsteadAndCheckErrorCode(usagePrefsHandler, status); + chain = fUsagePrefsHandler.getAlias(); + } else if (isMixedUnit) { + MeasureUnitImpl temp; + const MeasureUnitImpl &outputUnit = MeasureUnitImpl::forMeasureUnit(macros.unit, temp, status); + auto unitConversionHandler = + new UnitConversionHandler(outputUnit.units[0]->build(status), macros.unit, chain, status); + fUnitConversionHandler.adoptInsteadAndCheckErrorCode(unitConversionHandler, status); + chain = fUnitConversionHandler.getAlias(); + } + // Multiplier if (macros.scale.isValid()) { fMicros.helpers.multiplier.setAndChain(macros.scale, chain); @@ -232,20 +268,18 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, Precision precision; if (!macros.precision.isBogus()) { precision = macros.precision; - } else if (macros.notation.fType == Notation::NTN_COMPACT) { + } else if (isCompactNotation) { precision = Precision::integer().withMinDigits(2); } else if (isCurrency) { precision = Precision::currency(UCURR_USAGE_STANDARD); + } else if (macros.usage.isSet()) { + // Bogus Precision - it will get set in the UsagePrefsHandler instead + precision = Precision(); } else { precision = Precision::maxFraction(6); } UNumberFormatRoundingMode roundingMode; - if (macros.roundingMode != kDefaultMode) { - roundingMode = macros.roundingMode; - } else { - // Temporary until ICU 64 - roundingMode = precision.fRoundingMode; - } + roundingMode = macros.roundingMode; fMicros.rounder = {precision, roundingMode, currency, status}; if (U_FAILURE(status)) { return nullptr; @@ -254,7 +288,7 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, // Grouping strategy if (!macros.grouper.isBogus()) { fMicros.grouping = macros.grouper; - } else if (macros.notation.fType == Notation::NTN_COMPACT) { + } else if (isCompactNotation) { // Compact notation uses minGrouping by default since ICU 59 fMicros.grouping = Grouper::forStrategy(UNUM_GROUPING_MIN2); } else { @@ -330,7 +364,8 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, patternModifier->setSymbols(fMicros.symbols, currency, unitWidth, nullptr, status); } if (safe) { - fImmutablePatternModifier.adoptInstead(patternModifier->createImmutable(status)); + fImmutablePatternModifier.adoptInsteadAndCheckErrorCode(patternModifier->createImmutable(status), + status); } if (U_FAILURE(status)) { return nullptr; @@ -338,24 +373,34 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, // Outer modifier (CLDR units and currency long names) if (isCldrUnit) { - fLongNameHandler.adoptInstead( - LongNameHandler::forMeasureUnit( - macros.locale, - macros.unit, - macros.perUnit, - unitWidth, - resolvePluralRules(macros.rules, macros.locale, status), - chain, - status)); - chain = fLongNameHandler.getAlias(); + if (macros.usage.isSet()) { + fLongNameMultiplexer.adoptInsteadAndCheckErrorCode( + LongNameMultiplexer::forMeasureUnits( + macros.locale, *fUsagePrefsHandler->getOutputUnits(), unitWidth, + resolvePluralRules(macros.rules, macros.locale, status), chain, status), + status); + chain = fLongNameMultiplexer.getAlias(); + } else if (isMixedUnit) { + fMixedUnitLongNameHandler.adoptInsteadAndCheckErrorCode(new MixedUnitLongNameHandler(), + status); + MixedUnitLongNameHandler::forMeasureUnit( + macros.locale, macros.unit, unitWidth, + resolvePluralRules(macros.rules, macros.locale, status), chain, + fMixedUnitLongNameHandler.getAlias(), status); + chain = fMixedUnitLongNameHandler.getAlias(); + } else { + fLongNameHandler.adoptInsteadAndCheckErrorCode(new LongNameHandler(), status); + LongNameHandler::forMeasureUnit(macros.locale, macros.unit, macros.perUnit, unitWidth, + resolvePluralRules(macros.rules, macros.locale, status), + chain, fLongNameHandler.getAlias(), status); + chain = fLongNameHandler.getAlias(); + } } else if (isCurrency && unitWidth == UNUM_UNIT_WIDTH_FULL_NAME) { - fLongNameHandler.adoptInstead( - LongNameHandler::forCurrencyLongNames( - macros.locale, - currency, - resolvePluralRules(macros.rules, macros.locale, status), - chain, - status)); + fLongNameHandler.adoptInsteadAndCheckErrorCode( + LongNameHandler::forCurrencyLongNames( + macros.locale, currency, resolvePluralRules(macros.rules, macros.locale, status), chain, + status), + status); chain = fLongNameHandler.getAlias(); } else { // No outer modifier required @@ -366,7 +411,7 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, } // Compact notation - if (macros.notation.fType == Notation::NTN_COMPACT) { + if (isCompactNotation) { CompactType compactType = (isCurrency && unitWidth != UNUM_UNIT_WIDTH_FULL_NAME) ? CompactType::TYPE_CURRENCY : CompactType::TYPE_DECIMAL; auto newCompactHandler = new CompactHandler( @@ -379,6 +424,9 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, safe, chain, status); + if (U_FAILURE(status)) { + return nullptr; + } if (newCompactHandler == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return nullptr; @@ -417,6 +465,7 @@ NumberFormatterImpl::resolvePluralRules(const PluralRules* rulesPtr, const Local int32_t NumberFormatterImpl::writeAffixes(const MicroProps& micros, FormattedStringBuilder& string, int32_t start, int32_t end, UErrorCode& status) { + U_ASSERT(micros.modOuter != nullptr); // Always apply the inner modifier (which is "strong"). int32_t length = micros.modInner->apply(string, start, end, status); if (micros.padding.isValid()) { diff --git a/intl/icu/source/i18n/number_formatimpl.h b/intl/icu/source/i18n/number_formatimpl.h index 084bc4a9d0b2..5cd549e54a36 100644 --- a/intl/icu/source/i18n/number_formatimpl.h +++ b/intl/icu/source/i18n/number_formatimpl.h @@ -10,11 +10,13 @@ #include "number_types.h" #include "formatted_string_builder.h" #include "number_patternstring.h" +#include "number_usageprefs.h" #include "number_utils.h" #include "number_patternmodifier.h" #include "number_longnames.h" #include "number_compact.h" #include "number_microprops.h" +#include "number_utypes.h" U_NAMESPACE_BEGIN namespace number { namespace impl { @@ -34,9 +36,8 @@ class NumberFormatterImpl : public UMemory { /** * Builds and evaluates an "unsafe" MicroPropsGenerator, which is cheaper but can be used only once. */ - static int32_t - formatStatic(const MacroProps ¯os, DecimalQuantity &inValue, FormattedStringBuilder &outString, - UErrorCode &status); + static int32_t formatStatic(const MacroProps ¯os, UFormattedNumberData *results, + UErrorCode &status); /** * Prints only the prefix and suffix; used for DecimalFormat getters. @@ -51,7 +52,7 @@ class NumberFormatterImpl : public UMemory { /** * Evaluates the "safe" MicroPropsGenerator created by "fromMacros". */ - int32_t format(DecimalQuantity& inValue, FormattedStringBuilder& outString, UErrorCode& status) const; + int32_t format(UFormattedNumberData *results, UErrorCode &status) const; /** * Like format(), but saves the result into an output MicroProps without additional processing. @@ -82,7 +83,9 @@ class NumberFormatterImpl : public UMemory { int32_t end, UErrorCode& status); private: - // Head of the MicroPropsGenerator linked list: + // Head of the MicroPropsGenerator linked list. Subclasses' processQuantity + // methods process this list in a parent-first order, such that the last + // item added, which this points to, typically has its logic executed last. const MicroPropsGenerator *fMicroPropsGenerator = nullptr; // Tail of the list: @@ -90,13 +93,20 @@ class NumberFormatterImpl : public UMemory { // Other fields possibly used by the number formatting pipeline: // TODO: Convert more of these LocalPointers to value objects to reduce the number of news? + LocalPointer fUsagePrefsHandler; + LocalPointer fUnitConversionHandler; LocalPointer fSymbols; LocalPointer fRules; LocalPointer fPatternInfo; LocalPointer fScientificHandler; LocalPointer fPatternModifier; LocalPointer fImmutablePatternModifier; - LocalPointer fLongNameHandler; + LocalPointer fLongNameHandler; + // TODO: use a common base class that enables fLongNameHandler, + // fLongNameMultiplexer, and fMixedUnitLongNameHandler to be merged into one + // member? + LocalPointer fMixedUnitLongNameHandler; + LocalPointer fLongNameMultiplexer; LocalPointer fCompactHandler; // Value objects possibly used by the number formatting pipeline: diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp index 41f727a458f9..6b1642cfd34a 100644 --- a/intl/icu/source/i18n/number_grouping.cpp +++ b/intl/icu/source/i18n/number_grouping.cpp @@ -64,6 +64,13 @@ Grouper Grouper::forProperties(const DecimalFormatProperties& properties) { } void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) { + if (fMinGrouping == -2) { + fMinGrouping = getMinGroupingForLocale(locale); + } else if (fMinGrouping == -3) { + fMinGrouping = static_cast(uprv_max(2, getMinGroupingForLocale(locale))); + } else { + // leave fMinGrouping alone + } if (fGrouping1 != -2 && fGrouping2 != -4) { return; } @@ -76,13 +83,6 @@ void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Lo if (grouping3 == -1) { grouping2 = grouping1; } - if (fMinGrouping == -2) { - fMinGrouping = getMinGroupingForLocale(locale); - } else if (fMinGrouping == -3) { - fMinGrouping = static_cast(uprv_max(2, getMinGroupingForLocale(locale))); - } else { - // leave fMinGrouping alone - } fGrouping1 = grouping1; fGrouping2 = grouping2; } diff --git a/intl/icu/source/i18n/number_integerwidth.cpp b/intl/icu/source/i18n/number_integerwidth.cpp index d62aef444dca..10b853423c84 100644 --- a/intl/icu/source/i18n/number_integerwidth.cpp +++ b/intl/icu/source/i18n/number_integerwidth.cpp @@ -40,6 +40,9 @@ IntegerWidth IntegerWidth::truncateAt(int32_t maxInt) { } void IntegerWidth::apply(impl::DecimalQuantity& quantity, UErrorCode& status) const { + if (U_FAILURE(status)) { + return; + } if (fHasError) { status = U_ILLEGAL_ARGUMENT_ERROR; } else if (fUnion.minMaxInt.fMaxInt == -1) { diff --git a/intl/icu/source/i18n/number_longnames.cpp b/intl/icu/source/i18n/number_longnames.cpp index bb32d0381a50..3891d532dea8 100644 --- a/intl/icu/source/i18n/number_longnames.cpp +++ b/intl/icu/source/i18n/number_longnames.cpp @@ -10,6 +10,7 @@ #include "ureslocs.h" #include "charstr.h" #include "uresimp.h" +#include "measunit_impl.h" #include "number_longnames.h" #include "number_microprops.h" #include @@ -22,8 +23,23 @@ using namespace icu::number::impl; namespace { +/** + * Display Name (this format has no placeholder). + * + * Used as an index into the LongNameHandler::simpleFormats array. Units + * resources cover the normal set of PluralRules keys, as well as `dnam` and + * `per` forms. + */ constexpr int32_t DNAM_INDEX = StandardPlural::Form::COUNT; +/** + * "per" form (e.g. "{0} per day" is day's "per" form). + * + * Used as an index into the LongNameHandler::simpleFormats array. Units + * resources cover the normal set of PluralRules keys, as well as `dnam` and + * `per` forms. + */ constexpr int32_t PER_INDEX = StandardPlural::Form::COUNT + 1; +// Number of keys in the array populated by PluralTableSink. constexpr int32_t ARRAY_LENGTH = StandardPlural::Form::COUNT + 2; static int32_t getIndex(const char* pluralKeyword, UErrorCode& status) { @@ -38,6 +54,11 @@ static int32_t getIndex(const char* pluralKeyword, UErrorCode& status) { } } +// Selects a string out of the `strings` array which corresponds to the +// specified plural form, with fallback to the OTHER form. +// +// The `strings` array must have ARRAY_LENGTH items: one corresponding to each +// of the plural forms, plus a display name ("dnam") and a "per" form. static UnicodeString getWithPlural( const UnicodeString* strings, StandardPlural::Form plural, @@ -87,6 +108,18 @@ class PluralTableSink : public ResourceSink { // NOTE: outArray MUST have room for all StandardPlural values. No bounds checking is performed. +/** + * Populates outArray with `locale`-specific values for `unit` through use of + * PluralTableSink. Only the set of basic units are supported! + * + * Reading from resources *unitsNarrow* and *unitsShort* (for width + * UNUM_UNIT_WIDTH_NARROW), or just *unitsShort* (for width + * UNUM_UNIT_WIDTH_SHORT). For other widths, it reads just "units". + * + * @param unit must have a type and subtype (i.e. it must be a unit listed in + * gTypes and gSubTypes in measunit.cpp). + * @param outArray must be of fixed length ARRAY_LENGTH. + */ void getMeasureData(const Locale &locale, const MeasureUnit &unit, const UNumberUnitWidth &width, UnicodeString *outArray, UErrorCode &status) { PluralTableSink sink(outArray); @@ -184,78 +217,107 @@ UnicodeString getPerUnitFormat(const Locale& locale, const UNumberUnitWidth &wid } // namespace -LongNameHandler* -LongNameHandler::forMeasureUnit(const Locale &loc, const MeasureUnit &unitRef, const MeasureUnit &perUnit, - const UNumberUnitWidth &width, const PluralRules *rules, - const MicroPropsGenerator *parent, UErrorCode &status) { - if (uprv_strlen(unitRef.getType()) == 0 || uprv_strlen(perUnit.getType()) == 0) { - // TODO(ICU-20941): Unsanctioned unit. Not yet fully supported. Set an error code. - status = U_UNSUPPORTED_ERROR; - return nullptr; - } +void LongNameHandler::forMeasureUnit(const Locale &loc, const MeasureUnit &unitRef, + const MeasureUnit &perUnit, const UNumberUnitWidth &width, + const PluralRules *rules, const MicroPropsGenerator *parent, + LongNameHandler *fillIn, UErrorCode &status) { + // Not valid for mixed units that aren't built-in units, and there should + // not be any built-in mixed units! + U_ASSERT(uprv_strcmp(unitRef.getType(), "") != 0 || + unitRef.getComplexity(status) != UMEASURE_UNIT_MIXED); + U_ASSERT(fillIn != nullptr); MeasureUnit unit = unitRef; if (uprv_strcmp(perUnit.getType(), "none") != 0) { // Compound unit: first try to simplify (e.g., meters per second is its own unit). - bool isResolved = false; - MeasureUnit resolved = MeasureUnit::resolveUnitPerUnit(unit, perUnit, &isResolved); - if (isResolved) { - unit = resolved; + MeasureUnit simplified = unit.product(perUnit.reciprocal(status), status); + if (uprv_strcmp(simplified.getType(), "") != 0) { + unit = simplified; } else { // No simplified form is available. - return forCompoundUnit(loc, unit, perUnit, width, rules, parent, status); + forCompoundUnit(loc, unit, perUnit, width, rules, parent, fillIn, status); + return; } } - auto* result = new LongNameHandler(rules, parent); - if (result == nullptr) { - status = U_MEMORY_ALLOCATION_ERROR; - return nullptr; + if (uprv_strcmp(unit.getType(), "") == 0) { + // TODO(ICU-20941): Unsanctioned unit. Not yet fully supported. Set an + // error code. Once we support not-built-in units here, unitRef may be + // anything, but if not built-in, perUnit has to be "none". + status = U_UNSUPPORTED_ERROR; + return; } + UnicodeString simpleFormats[ARRAY_LENGTH]; getMeasureData(loc, unit, width, simpleFormats, status); - if (U_FAILURE(status)) { return result; } - result->simpleFormatsToModifiers(simpleFormats, {UFIELD_CATEGORY_NUMBER, UNUM_MEASURE_UNIT_FIELD}, status); - return result; + if (U_FAILURE(status)) { + return; + } + fillIn->rules = rules; + fillIn->parent = parent; + fillIn->simpleFormatsToModifiers(simpleFormats, {UFIELD_CATEGORY_NUMBER, UNUM_MEASURE_UNIT_FIELD}, + status); } -LongNameHandler* -LongNameHandler::forCompoundUnit(const Locale &loc, const MeasureUnit &unit, const MeasureUnit &perUnit, - const UNumberUnitWidth &width, const PluralRules *rules, - const MicroPropsGenerator *parent, UErrorCode &status) { - auto* result = new LongNameHandler(rules, parent); - if (result == nullptr) { - status = U_MEMORY_ALLOCATION_ERROR; - return nullptr; +void LongNameHandler::forCompoundUnit(const Locale &loc, const MeasureUnit &unit, + const MeasureUnit &perUnit, const UNumberUnitWidth &width, + const PluralRules *rules, const MicroPropsGenerator *parent, + LongNameHandler *fillIn, UErrorCode &status) { + if (uprv_strcmp(unit.getType(), "") == 0 || uprv_strcmp(perUnit.getType(), "") == 0) { + // TODO(ICU-20941): Unsanctioned unit. Not yet fully supported. Set an + // error code. Once we support not-built-in units here, unitRef may be + // anything, but if not built-in, perUnit has to be "none". + status = U_UNSUPPORTED_ERROR; + return; + } + if (fillIn == nullptr) { + status = U_INTERNAL_PROGRAM_ERROR; + return; } UnicodeString primaryData[ARRAY_LENGTH]; getMeasureData(loc, unit, width, primaryData, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } UnicodeString secondaryData[ARRAY_LENGTH]; getMeasureData(loc, perUnit, width, secondaryData, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } UnicodeString perUnitFormat; if (!secondaryData[PER_INDEX].isBogus()) { perUnitFormat = secondaryData[PER_INDEX]; } else { UnicodeString rawPerUnitFormat = getPerUnitFormat(loc, width, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } // rawPerUnitFormat is something like "{0}/{1}"; we need to substitute in the secondary unit. SimpleFormatter compiled(rawPerUnitFormat, 2, 2, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } UnicodeString secondaryFormat = getWithPlural(secondaryData, StandardPlural::Form::ONE, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } // Some "one" pattern may not contain "{0}". For example in "ar" or "ne" locale. SimpleFormatter secondaryCompiled(secondaryFormat, 0, 1, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } UnicodeString secondaryString = secondaryCompiled.getTextWithNoArguments().trim(); // TODO: Why does UnicodeString need to be explicit in the following line? compiled.format(UnicodeString(u"{0}"), secondaryString, perUnitFormat, status); - if (U_FAILURE(status)) { return result; } + if (U_FAILURE(status)) { + return; + } } - result->multiSimpleFormatsToModifiers(primaryData, perUnitFormat, {UFIELD_CATEGORY_NUMBER, UNUM_MEASURE_UNIT_FIELD}, status); - return result; + fillIn->rules = rules; + fillIn->parent = parent; + fillIn->multiSimpleFormatsToModifiers(primaryData, perUnitFormat, + {UFIELD_CATEGORY_NUMBER, UNUM_MEASURE_UNIT_FIELD}, status); } UnicodeString LongNameHandler::getUnitDisplayName( @@ -338,7 +400,9 @@ void LongNameHandler::multiSimpleFormatsToModifiers(const UnicodeString *leadFor void LongNameHandler::processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const { - parent->processQuantity(quantity, micros, status); + if (parent != NULL) { + parent->processQuantity(quantity, micros, status); + } StandardPlural::Form pluralForm = utils::getPluralSafe(micros.rounder, rules, quantity, status); micros.modOuter = &fModifiers[pluralForm]; } @@ -347,4 +411,199 @@ const Modifier* LongNameHandler::getModifier(Signum /*signum*/, StandardPlural:: return &fModifiers[plural]; } +void MixedUnitLongNameHandler::forMeasureUnit(const Locale &loc, const MeasureUnit &mixedUnit, + const UNumberUnitWidth &width, const PluralRules *rules, + const MicroPropsGenerator *parent, + MixedUnitLongNameHandler *fillIn, UErrorCode &status) { + U_ASSERT(mixedUnit.getComplexity(status) == UMEASURE_UNIT_MIXED); + U_ASSERT(fillIn != nullptr); + + MeasureUnitImpl temp; + const MeasureUnitImpl& impl = MeasureUnitImpl::forMeasureUnit(mixedUnit, temp, status); + fillIn->fMixedUnitCount = impl.units.length(); + fillIn->fMixedUnitData.adoptInstead(new UnicodeString[fillIn->fMixedUnitCount * ARRAY_LENGTH]); + for (int32_t i = 0; i < fillIn->fMixedUnitCount; i++) { + // Grab data for each of the components. + UnicodeString *unitData = &fillIn->fMixedUnitData[i * ARRAY_LENGTH]; + getMeasureData(loc, impl.units[i]->build(status), width, unitData, status); + } + + UListFormatterWidth listWidth = ULISTFMT_WIDTH_SHORT; + if (width == UNUM_UNIT_WIDTH_NARROW) { + listWidth = ULISTFMT_WIDTH_NARROW; + } else if (width == UNUM_UNIT_WIDTH_FULL_NAME) { + // This might be the same as SHORT in most languages: + listWidth = ULISTFMT_WIDTH_WIDE; + } + fillIn->fListFormatter.adoptInsteadAndCheckErrorCode( + ListFormatter::createInstance(loc, ULISTFMT_TYPE_UNITS, listWidth, status), status); + fillIn->rules = rules; + fillIn->parent = parent; + + // We need a localised NumberFormatter for the integers of the bigger units + // (providing Arabic numerals, for example). + fillIn->fIntegerFormatter = NumberFormatter::withLocale(loc); +} + +void MixedUnitLongNameHandler::processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const { + U_ASSERT(fMixedUnitCount > 1); + if (parent != nullptr) { + parent->processQuantity(quantity, micros, status); + } + micros.modOuter = getMixedUnitModifier(quantity, micros, status); +} + +const Modifier *MixedUnitLongNameHandler::getMixedUnitModifier(DecimalQuantity &quantity, + MicroProps µs, + UErrorCode &status) const { + if (micros.mixedMeasuresCount == 0) { + U_ASSERT(micros.mixedMeasuresCount > 0); // Mixed unit: we must have more than one unit value + status = U_UNSUPPORTED_ERROR; + return µs.helpers.emptyWeakModifier; + } + // If we don't have at least one mixedMeasure, the LongNameHandler would be + // sufficient and we shouldn't be running MixedUnitLongNameHandler code: + U_ASSERT(micros.mixedMeasuresCount > 0); + // mixedMeasures does not contain the last value: + U_ASSERT(fMixedUnitCount == micros.mixedMeasuresCount + 1); + U_ASSERT(fListFormatter.isValid()); + + // Algorithm: + // + // For the mixed-units measurement of: "3 yard, 1 foot, 2.6 inch", we should + // find "3 yard" and "1 foot" in micros.mixedMeasures. + // + // Obtain long-names with plural forms corresponding to measure values: + // * {0} yards, {0} foot, {0} inches + // + // Format the integer values appropriately and modify with the format + // strings: + // - 3 yards, 1 foot + // + // Use ListFormatter to combine, with one placeholder: + // - 3 yards, 1 foot and {0} inches + // + // Return a SimpleModifier for this pattern, letting the rest of the + // pipeline take care of the remaining inches. + + LocalArray outputMeasuresList(new UnicodeString[fMixedUnitCount], status); + if (U_FAILURE(status)) { + return µs.helpers.emptyWeakModifier; + } + + for (int32_t i = 0; i < micros.mixedMeasuresCount; i++) { + DecimalQuantity fdec; + fdec.setToLong(micros.mixedMeasures[i]); + if (i > 0 && fdec.isNegative()) { + // If numbers are negative, only the first number needs to have its + // negative sign formatted. + fdec.negate(); + } + StandardPlural::Form pluralForm = utils::getStandardPlural(rules, fdec); + + UnicodeString simpleFormat = + getWithPlural(&fMixedUnitData[i * ARRAY_LENGTH], pluralForm, status); + SimpleFormatter compiledFormatter(simpleFormat, 0, 1, status); + + UnicodeString num; + auto appendable = UnicodeStringAppendable(num); + fIntegerFormatter.formatDecimalQuantity(fdec, status).appendTo(appendable, status); + compiledFormatter.format(num, outputMeasuresList[i], status); + // TODO(icu-units#67): fix field positions + } + + // Reiterated: we have at least one mixedMeasure: + U_ASSERT(micros.mixedMeasuresCount > 0); + // Thus if negative, a negative has already been formatted: + if (quantity.isNegative()) { + quantity.negate(); + } + + UnicodeString *finalSimpleFormats = &fMixedUnitData[(fMixedUnitCount - 1) * ARRAY_LENGTH]; + StandardPlural::Form finalPlural = utils::getPluralSafe(micros.rounder, rules, quantity, status); + UnicodeString finalSimpleFormat = getWithPlural(finalSimpleFormats, finalPlural, status); + SimpleFormatter finalFormatter(finalSimpleFormat, 0, 1, status); + finalFormatter.format(UnicodeString(u"{0}"), outputMeasuresList[fMixedUnitCount - 1], status); + + // Combine list into a "premixed" pattern + UnicodeString premixedFormatPattern; + fListFormatter->format(outputMeasuresList.getAlias(), fMixedUnitCount, premixedFormatPattern, + status); + SimpleFormatter premixedCompiled(premixedFormatPattern, 0, 1, status); + if (U_FAILURE(status)) { + return µs.helpers.emptyWeakModifier; + } + + // TODO(icu-units#67): fix field positions + // Return a SimpleModifier for the "premixed" pattern + micros.helpers.mixedUnitModifier = + SimpleModifier(premixedCompiled, kUndefinedField, false, {this, SIGNUM_POS_ZERO, finalPlural}); + return µs.helpers.mixedUnitModifier; +} + +const Modifier *MixedUnitLongNameHandler::getModifier(Signum /*signum*/, + StandardPlural::Form /*plural*/) const { + // TODO(units): investigate this method when investigating where + // LongNameHandler::getModifier() gets used. To be sure it remains + // unreachable: + UPRV_UNREACHABLE; + return nullptr; +} + +LongNameMultiplexer * +LongNameMultiplexer::forMeasureUnits(const Locale &loc, const MaybeStackVector &units, + const UNumberUnitWidth &width, const PluralRules *rules, + const MicroPropsGenerator *parent, UErrorCode &status) { + LocalPointer result(new LongNameMultiplexer(parent), status); + if (U_FAILURE(status)) { + return nullptr; + } + U_ASSERT(units.length() > 0); + if (result->fHandlers.resize(units.length()) == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } + result->fMeasureUnits.adoptInstead(new MeasureUnit[units.length()]); + for (int32_t i = 0, length = units.length(); i < length; i++) { + const MeasureUnit& unit = *units[i]; + result->fMeasureUnits[i] = unit; + if (unit.getComplexity(status) == UMEASURE_UNIT_MIXED) { + MixedUnitLongNameHandler *mlnh = result->fMixedUnitHandlers.createAndCheckErrorCode(status); + MixedUnitLongNameHandler::forMeasureUnit(loc, unit, width, rules, NULL, mlnh, status); + result->fHandlers[i] = mlnh; + } else { + LongNameHandler *lnh = result->fLongNameHandlers.createAndCheckErrorCode(status); + LongNameHandler::forMeasureUnit(loc, unit, MeasureUnit(), width, rules, NULL, lnh, status); + result->fHandlers[i] = lnh; + } + if (U_FAILURE(status)) { + return nullptr; + } + } + return result.orphan(); +} + +void LongNameMultiplexer::processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const { + // We call parent->processQuantity() from the Multiplexer, instead of + // letting LongNameHandler handle it: we don't know which LongNameHandler to + // call until we've called the parent! + fParent->processQuantity(quantity, micros, status); + + // Call the correct LongNameHandler based on outputUnit + for (int i = 0; i < fHandlers.getCapacity(); i++) { + if (fMeasureUnits[i] == micros.outputUnit) { + fHandlers[i]->processQuantity(quantity, micros, status); + return; + } + } + if (U_FAILURE(status)) { + return; + } + // We shouldn't receive any outputUnit for which we haven't already got a + // LongNameHandler: + status = U_INTERNAL_PROGRAM_ERROR; +} + #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/number_longnames.h b/intl/icu/source/i18n/number_longnames.h index a19425aa268a..67f2316a9cd4 100644 --- a/intl/icu/source/i18n/number_longnames.h +++ b/intl/icu/source/i18n/number_longnames.h @@ -7,6 +7,8 @@ #ifndef __NUMBER_LONGNAMES_H__ #define __NUMBER_LONGNAMES_H__ +#include "cmemory.h" +#include "unicode/listformatter.h" #include "unicode/uversion.h" #include "number_utils.h" #include "number_modifiers.h" @@ -33,34 +35,206 @@ class LongNameHandler : public MicroPropsGenerator, public ModifierStore, public forCurrencyLongNames(const Locale &loc, const CurrencyUnit ¤cy, const PluralRules *rules, const MicroPropsGenerator *parent, UErrorCode &status); - static LongNameHandler* - forMeasureUnit(const Locale &loc, const MeasureUnit &unit, const MeasureUnit &perUnit, - const UNumberUnitWidth &width, const PluralRules *rules, - const MicroPropsGenerator *parent, UErrorCode &status); + /** + * Construct a localized LongNameHandler for the specified MeasureUnit. + * + * Compound units can be constructed via `unit` and `perUnit`. Both of these + * must then be built-in units. + * + * Mixed units are not supported, use MixedUnitLongNameHandler::forMeasureUnit. + * + * This function uses a fillIn intead of returning a pointer, because we + * want to fill in instances in a MemoryPool (which cannot adopt pointers it + * didn't create itself). + * + * @param loc The desired locale. + * @param unit The measure unit to construct a LongNameHandler for. If + * `perUnit` is also defined, `unit` must not be a mixed unit. + * @param perUnit If `unit` is a mixed unit, `perUnit` must be "none". + * @param width Specifies the desired unit rendering. + * @param rules Does not take ownership. + * @param parent Does not take ownership. + * @param fillIn Required. + */ + static void forMeasureUnit(const Locale &loc, const MeasureUnit &unit, const MeasureUnit &perUnit, + const UNumberUnitWidth &width, const PluralRules *rules, + const MicroPropsGenerator *parent, LongNameHandler *fillIn, + UErrorCode &status); + /** + * Selects the plural-appropriate Modifier from the set of fModifiers based + * on the plural form. + */ void processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const U_OVERRIDE; + // TODO(units): investigate whether we might run into Mixed Unit trouble + // with this. This override for ModifierStore::getModifier does not support + // mixed units: investigate under which circumstances it gets called (check + // both ImmutablePatternModifier and in NumberRangeFormatterImpl). const Modifier* getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE; private: + // A set of pre-computed modifiers, one for each plural form. SimpleModifier fModifiers[StandardPlural::Form::COUNT]; + // Not owned const PluralRules *rules; + // Not owned const MicroPropsGenerator *parent; LongNameHandler(const PluralRules *rules, const MicroPropsGenerator *parent) - : rules(rules), parent(parent) {} + : rules(rules), parent(parent) { + } - static LongNameHandler* - forCompoundUnit(const Locale &loc, const MeasureUnit &unit, const MeasureUnit &perUnit, - const UNumberUnitWidth &width, const PluralRules *rules, - const MicroPropsGenerator *parent, UErrorCode &status); + LongNameHandler() : rules(nullptr), parent(nullptr) { + } + // Enables MemoryPool::emplaceBack(): requires access to + // the private constructors. + friend class MemoryPool; + + // Allow macrosToMicroGenerator to call the private default constructor. + friend class NumberFormatterImpl; + + // Fills in LongNameHandler fields for formatting compound units identified + // via `unit` and `perUnit`. Both `unit` and `perUnit` need to be built-in + // units (for which data exists). + static void forCompoundUnit(const Locale &loc, const MeasureUnit &unit, const MeasureUnit &perUnit, + const UNumberUnitWidth &width, const PluralRules *rules, + const MicroPropsGenerator *parent, LongNameHandler *fillIn, + UErrorCode &status); + + // Sets fModifiers to use the patterns from `simpleFormats`. void simpleFormatsToModifiers(const UnicodeString *simpleFormats, Field field, UErrorCode &status); + + // Sets fModifiers to a combination of `leadFormats` (one per plural form) + // and `trailFormat` appended to each. + // + // With a leadFormat of "{0}m" and a trailFormat of "{0}/s", it produces a + // pattern of "{0}m/s" by inserting the leadFormat pattern into trailFormat. void multiSimpleFormatsToModifiers(const UnicodeString *leadFormats, UnicodeString trailFormat, Field field, UErrorCode &status); }; +// Similar to LongNameHandler, but only for MIXED units. +class MixedUnitLongNameHandler : public MicroPropsGenerator, public ModifierStore, public UMemory { + public: + /** + * Construct a localized MixedUnitLongNameHandler for the specified + * MeasureUnit. It must be a MIXED unit. + * + * This function uses a fillIn intead of returning a pointer, because we + * want to fill in instances in a MemoryPool (which cannot adopt pointers it + * didn't create itself). + * + * @param loc The desired locale. + * @param mixedUnit The mixed measure unit to construct a + * MixedUnitLongNameHandler for. + * @param width Specifies the desired unit rendering. + * @param rules Does not take ownership. + * @param parent Does not take ownership. + * @param fillIn Required. + */ + static void forMeasureUnit(const Locale &loc, const MeasureUnit &mixedUnit, + const UNumberUnitWidth &width, const PluralRules *rules, + const MicroPropsGenerator *parent, MixedUnitLongNameHandler *fillIn, + UErrorCode &status); + + /** + * Produces a plural-appropriate Modifier for a mixed unit: `quantity` is + * taken as the final smallest unit, while the larger unit values must be + * provided via `micros.mixedMeasures`. + */ + void processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const U_OVERRIDE; + + // Required for ModifierStore. And ModifierStore is required by + // SimpleModifier constructor's last parameter. We assert his will never get + // called though. + const Modifier *getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE; + + private: + // Not owned + const PluralRules *rules; + // Not owned + const MicroPropsGenerator *parent; + + // Total number of units in the MeasureUnit this handler was configured for: + // for "foot-and-inch", this will be 2. + int32_t fMixedUnitCount = 1; + // Stores unit data for each of the individual units. For each unit, it + // stores ARRAY_LENGTH strings, as returned by getMeasureData. (Each unit + // with index `i` has ARRAY_LENGTH strings starting at index + // `i*ARRAY_LENGTH` in this array.) + LocalArray fMixedUnitData; + // A localized NumberFormatter used to format the integer-valued bigger + // units of Mixed Unit measurements. + LocalizedNumberFormatter fIntegerFormatter; + // A localised list formatter for joining mixed units together. + LocalPointer fListFormatter; + + MixedUnitLongNameHandler(const PluralRules *rules, const MicroPropsGenerator *parent) + : rules(rules), parent(parent) { + } + + MixedUnitLongNameHandler() : rules(nullptr), parent(nullptr) { + } + + // Allow macrosToMicroGenerator to call the private default constructor. + friend class NumberFormatterImpl; + + // Enables MemoryPool::emplaceBack(): requires access to + // the private constructors. + friend class MemoryPool; + + // For a mixed unit, returns a Modifier that takes only one parameter: the + // smallest and final unit of the set. The bigger units' values and labels + // get baked into this Modifier, together with the unit label of the final + // unit. + const Modifier *getMixedUnitModifier(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const; +}; + +/** + * A MicroPropsGenerator that multiplexes between different LongNameHandlers, + * depending on the outputUnit. + * + * See processQuantity() for the input requirements. + */ +class LongNameMultiplexer : public MicroPropsGenerator, public UMemory { + public: + // Produces a multiplexer for LongNameHandlers, one for each unit in + // `units`. An individual unit might be a mixed unit. + static LongNameMultiplexer *forMeasureUnits(const Locale &loc, + const MaybeStackVector &units, + const UNumberUnitWidth &width, const PluralRules *rules, + const MicroPropsGenerator *parent, UErrorCode &status); + + // The output unit must be provided via `micros.outputUnit`, it must match + // one of the units provided to the factory function. + void processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const U_OVERRIDE; + + private: + /** + * Because we only know which LongNameHandler we wish to call after calling + * earlier MicroPropsGenerators in the chain, LongNameMultiplexer keeps the + * parent link, while the LongNameHandlers are given no parents. + */ + MemoryPool fLongNameHandlers; + MemoryPool fMixedUnitHandlers; + // Unowned pointers to instances owned by MaybeStackVectors. + MaybeStackArray fHandlers; + // Each MeasureUnit corresponds to the same-index MicroPropsGenerator + // pointed to in fHandlers. + LocalArray fMeasureUnits; + + const MicroPropsGenerator *fParent; + + LongNameMultiplexer(const MicroPropsGenerator *parent) : fParent(parent) { + } +}; + } // namespace impl } // namespace number U_NAMESPACE_END diff --git a/intl/icu/source/i18n/number_mapper.cpp b/intl/icu/source/i18n/number_mapper.cpp index ec617438c9a9..e2a0d284b7cf 100644 --- a/intl/icu/source/i18n/number_mapper.cpp +++ b/intl/icu/source/i18n/number_mapper.cpp @@ -92,6 +92,8 @@ MacroProps NumberPropertyMapper::oldToNew(const DecimalFormatProperties& propert int32_t minSig = properties.minimumSignificantDigits; int32_t maxSig = properties.maximumSignificantDigits; double roundingIncrement = properties.roundingIncrement; + // Not assigning directly to macros.roundingMode here: we change + // roundingMode if and when we also change macros.precision. RoundingMode roundingMode = properties.roundingMode.getOrDefault(UNUM_ROUND_HALFEVEN); bool explicitMinMaxFrac = minFrac != -1 || maxFrac != -1; bool explicitMinMaxSig = minSig != -1 || maxSig != -1; @@ -145,7 +147,7 @@ MacroProps NumberPropertyMapper::oldToNew(const DecimalFormatProperties& propert precision = Precision::constructCurrency(currencyUsage); } if (!precision.isBogus()) { - precision.fRoundingMode = roundingMode; + macros.roundingMode = roundingMode; macros.precision = precision; } @@ -239,7 +241,7 @@ MacroProps NumberPropertyMapper::oldToNew(const DecimalFormatProperties& propert // TODO: Reset maxSig_ = 1 + minFrac_ to follow the spec. macros.precision = Precision::constructSignificant(minSig_, maxSig_); } - macros.precision.fRoundingMode = roundingMode; + macros.roundingMode = roundingMode; } } diff --git a/intl/icu/source/i18n/number_mapper.h b/intl/icu/source/i18n/number_mapper.h index e5b5e3fd6294..d094289d2417 100644 --- a/intl/icu/source/i18n/number_mapper.h +++ b/intl/icu/source/i18n/number_mapper.h @@ -139,6 +139,16 @@ class AutoAffixPatternProvider { } } + inline void setTo(const AffixPatternProvider* provider, UErrorCode& status) { + if (auto ptr = dynamic_cast(provider)) { + propertiesAPP = *ptr; + } else if (auto ptr = dynamic_cast(provider)) { + currencyPluralInfoAPP = *ptr; + } else { + status = U_INTERNAL_PROGRAM_ERROR; + } + } + inline const AffixPatternProvider& get() const { if (!currencyPluralInfoAPP.isBogus()) { return currencyPluralInfoAPP; @@ -156,9 +166,9 @@ class AutoAffixPatternProvider { /** * A struct for ownership of a few objects needed for formatting. */ -struct DecimalFormatWarehouse { +struct DecimalFormatWarehouse : public UMemory { AutoAffixPatternProvider affixProvider; - + LocalPointer rules; }; diff --git a/intl/icu/source/i18n/number_microprops.h b/intl/icu/source/i18n/number_microprops.h index 56512f5e6f94..058c5923b456 100644 --- a/intl/icu/source/i18n/number_microprops.h +++ b/intl/icu/source/i18n/number_microprops.h @@ -22,6 +22,56 @@ U_NAMESPACE_BEGIN namespace number { namespace impl { +/** + * A copyable container for the integer values of mixed unit measurements. + * + * If memory allocation fails during copying, no values are copied and status is + * set to U_MEMORY_ALLOCATION_ERROR. + */ +class IntMeasures : public MaybeStackArray { + public: + /** + * Default constructor initializes with internal T[stackCapacity] buffer. + * + * Stack Capacity: most mixed units are expected to consist of two or three + * subunits, so one or two integer measures should be enough. + */ + IntMeasures() : MaybeStackArray() { + } + + /** + * Copy constructor. + * + * If memory allocation fails during copying, no values are copied and + * status is set to U_MEMORY_ALLOCATION_ERROR. + */ + IntMeasures(const IntMeasures &other) : MaybeStackArray() { + this->operator=(other); + } + + // Assignment operator + IntMeasures &operator=(const IntMeasures &rhs) { + if (this == &rhs) { + return *this; + } + copyFrom(rhs, status); + return *this; + } + + /** Move constructor */ + IntMeasures(IntMeasures &&src) = default; + + /** Move assignment */ + IntMeasures &operator=(IntMeasures &&src) = default; + + UErrorCode status = U_ZERO_ERROR; +}; + +/** + * MicroProps is the first MicroPropsGenerator that should be should be called, + * producing an initialized MicroProps instance that will be passed on and + * modified throughout the rest of the chain of MicroPropsGenerator instances. + */ struct MicroProps : public MicroPropsGenerator { // NOTE: All of these fields are properly initialized in NumberFormatterImpl. @@ -36,19 +86,47 @@ struct MicroProps : public MicroPropsGenerator { // Note: This struct has no direct ownership of the following pointers. const DecimalFormatSymbols* symbols; + + // Pointers to Modifiers provided by the number formatting pipeline (when + // the value is known): + + // A Modifier provided by LongNameHandler, used for currency long names and + // units. If there is no LongNameHandler needed, this should be an + // EmptyModifier. (This is typically the third modifier applied.) const Modifier* modOuter; + // A Modifier for short currencies and compact notation. (This is typically + // the second modifier applied.) const Modifier* modMiddle = nullptr; + // A Modifier provided by ScientificHandler, used for scientific notation. + // This is typically the first modifier applied. const Modifier* modInner; // The following "helper" fields may optionally be used during the MicroPropsGenerator. // They live here to retain memory. struct { + // The ScientificModifier for which ScientificHandler is responsible. + // ScientificHandler::processQuantity() modifies this Modifier. ScientificModifier scientificModifier; + // EmptyModifier used for modOuter EmptyModifier emptyWeakModifier{false}; + // EmptyModifier used for modInner EmptyModifier emptyStrongModifier{true}; MultiplierFormatHandler multiplier; + // A Modifier used for Mixed Units. When formatting mixed units, + // LongNameHandler assigns this Modifier. + SimpleModifier mixedUnitModifier; } helpers; + // The MeasureUnit with which the output is represented. May also have + // UMEASURE_UNIT_MIXED complexity, in which case mixedMeasures comes into + // play. + MeasureUnit outputUnit; + + // In the case of mixed units, this is the set of integer-only units + // *preceding* the final unit. + IntMeasures mixedMeasures; + // Number of mixedMeasures that have been populated + int32_t mixedMeasuresCount = 0; MicroProps() = default; @@ -56,7 +134,23 @@ struct MicroProps : public MicroPropsGenerator { MicroProps& operator=(const MicroProps& other) = default; - void processQuantity(DecimalQuantity&, MicroProps& micros, UErrorCode& status) const U_OVERRIDE { + /** + * As MicroProps is the "base instance", this implementation of + * MicroPropsGenerator::processQuantity() just ensures that the output + * `micros` is correctly initialized. + * + * For the "safe" invocation of this function, micros must not be *this, + * such that a copy of the base instance is made. For the "unsafe" path, + * this function can be used only once, because the base MicroProps instance + * will be modified and thus not be available for re-use. + * + * @param quantity The quantity for consideration and optional mutation. + * @param micros The MicroProps instance to populate. If this parameter is + * not already `*this`, it will be overwritten with a copy of `*this`. + */ + void processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const U_OVERRIDE { + (void) quantity; (void) status; if (this == µs) { // Unsafe path: no need to perform a copy. @@ -65,6 +159,7 @@ struct MicroProps : public MicroPropsGenerator { U_ASSERT(exhausted); } else { // Safe path: copy self into the output micros. + U_ASSERT(!exhausted); micros = *this; } } diff --git a/intl/icu/source/i18n/number_modifiers.cpp b/intl/icu/source/i18n/number_modifiers.cpp index 3becb7ba8523..b7d825f499e4 100644 --- a/intl/icu/source/i18n/number_modifiers.cpp +++ b/intl/icu/source/i18n/number_modifiers.cpp @@ -25,13 +25,13 @@ const int32_t ARG_NUM_LIMIT = 0x100; icu::UInitOnce gDefaultCurrencySpacingInitOnce = U_INITONCE_INITIALIZER; UnicodeSet *UNISET_DIGIT = nullptr; -UnicodeSet *UNISET_NOTS = nullptr; +UnicodeSet *UNISET_NOTSZ = nullptr; UBool U_CALLCONV cleanupDefaultCurrencySpacing() { delete UNISET_DIGIT; UNISET_DIGIT = nullptr; - delete UNISET_NOTS; - UNISET_NOTS = nullptr; + delete UNISET_NOTSZ; + UNISET_NOTSZ = nullptr; gDefaultCurrencySpacingInitOnce.reset(); return TRUE; } @@ -39,13 +39,13 @@ UBool U_CALLCONV cleanupDefaultCurrencySpacing() { void U_CALLCONV initDefaultCurrencySpacing(UErrorCode &status) { ucln_i18n_registerCleanup(UCLN_I18N_CURRENCY_SPACING, cleanupDefaultCurrencySpacing); UNISET_DIGIT = new UnicodeSet(UnicodeString(u"[:digit:]"), status); - UNISET_NOTS = new UnicodeSet(UnicodeString(u"[:^S:]"), status); - if (UNISET_DIGIT == nullptr || UNISET_NOTS == nullptr) { + UNISET_NOTSZ = new UnicodeSet(UnicodeString(u"[[:^S:]&[:^Z:]]"), status); + if (UNISET_DIGIT == nullptr || UNISET_NOTSZ == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } UNISET_DIGIT->freeze(); - UNISET_NOTS->freeze(); + UNISET_NOTSZ->freeze(); } } // namespace @@ -469,8 +469,8 @@ CurrencySpacingEnabledModifier::getUnicodeSet(const DecimalFormatSymbols &symbol status); if (pattern.compare(u"[:digit:]", -1) == 0) { return *UNISET_DIGIT; - } else if (pattern.compare(u"[:^S:]", -1) == 0) { - return *UNISET_NOTS; + } else if (pattern.compare(u"[[:^S:]&[:^Z:]]", -1) == 0) { + return *UNISET_NOTSZ; } else { return UnicodeSet(pattern, status); } diff --git a/intl/icu/source/i18n/number_output.cpp b/intl/icu/source/i18n/number_output.cpp index 40192a9225b9..7129b94e0f86 100644 --- a/intl/icu/source/i18n/number_output.cpp +++ b/intl/icu/source/i18n/number_output.cpp @@ -5,11 +5,13 @@ #if !UCONFIG_NO_FORMATTING +#include "unicode/measunit.h" #include "unicode/numberformatter.h" #include "number_utypes.h" #include "util.h" #include "number_decimalquantity.h" #include "number_decnum.h" +#include "numrange_impl.h" U_NAMESPACE_BEGIN namespace number { @@ -32,6 +34,11 @@ void FormattedNumber::getAllFieldPositionsImpl(FieldPositionIteratorHandler& fpi fData->getAllFieldPositions(fpih, status); } +MeasureUnit FormattedNumber::getOutputUnit(UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(MeasureUnit()) + return fData->outputUnit; +} + void FormattedNumber::getDecimalQuantity(impl::DecimalQuantity& output, UErrorCode& status) const { UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG) output = fData->quantity; @@ -41,6 +48,42 @@ void FormattedNumber::getDecimalQuantity(impl::DecimalQuantity& output, UErrorCo impl::UFormattedNumberData::~UFormattedNumberData() = default; +UPRV_FORMATTED_VALUE_SUBCLASS_AUTO_IMPL(FormattedNumberRange) + +#define UPRV_NOARG + +UnicodeString FormattedNumberRange::getFirstDecimal(UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(ICU_Utility::makeBogusString()) + return fData->quantity1.toScientificString(); +} + +UnicodeString FormattedNumberRange::getSecondDecimal(UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(ICU_Utility::makeBogusString()) + return fData->quantity2.toScientificString(); +} + +void FormattedNumberRange::getDecimalNumbers(ByteSink& sink1, ByteSink& sink2, UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG) + impl::DecNum decnum1; + impl::DecNum decnum2; + fData->quantity1.toDecNum(decnum1, status).toString(sink1, status); + fData->quantity2.toDecNum(decnum2, status).toString(sink2, status); +} + +UNumberRangeIdentityResult FormattedNumberRange::getIdentityResult(UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(UNUM_IDENTITY_RESULT_NOT_EQUAL) + return fData->identityResult; +} + +const impl::UFormattedNumberRangeData* FormattedNumberRange::getData(UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(nullptr) + return fData; +} + + +impl::UFormattedNumberRangeData::~UFormattedNumberRangeData() = default; + + } // namespace number U_NAMESPACE_END diff --git a/intl/icu/source/i18n/number_patternmodifier.cpp b/intl/icu/source/i18n/number_patternmodifier.cpp index 45602942aefe..314e7cb75ee1 100644 --- a/intl/icu/source/i18n/number_patternmodifier.cpp +++ b/intl/icu/source/i18n/number_patternmodifier.cpp @@ -294,14 +294,20 @@ UnicodeString MutablePatternModifier::getSymbol(AffixPatternType type) const { case AffixPatternType::TYPE_PERMILLE: return fSymbols->getSymbol(DecimalFormatSymbols::ENumberFormatSymbol::kPerMillSymbol); case AffixPatternType::TYPE_CURRENCY_SINGLE: { - // UnitWidth ISO and HIDDEN overrides the singular currency symbol. - if (fUnitWidth == UNumberUnitWidth::UNUM_UNIT_WIDTH_ISO_CODE) { - return fCurrencySymbols.getIntlCurrencySymbol(localStatus); - } else if (fUnitWidth == UNumberUnitWidth::UNUM_UNIT_WIDTH_HIDDEN) { - return UnicodeString(); - } else if (fUnitWidth == UNumberUnitWidth::UNUM_UNIT_WIDTH_NARROW) { + switch (fUnitWidth) { + case UNumberUnitWidth::UNUM_UNIT_WIDTH_NARROW: return fCurrencySymbols.getNarrowCurrencySymbol(localStatus); - } else { + case UNumberUnitWidth::UNUM_UNIT_WIDTH_SHORT: + return fCurrencySymbols.getCurrencySymbol(localStatus); + case UNumberUnitWidth::UNUM_UNIT_WIDTH_ISO_CODE: + return fCurrencySymbols.getIntlCurrencySymbol(localStatus); + case UNumberUnitWidth::UNUM_UNIT_WIDTH_FORMAL: + return fCurrencySymbols.getFormalCurrencySymbol(localStatus); + case UNumberUnitWidth::UNUM_UNIT_WIDTH_VARIANT: + return fCurrencySymbols.getVariantCurrencySymbol(localStatus); + case UNumberUnitWidth::UNUM_UNIT_WIDTH_HIDDEN: + return UnicodeString(); + default: return fCurrencySymbols.getCurrencySymbol(localStatus); } } diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/number_rounding.cpp index 3ffce673ad08..a8fd6bc892a8 100644 --- a/intl/icu/source/i18n/number_rounding.cpp +++ b/intl/icu/source/i18n/number_rounding.cpp @@ -5,13 +5,16 @@ #if !UCONFIG_NO_FORMATTING +#include "charstr.h" #include "uassert.h" #include "unicode/numberformatter.h" #include "number_types.h" #include "number_decimalquantity.h" #include "double-conversion.h" #include "number_roundingutils.h" +#include "number_skeletons.h" #include "putilimp.h" +#include "string_segment.h" using namespace icu; using namespace icu::number; @@ -19,6 +22,39 @@ using namespace icu::number::impl; using double_conversion::DoubleToStringConverter; +using icu::StringSegment; + +void number::impl::parseIncrementOption(const StringSegment &segment, + Precision &outPrecision, + UErrorCode &status) { + // Need to do char <-> UChar conversion... + U_ASSERT(U_SUCCESS(status)); + CharString buffer; + SKELETON_UCHAR_TO_CHAR(buffer, segment.toTempUnicodeString(), 0, segment.length(), status); + + // Utilize DecimalQuantity/decNumber to parse this for us. + DecimalQuantity dq; + UErrorCode localStatus = U_ZERO_ERROR; + dq.setToDecNumber({buffer.data(), buffer.length()}, localStatus); + if (U_FAILURE(localStatus)) { + // throw new SkeletonSyntaxException("Invalid rounding increment", segment, e); + status = U_NUMBER_SKELETON_SYNTAX_ERROR; + return; + } + double increment = dq.toDouble(); + + // We also need to figure out how many digits. Do a brute force string operation. + int decimalOffset = 0; + while (decimalOffset < segment.length() && segment.charAt(decimalOffset) != '.') { + decimalOffset++; + } + if (decimalOffset == segment.length()) { + outPrecision = Precision::increment(increment); + } else { + int32_t fractionLength = segment.length() - decimalOffset - 1; + outPrecision = Precision::increment(increment).withMinFraction(fractionLength); + } +} namespace { @@ -84,7 +120,7 @@ digits_t roundingutils::doubleFractionLength(double input, int8_t* singleDigit) Precision Precision::unlimited() { - return Precision(RND_NONE, {}, kDefaultMode); + return Precision(RND_NONE, {}); } FractionPrecision Precision::integer() { @@ -229,7 +265,7 @@ FractionPrecision Precision::constructFraction(int32_t minFrac, int32_t maxFrac) settings.fMaxSig = -1; PrecisionUnion union_; union_.fracSig = settings; - return {RND_FRACTION, union_, kDefaultMode}; + return {RND_FRACTION, union_}; } Precision Precision::constructSignificant(int32_t minSig, int32_t maxSig) { @@ -240,7 +276,7 @@ Precision Precision::constructSignificant(int32_t minSig, int32_t maxSig) { settings.fMaxSig = static_cast(maxSig); PrecisionUnion union_; union_.fracSig = settings; - return {RND_SIGNIFICANT, union_, kDefaultMode}; + return {RND_SIGNIFICANT, union_}; } Precision @@ -250,7 +286,7 @@ Precision::constructFractionSignificant(const FractionPrecision &base, int32_t m settings.fMaxSig = static_cast(maxSig); PrecisionUnion union_; union_.fracSig = settings; - return {RND_FRACTION_SIGNIFICANT, union_, kDefaultMode}; + return {RND_FRACTION_SIGNIFICANT, union_}; } IncrementPrecision Precision::constructIncrement(double increment, int32_t minFrac) { @@ -270,18 +306,18 @@ IncrementPrecision Precision::constructIncrement(double increment, int32_t minFr // NOTE: In C++, we must return the correct value type with the correct union. // It would be invalid to return a RND_FRACTION here because the methods on the // IncrementPrecision type assume that the union is backed by increment data. - return {RND_INCREMENT_ONE, union_, kDefaultMode}; + return {RND_INCREMENT_ONE, union_}; } else if (singleDigit == 5) { - return {RND_INCREMENT_FIVE, union_, kDefaultMode}; + return {RND_INCREMENT_FIVE, union_}; } else { - return {RND_INCREMENT, union_, kDefaultMode}; + return {RND_INCREMENT, union_}; } } CurrencyPrecision Precision::constructCurrency(UCurrencyUsage usage) { PrecisionUnion union_; union_.currencyUsage = usage; - return {RND_CURRENCY, union_, kDefaultMode}; + return {RND_CURRENCY, union_}; } @@ -341,6 +377,9 @@ RoundingImpl::chooseMultiplierAndApply(impl::DecimalQuantity &input, const impl: /** This is the method that contains the actual rounding logic. */ void RoundingImpl::apply(impl::DecimalQuantity &value, UErrorCode& status) const { + if (U_FAILURE(status)) { + return; + } if (fPassThrough) { return; } diff --git a/intl/icu/source/i18n/number_roundingutils.h b/intl/icu/source/i18n/number_roundingutils.h index 3e37f3195408..e85cbae9fdd2 100644 --- a/intl/icu/source/i18n/number_roundingutils.h +++ b/intl/icu/source/i18n/number_roundingutils.h @@ -8,6 +8,7 @@ #define __NUMBER_ROUNDINGUTILS_H__ #include "number_types.h" +#include "string_segment.h" U_NAMESPACE_BEGIN namespace number { @@ -44,6 +45,9 @@ enum Section { inline bool getRoundingDirection(bool isEven, bool isNegative, Section section, RoundingMode roundingMode, UErrorCode &status) { + if (U_FAILURE(status)) { + return false; + } switch (roundingMode) { case RoundingMode::UNUM_ROUND_UP: // round away from zero @@ -187,8 +191,22 @@ class RoundingImpl { Precision fPrecision; UNumberFormatRoundingMode fRoundingMode; bool fPassThrough = true; // default value + + // Permits access to fPrecision. + friend class units::UnitsRouter; + + // Permits access to fPrecision. + friend class UnitConversionHandler; }; +/** + * Parses Precision-related skeleton strings without knowledge of MacroProps + * - see blueprint_helpers::parseIncrementOption(). + * + * Referencing MacroProps means needing to pull in the .o files that have the + * destructors for the SymbolsWrapper, Usage, and Scale classes. + */ +void parseIncrementOption(const StringSegment &segment, Precision &outPrecision, UErrorCode &status); } // namespace impl } // namespace number diff --git a/intl/icu/source/i18n/number_skeletons.cpp b/intl/icu/source/i18n/number_skeletons.cpp index 4ba2647986c7..028525a589db 100644 --- a/intl/icu/source/i18n/number_skeletons.cpp +++ b/intl/icu/source/i18n/number_skeletons.cpp @@ -10,6 +10,7 @@ #define UNISTR_FROM_STRING_EXPLICIT #include "number_decnum.h" +#include "number_roundingutils.h" #include "number_skeletons.h" #include "umutex.h" #include "ucln_in.h" @@ -80,6 +81,8 @@ void U_CALLCONV initNumberSkeletons(UErrorCode& status) { b.add(u"unit-width-short", STEM_UNIT_WIDTH_SHORT, status); b.add(u"unit-width-full-name", STEM_UNIT_WIDTH_FULL_NAME, status); b.add(u"unit-width-iso-code", STEM_UNIT_WIDTH_ISO_CODE, status); + b.add(u"unit-width-formal", STEM_UNIT_WIDTH_FORMAL, status); + b.add(u"unit-width-variant", STEM_UNIT_WIDTH_VARIANT, status); b.add(u"unit-width-hidden", STEM_UNIT_WIDTH_HIDDEN, status); b.add(u"sign-auto", STEM_SIGN_AUTO, status); b.add(u"sign-always", STEM_SIGN_ALWAYS, status); @@ -97,6 +100,7 @@ void U_CALLCONV initNumberSkeletons(UErrorCode& status) { b.add(u"measure-unit", STEM_MEASURE_UNIT, status); b.add(u"per-measure-unit", STEM_PER_MEASURE_UNIT, status); b.add(u"unit", STEM_UNIT, status); + b.add(u"usage", STEM_UNIT_USAGE, status); b.add(u"currency", STEM_CURRENCY, status); b.add(u"integer-width", STEM_INTEGER_WIDTH, status); b.add(u"numbering-system", STEM_NUMBERING_SYSTEM, status); @@ -149,21 +153,6 @@ UPRV_BLOCK_MACRO_BEGIN { \ } UPRV_BLOCK_MACRO_END -#define SKELETON_UCHAR_TO_CHAR(dest, src, start, end, status) (void)(dest); \ -UPRV_BLOCK_MACRO_BEGIN { \ - UErrorCode conversionStatus = U_ZERO_ERROR; \ - (dest).appendInvariantChars({FALSE, (src).getBuffer() + (start), (end) - (start)}, conversionStatus); \ - if (conversionStatus == U_INVARIANT_CONVERSION_ERROR) { \ - /* Don't propagate the invariant conversion error; it is a skeleton syntax error */ \ - (status) = U_NUMBER_SKELETON_SYNTAX_ERROR; \ - return; \ - } else if (U_FAILURE(conversionStatus)) { \ - (status) = conversionStatus; \ - return; \ - } \ -} UPRV_BLOCK_MACRO_END - - } // anonymous namespace @@ -187,14 +176,11 @@ Notation stem_to_object::notation(skeleton::StemEnum stem) { MeasureUnit stem_to_object::unit(skeleton::StemEnum stem) { switch (stem) { case STEM_BASE_UNIT: - // Slicing is okay - return NoUnit::base(); // NOLINT + return MeasureUnit(); case STEM_PERCENT: - // Slicing is okay - return NoUnit::percent(); // NOLINT + return MeasureUnit::getPercent(); case STEM_PERMILLE: - // Slicing is okay - return NoUnit::permille(); // NOLINT + return MeasureUnit::getPermille(); default: UPRV_UNREACHABLE; } @@ -265,6 +251,10 @@ UNumberUnitWidth stem_to_object::unitWidth(skeleton::StemEnum stem) { return UNUM_UNIT_WIDTH_FULL_NAME; case STEM_UNIT_WIDTH_ISO_CODE: return UNUM_UNIT_WIDTH_ISO_CODE; + case STEM_UNIT_WIDTH_FORMAL: + return UNUM_UNIT_WIDTH_FORMAL; + case STEM_UNIT_WIDTH_VARIANT: + return UNUM_UNIT_WIDTH_VARIANT; case STEM_UNIT_WIDTH_HIDDEN: return UNUM_UNIT_WIDTH_HIDDEN; default: @@ -372,6 +362,12 @@ void enum_to_stem_string::unitWidth(UNumberUnitWidth value, UnicodeString& sb) { case UNUM_UNIT_WIDTH_ISO_CODE: sb.append(u"unit-width-iso-code", -1); break; + case UNUM_UNIT_WIDTH_FORMAL: + sb.append(u"unit-width-formal", -1); + break; + case UNUM_UNIT_WIDTH_VARIANT: + sb.append(u"unit-width-variant", -1); + break; case UNUM_UNIT_WIDTH_HIDDEN: sb.append(u"unit-width-hidden", -1); break; @@ -470,6 +466,7 @@ UnicodeString skeleton::generate(const MacroProps& macros, UErrorCode& status) { MacroProps skeleton::parseSkeleton( const UnicodeString& skeletonString, int32_t& errOffset, UErrorCode& status) { U_ASSERT(U_SUCCESS(status)); + U_ASSERT(kSerializedStemTrie != nullptr); // Add a trailing whitespace to the end of the skeleton string to make code cleaner. UnicodeString tempSkeletonString(skeletonString); @@ -550,6 +547,7 @@ MacroProps skeleton::parseSkeleton( case STATE_MEASURE_UNIT: case STATE_PER_MEASURE_UNIT: case STATE_IDENTIFIER_UNIT: + case STATE_UNIT_USAGE: case STATE_CURRENCY_UNIT: case STATE_INTEGER_WIDTH: case STATE_NUMBERING_SYSTEM: @@ -575,6 +573,8 @@ MacroProps skeleton::parseSkeleton( ParseState skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, SeenMacroProps& seen, MacroProps& macros, UErrorCode& status) { + U_ASSERT(U_SUCCESS(status)); + // First check for "blueprint" stems, which start with a "signal char" switch (segment.charAt(0)) { case u'.': @@ -683,6 +683,8 @@ skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, Se case STEM_UNIT_WIDTH_SHORT: case STEM_UNIT_WIDTH_FULL_NAME: case STEM_UNIT_WIDTH_ISO_CODE: + case STEM_UNIT_WIDTH_FORMAL: + case STEM_UNIT_WIDTH_VARIANT: case STEM_UNIT_WIDTH_HIDDEN: CHECK_NULL(seen, unitWidth, status); macros.unitWidth = stem_to_object::unitWidth(stem); @@ -705,7 +707,7 @@ skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, Se macros.decimal = stem_to_object::decimalSeparatorDisplay(stem); return STATE_NULL; - // Stems requiring an option: + // Stems requiring an option: case STEM_PRECISION_INCREMENT: CHECK_NULL(seen, precision, status); @@ -724,8 +726,13 @@ skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, Se CHECK_NULL(seen, perUnit, status); return STATE_IDENTIFIER_UNIT; + case STEM_UNIT_USAGE: + CHECK_NULL(seen, usage, status); + return STATE_UNIT_USAGE; + case STEM_CURRENCY: CHECK_NULL(seen, unit, status); + CHECK_NULL(seen, perUnit, status); return STATE_CURRENCY_UNIT; case STEM_INTEGER_WIDTH: @@ -747,6 +754,7 @@ skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, Se ParseState skeleton::parseOption(ParseState stem, const StringSegment& segment, MacroProps& macros, UErrorCode& status) { + U_ASSERT(U_SUCCESS(status)); ///// Required options: ///// @@ -763,6 +771,9 @@ ParseState skeleton::parseOption(ParseState stem, const StringSegment& segment, case STATE_IDENTIFIER_UNIT: blueprint_helpers::parseIdentifierUnitOption(segment, macros, status); return STATE_NULL; + case STATE_UNIT_USAGE: + blueprint_helpers::parseUnitUsageOption(segment, macros, status); + return STATE_NULL; case STATE_INCREMENT_PRECISION: blueprint_helpers::parseIncrementOption(segment, macros, status); return STATE_NULL; @@ -833,7 +844,7 @@ void GeneratorHelpers::generateSkeleton(const MacroProps& macros, UnicodeString& sb.append(u' '); } if (U_FAILURE(status)) { return; } - if (GeneratorHelpers::perUnit(macros, sb, status)) { + if (GeneratorHelpers::usage(macros, sb, status)) { sb.append(u' '); } if (U_FAILURE(status)) { return; } @@ -968,6 +979,7 @@ blueprint_helpers::generateCurrencyOption(const CurrencyUnit& currency, UnicodeS void blueprint_helpers::parseMeasureUnitOption(const StringSegment& segment, MacroProps& macros, UErrorCode& status) { + U_ASSERT(U_SUCCESS(status)); const UnicodeString stemString = segment.toTempUnicodeString(); // NOTE: The category (type) of the unit is guaranteed to be a valid subtag (alphanumeric) @@ -983,14 +995,13 @@ void blueprint_helpers::parseMeasureUnitOption(const StringSegment& segment, Mac } // Need to do char <-> UChar conversion... - U_ASSERT(U_SUCCESS(status)); CharString type; SKELETON_UCHAR_TO_CHAR(type, stemString, 0, firstHyphen, status); CharString subType; SKELETON_UCHAR_TO_CHAR(subType, stemString, firstHyphen + 1, stemString.length(), status); - // Note: the largest type as of this writing (March 2018) is "volume", which has 24 units. - static constexpr int32_t CAPACITY = 30; + // Note: the largest type as of this writing (Aug 2020) is "volume", which has 33 units. + static constexpr int32_t CAPACITY = 40; MeasureUnit units[CAPACITY]; UErrorCode localStatus = U_ZERO_ERROR; int32_t numUnits = MeasureUnit::getAvailable(type.data(), units, CAPACITY, localStatus); @@ -1011,14 +1022,6 @@ void blueprint_helpers::parseMeasureUnitOption(const StringSegment& segment, Mac status = U_NUMBER_SKELETON_SYNTAX_ERROR; } -void blueprint_helpers::generateMeasureUnitOption(const MeasureUnit& measureUnit, UnicodeString& sb, - UErrorCode&) { - // Need to do char <-> UChar conversion... - sb.append(UnicodeString(measureUnit.getType(), -1, US_INV)); - sb.append(u'-'); - sb.append(UnicodeString(measureUnit.getSubtype(), -1, US_INV)); -} - void blueprint_helpers::parseMeasurePerUnitOption(const StringSegment& segment, MacroProps& macros, UErrorCode& status) { // A little bit of a hack: save the current unit (numerator), call the main measure unit @@ -1045,6 +1048,20 @@ void blueprint_helpers::parseIdentifierUnitOption(const StringSegment& segment, return; } + // Mixed units can only be represented by full MeasureUnit instances, so we + // don't split the denominator into macros.perUnit. + if (fullUnit.complexity == UMEASURE_UNIT_MIXED) { + macros.unit = std::move(fullUnit).build(status); + return; + } + + // When we have a built-in unit (e.g. meter-per-second), we don't split it up + MeasureUnit testBuiltin = fullUnit.copy(status).build(status); + if (uprv_strcmp(testBuiltin.getType(), "") != 0) { + macros.unit = std::move(testBuiltin); + return; + } + // TODO(ICU-20941): Clean this up. for (int32_t i = 0; i < fullUnit.units.length(); i++) { SingleUnitImpl* subUnit = fullUnit.units[i]; @@ -1057,6 +1074,17 @@ void blueprint_helpers::parseIdentifierUnitOption(const StringSegment& segment, } } +void blueprint_helpers::parseUnitUsageOption(const StringSegment &segment, MacroProps ¯os, + UErrorCode &status) { + // Need to do char <-> UChar conversion... + U_ASSERT(U_SUCCESS(status)); + CharString buffer; + SKELETON_UCHAR_TO_CHAR(buffer, segment.toTempUnicodeString(), 0, segment.length(), status); + macros.usage.set(buffer.toStringPiece()); + // We do not do any validation of the usage string: it depends on the + // unitPreferenceData in the units resources. +} + void blueprint_helpers::parseFractionStem(const StringSegment& segment, MacroProps& macros, UErrorCode& status) { U_ASSERT(segment.charAt(0) == u'.'); @@ -1301,35 +1329,9 @@ bool blueprint_helpers::parseFracSigOption(const StringSegment& segment, MacroPr return true; } -void blueprint_helpers::parseIncrementOption(const StringSegment& segment, MacroProps& macros, - UErrorCode& status) { - // Need to do char <-> UChar conversion... - U_ASSERT(U_SUCCESS(status)); - CharString buffer; - SKELETON_UCHAR_TO_CHAR(buffer, segment.toTempUnicodeString(), 0, segment.length(), status); - - // Utilize DecimalQuantity/decNumber to parse this for us. - DecimalQuantity dq; - UErrorCode localStatus = U_ZERO_ERROR; - dq.setToDecNumber({buffer.data(), buffer.length()}, localStatus); - if (U_FAILURE(localStatus)) { - // throw new SkeletonSyntaxException("Invalid rounding increment", segment, e); - status = U_NUMBER_SKELETON_SYNTAX_ERROR; - return; - } - double increment = dq.toDouble(); - - // We also need to figure out how many digits. Do a brute force string operation. - int decimalOffset = 0; - while (decimalOffset < segment.length() && segment.charAt(decimalOffset) != '.') { - decimalOffset++; - } - if (decimalOffset == segment.length()) { - macros.precision = Precision::increment(increment); - } else { - int32_t fractionLength = segment.length() - decimalOffset - 1; - macros.precision = Precision::increment(increment).withMinFraction(fractionLength); - } +void blueprint_helpers::parseIncrementOption(const StringSegment &segment, MacroProps ¯os, + UErrorCode &status) { + number::impl::parseIncrementOption(segment, macros.precision, status); } void blueprint_helpers::generateIncrementOption(double increment, int32_t trailingZeros, UnicodeString& sb, @@ -1499,50 +1501,46 @@ bool GeneratorHelpers::notation(const MacroProps& macros, UnicodeString& sb, UEr } bool GeneratorHelpers::unit(const MacroProps& macros, UnicodeString& sb, UErrorCode& status) { - if (utils::unitIsCurrency(macros.unit)) { + MeasureUnit unit = macros.unit; + if (!utils::unitIsBaseUnit(macros.perUnit)) { + if (utils::unitIsCurrency(macros.unit) || utils::unitIsCurrency(macros.perUnit)) { + status = U_UNSUPPORTED_ERROR; + return false; + } + unit = unit.product(macros.perUnit.reciprocal(status), status); + } + + if (utils::unitIsCurrency(unit)) { sb.append(u"currency/", -1); - CurrencyUnit currency(macros.unit, status); + CurrencyUnit currency(unit, status); if (U_FAILURE(status)) { return false; } blueprint_helpers::generateCurrencyOption(currency, sb, status); return true; - } else if (utils::unitIsNoUnit(macros.unit)) { - if (utils::unitIsPercent(macros.unit)) { - sb.append(u"percent", -1); - return true; - } else if (utils::unitIsPermille(macros.unit)) { - sb.append(u"permille", -1); - return true; - } else { - // Default value is not shown in normalized form - return false; - } + } else if (utils::unitIsBaseUnit(unit)) { + // Default value is not shown in normalized form + return false; + } else if (utils::unitIsPercent(unit)) { + sb.append(u"percent", -1); + return true; + } else if (utils::unitIsPermille(unit)) { + sb.append(u"permille", -1); + return true; } else { - sb.append(u"measure-unit/", -1); - blueprint_helpers::generateMeasureUnitOption(macros.unit, sb, status); + sb.append(u"unit/", -1); + sb.append(unit.getIdentifier()); return true; } } -bool GeneratorHelpers::perUnit(const MacroProps& macros, UnicodeString& sb, UErrorCode& status) { - // Per-units are currently expected to be only MeasureUnits. - if (utils::unitIsNoUnit(macros.perUnit)) { - if (utils::unitIsPercent(macros.perUnit) || utils::unitIsPermille(macros.perUnit)) { - status = U_UNSUPPORTED_ERROR; - return false; - } else { - // Default value: ok to ignore - return false; - } - } else if (utils::unitIsCurrency(macros.perUnit)) { - status = U_UNSUPPORTED_ERROR; - return false; - } else { - sb.append(u"per-measure-unit/", -1); - blueprint_helpers::generateMeasureUnitOption(macros.perUnit, sb, status); +bool GeneratorHelpers::usage(const MacroProps& macros, UnicodeString& sb, UErrorCode& /* status */) { + if (macros.usage.isSet()) { + sb.append(u"usage/", -1); + sb.append(UnicodeString(macros.usage.fUsage, -1, US_INV)); return true; } + return false; } bool GeneratorHelpers::precision(const MacroProps& macros, UnicodeString& sb, UErrorCode& status) { diff --git a/intl/icu/source/i18n/number_skeletons.h b/intl/icu/source/i18n/number_skeletons.h index d9b2c0ee0b19..201267e635cd 100644 --- a/intl/icu/source/i18n/number_skeletons.h +++ b/intl/icu/source/i18n/number_skeletons.h @@ -22,10 +22,12 @@ struct SeenMacroProps; // namespace for enums and entrypoint functions namespace skeleton { -/////////////////////////////////////////////////////////////////////////////////////// -// NOTE: For an example of how to add a new stem to the number skeleton parser, see: // -// http://bugs.icu-project.org/trac/changeset/41193 // -/////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////// +// NOTE: For examples of how to add a new stem to the number skeleton parser, see: // +// https://github.com/unicode-org/icu/commit/a2a7982216b2348070dc71093775ac7195793d73 // +// and // +// https://github.com/unicode-org/icu/commit/6fe86f3934a8a5701034f648a8f7c5087e84aa28 // +//////////////////////////////////////////////////////////////////////////////////////// /** * While parsing a skeleton, this enum records what type of option we expect to find next. @@ -47,6 +49,7 @@ enum ParseState { STATE_MEASURE_UNIT, STATE_PER_MEASURE_UNIT, STATE_IDENTIFIER_UNIT, + STATE_UNIT_USAGE, STATE_CURRENCY_UNIT, STATE_INTEGER_WIDTH, STATE_NUMBERING_SYSTEM, @@ -95,6 +98,8 @@ enum StemEnum { STEM_UNIT_WIDTH_SHORT, STEM_UNIT_WIDTH_FULL_NAME, STEM_UNIT_WIDTH_ISO_CODE, + STEM_UNIT_WIDTH_FORMAL, + STEM_UNIT_WIDTH_VARIANT, STEM_UNIT_WIDTH_HIDDEN, STEM_SIGN_AUTO, STEM_SIGN_ALWAYS, @@ -112,6 +117,7 @@ enum StemEnum { STEM_MEASURE_UNIT, STEM_PER_MEASURE_UNIT, STEM_UNIT, + STEM_UNIT_USAGE, STEM_CURRENCY, STEM_INTEGER_WIDTH, STEM_NUMBERING_SYSTEM, @@ -234,14 +240,20 @@ void parseCurrencyOption(const StringSegment& segment, MacroProps& macros, UErro void generateCurrencyOption(const CurrencyUnit& currency, UnicodeString& sb, UErrorCode& status); +// "measure-unit/" is deprecated in favour of "unit/". void parseMeasureUnitOption(const StringSegment& segment, MacroProps& macros, UErrorCode& status); -void generateMeasureUnitOption(const MeasureUnit& measureUnit, UnicodeString& sb, UErrorCode& status); - +// "per-measure-unit/" is deprecated in favour of "unit/". void parseMeasurePerUnitOption(const StringSegment& segment, MacroProps& macros, UErrorCode& status); +/** + * Parses unit identifiers like "meter-per-second" and "foot-and-inch", as + * specified via a "unit/" concise skeleton. + */ void parseIdentifierUnitOption(const StringSegment& segment, MacroProps& macros, UErrorCode& status); +void parseUnitUsageOption(const StringSegment& segment, MacroProps& macros, UErrorCode& status); + void parseFractionStem(const StringSegment& segment, MacroProps& macros, UErrorCode& status); void generateFractionStem(int32_t minFrac, int32_t maxFrac, UnicodeString& sb, UErrorCode& status); @@ -302,7 +314,7 @@ class GeneratorHelpers { static bool unit(const MacroProps& macros, UnicodeString& sb, UErrorCode& status); - static bool perUnit(const MacroProps& macros, UnicodeString& sb, UErrorCode& status); + static bool usage(const MacroProps& macros, UnicodeString& sb, UErrorCode& status); static bool precision(const MacroProps& macros, UnicodeString& sb, UErrorCode& status); @@ -332,6 +344,7 @@ struct SeenMacroProps { bool notation = false; bool unit = false; bool perUnit = false; + bool usage = false; bool precision = false; bool roundingMode = false; bool grouper = false; @@ -344,6 +357,24 @@ struct SeenMacroProps { bool scale = false; }; +namespace { + +#define SKELETON_UCHAR_TO_CHAR(dest, src, start, end, status) (void)(dest); \ +UPRV_BLOCK_MACRO_BEGIN { \ + UErrorCode conversionStatus = U_ZERO_ERROR; \ + (dest).appendInvariantChars({false, (src).getBuffer() + (start), (end) - (start)}, conversionStatus); \ + if (conversionStatus == U_INVARIANT_CONVERSION_ERROR) { \ + /* Don't propagate the invariant conversion error; it is a skeleton syntax error */ \ + (status) = U_NUMBER_SKELETON_SYNTAX_ERROR; \ + return; \ + } else if (U_FAILURE(conversionStatus)) { \ + (status) = conversionStatus; \ + return; \ + } \ +} UPRV_BLOCK_MACRO_END + +} // namespace + } // namespace impl } // namespace number U_NAMESPACE_END diff --git a/intl/icu/source/i18n/number_symbolswrapper.cpp b/intl/icu/source/i18n/number_symbolswrapper.cpp new file mode 100644 index 000000000000..ac3043d1ca11 --- /dev/null +++ b/intl/icu/source/i18n/number_symbolswrapper.cpp @@ -0,0 +1,131 @@ +// © 2020 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING + +#include "number_microprops.h" +#include "unicode/numberformatter.h" + +using namespace icu; +using namespace icu::number; +using namespace icu::number::impl; + +SymbolsWrapper::SymbolsWrapper(const SymbolsWrapper &other) { + doCopyFrom(other); +} + +SymbolsWrapper::SymbolsWrapper(SymbolsWrapper &&src) U_NOEXCEPT { + doMoveFrom(std::move(src)); +} + +SymbolsWrapper &SymbolsWrapper::operator=(const SymbolsWrapper &other) { + if (this == &other) { + return *this; + } + doCleanup(); + doCopyFrom(other); + return *this; +} + +SymbolsWrapper &SymbolsWrapper::operator=(SymbolsWrapper &&src) U_NOEXCEPT { + if (this == &src) { + return *this; + } + doCleanup(); + doMoveFrom(std::move(src)); + return *this; +} + +SymbolsWrapper::~SymbolsWrapper() { + doCleanup(); +} + +void SymbolsWrapper::setTo(const DecimalFormatSymbols &dfs) { + doCleanup(); + fType = SYMPTR_DFS; + fPtr.dfs = new DecimalFormatSymbols(dfs); +} + +void SymbolsWrapper::setTo(const NumberingSystem *ns) { + doCleanup(); + fType = SYMPTR_NS; + fPtr.ns = ns; +} + +void SymbolsWrapper::doCopyFrom(const SymbolsWrapper &other) { + fType = other.fType; + switch (fType) { + case SYMPTR_NONE: + // No action necessary + break; + case SYMPTR_DFS: + // Memory allocation failures are exposed in copyErrorTo() + if (other.fPtr.dfs != nullptr) { + fPtr.dfs = new DecimalFormatSymbols(*other.fPtr.dfs); + } else { + fPtr.dfs = nullptr; + } + break; + case SYMPTR_NS: + // Memory allocation failures are exposed in copyErrorTo() + if (other.fPtr.ns != nullptr) { + fPtr.ns = new NumberingSystem(*other.fPtr.ns); + } else { + fPtr.ns = nullptr; + } + break; + } +} + +void SymbolsWrapper::doMoveFrom(SymbolsWrapper &&src) { + fType = src.fType; + switch (fType) { + case SYMPTR_NONE: + // No action necessary + break; + case SYMPTR_DFS: + fPtr.dfs = src.fPtr.dfs; + src.fPtr.dfs = nullptr; + break; + case SYMPTR_NS: + fPtr.ns = src.fPtr.ns; + src.fPtr.ns = nullptr; + break; + } +} + +void SymbolsWrapper::doCleanup() { + switch (fType) { + case SYMPTR_NONE: + // No action necessary + break; + case SYMPTR_DFS: + delete fPtr.dfs; + break; + case SYMPTR_NS: + delete fPtr.ns; + break; + } +} + +bool SymbolsWrapper::isDecimalFormatSymbols() const { + return fType == SYMPTR_DFS; +} + +bool SymbolsWrapper::isNumberingSystem() const { + return fType == SYMPTR_NS; +} + +const DecimalFormatSymbols *SymbolsWrapper::getDecimalFormatSymbols() const { + U_ASSERT(fType == SYMPTR_DFS); + return fPtr.dfs; +} + +const NumberingSystem *SymbolsWrapper::getNumberingSystem() const { + U_ASSERT(fType == SYMPTR_NS); + return fPtr.ns; +} + +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/number_types.h b/intl/icu/source/i18n/number_types.h index 5c2b8cf8b5d1..8078851ba3fd 100644 --- a/intl/icu/source/i18n/number_types.h +++ b/intl/icu/source/i18n/number_types.h @@ -246,31 +246,31 @@ class U_I18N_API ModifierStore { * itself. The {@link #processQuantity} method performs the final step in the number processing pipeline: it uses the * quantity to generate a finalized {@link MicroProps}, which can be used to render the number to output. * - *

    * In other words, this interface is used for the parts of number processing that are quantity-dependent. * - *

    * In order to allow for multiple different objects to all mutate the same MicroProps, a "chain" of MicroPropsGenerators * are linked together, and each one is responsible for manipulating a certain quantity-dependent part of the * MicroProps. At the tail of the linked list is a base instance of {@link MicroProps} with properties that are not * quantity-dependent. Each element in the linked list calls {@link #processQuantity} on its "parent", then does its * work, and then returns the result. * + * This chain of MicroPropsGenerators is typically constructed by NumberFormatterImpl::macrosToMicroGenerator() when + * constructing a NumberFormatter. + * * Exported as U_I18N_API because it is a base class for other exported types * */ class U_I18N_API MicroPropsGenerator { public: - virtual ~MicroPropsGenerator(); + virtual ~MicroPropsGenerator() = default; /** - * Considers the given {@link DecimalQuantity}, optionally mutates it, and returns a {@link MicroProps}. + * Considers the given {@link DecimalQuantity}, optionally mutates it, and + * populates a {@link MicroProps} instance. * - * @param quantity - * The quantity for consideration and optional mutation. - * @param micros - * The MicroProps instance to populate. - * @return A MicroProps instance resolved for the quantity. + * @param quantity The quantity for consideration and optional mutation. + * @param micros The MicroProps instance to populate. It will be modified as + * needed for the given quantity. */ virtual void processQuantity(DecimalQuantity& quantity, MicroProps& micros, UErrorCode& status) const = 0; diff --git a/intl/icu/source/i18n/number_usageprefs.cpp b/intl/icu/source/i18n/number_usageprefs.cpp new file mode 100644 index 000000000000..0d9cb06c50a2 --- /dev/null +++ b/intl/icu/source/i18n/number_usageprefs.cpp @@ -0,0 +1,208 @@ +// © 2020 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING + +#include "number_usageprefs.h" +#include "cstring.h" +#include "number_decimalquantity.h" +#include "number_microprops.h" +#include "number_roundingutils.h" +#include "number_skeletons.h" +#include "unicode/char16ptr.h" +#include "unicode/currunit.h" +#include "unicode/fmtable.h" +#include "unicode/measure.h" +#include "unicode/numberformatter.h" +#include "unicode/platform.h" +#include "unicode/unum.h" +#include "unicode/urename.h" +#include "units_data.h" + +using namespace icu; +using namespace icu::number; +using namespace icu::number::impl; +using icu::StringSegment; +using icu::units::ConversionRates; + +// Copy constructor +Usage::Usage(const Usage &other) : Usage() { + this->operator=(other); +} + +// Copy assignment operator +Usage &Usage::operator=(const Usage &other) { + fLength = 0; + fError = other.fError; + if (fUsage != nullptr) { + uprv_free(fUsage); + fUsage = nullptr; + } + if (other.fUsage == nullptr) { + return *this; + } + if (U_FAILURE(other.fError)) { + // We don't bother trying to allocating memory if we're in any case busy + // copying an errored Usage. + return *this; + } + fUsage = (char *)uprv_malloc(other.fLength + 1); + if (fUsage == nullptr) { + fError = U_MEMORY_ALLOCATION_ERROR; + return *this; + } + fLength = other.fLength; + uprv_strncpy(fUsage, other.fUsage, fLength + 1); + return *this; +} + +// Move constructor +Usage::Usage(Usage &&src) U_NOEXCEPT : fUsage(src.fUsage), fLength(src.fLength), fError(src.fError) { + // Take ownership away from src if necessary + src.fUsage = nullptr; +} + +// Move assignment operator +Usage &Usage::operator=(Usage &&src) U_NOEXCEPT { + if (this == &src) { + return *this; + } + if (fUsage != nullptr) { + uprv_free(fUsage); + } + fUsage = src.fUsage; + fLength = src.fLength; + fError = src.fError; + // Take ownership away from src if necessary + src.fUsage = nullptr; + return *this; +} + +Usage::~Usage() { + if (fUsage != nullptr) { + uprv_free(fUsage); + fUsage = nullptr; + } +} + +void Usage::set(StringPiece value) { + if (fUsage != nullptr) { + uprv_free(fUsage); + fUsage = nullptr; + } + fLength = value.length(); + fUsage = (char *)uprv_malloc(fLength + 1); + if (fUsage == nullptr) { + fLength = 0; + fError = U_MEMORY_ALLOCATION_ERROR; + return; + } + uprv_strncpy(fUsage, value.data(), fLength); + fUsage[fLength] = 0; +} + +// Populates micros.mixedMeasures and modifies quantity, based on the values in +// measures. +void mixedMeasuresToMicros(const MaybeStackVector &measures, DecimalQuantity *quantity, + MicroProps *micros, UErrorCode status) { + micros->mixedMeasuresCount = measures.length() - 1; + if (micros->mixedMeasuresCount > 0) { +#ifdef U_DEBUG + U_ASSERT(micros->outputUnit.getComplexity(status) == UMEASURE_UNIT_MIXED); + U_ASSERT(U_SUCCESS(status)); + // Check that we received measurements with the expected MeasureUnits: + MeasureUnitImpl temp; + const MeasureUnitImpl& impl = MeasureUnitImpl::forMeasureUnit(micros->outputUnit, temp, status); + U_ASSERT(U_SUCCESS(status)); + U_ASSERT(measures.length() == impl.units.length()); + for (int32_t i = 0; i < measures.length(); i++) { + U_ASSERT(measures[i]->getUnit() == impl.units[i]->build(status)); + } + (void)impl; +#endif + // Mixed units: except for the last value, we pass all values to the + // LongNameHandler via micros->mixedMeasures. + if (micros->mixedMeasures.getCapacity() < micros->mixedMeasuresCount) { + if (micros->mixedMeasures.resize(micros->mixedMeasuresCount) == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + } + for (int32_t i = 0; i < micros->mixedMeasuresCount; i++) { + micros->mixedMeasures[i] = measures[i]->getNumber().getInt64(); + } + } else { + micros->mixedMeasuresCount = 0; + } + // The last value (potentially the only value) gets passed on via quantity. + quantity->setToDouble(measures[measures.length() - 1]->getNumber().getDouble()); +} + +UsagePrefsHandler::UsagePrefsHandler(const Locale &locale, + const MeasureUnit &inputUnit, + const StringPiece usage, + const MicroPropsGenerator *parent, + UErrorCode &status) + : fUnitsRouter(inputUnit, StringPiece(locale.getCountry()), usage, status), + fParent(parent) { +} + +void UsagePrefsHandler::processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const { + fParent->processQuantity(quantity, micros, status); + if (U_FAILURE(status)) { + return; + } + + quantity.roundToInfinity(); // Enables toDouble + const units::RouteResult routed = fUnitsRouter.route(quantity.toDouble(), µs.rounder, status); + if (U_FAILURE(status)) { + return; + } + const MaybeStackVector& routedMeasures = routed.measures; + micros.outputUnit = routed.outputUnit.copy(status).build(status); + if (U_FAILURE(status)) { + return; + } + + mixedMeasuresToMicros(routedMeasures, &quantity, µs, status); +} + +UnitConversionHandler::UnitConversionHandler(const MeasureUnit &inputUnit, const MeasureUnit &outputUnit, + const MicroPropsGenerator *parent, UErrorCode &status) + : fOutputUnit(outputUnit), fParent(parent) { + MeasureUnitImpl tempInput, tempOutput; + const MeasureUnitImpl &inputUnitImpl = MeasureUnitImpl::forMeasureUnit(inputUnit, tempInput, status); + const MeasureUnitImpl &outputUnitImpl = + MeasureUnitImpl::forMeasureUnit(outputUnit, tempOutput, status); + + // TODO: this should become an initOnce thing? Review with other + // ConversionRates usages. + ConversionRates conversionRates(status); + if (U_FAILURE(status)) { + return; + } + fUnitConverter.adoptInsteadAndCheckErrorCode( + new ComplexUnitsConverter(inputUnitImpl, outputUnitImpl, conversionRates, status), status); +} + +void UnitConversionHandler::processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const { + fParent->processQuantity(quantity, micros, status); + if (U_FAILURE(status)) { + return; + } + quantity.roundToInfinity(); // Enables toDouble + MaybeStackVector measures = + fUnitConverter->convert(quantity.toDouble(), µs.rounder, status); + micros.outputUnit = fOutputUnit; + if (U_FAILURE(status)) { + return; + } + + mixedMeasuresToMicros(measures, &quantity, µs, status); +} + +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/number_usageprefs.h b/intl/icu/source/i18n/number_usageprefs.h new file mode 100644 index 000000000000..9e8bd936bd72 --- /dev/null +++ b/intl/icu/source/i18n/number_usageprefs.h @@ -0,0 +1,125 @@ +// © 2020 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING +#ifndef __NUMBER_USAGEPREFS_H__ +#define __NUMBER_USAGEPREFS_H__ + +#include "cmemory.h" +#include "number_types.h" +#include "unicode/listformatter.h" +#include "unicode/localpointer.h" +#include "unicode/locid.h" +#include "unicode/measunit.h" +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" +#include "units_converter.h" +#include "units_router.h" + +U_NAMESPACE_BEGIN + +using ::icu::units::ComplexUnitsConverter; +using ::icu::units::UnitsRouter; + +namespace number { +namespace impl { + +/** + * A MicroPropsGenerator which uses UnitsRouter to produce output converted to a + * MeasureUnit appropriate for a particular localized usage: see + * NumberFormatterSettings::usage(). + */ +class U_I18N_API UsagePrefsHandler : public MicroPropsGenerator, public UMemory { + public: + UsagePrefsHandler(const Locale &locale, const MeasureUnit &inputUnit, const StringPiece usage, + const MicroPropsGenerator *parent, UErrorCode &status); + + /** + * Obtains the appropriate output value, MeasureUnit and + * rounding/precision behaviour from the UnitsRouter. + * + * The output unit is passed on to the LongNameHandler via + * micros.outputUnit. + */ + void processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const U_OVERRIDE; + + /** + * Returns the list of possible output units, i.e. the full set of + * preferences, for the localized, usage-specific unit preferences. + * + * The returned pointer should be valid for the lifetime of the + * UsagePrefsHandler instance. + */ + const MaybeStackVector *getOutputUnits() const { + return fUnitsRouter.getOutputUnits(); + } + + private: + UnitsRouter fUnitsRouter; + const MicroPropsGenerator *fParent; +}; + +} // namespace impl +} // namespace number + +// Export explicit template instantiations of LocalPointerBase and LocalPointer. +// This is required when building DLLs for Windows. (See datefmt.h, +// collationiterator.h, erarules.h and others for similar examples.) +// +// Note: These need to be outside of the number::impl namespace, or Clang will +// generate a compile error. +#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN +#if defined(_MSC_VER) +// Ignore warning 4661 as LocalPointerBase does not use operator== or operator!= +#pragma warning(push) +#pragma warning(disable: 4661) +#endif +template class U_I18N_API LocalPointerBase; +template class U_I18N_API LocalPointer; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif +#endif + +namespace number { +namespace impl { + +/** + * A MicroPropsGenerator which converts a measurement from one MeasureUnit to + * another. In particular, the output MeasureUnit may be a mixed unit. (The + * input unit may not be a mixed unit.) + */ +class U_I18N_API UnitConversionHandler : public MicroPropsGenerator, public UMemory { + public: + /** + * Constructor. + * + * @param inputUnit Specifies the input MeasureUnit. Mixed units are not + * supported as input (because input is just a single decimal quantity). + * @param outputUnit Specifies the output MeasureUnit. + * @param parent The parent MicroPropsGenerator. + * @param status Receives status. + */ + UnitConversionHandler(const MeasureUnit &inputUnit, const MeasureUnit &outputUnit, + const MicroPropsGenerator *parent, UErrorCode &status); + + /** + * Obtains the appropriate output values from the Unit Converter. + */ + void processQuantity(DecimalQuantity &quantity, MicroProps µs, + UErrorCode &status) const U_OVERRIDE; + private: + MeasureUnit fOutputUnit; + LocalPointer fUnitConverter; + const MicroPropsGenerator *fParent; +}; + +} // namespace impl +} // namespace number +U_NAMESPACE_END + +#endif // __NUMBER_USAGEPREFS_H__ +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/number_utils.cpp b/intl/icu/source/i18n/number_utils.cpp index 91d7f335cd82..bef7ea6c61f3 100644 --- a/intl/icu/source/i18n/number_utils.cpp +++ b/intl/icu/source/i18n/number_utils.cpp @@ -258,7 +258,10 @@ void DecNum::toString(ByteSink& output, UErrorCode& status) const { } // "string must be at least dn->digits+14 characters long" int32_t minCapacity = fData.getAlias()->digits + 14; - MaybeStackArray buffer(minCapacity); + MaybeStackArray buffer(minCapacity, status); + if (U_FAILURE(status)) { + return; + } uprv_decNumberToString(fData, buffer.getAlias()); output.Append(buffer.getAlias(), static_cast(uprv_strlen(buffer.getAlias()))); } diff --git a/intl/icu/source/i18n/number_utils.h b/intl/icu/source/i18n/number_utils.h index 93195f080b27..bc369c940f79 100644 --- a/intl/icu/source/i18n/number_utils.h +++ b/intl/icu/source/i18n/number_utils.h @@ -49,8 +49,8 @@ inline bool unitIsCurrency(const MeasureUnit& unit) { return uprv_strcmp("currency", unit.getType()) == 0; } -inline bool unitIsNoUnit(const MeasureUnit& unit) { - return uprv_strcmp("none", unit.getType()) == 0; +inline bool unitIsBaseUnit(const MeasureUnit& unit) { + return unit == MeasureUnit(); } inline bool unitIsPercent(const MeasureUnit& unit) { diff --git a/intl/icu/source/i18n/number_utypes.h b/intl/icu/source/i18n/number_utypes.h index 7a1b7a4e80ac..d97eadc5cdb9 100644 --- a/intl/icu/source/i18n/number_utypes.h +++ b/intl/icu/source/i18n/number_utypes.h @@ -28,9 +28,6 @@ const DecimalQuantity* validateUFormattedNumberToDecimalQuantity( * This struct is held internally by the C++ version FormattedNumber since the member types are not * declared in the public header file. * - * The DecimalQuantity is not currently being used by FormattedNumber, but at some point it could be used - * to add a toDecNumber() or similar method. - * * Exported as U_I18N_API for tests */ class U_I18N_API UFormattedNumberData : public FormattedValueStringBuilderImpl { @@ -38,7 +35,13 @@ public: UFormattedNumberData() : FormattedValueStringBuilderImpl(kUndefinedField) {} virtual ~UFormattedNumberData(); + // The formatted quantity. DecimalQuantity quantity; + + // The output unit for the formatted quantity. + // TODO(units,hugovdm): populate this correctly for the general case - it's + // currently only implemented for the .usage() use case. + MeasureUnit outputUnit; }; diff --git a/intl/icu/source/i18n/numparse_affixes.cpp b/intl/icu/source/i18n/numparse_affixes.cpp index ca293e741d29..cef1685d03cd 100644 --- a/intl/icu/source/i18n/numparse_affixes.cpp +++ b/intl/icu/source/i18n/numparse_affixes.cpp @@ -127,8 +127,8 @@ void AffixPatternMatcherBuilder::addMatcher(NumberParseMatcher& matcher) { fMatchers[fMatchersLen++] = &matcher; } -AffixPatternMatcher AffixPatternMatcherBuilder::build() { - return AffixPatternMatcher(fMatchers, fMatchersLen, fPattern); +AffixPatternMatcher AffixPatternMatcherBuilder::build(UErrorCode& status) { + return AffixPatternMatcher(fMatchers, fMatchersLen, fPattern, status); } AffixTokenMatcherWarehouse::AffixTokenMatcherWarehouse(const AffixTokenMatcherSetupData* setupData) @@ -209,12 +209,13 @@ AffixPatternMatcher AffixPatternMatcher::fromAffixPattern(const UnicodeString& a AffixPatternMatcherBuilder builder(affixPattern, tokenWarehouse, ignorables); AffixUtils::iterateWithConsumer(affixPattern, builder, status); - return builder.build(); + return builder.build(status); } AffixPatternMatcher::AffixPatternMatcher(MatcherArray& matchers, int32_t matchersLen, - const UnicodeString& pattern) - : ArraySeriesMatcher(matchers, matchersLen), fPattern(pattern) {} + const UnicodeString& pattern, UErrorCode& status) + : ArraySeriesMatcher(matchers, matchersLen), fPattern(pattern, status) { +} UnicodeString AffixPatternMatcher::getPattern() const { return fPattern.toAliasedUnicodeString(); @@ -446,28 +447,3 @@ UnicodeString AffixMatcher::toString() const { #endif /* #if !UCONFIG_NO_FORMATTING */ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intl/icu/source/i18n/numparse_affixes.h b/intl/icu/source/i18n/numparse_affixes.h index 97a17f4d78ca..a82b731ab5b7 100644 --- a/intl/icu/source/i18n/numparse_affixes.h +++ b/intl/icu/source/i18n/numparse_affixes.h @@ -128,7 +128,7 @@ class AffixPatternMatcherBuilder : public TokenConsumer, public MutableMatcherCo void consumeToken(::icu::number::impl::AffixPatternType type, UChar32 cp, UErrorCode& status) override; /** NOTE: You can build only once! */ - AffixPatternMatcher build(); + AffixPatternMatcher build(UErrorCode& status); private: ArraySeriesMatcher::MatcherArray fMatchers; @@ -160,7 +160,8 @@ class U_I18N_API AffixPatternMatcher : public ArraySeriesMatcher { private: CompactUnicodeString<4> fPattern; - AffixPatternMatcher(MatcherArray& matchers, int32_t matchersLen, const UnicodeString& pattern); + AffixPatternMatcher(MatcherArray& matchers, int32_t matchersLen, const UnicodeString& pattern, + UErrorCode& status); friend class AffixPatternMatcherBuilder; }; diff --git a/intl/icu/source/i18n/numparse_types.h b/intl/icu/source/i18n/numparse_types.h index b4007c2ff5b5..623f0e80f166 100644 --- a/intl/icu/source/i18n/numparse_types.h +++ b/intl/icu/source/i18n/numparse_types.h @@ -64,14 +64,15 @@ class CompactUnicodeString { fBuffer[0] = 0; } - CompactUnicodeString(const UnicodeString& text) - : fBuffer(text.length() + 1) { + CompactUnicodeString(const UnicodeString& text, UErrorCode& status) + : fBuffer(text.length() + 1, status) { + if (U_FAILURE(status)) { return; } uprv_memcpy(fBuffer.getAlias(), text.getBuffer(), sizeof(UChar) * text.length()); fBuffer[text.length()] = 0; } inline UnicodeString toAliasedUnicodeString() const { - return UnicodeString(TRUE, fBuffer.getAlias(), -1); + return UnicodeString(true, fBuffer.getAlias(), -1); } bool operator==(const CompactUnicodeString& other) const { diff --git a/intl/icu/source/i18n/numrange_capi.cpp b/intl/icu/source/i18n/numrange_capi.cpp new file mode 100644 index 000000000000..a440a53fe6b1 --- /dev/null +++ b/intl/icu/source/i18n/numrange_capi.cpp @@ -0,0 +1,193 @@ +// © 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING + +// Allow implicit conversion from char16_t* to UnicodeString for this file: +// Helpful in toString methods and elsewhere. +#define UNISTR_FROM_STRING_EXPLICIT + +#include "fphdlimp.h" +#include "number_utypes.h" +#include "numparse_types.h" +#include "formattedval_impl.h" +#include "numrange_impl.h" +#include "number_decnum.h" +#include "unicode/numberrangeformatter.h" +#include "unicode/unumberrangeformatter.h" + +using namespace icu; +using namespace icu::number; +using namespace icu::number::impl; + + +U_NAMESPACE_BEGIN +namespace number { +namespace impl { + +/** + * Implementation class for UNumberRangeFormatter. Wraps a LocalizedRangeNumberFormatter. + */ +struct UNumberRangeFormatterData : public UMemory, + // Magic number as ASCII == "NRF" (NumberRangeFormatter) + public IcuCApiHelper { + LocalizedNumberRangeFormatter fFormatter; +}; + +struct UFormattedNumberRangeImpl; + +// Magic number as ASCII == "FDN" (FormatteDNumber) +typedef IcuCApiHelper UFormattedNumberRangeApiHelper; + +struct UFormattedNumberRangeImpl : public UFormattedValueImpl, public UFormattedNumberRangeApiHelper { + UFormattedNumberRangeImpl(); + ~UFormattedNumberRangeImpl(); + + FormattedNumberRange fImpl; + UFormattedNumberRangeData fData; +}; + +UFormattedNumberRangeImpl::UFormattedNumberRangeImpl() + : fImpl(&fData) { + fFormattedValue = &fImpl; +} + +UFormattedNumberRangeImpl::~UFormattedNumberRangeImpl() { + // Disown the data from fImpl so it doesn't get deleted twice + fImpl.fData = nullptr; +} + +} // namespace impl +} // namespace number +U_NAMESPACE_END + + +UPRV_FORMATTED_VALUE_CAPI_NO_IMPLTYPE_AUTO_IMPL( + UFormattedNumberRange, + UFormattedNumberRangeImpl, + UFormattedNumberRangeApiHelper, + unumrf) + + +const UFormattedNumberRangeData* number::impl::validateUFormattedNumberRange( + const UFormattedNumberRange* uresult, UErrorCode& status) { + auto* result = UFormattedNumberRangeApiHelper::validate(uresult, status); + if (U_FAILURE(status)) { + return nullptr; + } + return &result->fData; +} + + +U_CAPI UNumberRangeFormatter* U_EXPORT2 +unumrf_openForSkeletonWithCollapseAndIdentityFallback( + const UChar* skeleton, + int32_t skeletonLen, + UNumberRangeCollapse collapse, + UNumberRangeIdentityFallback identityFallback, + const char* locale, + UParseError* perror, + UErrorCode* ec) { + auto* impl = new UNumberRangeFormatterData(); + if (impl == nullptr) { + *ec = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } + // Readonly-alias constructor (first argument is whether we are NUL-terminated) + UnicodeString skeletonString(skeletonLen == -1, skeleton, skeletonLen); + impl->fFormatter = NumberRangeFormatter::withLocale(locale) + .numberFormatterBoth(NumberFormatter::forSkeleton(skeletonString, *perror, *ec)) + .collapse(collapse) + .identityFallback(identityFallback); + return impl->exportForC(); +} + +U_CAPI void U_EXPORT2 +unumrf_formatDoubleRange( + const UNumberRangeFormatter* uformatter, + double first, + double second, + UFormattedNumberRange* uresult, + UErrorCode* ec) { + const UNumberRangeFormatterData* formatter = UNumberRangeFormatterData::validate(uformatter, *ec); + auto* result = UFormattedNumberRangeApiHelper::validate(uresult, *ec); + if (U_FAILURE(*ec)) { return; } + + result->fData.getStringRef().clear(); + result->fData.quantity1.setToDouble(first); + result->fData.quantity2.setToDouble(second); + formatter->fFormatter.formatImpl(result->fData, first == second, *ec); +} + +U_CAPI void U_EXPORT2 +unumrf_formatDecimalRange( + const UNumberRangeFormatter* uformatter, + const char* first, int32_t firstLen, + const char* second, int32_t secondLen, + UFormattedNumberRange* uresult, + UErrorCode* ec) { + const UNumberRangeFormatterData* formatter = UNumberRangeFormatterData::validate(uformatter, *ec); + auto* result = UFormattedNumberRangeApiHelper::validate(uresult, *ec); + if (U_FAILURE(*ec)) { return; } + + result->fData.getStringRef().clear(); + result->fData.quantity1.setToDecNumber({first, firstLen}, *ec); + result->fData.quantity2.setToDecNumber({second, secondLen}, *ec); + formatter->fFormatter.formatImpl(result->fData, first == second, *ec); +} + +U_CAPI UNumberRangeIdentityResult U_EXPORT2 +unumrf_resultGetIdentityResult( + const UFormattedNumberRange* uresult, + UErrorCode* ec) { + auto* result = UFormattedNumberRangeApiHelper::validate(uresult, *ec); + if (U_FAILURE(*ec)) { + return UNUM_IDENTITY_RESULT_COUNT; + } + return result->fData.identityResult; +} + +U_CAPI int32_t U_EXPORT2 +unumrf_resultGetFirstDecimalNumber( + const UFormattedNumberRange* uresult, + char* dest, + int32_t destCapacity, + UErrorCode* ec) { + const auto* result = UFormattedNumberRangeApiHelper::validate(uresult, *ec); + if (U_FAILURE(*ec)) { + return 0; + } + DecNum decnum; + return result->fData.quantity1.toDecNum(decnum, *ec) + .toCharString(*ec) + .extract(dest, destCapacity, *ec); +} + +U_CAPI int32_t U_EXPORT2 +unumrf_resultGetSecondDecimalNumber( + const UFormattedNumberRange* uresult, + char* dest, + int32_t destCapacity, + UErrorCode* ec) { + const auto* result = UFormattedNumberRangeApiHelper::validate(uresult, *ec); + if (U_FAILURE(*ec)) { + return 0; + } + DecNum decnum; + return result->fData.quantity2 + .toDecNum(decnum, *ec) + .toCharString(*ec) + .extract(dest, destCapacity, *ec); +} + +U_CAPI void U_EXPORT2 +unumrf_close(UNumberRangeFormatter* f) { + UErrorCode localStatus = U_ZERO_ERROR; + const UNumberRangeFormatterData* impl = UNumberRangeFormatterData::validate(f, localStatus); + delete impl; +} + + +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/numrange_fluent.cpp b/intl/icu/source/i18n/numrange_fluent.cpp index ceec51431031..c8b1641c645e 100644 --- a/intl/icu/source/i18n/numrange_fluent.cpp +++ b/intl/icu/source/i18n/numrange_fluent.cpp @@ -12,6 +12,7 @@ #include "numrange_impl.h" #include "util.h" #include "number_utypes.h" +#include "number_decnum.h" using namespace icu; using namespace icu::number; @@ -404,28 +405,4 @@ LocalizedNumberRangeFormatter::getFormatter(UErrorCode& status) const { } -UPRV_FORMATTED_VALUE_SUBCLASS_AUTO_IMPL(FormattedNumberRange) - -#define UPRV_NOARG - -UnicodeString FormattedNumberRange::getFirstDecimal(UErrorCode& status) const { - UPRV_FORMATTED_VALUE_METHOD_GUARD(ICU_Utility::makeBogusString()) - return fData->quantity1.toScientificString(); -} - -UnicodeString FormattedNumberRange::getSecondDecimal(UErrorCode& status) const { - UPRV_FORMATTED_VALUE_METHOD_GUARD(ICU_Utility::makeBogusString()) - return fData->quantity2.toScientificString(); -} - -UNumberRangeIdentityResult FormattedNumberRange::getIdentityResult(UErrorCode& status) const { - UPRV_FORMATTED_VALUE_METHOD_GUARD(UNUM_IDENTITY_RESULT_NOT_EQUAL) - return fData->identityResult; -} - - -UFormattedNumberRangeData::~UFormattedNumberRangeData() = default; - - - #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/numrange_impl.cpp b/intl/icu/source/i18n/numrange_impl.cpp index 9fb3dee861f1..3aae5c235483 100644 --- a/intl/icu/source/i18n/numrange_impl.cpp +++ b/intl/icu/source/i18n/numrange_impl.cpp @@ -12,6 +12,7 @@ #include "unicode/numberrangeformatter.h" #include "numrange_impl.h" #include "patternprops.h" +#include "pluralranges.h" #include "uresimp.h" #include "util.h" @@ -106,92 +107,9 @@ void getNumberRangeData(const char* localeName, const char* nsName, NumberRangeD sink.fillInDefaults(status); } -class PluralRangesDataSink : public ResourceSink { - public: - PluralRangesDataSink(StandardPluralRanges& output) : fOutput(output) {} - - void put(const char* /*key*/, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) U_OVERRIDE { - ResourceArray entriesArray = value.getArray(status); - if (U_FAILURE(status)) { return; } - fOutput.setCapacity(entriesArray.getSize()); - for (int i = 0; entriesArray.getValue(i, value); i++) { - ResourceArray pluralFormsArray = value.getArray(status); - if (U_FAILURE(status)) { return; } - pluralFormsArray.getValue(0, value); - StandardPlural::Form first = StandardPlural::fromString(value.getUnicodeString(status), status); - if (U_FAILURE(status)) { return; } - pluralFormsArray.getValue(1, value); - StandardPlural::Form second = StandardPlural::fromString(value.getUnicodeString(status), status); - if (U_FAILURE(status)) { return; } - pluralFormsArray.getValue(2, value); - StandardPlural::Form result = StandardPlural::fromString(value.getUnicodeString(status), status); - if (U_FAILURE(status)) { return; } - fOutput.addPluralRange(first, second, result); - } - } - - private: - StandardPluralRanges& fOutput; -}; - -void getPluralRangesData(const Locale& locale, StandardPluralRanges& output, UErrorCode& status) { - if (U_FAILURE(status)) { return; } - LocalUResourceBundlePointer rb(ures_openDirect(nullptr, "pluralRanges", &status)); - if (U_FAILURE(status)) { return; } - - CharString dataPath; - dataPath.append("locales/", -1, status); - dataPath.append(locale.getLanguage(), -1, status); - if (U_FAILURE(status)) { return; } - int32_t setLen; - // Not all languages are covered: fail gracefully - UErrorCode internalStatus = U_ZERO_ERROR; - const UChar* set = ures_getStringByKeyWithFallback(rb.getAlias(), dataPath.data(), &setLen, &internalStatus); - if (U_FAILURE(internalStatus)) { return; } - - dataPath.clear(); - dataPath.append("rules/", -1, status); - dataPath.appendInvariantChars(set, setLen, status); - if (U_FAILURE(status)) { return; } - PluralRangesDataSink sink(output); - ures_getAllItemsWithFallback(rb.getAlias(), dataPath.data(), sink, status); - if (U_FAILURE(status)) { return; } -} - } // namespace -void StandardPluralRanges::initialize(const Locale& locale, UErrorCode& status) { - getPluralRangesData(locale, *this, status); -} - -void StandardPluralRanges::addPluralRange( - StandardPlural::Form first, - StandardPlural::Form second, - StandardPlural::Form result) { - U_ASSERT(fTriplesLen < fTriples.getCapacity()); - fTriples[fTriplesLen] = {first, second, result}; - fTriplesLen++; -} - -void StandardPluralRanges::setCapacity(int32_t length) { - if (length > fTriples.getCapacity()) { - fTriples.resize(length, 0); - } -} - -StandardPlural::Form -StandardPluralRanges::resolve(StandardPlural::Form first, StandardPlural::Form second) const { - for (int32_t i=0; i PluralRangeTriples; - PluralRangeTriples fTriples; - int32_t fTriplesLen = 0; -}; - - class NumberRangeFormatterImpl : public UMemory { public: NumberRangeFormatterImpl(const RangeMacroProps& macros, UErrorCode& status); @@ -105,6 +76,11 @@ class NumberRangeFormatterImpl : public UMemory { }; +/** Helper function used in upluralrules.cpp */ +const UFormattedNumberRangeData* validateUFormattedNumberRange( + const UFormattedNumberRange* uresult, UErrorCode& status); + + } // namespace impl } // namespace number U_NAMESPACE_END diff --git a/intl/icu/source/i18n/olsontz.cpp b/intl/icu/source/i18n/olsontz.cpp index d21e6e99297b..4873caaee6d4 100644 --- a/intl/icu/source/i18n/olsontz.cpp +++ b/intl/icu/source/i18n/olsontz.cpp @@ -197,58 +197,60 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, } // Process final rule and data, if any - const UChar *ruleIdUStr = ures_getStringByKey(res, kFINALRULE, &len, &ec); - ures_getByKey(res, kFINALRAW, r.getAlias(), &ec); - int32_t ruleRaw = ures_getInt(r.getAlias(), &ec); - ures_getByKey(res, kFINALYEAR, r.getAlias(), &ec); - int32_t ruleYear = ures_getInt(r.getAlias(), &ec); if (U_SUCCESS(ec)) { - UnicodeString ruleID(TRUE, ruleIdUStr, len); - UResourceBundle *rule = TimeZone::loadRule(top, ruleID, NULL, ec); - const int32_t *ruleData = ures_getIntVector(rule, &len, &ec); - if (U_SUCCESS(ec) && len == 11) { - UnicodeString emptyStr; - finalZone = new SimpleTimeZone( - ruleRaw * U_MILLIS_PER_SECOND, - emptyStr, - (int8_t)ruleData[0], (int8_t)ruleData[1], (int8_t)ruleData[2], - ruleData[3] * U_MILLIS_PER_SECOND, - (SimpleTimeZone::TimeMode) ruleData[4], - (int8_t)ruleData[5], (int8_t)ruleData[6], (int8_t)ruleData[7], - ruleData[8] * U_MILLIS_PER_SECOND, - (SimpleTimeZone::TimeMode) ruleData[9], - ruleData[10] * U_MILLIS_PER_SECOND, ec); - if (finalZone == NULL) { - ec = U_MEMORY_ALLOCATION_ERROR; + const UChar *ruleIdUStr = ures_getStringByKey(res, kFINALRULE, &len, &ec); + ures_getByKey(res, kFINALRAW, r.getAlias(), &ec); + int32_t ruleRaw = ures_getInt(r.getAlias(), &ec); + ures_getByKey(res, kFINALYEAR, r.getAlias(), &ec); + int32_t ruleYear = ures_getInt(r.getAlias(), &ec); + if (U_SUCCESS(ec)) { + UnicodeString ruleID(TRUE, ruleIdUStr, len); + UResourceBundle *rule = TimeZone::loadRule(top, ruleID, NULL, ec); + const int32_t *ruleData = ures_getIntVector(rule, &len, &ec); + if (U_SUCCESS(ec) && len == 11) { + UnicodeString emptyStr; + finalZone = new SimpleTimeZone( + ruleRaw * U_MILLIS_PER_SECOND, + emptyStr, + (int8_t)ruleData[0], (int8_t)ruleData[1], (int8_t)ruleData[2], + ruleData[3] * U_MILLIS_PER_SECOND, + (SimpleTimeZone::TimeMode) ruleData[4], + (int8_t)ruleData[5], (int8_t)ruleData[6], (int8_t)ruleData[7], + ruleData[8] * U_MILLIS_PER_SECOND, + (SimpleTimeZone::TimeMode) ruleData[9], + ruleData[10] * U_MILLIS_PER_SECOND, ec); + if (finalZone == NULL) { + ec = U_MEMORY_ALLOCATION_ERROR; + } else { + finalStartYear = ruleYear; + + // Note: Setting finalStartYear to the finalZone is problematic. When a date is around + // year boundary, SimpleTimeZone may return false result when DST is observed at the + // beginning of year. We could apply safe margin (day or two), but when one of recurrent + // rules falls around year boundary, it could return false result. Without setting the + // start year, finalZone works fine around the year boundary of the start year. + + // finalZone->setStartYear(finalStartYear); + + + // Compute the millis for Jan 1, 0:00 GMT of the finalYear + + // Note: finalStartMillis is used for detecting either if + // historic transition data or finalZone to be used. In an + // extreme edge case - for example, two transitions fall into + // small windows of time around the year boundary, this may + // result incorrect offset computation. But I think it will + // never happen practically. Yoshito - Feb 20, 2010 + finalStartMillis = Grego::fieldsToDay(finalStartYear, 0, 1) * U_MILLIS_PER_DAY; + } } else { - finalStartYear = ruleYear; - - // Note: Setting finalStartYear to the finalZone is problematic. When a date is around - // year boundary, SimpleTimeZone may return false result when DST is observed at the - // beginning of year. We could apply safe margin (day or two), but when one of recurrent - // rules falls around year boundary, it could return false result. Without setting the - // start year, finalZone works fine around the year boundary of the start year. - - // finalZone->setStartYear(finalStartYear); - - - // Compute the millis for Jan 1, 0:00 GMT of the finalYear - - // Note: finalStartMillis is used for detecting either if - // historic transition data or finalZone to be used. In an - // extreme edge case - for example, two transitions fall into - // small windows of time around the year boundary, this may - // result incorrect offset computation. But I think it will - // never happen practically. Yoshito - Feb 20, 2010 - finalStartMillis = Grego::fieldsToDay(finalStartYear, 0, 1) * U_MILLIS_PER_DAY; + ec = U_INVALID_FORMAT_ERROR; } - } else { - ec = U_INVALID_FORMAT_ERROR; + ures_close(rule); + } else if (ec == U_MISSING_RESOURCE_ERROR) { + // No final zone + ec = U_ZERO_ERROR; } - ures_close(rule); - } else if (ec == U_MISSING_RESOURCE_ERROR) { - // No final zone - ec = U_ZERO_ERROR; } // initialize canonical ID diff --git a/intl/icu/source/i18n/olsontz.h b/intl/icu/source/i18n/olsontz.h index a3b7dcc8f3d4..275b1b4add32 100644 --- a/intl/icu/source/i18n/olsontz.h +++ b/intl/icu/source/i18n/olsontz.h @@ -208,7 +208,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone { /** * TimeZone API. For a historical zone, whether DST is used or * not varies over time. In order to approximate expected - * behavior, this method returns TRUE if DST is observed at any + * behavior, this method returns true if DST is observed at any * point in the current year. */ virtual UBool useDaylightTime() const; @@ -234,7 +234,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone { * @param base The base time. * @param inclusive Whether the base time is inclusive or not. * @param result Receives the first transition after the base time. - * @return TRUE if the transition is found. + * @return true if the transition is found. */ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const; @@ -244,7 +244,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone { * @param base The base time. * @param inclusive Whether the base time is inclusive or not. * @param result Receives the most recent transition before the base time. - * @return TRUE if the transition is found. + * @return true if the transition is found. */ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const; diff --git a/intl/icu/source/i18n/persncal.cpp b/intl/icu/source/i18n/persncal.cpp index 26fd294ceebe..d30577f337f7 100644 --- a/intl/icu/source/i18n/persncal.cpp +++ b/intl/icu/source/i18n/persncal.cpp @@ -79,7 +79,7 @@ PersianCalendar* PersianCalendar::clone() const { } PersianCalendar::PersianCalendar(const Locale& aLocale, UErrorCode& success) - : Calendar(TimeZone::createDefault(), aLocale, success) + : Calendar(TimeZone::forLocaleOrDefault(aLocale), aLocale, success) { setTimeInMillis(getNow(), success); // Call this again now that the vtable is set up properly. } diff --git a/intl/icu/source/i18n/persncal.h b/intl/icu/source/i18n/persncal.h index ce6d7397bf4a..c9eff1c3058a 100644 --- a/intl/icu/source/i18n/persncal.h +++ b/intl/icu/source/i18n/persncal.h @@ -295,7 +295,7 @@ class PersianCalendar : public Calendar { virtual UBool inDaylightTime(UErrorCode& status) const; /** - * Returns TRUE because the Persian Calendar does have a default century + * Returns true because the Persian Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/pluralranges.cpp b/intl/icu/source/i18n/pluralranges.cpp new file mode 100644 index 000000000000..da10e2117d04 --- /dev/null +++ b/intl/icu/source/i18n/pluralranges.cpp @@ -0,0 +1,144 @@ +// © 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING + +// Allow implicit conversion from char16_t* to UnicodeString for this file: +// Helpful in toString methods and elsewhere. +#define UNISTR_FROM_STRING_EXPLICIT + +#include "unicode/numberrangeformatter.h" +#include "pluralranges.h" +#include "uresimp.h" +#include "charstr.h" +#include "uassert.h" +#include "util.h" +#include "numrange_impl.h" + +U_NAMESPACE_BEGIN + + +namespace { + +class PluralRangesDataSink : public ResourceSink { + public: + PluralRangesDataSink(StandardPluralRanges& output) : fOutput(output) {} + + void put(const char* /*key*/, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) U_OVERRIDE { + ResourceArray entriesArray = value.getArray(status); + if (U_FAILURE(status)) { return; } + fOutput.setCapacity(entriesArray.getSize(), status); + if (U_FAILURE(status)) { return; } + for (int i = 0; entriesArray.getValue(i, value); i++) { + ResourceArray pluralFormsArray = value.getArray(status); + if (U_FAILURE(status)) { return; } + if (pluralFormsArray.getSize() != 3) { + status = U_RESOURCE_TYPE_MISMATCH; + return; + } + pluralFormsArray.getValue(0, value); + StandardPlural::Form first = StandardPlural::fromString(value.getUnicodeString(status), status); + if (U_FAILURE(status)) { return; } + pluralFormsArray.getValue(1, value); + StandardPlural::Form second = StandardPlural::fromString(value.getUnicodeString(status), status); + if (U_FAILURE(status)) { return; } + pluralFormsArray.getValue(2, value); + StandardPlural::Form result = StandardPlural::fromString(value.getUnicodeString(status), status); + if (U_FAILURE(status)) { return; } + fOutput.addPluralRange(first, second, result); + } + } + + private: + StandardPluralRanges& fOutput; +}; + +void getPluralRangesData(const Locale& locale, StandardPluralRanges& output, UErrorCode& status) { + LocalUResourceBundlePointer rb(ures_openDirect(nullptr, "pluralRanges", &status)); + if (U_FAILURE(status)) { return; } + + CharString dataPath; + dataPath.append("locales/", -1, status); + dataPath.append(locale.getLanguage(), -1, status); + if (U_FAILURE(status)) { return; } + int32_t setLen; + // Not all languages are covered: fail gracefully + UErrorCode internalStatus = U_ZERO_ERROR; + const UChar* set = ures_getStringByKeyWithFallback(rb.getAlias(), dataPath.data(), &setLen, &internalStatus); + if (U_FAILURE(internalStatus)) { return; } + + dataPath.clear(); + dataPath.append("rules/", -1, status); + dataPath.appendInvariantChars(set, setLen, status); + if (U_FAILURE(status)) { return; } + PluralRangesDataSink sink(output); + ures_getAllItemsWithFallback(rb.getAlias(), dataPath.data(), sink, status); +} + +} // namespace + + +StandardPluralRanges +StandardPluralRanges::forLocale(const Locale& locale, UErrorCode& status) { + StandardPluralRanges result; + getPluralRangesData(locale, result, status); + return result; +} + +StandardPluralRanges +StandardPluralRanges::copy(UErrorCode& status) const { + StandardPluralRanges result; + if (fTriplesLen > result.fTriples.getCapacity()) { + if (result.fTriples.resize(fTriplesLen) == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return result; + } + } + uprv_memcpy(result.fTriples.getAlias(), + fTriples.getAlias(), + fTriplesLen * sizeof(fTriples[0])); + result.fTriplesLen = fTriplesLen; + return result; +} + +LocalPointer +StandardPluralRanges::toPointer(UErrorCode& status) && noexcept { + return LocalPointer(new StandardPluralRanges(std::move(*this)), status); +} + +void StandardPluralRanges::addPluralRange( + StandardPlural::Form first, + StandardPlural::Form second, + StandardPlural::Form result) { + U_ASSERT(fTriplesLen < fTriples.getCapacity()); + fTriples[fTriplesLen] = {first, second, result}; + fTriplesLen++; +} + +void StandardPluralRanges::setCapacity(int32_t length, UErrorCode& status) { + if (U_FAILURE(status)) { return; } + if (length > fTriples.getCapacity()) { + if (fTriples.resize(length, 0) == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + } + } +} + +StandardPlural::Form +StandardPluralRanges::resolve(StandardPlural::Form first, StandardPlural::Form second) const { + for (int32_t i=0; i toPointer(UErrorCode& status) && noexcept; + + /** Select rule based on the first and second forms */ + StandardPlural::Form resolve(StandardPlural::Form first, StandardPlural::Form second) const; + + /** Used for data loading. */ + void addPluralRange( + StandardPlural::Form first, + StandardPlural::Form second, + StandardPlural::Form result); + + /** Used for data loading. */ + void setCapacity(int32_t length, UErrorCode& status); + + private: + struct StandardPluralRangeTriple { + StandardPlural::Form first; + StandardPlural::Form second; + StandardPlural::Form result; + }; + + // TODO: An array is simple here, but it results in linear lookup time. + // Certain locales have 20-30 entries in this list. + // Consider changing to a smarter data structure. + typedef MaybeStackArray PluralRangeTriples; + PluralRangeTriples fTriples; + int32_t fTriplesLen = 0; +}; + +U_NAMESPACE_END + +#endif /* #if !UCONFIG_NO_FORMATTING */ +#endif //__PLURALRANGES_H__ diff --git a/intl/icu/source/i18n/plurfmt.cpp b/intl/icu/source/i18n/plurfmt.cpp index b99437630e67..aac35c5b094f 100644 --- a/intl/icu/source/i18n/plurfmt.cpp +++ b/intl/icu/source/i18n/plurfmt.cpp @@ -549,9 +549,15 @@ void PluralFormat::parseType(const UnicodeString& source, const NFRule *rbnfLeni UnicodeString currArg = pattern.tempSubString(partStart->getLimit(), partLimit->getIndex() - partStart->getLimit()); if (rbnfLenientScanner != NULL) { - // If lenient parsing is turned ON, we've got some time consuming parsing ahead of us. - int32_t length = -1; - currMatchIndex = rbnfLenientScanner->findTextLenient(source, currArg, startingAt, &length); + // Check if non-lenient rule finds the text before call lenient parsing + int32_t tempIndex = source.indexOf(currArg, startingAt); + if (tempIndex >= 0) { + currMatchIndex = tempIndex; + } else { + // If lenient parsing is turned ON, we've got some time consuming parsing ahead of us. + int32_t length = -1; + currMatchIndex = rbnfLenientScanner->findTextLenient(source, currArg, startingAt, &length); + } } else { currMatchIndex = source.indexOf(currArg, startingAt); diff --git a/intl/icu/source/i18n/plurrule.cpp b/intl/icu/source/i18n/plurrule.cpp index 794a3d8c55b0..e1e1667a6ea9 100644 --- a/intl/icu/source/i18n/plurrule.cpp +++ b/intl/icu/source/i18n/plurrule.cpp @@ -19,6 +19,7 @@ #include "unicode/ures.h" #include "unicode/numfmt.h" #include "unicode/decimfmt.h" +#include "unicode/numberrangeformatter.h" #include "charstr.h" #include "cmemory.h" #include "cstring.h" @@ -36,6 +37,8 @@ #include "unifiedcache.h" #include "number_decimalquantity.h" #include "util.h" +#include "pluralranges.h" +#include "numrange_impl.h" #if !UCONFIG_NO_FORMATTING @@ -56,6 +59,7 @@ static const UChar PK_VAR_N[]={LOW_N,0}; static const UChar PK_VAR_I[]={LOW_I,0}; static const UChar PK_VAR_F[]={LOW_F,0}; static const UChar PK_VAR_T[]={LOW_T,0}; +static const UChar PK_VAR_E[]={LOW_E,0}; static const UChar PK_VAR_V[]={LOW_V,0}; static const UChar PK_WITHIN[]={LOW_W,LOW_I,LOW_T,LOW_H,LOW_I,LOW_N,0}; static const UChar PK_DECIMAL[]={LOW_D,LOW_E,LOW_C,LOW_I,LOW_M,LOW_A,LOW_L,0}; @@ -67,6 +71,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(PluralKeywordEnumeration) PluralRules::PluralRules(UErrorCode& /*status*/) : UObject(), mRules(nullptr), + mStandardPluralRanges(nullptr), mInternalStatus(U_ZERO_ERROR) { } @@ -74,6 +79,7 @@ PluralRules::PluralRules(UErrorCode& /*status*/) PluralRules::PluralRules(const PluralRules& other) : UObject(other), mRules(nullptr), + mStandardPluralRanges(nullptr), mInternalStatus(U_ZERO_ERROR) { *this=other; @@ -81,6 +87,7 @@ PluralRules::PluralRules(const PluralRules& other) PluralRules::~PluralRules() { delete mRules; + delete mStandardPluralRanges; } SharedPluralRules::~SharedPluralRules() { @@ -89,14 +96,20 @@ SharedPluralRules::~SharedPluralRules() { PluralRules* PluralRules::clone() const { - PluralRules* newObj = new PluralRules(*this); // Since clone doesn't have a 'status' parameter, the best we can do is return nullptr if // the newly created object was not fully constructed properly (an error occurred). - if (newObj != nullptr && U_FAILURE(newObj->mInternalStatus)) { - delete newObj; - newObj = nullptr; + UErrorCode localStatus = U_ZERO_ERROR; + return clone(localStatus); +} + +PluralRules* +PluralRules::clone(UErrorCode& status) const { + LocalPointer newObj(new PluralRules(*this), status); + if (U_SUCCESS(status) && U_FAILURE(newObj->mInternalStatus)) { + status = newObj->mInternalStatus; + newObj.adoptInstead(nullptr); } - return newObj; + return newObj.orphan(); } PluralRules& @@ -104,6 +117,8 @@ PluralRules::operator=(const PluralRules& other) { if (this != &other) { delete mRules; mRules = nullptr; + delete mStandardPluralRanges; + mStandardPluralRanges = nullptr; mInternalStatus = other.mInternalStatus; if (U_FAILURE(mInternalStatus)) { // bail out early if the object we were copying from was already 'invalid'. @@ -119,6 +134,11 @@ PluralRules::operator=(const PluralRules& other) { mInternalStatus = mRules->fInternalStatus; } } + if (other.mStandardPluralRanges != nullptr) { + mStandardPluralRanges = other.mStandardPluralRanges->copy(mInternalStatus) + .toPointer(mInternalStatus) + .orphan(); + } } return *this; } @@ -211,11 +231,8 @@ PluralRules::forLocale(const Locale& locale, UPluralType type, UErrorCode& statu if (U_FAILURE(status)) { return nullptr; } - PluralRules *result = (*shared)->clone(); + PluralRules *result = (*shared)->clone(status); shared->removeRef(); - if (result == nullptr) { - status = U_MEMORY_ALLOCATION_ERROR; - } return result; } @@ -252,6 +269,10 @@ PluralRules::internalForLocale(const Locale& locale, UPluralType type, UErrorCod // Original impl used default rules. // Ask the question to ICU Core. + newObj->mStandardPluralRanges = StandardPluralRanges::forLocale(locale, status) + .toPointer(status) + .orphan(); + return newObj.orphan(); } @@ -272,6 +293,10 @@ PluralRules::select(const number::FormattedNumber& number, UErrorCode& status) c if (U_FAILURE(status)) { return ICU_Utility::makeBogusString(); } + if (U_FAILURE(mInternalStatus)) { + status = mInternalStatus; + return ICU_Utility::makeBogusString(); + } return select(dq); } @@ -285,6 +310,33 @@ PluralRules::select(const IFixedDecimal &number) const { } } +UnicodeString +PluralRules::select(const number::FormattedNumberRange& range, UErrorCode& status) const { + return select(range.getData(status), status); +} + +UnicodeString +PluralRules::select(const number::impl::UFormattedNumberRangeData* impl, UErrorCode& status) const { + if (U_FAILURE(status)) { + return ICU_Utility::makeBogusString(); + } + if (U_FAILURE(mInternalStatus)) { + status = mInternalStatus; + return ICU_Utility::makeBogusString(); + } + if (mStandardPluralRanges == nullptr) { + // Happens if PluralRules was constructed via createRules() + status = U_UNSUPPORTED_ERROR; + return ICU_Utility::makeBogusString(); + } + auto form1 = StandardPlural::fromString(select(impl->quantity1), status); + auto form2 = StandardPlural::fromString(select(impl->quantity2), status); + if (U_FAILURE(status)) { + return ICU_Utility::makeBogusString(); + } + auto result = mStandardPluralRanges->resolve(form1, form2); + return UnicodeString(StandardPlural::getKeyword(result), -1, US_INV); +} StringEnumeration* @@ -326,9 +378,23 @@ static double scaleForInt(double d) { return scale; } +/** + * Helper method for the overrides of getSamples() for double and FixedDecimal + * return value types. Provide only one of an allocated array of doubles or + * FixedDecimals, and a nullptr for the other. + */ static int32_t -getSamplesFromString(const UnicodeString &samples, double *dest, - int32_t destCapacity, UErrorCode& status) { +getSamplesFromString(const UnicodeString &samples, double *destDbl, + FixedDecimal* destFd, int32_t destCapacity, + UErrorCode& status) { + + if ((destDbl == nullptr && destFd == nullptr) + || (destDbl != nullptr && destFd != nullptr)) { + status = U_INTERNAL_PROGRAM_ERROR; + return 0; + } + + bool isDouble = destDbl != nullptr; int32_t sampleCount = 0; int32_t sampleStartIdx = 0; int32_t sampleEndIdx = 0; @@ -346,9 +412,13 @@ getSamplesFromString(const UnicodeString &samples, double *dest, int32_t tildeIndex = sampleRange.indexOf(TILDE); if (tildeIndex < 0) { FixedDecimal fixed(sampleRange, status); - double sampleValue = fixed.source; - if (fixed.visibleDecimalDigitCount == 0 || sampleValue != floor(sampleValue)) { - dest[sampleCount++] = sampleValue; + if (isDouble) { + double sampleValue = fixed.source; + if (fixed.visibleDecimalDigitCount == 0 || sampleValue != floor(sampleValue)) { + destDbl[sampleCount++] = sampleValue; + } + } else { + destFd[sampleCount++] = fixed; } } else { @@ -375,14 +445,21 @@ getSamplesFromString(const UnicodeString &samples, double *dest, rangeLo *= scale; rangeHi *= scale; for (double n=rangeLo; n<=rangeHi; n+=1) { - // Hack Alert: don't return any decimal samples with integer values that - // originated from a format with trailing decimals. - // This API is returning doubles, which can't distinguish having displayed - // zeros to the right of the decimal. - // This results in test failures with values mapping back to a different keyword. double sampleValue = n/scale; - if (!(sampleValue == floor(sampleValue) && fixedLo.visibleDecimalDigitCount > 0)) { - dest[sampleCount++] = sampleValue; + if (isDouble) { + // Hack Alert: don't return any decimal samples with integer values that + // originated from a format with trailing decimals. + // This API is returning doubles, which can't distinguish having displayed + // zeros to the right of the decimal. + // This results in test failures with values mapping back to a different keyword. + if (!(sampleValue == floor(sampleValue) && fixedLo.visibleDecimalDigitCount > 0)) { + destDbl[sampleCount++] = sampleValue; + } + } else { + int32_t v = (int32_t) fixedLo.getPluralOperand(PluralOperand::PLURAL_OPERAND_V); + int32_t e = (int32_t) fixedLo.getPluralOperand(PluralOperand::PLURAL_OPERAND_E); + FixedDecimal newSample = FixedDecimal::createWithExponent(sampleValue, v, e); + destFd[sampleCount++] = newSample; } if (sampleCount >= destCapacity) { break; @@ -394,24 +471,52 @@ getSamplesFromString(const UnicodeString &samples, double *dest, return sampleCount; } - int32_t PluralRules::getSamples(const UnicodeString &keyword, double *dest, int32_t destCapacity, UErrorCode& status) { - if (destCapacity == 0 || U_FAILURE(status)) { + if (U_FAILURE(status)) { return 0; } if (U_FAILURE(mInternalStatus)) { status = mInternalStatus; return 0; } + if (dest != nullptr ? destCapacity < 0 : destCapacity != 0) { + status = U_ILLEGAL_ARGUMENT_ERROR; + return 0; + } RuleChain *rc = rulesForKeyword(keyword); if (rc == nullptr) { return 0; } - int32_t numSamples = getSamplesFromString(rc->fIntegerSamples, dest, destCapacity, status); + int32_t numSamples = getSamplesFromString(rc->fIntegerSamples, dest, nullptr, destCapacity, status); if (numSamples == 0) { - numSamples = getSamplesFromString(rc->fDecimalSamples, dest, destCapacity, status); + numSamples = getSamplesFromString(rc->fDecimalSamples, dest, nullptr, destCapacity, status); + } + return numSamples; +} + +int32_t +PluralRules::getSamples(const UnicodeString &keyword, FixedDecimal *dest, + int32_t destCapacity, UErrorCode& status) { + if (U_FAILURE(status)) { + return 0; + } + if (U_FAILURE(mInternalStatus)) { + status = mInternalStatus; + return 0; + } + if (dest != nullptr ? destCapacity < 0 : destCapacity != 0) { + status = U_ILLEGAL_ARGUMENT_ERROR; + return 0; + } + RuleChain *rc = rulesForKeyword(keyword); + if (rc == nullptr) { + return 0; + } + int32_t numSamples = getSamplesFromString(rc->fIntegerSamples, nullptr, dest, destCapacity, status); + if (numSamples == 0) { + numSamples = getSamplesFromString(rc->fDecimalSamples, nullptr, dest, destCapacity, status); } return numSamples; } @@ -600,6 +705,7 @@ PluralRuleParser::parse(const UnicodeString& ruleData, PluralRules *prules, UErr case tVariableI: case tVariableF: case tVariableT: + case tVariableE: case tVariableV: U_ASSERT(curAndConstraint != nullptr); curAndConstraint->digitsType = type; @@ -984,6 +1090,8 @@ static UnicodeString tokenString(tokenType tok) { s.append(LOW_V); break; case tVariableT: s.append(LOW_T); break; + case tVariableE: + s.append(LOW_E); break; default: s.append(TILDE); } @@ -1160,6 +1268,7 @@ PluralRuleParser::checkSyntax(UErrorCode &status) case tVariableI: case tVariableF: case tVariableT: + case tVariableE: case tVariableV: if (type != tIs && type != tMod && type != tIn && type != tNot && type != tWithin && type != tEqual && type != tNotEqual) { @@ -1176,6 +1285,7 @@ PluralRuleParser::checkSyntax(UErrorCode &status) type == tVariableI || type == tVariableF || type == tVariableT || + type == tVariableE || type == tVariableV || type == tAt)) { status = U_UNEXPECTED_TOKEN; @@ -1207,6 +1317,7 @@ PluralRuleParser::checkSyntax(UErrorCode &status) type != tVariableI && type != tVariableF && type != tVariableT && + type != tVariableE && type != tVariableV) { status = U_UNEXPECTED_TOKEN; } @@ -1384,6 +1495,8 @@ PluralRuleParser::getKeyType(const UnicodeString &token, tokenType keyType) keyType = tVariableF; } else if (0 == token.compare(PK_VAR_T, 1)) { keyType = tVariableT; + } else if (0 == token.compare(PK_VAR_E, 1)) { + keyType = tVariableE; } else if (0 == token.compare(PK_VAR_V, 1)) { keyType = tVariableV; } else if (0 == token.compare(PK_IS, 2)) { @@ -1481,13 +1594,15 @@ PluralOperand tokenTypeToPluralOperand(tokenType tt) { return PLURAL_OPERAND_V; case tVariableT: return PLURAL_OPERAND_T; + case tVariableE: + return PLURAL_OPERAND_E; default: UPRV_UNREACHABLE; // unexpected. } } -FixedDecimal::FixedDecimal(double n, int32_t v, int64_t f) { - init(n, v, f); +FixedDecimal::FixedDecimal(double n, int32_t v, int64_t f, int32_t e) { + init(n, v, f, e); // check values. TODO make into unit test. // // long visiblePower = (int) Math.pow(10, v); @@ -1503,6 +1618,10 @@ FixedDecimal::FixedDecimal(double n, int32_t v, int64_t f) { // } } +FixedDecimal::FixedDecimal(double n, int32_t v, int64_t f) { + init(n, v, f); +} + FixedDecimal::FixedDecimal(double n, int32_t v) { // Ugly, but for samples we don't care. init(n, v, getFractionalDigits(n, v)); @@ -1522,20 +1641,36 @@ FixedDecimal::FixedDecimal() { FixedDecimal::FixedDecimal(const UnicodeString &num, UErrorCode &status) { CharString cs; - cs.appendInvariantChars(num, status); + int32_t parsedExponent = 0; + + int32_t exponentIdx = num.indexOf(u'e'); + if (exponentIdx < 0) { + exponentIdx = num.indexOf(u'E'); + } + if (exponentIdx >= 0) { + cs.appendInvariantChars(num.tempSubString(0, exponentIdx), status); + int32_t expSubstrStart = exponentIdx + 1; + parsedExponent = ICU_Utility::parseAsciiInteger(num, expSubstrStart); + } + else { + cs.appendInvariantChars(num, status); + } + DecimalQuantity dl; dl.setToDecNumber(cs.toStringPiece(), status); if (U_FAILURE(status)) { init(0, 0, 0); return; } + int32_t decimalPoint = num.indexOf(DOT); double n = dl.toDouble(); if (decimalPoint == -1) { - init(n, 0, 0); + init(n, 0, 0, parsedExponent); } else { - int32_t v = num.length() - decimalPoint - 1; - init(n, v, getFractionalDigits(n, v)); + int32_t fractionNumLength = exponentIdx < 0 ? num.length() : cs.length(); + int32_t v = fractionNumLength - decimalPoint - 1; + init(n, v, getFractionalDigits(n, v), parsedExponent); } } @@ -1546,6 +1681,7 @@ FixedDecimal::FixedDecimal(const FixedDecimal &other) { decimalDigits = other.decimalDigits; decimalDigitsWithoutTrailingZeros = other.decimalDigitsWithoutTrailingZeros; intValue = other.intValue; + exponent = other.exponent; _hasIntegerValue = other._hasIntegerValue; isNegative = other.isNegative; _isNaN = other._isNaN; @@ -1554,6 +1690,10 @@ FixedDecimal::FixedDecimal(const FixedDecimal &other) { FixedDecimal::~FixedDecimal() = default; +FixedDecimal FixedDecimal::createWithExponent(double n, int32_t v, int32_t e) { + return FixedDecimal(n, v, getFractionalDigits(n, v), e); +} + void FixedDecimal::init(double n) { int32_t numFractionDigits = decimals(n); @@ -1562,10 +1702,17 @@ void FixedDecimal::init(double n) { void FixedDecimal::init(double n, int32_t v, int64_t f) { + int32_t exponent = 0; + init(n, v, f, exponent); +} + + +void FixedDecimal::init(double n, int32_t v, int64_t f, int32_t e) { isNegative = n < 0.0; source = fabs(n); _isNaN = uprv_isNaN(source); _isInfinite = uprv_isInfinite(source); + exponent = e; if (_isNaN || _isInfinite) { v = 0; f = 0; @@ -1661,7 +1808,9 @@ int64_t FixedDecimal::getFractionalDigits(double n, int32_t v) { case 3: return (int64_t)(fract*1000.0 + 0.5); default: double scaled = floor(fract * pow(10.0, (double)v) + 0.5); - if (scaled > U_INT64_MAX) { + if (scaled >= static_cast(U_INT64_MAX)) { + // Note: a double cannot accurately represent U_INT64_MAX. Casting it to double + // will round up to the next representable value, which is U_INT64_MAX + 1. return U_INT64_MAX; } else { return (int64_t)scaled; @@ -1693,7 +1842,7 @@ double FixedDecimal::getPluralOperand(PluralOperand operand) const { case PLURAL_OPERAND_F: return static_cast(decimalDigits); case PLURAL_OPERAND_T: return static_cast(decimalDigitsWithoutTrailingZeros); case PLURAL_OPERAND_V: return visibleDecimalDigitCount; - case PLURAL_OPERAND_E: return 0; + case PLURAL_OPERAND_E: return exponent; default: UPRV_UNREACHABLE; // unexpected. } @@ -1719,6 +1868,23 @@ int32_t FixedDecimal::getVisibleFractionDigitCount() const { return visibleDecimalDigitCount; } +bool FixedDecimal::operator==(const FixedDecimal &other) const { + return source == other.source && visibleDecimalDigitCount == other.visibleDecimalDigitCount + && decimalDigits == other.decimalDigits && exponent == other.exponent; +} + +UnicodeString FixedDecimal::toString() const { + char pattern[15]; + char buffer[20]; + if (exponent == 0) { + snprintf(pattern, sizeof(pattern), "%%.%df", visibleDecimalDigitCount); + snprintf(buffer, sizeof(buffer), pattern, source); + } else { + snprintf(pattern, sizeof(pattern), "%%.%dfe%%d", visibleDecimalDigitCount); + snprintf(buffer, sizeof(buffer), pattern, source, exponent); + } + return UnicodeString(buffer, -1, US_INV); +} PluralAvailableLocalesEnumeration::PluralAvailableLocalesEnumeration(UErrorCode &status) { diff --git a/intl/icu/source/i18n/plurrule_impl.h b/intl/icu/source/i18n/plurrule_impl.h index 0dc44fb62e93..52af3a741316 100644 --- a/intl/icu/source/i18n/plurrule_impl.h +++ b/intl/icu/source/i18n/plurrule_impl.h @@ -30,6 +30,12 @@ #include "hash.h" #include "uassert.h" +/** + * A FixedDecimal version of UPLRULES_NO_UNIQUE_VALUE used in PluralRulesTest + * for parsing of samples. + */ +#define UPLRULES_NO_UNIQUE_VALUE_DECIMAL (FixedDecimal((double)-0.00123456777)) + class PluralRulesTest; U_NAMESPACE_BEGIN @@ -138,6 +144,7 @@ enum tokenType { tVariableF, tVariableV, tVariableT, + tVariableE, tDecimal, tInteger, tEOF @@ -273,7 +280,9 @@ class U_I18N_API FixedDecimal: public IFixedDecimal, public UObject { * @param n the number, e.g. 12.345 * @param v The number of visible fraction digits, e.g. 3 * @param f The fraction digits, e.g. 345 + * @param e The exponent, e.g. 7 in 1.2e7 (for compact/scientific) */ + FixedDecimal(double n, int32_t v, int64_t f, int32_t e); FixedDecimal(double n, int32_t v, int64_t f); FixedDecimal(double n, int32_t); explicit FixedDecimal(double n); @@ -282,6 +291,8 @@ class U_I18N_API FixedDecimal: public IFixedDecimal, public UObject { FixedDecimal(const UnicodeString &s, UErrorCode &ec); FixedDecimal(const FixedDecimal &other); + static FixedDecimal createWithExponent(double n, int32_t v, int32_t e); + double getPluralOperand(PluralOperand operand) const U_OVERRIDE; bool isNaN() const U_OVERRIDE; bool isInfinite() const U_OVERRIDE; @@ -291,19 +302,25 @@ class U_I18N_API FixedDecimal: public IFixedDecimal, public UObject { int32_t getVisibleFractionDigitCount() const; + void init(double n, int32_t v, int64_t f, int32_t e); void init(double n, int32_t v, int64_t f); void init(double n); UBool quickInit(double n); // Try a fast-path only initialization, - // return TRUE if successful. + // return true if successful. void adjustForMinFractionDigits(int32_t min); static int64_t getFractionalDigits(double n, int32_t v); static int32_t decimals(double n); + bool operator==(const FixedDecimal &other) const; + + UnicodeString toString() const; + double source; int32_t visibleDecimalDigitCount; int64_t decimalDigits; int64_t decimalDigitsWithoutTrailingZeros; int64_t intValue; + int32_t exponent; UBool _hasIntegerValue; UBool isNegative; UBool _isNaN; @@ -320,8 +337,8 @@ public: int32_t opNum = -1; // for mod expressions, the right operand of the mod. int32_t value = -1; // valid for 'is' rules only. UVector32 *rangeList = nullptr; // for 'in', 'within' rules. Null otherwise. - UBool negated = FALSE; // TRUE for negated rules. - UBool integerOnly = FALSE; // TRUE for 'within' rules. + UBool negated = false; // true for negated rules. + UBool integerOnly = false; // true for 'within' rules. tokenType digitsType = none; // n | i | v | f constraint. AndConstraint *next = nullptr; // Internal error status, used for errors that occur during the copy constructor. @@ -357,8 +374,8 @@ public: OrConstraint *ruleHeader = nullptr; UnicodeString fDecimalSamples; // Samples strings from rule source UnicodeString fIntegerSamples; // without @decimal or @integer, otherwise unprocessed. - UBool fDecimalSamplesUnbounded = FALSE; - UBool fIntegerSamplesUnbounded = FALSE; + UBool fDecimalSamplesUnbounded = false; + UBool fIntegerSamplesUnbounded = false; // Internal error status, used for errors that occur during the copy constructor. UErrorCode fInternalStatus = U_ZERO_ERROR; diff --git a/intl/icu/source/i18n/quant.h b/intl/icu/source/i18n/quant.h index d5aa8e5eeeed..df6924cc127b 100644 --- a/intl/icu/source/i18n/quant.h +++ b/intl/icu/source/i18n/quant.h @@ -62,11 +62,11 @@ class Quantifier : public UnicodeFunctor, public UnicodeMatcher { * considered for matching will be text.charAt(limit-1) in the * forward direction or text.charAt(limit+1) in the backward * direction. - * @param incremental if TRUE, then assume further characters may + * @param incremental if true, then assume further characters may * be inserted at limit and check for partial matching. Otherwise * assume the text as given is complete. * @return a match degree value indicating a full match, a partial - * match, or a mismatch. If incremental is FALSE then + * match, or a mismatch. If incremental is false then * U_PARTIAL_MATCH should never be returned. */ virtual UMatchDegree matches(const Replaceable& text, @@ -81,7 +81,7 @@ class Quantifier : public UnicodeFunctor, public UnicodeMatcher { * @return A reference to 'result'. */ virtual UnicodeString& toPattern(UnicodeString& result, - UBool escapeUnprintable = FALSE) const; + UBool escapeUnprintable = false) const; /** * Implement UnicodeMatcher diff --git a/intl/icu/source/i18n/quantityformatter.h b/intl/icu/source/i18n/quantityformatter.h index daaef4f060ac..841798cf8892 100644 --- a/intl/icu/source/i18n/quantityformatter.h +++ b/intl/icu/source/i18n/quantityformatter.h @@ -74,18 +74,18 @@ public: * @param variant "zero", "one", "two", "few", "many", "other" * @param rawPattern the pattern for the variant e.g "{0} meters" * @param status any error returned here. - * @return TRUE on success; FALSE if status was set to a non zero error. + * @return true on success; false if status was set to a non zero error. */ UBool addIfAbsent(const char *variant, const UnicodeString &rawPattern, UErrorCode &status); /** - * returns TRUE if this object has at least the "other" variant. + * returns true if this object has at least the "other" variant. */ UBool isValid() const; /** * Gets the pattern formatter that would be used for a particular variant. - * If isValid() returns TRUE, this method is guaranteed to return a + * If isValid() returns true, this method is guaranteed to return a * non-NULL value. */ const SimpleFormatter *getByVariant(const char *variant) const; @@ -112,7 +112,7 @@ public: /** * Selects the standard plural form for the number/formatter/rules. - * TODO(13591): Remove this method. + * Used in MeasureFormat for backwards compatibility with NumberFormat. */ static StandardPlural::Form selectPlural( const Formattable &number, diff --git a/intl/icu/source/i18n/rbt.h b/intl/icu/source/i18n/rbt.h index 97ef01e140af..61d3b6be527e 100644 --- a/intl/icu/source/i18n/rbt.h +++ b/intl/icu/source/i18n/rbt.h @@ -161,7 +161,7 @@ public: * to construct a new transliterator. * @param result the string to receive the rules. Previous * contents will be deleted. - * @param escapeUnprintable if TRUE then convert unprintable + * @param escapeUnprintable if true then convert unprintable * character to their hex escape representations, \uxxxx or * \Uxxxxxxxx. Unprintable characters are those other than * U+000A, U+0020..U+007E. diff --git a/intl/icu/source/i18n/rbt_pars.cpp b/intl/icu/source/i18n/rbt_pars.cpp index 1ae5b81f034d..89d426813ce1 100644 --- a/intl/icu/source/i18n/rbt_pars.cpp +++ b/intl/icu/source/i18n/rbt_pars.cpp @@ -1557,7 +1557,7 @@ UChar TransliteratorParser::getSegmentStandin(int32_t seg, UErrorCode& status) { return 0; } c = variableNext++; - // Set a placeholder in the master variables vector that will be + // Set a placeholder in the primary variables vector that will be // filled in later by setSegmentObject(). We know that we will get // called first because setSegmentObject() will call us. variablesVector.addElement((void*) NULL, status); diff --git a/intl/icu/source/i18n/rbt_pars.h b/intl/icu/source/i18n/rbt_pars.h index 61ce9727e05f..2a972e1eaa37 100644 --- a/intl/icu/source/i18n/rbt_pars.h +++ b/intl/icu/source/i18n/rbt_pars.h @@ -210,7 +210,7 @@ private: /** * Assert that the given character is NOT within the variable range. - * If it is, return FALSE. This is neccesary to ensure that the + * If it is, return false. This is neccesary to ensure that the * variable range does not overlap characters used in a rule. * @param ch the given character. * @return True, if the given character is NOT within the variable range. diff --git a/intl/icu/source/i18n/rbt_rule.h b/intl/icu/source/i18n/rbt_rule.h index 550198126673..b927f5d6c05c 100644 --- a/intl/icu/source/i18n/rbt_rule.h +++ b/intl/icu/source/i18n/rbt_rule.h @@ -172,9 +172,9 @@ public: * segments, or null if there are none. The array itself is adopted, * but the pointers within it are not. * @param segsCount number of elements in segs[]. - * @param anchorStart TRUE if the the rule is anchored on the left to + * @param anchorStart true if the the rule is anchored on the left to * the context start. - * @param anchorEnd TRUE if the rule is anchored on the right to the + * @param anchorEnd true if the rule is anchored on the right to the * context limit. * @param data the rule data. * @param status Output parameter filled in with success or failure status. @@ -267,11 +267,11 @@ public: * * @param text the text * @param pos the position indices - * @param incremental if TRUE, test for partial matches that may + * @param incremental if true, test for partial matches that may * be completed by additional text inserted at pos.limit. * @return one of U_MISMATCH, * U_PARTIAL_MATCH, or U_MATCH. If - * incremental is FALSE then U_PARTIAL_MATCH will not be returned. + * incremental is false then U_PARTIAL_MATCH will not be returned. */ UMatchDegree matchAndReplace(Replaceable& text, UTransPosition& pos, diff --git a/intl/icu/source/i18n/rbt_set.h b/intl/icu/source/i18n/rbt_set.h index b4b46786bf1d..35ae3fbb4baf 100644 --- a/intl/icu/source/i18n/rbt_set.h +++ b/intl/icu/source/i18n/rbt_set.h @@ -123,14 +123,14 @@ public: /** * Transliterate the given text with the given UTransPosition - * indices. Return TRUE if the transliteration should continue - * or FALSE if it should halt (because of a U_PARTIAL_MATCH match). - * Note that FALSE is only ever returned if isIncremental is TRUE. + * indices. Return true if the transliteration should continue + * or false if it should halt (because of a U_PARTIAL_MATCH match). + * Note that false is only ever returned if isIncremental is true. * @param text the text to be transliterated * @param index the position indices, which will be updated - * @param isIncremental if TRUE, assume new text may be inserted - * at index.limit, and return FALSE if thre is a partial match. - * @return TRUE unless a U_PARTIAL_MATCH has been obtained, + * @param isIncremental if true, assume new text may be inserted + * at index.limit, and return false if thre is a partial match. + * @return true unless a U_PARTIAL_MATCH has been obtained, * indicating that transliteration should stop until more text * arrives. */ diff --git a/intl/icu/source/i18n/regexcmp.h b/intl/icu/source/i18n/regexcmp.h index f2aeea909e74..f3cfa6e6d156 100644 --- a/intl/icu/source/i18n/regexcmp.h +++ b/intl/icu/source/i18n/regexcmp.h @@ -104,7 +104,7 @@ private: int32_t LoopOp); UBool compileInlineInterval(); // Generate inline code for a {min,max} quantifier void literalChar(UChar32 c); // Compile a literal char - void fixLiterals(UBool split=FALSE); // Generate code for pending literal characters. + void fixLiterals(UBool split=false); // Generate code for pending literal characters. void insertOp(int32_t where); // Open up a slot for a new op in the // generated code at the specified location. void appendOp(int32_t op); // Append a new op to the compiled pattern. diff --git a/intl/icu/source/i18n/regextxt.h b/intl/icu/source/i18n/regextxt.h index 9cfabbe41534..0f64b8437e7c 100644 --- a/intl/icu/source/i18n/regextxt.h +++ b/intl/icu/source/i18n/regextxt.h @@ -29,7 +29,7 @@ U_NAMESPACE_BEGIN #endif #ifdef REGEX_DISABLE_CHUNK_MODE -# define UTEXT_FULL_TEXT_IN_CHUNK(ut,len) (FALSE) +# define UTEXT_FULL_TEXT_IN_CHUNK(ut,len) (false) #else # define UTEXT_FULL_TEXT_IN_CHUNK(ut,len) ((0==((ut)->chunkNativeStart))&&((len)==((ut)->chunkNativeLimit))&&((len)==((ut)->nativeIndexingLimit))) #endif diff --git a/intl/icu/source/i18n/region.cpp b/intl/icu/source/i18n/region.cpp index 76445aef3289..d8a5ffddc376 100644 --- a/intl/icu/source/i18n/region.cpp +++ b/intl/icu/source/i18n/region.cpp @@ -217,7 +217,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { if ( aliasToRegion != NULL && aliasFromRegion == NULL ) { // This is just an alias from some string to a region uhash_put(newRegionAliases.getAlias(),(void *)aliasFromStr.orphan(), (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. + if ( aliasFromRegion == NULL ) { // Deprecated region code not in the primary codes list - so need to create a deprecated region for it. LocalPointer newRgn(new Region, status); if ( U_SUCCESS(status) ) { aliasFromRegion = newRgn.orphan(); diff --git a/intl/icu/source/i18n/reldatefmt.cpp b/intl/icu/source/i18n/reldatefmt.cpp index 8c6688c5b9ad..b4d4e646b044 100644 --- a/intl/icu/source/i18n/reldatefmt.cpp +++ b/intl/icu/source/i18n/reldatefmt.cpp @@ -1326,7 +1326,7 @@ ureldatefmt_formatNumeric( const URelativeDateTimeFormatter* reldatefmt, return res.extract(result, resultCapacity, *status); } -U_STABLE void U_EXPORT2 +U_CAPI void U_EXPORT2 ureldatefmt_formatNumericToResult( const URelativeDateTimeFormatter* reldatefmt, double offset, @@ -1369,7 +1369,7 @@ ureldatefmt_format( const URelativeDateTimeFormatter* reldatefmt, return res.extract(result, resultCapacity, *status); } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 ureldatefmt_formatToResult( const URelativeDateTimeFormatter* reldatefmt, double offset, diff --git a/intl/icu/source/i18n/rematch.cpp b/intl/icu/source/i18n/rematch.cpp index 69909faab9ca..8e496329ad35 100644 --- a/intl/icu/source/i18n/rematch.cpp +++ b/intl/icu/source/i18n/rematch.cpp @@ -2072,7 +2072,7 @@ int32_t RegexMatcher::split(UText *input, UErrorCode &status) { // - // Check arguements for validity + // Check arguments for validity // if (U_FAILURE(status)) { return 0; diff --git a/intl/icu/source/i18n/rulebasedcollator.cpp b/intl/icu/source/i18n/rulebasedcollator.cpp index 60acf17815a5..917482d65bb4 100644 --- a/intl/icu/source/i18n/rulebasedcollator.cpp +++ b/intl/icu/source/i18n/rulebasedcollator.cpp @@ -1600,10 +1600,7 @@ RuleBasedCollator::internalGetShortDefinitionString(const char *locale, appendSubtag(result, 'Z', subtag, length, errorCode); if(U_FAILURE(errorCode)) { return 0; } - if(result.length() <= capacity) { - uprv_memcpy(buffer, result.data(), result.length()); - } - return u_terminateChars(buffer, capacity, result.length(), &errorCode); + return result.extract(buffer, capacity, errorCode); } UBool diff --git a/intl/icu/source/i18n/smpdtfmt.cpp b/intl/icu/source/i18n/smpdtfmt.cpp index d704642b0536..4717899cf38d 100644 --- a/intl/icu/source/i18n/smpdtfmt.cpp +++ b/intl/icu/source/i18n/smpdtfmt.cpp @@ -54,6 +54,7 @@ #include "unicode/udisplaycontext.h" #include "unicode/brkiter.h" #include "unicode/rbnf.h" +#include "unicode/dtptngen.h" #include "uresimp.h" #include "olsontz.h" #include "patternprops.h" @@ -650,6 +651,12 @@ SimpleDateFormat::operator==(const Format& other) const } //---------------------------------------------------------------------- +static const UChar* timeSkeletons[4] = { + u"jmmsszzzz", // kFull + u"jmmssz", // kLong + u"jmmss", // kMedium + u"jmm", // kShort +}; void SimpleDateFormat::construct(EStyle timeStyle, EStyle dateStyle, @@ -714,35 +721,75 @@ void SimpleDateFormat::construct(EStyle timeStyle, fDateOverride.setToBogus(); fTimeOverride.setToBogus(); + UnicodeString timePattern; + if (timeStyle >= kFull && timeStyle <= kShort) { + const char* baseLocID = locale.getBaseName(); + if (baseLocID[0]!=0 && uprv_strcmp(baseLocID,"und")!=0) { + UErrorCode useStatus = U_ZERO_ERROR; + Locale baseLoc(baseLocID); + Locale validLoc(getLocale(ULOC_VALID_LOCALE, useStatus)); + if (U_SUCCESS(useStatus) && validLoc!=baseLoc) { + bool useDTPG = false; + const char* baseReg = baseLoc.getCountry(); // empty string if no region + if ((baseReg[0]!=0 && uprv_strncmp(baseReg,validLoc.getCountry(),ULOC_COUNTRY_CAPACITY)!=0) + || uprv_strncmp(baseLoc.getLanguage(),validLoc.getLanguage(),ULOC_LANG_CAPACITY)!=0) { + // use DTPG if + // * baseLoc has a region and validLoc does not have the same one (or has none), OR + // * validLoc has a different language code than baseLoc + useDTPG = true; + } + if (useDTPG) { + // The standard time formats may have the wrong time cycle, because: + // the valid locale differs in important ways (region, language) from + // the base locale. + // We could *also* check whether they do actually have a mismatch with + // the time cycle preferences for the region, but that is a lot more + // work for little or no additional benefit, since just going ahead + // and always synthesizing the time format as per the following should + // create a locale-appropriate pattern with cycle that matches the + // region preferences anyway. + LocalPointer dtpg(DateTimePatternGenerator::createInstanceNoStdPat(locale, useStatus)); + if (U_SUCCESS(useStatus)) { + UnicodeString timeSkeleton(TRUE, timeSkeletons[timeStyle], -1); + timePattern = dtpg->getBestPattern(timeSkeleton, useStatus); + } + } + } + } + } + // if the pattern should include both date and time information, use the date/time // pattern string as a guide to tell use how to glue together the appropriate date // and time pattern strings. if ((timeStyle != kNone) && (dateStyle != kNone)) { - currentBundle.adoptInstead( - ures_getByIndex(dateTimePatterns.getAlias(), (int32_t)timeStyle, NULL, &status)); - if (U_FAILURE(status)) { - status = U_INVALID_FORMAT_ERROR; - return; - } - switch (ures_getType(currentBundle.getAlias())) { - case URES_STRING: { - resStr = ures_getString(currentBundle.getAlias(), &resStrLen, &status); - break; - } - case URES_ARRAY: { - resStr = ures_getStringByIndex(currentBundle.getAlias(), 0, &resStrLen, &status); - ovrStr = ures_getStringByIndex(currentBundle.getAlias(), 1, &ovrStrLen, &status); - fTimeOverride.setTo(TRUE, ovrStr, ovrStrLen); - break; - } - default: { + UnicodeString tempus1(timePattern); + if (tempus1.length() == 0) { + currentBundle.adoptInstead( + ures_getByIndex(dateTimePatterns.getAlias(), (int32_t)timeStyle, NULL, &status)); + if (U_FAILURE(status)) { status = U_INVALID_FORMAT_ERROR; return; } - } + switch (ures_getType(currentBundle.getAlias())) { + case URES_STRING: { + resStr = ures_getString(currentBundle.getAlias(), &resStrLen, &status); + break; + } + case URES_ARRAY: { + resStr = ures_getStringByIndex(currentBundle.getAlias(), 0, &resStrLen, &status); + ovrStr = ures_getStringByIndex(currentBundle.getAlias(), 1, &ovrStrLen, &status); + fTimeOverride.setTo(TRUE, ovrStr, ovrStrLen); + break; + } + default: { + status = U_INVALID_FORMAT_ERROR; + return; + } + } - UnicodeString tempus1(TRUE, resStr, resStrLen); + tempus1.setTo(TRUE, resStr, resStrLen); + } currentBundle.adoptInstead( ures_getByIndex(dateTimePatterns.getAlias(), (int32_t)dateStyle, NULL, &status)); @@ -784,29 +831,32 @@ void SimpleDateFormat::construct(EStyle timeStyle, // pattern string from the resources // setTo() - see DateFormatSymbols::assignArray comments else if (timeStyle != kNone) { - currentBundle.adoptInstead( - ures_getByIndex(dateTimePatterns.getAlias(), (int32_t)timeStyle, NULL, &status)); - if (U_FAILURE(status)) { - status = U_INVALID_FORMAT_ERROR; - return; - } - switch (ures_getType(currentBundle.getAlias())) { - case URES_STRING: { - resStr = ures_getString(currentBundle.getAlias(), &resStrLen, &status); - break; - } - case URES_ARRAY: { - resStr = ures_getStringByIndex(currentBundle.getAlias(), 0, &resStrLen, &status); - ovrStr = ures_getStringByIndex(currentBundle.getAlias(), 1, &ovrStrLen, &status); - fDateOverride.setTo(TRUE, ovrStr, ovrStrLen); - break; - } - default: { + fPattern.setTo(timePattern); + if (fPattern.length() == 0) { + currentBundle.adoptInstead( + ures_getByIndex(dateTimePatterns.getAlias(), (int32_t)timeStyle, NULL, &status)); + if (U_FAILURE(status)) { status = U_INVALID_FORMAT_ERROR; return; } + switch (ures_getType(currentBundle.getAlias())) { + case URES_STRING: { + resStr = ures_getString(currentBundle.getAlias(), &resStrLen, &status); + break; + } + case URES_ARRAY: { + resStr = ures_getStringByIndex(currentBundle.getAlias(), 0, &resStrLen, &status); + ovrStr = ures_getStringByIndex(currentBundle.getAlias(), 1, &ovrStrLen, &status); + fDateOverride.setTo(TRUE, ovrStr, ovrStrLen); + break; + } + default: { + status = U_INVALID_FORMAT_ERROR; + return; + } + } + fPattern.setTo(TRUE, resStr, resStrLen); } - fPattern.setTo(TRUE, resStr, resStrLen); } else if (dateStyle != kNone) { currentBundle.adoptInstead( @@ -848,7 +898,8 @@ Calendar* SimpleDateFormat::initializeCalendar(TimeZone* adoptZone, const Locale& locale, UErrorCode& status) { if(!U_FAILURE(status)) { - fCalendar = Calendar::createInstance(adoptZone?adoptZone:TimeZone::createDefault(), locale, status); + fCalendar = Calendar::createInstance( + adoptZone ? adoptZone : TimeZone::forLocaleOrDefault(locale), locale, status); } return fCalendar; } diff --git a/intl/icu/source/i18n/sources.txt b/intl/icu/source/i18n/sources.txt new file mode 100644 index 000000000000..b28f34c86fb9 --- /dev/null +++ b/intl/icu/source/i18n/sources.txt @@ -0,0 +1,240 @@ +alphaindex.cpp +anytrans.cpp +astro.cpp +basictz.cpp +bocsu.cpp +brktrans.cpp +buddhcal.cpp +calendar.cpp +casetrn.cpp +cecal.cpp +chnsecal.cpp +choicfmt.cpp +coleitr.cpp +coll.cpp +collation.cpp +collationbuilder.cpp +collationcompare.cpp +collationdata.cpp +collationdatabuilder.cpp +collationdatareader.cpp +collationdatawriter.cpp +collationfastlatin.cpp +collationfastlatinbuilder.cpp +collationfcd.cpp +collationiterator.cpp +collationkeys.cpp +collationroot.cpp +collationrootelements.cpp +collationruleparser.cpp +collationsets.cpp +collationsettings.cpp +collationtailoring.cpp +collationweights.cpp +compactdecimalformat.cpp +coptccal.cpp +cpdtrans.cpp +csdetect.cpp +csmatch.cpp +csr2022.cpp +csrecog.cpp +csrmbcs.cpp +csrsbcs.cpp +csrucode.cpp +csrutf8.cpp +curramt.cpp +currfmt.cpp +currpinf.cpp +currunit.cpp +dangical.cpp +datefmt.cpp +dayperiodrules.cpp +dcfmtsym.cpp +decContext.cpp +decNumber.cpp +decimfmt.cpp +double-conversion-bignum-dtoa.cpp +double-conversion-bignum.cpp +double-conversion-cached-powers.cpp +double-conversion-double-to-string.cpp +double-conversion-fast-dtoa.cpp +double-conversion-string-to-double.cpp +double-conversion-strtod.cpp +dtfmtsym.cpp +dtitvfmt.cpp +dtitvinf.cpp +dtptngen.cpp +dtrule.cpp +erarules.cpp +esctrn.cpp +ethpccal.cpp +fmtable.cpp +fmtable_cnv.cpp +format.cpp +formatted_string_builder.cpp +formattedval_iterimpl.cpp +formattedval_sbimpl.cpp +formattedvalue.cpp +fphdlimp.cpp +fpositer.cpp +funcrepl.cpp +gender.cpp +gregocal.cpp +gregoimp.cpp +hebrwcal.cpp +indiancal.cpp +inputext.cpp +islamcal.cpp +japancal.cpp +listformatter.cpp +measfmt.cpp +measunit.cpp +measunit_extra.cpp +measure.cpp +msgfmt.cpp +name2uni.cpp +nfrs.cpp +nfrule.cpp +nfsubs.cpp +nortrans.cpp +nultrans.cpp +number_affixutils.cpp +number_asformat.cpp +number_capi.cpp +number_compact.cpp +number_currencysymbols.cpp +number_decimalquantity.cpp +number_decimfmtprops.cpp +number_fluent.cpp +number_formatimpl.cpp +number_grouping.cpp +number_integerwidth.cpp +number_longnames.cpp +number_mapper.cpp +number_modifiers.cpp +number_multiplier.cpp +number_notation.cpp +number_output.cpp +number_padding.cpp +number_patternmodifier.cpp +number_patternstring.cpp +number_rounding.cpp +number_scientific.cpp +number_skeletons.cpp +number_symbolswrapper.cpp +number_usageprefs.cpp +number_utils.cpp +numfmt.cpp +numparse_affixes.cpp +numparse_compositions.cpp +numparse_currency.cpp +numparse_decimal.cpp +numparse_impl.cpp +numparse_parsednumber.cpp +numparse_scientific.cpp +numparse_symbols.cpp +numparse_validators.cpp +numrange_capi.cpp +numrange_fluent.cpp +numrange_impl.cpp +numsys.cpp +olsontz.cpp +persncal.cpp +pluralranges.cpp +plurfmt.cpp +plurrule.cpp +quant.cpp +quantityformatter.cpp +rbnf.cpp +rbt.cpp +rbt_data.cpp +rbt_pars.cpp +rbt_rule.cpp +rbt_set.cpp +rbtz.cpp +regexcmp.cpp +regeximp.cpp +regexst.cpp +regextxt.cpp +region.cpp +reldatefmt.cpp +reldtfmt.cpp +rematch.cpp +remtrans.cpp +repattrn.cpp +rulebasedcollator.cpp +scientificnumberformatter.cpp +scriptset.cpp +search.cpp +selfmt.cpp +sharedbreakiterator.cpp +simpletz.cpp +smpdtfmt.cpp +smpdtfst.cpp +sortkey.cpp +standardplural.cpp +string_segment.cpp +strmatch.cpp +strrepl.cpp +stsearch.cpp +taiwncal.cpp +timezone.cpp +titletrn.cpp +tmunit.cpp +tmutamt.cpp +tmutfmt.cpp +tolowtrn.cpp +toupptrn.cpp +translit.cpp +transreg.cpp +tridpars.cpp +tzfmt.cpp +tzgnames.cpp +tznames.cpp +tznames_impl.cpp +tzrule.cpp +tztrans.cpp +ucal.cpp +ucln_in.cpp +ucol.cpp +ucol_res.cpp +ucol_sit.cpp +ucoleitr.cpp +ucsdet.cpp +udat.cpp +udateintervalformat.cpp +udatpg.cpp +ufieldpositer.cpp +uitercollationiterator.cpp +ulistformatter.cpp +ulocdata.cpp +umsg.cpp +unesctrn.cpp +uni2name.cpp +units_data.cpp +units_complexconverter.cpp +units_converter.cpp +units_router.cpp +unum.cpp +unumsys.cpp +upluralrules.cpp +uregex.cpp +uregexc.cpp +uregion.cpp +usearch.cpp +uspoof.cpp +uspoof_build.cpp +uspoof_conf.cpp +uspoof_impl.cpp +utf16collationiterator.cpp +utf8collationiterator.cpp +utmscale.cpp +utrans.cpp +vtzone.cpp +vzone.cpp +windtfmt.cpp +winnmfmt.cpp +wintzimpl.cpp +zonemeta.cpp +zrule.cpp +ztrans.cpp diff --git a/intl/icu/source/i18n/strmatch.h b/intl/icu/source/i18n/strmatch.h index 71ae9849511b..4ee5cbd08874 100644 --- a/intl/icu/source/i18n/strmatch.h +++ b/intl/icu/source/i18n/strmatch.h @@ -109,11 +109,11 @@ class StringMatcher : public UnicodeFunctor, public UnicodeMatcher, public Unico * considered for matching will be text.charAt(limit-1) in the * forward direction or text.charAt(limit+1) in the backward * direction. - * @param incremental if TRUE, then assume further characters may + * @param incremental if true, then assume further characters may * be inserted at limit and check for partial matching. Otherwise * assume the text as given is complete. * @return a match degree value indicating a full match, a partial - * match, or a mismatch. If incremental is FALSE then + * match, or a mismatch. If incremental is false then * U_PARTIAL_MATCH should never be returned. */ virtual UMatchDegree matches(const Replaceable& text, @@ -128,16 +128,16 @@ class StringMatcher : public UnicodeFunctor, public UnicodeMatcher, public Unico * @return A reference to 'result'. */ virtual UnicodeString& toPattern(UnicodeString& result, - UBool escapeUnprintable = FALSE) const; + UBool escapeUnprintable = false) const; /** * Implement UnicodeMatcher - * Returns TRUE if this matcher will match a character c, where c + * Returns true if this matcher will match a character c, where c * & 0xFF == v, at offset, in the forward direction (with limit > * offset). This is used by RuleBasedTransliterator for * indexing. * @param v the given value - * @return TRUE if this matcher will match a character c, + * @return true if this matcher will match a character c, * where c & 0xFF == v */ virtual UBool matchesIndexValue(uint8_t v) const; @@ -181,7 +181,7 @@ class StringMatcher : public UnicodeFunctor, public UnicodeMatcher, public Unico * replacer that is equal to this one. * @param result the string to receive the pattern. Previous * contents will be deleted. - * @param escapeUnprintable if TRUE then convert unprintable + * @param escapeUnprintable if true then convert unprintable * character to their hex escape representations, \\uxxxx or * \\Uxxxxxxxx. Unprintable characters are defined by * Utility.isUnprintable(). diff --git a/intl/icu/source/i18n/taiwncal.h b/intl/icu/source/i18n/taiwncal.h index 01d4d31e80b8..5fec78d14660 100644 --- a/intl/icu/source/i18n/taiwncal.h +++ b/intl/icu/source/i18n/taiwncal.h @@ -156,7 +156,7 @@ private: virtual int32_t handleGetLimit(UCalendarDateFields field, ELimitType limitType) const; /** - * Returns TRUE because the Taiwan Calendar does have a default century + * Returns true because the Taiwan Calendar does have a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/timezone.cpp b/intl/icu/source/i18n/timezone.cpp index 284334ebf7ef..78f538ccecdd 100644 --- a/intl/icu/source/i18n/timezone.cpp +++ b/intl/icu/source/i18n/timezone.cpp @@ -579,6 +579,24 @@ TimeZone::createDefault() // ------------------------------------- +TimeZone* U_EXPORT2 +TimeZone::forLocaleOrDefault(const Locale& locale) +{ + char buffer[ULOC_KEYWORDS_CAPACITY] = ""; + UErrorCode localStatus = U_ZERO_ERROR; + int32_t count = locale.getKeywordValue("timezone", buffer, sizeof(buffer), localStatus); + if (U_FAILURE(localStatus) || localStatus == U_STRING_NOT_TERMINATED_WARNING) { + // the "timezone" keyword exceeds ULOC_KEYWORDS_CAPACITY; ignore and use default. + count = 0; + } + if (count > 0) { + return TimeZone::createTimeZone(UnicodeString(buffer, count, US_INV)); + } + return TimeZone::createDefault(); +} + +// ------------------------------------- + void U_EXPORT2 TimeZone::adoptDefault(TimeZone* zone) { diff --git a/intl/icu/source/i18n/transreg.h b/intl/icu/source/i18n/transreg.h index 041244e1b02d..04ed3fb50105 100644 --- a/intl/icu/source/i18n/transreg.h +++ b/intl/icu/source/i18n/transreg.h @@ -69,7 +69,7 @@ class TransliteratorAlias : public UMemory { * it when the registry mutex is NOT held, to prevent deadlock. * It may only be called once. * - * Note: Only call create() if isRuleBased() returns FALSE. + * Note: Only call create() if isRuleBased() returns false. * * This method must be called *outside* of the TransliteratorRegistry * mutex. @@ -77,17 +77,17 @@ class TransliteratorAlias : public UMemory { Transliterator* create(UParseError&, UErrorCode&); /** - * Return TRUE if this alias is rule-based. If so, the caller + * Return true if this alias is rule-based. If so, the caller * must call parse() on it, then call TransliteratorRegistry::reget(). */ UBool isRuleBased() const; /** - * If isRuleBased() returns TRUE, then the caller must call this + * If isRuleBased() returns true, then the caller must call this * method, followed by TransliteratorRegistry::reget(). The latter * method must be called inside the TransliteratorRegistry mutex. * - * Note: Only call parse() if isRuleBased() returns TRUE. + * Note: Only call parse() if isRuleBased() returns true. * * This method must be called *outside* of the TransliteratorRegistry * mutex, because it can instantiate Transliterators embedded in diff --git a/intl/icu/source/i18n/tridpars.h b/intl/icu/source/i18n/tridpars.h index 5e42f068a47c..03d68ccac910 100644 --- a/intl/icu/source/i18n/tridpars.h +++ b/intl/icu/source/i18n/tridpars.h @@ -222,7 +222,7 @@ class TransliteratorIDParser /* not : public UObject because all methods are sta * @param source the given source. * @param target the given target. * @param variant the given variant - * @param isSourcePresent If TRUE then the source is present. + * @param isSourcePresent If true then the source is present. * If the source is not present, ANY will be * given as the source, and isSourcePresent will be null * @return an array of 4 strings: source, target, variant, and diff --git a/intl/icu/source/i18n/tznames_impl.h b/intl/icu/source/i18n/tznames_impl.h index 1286eeb80dc5..417c0511f81f 100644 --- a/intl/icu/source/i18n/tznames_impl.h +++ b/intl/icu/source/i18n/tznames_impl.h @@ -92,9 +92,9 @@ struct CharacterNode { UBool fHasValuesVector; UBool fPadding; - // No value: fValues == NULL and fHasValuesVector == FALSE - // One value: fValues == value and fHasValuesVector == FALSE - // >=2 values: fValues == UVector of values and fHasValuesVector == TRUE + // No value: fValues == NULL and fHasValuesVector == false + // One value: fValues == value and fHasValuesVector == false + // >=2 values: fValues == UVector of values and fHasValuesVector == true }; inline UBool CharacterNode::hasValues() const { diff --git a/intl/icu/source/i18n/ucal.cpp b/intl/icu/source/i18n/ucal.cpp index 67c51aea2718..c30ce0933521 100644 --- a/intl/icu/source/i18n/ucal.cpp +++ b/intl/icu/source/i18n/ucal.cpp @@ -91,7 +91,7 @@ ucal_setDefaultTimeZone(const UChar* zoneID, UErrorCode* ec) { } } -U_DRAFT int32_t U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ucal_getHostTimeZone(UChar* result, int32_t resultCapacity, UErrorCode* ec) { int32_t len = 0; if (ec != NULL && U_SUCCESS(*ec)) { diff --git a/intl/icu/source/i18n/ucol_imp.h b/intl/icu/source/i18n/ucol_imp.h index a251fc461d3a..f463957fd4f2 100644 --- a/intl/icu/source/i18n/ucol_imp.h +++ b/intl/icu/source/i18n/ucol_imp.h @@ -41,10 +41,10 @@ * rules must be equivalent. * @param source first collator * @param target second collator - * @return TRUE or FALSE + * @return true or false * @internal ICU 3.0 */ -U_INTERNAL UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 ucol_equals(const UCollator *source, const UCollator *target); /** diff --git a/intl/icu/source/i18n/ucol_sit.cpp b/intl/icu/source/i18n/ucol_sit.cpp index 92f332d6d06e..4dc81aebcc94 100644 --- a/intl/icu/source/i18n/ucol_sit.cpp +++ b/intl/icu/source/i18n/ucol_sit.cpp @@ -372,10 +372,7 @@ int32_t ucol_sit_dumpSpecs(CollatorSpec *s, char *destination, int32_t capacity, } len += s->entries[i].length(); } else { - len += s->entries[i].length(); - if(len < capacity) { - uprv_strncat(destination,s->entries[i].data(), s->entries[i].length()); - } + len += s->entries[i].extract(destination + len, capacity - len, *status); } } } diff --git a/intl/icu/source/i18n/ucsdet.cpp b/intl/icu/source/i18n/ucsdet.cpp index 46f69cf90cba..63f204d0e104 100644 --- a/intl/icu/source/i18n/ucsdet.cpp +++ b/intl/icu/source/i18n/ucsdet.cpp @@ -193,7 +193,7 @@ ucsdet_getAllDetectableCharsets(const UCharsetDetector * /*ucsd*/, UErrorCode *s return CharsetDetector::getAllDetectableCharsets(*status); } -U_DRAFT UEnumeration * U_EXPORT2 +U_CAPI UEnumeration * U_EXPORT2 ucsdet_getDetectableCharsets(const UCharsetDetector *ucsd, UErrorCode *status) { return ((CharsetDetector *)ucsd)->getDetectableCharsets(*status); diff --git a/intl/icu/source/i18n/udat.cpp b/intl/icu/source/i18n/udat.cpp index ab91bcff4127..ba44710ca0a7 100644 --- a/intl/icu/source/i18n/udat.cpp +++ b/intl/icu/source/i18n/udat.cpp @@ -82,19 +82,24 @@ static UCalendarDateFields gDateFieldMapping[] = { UCAL_ZONE_OFFSET, // UDAT_TIMEZONE_ISO_FIELD = 32 (also UCAL_DST_OFFSET) UCAL_ZONE_OFFSET, // UDAT_TIMEZONE_ISO_LOCAL_FIELD = 33 (also UCAL_DST_OFFSET) UCAL_EXTENDED_YEAR, // UDAT_RELATED_YEAR_FIELD = 34 (not an exact match) - UCAL_FIELD_COUNT, // UDAT_FIELD_COUNT = 35 + UCAL_FIELD_COUNT, // UDAT_AM_PM_MIDNIGHT_NOON_FIELD=35 (no match) + UCAL_FIELD_COUNT, // UDAT_FLEXIBLE_DAY_PERIOD_FIELD=36 (no match) + UCAL_FIELD_COUNT, // UDAT_TIME_SEPARATOR_FIELD = 37 (no match) + // UDAT_FIELD_COUNT = 38 as of ICU 67 // UCAL_IS_LEAP_MONTH is not the target of a mapping }; U_CAPI UCalendarDateFields U_EXPORT2 udat_toCalendarDateField(UDateFormatField field) { - return gDateFieldMapping[field]; + static_assert(UDAT_FIELD_COUNT == UPRV_LENGTHOF(gDateFieldMapping), + "UDateFormatField and gDateFieldMapping should have the same number of entries and be kept in sync."); + return (field >= UDAT_ERA_FIELD && field < UPRV_LENGTHOF(gDateFieldMapping))? gDateFieldMapping[field]: UCAL_FIELD_COUNT; } /* For now- one opener. */ static UDateFormatOpener gOpener = NULL; -U_INTERNAL void U_EXPORT2 +U_CAPI void U_EXPORT2 udat_registerOpener(UDateFormatOpener opener, UErrorCode *status) { if(U_FAILURE(*status)) return; @@ -107,7 +112,7 @@ udat_registerOpener(UDateFormatOpener opener, UErrorCode *status) umtx_unlock(NULL); } -U_INTERNAL UDateFormatOpener U_EXPORT2 +U_CAPI UDateFormatOpener U_EXPORT2 udat_unregisterOpener(UDateFormatOpener opener, UErrorCode *status) { if(U_FAILURE(*status)) return NULL; @@ -419,7 +424,7 @@ udat_setLenient( UDateFormat* fmt, ((DateFormat*)fmt)->setLenient(isLenient); } -U_DRAFT UBool U_EXPORT2 +U_CAPI UBool U_EXPORT2 udat_getBooleanAttribute(const UDateFormat* fmt, UDateFormatBooleanAttribute attr, UErrorCode* status) @@ -429,7 +434,7 @@ udat_getBooleanAttribute(const UDateFormat* fmt, //return FALSE; } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 udat_setBooleanAttribute(UDateFormat *fmt, UDateFormatBooleanAttribute attr, UBool newValue, @@ -452,7 +457,7 @@ udat_setCalendar(UDateFormat* fmt, ((DateFormat*)fmt)->setCalendar(*((Calendar*)calendarToSet)); } -U_DRAFT const UNumberFormat* U_EXPORT2 +U_CAPI const UNumberFormat* U_EXPORT2 udat_getNumberFormatForField(const UDateFormat* fmt, UChar field) { UErrorCode status = U_ZERO_ERROR; @@ -467,7 +472,7 @@ udat_getNumberFormat(const UDateFormat* fmt) return (const UNumberFormat*) ((DateFormat*)fmt)->getNumberFormat(); } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 udat_adoptNumberFormatForFields( UDateFormat* fmt, const UChar* fields, UNumberFormat* numberFormatToSet, @@ -489,7 +494,7 @@ udat_setNumberFormat(UDateFormat* fmt, ((DateFormat*)fmt)->setNumberFormat(*((NumberFormat*)numberFormatToSet)); } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 udat_adoptNumberFormat( UDateFormat* fmt, UNumberFormat* numberFormatToAdopt) { diff --git a/intl/icu/source/i18n/udateintervalformat.cpp b/intl/icu/source/i18n/udateintervalformat.cpp index 388960384b56..355744346a39 100644 --- a/intl/icu/source/i18n/udateintervalformat.cpp +++ b/intl/icu/source/i18n/udateintervalformat.cpp @@ -18,6 +18,7 @@ #include "unicode/timezone.h" #include "unicode/locid.h" #include "unicode/unistr.h" +#include "unicode/udisplaycontext.h" #include "formattedval_impl.h" U_NAMESPACE_USE @@ -116,7 +117,7 @@ udtitvfmt_format(const UDateIntervalFormat* formatter, } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 udtitvfmt_formatToResult( const UDateIntervalFormat* formatter, UDate fromDate, @@ -134,7 +135,7 @@ udtitvfmt_formatToResult( } } -U_DRAFT void U_EXPORT2 +U_CAPI void U_EXPORT2 udtitvfmt_formatCalendarToResult( const UDateIntervalFormat* formatter, UCalendar* fromCalendar, @@ -151,5 +152,25 @@ udtitvfmt_formatCalendarToResult( } } +U_CAPI void U_EXPORT2 +udtitvfmt_setContext(UDateIntervalFormat* formatter, + UDisplayContext value, + UErrorCode* status) { + if (U_FAILURE(*status)) { + return; + } + reinterpret_cast(formatter)->setContext( value, *status ); +} + +U_CAPI UDisplayContext U_EXPORT2 +udtitvfmt_getContext(const UDateIntervalFormat* formatter, + UDisplayContextType type, + UErrorCode* status) { + if (U_FAILURE(*status)) { + return (UDisplayContext)0; + } + return reinterpret_cast(formatter)->getContext( type, *status ); +} + #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/intl/icu/source/i18n/uitercollationiterator.h b/intl/icu/source/i18n/uitercollationiterator.h index 62b6f8341933..3a7b1a0ec23b 100644 --- a/intl/icu/source/i18n/uitercollationiterator.h +++ b/intl/icu/source/i18n/uitercollationiterator.h @@ -96,7 +96,7 @@ private: /** * Extends the FCD text segment forward or normalizes around pos. - * @return TRUE if success + * @return true if success */ UBool nextSegment(UErrorCode &errorCode); @@ -107,7 +107,7 @@ private: /** * Extends the FCD text segment backward or normalizes around pos. - * @return TRUE if success + * @return true if success */ UBool previousSegment(UErrorCode &errorCode); diff --git a/intl/icu/source/i18n/ulocdata.cpp b/intl/icu/source/i18n/ulocdata.cpp index 7f4e7b9b116e..68b9e0cf6344 100644 --- a/intl/icu/source/i18n/ulocdata.cpp +++ b/intl/icu/source/i18n/ulocdata.cpp @@ -172,7 +172,7 @@ ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type, return 0; } - delimiter = ures_getStringByKey(delimiterBundle, delimiterKeys[type], &len, &localStatus); + delimiter = ures_getStringByKeyWithFallback(delimiterBundle, delimiterKeys[type], &len, &localStatus); ures_close(delimiterBundle); if ( (localStatus == U_USING_DEFAULT_WARNING) && uld->noSubstitute ) { diff --git a/intl/icu/source/i18n/unicode/alphaindex.h b/intl/icu/source/i18n/unicode/alphaindex.h index e3c68ea7cce9..edab16bd6040 100644 --- a/intl/icu/source/i18n/unicode/alphaindex.h +++ b/intl/icu/source/i18n/unicode/alphaindex.h @@ -549,14 +549,14 @@ public: /** - * Advance the iteration over the Buckets of this index. Return FALSE if + * Advance the iteration over the Buckets of this index. Return false if * there are no more Buckets. * * @param status Error code, will be set with the reason if the operation fails. * U_ENUM_OUT_OF_SYNC_ERROR will be reported if the index is modified while * an enumeration of its contents are in process. * - * @return TRUE if success, FALSE if at end of iteration + * @return true if success, false if at end of iteration * @stable ICU 4.8 */ virtual UBool nextBucket(UErrorCode &status); @@ -609,7 +609,7 @@ public: * @param status Error code, will be set with the reason if the operation fails. * U_ENUM_OUT_OF_SYNC_ERROR will be reported if the index is modified while * an enumeration of its contents are in process. - * @return TRUE if successful, FALSE when the iteration advances past the last item. + * @return true if successful, false when the iteration advances past the last item. * @stable ICU 4.8 */ virtual UBool nextRecord(UErrorCode &status); diff --git a/intl/icu/source/i18n/unicode/basictz.h b/intl/icu/source/i18n/unicode/basictz.h index fc2cb8e59f76..7dd981abf934 100644 --- a/intl/icu/source/i18n/unicode/basictz.h +++ b/intl/icu/source/i18n/unicode/basictz.h @@ -56,7 +56,7 @@ public: * @param base The base time. * @param inclusive Whether the base time is inclusive or not. * @param result Receives the first transition after the base time. - * @return TRUE if the transition is found. + * @return true if the transition is found. * @stable ICU 3.8 */ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const = 0; @@ -66,7 +66,7 @@ public: * @param base The base time. * @param inclusive Whether the base time is inclusive or not. * @param result Receives the most recent transition before the base time. - * @return TRUE if the transition is found. + * @return true if the transition is found. * @stable ICU 3.8 */ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const = 0; diff --git a/intl/icu/source/i18n/unicode/calendar.h b/intl/icu/source/i18n/unicode/calendar.h index 2a8c2935ca8e..cc84bb274dee 100644 --- a/intl/icu/source/i18n/unicode/calendar.h +++ b/intl/icu/source/i18n/unicode/calendar.h @@ -464,10 +464,10 @@ public: UBool operator!=(const Calendar& that) const {return !operator==(that);} /** - * Returns TRUE if the given Calendar object is equivalent to this + * Returns true if the given Calendar object is equivalent to this * one. An equivalent Calendar will behave exactly as this one * does, but it may be set to a different time. By contrast, for - * the operator==() method to return TRUE, the other Calendar must + * the operator==() method to return true, the other Calendar must * be set to the same time. * * @param other the Calendar to be compared with this Calendar @@ -1359,7 +1359,7 @@ public: * localeID.append(calType); * char langTag[100]; * UErrorCode errorCode = U_ZERO_ERROR; - * int32_t length = uloc_toLanguageTag(localeID.c_str(), langTag, (int32_t)sizeof(langTag), TRUE, &errorCode); + * int32_t length = uloc_toLanguageTag(localeID.c_str(), langTag, (int32_t)sizeof(langTag), true, &errorCode); * if (U_FAILURE(errorCode)) { * // deal with errors & overflow * } @@ -1410,21 +1410,21 @@ public: virtual int32_t getWeekendTransition(UCalendarDaysOfWeek dayOfWeek, UErrorCode &status) const; /** - * Returns TRUE if the given UDate is in the weekend in + * Returns true if the given UDate is in the weekend in * this calendar system. * @param date The UDate in question. * @param status The error code for the operation. - * @return TRUE if the given UDate is in the weekend in - * this calendar system, FALSE otherwise. + * @return true if the given UDate is in the weekend in + * this calendar system, false otherwise. * @stable ICU 4.4 */ virtual UBool isWeekend(UDate date, UErrorCode &status) const; /** - * Returns TRUE if this Calendar's current date-time is in the weekend in + * Returns true if this Calendar's current date-time is in the weekend in * this calendar system. - * @return TRUE if this Calendar's current date-time is in the weekend in - * this calendar system, FALSE otherwise. + * @return true if this Calendar's current date-time is in the weekend in + * this calendar system, false otherwise. * @stable ICU 4.4 */ virtual UBool isWeekend(void) const; @@ -2372,7 +2372,7 @@ private: * * @param key the registry key returned by a previous call to registerFactory * @param status the in/out status code, no special meanings are assigned - * @return TRUE if the factory for the key was successfully unregistered + * @return true if the factory for the key was successfully unregistered * @internal */ static UBool unregister(URegistryKey key, UErrorCode& status); @@ -2398,7 +2398,7 @@ private: #endif /* !UCONFIG_NO_SERVICE */ /** - * @return TRUE if this calendar has a default century (i.e. 03 -> 2003) + * @return true if this calendar has a default century (i.e. 03 -> 2003) * @internal */ virtual UBool haveDefaultCentury() const = 0; @@ -2458,7 +2458,7 @@ private: * @param base The base time, inclusive * @param transitionTime Receives the result time * @param status The error status - * @return TRUE if a transition is found. + * @return true if a transition is found. */ UBool getImmediatePreviousZoneTransition(UDate base, UDate *transitionTime, UErrorCode& status) const; @@ -2531,7 +2531,7 @@ Calendar::internalSet(UCalendarDateFields field, int32_t value) { fFields[field] = value; fStamp[field] = kInternallySet; - fIsSet[field] = TRUE; // Remove later + fIsSet[field] = true; // Remove later } diff --git a/intl/icu/source/i18n/unicode/choicfmt.h b/intl/icu/source/i18n/unicode/choicfmt.h index 3b2f48cb1f85..cb01fca25335 100644 --- a/intl/icu/source/i18n/unicode/choicfmt.h +++ b/intl/icu/source/i18n/unicode/choicfmt.h @@ -106,7 +106,7 @@ class MessageFormat; * arrays of numbers, closure flags and strings, * they are interpreted just like * the sequence of (number separator string) in an equivalent pattern string. - * closure[i]==TRUE corresponds to a less_than separator sign. + * closure[i]==true corresponds to a less_than separator sign. * The equivalent pattern string will be constructed automatically.

    * *

    During formatting, a number is mapped to the first range @@ -126,7 +126,7 @@ class MessageFormat; *

    Here is an example of two arrays that map the number * 1..7 to the English day of the week abbreviations * Sun..Sat. No closures array is given; this is the same as - * specifying all closures to be FALSE.

    + * specifying all closures to be false.

    * *
        {1,2,3,4,5,6,7},
      *     {"Sun","Mon","Tue","Wed","Thur","Fri","Sat"}
    @@ -138,7 +138,7 @@ class MessageFormat; * like the turned bracket in European notation: [-Inf, 1) == [-Inf, 1[ )

    * *
        {0, 1, 1},
    - *     {FALSE, FALSE, TRUE},
    + *     {false, false, true},
      *     {"no files", "one file", "many files"}
    * *

    Here is an example that shows formatting and parsing:

    @@ -189,7 +189,7 @@ public: /** * Constructs a new ChoiceFormat with the given limits and message strings. - * All closure flags default to FALSE, + * All closure flags default to false, * equivalent to less_than_or_equal separators. * * Copies the limits and formats instead of adopting them. @@ -210,9 +210,9 @@ public: * * @param limits Array of limit values * @param closures Array of booleans specifying whether each - * element of 'limits' is open or closed. If FALSE, then the + * element of 'limits' is open or closed. If false, then the * corresponding limit number is a member of its range. - * If TRUE, then the limit number belongs to the previous range it. + * If true, then the limit number belongs to the previous range it. * @param formats Array of formats * @param count Size of 'limits', 'closures', and 'formats' arrays * @deprecated ICU 49 Use MessageFormat instead, with plural and select arguments. @@ -568,13 +568,13 @@ private: * The intervals may be closed, half open, or open. This affects * formatting but does not affect parsing. Interval i is affected * by fClosures[i] and fClosures[i+1]. If fClosures[i] - * is FALSE, then the value fChoiceLimits[i] is in interval i. + * is false, then the value fChoiceLimits[i] is in interval i. * That is, intervals i and i are: * * i-1: ... x < fChoiceLimits[i] * i: fChoiceLimits[i] <= x ... * - * If fClosures[i] is TRUE, then the value fChoiceLimits[i] is + * If fClosures[i] is true, then the value fChoiceLimits[i] is * in interval i-1. That is, intervals i-1 and i are: * * i-1: ... x <= fChoiceLimits[i] diff --git a/intl/icu/source/i18n/unicode/coleitr.h b/intl/icu/source/i18n/unicode/coleitr.h index e3ec0e01a18e..aa0b08f5e73f 100644 --- a/intl/icu/source/i18n/unicode/coleitr.h +++ b/intl/icu/source/i18n/unicode/coleitr.h @@ -253,7 +253,7 @@ public: /** * Checks if a comparison order is ignorable. * @param order the collation order. - * @return TRUE if a character is ignorable, FALSE otherwise. + * @return true if a character is ignorable, false otherwise. * @stable ICU 2.0 */ static inline UBool isIgnorable(int32_t order); diff --git a/intl/icu/source/i18n/unicode/coll.h b/intl/icu/source/i18n/unicode/coll.h index f5564c73944b..c750711fc158 100644 --- a/intl/icu/source/i18n/unicode/coll.h +++ b/intl/icu/source/i18n/unicode/coll.h @@ -236,21 +236,21 @@ public: // Collator public methods -------------------------------------------- /** - * Returns TRUE if "other" is the same as "this". + * Returns true if "other" is the same as "this". * - * The base class implementation returns TRUE if "other" has the same type/class as "this": + * The base class implementation returns true if "other" has the same type/class as "this": * `typeid(*this) == typeid(other)`. * * Subclass implementations should do something like the following: * - * if (this == &other) { return TRUE; } - * if (!Collator::operator==(other)) { return FALSE; } // not the same class + * if (this == &other) { return true; } + * if (!Collator::operator==(other)) { return false; } // not the same class * * const MyCollator &o = (const MyCollator&)other; * (compare this vs. o's subclass fields) * * @param other Collator object to be compared - * @return TRUE if other is the same as this. + * @return true if other is the same as this. * @stable ICU 2.0 */ virtual UBool operator==(const Collator& other) const; @@ -259,7 +259,7 @@ public: * Returns true if "other" is not the same as "this". * Calls ! operator==(const Collator&) const which works for all subclasses. * @param other Collator object to be compared - * @return TRUE if other is not the same as this. + * @return true if other is not the same as this. * @stable ICU 2.0 */ virtual UBool operator!=(const Collator& other) const; @@ -304,7 +304,7 @@ public: * Starting with ICU 54, collation attributes can be specified via locale keywords as well, * in the old locale extension syntax ("el@colCaseFirst=upper") * or in language tag syntax ("el-u-kf-upper"). - * See User Guide: Collation API. + * See User Guide: Collation API. * * The UErrorCode& err parameter is used to return status information to the user. * To check whether the construction succeeded or not, you should check @@ -788,7 +788,7 @@ public: * applications who wish to cache collators, or otherwise reuse * collators when possible. The functional equivalent may change * over time. For more information, please see the + * href="https://unicode-org.github.io/icu/userguide/locale#locales-and-services"> * Locales and Services section of the ICU User Guide. * @param keyword a particular keyword as enumerated by * ucol_getKeywords. @@ -841,7 +841,7 @@ public: * Collator::createInstance to avoid undefined behavior. * @param key the registry key returned by a previous call to registerInstance * @param status the in/out status code, no special meanings are assigned - * @return TRUE if the collator for the key was successfully unregistered + * @return true if the collator for the key was successfully unregistered * @stable ICU 2.6 */ static UBool U_EXPORT2 unregister(URegistryKey key, UErrorCode& status); @@ -1139,7 +1139,7 @@ public: * This string will be normalized. * The structure and the syntax of the string is defined in the "Naming collators" * section of the users guide: - * http://userguide.icu-project.org/collation/concepts#TOC-Collator-naming-scheme + * https://unicode-org.github.io/icu/userguide/collation/concepts#collator-naming-scheme * This function supports preflighting. * * This is internal, and intended to be used with delegate converters. diff --git a/intl/icu/source/i18n/unicode/curramt.h b/intl/icu/source/i18n/unicode/curramt.h index 5cfe1cf75e6a..e4c35c181112 100644 --- a/intl/icu/source/i18n/unicode/curramt.h +++ b/intl/icu/source/i18n/unicode/curramt.h @@ -41,7 +41,7 @@ class U_I18N_API CurrencyAmount: public Measure { /** * Construct an object with the given numeric amount and the given * ISO currency code. - * @param amount a numeric object; amount.isNumeric() must be TRUE + * @param amount a numeric object; amount.isNumeric() must be true * @param isoCode the 3-letter ISO 4217 currency code; must not be * NULL and must have length 3 * @param ec input-output error code. If the amount or the isoCode diff --git a/intl/icu/source/i18n/unicode/dcfmtsym.h b/intl/icu/source/i18n/unicode/dcfmtsym.h index 582e7533a4ac..b2c39a0236e4 100644 --- a/intl/icu/source/i18n/unicode/dcfmtsym.h +++ b/intl/icu/source/i18n/unicode/dcfmtsym.h @@ -378,7 +378,7 @@ private: * back to the locale. */ void initialize(const Locale& locale, UErrorCode& success, - UBool useLastResortData = FALSE, const NumberingSystem* ns = nullptr); + UBool useLastResortData = false, const NumberingSystem* ns = nullptr); /** * Initialize the symbols with default values. @@ -543,12 +543,12 @@ inline const UnicodeString& DecimalFormatSymbols::getConstDigitSymbol(int32_t di // ------------------------------------- inline void -DecimalFormatSymbols::setSymbol(ENumberFormatSymbol symbol, const UnicodeString &value, const UBool propogateDigits = TRUE) { +DecimalFormatSymbols::setSymbol(ENumberFormatSymbol symbol, const UnicodeString &value, const UBool propagateDigits = true) { if (symbol == kCurrencySymbol) { - fIsCustomCurrencySymbol = TRUE; + fIsCustomCurrencySymbol = true; } else if (symbol == kIntlCurrencySymbol) { - fIsCustomIntlCurrencySymbol = TRUE; + fIsCustomIntlCurrencySymbol = true; } if(symbolIn order to enable significant digits formatting, use a pattern * containing the '@' pattern character. Alternatively, - * call setSignificantDigitsUsed(TRUE). + * call setSignificantDigitsUsed(true). * *
  • In order to disable significant digits formatting, use a * pattern that does not contain the '@' pattern - * character. Alternatively, call setSignificantDigitsUsed(FALSE). + * character. Alternatively, call setSignificantDigitsUsed(false). * *
  • The number of significant digits has no effect on parsing. * @@ -817,8 +817,8 @@ class U_I18N_API DecimalFormat : public NumberFormat { /** * Sets whether lenient parsing should be enabled (it is off by default). * - * @param enable \c TRUE if lenient parsing should be used, - * \c FALSE otherwise. + * @param enable \c true if lenient parsing should be used, + * \c false otherwise. * @stable ICU 4.8 */ void setLenient(UBool enable) U_OVERRIDE; @@ -1507,7 +1507,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { /** * Return whether or not scientific notation is used. - * @return TRUE if this object formats and parses scientific notation + * @return true if this object formats and parses scientific notation * @see #setScientificNotation * @see #getMinimumExponentDigits * @see #setMinimumExponentDigits @@ -1523,7 +1523,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * maximum number of integer digits is set to more than 8, the effective * maximum will be 1. This allows this call to generate a 'default' scientific * number format without additional changes. - * @param useScientific TRUE if this object formats and parses scientific + * @param useScientific true if this object formats and parses scientific * notation * @see #isScientificNotation * @see #getMinimumExponentDigits @@ -1562,7 +1562,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { /** * Return whether the exponent sign is always shown. - * @return TRUE if the exponent is always prefixed with either the + * @return true if the exponent is always prefixed with either the * localized minus sign or the localized plus sign, false if only negative * exponents are prefixed with the localized minus sign. * @see #setScientificNotation @@ -1577,7 +1577,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { /** * Set whether the exponent sign is always shown. This has no effect * unless scientific notation is in use. - * @param expSignAlways TRUE if the exponent is always prefixed with either + * @param expSignAlways true if the exponent is always prefixed with either * the localized minus sign or the localized plus sign, false if only * negative exponents are prefixed with the localized minus sign. * @see #setScientificNotation @@ -1674,8 +1674,15 @@ class U_I18N_API DecimalFormat : public NumberFormat { int32_t getMinimumGroupingDigits() const; /** - * Sets the minimum grouping digits. Setting to a value less than or - * equal to 1 turns off minimum grouping digits. + * Sets the minimum grouping digits. Setting the value to + * - 1: Turns off minimum grouping digits. + * - 0 or -1: The behavior is undefined. + * - UNUM_MINIMUM_GROUPING_DIGITS_AUTO: Display grouping using the default + * strategy for all locales. + * - UNUM_MINIMUM_GROUPING_DIGITS_MIN2: Display grouping using locale + * defaults, except do not show grouping on values smaller than 10000 + * (such that there is a minimum of two digits before the first + * separator). * * For more control over grouping strategies, use NumberFormatter. * @@ -1689,7 +1696,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * Allows you to get the behavior of the decimal separator with integers. * (The decimal separator will always appear with decimals.) * - * @return TRUE if the decimal separator always appear with decimals. + * @return true if the decimal separator always appear with decimals. * Example: Decimal ON: 12345 -> 12345.; OFF: 12345 -> 12345 * @stable ICU 2.0 */ @@ -1699,7 +1706,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * Allows you to set the behavior of the decimal separator with integers. * (The decimal separator will always appear with decimals.) * - * @param newValue set TRUE if the decimal separator will always appear with decimals. + * @param newValue set true if the decimal separator will always appear with decimals. * Example: Decimal ON: 12345 -> 12345.; OFF: 12345 -> 12345 * @stable ICU 2.0 */ @@ -1708,7 +1715,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { /** * Allows you to get the parse behavior of the pattern decimal mark. * - * @return TRUE if input must contain a match to decimal mark in pattern + * @return true if input must contain a match to decimal mark in pattern * @stable ICU 54 */ UBool isDecimalPatternMatchRequired(void) const; @@ -1716,10 +1723,10 @@ class U_I18N_API DecimalFormat : public NumberFormat { /** * Allows you to set the parse behavior of the pattern decimal mark. * - * if TRUE, the input must have a decimal mark if one was specified in the pattern. When - * FALSE the decimal mark may be omitted from the input. + * if true, the input must have a decimal mark if one was specified in the pattern. When + * false the decimal mark may be omitted from the input. * - * @param newValue set TRUE if input must contain a match to decimal mark in pattern + * @param newValue set true if input must contain a match to decimal mark in pattern * @stable ICU 54 */ virtual void setDecimalPatternMatchRequired(UBool newValue); @@ -1962,7 +1969,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * to one. If the maximum significant digits count is less than * min, then it is set to min. * This function also enables the use of significant digits - * by this formatter - areSignificantDigitsUsed() will return TRUE. + * by this formatter - areSignificantDigitsUsed() will return true. * @see #areSignificantDigitsUsed * @param min the fewest significant digits to be shown * @stable ICU 3.0 @@ -1975,7 +1982,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * to one. If the minimum significant digits count is greater * than max, then it is set to max. * This function also enables the use of significant digits - * by this formatter - areSignificantDigitsUsed() will return TRUE. + * by this formatter - areSignificantDigitsUsed() will return true. * @see #areSignificantDigitsUsed * @param max the most significant digits to be shown * @stable ICU 3.0 diff --git a/intl/icu/source/i18n/unicode/dtfmtsym.h b/intl/icu/source/i18n/unicode/dtfmtsym.h index c6d76fe98eb9..69f9f9759ec7 100644 --- a/intl/icu/source/i18n/unicode/dtfmtsym.h +++ b/intl/icu/source/i18n/unicode/dtfmtsym.h @@ -919,7 +919,8 @@ private: * failure code upon return. * @param useLastResortData determine if use last resort data */ - void initializeData(const Locale& locale, const char *type, UErrorCode& status, UBool useLastResortData = FALSE); + void initializeData(const Locale& locale, const char *type, + UErrorCode& status, UBool useLastResortData = false); /** * Copy or alias an array in another object, as appropriate. @@ -983,12 +984,12 @@ private: static UDateFormatField U_EXPORT2 getPatternCharIndex(char16_t c); /** - * Returns TRUE if f (with its pattern character repeated count times) is a numeric field. + * Returns true if f (with its pattern character repeated count times) is a numeric field. */ static UBool U_EXPORT2 isNumericField(UDateFormatField f, int32_t count); /** - * Returns TRUE if c (repeated count times) is the pattern character for a numeric field. + * Returns true if c (repeated count times) is the pattern character for a numeric field. */ static UBool U_EXPORT2 isNumericPatternChar(char16_t c, int32_t count); public: diff --git a/intl/icu/source/i18n/unicode/dtitvfmt.h b/intl/icu/source/i18n/unicode/dtitvfmt.h index 4e4d712b4f5b..f45e68038ac4 100644 --- a/intl/icu/source/i18n/unicode/dtitvfmt.h +++ b/intl/icu/source/i18n/unicode/dtitvfmt.h @@ -31,6 +31,7 @@ #include "unicode/dtitvinf.h" #include "unicode/dtptngen.h" #include "unicode/formattedvalue.h" +#include "unicode/udisplaycontext.h" U_NAMESPACE_BEGIN @@ -651,6 +652,34 @@ public: */ virtual void setTimeZone(const TimeZone& zone); +#ifndef U_FORCE_HIDE_DRAFT_API + /** + * Set a particular UDisplayContext value in the formatter, such as + * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. This causes the formatted + * result to be capitalized appropriately for the context in which + * it is intended to be used, considering both the locale and the + * type of field at the beginning of the formatted result. + * @param value The UDisplayContext value to set. + * @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. + * @draft ICU 68 + */ + virtual void setContext(UDisplayContext value, UErrorCode& status); + + /** + * Get the formatter's UDisplayContext value for the specified UDisplayContextType, + * such as UDISPCTX_TYPE_CAPITALIZATION. + * @param type The UDisplayContextType whose value to return + * @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. + * @return The UDisplayContextValue for the specified type. + * @draft ICU 68 + */ + virtual UDisplayContext getContext(UDisplayContextType type, UErrorCode& status) const; +#endif // U_FORCE_HIDE_DRAFT_API + /** * Return the class ID for this class. This is useful only for comparing to * a return value from getDynamicClassID(). For example: @@ -796,7 +825,7 @@ private: * to be formatted into date interval string * @param toCalendar calendar set to the to date in date interval * to be formatted into date interval string - * @param fromToOnSameDay TRUE iff from and to dates are on the same day + * @param fromToOnSameDay true iff from and to dates are on the same day * (any difference is in ampm/hours or below) * @param appendTo Output parameter to receive result. * Result is appended to existing contents. @@ -864,6 +893,19 @@ private: void setFallbackPattern(UCalendarDateFields field, const UnicodeString& skeleton, UErrorCode& status); + + + + /** + * Converts special hour metacharacters (such as 'j') in the skeleton into locale-appropriate + * pattern characters. + * + * + * @param skeleton The skeleton to convert + * @return A copy of the skeleton, which "j" and any other special hour metacharacters converted to the regular ones. + * + */ + UnicodeString normalizeHourMetacharacters(const UnicodeString& skeleton) const; @@ -919,8 +961,8 @@ private: * @param dateSkeleton normalized date skeleton * @param timeSkeleton normalized time skeleton * @return whether the resource is found for the skeleton. - * TRUE if interval pattern found for the skeleton, - * FALSE otherwise. + * true if interval pattern found for the skeleton, + * false otherwise. */ UBool setSeparateDateTimePtn(const UnicodeString& dateSkeleton, const UnicodeString& timeSkeleton); @@ -948,8 +990,8 @@ private: * @param extendedBestSkeleton extended best match skeleton * @return whether the interval pattern is found * through extending skeleton or not. - * TRUE if interval pattern is found by - * extending skeleton, FALSE otherwise. + * true if interval pattern is found by + * extending skeleton, false otherwise. */ UBool setIntervalPattern(UCalendarDateFields field, const UnicodeString* skeleton, @@ -984,6 +1026,7 @@ private: * @param differenceInfo the difference between 2 skeletons * 1 means only field width differs * 2 means v/z exchange + * @param suppressDayPeriodField if true, remove the day period field from the pattern, if there is one * @param adjustedIntervalPattern adjusted interval pattern */ static void U_EXPORT2 adjustFieldWidth( @@ -991,8 +1034,20 @@ private: const UnicodeString& bestMatchSkeleton, const UnicodeString& bestMatchIntervalPattern, int8_t differenceInfo, + UBool suppressDayPeriodField, UnicodeString& adjustedIntervalPattern); + /** + * Does the same thing as UnicodeString::findAndReplace(), except that it won't perform + * the substitution inside quoted literal text. + * @param targetString The string to perform the find-replace operation on. + * @param strToReplace The string to search for and replace in the target string. + * @param strToReplaceWith The string to substitute in wherever `stringToReplace` was found. + */ + static void U_EXPORT2 findReplaceInPattern(UnicodeString& targetString, + const UnicodeString& strToReplace, + const UnicodeString& strToReplaceWith); + /** * Concat a single date pattern with a time interval pattern, * set it into the intervalPatterns, while field is time field. @@ -1137,6 +1192,11 @@ private: UnicodeString* fDatePattern; UnicodeString* fTimePattern; UnicodeString* fDateTimeFormat; + + /** + * Other formatting information + */ + UDisplayContext fCapitalizationContext; }; inline UBool diff --git a/intl/icu/source/i18n/unicode/dtitvinf.h b/intl/icu/source/i18n/unicode/dtitvinf.h index 68bfa4352a65..3b2608518733 100644 --- a/intl/icu/source/i18n/unicode/dtitvinf.h +++ b/intl/icu/source/i18n/unicode/dtitvinf.h @@ -307,8 +307,8 @@ public: /** Get default order -- whether the first date in pattern is later date or not. - * return default date ordering in interval pattern. TRUE if the first date - * in pattern is later date, FALSE otherwise. + * return default date ordering in interval pattern. true if the first date + * in pattern is later date, false otherwise. * @stable ICU 4.0 */ UBool getDefaultOrder() const; diff --git a/intl/icu/source/i18n/unicode/dtptngen.h b/intl/icu/source/i18n/unicode/dtptngen.h index dd99d58e65e4..828c0a9854b2 100644 --- a/intl/icu/source/i18n/unicode/dtptngen.h +++ b/intl/icu/source/i18n/unicode/dtptngen.h @@ -76,6 +76,13 @@ public: #ifndef U_HIDE_INTERNAL_API + /** + * For ICU use only. Skips loading the standard date/time patterns (which is done via DateFormat). + * + * @internal + */ + static DateTimePatternGenerator* U_EXPORT2 createInstanceNoStdPat(const Locale& uLocale, UErrorCode& status); + /** * For ICU use only * @@ -526,7 +533,7 @@ private: /** * Constructor. */ - DateTimePatternGenerator(const Locale& locale, UErrorCode & status); + DateTimePatternGenerator(const Locale& locale, UErrorCode & status, UBool skipStdPatterns = false); /** * Copy constructor. @@ -573,7 +580,7 @@ private: // with #13183, no longer need flags for b, B }; - void initData(const Locale &locale, UErrorCode &status); + void initData(const Locale &locale, UErrorCode &status, UBool skipStdPatterns = false); void addCanonicalItems(UErrorCode &status); void addICUPatterns(const Locale& locale, UErrorCode& status); void hackTimes(const UnicodeString& hackPattern, UErrorCode& status); diff --git a/intl/icu/source/i18n/unicode/fieldpos.h b/intl/icu/source/i18n/unicode/fieldpos.h index 23ee38624b74..ea0a23b13ece 100644 --- a/intl/icu/source/i18n/unicode/fieldpos.h +++ b/intl/icu/source/i18n/unicode/fieldpos.h @@ -161,7 +161,7 @@ public: /** * Equality operator. * @param that the object to be compared with. - * @return TRUE if the two field positions are equal, FALSE otherwise. + * @return true if the two field positions are equal, false otherwise. * @stable ICU 2.0 */ UBool operator==(const FieldPosition& that) const; @@ -169,7 +169,7 @@ public: /** * Equality operator. * @param that the object to be compared with. - * @return TRUE if the two field positions are not equal, FALSE otherwise. + * @return true if the two field positions are not equal, false otherwise. * @stable ICU 2.0 */ UBool operator!=(const FieldPosition& that) const; diff --git a/intl/icu/source/i18n/unicode/fmtable.h b/intl/icu/source/i18n/unicode/fmtable.h index 7bec4f6906e7..3a090393ac4b 100644 --- a/intl/icu/source/i18n/unicode/fmtable.h +++ b/intl/icu/source/i18n/unicode/fmtable.h @@ -179,7 +179,7 @@ public: /** * Equality comparison. * @param other the object to be compared with. - * @return TRUE if other are equal to this, FALSE otherwise. + * @return true if other are equal to this, false otherwise. * @stable ICU 2.0 */ UBool operator==(const Formattable &other) const; @@ -187,7 +187,7 @@ public: /** * Equality operator. * @param other the object to be compared with. - * @return TRUE if other are unequal to this, FALSE otherwise. + * @return true if other are unequal to this, false otherwise. * @stable ICU 2.0 */ UBool operator!=(const Formattable& other) const @@ -277,9 +277,9 @@ public: Type getType(void) const; /** - * Returns TRUE if the data type of this Formattable object + * Returns true if the data type of this Formattable object * is kDouble, kLong, or kInt64 - * @return TRUE if this is a pure numeric object + * @return true if this is a pure numeric object * @stable ICU 3.0 */ UBool isNumeric() const; diff --git a/intl/icu/source/i18n/unicode/formattedvalue.h b/intl/icu/source/i18n/unicode/formattedvalue.h index e7ba4ec24599..5febea066180 100644 --- a/intl/icu/source/i18n/unicode/formattedvalue.h +++ b/intl/icu/source/i18n/unicode/formattedvalue.h @@ -116,7 +116,7 @@ class U_I18N_API ConstrainedFieldPosition : public UMemory { * Gets the field category for the current position. * * The return value is well-defined only after - * FormattedValue#nextPosition returns TRUE. + * FormattedValue#nextPosition returns true. * * @return The field category saved in the instance. * @stable ICU 64 @@ -129,7 +129,7 @@ class U_I18N_API ConstrainedFieldPosition : public UMemory { * Gets the field for the current position. * * The return value is well-defined only after - * FormattedValue#nextPosition returns TRUE. + * FormattedValue#nextPosition returns true. * * @return The field saved in the instance. * @stable ICU 64 @@ -141,7 +141,7 @@ class U_I18N_API ConstrainedFieldPosition : public UMemory { /** * Gets the INCLUSIVE start index for the current position. * - * The return value is well-defined only after FormattedValue#nextPosition returns TRUE. + * The return value is well-defined only after FormattedValue#nextPosition returns true. * * @return The start index saved in the instance. * @stable ICU 64 @@ -153,7 +153,7 @@ class U_I18N_API ConstrainedFieldPosition : public UMemory { /** * Gets the EXCLUSIVE end index stored for the current position. * - * The return value is well-defined only after FormattedValue#nextPosition returns TRUE. + * The return value is well-defined only after FormattedValue#nextPosition returns true. * * @return The end index saved in the instance. * @stable ICU 64 @@ -301,8 +301,8 @@ class U_I18N_API FormattedValue /* not : public UObject because this is an inter * see ConstrainedFieldPosition#constrainCategory * and ConstrainedFieldPosition#constrainField. * @param status Set if an error occurs. - * @return TRUE if a new occurrence of the field was found; - * FALSE otherwise or if an error was set. + * @return true if a new occurrence of the field was found; + * false otherwise or if an error was set. * * @stable ICU 64 */ diff --git a/intl/icu/source/i18n/unicode/fpositer.h b/intl/icu/source/i18n/unicode/fpositer.h index 3e8a0108f16f..87e811ea232a 100644 --- a/intl/icu/source/i18n/unicode/fpositer.h +++ b/intl/icu/source/i18n/unicode/fpositer.h @@ -96,7 +96,7 @@ public: /** * If the current position is valid, updates the FieldPosition values, advances the iterator, - * and returns TRUE, otherwise returns FALSE. + * and returns true, otherwise returns false. * @stable ICU 4.4 */ UBool next(FieldPosition& fp); diff --git a/intl/icu/source/i18n/unicode/gregocal.h b/intl/icu/source/i18n/unicode/gregocal.h index 4ce40daf3a4f..e5e6df17fda2 100644 --- a/intl/icu/source/i18n/unicode/gregocal.h +++ b/intl/icu/source/i18n/unicode/gregocal.h @@ -344,7 +344,7 @@ public: UBool isLeapYear(int32_t year) const; /** - * Returns TRUE if the given Calendar object is equivalent to this + * Returns true if the given Calendar object is equivalent to this * one. Calendar override. * * @param other the Calendar to be compared with this Calendar @@ -756,7 +756,7 @@ public: public: // internal implementation /** - * @return TRUE if this calendar has the notion of a default century + * @return true if this calendar has the notion of a default century * @internal */ virtual UBool haveDefaultCentury() const; diff --git a/intl/icu/source/i18n/unicode/listformatter.h b/intl/icu/source/i18n/unicode/listformatter.h index 211055d9d1c1..76a728942d97 100644 --- a/intl/icu/source/i18n/unicode/listformatter.h +++ b/intl/icu/source/i18n/unicode/listformatter.h @@ -23,6 +23,8 @@ #if U_SHOW_CPLUSPLUS_API +#if !UCONFIG_NO_FORMATTING + #include "unicode/unistr.h" #include "unicode/locid.h" #include "unicode/formattedvalue.h" @@ -65,7 +67,6 @@ struct ListFormatData : public UMemory { */ -#if !UCONFIG_NO_FORMATTING /** * An immutable class containing the result of a list formatting operation. * @@ -135,7 +136,6 @@ class U_I18N_API FormattedList : public UMemory, public FormattedValue { : fData(nullptr), fErrorCode(errorCode) {} friend class ListFormatter; }; -#endif // !UCONFIG_NO_FORMATTING /** @@ -185,8 +185,6 @@ class U_I18N_API ListFormatter : public UObject{ */ static ListFormatter* createInstance(const Locale& locale, UErrorCode& errorCode); -#ifndef U_HIDE_DRAFT_API -#if !UCONFIG_NO_FORMATTING /** * Creates a ListFormatter for the given locale, list type, and style. * @@ -195,12 +193,10 @@ class U_I18N_API ListFormatter : public UObject{ * @param width The width of formatting to use. * @param errorCode ICU error code, set if no data available for the given locale. * @return A ListFormatter object created from internal data derived from CLDR data. - * @draft ICU 67 + * @stable ICU 67 */ static ListFormatter* createInstance( const Locale& locale, UListFormatterType type, UListFormatterWidth width, UErrorCode& errorCode); -#endif /* !UCONFIG_NO_FORMATTING */ -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_INTERNAL_API /** @@ -239,7 +235,6 @@ class U_I18N_API ListFormatter : public UObject{ UnicodeString& format(const UnicodeString items[], int32_t n_items, UnicodeString& appendTo, UErrorCode& errorCode) const; -#if !UCONFIG_NO_FORMATTING /** * Formats a list of strings to a FormattedList, which exposes field * position information. The FormattedList contains more information than @@ -255,7 +250,6 @@ class U_I18N_API ListFormatter : public UObject{ const UnicodeString items[], int32_t n_items, UErrorCode& errorCode) const; -#endif // !UCONFIG_NO_FORMATTING #ifndef U_HIDE_INTERNAL_API /** @@ -296,6 +290,8 @@ class U_I18N_API ListFormatter : public UObject{ U_NAMESPACE_END +#endif /* #if !UCONFIG_NO_FORMATTING */ + #endif /* U_SHOW_CPLUSPLUS_API */ #endif // __LISTFORMATTER_H__ diff --git a/intl/icu/source/i18n/unicode/measfmt.h b/intl/icu/source/i18n/unicode/measfmt.h index b4f904862946..2155ad531aa8 100644 --- a/intl/icu/source/i18n/unicode/measfmt.h +++ b/intl/icu/source/i18n/unicode/measfmt.h @@ -309,7 +309,7 @@ class U_I18N_API MeasureFormat : public Format { /** * ICU use only. * Allows subclass to change locale. Note that this method also changes - * the NumberFormat object. Returns TRUE if locale changed; FALSE if no + * the NumberFormat object. Returns true if locale changed; false if no * change was made. * @internal. */ diff --git a/intl/icu/source/i18n/unicode/measunit.h b/intl/icu/source/i18n/unicode/measunit.h index e240092e305d..d86bab390951 100644 --- a/intl/icu/source/i18n/unicode/measunit.h +++ b/intl/icu/source/i18n/unicode/measunit.h @@ -434,7 +434,7 @@ class U_I18N_API MeasureUnit: public UObject { * For example, if the receiver is "kilowatt" and the argument is "hour-per-day", then the * unit "kilowatt-hour-per-day" is returned. * - * NOTE: Only works on SINGLE and COMPOUND units. If either unit (receivee and argument) is a + * NOTE: Only works on SINGLE and COMPOUND units. If either unit (receiver and argument) is a * MIXED unit, an error will occur. For more information, see UMeasureUnitComplexity. * * @param other The MeasureUnit to multiply with the target. @@ -445,9 +445,9 @@ class U_I18N_API MeasureUnit: public UObject { MeasureUnit product(const MeasureUnit& other, UErrorCode& status) const; #endif // U_HIDE_DRAFT_API -#ifndef U_HIDE_INTERNAL_API +#ifndef U_HIDE_DRAFT_API /** - * Gets the list of SINGLE units contained within a MIXED of COMPOUND unit. + * Gets the list of SINGLE units contained within a MIXED or COMPOUND unit. * * Examples: * - Given "meter-kilogram-per-second", three units will be returned: "meter", @@ -457,15 +457,12 @@ class U_I18N_API MeasureUnit: public UObject { * * If this is a SINGLE unit, an array of length 1 will be returned. * - * TODO(ICU-21021): Finalize this API and propose it as draft. - * - * @param outCount The number of elements in the return array. * @param status Set if an error occurs. - * @return An array of single units, owned by the caller. - * @internal ICU 67 Technical Preview + * @return A pair with the list of units as a LocalArray and the number of units in the list. + * @draft ICU 68 */ - LocalArray splitToSingleUnits(int32_t& outCount, UErrorCode& status) const; -#endif // U_HIDE_INTERNAL_API + inline std::pair, int32_t> splitToSingleUnits(UErrorCode& status) const; +#endif // U_HIDE_DRAFT_API /** * getAvailable gets all of the available units. @@ -540,33 +537,10 @@ class U_I18N_API MeasureUnit: public UObject { #ifndef U_HIDE_INTERNAL_API /** * ICU use only. - * Returns associated array index for this measure unit. Only valid for - * non-currency measure units. + * Returns associated array index for this measure unit. * @internal */ - int32_t getIndex() const; - - /** - * ICU use only. - * Returns maximum value from getIndex plus 1. - * @internal - */ - static int32_t getIndexCount(); - - /** - * ICU use only. - * @return the unit.getIndex() of the unit which has this unit.getType() and unit.getSubtype(), - * or a negative value if there is no such unit - * @internal - */ - static int32_t internalGetIndexForTypeAndSubtype(const char *type, const char *subtype); - - /** - * ICU use only. - * @internal - */ - static MeasureUnit resolveUnitPerUnit( - const MeasureUnit &unit, const MeasureUnit &perUnit, bool* isResolved); + int32_t getOffset() const; #endif /* U_HIDE_INTERNAL_API */ // All code between the "Start generated createXXX methods" comment and @@ -913,22 +887,6 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getMole(); - /** - * Returns by pointer, unit of concentr: permillion. - * Caller owns returned value and must free it. - * Also see {@link #getPartPerMillion()}. - * @param status ICU error code. - * @stable ICU 57 - */ - static MeasureUnit *createPartPerMillion(UErrorCode &status); - - /** - * Returns by value, unit of concentr: permillion. - * Also see {@link #createPartPerMillion()}. - * @stable ICU 64 - */ - static MeasureUnit getPartPerMillion(); - /** * Returns by pointer, unit of concentr: percent. * Caller owns returned value and must free it. @@ -961,6 +919,22 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getPermille(); + /** + * Returns by pointer, unit of concentr: permillion. + * Caller owns returned value and must free it. + * Also see {@link #getPartPerMillion()}. + * @param status ICU error code. + * @stable ICU 57 + */ + static MeasureUnit *createPartPerMillion(UErrorCode &status); + + /** + * Returns by value, unit of concentr: permillion. + * Also see {@link #createPartPerMillion()}. + * @stable ICU 64 + */ + static MeasureUnit getPartPerMillion(); + /** * Returns by pointer, unit of concentr: permyriad. * Caller owns returned value and must free it. @@ -1265,23 +1239,21 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getDayPerson(); -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of duration: decade. * Caller owns returned value and must free it. * Also see {@link #getDecade()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createDecade(UErrorCode &status); /** * Returns by value, unit of duration: decade. * Also see {@link #createDecade()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getDecade(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of duration: hour. @@ -1667,23 +1639,21 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getKilowattHour(); -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of energy: therm-us. * Caller owns returned value and must free it. * Also see {@link #getThermUs()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createThermUs(UErrorCode &status); /** * Returns by value, unit of energy: therm-us. * Also see {@link #createThermUs()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getThermUs(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of force: newton. @@ -1782,130 +1752,134 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getMegahertz(); #ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: dot. + * Caller owns returned value and must free it. + * Also see {@link #getDot()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createDot(UErrorCode &status); + + /** + * Returns by value, unit of graphics: dot. + * Also see {@link #createDot()}. + * @draft ICU 68 + */ + static MeasureUnit getDot(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of graphics: dot-per-centimeter. * Caller owns returned value and must free it. * Also see {@link #getDotPerCentimeter()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createDotPerCentimeter(UErrorCode &status); /** * Returns by value, unit of graphics: dot-per-centimeter. * Also see {@link #createDotPerCentimeter()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getDotPerCentimeter(); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of graphics: dot-per-inch. * Caller owns returned value and must free it. * Also see {@link #getDotPerInch()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createDotPerInch(UErrorCode &status); /** * Returns by value, unit of graphics: dot-per-inch. * Also see {@link #createDotPerInch()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getDotPerInch(); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of graphics: em. * Caller owns returned value and must free it. * Also see {@link #getEm()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createEm(UErrorCode &status); /** * Returns by value, unit of graphics: em. * Also see {@link #createEm()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getEm(); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of graphics: megapixel. * Caller owns returned value and must free it. * Also see {@link #getMegapixel()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createMegapixel(UErrorCode &status); /** * Returns by value, unit of graphics: megapixel. * Also see {@link #createMegapixel()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getMegapixel(); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of graphics: pixel. * Caller owns returned value and must free it. * Also see {@link #getPixel()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createPixel(UErrorCode &status); /** * Returns by value, unit of graphics: pixel. * Also see {@link #createPixel()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getPixel(); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of graphics: pixel-per-centimeter. * Caller owns returned value and must free it. * Also see {@link #getPixelPerCentimeter()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createPixelPerCentimeter(UErrorCode &status); /** * Returns by value, unit of graphics: pixel-per-centimeter. * Also see {@link #createPixelPerCentimeter()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getPixelPerCentimeter(); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of graphics: pixel-per-inch. * Caller owns returned value and must free it. * Also see {@link #getPixelPerInch()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createPixelPerInch(UErrorCode &status); /** * Returns by value, unit of graphics: pixel-per-inch. * Also see {@link #createPixelPerInch()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getPixelPerInch(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of length: astronomical-unit. @@ -1955,6 +1929,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getDecimeter(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: earth-radius. + * Caller owns returned value and must free it. + * Also see {@link #getEarthRadius()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createEarthRadius(UErrorCode &status); + + /** + * Returns by value, unit of length: earth-radius. + * Also see {@link #createEarthRadius()}. + * @draft ICU 68 + */ + static MeasureUnit getEarthRadius(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of length: fathom. * Caller owns returned value and must free it. @@ -2243,6 +2235,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getYard(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of light: candela. + * Caller owns returned value and must free it. + * Also see {@link #getCandela()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createCandela(UErrorCode &status); + + /** + * Returns by value, unit of light: candela. + * Also see {@link #createCandela()}. + * @draft ICU 68 + */ + static MeasureUnit getCandela(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of light: lumen. + * Caller owns returned value and must free it. + * Also see {@link #getLumen()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createLumen(UErrorCode &status); + + /** + * Returns by value, unit of light: lumen. + * Also see {@link #createLumen()}. + * @draft ICU 68 + */ + static MeasureUnit getLumen(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of light: lux. * Caller owns returned value and must free it. @@ -2323,6 +2351,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getEarthMass(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of mass: grain. + * Caller owns returned value and must free it. + * Also see {@link #getGrain()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createGrain(UErrorCode &status); + + /** + * Returns by value, unit of mass: grain. + * Also see {@link #createGrain()}. + * @draft ICU 68 + */ + static MeasureUnit getGrain(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of mass: gram. * Caller owns returned value and must free it. @@ -2611,23 +2657,21 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getAtmosphere(); -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of pressure: bar. * Caller owns returned value and must free it. * Also see {@link #getBar()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createBar(UErrorCode &status); /** * Returns by value, unit of pressure: bar. * Also see {@link #createBar()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getBar(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of pressure: hectopascal. @@ -2725,23 +2769,21 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getMillimeterOfMercury(); -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of pressure: pascal. * Caller owns returned value and must free it. * Also see {@link #getPascal()}. * @param status ICU error code. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit *createPascal(UErrorCode &status); /** * Returns by value, unit of pressure: pascal. * Also see {@link #createPascal()}. - * @draft ICU 65 + * @stable ICU 65 */ static MeasureUnit getPascal(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of pressure: pound-force-per-square-inch. @@ -3143,6 +3185,78 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getDeciliter(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: dessert-spoon. + * Caller owns returned value and must free it. + * Also see {@link #getDessertSpoon()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createDessertSpoon(UErrorCode &status); + + /** + * Returns by value, unit of volume: dessert-spoon. + * Also see {@link #createDessertSpoon()}. + * @draft ICU 68 + */ + static MeasureUnit getDessertSpoon(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: dessert-spoon-imperial. + * Caller owns returned value and must free it. + * Also see {@link #getDessertSpoonImperial()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createDessertSpoonImperial(UErrorCode &status); + + /** + * Returns by value, unit of volume: dessert-spoon-imperial. + * Also see {@link #createDessertSpoonImperial()}. + * @draft ICU 68 + */ + static MeasureUnit getDessertSpoonImperial(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: dram. + * Caller owns returned value and must free it. + * Also see {@link #getDram()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createDram(UErrorCode &status); + + /** + * Returns by value, unit of volume: dram. + * Also see {@link #createDram()}. + * @draft ICU 68 + */ + static MeasureUnit getDram(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: drop. + * Caller owns returned value and must free it. + * Also see {@link #getDrop()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createDrop(UErrorCode &status); + + /** + * Returns by value, unit of volume: drop. + * Also see {@link #createDrop()}. + * @draft ICU 68 + */ + static MeasureUnit getDrop(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: fluid-ounce. * Caller owns returned value and must free it. @@ -3223,6 +3337,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getHectoliter(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: jigger. + * Caller owns returned value and must free it. + * Also see {@link #getJigger()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createJigger(UErrorCode &status); + + /** + * Returns by value, unit of volume: jigger. + * Also see {@link #createJigger()}. + * @draft ICU 68 + */ + static MeasureUnit getJigger(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: liter. * Caller owns returned value and must free it. @@ -3271,6 +3403,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getMilliliter(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: pinch. + * Caller owns returned value and must free it. + * Also see {@link #getPinch()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createPinch(UErrorCode &status); + + /** + * Returns by value, unit of volume: pinch. + * Also see {@link #createPinch()}. + * @draft ICU 68 + */ + static MeasureUnit getPinch(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: pint. * Caller owns returned value and must free it. @@ -3319,6 +3469,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getQuart(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: quart-imperial. + * Caller owns returned value and must free it. + * Also see {@link #getQuartImperial()}. + * @param status ICU error code. + * @draft ICU 68 + */ + static MeasureUnit *createQuartImperial(UErrorCode &status); + + /** + * Returns by value, unit of volume: quart-imperial. + * Also see {@link #createQuartImperial()}. + * @draft ICU 68 + */ + static MeasureUnit getQuartImperial(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: tablespoon. * Caller owns returned value and must free it. @@ -3369,12 +3537,6 @@ class U_I18N_API MeasureUnit: public UObject { */ void initCurrency(StringPiece isoCurrency); - /** - * For ICU use only. - * @internal - */ - void initNoUnit(const char *subtype); - #endif /* U_HIDE_INTERNAL_API */ private: @@ -3393,7 +3555,6 @@ private: MeasureUnit(int32_t typeId, int32_t subTypeId); MeasureUnit(MeasureUnitImpl&& impl); void setTo(int32_t typeId, int32_t subTypeId); - int32_t getOffset() const; static MeasureUnit *create(int typeId, int subTypeId, UErrorCode &status); /** @@ -3405,9 +3566,21 @@ private: */ static bool findBySubType(StringPiece subType, MeasureUnit* output); + /** Internal version of public API */ + LocalArray splitToSingleUnitsImpl(int32_t& outCount, UErrorCode& status) const; + friend struct MeasureUnitImpl; }; +#ifndef U_HIDE_DRAFT_API // @draft ICU 68 +inline std::pair, int32_t> +MeasureUnit::splitToSingleUnits(UErrorCode& status) const { + int32_t length; + auto array = splitToSingleUnitsImpl(length, status); + return std::make_pair(std::move(array), length); +} +#endif // U_HIDE_DRAFT_API + U_NAMESPACE_END #endif // !UNCONFIG_NO_FORMATTING diff --git a/intl/icu/source/i18n/unicode/measure.h b/intl/icu/source/i18n/unicode/measure.h index fa9c29351e35..aeb1dace43dc 100644 --- a/intl/icu/source/i18n/unicode/measure.h +++ b/intl/icu/source/i18n/unicode/measure.h @@ -48,7 +48,7 @@ class U_I18N_API Measure: public UObject { * Construct an object with the given numeric amount and the given * unit. After this call, the caller must not delete the given * unit object. - * @param number a numeric object; amount.isNumeric() must be TRUE + * @param number a numeric object; amount.isNumeric() must be true * @param adoptedUnit the unit object, which must not be NULL * @param ec input-output error code. If the amount or the unit * is invalid, then this will be set to a failing value. diff --git a/intl/icu/source/i18n/unicode/msgfmt.h b/intl/icu/source/i18n/unicode/msgfmt.h index 99b0eaeec1dc..2d9bc8f2e2b0 100644 --- a/intl/icu/source/i18n/unicode/msgfmt.h +++ b/intl/icu/source/i18n/unicode/msgfmt.h @@ -255,7 +255,7 @@ class NumberFormat; * or preformatted values, but not pattern strings or custom format objects.

    * *

    For more details, see the - * ICU User Guide.

    + * ICU User Guide.

    * *

    Usage Information

    * @@ -920,7 +920,7 @@ private: int32_t argTypeCapacity; /** - * TRUE if there are different argTypes for the same argument. + * true if there are different argTypes for the same argument. * This only matters when the MessageFormat is used in the plain C (umsg_xxx) API * where the pattern argTypes determine how the va_arg list is read. */ diff --git a/intl/icu/source/i18n/unicode/nounit.h b/intl/icu/source/i18n/unicode/nounit.h index 61b5c16ee395..cee45e352df4 100644 --- a/intl/icu/source/i18n/unicode/nounit.h +++ b/intl/icu/source/i18n/unicode/nounit.h @@ -29,80 +29,53 @@ U_NAMESPACE_BEGIN /** * Dimensionless unit for percent and permille. + * Prior to ICU 68, this namespace was a class with the same name. * @see NumberFormatter - * @draft ICU 60 + * @draft ICU 68 */ -class U_I18N_API NoUnit: public MeasureUnit { -public: +namespace NoUnit { /** * Returns an instance for the base unit (dimensionless and no scaling). * - * @return a NoUnit instance - * @draft ICU 60 + * Prior to ICU 68, this function returned a NoUnit by value. + * + * Since ICU 68, this function returns the same value as the default MeasureUnit constructor. + * + * @return a MeasureUnit instance + * @draft ICU 68 */ - static NoUnit U_EXPORT2 base(); + static inline MeasureUnit U_EXPORT2 base() { + return MeasureUnit(); + } /** * Returns an instance for percent, or 1/100 of a base unit. * - * @return a NoUnit instance - * @draft ICU 60 + * Prior to ICU 68, this function returned a NoUnit by value. + * + * Since ICU 68, this function returns the same value as MeasureUnit::getPercent(). + * + * @return a MeasureUnit instance + * @draft ICU 68 */ - static NoUnit U_EXPORT2 percent(); + static inline MeasureUnit U_EXPORT2 percent() { + return MeasureUnit::getPercent(); + } /** * Returns an instance for permille, or 1/1000 of a base unit. * - * @return a NoUnit instance - * @draft ICU 60 + * Prior to ICU 68, this function returned a NoUnit by value. + * + * Since ICU 68, this function returns the same value as MeasureUnit::getPermille(). + * + * @return a MeasureUnit instance + * @draft ICU 68 */ - static NoUnit U_EXPORT2 permille(); - - /** - * Copy operator. - * @draft ICU 60 - */ - NoUnit(const NoUnit& other); - - /** - * Destructor. - * @draft ICU 60 - */ - virtual ~NoUnit(); - - /** - * Return a polymorphic clone of this object. The result will - * have the same class as returned by getDynamicClassID(). - * @draft ICU 60 - */ - virtual NoUnit* clone() const; - - /** - * Returns a unique class ID for this object POLYMORPHICALLY. - * This method implements a simple form of RTTI used by ICU. - * @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 60 - */ - virtual UClassID getDynamicClassID() const; - - /** - * Returns the class ID for this class. This is used to compare to - * the return value of getDynamicClassID(). - * @return The class ID for all objects of this class. - * @draft ICU 60 - */ - static UClassID U_EXPORT2 getStaticClassID(); - -private: - /** - * Constructor - * @internal (private) - */ - NoUnit(const char* subtype); - -}; + static inline MeasureUnit U_EXPORT2 permille() { + return MeasureUnit::getPermille(); + } +} U_NAMESPACE_END diff --git a/intl/icu/source/i18n/unicode/numberformatter.h b/intl/icu/source/i18n/unicode/numberformatter.h index 615cf49f7b75..06329b8e7aa0 100644 --- a/intl/icu/source/i18n/unicode/numberformatter.h +++ b/intl/icu/source/i18n/unicode/numberformatter.h @@ -99,6 +99,13 @@ class MultiplierParseHandler; } } +namespace units { + +// Forward declarations: +class UnitsRouter; + +} // namespace units + namespace number { // icu::number // Forward declarations: @@ -157,6 +164,7 @@ struct RangeMacroProps; struct UFormattedNumberImpl; class MutablePatternModifier; class ImmutablePatternModifier; +struct DecimalFormatWarehouse; /** * Used for NumberRangeFormatter and implemented in numrange_fluent.cpp. @@ -371,9 +379,9 @@ class U_I18N_API Notation : public UMemory { UBool copyErrorTo(UErrorCode &status) const { if (fType == NTN_ERROR) { status = fUnion.errorCode; - return TRUE; + return true; } - return FALSE; + return false; } // To allow MacroProps to initialize empty instances: @@ -705,12 +713,8 @@ class U_I18N_API Precision : public UMemory { typedef PrecisionUnion::FractionSignificantSettings FractionSignificantSettings; typedef PrecisionUnion::IncrementSettings IncrementSettings; - /** The Precision encapsulates the RoundingMode when used within the implementation. */ - UNumberFormatRoundingMode fRoundingMode; - - Precision(const PrecisionType& type, const PrecisionUnion& union_, - UNumberFormatRoundingMode roundingMode) - : fType(type), fUnion(union_), fRoundingMode(roundingMode) {} + Precision(const PrecisionType& type, const PrecisionUnion& union_) + : fType(type), fUnion(union_) {} Precision(UErrorCode errorCode) : fType(RND_ERROR) { fUnion.errorCode = errorCode; @@ -725,9 +729,9 @@ class U_I18N_API Precision : public UMemory { UBool copyErrorTo(UErrorCode &status) const { if (fType == RND_ERROR) { status = fUnion.errorCode; - return TRUE; + return true; } - return FALSE; + return false; } // On the parent type so that this method can be called internally on Precision instances. @@ -744,8 +748,6 @@ class U_I18N_API Precision : public UMemory { static CurrencyPrecision constructCurrency(UCurrencyUsage usage); - static Precision constructPassThrough(); - // To allow MacroProps/MicroProps to initialize bogus instances: friend struct impl::MacroProps; friend struct impl::MicroProps; @@ -766,6 +768,9 @@ class U_I18N_API Precision : public UMemory { // To allow access to the skeleton generation code: friend class impl::GeneratorHelpers; + + // To allow access to isBogus and the default (bogus) constructor: + friend class units::UnitsRouter; }; /** @@ -969,9 +974,9 @@ class U_I18N_API IntegerWidth : public UMemory { UBool copyErrorTo(UErrorCode &status) const { if (fHasError) { status = fUnion.errorCode; - return TRUE; + return true; } - return FALSE; + return false; } void apply(impl::DecimalQuantity &quantity, UErrorCode &status) const; @@ -1095,11 +1100,11 @@ class U_I18N_API Scale : public UMemory { } UBool copyErrorTo(UErrorCode &status) const { - if (fError != U_ZERO_ERROR) { + if (U_FAILURE(fError)) { status = fError; - return TRUE; + return true; } - return FALSE; + return false; } void applyTo(impl::DecimalQuantity& quantity) const; @@ -1126,6 +1131,71 @@ class U_I18N_API Scale : public UMemory { namespace impl { +// Do not enclose entire Usage with #ifndef U_HIDE_INTERNAL_API, needed for a protected field +/** + * Manages NumberFormatterSettings::usage()'s char* instance on the heap. + * @internal + */ +class U_I18N_API Usage : public UMemory { + +#ifndef U_HIDE_INTERNAL_API + + public: + /** @internal */ + Usage(const Usage& other); + + /** @internal */ + Usage& operator=(const Usage& other); + + /** @internal */ + Usage(Usage &&src) U_NOEXCEPT; + + /** @internal */ + Usage& operator=(Usage&& src) U_NOEXCEPT; + + /** @internal */ + ~Usage(); + + /** @internal */ + int16_t length() const { return fLength; } + + /** @internal + * Makes a copy of value. Set to "" to unset. + */ + void set(StringPiece value); + + /** @internal */ + bool isSet() const { return fLength > 0; } + +#endif // U_HIDE_INTERNAL_API + + private: + char *fUsage; + int16_t fLength; + UErrorCode fError; + + Usage() : fUsage(nullptr), fLength(0), fError(U_ZERO_ERROR) {} + + /** @internal */ + UBool copyErrorTo(UErrorCode &status) const { + if (U_FAILURE(fError)) { + status = fError; + return true; + } + return false; + } + + // Allow NumberFormatterImpl to access fUsage. + friend class impl::NumberFormatterImpl; + + // Allow skeleton generation code to access private members. + friend class impl::GeneratorHelpers; + + // Allow MacroProps/MicroProps to initialize empty instances and to call + // copyErrorTo(). + friend struct impl::MacroProps; +}; + // Do not enclose entire SymbolsWrapper with #ifndef U_HIDE_INTERNAL_API, needed for a protected field /** @internal */ class U_I18N_API SymbolsWrapper : public UMemory { @@ -1192,12 +1262,12 @@ class U_I18N_API SymbolsWrapper : public UMemory { UBool copyErrorTo(UErrorCode &status) const { if (fType == SYMPTR_DFS && fPtr.dfs == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return TRUE; + return true; } else if (fType == SYMPTR_NS && fPtr.ns == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return TRUE; + return true; } - return FALSE; + return false; } private: @@ -1239,13 +1309,13 @@ class U_I18N_API Grouper : public UMemory { fGrouping2(grouping2), fMinGrouping(minGrouping), fStrategy(strategy) {} -#endif // U_HIDE_INTERNAL_API /** @internal */ int16_t getPrimary() const; /** @internal */ int16_t getSecondary() const; +#endif // U_HIDE_INTERNAL_API private: /** @@ -1309,10 +1379,10 @@ class U_I18N_API Padder : public UMemory { /** @internal */ static Padder codePoints(UChar32 cp, int32_t targetWidth, UNumberFormatPadPosition position); -#endif // U_HIDE_INTERNAL_API /** @internal */ static Padder forProperties(const DecimalFormatProperties& properties); +#endif // U_HIDE_INTERNAL_API private: UChar32 fWidth; // -3 = error; -2 = bogus; -1 = no padding @@ -1341,9 +1411,9 @@ class U_I18N_API Padder : public UMemory { UBool copyErrorTo(UErrorCode &status) const { if (fWidth == -3) { status = fUnion.errorCode; - return TRUE; + return true; } - return FALSE; + return false; } bool isValid() const { @@ -1372,10 +1442,10 @@ struct U_I18N_API MacroProps : public UMemory { Notation notation; /** @internal */ - MeasureUnit unit; // = NoUnit::base(); + MeasureUnit unit; // = MeasureUnit(); (the base dimensionless unit) /** @internal */ - MeasureUnit perUnit; // = NoUnit::base(); + MeasureUnit perUnit; // = MeasureUnit(); (the base dimensionless unit) /** @internal */ Precision precision; // = Precision(); (bogus) @@ -1409,6 +1479,9 @@ struct U_I18N_API MacroProps : public UMemory { /** @internal */ Scale scale; // = Scale(); (benign value) + /** @internal */ + Usage usage; // = Usage(); (no usage) + /** @internal */ const AffixPatternProvider* affixProvider = nullptr; // no ownership @@ -1430,7 +1503,7 @@ struct U_I18N_API MacroProps : public UMemory { bool copyErrorTo(UErrorCode &status) const { return notation.copyErrorTo(status) || precision.copyErrorTo(status) || padder.copyErrorTo(status) || integerWidth.copyErrorTo(status) || - symbols.copyErrorTo(status) || scale.copyErrorTo(status); + symbols.copyErrorTo(status) || scale.copyErrorTo(status) || usage.copyErrorTo(status); } }; @@ -1507,10 +1580,15 @@ class U_I18N_API NumberFormatterSettings { * All units will be properly localized with locale data, and all units are compatible with notation styles, * rounding precisions, and other number formatter settings. * + * \note If the usage() is set, the output unit **will be changed** to + * produce localised units, according to usage, locale and unit. See + * FormattedNumber::getOutputUnit(). + * * Pass this method any instance of {@link MeasureUnit}. For units of measure: * *
          * NumberFormatter::with().unit(MeasureUnit::getMeter())
    +     * NumberFormatter::with().unit(MeasureUnit::forIdentifier("foot-per-second", status))
          * 
    * * Currency: @@ -1693,7 +1771,7 @@ class U_I18N_API NumberFormatterSettings { * * The default is HALF_EVEN. For more information on rounding mode, see the ICU userguide here: * - * http://userguide.icu-project.org/formatparse/numbers/rounding-modes + * https://unicode-org.github.io/icu/userguide/format_parse/numbers/rounding-modes * * @param roundingMode The rounding mode to use. * @return The fluent chain. @@ -2038,6 +2116,61 @@ class U_I18N_API NumberFormatterSettings { */ Derived scale(const Scale &scale) &&; +#ifndef U_HIDE_DRAFT_API + /** + * Specifies the usage for which numbers will be formatted ("person-height", + * "road", "rainfall", etc.) + * + * When a `usage` is specified, the output unit will change depending on the + * `Locale` and the unit quantity. For example, formatting length + * measurements specified in meters: + * + * `NumberFormatter::with().usage("person").unit(MeasureUnit::getMeter()).locale("en-US")` + * * When formatting 0.25, the output will be "10 inches". + * * When formatting 1.50, the output will be "4 feet and 11 inches". + * + * The input unit specified via unit() determines the type of measurement + * being formatted (e.g. "length" when the unit is "foot"). The usage + * requested will be looked for only within this category of measurement + * units. + * + * The output unit can be found via FormattedNumber::getOutputUnit(). + * + * If the usage has multiple parts (e.g. "land-agriculture-grain") and does + * not match a known usage preference, the last part will be dropped + * repeatedly until a match is found (e.g. trying "land-agriculture", then + * "land"). If a match is still not found, usage will fall back to + * "default". + * + * Setting usage to an empty string clears the usage (disables usage-based + * localized formatting). + * + * Setting a usage string but not a correct input unit will result in an + * U_ILLEGAL_ARGUMENT_ERROR. + * + * When using usage, specifying rounding or precision is unnecessary. + * Specifying a precision in some manner will override the default + * formatting. + * + * @param usage A `usage` parameter from the units resource. See the + * unitPreferenceData in *source/data/misc/units.txt*, generated from + * `unitPreferenceData` in [CLDR's + * supplemental/units.xml](https://github.com/unicode-org/cldr/blob/master/common/supplemental/units.xml). + * @return The fluent chain. + * @draft ICU 68 + */ + Derived usage(StringPiece usage) const &; + + /** + * Overload of usage() for use on an rvalue reference. + * + * @param usage The unit `usage`. + * @return The fluent chain. + * @draft ICU 68 + */ + Derived usage(StringPiece usage) &&; +#endif // U_HIDE_DRAFT_API + #ifndef U_HIDE_INTERNAL_API /** @@ -2120,13 +2253,13 @@ class U_I18N_API NumberFormatterSettings { /** * Sets the UErrorCode if an error occurred in the fluent chain. * Preserves older error codes in the outErrorCode. - * @return TRUE if U_FAILURE(outErrorCode) + * @return true if U_FAILURE(outErrorCode) * @stable ICU 60 */ UBool copyErrorTo(UErrorCode &outErrorCode) const { if (U_FAILURE(outErrorCode)) { // Do not overwrite the older error code - return TRUE; + return true; } fMacros.copyErrorTo(outErrorCode); return U_FAILURE(outErrorCode); @@ -2385,6 +2518,10 @@ class U_I18N_API LocalizedNumberFormatter const impl::NumberFormatterImpl* fCompiled {nullptr}; char fUnsafeCallCount[8] {}; // internally cast to u_atomic_int32_t + // Owned pointer to a DecimalFormatWarehouse, used when copying a LocalizedNumberFormatter + // from a DecimalFormat. + const impl::DecimalFormatWarehouse* fWarehouse {nullptr}; + explicit LocalizedNumberFormatter(const NumberFormatterSettings& other); explicit LocalizedNumberFormatter(NumberFormatterSettings&& src) U_NOEXCEPT; @@ -2393,10 +2530,12 @@ class U_I18N_API LocalizedNumberFormatter LocalizedNumberFormatter(impl::MacroProps &¯os, const Locale &locale); - void clear(); + void resetCompiled(); void lnfMoveHelper(LocalizedNumberFormatter&& src); + void lnfCopyHelper(const LocalizedNumberFormatter& src, UErrorCode& status); + /** * @return true if the compiled formatter is available. */ @@ -2485,7 +2624,6 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { /** @copydoc FormattedValue::nextPosition() */ UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; -#ifndef U_HIDE_DRAFT_API /** * Export the formatted number as a "numeric string" conforming to the * syntax defined in the Decimal Arithmetic Specification, available at @@ -2502,10 +2640,24 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * for example, std::string. * @param status Set if an error occurs. * @return A StringClass containing the numeric string. - * @draft ICU 65 + * @stable ICU 65 */ template inline StringClass toDecimalNumber(UErrorCode& status) const; + +#ifndef U_HIDE_DRAFT_API + /** + * Gets the resolved output unit. + * + * The output unit is dependent upon the localized preferences for the usage + * specified via NumberFormatterSettings::usage(), and may be a unit with + * UMEASURE_UNIT_MIXED unit complexity (MeasureUnit::getComplexity()), such + * as "foot-and-inch" or "hour-and-minute-and-second". + * + * @return `MeasureUnit`. + * @draft ICU 68 + */ + MeasureUnit getOutputUnit(UErrorCode& status) const; #endif // U_HIDE_DRAFT_API #ifndef U_HIDE_INTERNAL_API @@ -2541,7 +2693,6 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { explicit FormattedNumber(UErrorCode errorCode) : fData(nullptr), fErrorCode(errorCode) {} - // TODO(ICU-20775): Propose this as API. void toDecimalNumber(ByteSink& sink, UErrorCode& status) const; // To give LocalizedNumberFormatter format methods access to this class's constructor: @@ -2639,4 +2790,3 @@ U_NAMESPACE_END #endif /* U_SHOW_CPLUSPLUS_API */ #endif // __NUMBERFORMATTER_H__ - diff --git a/intl/icu/source/i18n/unicode/numberrangeformatter.h b/intl/icu/source/i18n/unicode/numberrangeformatter.h index 5adb09285797..8c7a6c3f59a9 100644 --- a/intl/icu/source/i18n/unicode/numberrangeformatter.h +++ b/intl/icu/source/i18n/unicode/numberrangeformatter.h @@ -15,6 +15,7 @@ #include "unicode/formattedvalue.h" #include "unicode/fpositer.h" #include "unicode/numberformatter.h" +#include "unicode/unumberrangeformatter.h" #ifndef __wasi__ #include @@ -34,7 +35,7 @@ * .numberFormatterFirst(NumberFormatter::with().adoptUnit(MeasureUnit::createMeter())) * .numberFormatterSecond(NumberFormatter::with().adoptUnit(MeasureUnit::createKilometer())) * .locale("en-GB") - * .formatRange(750, 1.2, status) + * .formatFormattableRange(750, 1.2, status) * .toString(status); * // => "750 m - 1.2 km" * @@ -47,130 +48,11 @@ */ -/** - * Defines how to merge fields that are identical across the range sign. - * - * @stable ICU 63 - */ -typedef enum UNumberRangeCollapse { - /** - * Use locale data and heuristics to determine how much of the string to collapse. Could end up collapsing none, - * some, or all repeated pieces in a locale-sensitive way. - * - * The heuristics used for this option are subject to change over time. - * - * @stable ICU 63 - */ - UNUM_RANGE_COLLAPSE_AUTO, - - /** - * Do not collapse any part of the number. Example: "3.2 thousand kilograms – 5.3 thousand kilograms" - * - * @stable ICU 63 - */ - UNUM_RANGE_COLLAPSE_NONE, - - /** - * Collapse the unit part of the number, but not the notation, if present. Example: "3.2 thousand – 5.3 thousand - * kilograms" - * - * @stable ICU 63 - */ - UNUM_RANGE_COLLAPSE_UNIT, - - /** - * Collapse any field that is equal across the range sign. May introduce ambiguity on the magnitude of the - * number. Example: "3.2 – 5.3 thousand kilograms" - * - * @stable ICU 63 - */ - UNUM_RANGE_COLLAPSE_ALL -} UNumberRangeCollapse; - -/** - * Defines the behavior when the two numbers in the range are identical after rounding. To programmatically detect - * when the identity fallback is used, compare the lower and upper BigDecimals via FormattedNumber. - * - * @stable ICU 63 - * @see NumberRangeFormatter - */ -typedef enum UNumberRangeIdentityFallback { - /** - * Show the number as a single value rather than a range. Example: "$5" - * - * @stable ICU 63 - */ - UNUM_IDENTITY_FALLBACK_SINGLE_VALUE, - - /** - * Show the number using a locale-sensitive approximation pattern. If the numbers were the same before rounding, - * show the single value. Example: "~$5" or "$5" - * - * @stable ICU 63 - */ - UNUM_IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, - - /** - * Show the number using a locale-sensitive approximation pattern. Use the range pattern always, even if the - * inputs are the same. Example: "~$5" - * - * @stable ICU 63 - */ - UNUM_IDENTITY_FALLBACK_APPROXIMATELY, - - /** - * Show the number as the range of two equal values. Use the range pattern always, even if the inputs are the - * same. Example (with RangeCollapse.NONE): "$5 – $5" - * - * @stable ICU 63 - */ - UNUM_IDENTITY_FALLBACK_RANGE -} UNumberRangeIdentityFallback; - -/** - * Used in the result class FormattedNumberRange to indicate to the user whether the numbers formatted in the range - * were equal or not, and whether or not the identity fallback was applied. - * - * @stable ICU 63 - * @see NumberRangeFormatter - */ -typedef enum UNumberRangeIdentityResult { - /** - * Used to indicate that the two numbers in the range were equal, even before any rounding rules were applied. - * - * @stable ICU 63 - * @see NumberRangeFormatter - */ - UNUM_IDENTITY_RESULT_EQUAL_BEFORE_ROUNDING, - - /** - * Used to indicate that the two numbers in the range were equal, but only after rounding rules were applied. - * - * @stable ICU 63 - * @see NumberRangeFormatter - */ - UNUM_IDENTITY_RESULT_EQUAL_AFTER_ROUNDING, - - /** - * Used to indicate that the two numbers in the range were not equal, even after rounding rules were applied. - * - * @stable ICU 63 - * @see NumberRangeFormatter - */ - UNUM_IDENTITY_RESULT_NOT_EQUAL, - -#ifndef U_HIDE_INTERNAL_API - /** - * The number of entries in this enum. - * @internal - */ - UNUM_IDENTITY_RESULT_COUNT -#endif - -} UNumberRangeIdentityResult; - U_NAMESPACE_BEGIN +// Forward declarations: +class PluralRules; + namespace number { // icu::number // Forward declarations: @@ -185,6 +67,7 @@ struct RangeMacroProps; class DecimalQuantity; class UFormattedNumberRangeData; class NumberRangeFormatterImpl; +struct UFormattedNumberRangeImpl; } // namespace impl @@ -423,8 +306,8 @@ class U_I18N_API NumberRangeFormatterSettings { /** * Sets the behavior when the two sides of the range are the same. This could happen if the same two numbers are - * passed to the formatRange function, or if different numbers are passed to the function but they become the same - * after rounding rules are applied. Possible values: + * passed to the formatFormattableRange function, or if different numbers are passed to the function but they + * become the same after rounding rules are applied. Possible values: *

    *