Index: source/data/locales/en_NZ.txt |
diff --git a/source/data/locales/en_NZ.txt b/source/data/locales/en_NZ.txt |
index 7bc60fd1e7b8ca1a62076ded3c2dca8b223e3c45..0959117a55054b695389b9d9e4ab385a1084963a 100644 |
--- a/source/data/locales/en_NZ.txt |
+++ b/source/data/locales/en_NZ.txt |
@@ -1,14 +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/en_NZ.xml |
// * |
// *************************************************************************** |
en_NZ{ |
- %%Parent{"en_GB"} |
- Version{"2.1.8.19"} |
+ %%Parent{"en_001"} |
+ Version{"2.1.19.14"} |
calendar{ |
generic{ |
DateTimePatterns{ |
@@ -20,89 +20,42 @@ en_NZ{ |
"d MMMM y G", |
"d/MM/y G", |
"d/MM/y GGGGG", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
+ "{1}, {0}", |
+ "{1} 'at' {0}", |
+ "{1} 'at' {0}", |
+ "{1}, {0}", |
+ "{1}, {0}", |
} |
availableFormats{ |
- MMMEd{"E, d MMM"} |
Md{"d/M"} |
yyyyMd{"d/MM/y G"} |
} |
intervalFormats{ |
- M{ |
- M{"M-M"} |
- } |
MEd{ |
- M{"E, d/MM - E, d/MM"} |
- d{"E, d/MM - E, d/MM"} |
- } |
- MMM{ |
- M{"MMM-MMM"} |
+ M{"E, d/MM – E, d/MM"} |
+ d{"E, d/MM – E, d/MM"} |
} |
MMMEd{ |
- M{"E, d MMM - E, d MMM"} |
- d{"E, d - E, d MMM"} |
- } |
- MMMd{ |
- M{"d MMM - d MMM"} |
- d{"d-d MMM"} |
+ M{"E, d MMM – E, d MMM"} |
+ d{"E, d – E, d MMM"} |
} |
Md{ |
- M{"d/MM - d/MM"} |
- d{"d/MM - d/MM"} |
- } |
- d{ |
- d{"d-d"} |
- } |
- fallback{"{0} - {1}"} |
- h{ |
- a{"h a - h a"} |
- h{"h-h a"} |
- } |
- hm{ |
- a{"h:mm a - h:mm a"} |
- h{"h:mm-h:mm a"} |
- m{"h:mm-h:mm a"} |
- } |
- hmv{ |
- a{"h:mm a - h:mm a v"} |
- h{"h:mm-h:mm a v"} |
- m{"h:mm-h:mm a v"} |
- } |
- hv{ |
- a{"h a - h a v"} |
- h{"h-h a v"} |
+ M{"d/MM – d/MM"} |
+ d{"d/MM – d/MM"} |
} |
yM{ |
- M{"MM/y - MM/y G"} |
- y{"MM/y - MM/y G"} |
+ M{"MM/y – MM/y G"} |
+ y{"MM/y – MM/y G"} |
} |
yMEd{ |
- M{"E, d/MM/y - E, d/MM/y G"} |
- d{"E, d/MM/y - E, d/MM/y G"} |
- y{"E, d/MM/y - E, d/MM/y G"} |
- } |
- yMMM{ |
- M{"MMM-MMM y G"} |
- y{"MMM y - MMM y G"} |
- } |
- yMMMEd{ |
- M{"E, d MMM - E, d MMM y G"} |
- d{"E, d - E, d MMM y G"} |
- y{"E, d MMM y - E, d MMM y G"} |
- } |
- yMMMd{ |
- M{"d MMM - d MMM y G"} |
- d{"d-d MMM y G"} |
- y{"d MMM y - d MMM y G"} |
+ M{"E, d/MM/y – E, d/MM/y G"} |
+ d{"E, d/MM/y – E, d/MM/y G"} |
+ y{"E, d/MM/y – E, d/MM/y G"} |
} |
yMd{ |
- M{"d/MM/y - d/MM/y G"} |
- d{"d/MM/y - d/MM/y G"} |
- y{"d/MM/y - d/MM/y G"} |
+ M{"d/MM/y – d/MM/y G"} |
+ d{"d/MM/y – d/MM/y G"} |
+ y{"d/MM/y – d/MM/y G"} |
} |
} |
} |
@@ -123,82 +76,31 @@ en_NZ{ |
"{1}, {0}", |
} |
availableFormats{ |
- MMMEd{"E, d MMM"} |
Md{"d/M"} |
yMd{"d/MM/y"} |
} |
intervalFormats{ |
- M{ |
- M{"M-M"} |
- } |
MEd{ |
- M{"E, d/MM - E, d/MM"} |
- d{"E, d/MM - E, d/MM"} |
- } |
- MMM{ |
- M{"MMM-MMM"} |
+ M{"E, d/MM – E, d/MM"} |
+ d{"E, d/MM – E, d/MM"} |
} |
MMMEd{ |
- M{"E, d MMM - E, d MMM"} |
- d{"E, d - E, d MMM"} |
- } |
- MMMd{ |
- M{"d MMM - d MMM"} |
- d{"d-d MMM"} |
+ M{"E, d MMM – E, d MMM"} |
+ d{"E, d – E, d MMM"} |
} |
Md{ |
- M{"d/MM - d/MM"} |
- d{"d/MM - d/MM"} |
- } |
- d{ |
- d{"d-d"} |
- } |
- fallback{"{0} - {1}"} |
- h{ |
- a{"h a - h a"} |
- h{"h-h a"} |
- } |
- hm{ |
- a{"h:mm a - h:mm a"} |
- h{"h:mm-h:mm a"} |
- m{"h:mm-h:mm a"} |
- } |
- hmv{ |
- a{"h:mm a - h:mm a v"} |
- h{"h:mm-h:mm a v"} |
- m{"h:mm-h:mm a v"} |
- } |
- hv{ |
- a{"h a - h a v"} |
- h{"h-h a v"} |
- } |
- yM{ |
- M{"MM/y - MM/y"} |
- y{"MM/y - MM/y"} |
+ M{"d/MM – d/MM"} |
+ d{"d/MM – d/MM"} |
} |
yMEd{ |
- M{"E, d/MM/y - E, d/MM/y"} |
- d{"E, d/MM/y - E, d/MM/y"} |
- y{"E, d/MM/y - E, d/MM/y"} |
- } |
- yMMM{ |
- M{"MMM-MMM y"} |
- y{"MMM y - MMM y"} |
- } |
- yMMMEd{ |
- M{"E, d MMM - E, d MMM y"} |
- d{"E, d - E, d MMM y"} |
- y{"E, d MMM y - E, d MMM y"} |
- } |
- yMMMd{ |
- M{"d MMM - d MMM y"} |
- d{"d-d MMM y"} |
- y{"d MMM y - d MMM y"} |
+ M{"E, d/MM/y – E, d/MM/y"} |
+ d{"E, d/MM/y – E, d/MM/y"} |
+ y{"E, d/MM/y – E, d/MM/y"} |
} |
yMd{ |
- M{"d/MM/y - d/MM/y"} |
- d{"d/MM/y - d/MM/y"} |
- y{"d/MM/y - d/MM/y"} |
+ M{"d/MM/y – d/MM/y"} |
+ d{"d/MM/y – d/MM/y"} |
+ y{"d/MM/y – d/MM/y"} |
} |
} |
} |