GG5 only has catching.

蛍狩り	11042
ホタル狩り	6940
ほたる狩り	1538
蛍狩	1015
ホタル狩	303
ほたる狩	99

I heard this used in the "watching" sense

first 3 google hits are all about firefly watching, and say specifically it's NOT firefly catching:

http://www.i-nekko.jp/kurashi/2013-
052815.html#:~:text=%E3%81%A9%E3%82%93%E3%82%88%E3%82%8A%E6%9B%87%E3%81%A3%E3%81%9F%E6%A2%85%E9%9B%A8%E3%81%AE,%E3%81%99%E3%82%8B%E3%81%A8%E3%81%84%E
3%81%86%E6%84%8F%E5%91%B3%E3%81%8C%E3%81%82%E3%82%8A%E3%81%BE%E3%81%99%E3%80%82
"どんより曇った梅雨の夜、甘い水を求めて草から草へと飛び回る蛍たち。 その幻想的な光景を楽しむのが「蛍狩り」です。 「狩る」といってもホタルを捕まえることではありませ
ん。 「狩る」という言葉には、動物を捕まえるという意味のほかに、「紅葉狩り」などと同じく季節の風物を楽しむ、鑑賞するという意味があります。"

https://allabout.co.jp/gm/gc/463681/
蛍狩りのマナー
[1] 蛍狩りは蛍をめでるもの。捕まえたりするのは厳禁です。

https://shikitari.net/shikitari/nijushisekki/season/11039/
蛍狩り、という言葉をご存知でしょうか？もしかすると現代ではあまり浸透していない言葉かもしれません。一見すると、「狩り」という言葉があるので、蛍を捕まえに行くこと、と
想像し、随分とかわいそうなことをする、とお思いになる方もいらっしゃるかもしれませんね。蛍というとなんとなく貴重な虫、というイメージもありますしただでさえ数が少ない蛍
を捕獲してしまうのはよくないことではと蛍狩りという言葉そのものをよくない意味で捉える方もいらっしゃるかもしれません。

しかし蛍狩りとは蛍を捕まえる、ということではなく、「紅葉狩り」と同じような意味合いで、「蛍を鑑賞する」という意味で使います。

but daijr says: "蛍を追い捕らえたり眺めたりすること。"
daijs: "夏の夕べ、水辺などで蛍を追って捕らえる遊び。... 「提灯を借りて帰りぬ―／虚子」"

I think having 2 senses would be best. I think the "catching" sense is archaic or dated.

@@ -6,0 +7,9 @@
+<k_ele>
+<keb>ホタル狩り</keb>
+</k_ele>
+<k_ele>
+<keb>ほたる狩り</keb>
+</k_ele>
+<k_ele>
+<keb>蛍狩</keb>
+</k_ele>
@@ -8,0 +18,7 @@
+<re_restr>蛍狩り</re_restr>
+<re_restr>ほたる狩り</re_restr>
+<re_restr>蛍狩</re_restr>
+</r_ele>
+<r_ele>
+<reb>ホタルがり</reb>
+<re_restr>ホタル狩り</re_restr>
@@ -11,0 +28,5 @@
+<gloss>firefly watching</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&dated;</misc>

GG5, etc.

JST https://ejje.weblio.jp/content/国際法

@@ -16 +16,2 @@
-<gloss>international laws</gloss>
+<gloss>international law</gloss>
+<gloss>law of nations</gloss>

gg5, prog, Wisdom
優秀	3732181
優秀な	1937565
優秀を	976
優秀が	705

-> adjective glosses

@@ -19,2 +19,4 @@
-<gloss>superiority</gloss>
-<gloss>excellence</gloss>
+<gloss>superior</gloss>
+<gloss>excellent</gloss>
+<gloss>brilliant</gloss>
+<gloss>outstanding</gloss>

year→term

