Add Nunavut, and flower/bird/tree categories as appropriate.

3 files changed, 77 insertions, 65 deletions

diff --git a/games/quiz/datfiles/index b/games/quiz/datfiles/index
index 0822ca1977a..a66814faf1e 100644
--- a/games/quiz/datfiles/index
+++ b/games/quiz/datfiles/index
@@ -22,11 +22,11 @@
 /usr/share/games/quiz.db/poetry:poem{-}line:next:poem:author
 /usr/share/games/quiz.db/posneg:pos{itive}:neg{ative}
 /usr/share/games/quiz.db/pres:pres{ident}:term:vice:succ{essor}
-/usr/share/games/quiz.db/province:province:cap{ital}
+/usr/share/games/quiz.db/province:province:cap{ital}:flower:bird
 /usr/share/games/quiz.db/seq-easy:easy{-}{seq{uence}}:next:name
 /usr/share/games/quiz.db/seq-hard:hard{-}{seq{uence}}:next:name
 /usr/share/games/quiz.db/sexes:male:female
 /usr/share/games/quiz.db/sov:sov{ereign}:cen{t{ury}}:succ{essor}
-/usr/share/games/quiz.db/state:state:cap{ital}:abbr{ev{iation}}:flower
+/usr/share/games/quiz.db/state:state:cap{ital}:abbr{ev{iation}}:flower:bird:tree
 /usr/share/games/quiz.db/trek:star:trek
 /usr/share/games/quiz.db/ucc:section:U{niform{-}}C{riminal{-}}C{ode}
