google

I think the "wear" sense is more common.

@@ -22,2 +22,4 @@
-<pos>&suf;</pos>
-<gloss>-ware</gloss>
+<pos>&n-suf;</pos>
+<gloss>wear</gloss>
+<gloss>clothing</gloss>
+<gloss>dress</gloss>
@@ -27,3 +29,3 @@
-<pos>&suf;</pos>
-<gloss>-wear (clothing)</gloss>
-<gloss>(sports) wear</gloss>
+<pos>&n-suf;</pos>
+<gloss>ware</gloss>
+<gloss>goods</gloss>

ウエア	1125231
ウェア	5480496
ウエアー	39560
ウェアー	80103
----
ルームウェア	22798
ルームウェアー	1569
アドウェア	48387
アドウェアー	263
ソフトウェア	8340250
ソフトウェアー	19969
ルームウエア	6834
ルームウエアー	2329
アドウエア	2551
アドウエアー	116
ソフトウエア	1195808
ソフトエアー	171

- reversing the order of ウェア/ウエア to match 5:1 frequency measures
- adding the non-standard ウェアー/ウエアー versions which get quite a bit of use. I've proposed tagging them "ik", but I'm not fussed if others want it dropped.

@@ -3,0 +4,4 @@
+<r_ele>
+<reb>ウェア</reb>
+<re_pri>spec1</re_pri>
+</r_ele>
@@ -9 +13,6 @@
-<reb>ウェア</reb>
+<reb>ウェアー</reb>
+<re_inf>&ik;</re_inf>
+</r_ele>
+<r_ele>
+<reb>ウエアー</reb>
+<re_inf>&ik;</re_inf>

I think it's better to keep the explanation.

@@ -11 +11,2 @@
-<gloss>soapland (type of brothel)</gloss>
+<gloss>soapland</gloss>
+<gloss g_type="expl">brothel where one can bathe with prostitutes</gloss>

@@ -10,2 +10,2 @@
-<lsource ls_wasei="y">soapland</lsource>
-<gloss>brothel where one can bathe with the prostitutes</gloss>
+<lsource ls_wasei="y"/>
+<gloss>soapland (type of brothel)</gloss>

I see the second sense in daijirin and koj, but I don't see it in daijs, smk, shinsen, iwakoku, and gg5.

daijirin: 「ソープランドの旧称。」

@@ -17 +17 @@
-<misc>&sens;</misc>
+<misc>&dated;</misc>

Keep aligned with  ソープランド.

@@ -18 +18,2 @@
-<gloss>soapland (type of brothel)</gloss>
+<gloss>soapland</gloss>
+<gloss>brothel where one can bathe with prostitutes</gloss>

@@ -18 +18 @@
-<gloss>soapland (brothel where one can bathe with the prostitutes)</gloss>
+<gloss>soapland (type of brothel)</gloss>

Merging in 2202190, which was marked as "col" and "abbr", but based on daijr, koj and jawiki is just a synonym.

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ハングライダー</reb>

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>

aligning with the abbreviated entry

@@ -12,0 +13 @@
+<gloss>payment via multiple installments</gloss>

@@ -11,0 +12 @@
+<xref type="see" seq="1142870">リボルビング払い</xref>

gg5, prog

Splitting into senses.

@@ -20,0 +21,5 @@
+<gloss>board and lodging</gloss>
+<gloss>room and board</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -21,0 +27,2 @@
+<gloss>lodging house</gloss>
+<gloss>lodgings</gloss>

@@ -18 +18,3 @@
-<gloss>(in colloquial usage, ironically or as an excuse) the wise make no scruple in suddenly changing their demeanor</gloss>
+<misc>&yoji;</misc>
+<s_inf>in colloquial usage, ironically or as an excuse</s_inf>
+<gloss>the wise make no scruple in suddenly changing their demeanor</gloss>

Kanji Haitani list

Adding yoji tagAdding yoji tag
-*- via bulkupd.py -*-

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

gg5, prog

@@ -16,2 +16,5 @@
-<gloss>senior schoolmate</gloss>
-<gloss>senior apprentice</gloss>
+<xref type="see" seq="1589240">弟弟子</xref>
+<gloss>senior pupil (of the same master)</gloss>
+<gloss>senior disciple</gloss>
+<gloss>senior student</gloss>
+<gloss>senior member</gloss>

I guess that works.

Maybe better to have example sentences to show it should usually be translated as "extremely"?

@@ -58,4 +58,3 @@
-<s_inf>usu. adj+限りです/だ</s_inf>
-<gloss>extremely</gloss>
-<gloss>absolutely</gloss>
-<gloss>very</gloss>
+<s_inf>usu. adj+限り</s_inf>
+<gloss>being very much (in a certain state)</gloss>
+<gloss>extreme amount (of a feeling, etc.)</gloss>

Unidic: 限り 名詞-普通名詞-副詞可能

Yes, behaving adverbially. Odd glosses for a noun.

@@ -57 +57 @@
-<pos>&adv;</pos>
+<pos>&n;</pos>

Is it an adv in this usage? Syntactically it's a noun.

GG5 sense: 〔極み〕
ようやく彼の賛成を得ることができて喜ばしい限りだ. We are extremely pleased that we have finally obtained his approval.
その子供たちの姿は痛ましい限りだった. The children's appearance was absolutely heart-rending.
https://www.janguage.jp/material/grammar/grammar-advanced-9

This came up as an entry submission (2859126) and I see it's in GG5 as a sense which we don't really cover. Should be included. I'm putting it after the sense for which we have example sentences.

@@ -54,0 +55,7 @@
+</sense>
+<sense>
+<pos>&adv;</pos>
+<s_inf>usu. adj+限りです/だ</s_inf>
+<gloss>extremely</gloss>
+<gloss>absolutely</gloss>
+<gloss>very</gloss>

daij, gg5

Replaced adj-no sense with second sense in kokugos.

