aligning the 五経 entries

@@ -13 +13 @@
-<gloss>I Ching (one of the five Confucian classics)</gloss>
+<gloss>The Book of Changes</gloss>
@@ -15 +15 @@
-<gloss>The Book of Changes</gloss>
+<gloss>I Ching</gloss>

tidying

@@ -13 +13,3 @@
-<gloss>I Ching (Yi Jing) or The Book of Changes - one of the Five Classics</gloss>
+<gloss>I Ching (one of the five Confucian classics)</gloss>
+<gloss>Yijing</gloss>
+<gloss>The Book of Changes</gloss>

Bulk update: Replace n-t with n,adv
-*- via bulkupd.py -*-

@@ -15 +15,2 @@
-<pos>&n-t;</pos>
+<pos>&n;</pos>
+<pos>&adv;</pos>

一殺那 is not in gg5 koj daijs
0 ngram hits

Or should we drop it completely?
殺那 does get 1341 ngram hits though

@@ -8,0 +9 @@
+<ke_inf>&iK;</ke_inf>

Google N-gram Corpus Counts
╭─ーーー─┬───────────┬───────╮
│ 隠す　 │ 1,484,436 │ 97.8% │
│ 隱す　 │       525 │  0.0% │ - [oK] to [sK]
│ 匿す　 │       311 │  0.0% │ - rK (koj)
│ 隠くす │       128 │  0.0% │ - [io] to [sK]
│ かくす │    32,706 │  2.2% │
╰─ーーー─┴───────────┴───────╯

@@ -11,4 +10,0 @@
-<keb>隠くす</keb>
-<ke_inf>&io;</ke_inf>
-</k_ele>
-<k_ele>
@@ -15,0 +12 @@
+<ke_inf>&rK;</ke_inf>
@@ -19 +16,5 @@
-<ke_inf>&oK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>隠くす</keb>
+<ke_inf>&sK;</ke_inf>

Almost all the google hits for 隱くす lead back here. I think the く was added in error.

@@ -18,2 +18 @@
-<keb>隱くす</keb>
-<ke_inf>&io;</ke_inf>
+<keb>隱す</keb>

@@ -19,0 +19,1 @@
+<ke_inf>&io;</ke_inf>

gg5, luminous
艶やか	152882	99.9%
艷やか	167	0.1%

I don't think the etymology note or x-ref is needed. あてやか is archaic.

@@ -9 +9 @@
-<ke_inf>&oK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -16 +15,0 @@
-<xref type="see" seq="2553660">貴やか・あてやか</xref>
@@ -18 +16,0 @@
-<s_inf>from 貴やか</s_inf>
@@ -20,0 +19,3 @@
+<gloss>fascinatingly elegant</gloss>
+<gloss>lovely</gloss>
+<gloss>gorgeous</gloss>
@@ -23,4 +23,0 @@
-<gloss>beautiful</gloss>
-<gloss>gorgeous</gloss>
-<gloss>stunning</gloss>
-<gloss>fascinatingly elegant</gloss>

Maybe too many glosses.

ウィズダム英和辞典 / ウィズダム和英辞典

added definition

@@ -23,0 +24,2 @@
+<gloss>gorgeous</gloss>
+<gloss>stunning</gloss>

yes. one of the annoying BrE quirks like "humour" --> "humorous"

GG5 glosses this as a noun. Could have a separate [adj-no] sense if it's helpful.

@@ -17,3 +17,4 @@
-<gloss>former</gloss>
-<gloss>one-time</gloss>
-<gloss>years ago</gloss>
+<gloss>years gone by</gloss>
+<gloss>earlier years</gloss>
+<gloss>former years</gloss>
+<gloss>the past</gloss>

gg5, prog
daij: "「超過勤務」の略"

I don't think "overwork" is right.

@@ -12 +12,3 @@
-<gloss>overwork</gloss>
+<xref type="see" seq="1742500">超過勤務</xref>
+<misc>&abbr;</misc>
+<gloss>overtime work</gloss>

daij, gg5, prog

Splitting

@@ -15,0 +16 @@
+<gloss>subject (of a painting)</gloss>
@@ -18 +19,4 @@
-<gloss>subject (of picture)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>title of a painting</gloss>

