I was rereading the posts, and I missed a など. I'll drop that sense.

@@ -22,4 +21,0 @@
-<sense>
-<pos>&n;</pos>
-<gloss>carbonated soft drink (generic term)</gloss>
-</sense>

enwiki: cola: "carbonated soft drink flavored with vanilla, cinnamon, citrus oils and other flavorings. Most contain caffeine, which was 
originally sourced from the kola nut,"
jawiki: "コーラ (Cola) という名称は当初コーラの実 (kola nuts) から抽出したほろ苦い味のコーラ・エキスを用いていたことに由来しているが、現在ではコーラの
実は含まれていないのが一般的であり"

I can't find any evidence for sense 3 on google, and I've personally never heard/seen this usage. Did they post any actual examples on the 
honyaku list?

@@ -12 +12 @@
-<gloss>cola (carbonated soft drink flavoured with kola nut extract)</gloss>
+<gloss>cola (carbonated soft drink)</gloss>

Reopen.

https://en.wikipedia.org/wiki/Cola_(plant)
https://en.wikipedia.org/wiki/Kola_nut
Daijr (has first two senses)

Long Honyaku discussion, mainly about the generic (sense 3) use of コーラ as a term for soft drinks. "Cola" doesn't seem to be used that way in BrE, but it seems in parts of the US "cola" can be a generic term.
Approving temporarily for an xref.

@@ -11 +11,13 @@
-<gloss>cola</gloss>
+<xref type="see" seq="2837332">コカコーラ</xref>
+<gloss>cola (carbonated soft drink flavoured with kola nut extract)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="2839873">コーラの木</xref>
+<misc>&abbr;</misc>
+<gloss>kola tree (Cola acuminata, etc.)</gloss>
+<gloss>cola tree</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>carbonated soft drink (generic term)</gloss>

Converting somebody to someone
-*- via bulkupd.py -*-

@@ -25 +25 @@
-<gloss>to push (and hold) somebody down (esp. with sexual connotations)</gloss>
+<gloss>to push (and hold) someone down (esp. with sexual connotations)</gloss>

Of my JEs only GG5 has the sexual connotation. OTOH the images are all that way. Maybe keep 
it in the one sense, but not first.

@@ -23 +22,0 @@
-<gloss>to push (and hold) somebody down (esp. with sexual connotations)</gloss>
@@ -25,0 +25 @@
+<gloss>to push (and hold) somebody down (esp. with sexual connotations)</gloss>

google images, daijr

Is this maybe better?

@@ -23 +23,2 @@
-<gloss>to push down</gloss>
+<gloss>to push (and hold) somebody down (esp. with sexual connotations)</gloss>
+<gloss>to pin down</gloss>
@@ -26,6 +26,0 @@
-<sense>
-<pos>&v5s;</pos>
-<pos>&vt;</pos>
-<gloss>to force a woman to have sex</gloss>
-<gloss>to jump on a woman</gloss>
-</sense>

@@ -23,0 +24,7 @@
+<gloss>to knock down</gloss>
+</sense>
+<sense>
+<pos>&v5s;</pos>
+<pos>&vt;</pos>
+<gloss>to force a woman to have sex</gloss>
+<gloss>to jump on a woman</gloss>

GG5: push [force, shove] sb down; 〔性交を強いる〕 get 《a woman》 down on the bed to have sex; force 《a woman》 into sex; jump on 《a 
woman》. [⇒たおす]

@@ -5 +5,2 @@
-<keb>開発途上国{spec1]</keb>
+<keb>開発途上国</keb>
+<ke_pri>spec1</ke_pri>

G n-grams 6187766

@@ -5 +5 @@
-<keb>開発途上国</keb>
+<keb>開発途上国{spec1]</keb>
@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

i'd be fine without an expl.  surely anyone using the dictionary knows what a geisha is

GG5: a geisha; a woman who can provide professional entertainment at banquets held in tatami rooms

I feel something more is needed - we usually expand a little. How about this or the like?