@@ -15,0 +16,3 @@
+<xref type="ant" seq="1311410">私用・2</xref>
+<xref type="ant" seq="1311410">私用・2</xref>
+<gloss>official business</gloss>
@@ -17 +20,2 @@
-<gloss>official business</gloss>
+<gloss>public business</gloss>
+<gloss>company duties</gloss>
@@ -19,0 +24 @@
+<pos>&n;</pos>
@@ -21,3 +26,4 @@
-<gloss>public</gloss>
-<gloss>official</gloss>
-<gloss>governmental</gloss>
+<xref type="ant" seq="1311410">私用・1</xref>
+<xref type="ant" seq="1311410">私用・1</xref>
+<gloss>public use</gloss>
+<gloss>government use</gloss>

@@ -29 +29,2 @@
-<gloss>zabuton (flat floor cushion used when sitting or kneeling; usu. rectangular)</gloss>
+<gloss>zabuton</gloss>
+<gloss g_type="expl">flat floor cushion used when sitting or kneeling; usu. rectangular</gloss>

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

https://bokuniku.com/牛/ザブトン.html
https://macaro-ni.jp/88194
"牛の肩ロースの一部であるザブトンはあばら骨側にあり、赤身の肩ロースのなかでもっとも霜降りが多い、おいしいお肉として有名です。"

It's a particular part of 肩ロース.
As it's always written ザブトン, it should be a separate entry.

@@ -25,4 +24,0 @@
-<r_ele>
-<reb>ザブトン</reb>
-<re_nokanji/>
-</r_ele>
@@ -32,6 +27,0 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<xref type="see" seq="2201500">肩ロース</xref>
-<misc>&uk;</misc>
-<gloss>shoulder roast (e.g. of cattle)</gloss>

https://happyisland.jp/2018/02/niku7/

@@ -24,0 +25,4 @@
+<r_ele>
+<reb>ザブトン</reb>
+<re_nokanji/>
+</r_ele>
@@ -27,0 +32,6 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="2201500">肩ロース</xref>
+<misc>&uk;</misc>
+<gloss>shoulder roast (e.g. of cattle)</gloss>

in a similar vein

@@ -29,0 +30 @@
+<gloss>it's too much</gloss>

@@ -17 +17 @@
-<s_inf>used both to apologize and to get someone's attention</s_inf>
+<s_inf>used to apologize or get someone's attention</s_inf>

Quiet, self-approving.

to clarify the 申し訳ない気持ち here

@@ -28,0 +29 @@
+<gloss>you shouldn't have</gloss>

@@ -20 +20 @@
-<xref type="see" seq="1274940">公用・1</xref>
+<xref type="ant" seq="1274940">公用・2</xref>
@@ -25,0 +26 @@
+<xref type="ant" seq="1274940">公用・1</xref>

meikyo, gg5, prog

I believe only sense 1 is vs.

@@ -17,0 +18 @@
+<pos>&vs;</pos>
@@ -19,2 +20 @@
-<pos>&vs;</pos>
-<xref type="see" seq="1274940">公用</xref>
+<xref type="see" seq="1274940">公用・1</xref>
@@ -21,0 +22 @@
+<gloss>private use</gloss>
@@ -25,2 +25,0 @@
-<pos>&adj-no;</pos>
-<pos>&vs;</pos>
@@ -27,0 +27 @@
+<gloss>personal business</gloss>

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

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

gg5

Added "actualization" because it was the best fit for a translation I recently did.

@@ -23,0 +24,2 @@
+<gloss>actualization</gloss>
+<gloss>actualisation</gloss>

"n-t" conversion to "n,adv", etc.

@@ -15 +14,0 @@
-<pos>&n-t;</pos>
@@ -16,0 +16 @@
+<pos>&adv;</pos>

"toward morning" looks odd to me.

@@ -15 +15 @@
-<pos>&n-adv;</pos>
+<pos>&n-t;</pos>
@@ -19 +19 @@
-<gloss>toward morning</gloss>
+<gloss>early in the morning</gloss>

https://ja.wikipedia.org/wiki/ギャル文字#漢字
https://en.wikipedia.org/wiki/Gyaru-moji

Google N-gram Corpus Counts
╭─ーー─┬─────────╮
│ 禾ム │     254 │
│ 走召 │   4,353 │
│ ネ申 │ 187,033 │ - entry 2223620
╰─ーー─┴─────────╯

走召 gets a lot of hits on twitter. Maybe worth having as a search form?

@@ -6,0 +7,4 @@
+</k_ele>
+<k_ele>
+<keb>走召</keb>
+<ke_inf>&sK;</ke_inf>

I think "pref" is safest. It's rather like めっちゃ, which could xref here.

Should sense 2 maybe be an adv rather than pref? Is there any difference in usage between 超 and めっちゃ？

daij, gg5

Added colloquial sense.
Fixed PoS tags.

@@ -17,2 +17 @@
-<pos>&n;</pos>
-<pos>&n-suf;</pos>
+<stagr>ちょう</stagr>
@@ -23,2 +22 @@
-<gloss>very</gloss>
-<gloss>really</gloss>
+<gloss>extreme</gloss>
@@ -27 +25,9 @@
-<pos>&n;</pos>
+<pos>&pref;</pos>
+<misc>&col;</misc>
+<gloss>extremely</gloss>
+<gloss>really</gloss>
+<gloss>totally</gloss>
+<gloss>absolutely</gloss>
+</sense>
+<sense>
+<stagr>ちょう</stagr>

JR Central calls these "Limited Express Ticket" on their English website
https://global.jr-central.co.jp/en/tickets/type/types.html

@@ -15,2 +15,2 @@
-<gloss>special-express ticket (usu. needed in addition to a basic fare ticket)</gloss>
-<gloss>limited-express ticket</gloss>
+<gloss>limited-express ticket (usu. needed in addition to a basic fare ticket)</gloss>
+<gloss>special-express ticket</gloss>

@@ -12,2 +12,2 @@
-<xref type="see">特別急行券</xref>
-<xref type="see">乗車券</xref>
+<xref type="see" seq="2837290">特別急行券</xref>
+<xref type="see" seq="1355290">乗車券・2</xref>

