X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..3d1f044b704633e2e541231cd17ae9ecf9ad5c7a:/icuSources/data/locales/mer.txt

diff --git a/icuSources/data/locales/mer.txt b/icuSources/data/locales/mer.txt
old mode 100755
new mode 100644
index 2b55409b..63fc8088
--- a/icuSources/data/locales/mer.txt
+++ b/icuSources/data/locales/mer.txt
@@ -1,43 +1,76 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2010 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/common/main/mer.xml
-// *
-// ***************************************************************************
-/**
- *  ICU <specials> source: <path>/xml/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]"}
-    LocaleScript{
-        "Latn",
-    }
     NumberElements{
         latn{
             patterns{
-                currencyFormat{"¤#,##0.00;(¤#,##0.00)"}
+                accountingFormat{"¤#,##0.00;(¤#,##0.00)"}
+                currencyFormat{"¤#,##0.00"}
             }
         }
     }
-    Version{"2.0.47.63"}
+    Version{"2.1.47.82"}
     calendar{
+        generic{
+            DateTimePatterns{
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
+                "EEEE, d MMMM y G",
+                "d MMMM y G",
+                "d MMM y G",
+                "dd/MM/y GGGGG",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+            availableFormats{
+                Hm{"HH:mm"}
+                Hms{"HH:mm:ss"}
+                M{"L"}
+                MEd{"E, M/d"}
+                MMM{"LLL"}
+                MMMEd{"E, MMM d"}
+                MMMMEd{"E, MMMM d"}
+                MMMMd{"MMMM d"}
+                MMMd{"MMM d"}
+                Md{"M/d"}
+                d{"d"}
+                hm{"h:mm a"}
+                ms{"mm:ss"}
+                y{"y"}
+                yM{"M/y"}
+                yMEd{"E, M/d/y"}
+                yMMM{"MMM y"}
+                yMMMEd{"E, MMM d, y"}
+                yMMMM{"MMMM y"}
+                yQQQ{"QQQ y"}
+                yQQQQ{"QQQQ y"}
+            }
+        }
         gregorian{
             AmPmMarkers{
                 "RŨ",
                 "Ũ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",
-                "dd/MM/yyyy",
+                "dd/MM/y",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
@@ -60,12 +93,12 @@ mer{
                 ms{"mm:ss"}
                 y{"y"}
                 yM{"M/y"}
-                yMEd{"EEE, M/d/y"}
+                yMEd{"E, M/d/y"}
                 yMMM{"MMM y"}
-                yMMMEd{"EEE, MMM d, y"}
+                yMMMEd{"E, MMM d, y"}
                 yMMMM{"MMMM y"}
-                yQ{"Q y"}
                 yQQQ{"QQQ y"}
+                yQQQQ{"QQQQ y"}
             }
             dayNames{
                 format{
@@ -110,46 +143,6 @@ mer{
                     "Nyuma ya Kristũ",
                 }
             }
-            fields{
-                day{
-                    dn{"Ntukũ"}
-                    relative{
-                        "-1"{"Ĩgoro"}
-                        "0"{"Narua"}
-                        "1"{"Rũjũ"}
-                    }
-                }
-                dayperiod{
-                    dn{"MÅ©thenya"}
-                }
-                era{
-                    dn{"Ĩgita"}
-                }
-                hour{
-                    dn{"Ĩthaa"}
-                }
-                minute{
-                    dn{"Ndagika"}
-                }
-                month{
-                    dn{"Mweri"}
-                }
-                second{
-                    dn{"Sekondi"}
-                }
-                week{
-                    dn{"Kiumia"}
-                }
-                weekday{
-                    dn{"Ntukũ ya ngũgĩ"}
-                }
-                year{
-                    dn{"Mwaka"}
-                }
-                zone{
-                    dn{"Gũntũ kwa thaa"}
-                }
-            }
             monthNames{
                 format{
                     abbreviated{
@@ -211,9 +204,49 @@ mer{
         }
     }
     delimiters{
-        alternateQuotationEnd{"”"}
-        alternateQuotationStart{"“"}
-        quotationEnd{"'"}
-        quotationStart{"'"}
+        alternateQuotationEnd{"’"}
+        alternateQuotationStart{"‘"}
+        quotationEnd{"”"}
+        quotationStart{"“"}
+    }
+    fields{
+        day{
+            dn{"Ntukũ"}
+            relative{
+                "-1"{"Ĩgoro"}
+                "0"{"Narua"}
+                "1"{"Rũjũ"}
+            }
+        }
+        dayperiod{
+            dn{"MÅ©thenya"}
+        }
+        era{
+            dn{"Ĩgita"}
+        }
+        hour{
+            dn{"Ĩthaa"}
+        }
+        minute{
+            dn{"Ndagika"}
+        }
+        month{
+            dn{"Mweri"}
+        }
+        second{
+            dn{"Sekondi"}
+        }
+        week{
+            dn{"Kiumia"}
+        }
+        weekday{
+            dn{"Ntukũ ya ngũgĩ"}
+        }
+        year{
+            dn{"Mwaka"}
+        }
+        zone{
+            dn{"Gũntũ kwa thaa"}
+        }
     }
 }