どきん can also be used without と.  shouldn't be merged here

@@ -14,6 +13,0 @@
-<r_ele>
-<reb>ドキンと</reb>
-</r_ele>
-<r_ele>
-<reb>どきんと</reb>
-</r_ele>

gg5

Not a noun.

@@ -22 +21,0 @@
-<pos>&n;</pos>
@@ -25,2 +24,2 @@
-<gloss>feeling a shock</gloss>
-<gloss>startling</gloss>
+<gloss>being startled</gloss>
+<gloss>getting a shock</gloss>

Moving the "ichi1".

@@ -5,0 +6 @@
+<re_pri>ichi1</re_pri>
@@ -12 +12,0 @@
-<re_pri>ichi1</re_pri>

splitting out

@@ -9,3 +8,0 @@
-</r_ele>
-<r_ele>
-<reb>どきり</reb>
@@ -22,2 +18,0 @@
-<stagr>ドッキリ</stagr>
-<stagr>どっきり</stagr>

gg5

I think this is better.

@@ -18 +18,2 @@
-<gloss>feeling shocked or startled</gloss>
+<gloss>feeling startled</gloss>
+<gloss>getting a shock</gloss>

@@ -11,0 +12 @@
+<xref type="see" seq="2834144">パーキングブレーキ</xref>

Oops.

@@ -14,2 +14,2 @@
-<gloss>parking break</gloss>
-<gloss>emergency break</gloss>
+<gloss>parking brake</gloss>
+<gloss>emergency brake</gloss>

gg5

@@ -13 +13,3 @@
-<gloss>hand brake</gloss>
+<gloss>handbrake</gloss>
+<gloss>parking break</gloss>
+<gloss>emergency break</gloss>

Added additional dotted reading(s) via batch update.Added additional dotted reading(s) via batch update.
-*- via bulkupd.py -*-

@@ -6,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>サイド・ブレーキ</reb>

refers to both, but the other is in enamdict

daijr, koj

Refers to a person from New York.

@@ -13 +13 @@
-<gloss>The New Yorker</gloss>
+<gloss>New Yorker</gloss>

to enam

Added additional dotted reading(s) via batch update.Added additional dotted reading(s) via batch update.
-*- via bulkupd.py -*-

@@ -8,0 +8,3 @@
+<r_ele>
+<reb>ニュー・ヨーカー</reb>
+</r_ele>

You're mistaken. That's an error.

森さんは会社員ですか。いいえ、違います。

daij, gg5

Added sense.
I don't think sense 1 is a suffix.

@@ -18 +17,0 @@
-<pos>&n-suf;</pos>
@@ -19,0 +19 @@
+<gloss>distinction</gloss>
@@ -21,0 +22,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>mistake</gloss>
+<gloss>error</gloss>
+</sense>

Not the machine.

@@ -12 +12 @@
-<gloss>printer</gloss>
+<gloss>printer (person)</gloss>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

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

gg5, prog

@@ -20,0 +21,2 @@
+<gloss>setting up</gloss>
+<gloss>inauguration</gloss>

mk

@@ -16,0 +17 @@
+<pos>&vi;</pos>
@@ -23,0 +25 @@
+<pos>&vi;</pos>

daij, gg5, prog

Splitting.

@@ -16,0 +17,9 @@
+<gloss>lethargy</gloss>
+<gloss>despondency</gloss>
+<gloss>mental numbness</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<field>&med;</field>
+<gloss>(physical) collapse</gloss>
@@ -18,3 +26,0 @@
-<gloss>lethargy</gloss>
-<gloss>collapse</gloss>
-<gloss>despondency</gloss>

gg5, daij

@@ -12 +12,3 @@
-<gloss>curio or secondhand dealer</gloss>
+<gloss>antiques business</gloss>
+<gloss>curio dealer</gloss>
+<gloss>secondhand dealer</gloss>

gg5

@@ -16,0 +17 @@
+<gloss>particulars</gloss>

Correct POS order
-*- via bulkupd.py -*-

@@ -19 +18,0 @@
-<pos>&adj-no;</pos>
@@ -21,0 +21 @@
+<pos>&adj-no;</pos>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -19,0 +20,2 @@
+<pos>&vt;</pos>
+<pos>&vi;</pos>

@@ -19,0 +20 @@
+<xref type="see" seq="1463630">肉食・1</xref>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

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

gg5, prog, daijr

@@ -19 +19,3 @@
-<gloss>(enrolled) in school</gloss>
+<gloss>attending (school, college, etc.)</gloss>
+<gloss>being enrolled</gloss>
+<gloss>being a student</gloss>

gg5, prog, daijr

@@ -22 +22,2 @@
-<gloss>barbarous</gloss>
+<gloss>cruel</gloss>
+<gloss>heartless</gloss>
@@ -25,2 +25,0 @@
-<gloss>cruel</gloss>
-<gloss>heartless</gloss>

gg5
G n-grams:
せっ生	No matches

せっ生 gets barely any hits. I think we can drop it.

