Merge branch CLDR 42 into aosp/master
Bug: 239910154
Test: external/icu/tools/updatecldrdata.py
Change-Id: I5c6079981ebf847e9dc54f576d7f4e1c920e6a35
diff --git a/.gitignore b/.gitignore
index 768449a..e28059a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+common/main/ar_XB.xml
+common/main/en_XA.xml
tools/cldr-apps/
tools/cldr-apps-watcher/
tools/SurveyConsole/
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e0f8089
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,683 @@
+unicode-license.txt
+
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the
+directory http://www.unicode.org/Public/.
+
+Software includes any source code published in the Unicode Standard
+or under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2018 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+-------------------------------------------------------------------------
+apache-license.txt
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-------------------------------------------------------------------------
+ICU-LICENSE
+
+COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
+
+Copyright © 1991-2018 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+
+---------------------
+
+Third-Party Software Licenses
+
+This section contains third-party software notices and/or additional
+terms for licensed third-party software components included within ICU
+libraries.
+
+1. ICU License - ICU 1.8.1 to ICU 57.1
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2016 International Business Machines Corporation and others
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the
+property of their respective owners.
+
+2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+
+ # The Google Chrome software developed by Google is licensed under
+ # the BSD license. Other software included in this distribution is
+ # provided under other licenses, as set forth below.
+ #
+ # The BSD License
+ # http://opensource.org/licenses/bsd-license.php
+ # Copyright (C) 2006-2008, Google Inc.
+ #
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are met:
+ #
+ # Redistributions of source code must retain the above copyright notice,
+ # this list of conditions and the following disclaimer.
+ # Redistributions in binary form must reproduce the above
+ # copyright notice, this list of conditions and the following
+ # disclaimer in the documentation and/or other materials provided with
+ # the distribution.
+ # Neither the name of Google Inc. nor the names of its
+ # contributors may be used to endorse or promote products derived from
+ # this software without specific prior written permission.
+ #
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #
+ #
+ # The word list in cjdict.txt are generated by combining three word lists
+ # listed below with further processing for compound word breaking. The
+ # frequency is generated with an iterative training against Google web
+ # corpora.
+ #
+ # * Libtabe (Chinese)
+ # - https://sourceforge.net/project/?group_id=1519
+ # - Its license terms and conditions are shown below.
+ #
+ # * IPADIC (Japanese)
+ # - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+ # - Its license terms and conditions are shown below.
+ #
+ # ---------COPYING.libtabe ---- BEGIN--------------------
+ #
+ # /*
+ # * Copyright (c) 1999 TaBE Project.
+ # * Copyright (c) 1999 Pai-Hsiang Hsiao.
+ # * All rights reserved.
+ # *
+ # * Redistribution and use in source and binary forms, with or without
+ # * modification, are permitted provided that the following conditions
+ # * are met:
+ # *
+ # * . Redistributions of source code must retain the above copyright
+ # * notice, this list of conditions and the following disclaimer.
+ # * . Redistributions in binary form must reproduce the above copyright
+ # * notice, this list of conditions and the following disclaimer in
+ # * the documentation and/or other materials provided with the
+ # * distribution.
+ # * . Neither the name of the TaBE Project nor the names of its
+ # * contributors may be used to endorse or promote products derived
+ # * from this software without specific prior written permission.
+ # *
+ # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ # * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ # * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ # * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ # * OF THE POSSIBILITY OF SUCH DAMAGE.
+ # */
+ #
+ # /*
+ # * Copyright (c) 1999 Computer Systems and Communication Lab,
+ # * Institute of Information Science, Academia
+ # * Sinica. All rights reserved.
+ # *
+ # * Redistribution and use in source and binary forms, with or without
+ # * modification, are permitted provided that the following conditions
+ # * are met:
+ # *
+ # * . Redistributions of source code must retain the above copyright
+ # * notice, this list of conditions and the following disclaimer.
+ # * . Redistributions in binary form must reproduce the above copyright
+ # * notice, this list of conditions and the following disclaimer in
+ # * the documentation and/or other materials provided with the
+ # * distribution.
+ # * . Neither the name of the Computer Systems and Communication Lab
+ # * nor the names of its contributors may be used to endorse or
+ # * promote products derived from this software without specific
+ # * prior written permission.
+ # *
+ # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ # * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ # * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ # * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ # * OF THE POSSIBILITY OF SUCH DAMAGE.
+ # */
+ #
+ # Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
+ # University of Illinois
+ # c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4
+ #
+ # ---------------COPYING.libtabe-----END--------------------------------
+ #
+ #
+ # ---------------COPYING.ipadic-----BEGIN-------------------------------
+ #
+ # Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+ # and Technology. All Rights Reserved.
+ #
+ # Use, reproduction, and distribution of this software is permitted.
+ # Any copy of this software, whether in its original form or modified,
+ # must include both the above copyright notice and the following
+ # paragraphs.
+ #
+ # Nara Institute of Science and Technology (NAIST),
+ # the copyright holders, disclaims all warranties with regard to this
+ # software, including all implied warranties of merchantability and
+ # fitness, in no event shall NAIST be liable for
+ # any special, indirect or consequential damages or any damages
+ # whatsoever resulting from loss of use, data or profits, whether in an
+ # action of contract, negligence or other tortuous action, arising out
+ # of or in connection with the use or performance of this software.
+ #
+ # A large portion of the dictionary entries
+ # originate from ICOT Free Software. The following conditions for ICOT
+ # Free Software applies to the current dictionary as well.
+ #
+ # Each User may also freely distribute the Program, whether in its
+ # original form or modified, to any third party or parties, PROVIDED
+ # that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+ # on, or be attached to, the Program, which is distributed substantially
+ # in the same form as set out herein and that such intended
+ # distribution, if actually made, will neither violate or otherwise
+ # contravene any of the laws and regulations of the countries having
+ # jurisdiction over the User or the intended distribution itself.
+ #
+ # NO WARRANTY
+ #
+ # The program was produced on an experimental basis in the course of the
+ # research and development conducted during the project and is provided
+ # to users as so produced on an experimental basis. Accordingly, the
+ # program is provided without any warranty whatsoever, whether express,
+ # implied, statutory or otherwise. The term "warranty" used herein
+ # includes, but is not limited to, any warranty of the quality,
+ # performance, merchantability and fitness for a particular purpose of
+ # the program and the nonexistence of any infringement or violation of
+ # any right of any third party.
+ #
+ # Each user of the program will agree and understand, and be deemed to
+ # have agreed and understood, that there is no warranty whatsoever for
+ # the program and, accordingly, the entire risk arising from or
+ # otherwise connected with the program is assumed by the user.
+ #
+ # Therefore, neither ICOT, the copyright holder, or any other
+ # organization that participated in or was otherwise related to the
+ # development of the program and their respective officials, directors,
+ # officers and other employees shall be held liable for any and all
+ # damages, including, without limitation, general, special, incidental
+ # and consequential damages, arising out of or otherwise in connection
+ # with the use or inability to use the program or any product, material
+ # or result produced or otherwise obtained by using the program,
+ # regardless of whether they have been advised of, or otherwise had
+ # knowledge of, the possibility of such damages at any time during the
+ # project or thereafter. Each user will be deemed to have agreed to the
+ # foregoing by his or her commencement of use of the program. The term
+ # "use" as used herein includes, but is not limited to, the use,
+ # modification, copying and distribution of the program and the
+ # production of secondary products from the program.
+ #
+ # In the case where the program, whether in its original form or
+ # modified, was distributed or delivered to or received by a user from
+ # any person, organization or entity other than ICOT, unless it makes or
+ # grants independently of ICOT any specific warranty to the user in
+ # writing, such person, organization or entity, will also be exempted
+ # from and not be held liable to the user for any such damages as noted
+ # above as far as the program is concerned.
+ #
+ # ---------------COPYING.ipadic-----END----------------------------------
+
+3. Lao Word Break Dictionary Data (laodict.txt)
+
+ # Copyright (c) 2013 International Business Machines Corporation
+ # and others. All Rights Reserved.
+ #
+ # Project: http://code.google.com/p/lao-dictionary/
+ # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
+ # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
+ # (copied below)
+ #
+ # This file is derived from the above dictionary, with slight
+ # modifications.
+ # ----------------------------------------------------------------------
+ # Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification,
+ # are permitted provided that the following conditions are met:
+ #
+ #
+ # Redistributions of source code must retain the above copyright notice, this
+ # list of conditions and the following disclaimer. Redistributions in
+ # binary form must reproduce the above copyright notice, this list of
+ # conditions and the following disclaimer in the documentation and/or
+ # other materials provided with the distribution.
+ #
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ # COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ # OF THE POSSIBILITY OF SUCH DAMAGE.
+ # --------------------------------------------------------------------------
+
+4. Burmese Word Break Dictionary Data (burmesedict.txt)
+
+ # Copyright (c) 2014 International Business Machines Corporation
+ # and others. All Rights Reserved.
+ #
+ # This list is part of a project hosted at:
+ # github.com/kanyawtech/myanmar-karen-word-lists
+ #
+ # --------------------------------------------------------------------------
+ # Copyright (c) 2013, LeRoy Benjamin Sharon
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+ # are met: Redistributions of source code must retain the above
+ # copyright notice, this list of conditions and the following
+ # disclaimer. Redistributions in binary form must reproduce the
+ # above copyright notice, this list of conditions and the following
+ # disclaimer in the documentation and/or other materials provided
+ # with the distribution.
+ #
+ # Neither the name Myanmar Karen Word Lists, nor the names of its
+ # contributors may be used to endorse or promote products derived
+ # from this software without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ # TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ # --------------------------------------------------------------------------
+
+5. Time Zone Database
+
+ ICU uses the public domain data and code derived from Time Zone
+Database for its time zone support. The ownership of the TZ database
+is explained in BCP 175: Procedure for Maintaining the Time Zone
+Database section 7.
+
+ # 7. Database Ownership
+ #
+ # The TZ database itself is not an IETF Contribution or an IETF
+ # document. Rather it is a pre-existing and regularly updated work
+ # that is in the public domain, and is intended to remain in the
+ # public domain. Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do
+ # not apply to the TZ Database or contributions that individuals make
+ # to it. Should any claims be made and substantiated against the TZ
+ # Database, the organization that is providing the IANA
+ # Considerations defined in this RFC, under the memorandum of
+ # understanding with the IETF, currently ICANN, may act in accordance
+ # with all competent court orders. No ownership claims will be made
+ # by ICANN or the IETF Trust on the database or the code. Any person
+ # making a contribution to the database or code waives all rights to
+ # future claims in that contribution or in the TZ Database.
+
+6. Google double-conversion
+
+Copyright 2006-2011, the V8 project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-------------------------------------------------------------------------
+
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..6db2c50
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,17 @@
+name: "cldr"
+description:
+ "CLDR data and tools"
+
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://www.unicode.org/"
+ }
+ url {
+ type: GIT
+ value: "https://github.com/unicode-org/cldr"
+ }
+ version: "41.0"
+ last_upgrade_date { year: 2022 month: 5 day: 23 }
+ license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/MODULE_LICENSE_ICU b/MODULE_LICENSE_ICU
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_ICU
diff --git a/MODULE_LICENSE_UNICODE b/MODULE_LICENSE_UNICODE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_UNICODE
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..ba47b8b
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,9 @@
+icu-team+reviews@google.com
+mscherer@google.com
+roubert@google.com
+
+android-libcore-team+review@google.com
+vichang@google.com
+nikitai@google.com
+nfuller@google.com
+ngeoffray@google.com
diff --git a/common/annotationsDerived/ig.xml b/common/annotationsDerived/ig.xml
index 72c2576..d09ef0d 100644
--- a/common/annotationsDerived/ig.xml
+++ b/common/annotationsDerived/ig.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/jv.xml b/common/annotationsDerived/jv.xml
index a498e05..bad371d 100644
--- a/common/annotationsDerived/jv.xml
+++ b/common/annotationsDerived/jv.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/lb.xml b/common/annotationsDerived/lb.xml
index 2bc5a20..4d89c83 100644
--- a/common/annotationsDerived/lb.xml
+++ b/common/annotationsDerived/lb.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/mi.xml b/common/annotationsDerived/mi.xml
index a49d653..5eae03a 100644
--- a/common/annotationsDerived/mi.xml
+++ b/common/annotationsDerived/mi.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/mt.xml b/common/annotationsDerived/mt.xml
index 6b316d2..3a7a4a4 100644
--- a/common/annotationsDerived/mt.xml
+++ b/common/annotationsDerived/mt.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/or.xml b/common/annotationsDerived/or.xml
index d9793e0..c0a52f4 100644
--- a/common/annotationsDerived/or.xml
+++ b/common/annotationsDerived/or.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/ps.xml b/common/annotationsDerived/ps.xml
index 6440820..0bf0c2d 100644
--- a/common/annotationsDerived/ps.xml
+++ b/common/annotationsDerived/ps.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/qu.xml b/common/annotationsDerived/qu.xml
index 1de17b1..0b2503e 100644
--- a/common/annotationsDerived/qu.xml
+++ b/common/annotationsDerived/qu.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/rm.xml b/common/annotationsDerived/rm.xml
index d8ba6b0..9eb4ef4 100644
--- a/common/annotationsDerived/rm.xml
+++ b/common/annotationsDerived/rm.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/sc.xml b/common/annotationsDerived/sc.xml
index aaeeb05..b935bd4 100644
--- a/common/annotationsDerived/sc.xml
+++ b/common/annotationsDerived/sc.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/so.xml b/common/annotationsDerived/so.xml
index 4658e73..58cf715 100644
--- a/common/annotationsDerived/so.xml
+++ b/common/annotationsDerived/so.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/tg.xml b/common/annotationsDerived/tg.xml
index 55d7357..991bbb6 100644
--- a/common/annotationsDerived/tg.xml
+++ b/common/annotationsDerived/tg.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/ti.xml b/common/annotationsDerived/ti.xml
index c541806..0d06adb 100644
--- a/common/annotationsDerived/ti.xml
+++ b/common/annotationsDerived/ti.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/ug.xml b/common/annotationsDerived/ug.xml
index 99eb908..571bc21 100644
--- a/common/annotationsDerived/ug.xml
+++ b/common/annotationsDerived/ug.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/wo.xml b/common/annotationsDerived/wo.xml
index 431b0dc..a1dee75 100644
--- a/common/annotationsDerived/wo.xml
+++ b/common/annotationsDerived/wo.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/annotationsDerived/yo.xml b/common/annotationsDerived/yo.xml
index 8c819dd..d960faa 100644
--- a/common/annotationsDerived/yo.xml
+++ b/common/annotationsDerived/yo.xml
@@ -4,8 +4,9 @@
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file.
-->
-<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
<ldml>
<identity>
<version number="$Revision$"/>
diff --git a/common/collation/ja.xml b/common/collation/ja.xml
index aebfd2f..f8f1ef4 100644
--- a/common/collation/ja.xml
+++ b/common/collation/ja.xml
@@ -23,7 +23,7 @@
-->
<cr><![CDATA[
[strength 3]
- [reorder Latn Kana Hani]
+ [reorder Kana Hani] # Android patch (b/13790528).
&ゝ<<<<ヽ # iteration marks \u309D, \u30FD
# The length mark sorts tertiary less-than the
diff --git a/common/main/en.xml b/common/main/en.xml
index d66e24c..6b481b4 100644
--- a/common/main/en.xml
+++ b/common/main/en.xml
@@ -1194,8 +1194,10 @@
<territory type="TM">Turkmenistan</territory>
<territory type="TN">Tunisia</territory>
<territory type="TO">Tonga</territory>
- <territory type="TR">Turkey</territory>
- <territory type="TR" alt="variant">Türkiye</territory>
+ <!-- Android patch: Swap the primary and variant name. b/246410688 begin. -->
+ <territory type="TR">Türkiye</territory>
+ <territory type="TR" alt="variant">Turkey</territory>
+ <!-- Android patch: Swap the primary and variant name. b/246410688 end. -->
<territory type="TT">Trinidad & Tobago</territory>
<territory type="TV">Tuvalu</territory>
<territory type="TW">Taiwan</territory>
diff --git a/common/main/en_GB.xml b/common/main/en_GB.xml
index ff356b7..da5ee08 100644
--- a/common/main/en_GB.xml
+++ b/common/main/en_GB.xml
@@ -1007,8 +1007,10 @@
<territory type="TM">Turkmenistan</territory>
<territory type="TN">Tunisia</territory>
<territory type="TO">Tonga</territory>
- <territory type="TR">Turkey</territory>
+ <!-- Android patch: Swap the primary and variant name. b/246410688 begin. -->
+ <territory type="TR">Türkiye</territory>
<territory type="TR" alt="variant">↑↑↑</territory>
+ <!-- Android patch: Swap the primary and variant name. b/246410688 end. -->
<territory type="TT">↑↑↑</territory>
<territory type="TV">Tuvalu</territory>
<territory type="TW">Taiwan</territory>
diff --git a/common/main/hi.xml b/common/main/hi.xml
index 4fb0ead..b4d8a9e 100644
--- a/common/main/hi.xml
+++ b/common/main/hi.xml
@@ -1973,8 +1973,9 @@
<dayPeriod type="evening1">शाम</dayPeriod>
<dayPeriod type="night1">रात</dayPeriod>
</dayPeriodWidth>
+ <!-- Android patch (b/5948448) begin. -->
<dayPeriodWidth type="narrow">
- <dayPeriod type="midnight">मध्यरात्रि</dayPeriod>
+ <dayPeriod type="midnight" draft="contributed">m</dayPeriod>
<dayPeriod type="am">am</dayPeriod>
<dayPeriod type="pm">pm</dayPeriod>
<dayPeriod type="morning1">सुबह</dayPeriod>
@@ -1983,7 +1984,7 @@
<dayPeriod type="night1">रात</dayPeriod>
</dayPeriodWidth>
<dayPeriodWidth type="wide">
- <dayPeriod type="midnight">मध्यरात्रि</dayPeriod>
+ <dayPeriod type="midnight" draft="contributed">midnight</dayPeriod>
<dayPeriod type="am">am</dayPeriod>
<dayPeriod type="pm">pm</dayPeriod>
<dayPeriod type="morning1">सुबह</dayPeriod>
@@ -1991,6 +1992,7 @@
<dayPeriod type="evening1">शाम</dayPeriod>
<dayPeriod type="night1">रात</dayPeriod>
</dayPeriodWidth>
+ <!-- Android patch (b/5948448) end. -->
</dayPeriodContext>
<dayPeriodContext type="stand-alone">
<dayPeriodWidth type="abbreviated">
diff --git a/common/main/hi_Latn.xml b/common/main/hi_Latn.xml
index d1c0868..1f5e44b 100644
--- a/common/main/hi_Latn.xml
+++ b/common/main/hi_Latn.xml
@@ -1021,8 +1021,10 @@
<territory type="TM">Turkmenistan</territory>
<territory type="TN">Tunisia</territory>
<territory type="TO">Tonga</territory>
- <territory type="TR">Turkey</territory>
- <territory type="TR" alt="variant">Turkiye</territory>
+ <!-- Android patch: Swap the primary and variant name. b/246410688 begin. -->
+ <territory type="TR">Turkiye</territory>
+ <territory type="TR" alt="variant">Turkey</territory>
+ <!-- Android patch: Swap the primary and variant name. b/246410688 end. -->
<territory type="TT">Trinidad & Tobago</territory>
<territory type="TV">Tuvalu</territory>
<territory type="TW">Taiwan</territory>
diff --git a/common/main/ko.xml b/common/main/ko.xml
index b625f3a..e237ecf 100644
--- a/common/main/ko.xml
+++ b/common/main/ko.xml
@@ -6085,9 +6085,11 @@
</metazone>
<metazone type="Korea">
<long>
- <generic>대한민국 시간</generic>
- <standard>대한민국 표준시</standard>
- <daylight>대한민국 하계 표준시</daylight>
+ <!-- Android patch (b/16639166) begin. -->
+ <generic>한국 시간</generic>
+ <standard>한국 표준시</standard>
+ <daylight>한국 하계 표준시</daylight>
+ <!-- Android patch (b/16639166) end. -->
</long>
</metazone>
<metazone type="Kosrae">
diff --git a/common/main/sl.xml b/common/main/sl.xml
index 77a350c..2fc0a4c 100644
--- a/common/main/sl.xml
+++ b/common/main/sl.xml
@@ -1323,8 +1323,10 @@
</dateFormatLength>
<dateFormatLength type="short">
<dateFormat>
- <pattern>d. MM. yy GGGGG</pattern>
- <datetimeSkeleton>GGGGGyyMMd</datetimeSkeleton>
+ <!-- Android patch (CLDR ticket #7991) begin. -->
+ <pattern>d. M. yy GGGGG</pattern>
+ <datetimeSkeleton>GGGGGyyMd</datetimeSkeleton>
+ <!-- Android patch (CLDR ticket #7991) end. -->
</dateFormat>
</dateFormatLength>
</dateFormats>
@@ -1868,8 +1870,10 @@
</dateFormatLength>
<dateFormatLength type="short">
<dateFormat>
- <pattern>d. MM. yy</pattern>
- <datetimeSkeleton>yyMMd</datetimeSkeleton>
+ <!-- Android patch (CLDR ticket #7991) begin. -->
+ <pattern>d. M. yy</pattern>
+ <datetimeSkeleton>yyMd</datetimeSkeleton>
+ <!-- Android patch (CLDR ticket #7991) end. -->
</dateFormat>
</dateFormatLength>
</dateFormats>
diff --git a/common/main/ta.xml b/common/main/ta.xml
index cfad435..19b0999 100644
--- a/common/main/ta.xml
+++ b/common/main/ta.xml
@@ -2002,11 +2002,12 @@
</quarters>
<dayPeriods>
<dayPeriodContext type="format">
+ <!-- Android patch (b/5948448) begin. -->
<dayPeriodWidth type="abbreviated">
<dayPeriod type="midnight">நள்ளிரவு</dayPeriod>
- <dayPeriod type="am">முற்பகல்</dayPeriod>
+ <dayPeriod type="am">AM</dayPeriod>
<dayPeriod type="noon">நண்பகல்</dayPeriod>
- <dayPeriod type="pm">பிற்பகல்</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
<dayPeriod type="morning1">அதிகாலை</dayPeriod>
<dayPeriod type="morning2">காலை</dayPeriod>
<dayPeriod type="afternoon1">மதியம்</dayPeriod>
@@ -2015,6 +2016,7 @@
<dayPeriod type="evening2">அந்தி மாலை</dayPeriod>
<dayPeriod type="night1">இரவு</dayPeriod>
</dayPeriodWidth>
+ <!-- Android patch (b/5948448) end. -->
<dayPeriodWidth type="narrow">
<dayPeriod type="midnight">நள்.</dayPeriod>
<dayPeriod type="am">மு.ப</dayPeriod>
diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index b8f5269..bae3346 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -1094,7 +1094,9 @@
<!--{ Gwak; ?; ? } => { Gwak; Latin; Unknown Region }-->
<likelySubtag from="jgo" to="jgo_Latn_CM"/>
<!--{ Ngomba; ?; ? } => { Ngomba; Latin; Cameroon }-->
+ <!-- Android patch (b/17938245) begin.
<likelySubtag from="ji" to="ji_Hebr_UA"/>
+ Android patch (b/17938245) end. -->
<!--{ Yiddish; ?; ? } => { Yiddish; Hebrew; Ukraine }-->
<likelySubtag from="jib" to="jib_Latn_ZZ"/>
<!--{ Jibu; ?; ? } => { Jibu; Latin; Unknown Region }-->
@@ -1328,6 +1330,10 @@
<!--{ Kurdish; ?; ? } => { Kurdish; Latin; Turkey }-->
<likelySubtag from="ku_LB" to="ku_Arab_LB"/>
<!--{ Kurdish; ?; Lebanon } => { Kurdish; Arabic; Lebanon }-->
+ <!-- Android patch (CLDR ticket #3459) begin. -->
+ <likelySubtag from="ku_IR" to="ku_Arab_IR"/>
+ <!--{ Kurdish; ?; Iran } => { Kurdish; Arabic; Iran }-->
+ <!-- Android patch (CLDR ticket #3459) end. -->
<likelySubtag from="ku_Arab" to="ku_Arab_IQ"/>
<!--{ Kurdish; Arabic; ? } => { Kurdish; Arabic; Iraq }-->
<likelySubtag from="ku_Yezi" to="ku_Yezi_GE"/>
@@ -2200,6 +2206,10 @@
<!--{ Sebat Bet Gurage; ?; ? } => { Sebat Bet Gurage; Ethiopic; Unknown Region }-->
<likelySubtag from="sgz" to="sgz_Latn_ZZ"/>
<!--{ Sursurunga; ?; ? } => { Sursurunga; Latin; Unknown Region }-->
+ <!-- Android patch begin. -->
+ <likelySubtag from="sh" to="sr_Latn_RS"/>
+ <!--{ Serbo-Croatian; ?; ? } => { Serbian; Latin; Serbia }-->
+ <!-- Android patch end. -->
<likelySubtag from="shi" to="shi_Tfng_MA"/>
<!--{ Tachelhit; ?; ? } => { Tachelhit; Tifinagh; Morocco }-->
<likelySubtag from="shk" to="shk_Latn_ZZ"/>
@@ -3204,8 +3214,10 @@
<!--{ ?; ?; Nicaragua } => { Spanish; Latin; Nicaragua }-->
<likelySubtag from="und_NL" to="nl_Latn_NL"/>
<!--{ ?; ?; Netherlands } => { Dutch; Latin; Netherlands }-->
- <likelySubtag from="und_NO" to="nb_Latn_NO"/>
- <!--{ ?; ?; Norway } => { Norwegian Bokmål; Latin; Norway }-->
+ <!-- Android patch (CLDR ticket #2698) begin. -->
+ <likelySubtag from="und_NO" to="no_Latn_NO"/>
+ <!--{ ?; ?; Norway } => { Norwegian; Latin; Norway }-->
+ <!-- Android patch (CLDR ticket #2698) end. -->
<likelySubtag from="und_NP" to="ne_Deva_NP"/>
<!--{ ?; ?; Nepal } => { Nepali; Devanagari; Nepal }-->
<likelySubtag from="und_OM" to="ar_Arab_OM"/>
@@ -3260,8 +3272,10 @@
<!--{ ?; ?; Sweden } => { Swedish; Latin; Sweden }-->
<likelySubtag from="und_SI" to="sl_Latn_SI"/>
<!--{ ?; ?; Slovenia } => { Slovenian; Latin; Slovenia }-->
- <likelySubtag from="und_SJ" to="nb_Latn_SJ"/>
- <!--{ ?; ?; Svalbard & Jan Mayen } => { Norwegian Bokmål; Latin; Svalbard & Jan Mayen }-->
+ <!-- Android patch begin. -->
+ <likelySubtag from="und_SJ" to="no_Latn_SJ"/>
+ <!--{ ?; ?; Svalbard & Jan Mayen } => { Norwegian; Latin; Svalbard & Jan Mayen }-->
+ <!-- Android patch end. -->
<likelySubtag from="und_SK" to="sk_Latn_SK"/>
<!--{ ?; ?; Slovakia } => { Slovak; Latin; Slovakia }-->
<likelySubtag from="und_SM" to="it_Latn_SM"/>
diff --git a/common/supplemental/metaZones.xml b/common/supplemental/metaZones.xml
index 7159d09..1c363cb 100644
--- a/common/supplemental/metaZones.xml
+++ b/common/supplemental/metaZones.xml
@@ -330,7 +330,8 @@
</timezone>
<timezone type="America/Chihuahua">
<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
- <usesMetazone from="1998-04-05 09:00" mzone="Mexico_Pacific"/>
+ <usesMetazone to="2022-10-30 08:00" from="1998-04-05 09:00" mzone="Mexico_Pacific"/>
+ <usesMetazone from="2022-10-30 08:00" mzone="America_Central"/>
</timezone>
<timezone type="America/Coral_Harbour">
<usesMetazone mzone="America_Eastern"/>
@@ -613,7 +614,8 @@
</timezone>
<timezone type="America/Ojinaga">
<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
- <usesMetazone from="1998-04-05 09:00" mzone="America_Mountain"/>
+ <usesMetazone to="2022-10-30 08:00" from="1998-04-05 09:00" mzone="America_Mountain"/>
+ <usesMetazone from="2022-10-30 08:00" mzone="America_Central"/>
</timezone>
<timezone type="America/Panama">
<usesMetazone mzone="America_Eastern"/>
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index 8c390b5..fab3f50 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -4744,7 +4744,7 @@
<calendarPreference territories="BD DJ DZ EH ER ID IQ JO KM LB LY MA MR MY NE OM PK PS SD SY TD TN YE" ordering="gregorian islamic islamic-civil islamic-tbla"/>
<calendarPreference territories="AL AZ MV TJ TM TR UZ XK" ordering="gregorian islamic-civil islamic-tbla"/>
<calendarPreference territories="AE BH KW QA" ordering="gregorian islamic-umalqura islamic islamic-civil islamic-tbla"/>
- <calendarPreference territories="AF IR" ordering="persian gregorian islamic islamic-civil islamic-tbla"/>
+ <calendarPreference territories="AF IR" ordering="gregorian persian islamic islamic-civil islamic-tbla"/> <!-- Android patch: Gregorian default. -->
<calendarPreference territories="CN CX HK MO SG" ordering="gregorian chinese"/>
<calendarPreference territories="EG" ordering="gregorian coptic islamic islamic-civil islamic-tbla"/>
<calendarPreference territories="ET" ordering="gregorian ethiopic"/>
@@ -4752,8 +4752,8 @@
<calendarPreference territories="IN" ordering="gregorian indian"/>
<calendarPreference territories="JP" ordering="gregorian japanese"/>
<calendarPreference territories="KR" ordering="gregorian dangi"/>
- <calendarPreference territories="SA" ordering="islamic-umalqura gregorian islamic islamic-rgsa"/>
- <calendarPreference territories="TH" ordering="buddhist gregorian"/>
+ <calendarPreference territories="SA" ordering="gregorian islamic-umalqura islamic islamic-rgsa"/> <!-- Android patch: Gregorian default. -->
+ <calendarPreference territories="TH" ordering="gregorian buddhist"/> <!-- Android patch: Gregorian default. -->
<calendarPreference territories="TW" ordering="gregorian roc chinese"/>
</calendarPreferenceData>
<weekData>
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CLDRFilePseudolocalizer.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CLDRFilePseudolocalizer.java
index 329add5..a342983 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CLDRFilePseudolocalizer.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CLDRFilePseudolocalizer.java
@@ -23,9 +23,13 @@
public class CLDRFilePseudolocalizer {
private static final Pattern NUMERIC_PLACEHOLDER = Pattern.compile("\\{\\d+\\}");
private static final Pattern QUOTED_TEXT = Pattern.compile("'.*?'");
- private static final String PSEUDOLOCALES_DIRECTORY = "pseudolocales";
+ // Android patch (b/37077221) begin.
+ private static final String PSEUDOLOCALES_DIRECTORY = ".";
+ // Android patch (b/37077221) end.
private static final String ORIGINAL_LOCALE = "en";
- private static final String EXEMPLARS_PATH = "/exemplarCharactersx";
+ // Android patch (b/37512961) begin.
+ private static final String NUMBERS_PATH = "//ldml/numbers/defaultNumberingSystem";
+ // Android patch (b/37512961) end.
private static final String EXEMPLAR_PATH = "//ldml/characters/exemplarCharacters";
private static final String EXEMPLAR_AUX_PATH = "//ldml/characters/exemplarCharacters[@type=\"auxiliary\"]";
private static final String TERRITORY_PATTERN = "//ldml/localeDisplayNames/territories/territory[@type=\"%s\"]";
@@ -222,14 +226,16 @@
private static class PseudolocalizerXB extends Pseudolocalizer {
/** Right-to-left override character. */
private static final String RLO = "\u202e";
- /** Right-to-left mark character. */
- private static final String RLM = "\u200f";
+ // Android patch (b/37512961) begin.
+ /** Arabic letter mark character. */
+ private static final String ALM = "\u061C";
/** Pop direction formatting character. */
private static final String PDF = "\u202c";
/** Prefix to add before each LTR word */
- private static final String BIDI_PREFIX = RLM + RLO;
+ private static final String BIDI_PREFIX = ALM + RLO;
/** Postfix to add after each LTR word */
- private static final String BIDI_POSTFIX = PDF + RLM;
+ private static final String BIDI_POSTFIX = PDF + ALM;
+ // Android patch (b/37512961) end.
@Override
public String fragment(String text) {
@@ -387,6 +393,10 @@
// Create fake pseudolocales territories.
addTerritory(outputSource, "XA");
addTerritory(outputSource, "XB");
+ // Android patch (b/37512961) begin.
+ // Use latin numbers for pseudolocales.
+ outputSource.putValueAtPath(NUMBERS_PATH, "latn");
+ // Android patch (b/37512961) end.
return new CLDRFile(outputSource);
}
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ZoneParser.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ZoneParser.java
index 00c843d..cf138ab 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ZoneParser.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ZoneParser.java
@@ -684,8 +684,11 @@
// When these zones are deprecated in CLDR, remove them from this array.
// See CLDR-16049
static final String[][] SUPPLEMENTAL_ZONE_ID_DATA = {
- {"Europe/Uzhgorod", "UA", "+4837+02218"},
- {"Europe/Zaporozhye", "UA", "+4750+03510"}
+ {"Europe/Uzhgorod", "UA", "+4837+02218"}, // 2022d
+ {"Europe/Zaporozhye", "UA", "+4750+03510"}, // 2022d
+ {"America/Nipigon", "CA", "+4901-08816"}, // 2022f
+ {"America/Rainy_River", "CA", "+4843-09434"}, // 2022f
+ {"America/Thunder_Bay", "CA", "+4823-08915"}, // 2022f
};
/**
@@ -1035,4 +1038,4 @@
return version;
}
-}
\ No newline at end of file
+}
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa
index d2a6a70..b2b8c88 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa
@@ -97,22 +97,6 @@
0:00 Algeria WE%sT 1981 May
1:00 - CET
-# Angola
-# Benin
-# See Africa/Lagos.
-
-# Botswana
-# See Africa/Maputo.
-
-# Burkina Faso
-# See Africa/Abidjan.
-
-# Burundi
-# See Africa/Maputo.
-
-# Cameroon
-# See Africa/Lagos.
-
# Cape Verde / Cabo Verde
#
# From Paul Eggert (2018-02-16):
@@ -127,9 +111,6 @@
-2:00 - -02 1975 Nov 25 2:00
-1:00 - -01
-# Central African Republic
-# See Africa/Lagos.
-
# Chad
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
@@ -137,33 +118,29 @@
1:00 1:00 WAST 1980 Mar 8
1:00 - WAT
-# Comoros
-# See Africa/Nairobi.
+# Burkina Faso
+# Côte d'Ivoire (Ivory Coast)
+# The Gambia
+# Ghana
+# Guinea
+# Iceland
+# Mali
+# Mauritania
+# St Helena
+# Senegal
+# Sierra Leone
+# Togo
-# Democratic Republic of the Congo
-# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
+# The other parts of the St Helena territory are similar:
+# Tristan da Cunha: on GMT, say Whitman and the CIA
+# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
+# Gough (scientific station since 1955; sealers wintered previously):
+# on GMT, says the CIA
+# Inaccessible, Nightingale: uninhabited
-# Republic of the Congo
-# See Africa/Lagos.
-
-# Côte d'Ivoire / Ivory Coast
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Abidjan -0:16:08 - LMT 1912
0:00 - GMT
-Link Africa/Abidjan Africa/Accra # Ghana
-Link Africa/Abidjan Africa/Bamako # Mali
-Link Africa/Abidjan Africa/Banjul # The Gambia
-Link Africa/Abidjan Africa/Conakry # Guinea
-Link Africa/Abidjan Africa/Dakar # Senegal
-Link Africa/Abidjan Africa/Freetown # Sierra Leone
-Link Africa/Abidjan Africa/Lome # Togo
-Link Africa/Abidjan Africa/Nouakchott # Mauritania
-Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
-Link Africa/Abidjan Atlantic/Reykjavik # Iceland
-Link Africa/Abidjan Atlantic/St_Helena # St Helena
-
-# Djibouti
-# See Africa/Nairobi.
###############################################################################
@@ -359,33 +336,6 @@
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
2:00 Egypt EE%sT
-# Equatorial Guinea
-# See Africa/Lagos.
-
-# Eritrea
-# See Africa/Nairobi.
-
-# Eswatini (formerly Swaziland)
-# See Africa/Johannesburg.
-
-# Ethiopia
-# See Africa/Nairobi.
-#
-# Unfortunately tzdb records only Western clock time in use in Ethiopia,
-# as the tzdb format is not up to properly recording a common Ethiopian
-# timekeeping practice that is based on solar time. See:
-# Mortada D. If you have a meeting in Ethiopia, you'd better double
-# check the time. PRI's The World. 2015-01-30 15:15 -05.
-# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
-
-# Gabon
-# See Africa/Lagos.
-
-# The Gambia
-# Ghana
-# Guinea
-# See Africa/Abidjan.
-
# Guinea-Bissau
#
# From Paul Eggert (2018-02-16):
@@ -398,7 +348,16 @@
-1:00 - -01 1975
0:00 - GMT
+# Comoros
+# Djibouti
+# Eritrea
+# Ethiopia
# Kenya
+# Madagascar
+# Mayotte
+# Somalia
+# Tanzania
+# Uganda
# From P Chan (2020-10-24):
#
@@ -441,6 +400,14 @@
# The 1908-05-01 announcement does not give an effective date,
# so just say "1908 May".
+# From Paul Eggert (2018-09-11):
+# Unfortunately tzdb records only Western clock time in use in Ethiopia,
+# as the tzdb format is not up to properly recording a common Ethiopian
+# timekeeping practice that is based on solar time. See:
+# Mortada D. If you have a meeting in Ethiopia, you'd better double
+# check the time. PRI's The World. 2015-01-30 15:15 -05.
+# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
+
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Nairobi 2:27:16 - LMT 1908 May
2:30 - +0230 1928 Jun 30 24:00
@@ -448,18 +415,6 @@
2:30 - +0230 1936 Dec 31 24:00
2:45 - +0245 1942 Jul 31 24:00
3:00 - EAT
-Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
-Link Africa/Nairobi Africa/Asmara # Eritrea
-Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
-Link Africa/Nairobi Africa/Djibouti
-Link Africa/Nairobi Africa/Kampala # Uganda
-Link Africa/Nairobi Africa/Mogadishu # Somalia
-Link Africa/Nairobi Indian/Antananarivo # Madagascar
-Link Africa/Nairobi Indian/Comoro
-Link Africa/Nairobi Indian/Mayotte
-
-# Lesotho
-# See Africa/Johannesburg.
# Liberia
#
@@ -540,16 +495,6 @@
1:00 Libya CE%sT 2013 Oct 25 2:00
2:00 - EET
-# Madagascar
-# See Africa/Nairobi.
-
-# Malawi
-# See Africa/Maputo.
-
-# Mali
-# Mauritania
-# See Africa/Abidjan.
-
# Mauritius
# From Steffen Thorsen (2008-06-25):
@@ -643,12 +588,6 @@
# Agalega Is, Rodriguez
# no information; probably like Indian/Mauritius
-# Mayotte
-# See Africa/Nairobi.
-
-# Morocco
-# See Africa/Ceuta for Spanish Morocco.
-
# From Alex Krivenyshev (2008-05-09):
# Here is an article that Morocco plan to introduce Daylight Saving Time between
# 1 June, 2008 and 27 September, 2008.
@@ -1137,7 +1076,14 @@
0:00 Morocco +00/+01 2018 Oct 28 3:00
0:00 Morocco +00/+01
+# Botswana
+# Burundi
+# Democratic Republic of the Congo (eastern)
+# Malawi
# Mozambique
+# Rwanda
+# Zambia
+# Zimbabwe
#
# Shanks gives 1903-03-01 for the transition to CAT.
# Perhaps the 1911-05-26 Portuguese decree
@@ -1147,14 +1093,6 @@
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
2:00 - CAT
-Link Africa/Maputo Africa/Blantyre # Malawi
-Link Africa/Maputo Africa/Bujumbura # Burundi
-Link Africa/Maputo Africa/Gaborone # Botswana
-Link Africa/Maputo Africa/Harare # Zimbabwe
-Link Africa/Maputo Africa/Kigali # Rwanda
-Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
-Link Africa/Maputo Africa/Lusaka # Zambia
-
# Namibia
@@ -1233,9 +1171,16 @@
2:00 - CAT
# End of rearguard section.
-# Niger
-# See Africa/Lagos.
+# Angola
+# Benin
+# Cameroon
+# Central African Republic
+# Democratic Republic of the Congo (western)
+# Republic of the Congo
+# Equatorial Guinea
+# Gabon
+# Niger
# Nigeria
# From P Chan (2020-12-03):
@@ -1301,32 +1246,6 @@
0:13:35 - LMT 1914 Jan 1
0:30 - +0030 1919 Sep 1
1:00 - WAT
-Link Africa/Lagos Africa/Bangui # Central African Republic
-Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
-Link Africa/Lagos Africa/Douala # Cameroon
-Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west)
-Link Africa/Lagos Africa/Libreville # Gabon
-Link Africa/Lagos Africa/Luanda # Angola
-Link Africa/Lagos Africa/Malabo # Equatorial Guinea
-Link Africa/Lagos Africa/Niamey # Niger
-Link Africa/Lagos Africa/Porto-Novo # Benin
-
-# Réunion
-# See Asia/Dubai.
-#
-# The Crozet Islands also observe Réunion time; see the 'antarctica' file.
-
-# Rwanda
-# See Africa/Maputo.
-
-# St Helena
-# See Africa/Abidjan.
-# The other parts of the St Helena territory are similar:
-# Tristan da Cunha: on GMT, say Whitman and the CIA
-# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
-# Gough (scientific station since 1955; sealers wintered previously):
-# on GMT, says the CIA
-# Inaccessible, Nightingale: uninhabited
# São Tomé and Príncipe
@@ -1355,19 +1274,10 @@
1:00 - WAT 2019 Jan 1 02:00
0:00 - GMT
-# Senegal
-# See Africa/Abidjan.
-
-# Seychelles
-# See Asia/Dubai.
-
-# Sierra Leone
-# See Africa/Abidjan.
-
-# Somalia
-# See Africa/Nairobi.
-
+# Eswatini (Swaziland)
+# Lesotho
# South Africa
+
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
@@ -1375,8 +1285,6 @@
Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAST 1903 Mar
2:00 SA SAST
-Link Africa/Johannesburg Africa/Maseru # Lesotho
-Link Africa/Johannesburg Africa/Mbabane # Eswatini
#
# Marion and Prince Edward Is
# scientific station since 1947
@@ -1425,12 +1333,6 @@
3:00 - EAT 2021 Feb 1 00:00
2:00 - CAT
-# Tanzania
-# See Africa/Nairobi.
-
-# Togo
-# See Africa/Abidjan.
-
# Tunisia
# From Gwillim Law (2005-04-30):
@@ -1528,10 +1430,3 @@
Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
1:00 Tunisia CE%sT
-
-# Uganda
-# See Africa/Nairobi.
-
-# Zambia
-# Zimbabwe
-# See Africa/Maputo.
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica
index dbdf209..f02755a 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica
@@ -306,4 +306,4 @@
# we have to go around and set them back 5 minutes or so.
# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
#
-# See 'australasia' for Antarctica/McMurdo.
+# See Pacific/Auckland.
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia
index 4f6bcd3..8fd9c25 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia
@@ -149,9 +149,6 @@
4:00 EUAsia +04/+05 1997
4:00 Azer +04/+05
-# Bahrain
-# See Asia/Qatar.
-
# Bangladesh
# From Alexander Krivenyshev (2009-05-13):
# According to newspaper Asian Tribune (May 6, 2009) Bangladesh may introduce
@@ -254,10 +251,8 @@
5:00 - +05 1996
6:00 - +06
-# Brunei
-# See Asia/Kuching.
-
-# Burma / Myanmar
+# Cocos (Keeling) Islands
+# Myanmar (Burma)
# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
@@ -273,11 +268,6 @@
6:30 - +0630 1942 May
9:00 - +09 1945 May 3
6:30 - +0630
-Link Asia/Yangon Indian/Cocos
-
-# Cambodia
-# See Asia/Bangkok.
-
# China
@@ -665,10 +655,9 @@
8:00 PRC C%sT
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
+# Vostok base in Antarctica matches this since 1970.
Zone Asia/Urumqi 5:50:20 - LMT 1928
6:00 - +06
-Link Asia/Urumqi Antarctica/Vostok
-
# Hong Kong
@@ -1172,10 +1161,6 @@
3:00 - +03 2017 Oct 29 1:00u
2:00 EUAsia EE%sT
-# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
-# However, for various reasons many users expect to find it under Europe.
-Link Asia/Nicosia Europe/Nicosia
-
# Georgia
# From Paul Eggert (1994-11-19):
# Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
@@ -2704,14 +2689,6 @@
8:30 - KST 2018 May 4 23:30
9:00 - KST
-###############################################################################
-
-# Kuwait
-# See Asia/Riyadh.
-
-# Laos
-# See Asia/Bangkok.
-
# Lebanon
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
@@ -2743,7 +2720,9 @@
Zone Asia/Beirut 2:22:00 - LMT 1880
2:00 Lebanon EE%sT
-# Malaysia
+# Brunei
+# Malaysia (eastern)
+#
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
@@ -2760,14 +2739,12 @@
8:00 NBorneo +08/+0820 1942 Feb 16
9:00 - +09 1945 Sep 12
8:00 - +08
-Link Asia/Kuching Asia/Brunei
# Maldives
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Maldives 4:54:00 - LMT 1880 # Malé
4:54:00 - MMT 1960 # Malé Mean Time
5:00 - +05
-Link Indian/Maldives Indian/Kerguelen
# Mongolia
@@ -2930,9 +2907,6 @@
5:30 - +0530 1986
5:45 - +0545
-# Oman
-# See Asia/Dubai.
-
# Pakistan
# From Rives McDow (2002-03-13):
@@ -3543,14 +3517,18 @@
9:00 - JST 1944 Nov
8:00 Phil P%sT
+# Bahrain
# Qatar
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
4:00 - +04 1972 Jun
3:00 - +03
-Link Asia/Qatar Asia/Bahrain
+# Kuwait
# Saudi Arabia
+# Yemen
+#
+# Japan's year-round bases in Antarctica match this since 1970.
#
# From Paul Eggert (2018-08-29):
# Time in Saudi Arabia and other countries in the Arabian peninsula was not
@@ -3595,9 +3573,6 @@
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
3:00 - +03
-Link Asia/Riyadh Antarctica/Syowa
-Link Asia/Riyadh Asia/Aden # Yemen
-Link Asia/Riyadh Asia/Kuwait
# Singapore
# taken from Mok Ly Yng (2003-10-30)
@@ -3612,7 +3587,6 @@
9:00 - +09 1945 Sep 12
7:30 - +0730 1982 Jan 1
8:00 - +08
-Link Asia/Singapore Asia/Kuala_Lumpur
# Spratly Is
# no information
@@ -3858,14 +3832,15 @@
5:00 1:00 +06 1991 Sep 9 2:00s
5:00 - +05
+# Cambodia
+# Christmas I
+# Laos
# Thailand
+# Vietnam (northern)
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Bangkok 6:42:04 - LMT 1880
6:42:04 - BMT 1920 Apr # Bangkok Mean Time
7:00 - +07
-Link Asia/Bangkok Asia/Phnom_Penh # Cambodia
-Link Asia/Bangkok Asia/Vientiane # Laos
-Link Asia/Bangkok Indian/Christmas
# Turkmenistan
# From Shanks & Pottenger.
@@ -3876,13 +3851,15 @@
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00
5:00 - +05
+# Oman
+# Réunion
+# Seychelles
# United Arab Emirates
+#
+# The Crozet Is also observe Réunion time; see the 'antarctica' file.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dubai 3:41:12 - LMT 1920
4:00 - +04
-Link Asia/Dubai Asia/Muscat # Oman
-Link Asia/Dubai Indian/Mahe
-Link Asia/Dubai Indian/Reunion
# Uzbekistan
# Byalokoz 1919 says Uzbekistan was 4:27:53.
@@ -3902,7 +3879,7 @@
5:00 RussiaAsia +05/+06 1992
5:00 - +05
-# Vietnam
+# Vietnam (southern)
# From Paul Eggert (2014-10-04):
# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
@@ -3976,7 +3953,3 @@
# For timestamps in north Vietnam back to 1970 (the tzdb cutoff),
# use Asia/Bangkok; see the VN entries in the file zone1970.tab.
# For timestamps before 1970, see Asia/Hanoi in the file 'backzone'.
-
-
-# Yemen
-# See Asia/Riyadh.
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia
index d6d1171..af0410a 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia
@@ -251,13 +251,6 @@
10:00 1:00 AEDT 2011
10:00 AT AE%sT
-# Christmas
-# See Asia/Bangkok.
-
-# Cocos (Keeling) Is
-# See Asia/Yangon.
-
-
# Fiji
# Milne gives 11:55:44 for Suva.
@@ -393,8 +386,14 @@
# concerned shifting arrival and departure times, which may look like a simple
# thing but requires some significant logistical adjustments domestically and
# internationally."
-# Assume for now that DST will resume with the recent pre-2020 rules for the
-# 2022/2023 season.
+
+# From Shalvin Narayan (2022-10-27):
+# Please note that there will not be any daylight savings time change
+# in Fiji for 2022-2023....
+# https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl
+#
+# From Paul Eggert (2022-10-27):
+# For now, assume DST is suspended indefinitely.
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
@@ -409,8 +408,6 @@
Rule Fiji 2015 2021 - Jan Sun>=12 3:00 0 -
Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 -
Rule Fiji 2020 only - Dec 20 2:00 1:00 -
-Rule Fiji 2022 max - Nov Sun>=8 2:00 1:00 -
-Rule Fiji 2023 max - Jan Sun>=12 3:00 0 -
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
@@ -426,7 +423,9 @@
# Clipperton (near North America) is administered from French Polynesia;
# it is uninhabited.
+
# Guam
+# N Mariana Is
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
# http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
@@ -466,17 +465,20 @@
9:00 - +09 1944 Jul 31
10:00 Guam G%sT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time
-Link Pacific/Guam Pacific/Saipan # N Mariana Is
-# Kiribati
+
+# Kiribati (Gilbert Is)
+# Marshall Is
+# Tuvalu
+# Wake
+# Wallis & Futuna
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
12:00 - +12
-Link Pacific/Tarawa Pacific/Funafuti
-Link Pacific/Tarawa Pacific/Majuro
-Link Pacific/Tarawa Pacific/Wake
-Link Pacific/Tarawa Pacific/Wallis
+# Kiribati (except Gilbert Is)
+# See Pacific/Tarawa for the Gilbert Is.
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Kanton 0 - -00 1937 Aug 31
-12:00 - -12 1979 Oct
-11:00 - -11 1994 Dec 31
@@ -486,9 +488,6 @@
-10:00 - -10 1994 Dec 31
14:00 - +14
-# N Mariana Is
-# See Pacific/Guam.
-
# Marshall Is
# See Pacific/Tarawa for most locations.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
@@ -538,6 +537,7 @@
###############################################################################
# New Zealand
+# McMurdo Station and Scott Base in Antarctica use Auckland time.
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule NZ 1927 only - Nov 6 2:00 1:00 S
@@ -573,7 +573,6 @@
Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2
11:30 NZ NZ%sT 1946 Jan 1
12:00 NZ NZ%sT
-Link Pacific/Auckland Antarctica/McMurdo
Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2
12:15 - +1215 1946 Jan 1
@@ -672,8 +671,6 @@
Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
9:48:32 - PMMT 1895 # Port Moresby Mean Time
10:00 - +10
-Link Pacific/Port_Moresby Antarctica/DumontDUrville
-Link Pacific/Port_Moresby Pacific/Chuuk
#
# From Paul Eggert (2014-10-13):
# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
@@ -706,10 +703,10 @@
-8:00 - -08
# American Samoa
+# Midway
Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
-11:22:48 - LMT 1911
-11:00 - SST # S=Samoa
-Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
# Samoa (formerly and also known as Western Samoa)
@@ -801,7 +798,6 @@
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
11:00 - +11
-Link Pacific/Guadalcanal Pacific/Pohnpei
# Tokelau
#
@@ -841,9 +837,6 @@
13:00 - +13 1999
13:00 Tonga +13/+14
-# Tuvalu
-# See Pacific/Tarawa.
-
# US minor outlying islands
@@ -894,15 +887,9 @@
# Kingman
# uninhabited
-# Midway
-# See Pacific/Pago_Pago.
-
# Palmyra
# uninhabited since World War II; was probably like Pacific/Kiritimati
-# Wake
-# See Pacific/Tarawa.
-
# Vanuatu
@@ -939,9 +926,6 @@
Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
11:00 Vanuatu +11/+12
-# Wallis and Futuna
-# See Pacific/Tarawa.
-
###############################################################################
# NOTES
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward
index 14e4b14..4c1c5d5 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward
@@ -4,7 +4,7 @@
# 2009-05-17 by Arthur David Olson.
# This file provides links from old or merged timezone names to current ones.
-# Many names changed in late 1993, and many merged names moved here
+# Many names changed in 1993 and in 1995, and many merged names moved here
# in the period from 2013 through 2022. Several of these names are
# also present in the file 'backzone', which has data important only
# for pre-1970 timestamps and so is out of scope for tzdb proper.
@@ -13,50 +13,24 @@
# building with 'make BACKWARD=', in practice downstream users
# typically use this file for backward compatibility.
-# Link TARGET LINK-NAME
-Link Africa/Nairobi Africa/Asmera
-Link Africa/Abidjan Africa/Timbuktu
-Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
-Link America/Adak America/Atka
-Link America/Argentina/Buenos_Aires America/Buenos_Aires
-Link America/Argentina/Catamarca America/Catamarca
-Link America/Panama America/Coral_Harbour
-Link America/Argentina/Cordoba America/Cordoba
-Link America/Tijuana America/Ensenada
-Link America/Indiana/Indianapolis America/Fort_Wayne
-Link America/Nuuk America/Godthab
-Link America/Indiana/Indianapolis America/Indianapolis
-Link America/Argentina/Jujuy America/Jujuy
-Link America/Indiana/Knox America/Knox_IN
-Link America/Kentucky/Louisville America/Louisville
-Link America/Argentina/Mendoza America/Mendoza
-Link America/Toronto America/Montreal
-Link America/Rio_Branco America/Porto_Acre
-Link America/Argentina/Cordoba America/Rosario
-Link America/Tijuana America/Santa_Isabel
-Link America/Denver America/Shiprock
-Link America/Puerto_Rico America/Virgin
-Link Pacific/Auckland Antarctica/South_Pole
-Link Asia/Ashgabat Asia/Ashkhabad
-Link Asia/Kolkata Asia/Calcutta
-Link Asia/Shanghai Asia/Chongqing
-Link Asia/Shanghai Asia/Chungking
-Link Asia/Dhaka Asia/Dacca
-Link Asia/Shanghai Asia/Harbin
-Link Asia/Urumqi Asia/Kashgar
-Link Asia/Kathmandu Asia/Katmandu
-Link Asia/Macau Asia/Macao
-Link Asia/Yangon Asia/Rangoon
-Link Asia/Ho_Chi_Minh Asia/Saigon
-Link Asia/Jerusalem Asia/Tel_Aviv
-Link Asia/Thimphu Asia/Thimbu
-Link Asia/Makassar Asia/Ujung_Pandang
-Link Asia/Ulaanbaatar Asia/Ulan_Bator
-Link Atlantic/Faroe Atlantic/Faeroe
-Link Europe/Berlin Atlantic/Jan_Mayen
-Link Australia/Sydney Australia/ACT
-Link Australia/Sydney Australia/Canberra
-Link Australia/Hobart Australia/Currie
+# This file is divided into sections, one for each major reason for a
+# backward compatibility link. Each section is sorted by link name.
+
+# A "#= TARGET1" comment labels each link inserted only because some
+# .zi parsers (including tzcode through 2022e) mishandle links to links.
+# The comment says what the target would be if these parsers were fixed
+# so that data could contain links to links. For example, the line
+# "Link Australia/Sydney Australia/ACT #= Australia/Canberra" would be
+# "Link Australia/Canberra Australia/ACT" were it not that data lines
+# refrain from linking to links like Australia/Canberra, which means
+# the Australia/ACT line links instead to Australia/Sydney,
+# Australia/Canberra's target.
+
+
+# Pre-1993 naming conventions
+
+# Link TARGET LINK-NAME #= TARGET1
+Link Australia/Sydney Australia/ACT #= Australia/Canberra
Link Australia/Lord_Howe Australia/LHI
Link Australia/Sydney Australia/NSW
Link Australia/Darwin Australia/North
@@ -66,7 +40,7 @@
Link Australia/Melbourne Australia/Victoria
Link Australia/Perth Australia/West
Link Australia/Broken_Hill Australia/Yancowinna
-Link America/Rio_Branco Brazil/Acre
+Link America/Rio_Branco Brazil/Acre #= America/Porto_Acre
Link America/Noronha Brazil/DeNoronha
Link America/Sao_Paulo Brazil/East
Link America/Manaus Brazil/West
@@ -86,20 +60,36 @@
Link America/Havana Cuba
Link Africa/Cairo Egypt
Link Europe/Dublin Eire
+# Vanguard section, for most .zi parsers.
+#Link GMT Etc/GMT
+#Link GMT Etc/GMT+0
+#Link GMT Etc/GMT-0
+#Link GMT Etc/GMT0
+#Link GMT Etc/Greenwich
+# Rearguard section, for TZUpdater 2.3.2 and earlier.
+Link Etc/GMT Etc/GMT+0
+Link Etc/GMT Etc/GMT-0
+Link Etc/GMT Etc/GMT0
+Link Etc/GMT Etc/Greenwich
+# End of rearguard section.
Link Etc/UTC Etc/UCT
-Link Europe/London Europe/Belfast
-Link Europe/Kyiv Europe/Kiev
-Link Europe/Chisinau Europe/Tiraspol
-Link Europe/Kyiv Europe/Uzhgorod
-Link Europe/Kyiv Europe/Zaporozhye
+Link Etc/UTC Etc/Universal
+Link Etc/UTC Etc/Zulu
Link Europe/London GB
Link Europe/London GB-Eire
+# Vanguard section, for most .zi parsers.
+#Link GMT GMT+0
+#Link GMT GMT-0
+#Link GMT GMT0
+#Link GMT Greenwich
+# Rearguard section, for TZUpdater 2.3.2 and earlier.
Link Etc/GMT GMT+0
Link Etc/GMT GMT-0
Link Etc/GMT GMT0
Link Etc/GMT Greenwich
+# End of rearguard section.
Link Asia/Hong_Kong Hongkong
-Link Africa/Abidjan Iceland
+Link Africa/Abidjan Iceland #= Atlantic/Reykjavik
Link Asia/Tehran Iran
Link Asia/Jerusalem Israel
Link America/Jamaica Jamaica
@@ -111,14 +101,8 @@
Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
-Link America/Denver Navajo
+Link America/Denver Navajo #= America/Shiprock
Link Asia/Shanghai PRC
-Link Pacific/Kanton Pacific/Enderbury
-Link Pacific/Honolulu Pacific/Johnston
-Link Pacific/Guadalcanal Pacific/Ponape
-Link Pacific/Pago_Pago Pacific/Samoa
-Link Pacific/Port_Moresby Pacific/Truk
-Link Pacific/Port_Moresby Pacific/Yap
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
Link Asia/Taipei ROC
@@ -142,3 +126,192 @@
Link Etc/UTC Universal
Link Europe/Moscow W-SU
Link Etc/UTC Zulu
+
+
+# Two-part names that were renamed mostly to three-part names in 1995
+
+# Link TARGET LINK-NAME #= TARGET1
+Link America/Argentina/Buenos_Aires America/Buenos_Aires
+Link America/Argentina/Catamarca America/Catamarca
+Link America/Argentina/Cordoba America/Cordoba
+Link America/Indiana/Indianapolis America/Indianapolis
+Link America/Argentina/Jujuy America/Jujuy
+Link America/Indiana/Knox America/Knox_IN
+Link America/Kentucky/Louisville America/Louisville
+Link America/Argentina/Mendoza America/Mendoza
+Link America/Puerto_Rico America/Virgin #= America/St_Thomas
+Link Pacific/Pago_Pago Pacific/Samoa
+
+
+# Pre-2013 practice, which typically had a Zone per zone.tab line
+
+# Link TARGET LINK-NAME
+Link Africa/Abidjan Africa/Accra
+Link Africa/Nairobi Africa/Addis_Ababa
+Link Africa/Nairobi Africa/Asmara
+Link Africa/Abidjan Africa/Bamako
+Link Africa/Lagos Africa/Bangui
+Link Africa/Abidjan Africa/Banjul
+Link Africa/Maputo Africa/Blantyre
+Link Africa/Lagos Africa/Brazzaville
+Link Africa/Maputo Africa/Bujumbura
+Link Africa/Abidjan Africa/Conakry
+Link Africa/Abidjan Africa/Dakar
+Link Africa/Nairobi Africa/Dar_es_Salaam
+Link Africa/Nairobi Africa/Djibouti
+Link Africa/Lagos Africa/Douala
+Link Africa/Abidjan Africa/Freetown
+Link Africa/Maputo Africa/Gaborone
+Link Africa/Maputo Africa/Harare
+Link Africa/Nairobi Africa/Kampala
+Link Africa/Maputo Africa/Kigali
+Link Africa/Lagos Africa/Kinshasa
+Link Africa/Lagos Africa/Libreville
+Link Africa/Abidjan Africa/Lome
+Link Africa/Lagos Africa/Luanda
+Link Africa/Maputo Africa/Lubumbashi
+Link Africa/Maputo Africa/Lusaka
+Link Africa/Lagos Africa/Malabo
+Link Africa/Johannesburg Africa/Maseru
+Link Africa/Johannesburg Africa/Mbabane
+Link Africa/Nairobi Africa/Mogadishu
+Link Africa/Lagos Africa/Niamey
+Link Africa/Abidjan Africa/Nouakchott
+Link Africa/Abidjan Africa/Ouagadougou
+Link Africa/Lagos Africa/Porto-Novo
+Link America/Puerto_Rico America/Anguilla
+Link America/Puerto_Rico America/Antigua
+Link America/Puerto_Rico America/Aruba
+Link America/Panama America/Atikokan
+Link America/Puerto_Rico America/Blanc-Sablon
+Link America/Panama America/Cayman
+Link America/Phoenix America/Creston
+Link America/Puerto_Rico America/Curacao
+Link America/Puerto_Rico America/Dominica
+Link America/Puerto_Rico America/Grenada
+Link America/Puerto_Rico America/Guadeloupe
+Link America/Puerto_Rico America/Kralendijk
+Link America/Puerto_Rico America/Lower_Princes
+Link America/Puerto_Rico America/Marigot
+Link America/Puerto_Rico America/Montserrat
+Link America/Toronto America/Nassau
+Link America/Puerto_Rico America/Port_of_Spain
+Link America/Puerto_Rico America/St_Barthelemy
+Link America/Puerto_Rico America/St_Kitts
+Link America/Puerto_Rico America/St_Lucia
+Link America/Puerto_Rico America/St_Thomas
+Link America/Puerto_Rico America/St_Vincent
+Link America/Puerto_Rico America/Tortola
+Link Pacific/Port_Moresby Antarctica/DumontDUrville
+Link Pacific/Auckland Antarctica/McMurdo
+Link Asia/Riyadh Antarctica/Syowa
+Link Asia/Urumqi Antarctica/Vostok
+Link Europe/Berlin Arctic/Longyearbyen
+Link Asia/Riyadh Asia/Aden
+Link Asia/Qatar Asia/Bahrain
+Link Asia/Kuching Asia/Brunei
+Link Asia/Singapore Asia/Kuala_Lumpur
+Link Asia/Riyadh Asia/Kuwait
+Link Asia/Dubai Asia/Muscat
+Link Asia/Bangkok Asia/Phnom_Penh
+Link Asia/Bangkok Asia/Vientiane
+Link Africa/Abidjan Atlantic/Reykjavik
+Link Africa/Abidjan Atlantic/St_Helena
+Link Europe/Brussels Europe/Amsterdam
+Link Europe/Prague Europe/Bratislava
+Link Europe/Zurich Europe/Busingen
+Link Europe/Berlin Europe/Copenhagen
+Link Europe/London Europe/Guernsey
+Link Europe/London Europe/Isle_of_Man
+Link Europe/London Europe/Jersey
+Link Europe/Belgrade Europe/Ljubljana
+Link Europe/Brussels Europe/Luxembourg
+Link Europe/Helsinki Europe/Mariehamn
+Link Europe/Paris Europe/Monaco
+Link Europe/Berlin Europe/Oslo
+Link Europe/Belgrade Europe/Podgorica
+Link Europe/Rome Europe/San_Marino
+Link Europe/Belgrade Europe/Sarajevo
+Link Europe/Belgrade Europe/Skopje
+Link Europe/Berlin Europe/Stockholm
+Link Europe/Zurich Europe/Vaduz
+Link Europe/Rome Europe/Vatican
+Link Europe/Belgrade Europe/Zagreb
+Link Africa/Nairobi Indian/Antananarivo
+Link Asia/Bangkok Indian/Christmas
+Link Asia/Yangon Indian/Cocos
+Link Africa/Nairobi Indian/Comoro
+Link Indian/Maldives Indian/Kerguelen
+Link Asia/Dubai Indian/Mahe
+Link Africa/Nairobi Indian/Mayotte
+Link Asia/Dubai Indian/Reunion
+Link Pacific/Port_Moresby Pacific/Chuuk
+Link Pacific/Tarawa Pacific/Funafuti
+Link Pacific/Tarawa Pacific/Majuro
+Link Pacific/Pago_Pago Pacific/Midway
+Link Pacific/Guadalcanal Pacific/Pohnpei
+Link Pacific/Guam Pacific/Saipan
+Link Pacific/Tarawa Pacific/Wake
+Link Pacific/Tarawa Pacific/Wallis
+
+
+# Non-zone.tab locations with timestamps since 1970 that duplicate
+# those of an existing location
+
+# Link TARGET LINK-NAME
+Link Africa/Abidjan Africa/Timbuktu
+Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
+Link America/Adak America/Atka
+Link America/Panama America/Coral_Harbour
+Link America/Tijuana America/Ensenada
+Link America/Indiana/Indianapolis America/Fort_Wayne
+Link America/Toronto America/Montreal
+Link America/Toronto America/Nipigon
+Link America/Rio_Branco America/Porto_Acre
+Link America/Winnipeg America/Rainy_River
+Link America/Argentina/Cordoba America/Rosario
+Link America/Tijuana America/Santa_Isabel
+Link America/Denver America/Shiprock
+Link America/Toronto America/Thunder_Bay
+Link Pacific/Auckland Antarctica/South_Pole
+Link Asia/Shanghai Asia/Chongqing
+Link Asia/Shanghai Asia/Harbin
+Link Asia/Urumqi Asia/Kashgar
+Link Asia/Jerusalem Asia/Tel_Aviv
+Link Europe/Berlin Atlantic/Jan_Mayen
+Link Australia/Sydney Australia/Canberra
+Link Australia/Hobart Australia/Currie
+Link Europe/London Europe/Belfast
+Link Europe/Chisinau Europe/Tiraspol
+Link Europe/Kyiv Europe/Uzhgorod
+Link Europe/Kyiv Europe/Zaporozhye
+Link Pacific/Kanton Pacific/Enderbury
+Link Pacific/Honolulu Pacific/Johnston
+Link Pacific/Port_Moresby Pacific/Yap
+
+
+# Alternate names for the same location
+
+# Link TARGET LINK-NAME #= TARGET1
+Link Africa/Nairobi Africa/Asmera #= Africa/Asmara
+Link America/Nuuk America/Godthab
+Link Asia/Ashgabat Asia/Ashkhabad
+Link Asia/Kolkata Asia/Calcutta
+Link Asia/Shanghai Asia/Chungking #= Asia/Chongqing
+Link Asia/Dhaka Asia/Dacca
+# Istanbul is in both continents.
+Link Europe/Istanbul Asia/Istanbul
+Link Asia/Kathmandu Asia/Katmandu
+Link Asia/Macau Asia/Macao
+Link Asia/Yangon Asia/Rangoon
+Link Asia/Ho_Chi_Minh Asia/Saigon
+Link Asia/Thimphu Asia/Thimbu
+Link Asia/Makassar Asia/Ujung_Pandang
+Link Asia/Ulaanbaatar Asia/Ulan_Bator
+Link Atlantic/Faroe Atlantic/Faeroe
+Link Europe/Kyiv Europe/Kiev
+# Classically, Cyprus is in Asia; e.g. see Herodotus, Histories, I.72.
+# However, for various reasons many users expect to find it under Europe.
+Link Asia/Nicosia Europe/Nicosia
+Link Pacific/Guadalcanal Pacific/Ponape #= Pacific/Pohnpei
+Link Pacific/Port_Moresby Pacific/Truk #= Pacific/Chuuk
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/etcetera b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/etcetera
index a7e0eb4..865a220 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/etcetera
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/etcetera
@@ -16,26 +16,23 @@
# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
# behind GMT but uses the completely misleading abbreviation "GMT".
-Zone Etc/GMT 0 - GMT
-
# The following zone is used by tzcode functions like gmtime,
# which load the "UTC" file to handle seconds properly.
Zone Etc/UTC 0 - UTC
+# Functions like gmtime load the "GMT" file to handle leap seconds properly.
+# Vanguard section, which works with most .zi parsers.
+#Zone GMT 0 - GMT
+# Rearguard section, for TZUpdater 2.3.2 and earlier.
+Zone Etc/GMT 0 - GMT
+
# The following link uses older naming conventions,
# but it belongs here, not in the file 'backward',
# as it is needed for tzcode releases through 2022a,
# where functions like gmtime load "GMT" instead of the "Etc/UTC".
# We want this to work even on installations that omit 'backward'.
Link Etc/GMT GMT
-
-Link Etc/UTC Etc/Universal
-Link Etc/UTC Etc/Zulu
-
-Link Etc/GMT Etc/Greenwich
-Link Etc/GMT Etc/GMT-0
-Link Etc/GMT Etc/GMT+0
-Link Etc/GMT Etc/GMT0
+# End of rearguard section.
# Be consistent with POSIX TZ settings in the Zone names,
# even though this is the opposite of what many people expect.
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe
index 0d27408..751952b 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe
@@ -504,9 +504,6 @@
1:00 - BST 1971 Oct 31 2:00u
0:00 GB-Eire %s 1996
0:00 EU GMT/BST
-Link Europe/London Europe/Jersey
-Link Europe/London Europe/Guernsey
-Link Europe/London Europe/Isle_of_Man
# From Paul Eggert (2018-02-15):
# In January 2018 we discovered that the negative SAVE values in the
@@ -879,6 +876,8 @@
3:00 - +03
# Belgium
+# Luxembourg
+# Netherlands
#
# From Michael Deckers (2019-08-25):
# The exposition in the web page
@@ -961,11 +960,6 @@
1:00 C-Eur CE%sT 1944 Sep 3
1:00 Belgium CE%sT 1977
1:00 EU CE%sT
-Link Europe/Brussels Europe/Amsterdam
-Link Europe/Brussels Europe/Luxembourg
-
-# Bosnia and Herzegovina
-# See Europe/Belgrade.
# Bulgaria
#
@@ -992,13 +986,11 @@
2:00 E-Eur EE%sT 1997
2:00 EU EE%sT
-# Croatia
-# See Europe/Belgrade.
-
# Cyprus
# Please see the 'asia' file for Asia/Nicosia.
-# Czech Republic / Czechia
+# Czech Republic (Czechia)
+# Slovakia
#
# From Paul Eggert (2018-04-15):
# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15.
@@ -1025,15 +1017,14 @@
# End of rearguard section.
1:00 Czech CE%sT 1979
1:00 EU CE%sT
-Link Europe/Prague Europe/Bratislava
-
-# Denmark, Faroe Islands, and Greenland
-# For Denmark see Europe/Berlin.
-
+# Faroe Is
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
0:00 - WET 1981
0:00 EU WE%sT
+
+# Greenland
#
# From Paul Eggert (2004-10-31):
# During World War II, Germany maintained secret manned weather stations in
@@ -1259,11 +1250,8 @@
2:00 Finland EE%sT 1983
2:00 EU EE%sT
-# Åland Is
-Link Europe/Helsinki Europe/Mariehamn
-
-
# France
+# Monaco
# From Ciro Discepolo (2000-12-20):
#
@@ -1400,9 +1388,11 @@
0:00 France WE%sT 1945 Sep 16 3:00
1:00 France CE%sT 1977
1:00 EU CE%sT
-Link Europe/Paris Europe/Monaco
+# Denmark
# Germany
+# Norway
+# Sweden
# From Markus Kuhn (1998-09-29):
# The German time zone web site by the Physikalisch-Technische
@@ -1420,6 +1410,53 @@
# However, Moscow did not observe daylight saving in 1945, so
# this was equivalent to UT +03, not +04.
+# Svalbard & Jan Mayen
+
+# From Steffen Thorsen (2001-05-01):
+# Although I could not find it explicitly, it seems that Jan Mayen and
+# Svalbard have been using the same time as Norway at least since the
+# time they were declared as parts of Norway. Svalbard was declared
+# as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan
+# Mayen by law of 1930-02-27 no 2, section 2. (From
+# <http://www.lovdata.no/all/nl-19250717-011.html> and
+# <http://www.lovdata.no/all/nl-19300227-002.html>). The law/regulation
+# for normal/standard time in Norway is from 1894-06-29 no 1 (came
+# into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a
+# part of this law since 1925/1930. (From
+# <http://www.lovdata.no/all/nl-18940629-001.html>) I have not been
+# able to find if Jan Mayen used a different time zone (e.g. -0100)
+# before 1930. Jan Mayen has only been "inhabited" since 1921 by
+# Norwegian meteorologists and maybe used the same time as Norway ever
+# since 1921. Svalbard (Arctic/Longyearbyen) has been inhabited since
+# before 1895, and therefore probably changed the local time somewhere
+# between 1895 and 1925 (inclusive).
+
+# From Paul Eggert (2013-09-04):
+#
+# Actually, Jan Mayen was never occupied by Germany during World War II,
+# so it must have diverged from Oslo time during the war, as Oslo was
+# keeping Berlin time.
+#
+# <https://www.jan-mayen.no/history.htm> says that the meteorologists
+# burned down their station in 1940 and left the island, but returned in
+# 1941 with a small Norwegian garrison and continued operations despite
+# frequent air attacks from Germans. In 1943 the Americans established a
+# radiolocating station on the island, called "Atlantic City". Possibly
+# the UT offset changed during the war, but I think it unlikely that
+# Jan Mayen used German daylight-saving rules.
+#
+# Svalbard is more complicated, as it was raided in August 1941 by an
+# Allied party that evacuated the civilian population to England (says
+# <http://www.bartleby.com/65/sv/Svalbard.html>). The Svalbard FAQ
+# <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were
+# expelled on 1942-05-14. However, small parties of Germans did return,
+# and according to Wilhelm Dege's book "War North of 80" (1954)
+# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html
+# the German armed forces at the Svalbard weather station code-named
+# Haudegen did not surrender to the Allies until September 1945.
+#
+# All these events predate our cutoff date of 1970, so use Europe/Berlin
+# for these regions.
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Germany 1946 only - Apr 14 2:00s 1:00 S
@@ -1444,11 +1481,6 @@
1:00 SovietZone CE%sT 1946
1:00 Germany CE%sT 1980
1:00 EU CE%sT
-Link Europe/Berlin Arctic/Longyearbyen
-Link Europe/Berlin Europe/Copenhagen
-Link Europe/Berlin Europe/Oslo
-Link Europe/Berlin Europe/Stockholm
-
# Georgia
# Please see the "asia" file for Asia/Tbilisi.
@@ -1567,10 +1599,9 @@
1:00 Hungary CE%sT 1984
1:00 EU CE%sT
-# Iceland
-# See Africa/Abidjan.
-
# Italy
+# San Marino
+# Vatican City
#
# From Paul Eggert (2001-03-06):
# Sicily and Sardinia each had their own time zones from 1866 to 1893,
@@ -1689,13 +1720,6 @@
1:00 C-Eur CE%sT 1944 Jun 4
1:00 Italy CE%sT 1980
1:00 EU CE%sT
-Link Europe/Rome Europe/Vatican
-Link Europe/Rome Europe/San_Marino
-
-
-# Kosovo
-# See Europe/Belgrade.
-
# Latvia
@@ -1779,10 +1803,6 @@
2:00 - EET 2001 Jan 2
2:00 EU EE%sT
-# Liechtenstein
-# See Europe/Zurich.
-
-
# Lithuania
# From Paul Eggert (2016-03-18):
@@ -1835,12 +1855,6 @@
2:00 - EET 2003 Jan 1
2:00 EU EE%sT
-# Luxembourg
-# See Europe/Brussels.
-
-# North Macedonia
-# See Europe/Belgrade.
-
# Malta
#
# From Paul Eggert (2016-10-21):
@@ -1936,67 +1950,6 @@
# See Romania commentary for the guessed 1997 transition to EU rules.
2:00 Moldova EE%sT
-# Monaco
-# See Europe/Paris.
-
-# Montenegro
-# See Europe/Belgrade.
-
-# Netherlands
-# See Europe/Brussels.
-
-# Norway
-# See Europe/Berlin.
-
-# Svalbard & Jan Mayen
-
-# From Steffen Thorsen (2001-05-01):
-# Although I could not find it explicitly, it seems that Jan Mayen and
-# Svalbard have been using the same time as Norway at least since the
-# time they were declared as parts of Norway. Svalbard was declared
-# as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan
-# Mayen by law of 1930-02-27 no 2, section 2. (From
-# <http://www.lovdata.no/all/nl-19250717-011.html> and
-# <http://www.lovdata.no/all/nl-19300227-002.html>). The law/regulation
-# for normal/standard time in Norway is from 1894-06-29 no 1 (came
-# into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a
-# part of this law since 1925/1930. (From
-# <http://www.lovdata.no/all/nl-18940629-001.html>) I have not been
-# able to find if Jan Mayen used a different time zone (e.g. -0100)
-# before 1930. Jan Mayen has only been "inhabited" since 1921 by
-# Norwegian meteorologists and maybe used the same time as Norway ever
-# since 1921. Svalbard (Arctic/Longyearbyen) has been inhabited since
-# before 1895, and therefore probably changed the local time somewhere
-# between 1895 and 1925 (inclusive).
-
-# From Paul Eggert (2013-09-04):
-#
-# Actually, Jan Mayen was never occupied by Germany during World War II,
-# so it must have diverged from Oslo time during the war, as Oslo was
-# keeping Berlin time.
-#
-# <https://www.jan-mayen.no/history.htm> says that the meteorologists
-# burned down their station in 1940 and left the island, but returned in
-# 1941 with a small Norwegian garrison and continued operations despite
-# frequent air attacks from Germans. In 1943 the Americans established a
-# radiolocating station on the island, called "Atlantic City". Possibly
-# the UT offset changed during the war, but I think it unlikely that
-# Jan Mayen used German daylight-saving rules.
-#
-# Svalbard is more complicated, as it was raided in August 1941 by an
-# Allied party that evacuated the civilian population to England (says
-# <http://www.bartleby.com/65/sv/Svalbard.html>). The Svalbard FAQ
-# <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were
-# expelled on 1942-05-14. However, small parties of Germans did return,
-# and according to Wilhelm Dege's book "War North of 80" (1954)
-# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html
-# the German armed forces at the Svalbard weather station code-named
-# Haudegen did not surrender to the Allies until September 1945.
-#
-# All these events predate our cutoff date of 1970, so use Europe/Berlin
-# for these regions.
-
-
# Poland
# The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
@@ -3278,11 +3231,13 @@
11:00 Russia +11/+12 2011 Mar 27 2:00s
12:00 - +12
-
-# San Marino
-# See Europe/Rome.
-
+# Bosnia & Herzegovina
+# Croatia
+# Kosovo
+# Montenegro
+# North Macedonia
# Serbia
+# Slovenia
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Belgrade 1:22:00 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
@@ -3294,17 +3249,6 @@
# Shanks & Pottenger don't give as much detail, so go with Koželj.
1:00 - CET 1982 Nov 27
1:00 EU CE%sT
-Link Europe/Belgrade Europe/Ljubljana # Slovenia
-Link Europe/Belgrade Europe/Podgorica # Montenegro
-Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina
-Link Europe/Belgrade Europe/Skopje # North Macedonia
-Link Europe/Belgrade Europe/Zagreb # Croatia
-
-# Slovakia
-# See Europe/Prague.
-
-# Slovenia
-# See Europe/Belgrade.
# Spain
#
@@ -3411,10 +3355,11 @@
# IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
# Ignore this for now, as the Canaries are part of the EU.
-# Sweden
-# See Europe/Berlin.
+# Germany (Busingen enclave)
+# Liechtenstein
# Switzerland
+#
# From Howse:
# By the end of the 18th century clocks and watches became commonplace
# and their performance improved enormously. Communities began to keep
@@ -3527,9 +3472,6 @@
0:29:46 - BMT 1894 Jun # Bern Mean Time
1:00 Swiss CE%sT 1981
1:00 EU CE%sT
-Link Europe/Zurich Europe/Busingen
-Link Europe/Zurich Europe/Vaduz
-
# Turkey
@@ -3734,7 +3676,6 @@
2:00 1:00 EEST 2015 Nov 8 1:00u
2:00 EU EE%sT 2016 Sep 7
3:00 - +03
-Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
# Ukraine
#
@@ -3837,9 +3778,6 @@
2:00 C-Eur EE%sT 1996 May 13
2:00 EU EE%sT
-# Vatican City
-# See Europe/Rome.
-
###############################################################################
# One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica
index da84f35..df19543 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica
@@ -829,7 +829,6 @@
-7:00 - MST 1967
-7:00 US M%sT 1968 Mar 21
-7:00 - MST
-Link America/Phoenix America/Creston
# From Arthur David Olson (1988-02-13):
# A writer from the Inter Tribal Council of Arizona, Inc.,
@@ -1603,23 +1602,6 @@
# Ontario
-# From Paul Eggert (2006-07-09):
-# Shanks & Pottenger write that since 1970 most of Ontario has been like
-# Toronto.
-# Thunder Bay skipped DST in 1973.
-# Many smaller locales did not observe peacetime DST until 1974;
-# Nipigon (EST) and Rainy River (CST) are the largest that we know of.
-# Far west Ontario is like Winnipeg; far east Quebec is like Halifax.
-
-# From Jeffery Nichols (2020-02-06):
-# According to the [Shanks] atlas, those western Ontario zones are huge,
-# covering most of Ontario northwest of Sault Ste Marie and Timmins.
-# The zones seem to include towns bigger than the ones they're named after,
-# like Dryden in America/Rainy_River and Wawa (and maybe Attawapiskat) in
-# America/Nipigon. I assume it's too much trouble to change the name of the
-# zone (like when you found out that America/Glace_Bay includes Sydney, Nova
-# Scotia)....
-
# From Mark Brader (2003-07-26):
# [According to the Toronto Star] Orillia, Ontario, adopted DST
# effective Saturday, 1912-06-22, 22:00; the article mentions that
@@ -1640,17 +1622,6 @@
# From Mark Brader (2010-03-06):
#
-# Currently the database has:
-#
-# # Ontario
-#
-# # From Paul Eggert (2006-07-09):
-# # Shanks & Pottenger write that since 1970 most of Ontario has been like
-# # Toronto.
-# # Thunder Bay skipped DST in 1973.
-# # Many smaller locales did not observe peacetime DST until 1974;
-# # Nipigon (EST) and Rainy River (CST) are the largest that we know of.
-#
# In the (Toronto) Globe and Mail for Saturday, 1955-09-24, in the bottom
# right corner of page 1, it says that Toronto will return to standard
# time at 2 am Sunday morning (which agrees with the database), and that:
@@ -1658,10 +1629,8 @@
# The one-hour setback will go into effect throughout most of Ontario,
# except in areas like Windsor which remains on standard time all year.
#
-# Windsor is, of course, a lot larger than Nipigon.
-#
-# I only came across this incidentally. I don't know if Windsor began
-# observing DST when Detroit did, or in 1974, or on some other date.
+# ... I don't know if Windsor began observing DST when Detroit did,
+# or in 1974, or on some other date.
#
# By the way, the article continues by noting that:
#
@@ -1743,23 +1712,7 @@
# Toronto Star, which said that DST was ending 1971-10-31 as usual.
Rule Toronto 1957 1973 - Oct lastSun 2:00 0 S
-# From Paul Eggert (2003-07-27):
-# Willett (1914-03) writes (p. 17) "In the Cities of Fort William, and
-# Port Arthur, Ontario, the principle of the Bill has been in
-# operation for the past three years, and in the City of Moose Jaw,
-# Saskatchewan, for one year."
-
-# From David Bryan via Tory Tronrud, Director/Curator,
-# Thunder Bay Museum (2003-11-12):
-# There is some suggestion, however, that, by-law or not, daylight
-# savings time was being practiced in Fort William and Port Arthur
-# before 1909.... [I]n 1910, the line between the Eastern and Central
-# Time Zones was permanently moved about two hundred miles west to
-# include the Thunder Bay area.... When Canada adopted daylight
-# savings time in 1916, Fort William and Port Arthur, having done so
-# already, did not change their clocks.... During the Second World
-# War,... [t]he cities agreed to implement DST during the summer
-# months for the remainder of the war years.
+# The Bahamas match Toronto since 1970.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Toronto -5:17:32 - LMT 1895
@@ -1768,22 +1721,6 @@
-5:00 Canada E%sT 1946
-5:00 Toronto E%sT 1974
-5:00 Canada E%sT
-Link America/Toronto America/Nassau
-Zone America/Thunder_Bay -5:57:00 - LMT 1895
- -6:00 - CST 1910
- -5:00 - EST 1942
- -5:00 Canada E%sT 1970
- -5:00 Toronto E%sT 1973
- -5:00 - EST 1974
- -5:00 Canada E%sT
-Zone America/Nipigon -5:53:04 - LMT 1895
- -5:00 Canada E%sT 1940 Sep 29
- -5:00 1:00 EDT 1942 Feb 9 2:00s
- -5:00 Canada E%sT
-Zone America/Rainy_River -6:18:16 - LMT 1895
- -6:00 Canada C%sT 1940 Sep 29
- -6:00 1:00 CDT 1942 Feb 9 2:00s
- -6:00 Canada C%sT
# For Atikokan see America/Panama.
@@ -2616,6 +2553,12 @@
# 5- The islands, reefs and keys shall take their timezone from the
# longitude they are located at.
+# From Paul Eggert (2022-10-28):
+# The new Mexican law was published today:
+# https://www.dof.gob.mx/nota_detalle.php?codigo=5670045&fecha=28/10/2022
+# This abolishes DST except where US DST rules are observed,
+# and in addition changes all of Chihuahua to -06 with no DST.
+
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Mexico 1931 only - May 1 23:00 1:00 D
Rule Mexico 1931 only - Oct 1 0:00 0 S
@@ -2631,8 +2574,8 @@
Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S
Rule Mexico 2001 only - May Sun>=1 2:00 1:00 D
Rule Mexico 2001 only - Sep lastSun 2:00 0 S
-Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
-Rule Mexico 2002 max - Oct lastSun 2:00 0 S
+Rule Mexico 2002 2022 - Apr Sun>=1 2:00 1:00 D
+Rule Mexico 2002 2022 - Oct lastSun 2:00 0 S
# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Quintana Roo; represented by Cancún
Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u
@@ -2685,7 +2628,8 @@
-6:00 Mexico C%sT 1998
-6:00 - CST 1998 Apr Sun>=1 3:00
-7:00 Mexico M%sT 2010
- -7:00 US M%sT
+ -7:00 US M%sT 2022 Oct 30 2:00
+ -6:00 - CST
# Chihuahua (away from US border)
Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u
-7:00 - MST 1927 Jun 10 23:00
@@ -2694,7 +2638,8 @@
-6:00 - CST 1996
-6:00 Mexico C%sT 1998
-6:00 - CST 1998 Apr Sun>=1 3:00
- -7:00 Mexico M%sT
+ -7:00 Mexico M%sT 2022 Oct 30 2:00
+ -6:00 - CST
# Sonora
Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u
-7:00 - MST 1927 Jun 10 23:00
@@ -2792,20 +2737,16 @@
# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
# It has been moved to the 'backward' file.
#
+# From Paul Eggert (2022-10-28):
+# Today's new law states that the entire state of Baja California
+# follows US DST rules, which agrees with simplifications noted above.
+#
#
# Revillagigedo Is
# no information
###############################################################################
-# Anguilla
-# Antigua and Barbuda
-# See America/Puerto_Rico.
-
-# The Bahamas
-# See America/Toronto.
-
-
# Barbados
# For 1899 Milne gives -3:58:29.2.
@@ -3018,12 +2959,6 @@
-4:00 Canada A%sT 1976
-4:00 US A%sT
-# Caribbean Netherlands
-# See America/Puerto_Rico.
-
-# Cayman Is
-# See America/Panama.
-
# Costa Rica
# Milne gives -5:36:13.3 as San José mean time.
@@ -3249,9 +3184,6 @@
-5:29:36 - HMT 1925 Jul 19 12:00 # Havana MT
-5:00 Cuba C%sT
-# Dominica
-# See America/Puerto_Rico.
-
# Dominican Republic
# From Steffen Thorsen (2000-10-30):
@@ -3298,12 +3230,6 @@
Zone America/El_Salvador -5:56:48 - LMT 1921 # San Salvador
-6:00 Salv C%sT
-# Grenada
-# Guadeloupe
-# St Barthélemy
-# St Martin (French part)
-# See America/Puerto_Rico.
-
# Guatemala
#
# From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen:
@@ -3489,9 +3415,6 @@
-4:00 1:00 ADT 1980 Sep 28
-4:00 - AST
-# Montserrat
-# See America/Puerto_Rico.
-
# Nicaragua
#
# This uses Shanks & Pottenger for times before 2005.
@@ -3557,44 +3480,39 @@
-5:00 - EST 1997
-6:00 Nic C%sT
+# Cayman Is
# Panama
+#
+# Atikokan and Coral Harbour, Canada, match Panama since 1970.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST
-Link America/Panama America/Atikokan
-Link America/Panama America/Cayman
+# Anguilla
+# Antigua & Barbuda
+# Aruba
+# Caribbean Netherlands
+# Curaçao
+# Dominica
+# Grenada
+# Guadeloupe
+# Montserrat
# Puerto Rico
+# St Barthélemy
+# St Kitts-Nevis
+# Sint Maarten / St Martin
+# St Lucia
+# St Vincent & the Grenadines
+# Trinidad & Tobago
+# Virgin Is (UK & US)
+#
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
-4:00 - AST 1942 May 3
-4:00 US A%sT 1946
-4:00 - AST
-Link America/Puerto_Rico America/Anguilla
-Link America/Puerto_Rico America/Antigua
-Link America/Puerto_Rico America/Aruba
-Link America/Puerto_Rico America/Curacao
-Link America/Puerto_Rico America/Blanc-Sablon # Quebec (Lower North Shore)
-Link America/Puerto_Rico America/Dominica
-Link America/Puerto_Rico America/Grenada
-Link America/Puerto_Rico America/Guadeloupe
-Link America/Puerto_Rico America/Kralendijk # Caribbean Netherlands
-Link America/Puerto_Rico America/Lower_Princes # Sint Maarten
-Link America/Puerto_Rico America/Marigot # St Martin (French part)
-Link America/Puerto_Rico America/Montserrat
-Link America/Puerto_Rico America/Port_of_Spain # Trinidad & Tobago
-Link America/Puerto_Rico America/St_Barthelemy # St Barthélemy
-Link America/Puerto_Rico America/St_Kitts # St Kitts & Nevis
-Link America/Puerto_Rico America/St_Lucia
-Link America/Puerto_Rico America/St_Thomas # Virgin Islands (US)
-Link America/Puerto_Rico America/St_Vincent
-Link America/Puerto_Rico America/Tortola # Virgin Islands (UK)
-
-# St Kitts-Nevis
-# St Lucia
-# See America/Puerto_Rico.
# St Pierre and Miquelon
# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
@@ -3604,12 +3522,6 @@
-3:00 - -03 1987
-3:00 Canada -03/-02
-# St Vincent and the Grenadines
-# See America/Puerto_Rico.
-
-# Sint Maarten
-# See America/Puerto_Rico.
-
# Turks and Caicos
#
# From Chris Dunn in
@@ -3679,11 +3591,6 @@
-4:00 - AST 2018 Mar 11 3:00
-5:00 US E%sT
-# British Virgin Is
-# US Virgin Is
-# See America/Puerto_Rico.
-
-
# Local Variables:
# coding: utf-8
# End:
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica
index 2f51004..13cc65e 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica
@@ -585,9 +585,6 @@
-3:00 Arg -03/-02 2008 Oct 18
-3:00 - -03
-# Aruba
-# See America/Puerto_Rico.
-
# Bolivia
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/La_Paz -4:32:36 - LMT 1890
@@ -1432,15 +1429,6 @@
# Malpelo, Providencia, San Andres
# no information; probably like America/Bogota
-# Curaçao
-# See America/Puerto_Rico.
-#
-# From Arthur David Olson (2011-06-15):
-# use links for places with new iso3166 codes.
-# The name "Lower Prince's Quarter" is both longer than fourteen characters
-# and contains an apostrophe; use "Lower_Princes"....
-# From Paul Eggert (2021-09-29):
-# These backward-compatibility links now are in the 'northamerica' file.
# Ecuador
#
@@ -1756,9 +1744,6 @@
-3:30 - -0330 1984 Oct
-3:00 - -03
-# Trinidad and Tobago
-# See America/Puerto_Rico.
-
# Uruguay
# From Paul Eggert (1993-11-18):
# Uruguay wins the prize for the strangest peacetime manipulation of the rules.
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt
index 13ad873..5c8fbb4 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt
@@ -1 +1 @@
-2022e
+2022f
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab
index 4904028..2636e21 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab
@@ -114,13 +114,10 @@
CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas)
CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore)
CA +4339-07923 America/Toronto Eastern - ON, QC (most areas)
-CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73)
-CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay)
CA +6344-06828 America/Iqaluit Eastern - NU (most east areas)
CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung)
CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H)
CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba
-CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances)
CA +744144-0944945 America/Resolute Central - NU (Resolute)
CA +624900-0920459 America/Rankin_Inlet Central - NU (central)
CA +5024-10439 America/Regina CST - SK (most areas)
diff --git a/tools/pom.xml b/tools/pom.xml
index e16d6f2..b03b88d 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -34,7 +34,8 @@
<modules>
<module>cldr-code</module>
- <module>cldr-apps</module>
+ <!-- Android patch: AOSP doesn't check out cldr-apps.
+ <module>cldr-apps</module> -->
<module>cldr-rdf</module>
</modules>
