@@ -17,2 +17,2 @@
-<gloss>(on-screen) subtitles</gloss>
-<gloss>caption</gloss>
+<gloss>(on-screen) caption</gloss>
+<gloss>subtitles</gloss>

daij, meikyo, gg5, prog

I don't think "telop" has survived as a generic term in English.

@@ -10,3 +10,3 @@
-<gloss>telop</gloss>
-<gloss>television opaque projector</gloss>
-<gloss g_type="expl">device used to broadcast onscreen text (e.g. subtitles, captions)</gloss>
+<s_inf>orig. a trademark</s_inf>
+<lsource xml:lang="eng">Telop</lsource>
+<gloss>device used to superimpose text or images on a television screen</gloss>
@@ -16 +16,3 @@
-<gloss>onscreen text and images (e.g. subtitles, captions, scrolling tickers, logos)</gloss>
+<gloss>text or image superimposed on a television screen</gloss>
+<gloss>(on-screen) subtitles</gloss>
+<gloss>caption</gloss>

GG5 daijr koj

Split into two senses, format, elab
(Heard in conversation today.)

@@ -10,1 +10,7 @@
-<gloss>(orig) television opaque projector (telop), used for subtitles and captions, now used for the subtitles and captions themselves</gloss>
+<gloss>telop</gloss>
+<gloss>television opaque projector</gloss>
+<gloss g_type="expl">device used to broadcast onscreen text (e.g. subtitles, captions)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>onscreen text and images (e.g. subtitles, captions, scrolling tickers, logos)</gloss>

Moving lsrc tag to first sense.

@@ -12,0 +13 @@
+<lsource xml:lang="fre">roman</lsource>
@@ -25 +25,0 @@
-<lsource xml:lang="fre">roman</lsource>
@@ -37 +37 @@
-<xref type="see" seq="1560810">ロマン主義・ロマンしゅぎ</xref>
+<xref type="see" seq="1560810">ロマン主義</xref>

We could add "state of being romantic", but it's hardly needed.

I meant romanticism as in "the state or 
quality of being romantic."

Romance and romanticism are not the same thing and should be in separate senses.

@@ -32,0 +33,5 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1148000">ロマンチシズム</xref>
+<xref type="see" seq="1560810">ロマン主義・ロマンしゅぎ</xref>

Here's my go at it. I reinstated "Arthurian romance" for sense 1, as it's a good match of what's in daij. I changed the order of the other 
senses based on twitter recent hits and Google Images. 

sense 2 is GG5's ③, daijr ③, nikk ③. I got the "great undertaking" and "epic adventure" from daijr's definition.

@@ -13,3 +13,2 @@
-<lsource xml:lang="fre">roman</lsource>
-<gloss>novel</gloss>
-<gloss>roman</gloss>
+<gloss>romance (e.g. Arthurian romances)</gloss>
+<gloss>heroic tale</gloss>
@@ -19,2 +18,9 @@
-<xref type="see" seq="1147950">ロマンス・1</xref>
-<gloss>romance (film, novel)</gloss>
+<gloss>(nigh) impossible dream</gloss>
+<gloss>adventurous spirit</gloss>
+<gloss>great undertaking</gloss>
+<gloss>epic adventure</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<lsource xml:lang="fre">roman</lsource>
+<gloss>(full-length) novel</gloss>
@@ -27,6 +33 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>adventurous spirit</gloss>
-<gloss>impossible dream</gloss>
-<gloss>great ambition</gloss>
+<gloss>romanticism</gloss>

@@ -23 +23,2 @@
-<gloss>romance (music)</gloss>
+<field>&music;</field>
+<gloss>romance</gloss>

GG5, 新和英中辞典

@@ -14,0 +14,10 @@
+<gloss>love story</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>love affair</gloss>
+<gloss>romantic relationship</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>romance (music)</gloss>

Iwakoku, sankoku, and smk say 雅語的.

Iwakoku puts the note on the second sense. I'd guess that the first sense probably isn't used much in practice, and that it's only mentioned by the refs in order to explain the literal meaning.

@@ -27,0 +28 @@
+<misc>&poet;</misc>

Google N-gram Corpus Counts
╭─ーーー─┬─────────┬───────╮
│ 息吹　 │ 349,832 │ 89.1% │
│ 息吹き │  40,675 │ 10.4% │
│ 気吹　 │   1,937 │  0.5% │ - rK (daijr/s, koj)
│ いぶき │ 186,908 │  N/A  │
╰─ーーー─┴─────────┴───────╯

@@ -14,0 +15 @@
+<ke_inf>&rK;</ke_inf>