@@ -20,0 +21 @@
+<gloss g_type="expl">professional female entertainer, usu. at traditional banquets</gloss>

daijr

I feel "Japanese singing and dancing girl" is so overly simplistic as to be nearly meaningless.
If we need an expl or clarification, maybe "traditional female entertainer" would be better.

@@ -7,0 +8,4 @@
+</k_ele>
+<k_ele>
+<keb>藝者</keb>
+<ke_inf>&oK;</ke_inf>
@@ -17 +20,0 @@
-<gloss g_type="expl">Japanese singing and dancing girl</gloss>

@@ -17,1 +17,1 @@
-<gloss>Japanese singing and dancing girl</gloss>
+<gloss g_type="expl">Japanese singing and dancing girl</gloss>

daijs

@@ -15,0 +16 @@
+<xref type="see" seq="1202890">開発途上国・かいはつとじょうこく</xref>

@@ -19 +19,2 @@
-<gloss>passive</gloss>
+<xref type="ant" seq="1470200">能動</xref>
+<gloss>passivity</gloss>

浸透	2403240
滲透	4150

@@ -10,0 +11 @@
+<ke_inf>&rK;</ke_inf>

mk

滲透 poss rK?

@@ -19,0 +20 @@
+<pos>&vi;</pos>
@@ -28,0 +30 @@
+<pos>&vi;</pos>
@@ -35,0 +38 @@
+<pos>&vi;</pos>

daij, gg5, prog

Splitting "osmosis" into a separate sense.

@@ -20,2 +20,5 @@
-<gloss>penetration (e.g. market)</gloss>
-<gloss>pervasion (e.g. thought, ideology)</gloss>
+<gloss>permeation (of thought, ideology, culture, etc.)</gloss>
+<gloss>infiltration (e.g. of ideas)</gloss>
+<gloss>spread</gloss>
+<gloss>penetration (e.g. into a market)</gloss>
+<gloss>pervasion</gloss>
@@ -26 +29 @@
-<gloss>permeation</gloss>
+<gloss>permeation (of a liquid, etc.)</gloss>
@@ -27,0 +31,7 @@
+<gloss>percolation</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<field>&chem;</field>
+<field>&biol;</field>

捜し求める	21188
探し求める	38000
捜しもとめる	34
探しもとめる	437

@@ -3,0 +4,5 @@
+<k_ele>
+<keb>探し求める</keb>
+<ke_pri>news2</ke_pri>
+<ke_pri>nf35</ke_pri>
+</k_ele>
@@ -8,3 +13,4 @@
-<keb>探し求める</keb>
-<ke_pri>news2</ke_pri>
-<ke_pri>nf35</ke_pri>
+<keb>探しもとめる</keb>
+</k_ele>
+<k_ele>
+<keb>捜しもとめる</keb>

@@ -18,0 +19 @@
+<pos>&vt;</pos>

"active" is in fact a noun in grammar.

@@ -16 +16,2 @@
-<gloss>activivity</gloss>
+<xref type="ant" seq="1329990">受動</xref>
+<gloss>activity</gloss>

gg5

SHould this really be [news1,nf24]? Doesn't seem like it's used much by itself but always in compounds. Prog doesn't even have a gloss for 
能動, only for its subentries like 能動的

@@ -16 +16 @@
-<gloss>active</gloss>
+<gloss>activivity</gloss>

"active" is not a noun.

reopen

i agree. merging english & japanese entries is not how we handle things.  also 零 is ateji for ゼロ, so it's not a proper merge.  split out and temp approve

@@ -4,4 +3,0 @@
-<k_ele>
-<keb>０</keb>
-<ke_pri>spec1</ke_pri>
-</k_ele>
@@ -14,0 +11,4 @@
+<keb>０</keb>
+<ke_pri>spec1</ke_pri>
+</k_ele>
+<k_ele>
@@ -15,0 +16 @@
+<ke_pri>spec1</ke_pri>
@@ -22,5 +23 @@
-</r_ele>
-<r_ele>
-<reb>ゼロ</reb>
-<re_pri>gai1</re_pri>
-<re_pri>ichi1</re_pri>
+<re_pri>spec1</re_pri>
@@ -30 +26,0 @@
-<misc>&uk;</misc>