diff --git a/games/quiz/datfiles/province b/games/quiz/datfiles/province
index 63e044cd805..6b20dfc1cfb 100644
--- a/games/quiz/datfiles/province
+++ b/games/quiz/datfiles/province
@@ -1,13 +1,14 @@
-Newfoundland{ and Labrador}:[St.|Saint] John's
-New Brunswick:Fredericton
-Prince Edward Island:Charlottetown
-Nova Scotia:Halifax
-Quebec:Quebec
-Ontario:Toronto
-Manitoba:Winnipeg
-Saskatchewan:Regina
-Alberta:Edmonton
-British Columbia:Victoria
-Yukon Territory:Whitehorse
-Northwest Territories:Yellowknife
-Canada:Ottawa
+Newfoundland{ and Labrador}:[St.|Saint] John's:pitcher plant:{Atlantic }puffin
+New Brunswick|NB:Fredericton:{purple }violet:{black{-| }capped }chickadee
+Prince Edward Island|PEI:Charlottetown:lady{'s |-}slipper:{blue|blue }jay
+Nova Scotia|NS:Halifax:mayflower:osprey
+Quebec:Quebec{ City}:{white }{garden }lily:{snowy }owl
+Ontario:Toronto:{white }trillium:{common }loon
+Manitoba:Winnipeg:{prairie }crocus:{great }{grey }owl
+Saskatchewan:Regina:{Western }{red }lily:{prairie }grouse
+Alberta:Edmonton:{wild }rose:{great }{horned }owl
+British Columbia|BC:Victoria:{Pacific }dogwood:{Stellar's }jay
+Yukon{ Territory}:Whitehorse:fireweed:{common }raven
+Nunavut:Iqaluit:{Arctic }poppy:
+Northwest Territories|NWT:Yellowknife:{mountain }avens:gyrfalcon
+Canada:Ottawa::
diff --git a/games/quiz/datfiles/state b/games/quiz/datfiles/state
index 0c114873b81..6a8ceb1c78b 100644
--- a/games/quiz/datfiles/state
+++ b/games/quiz/datfiles/state
@@ -1,50 +1,61 @@
-Alabama|Ala|AL:Montgomery:AL:goldenrod
-Alaska|AK:Juneau:AK:forget{-| }me{-| }not
-Arizona|Ariz|AZ:Phoenix:AZ:{saguaro }cactus
-Arkansas|Ark|AR:Little Rock:AR:gok
-Cal{if{ornia}}|CA:Sacramento:CA:{golden }poppy
-Col{o{rado}}|CO:Denver:CO:columbine
-Conn{ecticut}|CT:Hartford:CT:{mountain }laurel
-Del{aware}|DE:Dover:DE:peach{ blossom}
-Fl{orid}a|FL:Tallahassee:FL:orange{ blossom}
-Georgia|Ga:Atlanta:GA:{Cherokee }rose
-Hawaii|HI:Honolulu:HI:hibiscus
-Idaho|Ida|ID:Boise:ID:syringa
-Ill{inois}|IL:Springfield:IL:violet
-Ind{iana}|IN:Indianapolis:IN:zinnia
-Iowa|Ia:Des Moines:IA:{wild }rose
-Kans{as}|Kan|KS:Topeka:KS:sun{ }flower
-Kentucky|Ky:Frankfort:KY:goldenrod
-Louisiana|La:Baton Rouge:LA:magnolia
-Maine|Me:Augusta:ME:pinecone{ and}{ tassel}
-Maryland|Md:Annapolis:MD:blackeyed susan
-Mass{achusetts}|MA:Boston:MA:{trailing }arbutus
-Mich{igan}|MI:Lansing:MI:apple{ blossom}
-Minn{esota}|MN:Saint Paul|St Paul:MN:gok
-Miss{issippi}|MS:Jackson:MS:magnolia
-Missouri|Mo:Jefferson City:MO:hawthorn
-Mont{ana}|MT:Helena:MT:bitterroot
-Nebraska|Neb|NE|NB:Lincoln:NE|NB:goldenrod
-Nevada|Nev|NV:Carson City:NV:sagebrush
-New Hampshire|NH:Concord:NH:{purple }lilac
-New Jersey|NJ:Trenton:NJ:violet
-New Mexico|NM:Santa Fe:NM:yucca
-New York|NY:Albany:NY:{wild }rose
-N{orth} Carolina|NC:Raleigh:NC:dogwood
-N{orth} Dakota|ND:Bismarck:ND:{wild }{prarie }rose
-Ohio|O|OH:Columbus:OH:{scarlet }carnation
-Oklahoma|Okla|OK:Oklahoma City:OK:mistletoe
-Oregon|Ore|OR:Salem:OR:{Oregon }grape
-Pennsylvania|Pa:Harrisburg:PA:{mountain }laurel
-Rhode Island|RI:Providence:RI:violet
-S{outh} Carolina|SC:Columbia:SC:{yellow }jasmine
-S{outh} Dakota|SD:Pierre:SD:pasque{ flower}
-Tenn{essee}|TN:Nashville:TN:iris
-Texas|Tex|TX:Austin:TX:blue{-| }bonnet
-Utah|UT:Salt Lake City:UT:{sego }lilly
-Vermont|Vt:Montpelier:VT:{red }clover
-Virginia|Va:Richmond:VA:dogwood
-Wash{ington}|WA:Olympia:WA:rhododendron
-W{est} Virginia|W{ }Va|WV:Charleston:WV:rhododendron
-Wisconsin|Wis|WI:Madison:WI:violet
-Wyo{ming}|WY:Cheyenne:WY:indian paint brush
+Alabama|Ala|AL:Montgomery:AL:camellia:yellowhammer:{Southern }pine
+Alaska|AK:Juneau:AK:forget{-| }me{-| }not:{willow }ptarmigan:{Sitka }spruce
+Arizona|Ariz|AZ:Phoenix:AZ:{saguaro }cactus{ blossom}:cactus wren:paloverde
+Arkansas|Ark|AR:Little Rock:AR:apple blossom:mockingbird:pine
+Cal{if{ornia}}|CA:Sacramento:CA:{golden }poppy:{California Valley }Quail:\
+{California }redwood
+Col{o{rado}}|CO:Denver:CO:{Rocky Mountain }columbine:lark bunting:\
+{{Colorado }Blue }Spruce
+Conn{ecticut}|CT:Hartford:CT:{mountain }laurel:robin:{white }oak
+Del{aware}|DE:Dover:DE:peach{ blossom}:Blue Hen chicken:{American }holly
+Fl{orid}a|FL:Tallahassee:FL:orange{ blossom}:mockingbird:{sabal }palm
+Georgia|Ga:Atlanta:GA:{Cherokee }rose:{brown }thrasher:{live }oak
+Hawaii|HI:Honolulu:HI:{yellow }hibiscus:nene|{short winged }goose:\
+kukui|candlenut
+Idaho|Ida|ID:Boise:ID:syringa:{mountain }bluebird:{western }{white }pine
+Ill{inois}|IL:Springfield:IL:violet:cardinal:{white }oak
+Ind{iana}|IN:Indianapolis:IN:peony:cardinal:tulip tree
+Iowa|Ia:Des Moines:IA:{wild }rose:{Eastern }goldfinch:oak
+Kans{as}|Kan|KS:Topeka:KS:sun{ }flower:{Western }meadow{ }lark:cottonwood
+Kentucky|Ky:Frankfort:KY:goldenrod:{Kentucky }cardinal:{tulip }poplar
+Louisiana|La:Baton Rouge:LA:magnolia:{Eastern }{brown }pelican:{bald }cypress
+Maine|Me:Augusta:ME:{white }pine{ }cone{ and}{ tassel}:chickadee:{white }pine
+Maryland|Md:Annapolis:MD:black{-}eyed susan:{Baltimore }oriole:{white }oak
+Mass{achusetts}|MA:Boston:MA:Mayflower|{trailing }arbutus:chickadee:\
+{American }elm
+Mich{igan}|MI:Lansing:MI:apple{ blossom}:robin:{white }pine
+Minn{esota}|MN:Saint Paul|St Paul:MN:lady{-|'s | }slipper:{common }loon:\
+{red |Norway }pine
+Miss{issippi}|MS:Jackson:MS:magnolia:mockingbird:magnolia
+Missouri|Mo:Jefferson City:MO:hawthorn:blue{ }bird:{flowering }dogwood
+Mont{ana}|MT:Helena:MT:bitterroot:{western }meadow{ }lark:{Ponderosa }pine
+Nebraska|Neb|NE|NB:Lincoln:NE|NB:goldenrod:{western }meadow{ }lark:cottonwood
+Nevada|Nev|NV:Carson City:NV:sagebrush:{mountain }blue{ }bird:\
+{bristlecone }pine|{single-leaf }pinon
+New Hampshire|NH:Concord:NH:{purple }lilac:{purple }finch:{white }birch
+New Jersey|NJ:Trenton:NJ:violet:{eastern }goldfinch:{red }oak
+New Mexico|NM:Santa Fe:NM:yucca:roadrunner:nut pine|pinon
+New York|NY:Albany:NY:rose:bluebird:{sugar }maple
+N{orth} Carolina|NC:Raleigh:NC:{flowering }dogwood:cardinal:pine
+N{orth} Dakota|ND:Bismarck:ND:{wild }{prairie }rose:{western }meadow{ }lark:\
+{American }elm
+Ohio|O|OH:Columbus:OH:{scarlet }carnation:cardinal:buckeye
+Oklahoma|Okla|OK:Oklahoma City:OK:mistletoe:{scissor-tailed }flycatcher:\
+redbud
+Oregon|Ore|OR:Salem:OR:{Oregon }grape:{western }meadow{ }lark:{Douglas }fir
+Pennsylvania|Pa:Harrisburg:PA:{mountain }laurel:{ruffed }grouse:hemlock
+Rhode Island|RI:Providence:RI:violet:Rhode Island red:{red }maple
+S{outh} Carolina|SC:Columbia:SC:{yellow }jasmine|jessamine:\
+{Great }{Carolina }wren:palmetto
+S{outh} Dakota|SD:Pierre:SD:{American }pasque{{f| f}lower}:\
+{ring-necked }pheasant:{Black Hills }spruce
+Tenn{essee}|TN:Nashville:TN:iris:mockingbird:{tulip }poplar
+Texas|Tex|TX:Austin:TX:blue{-| }bonnet:mockingbird:pecan
+Utah|UT:Salt Lake City:UT:{sego }lily:{sea|sea }gull:{blue }spruce
+Vermont|Vt:Montpelier:VT:{red }clover:{hermit }thrush:{sugar }maple
+Virginia|Va:Richmond:VA:dogwood:cardinal:
+Wash{ington}|WA:Olympia:WA:{coast }rhododendron:{willow }goldfinch:\
+{western }hemlock
+W{est} Virginia|W{ }Va|WV:Charleston:WV:rhododendron:cardinal:{sugar }maple
+Wisconsin|Wis|WI:Madison:WI:violet:robin:{sugar }maple
+Wyo{ming}|WY:Cheyenne:WY:indian paint brush:{western }meadow{ }lark:cottonwood