daijs
"急行券の一。特別急行列車に乗車するため、_乗車券のほかに_必要とされるもの。特急券。" (my emphasis)
Probably helpful to state that a tokkyuuken is not a full ticket by itself.

I forget, did we always abbreviate words like "usually" into "usu." when they appear in a gloss? I vaguely remember we would normally just 
do that for notes. Which is it?

@@ -12 +12,5 @@
-<gloss>special-express ticket</gloss>
+<xref type="see">特別急行券</xref>
+<xref type="see">乗車券</xref>
+<misc>&abbr;</misc>
+<gloss>special-express ticket (usu. needed in addition to a basic fare ticket)</gloss>
+<gloss>limited-express ticket</gloss>

@@ -23,0 +24 @@
+<xref type="ant" seq="1580020">出国</xref>

meikyo

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

GG5, etc.

Could include "immigration" as the the JEs.
I think just the one gloss is OK.

I think the additional gloss was also 
helpful for English speakers. Also, while 
it's true that JMdict is not primarily 
aimed at Japanese users, we certainly have 
plenty of them.

Gerund glosses can be helpful but I don't think they add anything in this case. A learner will have no trouble translating "彼はアメリカに入国した" as "He entered America" from the gloss "entry into a country".
GG5, Eijro, etc. are aimed primarily at Japanese speakers (i.e. English learners) so it's helpful to have similar glosses in different forms. We don't really have to do that in JMdict.

布団	5850580
蒲団	43052
薄団	37

@@ -13,4 +13 @@
-</k_ele>
-<k_ele>
-<keb>薄団</keb>
-<ke_inf>&iK;</ke_inf>
+<ke_inf>&rK;</ke_inf>

I suspect this could be argued about for years.

jwiki: 主に、人が上に横たわるための敷き布団（しきぶとん）と、人の上に被せる掛け布団（かけぶとん） に分けられる。
wiki
 gg5 daijs

@@ -26 +26,5 @@
-<gloss>futon (quilted Japanese-style mattress laid out on the floor)</gloss>
+<xref type="see" seq="1594170">敷き布団・しきぶとん</xref>
+<xref type="see" seq="1590140">掛け布団・かけぶとん</xref>
+<xref type="see" seq="1590140">掛け布団・かけぶとん</xref>
+<gloss>futon</gloss>
+<gloss g_type="expl">Japanese bedding consisting of a mattress and a duvet</gloss>

google

@@ -13,0 +13,4 @@
+</k_ele>
+<k_ele>
+<keb>薄団</keb>
+<ke_inf>&iK;</ke_inf>

It's true that "cut (of meat)" still means "part" of the body, but I still think it'd be more helpful to split it out into its own sense. 
Approving, though.

I agree that "part of a body" shouldn't be a separate sense. It just creates unnecessary overlap.
But I'm not sure "cut of meat" can be considered a separate sense either. It still means "part" or "region" in that context.
This is my suggestion.
---
I note that daijr's sense 1 ("position of a part") isn't even covered here. The JEs and daijs have ignored it as well, though.

@@ -16 +16 @@
-<gloss>part</gloss>
+<gloss>part (esp. of the body)</gloss>
@@ -19,4 +19 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>part of a body (e.g. cut of meat)</gloss>
+<gloss>cut (of meat)</gloss>

It's closer to the daijr definition for 
sure, but is it more helpful for our 
users? I think "part of a body" isn't 
really necessary to split out from sense 1 
from a wa-ei perspective, but "cut of 
meat" is.

I've been chewing over that daijr sense. How's this?

@@ -22 +22 @@
-<gloss>cut (of meat)</gloss>
+<gloss>part of a body (e.g. cut of meat)</gloss>

daijr does have two senses:
① 全体に対するある部分の位置。 ② 生物の体で、全体に対しての一部分をさしていうことば。 「身体各－の名称」 「食肉－」
daijr's sense two might be broader than just "cut" but considering compounds like 希少部位 I think "cut" definitely should be its own 
sense, esp. considering this is a wa-ei.

@@ -12 +12,3 @@
-<gloss>dictionary tag indicating colloquialism, slang or vulgarity of American origin (in English)</gloss>
+<s_inf>dictionary tag</s_inf>
+<gloss>American English colloquialism</gloss>
+<gloss>American slang</gloss>

@@ -12,1 +12,1 @@
-<gloss>dictionary tag indicating colloquialism, slang or vulgarity of American origin</gloss>
+<gloss>dictionary tag indicating colloquialism, slang or vulgarity of American origin (in English)</gloss>

@@ -19,2 +19,2 @@
-<gloss>sticking firmly to</gloss>
-<gloss>being glued to</gloss>
+<gloss>sticking firmly (to)</gloss>
+<gloss>being glued (to)</gloss>
@@ -26,2 +26,2 @@
-<gloss>relating closely to</gloss>
-<gloss>having relevance to</gloss>
+<gloss>relating closely (to)</gloss>
+<gloss>having relevance (to)</gloss>
@@ -32,0 +33 @@
+<field>&photo;</field>

mk

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

gg5, prog, daij

-> noun glosses
Added sense.
I don't separate "giving total coverage ..." is right. It needs to be used with 取材 to have that meaning.

@@ -17,3 +17,3 @@
-<gloss>glued to</gloss>
-<gloss>pressing tightly against</gloss>
-<gloss>closely related to</gloss>
+<gloss>close adhesion</gloss>
+<gloss>sticking firmly to</gloss>
+<gloss>being glued to</gloss>
@@ -24 +24,2 @@
-<gloss>giving total coverage to the key figure(s) of a TV or film documentary</gloss>
+<gloss>relating closely to</gloss>
+<gloss>having relevance to</gloss>

ルミナス

@@ -25,0 +26,5 @@
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<gloss>contact printing</gloss>
+</sense>

gg5, prog
G n-grams:
弟々子	No matches
弟弟子	11822

弟々子 is an incorrect use of 々.
Not necessarily "oneself".