I'm keeping 捺落 visible and tagged as rare since it's in kokugos. That's the usual practice. I wouldn't bother with the others, but they're hidden.

@@ -13 +13 @@
-<ke_inf>&sK;</ke_inf>
+<ke_inf>&rK;</ke_inf>

https://kotobank.jp/word/奈落-108572
nipponika 奈落
地獄の意。サンスクリットのナラカnarakaの音訳語で、那落迦、捺落迦、那羅柯とも記す。漢訳では地獄のほか、悪道、不可楽、不可救済、非行、闇冥(あんみょう)と訳す。

奈落	220039	99.8%
那落	268	0.1%
奈落迦	83	0.0%
捺落	0	0.0%
那落迦	0	0.0%
捺落迦	0	0.0%
那羅柯	0	0.0%

https://ja.wikipedia.org/wiki/地獄_(仏教)
奈落迦[2]、那落迦、捺落迦、那羅柯などと音写される[1]。

sankoku has only the first term

From sanskrit サンスクリットのナラカnaraka, these all seem to be based on phonetic readings.

Quite a lot of kanji trivia here. Someone actually stuck 那落 on a book cover or something though.

捺落 is just a variant/obsolete kanji of 奈落, I can't imagine it's a huge loss even if daijs notes it. Gonna swing for the fences and [sK] it.

When I do an image search for 捺落, I don't actually get 捺落, I get the full form: 捺落迦. Seems like it was a poetry collection long ago too? (nikk).

@@ -8,0 +9 @@
+<ke_inf>&rK;</ke_inf>
@@ -11,0 +13,17 @@
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>奈落迦</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>捺落迦</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>那落迦</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>那羅柯</keb>
+<ke_inf>&sK;</ke_inf>

gg5
https://en.wikipedia.org/wiki/Parts_of_a_theatre#Backstage_or_offstage

The JEs have "trap cellar" but that doesn't appear to be a common term.

@@ -21,2 +21,2 @@
-<gloss>hell</gloss>
-<gloss>hades</gloss>
+<gloss>Hell</gloss>
+<gloss>Hades</gloss>
@@ -33,2 +33,2 @@
-<gloss>theatre basement</gloss>
-<gloss>theater basement</gloss>
+<gloss>trap room (of a theatre)</gloss>
+<gloss>below-stage basement</gloss>

Daijr: "梵 naraka"

@@ -18,0 +19 @@
+<lsource xml:lang="san">naraka</lsource>

!!

〈変（（わ）り）／替（（わ）り）／代（（わ）り）／かわり〉〈目／め〉

Google N-gram Corpus Counts
╭─ーーーー─┬───────────┬───────╮
│ 代目　　 │ 2,826,795 │  N/A  │
│ 変わり目 │   412,882 │ 89.9% │
│ 変わりめ │    21,939 │  4.8% │ - add sK
│ 変り目　 │     8,083 │  1.8% │ - sK
│ 代め　　 │     2,935 │  0.6% │
│ 替り目　 │     2,908 │  0.6% │ - sK
│ 代わり目 │     1,977 │  0.4% │ - add rK (daijr/s, meikyo, smk)
│ 替わり目 │     1,566 │  0.3% │ - rK (daijr, meikyo)
│ かわり目 │     1,401 │  0.3% │ - add sK
│ 代り目　 │       566 │  0.1% │ - add sK
│ 変りめ　 │       256 │  0.1% │
│ 代わりめ │       198 │  0.0% │
│ 替わりめ │       142 │  0.0% │
│ 変目　　 │       137 │  0.0% │ - [io] to [sK]
│ 変め　　 │        77 │  0.0% │
│ 替りめ　 │        49 │  0.0% │
│ 替目　　 │         0 │  0.0% │
│ 替め　　 │         0 │  0.0% │
│ 代りめ　 │         0 │  0.0% │
│ かわりめ │     4,231 │  0.9% │
╰─ーーーー─┴───────────┴───────╯

@@ -10 +10,2 @@
-<keb>変り目</keb>
+<keb>替わり目</keb>
+<ke_inf>&rK;</ke_inf>
@@ -13 +14,10 @@
-<keb>替わり目</keb>
+<keb>代わり目</keb>
+<ke_inf>&rK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>変わりめ</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>変り目</keb>
+<ke_inf>&sK;</ke_inf>
@@ -16,0 +27,9 @@
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>かわり目</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>代り目</keb>
+<ke_inf>&sK;</ke_inf>
@@ -20 +39 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>

gg5, prog

I don't know where "new programme" came from.

@@ -32,2 +32 @@
-<gloss>new program</gloss>
-<gloss>new programme</gloss>
+<gloss>turn (of the tide, century, etc.)</gloss>