@@ -12,5 +12,5 @@
-<xref type="see" seq="1816730">詩経・しきょう</xref>
-<xref type="see" seq="1701900">書経・しょきょう</xref>
-<xref type="see" seq="2028190">礼記・らいき</xref>
-<xref type="see" seq="1157040">易経・えききょう</xref>
-<xref type="see" seq="1341090">春秋・しゅんじゅう・3</xref>
+<xref type="see" seq="1816730">詩経</xref>
+<xref type="see" seq="1701900">書経</xref>
+<xref type="see" seq="2028190">礼記</xref>
+<xref type="see" seq="1157040">易経</xref>
+<xref type="see" seq="1341090">春秋・3</xref>

I think it would be useful here to have xrefs both ways

@@ -12 +12,10 @@
-<gloss>the Five Classics texts of Confucianism</gloss>
+<xref type="see" seq="1816730">詩経・しきょう</xref>
+<xref type="see" seq="1816730">詩経・しきょう</xref>
+<xref type="see" seq="1701900">書経・しょきょう</xref>
+<xref type="see" seq="1701900">書経・しょきょう</xref>
+<xref type="see" seq="2028190">礼記・らいき</xref>
+<xref type="see" seq="2028190">礼記・らいき</xref>
+<xref type="see" seq="1157040">易経・えききょう</xref>
+<xref type="see" seq="1341090">春秋・しゅんじゅう・3</xref>
+<xref type="see" seq="1341090">春秋・しゅんじゅう・3</xref>
+<gloss>The Five Classics (of Confucianism)</gloss>

gg5

jwiki notes that "brown sugarは黒砂糖の英訳だが，日本語でのブラウンシュガー(茶色の砂糖の総称)とは異なる".
The EJs translate "brown sugar" as "赤砂糖".

@@ -16 +16,2 @@
-<gloss>brown sugar</gloss>
+<gloss>(unrefined) brown sugar</gloss>
+<gloss>muscovado</gloss>

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

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

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

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

daij: "「しさん」とも"

@@ -13,0 +14,3 @@
+<r_ele>
+<reb>しさん</reb>
+</r_ele>

wiki

@@ -32,0 +33,2 @@
+<gloss>Chunqiu</gloss>
+<gloss>Ch'un Ch'iu</gloss>

reopen

tmp for xref

gg5 koj daijs wiki

@@ -19 +18,0 @@
-<xref type="see" seq="1268150">五経</xref>
@@ -22 +21,5 @@
-<gloss>months and years</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>years</gloss>
+<gloss>age</gloss>
@@ -27 +30,3 @@
-<gloss>the Chronicles of Lu or the Spring and Autumn Annals - one of the Five Classics</gloss>
+<xref type="see" seq="1268150">五経</xref>
+<gloss>The Spring and Autumn Annals</gloss>
+<gloss>The Chronicles of Lu</gloss>

Probably not.

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

GG5

GG5 has three separate meaning categories: ~as one pleases, ~at one's own initiative, and ~by itself/automatically. perhaps overkill here, dunno (also, do we need both 'wilfully' and 'willfully'? :P)

@@ -13,0 +14 @@
+<gloss>without asking</gloss>
@@ -17,0 +19,2 @@
+<gloss>by itself</gloss>
+<gloss>automatically</gloss>

Not a good gloss. In that case it means the same as "arbitrarily", but it means a lot of other things as well which don't apply here.

@@ -18 +17,0 @@
-<gloss>on one's own</gloss>

「そんなこと、勝手に決めないでよ」
"don't decide that on your own"

@@ -17,0 +18 @@
+<gloss>on one's own</gloss>

Probably harmless.

chujiten

Too many xrefs?

