]> git.saurik.com Git - apple/icu.git/blobdiff - icuSources/data/locales/cy.txt
ICU-64260.0.1.tar.gz
[apple/icu.git] / icuSources / data / locales / cy.txt
index e19e4a717340cdc0cbc7c2f5d92c7cd67c3a130b..4fd29b6d17dabb970ac4eeeb38d9e17740966e67 100644 (file)
@@ -1,14 +1,5 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2014 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/cy.xml
-// *
-// ***************************************************************************
-/**
- * ICU <specials> source: <path>/common/main/cy.xml
- */
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 cy{
     AuxExemplarCharacters{"[ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z]"}
     Ellipsis{
@@ -27,127 +18,246 @@ cy{
         "[A B C {CH} D {DD} E F {FF} G {NG} H I J K L {LL} M N O P {PH} Q R {RH} S T "
         "{TH} U V W X Y Z]"
     }
+    ExemplarCharactersNumbers{"[\\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"}
     ExemplarCharactersPunctuation{
         "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
         "″]"
     }
-    LocaleScript{
-        "Latn",
-    }
     MoreInformation{"?"}
     NumberElements{
+        arab{
+            symbols{
+                infinity{"∞"}
+                minusSign{"؜-"}
+                nan{"NaN"}
+                perMille{"؉"}
+                percentSign{"٪؜"}
+                plusSign{"؜+"}
+                timeSeparator{":"}
+            }
+        }
+        arabext{
+            symbols{
+                infinity{"∞"}
+                minusSign{"‎-‎"}
+                nan{"NaN"}
+                perMille{"؉"}
+                percentSign{"٪"}
+                plusSign{"‎+‎"}
+            }
+        }
         latn{
             miscPatterns{
+                approximately{"~{0}"}
                 atLeast{"{0}+"}
-                range{"{0}-{1}"}
+                atMost{"≤{0}"}
+                range{"{0}–{1}"}
             }
             patterns{
+                accountingFormat{"¤#,##0.00;(¤#,##0.00)"}
                 currencyFormat{"¤#,##0.00"}
-                decimalFormat{"#,##0.###"}
                 percentFormat{"#,##0%"}
                 scientificFormat{"#E0"}
             }
             patternsLong{
                 decimalFormat{
                     1000{
-                        few{"0 mil"}
-                        many{"0 mil"}
-                        one{"0 fil"}
+                        few{"0K"}
+                        many{"0K"}
+                        one{"0 mil"}
                         other{"0 mil"}
-                        two{"0 fil"}
+                        two{"0K"}
                         zero{"0 mil"}
                     }
                     10000{
-                        few{"00 mil"}
-                        many{"00 mil"}
+                        few{"00K"}
+                        many{"00K"}
                         one{"00 mil"}
                         other{"00 mil"}
-                        two{"00 mil"}
-                        zero{"00 mil"}
+                        two{"00K"}
+                        zero{"00K"}
                     }
                     100000{
-                        few{"000 mil"}
-                        many{"000 mil"}
+                        few{"000K"}
+                        many{"000K"}
                         one{"000 mil"}
                         other{"000 mil"}
-                        two{"000 mil"}
-                        zero{"000 mil"}
+                        two{"000K"}
+                        zero{"000K"}
                     }
                     1000000{
-                        few{"0 miliwn"}
-                        many{"0 miliwn"}
-                        one{"0 filiwn"}
+                        few{"0M"}
+                        many{"0M"}
+                        one{"0 miliwn"}
                         other{"0 miliwn"}
-                        two{"0 filiwn"}
-                        zero{"0 miliwn"}
+                        two{"0M"}
+                        zero{"0M"}
                     }
                     10000000{
-                        few{"00 miliwn"}
-                        many{"00 miliwn"}
+                        few{"00M"}
+                        many{"00M"}
                         one{"00 miliwn"}
                         other{"00 miliwn"}
-                        two{"00 miliwn"}
-                        zero{"00 miliwn"}
+                        two{"00M"}
+                        zero{"00M"}
                     }
                     100000000{
-                        few{"000 miliwn"}
-                        many{"000 miliwn"}
+                        few{"000M"}
+                        many{"000M"}
                         one{"000 miliwn"}
                         other{"000 miliwn"}
-                        two{"000 miliwn"}
-                        zero{"000 miliwn"}
+                        two{"000M"}
+                        zero{"000M"}
                     }
                     1000000000{
-                        few{"0 biliwn"}
-                        many{"0 biliwn"}
+                        few{"0B"}
+                        many{"0B"}
                         one{"0 biliwn"}
                         other{"0 biliwn"}
-                        two{"0 biliwn"}
-                        zero{"0 biliwn"}
+                        two{"0B"}
+                        zero{"0B"}
                     }
                     10000000000{
-                        few{"00 biliwn"}
-                        many{"00 biliwn"}
+                        few{"00B"}
+                        many{"00B"}
                         one{"00 biliwn"}
                         other{"00 biliwn"}
-                        two{"00 biliwn"}
-                        zero{"00 biliwn"}
+                        two{"00B"}
+                        zero{"00B"}
                     }
                     100000000000{
-                        few{"000 biliwn"}
-                        many{"000 biliwn"}
+                        few{"000B"}
+                        many{"000B"}
                         one{"000 biliwn"}
                         other{"000 biliwn"}
-                        two{"000 biliwn"}
-                        zero{"000 biliwn"}
+                        two{"000B"}
+                        zero{"000B"}
                     }
                     1000000000000{
-                        few{"0 thriliwn"}
-                        many{"0 thriliwn"}
+                        few{"0T"}
+                        many{"0T"}
                         one{"0 triliwn"}
                         other{"0 triliwn"}
-                        two{"0 driliwn"}
-                        zero{"0 triliwn"}
+                        two{"0T"}
+                        zero{"0T"}
                     }
                     10000000000000{
-                        few{"00 triliwn"}
-                        many{"00 triliwn"}
+                        few{"00T"}
+                        many{"00T"}
                         one{"00 triliwn"}
                         other{"00 triliwn"}
-                        two{"00 triliwn"}
-                        zero{"00 triliwn"}
+                        two{"00T"}
+                        zero{"00T"}
                     }
                     100000000000000{
-                        few{"000 triliwn"}
-                        many{"000 triliwn"}
-                        one{"000 triliwn"}
+                        few{"000T"}
+                        many{"000T"}
+                        one{"000T"}
                         other{"000 triliwn"}
-                        two{"000 triliwn"}
-                        zero{"000 triliwn"}
+                        two{"000T"}
+                        zero{"000T"}
                     }
                 }
             }
             patternsShort{
+                currencyFormat{
+                    1000{
+                        few{"¤0K"}
+                        many{"¤0K"}
+                        one{"¤0K"}
+                        other{"¤0K"}
+                        two{"¤0K"}
+                        zero{"¤0K"}
+                    }
+                    10000{
+                        few{"¤00K"}
+                        many{"¤00K"}
+                        one{"¤00K"}
+                        other{"¤00K"}
+                        two{"¤00K"}
+                        zero{"¤00K"}
+                    }
+                    100000{
+                        few{"¤000K"}
+                        many{"¤000K"}
+                        one{"¤000K"}
+                        other{"¤000K"}
+                        two{"¤000K"}
+                        zero{"¤000K"}
+                    }
+                    1000000{
+                        few{"¤0M"}
+                        many{"¤0M"}
+                        one{"¤0M"}
+                        other{"¤0M"}
+                        two{"¤0M"}
+                        zero{"¤0M"}
+                    }
+                    10000000{
+                        few{"¤00M"}
+                        many{"¤00M"}
+                        one{"¤00M"}
+                        other{"¤00M"}
+                        two{"¤00M"}
+                        zero{"¤00M"}
+                    }
+                    100000000{
+                        few{"¤000M"}
+                        many{"¤000M"}
+                        one{"¤000M"}
+                        other{"¤000M"}
+                        two{"¤000M"}
+                        zero{"¤000M"}
+                    }
+                    1000000000{
+                        few{"¤0B"}
+                        many{"¤0B"}
+                        one{"¤0B"}
+                        other{"¤0B"}
+                        two{"¤0B"}
+                        zero{"¤0B"}
+                    }
+                    10000000000{
+                        few{"¤00B"}
+                        many{"¤00B"}
+                        one{"¤00B"}
+                        other{"¤00B"}
+                        two{"¤00B"}
+                        zero{"¤00B"}
+                    }
+                    100000000000{
+                        few{"¤000B"}
+                        many{"¤000B"}
+                        one{"¤000B"}
+                        other{"¤000B"}
+                        two{"¤000B"}
+                        zero{"¤000B"}
+                    }
+                    1000000000000{
+                        few{"¤0T"}
+                        many{"¤0T"}
+                        one{"¤0T"}
+                        other{"¤0T"}
+                        two{"¤0T"}
+                        zero{"¤0T"}
+                    }
+                    10000000000000{
+                        few{"¤00T"}
+                        many{"¤00T"}
+                        one{"¤00T"}
+                        other{"¤00T"}
+                        two{"¤00T"}
+                        zero{"¤00T"}
+                    }
+                    100000000000000{
+                        few{"¤000T"}
+                        many{"¤000T"}
+                        one{"¤000T"}
+                        other{"¤000T"}
+                        two{"¤000T"}
+                        zero{"¤000T"}
+                    }
+                }
                 decimalFormat{
                     1000{
                         few{"0K"}
@@ -248,21 +358,37 @@ cy{
                 }
             }
             symbols{
-                decimal{"."}
                 exponential{"E"}
-                group{","}
                 infinity{"∞"}
                 list{";"}
-                minusSign{"-"}
                 nan{"NaN"}
                 perMille{"‰"}
                 percentSign{"%"}
-                plusSign{"+"}
-                superscriptingExponent{"x"}
+                superscriptingExponent{"×"}
+                timeSeparator{":"}
             }
         }
+        minimalPairs{
+            ordinal{
+                few{"{0}ydd ci"}
+                many{"{0}ed ci"}
+                one{"ci {0}af"}
+                other{"ci rhif {0}"}
+                two{"{0}il gi"}
+                zero{"{0}fed ci"}
+            }
+            plural{
+                few{"{0} chi, {0} cath"}
+                many{"{0} chi, {0} chath"}
+                one{"{0} ci, {0} gath"}
+                other{"{0} ci, {0} cath"}
+                two{"{0} gi, {0} gath"}
+                zero{"{0} cŵn, {0} cathod"}
+            }
+        }
+        minimumGroupingDigits{"1"}
     }
-    Version{"2.0.98.52"}
+    Version{"2.1.49.82"}
     calendar{
         generic{
             DateTimePatterns{
@@ -274,14 +400,24 @@ cy{
                 "d MMMM y G",
                 "d MMM y G",
                 "dd/MM/y GGGGG",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
+                "{1}, {0}",
+                "{1} 'am' {0}",
+                "{1} 'am' {0}",
+                "{1}, {0}",
+                "{1}, {0}",
             }
             availableFormats{
+                Bh{"h B"}
+                Bhm{"h:mm B"}
+                Bhms{"h:mm:ss B"}
+                E{"ccc"}
+                EBhm{"E h:mm B"}
+                EBhms{"E h:mm:ss B"}
+                EHm{"E HH:mm"}
+                EHms{"E HH:mm:ss"}
                 Ed{"E, d"}
+                Ehm{"E h:mm a"}
+                Ehms{"E h:mm:ss a"}
                 Gy{"y G"}
                 GyMMM{"MMM y G"}
                 GyMMMEd{"E, d MMM y G"}
@@ -293,6 +429,7 @@ cy{
                 MEd{"E, d/M"}
                 MMM{"LLL"}
                 MMMEd{"E, d MMM"}
+                MMMMd{"MMMM d"}
                 MMMd{"d MMM"}
                 Md{"d/M"}
                 d{"d"}
@@ -300,120 +437,176 @@ cy{
                 hm{"h:mm a"}
                 hms{"h:mm:ss a"}
                 ms{"mm:ss"}
-                y{"y"}
+                y{"y G"}
                 yyyy{"y G"}
-                yyyyM{"M/y G"}
-                yyyyMEd{"E, d/M/y G"}
+                yyyyM{"GGGGG y-MM"}
+                yyyyMEd{"GGGGG y-MM-dd, E"}
                 yyyyMMM{"MMM y G"}
                 yyyyMMMEd{"E, d MMM y G"}
+                yyyyMMMM{"G y MMMM"}
                 yyyyMMMd{"d MMM y G"}
-                yyyyMd{"d/M/y G"}
+                yyyyMd{"GGGGG y-MM-dd"}
                 yyyyQQQ{"QQQ y G"}
                 yyyyQQQQ{"QQQQ y G"}
             }
             intervalFormats{
+                Bh{
+                    B{"h B – h B"}
+                    h{"h–h B"}
+                }
+                Bhm{
+                    B{"h:mm B – h:mm B"}
+                    h{"h:mm–h:mm B"}
+                    m{"h:mm–h:mm B"}
+                }
+                Gy{
+                    G{"G y – G y"}
+                    y{"G y–y"}
+                }
+                GyM{
+                    G{"GGGGG y-MM – GGGGG y-MM"}
+                    M{"GGGGG y-MM – y-MM"}
+                    y{"GGGGG y-MM – y-MM"}
+                }
+                GyMEd{
+                    G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"}
+                    M{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                    d{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                    y{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                }
+                GyMMM{
+                    G{"G y MMM – G y MMM"}
+                    M{"G y MMM–MMM"}
+                    y{"G y MMM – y MMM"}
+                }
+                GyMMMEd{
+                    G{"G y MMM d, E – G y MMM d, E"}
+                    M{"G y MMM d, E – MMM d, E"}
+                    d{"G y MMM d, E – MMM d, E"}
+                    y{"G y MMM d, E – y MMM d, E"}
+                }
+                GyMMMd{
+                    G{"G y MMM d – G y MMM d"}
+                    M{"G y MMM d – MMM d"}
+                    d{"G y MMM d–d"}
+                    y{"G y MMM d – y MMM d"}
+                }
+                GyMd{
+                    G{"GGGGG y-MM-dd – GGGGG y-MM-dd"}
+                    M{"GGGGG y-MM-dd – y-MM-dd"}
+                    d{"GGGGG y-MM-dd – y-MM-dd"}
+                    y{"GGGGG y-MM-dd – y-MM-dd"}
+                }
                 H{
-                    H{"HHHH"}
+                    H{"HH – HH"}
                 }
                 Hm{
-                    H{"HH:mmHH:mm"}
-                    m{"HH:mmHH:mm"}
+                    H{"HH:mm – HH:mm"}
+                    m{"HH:mm – HH:mm"}
                 }
                 Hmv{
-                    H{"HH:mmHH:mm v"}
-                    m{"HH:mmHH:mm v"}
+                    H{"HH:mm – HH:mm v"}
+                    m{"HH:mm – HH:mm v"}
                 }
                 Hv{
-                    H{"HHHH v"}
+                    H{"HH – HH v"}
                 }
                 M{
-                    M{"M-M"}
+                    M{"M – M"}
                 }
                 MEd{
                     M{"E, d/M – E, d/M"}
                     d{"E, d/M – E, d/M"}
                 }
                 MMM{
-                    M{"MMM-MMM"}
+                    M{"MMM – MMM"}
                 }
                 MMMEd{
                     M{"E, d MMM – E, d MMM"}
                     d{"E, d MMM – E, d MMM"}
                 }
                 MMMM{
-                    M{"LLLL-LLLL"}
+                    M{"LLLLLLLL"}
                 }
                 MMMd{
                     M{"d MMM – d MMM"}
-                    d{"dd MMM"}
+                    d{"d – d MMM"}
                 }
                 Md{
                     M{"d/M – d/M"}
                     d{"d/M – d/M"}
                 }
                 d{
-                    d{"d-d"}
+                    d{"d – d"}
                 }
                 fallback{"{0} – {1}"}
                 h{
                     a{"h a – h a"}
-                    h{"hh a"}
+                    h{"h – h a"}
                 }
                 hm{
                     a{"h:mm a – h:mm a"}
-                    h{"h:mmh:mm a"}
-                    m{"h:mmh: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:mmh:mm a v"}
-                    m{"h:mmh: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{"hh a v"}
+                    h{"h – h a v"}
                 }
                 y{
-                    y{"y-y G"}
+                    y{"yy G"}
                 }
                 yM{
                     M{"M/y – M/y GGGGG"}
                     y{"M/y – M/y GGGGG"}
                 }
                 yMEd{
-                    M{"E, d/M/y - E, d/M/y GGGGG"}
-                    d{"E, d/M/y - E, d/M/y GGGGG"}
-                    y{"E, d/M/y - E, d/M/y GGGGG"}
+                    M{"E, d/M/y  E, d/M/y GGGGG"}
+                    d{"E, d/M/y  E, d/M/y GGGGG"}
+                    y{"E, d/M/y  E, d/M/y GGGGG"}
                 }
                 yMMM{
-                    M{"MMM - MMM y G"}
-                    y{"MMM y - MMM y G"}
+                    M{"MMM  MMM y G"}
+                    y{"MMM y  MMM y G"}
                 }
                 yMMMEd{
-                    M{"E, d MMM - E, d MMM y G"}
-                    d{"E, d MMM - E, d MMM y G"}
-                    y{"E, d MMM, y - E, d MMM y G"}
+                    M{"E, d MMM  E, d MMM y G"}
+                    d{"E, d MMM  E, d MMM y G"}
+                    y{"E, d MMM, y  E, d MMM y G"}
                 }
                 yMMMM{
                     M{"MMMM–MMMM y G"}
                     y{"MMMM y – MMMM 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{"d MMM  d MMM y G"}
+                    d{"dd MMM y G"}
+                    y{"d MMM y  d MMM y G"}
                 }
                 yMd{
-                    M{"d/M/y - d/M/y GGGGG"}
-                    d{"d/M/y - d/M/y GGGGG"}
-                    y{"d/M/y - d/M/y GGGGG"}
+                    M{"d/M/y  d/M/y GGGGG"}
+                    d{"d/M/y  d/M/y GGGGG"}
+                    y{"d/M/y  d/M/y GGGGG"}
                 }
             }
         }
         gregorian{
             AmPmMarkers{
-                "AM",
-                "PM",
+                "yb",
+                "yh",
+            }
+            AmPmMarkersAbbr{
+                "yb",
+                "yh",
+            }
+            AmPmMarkersNarrow{
+                "b",
+                "h",
             }
             DateTimePatterns{
                 "HH:mm:ss zzzz",
@@ -423,7 +616,7 @@ cy{
                 "EEEE, d MMMM y",
                 "d MMMM y",
                 "d MMM y",
-                "dd/MM/y",
+                "dd/MM/yy",
                 "{1} {0}",
                 "{1} 'am' {0}",
                 "{1} 'am' {0}",
@@ -434,11 +627,17 @@ cy{
                 Timezone{"{0} {1}"}
             }
             availableFormats{
+                Bh{"h B"}
+                Bhm{"h:mm B"}
+                Bhms{"h:mm:ss B"}
+                E{"ccc"}
+                EBhm{"E h:mm B"}
+                EBhms{"E h:mm:ss B"}
                 EHm{"E, HH:mm"}
                 EHms{"E, HH:mm:ss"}
-                Ed{"E, d"}
-                Ehm{"E, h.mm a"}
-                Ehms{"E, h.mm.ss a"}
+                Ed{"d, E"}
+                Ehm{"E, h:mm a"}
+                Ehms{"E, h:mm:ss a"}
                 Gy{"y G"}
                 GyMMM{"MMM y G"}
                 GyMMMEd{"E, d MMM y G"}
@@ -446,27 +645,49 @@ cy{
                 H{"HH"}
                 Hm{"HH:mm"}
                 Hms{"HH:mm:ss"}
+                Hmsv{"HH:mm:ss v"}
+                Hmv{"HH:mm v"}
                 M{"L"}
                 MEd{"E, d/M"}
                 MMM{"LLL"}
                 MMMEd{"E, d MMM"}
+                MMMMW{
+                    few{"'wythnos' W 'o' MMMM"}
+                    many{"'wythnos' W 'o' MMMM"}
+                    one{"'wythnos' W 'o' MMMM"}
+                    other{"'wythnos' W 'o' MMMM"}
+                    two{"'wythnos' W 'o' MMMM"}
+                    zero{"'wythnos' W 'o' MMMM"}
+                }
+                MMMMd{"MMMM d"}
                 MMMd{"d MMM"}
                 Md{"d/M"}
                 d{"d"}
                 h{"h a"}
-                hm{"h.mm a"}
+                hm{"h:mm a"}
                 hms{"h:mm:ss a"}
+                hmsv{"h:mm:ss a v"}
+                hmv{"h:mm a v"}
                 ms{"mm:ss"}
                 y{"y"}
                 yM{"M/y"}
                 yMEd{"E, d/M/y"}
                 yMMM{"MMM y"}
                 yMMMEd{"E, d MMM y"}
+                yMMMM{"MMMM y"}
                 yMMMd{"d MMM y"}
                 yMd{"d/M/y"}
                 yQ{"Q y"}
                 yQQQ{"QQQ y"}
                 yQQQQ{"QQQQ y"}
+                yw{
+                    few{"'wythnos' w 'o' Y"}
+                    many{"'wythnos' w 'o' Y"}
+                    one{"'wythnos' w 'o' Y"}
+                    other{"'wythnos' w 'o' Y"}
+                    two{"'wythnos' w 'o' Y"}
+                    zero{"'wythnos' w 'o' Y"}
+                }
             }
             dayNames{
                 format{
@@ -546,11 +767,69 @@ cy{
                     }
                 }
             }
+            dayPeriod{
+                format{
+                    abbreviated{
+                        afternoon1{"y prynhawn"}
+                        evening1{"yr hwyr"}
+                        midnight{"canol nos"}
+                        morning1{"y bore"}
+                        noon{"canol dydd"}
+                    }
+                    narrow{
+                        afternoon1{"yn y prynhawn"}
+                        evening1{"min nos"}
+                        midnight{"canol nos"}
+                        morning1{"yn y bore"}
+                        noon{"canol dydd"}
+                    }
+                    wide{
+                        afternoon1{"y prynhawn"}
+                        evening1{"yr hwyr"}
+                        midnight{"canol nos"}
+                        morning1{"y bore"}
+                        noon{"canol dydd"}
+                    }
+                }
+                stand-alone{
+                    abbreviated{
+                        afternoon1{"prynhawn"}
+                        am{"yb"}
+                        evening1{"yr hwyr"}
+                        midnight{"canol nos"}
+                        morning1{"bore"}
+                        noon{"canol dydd"}
+                        pm{"yh"}
+                    }
+                    narrow{
+                        afternoon1{"prynhawn"}
+                        am{"yb"}
+                        evening1{"min nos"}
+                        midnight{"canol nos"}
+                        morning1{"bore"}
+                        noon{"canol dydd"}
+                        pm{"yh"}
+                    }
+                    wide{
+                        afternoon1{"y prynhawn"}
+                        am{"yb"}
+                        evening1{"yr hwyr"}
+                        midnight{"canol nos"}
+                        morning1{"y bore"}
+                        noon{"canol dydd"}
+                        pm{"yh"}
+                    }
+                }
+            }
             eras{
                 abbreviated{
                     "CC",
                     "OC",
                 }
+                abbreviated%variant{
+                    "CCC",
+                    "CYCY",
+                }
                 narrow{
                     "C",
                     "O",
@@ -559,103 +838,154 @@ cy{
                     "Cyn Crist",
                     "Oed Crist",
                 }
+                wide%variant{
+                    "Cyn Cyfnod Cyffredin",
+                    "Cyfnod Cyffredin",
+                }
             }
             intervalFormats{
+                Bh{
+                    B{"h B – h B"}
+                    h{"h–h B"}
+                }
+                Bhm{
+                    B{"h:mm B – h:mm B"}
+                    h{"h:mm–h:mm B"}
+                    m{"h:mm–h:mm B"}
+                }
+                Gy{
+                    G{"G y – G y"}
+                    y{"G y–y"}
+                }
+                GyM{
+                    G{"GGGGG y-MM – GGGGG y-MM"}
+                    M{"GGGGG y-MM – y-MM"}
+                    y{"GGGGG y-MM – y-MM"}
+                }
+                GyMEd{
+                    G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"}
+                    M{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                    d{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                    y{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                }
+                GyMMM{
+                    G{"G y MMM – G y MMM"}
+                    M{"G y MMM–MMM"}
+                    y{"G y MMM – y MMM"}
+                }
+                GyMMMEd{
+                    G{"G y MMM d, E – G y MMM d, E"}
+                    M{"G y MMM d, E – MMM d, E"}
+                    d{"G y MMM d, E – MMM d, E"}
+                    y{"G y MMM d, E – y MMM d, E"}
+                }
+                GyMMMd{
+                    G{"G y MMM d – G y MMM d"}
+                    M{"G y MMM d – MMM d"}
+                    d{"G y MMM d–d"}
+                    y{"G y MMM d – y MMM d"}
+                }
+                GyMd{
+                    G{"GGGGG y-MM-dd – GGGGG y-MM-dd"}
+                    M{"GGGGG y-MM-dd – y-MM-dd"}
+                    d{"GGGGG y-MM-dd – y-MM-dd"}
+                    y{"GGGGG y-MM-dd – y-MM-dd"}
+                }
                 H{
-                    H{"HHHH"}
+                    H{"HH – HH"}
                 }
                 Hm{
-                    H{"HH:mmHH:mm"}
-                    m{"HH:mmHH:mm"}
+                    H{"HH:mm – HH:mm"}
+                    m{"HH:mm – HH:mm"}
                 }
                 Hmv{
-                    H{"HH:mmHH:mm v"}
-                    m{"HH:mmHH:mm v"}
+                    H{"HH:mm – HH:mm v"}
+                    m{"HH:mm – HH:mm v"}
                 }
                 Hv{
-                    H{"HHHH v"}
+                    H{"HH – HH v"}
                 }
                 M{
-                    M{"M-M"}
+                    M{"MM"}
                 }
                 MEd{
                     M{"E, d/M – E, d/M"}
                     d{"E, d/M – E, d/M"}
                 }
                 MMM{
-                    M{"MMM-MMM"}
+                    M{"MMMMMM"}
                 }
                 MMMEd{
                     M{"E, d MMM – E, d MMM"}
                     d{"E, d MMM – E, d MMM"}
                 }
                 MMMM{
-                    M{"LLLL-LLLL"}
+                    M{"LLLLLLLL"}
                 }
                 MMMd{
                     M{"d MMM – d MMM"}
-                    d{"dd MMM"}
+                    d{"d – d MMM"}
                 }
                 Md{
                     M{"d/M – d/M"}
                     d{"d/M – d/M"}
                 }
                 d{
-                    d{"d-d"}
+                    d{"dd"}
                 }
                 fallback{"{0} – {1}"}
                 h{
                     a{"h a – h a"}
-                    h{"hh a"}
+                    h{"h – h a"}
                 }
                 hm{
                     a{"h:mm a – h:mm a"}
-                    h{"h:mmh:mm a"}
-                    m{"h:mmh: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:mmh:mm a v"}
-                    m{"h:mmh: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{"hh a v"}
+                    h{"h – h a v"}
                 }
                 y{
-                    y{"y-y"}
+                    y{"yy"}
                 }
                 yM{
                     M{"M/y – M/y"}
                     y{"M/y – M/y"}
                 }
                 yMEd{
-                    M{"E, d/M/y - E, d/M/y"}
-                    d{"E, d/M/y - E, d/M/y"}
-                    y{"E, d/M/y - E, d/M/y"}
+                    M{"E, d/M/y  E, d/M/y"}
+                    d{"E, d/M/y  E, d/M/y"}
+                    y{"E, d/M/y  E, d/M/y"}
                 }
                 yMMM{
-                    M{"MMM - MMM y"}
-                    y{"MMM y - MMM y"}
+                    M{"MMM  MMM y"}
+                    y{"MMM y  MMM y"}
                 }
                 yMMMEd{
-                    M{"E, d MMM - E, d MMM y"}
-                    d{"E, d MMM - E, d MMM y"}
-                    y{"E, d MMM, y - E, d MMM y"}
+                    M{"E, d MMM  E, d MMM y"}
+                    d{"E, d MMM  E, d MMM y"}
+                    y{"E, d MMM y – E, d MMM y"}
                 }
                 yMMMM{
-                    M{"MMMMMMMM y"}
+                    M{"MMMM – MMMM y"}
                     y{"MMMM y – MMMM y"}
                 }
                 yMMMd{
-                    M{"d MMM - d MMM y"}
-                    d{"d-d MMM y"}
-                    y{"d MMM, y - d MMM y"}
+                    M{"d MMM  d MMM y"}
+                    d{"dd MMM y"}
+                    y{"d MMM, y  d MMM y"}
                 }
                 yMd{
-                    M{"d/M/y - d/M/y"}
-                    d{"d/M/y - d/M/y"}
-                    y{"d/M/y - d/M/y"}
+                    M{"d/M/y  d/M/y"}
+                    d{"d/M/y  d/M/y"}
+                    y{"d/M/y  d/M/y"}
                 }
             }
             monthNames{
@@ -663,7 +993,7 @@ cy{
                     abbreviated{
                         "Ion",
                         "Chwef",
-                        "Mawrth",
+                        "Maw",
                         "Ebrill",
                         "Mai",
                         "Meh",
@@ -763,7 +1093,7 @@ cy{
                         "4",
                     }
                     wide{
-                        "Chwarter 1af",
+                        "chwarter 1af",
                         "2il chwarter",
                         "3ydd chwarter",
                         "4ydd chwarter",
@@ -792,20 +1122,152 @@ cy{
             }
         }
     }
-    delimiters{
-        alternateQuotationEnd{"”"}
-        alternateQuotationStart{"“"}
-        quotationEnd{"’"}
-        quotationStart{"‘"}
+    characterLabel{
+        activities{"gweithgaredd"}
+        african_scripts{"sgript Affricanaidd"}
+        american_scripts{"sgript Americanaidd"}
+        animal{"anifail"}
+        animals_nature{"anifail neu natur"}
+        arrows{"saeth"}
+        body{"corff"}
+        box_drawing{"dylunio bocs"}
+        braille{"braille"}
+        building{"adeilad"}
+        bullets_stars{"bwled neu seren"}
+        consonantal_jamo{"jamo cytseiniol"}
+        currency_symbols{"symbol arian"}
+        dash_connector{"llinell doriad neu gysylltydd"}
+        digits{"digid"}
+        dingbats{"dingbat"}
+        divination_symbols{"symbol darogan"}
+        downwards_arrows{"saeth i lawr"}
+        downwards_upwards_arrows{"saeth i fyny ac i lawr"}
+        east_asian_scripts{"sgript asia dwyreiniol"}
+        emoji{"emoji"}
+        european_scripts{"sgript Ewropeaidd"}
+        female{"benywaidd"}
+        flag{"baner"}
+        flags{"baneri"}
+        food_drink{"bwyd a diod"}
+        format{"fformat"}
+        format_whitespace{"fformat a bwlch gwyn"}
+        full_width_form_variant{"amryw ffurf lled llawn"}
+        geometric_shapes{"siâp geometrig"}
+        half_width_form_variant{"amryw ffurf hanner lled"}
+        han_characters{"llythyren Han"}
+        han_radicals{"gwreiddyn Han"}
+        hanja{"hanja"}
+        hanzi_simplified{"Hanzi (symledig)"}
+        hanzi_traditional{"Hanzi (traddodiadol)"}
+        heart{"calon"}
+        historic_scripts{"sgript hanesyddol"}
+        ideographic_desc_characters{"llythyren disg. ideograffeg"}
+        japanese_kana{"kana Japaneaidd"}
+        kanbun{"kanbun"}
+        kanji{"kanji"}
+        keycap{"gorchudd bysell"}
+        leftwards_arrows{"saeth i’r chwith"}
+        leftwards_rightwards_arrows{"saeth i’r chwith ac i’r dde"}
+        letterlike_symbols{"symbol math llythyren"}
+        limited_use{"Defnydd Cyfyngedig"}
+        male{"gwrywaidd"}
+        math_symbols{"symbol mathemategol"}
+        middle_eastern_scripts{"sgript y Dwyrain Canol"}
+        miscellaneous{"amrywiol"}
+        modern_scripts{"sgript modern"}
+        modifier{"addasydd"}
+        musical_symbols{"symbol cerddorol"}
+        nature{"natur"}
+        nonspacing{"heb fylchau"}
+        numbers{"rhifau"}
+        objects{"gwrthrych"}
+        other{"arall"}
+        paired{"paredig"}
+        person{"person"}
+        phonetic_alphabet{"y wyddor seinegol"}
+        pictographs{"pictograff"}
+        place{"lle"}
+        plant{"planhigyn"}
+        punctuation{"atalnodi"}
+        rightwards_arrows{"saeth i’r dde"}
+        sign_standard_symbols{"arwydd neu symbol"}
+        small_form_variant{"amryw ffurf fach"}
+        smiley{"gwên"}
+        smileys_people{"gwenoglun neu berson"}
+        south_asian_scripts{"sgript Asia Deheuol"}
+        southeast_asian_scripts{"sgript De-Ddwyrain Asia"}
+        spacing{"bylchu"}
+        sport{"chwaraeon"}
+        symbols{"symbol"}
+        technical_symbols{"symbol technegol"}
+        tone_marks{"marc tôn"}
+        travel{"teithio"}
+        travel_places{"teithio neu le"}
+        upwards_arrows{"Saethau i Fyny"}
+        variant_forms{"Ffurfiau Amrywiol"}
+        vocalic_jamo{"jamo llafarog"}
+        weather{"tywydd"}
+        western_asian_scripts{"sgript Asia Gorllewinol"}
+        whitespace{"bwlch gwyn"}
     }
-    durationUnits{
-        hm{"h.mm"}
-        hms{"h.mm.ss"}
-        ms{"m.ss"}
+    delimiters{
+        alternateQuotationEnd{"’"}
+        alternateQuotationStart{"‘"}
+        quotationEnd{"”"}
+        quotationStart{"“"}
     }
     fields{
         day{
-            dn{"Dydd"}
+            dn{"diwrnod"}
+            relative{
+                "-1"{"ddoe"}
+                "-2"{"echdoe"}
+                "0"{"heddiw"}
+                "1"{"yfory"}
+                "2"{"drennydd"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} diwrnod"}
+                    many{"ymhen {0} diwrnod"}
+                    one{"ymhen diwrnod"}
+                    other{"ymhen {0} diwrnod"}
+                    two{"ymhen deuddydd"}
+                    zero{"ymhen {0} diwrnod"}
+                }
+                past{
+                    few{"{0} diwrnod yn ôl"}
+                    many{"{0} diwrnod yn ôl"}
+                    one{"{0} diwrnod yn ôl"}
+                    other{"{0} diwrnod yn ôl"}
+                    two{"{0} ddiwrnod yn ôl"}
+                    zero{"{0} diwrnod yn ôl"}
+                }
+            }
+        }
+        day-narrow{
+            dn{"diwrnod"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} diwrnod"}
+                    many{"ymhen {0} diwrnod"}
+                    one{"ymhen {0} diwrnod"}
+                    other{"ymhen {0} diwrnod"}
+                    two{"ymhen {0} diwrnod"}
+                    zero{"ymhen {0} diwrnod"}
+                }
+                past{
+                    few{"{0} diwrnod yn ôl"}
+                    many{"{0} diwrnod yn ôl"}
+                    one{"{0} diwrnod yn ôl"}
+                    other{"{0} diwrnod yn ôl"}
+                    two{"{0} ddiwrnod yn ôl"}
+                    zero{"{0} diwrnod yn ôl"}
+                }
+            }
+        }
+        day-short{
+            dn{"diwrnod"}
             relative{
                 "-1"{"ddoe"}
                 "-2"{"echdoe"}
@@ -815,12 +1277,12 @@ cy{
             }
             relativeTime{
                 future{
-                    few{"Ymhen tridiau"}
-                    many{"Ymhen {0} diwrnod"}
-                    one{"Ymhen diwrnod"}
-                    other{"Ymhen {0} diwrnod"}
-                    two{"Ymhen deuddydd"}
-                    zero{"Ymhen {0} diwrnod"}
+                    few{"ymhen {0} diwrnod"}
+                    many{"ymhen {0} diwrnod"}
+                    one{"ymhen diwrnod"}
+                    other{"ymhen {0} diwrnod"}
+                    two{"ymhen deuddydd"}
+                    zero{"ymhen {0} diwrnod"}
                 }
                 past{
                     few{"{0} diwrnod yn ôl"}
@@ -832,11 +1294,32 @@ cy{
                 }
             }
         }
+        dayOfYear{
+            dn{"rhif y dydd yn y flwyddyn"}
+        }
+        dayOfYear-narrow{
+            dn{"dydd y fl."}
+        }
+        dayOfYear-short{
+            dn{"rhif y dydd yn y fl."}
+        }
         dayperiod{
             dn{"AM/PM"}
         }
+        dayperiod-narrow{
+            dn{"AM/PM"}
+        }
+        dayperiod-short{
+            dn{"AM/PM"}
+        }
         era{
-            dn{"Oes"}
+            dn{"oes"}
+        }
+        era-narrow{
+            dn{"oes"}
+        }
+        era-short{
+            dn{"oes"}
         }
         fri{
             relative{
@@ -844,17 +1327,130 @@ cy{
                 "0"{"dydd Gwener yma"}
                 "1"{"dydd Gwener nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Gwener"}
+                    many{"ymhen {0} dydd Gwener"}
+                    one{"ymhen {0} dydd Gwener"}
+                    other{"ymhen {0} dydd Gwener"}
+                    two{"ymhen {0} dydd Gwener"}
+                    zero{"ymhen {0} dydd Gwener"}
+                }
+                past{
+                    few{"{0} dydd Gwener yn ôl"}
+                    many{"{0} dydd Gwener yn ôl"}
+                    one{"{0} dydd Gwener yn ôl"}
+                    other{"{0} dydd Gwener yn ôl"}
+                    two{"{0} dydd Gwener yn ôl"}
+                    zero{"{0} dydd Gwener yn ôl"}
+                }
+            }
+        }
+        fri-narrow{
+            relative{
+                "-1"{"Gwener diwethaf"}
+                "0"{"Gwener yma"}
+                "1"{"Gwener nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Gwener"}
+                    many{"ymhen {0} dydd Gwener"}
+                    one{"ymhen {0} dydd Gwener"}
+                    other{"ymhen {0} dydd Gwener"}
+                    two{"ymhen {0} dydd Gwener"}
+                    zero{"ymhen {0} dydd Gwener"}
+                }
+                past{
+                    few{"{0} dydd Gwener yn ôl"}
+                    many{"{0} dydd Gwener yn ôl"}
+                    one{"{0} dydd Gwener yn ôl"}
+                    other{"{0} dydd Gwener yn ôl"}
+                    two{"{0} dydd Gwener yn ôl"}
+                    zero{"{0} dydd Gwener yn ôl"}
+                }
+            }
+        }
+        fri-short{
+            relative{
+                "-1"{"Gwener diwethaf"}
+                "0"{"Gwener yma"}
+                "1"{"Gwener nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Gwener"}
+                    many{"ymhen {0} dydd Gwener"}
+                    one{"ymhen {0} dydd Gwener"}
+                    other{"ymhen {0} dydd Gwener"}
+                    two{"ymhen {0} dydd Gwener"}
+                    zero{"ymhen {0} dydd Gwener"}
+                }
+                past{
+                    few{"{0} dydd Gwener yn ôl"}
+                    many{"{0} dydd Gwener yn ôl"}
+                    one{"{0} dydd Gwener yn ôl"}
+                    other{"{0} dydd Gwener yn ôl"}
+                    two{"{0} dydd Gwener yn ôl"}
+                    zero{"{0} dydd Gwener yn ôl"}
+                }
+            }
         }
         hour{
-            dn{"Awr"}
+            dn{"awr"}
+            relative{
+                "0"{"yr awr hon"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} awr"}
+                    many{"ymhen {0} awr"}
+                    one{"ymhen awr"}
+                    other{"ymhen {0} awr"}
+                    two{"ymhen {0} awr"}
+                    zero{"ymhen {0} awr"}
+                }
+                past{
+                    few{"{0} awr yn ôl"}
+                    many{"{0} awr yn ôl"}
+                    one{"{0} awr yn ôl"}
+                    other{"{0} awr yn ôl"}
+                    two{"{0} awr yn ôl"}
+                    zero{"{0} awr yn ôl"}
+                }
+            }
+        }
+        hour-narrow{
+            dn{"awr"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} awr"}
+                    many{"ymhen {0} awr"}
+                    one{"ymhen {0} awr"}
+                    other{"ymhen {0} awr"}
+                    two{"ymhen {0} awr"}
+                    zero{"ymhen {0} awr"}
+                }
+                past{
+                    few{"{0} awr yn ôl"}
+                    many{"{0} awr yn ôl"}
+                    one{"{0} awr yn ôl"}
+                    other{"{0} awr yn ôl"}
+                    two{"{0} awr yn ôl"}
+                    zero{"{0} awr yn ôl"}
+                }
+            }
+        }
+        hour-short{
+            dn{"awr"}
             relativeTime{
                 future{
-                    few{"Ymhen {0} awr"}
-                    many{"Ymhen {0} awr"}
-                    one{"Ymhen {0} awr"}
-                    other{"Ymhen {0} awr"}
-                    two{"Ymhen {0} awr"}
-                    zero{"Ymhen {0} awr"}
+                    few{"ymhen {0} awr"}
+                    many{"ymhen {0} awr"}
+                    one{"ymhen awr"}
+                    other{"ymhen {0} awr"}
+                    two{"ymhen {0} awr"}
+                    zero{"ymhen {0} awr"}
                 }
                 past{
                     few{"{0} awr yn ôl"}
@@ -867,22 +1463,67 @@ cy{
             }
         }
         minute{
-            dn{"Munud"}
+            dn{"munud"}
+            relative{
+                "0"{"y funud hon"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} munud"}
+                    many{"ymhen {0} munud"}
+                    one{"ymhen {0} munud"}
+                    other{"ymhen {0} munud"}
+                    two{"ymhen {0} munud"}
+                    zero{"ymhen {0} munud"}
+                }
+                past{
+                    few{"{0} munud yn ôl"}
+                    many{"{0} munud yn ôl"}
+                    one{"{0} munud yn ôl"}
+                    other{"{0} munud yn ôl"}
+                    two{"{0} munud yn ôl"}
+                    zero{"{0} munud yn ôl"}
+                }
+            }
+        }
+        minute-narrow{
+            dn{"mun."}
+            relativeTime{
+                future{
+                    few{"ymhen {0} mun."}
+                    many{"ymhen {0} mun."}
+                    one{"ymhen {0} mun."}
+                    other{"ymhen {0} mun."}
+                    two{"ymhen {0} mun."}
+                    zero{"ymhen {0} mun."}
+                }
+                past{
+                    few{"{0} mun. yn ôl"}
+                    many{"{0} mun. yn ôl"}
+                    one{"{0} mun. yn ôl"}
+                    other{"{0} mun. yn ôl"}
+                    two{"{0} mun. yn ôl"}
+                    zero{"{0} mun. yn ôl"}
+                }
+            }
+        }
+        minute-short{
+            dn{"mun."}
             relativeTime{
                 future{
-                    few{"Ymhen {0} munud"}
-                    many{"Ymhen {0} munud"}
-                    one{"Ymhen munud"}
-                    other{"Ymhen {0} munud"}
-                    two{"Ymhen {0} funud"}
-                    zero{"Ymhen {0} munud"}
+                    few{"ymhen {0} munud"}
+                    many{"ymhen {0} munud"}
+                    one{"ymhen {0} mun."}
+                    other{"ymhen {0} munud"}
+                    two{"ymhen {0} fun."}
+                    zero{"ymhen {0} munud"}
                 }
                 past{
                     few{"{0} munud yn ôl"}
                     many{"{0} munud yn ôl"}
                     one{"{0} munud yn ôl"}
                     other{"{0} munud yn ôl"}
-                    two{"{0} funud yn ôl"}
+                    two{"{0} fun. yn ôl"}
                     zero{"{0} munud yn ôl"}
                 }
             }
@@ -893,58 +1534,346 @@ cy{
                 "0"{"dydd Llun yma"}
                 "1"{"dydd Llun nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} Dydd Llun"}
+                    many{"ymhen {0} Dydd Llun"}
+                    one{"ymhen {0} Dydd Llun"}
+                    other{"ymhen {0} Dydd Llun"}
+                    two{"ymhen {0} Dydd Llun"}
+                    zero{"ymhen {0} Dydd Llun"}
+                }
+                past{
+                    few{"{0} dydd Llun yn ôl"}
+                    many{"{0} dydd Llun yn ôl"}
+                    one{"{0} dydd Llun yn ôl"}
+                    other{"{0} dydd Llun yn ôl"}
+                    two{"{0} dydd Llun yn ôl"}
+                    zero{"{0} dydd Llun yn ôl"}
+                }
+            }
         }
-        month{
-            dn{"Mis"}
+        mon-narrow{
             relative{
-                "-1"{"mis diwethaf"}
-                "0"{"y mis hwn"}
-                "1"{"mis nesaf"}
+                "-1"{"Llun diwethaf"}
+                "0"{"Llun yma"}
+                "1"{"Llun nesaf"}
             }
             relativeTime{
                 future{
-                    few{"Ymhen {0} mis"}
-                    many{"Ymhen {0} mis"}
-                    one{"Ymhen mis"}
-                    other{"Ymhen {0} mis"}
-                    two{"Ymhen deufis"}
-                    zero{"Ymhen {0} mis"}
+                    few{"ymhen {0} Dydd Llun"}
+                    many{"ymhen {0} Dydd Llun"}
+                    one{"ymhen {0} Dydd Llun"}
+                    other{"ymhen {0} Dydd Llun"}
+                    two{"ymhen {0} Dydd Llun"}
+                    zero{"ymhen {0} Dydd Llun"}
                 }
                 past{
-                    few{"{0} mis yn ôl"}
-                    many{"{0} mis yn ôl"}
-                    one{"{0} mis yn ôl"}
-                    other{"{0} mis yn ôl"}
-                    two{"{0} fis yn ôl"}
-                    zero{"{0} mis yn ôl"}
+                    few{"{0} dydd Llun yn ôl"}
+                    many{"{0} dydd Llun yn ôl"}
+                    one{"{0} dydd Llun yn ôl"}
+                    other{"{0} dydd Llun yn ôl"}
+                    two{"{0} dydd Llun yn ôl"}
+                    zero{"{0} dydd Llun yn ôl"}
                 }
             }
         }
-        sat{
+        mon-short{
             relative{
-                "-1"{"dydd Sadwrn diwethaf"}
+                "-1"{"Llun diwethaf"}
+                "0"{"Llun yma"}
+                "1"{"Llun nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} Dydd Llun"}
+                    many{"ymhen {0} Dydd Llun"}
+                    one{"ymhen {0} Dydd Llun"}
+                    other{"ymhen {0} Dydd Llun"}
+                    two{"ymhen {0} Dydd Llun"}
+                    zero{"ymhen {0} Dydd Llun"}
+                }
+                past{
+                    few{"{0} dydd Llun yn ôl"}
+                    many{"{0} dydd Llun yn ôl"}
+                    one{"{0} dydd Llun yn ôl"}
+                    other{"{0} dydd Llun yn ôl"}
+                    two{"{0} dydd Llun yn ôl"}
+                    zero{"{0} dydd Llun yn ôl"}
+                }
+            }
+        }
+        month{
+            dn{"mis"}
+            relative{
+                "-1"{"mis diwethaf"}
+                "0"{"y mis hwn"}
+                "1"{"mis nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} mis"}
+                    many{"ymhen {0} mis"}
+                    one{"ymhen mis"}
+                    other{"ymhen {0} mis"}
+                    two{"ymhen deufis"}
+                    zero{"ymhen {0} mis"}
+                }
+                past{
+                    few{"{0} mis yn ôl"}
+                    many{"{0} mis yn ôl"}
+                    one{"{0} mis yn ôl"}
+                    other{"{0} mis yn ôl"}
+                    two{"{0} fis yn ôl"}
+                    zero{"{0} mis yn ôl"}
+                }
+            }
+        }
+        month-narrow{
+            dn{"mis"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} mis"}
+                    many{"ymhen {0} mis"}
+                    one{"ymhen mis"}
+                    other{"ymhen {0} mis"}
+                    two{"ymhen deufis"}
+                    zero{"ymhen {0} mis"}
+                }
+                past{
+                    few{"{0} mis yn ôl"}
+                    many{"{0} mis yn ôl"}
+                    one{"{0} mis yn ôl"}
+                    other{"{0} mis yn ôl"}
+                    two{"{0} fis yn ôl"}
+                    zero{"{0} mis yn ôl"}
+                }
+            }
+        }
+        month-short{
+            dn{"mis"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} mis"}
+                    many{"ymhen {0} mis"}
+                    one{"ymhen mis"}
+                    other{"ymhen {0} mis"}
+                    two{"ymhen deufis"}
+                    zero{"ymhen {0} mis"}
+                }
+                past{
+                    few{"{0} mis yn ôl"}
+                    many{"{0} mis yn ôl"}
+                    one{"{0} mis yn ôl"}
+                    other{"{0} mis yn ôl"}
+                    two{"deufis yn ôl"}
+                    zero{"{0} mis yn ôl"}
+                }
+            }
+        }
+        quarter{
+            dn{"chwarter"}
+            relative{
+                "-1"{"chwarter olaf"}
+                "0"{"chwarter hwn"}
+                "1"{"chwarter nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} chwarter"}
+                    many{"ymhen {0} chwarter"}
+                    one{"ymhen {0} chwarter"}
+                    other{"ymhen {0} chwarter"}
+                    two{"ymhen {0} chwarter"}
+                    zero{"ymhen {0} chwarter"}
+                }
+                past{
+                    few{"{0} chwarter yn ôl"}
+                    many{"{0} chwarter yn ôl"}
+                    one{"{0} chwarter yn ôl"}
+                    other{"{0} o chwarteri yn ôl"}
+                    two{"{0} chwarter yn ôl"}
+                    zero{"{0} o chwarteri yn ôl"}
+                }
+            }
+        }
+        quarter-narrow{
+            dn{"chw."}
+            relativeTime{
+                future{
+                    few{"ymhen {0} chwarter"}
+                    many{"ymhen {0} chwarter"}
+                    one{"ymhen {0} chwarter"}
+                    other{"ymhen {0} chwarter"}
+                    two{"ymhen {0} chwarter"}
+                    zero{"ymhen {0} chwarter"}
+                }
+                past{
+                    few{"{0} chwarter yn ôl"}
+                    many{"{0} chwarter yn ôl"}
+                    one{"{0} chwarter yn ôl"}
+                    other{"{0} o chwarteri yn ôl"}
+                    two{"{0} chwarter yn ôl"}
+                    zero{"{0} o chwarteri yn ôl"}
+                }
+            }
+        }
+        quarter-short{
+            dn{"chwarter"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} chwarter"}
+                    many{"ymhen {0} chwarter"}
+                    one{"ymhen {0} chwarter"}
+                    other{"ymhen {0} chwarter"}
+                    two{"ymhen {0} chwarter"}
+                    zero{"ymhen {0} chwarter"}
+                }
+                past{
+                    few{"{0} chwarter yn ôl"}
+                    many{"{0} chwarter yn ôl"}
+                    one{"{0} chwarter yn ôl"}
+                    other{"{0} o chwarteri yn ôl"}
+                    two{"{0} chwarter yn ôl"}
+                    zero{"{0} o chwarteri yn ôl"}
+                }
+            }
+        }
+        sat{
+            relative{
+                "-1"{"dydd Sadwrn diwethaf"}
                 "0"{"dydd Sadwrn yma"}
                 "1"{"dydd Sadwrn nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Sadwrn"}
+                    many{"ymhen {0} dydd Sadwrn"}
+                    one{"ymhen {0} dydd Sadwrn"}
+                    other{"ymhen {0} dydd Sadwrn"}
+                    two{"ymhen {0} dydd Sadwrn"}
+                    zero{"ymhen {0} dydd Sadwrn"}
+                }
+                past{
+                    few{"{0} dydd Sadwrn yn ôl"}
+                    many{"{0} dydd Sadwrn yn ôl"}
+                    one{"{0} dydd Sadwrn yn ôl"}
+                    other{"{0} dydd Sadwrn yn ôl"}
+                    two{"{0} dydd Sadwrn yn ôl"}
+                    zero{"{0} dydd Sadwrn yn ôl"}
+                }
+            }
+        }
+        sat-narrow{
+            relative{
+                "-1"{"Sadwrn diwethaf"}
+                "0"{"Sadwrn yma"}
+                "1"{"Sadwrn nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Sadwrn"}
+                    many{"ymhen {0} dydd Sadwrn"}
+                    one{"ymhen {0} dydd Sadwrn"}
+                    other{"ymhen {0} dydd Sadwrn"}
+                    two{"ymhen {0} dydd Sadwrn"}
+                    zero{"ymhen {0} dydd Sadwrn"}
+                }
+                past{
+                    few{"{0} dydd Sadwrn yn ôl"}
+                    many{"{0} dydd Sadwrn yn ôl"}
+                    one{"{0} dydd Sadwrn yn ôl"}
+                    other{"{0} dydd Sadwrn yn ôl"}
+                    two{"{0} dydd Sadwrn yn ôl"}
+                    zero{"{0} dydd Sadwrn yn ôl"}
+                }
+            }
+        }
+        sat-short{
+            relative{
+                "-1"{"Sadwrn diwethaf"}
+                "0"{"Sadwrn yma"}
+                "1"{"Sadwrn nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Sadwrn"}
+                    many{"ymhen {0} dydd Sadwrn"}
+                    one{"ymhen {0} dydd Sadwrn"}
+                    other{"ymhen {0} dydd Sadwrn"}
+                    two{"ymhen {0} dydd Sadwrn"}
+                    zero{"ymhen {0} dydd Sadwrn"}
+                }
+                past{
+                    few{"{0} dydd Sadwrn yn ôl"}
+                    many{"{0} dydd Sadwrn yn ôl"}
+                    one{"{0} dydd Sadwrn yn ôl"}
+                    other{"{0} dydd Sadwrn yn ôl"}
+                    two{"{0} dydd Sadwrn yn ôl"}
+                    zero{"{0} dydd Sadwrn yn ôl"}
+                }
+            }
         }
         second{
-            dn{"Eiliad"}
+            dn{"eiliad"}
             relative{
                 "0"{"nawr"}
             }
             relativeTime{
                 future{
-                    few{"Ymhen {0} eiliad"}
-                    many{"Ymhen {0} eiliad"}
-                    one{"Ymhen eiliad"}
-                    other{"Ymhen {0} eiliad"}
-                    two{"Ymhen {0} eiliad"}
-                    zero{"Ymhen {0} eiliad"}
+                    few{"ymhen {0} eiliad"}
+                    many{"ymhen {0} eiliad"}
+                    one{"ymhen {0} eiliad"}
+                    other{"ymhen {0} eiliad"}
+                    two{"ymhen {0} eiliad"}
+                    zero{"ymhen {0} eiliad"}
+                }
+                past{
+                    few{"{0} eiliad yn ôl"}
+                    many{"{0} eiliad yn ôl"}
+                    one{"{0} eiliad yn ôl"}
+                    other{"{0} eiliad yn ôl"}
+                    two{"{0} eiliad yn ôl"}
+                    zero{"{0} eiliad yn ôl"}
+                }
+            }
+        }
+        second-narrow{
+            dn{"eiliad"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} eiliad"}
+                    many{"ymhen {0} eiliad"}
+                    one{"ymhen {0} eiliad"}
+                    other{"ymhen {0} eiliad"}
+                    two{"ymhen {0} eiliad"}
+                    zero{"ymhen {0} eiliad"}
                 }
                 past{
                     few{"{0} eiliad yn ôl"}
                     many{"{0} eiliad yn ôl"}
-                    one{"eiliad yn ôl"}
+                    one{"{0} eiliad yn ôl"}
+                    other{"{0} eiliad yn ôl"}
+                    two{"{0} eiliad yn ôl"}
+                    zero{"{0} eiliad yn ôl"}
+                }
+            }
+        }
+        second-short{
+            dn{"eiliad"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} eiliad"}
+                    many{"ymhen {0} eiliad"}
+                    one{"ymhen {0} eiliad"}
+                    other{"ymhen {0} eiliad"}
+                    two{"ymhen {0} eiliad"}
+                    zero{"ymhen {0} eiliad"}
+                }
+                past{
+                    few{"{0} eiliad yn ôl"}
+                    many{"{0} eiliad yn ôl"}
+                    one{"{0} eiliad yn ôl"}
                     other{"{0} eiliad yn ôl"}
                     two{"{0} eiliad yn ôl"}
                     zero{"{0} eiliad yn ôl"}
@@ -957,6 +1886,74 @@ cy{
                 "0"{"dydd Sul yma"}
                 "1"{"dydd Sul nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} Dydd Sul"}
+                    many{"ymhen {0} Dydd Sul"}
+                    one{"ymhen {0} Dydd Sul"}
+                    other{"ymhen {0} Dydd Sul"}
+                    two{"ymhen {0} Dydd Sul"}
+                    zero{"ymhen {0} Dydd Sul"}
+                }
+                past{
+                    few{"{0} Dydd Sul yn ôl"}
+                    many{"{0} Dydd Sul yn ôl"}
+                    one{"{0} Dydd Sul yn ôl"}
+                    other{"{0} Dydd Sul yn ôl"}
+                    two{"{0} Dydd Sul yn ôl"}
+                    zero{"{0} Dydd Sul yn ôl"}
+                }
+            }
+        }
+        sun-narrow{
+            relative{
+                "-1"{"Sul diwethaf"}
+                "0"{"Sul yma"}
+                "1"{"Sul nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} Dydd Sul"}
+                    many{"ymhen {0} Dydd Sul"}
+                    one{"ymhen {0} Dydd Sul"}
+                    other{"ymhen {0} Dydd Sul"}
+                    two{"ymhen {0} Dydd Sul"}
+                    zero{"ymhen {0} Dydd Sul"}
+                }
+                past{
+                    few{"{0} Dydd Sul yn ôl"}
+                    many{"{0} Dydd Sul yn ôl"}
+                    one{"{0} Dydd Sul yn ôl"}
+                    other{"{0} Dydd Sul yn ôl"}
+                    two{"{0} Dydd Sul yn ôl"}
+                    zero{"{0} Dydd Sul yn ôl"}
+                }
+            }
+        }
+        sun-short{
+            relative{
+                "-1"{"Sul diwethaf"}
+                "0"{"Sul yma"}
+                "1"{"Sul nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} Dydd Sul"}
+                    many{"ymhen {0} Dydd Sul"}
+                    one{"ymhen {0} Dydd Sul"}
+                    other{"ymhen {0} Dydd Sul"}
+                    two{"ymhen {0} Dydd Sul"}
+                    zero{"ymhen {0} Dydd Sul"}
+                }
+                past{
+                    few{"{0} Dydd Sul yn ôl"}
+                    many{"{0} Dydd Sul yn ôl"}
+                    one{"{0} Dydd Sul yn ôl"}
+                    other{"{0} Dydd Sul yn ôl"}
+                    two{"{0} Dydd Sul yn ôl"}
+                    zero{"{0} Dydd Sul yn ôl"}
+                }
+            }
         }
         thu{
             relative{
@@ -964,6 +1961,74 @@ cy{
                 "0"{"dydd Iau yma"}
                 "1"{"dydd Iau nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Iau"}
+                    many{"ymhen {0} dydd Iau"}
+                    one{"ymhen {0} dydd Iau"}
+                    other{"ymhen {0} dydd Iau"}
+                    two{"ymhen {0} dydd Iau"}
+                    zero{"ymhen {0} dydd Iau"}
+                }
+                past{
+                    few{"{0} dydd Iau yn ôl"}
+                    many{"{0} dydd Iau yn ôl"}
+                    one{"{0} dydd Iau yn ôl"}
+                    other{"{0} dydd Iau yn ôl"}
+                    two{"{0} dydd Iau yn ôl"}
+                    zero{"{0} dydd Iau yn ôl"}
+                }
+            }
+        }
+        thu-narrow{
+            relative{
+                "-1"{"Iau diwethaf"}
+                "0"{"Iau yma"}
+                "1"{"Iau nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Iau"}
+                    many{"ymhen {0} dydd Iau"}
+                    one{"ymhen {0} dydd Iau"}
+                    other{"ymhen {0} dydd Iau"}
+                    two{"ymhen {0} dydd Iau"}
+                    zero{"ymhen {0} dydd Iau"}
+                }
+                past{
+                    few{"{0} dydd Iau yn ôl"}
+                    many{"{0} dydd Iau yn ôl"}
+                    one{"{0} dydd Iau yn ôl"}
+                    other{"{0} dydd Iau yn ôl"}
+                    two{"{0} dydd Iau yn ôl"}
+                    zero{"{0} dydd Iau yn ôl"}
+                }
+            }
+        }
+        thu-short{
+            relative{
+                "-1"{"Iau diwethaf"}
+                "0"{"Iau yma"}
+                "1"{"Iau nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Iau"}
+                    many{"ymhen {0} dydd Iau"}
+                    one{"ymhen {0} dydd Iau"}
+                    other{"ymhen {0} dydd Iau"}
+                    two{"ymhen {0} dydd Iau"}
+                    zero{"ymhen {0} dydd Iau"}
+                }
+                past{
+                    few{"{0} dydd Iau yn ôl"}
+                    many{"{0} dydd Iau yn ôl"}
+                    one{"{0} dydd Iau yn ôl"}
+                    other{"{0} dydd Iau yn ôl"}
+                    two{"{0} dydd Iau yn ôl"}
+                    zero{"{0} dydd Iau yn ôl"}
+                }
+            }
         }
         tue{
             relative{
@@ -971,6 +2036,74 @@ cy{
                 "0"{"dydd Mawrth yma"}
                 "1"{"dydd Mawrth nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Mawrth"}
+                    many{"ymhen {0} dydd Mawrth"}
+                    one{"ymhen {0} dydd Mawrth"}
+                    other{"ymhen {0} dydd Mawrth"}
+                    two{"ymhen {0} dydd Mawrth"}
+                    zero{"ymhen {0} dydd Mawrth"}
+                }
+                past{
+                    few{"{0} dydd Mawrth yn ôl"}
+                    many{"{0} dydd Mawrth yn ôl"}
+                    one{"{0} dydd Mawrth yn ôl"}
+                    other{"{0} dydd Mawrth yn ôl"}
+                    two{"{0} dydd Mawrth yn ôl"}
+                    zero{"{0} dydd Mawrth yn ôl"}
+                }
+            }
+        }
+        tue-narrow{
+            relative{
+                "-1"{"Mawrth diwethaf"}
+                "0"{"Mawrth yma"}
+                "1"{"Mawrth nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Mawrth"}
+                    many{"ymhen {0} dydd Mawrth"}
+                    one{"ymhen {0} dydd Mawrth"}
+                    other{"ymhen {0} dydd Mawrth"}
+                    two{"ymhen {0} dydd Mawrth"}
+                    zero{"ymhen {0} dydd Mawrth"}
+                }
+                past{
+                    few{"{0} dydd Mawrth yn ôl"}
+                    many{"{0} dydd Mawrth yn ôl"}
+                    one{"{0} dydd Mawrth yn ôl"}
+                    other{"{0} dydd Mawrth yn ôl"}
+                    two{"{0} dydd Mawrth yn ôl"}
+                    zero{"{0} dydd Mawrth yn ôl"}
+                }
+            }
+        }
+        tue-short{
+            relative{
+                "-1"{"Mawrth diwethaf"}
+                "0"{"Mawrth yma"}
+                "1"{"Mawrth nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Mawrth"}
+                    many{"ymhen {0} dydd Mawrth"}
+                    one{"ymhen {0} dydd Mawrth"}
+                    other{"ymhen {0} dydd Mawrth"}
+                    two{"ymhen {0} dydd Mawrth"}
+                    zero{"ymhen {0} dydd Mawrth"}
+                }
+                past{
+                    few{"{0} dydd Mawrth yn ôl"}
+                    many{"{0} dydd Mawrth yn ôl"}
+                    one{"{0} dydd Mawrth yn ôl"}
+                    other{"{0} dydd Mawrth yn ôl"}
+                    two{"{0} dydd Mawrth yn ôl"}
+                    zero{"{0} dydd Mawrth yn ôl"}
+                }
+            }
         }
         wed{
             relative{
@@ -978,22 +2111,91 @@ cy{
                 "0"{"dydd Mercher yma"}
                 "1"{"dydd Mercher nesaf"}
             }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Mercher"}
+                    many{"ymhen {0} dydd Mercher"}
+                    one{"ymhen {0} dydd Mercher"}
+                    other{"ymhen {0} dydd Mercher"}
+                    two{"ymhen {0} dydd Mercher"}
+                    zero{"ymhen {0} dydd Mercher"}
+                }
+                past{
+                    few{"{0} dydd Mercher yn ôl"}
+                    many{"{0} dydd Mercher yn ôl"}
+                    one{"{0} dydd Mercher yn ôl"}
+                    other{"{0} dydd Mercher yn ôl"}
+                    two{"{0} dydd Mercher yn ôl"}
+                    zero{"{0} dydd Mercher yn ôl"}
+                }
+            }
+        }
+        wed-narrow{
+            relative{
+                "-1"{"Mercher diwethaf"}
+                "0"{"Mercher yma"}
+                "1"{"Mercher nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Mercher"}
+                    many{"ymhen {0} dydd Mercher"}
+                    one{"ymhen {0} dydd Mercher"}
+                    other{"ymhen {0} dydd Mercher"}
+                    two{"ymhen {0} dydd Mercher"}
+                    zero{"ymhen {0} dydd Mercher"}
+                }
+                past{
+                    few{"{0} dydd Mercher yn ôl"}
+                    many{"{0} dydd Mercher yn ôl"}
+                    one{"{0} dydd Mercher yn ôl"}
+                    other{"{0} dydd Mercher yn ôl"}
+                    two{"{0} dydd Mercher yn ôl"}
+                    zero{"{0} dydd Mercher yn ôl"}
+                }
+            }
+        }
+        wed-short{
+            relative{
+                "-1"{"Mercher diwethaf"}
+                "0"{"Mercher yma"}
+                "1"{"Mercher nesaf"}
+            }
+            relativeTime{
+                future{
+                    few{"ymhen {0} dydd Mercher"}
+                    many{"ymhen {0} dydd Mercher"}
+                    one{"ymhen {0} dydd Mercher"}
+                    other{"ymhen {0} dydd Mercher"}
+                    two{"ymhen {0} dydd Mercher"}
+                    zero{"ymhen {0} dydd Mercher"}
+                }
+                past{
+                    few{"{0} dydd Mercher yn ôl"}
+                    many{"{0} dydd Mercher yn ôl"}
+                    one{"{0} dydd Mercher yn ôl"}
+                    other{"{0} dydd Mercher yn ôl"}
+                    two{"{0} dydd Mercher yn ôl"}
+                    zero{"{0} dydd Mercher yn ôl"}
+                }
+            }
         }
         week{
-            dn{"Wythnos"}
+            dn{"wythnos"}
             relative{
                 "-1"{"wythnos ddiwethaf"}
                 "0"{"yr wythnos hon"}
                 "1"{"wythnos nesaf"}
             }
+            relativePeriod{"wythnos {0}"}
             relativeTime{
                 future{
-                    few{"Ymhen {0} wythnos"}
-                    many{"Ymhen {0} wythnos"}
-                    one{"Ymhen wythnos"}
-                    other{"Ymhen {0} wythnos"}
-                    two{"Ymhen pythefnos"}
-                    zero{"Ymhen {0} wythnos"}
+                    few{"ymhen {0} wythnos"}
+                    many{"ymhen {0} wythnos"}
+                    one{"ymhen wythnos"}
+                    other{"ymhen {0} wythnos"}
+                    two{"ymhen pythefnos"}
+                    zero{"ymhen {0} wythnos"}
                 }
                 past{
                     few{"{0} wythnos yn ôl"}
@@ -1005,11 +2207,79 @@ cy{
                 }
             }
         }
+        week-narrow{
+            dn{"wythnos"}
+            relativePeriod{"wythnos {0}"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} wythnos"}
+                    many{"ymhen {0} wythnos"}
+                    one{"ymhen {0} wythnos"}
+                    other{"ymhen {0} wythnos"}
+                    two{"ymhen {0} wythnos"}
+                    zero{"ymhen {0} wythnos"}
+                }
+                past{
+                    few{"{0} wythnos yn ôl"}
+                    many{"{0} wythnos yn ôl"}
+                    one{"{0} wythnos yn ôl"}
+                    other{"{0} wythnos yn ôl"}
+                    two{"pythefnos yn ôl"}
+                    zero{"{0} wythnos yn ôl"}
+                }
+            }
+        }
+        week-short{
+            dn{"wythnos"}
+            relativePeriod{"wythnos {0}"}
+            relativeTime{
+                future{
+                    few{"ymhen {0} wythnos"}
+                    many{"ymhen {0} wythnos"}
+                    one{"ymhen wythnos"}
+                    other{"ymhen {0} wythnos"}
+                    two{"ymhen pythefnos"}
+                    zero{"ymhen {0} wythnos"}
+                }
+                past{
+                    few{"{0} wythnos yn ôl"}
+                    many{"{0} wythnos yn ôl"}
+                    one{"{0} wythnos yn ôl"}
+                    other{"{0} wythnos yn ôl"}
+                    two{"pythefnos yn ôl"}
+                    zero{"{0} wythnos yn ôl"}
+                }
+            }
+        }
+        weekOfMonth{
+            dn{"rhif wythnos yn y mis"}
+        }
+        weekOfMonth-narrow{
+            dn{"wythnos y mis"}
+        }
+        weekOfMonth-short{
+            dn{"wythnos y mis"}
+        }
         weekday{
-            dn{"Dydd o'r Wythnos"}
+            dn{"diwrnod o’r wythnos"}
+        }
+        weekday-narrow{
+            dn{"diwrnod o’r wythnos"}
+        }
+        weekday-short{
+            dn{"diwrnod o’r wythnos"}
+        }
+        weekdayOfMonth{
+            dn{"diwrnod yn y mis"}
+        }
+        weekdayOfMonth-narrow{
+            dn{"diwrnod yn y mis"}
+        }
+        weekdayOfMonth-short{
+            dn{"diwrnod yn y mis"}
         }
         year{
-            dn{"Blwyddyn"}
+            dn{"blwyddyn"}
             relative{
                 "-1"{"llynedd"}
                 "0"{"eleni"}
@@ -1017,12 +2287,54 @@ cy{
             }
             relativeTime{
                 future{
-                    few{"Ymhen {0} blynedd"}
-                    many{"Ymhen {0} blynedd"}
-                    one{"Ymhen blwyddyn"}
-                    other{"Ymhen {0} mlynedd"}
-                    two{"Ymhen {0} flynedd"}
-                    zero{"Ymhen {0} mlynedd"}
+                    few{"ymhen {0} blynedd"}
+                    many{"ymhen {0} blynedd"}
+                    one{"ymhen blwyddyn"}
+                    other{"ymhen {0} mlynedd"}
+                    two{"ymhen {0} flynedd"}
+                    zero{"ymhen {0} mlynedd"}
+                }
+                past{
+                    few{"{0} blynedd yn ôl"}
+                    many{"{0} blynedd yn ôl"}
+                    one{"blwyddyn yn ôl"}
+                    other{"{0} o flynyddoedd yn ôl"}
+                    two{"{0} flynedd yn ôl"}
+                    zero{"{0} o flynyddoedd yn ôl"}
+                }
+            }
+        }
+        year-narrow{
+            dn{"bl."}
+            relativeTime{
+                future{
+                    few{"ymhen {0} blynedd"}
+                    many{"ymhen {0} blynedd"}
+                    one{"ymhen blwyddyn"}
+                    other{"ymhen {0} mlynedd"}
+                    two{"ymhen {0} flynedd"}
+                    zero{"ymhen {0} mlynedd"}
+                }
+                past{
+                    few{"{0} blynedd yn ôl"}
+                    many{"{0} blynedd yn ôl"}
+                    one{"blwyddyn yn ôl"}
+                    other{"{0} o flynyddoedd yn ôl"}
+                    two{"{0} flynedd yn ôl"}
+                    zero{"{0} o flynyddoedd yn ôl"}
+                }
+            }
+        }
+        year-short{
+            dn{"bl."}
+            relativeTime{
+                future{
+                    few{"ymhen {0} blynedd"}
+                    many{"ymhen {0} blynedd"}
+                    one{"ymhen blwyddyn"}
+                    other{"ymhen {0} mlynedd"}
+                    two{"ymhen {0} flynedd"}
+                    zero{"ymhen {0} mlynedd"}
                 }
                 past{
                     few{"{0} blynedd yn ôl"}
@@ -1035,22 +2347,52 @@ cy{
             }
         }
         zone{
-            dn{"Cylchfa Amser"}
+            dn{"cylchfa amser"}
+        }
+        zone-narrow{
+            dn{"cylchfa"}
+        }
+        zone-short{
+            dn{"cylchfa amser"}
         }
     }
     listPattern{
+        or{
+            2{"{0} neu {1}"}
+            end{"{0} neu {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
+        }
         standard{
+            2{"{0} a(c) {1}"}
+            end{"{0}, a(c) {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
+        }
+        standard-narrow{
             2{"{0}, {1}"}
             end{"{0}, {1}"}
             middle{"{0}, {1}"}
             start{"{0}, {1}"}
         }
+        standard-short{
+            2{"{0} a(c) {1}"}
+            end{"{0}, a(c) {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
+        }
         unit{
             2{"{0}, {1}"}
             end{"{0}, {1}"}
             middle{"{0}, {1}"}
             start{"{0}, {1}"}
         }
+        unit-narrow{
+            2{"{0}, {1}"}
+            end{"{0}, {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
+        }
         unit-short{
             2{"{0}, {1}"}
             end{"{0}, {1}"}
@@ -1063,1188 +2405,35 @@ cy{
         US{"UDA"}
         metric{"Metrig"}
     }
-    units{
-        acceleration{
-            g-force{
-                few{"{0} grym disgyrchedd"}
-                many{"{0} grym disgyrchedd"}
-                one{"{0} grym disgyrchedd"}
-                other{"{0} grym disgyrchedd"}
-                two{"{0} rym disgyrchedd"}
-                zero{"{0} grym disgyrchedd"}
-            }
-        }
-        angle{
-            arc-minute{
-                few{"{0} munud"}
-                many{"{0} munud"}
-                one{"{0} munud"}
-                other{"{0} munud"}
-                two{"{0} funud"}
-                zero{"{0} munud"}
-            }
-            arc-second{
-                few{"{0} eiliad"}
-                many{"{0} eiliad"}
-                one{"{0} eiliad"}
-                other{"{0} eiliad"}
-                two{"{0} eiliad"}
-                zero{"{0} eiliad"}
-            }
-            degree{
-                few{"{0} gradd"}
-                many{"{0} gradd"}
-                one{"{0} radd"}
-                other{"{0} gradd"}
-                two{"{0} radd"}
-                zero{"{0} gradd"}
-            }
-        }
-        area{
-            acre{
-                few{"{0} erw"}
-                many{"{0} erw"}
-                one{"{0} erw"}
-                other{"{0} erw"}
-                two{"{0} erw"}
-                zero{"{0} erw"}
-            }
-            hectare{
-                few{"{0} hectar"}
-                many{"{0} hectar"}
-                one{"{0} hectar"}
-                other{"{0} hectar"}
-                two{"{0} hectar"}
-                zero{"{0} hectar"}
-            }
-            square-foot{
-                few{"{0} troedfedd sgwâr"}
-                many{"{0} throedfedd sgwâr"}
-                one{"{0} droedfedd sgwâr"}
-                other{"{0} troedfedd sgwâr"}
-                two{"{0} droedfedd sgwâr"}
-                zero{"{0} troedfedd sgwâr"}
-            }
-            square-kilometer{
-                few{"{0} chilometr sgwâr"}
-                many{"{0} chilometr sgwâr"}
-                one{"{0} cilometr sgwâr"}
-                other{"{0} cilometr sgwâr"}
-                two{"{0} gilometr sgwâr"}
-                zero{"{0} cilometr sgwâr"}
-            }
-            square-meter{
-                few{"{0} metr sgwâr"}
-                many{"{0} metr sgwâr"}
-                one{"{0} metr sgwâr"}
-                other{"{0} metr sgwâr"}
-                two{"{0} fetr sgwâr"}
-                zero{"{0} metr sgwâr"}
-            }
-            square-mile{
-                few{"{0} milltir sgwâr"}
-                many{"{0} milltir sgwâr"}
-                one{"filltir sgwâr"}
-                other{"{0} milltir sgwâr"}
-                two{"{0} filltir sgwâr"}
-                zero{"{0} milltir sgwâr"}
-            }
-        }
-        compound{
-            per{"{0}/{1}"}
-        }
-        duration{
-            day{
-                few{"{0} diwrnod"}
-                many{"{0} diwrnod"}
-                one{"{0} diwrnod"}
-                other{"{0} diwrnod"}
-                two{"{0} ddiwrnod"}
-                zero{"{0} diwrnod"}
-            }
-            hour{
-                few{"{0} awr"}
-                many{"{0} awr"}
-                one{"{0} awr"}
-                other{"{0} awr"}
-                two{"{0} awr"}
-                zero{"{0} awr"}
-            }
-            millisecond{
-                few{"{0} milieiliad"}
-                many{"{0} milieiliad"}
-                one{"{0} milieiliad"}
-                other{"{0} milieiliad"}
-                two{"{0} filieiliad"}
-                zero{"{0} milieiliad"}
-            }
-            minute{
-                few{"{0} munud"}
-                many{"{0} munud"}
-                one{"{0} munud"}
-                other{"{0} munud"}
-                two{"{0} funud"}
-                zero{"{0} munud"}
-            }
-            month{
-                few{"{0} mis"}
-                many{"{0} mis"}
-                one{"{0} mis"}
-                other{"{0} mis"}
-                two{"{0} fis"}
-                zero{"{0} mis"}
-            }
-            second{
-                few{"{0} eiliad"}
-                many{"{0} eiliad"}
-                one{"{0} eiliad"}
-                other{"{0} eiliad"}
-                two{"{0} eiliad"}
-                zero{"{0} eiliad"}
-            }
-            week{
-                few{"{0} wythnos"}
-                many{"{0} wythnos"}
-                one{"{0} wythnos"}
-                other{"{0} wythnos"}
-                two{"{0} wythnos"}
-                zero{"{0} wythnos"}
-            }
-            year{
-                few{"{0} blynedd"}
-                many{"{0} blynedd"}
-                one{"{0} flwyddyn"}
-                other{"{0} mlynedd"}
-                two{"{0} flynedd"}
-                zero{"{0} mlynedd"}
-            }
-        }
-        length{
-            centimeter{
-                few{"{0} chentimetr"}
-                many{"{0} chentimetr"}
-                one{"{0} centimetr"}
-                other{"{0} centimetr"}
-                two{"{0} gentimetr"}
-                zero{"{0} centimetr"}
-            }
-            foot{
-                few{"{0} troedfedd"}
-                many{"{0} throedfedd"}
-                one{"{0} droedfedd"}
-                other{"{0} troedfedd"}
-                two{"{0} droedfedd"}
-                zero{"{0} troedfedd"}
-            }
-            inch{
-                few{"{0} modfedd"}
-                many{"{0} modfedd"}
-                one{"{0} fodfedd"}
-                other{"{0} modfedd"}
-                two{"{0} fodfedd"}
-                zero{"{0} modfedd"}
-            }
-            kilometer{
-                few{"{0} chilometr"}
-                many{"{0} chilometr"}
-                one{"{0} cilometr"}
-                other{"{0} cilometr"}
-                two{"{0} gilometr"}
-                zero{"{0} cilometr"}
-            }
-            light-year{
-                few{"{0} blwyddyn golau"}
-                many{"{0} blwyddyn golau"}
-                one{"{0} flwyddyn golau"}
-                other{"{0} blwyddyn golau"}
-                two{"{0} flwyddyn golau"}
-                zero{"{0} blwyddyn golau"}
-            }
-            meter{
-                few{"{0} metr"}
-                many{"{0} metr"}
-                one{"{0} metr"}
-                other{"{0} metr"}
-                two{"{0} fetr"}
-                zero{"{0} metr"}
-            }
-            mile{
-                few{"{0} milltir"}
-                many{"{0} milltir"}
-                one{"{0} filltir"}
-                other{"{0} milltir"}
-                two{"{0} filltir"}
-                zero{"{0} milltir"}
-            }
-            millimeter{
-                few{"{0} milimetr"}
-                many{"{0} milimetr"}
-                one{"{0} milimetr"}
-                other{"{0} milimetr"}
-                two{"{0} filimetr"}
-                zero{"{0} milimetr"}
-            }
-            picometer{
-                few{"{0} phicometr"}
-                many{"{0} phicometr"}
-                one{"{0} picometr"}
-                other{"{0} picometr"}
-                two{"{0} bicometr"}
-                zero{"{0} picometr"}
-            }
-            yard{
-                few{"{0} llath"}
-                many{"{0} llath"}
-                one{"{0} llath"}
-                other{"{0} llath"}
-                two{"{0} lath"}
-                zero{"{0} llath"}
-            }
-        }
-        mass{
-            gram{
-                few{"{0} gram"}
-                many{"{0} gram"}
-                one{"{0} gram"}
-                other{"{0} gram"}
-                two{"{0} gram"}
-                zero{"{0} gram"}
-            }
-            kilogram{
-                few{"{0} chilogram"}
-                many{"{0} chilogram"}
-                one{"{0} cilogram"}
-                other{"{0} cilogram"}
-                two{"{0} gilogram"}
-                zero{"{0} cilogram"}
-            }
-            ounce{
-                few{"{0} owns"}
-                many{"{0} owns"}
-                one{"{0} owns"}
-                other{"{0} owns"}
-                two{"{0} owns"}
-                zero{"{0} owns"}
-            }
-            pound{
-                few{"{0} phwys"}
-                many{"{0} phwys"}
-                one{"{0} pwys"}
-                other{"{0} pwys"}
-                two{"{0} bwys"}
-                zero{"{0} pwys"}
-            }
-        }
-        power{
-            horsepower{
-                few{"{0} marchnerth"}
-                many{"{0} marchnerth"}
-                one{"{0} marchnerth"}
-                other{"{0} marchnerth"}
-                two{"{0} farchnerth"}
-                zero{"{0} marchnerth"}
-            }
-            kilowatt{
-                few{"{0} chilowat"}
-                many{"{0} chilowat"}
-                one{"{0} cilowat"}
-                other{"{0} cilowat"}
-                two{"{0} gilowat"}
-                zero{"{0} cilowat"}
-            }
-            watt{
-                few{"{0} wat"}
-                many{"{0} wat"}
-                one{"{0} wat"}
-                other{"{0} wat"}
-                two{"{0} wat"}
-                zero{"{0} wat"}
-            }
-        }
-        pressure{
-            hectopascal{
-                few{"{0} hectopascal"}
-                many{"{0} hectopascal"}
-                one{"{0} hectopascal"}
-                other{"{0} hectopascal"}
-                two{"{0} hectopascal"}
-                zero{"{0} hectopascal"}
-            }
-            inch-hg{
-                few{"{0} modfedd o fercwri"}
-                many{"{0} modfedd o fercwri"}
-                one{"{0} fodfedd o fercwri"}
-                other{"{0} modfedd o fercwri"}
-                two{"{0} fodfedd o fercwri"}
-                zero{"{0} modfedd o fercwri"}
-            }
-            millibar{
-                few{"{0} milibar"}
-                many{"{0} milibar"}
-                one{"{0} milibar"}
-                other{"{0} milibar"}
-                two{"{0} filibar"}
-                zero{"{0} milibar"}
-            }
-        }
-        speed{
-            kilometer-per-hour{
-                few{"{0} chilometr yr awr"}
-                many{"{0} chilometr yr awr"}
-                one{"{0} cilometr yr awr"}
-                other{"{0} cilometr yr awr"}
-                two{"{0} gilometr yr awr"}
-                zero{"{0} cilometr yr awr"}
-            }
-            meter-per-second{
-                few{"{0} metr yr eiliad"}
-                many{"{0} metr yr eiliad"}
-                one{"{0} metr yr eiliad"}
-                other{"{0} metr yr eiliad"}
-                two{"{0} fetr yr eiliad"}
-                zero{"{0} metr yr eiliad"}
-            }
-            mile-per-hour{
-                few{"{0} milltir yr awr"}
-                many{"{0} milltir yr awr"}
-                one{"{0} filltir yr awr"}
-                other{"{0} milltir yr awr"}
-                two{"{0} filltir yr awr"}
-                zero{"{0} milltir yr awr"}
-            }
-        }
-        temperature{
-            celsius{
-                few{"{0} gradd Celsius"}
-                many{"{0} gradd Celsius"}
-                one{"{0} radd Celsius"}
-                other{"{0} gradd Celsius"}
-                two{"{0} radd Celsius"}
-                zero{"{0} gradd Celsius"}
-            }
-            fahrenheit{
-                few{"{0} gradd Fahrenheit"}
-                many{"{0} gradd Fahrenheit"}
-                one{"{0} radd Fahrenheit"}
-                other{"{0} gradd Fahrenheit"}
-                two{"{0} radd Fahrenheit"}
-                zero{"{0} gradd Fahrenheit"}
-            }
-        }
-        volume{
-            cubic-kilometer{
-                few{"{0} chilometr ciwbig"}
-                many{"{0} chilometr ciwbig"}
-                one{"{0} cilometr ciwbig"}
-                other{"{0} cilometr ciwbig"}
-                two{"{0} gilometr ciwbig"}
-                zero{"{0} cilometr ciwbig"}
-            }
-            cubic-mile{
-                few{"{0} milltir giwbig"}
-                many{"{0} milltir giwbig"}
-                one{"{0} filltir giwbig"}
-                other{"{0} milltir giwbig"}
-                two{"{0} filltir giwbig"}
-                zero{"{0} milltir giwbig"}
-            }
-            liter{
-                few{"{0} litr"}
-                many{"{0} litr"}
-                one{"{0} litr"}
-                other{"{0} litr"}
-                two{"{0} litr"}
-                zero{"{0} litr"}
+    parse{
+        date{
+            lenient{
+                "[\\--/]",
+                "[\\:∶︓﹕:]",
             }
         }
-    }
-    unitsNarrow{
-        acceleration{
-            g-force{
-                few{"{0}G"}
-                many{"{0}G"}
-                one{"{0}G"}
-                other{"{0}G"}
-                two{"{0}G"}
-                zero{"{0}G"}
-            }
-        }
-        angle{
-            arc-minute{
-                few{"{0}′"}
-                many{"{0}′"}
-                one{"{0}′"}
-                other{"{0}′"}
-                two{"{0}′"}
-                zero{"{0}′"}
-            }
-            arc-second{
-                few{"{0}″"}
-                many{"{0}″"}
-                one{"{0}″"}
-                other{"{0}″"}
-                two{"{0}″"}
-                zero{"{0}″"}
-            }
-            degree{
-                few{"{0}°"}
-                many{"{0}°"}
-                one{"{0}°"}
-                other{"{0}°"}
-                two{"{0}°"}
-                zero{"{0}°"}
-            }
-        }
-        area{
-            acre{
-                few{"{0}erw"}
-                many{"{0}erw"}
-                one{"{0}erw"}
-                other{"{0}erw"}
-                two{"{0}erw"}
-                zero{"{0}erw"}
-            }
-            hectare{
-                few{"{0}ha"}
-                many{"{0}ha"}
-                one{"{0}ha"}
-                other{"{0}ha"}
-                two{"{0}ha"}
-                zero{"{0}ha"}
-            }
-            square-foot{
-                few{"{0}ft²"}
-                many{"{0}ft²"}
-                one{"{0}ft²"}
-                other{"{0}ft²"}
-                two{"{0}ft²"}
-                zero{"{0}ft²"}
-            }
-            square-kilometer{
-                few{"{0}km²"}
-                many{"{0}km²"}
-                one{"{0}km²"}
-                other{"{0}km²"}
-                two{"{0}km²"}
-                zero{"{0}km²"}
-            }
-            square-meter{
-                few{"{0}m²"}
-                many{"{0}m²"}
-                one{"{0}m²"}
-                other{"{0}m²"}
-                two{"{0}m²"}
-                zero{"{0}m²"}
-            }
-            square-mile{
-                few{"{0}mi²"}
-                many{"{0}mi²"}
-                one{"{0}mi²"}
-                other{"{0}mi²"}
-                two{"{0}mi²"}
-                zero{"{0}mi²"}
-            }
-        }
-        compound{
-            per{"{0}/{1}"}
-        }
-        duration{
-            day{
-                few{"{0}d"}
-                many{"{0}d"}
-                one{"{0}d"}
-                other{"{0}d"}
-                two{"{0}d"}
-                zero{"{0}d"}
-            }
-            hour{
-                few{"{0} awr"}
-                many{"{0} awr"}
-                one{"{0} awr"}
-                other{"{0} awr"}
-                two{"{0} awr"}
-                zero{"{0} awr"}
-            }
-            millisecond{
-                few{"{0}ms"}
-                many{"{0}ms"}
-                one{"{0}ms"}
-                other{"{0}ms"}
-                two{"{0}ms"}
-                zero{"{0}ms"}
-            }
-            minute{
-                few{"{0} mun"}
-                many{"{0} mun"}
-                one{"{0} mun"}
-                other{"{0} mun"}
-                two{"{0} mun"}
-                zero{"{0} mun"}
-            }
-            month{
-                few{"{0}m"}
-                many{"{0}m"}
-                one{"{0}m"}
-                other{"{0}m"}
-                two{"{0}m"}
-                zero{"{0}m"}
-            }
-            second{
-                few{"{0} eil"}
-                many{"{0} eil"}
-                one{"{0} eil"}
-                other{"{0} eil"}
-                two{"{0} eil"}
-                zero{"{0} eil"}
-            }
-            week{
-                few{"{0}w"}
-                many{"{0}w"}
-                one{"{0}w"}
-                other{"{0}w"}
-                two{"{0}w"}
-                zero{"{0}w"}
-            }
-            year{
-                few{"{0}bl"}
-                many{"{0}bl"}
-                one{"{0}bl"}
-                other{"{0}bl"}
-                two{"{0}bl"}
-                zero{"{0}bl"}
-            }
-        }
-        length{
-            centimeter{
-                few{"{0}cm"}
-                many{"{0}cm"}
-                one{"{0}cm"}
-                other{"{0}cm"}
-                two{"{0}cm"}
-                zero{"{0}cm"}
-            }
-            foot{
-                few{"{0}′"}
-                many{"{0}′"}
-                one{"{0}′"}
-                other{"{0}′"}
-                two{"{0}′"}
-                zero{"{0}′"}
-            }
-            inch{
-                few{"{0}″"}
-                many{"{0}″"}
-                one{"{0}″"}
-                other{"{0}″"}
-                two{"{0}″"}
-                zero{"{0}″"}
-            }
-            kilometer{
-                few{"{0}km"}
-                many{"{0}km"}
-                one{"{0}km"}
-                other{"{0}km"}
-                two{"{0}km"}
-                zero{"{0}km"}
-            }
-            light-year{
-                few{"{0}ly"}
-                many{"{0}ly"}
-                one{"{0}ly"}
-                other{"{0}ly"}
-                two{"{0}ly"}
-                zero{"{0}ly"}
-            }
-            meter{
-                few{"{0}m"}
-                many{"{0}m"}
-                one{"{0}m"}
-                other{"{0}m"}
-                two{"{0}m"}
-                zero{"{0}m"}
-            }
-            mile{
-                few{"{0}mi"}
-                many{"{0}mi"}
-                one{"{0}mi"}
-                other{"{0}mi"}
-                two{"{0}mi"}
-                zero{"{0}mi"}
-            }
-            millimeter{
-                few{"{0}mm"}
-                many{"{0}mm"}
-                one{"{0}mm"}
-                other{"{0}mm"}
-                two{"{0}mm"}
-                zero{"{0}mm"}
-            }
-            picometer{
-                few{"{0}pm"}
-                many{"{0}pm"}
-                one{"{0}pm"}
-                other{"{0}pm"}
-                two{"{0}pm"}
-                zero{"{0}pm"}
-            }
-            yard{
-                few{"{0}llath"}
-                many{"{0}llath"}
-                one{"{0}llath"}
-                other{"{0}llath"}
-                two{"{0}lath"}
-                zero{"{0}llath"}
-            }
-        }
-        mass{
-            gram{
-                few{"{0}g"}
-                many{"{0}g"}
-                one{"{0}g"}
-                other{"{0}g"}
-                two{"{0}g"}
-                zero{"{0}g"}
-            }
-            kilogram{
-                few{"{0}kg"}
-                many{"{0}kg"}
-                one{"{0}kg"}
-                other{"{0}kg"}
-                two{"{0}kg"}
-                zero{"{0}kg"}
-            }
-            ounce{
-                few{"{0}owns"}
-                many{"{0}owns"}
-                one{"{0}owns"}
-                other{"{0}owns"}
-                two{"{0}owns"}
-                zero{"{0}owns"}
-            }
-            pound{
-                few{"{0}phwys"}
-                many{"{0}phwys"}
-                one{"{0}pwys"}
-                other{"{0}pwys"}
-                two{"{0}bwys"}
-                zero{"{0}pwys"}
-            }
-        }
-        power{
-            horsepower{
-                few{"{0}hp"}
-                many{"{0}hp"}
-                one{"{0}hp"}
-                other{"{0}hp"}
-                two{"{0}hp"}
-                zero{"{0}hp"}
-            }
-            kilowatt{
-                few{"{0}kW"}
-                many{"{0}kW"}
-                one{"{0}kW"}
-                other{"{0}kW"}
-                two{"{0}kW"}
-                zero{"{0} kW"}
-            }
-            watt{
-                few{"{0}W"}
-                many{"{0}W"}
-                one{"{0}W"}
-                other{"{0}W"}
-                two{"{0}W"}
-                zero{"{0}W"}
-            }
-        }
-        pressure{
-            hectopascal{
-                few{"{0}hPa"}
-                many{"{0}hPa"}
-                one{"{0}hPa"}
-                other{"{0}hPa"}
-                two{"{0}hPa"}
-                zero{"{0}hPa"}
-            }
-            inch-hg{
-                few{"{0}\u0022 Hg"}
-                many{"{0}\u0022 Hg"}
-                one{"{0}\u0022 Hg"}
-                other{"{0}\u0022 Hg"}
-                two{"{0}\u0022 Hg"}
-                zero{"{0}\u0022 Hg"}
-            }
-            millibar{
-                few{"{0}mb"}
-                many{"{0}mb"}
-                one{"{0}mb"}
-                other{"{0}mb"}
-                two{"{0}mb"}
-                zero{"{0}mb"}
-            }
-        }
-        speed{
-            kilometer-per-hour{
-                few{"{0}km/h"}
-                many{"{0}km/h"}
-                one{"{0}km/h"}
-                other{"{0}km/h"}
-                two{"{0}km/h"}
-                zero{"{0}km/h"}
-            }
-            meter-per-second{
-                few{"{0}m/s"}
-                many{"{0}m/s"}
-                one{"{0}m/s"}
-                other{"{0}m/s"}
-                two{"{0}m/s"}
-                zero{"{0}m/s"}
-            }
-            mile-per-hour{
-                few{"{0}m.y.a."}
-                many{"{0}m.y.a."}
-                one{"{0}m.y.a."}
-                other{"{0}m.y.a."}
-                two{"{0}m.y.a."}
-                zero{"{0}m.y.a."}
-            }
-        }
-        temperature{
-            celsius{
-                few{"{0}°"}
-                many{"{0}°"}
-                one{"{0}°"}
-                other{"{0}°"}
-                two{"{0}°"}
-                zero{"{0}°"}
-            }
-            fahrenheit{
-                few{"{0}°F"}
-                many{"{0}°F"}
-                one{"{0}°F"}
-                other{"{0}°F"}
-                two{"{0}°F"}
-                zero{"{0}°F"}
-            }
-        }
-        volume{
-            cubic-kilometer{
-                few{"{0}km³"}
-                many{"{0}km³"}
-                one{"{0}km³"}
-                other{"{0}km³"}
-                two{"{0}km³"}
-                zero{"{0}km³"}
-            }
-            cubic-mile{
-                few{"{0} mi³"}
-                many{"{0} mi³"}
-                one{"{0} mi³"}
-                other{"{0} mi³"}
-                two{"{0} mi³"}
-                zero{"{0} mi³"}
-            }
-            liter{
-                few{"{0}l"}
-                many{"{0}l"}
-                one{"{0}l"}
-                other{"{0}l"}
-                two{"{0}l"}
-                zero{"{0}l"}
+        general{
+            lenient{
+                "[.․。︒﹒.。]",
+                "['ʼ՚᾽᾿’']",
+                "[%٪﹪%]",
+                "[؉‰]",
+                "[\$﹩$]",
+                "[£₤£]",
+                "[¥¥]",
+                "[₩₩]",
+                "[₨₹{Rp}{Rs}]",
             }
         }
-    }
-    unitsShort{
-        acceleration{
-            g-force{
-                few{"{0} grym disgyrchedd"}
-                many{"{0} grym disgyrchedd"}
-                one{"{0} grym disgyrchedd"}
-                other{"{0} grym disgyrchedd"}
-                two{"{0} rym disgyrchedd"}
-                zero{"{0} grym disgyrchedd"}
-            }
-        }
-        angle{
-            arc-minute{
-                few{"{0}′"}
-                many{"{0}′"}
-                one{"{0}′"}
-                other{"{0}′"}
-                two{"{0}′"}
-                zero{"{0}′"}
-            }
-            arc-second{
-                few{"{0}″"}
-                many{"{0}″"}
-                one{"{0}″"}
-                other{"{0}″"}
-                two{"{0}″"}
-                zero{"{0}″"}
-            }
-            degree{
-                few{"{0}°"}
-                many{"{0}°"}
-                one{"{0}°"}
-                other{"{0}°"}
-                two{"{0}°"}
-                zero{"{0}°"}
-            }
-        }
-        area{
-            acre{
-                few{"{0} erw"}
-                many{"{0} erw"}
-                one{"{0} erw"}
-                other{"{0} erw"}
-                two{"{0} erw"}
-                zero{"{0} erw"}
-            }
-            hectare{
-                few{"{0} ha"}
-                many{"{0} ha"}
-                one{"{0} ha"}
-                other{"{0} ha"}
-                two{"{0} ha"}
-                zero{"{0} ha"}
-            }
-            square-foot{
-                few{"{0} troedfedd ²"}
-                many{"{0} throedfedd ²"}
-                one{"{0} droedfedd ²"}
-                other{"{0} troedfedd ²"}
-                two{"{0} droedfedd ²"}
-                zero{"{0} troedfedd ²"}
-            }
-            square-kilometer{
-                few{"{0} km²"}
-                many{"{0} km²"}
-                one{"{0} km²"}
-                other{"{0} km²"}
-                two{"{0} km²"}
-                zero{"{0} km²"}
-            }
-            square-meter{
-                few{"{0} m²"}
-                many{"{0} m²"}
-                one{"{0} m²"}
-                other{"{0} m²"}
-                two{"{0} m²"}
-                zero{"{0} m²"}
-            }
-            square-mile{
-                few{"{0} mi²"}
-                many{"{0} mi²"}
-                one{"{0} mi²"}
-                other{"{0} mi²"}
-                two{"{0} mi²"}
-                zero{"{0} mi²"}
-            }
-        }
-        compound{
-            per{"{0}/{1}"}
-        }
-        duration{
-            day{
-                few{"{0} diwrnod"}
-                many{"{0} diwrnod"}
-                one{"{0} diwrnod"}
-                other{"{0} diwrnod"}
-                two{"{0} ddiwrnod"}
-                zero{"{0} diwrnod"}
-            }
-            hour{
-                few{"{0} awr"}
-                many{"{0} awr"}
-                one{"{0} awr"}
-                other{"{0} awr"}
-                two{"{0} awr"}
-                zero{"{0} awr"}
-            }
-            millisecond{
-                few{"{0} ms"}
-                many{"{0} ms"}
-                one{"{0} ms"}
-                other{"{0} ms"}
-                two{"{0} ms"}
-                zero{"{0} ms"}
-            }
-            minute{
-                few{"{0} mun"}
-                many{"{0} mun"}
-                one{"{0} mun"}
-                other{"{0} mun"}
-                two{"{0} mun"}
-                zero{"{0} mun"}
-            }
-            month{
-                few{"{0} mis"}
-                many{"{0} mis"}
-                one{"{0} mis"}
-                other{"{0} mis"}
-                two{"{0} fis"}
-                zero{"{0} mis"}
-            }
-            second{
-                few{"{0} eil"}
-                many{"{0} eil"}
-                one{"{0} eil"}
-                other{"{0} eil"}
-                two{"{0} eil"}
-                zero{"{0} eil"}
-            }
-            week{
-                few{"{0} wythnos"}
-                many{"{0} wythnos"}
-                one{"{0} wythnos"}
-                other{"{0} wythnos"}
-                two{"{0} wythnos"}
-                zero{"{0} wythnos"}
-            }
-            year{
-                few{"{0} bl"}
-                many{"{0} bl"}
-                one{"{0} bl"}
-                other{"{0} bl"}
-                two{"{0} bl"}
-                zero{"{0} bl"}
-            }
-        }
-        length{
-            centimeter{
-                few{"{0} cm"}
-                many{"{0} cm"}
-                one{"{0} cm"}
-                other{"{0} cm"}
-                two{"{0} cm"}
-                zero{"{0} cm"}
-            }
-            foot{
-                few{"{0} troedfedd"}
-                many{"{0} throedfedd"}
-                one{"{0} droedfedd"}
-                other{"{0} troedfedd"}
-                two{"{0} droedfedd"}
-                zero{"{0} troedfedd"}
-            }
-            inch{
-                few{"{0} modfedd"}
-                many{"{0} modfedd"}
-                one{"{0} fodfedd"}
-                other{"{0} modfedd"}
-                two{"{0} fodfedd"}
-                zero{"{0} modfedd"}
-            }
-            kilometer{
-                few{"{0} km"}
-                many{"{0} km"}
-                one{"{0} km"}
-                other{"{0} km"}
-                two{"{0} km"}
-                zero{"{0} km"}
-            }
-            light-year{
-                few{"{0} blwyddyn golau"}
-                many{"{0} blwyddyn golau"}
-                one{"{0} flwyddyn golau"}
-                other{"{0} blwyddyn golau"}
-                two{"{0} flwyddyn golau"}
-                zero{"{0} blwyddyn golau"}
-            }
-            meter{
-                few{"{0} m"}
-                many{"{0} m"}
-                one{"{0} m"}
-                other{"{0} m"}
-                two{"{0} m"}
-                zero{"{0} m"}
-            }
-            mile{
-                few{"{0} milltir"}
-                many{"{0} milltir"}
-                one{"{0} filltir"}
-                other{"{0} milltir"}
-                two{"{0} filltir"}
-                zero{"{0} milltir"}
-            }
-            millimeter{
-                few{"{0} mm"}
-                many{"{0} mm"}
-                one{"{0} mm"}
-                other{"{0} mm"}
-                two{"{0} mm"}
-                zero{"{0} mm"}
-            }
-            picometer{
-                few{"{0} pm"}
-                many{"{0} pm"}
-                one{"{0} pm"}
-                other{"{0} pm"}
-                two{"{0} pm"}
-                zero{"{0} pm"}
-            }
-            yard{
-                few{"{0} llath"}
-                many{"{0} llath"}
-                one{"{0} llath"}
-                other{"{0} llath"}
-                two{"{0} lath"}
-                zero{"{0} llath"}
-            }
-        }
-        mass{
-            gram{
-                few{"{0} g"}
-                many{"{0} g"}
-                one{"{0} g"}
-                other{"{0} g"}
-                two{"{0} g"}
-                zero{"{0} g"}
-            }
-            kilogram{
-                few{"{0} kg"}
-                many{"{0} kg"}
-                one{"{0} kg"}
-                other{"{0} kg"}
-                two{"{0} kg"}
-                zero{"{0} kg"}
-            }
-            ounce{
-                few{"{0} owns"}
-                many{"{0} owns"}
-                one{"{0} owns"}
-                other{"{0} owns"}
-                two{"{0} owns"}
-                zero{"{0} owns"}
-            }
-            pound{
-                few{"{0} phwys"}
-                many{"{0} phwys"}
-                one{"{0} pwys"}
-                other{"{0} pwys"}
-                two{"{0} bwys"}
-                zero{"{0} pwys"}
-            }
-        }
-        power{
-            horsepower{
-                few{"{0} hp"}
-                many{"{0} hp"}
-                one{"{0} hp"}
-                other{"{0} hp"}
-                two{"{0} hp"}
-                zero{"{0} hp"}
-            }
-            kilowatt{
-                few{"{0} kW"}
-                many{"{0} kW"}
-                one{"{0} kW"}
-                other{"{0} kW"}
-                two{"{0} kW"}
-                zero{"{0} kW"}
-            }
-            watt{
-                few{"{0} W"}
-                many{"{0} W"}
-                one{"{0} W"}
-                other{"{0} W"}
-                two{"{0} W"}
-                zero{"{0} W"}
-            }
-        }
-        pressure{
-            hectopascal{
-                few{"{0} hPa"}
-                many{"{0} hPa"}
-                one{"{0} hPa"}
-                other{"{0} hPa"}
-                two{"{0} hPa"}
-                zero{"{0} hPa"}
-            }
-            inch-hg{
-                few{"{0} \u0022 Hg"}
-                many{"{0} \u0022 Hg"}
-                one{"{0} \u0022 Hg"}
-                other{"{0} \u0022 Hg"}
-                two{"{0} \u0022 Hg"}
-                zero{"{0} \u0022 Hg"}
-            }
-            millibar{
-                few{"{0} mbar"}
-                many{"{0} mbar"}
-                one{"{0} mbar"}
-                other{"{0} mbar"}
-                two{"{0} mbar"}
-                zero{"{0} mbar"}
-            }
-        }
-        speed{
-            kilometer-per-hour{
-                few{"{0} km/h"}
-                many{"{0} km/h"}
-                one{"{0} km/h"}
-                other{"{0} km/h"}
-                two{"{0} km/h"}
-                zero{"{0} km/h"}
-            }
-            meter-per-second{
-                few{"{0} m/s"}
-                many{"{0} m/s"}
-                one{"{0} m/s"}
-                other{"{0} m/s"}
-                two{"{0} m/s"}
-                zero{"{0} m/s"}
-            }
-            mile-per-hour{
-                few{"{0} m.y.a."}
-                many{"{0} m.y.a."}
-                one{"{0} m.y.a."}
-                other{"{0} m.y.a."}
-                two{"{0} m.y.a."}
-                zero{"{0} m.y.a."}
-            }
-        }
-        temperature{
-            celsius{
-                few{"{0}°C"}
-                many{"{0}°C"}
-                one{"{0}°C"}
-                other{"{0}°C"}
-                two{"{0}°C"}
-                zero{"{0}°C"}
-            }
-            fahrenheit{
-                few{"{0}°F"}
-                many{"{0}°F"}
-                one{"{0}°F"}
-                other{"{0}°F"}
-                two{"{0}°F"}
-                zero{"{0}°F"}
-            }
-        }
-        volume{
-            cubic-kilometer{
-                few{"{0} km³"}
-                many{"{0} km³"}
-                one{"{0} km³"}
-                other{"{0} km³"}
-                two{"{0} km³"}
-                zero{"{0} km³"}
-            }
-            cubic-mile{
-                few{"{0} mi³"}
-                many{"{0} mi³"}
-                one{"{0} mi³"}
-                other{"{0} mi³"}
-                two{"{0} mi³"}
-                zero{"{0} mi³"}
-            }
-            liter{
-                few{"{0} l"}
-                many{"{0} l"}
-                one{"{0} l"}
-                other{"{0} l"}
-                two{"{0} l"}
-                zero{"{0} l"}
+        number{
+            lenient{
+                "[\\-‐‒–⁻₋−➖﹣-]",
+                "[,،٫、︐︑﹐﹑,、]",
+                "[+⁺₊➕﬩﹢+]",
+            }
+            stricter{
+                "[,٫︐﹐,]",
+                "[.․﹒.。]",
             }
         }
     }