Daijr

@@ -11,0 +11,6 @@
+</k_ele>
+<k_ele>
+<keb>替わり目</keb>
+</k_ele>
+<k_ele>
+<keb>替り目</keb>
@@ -31,0 +37,1 @@
+<misc>&arch;</misc>

g ng

命知らずな	6615
命知らずの	69300

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

GG5

@@ -15,1 +15,2 @@
-<gloss>daredevil</gloss>
+<gloss>daredevilry</gloss>
+<gloss>rashness</gloss>

daij

I don't see sense 2 in other sources (新和英中辞典, prog, Luminous, ALC), and the source for the sense 2 examples in daij is from 1688.

@@ -16,0 +16,6 @@
+</sense>
+<sense>
+<pos>&adj-na;</pos>
+<pos>&n;</pos>
+<pos>&adj-no;</pos>
+<misc>&arch;</misc>

@@ -12,0 +12,3 @@
+</k_ele>
+<k_ele>
+<keb>木いちご</keb>

n-grams
労り	491
いたわり	5897

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

GG5

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

daij, prog, 新和英中辞典, Luminous

Only daij has senses other than 1, and the sources for their examples are old, hence giving them [arch].

@@ -7,0 +7,6 @@
+<k_ele>
+<keb>功り</keb>
+</k_ele>
+<k_ele>
+<keb>功</keb>
+</k_ele>
@@ -11,0 +17,1 @@
+<stagk>労り</stagk>
@@ -12,1 +19,8 @@
-<gloss>trouble</gloss>
+<gloss>sympathy</gloss>
+<gloss>consideration</gloss>
+<gloss>carefulness</gloss>
+<gloss>attention</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&arch;</misc>
@@ -16,1 +30,7 @@
-<gloss>sympathy</gloss>
+<gloss>trouble</gloss>
+<gloss>meritorious deed</gloss>
+</sense>
+<sense>
+<stagk>労り</stagk>
+<pos>&n;</pos>
+<misc>&arch;</misc>
@@ -18,2 +38,2 @@
-<gloss>carefulness</gloss>
-<gloss>attention</gloss>
+<gloss>disease</gloss>
+<gloss>sickness</gloss>

Daijr, GG5, etc.

Needs to be split. とうすう only means animals.

@@ -14,3 +14,0 @@
-<r_ele>
-<reb>とうすう</reb>
-</r_ele>

daij koj

@@ -6,0 +6,6 @@
+</k_ele>
+<k_ele>
+<keb>涌き水</keb>
+</k_ele>
+<k_ele>
+<keb>わき水</keb>

@@ -14,1 +14,1 @@
-<gloss>wild turtledove living in the mountains (often oriental turtle dove)</gloss>
+<gloss>mountain-dwelling turtledove (often oriental turtle dove)</gloss>

koj daij

@@ -12,1 +12,3 @@
-<gloss>turtledove</gloss>
+<xref type="see" seq="1957190">キジバト</xref>
+<xref type="see" seq="2232060">アオバト</xref>
+<gloss>wild turtledove living in the mountains (often oriental turtle dove)</gloss>

gg5, luminous

@@ -18,0 +19,4 @@
+<gloss>appraisal</gloss>
+<gloss>assessment</gloss>
+<gloss>judgement</gloss>
+<gloss>estimation</gloss>
@@ -21,2 +24,0 @@
-<gloss>assessment</gloss>
-<gloss>estimation</gloss>

[vt]: sankoku, iwakoku, obunsha

@@ -16,0 +17 @@
+<pos>&vt;</pos>

GG5

@@ -16,0 +16,1 @@
+<pos>&vs;</pos>
@@ -20,0 +21,1 @@
+<gloss>estimation</gloss>

daij, prog, 新和英中辞典, Luminous

@@ -16,1 +16,4 @@
-<gloss>evaluate</gloss>
+<gloss>evaluation</gloss>
+<gloss>criticism</gloss>
+<gloss>commenting on</gloss>
+<gloss>assessment</gloss>

Google N-gram Corpus Counts
╭─ーーーー─┬───────────╮
│ 阿弗利加 │     1,811 │
│ 亜弗利加 │       238 │ - sK (only nikk)
│ アフリカ │ 3,611,627 │
╰─ーーーー─┴───────────╯

@@ -11,2 +11 @@
-<ke_inf>&ateji;</ke_inf>
-<ke_inf>&rK;</ke_inf>
+<ke_inf>&sK;</ke_inf>