@@ -4,3 +3,0 @@
-<k_ele>
-<keb>弟々子</keb>
-</k_ele>
@@ -15,2 +12,4 @@
-<gloss>younger pupil (under the same master as oneself)</gloss>
-<gloss>new disciple</gloss>
+<xref type="see" seq="1249980">兄弟子</xref>
+<gloss>younger pupil (of the same master)</gloss>
+<gloss>younger disciple</gloss>
+<gloss>junior member</gloss>

@@ -15 +15 @@
-<gloss>pupil</gloss>
+<gloss>younger pupil (under the same master as oneself)</gloss>

A handful of kokugos display the 蒲団 form here, but I don't think it's necessary in a compound word like this.
Daijr/s don't show it.

〈掛（け）／かけ／カケ〉〈布団／蒲団／ぶとん／ブトン〉

Google N-gram Corpus Counts
╭─ーーーーー─┬─────────┬───────╮
│ 掛け布団　 │ 554,875 │ 78.1% │
│ 掛布団　　 │ 142,049 │ 20.0% │
│ かけ布団　 │   7,202 │  1.0% │ - add, sK
│ 掛けぶとん │   1,834 │  0.3% │ - add, sK
│ 掛蒲団　　 │     493 │  0.1% │ - sK
│ 掛け蒲団　 │     356 │  0.1% │ - sK
│ 掛ぶとん　 │     277 │  0.0% │
│ カケ布団　 │      56 │  0.0% │
│ かけ蒲団　 │      43 │  0.0% │
│ 掛けブトン │      36 │  0.0% │
│ かけぶとん │   2,950 │  0.4% │
│ かけブトン │     102 │  0.0% │
╰─ーーーーー─┴─────────┴───────╯

@@ -10,0 +11,8 @@
+<keb>かけ布団</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>掛けぶとん</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
@@ -11,0 +20 @@
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +24 @@
+<ke_inf>&sK;</ke_inf>
@@ -21 +31 @@
-<xref type="see" seq="1594170">敷き布団・しきぶとん</xref>
+<xref type="see" seq="1594170">敷き布団</xref>