Not sure the ゼロ/零 merge was the best choice. If they stay together, I don't think ゼロ should be nokanji (and I don't think ぜろ is 
valid)

@@ -3,0 +4,4 @@
+<k_ele>
+<keb>０</keb>
+<ke_pri>spec1</ke_pri>
+</k_ele>
@@ -8,0 +13,3 @@
+</k_ele>
+<k_ele>
+<keb>〇</keb>
@@ -17,3 +23,0 @@
-<reb>ぜろ</reb>
-</r_ele>
-<r_ele>
@@ -21 +24,0 @@
-<re_nokanji/>
@@ -27 +29,0 @@
-<pos>&adj-no;</pos>

G n-grams:
 数ヶ月	1506182
 数カ月	 192490
 数ヵ月	 117759
 数か月	  62550
 数ケ月	   6731
 数箇月	   2506
 すうかげつ	390

@@ -5,0 +6,4 @@
+<ke_pri>spec1</ke_pri>
+</k_ele>
+<k_ele>
+<keb>数カ月</keb>
@@ -9,3 +12,0 @@
-</k_ele>
-<k_ele>
-<keb>数カ月</keb>
@@ -23,0 +25 @@
+<re_pri>spec1</re_pri>

@@ -8 +8,4 @@
-<keb>数ケ月</keb>
+<keb>数ヵ月</keb>
+</k_ele>
+<k_ele>
+<keb>数カ月</keb>
@@ -14 +17,4 @@
-<keb>数カ月</keb>
+<keb>数ケ月</keb>
+</k_ele>
+<k_ele>
+<keb>数箇月</keb>

daijs

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>二〇〇〇年問題</keb>

@@ -11,0 +12 @@
+<field>&comp;</field>

@@ -12 +12,2 @@
-<gloss>various aspects or phases</gloss>
+<gloss>various aspects</gloss>
+<gloss>various phases</gloss>

@@ -22,0 +23 @@
+<re_restr>好い児</re_restr>

好い児[いいこ] is in kojien.  seems harmless to include it

@@ -11,0 +12,3 @@
+</k_ele>
+<k_ele>
+<keb>好い児</keb>

いい子	858468
良い子	553997
好い子	1170
いい児	111
好い児	92
良い児	65

I suggest removing the 良い児 kanji. If we should have one 児 kanji, it should be いい児, but it's not common at all - a 10th of a promille 
of the hits for いい子

@@ -11 +11 @@
-<keb>良い児</keb>
+<keb>良い子</keb>
@@ -19 +19 @@
-<re_restr>良い児</re_restr>
+<re_restr>良い子</re_restr>

いい気	343032
好い気	1845
良い気	112690
but daij only has 好い気, not 良い... nikk does have 良気, though.

daijr only lists いいき as the reading, not よいき

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>いい気</keb>
+</k_ele>
@@ -8 +11 @@
-<keb>いい気</keb>
+<keb>良い気</keb>

@@ -11,0 +12 @@
+<pos>&adj-no;</pos>

@@ -11,0 +12 @@
+<xref type="see" seq="2138450">形・なり</xref>

I agree.

彼女なり and 彼なり are 	[adj-no,adv] 
I don't think adv is quite right though? 自分なりに would be adverbial but without the に...?

@@ -12 +12 @@
-<gloss>one's own special way</gloss>
+<gloss>(in) one's own way</gloss>

Entry created

@@ -14 +14 @@
-<gloss>day on which the temperature rises above 35 degrees Celsius</gloss>
+<gloss>day on which the temperature rises above 35°C</gloss>

I agree.

I don't like " (official definition)", it's not our usual style.