@@ -6,0 +7 @@
+<ke_inf>&rK;</ke_inf>
@@ -10,0 +12 @@
+<ke_inf>&rK;</ke_inf>
@@ -18 +19,0 @@
-<pos>&adj-no;</pos>

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

I agree that the x-ref isn't needed. I wouldn't add one to the 含羞 entry either.

@@ -12 +11,0 @@
-<xref type="see" seq="1681810">含羞</xref>

ハニカミ	306056
はにかみ	85786
含羞	6241
がんしゅう	413

I'm surprised to see the cross-reference return.  If I were using jisho.org, searched for ハニカミ, got this reference, and then saw [see=含羞], this would indicate to me that 含羞 is a *better* way to say "bashfullness". Obviously it is not.

If there were kanji on this term, I would understand "oh, these are two different readings of the same kanji, that's what the [see=] is for".  With the kanji gone, this cross-reference seems to do more harm than good.

That's why I removed [see=] in the original edit.

Maybe we could move [see=] over to the 含羞 entry instead? That will get less-popular-entry pointing at more-popular-entry.  Even there, no one will understand that these terms are related by kanji.

@@ -11,0 +12 @@
+<xref type="see" seq="1681810">含羞</xref>

OK. I'll put the xref back.

含羞笑顔	        0		
含羞屋	        0
含羞み笑顔	0		
含羞み屋	        0

I think we can drop the kanji form. My IME doesn't bring up it. I don't think 含羞 would ever be used for はにかみ without furigana.

@@ -4,4 +3,0 @@
-<k_ele>
-<keb>含羞</keb>
-<ke_inf>&sK;</ke_inf>
-</k_ele>
@@ -18 +14 @@
-<gloss>(showing) signs of embarrassment</gloss>
+<gloss>(showing signs of) embarrassment</gloss>

はるのど.

Oops. I meant to replace "caffe" with "caffè" (aligning it with the ラテ entry) but mistakenly pasted it over the wrong word.

@@ -19 +19 @@
-<gloss>cafe caffè</gloss>
+<gloss>caffè latte</gloss>

"cafe caffè"??

I don't see a need for the x-ref.

@@ -18 +17,0 @@
-<xref type="see" seq="1038090">カフェオレ</xref>
@@ -20 +19 @@
-<gloss>cafe latte</gloss>
+<gloss>cafe caffè</gloss>

@@ -8,0 +9,3 @@
+</r_ele>
+<r_ele>
+<reb>カフェ・ラテ</reb>

We have this note on い形容詞 and な形容詞.

@@ -11,4 +10,0 @@
-<reb>テけい</reb>
-<re_restr>テ形</re_restr>
-</r_ele>
-<r_ele>
@@ -16 +11,0 @@
-<re_restr>て形</re_restr>
@@ -20,2 +15,3 @@
-<field>&ling;</field>
-<gloss>-te form (e.g. of a verb)</gloss>
+<field>&gramm;</field>
+<s_inf>esp. in JSL contexts</s_inf>
+<gloss>-te form (of a verb or adjective)</gloss>

I don't think so.

I think this is one of those expressions only used in JLS 
teaching (a brief google seems to confirm this) - do we 
want to mention that in a note?

It gets a lot of hits - some false but enough to confirm this.

@@ -7,0 +7,3 @@
+<k_ele>
+<keb>て形</keb>
+</k_ele>
@@ -9,0 +12,5 @@
+<re_restr>テ形</re_restr>
+</r_ele>
+<r_ele>
+<reb>てけい</reb>
+<re_restr>て形</re_restr>

Thanks for doing these; I was about to drop the thread.

@@ -6,9 +6,0 @@
-</k_ele>
-<k_ele>
-<keb>修む</keb>
-</k_ele>
-<k_ele>
-<keb>納む</keb>
-</k_ele>
-<k_ele>
-<keb>収む</keb>
@@ -21,4 +12,10 @@
-<xref type="see" seq="1589090">収める</xref>
-<xref type="see" seq="1331900">修める</xref>
-<xref type="see" seq="1316830">治める</xref>
-<gloss>to supply, suppress, etc.</gloss>
+<pos>&vt;</pos>
+<misc>&arch;</misc>
+<gloss>to govern</gloss>
+<gloss>to manage</gloss>
+</sense>
+<sense>
+<pos>&v2m-s;</pos>
+<pos>&vt;</pos>
+<misc>&arch;</misc>
+<gloss>to subdue</gloss>

Well, I'm not making the changes. If this doesn't get sorted out in a day or two, I'll reject this set.

yes, i think it should be made consistent with おさめる

I'll leave this open for others to comment, but while it's concise, I think I'd prefer each to be a full entry (納む and 収む can be combined.)