@@ -8,3 +7,0 @@
-</k_ele>
-<k_ele>
-<keb>せっ生</keb>
@@ -28,0 +26 @@
+<gloss>heartless</gloss>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -12,0 +13,2 @@
+<pos>&vt;</pos>
+<pos>&vi;</pos>

gg5, daij

"fomentation" is archaic according to Oxford.

@@ -12,0 +13,2 @@
+<gloss>(wet) compress</gloss>
+<gloss>poultice</gloss>
@@ -14 +15,0 @@
-<gloss>compress</gloss>

@@ -41,0 +42 @@
+<pos>&vt;</pos>

Meikyo and sankoku describe 十分 as the 本来 form.
shinmeikai: 「充分」と書くのは、借字。

@@ -11,0 +12 @@
+<ke_inf>&ateji;</ke_inf>

G n-grams:
 十分	26408291
 充分	 4855162

@@ -11,0 +12 @@
+<ke_pri>spec1</ke_pri>
@@ -17,0 +19 @@
+<re_pri>spec1</re_pri>

daij, gg5

Splitting.

@@ -11,0 +12,2 @@
+<pos>&adj-no;</pos>
+<gloss>repeatedly</gloss>
@@ -12,0 +15,6 @@
+<gloss>over and over</gloss>
+<gloss>time and time again</gloss>
+</sense>
+<sense>
+<pos>&adv;</pos>
+<gloss>exceedingly</gloss>
@@ -14 +22 @@
-<gloss>exceedingly</gloss>
+<gloss>very much</gloss>

gg5

@@ -12 +12,3 @@
-<gloss>first sunrise (of New Year)</gloss>
+<pos>&n;</pos>
+<gloss>first sunrise of the year</gloss>
+<gloss>sunrise on New Year's Day</gloss>

gg5, prog

@@ -19,0 +20,2 @@
+<gloss>people</gloss>
+<gloss>the public</gloss>

daijs, nikk: https://kotobank.jp/word/操-27614

@@ -12,0 +13,3 @@
+</r_ele>
+<r_ele>
+<reb>そう</reb>

daij, gg5, prog

Splitting.