@@ -13,0 +14 @@
+<gloss>day on which the temperature rises above 35 degrees Celsius</gloss>
@@ -15 +15,0 @@
-<gloss>day on which the temperature rises above 35 degrees Celsius (official definition)</gloss>

Thanks.

spelling mistake (temperate>temperature)

@@ -15 +15 @@
-<gloss>day on which the temperate rises above 35 degrees Celsius (official definition)</gloss>
+<gloss>day on which the temperature rises above 35 degrees Celsius (official definition)</gloss>

i agree.

一万円札	52227
一万円	967999
一万円キャンペーン	392345	  
一万円以上	135360	  
一万円未満	29693
一万円以下	21510

No problem with there being a １万円札, etc. entry, but 95% of the time 一万円 precedes other things (the キャンペーン case notwithstanding).
I think this should stay as 一万円 and 一万円札 be a new entry.

一万円札	52227
壱万円札	3580

I suggest changing this to -札 (and changing the seq number). See my comment on the １００円 entry.

@@ -5 +5 @@
-<keb>一万円</keb>
+<keb>１万円札</keb>
@@ -8 +8 @@
-<keb>壱万円</keb>
+<keb>一万円札</keb>
@@ -11 +11 @@
-<keb>１万円</keb>
+<keb>壱万円札</keb>
@@ -14 +14 @@
-<reb>いちまんえん</reb>
+<reb>いちまんえんさつ</reb>
@@ -18,2 +18 @@
-<s_inf>壱 used in legal documents</s_inf>
-<gloss>10,000 yen</gloss>
+<gloss>10,000 yen note</gloss>

@@ -19 +19 @@
-<gloss>10,000 Yen</gloss>
+<gloss>10,000 yen</gloss>

Entry created

Bulk convert ling to gramm
-*- via bulkupd.py -*-

@@ -14 +14 @@
-<field>&ling;</field>
+<field>&gramm;</field>

@@ -12 +12,2 @@
-<xref type="see" seq="1329860">受け身・3</xref>
+<xref type="syn" seq="1329860">受け身・3</xref>
+<xref type="ant" seq="2432710">能相</xref>

@@ -12 +12 @@
-<xref type="see" seq="1329860">受け身</xref>
+<xref type="see" seq="1329860">受け身・3</xref>

Entry created

Bulk convert ling to gramm
-*- via bulkupd.py -*-

@@ -14 +14 @@
-<field>&ling;</field>
+<field>&gramm;</field>

@@ -12 +12,2 @@
-<xref type="see" seq="1470200">能動</xref>
+<xref type="syn" seq="1470210">能動態</xref>
+<xref type="ant" seq="2432700">所相</xref>

Entry created

@@ -24,0 +25 @@
+<gloss>black fungus</gloss>

GG5

Sorted on hits.

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>あらげ木耳</keb>
+</k_ele>
@@ -21,0 +24,1 @@
+<gloss>wood ear fungus</gloss>

2040 hits vs 195

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>荒毛木耳</keb>
+</k_ele>

daijs
ゲーム化
⇒ゲーミフィケーション

@@ -14,0 +15,5 @@
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<gloss>gamification</gloss>
+</sense>

Good point, in fact that Weblio reference was to the "other" gamification.
Best omitted.

@@ -13 +12,0 @@
-<gloss>gamification</gloss>

https://en.wikipedia.org/wiki/Gamification

if that's actually what this means, i think it should be two senses because those glosses don't have the same meaning

https://ejje.weblio.jp/sentence/content/gamification

Adding the more concise gloss first

@@ -12,0 +13 @@
+<gloss>gamification</gloss>

@@ -13,1 +13,1 @@
-<gloss>turning (movie, comic, etc.) into a (computer) game</gloss>
+<gloss>turning a movie, comic, etc. into a (computer) game</gloss>

eij

@@ -15,0 +16 @@
+<gloss>unified</gloss>