@@ -5,1 +5,10 @@
-<keb>治む・修む・納む・収む</keb>
+<keb>治む</keb>
+</k_ele>
+<k_ele>
+<keb>修む</keb>
+</k_ele>
+<k_ele>
+<keb>納む</keb>
+</k_ele>
+<k_ele>
+<keb>収む</keb>

No response.

Any references? This is really just the sum of the parts. It gets 67k hits, so it's far from obscure, but I guess I'd like to see a reason why it should be included when no other dictionary that I can find does so.

@@ -11,0 +11,1 @@
+<pos>&n;</pos>

南ア	236245	99.6%
南阿	1017	0.4%

Merging 1459950.

@@ -5,0 +6,4 @@
+</k_ele>
+<k_ele>
+<keb>南阿</keb>
+<ke_inf>&rK;</ke_inf>

Daijr, GG5, etc.

The refs have "なんア". "みなみア" gets some hits too.
This is in Enamdict, so I wonder about replicating it.

@@ -8,0 +8,3 @@
+<reb>なんア</reb>
+</r_ele>
+<r_ele>
@@ -9,0 +12,1 @@
+<re_inf>&ik;</re_inf>

http://ja.wikipedia.org/wiki/南ア

saw used on twitter: "しかし毎度思うが、韓国の戦い方には限界を感じる。だか
ら、今回の五輪も勝ち数自体は多くないし、南アW杯でもそれは同様。日本の方がより正し
い道を歩んでいると思う。韓国のフィジカルを生かしたサッカーは日本には有効でも欧州・南
米列強には通用しない。" (@gokuusoccer)

@@ -9,0 +9,1 @@
+<misc>&sl;</misc>

http://d.hatena.ne.jp/keyword/�ߥ�
for example used here:
http://jin115.com/lite/archives/51885119/comments/3742/?p=172

”ミンスが政権を取ったから
地震が起きて、原発も津波で壊れるくらい弱い施設になった"

Eijiro

wiki

wiki

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

http://www.suken.info/ English WP

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

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

meikyo

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

LSD, JWN, 医学英和辞典

daijr: "ウマ・ウシなど大形の動物の数"

I don't think the x-ref is necessary.

@@ -12,2 +12 @@
-<xref type="see" seq="1582320">頭数・あたまかず</xref>
-<gloss>number of animals</gloss>
+<gloss>number of (large) animals</gloss>

Daijr, GG5, etc.

Split from 1582320.

GG5, 新和英中辞典, etc.

gg5

@@ -12,1 +12,2 @@
-<gloss>Taikyoku shogi (variant of shogi (Japanese chess))</gloss>
+<xref type="see" seq="1347640">将棋・しょうぎ</xref>
+<gloss>Taikyoku shogi (variant of shogi)</gloss>

wiki

@@ -12,1 +12,2 @@
-<gloss>Heian shogi (precursor to modern shogi(Japanese chess))</gloss>
+<xref type="see" seq="1347640">将棋・しょうぎ</xref>
+<gloss>Heian shogi (precursor to modern shogi)</gloss>

wiki

Daijr, GG5

@@ -12,1 +12,1 @@
-<gloss>brooch or necklace worn with Western clothing</gloss>
+<gloss>jewellery worn at the neck or collar of Western clothing (brooch, necklace, choker, etc.)</gloss>

nikk daijs

probably obs

@@ -12,0 +12,1 @@
+<misc>&obsc;</misc>
@@ -13,0 +14,1 @@
+<gloss>light jacket</gloss>

nikk

koj daij nikk

koj

gg5, oed

i feel like sense 2 should be indicated as obscure in some way

@@ -15,1 +15,1 @@
-<gloss>someone born and raised in Tokyo</gloss>
+<gloss>Tokyoite</gloss>

nikk

also the name of a magazine

3M hits. Probably worth having, if only to show it's くせ and not へき.

@@ -15,0 +15,1 @@
+<pos>&n;</pos>
@@ -16,0 +17,1 @@
+<gloss>bad habits</gloss>

Masses of Google hits for the first, a good number for the second.

Francis has a bad habit of making submission for a + b, but in view of the following, he thought that it may work for you because "bad habit" must be even more common amongst people than bad colds, bad news or unsavoury rumours. Perhaps we all have "bad habits", so perhaps they should not be called "bad habits"; maybe they should be called normalities. In which case this submission would be defeated by default.

悪い知らせ 【わるいしらせ】 (n) bad news
悪い評判 【わるいひょうばん】 (n) unsavory rumor; unsavoury rumour
悪い風邪 【わるいかぜ】 (n) bad cold