ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / data / locales / mer.txt

diff --git a/icuSources/data/locales/mer.txt b/icuSources/data/locales/mer.txt
old mode 100755 (executable)
new mode 100644 (file)
index b6d2927..63fc808
--- a/icuSources/data/locales/mer.txt
+++ b/icuSources/data/locales/mer.txt
@@ -1,11 +1,5 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2015 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/mer.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 mer{
     ExemplarCharacters{"[a b c d e f g h i ĩ j k l m n o p q r s t u ũ v w x y z]"}
     ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
@@ -17,14 +11,14 @@ mer{
             }
         }
     }
-    Version{"2.1.6.69"}
+    Version{"2.1.47.82"}
     calendar{
         generic{
             DateTimePatterns{
-                "h:mm:ss a zzzz",
-                "h:mm:ss a z",
-                "h:mm:ss a",
-                "h:mm a",
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
                 "EEEE, d MMMM y G",
                 "d MMMM y G",
                 "d MMM y G",
@@ -64,11 +58,15 @@ mer{
                 "RŨ",
                 "ŨG",
             }
+            AmPmMarkersAbbr{
+                "RŨ",
+                "ŨG",
+            }
             DateTimePatterns{
-                "h:mm:ss a zzzz",
-                "h:mm:ss a z",
-                "h:mm:ss a",
-                "h:mm a",
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
                 "EEEE, d MMMM y",
                 "d MMMM y",
                 "d MMM y",