@@ -16 +15,0 @@
-<gloss>chastity</gloss>
@@ -20 +19,6 @@
-<gloss>faith</gloss>
+<gloss>constancy</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>chastity (of a woman)</gloss>
+<gloss>faithfulness (e.g. to one's husband)</gloss>

G n-grams:
はじき出す	20878
弾き出す	        10813
弾きだす	        2808

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>弾きだす</keb>
@@ -23 +26 @@
-<s_inf>originally on an abacus</s_inf>
+<s_inf>orig. on an abacus</s_inf>

gg5, 中辞典, ウィズダム和英辞典, daijr/s

Added sense.
Improved existing senses.

@@ -16 +16,3 @@
-<gloss>to shoot (marbles)</gloss>
+<gloss>to flick out</gloss>
+<gloss>to spring out</gloss>
+<gloss>to repel</gloss>
@@ -21 +23,3 @@
-<gloss>to calculate (originally on an abacus)</gloss>
+<s_inf>originally on an abacus</s_inf>
+<gloss>to calculate</gloss>
+<gloss>to work out</gloss>
@@ -26,2 +30,8 @@
-<gloss>to spring out</gloss>
-<gloss>to force out</gloss>
+<gloss>to expel (from a group)</gloss>
+<gloss>to drive out</gloss>
+<gloss>to ostracize</gloss>
+</sense>
+<sense>
+<pos>&v5s;</pos>
+<pos>&vt;</pos>
+<gloss>to raise funds</gloss>

GG5 Genius daijr koj shinkaisan

* Add spelling はじき出す (saw as such in news, slight edge on Google)
* split into separate senses
* explain abacus origin

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>はじき出す</keb>
+</k_ele>
@@ -14,1 +17,9 @@
-<gloss>to calculate</gloss>
+</sense>
+<sense>
+<pos>&v5s;</pos>
+<pos>&vt;</pos>
+<gloss>to calculate (originally on an abacus)</gloss>
+</sense>
+<sense>
+<pos>&v5s;</pos>
+<pos>&vt;</pos>

@@ -20 +19,0 @@
-<pos>&exp;</pos>

Aligning with 右折￥左折禁止

@@ -27,3 +27,4 @@
-<gloss>Road closed (on a sign)</gloss>
-<gloss>Closed to traffic</gloss>
-<gloss>No through road</gloss>
+<s_inf>on signage, etc.</s_inf>
+<gloss>road closed</gloss>
+<gloss>closed to traffic</gloss>
+<gloss>no through road</gloss>

I agree. But I think both senses are [exp] because 通行止め isn't in the kokugos.

@@ -24 +24,5 @@
-<gloss>Road closed (e.g. on a sign)</gloss>
+</sense>
+<sense>
+<pos>&exp;</pos>
+<gloss>Road closed (on a sign)</gloss>
+<gloss>Closed to traffic</gloss>

gg5, prog

@@ -10,0 +11 @@
+<pos>&n;</pos>
@@ -12 +12,0 @@
-<pos>&n;</pos>
@@ -13,0 +14,2 @@
+<gloss>fidelity</gloss>
+<gloss>faithfulness</gloss>
@@ -15 +16,0 @@
-<gloss>fidelity</gloss>

Correct POS order
-*- via bulkupd.py -*-

@@ -21,0 +22 @@
+<pos>&vi;</pos>
@@ -23 +23,0 @@
-<pos>&vi;</pos>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -22,0 +23 @@
+<pos>&vi;</pos>

daij, koj

@@ -15,0 +16,3 @@
+<r_ele>
+<reb>にくじき</reb>
+</r_ele>
@@ -19,0 +23 @@
+<xref type="see" seq="1295890">菜食</xref>
@@ -24,0 +29 @@
+<stagr>にくしょく</stagr>
@@ -25,0 +31 @@
+<xref type="see" seq="1610100">草食</xref>

the Japanese form Fudo is often used in English

@@ -29,0 +30,2 @@
+<gloss>Fudō</gloss>
+<gloss g_type="expl">fierce Buddhist deity</gloss>

gg5, prog, daij

Added sense.
Not [adj-na].
All the JE and kokugo examples are [adj-no].

@@ -15 +15 @@
-<pos>&adj-na;</pos>
+<pos>&adj-no;</pos>
@@ -17,5 +17 @@
-<pos>&adj-no;</pos>
-<gloss>immobility</gloss>
-<gloss>firmness</gloss>
-<gloss>fixed</gloss>
-<gloss>steadfastness</gloss>
+<gloss>immovable</gloss>
@@ -23 +19,11 @@
-<gloss>idle</gloss>
+<gloss>firm</gloss>
+<gloss>unwavering</gloss>
+<gloss>unshakable</gloss>
+<gloss>steadfast</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1494260">不動明王</xref>
+<field>&Buddh;</field>
+<misc>&abbr;</misc>
+<gloss>Acala (Wisdom King)</gloss>

The English versions have both forms. I don't like the 
hyphen.

@@ -15 +15 @@
-<gloss>Fudō Myō-ō</gloss>
+<gloss>Fudō Myōō (Myō-ō)</gloss>

the Japanese form is often used in English

@@ -14,0 +15 @@
+<gloss>Fudō Myō-ō</gloss>

OK

wiki

I don't think we need all these glosses.
They are explanations and etymologies rather than proper translations.
(And according to Shingon doctrine all Buddhist deities are manifestations of Mahavairocana(大日如来) anyway.)

@@ -13,6 +13,3 @@
-<gloss>Acala</gloss>
-<gloss>Acalanatha Vidya-raja</gloss>
-<gloss>The Immovable</gloss>
-<gloss>manifestation of Mahavairocana</gloss>
-<gloss>god of fire</gloss>
-<gloss>fierce manifestation of Dainichi Nyorai</gloss>
+<gloss>Acala (Wisdom King)</gloss>
+<gloss>Acalanatha</gloss>
+<gloss g_type="expl">fierce Buddhist deity</gloss>

https://ja.wikipedia.org/wiki/不動明王
GG5, ルミナス, 中辞典

Every JE has a different version.

@@ -15 +15,4 @@
-<gloss>The Immovable, a manifestation of Mahavairocana</gloss>
+<gloss>The Immovable</gloss>
+<gloss>manifestation of Mahavairocana</gloss>
+<gloss>god of fire</gloss>
+<gloss>fierce manifestation of Dainichi Nyorai</gloss>

I don't think it's needed but feel free to make some suggestions for the entries you have in mind.

there are about 15 entries with 奉公 in them that do not mention the live-in part. should it be added to at least some of them? AFAIK this is pretty integral to 奉公

mk

@@ -16,0 +17 @@
+<pos>&vi;</pos>
@@ -22,0 +24 @@
+<pos>&vi;</pos>

gg5, prog

@@ -23,0 +24 @@
+<gloss>public service</gloss>

GG5

Clearly two or more senses.

@@ -17 +17 @@
-<gloss>service</gloss>
+<gloss>live-in domestic service</gloss>
@@ -18,0 +19,4 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>

GG5

@@ -11,0 +12,2 @@
+<gloss>one's employer's house</gloss>
+<gloss>one's employer</gloss>

奉公 means apprenticeship, where the master provides the quarters.

@@ -12 +12 @@
-<gloss>place of employment</gloss>
+<gloss>place of apprenticeship</gloss>

gg5, daij
顔なじみ	85742
顔馴染み	22501
顔馴染	2713

gg5 ex: "顔なじみの店員"

@@ -9 +9 @@
-<keb>顔馴染</keb>
+<keb>顔馴染み</keb>
@@ -12 +12 @@
-<keb>顔馴染み</keb>
+<keb>顔馴染</keb>
@@ -19,0 +20 @@
+<pos>&adj-no;</pos>

gg5
daijr: "重々の不始末"

@@ -16,0 +17 @@
+<gloss>over and over again</gloss>
@@ -19,0 +21 @@
+<gloss>fully (e.g. understand)</gloss>
@@ -21 +23 @@
-<gloss>fully (e.g. understand)</gloss>
+<gloss>very well</gloss>

gg5, prog, daij

Splitting.

@@ -13,0 +14 @@
+<pos>&adv;</pos>
@@ -14,0 +16,3 @@
+<gloss>repeatedly</gloss>
+</sense>
+<sense>
@@ -16,3 +20,3 @@
-<pos>&n;</pos>
-<gloss>repeated</gloss>
-<gloss>manifold</gloss>
+<gloss>very much</gloss>
+<gloss>fully (e.g. understand)</gloss>
+<gloss>exceedingly</gloss>

daijr has 重重 followed by に in one of its archaic  名 ・形動ナリ ）senses:
いくえにも重なり合う・こと（さま）。 「宮殿楼閣－にして／今昔 6」

i agree.  and if someone can't figure out what 重重に means given that we have entries for 重重 and に, they probably are in need of more help than we can provide.  if needed, the sense above belongs in the entry for 重重, not here

G n-grams:
重々	189287
重々に	1966

I'm not sure we need this. 重々 isn't a 形容動詞 and there are no 重々に examples in the kokugos or JEs.
I suspect it's just a a mistake made by people who forget that 重々 is already an adverb. Only accounts for ~1% of instances of 重々.

立て込む	4948	83.4%
立込む	128	2.2% <- Daijr: 立(て)込む
たてこむ	663	11.2%
立てこむ	194	3.3%

@@ -9,0 +10,4 @@
+</k_ele>
+<k_ele>
+<keb>立てこむ</keb>
+<ke_inf>&sK;</ke_inf>

gg5, prog

@@ -18,2 +18 @@
-<xref type="see" seq="2010830">建て込む</xref>
-<gloss>to be crowded (with)</gloss>
+<gloss>to be crowded</gloss>
@@ -20,0 +20 @@
+<gloss>to be busy</gloss>
@@ -26 +26,4 @@
-<gloss>to be busy (with)</gloss>
+<gloss>to be busy (with many things)</gloss>
+<gloss>to be packed (of one's schedule)</gloss>
+<gloss>to have a lot of work to do</gloss>
+<gloss>to have one's hands full</gloss>

gg5

@@ -19 +19,2 @@
-<gloss>to be crowded</gloss>
+<gloss>to be crowded (with)</gloss>
+<gloss>to be packed</gloss>
@@ -24 +25,2 @@
-<gloss>to be busy</gloss>
+<gloss>to be piled up (of work)</gloss>
+<gloss>to be busy (with)</gloss>

gg5, prog, daij
G n-grams:
大股	58379
大また	14888

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>大また</keb>
@@ -12,0 +16 @@
+<gloss>spreading one's legs wide apart</gloss>
@@ -18,2 +22,2 @@
-<gloss>long (great, swinging) stride</gloss>
-<gloss>long (big) steps</gloss>
+<gloss>long stride</gloss>
+<gloss>big steps</gloss>
@@ -23 +26,0 @@
-<pos>&adj-no;</pos>

@@ -24,1 +24,2 @@
-<gloss>thigh-scooping body drop (sumo)</gloss>
+<field>&sumo;</field>
+<gloss>thigh-scooping body drop</gloss>

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -12,0 +13 @@
+<pos>&vt;</pos>

gg5

@@ -13 +13,3 @@
-<gloss>tacit permission or approval</gloss>
+<gloss>tacit permission</gloss>
+<gloss>tacit consent</gloss>
+<gloss>connivance</gloss>

I added adj-nari a couple of years ago but it's not needed if we have adj-na.

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

Daijr: "（名形動ナリ）"

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

daijs

@@ -8,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>無礙</keb>

@@ -13,0 +14 @@
+<gloss>no open flame</gloss>

@@ -11 +11 @@
-<pos>&n;</pos>
+<pos>&exp;</pos>

Very common.

@@ -14,0 +14,1 @@
+<gloss>flammables!</gloss>

eij

A+B, could also be deleted

@@ -12,1 +12,2 @@
-<gloss>a warning of flammability</gloss>
+<gloss>total fire ban</gloss>
+<gloss>no source of ignition permitted</gloss>

prog

@@ -12 +12,2 @@
-<gloss>enrolled or registered student</gloss>
+<gloss>enrolled student</gloss>
+<gloss>registered student</gloss>

gg5, daij

@@ -13,0 +14,5 @@
+<sense>
+<pos>&n;</pos>
+<misc>&hum;</misc>
+<gloss>(one's own) skill</gloss>
+</sense>

A+B. Bizarre.

A+B? Already have a sense for this in the 降ろす entry.

@@ -12,0 +12,1 @@
+<pos>&v5s;</pos>

gg5, prog, daij

I don't think "double check" or "make sure" fit the definition.

@@ -13,3 +13,3 @@
-<gloss>to pay attention to</gloss>
-<gloss>to make sure</gloss>
-<gloss>to double check</gloss>
+<gloss>to take great care (in doing)</gloss>
+<gloss>to pay attention</gloss>
+<gloss>to be careful</gloss>

gg5 eij

@@ -13,0 +14,2 @@
+<gloss>to make sure</gloss>
+<gloss>to double check</gloss>

Added additional PoS via batch update.Added additional PoS via batch update.
-*- via bulkupd.py -*-

@@ -12,0 +12,1 @@
+<pos>&v1;</pos>

No reason offered.

gg5

I think "to be worked to death" could be taken literally.
I was going to suggest deleting this but all the examples are in this form (rather than 忙殺する) so it's probably worth keeping.

@@ -10,0 +11 @@
+<pos>&exp;</pos>
@@ -12 +12,0 @@
-<gloss>to be worked to death</gloss>
@@ -13,0 +14 @@
+<gloss>to be swamped with work</gloss>

I guess so.

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

gg5
G n-grams:
どぎつい	35312
ドギツイ	11158

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ドギツイ</reb>
@@ -12 +15 @@
-<gloss>violent</gloss>
+<gloss>intense</gloss>
@@ -13,0 +17,2 @@
+<gloss>extreme</gloss>
+<gloss>heavy</gloss>

Reformat initialsms
-*- via bulkupd.py -*-

@@ -7,0 +8,3 @@
+<reb>ティー・ピー・オー</reb>
+</r_ele>
+<r_ele>
@@ -8,0 +12 @@
+<re_inf>&sk;</re_inf>

GG5, etc.

jwiki: "「時と場所、場合に応じた方法・態度・服装等の使い分け」を意味する和製英語"
---
"季節やTPOに合わないファッション"
"TPOに合わせて標準語を話しているつもりが、相槌を打つときに「･･･だら～」と言っていることに気がつかない三河人"
"ＴＰＯに応じて対応を変えるのは当たり前だろう？"

It's not about exploiting an opportunity but rather behaving appropriately.
I took the above examples from Twitter.
Wikipedia thinks it's wasei and I agree. TPO is not used in English.
I don't think we need the unabbreviated form. It gets fewer than 200 googits and it's only used to explain what the letters stand for.

@@ -12,3 +12,2 @@
-<xref type="see" seq="2721630">タイムプレイスオケイジョン</xref>
-<gloss>time, place, occasion</gloss>
-<gloss g_type="expl">being able to exploit an opportunity</gloss>
+<lsource ls_wasei="y"/>
+<gloss>(appropriate to) time, place, occasion</gloss>

http://ja.wikipedia.org/wiki/TPO

I think wasei is a bit of a stretch.

@@ -12,0 +12,1 @@
+<xref type="see" seq="2721630">タイムプレイスオケイジョン</xref>
@@ -13,0 +14,1 @@
+<gloss g_type="expl">being able to exploit an opportunity</gloss>

Remove unsupported yoji tag
-*- via bulkupd.py -*-

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

I agree. The space that came in my 1 Jan edit was an artefact introduced by Chrome running on my tablet, which inserts an LF at the end of a line in a text box. I didn't notice it at the time.

@@ -16 +16 @@
-<gloss>learning good manners through apprenticeship (to an upper class family)</gloss>
+<gloss>learning good manners through apprenticeship (to an upper-class family)</gloss>

i think there should be a hyphen

G n-grams:
行儀見習	        405
行儀見習い	2407

I assume you wanted to replace the hyphen with a space?

@@ -5 +5 @@
-<keb>行儀見習</keb>
+<keb>行儀見習い</keb>
@@ -8 +8 @@
-<keb>行儀見習い</keb>
+<keb>行儀見習</keb>
@@ -16 +16 @@
-<gloss>learning good manners through apprenticeship (to an upper- class family)</gloss>
+<gloss>learning good manners through apprenticeship (to an upper class family)</gloss>

@@ -16 +16 @@
-<gloss>learning good manners through apprenticeship (to an upper-class family)</gloss>
+<gloss>learning good manners through apprenticeship (to an upper- class family)</gloss>

Looks like an error.

@@ -9,4 +8,0 @@
-</k_ele>
-<k_ele>
-<keb>画面</keb>
-<ke_inf>&iK;</ke_inf>

Ref for 画面?

@@ -19 +19 @@
-<gloss>the impression given by a painting or image</gloss>
+<gloss>impression given by a painting or image</gloss>

Entry created

Weblio Email例文集

@@ -12,2 +12,2 @@
-<gloss>garbage man</gloss>
-<gloss>garbage collector</gloss>
+<gloss>cleaner</gloss>
+<gloss>janitor</gloss>

Entry created

Adding yoji tags based on gakken, shinmeikai and-or jitenon
-*- via bulkupd.py -*-

@@ -19,0 +20 @@
+<misc>&yoji;</misc>

wiki(shikantaza), wiki(Dogen#Zazen)

there is nothing wrong with the current gloss,
but I think the new gloss is what really distinguishes 只管打坐 from other forms of meditation
where you usually focus on some object (your breath, a mantra, a visualization, a koan, etc.)

@@ -20 +20,2 @@
-<gloss>shikantaza (zazen meditation in which one focuses on sitting without actively seeking enlightenment)</gloss>
+<gloss>shikantaza</gloss>
+<gloss g_type="expl">meditation practice where one stays intensely focused without focusing on any particular object</gloss>

www-images
not in gg5 koj daijs
G n-grams:
  只管打坐	4627
  只管打座	2500
  祗管打坐	  70

@@ -8,0 +9,4 @@
+</k_ele>
+<k_ele>
+<keb>只管打座</keb>
+<ke_inf>&iK;</ke_inf>

@@ -13,2 +13,2 @@
-<xref type="see" seq="2540600">見られる・みられる・3</xref>
-<xref type="see" seq="2540600">見られる・みられる・3</xref>
+<xref type="see" seq="2835071">見られる・みられる・2</xref>
+<xref type="see" seq="2835071">見られる・みられる・2</xref>

@@ -13 +13 @@
-<xref type="see" seq="1259290">見る・1</xref>
+<xref type="see" seq="2540600">見られる・みられる・3</xref>

@@ -13,1 +13,1 @@
-<xref type="see" seq="1259290">見る</xref>
+<xref type="see" seq="1259290">見る・1</xref>

Entry created

@@ -12 +12,3 @@
-<gloss>(it's been) one thing after another</gloss>
+<misc>&id;</misc>
+<gloss>one thing after another</gloss>
+<gloss>out of the frying pan and into the fire</gloss>

Entry created

@@ -15,0 +16 @@
+<gloss>we were all beginners once</gloss>

daij

I get around 2k googits for "Don't forget your first 
resolution" but all results are Japanese pages and I don't 
think it's particularly fitting

@@ -15,2 +15,4 @@
-<misc>&id;</misc>
-<gloss>Don't forget your first resolution</gloss>
+<misc>&proverb;</misc>
+<gloss>never lose your humility</gloss>
+<gloss>don't let success get to your head</gloss>
+<gloss>don't forget where you came from</gloss>

kotowaza-allguide

@@ -12,2 +12,3 @@
-<misc>&id;</misc>
-<gloss>Haste makes waste</gloss>
+<misc>&proverb;</misc>
+<gloss>haste makes waste</gloss>
+<gloss>anger and haste hinder good counsel</gloss>

Entry created

中辞典, gg5

@@ -14 +14 @@
-<gloss>to run out of steam after having tried everything (and failed)</gloss>
+<gloss>to exhaust all one's options</gloss>

isn't this about having exhausted all your options (not "being out of steam")?

http://kotowaza-allguide.com/ka/katanaoreyatsukiru.html
「やれることは全てやったが、刀折れ矢尽きてしまった」

Not a great gloss but better than the previous one

@@ -11,0 +12 @@
+<pos>&v1;</pos>
@@ -13 +14 @@
-<gloss>It's all over now</gloss>
+<gloss>to run out of steam after having tried everything (and failed)</gloss>

Entry created

daijs
kotowaza-allguide

judging from daijs, "...flock together" isn't a great 
translation, but in the kotowaza-allguide for the full 
version (牛は牛連れ，馬は馬連れ), they mention two meanings: 
"牛は牛連れ馬は馬連れとは、同類や似た者同士は自然と集まりやすいこと
のたとえ。また、似た者同士で物事を行えば、うまくいくということ。"

@@ -12,2 +12,5 @@
-<misc>&id;</misc>
-<gloss>Birds of a feather flock together</gloss>
+<xref type="see" seq="2833980">牛は牛連れ馬は馬連れ</xref>
+<misc>&proverb;</misc>
+<gloss>birds of a feather flock together</gloss>
+<gloss>horses work best together</gloss>
+<gloss>don't mix your horses with your cows</gloss>

Entry created

daijs: 酒席でのいやがらせ。酒が飲めない体質の人に、無理やり酒を
飲ませようとすること。

@@ -13 +13 @@
-<gloss>alcohol related harassment</gloss>
+<gloss>forcing people who can't drink alcohol to drink alcohol</gloss>

Added additional dotted reading(s) via batch update.Added additional dotted reading(s) via batch update.
-*- via bulkupd.py -*-

@@ -6,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>アルコール・ハラスメント</reb>

wiki

aligning with  1494260
keeping Āryācalanātha (= the noble Acalanātha)

@@ -13,0 +14 @@
+<gloss>Acala (Wisdom King)</gloss>
@@ -14,0 +16,2 @@
+<gloss>Fudō</gloss>
+<gloss g_type="expl">fierce Buddhist deity</gloss>

sp

@@ -13,0 +13,1 @@
+<misc>&hon;</misc>
@@ -14,1 +15,0 @@
-<gloss>polite way of refering to Acala</gloss>

daij

Google N-gram Corpus Counts
╭─ーーーーーー─┬────────┬───────╮
│ 仕切り直し　 │ 93,638 │ 55.2% │
│ しきり直し　 │  3,246 │  1.9% │ - sK
│ 仕切りなおし │ 68,794 │ 40.6% │
│ しきりなおし │  3,812 │  2.2% │
╰─ーーーーーー─┴────────┴───────╯

@@ -8 +8 @@
-<keb>しきり直し</keb>
+<keb>仕切りなおし</keb>
@@ -11 +11,2 @@
-<keb>仕切りなおし</keb>
+<keb>しきり直し</keb>
+<ke_inf>&sK;</ke_inf>

Alternate spellings for searching.

@@ -5,0 +6,6 @@
+</k_ele>
+<k_ele>
+<keb>しきり直し</keb>
+</k_ele>
+<k_ele>
+<keb>仕切りなおし</keb>

Seen in a game

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>並びたつ</keb>

daij, prog, Luminous

aligning with  1494260

@@ -14,6 +14,4 @@
-<gloss>Acala</gloss>
-<gloss>Acalanatha Vidya-raja</gloss>
-<gloss>The Immovable</gloss>
-<gloss>manifestation of Mahavairocana</gloss>
-<gloss>god of fire</gloss>
-<gloss>fierce manifestation of Dainichi Nyorai</gloss>
+<gloss>Acala (Wisdom King)</gloss>
+<gloss>Acalanatha</gloss>
+<gloss>Fudō</gloss>
+<gloss g_type="expl">fierce Buddhist deity</gloss>

N-grams - 14.7k, mentioned in the 不動明王 Wikipedia page.

More common than I thought. (I originally thought it was a pun on 不動産.)

@@ -15,0 +16,5 @@
+<gloss>Acalanatha Vidya-raja</gloss>
+<gloss>The Immovable</gloss>
+<gloss>manifestation of Mahavairocana</gloss>
+<gloss>god of fire</gloss>
+<gloss>fierce manifestation of Dainichi Nyorai</gloss>

http://www.shiga-miidera.or.jp/about/walk/161.html
first paragraph

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1
2105988447
lots of Google Books results

@@ -12 +12,3 @@
-<gloss>someone who call a spade a spade</gloss>
+<gloss>straight shooter</gloss>
+<gloss>frank person</gloss>
+<gloss>person who tells it like it is</gloss>

http://blog.goo.ne.jp/wxyz2008/e/cdda4c7c44d6c40fe959e53c0a29c95a

歯に衣着せぬ物言いをする人
相手が誰であろうと臆せずに、良いことは良い、 悪いことは悪いとはっきり意見を述べる人

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

@@ -21 +21 @@
-<gloss>being jealous of somebody over something but also thinking they should be sentenced to death over it (esp. of male teachers having sexual relations with their students)</gloss>
+<gloss>being jealous of someone over something but also thinking they should be sentenced to death over it (esp. of male teachers having sexual relations with their students)</gloss>

@@ -19 +19 @@
-<misc>&sl;</misc>
+<misc>&net-sl;</misc>

This may be the most common form.

@@ -9,0 +10,3 @@
+</k_ele>
+<k_ele>
+<keb>羨ま死刑</keb>

@@ -5,0 +6 @@
+<ke_inf>&ateji;</ke_inf>

koj, daij, etc.

i've moved どきり out of its merged entry and どきん out of its merged entry (as どきんと) and suggest putting both together here

チチンプイプイ	3746
ちちんぷいぷい	76375
Koj, Daijr, etc:
ルミナス: Ouchee! Go away!; (説明的には) charm repeated by children while rubbing a bruise

In rejected 2848193 Anthony Russo wrote:
'The Real Japanese podcast' episode 69: https://www.haru-no-nihongo.com/post/ep-69-質問に答えるよ-i-answer-questions-n3-n2
Supposedly from English: 'Bibbidi-Bobbidi-Boo', which originated in the 1948 novelty song Bibbidi-Bobbidi-Boo, used in the 1950 film 'Cinderella', according to Wiki.
and proposed: "words chanted when casting a magic spell; a light-hearted magical incantation".
That doesn't line up well with the references, and suspect may be an urban myth.

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>チチンプイプイ</reb>

@@ -8,0 +9 @@
+<s_inf>said to comfort children in pain</s_inf>
@@ -10 +10,0 @@
-<gloss g_type="expl">phrase used to comfort children who have injured themselves</gloss>

This version meets with my wife's approval.

@@ -10 +10 @@
-<gloss g_type="expl">phrase used to comfort a child who has injured themselves</gloss>
+<gloss g_type="expl">phrase used to comfort children who have injured themselves</gloss>

中辞典

https://eow.alc.co.jp/search?q=カロリー計算

daijs

@@ -12 +12 @@
-<gloss>parking break</gloss>
+<gloss>parking brake</gloss>
@@ -13,0 +14 @@
+<gloss>emergency brake</gloss>

@@ -13 +13 @@
-<gloss>hand brake</gloss>
+<gloss>handbrake</gloss>

gg5, daijr

Judging by googits, パーキングブレーキ appears to be more common than サイドブレーキ now.

gg5, daijr/s

https://allabout.co.jp/gm/gc/188860/
"「魔の二歳児」と世界共通で呼ばれる第1次反抗期・イヤイ
ヤ期"
lots of mentions on twitter in past 24hrs 
().20+

google image hits

@@ -19 +19 @@
-<gloss>bok choy (Brassica rapa subsp. chinensis; esp. cultivars with green stalks)</gloss>
+<gloss>bok choy (Brassica rapa subsp. chinensis)</gloss>

koj, daij, wiki

Fork

google image hits

@@ -18 +18 @@
-<gloss>bok choy (Brassica rapa subsp. chinensis; esp. cultivars with green stalks)</gloss>
+<gloss>bok choy (Brassica rapa subsp. chinensis)</gloss>

koj, daij, wiki

From the forked edit.

@@ -22 +22 @@
-<gloss>bok choy (Brassica rapa subsp. chinensis; esp. cultivars with green stalks)</gloss>
+<gloss>bok choy (Brassica rapa subsp. chinensis)</gloss>

web hits

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>しゃくし菜</keb>
+</k_ele>
@@ -19 +21,0 @@
-<misc>&uk;</misc>

@@ -17,0 +18 @@
+<misc>&uk;</misc>

koj, daij, wiki

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

@@ -13 +13 @@
-<gloss>causing somebody discomfort through strong odors</gloss>
+<gloss>causing someone discomfort through strong odors</gloss>

You're right, "odor nuisance" isn't used when talking about 
body odors/perfumes, while スメルハラスメント and 香害 seem 
to be almost exclusively used for just that.

@@ -13 +13 @@
-<gloss>odor nuisance</gloss>
+<gloss>causing somebody discomfort through strong odors</gloss>

see comments on 香害 as well

"odor nuisance" is about the *scent* being annoying... e.g., it might apply to a rendering plant near one's home. スメルハラスメント is a thing *a person does* (a play on "sexual harassment")
--

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

@@ -11 +11 @@
-<gloss>causing somebody discomfort through strong odors</gloss>
+<gloss>causing someone discomfort through strong odors</gloss>

aligning with main entry

@@ -11 +11 @@
-<gloss>odor nuisance</gloss>
+<gloss>causing somebody discomfort through strong odors</gloss>

daijs

Daijs

@@ -12,5 +12,4 @@
-<gloss>distribution income (film)</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>income received from distribution (of a film)</gloss>
+<xref type="see" seq="2834162">配給収入</xref>
+<misc>&abbr;</misc>
+<gloss>distribution revenue (e.g. films)</gloss>
+<gloss>distribution income</gloss>

https://kotobank.jp/word/配収-598806

Meikyo vt and vi additions to n,vs entries
-*- via bulkupd.py -*-

@@ -12,0 +13 @@
+<pos>&vi;</pos>

gg5, daij

gg5
https://en.wikipedia.org/wiki/Poultice

Eijiro, weblio, www hits

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>大燥ぎ</keb>
@@ -12,2 +15,4 @@
-<gloss>in high spirits</gloss>
-<gloss>tickled pink</gloss>
+<pos>&vs;</pos>
+<pos>&adj-no;</pos>
+<gloss>high spirits</gloss>
+<gloss>gleeful mood</gloss>

email communication with native speaker

promotion from WI3
(Kindly check: there are surely more English phrases that match this expression, but I am traveling and don't have any dictionaries at hand)

ＫＯＤ追加語彙

Abbr. target.

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

false memory seems ok to me

Reopening.

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

"False memory" has a more specific definition so I'd go with "mistaken" here.

@@ -11,0 +12 @@
+<gloss>mistaken memory</gloss>
@@ -13 +13,0 @@
-<gloss>false memory</gloss>

gg5, 中辞

Once it's approved, can it be reopened to remind me to link 
some example sentences.

gg5
https://en.wikipedia.org/wiki/Hearing_range

Aligned.

@@ -13,0 +14 @@
+<gloss>twin town</gloss>

G n-grams:
姉妹都市	139672
友好都市	48497

@@ -11,0 +12 @@
+<xref type="see" seq="1307700">姉妹都市</xref>

ＫＯＤ追加語彙

@@ -12 +12 @@
-<gloss>sister cities</gloss>
+<gloss>sister city</gloss>

https://ja.wikipedia.org/wiki/姉妹都市

daijr/s

@@ -11,0 +12,6 @@
+<misc>&hist;</misc>
+<gloss>Tsukushi (former province located in northern Kyūshū; later split into Chikuzen and Chikugo)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1243710">九州</xref>
@@ -13 +19 @@
-<gloss>Tsukushi (provinces of Chikuzen and Chikugo in northern Kyushu)</gloss>
+<gloss>Kyūshū</gloss>

Daijr, gg5

@@ -11 +11,3 @@
-<gloss>(n) Tsukushi, old name for northern Kyushu.</gloss>
+<pos>&n;</pos>
+<misc>&arch;</misc>
+<gloss>Tsukushi (provinces of Chikuzen and Chikugo in northern Kyushu)</gloss>

https://ja.wikipedia.org/wiki/筑紫

Encountered while attempting to translate the Misogi no O-
Harai, a Shinto prayer of ritual cleansing.