@@ -20,2 +20,3 @@
-<gloss>superior authorities</gloss>
-<gloss>boss</gloss>
+<gloss>(one's) superior</gloss>
+<gloss>(one's) boss</gloss>
+<gloss>the higher-ups</gloss>

Not really an "ant".

@@ -18,1 +18,1 @@
-<xref type="ant" seq="1499350">部下</xref>
+<xref type="see" seq="1499350">部下</xref>

ant, syn

@@ -18,0 +18,3 @@
+<xref type="ant" seq="1499350">部下</xref>
+<xref type="see" seq="1535490">目上</xref>
+<xref type="see" seq="1535490">目上</xref>

ずしょ isn't mentioned in the smaller kokugos.
We have the corresponding reading on 図書館 marked as outdated.

@@ -17,0 +18 @@
+<re_inf>&ok;</re_inf>

daij, koj

@@ -15,0 +16,3 @@
+<r_ele>
+<reb>ずしょ</reb>
+</r_ele>

I see all 4 examples are for sense 3.

gg5, prog, daij
G n-grams:
叩き込む	        82475
たたき込む	13128
叩きこむ	        4511

Splitting into senses.

@@ -9,0 +10,3 @@
+<k_ele>
+<keb>叩きこむ</keb>
+</k_ele>
@@ -16,3 +19,14 @@
-<gloss>to drive into</gloss>
-<gloss>to throw into</gloss>
-<gloss>to hit into</gloss>
+<gloss>to drive into (e.g. a nail into a board)</gloss>
+<gloss>to hit into (e.g. a home run into the stands)</gloss>
+</sense>
+<sense>
+<pos>&v5m;</pos>
+<pos>&vt;</pos>
+<gloss>to throw into (e.g. jail)</gloss>
+</sense>
+<sense>
+<pos>&v5m;</pos>
+<pos>&vt;</pos>
+<gloss>to drum into (someone) (an idea, skill, etc.)</gloss>
+<gloss>to hammer into</gloss>
+<gloss>to drill into</gloss>

gg5, prog

I don't think that qualification is necessary.

@@ -11,0 +12 @@
+<pos>&vt;</pos>
@@ -14 +15,2 @@
-<gloss>to contend for the same (limited) thing</gloss>
+<gloss>to contend for</gloss>
+<gloss>to fight for</gloss>

Daijisen

@@ -13,0 +14 @@
+<gloss>to contend for the same (limited) thing</gloss>

Google N-gram Corpus Counts
╭─ーーー─┬─────────╮
│ 知覚　 │ 494,444 │
│ 智覚　 │     222 │ 🡠 rK (daijr/s, shinmeikai)
│ ちかく │ 241,139 │
╰─ーーー─┴─────────╯

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

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

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

gg5
daijr/s (智覚)

Can't find any [adj-no] examples.

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>智覚</keb>
@@ -19 +21,0 @@
-<pos>&adj-no;</pos>
@@ -20,0 +23,2 @@
+<gloss>sensation</gloss>
+<gloss>awareness</gloss>

Tried to clarify the word is used disparagingly without relying on a note.

@@ -16,3 +16,3 @@
-<s_inf>most oft. used disparagingly</s_inf>
-<gloss>to be elated</gloss>
-<gloss>to be excited</gloss>
+<gloss>to get carried away</gloss>
+<gloss>to get overly elated</gloss>
+<gloss>to become over-excited</gloss>
@@ -20 +19,0 @@
-<gloss>to be carried away</gloss>

@@ -16 +16 @@
-<s_inf>oft. used in a negative sense</s_inf>
+<s_inf>most oft. used disparagingly</s_inf>

I thought it might be worth to emphasize it's a quite 
negative phrase. "調子にのるな"

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>調子にのる</keb>
@@ -12,0 +16 @@
+<s_inf>oft. used in a negative sense</s_inf>

daijs, koj, nikk
G n-grams:
貧乏揺すり	7958
貧乏ゆすり	30026

All the refs except daijr explicitly say ひざ.

@@ -5 +5 @@
-<keb>貧乏揺すり</keb>
+<keb>貧乏ゆすり</keb>
@@ -8 +8 @@
-<keb>貧乏ゆすり</keb>
+<keb>貧乏揺すり</keb>
@@ -16,2 +16,3 @@
-<gloss>shaking or tapping (usu. one's foot) unconsciously</gloss>
-<gloss>fidgeting (esp. of the legs)</gloss>
+<gloss>shaking one's legs (usu. unconsciously)</gloss>
+<gloss>tapping one's foot</gloss>
+<gloss>fidgeting (of the legs)</gloss>

Several EJs have "primer" for 雷管.

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

gg5, prog

@@ -12,0 +13 @@
+<gloss>percussion cap</gloss>

gg5, prog, meikyo

Not transitive.

@@ -18 +18 @@
-<pos>&vt;</pos>
+<pos>&vi;</pos>
@@ -27 +27,3 @@
-<pos>&vt;</pos>
+<pos>&vi;</pos>
+<gloss>to put on a bold front</gloss>
+<gloss>to make a show of strength</gloss>

GG5, 中辞典, etc. Koj, Daijr

Fleshing it out a bit.

@@ -19,0 +20,3 @@
+<gloss>to bear down</gloss>
+<gloss>to exert oneself</gloss>
+<gloss>to try (too) hard</gloss>
@@ -21,2 +23,0 @@
-<gloss>to bear up</gloss>
-<gloss>to exert one's strength</gloss>

daijisen

strain has a lot of meanings and it's easy to pick a wrong meaning if it only says "to strain (oneself)"

@@ -19,0 +20 @@
+<gloss>to draw one's body taut</gloss>

gg5

@@ -15,0 +16 @@
+<gloss>armpit hair</gloss>

OK

@@ -17,2 +17 @@
-<gloss>musk deer (Moschus moschiferus)</gloss>
-<gloss>musk</gloss>
+<gloss>musk deer</gloss>

i would probably leave this one as it was.  there are multiple species
https://ja.wikipedia.org/wiki/ジャコウジカ

also, though gg5 does have this as a gloss, my english dictionaries don't have 'musk deer' as a meaning of 'musk'

GG5, JWN. N-grams:
麝香鹿	869
じゃこうじか	174
ジャコウジカ	2102

@@ -9,0 +10,4 @@
+<r_ele>
+<reb>ジャコウジカ</reb>
+<re_nokanji/>
+</r_ele>
@@ -12 +16,3 @@
-<gloss>musk deer</gloss>
+<misc>&uk;</misc>
+<gloss>musk deer (Moschus moschiferus)</gloss>
+<gloss>musk</gloss>

@@ -13,2 +13,2 @@
-<gloss>beauty</gloss>
-<gloss>gorgeous(ness)</gloss>
+<gloss>beautiful</gloss>
+<gloss>gorgeous</gloss>

daij, gg5

Also a noun.

@@ -15,0 +16 @@
+<pos>&n;</pos>
@@ -18,0 +20 @@
+<gloss>stuck-up</gloss>

The examples in GG5 and prog also use the kanji form.

Google N-gram Corpus Counts
╭─ーーーーー─┬────────┬───────╮
│ 　粋がっ　 │ 13,812 │ 30.4% │
│ 　意気がっ │  1,917 │  4.2% │
│ 　いきがっ │ 24,779 │ 54.5% │
│ 　イキがっ │  4,977 │ 10.9% │
├─ーーーーー─┼────────┼───────┤
│ に粋がっ　 │    770 │ 30.3% │
│ に意気がっ │    136 │  5.4% │
│ にいきがっ │  1,341 │ 52.8% │
│ にイキがっ │    291 │ 11.5% │
╰─ーーーーー─┴────────┴───────╯

Could add a [uk] tag. I see that sankoku doesn't use its "okay to write in kana" braces for this word, though.

@@ -15 +15 @@
-<re_nokanji/>
+<re_inf>&sk;</re_inf>

Google N-gram Corpus Counts
╭─ーーーー─┬───────┬───────╮
│ 粋がる　 │ 4,069 │ 62.7% │
│ 意気がる │ 1,033 │ 15.9% │
│ イキがる │ 1,384 │ 21.3% │
╰─ーーーー─┴───────┴───────╯

@@ -11,0 +12,4 @@
+</r_ele>
+<r_ele>
+<reb>イキがる</reb>
+<re_nokanji/>

Daijirin and nikkoku only have a yodan (v4r) part-of-speech tag in their entries for すいがる. They reference works from the late 1700s / early 1800s for the word. I don't think it can be merged here and it's not worth making a new entry for it.

https://github.com/JMdictProject/JMdictIssues/issues/103#issuecomment-1836978316

There are many entries in daijirin that begin with reading notes like 〔古くは「〇〇」〕. Generally the readings are pretty similar to the modern reading and only differ by a dakuten or vowel sound. I think those are the sorts of readings we want to use with the [ok] tag now.

@@ -12,5 +11,0 @@
-</r_ele>
-<r_ele>
-<reb>すいがる</reb>
-<re_restr>粋がる</re_restr>
-<re_inf>&ok;</re_inf>

daijr/s, nikk

@@ -11,0 +12,5 @@
+</r_ele>
+<r_ele>
+<reb>すいがる</reb>
+<re_restr>粋がる</re_restr>
+<re_inf>&ok;</re_inf>

gg5 wiki

tidying

@@ -13 +13,4 @@
-<gloss>the Shujing (Shu Ching) or the Book of History - one of the Five Classics</gloss>
+<gloss>The Book of Documents</gloss>
+<gloss>The Book of History</gloss>
+<gloss>Shujing</gloss>
+<gloss>Shu Ching</gloss>

smk has this as intransitive only but web results appear to be mostly transitive (with the gunpowder as the direct object).

@@ -13 +13,3 @@
-<gloss>charging with gunpowder</gloss>
+<pos>&vt;</pos>
+<pos>&vi;</pos>
+<gloss>charging a gun (with gunpowder)</gloss>

gg5, daij

@@ -13 +13,2 @@
-<gloss>(charging with) gunpowder</gloss>
+<gloss>charging with gunpowder</gloss>
+<gloss>charge of gunpowder</gloss>

gg5 wiki

tidying

@@ -13 +13,5 @@
-<gloss>the Shijing (Shih Ching) or Book of Odes (Songs, Poems) - one of the Five Classics</gloss>
+<gloss>The Classic of Poetry</gloss>
+<gloss>The Book of Songs</gloss>
+<gloss>The Book of Odes</gloss>
+<gloss>Shijing</gloss>
+<gloss>Shih Ching</gloss>

女友達	7908
女友だち	421
女ともだち	167

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>女友だち</keb>

I think "girlfriend" could be misleading.

@@ -12,2 +12,2 @@
-<gloss>girlfriend</gloss>
-<gloss>woman (lady) friend</gloss>
+<gloss>female friend</gloss>
+<gloss>woman friend</gloss>

The kokugos define it simply as "涙を流す". I don't think "to be moved to tears" is needed.

@@ -11,0 +12 @@
+<pos>&vi;</pos>
@@ -14 +14,0 @@
-<gloss>to be moved to tears</gloss>

https://www.edrdg.org/wwwjdic/wwwverbinf.html#suru_tag (4th paragraph)

@@ -11 +11 @@
-<pos>&vs-s;</pos>
+<pos>&vs-i;</pos>

daij
daijr example: 「その話を聞いて－・しない者はなかった」

@@ -11,0 +12 @@
+<gloss>to cry</gloss>
@@ -13 +14 @@
-<gloss>to bring tears to one's eyes</gloss>
+<gloss>to be moved to tears</gloss>

gg5 wiki

tidying

@@ -13 +13,3 @@
-<gloss>the Li Ji or Book of Rites - one of the Five Classics</gloss>
+<gloss>The Book of Rites</gloss>
+<gloss>Liji</gloss>
+<gloss>Li Chi</gloss>

Entry created

daijr/s
https://ja.wikipedia.org/wiki/アルティメット
https://en.wikipedia.org/wiki/Ultimate_(sport)

@@ -10,0 +11,5 @@
+<sense>
+<pos>&n;</pos>
+<gloss>ultimate (sport)</gloss>
+<gloss>ultimate frisbee</gloss>
+</sense>

Entry created

OK

I think this is sufficient.

@@ -12,2 +11,0 @@
-<xref type="see" seq="1056690">サタン</xref>
-<xref type="see" seq="2856037">ルシファー・1</xref>
@@ -15,2 +13 @@
-<gloss>fallen angel (oft. Satan, Lucifer)</gloss>
-<gloss>demon</gloss>
+<gloss>fallen angel (esp. Lucifer)</gloss>

Note that the field tag applies to 堕天使; not the gloss.  I think the "demon" was OK.

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

daijs.
キリスト教で、悪魔のこと。神の試練に堪えきれず下界に堕おとされた天使、特に、その首領ルシフェル。

nikk says:
キリスト教で、悪魔をいう語。神の怒りを買い、天上界から下界に堕落させられた天使。

To interpret nikk, Wikipedia says of 悪魔:
https://ja.wikipedia.org/wiki/悪魔
キリスト教神学では、神に対して謀反を起こした堕天使（サタン）の手先である。
In Christianity, 悪魔 are Satan's henchmen(one of our many glosses - demons).  So nikk isn't singling out Satan at all (as far as I can see).
And Satan is, of course, a *specific* 堕天使 (神に対して謀反を起こした堕天使). 


堕天使	194658	41.8%
ルシファー	68682	14.7%
サタン	202355	43.5%

Apart from the main comments below, if you do an image search for 堕天使, you'll quickly see that this has a "romantic" use in Japanese imagery that seems somewhat disjoint from actual Christianity.  堕天使, like 天使, seems like a fun concept to play with (like medieval knights) without being overly invested in any particular religious principles. In these cases, I think "fallen angel" alone still remains the best gloss. 

===
I got this term from jisho some years ago, and the gloss collection has always seemed off to me. I'm suggesting what I think is a "better" way to do this. 

My core motivation is that "fallen angel" is essentially a perfect 1-to-1 gloss.  If you want to translate "fallen angel" into Japanese, this term is perfect.  If you want to translate 堕天使 to English, "fallen angel" is perfect.  Everything other gloss that was here just muddies things up. (Lucifer <-> ルシファー, Satan <-> サタン, demon <-> 悪魔)

Almost every reverso gloss is "fallen angel". Why wouldn't it be? And where it isn't, it is never glossed as "Satan" or "Lucifer". 
https://context.reverso.net/translation/japanese-english/堕天使

daijs just says: "特に、その首領ルシフェル".  "Often refers to the head of the fallen angels, Satan" could be said just as easily of the English term "fallen Angel".  But context is always required.  You can never blindly change 堕天使 to "Lucifer" unless you understand the text.  If you understand the text, that's your prerogative.  If you don't understand the text, "fallen angel" is always safe. 

daijs' mention 特にルシファー is part of the *definition*, to provide information to a Japanese reader about the meaning of the term.  But that doesn't make ルシファー an appropriate gloss.

The number one pinned gloss for 堕天使 on weblio is "seducer".  Another on the page is "tempter".  I wouldn't suggest adding those either. 
https://ejje.weblio.jp/content/堕天使

For comparison, eow.alc.co.jp (usually pretty good) has exactly one gloss:
https://eow.alc.co.jp/search?q=堕天使
fallen angel

oft. and not esp. because:
1. I'm suspicious about "fallen angel" usually being a reference to Satan in the first place.  Growing up Catholic myself, "fallen angels" was usually plural. Satan has perfectly serviceable names of his own.
2. Based on google search, I think 堕天使 is extremely common in pop-culture to refer to something that is maybe satan-like, but not really part of Christianity.

[fld=Christn] is a little problematic , since there are fallen angels in other religions (Islam) as well.  The names of the specific figures differ.

@@ -11,0 +12,2 @@
+<xref type="see" seq="1056690">サタン</xref>
+<xref type="see" seq="2856037">ルシファー・1</xref>
@@ -13,4 +15 @@
-<gloss>fallen angel</gloss>
-<gloss>Lucifer</gloss>
-<gloss>demon</gloss>
-<gloss>Satan</gloss>
+<gloss>fallen angel (oft. Satan, Lucifer)</gloss>

gg5, prog
daijs: "また、高慢な人をののしっていう語"

@@ -11,0 +12 @@
+<pos>&n;</pos>
@@ -13,0 +15,6 @@
+<gloss>stuck-up</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>arrogant bastard</gloss>
+<gloss>snob</gloss>

Entry created

Just 高慢 + さ.

Entry created

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

Colloquial?

@@ -12,2 +12 @@
-<misc>&col;</misc>
-<gloss>Imjin War (1592 1597)</gloss>
+<gloss>Imjin War (1592-1597)</gloss>

@@ -13 +13 @@
-<gloss>Imjin War (1592 - 1597)</gloss>
+<gloss>Imjin War (1592 1597)</gloss>

Entry created

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

@@ -12 +12 @@
-<gloss>Imjin War (1592 - 1597)</gloss>
+<gloss>Imjin War (1592-1597)</gloss>

Entry created

Indeed.

@@ -11,0 +12 @@
+<gloss>frisbee</gloss>
@@ -13 +13,0 @@
-<gloss>frisbee</gloss>

gg5

Everyone calls it a frisbee.

@@ -12,0 +13 @@
+<gloss>frisbee</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>

Entry created

daij: "形動ナリ"

X-ref isn't necessary.

@@ -11,2 +11 @@
-<pos>&adj-na;</pos>
-<xref type="see" seq="1222540">気品・1</xref>
+<pos>&adj-nari;</pos>
@@ -15,0 +15 @@
+<gloss>beautiful</gloss>

koj, daij

@@ -13,0 +13,1 @@
+<misc>&arch;</misc>

http://dic.yahoo.co.jp/search?stype=0&ei=UTF-8&dtype=2&p=あてやか

ATC typically stands for "air traffic control". I think it's best left out here.

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

gg5

aligning with 賢者モード

@@ -14 +14,2 @@
-<gloss>period after orgasm when a man is free from sexual desire and can think clearly</gloss>
+<gloss>post-coital clarity</gloss>
+<gloss g_type="expl">period after orgasm when a man is free from sexual desire and can think clearly</gloss>

Charming.

@@ -14,1 +14,1 @@
-<gloss>period after masturbation when a man is free from sexual desire and can think clearly</gloss>
+<gloss>period after orgasm when a man is free from sexual desire and can think clearly</gloss>

hatena, nicopedia, 実用日本語表現辞典 
748,000 results
http://d.hatena.ne.jp/keyword/���ԥ�����
http://dic.nicovideo.jp/a/賢者タ�%
A4%E3%83%A0
"賢者タイムってなんですか？"
http://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q141
5419099

Maybe better.

@@ -14 +14 @@
-<gloss>post-cum clarity</gloss>
+<gloss>post-coital clarity</gloss>

eij urban dictionary

@@ -14 +14,2 @@
-<gloss>period after orgasm when a man is free from sexual desire and can think clearly</gloss>
+<gloss>post-cum clarity</gloss>
+<gloss g_type="expl">period after orgasm when a man is free from sexual desire and can think clearly</gloss>

hatena
http://d.hatena.ne.jp/keyword/���ԥ�����
394k
"男性の”賢者モード”が怖くて、主人とセックスするのが嫌です"
http://oshiete.goo.ne.jp/qa/6274659.html
"賢者モードの克服方法教えれ"
http://logsoku.com/thread/toro.2ch.net/news4viptasu/13274742
31/
"男性が行為後、賢者モードに突入してしまうのは回避不可能 ... "
http://blog.esuteru.com/archives/6492145.html

@@ -15,2 +15,2 @@
-<gloss>flirt</gloss>
-<gloss>make out</gloss>
+<gloss>flirting</gloss>
+<gloss>making out</gloss>

http://diary.uedakeita.net/archives/2681

Not sure about the order of the POS tags. For いちゃいちゃ Daijirin has "（ 副 ） スル", but the JEs say いちゃいちゃ is ~する.

http://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1462613304
http://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1045997875
n-grams

Maybe [col]?

@@ -11,0 +12 @@
+<xref type="see" seq="1279680">構う・1</xref>

lots of hits on twitter

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>カマチョ</reb>

Daijr

@@ -8 +8,4 @@
-<pos>&n;</pos>
+<pos>&exp;</pos>
+<misc>&sl;</misc>
+<misc>&abbr;</misc>
+<s_inf>from かまってちょうだい</s_inf>

wiki, google news search

Probably uk

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>ＹｏｕＴｕｂｅｒ</keb>
+</k_ele>
@@ -8,0 +12 @@
+<misc>&uk;</misc>

daijs

jwiki
googits 628,000

@@ -9,0 +10 @@
+<gloss>YouTube celebrity</gloss>

https://kotobank.jp/word/ユーチューバー-192078

Fork. You need to edit the last in the thread; not an intermediate.

@@ -13 +13 @@
-<gloss>excavation, cave-raid</gloss>
+<gloss>excavation, exploration, cave raid</gloss>

Yes, I think exploratory excavation fits nicely.

Daniel later added "exploration" in a forked submission.

@@ -13 +13,2 @@
-<gloss>excavation, cave-raid</gloss>
+<gloss>exploratory excavation</gloss>
+<gloss>prospecting</gloss>

ブリタニカ国際大百科事典 : "outpost drilling"
https://ejje.weblio.jp/content/探掘 " "exploration"
JST : :excavation"
ALC: ウラニウム探掘者 uranium prospector

I suspect the best gloss is something like "exploratory excavation".

I think it's better to play safe and not attempt to qualify it.

@@ -19 +18,0 @@
-<s_inf>light-heartedly, flirtatiously</s_inf>

It might be safest to just remove it. That, or basing the 
note more closely on the jitsuyo definition and make it a 
"sometimes" to cover our bases. 
"sometimes used playfully"?

i ran this past a friend who is half-japanese and was raised bilingual and i asked him that if a woman said いやあん in a sexual context would it be considered "light-hearted/flirtatious", and after a bit of back and forth, his final comment was "i'm not kidding, there is a rape element to iyan."  he's not the type to throw that around lightly

so perhaps the current note is not adequate

Maybe this?

@@ -18,0 +19 @@
+<s_inf>light-heartedly, flirtatiously</s_inf>
@@ -21 +22 @@
-<gloss>don't (very light-hearted)</gloss>
+<gloss>don't</gloss>

mentioned in daijr 意気がる・粋がる entry
and this site:
http://www.geocities.jp/kuro_kurogo/ko-jien01/page8.html
・粋がる（いきがる）　自分から粋だと思って得意がること。実際は
そうでないのに、粋のように振る舞う。　類：●粋ぶる
and a few other places. but not very common

copied glosses from いきがる

@@ -5 +5 @@
-<reb>やばす</reb>
+<reb>ヤバス</reb>
@@ -8 +8 @@
-<reb>ヤバス</reb>
+<reb>やばす</reb>

http://d.hatena.ne.jp/keyword/���
ngrams/twitter past hr
やばす	4 /8
ヤバス	4 /15
やばっす	6 / 0 (2 past 24 hrs)
ヤバっす	4 / 0 (2 past 24 hrs)

probably shares all the meanings with やばい

ＫＯＤ追加語彙

https://ejje.weblio.jp/content/築年数

Pretty common expression when looking at apartments

daij, koj

I don't think this is used in modern Japanese.

Wasei?

gg5, daijr/s
https://en.wikipedia.org/wiki/Elizabethan_collar

Great word. I'm still trying to use it in Scrabble.

gg5, daij, koj, Readers+

daijr, eij, Readers+

daijr, koj

gg5
G n-grams: 20716

OK, I've proposed them, so this can go.

reviving this deleted entry (which should probably remain deleted) because of Johan's comments above, although this is probably not the place for them

there seems to be consensus above that this should be nuked.  changes have been made to 市営

G n-grams
市営地下鉄	608555
市営住宅  	233864	*
市営バス   	190846	  
市営交通  	 53457
市営駐車場 	 26566
市営プール	 22483
市営球場  	 16948
市営墓地  	  6159	*

Here are the most common 市営～ terms.
We have the ones marked with *
Seems we could drop 市営墓地 and maybe add 市営地下鉄, 市営バス and 市営交通

市営住宅	233967
市営アパート	1673
市営事業	423
市営住宅団地	629
市営地下鉄	608578
市営電車	807
市営バス	190870
市営プール	22483
市営墓地	6159

There's a heap of these 市営XX terms. We have 市営住宅; GG5 has 市営アパート, 市営事業, 市営住宅団地, 市営地下鉄, 市営電車, 市営バス and 市営プール. Other JEs have a selection.
I agree that 市営墓地 probably shouldn't go in, but the 市営 entry could probably do with improvement.

Google N-gram Corpus Counts
╭─ーーーーー─┬────────┬───────╮
│ 剃り残し　 │ 21,065 │ 81.1% │
│ そり残し　 │  2,455 │  9.5% │ 🡠 adding
│ 剃りのこし │    318 │  1.2% │ 🡠 adding
│ そりのこし │  2,139 │  8.2% │
╰─ーーーーー─┴────────┴───────╯

@@ -5,0 +6,7 @@
+</k_ele>
+<k_ele>
+<keb>そり残し</keb>
+</k_ele>
+<k_ele>
+<keb>剃りのこし</keb>
+<ke_inf>&sK;</ke_inf>

ＫＯＤ追加語彙

@@ -12,0 +13 @@
+<gloss>unshaven hairs</gloss>

http://eikaiwa.dmm.com/uknow/questions/19583/

gg5, daij, koj

Daijr

@@ -12,2 +12,3 @@
-<gloss>water ice</gloss>
-<gloss>frozen H2O</gloss>
+<xref type="see" seq="1488840">氷・こおり・1</xref>
+<gloss>(water) ice</gloss>
+<gloss>frozen water</gloss>

https://kotobank.jp/word/水氷-301063

GG5, etc.

@@ -12 +12,3 @@
-<gloss>songwriting</gloss>
+<gloss>musical composition</gloss>
+<gloss>melody writing</gloss>
+<gloss>song writing</gloss>

https://eow.alc.co.jp/search?q=曲作り

daijr: "（魚の鮮度を保つための）水と氷をまぜたもの"

@@ -12 +12 @@
-<gloss>mixture of ice and water</gloss>
+<gloss>mixture of ice and water (for keeping fish fresh)</gloss>

Daijr

I'll just go ahead and approve this for now.

EDR日英対訳辞書 "detonator"
saito has "爆発管 detonator"
but looking at this
https://en.wikipedia.org/wiki/Cartridge_(firearms)
https://en.wikipedia.org/wiki/Primer_(firearms)
I kind of think Robin's glosses were on point?

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

I think this is more like it.

@@ -12 +12,2 @@
-<gloss>primer (firearms)</gloss>
+<gloss>igniter (cartridge)</gloss>
+<gloss>detonator</gloss>

daij, koj

I'm not sure about the gloss.

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

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

@@ -12,2 +12 @@
-<gloss>Rashōmon</gloss>
-<gloss>gate in old Kyoto</gloss>
+<gloss>Rashōmon (gate in old Kyoto)</gloss>

@@ -11,0 +12 @@
+<gloss>Rashōmon</gloss>

See comment on 東京招魂社 entry.

@@ -16 +16 @@
-<gloss>Rashomon (story by Akutagawa, film by Kurosawa)</gloss>
+<gloss>Rashōmon (story by Akutagawa, film by Kurosawa)</gloss>

Reopen.

https://en.wikipedia.org/wiki/Rajōmon

daijs: 《(ポルトガル)Formosaの訳語》台湾の異称。