GG5: 医療と福祉の一体的なサービスを提供する offer seamless services in medical treatment and 
welfare; provide completely integrated treatment and welfare
エネルギー問題と環境問題の一体的解決 integrated solution of [an integrated solution to] energy 
and environmental problems.
一体的	167789
一体的に	91468

Came up on the honyaku list. Meaning is not clear from the 一体 entry.

Koj

Currently a name entry too.

daijs, nikk
玄石	13

I agree.

That information should go in a usage note, not an explanatory gloss, but I don't think it's needed.

@@ -14 +13,0 @@
-<gloss g_type="expl">phrase used to change the topic</gloss>

Nothing wrong with those glosses. They're in several JEs.

@@ -9,0 +10,2 @@
+<gloss>that said</gloss>
+<gloss>apart from that</gloss>

Daijisen

@@ -10,2 +10 @@
-<gloss>that said</gloss>
-<gloss>apart from that</gloss>
+<gloss>anyway</gloss>
@@ -12,0 +12 @@
+<gloss g_type="expl">phrase used to change the topic</gloss>

GG5, 中辞典, etc.
それはそれとして	193183

@@ -10,0 +11,2 @@
+<gloss>apart from that</gloss>
+<gloss>be that as it may</gloss>

中辞典, RP

daijr/s

JLD, Unidic
陣触れ	355

daijr/s

@@ -14,0 +15 @@
+<s_inf>message welcoming a new imperial era</s_inf>
@@ -16 +16,0 @@
-<gloss g_type="expl">message welcoming a new imperial era</gloss>

天皇弥栄 gets more WWW hits.

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>天皇弥栄</keb>
+</k_ele>
@@ -11,6 +14,3 @@
-<pos>&n;</pos>
-<gloss>prosperity to the emperor 令和になる瞬間、なんて言おう？あけおめはおかしいし…と悩んでいるそこの貴方。｢すめらぎいやさか(天皇彌榮)｣というぴったりの言葉がありますよ。天皇陛下の御代がいつまでも長く平和に栄えますようにという意味です。多分今回ぐらい しか使う機会ないと思うのでよろしければ。</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>happy new imperial era</gloss>
+<pos>&exp;</pos>
+<gloss>prosperity to the emperor</gloss>
+<gloss g_type="expl">message welcoming a new imperial era</gloss>

https://soranews24.com/2019/05/01/how-do-you-say-happy-new-era-in-japanese/

Kyoto’s Kifune Shrine sends out a tweet on the first morning of the Reiwa era, containing both sumeragi iyasaka in both the kanji characters seen above and the alternate rendering, 天皇弥栄.

令和元年５月１日 謹賀新時代 天皇彌榮 天皇弥栄 すめらぎいやさか 令和の御代の幕開けを浄める雨 #氣生根 #きふね #貴船神社 #令和元年 #天皇彌榮 #貴船神社の初夏

おじいちゃま	32248
お爺ちゃま	1435
お祖父ちゃま

daijs ちゃま
［接尾］《「さま（様）」の音変化》人名または人を表す名詞に付いて、敬い親しむ気持ちを表す。幼児語。「おばちゃま」「おじいちゃま」

We already have ちゃま as an entry but 1) "Mr." isn't super helpful in this case and 2) I don't think I've ever seen/heard ちゃま 
outside of おじいちゃま おばあちゃま and I would venture those two are probably something like 90% of all ちゃま usage, so we might as 
well have them as entries.

お祖母ちゃま	757
おばあちゃま	70456
おばちゃま	61091
お婆ちゃま	5101


daijs ちゃま
［接尾］《「さま（様）」の音変化》人名または人を表す名詞に付いて、敬い親しむ気持ちを表す。幼児語。「おばちゃま」「おじいちゃま」

We already have ちゃま as an entry but 1) "Mr./Ms." isn't super helpful in this case and 2) I don't think I've ever seen/heard ちゃま 
outside of おじいちゃま おばあちゃま and I would venture those two are probably something like 90% of all ちゃま usage, so we might as 
well have them as entries.

Trimming.

