X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/2ca993e82fb37b597a3c73ecd1586a139a6579c5..340931cb2e044a2141d11567dd0f782524e32994:/icuSources/data/misc/dayPeriods.txt

diff --git a/icuSources/data/misc/dayPeriods.txt b/icuSources/data/misc/dayPeriods.txt
index ca56bf2c..1f88c239 100644
--- a/icuSources/data/misc/dayPeriods.txt
+++ b/icuSources/data/misc/dayPeriods.txt
@@ -1,167 +1,167 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2016 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/dayPeriods.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 dayPeriods:table(nofallback){
     locales{
         af{"set3"}
-        am{"set67"}
-        ar{"set65"}
-        az{"set61"}
-        bg{"set20"}
-        bn{"set33"}
-        bs{"set24"}
-        ca{"set14"}
-        chr{"set75"}
-        cs{"set26"}
-        da{"set6"}
-        de{"set5"}
-        ee{"set76"}
-        el{"set39"}
+        am{"set68"}
+        ar{"set66"}
+        az{"set62"}
+        bg{"set21"}
+        bn{"set34"}
+        bs{"set25"}
+        ca{"set15"}
+        ccp{"set34"}
+        chr{"set76"}
+        cs{"set27"}
+        cy{"set78"}
+        da{"set7"}
+        de{"set6"}
+        ee{"set77"}
+        el{"set40"}
         en{"set2"}
-        es{"set12"}
-        es_CO{"set13"}
-        et{"set48"}
-        eu{"set73"}
-        fa{"set42"}
-        fi{"set47"}
-        fil{"set59"}
-        fr{"set17"}
-        gl{"set11"}
-        gu{"set34"}
-        he{"set66"}
-        hi{"set32"}
-        hr{"set23"}
-        hu{"set49"}
-        hy{"set41"}
-        id{"set57"}
-        is{"set9"}
-        it{"set15"}
-        ja{"set52"}
-        ka{"set72"}
-        kk{"set62"}
-        km{"set69"}
-        kn{"set46"}
-        ko{"set53"}
-        ky{"set63"}
-        lo{"set56"}
-        lt{"set29"}
-        lv{"set30"}
-        mk{"set21"}
-        ml{"set45"}
-        mn{"set74"}
-        mr{"set35"}
-        ms{"set58"}
-        my{"set54"}
-        nb{"set7"}
-        ne{"set36"}
+        es{"set13"}
+        es_CO{"set14"}
+        et{"set49"}
+        eu{"set74"}
+        fa{"set43"}
+        fi{"set48"}
+        fil{"set60"}
+        fr{"set18"}
+        gl{"set12"}
+        gsw{"set5"}
+        gu{"set35"}
+        he{"set67"}
+        hi{"set33"}
+        hr{"set24"}
+        hu{"set50"}
+        hy{"set42"}
+        id{"set58"}
+        is{"set10"}
+        it{"set16"}
+        ja{"set53"}
+        ka{"set73"}
+        kk{"set63"}
+        km{"set70"}
+        kn{"set47"}
+        ko{"set54"}
+        ky{"set64"}
+        lo{"set57"}
+        lt{"set30"}
+        lv{"set31"}
+        mk{"set22"}
+        ml{"set46"}
+        mn{"set75"}
+        mr{"set36"}
+        ms{"set59"}
+        my{"set55"}
+        nb{"set8"}
+        ne{"set37"}
         nl{"set4"}
-        pa{"set37"}
-        pl{"set28"}
-        pt{"set10"}
-        ro{"set16"}
+        pa{"set38"}
+        pl{"set29"}
+        pt{"set11"}
+        ro{"set17"}
         root{"set1"}
-        ru{"set18"}
-        si{"set38"}
-        sk{"set27"}
-        sl{"set25"}
-        sq{"set40"}
-        sr{"set22"}
-        sv{"set8"}
-        sw{"set70"}
-        ta{"set43"}
-        te{"set44"}
-        th{"set55"}
-        tr{"set60"}
-        uk{"set19"}
-        ur{"set31"}
-        uz{"set64"}
-        vi{"set68"}
-        yue{"set51"}
-        zh{"set50"}
-        zu{"set71"}
+        ru{"set19"}
+        si{"set39"}
+        sk{"set28"}
+        sl{"set26"}
+        sq{"set41"}
+        sr{"set23"}
+        sv{"set9"}
+        sw{"set71"}
+        ta{"set44"}
+        te{"set45"}
+        th{"set56"}
+        tr{"set61"}
+        uk{"set20"}
+        ur{"set32"}
+        uz{"set65"}
+        vi{"set69"}
+        yue{"set52"}
+        zh{"set51"}
+        zu{"set72"}
     }
     locales_selection{
-        af{"set79"}
-        am{"set147"}
-        ar{"set138"}
-        az{"set129"}
-        bg{"set101"}
-        bn{"set114"}
-        bs{"set95"}
-        ca{"set90"}
-        chr{"set151"}
-        cs{"set98"}
-        da{"set82"}
-        de{"set81"}
-        ee{"set152"}
-        el{"set107"}
-        en{"set78"}
-        es{"set88"}
-        es_CO{"set89"}
-        et{"set133"}
-        eu{"set148"}
-        fa{"set108"}
-        fi{"set134"}
-        fil{"set142"}
-        fr{"set93"}
-        gl{"set87"}
-        gu{"set115"}
-        he{"set139"}
-        hi{"set113"}
-        hr{"set94"}
-        hu{"set135"}
-        hy{"set109"}
-        id{"set140"}
-        is{"set85"}
-        it{"set91"}
-        ja{"set126"}
-        ka{"set110"}
-        kk{"set130"}
-        km{"set144"}
-        kn{"set123"}
-        ko{"set127"}
-        ky{"set131"}
-        lo{"set137"}
-        lt{"set105"}
-        lv{"set106"}
-        mk{"set102"}
-        ml{"set122"}
-        mn{"set149"}
-        mr{"set116"}
-        ms{"set141"}
-        my{"set150"}
-        nb{"set83"}
-        ne{"set117"}
-        nl{"set80"}
-        pa{"set118"}
-        pl{"set100"}
-        pt{"set86"}
-        ro{"set92"}
-        root{"set77"}
-        ru{"set103"}
-        si{"set119"}
-        sk{"set99"}
-        sl{"set97"}
-        sq{"set111"}
-        sr{"set96"}
-        sv{"set84"}
-        sw{"set145"}
-        ta{"set120"}
-        te{"set121"}
-        th{"set136"}
-        tr{"set128"}
-        uk{"set104"}
-        ur{"set112"}
-        uz{"set132"}
-        vi{"set143"}
-        yue{"set125"}
-        zh{"set124"}
-        zu{"set146"}
+        af{"set81"}
+        am{"set150"}
+        ar{"set141"}
+        az{"set132"}
+        bg{"set104"}
+        bn{"set117"}
+        bs{"set98"}
+        ca{"set93"}
+        ccp{"set117"}
+        chr{"set154"}
+        cs{"set101"}
+        cy{"set156"}
+        da{"set85"}
+        de{"set84"}
+        ee{"set155"}
+        el{"set110"}
+        en{"set80"}
+        es{"set91"}
+        es_CO{"set92"}
+        et{"set136"}
+        eu{"set151"}
+        fa{"set111"}
+        fi{"set137"}
+        fil{"set145"}
+        fr{"set96"}
+        gl{"set90"}
+        gsw{"set83"}
+        gu{"set118"}
+        he{"set142"}
+        hi{"set116"}
+        hr{"set97"}
+        hu{"set138"}
+        hy{"set112"}
+        id{"set143"}
+        is{"set88"}
+        it{"set94"}
+        ja{"set129"}
+        ka{"set113"}
+        kk{"set133"}
+        km{"set147"}
+        kn{"set126"}
+        ko{"set130"}
+        ky{"set134"}
+        lo{"set140"}
+        lt{"set108"}
+        lv{"set109"}
+        mk{"set105"}
+        ml{"set125"}
+        mn{"set152"}
+        mr{"set119"}
+        ms{"set144"}
+        my{"set153"}
+        nb{"set86"}
+        ne{"set120"}
+        nl{"set82"}
+        pa{"set121"}
+        pl{"set103"}
+        pt{"set89"}
+        ro{"set95"}
+        root{"set79"}
+        ru{"set106"}
+        si{"set122"}
+        sk{"set102"}
+        sl{"set100"}
+        sq{"set114"}
+        sr{"set99"}
+        sv{"set87"}
+        sw{"set148"}
+        ta{"set123"}
+        te{"set124"}
+        th{"set139"}
+        tr{"set131"}
+        uk{"set107"}
+        ur{"set115"}
+        uz{"set135"}
+        vi{"set146"}
+        yue{"set128"}
+        zh{"set127"}
+        zu{"set149"}
     }
     rules{
         set1{
@@ -176,12 +176,12 @@ dayPeriods:table(nofallback){
         }
         set10{
             afternoon1{
-                before{"19:00"}
+                before{"18:00"}
                 from{"12:00"}
             }
             evening1{
                 before{"24:00"}
-                from{"19:00"}
+                from{"18:00"}
             }
             midnight{
                 at{"00:00"}
@@ -199,6 +199,72 @@ dayPeriods:table(nofallback){
             }
         }
         set100{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"22:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"10:00"}
+                from{"06:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"10:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"22:00"}
+            }
+        }
+        set101{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"22:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"09:00"}
+                from{"04:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"09:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"22:00"}
+            }
+        }
+        set102{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"22:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"09:00"}
+                from{"04:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"09:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"22:00"}
+            }
+        }
+        set103{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -220,7 +286,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set101{
+        set104{
             afternoon1{
                 before{"18:00"}
                 from{"14:00"}
@@ -242,7 +308,7 @@ dayPeriods:table(nofallback){
                 from{"22:00"}
             }
         }
-        set102{
+        set105{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -264,7 +330,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set103{
+        set106{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -282,7 +348,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set104{
+        set107{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -300,7 +366,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set105{
+        set108{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -318,7 +384,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set106{
+        set109{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -336,31 +402,37 @@ dayPeriods:table(nofallback){
                 from{"23:00"}
             }
         }
-        set107{
+        set11{
             afternoon1{
-                before{"17:00"}
+                before{"19:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"20:00"}
-                from{"17:00"}
+                before{"24:00"}
+                from{"19:00"}
+            }
+            midnight{
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"04:00"}
+                from{"06:00"}
             }
             night1{
-                before{"04:00"}
-                from{"20:00"}
+                before{"06:00"}
+                from{"00:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set108{
+        set110{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"19:00"}
+                before{"20:00"}
                 from{"17:00"}
             }
             morning1{
@@ -369,53 +441,54 @@ dayPeriods:table(nofallback){
             }
             night1{
                 before{"04:00"}
-                from{"19:00"}
+                from{"20:00"}
             }
         }
-        set109{
+        set111{
             afternoon1{
-                before{"18:00"}
+                before{"13:00"}
                 from{"12:00"}
             }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
+            afternoon2{
+                before{"19:00"}
+                from{"13:00"}
             }
             morning1{
+                before{"04:00"}
+                from{"01:00"}
+            }
+            morning2{
                 before{"12:00"}
-                from{"06:00"}
+                from{"04:00"}
             }
             night1{
-                before{"06:00"}
+                before{"24:00"}
+                from{"19:00"}
+            }
+            night2{
+                before{"01:00"}
                 from{"00:00"}
             }
         }
-        set11{
+        set112{
             afternoon1{
-                before{"13:00"}
+                before{"18:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"21:00"}
-                from{"13:00"}
-            }
-            midnight{
-                at{"00:00"}
+                before{"24:00"}
+                from{"18:00"}
             }
             morning1{
-                before{"06:00"}
-                from{"00:00"}
-            }
-            morning2{
                 before{"12:00"}
                 from{"06:00"}
             }
             night1{
-                before{"24:00"}
-                from{"21:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set110{
+        set113{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -433,7 +506,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set111{
+        set114{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -455,7 +528,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set112{
+        set115{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -477,7 +550,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set113{
+        set116{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -495,7 +568,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set114{
+        set117{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -521,7 +594,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set115{
+        set118{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -539,7 +612,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set116{
+        set119{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -565,7 +638,32 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set117{
+        set12{
+            afternoon1{
+                before{"13:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"13:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"21:00"}
+            }
+        }
+        set120{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -587,7 +685,7 @@ dayPeriods:table(nofallback){
                 from{"22:00"}
             }
         }
-        set118{
+        set121{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -605,7 +703,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set119{
+        set122{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -631,28 +729,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set12{
-            evening1{
-                before{"20:00"}
-                from{"12:00"}
-            }
-            morning1{
-                before{"06:00"}
-                from{"00:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"20:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
-        set120{
+        set123{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -682,7 +759,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set121{
+        set124{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -700,7 +777,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set122{
+        set125{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -730,7 +807,7 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set123{
+        set126{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -748,7 +825,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set124{
+        set127{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -774,7 +851,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set125{
+        set128{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -800,7 +877,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set126{
+        set129{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -822,7 +899,28 @@ dayPeriods:table(nofallback){
                 from{"23:00"}
             }
         }
-        set127{
+        set13{
+            evening1{
+                before{"20:00"}
+                from{"12:00"}
+            }
+            morning1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"20:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set130{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -844,7 +942,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set128{
+        set131{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -870,7 +968,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set129{
+        set132{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
@@ -896,24 +994,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set13{
-            evening1{
-                before{"20:00"}
-                from{"12:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"00:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"20:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
-        set130{
+        set133{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -931,7 +1012,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set131{
+        set134{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -949,7 +1030,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set132{
+        set135{
             afternoon1{
                 before{"18:00"}
                 from{"11:00"}
@@ -967,7 +1048,7 @@ dayPeriods:table(nofallback){
                 from{"22:00"}
             }
         }
-        set133{
+        set136{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -985,7 +1066,7 @@ dayPeriods:table(nofallback){
                 from{"23:00"}
             }
         }
-        set134{
+        set137{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1007,7 +1088,7 @@ dayPeriods:table(nofallback){
                 from{"23:00"}
             }
         }
-        set135{
+        set138{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1033,7 +1114,7 @@ dayPeriods:table(nofallback){
                 from{"04:00"}
             }
         }
-        set136{
+        set139{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -1059,7 +1140,24 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set137{
+        set14{
+            evening1{
+                before{"20:00"}
+                from{"12:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"00:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"20:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set140{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1077,7 +1175,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set138{
+        set141{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -1107,58 +1205,33 @@ dayPeriods:table(nofallback){
                 from{"01:00"}
             }
         }
-        set139{
+        set142{
             afternoon1{
-                before{"15:00"}
-                from{"11:00"}
+                before{"16:00"}
+                from{"12:00"}
             }
             afternoon2{
                 before{"18:00"}
-                from{"15:00"}
+                from{"16:00"}
             }
             evening1{
                 before{"22:00"}
                 from{"18:00"}
             }
             morning1{
-                before{"11:00"}
-                from{"05:00"}
+                before{"12:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
+                before{"03:00"}
                 from{"22:00"}
             }
-        }
-        set14{
-            afternoon1{
-                before{"13:00"}
-                from{"12:00"}
-            }
-            afternoon2{
-                before{"19:00"}
-                from{"13:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"19:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
+            night2{
                 before{"06:00"}
-                from{"00:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"21:00"}
+                from{"03:00"}
             }
         }
-        set140{
+        set143{
             afternoon1{
                 before{"15:00"}
                 from{"10:00"}
@@ -1176,7 +1249,7 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
         }
-        set141{
+        set144{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1198,7 +1271,7 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set142{
+        set145{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1220,7 +1293,7 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
         }
-        set143{
+        set146{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1238,7 +1311,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set144{
+        set147{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1256,7 +1329,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set145{
+        set148{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1278,7 +1351,7 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set146{
+        set149{
             afternoon1{
                 before{"13:00"}
                 from{"10:00"}
@@ -1300,7 +1373,36 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set147{
+        set15{
+            afternoon1{
+                before{"13:00"}
+                from{"12:00"}
+            }
+            afternoon2{
+                before{"19:00"}
+                from{"13:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"19:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"21:00"}
+            }
+        }
+        set150{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1318,7 +1420,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set148{
+        set151{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1344,7 +1446,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set149{
+        set152{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1362,31 +1464,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set15{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"00:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
-        set150{
+        set153{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1404,7 +1482,7 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set151{
+        set154{
             afternoon1{
                 before{"24:00"}
                 from{"12:00"}
@@ -1414,7 +1492,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set152{
+        set155{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1440,13 +1518,27 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
+        set156{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"00:00"}
+            }
+        }
         set16{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"22:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             midnight{
@@ -1454,11 +1546,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"05:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
-                from{"22:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -1470,7 +1562,7 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"22:00"}
                 from{"18:00"}
             }
             midnight{
@@ -1478,11 +1570,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"04:00"}
+                from{"05:00"}
             }
             night1{
-                before{"04:00"}
-                from{"00:00"}
+                before{"05:00"}
+                from{"22:00"}
             }
             noon{
                 at{"12:00"}
@@ -1561,6 +1653,30 @@ dayPeriods:table(nofallback){
             }
         }
         set20{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"00:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set21{
             afternoon1{
                 before{"18:00"}
                 from{"14:00"}
@@ -1585,7 +1701,7 @@ dayPeriods:table(nofallback){
                 from{"22:00"}
             }
         }
-        set21{
+        set22{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1613,7 +1729,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set22{
+        set23{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1637,7 +1753,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set23{
+        set24{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1661,7 +1777,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set24{
+        set25{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1685,7 +1801,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set25{
+        set26{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1713,7 +1829,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set26{
+        set27{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1741,7 +1857,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set27{
+        set28{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1769,7 +1885,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set28{
+        set29{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1797,7 +1913,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set29{
+        set3{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1811,17 +1927,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"06:00"}
+                from{"05:00"}
             }
             night1{
-                before{"06:00"}
+                before{"05:00"}
                 from{"00:00"}
             }
-            noon{
-                at{"12:00"}
-            }
         }
-        set3{
+        set30{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1835,14 +1948,17 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"05:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
+                before{"06:00"}
                 from{"00:00"}
             }
-        }
-        set30{
+            noon{
+                at{"12:00"}
+            }
+        }
+        set31{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1866,7 +1982,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set31{
+        set32{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1891,7 +2007,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set32{
+        set33{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1912,7 +2028,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set33{
+        set34{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1938,7 +2054,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set34{
+        set35{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1959,7 +2075,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set35{
+        set36{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1991,7 +2107,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set36{
+        set37{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2019,7 +2135,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set37{
+        set38{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2040,7 +2156,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set38{
+        set39{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2072,24 +2188,6 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set39{
-            afternoon1{
-                before{"17:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"20:00"}
-                from{"17:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"20:00"}
-            }
-        }
         set4{
             afternoon1{
                 before{"18:00"}
@@ -2112,6 +2210,24 @@ dayPeriods:table(nofallback){
             }
         }
         set40{
+            afternoon1{
+                before{"17:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"20:00"}
+                from{"17:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"20:00"}
+            }
+        }
+        set41{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2139,7 +2255,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set41{
+        set42{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2163,31 +2279,33 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set42{
+        set43{
             afternoon1{
-                before{"17:00"}
+                before{"13:00"}
                 from{"12:00"}
             }
-            evening1{
+            afternoon2{
                 before{"19:00"}
-                from{"17:00"}
-            }
-            midnight{
-                at{"00:00"}
+                from{"13:00"}
             }
             morning1{
+                before{"04:00"}
+                from{"01:00"}
+            }
+            morning2{
                 before{"12:00"}
                 from{"04:00"}
             }
             night1{
-                before{"04:00"}
+                before{"24:00"}
                 from{"19:00"}
             }
-            noon{
-                at{"12:00"}
+            night2{
+                before{"01:00"}
+                from{"00:00"}
             }
         }
-        set43{
+        set44{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2223,7 +2341,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set44{
+        set45{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2244,7 +2362,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set45{
+        set46{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2280,7 +2398,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set46{
+        set47{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2301,7 +2419,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set47{
+        set48{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2329,7 +2447,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set48{
+        set49{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2353,68 +2471,64 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set49{
+        set5{
             afternoon1{
-                before{"18:00"}
+                before{"14:00"}
                 from{"12:00"}
             }
+            afternoon2{
+                before{"18:00"}
+                from{"14:00"}
+            }
             evening1{
-                before{"21:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"09:00"}
-                from{"06:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"09:00"}
+                from{"05:00"}
             }
             night1{
-                before{"04:00"}
-                from{"21:00"}
-            }
-            night2{
-                before{"06:00"}
-                from{"04:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set5{
+        set50{
             afternoon1{
-                before{"13:00"}
-                from{"12:00"}
-            }
-            afternoon2{
                 before{"18:00"}
-                from{"13:00"}
+                from{"12:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"21:00"}
                 from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"05:00"}
+                before{"09:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"09:00"}
             }
             night1{
-                before{"05:00"}
-                from{"00:00"}
+                before{"04:00"}
+                from{"21:00"}
+            }
+            night2{
+                before{"06:00"}
+                from{"04:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set50{
+        set51{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2443,7 +2557,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set51{
+        set52{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2472,7 +2586,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set52{
+        set53{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2500,7 +2614,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set53{
+        set54{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2528,7 +2642,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set54{
+        set55{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2552,7 +2666,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set55{
+        set56{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2584,7 +2698,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set56{
+        set57{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2608,7 +2722,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set57{
+        set58{
             afternoon1{
                 before{"15:00"}
                 from{"10:00"}
@@ -2632,7 +2746,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set58{
+        set59{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2654,60 +2768,64 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set59{
+        set6{
             afternoon1{
-                before{"16:00"}
+                before{"13:00"}
                 from{"12:00"}
             }
-            evening1{
+            afternoon2{
                 before{"18:00"}
-                from{"16:00"}
+                from{"13:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"06:00"}
-                from{"00:00"}
+                before{"10:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"06:00"}
+                from{"10:00"}
             }
             night1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set6{
+        set60{
             afternoon1{
-                before{"18:00"}
+                before{"16:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
-                from{"18:00"}
+                before{"18:00"}
+                from{"16:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"05:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
-                from{"00:00"}
+                before{"24:00"}
+                from{"18:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set60{
+        set61{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2739,7 +2857,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set61{
+        set62{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
@@ -2771,7 +2889,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set62{
+        set63{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2795,7 +2913,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set63{
+        set64{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2819,7 +2937,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set64{
+        set65{
             afternoon1{
                 before{"18:00"}
                 from{"11:00"}
@@ -2843,7 +2961,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set65{
+        set66{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2873,14 +2991,14 @@ dayPeriods:table(nofallback){
                 from{"01:00"}
             }
         }
-        set66{
+        set67{
             afternoon1{
-                before{"15:00"}
-                from{"11:00"}
+                before{"16:00"}
+                from{"12:00"}
             }
             afternoon2{
                 before{"18:00"}
-                from{"15:00"}
+                from{"16:00"}
             }
             evening1{
                 before{"22:00"}
@@ -2890,15 +3008,19 @@ dayPeriods:table(nofallback){
                 at{"00:00"}
             }
             morning1{
-                before{"11:00"}
-                from{"05:00"}
+                before{"12:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
+                before{"03:00"}
                 from{"22:00"}
             }
+            night2{
+                before{"06:00"}
+                from{"03:00"}
+            }
         }
-        set67{
+        set68{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2922,7 +3044,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set68{
+        set69{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2946,56 +3068,56 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set69{
+        set7{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"21:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
+                before{"10:00"}
+                from{"05:00"}
+            }
+            morning2{
                 before{"12:00"}
-                from{"00:00"}
+                from{"10:00"}
             }
             night1{
-                before{"24:00"}
-                from{"21:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set7{
+        set70{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"21:00"}
                 from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"06:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"00:00"}
             }
             night1{
-                before{"06:00"}
-                from{"00:00"}
+                before{"24:00"}
+                from{"21:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set70{
+        set71{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -3023,7 +3145,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set71{
+        set72{
             afternoon1{
                 before{"13:00"}
                 from{"10:00"}
@@ -3045,7 +3167,7 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
         }
-        set72{
+        set73{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3069,7 +3191,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set73{
+        set74{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3098,7 +3220,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set74{
+        set75{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3122,7 +3244,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set75{
+        set76{
             afternoon1{
                 before{"24:00"}
                 from{"12:00"}
@@ -3135,7 +3257,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set76{
+        set77{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3161,7 +3283,27 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set77{
+        set78{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"00:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set79{
             am{
                 before{"12:00"}
                 from{"00:00"}
@@ -3171,7 +3313,32 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
         }
-        set78{
+        set8{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"10:00"}
+                from{"06:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"10:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+        }
+        set80{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3189,7 +3356,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set79{
+        set81{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3207,7 +3374,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set8{
+        set82{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3216,41 +3383,41 @@ dayPeriods:table(nofallback){
                 before{"24:00"}
                 from{"18:00"}
             }
-            midnight{
-                at{"00:00"}
-            }
             morning1{
-                before{"10:00"}
-                from{"05:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
+                before{"06:00"}
                 from{"00:00"}
             }
         }
-        set80{
+        set83{
             afternoon1{
-                before{"18:00"}
+                before{"14:00"}
                 from{"12:00"}
             }
+            afternoon2{
+                before{"18:00"}
+                from{"14:00"}
+            }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
+            midnight{
+                at{"00:00"}
+            }
             morning1{
                 before{"12:00"}
-                from{"06:00"}
+                from{"05:00"}
             }
             night1{
-                before{"06:00"}
+                before{"05:00"}
                 from{"00:00"}
             }
         }
-        set81{
+        set84{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3276,7 +3443,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set82{
+        set85{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3298,7 +3465,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set83{
+        set86{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3320,7 +3487,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set84{
+        set87{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3342,7 +3509,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set85{
+        set88{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3360,7 +3527,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set86{
+        set89{
             afternoon1{
                 before{"19:00"}
                 from{"12:00"}
@@ -3378,7 +3545,32 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set87{
+        set9{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"10:00"}
+                from{"05:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"10:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"00:00"}
+            }
+        }
+        set90{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3400,7 +3592,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set88{
+        set91{
             evening1{
                 before{"20:00"}
                 from{"12:00"}
@@ -3418,7 +3610,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set89{
+        set92{
             evening1{
                 before{"20:00"}
                 from{"12:00"}
@@ -3432,31 +3624,7 @@ dayPeriods:table(nofallback){
                 from{"20:00"}
             }
         }
-        set9{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"00:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
-        set90{
+        set93{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3482,7 +3650,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set91{
+        set94{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3500,7 +3668,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set92{
+        set95{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3518,7 +3686,7 @@ dayPeriods:table(nofallback){
                 from{"22:00"}
             }
         }
-        set93{
+        set96{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3536,7 +3704,7 @@ dayPeriods:table(nofallback){
                 from{"00:00"}
             }
         }
-        set94{
+        set97{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3554,7 +3722,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set95{
+        set98{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3572,7 +3740,7 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set96{
+        set99{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3590,71 +3758,5 @@ dayPeriods:table(nofallback){
                 from{"21:00"}
             }
         }
-        set97{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"22:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"10:00"}
-                from{"06:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"10:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"22:00"}
-            }
-        }
-        set98{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"22:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"09:00"}
-                from{"04:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"09:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"22:00"}
-            }
-        }
-        set99{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"22:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"09:00"}
-                from{"04:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"09:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"22:00"}
-            }
-        }
     }
 }