Index: source/data/locales/mer.txt |
diff --git a/source/data/locales/mer.txt b/source/data/locales/mer.txt |
index 4d8716ed6a45c168787410169d652bc43e400fb8..c66ae993914ea49bca9fb3a1462d57cab870229c 100755 |
--- a/source/data/locales/mer.txt |
+++ b/source/data/locales/mer.txt |
@@ -1,20 +1,14 @@ |
// *************************************************************************** |
// * |
-// * Copyright (C) 2014 International Business Machines |
+// * 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 |
// * |
// *************************************************************************** |
-/** |
- * ICU <specials> source: <path>/common/main/mer.xml |
- */ |
mer{ |
ExemplarCharacters{"[a b c d e f g h i ĩ j k l m n o p q r s t u ũ v w x y z]"} |
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"} |
- LocaleScript{ |
- "Latn", |
- } |
NumberElements{ |
latn{ |
patterns{ |
@@ -23,14 +17,14 @@ mer{ |
} |
} |
} |
- Version{"2.1.6.69"} |
+ Version{"2.1.19.14"} |
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", |
@@ -71,10 +65,10 @@ mer{ |
"Ũ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", |