wiki(futon): A complete futon set consists of a mattress (敷き布団 shikibuton, lit. "spreading futon") and a duvet (掛け布団 kakebuton, lit. "covering futon").[

Maybe duvet is the best gloss

@@ -21,0 +22 @@
+<gloss>duvet</gloss>

@@ -20,0 +21 @@
+<xref type="see" seq="1594170">敷き布団・しきぶとん</xref>

not an antonym

@@ -31 +31 @@
-<xref type="ant" seq="1590140">掛蒲団</xref>
+<xref type="see" seq="1590140">掛蒲団</xref>

Oh.

In the West, a "futon" is usually placed on a low frame or on a sofa bed,
so I think the comment was useful

@@ -32 +32 @@
-<gloss>futon</gloss>
+<gloss>futon (laid on the floor)</gloss>

@@ -31,0 +32 @@
+<gloss>futon</gloss>
@@ -34 +34,0 @@
-<gloss>futon laid on the floor</gloss>

GG5 daij
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1192934441
"ひねくれる ひねくれるって どういう状態？
...
素直ではない。
自分の本音をねじ曲げて伝える。
膨れっ面をするという意味です。"
daij examples:
「 － ・れた考え方」　「―・れたものの言い方」

I feel like there's a difference between "sulking" (膨れっ面をする) and "being bitter" (e.g. as in ひねくれた考え方) so I split the second 
sense into two.

@@ -17 +17,2 @@
-<gloss>to be twisted</gloss>
+<gloss>to become twisted</gloss>
+<gloss>to grow distorted</gloss>
@@ -25,2 +26,10 @@
-<gloss>to be warped (mind)</gloss>
-<gloss>to be distorted</gloss>
+<gloss>to get sulky</gloss>
+<gloss>to sulk</gloss>
+</sense>
+<sense>
+<pos>&v1;</pos>
+<pos>&vi;</pos>
+<misc>&uk;</misc>
+<gloss>to grow bitter</gloss>
+<gloss>to become embittered</gloss>
+<gloss>to become perverse</gloss>

大辞林

@@ -17,3 +17,10 @@
-<gloss>to be contrary</gloss>
-<gloss>to be uncooperative</gloss>
-<gloss>to be rebellious</gloss>
+<gloss>to be twisted</gloss>
+<gloss>to be curved</gloss>
+<gloss>to bend</gloss>
+</sense>
+<sense>
+<pos>&v1;</pos>
+<pos>&vi;</pos>
+<misc>&uk;</misc>
+<gloss>to be warped (mind)</gloss>
+<gloss>to be distorted</gloss>

n-grams (8:1)

@@ -15,0 +16 @@
+<misc>&uk;</misc>

I'm dropping the "ichi1" from the extra forms - I think it's over-interpretation of the "割(り)引(き)" in the original. I'd like to keep 割り引 with its "io" as 600+ is not an insignificant count and I like indicating it shouldn't be used.

@@ -12 +11,0 @@
-<ke_pri>ichi1</ke_pri>
@@ -16 +14,0 @@
-<ke_pri>ichi1</ke_pri>
@@ -21 +18,0 @@
-<ke_pri>ichi1</ke_pri>

Meikyo has the following note: "許容形「割引き」も好まれる". I think we can drop io from 割引き and 割り引き.
I suggest dropping 割り引 altogether. It gets less than 0.01% of the n-gram counts of 割引.

@@ -12 +11,0 @@
-<ke_inf>&io;</ke_inf>
@@ -17 +15,0 @@
-<ke_inf>&io;</ke_inf>

割引	9956420
割り引き	130671
割引き	298747
割り引	629

I wonder about the "io" on 割引き as 引's reading doesn't include the き. In fact I think they can probably all lose the "io" although 割り引 is rather odd.

@@ -11 +11 @@
-<keb>割り引き</keb>
+<keb>割引き</keb>
@@ -16 +16 @@
-<keb>割引き</keb>
+<keb>割り引き</keb>

Better?

@@ -33,2 +32,0 @@
-<pos>&suf;</pos>
-<pos>&adj-no;</pos>
@@ -38 +36,4 @@
-<gloss>(after a number) tenths discounted</gloss>
+</sense>
+<sense>
+<pos>&ctr;</pos>
+<gloss>tenths discounted</gloss>

gg5, daij

There's only one sense here.

@@ -16,6 +16 @@
-<gloss>jail sentence</gloss>
-<gloss>gaol sentence</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<gloss>imprisonment without a stay of execution</gloss>
+<gloss>prison sentence (without a stay of execution)</gloss>

daij, gg5

Not a 形容動詞. Aligning glosses with 一人前.

@@ -18 +17,0 @@
-<pos>&adj-na;</pos>
@@ -22 +21,10 @@
-<gloss>becoming an adult or full-fledged member of (a) society</gloss>
+<gloss>adult</gloss>
+<gloss>grown-up</gloss>
+<gloss>person who has come of age</gloss>
+</sense>
+<sense>
+<pos>&adj-no;</pos>
+<misc>&uk;</misc>
+<gloss>fully fledged</gloss>
+<gloss>established</gloss>
+<gloss>qualified</gloss>

fixing xref

@@ -20 +20 @@
-<xref type="see" seq="1163770">一人前・1</xref>
+<xref type="see" seq="1163770">一人前・2</xref>

In crude Google counts 一丁前 + いっちょうまえ gets 467 and 一丁前 + いっちょまえ gets 6,700. While not too much can be made of this, quite a few pages are saying that 一丁前 is read いっちょまえ. I don't think we are out on a limb, but we *are* going where few dictionaries fear to tread.

Can 一丁前 be read いっちょまえ?

I'd keep it, if only to indicate it has two readings.

G n-grams: 6595
https://furigana.info/w/一茎
https://www.weblio.jp/content/一茎の葦

Not sure we do. It's not in the refs.
ひとくき appears to be the more common reading when it appears on its own.

@@ -6,0 +7,3 @@
+<r_ele>
+<reb>ひとくき</reb>
+</r_ele>

Is it necessary, though?

@@ -12 +12 @@
-<gloss>a stem</gloss>
+<gloss>one stem</gloss>

OK.

@@ -16,0 +17 @@
+<gloss>to take in lodgers</gloss>
@@ -18 +18,0 @@
-<gloss>to take in lodgers</gloss>

g ng　for similar terms
宿人を置く	No matches
間借り人を置く	No matches
宿泊者を置く	No matches
宿泊人を置く	No matches

It's in eij too: 
下宿人を置く
take in a boarder
take in a lodger
take in lodgers
(prog has the same example as gg5)

I don't mind keeping it in. The situation is a little complicated. It's easy to say "it's better as an example sentence" and that 
might be true in a paper dictionary, but honestly I don't think we're helping anybody by sticking it inside the tatoeba collection.

下宿人を置く	122
下宿人をおく	27
GG5: 下宿人を置く[置いている] take in [keep] lodgers [boarders].

My first reaction was that it can go. Then I thought about whether I would have come up with that sentence, since I didn't really know the verb to use. It's not exactly a common sense of 置く. It may be better as an example, but it may also be a useful thing for people to find when they look up 下宿 or 下宿人.
Then I saw that GG5 has it as an example of the 下宿人 subentry of the 下宿 entry.

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>下宿人をおく</keb>
@@ -12,0 +16 @@
+<xref type="see" seq="1421850">置く・おく・7</xref>
@@ -13,0 +18 @@
+<gloss>to take in lodgers</gloss>

G n-grams: 下宿人を置く	122

I don't think we need this. A+B. Not particularly common.

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

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

daijs
g ng

ビビンバ	353398
ビビンパ	41455
ピビンパプ	1283
ビビンバップ	213
ピビムパプ	589
ピビンパ	11299

@@ -10,0 +11,3 @@
+<reb>ピビンパ</reb>
+</r_ele>
+<r_ele>
@@ -14,0 +18,3 @@
+</r_ele>
+<r_ele>
+<reb>ピビムパプ</reb>

Daijr for the variants.

Sorted on hits.

@@ -6,0 +6,6 @@
+</r_ele>
+<r_ele>
+<reb>ビビンパ</reb>
+</r_ele>
+<r_ele>
+<reb>ピビンパプ</reb>

Eijiro

Some hits for ビビンバップ.

@@ -6,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ビビンバップ</reb>

Spelling mistake

@@ -9,1 +9,1 @@
-<gloss>bibimbab (Korean rice dish)</gloss>
+<gloss>bibimbap (Korean rice dish)</gloss>

OK.

@@ -14 +14 @@
-<pos>&exp;</pos>
+<pos>&conj;</pos>

Probably should be revisited. Ditto for さもないと.

* meikyo: 〔接〕
* wikt: https://en.wiktionary.org/wiki/さもなくば

Are we sure it's not a conjunction?

Aligning with 2008300.
Not a conjunction according to the kokugos.

@@ -14 +13,0 @@
-<pos>&conj;</pos>
@@ -18,2 +17,2 @@
-<gloss>else</gloss>
-<gloss>if you don't, the only other option is ...</gloss>
+<gloss>or else</gloss>
+<gloss>if not</gloss>

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

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

慙愧に堪えない	6540
斬鬼に堪えない	No matches
慙愧の念	        2225
斬鬼の念	        No matches

斬鬼 is the name of a character from Kamen Rider (which explains the high ngram counts). I don't know where I originally saw it but it doesn't look like it's used with this meaning.

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

daijs: "古くは「ざんぎ」とも"
G n-grams:
慙愧	23125
慚愧	17278
斬鬼	38579

Added irregular kanji form. Interestingly, it's more common than either of the "correct" forms.

@@ -9,0 +10,4 @@
+<k_ele>
+<keb>斬鬼</keb>
+<ke_inf>&iK;</ke_inf>
+</k_ele>
@@ -11,0 +16,4 @@
+</r_ele>
+<r_ele>
+<reb>ざんぎ</reb>
+<re_inf>&ok;</re_inf>

Looks good.

https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q10247484280
https://okwave.jp/qa/q3939723.html
https://www.quora.com/What-happens-when-a-curse-or-spell-backfires-in-witchcraft-or-black-magic

I think the context here is "magic". This term is used by people who believe in the occult.
Pretty sure it should be "backfire", not "backlash".

@@ -12,2 +12 @@
-<misc>&col;</misc>
-<gloss>backlash from using magic (e.g. in a game)</gloss>
+<gloss>backfire (of a spell, curse, etc.)</gloss>

It needs context.

@@ -12 +12,2 @@
-<gloss>backlash from using magic</gloss>
+<misc>&col;</misc>
+<gloss>backlash from using magic (e.g. in a game)</gloss>

I don't see the point of having magic  iquote marks, it's confusing

@@ -12,2 +12 @@
-<xref type="see" seq="1681860">陰陽師</xref>
-<gloss>backlash (after use of 'magic')</gloss>
+<gloss>backlash from using magic</gloss>

It's a bit self-evident.

I agree with Marcus. I don't really see it as an expression that needs to be defined. It's just a comparison.

g ng

日本のチベット	2677
https://www.projectdesign.jp/201601/pn-iwate/002659.php
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q109387295
https://blog.goo.ne.jp/kurokuragawa/e/a060d17c1b1e1937c0f2203d9456937b

Real, esp. as a nickname(?) for Iwate Prefecture, but I'm not sure this needs to be an entry. It's hard to define and kind of self-
evident.
Also see ngrams for:
日本のスウェーデン	236
日本のアメリカ	4518
日本のアフリカ	1253
日本のスイス	1903
日本のイギリス	391
日本のフランス	7843
日本のインド	3528
日本のネパール	110

@@ -13 +13,2 @@
-<gloss>unpopulated, undeveloped or high-altitude region of Japan</gloss>
+<gloss>the Tibet of Japan</gloss>
+<gloss>sparsely populated and undeveloped region of Japan</gloss>

Entry created

ないことには	323210
無い事には	3802
無いことには	4536
ない事には	65170

Not sure this is really needed.

@@ -3,0 +4,9 @@
+<k_ele>
+<keb>ない事には</keb>
+</k_ele>
+<k_ele>
+<keb>無いことには</keb>
+</k_ele>
+<k_ele>
+<keb>無い事には</keb>
+</k_ele>
@@ -8,0 +18 @@
+<misc>&uk;</misc>
@@ -10 +20 @@
-<gloss>unless</gloss>
+<gloss>unless (you do something)</gloss>

@@ -10 +10 @@
-<gloss>unless you do something</gloss>
+<gloss>unless</gloss>

@@ -9 +9,2 @@
-<gloss>(with verb stem) unless you do something</gloss>
+<s_inf>with verb stem</s_inf>
+<gloss>unless you do something</gloss>

Entry created

Doesn't look like a real thing to me.

Is this a real thing? I've never seen/heard ズマン, and a quick google doesn't bring up anything relevant. If it's real, I propose 
it's merged with the すまん entry.

@@ -12,1 +12,1 @@
-<xref type="see" seq="1985560">すいません</xref>
+<xref type="see" seq="1295060">すみません</xref>

Entry created

Very odd.

g ng
スマラン	5940
すまらん	35
but スマラン is the name of an Indonesian city. If this were real, the hiragana version would be much more common.

Entry created

走/そう has since been added. This can go.

I vote for it to go.

Not sure if necessary.

@@ -11,2 +11,2 @@
-<pos>&suf;</pos>
-<gloss>-meter race (after number)</gloss>
+<pos>&ctr;</pos>
+<gloss>-meter race</gloss>

Entry created

daijr
ハンググライダー
... (definition) ... ハングライダー。

Merging.

koj (ハンググライダー): 金属製の枠に布を張った翼の下にぶら下がって滑空するグライダー。ハングライダー。"
G n-grams:
ハングライダー	12804
ハンググライダー	23673

Not an abbreviation. Shouldn't this be merged with ハンググライダー?

Entry created

@@ -12,0 +13 @@
+<gloss g_type="lit">pillar of buzzards</gloss>

Entry created

Koj : 四国八十八箇所にならって、これを小形化した札所(ふだしよ)。小豆島・淡路島などにある。

It's not a single place, and not really a "product". I think since it's in Koj it should stay.

@@ -13 +13 @@
-<gloss>small-scale version of the 88 temples of Shikoku (i.e. on Awaji Island)</gloss>
+<gloss>small-scale version of the 88 temples of Shikoku (Awaji Island, Shōdoshima, etc.)</gloss>

One mention in 世界大百科事典's 【吉海[町]】 entry: 
"なお，大島には四国八十八ヵ所を模した〈島四国〉霊場があり，春の霊場巡りの季節には訪れる人も多く，湯茶の接待や宿をかす善根宿（ぜんこんやど）の風
習を今も残している。"

This seems to be in reference to a unique instance of this. It should be moved to enam or just deleted.

Entry created

OK, but not first.

@@ -11 +10,0 @@
-<gloss>There we go</gloss>
@@ -14,0 +14 @@
+<gloss>there we go</gloss>

Subtitle from Konosuba

Subtitles translates this word as  "there we go" as Kazuma 
puts on his clothes for the day

@@ -10,0 +11 @@
+<gloss>There we go</gloss>

I think "aux" is OK. It doesn't really stand alone.

aux or just exp?

@@ -9 +9 @@
-<xref type="see" seq="1008420">でしょう</xref>
+<xref type="see" seq="1008420">でしょう・2</xref>
@@ -11 +11,3 @@
-<gloss>col. form of deshou</gloss>
+<gloss>I know, right?</gloss>
+<gloss>don't you agree?</gloss>
+<gloss>I thought you'd say that!</gloss>

I agree. The glossaries that went into the old "compdic" have turned out to have a lot of 
fabrications.

G n-grams:
私用かぎ	No matches
私用カギ	No matches
私用鍵	No matches
秘密鍵	58995

Not in the refs. I think this can go.

Entry created

G n-grams:
秘密鍵	58995
秘密かぎ	3201

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>秘密かぎ</keb>
@@ -13 +16 @@
-<gloss>private key</gloss>
+<gloss>private key (cryptography)</gloss>

Entry created

@@ -13 +13,2 @@
-<gloss>(after a noun or the stem of an adjective) seeming very... (usu. with a negative connotation)</gloss>
+<s_inf>after a noun or the stem of an adjective; usu. with a negative connotation</s_inf>
+<gloss>seeming very</gloss>

Entry created

X-ref isn't really appropriate. んと欲す doesn't include する.

@@ -12 +11,0 @@
-<xref type="see" seq="2537250">しようとする</xref>

Not a conjunction.

@@ -11 +11 @@
-<pos>&conj;</pos>
+<pos>&exp;</pos>
@@ -13 +13 @@
-<s_inf>connects to ない stem</s_inf>
+<s_inf>after the ない stem of a verb</s_inf>
@@ -15 +15,2 @@
-<gloss>to aspire to</gloss>
+<gloss>to try to</gloss>
+<gloss>to want to</gloss>

んと欲す	7174
んとほっす	166
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1399286413

It seems ok, and is used quite a bit in formal old-fashioned writing. I don't think it's 
archaic in our sense.

@@ -13 +12,0 @@
-<misc>&arch;</misc>
@@ -15,0 +15 @@
+<gloss>to aspire to</gloss>

Aligning.

@@ -12,2 +12 @@
-<gloss>information illiterate</gloss>
-<gloss>people with inadequate access to information</gloss>
+<gloss>person with limited access to information (via the Internet, television, etc.)</gloss>

Daijr, GG5

@@ -13,0 +13,1 @@
+<gloss>people with inadequate access to information</gloss>

daijs
eij example sentence
nicopedia
http://dic.nicovideo.jp/a/情報弱者
http://en.wikipedia.org/wiki/Information_literacy

@@ -20,0 +21 @@
+<gloss>Internet illiterate</gloss>

Something shorter and catchier would be good, but I think this is OK.

https://ja.wikipedia.org/wiki/情弱 
http://imimatome.com/netyogonoimi/joujyaku.html

I think we need to split this into two senses.
Struggling to think of glosses, though.

@@ -12,0 +13,5 @@
+<misc>&abbr;</misc>
+<gloss>person with limited access to information (via the Internet, television, etc.)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -14,5 +19,2 @@
-<misc>&abbr;</misc>
-<gloss>information illiterate</gloss>
-<gloss>information have-not</gloss>
-<gloss>digital have-not</gloss>
-<gloss>person with limited access to or ability to interpret information</gloss>
+<misc>&derog;</misc>
+<gloss>person who is inept at using the Internet to access information</gloss>

daijr

@@ -16 +16,3 @@
-<gloss>people with inadequate access to information</gloss>
+<gloss>information have-not</gloss>
+<gloss>digital have-not</gloss>
+<gloss>person with limited access to or ability to interpret information</gloss>

gg5

@@ -12,2 +12,2 @@
-<gloss>prison sentence</gloss>
-<gloss>jail sentence</gloss>
+<gloss>unsuspended prison sentence</gloss>
+<gloss>prison sentence with no stay of execution</gloss>

研究社 新和英中辞典, jst, nikk, eij, wiki redir to 実刑

See the 2010 discussions on 2458040.
I think this the related entries can go - as Robin noted it's really a grammar point. At the 
same time sense 4 of 良い/いい should be expanded a bit to reflect this usage. I'm a bit 
limited in my editing tools at the moment.

Actually, I agree. I'll give Jim a chance to comment though.

I don't think this (or てもいい) should be an entry. It's not really an expression but a grammar point. We don't have でよい/でもいい, which is just as valid.

Perhaps somewhat of an improvement. Still wish we'd move along on allowing for notes-only meanings.

@@ -14 +14,2 @@
-<gloss>(after the ren'yōkei form of a verb) indicates concession or compromise</gloss>
+<s_inf>after the ren'yōkei form of a verb; indicates concession or compromise</s_inf>
+<gloss>(is) alright</gloss>
@@ -20 +21,2 @@
-<gloss>indicates permission</gloss>
+<gloss>(is) permissible</gloss>
+<gloss>(is) fine</gloss>

Meant to delete it.

There's not really a clear consensus here but it's been almost 6 months now. I'm going to delete this based on arguments made by me, 
Robin, and Rene. I'll add it to the 事務所 entry but as I've said, I wouldn't be miffed if it isn't included at all.

reopen as a reminder

close and reopen. given the extent of the conversation, probably this is a matter for the mailing list

It might be the case that it's much more common in handwritten Japanese than online.
https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q118149731
"私は急いでメモしないといけないときに、一種の略字として
まだれ（广）の中に“Ｋ”や“Ｏ”を入れて「慶応」としたり、
... こういう表記で、他に便利なのはありませんか？
...
事務所は事ム所だな。務はみんなムにしちゃう。"
https://books.google.co.jp/books?
id=KlYNMV9Ot0MC&lpg=PA430&ots=RhPIs9dLWH&dq=%22'%E4%BA%8B%E3%83%A0%E6%89%80%22%20%22%E5%8B%99%22&pg=PA430#v=onepage&q=%22
'%E4%BA%8B%E3%83%A0%E6%89%80%22%20%22%E5%8B%99%22&f=false
"全く務の字が一寸むづかしい貸めに、軍なる片暇名でその務音を示し間に合せてみる" (1936)
(149 unique hits on google books for 事ム所)
If so, I think that strengthens the case to include it, but it's hard to look into of course.
In general, we have included some pretty obscure kanji forms in plenty of entries. As long as they're properly marked as 
iK or oK, I don't think it's that much of an issue. Dictionary developers can decide for themselves how prominently (or 
not) they want to display these.

Daijr seems to be saying so.

Is this really a prt and not a conjugation?

@@ -9 +9,2 @@
-<gloss>(after imperative form of a verb) as if to say</gloss>
+<s_inf>after imperative form of a verb</s_inf>
+<gloss>as if to say</gloss>

I suspect it's rather obscure.

大辞泉・大辞林

ＧＧ５ example as well.

@@ -9 +9 @@
-<s_inf>used when responding affirmatively to someone's request</s_inf>
+<s_inf>used when responding affirmatively to a request</s_inf>
@@ -12,0 +13 @@
+<gloss>I got it</gloss>

daijr/s
https://ejje.weblio.jp/sentence/content/"よしきた"

gg5
 low-resilience (foam) □pillow [cushion].
g ng

低反発枕	118366

低反発枕	118366
低反発まくら	32129
低反発マクラ	3855

g ng
低反発マットレス	49080
https://eikaiwa.dmm.com/uknow/questions/16689/

バスチェア	23822
バスチェアー	7233

@@ -7,0 +8,3 @@
+<reb>バスチェアー</reb>
+</r_ele>
+<r_ele>
@@ -8,0 +12,3 @@
+</r_ele>
+<r_ele>
+<reb>バス・チェアー</reb>

g ng

バスチェア	23822
風呂イス	7511
not really wasei
https://www.walgreens.com/q/bath+chairs

ルームウェア	22798
ルームウェアー	1569

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>ルームウェアー</reb>

Aligning with my edit to 部屋着

@@ -8,0 +9,2 @@
+<xref type="see" seq="1499340">部屋着</xref>
+<xref type="see" seq="1499340">部屋着</xref>
@@ -10,0 +13 @@
+<gloss>comfortable clothing worn at home</gloss>

g ng

ルームウェア	22798
https://eikaiwa.dmm.com/uknow/questions/9157/

https://reform-s-rental.com/introduction/

Sorry, but to me "storage space" and "space to store things" are synonyms. I think Robins' addition is enough. 
About 10% of the time it seems to mean/include storage units, but I think the "esp" covers that.

gg5
収納場所[スペース] storage space.
この分譲マンションは収納場所が少ない.　This condo doesn't have enough 「storage space [places to put things].

I just think having "space to store things" or something like that is helpful and I don't see how it subtracts anything from the entry. A 
translator using jmdict would be happy to immediately have more than one synonym to choose from. Sometimes "space to store things" will be 
the more natural-sounding translation and as such, I think we should include it.

The English Google image results are misleading. When I hear "storage space", I think of storage space in a home, not self-storage units.
Before removing the other gloss, I did a Google image search for "収納スペース" and the results matched what I expected. 
We could add this to avoid confusion.

@@ -12 +12 @@
-<gloss>storage space</gloss>
+<gloss>storage space (esp. in a home)</gloss>

There's a difference between the two 
glosses though - check google images for 
"storage space" and it's all self-storage 
units. The Japanese word is much wider 
than that and is actually mainly about 
storage space in one's home. This is 
better conveyed by "space to store 
things," but it's a less straight-forward 
translation so it shouldn't be the first 
gloss.
Like I mentioned in the 入国 entry - it's 
not like the other major wa-ei's are 
trying to avoid having several similar-
sounding glosses, so I don't think we need 
to worry about being concise either. Even 
similar-sounding glosses can help to 
convey the full range of the Japanese 
word.

Don't need to repeat ourselves.

@@ -13 +12,0 @@
-<gloss>space to store things</gloss>

Google N-gram Corpus Counts
╭─ーーーーー─┬───────┬───────╮
│ 突き入れる │ 2,040 │ 97.7% │
│ 突きいれる │    48 │  2.3% │ add, sK
│ 突入れる　 │     0 │  0.0% │ add sK
╰─ーーーーー─┴───────┴───────╯

@@ -7,0 +8,4 @@
+<keb>突きいれる</keb>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
@@ -8,0 +13 @@
+<ke_inf>&sK;</ke_inf>

daij

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>突入れる</keb>

ルミナス

@@ -14,0 +15 @@
+<gloss>to push into</gloss>

大辞林

@@ -11,0 +12 @@
+<xref type="see" seq="1075350">ソープランド</xref>

g ng

特殊浴場	5441
used in daij's definitions of soapland: 
"個室式の特殊浴場。"

GG5

daij
g ng

ほいきた	6072
おいきた	269

よしきた	5672

@@ -18 +18 @@
-<gloss>charity consert</gloss>
+<gloss>charity concert</gloss>

g ng
チャリティーコンサート	47784
チャリティコンサート	25182

daijs eij

g ng

乗継地	19802
乗り継ぎ地	7007

乗継ぎ地	1511

乗継地点	179
乗り継ぎ地点	916

乗り継ぎ地点 in eij as: "transit point"
asahi keyword has "バスの乗り継ぎ地点" in an entry.

daijr

@@ -8,0 +9,3 @@
+</r_ele>
+<r_ele>
+<reb>りょうぎん</reb>

daij

Appears in names of restaurants, etc.

OK

https://www.healthline.com/nutrition/best-body-fat-scale#A-quick-look-at-the-best-body-fat-scales
https://www.chicagotribune.com/consumer-reviews/sns-bestreviews-health-the-best-body-fat-monitor-20190628-story.html
https://www.medicalnewstoday.com/articles/body-fat-scale-accuracy

I believe that "body fat scale" and "body composition monitor" are synonymous. I also compared Google Image results for these terms and 体組成計 and they all look like the same kind of product to me.

Aren't these a bit specific? For 体組成 GG5 has "〔筋肉, 脂肪などから成る体の構成〕". Its 体組成計 subentry doesn't mention fat.

Adding some common synonyms as glosses.

@@ -12,0 +13,2 @@
+<gloss>body fat monitor</gloss>
+<gloss>body fat scale</gloss>

gg5, eij
https://www.weblio.jp/content/骨量 
G n-grams: 62576

daijs, eij
https://ja.wikipedia.org/wiki/共通鍵暗号