@@ -19 +19 @@
-<gloss>Wood Rat (1st year of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>
+<gloss>Wood Rat (1st term of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>

@@ -19 +19 @@
-<gloss>Wood Rat (first year of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>
+<gloss>Wood Rat (1st year of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>

@@ -19 +19 @@
-<gloss>year of the Wood Rat (first year of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>
+<gloss>Wood Rat (first year of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>

@@ -19 +19 @@
-<gloss>year of the Wood Rat (1st year of the sexagenary cycle)</gloss>
+<gloss>year of the Wood Rat (first year of the sexagenary cycle, e.g. 1924, 1984, 2044)</gloss>

Removing the tags. Not sure of the order of readings, but it's not a big deal.

@@ -6,2 +5,0 @@
-<ke_pri>news1</ke_pri>
-<ke_pri>nf03</ke_pri>
@@ -11,2 +8,0 @@
-<re_pri>news1</re_pri>
-<re_pri>nf03</re_pri>

year→term

@@ -16 +16 @@
-<gloss>Earth Snake (6th year of the sexagenary cycle, e.g. 1929, 1989, 2049)</gloss>
+<gloss>Earth Snake (6th term of the sexagenary cycle, e.g. 1929, 1989, 2049)</gloss>

@@ -16 +16 @@
-<gloss>year of the Earth Snake (6th year of the sexagenary cycle, e.g. 1929, 1989, 2049)</gloss>
+<gloss>Earth Snake (6th year of the sexagenary cycle, e.g. 1929, 1989, 2049)</gloss>

@@ -16 +16 @@
-<gloss>year of the Earth Snake (6th year of the sexagenary cycle)</gloss>
+<gloss>year of the Earth Snake (6th year of the sexagenary cycle, e.g. 1929, 1989, 2049)</gloss>

Daijr 3.0 only has きし, with つちのとみ given as a meaning. That's why I preferred it, but I'm really not fussed.

@@ -8 +8 @@
-<reb>きし</reb>
+<reb>つちのとみ</reb>
@@ -11 +11 @@
-<reb>つちのとみ</reb>
+<reb>きし</reb>

I'm happy to align all of them either way, but I think we should decide if it's the onyomi or kunyomi that comes first for all of these.
in the 甲子 entry, Rene said 
"pretty sure きのえね is most common (e.g. the only one that meikyo has and the one that wiki lists first) so listing it first and moving the usage tags"
but on the other hand, daijs only has actual entries for かっし, and then mention こうし and きのえね in the description, e.g.:
１ 干支 (えと) の一。こうし。きのえね。
daijr does have entries for all 3 (at weblio - impossible to tell now at kotobank because the recent horrible "re-design")
jitsuyo only has きのえね
難読語辞典 only has こうし

searching for 丙午, the one that's seen a lot of discussion because of low birth rates, everyone seems to be calling it ひのえうま and nothing else
 (most provide hiragana)

on balance, Rene was maybe right, and if so, つちのとみ should come first here as well?

daij

婆や	8828
ばあや	31169

また、その人を親しんで呼ぶ語。 → "also vocative", OK?
(I think this word is prob dated)

@@ -12,0 +13 @@
+<misc>&uk;</misc>
@@ -13,0 +15 @@
+<s_inf>also vocative</s_inf>
@@ -18,0 +21 @@
+<misc>&uk;</misc>

Daijr, GG5, etc.

Suggest splitting. Elderly maids aren't usually wetnurses.

@@ -11,0 +12,7 @@
+<xref type="see" seq="2845395">爺や</xref>
+<misc>&fam;</misc>
+<gloss>elderly housekeeper</gloss>
+<gloss>elderly maid</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -13 +20 @@
-<gloss>old housekeeper</gloss>
+<gloss>nanny</gloss>

year→term

@@ -16 +16 @@
-<gloss>Earth Dragon (5th year of the sexagenary cycle, e.g. 1928, 1988, 2048)</gloss>
+<gloss>Earth Dragon (5th term of the sexagenary cycle, e.g. 1928, 1988, 2048)</gloss>

@@ -16 +16 @@
-<gloss>year of the Earth Dragon (5th year of the sexagenary cycle, e.g. 1928, 1988, 2048)</gloss>
+<gloss>Earth Dragon (5th year of the sexagenary cycle, e.g. 1928, 1988, 2048)</gloss>

@@ -16 +16 @@
-<gloss>year of the Earth Dragon (fifth year of the sexagenary cycle)</gloss>
+<gloss>year of the Earth Dragon (5th year of the sexagenary cycle, e.g. 1928, 1988, 2048)</gloss>

daijs wiki

Hm. Rene placed these kunyomi before onyomi in Scott's submissions, but is it really right? Wikipedia does the same thing.
But of course even today we speak of the boshin war (1868), not the tsuchinoetatsu war.

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>つちのえたつ</reb>
+</r_ele>

@@ -10,0 +11 @@
+<pos>&exp;</pos>

nikk
heard in anime ("Ore no mana wa Burning Fighting Fighter")

@@ -32,0 +33,5 @@
+<sense>
+<stagk>真名</stagk>
+<pos>&n;</pos>
+<gloss>real name</gloss>
+</sense>

Aligning.

@@ -28 +28,4 @@
-<gloss>printed-style writing</gloss>
+<gloss>printed style (of writing Chinese characters)</gloss>
+<gloss>square style</gloss>
+<gloss>block style</gloss>
+<gloss>standard style</gloss>

@@ -22,0 +22,1 @@
+<xref type="see" seq="1590540">仮名・かな</xref>

Entry created

@@ -14 +14 @@
-<gloss>to the brim</gloss>
+<gloss>(filled) to the brim</gloss>

@@ -10,0 +11 @@
+<pos>&adv-to;</pos>
@@ -12 +12,0 @@
-<pos>&adv-to;</pos>

なみなみ	59057
ナミナミ	16824

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ナミナミ</reb>

year→term

@@ -16 +16 @@
-<gloss>Earth Tiger (15th year of the sexagenary cycle, e.g. 1938, 1998, 2058)</gloss>
+<gloss>Earth Tiger (15th term of the sexagenary cycle, e.g. 1938, 1998, 2058)</gloss>

I double-checked the 59 other entries and found no other duplicates.

My bad.

It's been pointed out that in the Wikipedia page this is Earth, not Fire.

@@ -16 +16 @@
-<gloss>Fire Tiger (15th year of the sexagenary cycle, e.g. 1938, 1998, 2058)</gloss>
+<gloss>Earth Tiger (15th year of the sexagenary cycle, e.g. 1938, 1998, 2058)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Tiger (15th year of the sexagenary cycle, e.g. 1938, 1998, 2058)</gloss>
+<gloss>Fire Tiger (15th year of the sexagenary cycle, e.g. 1938, 1998, 2058)</gloss>

@@ -19 +19 @@
-<gloss>Wood Ox (2nd year of the sexagenary cycle, e.g. 1925, 1985, 2045)</gloss>
+<gloss>Wood Ox (2nd term of the sexagenary cycle, e.g. 1925, 1985, 2045)</gloss>

@@ -19 +19 @@
-<gloss>year of the Wood Ox (2nd year of the sexagenary cycle, e.g. 1925, 1985, 2045)</gloss>
+<gloss>Wood Ox (2nd year of the sexagenary cycle, e.g. 1925, 1985, 2045)</gloss>

@@ -19 +19 @@
-<gloss>year of the Wood Ox (2nd year of the sexagenary cycle)</gloss>
+<gloss>year of the Wood Ox (2nd year of the sexagenary cycle, e.g. 1925, 1985, 2045)</gloss>

Aligning

@@ -19 +19 @@
-<gloss>second of the sexagenary cycle</gloss>
+<gloss>year of the Wood Ox (2nd year of the sexagenary cycle)</gloss>

http://ja.wikipedia.org/wiki/乙丑

year→term

@@ -16 +16 @@
-<gloss>Fire Tiger (3rd year of the sexagenary cycle, e.g. 1926, 1986, 2046)</gloss>
+<gloss>Fire Tiger (3rd term of the sexagenary cycle, e.g. 1926, 1986, 2046)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Tiger (3rd year of the sexagenary cycle, e.g. 1926, 1986, 2046)</gloss>
+<gloss>Fire Tiger (3rd year of the sexagenary cycle, e.g. 1926, 1986, 2046)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Tiger (3rd year of the sexagenary cycle)</gloss>
+<gloss>year of the Fire Tiger (3rd year of the sexagenary cycle, e.g. 1926, 1986, 2046)</gloss>

@@ -16 +16 @@
-<gloss>third of the sexagenary cycle</gloss>
+<gloss>year of the Fire Tiger (3rd year of the sexagenary cycle)</gloss>

wiki

@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Fire Rabbit (4th year of the sexagenary cycle, e.g. 1927, 1987, 2047)</gloss>
+<gloss>Fire Rabbit (4th term of the sexagenary cycle, e.g. 1927, 1987, 2047)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Rabbit (4th year of the sexagenary cycle, e.g. 1927, 1987, 2047)</gloss>
+<gloss>Fire Rabbit (4th year of the sexagenary cycle, e.g. 1927, 1987, 2047)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Rabbit (4th year of the sexagenary cycle)</gloss>
+<gloss>year of the Fire Rabbit (4th year of the sexagenary cycle, e.g. 1927, 1987, 2047)</gloss>

@@ -16 +16 @@
-<gloss>fourth of the sexagenary cycle</gloss>
+<gloss>year of the Fire Rabbit (4th year of the sexagenary cycle)</gloss>

wiki, koj

incorrect reading.  fwiw, all of these recent sexagenary submissions have the more common reading last

@@ -8,1 +8,1 @@
-<reb>ひのとのう</reb>
+<reb>ひのとう</reb>
@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Metal Horse (7th year of the sexagenary cycle, e.g. 1930, 1990, 2050)</gloss>
+<gloss>Metal Horse (7th term of the sexagenary cycle, e.g. 1930, 1990, 2050)</gloss>

@@ -16 +16 @@
-<gloss>year of the Metal Horse (7th year of the sexagenary cycle, e.g. 1930, 1990, 2050)</gloss>
+<gloss>Metal Horse (7th year of the sexagenary cycle, e.g. 1930, 1990, 2050)</gloss>

@@ -16 +16 @@
-<gloss>year of the Metal Horse (7th year of the sexagenary cycle)</gloss>
+<gloss>year of the Metal Horse (7th year of the sexagenary cycle, e.g. 1930, 1990, 2050)</gloss>

@@ -16 +16 @@
-<gloss>seventh of the sexagenary cycle</gloss>
+<gloss>year of the Metal Horse (7th year of the sexagenary cycle)</gloss>

wiki

@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Metal Sheep (8th year of the sexagenary cycle, e.g. 1931, 1991, 2051)</gloss>
+<gloss>Metal Sheep (8th term of the sexagenary cycle, e.g. 1931, 1991, 2051)</gloss>

@@ -16 +16 @@
-<gloss>year of the Metal Sheep (8th year of the sexagenary cycle, e.g. 1931, 1991, 2051)</gloss>
+<gloss>Metal Sheep (8th year of the sexagenary cycle, e.g. 1931, 1991, 2051)</gloss>

@@ -16 +16 @@
-<gloss>year of the Metal Sheep (8th year of the sexagenary cycle)</gloss>
+<gloss>year of the Metal Sheep (8th year of the sexagenary cycle, e.g. 1931, 1991, 2051)</gloss>

"year of the sheep" is 2-4x more common than goat/ram in the google books' ngrams
sheep gets the most googits for "year of the metal x" also

@@ -16 +16 @@
-<gloss>eighth of the sexagenary cycle</gloss>
+<gloss>year of the Metal Sheep (8th year of the sexagenary cycle)</gloss>

year→term

@@ -16 +16 @@
-<gloss>Water Monkey (9th year of the sexagenary cycle, e.g. 1932, 1992, 2052)</gloss>
+<gloss>Water Monkey (9th term of the sexagenary cycle, e.g. 1932, 1992, 2052)</gloss>

@@ -16 +16 @@
-<gloss>year of the Water Monkey (9th year of the sexagenary cycle, e.g. 1932, 1992, 2052)</gloss>
+<gloss>Water Monkey (9th year of the sexagenary cycle, e.g. 1932, 1992, 2052)</gloss>

@@ -16 +16 @@
-<gloss>year of the Water Monkey (9th year of the sexagenary cycle)</gloss>
+<gloss>year of the Water Monkey (9th year of the sexagenary cycle, e.g. 1932, 1992, 2052)</gloss>

@@ -16 +16 @@
-<gloss>ninth of the sexagenary cycle</gloss>
+<gloss>year of the Water Monkey (9th year of the sexagenary cycle)</gloss>

wiki

@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Water Rooster (10th year of the sexagenary cycle, e.g. 1933, 1993, 2053)</gloss>
+<gloss>Water Rooster (10th term of the sexagenary cycle, e.g. 1933, 1993, 2053)</gloss>

@@ -16 +16 @@
-<gloss>year of the Water Rooster (10th year of the sexagenary cycle, e.g. 1933, 1993, 2053)</gloss>
+<gloss>Water Rooster (10th year of the sexagenary cycle, e.g. 1933, 1993, 2053)</gloss>

@@ -16 +16 @@
-<gloss>year of the Water Rooster (10th year of the sexagenary cycle)</gloss>
+<gloss>year of the Water Rooster (10th year of the sexagenary cycle, e.g. 1933, 1993, 2053)</gloss>

lots more googits than "year of the water cock"

@@ -16 +16 @@
-<gloss>tenth of the sexagenary cycle</gloss>
+<gloss>year of the Water Rooster (10th year of the sexagenary cycle)</gloss>

wiki

@@ -8,1 +8,1 @@
-<reb>みずのとのとり</reb>
+<reb>みずのととり</reb>
@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Wood Dog (11th year of the sexagenary cycle, e.g. 1934, 1994, 2054)</gloss>
+<gloss>Wood Dog (11th term of the sexagenary cycle, e.g. 1934, 1994, 2054)</gloss>

@@ -16 +16 @@
-<gloss>year of the Wood Dog (11th year of the sexagenary cycle, e.g. 1934, 1994, 2054)</gloss>
+<gloss>Wood Dog (11th year of the sexagenary cycle, e.g. 1934, 1994, 2054)</gloss>

@@ -16 +16 @@
-<gloss>year of the Wood Dog (11th year of the sexagenary cycle)</gloss>
+<gloss>year of the Wood Dog (11th year of the sexagenary cycle, e.g. 1934, 1994, 2054)</gloss>

4x more googits for "year of the Wood Dog" vs "year of the Wooden Dog"

@@ -16 +16 @@
-<gloss>eleventh of the sexagenary cycle</gloss>
+<gloss>year of the Wood Dog (11th year of the sexagenary cycle)</gloss>

wiki

@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -19 +19 @@
-<gloss>Wood Boar (12th year of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>
+<gloss>Wood Boar (12th term of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>

since I went with "year of the Boar"

@@ -19 +19 @@
-<gloss>Wood Pig (12th year of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>
+<gloss>Wood Boar (12th year of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>

@@ -19 +19 @@
-<gloss>year of the Wood Pig (12th year of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>
+<gloss>Wood Pig (12th year of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>

@@ -19 +19 @@
-<gloss>year of the Wood Pig (12th year of the sexagenary cycle)</gloss>
+<gloss>year of the Wood Pig (12th year of the sexagenary cycle, e.g. 1935, 1995, 2055)</gloss>

@@ -19 +19 @@
-<gloss>twelfth of the sexagenary cycle</gloss>
+<gloss>year of the Wood Pig (12th year of the sexagenary cycle)</gloss>

year→term

@@ -16 +16 @@
-<gloss>Fire Rat (13th year of the sexagenary cycle, e.g. 1936, 1996, 2056)</gloss>
+<gloss>Fire Rat (13th term of the sexagenary cycle, e.g. 1936, 1996, 2056)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Rat (13th year of the sexagenary cycle, e.g. 1936, 1996, 2056)</gloss>
+<gloss>Fire Rat (13th year of the sexagenary cycle, e.g. 1936, 1996, 2056)</gloss>

Sorry, I forgot to say. I like "year of the Fire Rat (13th year of the sexagenary cycle, e.g. 1936, 1996, 2056)".

@@ -16 +16 @@
-<gloss>year of the Fire Rat (13th year of the sexagenary cycle)</gloss>
+<gloss>year of the Fire Rat (13th year of the sexagenary cycle, e.g. 1936, 1996, 2056)</gloss>

Sorry, fine as-is? Or fine to mention the actual years?

I think that's fine.

year→term

@@ -16 +16 @@
-<gloss>Fire Ox (14th year of the sexagenary cycle, e.g. 1937, 1997, 2057)</gloss>
+<gloss>Fire Ox (14th term of the sexagenary cycle, e.g. 1937, 1997, 2057)</gloss>

@@ -16 +16 @@
-<gloss>year of the Fire Ox (14th year of the sexagenary cycle, e.g. 1937, 1997, 2057)</gloss>
+<gloss>Fire Ox (14th year of the sexagenary cycle, e.g. 1937, 1997, 2057)</gloss>

@@ -16 +16 @@
-<gloss>fourteenth of the sexagenary cycle</gloss>
+<gloss>year of the Fire Ox (14th year of the sexagenary cycle, e.g. 1937, 1997, 2057)</gloss>

wiki

@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Earth Rabbit (16th year of the sexagenary cycle, e.g. 1939, 1999, 2059)</gloss>
+<gloss>Earth Rabbit (16th term of the sexagenary cycle, e.g. 1939, 1999, 2059)</gloss>

@@ -16 +16 @@
-<gloss>year of the Earth Rabbit (16th of the sexagenary cycle, e.g. 1939, 1999, 2059)</gloss>
+<gloss>Earth Rabbit (16th year of the sexagenary cycle, e.g. 1939, 1999, 2059)</gloss>

@@ -16 +16 @@
-<gloss>sixteenth of the sexagenary cycle</gloss>
+<gloss>year of the Earth Rabbit (16th of the sexagenary cycle, e.g. 1939, 1999, 2059)</gloss>

wiki

@@ -8,1 +8,1 @@
-<reb>つちのとのう</reb>
+<reb>つちのとう</reb>
@@ -15,0 +15,1 @@
+<xref type="see" seq="1650120">干支</xref>

year→term

@@ -16 +16 @@
-<gloss>Metal Dragon (17th year of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>
+<gloss>Metal Dragon (17th term of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>

OK, I'll align the rest with this one.

How about this style?

@@ -16 +16 @@
-<gloss>(year of the) Metal Dragon (17th of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>
+<gloss>Metal Dragon (17th year of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>

丙午に生まれた	55
丙午の年に生まれた	94

hold on. Maybe "year of the..." should only be in brackets?

@@ -16 +16 @@
-<gloss>year of the Metal Dragon (17th of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>
+<gloss>(year of the) Metal Dragon (17th of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>

@@ -16 +16 @@
-<gloss>seventeenth of the sexagenary cycle</gloss>
+<gloss>year of the Metal Dragon (17th of the sexagenary cycle, e.g. 1940, 2000, 2060)</gloss>

@@ -22,0 +23 @@
+<xref type="see" seq="1567890">昴・すばる</xref>

@@ -18,0 +18,6 @@
+<gloss>Pleiades (in Greek mythology)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="2248380">プレアデス星団・プレアデスせいだん</xref>
+<field>&astron;</field>
@@ -19,0 +25,1 @@
+<gloss>the Seven Sisters</gloss>

Daij, GG5, 医学英和辞典, 新英和大辞典, Eijiro

@@ -6,0 +6,9 @@
+</r_ele>
+<r_ele>
+<reb>プレイアデス</reb>
+</r_ele>
+<r_ele>
+<reb>プレヤデス</reb>
+</r_ele>
+<r_ele>
+<reb>プレイアディ</reb>

gg5

I guess it may as well stay. Harmless, really.

Maybe this isn't needed any longer?
We're at 第５波 now.

Well spotted. Thanks.

was Katakana ニ instead of Kanji 二

@@ -8 +8 @@
-<keb>第ニ波</keb>
+<keb>第二波</keb>

(looking at how frequently this word is 
used right now, I'm happy this was 
svcrpted)

Bulk update adding hist to old provinces
-*- via bulkupd.py -*-

@@ -14,0 +15 @@
+<misc>&hist;</misc>

Correction: りきおう -> りくおう

I assumedly wrongly from the note that the reading of 陸奥 changed in 1869 when in fact 陸奥/むつ split into five provinces, 陸奥/りきおう being one of them. I don't think the note and x-ref are necessary.

@@ -15,2 +14,0 @@
-<xref type="see" seq="2845219">陸奥・りくおう</xref>
-<s_inf>after 1869 became りくおう</s_inf>

I think it's useful. Restoring vanished xref.

@@ -14,0 +15 @@
+<xref type="see" seq="2845219">陸奥・りくおう</xref>

Bulk update adding hist to old provinces
-*- via bulkupd.py -*-

@@ -11,0 +12 @@
+<misc>&hist;</misc>

https://en.wikipedia.org/wiki/Mutsu_Province_(1868)

Made a reading mistake here. In the Meiji era, Mutsu (陸奥) was split up into three provinces: Rikuzen (陸前), Rikuchū (陸中) and Rikuō 
(陸奥). 陸奥 can thus be read as both むつ and りくおう (not りくおく).

@@ -8 +8 @@
-<reb>りくおく</reb>
+<reb>りくおう</reb>
@@ -12 +12 @@
-<gloss>Rikuoku (former province located in parts of present-day Aomori and Iwate prefectures)</gloss>
+<gloss>Rikuō (former province located in parts of present-day Aomori and Iwate prefectures)</gloss>

split from 陸奥(むつ)

We don't include 国 on the vast majority of our historical province entries.
The kokugos have it as 吉備.

@@ -5 +5 @@
-<keb>吉備国</keb>
+<keb>吉備</keb>
@@ -8 +8 @@
-<reb>きびのくに</reb>
+<reb>きび</reb>

Bulk update adding hist to old provinces
-*- via bulkupd.py -*-

@@ -11,0 +12 @@
+<misc>&hist;</misc>

Typo

@@ -12 +12 @@
-<gloss>Kibi (former province located in present-day Okayama and parts of Hiroshima, Hyōgo and Kagawa prefectures; later split into Bizen, Bitchu and Bigo provinces)</gloss>
+<gloss>Kibi (former province located in present-day Okayama and parts of Hiroshima, Hyōgo and Kagawa prefectures; later split into Bizen, Bitchu and Bingo provinces)</gloss>

@@ -11,0 +12,3 @@
+<xref type="see" seq="2845160">備前</xref>
+<xref type="see" seq="2845152">備中</xref>
+<xref type="see" seq="2845193">備後</xref>

https://nl.wikipedia.org/wiki/Kibi_(provincie)

Also 三備
Before split 吉備国

@@ -14,0 +15 @@
+<misc>&hist;</misc>

@@ -11,0 +12,3 @@
+<xref type="see" seq="2845160">備前</xref>
+<xref type="see" seq="2845152">備中</xref>
+<xref type="see" seq="2845193">備後</xref>

https://ja.wikipedia.org/wiki/吉備国

Also 備州
Before split 吉備国（きびのくに）

@@ -11,0 +12,3 @@
+<xref type="see" seq="2845150">陸前</xref>
+<xref type="see" seq="2845196">陸中</xref>
+<xref type="see" seq="2845219">陸奥・りくおう</xref>

https://ja.wikipedia.org/wiki/三陸

Also 三陸（さんりく）

@@ -11,0 +12,3 @@
+<xref type="see" seq="2845150">陸前</xref>
+<xref type="see" seq="2845196">陸中</xref>
+<xref type="see" seq="2845219">陸奥・りくおう</xref>

https://ja.wikipedia.org/wiki/三陸

Also 陸州（りくしゅう）

@@ -11,0 +12,2 @@
+<xref type="see" seq="2845159">丹波</xref>
+<xref type="see" seq="2845177">丹後</xref>

https://ja.wikipedia.org/wiki/両丹

Also 両丹（りょうたん）

OK

let's be explicit with what it is, a region. Adding Kansai in there doesn't hurt

@@ -14 +14 @@
-<gloss>Ryōtan (the two former provinces of Tanba and Tango)</gloss>
+<gloss>Ryōtan (region in Kansai corresponding to the two historical provinces of Tanba and Tango)</gloss>

I think xrefs is probably the best way to handle this.

@@ -11,0 +12,2 @@
+<xref type="see" seq="2845159">丹波</xref>
+<xref type="see" seq="2845177">丹後</xref>

These names that I have been adding in recent days are names of clusters of two or three former provinces. Sometimes such names are equal to a 
province that was split at some point (it seems most splits happened in the 8th century). I have only added geographic information of current prefectures if 
this is the case. In other cases I have only added the former province names. I still think these names are useful to have (for example, 三陸 さんりく was 
never the official name of an existing province, but it’s a fairly often used way to refer to northeastern Tohoku region. If you look up 三陸 in a Japanese 
dictionary, it won’t have current geographical information; it will just have the former province names). If you think not adding current prefecture names 
causes confusion, how about solving this issue with cross references to the actual former provinces (that do have that information)?

Could we not do this format of "two former 
provinces of..." "later bla bla" and 
instead do up-to-date geographical 
information for all of these province 
entries? I don't think it's useful to 
explain one historical province by name-
dropping 2 others.
(assuming this is a historical province, 
though that's not really clear from the 
gloss. if it's not, I don't think it's 
within the scope of proper names we 
decided we'd let into jmdict at this time)

Indeed.

I think this works.

@@ -13 +13 @@
-<gloss>laughing so hard one cries</gloss>
+<gloss>crying with laughter</gloss>

@@ -13 +13 @@
-<gloss>lauhging so hard one cries</gloss>
+<gloss>laughing so hard one cries</gloss>

jitsuyo
prob vs? (our 泣き笑い entry is)

笑い泣き	15336

オークションハウス	5114

https://www.christies.com/exhibitions/japan/
世界で最も長い歴史を誇る美術品オークションハウスの日本支社です。

ＫＯＤ追加語彙

@@ -12,0 +13 @@
+<gloss>historical background</gloss>

eij

歴史的背景	155257

プレイングカード	2532
wiki: トランプは、日本ではカードを使用した室内用の玩具を指すために用いられている用語で[1]、もっぱら4種各13枚の計52枚(+α)を1セットとするタイプ
のものを指して言うことが多い。「プレイング・カード」「西洋かるた」

GG5, ルミナス

Moving from the names dictionary

@@ -1,3 +1,2 @@
-<ent_seq>5626254</ent_seq>
-<ent_corp>jmnedict</ent_corp>
+<ent_corp>jmdict</ent_corp>
@@ -11,2 +10,2 @@
-<misc>&place;</misc>
-<gloss>Butsuryuusenta-</gloss>
+<pos>&n;</pos>
+<gloss>distribution center</gloss>

GG5, ルミナス

@@ -11,0 +12,2 @@
+<xref type="see" seq="1903140">婆や・ばあや</xref>
+<xref type="see" seq="1903140">婆や・ばあや・1</xref>
@@ -13 +15,2 @@
-<gloss>vocative for an elderly manservant</gloss>
+<gloss>elderly handyman</gloss>
+<gloss>elderly manservant</gloss>

大辞林

ＫＯＤ追加語彙

I think this is more technically accurate

@@ -12 +12,3 @@
-<gloss>an earthquake that occurred outside of Japan</gloss>
+<gloss>distant earthquake</gloss>
+<gloss>teleseismic earthquake</gloss>
+<gloss>teleseism</gloss>

https://www3.nhk.or.jp/news/html/20200624/k10012481501000.html?utm_int=news_contents_news-main_001
https://www.jma-net.go.jp/sapporo/bousaikyouiku/schoolbousai/sozai/shiryou/pdf/201808_enchi.pdf

Daijr, ＫＯＤ追加語彙

From a Japanese perspective every 遠地XX occurs outside Japan.

@@ -12 +12,2 @@
-<gloss>a tsunami that occurred outside of Japan</gloss>
+<gloss>far-field tsunami</gloss>
+<gloss>tsunami that occurred away from Japan</gloss>

https://www.jma-net.go.jp/sapporo/bousaikyouiku/schoolbousai/sozai/shiryou/pdf/201808_enchi.pdf

@@ -11 +10,0 @@
-<gloss>Eimi-</gloss>

Yes, they're on my list of things to try and fix with a batch update, or delete.

https://www.edrdg.org/jmdictdb/cgi-bin/srchres.py?s1=1&y1=4&t1=-&src=2&search=Search&svc=jmdict

142 other entries in jmndict ending in "-"

@@ -9 +9 @@
-<gloss>Emi-</gloss>
+<gloss>Emmy</gloss>

@@ -11 +10,0 @@
-<gloss>Jeshi-</gloss>

@@ -8,0 +9 @@
+<gloss>Jenny</gloss>
@@ -12 +12,0 @@
-<gloss>Jeni-</gloss>

@@ -8,2 +8,2 @@
-<misc>&unclass;</misc>
-<gloss>Ginie</gloss>
+<misc>&fem;</misc>
+<gloss>Ginnie</gloss>

セイディ	1650
セイディー	782

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>セイディー</reb>

@@ -8 +8 @@
-<misc>&unclass;</misc>
+<misc>&fem;</misc>

@@ -8 +8 @@
-<misc>&unclass;</misc>
+<misc>&fem;</misc>

@@ -11 +10,0 @@
-<gloss>Natari-</gloss>

wiki

@@ -8,4 +8 @@
-<reb>えぐろまりい</reb>
-</r_ele>
-<r_ele>
-<reb>えぐろまりー</reb>
+<reb>えぐろまりぃ</reb>
@@ -15 +12 @@
-<gloss>Eguro Marii (1972.1.13-)</gloss>
+<gloss>Marie Eguro (1972.1.13-)</gloss>

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>えぐろまりー</reb>
+</r_ele>

@@ -8 +8 @@
-<reb>はんがりー</reb>
+<reb>ハンガリー</reb>
@@ -12 +12 @@
-<gloss>Hangari-</gloss>
+<gloss>Hungary</gloss>

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

daij, koj, nikk

I don't think we need the きりすと reading. It's キリスト in all the kokugos, which is to be expected given that it's a foreign name.

@@ -7,3 +6,0 @@
-<r_ele>
-<reb>こくさいきりすときょうだいがく</reb>
-</r_ele>

Daijisen has こくさいキリストきょうだいがく

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>こくさいキリストきょうだいがく</reb>
+</r_ele>
@@ -11 +14 @@
-<misc>&place;</misc>
+<misc>&organization;</misc>

https://ja.wikipedia.org/wiki/国際基督教大学

@@ -8 +8 @@
-<reb>こくさいきりすとだいがく</reb>
+<reb>こくさいきりすときょうだいがく</reb>

@@ -12 +12 @@
-<gloss>Cheri-</gloss>
+<gloss>Cherry</gloss>

@@ -12 +12,2 @@
-<gloss>Sheri-</gloss>
+<gloss>Sheri</gloss>
+<gloss>Cheri</gloss>

@@ -12 +12,2 @@
-<gloss>Sheri-</gloss>
+<gloss>Sheri</gloss>
+<gloss>Cheri</gloss>

@@ -12 +12 @@
-<gloss>Suwa Mari-</gloss>
+<gloss>Suwa Marie</gloss>

@@ -12 +12 @@
-<gloss>Sofi-</gloss>
+<gloss>Sophie</gloss>

@@ -12 +12 @@
-<gloss>Ha-moni-</gloss>
+<gloss>Harmony</gloss>

@@ -12 +12 @@
-<gloss>Sofi-</gloss>
+<gloss>Sophie</gloss>

@@ -11,2 +11,2 @@
-<misc>&unclass;</misc>
-<gloss>Sun'ie-</gloss>
+<misc>&person;</misc>
+<gloss>Sun Yue</gloss>

@@ -12 +12 @@
-<gloss>Taihei Saburō (1956.2.24-)</gloss>
+<gloss>Saburō Taihei (1956.2.24-)</gloss>

@@ -12 +12 @@
-<gloss>Taihei Saburo- (1956.2.24-)</gloss>
+<gloss>Taihei Saburō (1956.2.24-)</gloss>

dupe

@@ -12 +12 @@
-<gloss>Taihei Saburo-</gloss>
+<gloss>Taihei Saburō</gloss>

@@ -12 +12 @@
-<gloss>Cheri-</gloss>
+<gloss>Cherry</gloss>

@@ -12 +12 @@
-<gloss>Tsujimura Jusaburo-</gloss>
+<gloss>Tsujimura Jusaburō</gloss>

@@ -12 +12 @@
-<misc>&organization;</misc>
+<misc>&ev;</misc>

@@ -13 +13 @@
-<gloss>International Tokyo Toy Show)</gloss>
+<gloss>International Tokyo Toy Show</gloss>

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

@@ -11,2 +11,2 @@
-<misc>&unclass;</misc>
-<gloss>Toukyouomochasho-</gloss>
+<misc>&organization;</misc>
+<gloss>International Tokyo Toy Show)</gloss>

@@ -12 +12 @@
-<gloss>Fuji Jini-</gloss>
+<gloss>Fuji Ginnie</gloss>

@@ -12 +12 @@
-<gloss>Doroshi-</gloss>
+<gloss>Dorothy</gloss>

@@ -12 +12 @@
-<gloss>Nanshi-</gloss>
+<gloss>Nancy</gloss>

@@ -12 +12 @@
-<gloss>Nanshi-</gloss>
+<gloss>Nancy</gloss>

@@ -12 +12 @@
-<gloss>Nanshi-</gloss>
+<gloss>Nancy</gloss>

@@ -12 +12 @@
-<gloss>Ha-moni-</gloss>
+<gloss>Harmony</gloss>

@@ -12 +12 @@
-<gloss>Ha-moni-</gloss>
+<gloss>Harmony</gloss>

@@ -12 +12 @@
-<gloss>Mari Kawasuji-</gloss>
+<gloss>Mari Kawasuji</gloss>

@@ -12 +12 @@
-<gloss>Youko Ma-fi-</gloss>
+<gloss>Yōko Murphy</gloss>

@@ -12 +12 @@
-<gloss>Ha-moni-</gloss>
+<gloss>Harmony</gloss>

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

wiki brit

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

https://ja.wikipedia.org/wiki/東京学芸大学

Adding spec1
-*- via bulkupd.py -*-

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

https://ja.wikipedia.org/wiki/東京学芸大学