@@ -17 +17 @@
-<s_inf>used when exchanging gifts; usu. as ほんの気持ちですが</s_inf>
+<s_inf>used when exchanging gifts; usu. as ～ですが</s_inf>

gg5
daijr (気持ち): "自分の心遣いを謙遜していうときに使う語。「―ばかりのお礼ですが」「ほんの―ですが」"

It wasn't clear from the glosses how this is used.
That second GG5 example ("Let me sip just a bit") is actually a completely different sense of 気持ち so we probably need a second sense here.

@@ -16,4 +16,10 @@
-<gloss>modesty</gloss>
-<gloss>humility</gloss>
-<gloss>frankness</gloss>
-<gloss>honesty</gloss>
+<misc>&hum;</misc>
+<s_inf>used when exchanging gifts; usu. as ほんの気持ちですが</s_inf>
+<gloss>small token of one's sentiments</gloss>
+</sense>
+<sense>
+<pos>&exp;</pos>
+<pos>&adv;</pos>
+<xref type="see" seq="1591430">気持ち・4</xref>
+<gloss>just slightly</gloss>
+<gloss>only a bit</gloss>

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q10125368455
ほんの気持ち	19267
本の気持ち	929
ほんのきもち	13535
GG5: これはほんの気持ちだけですが(どうぞ受け取ってください)． This is only a small token of my sentiments.
GG5: ほんの気持ち, 気持ちだけでいいから飲ませて． Let me sip just a bit, only a bit.

@@ -6,0 +7,3 @@
+<k_ele>
+<keb>本の気持ち</keb>
+</k_ele>
@@ -10,0 +14 @@
+<pos>&exp;</pos>
@@ -12 +16,2 @@
-<pos>&exp;</pos>
+<gloss>modesty</gloss>
+<gloss>humility</gloss>
@@ -15 +19,0 @@
-<gloss>from the heart</gloss>

weblio https://ejje.weblio.jp/content/ほんの気持ち

G n-grams:
ほんのキムチ	128
キムチ悪い	374

I don't think we need this. You could use キムチ in place of 気持ち in any expression. Even キムチ悪い gets more more hits.

Aligning.

@@ -8,0 +9 @@
+<pos>&n;</pos>
@@ -11,0 +13,2 @@
+<gloss>modesty</gloss>
+<gloss>humility</gloss>
@@ -14 +16,0 @@
-<gloss>from the heart</gloss>

https://www.google.com/search?hl=ja&ei=zFzsXOVq9JCvvA_T6IagBw&q="ほんのキムチ"&oq="ほんのキムチ"&gs_l=psy-ab.3..0i4i37.4330.5491..5812...0.0..0.125.235.0j2......0....1..gws-wiz.X2wATnITeps

My native teacher mentioned this pun during class

aligning (see the 九 entry)

@@ -24,0 +25 @@
+<gloss>0</gloss>

Small trim. I'm not sure 零 belongs here.

@@ -23 +23 @@
-<s_inf>〇 is used together with kanji numerals</s_inf>
+<s_inf>〇 used with kanji numerals</s_inf>

e.g. 一九〇二 vs １９０２ 
(does 一九零二 exist in modern Japanese? I don't think I've ever seen it)

@@ -22,0 +23 @@
+<s_inf>〇 is used together with kanji numerals</s_inf>

ゼロから始める	115777
ゼロからスタート	49338
koj:
③（数・量・価値などが）全く無いこと。皆無。「―からの出発」
daijr:
３）全くないこと。「美的センスが―だ」
daijs:
(3)何もないこと。また、価値のないこと。「―の状態」「服装のセンスは―」
nikk:
２ 何もないこと。無。また、無価値であること。

@@ -24,0 +25,7 @@
+<gloss>nil</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&uk;</misc>
+<gloss>nothing</gloss>
+<gloss>zilch</gloss>

@@ -15 +15 @@
-<gloss>10,000 yen note</gloss>
+<gloss>10,000 yen bill</gloss>