diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:55:10 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-04 04:35:59 +0200 |
commit | 3fa570c72df3bf358988b8ce3f019bb7224c380e (patch) | |
tree | eeb2f8db4c9a619597aa6713eb8844268064caa4 /kiten | |
parent | b142e177fd839801f225b2694b98095a59869772 (diff) | |
download | tdeedu-3fa570c72df3bf358988b8ce3f019bb7224c380e.tar.gz tdeedu-3fa570c72df3bf358988b8ce3f019bb7224c380e.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 746abe84406ed1ec1a8dc68f29ce0ab8322ccc80)
Diffstat (limited to 'kiten')
-rw-r--r-- | kiten/dict.cpp | 6 | ||||
-rw-r--r-- | kiten/edict | 540 | ||||
-rw-r--r-- | kiten/kanjidic | 26 | ||||
-rw-r--r-- | kiten/kiten.cpp | 26 | ||||
-rw-r--r-- | kiten/kloader.cpp | 6 | ||||
-rw-r--r-- | kiten/ksaver.cpp | 2 | ||||
-rw-r--r-- | kiten/learn.cpp | 22 | ||||
-rw-r--r-- | kiten/widgets.cpp | 38 |
8 files changed, 333 insertions, 333 deletions
diff --git a/kiten/dict.cpp b/kiten/dict.cpp index cde11f1c..0b86e906 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -41,7 +41,7 @@ void msgerr(const TQString &msg, const TQString &dict = TQString()) { TQString output = msg; if (!dict.isNull()) - output = msg.tqarg(dict); + output = msg.arg(dict); KMessageBox::error(0, output); } } @@ -50,7 +50,7 @@ using namespace Dict; TextType Dict::textType(const TQString &text) { - ushort first = text.tqat(0).tqunicode(); + ushort first = text.at(0).tqunicode(); if (first < 0x3000) return Text_Latin; @@ -487,7 +487,7 @@ TQRegExp Dict::Index::createRegExp(SearchType type, const TQString &text, Dictio regExp = "%1"; } - return TQRegExp(regExp.tqarg(text), caseSensitive); + return TQRegExp(regExp.arg(text), caseSensitive); } int Index::stringCompare(File &file, int index, TQCString str) diff --git a/kiten/edict b/kiten/edict index 755afd4b..55456bca 100644 --- a/kiten/edict +++ b/kiten/edict @@ -115,7 +115,7 @@ ����ʤ� /(exp) to that extent/to that degree/ ��������� [����ʤդ���] /(exp) (uk) in that way/like that/that way/ �����ø� [����������] /(adj-na,adv,exp,n) moderate/right/random/not thorough/vague/irresponsible/halfhearted/(P)/ -�����ø��ˤ��ʤ��� [����������ˤ��ʤ���] /tqshape up!/act properly!/ +�����ø��ˤ��ʤ��� [����������ˤ��ʤ���] /shape up!/act properly!/ �����ø��ˤ��� [����������ˤ���] /(exp) to put an end to something/to get something over with/to quit something one has been engaged in too long or to an excessive degree/ ����ǯ�� [�����Ȥ���] /(in spite of) being old enough to know better/ ������ /(v5s) smart/cool/sharp/stylish/ @@ -1086,7 +1086,7 @@ �����ޤ��� /(exp) excuse me (coll. form of sumimasen)/ ������ [��������] /(n) pancreatitis/ �����ä� /(vs,adv) refreshed/relieved/ -�����ä� /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/ +�����ä� /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/ ������ [�����䤭] /(n) Japanese beef meal/sukiyaki/(P)/ �����Ƥ� [�����䤭] /(n) Japanese beef meal/sukiyaki/(P)/ �������� /(adv) quickly/fast/rapidly/ @@ -1098,8 +1098,8 @@ �������� /(adv) briskly/ ���ä��餫�� /(adj-na,n) penniless/broke/ ���ä��� /(adv) all/completely/thoroughly/(P)/ -���ä��� /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/(P)/ -���ä���� /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/ +���ä��� /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/(P)/ +���ä���� /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/ ���ä��� /(adv) straight/upright/erect/ ���äƤ�Ƥ� /(adj-na) flat broke/cleaned outless/penniless/ ���ä� /(adv,n,vs) straight/quickly/directly/all of a sudden/quietly/gently/softly/(P)/ @@ -1427,7 +1427,7 @@ �Ȥ���� /(conj) if we make ../if we take ../if we assume ../ �ȤäȤ� /(adv) quickly/hurriedly/ �Ȥäפ� /(adv) completely/fully/entirely/ -�Ȥ� /(n) (tqchildren's term for) fish/ +�Ȥ� /(n) (children's term for) fish/ �Ȥʤ�μ������Ĥ� [�Ȥʤ�Τ��ФդϤ�����] /(exp) the grass is always greener on the other side/ �Ȥʤ�� /where .. is concerned/ �Ȥ� /construction worker/scaffold erector/ @@ -2283,7 +2283,7 @@ �����ӡ���å� /ivy look/ �����֥饦 /eyebrow/ �����֥��� /eyebrow/ -�����֥����������� /eyebrow tqshape/ +�����֥����������� /eyebrow shape/ �����֥����ڥ� /(n) eyebrow pencil/ �����֥��� /eyebrow/ �����ܥ� /(n) ivory/ @@ -2900,7 +2900,7 @@ ���顼�� /(adj-no,n) alert/ ���顼�� /alarm/ ���饤���� /alliance/ -���饤����� /(n) tqalignment/ +���饤����� /(n) alignment/ ���饦��� /(n) around/(P)/ ���饫��� /(fr:) (n) a la carte/(P)/ ���饭�ɥ�� [���饭�ɥ�] /(n) arachidonic acid/ @@ -6845,7 +6845,7 @@ ���ĥ��� /(adv) (1) unflaggingly/steadily/untiringly/laboriously/(2) clicking/drumming/ ���ơ��� /cottage/(P)/ ���ơ��������� /cottage cheese/ -���ˡ��� /(de:) Fujiyama-tqshaped volcano (de: Konide)/(P)/ +���ˡ��� /(de:) Fujiyama-shaped volcano (de: Konide)/(P)/ ���˥�å� /(n) cognac/(P)/ ���� /(n) (abbr) connection/pull/(P)/ ���ͥ�����˥��� /(n) connectionist/ @@ -7599,7 +7599,7 @@ ���Х� /(pt:) Saturday (pt: sabado)/ ���Х� /savanna/ ���Хҡ� /(n) milkfish (Chanos chanos)/ -���Х�� /(fr:) savarin (crown-tqshaped cake served with liqueur-laced syrup)/ +���Х�� /(fr:) savarin (crown-shaped cake served with liqueur-laced syrup)/ ���Х�� /(n) savanna/sahel/(P)/ ���ѡ� /supper/(P)/ ���ѡ������ /supper club/ @@ -7929,7 +7929,7 @@ �������ӥ���� /shaving cream/ �������ӥե����� /shaving foam/ �������ӥ�������� /shaving lotion/ -�������ץ��å� /tqshape-up/ +�������ץ��å� /shape-up/ �������� /(n) scheme/schema/ �������륪���� /shale oil/ ������ /(n) (market) share/(P)/ @@ -7938,7 +7938,7 @@ ��������� /(n) sharing/(P)/ �������� /shake/(P)/ �������� /(n) shade/ -�������ץ��å� /(n,vs) tqshape-up/(P)/ +�������ץ��å� /(n,vs) shape-up/(P)/ �����ˡ���� [�����ˡ��뤤��] /(n) chenille/chenille yarn/ �����ѡ��� /(n) shepherd/(P)/ �����ѡ��ɥ����å� /shepherd's check/ @@ -8460,7 +8460,7 @@ ��������ե��� /geography/ �����ȥԥ� /Geotopia/ �����ץȥ /(de:) (n) diopter (optical unit of refraction in lenses) (de: Dioptrie)/ -������ȥ /tqgeometry/ +������ȥ /geometry/ ������ȥ�å� /(adj-na) geometric/ ���������� /geology/ ������ܥ�� [������ܥ�] /(n) dicarboxylic acid/ @@ -9643,7 +9643,7 @@ �������� /(n,adj) secondary/ ������� /(n) (1) second/(2) second base/(P)/ ������ɥ��ԥ˥��� /(n) second opinion/ -������ɥ������� /outdoor environmental educational program for city tqchildren (trans: second school)/ +������ɥ������� /outdoor environmental educational program for city children (trans: second school)/ ������ɥХå� /second bag/zippered carrying case/ �������ƥ� /(n) security/(P)/ �������ƥ��� /(n) security/(P)/ @@ -10223,7 +10223,7 @@ ���� /(n) Chile/(P)/ ������� [���ꤷ�礦����] /(n) Chile saltpeter/ ����� /tilda/(P)/ -����ɥ�� /(n) tqchildren/ +����ɥ�� /(n) children/ ���������� /thyroxine/ ������ /Tyrol/(P)/ ���� /(n) chin/(P)/ @@ -17047,7 +17047,7 @@ �桼���� /(n) eucalyptus/(P)/ �桼������ [�桼�����] /(n) eucalyptus oil/ �桼����å� /Euclid/ -�桼����åɴ����� [�桼����åɤ�������] /(n) Euclidean tqgeometry/ +�桼����åɴ����� [�桼����åɤ�������] /(n) Euclidean geometry/ �桼����åɶ��� [�桼����åɤ�������] /(n) Euclidean space/ �桼���˥��� /yugenism/ �桼����ڽ� [�桼����夦] /Yukon Territory/ @@ -17558,7 +17558,7 @@ ��ܥå� /Reebok (sneakers)/ ��ޡ� /reamer/ ��ޥ� /Riemann/(P)/ -��ޥ������ [��ޥ�����] /(n) Riemannian tqgeometry/ +��ޥ������ [��ޥ�����] /(n) Riemannian geometry/ ��� /(n) reel/(P)/ �ꥢ /(n) rear/(P)/ �ꥢ������ɡ� /rear window/ @@ -18407,7 +18407,7 @@ ���� /(n) ROM/read-only memory/(P)/ ���⡼�ȥ��� /remote sensing/ ���������ץ�å��� /Lolita complex (read Vladimir Nabokov)/ -���ꥳ�� /(n) Lolita complex/sexual attraction to tqchildren/paedophile/ +���ꥳ�� /(n) Lolita complex/sexual attraction to children/paedophile/ ���쥯�� /Rolex/ ���� /(adj-na,n) long/(P)/ ���������� /Long Island/ @@ -18425,7 +18425,7 @@ ����ɷ��� [����ɤ�������] /(n) rondo form/ ����С��ɥ졼�� /(n) Lombard rate/ ����ѡ��� /(n) rompers/ -����ѡ��롼�� /romper room/tqchildren's play room/ +����ѡ��롼�� /romper room/children's play room/ �����ͥ� /loneliness/ ������ [����] /long hair/ ��ûĴ [��������礦] /B minor/ @@ -18775,7 +18775,7 @@ ���Ǥ��� [��Ǥ���] /wonderful/ ���Ǥ� [��Ǥ�] /(v1) to love/to admire/ ���˵����� [�����ˤ�����] /(v1) to hunger (starve) for love/ -���η뾽 [�����Τ��ä��礦] /fruit of love/tqchildren/ +���η뾽 [�����Τ��ä��礦] /fruit of love/children/ ���ο� [�����Τ���] /(n) Amor/Eros/Venus/god of love/ ������ [�����Τ�] /(n) love nest/ ���� [������] /(n,vs) caress/loving dearly/ @@ -19276,7 +19276,7 @@ ���� [���Ƥ���] /address/ ���� [���Ƥ���] /(n) address/destination/(P)/ ���� [����] /(adj-na,n) as if/ -��ž���� [����Ƥ�] /(adj-t) moving smoothly/(of eyebrows) tqshapely/ +��ž���� [����Ƥ�] /(adj-t) moving smoothly/(of eyebrows) shapely/ ��̾ [���Ƥ�] /(n) address/direction/(P)/ �� [����] /(n) maidservant/elder sister/ ���� [���ͤ�] /(n) (hum) elder sister/ @@ -19693,7 +19693,7 @@ ���֤��Ѥ��� [��������] /(exp) to change the position of/ ���֥��ͥ륮�� [�������ͥ륮��] /(n) potential energy/ ���֥٥��ȥ� [�����٥��ȥ�] /(n) position vector/ -���ֹ�碌 [�������碌] /(vs) tqalignment/justification/ +���ֹ�碌 [�������碌] /(vs) alignment/justification/ ����·�� [����������] /(vs) justification/ ����ŷʸ�� [�����Ƥ���] /(n) position astronomy/ �����դ� [�����Ĥ�] /(n) placement/fixed position/(P)/ @@ -22701,7 +22701,7 @@ ���� [�����ޤ�] /(n) whirlpool/eddy/coil/ ������ [�����ޤ�] /(n) whirlpool/eddy/coil/(P)/ �������ݥ�� [�����ޤ��ݥ��] /(n) centrifugal pump/ -�������� [�����ޤ�����] /spiral-tqshaped/ +�������� [�����ޤ�����] /spiral-shaped/ ���������� [�����ޤ���褦] /whirling or spiral pattern/ ������ [�����ޤ�] /(v5k) to whirl/to eddy/to swirl/to curl (smoke)/ �������� [�����ޤ���������] /(n) spiral nebula/ @@ -22895,7 +22895,7 @@ ���ξ� [����Τ���] /(n) above the clouds/the Imperial Court/ ���� [���⤤] /(n) sky/court circles or palace/ ������ [���⤬����] /(n) disappearance/ -���� [����] /(n) cloud tqshape/ +���� [����] /(n) cloud shape/ ���� [����] /(n) clouds and smoke/landscape/ ���� [����] /(n) clouds and haze (fog)/disappearing/fleeing/ ���� [���⤫����] /(n) clouds and haze (fog)/disappearing/fleeing/ @@ -22907,8 +22907,8 @@ ���� [���㤯] /(n) cloud movements/overhanging clouds/ ���� [���⤢��] /(n) cloud movements/overhanging clouds/ ���� [���⤤] /(n) sky/the Imperial Court/ -���� [����] /(n) cloud formations/cloud-tqshaped/ -���� [���⤬��] /(n) cloud formations/cloud-tqshaped/ +���� [����] /(n) cloud formations/cloud-shaped/ +���� [���⤬��] /(n) cloud formations/cloud-shaped/ �����구 [���⤬�����礦��] /French curve/ ���� [����] /cloudscape/ ���Ԥ� [����椭] /(n) weather/look of the sky/situation/turn of affairs/signs/(P)/ @@ -23219,7 +23219,7 @@ �ѹ�̱ [���������ߤ�] /(n) British person/British citizen/Briton/ �Ѻ� [��������] /(n) departed spirit/ �Ѻ� [��������] /(n) unusual talent/ -�ѺͶ��� [�����������礦����] /special education for gifted tqchildren/ +�ѺͶ��� [�����������礦����] /special education for gifted children/ �Ѻ�ʸ [���������֤�] /(n) English composition/ �ѻ� [������] /(n) noble figure/ �ѻ� [������] /(n) English poetry/ @@ -23361,7 +23361,7 @@ ���� [�䤯�Ӥ礦] /(n) infectious disease/plague/epidemic/ ���¿� [�����Ӥ礦����] /(n) jinx/hoodoo/pest/plague/angel of death/ ���¿� [�䤯�Ӥ礦����] /(n) jinx/hoodoo/pest/plague/angel of death/ -��Ρ [������] /(n) tqchildren's dysentery/ +��Ρ [������] /(n) children's dysentery/ ���� [�����줤] /(n) epidemic/plague/pestilence/ �� [����] /(n,n-suf,vs) gain/benefit/profit/use/advantage/being beneficial (useful, profitable, valuable)/(P)/ �� [�䤯] /(n,n-suf,vs) gain/benefit/profit/use/advantage/being beneficial (useful, profitable, valuable)/ @@ -23436,7 +23436,7 @@ ���� [���Ĥ줭] /(n) career/ ���� [���Τ�����] /(n) (uk) long thin white "enokitake" mushroom/ �� [����] /(adj-na,n) disagreeable/detestable/unpleasant/reluctant/ -�ޡ� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +�ޡ� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ �ޤ� [���Ȥ�] /(v5u) to dislike/to hate/to grudge (doing)/to spare (oneself)/to be weary of/to take (good) care of/ �ޤ��� [������] /(v5s) to glut/to satiate/to weary/to tire/to bore/to weary/ �ޤ��餻 [���䤬�餻] /(n) harassment/ @@ -23450,7 +23450,7 @@ �ޤ�餷�� [����餷��] /(adj) unpleasant/disgusting/repulsive/detestable/disagreeable/indecent/lewd/dirty/lascivious/(P)/ �ޤ路�� [���Ȥ路��] /(adj) detestable/disagreeable/ �ް� [����] /(n,vs) dislike/detestation/ -�ޱ� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +�ޱ� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ �� [����] /(n) misanthropy/ �ͼ� [����] /misanthrope/ ���� [����] /(n) pessimism/weariness with life/ @@ -23500,9 +23500,9 @@ �߶� [���礦] /(n) round mirror/ �߶� [�ޤ뤫����] /(n) round mirror/ �߶� [���礯] /roundabout way (of speaking or working)/ -�߷� [�ޤ뤬��] /(n) (1) round tqshape/circle/(2) circular form/ -�߷� [����] /(n) (1) round tqshape/circle/(2) circular form/(P)/ -�߷� [�ޤ뤬��] /(n) (1) round tqshape/circle/(2) circular form/ +�߷� [�ޤ뤬��] /(n) (1) round shape/circle/(2) circular form/ +�߷� [����] /(n) (1) round shape/circle/(2) circular form/(P)/ +�߷� [�ޤ뤬��] /(n) (1) round shape/circle/(2) circular form/ �߷���� [�����������礦] /amphitheater/ �߷�æ�Ӿ� [�������Ĥ⤦���礦] /(n) alopecia areata/ �߷��� [�������] /(n) yen base/(P)/ @@ -23545,7 +23545,7 @@ ������ˡ [����Ȥ����ۤ�] /(n) cylindrical projection/ ���� [����ʤ�] /(n) within the circle/ ���� [����Ф�] /(n) disk/discus/(P)/ -���� [����Ф礦] /disk-tqshaped/ +���� [����Ф礦] /disk-shaped/ �����ꤲ [����Ф�ʤ�] /(n) discus throw/ ���� [�����] /(n) waltz/ ����� [����֤��礯] /(n) waltz (composition)/ @@ -24070,7 +24070,7 @@ ���Ф� [��������] /(n) desalinating with water/ ���� [�����䤭] /(n) fish broiled with salt/boiling seawater to get salt/ ���Ƥ� [�����䤭] /(n) grilled or broiled with salt/boiling sea water to obtain salt/ -���� [��������] /(n) cone-tqshaped/ +���� [��������] /(n) cone-shaped/ ���� [��������] /(n) salted fish (entrails)/ ���ɤ� [�������餤] /(adj) salty (taste)/(P)/ ������ [�������餴��] /(n) hoarse voice/ @@ -24464,7 +24464,7 @@ ���� [�褳���礦] /(n) lane/alley/small street intersecting a main or side street/ ��Į [�褳���礦] /(n) lane/alley/small street intersecting a main or side street/ ��Ĺ [�褳�ʤ�] /(adj-na,n) oblong/ -���֤� [�褳�Ȥ�] /(n) binding a book in an oblong tqshape/ +���֤� [�褳�Ȥ�] /(n) binding a book in an oblong shape/ ��ū [�褳�֤�] /(n) flute/fife/ ��ž [�����Ƥ�] /(n,vs) turning sideways/barrel roll/(P)/ ���ݤ� [�褳������] /(n) falling over/toppling sideways/ @@ -26960,7 +26960,7 @@ �����̼ [�Ϥʤ���ह��] /flower girl/ ��Ȫ [�ϤʤФ���] /(n) flower garden/flower bed/ ���� [����] /(n) perianth/floral envelope/ -��ɩ [�ϤʤӤ�] /(n) flower-tqshaped family crest/ +��ɩ [�ϤʤӤ�] /(n) flower-shaped family crest/ ��ɩ�� [�ϤʤӤ�����] /(n) California poppy/ ��ɹ [�Ϥʤ�����] /(n) flowers surrounded by ice/ ���� [���Ӥ�] /(n) (flower) vase/(P)/ @@ -27489,7 +27489,7 @@ ���� [���դ�] /(n) picture scroll/ ���� [���ۤ�] /(n) illustrated news magazine/pictorial/ ��ˡ [���ۤ�] /(n) art of drawing and painting/ -��ˡ������ [���ۤ���������] /(n) descriptive tqgeometry/ +��ˡ������ [���ۤ���������] /(n) descriptive geometry/ ���� [���ۤ�] /picture copybook/ ���� [�����] /(n) terminal screen/scene/picture/the field (in TV)/photo/(P)/ ���� [���ؤ�] /(n) failure/fiasco/rice-cake painting/collapse/something of little value/ @@ -27559,7 +27559,7 @@ ���� [���Ĥ�����] /(n) (death from) starvation/ � [����] /(n) (uk) brat/kids/ghoul/ ��� [�����ɤ�] /those damn kids/ -��羭 [�����������礦] /(n) boss of the tqchildren (in the neighbourhood)/bully/ +��羭 [�����������礦] /(n) boss of the children (in the neighbourhood)/bully/ �ƻ [�����ɤ�] /(n) hungry ghost/hungry devil/ ��� [��������] /(n) (death from) starvation/(P)/ ��� [����] /(n) (death from) starvation/(P)/ @@ -27741,7 +27741,7 @@ �� [�������礯] /(n) discharge/dismissal/ ���� [��������] /(n,vs) analysis/(P)/ ���ϳ� [������������] /(n) analysis/ -���ϴ����� [����������������] /analytical tqgeometry/ +���ϴ����� [����������������] /analytical geometry/ ������ [������������] /analyticity (physics)/ ���� [��������] /(n,vs) explanation/commentary/(P)/ ����� [�������Ĥ���] /(n) commentator/ @@ -28031,7 +28031,7 @@ ���ñDz� [�������夦������] /monster film/ ���� [��������] /(n) mysterious person/ ����ʪ [��������֤�] /mysterious person/ -���� [��������] /(n) oddly tqshaped stone or rock/ +���� [��������] /(n) oddly shaped stone or rock/ ���� [��������] /(n) ghost story/(P)/ ����β� [�������夦�Τ���] /mystery of mysteries/ ���� [�����Ȥ�] /(n) mysterious (phantom) thief/ @@ -29111,10 +29111,10 @@ ���λҤϳ� [������Τ��Ϥ�����] /(exp) Like father, like son/ �����̤˿� [������ΤĤ�ˤߤ�] /(exp) like water off a duck's back/ ���ˤ� [�����뤪�褮] /(n) the breaststroke/ -���� [������ޤ�] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ +���� [������ޤ�] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ ��ķ [������Ȥ�] /(game of) leapfrog/ ��ķ�� [������Ȥ�] /(n) leapfrog/ -���� [������ޤ�] /(iK) (n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ +���� [������ޤ�] /(iK) (n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ ���� [���ܤ�] /(arch) tree frog (toad)/ �� [����] /(n) fence/(P)/ ���ָ��� [�����ޤߤ�] /(v1) to take a peep at/to catch a glimpse of/(P)/ @@ -29234,7 +29234,7 @@ �ʲ��� [��������] /(n) demotion/downgrading/ �ʳ� [��������] /(adj-na,adj-no,n) nonstandard/extraordinary/special/ �ʸ� [��������] /(n) aphorism/ -�ʹ� [���ä���] /(adj-no,adj-na,n) tqshape/form/posture/suitability/moderateness (in price)/appearance/manner/(P)/ +�ʹ� [���ä���] /(adj-no,adj-na,n) shape/form/posture/suitability/moderateness (in price)/appearance/manner/(P)/ �ʹ����� [���ä�����] /(adj-na) attractive/good-looking/stylish/"cool"/ �ʹ����� [���ä�������] /(ik) (adj-na) attractive/good-looking/stylish/"cool"/ �ʹ��Τ��� [���ä����Τ���] /(adj-na) attractive/good-looking/stylish/"cool"/ @@ -29690,7 +29690,7 @@ ��Ĺ��Ǽ�ޤ� [�������礦�ˤ����ޤ�] /(exp) to take one's position as rector/ ���� [������] /(n) student/follower/students and pupils/(P)/ ��Ƹ [�����ɤ�] /(n) school child/pupil/(P)/ -��Ƹ�ݰ� [�����ɤ��ۤ���] /care of schooltqchildren outside of school time/ +��Ƹ�ݰ� [�����ɤ��ۤ���] /care of schoolchildren outside of school time/ ���� [�����Ȥ�] /(n) learning and virtue/ ���� [�����ʤ�] /(n) within the school/(P)/ ��ǯ [�����ͤ�] /(n) year in school/grade in school/(P)/ @@ -29722,7 +29722,7 @@ ���� [������礦] /(n) student hostel/dormitory (e.g. for factory workers)/ ���� [������礯] /(n) scholarship/knowledge/literary ability/(P)/ ���� [�����줤] /(n) school age/(P)/ -�����Ƹ [�����줤���ɤ�] /tqchildren of school age/ +�����Ƹ [�����줤���ɤ�] /children of school age/ ���� [�����줭] /(n) academic background/(P)/ ����Ҳ� [�����줭���㤫��] /society emphasizing education/ �� [����] /(n,suf) (1) peak/(2) mountain/(P)/ @@ -29798,7 +29798,7 @@ �۱� [�����֤�] /(n) picture frame/(P)/ �ۺ� [�Ҥ�������] /(n) the hairline/ ���ͤ� [�̤�����] /(v5k) to make a deep bow/ -���դ� [�Ҥ����Ĥ�] /(n) tqshape of one's brow or forehead/ +���դ� [�Ҥ����Ĥ�] /(n) shape of one's brow or forehead/ ���� [�������] /(n) face value/par/(P)/ ���̳�� [���������] /(n) drop below par/ ���̳� [�������] /(n) par value stock/ @@ -30037,7 +30037,7 @@ ���� [���ä�] /(n) proclamation/(P)/ ��� [��������] /(adv) as if/as it were/(P)/ ���� [��������褷] /(adv) luckily/fortunately/ -�湥 [���ä���] /(adj-no,adj-na,n) tqshape/form/posture/suitability/moderateness (in price)/appearance/manner/ +�湥 [���ä���] /(adj-no,adj-na,n) shape/form/posture/suitability/moderateness (in price)/appearance/manner/ �湥�դ��� [���ä��Ĥ���] /(v1) to affect a stylish air/ ���� [���礦��] /(oK) (adj-na,adv,n) just/right/exactly/ ���� [���äפ�] /(n) physique/bodily build/ @@ -30263,7 +30263,7 @@ �� [���֤�] /(n) helmet (of armor)/headpiece/(P)/ ���� [���֤Ȥ���] /(n) horseshoe crab/ ���� [���֤Ȥष] /(n) beetle/ -��Ƭ�� [���֤Ȥ�����] /(n) helmet-tqshaped hood/ +��Ƭ�� [���֤Ȥ�����] /(n) helmet-shaped hood/ �� [����] /(n) bulrush/cattail/ �� [����] /(n) bulrush/cattail/ ���� [���ޤȤ�] /(n) a kind of woman who pretends to be all sweet and innocent and naive/ @@ -30285,7 +30285,7 @@ ��觤� [���ޤ��] /(n) boiling in an iron pot/ �� [����] /(n) (1) sickle/(2) part of a fish around the gills/(P)/ ����ݤ��� [���ޤ���] /(exp) to trick someone into telling the truth/ -���� [���ޤ���] /(adj-no,n) sickle-tqshaped/falciform/ +���� [���ޤ���] /(adj-no,n) sickle-shaped/falciform/ ���ߤ� [���ޤɤ�] /(n) cutting grass and trees is prohibited/ ���� [���ޤ���] /(n) gooseneck/ ���һ��� [���ޤ��餸����] /(n) Kamakura period (1185-1333 CE)/ @@ -30364,7 +30364,7 @@ ���� [������] /tile-roofed house/ ���� [������] /(n) fatal flaw/ ���� [����] /(n) (uk) gas/ -������ [����餻��٤�] /(n) tile-tqshaped rice-cracker/ +������ [����餻��٤�] /(n) tile-shaped rice-cracker/ ���� [������] /(n) meaningless existence/ ���� [�����Ф�] /(n) tile block print (newspaper in Tokugawa period)/ ���� [�����֤�] /(n) tile-roofing/ @@ -31384,7 +31384,7 @@ �ɸ����� [��������] /orchestra/(P)/ �ɸ���ˡ [�����ۤ�] /(n) orchestration/ �ɸ��� [����] /(n) orchestral music/ -�ɺ� [����] /(n) administration of property/custodianship/tqreceivership/(P)/ +�ɺ� [����] /(n) administration of property/custodianship/receivership/(P)/ �ɺ�� [�����ˤ�] /(n) trustee/receiver/administrator/ �ɻ��� [��������] /(n) organ-pipe coral/ �ɾ� [���礦] /(n) taking charge/management/ @@ -31888,8 +31888,8 @@ �ݴݤ����ä� [�ޤ�ޤ�ȤդȤä�] /rotund/plump/chubby/ �ݴ� [�ޤ뤬��] /(n) round face/moon face/ �ݵ� [�ޤ�Τ�] /(n) circular saw/buzz saw/ -�ݷ� [�ޤ뤬��] /(n) (1) round tqshape/circle/(2) circular form/ -�ݷ� [�ޤ뤬��] /(n) (1) round tqshape/circle/(2) circular form/ +�ݷ� [�ޤ뤬��] /(n) (1) round shape/circle/(2) circular form/ +�ݷ� [�ޤ뤬��] /(n) (1) round shape/circle/(2) circular form/ �ݸ��� [�ޤ�ߤ�] /(n) completely visible/ �ݸ� [�ޤ뤳��] /(n) official price/ �ݹ� [�ޤ뤳��] /round steel bar/ @@ -32153,7 +32153,7 @@ ��礻 [�������碌] /(n,vs) meeting together/introduction/ ���碌 [�������碌] /(n,vs) meeting together/introduction/(P)/ ��� [����] /(n,vs) blackening the body/ -���� [�����Ť���] /(n) tqshape of the head/using make-up/ +���� [�����Ť���] /(n) shape of the head/using make-up/ ��̿� [�������㤷��] /(n) photographic portrait/ ��Ф� [��������] /(n) putting in an appearance/showing one's face/ �鿧 [��������] /(n) complexion/countenance/expression/(P)/ @@ -32415,9 +32415,9 @@ ��� [������] /(adj-na,n) strange/wonderful/weird/outrageous/mysterious/(P)/ ��� [���ä���] /(adj-na,n) strange/wonderful/weird/outrageous/mysterious/ ��� [������] /(n) wonderful sight/ -��� [������] /(n) massive rock of unusual tqshape/ -��� [������] /(n) strangely tqshaped rocks/ -������ [����������] /strangely tqshaped rocks and bizarre stones/ +��� [������] /(n) massive rock of unusual shape/ +��� [������] /(n) strangely shaped rocks/ +������ [����������] /strangely shaped rocks and bizarre stones/ ������ [������������] /(adj-na,n) very strange/bizarre/ �� [�����礦] /(adj-na,n) eccentric/ ���� [�����礦�ʤؤ�] /eccentric habit/ @@ -32607,9 +32607,9 @@ ���������ͭ�äƤ� [�����餱�äƤ��äƤ�] /with all one's faults/ �����ٶ����Ƥ� [������٤礦���Ƥ�] /however hard one may work/ ���� [�����Ф�] /(adv,n-t) how many/how much/ -���� [����] /(n) tqgeometry/(P)/ +���� [����] /(n) geometry/(P)/ ������̵�� [�����Ф���ʤ�] /(adv) not long after/before long/ -������ [��������] /(n) tqgeometry/(P)/ +������ [��������] /(n) geometry/(P)/ ������� [�������夦����] /(n) geometric series or progression/ ����ʿ�� [�����ؤ�����] /geometric average or mean/ ���פ��� [�����Ҥ�����] /(adv) forever/ @@ -33531,7 +33531,7 @@ ������ [���ˤ�����] /crack detective/ ���� [������] /(n) wizard/genius/great talent/(P)/ ���� [���ˤ�] /(n) child born with teeth/child which does not resemble its parents/ -������� [�����⤸��] /(n) goddess of childbirth and tqchildren/ +������� [�����⤸��] /(n) goddess of childbirth and children/ ���� [���ˤ�] /(n) protruding tooth (like a fang)/ ���� [������] /(n) demoness/witch/ogress/she-devil/ ���� [���ˤ���] /(n) fierce god/ @@ -33910,7 +33910,7 @@ �Ʋ� [���ä�] /(n) chrysanthemum/ �Ʒ� [�����Ť�] /(n) the ninth month in the lunar calendar/ �ƺ�� [�����Ť���] /(n) chrysanthemum growing/ -�ƿͷ� [�����ˤ礦] /(n) chrysanthemum-tqshaped puppet/ +�ƿͷ� [�����ˤ礦] /(n) chrysanthemum-shaped puppet/ ���� [��������] /(n) ammonite (traditional name)/ ��Ƚ [�����Ф�] /(n) A5/medium octavo/small octavo/ �� [�ޤ�] /(n) ball/ @@ -34355,21 +34355,21 @@ �� [���] /(n) bow (and arrow)/(P)/ �ݤ���� [��ߤ�Ҥ�] /(exp) to draw a bow/ �ݶ� [���夦��] /things used in archery/ -�ݷ� [���夦����] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ -�ݷ� [��ߤ���] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ -�ݷ� [��ߤʤ�] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ -�ݷ��ˤʤ� [��ߤʤ�ˤʤ�] /(exp) to bend backward/to become bow-tqshaped/ +�ݷ� [���夦����] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ +�ݷ� [��ߤ���] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ +�ݷ� [��ߤʤ�] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ +�ݷ��ˤʤ� [��ߤʤ�ˤʤ�] /(exp) to bend backward/to become bow-shaped/ �ݸ� [��ߤŤ�] /(n) bowstring/ �ݻ� [��ߤ�] /(n) bow maker/ �ݼ�꼰 [��ߤȤꤷ��] /(n) bow-twirling ceremony in sumo/ �ݼ� [����] /(n) one's left hand/ �ݽ� [���夦�����] /(n) (Japanese) archery/ -�ݾ� [���夦���礦] /(adj-no,n) bow-tqshaped/arched/ +�ݾ� [���夦���礦] /(adj-no,n) bow-shaped/arched/ ���� [���] /(n) strength needed to pull back a bow/ ���� [���夦����] /(n) bows and arrows/war/ -��ĥ�� [��ߤϤ�] /(n) paper lantern with bow-tqshaped handle/ +��ĥ�� [��ߤϤ�] /(n) paper lantern with bow-shaped handle/ ��ĥ��� [��ߤϤ�Ť�] /(n) crescent moon/ -��ĥ������ [��ߤϤ�¤礦����] /paper lantern with bow-tqshaped handle/ +��ĥ������ [��ߤϤ�¤礦����] /paper lantern with bow-shaped handle/ ��ƻ [���夦�ɤ�] /(n) (Japanese) archery/(P)/ ���� [���夦��] /(n) archery and horsemanship/ ���� [���夦��] /(n) bow and arrow/ @@ -34624,7 +34624,7 @@ �嵺 [���夦��] /(n) billiards/ �嵻 [���夦��] /(n) any ball game/(P)/ ��� [���夦����] /(n) coccus/(P)/ -��� [���夦����] /(adj-no,n) globular or spherical tqshape/ +��� [���夦����] /(adj-no,n) globular or spherical shape/ ��� [���夦����] /(n) (plant) bulb/onion/ �庬 [���夦����] /(n) (plant) bulb/ ���ɸ [���夦���Ҥ礦] /(n) spherical coordinates/ @@ -34638,7 +34638,7 @@ ���� [���夦����] /(n) baseball team/(P)/ ���� [���夦�Ǥ�] /(n) ball lightning/ ���� [���夦���] /(n) spherical surface/ -���̴����� [���夦�������] /(n) spherical tqgeometry/ +���̴����� [���夦�������] /(n) spherical geometry/ ���̶� [���夦��礦] /(n) spherical mirror/ ���̻���ˡ [���夦����ۤ�] /spherical trigonometry/ ���� [������] /(v1) to master/to investigate thoroughly/ @@ -35209,7 +35209,7 @@ ���� [����Ȥ�] /(n) lights to lure fish/ ��ƻ [����ɤ�] /(n) path taken by school of fish/fish ladder/ ���� [����ˤ�] /(n) fish meat/(P)/ -���� [����Ф�] /(n) wooden gong tqshaped like a fish/ +���� [����Ф�] /(n) wooden gong shaped like a fish/ ���� [�����] /(n) fertilizer made from fish parts/ ��ʢ [����դ�] /(n) fish entrails/ ��ʴ [����դ�] /(n) fish meal/ @@ -35633,7 +35633,7 @@ ���� [���礦����] /(n) boundary/(P)/ ������ [���礦��������] /(n) boundary line/ ���������� [���礦������������] /boundary value problem/ -����Ĵ�� [���礦�������礦����] /tqalignment/ +����Ĵ�� [���礦�������礦����] /alignment/ ����ɸ [���礦�����Ҥ礦] /landmark/ �������� [���礦���������] /bounding theory/ ���� [���礦����] /(n) circumstances/one's situation or lot in life/ @@ -36387,7 +36387,7 @@ �ʵ� [���礯��] /(n) acrobatic feats/ �ʵ� [����ä��夦] /(n) curve ball/ �ʶ� [���ޤ���] /nooks/corners/ -�ʶ� [�ޤ�����] /(n) (ancient) comma-tqshaped jewels/ +�ʶ� [�ޤ�����] /(n) (ancient) comma-shaped jewels/ �ʷ� [���礯����] /(n) acrobatics/ �ʷݻ� [���礯������] /acrobat/tumbler/ �ʻ� [���礯��] /(n) wickedness/injustice/ @@ -37928,7 +37928,7 @@ ����� [�������] /(v1) (uk) to stoop/to bend/ ���� [���ä��礦] /(adj-na,n) robust (health)/obstinate/sturdy/muscular/ ���� [���ä��礯] /(n) be crooked/bent/indented/ -������ [���ä��礯��] /(n) elbow/elbow-tqshaped bend/ +������ [���ä��礯��] /(n) elbow/elbow-shaped bend/ ���� [���ä���] /(n) flexor muscle/ ������ [���ä�������] /(n) phototropism/ ���� [���ä�] /(adj-no,n) leading/foremost/preeminent/outstanding/one of the best/(P)/ @@ -38532,7 +38532,7 @@ ���� [������] /(n) silicon (Si)/ ���� [��������] /(n) diatom/ ������ [����������] /(n) diatomaceous soil/ -�� [����] /(n) mold/model/style/tqshape/data type/(P)/ +�� [����] /(n) mold/model/style/shape/data type/(P)/ �����Ȥ�� [�����ˤϤ��] /(v1) to stereotype/to squeeze into a pattern/to regiment/ ���� [��������] /(n) pattern paper (for dressmaking)/ ���� [��������] /(n) model/(P)/ @@ -38542,7 +38542,7 @@ ���ˤ� [������֤�] /(adj-na,adj-no,n) unusual/unconventional/ ���� [�����Ф�] /(n) pattern number/ ���Ѵ� [�����ؤ�] /type conversion/ -������ [����������] /(n,vs) losing tqshape/getting out of tqshape/ +������ [����������] /(n,vs) losing shape/getting out of shape/ ���� [�����勞] /(n) mold/ ���� [������] /(n) pledge/vow/promise/destiny/share bed and board/ ���� [������] /(v5r) to pledge/to promise/to swear/ @@ -38559,19 +38559,19 @@ ����� [�����䤯����] /(n) (written) contract/ ���������� [�����䤯�դꤳ��] /(n) breach of contract/ �������� [�����䤯������] /(n) contract dispute/ -�� [������] /(n) form/tqshape/figure/type/(P)/ -��������� [�������������] /(exp) to get out of tqshape/to lose tqshape/ -���Ť��� [�������Ť���] /(v5r) to form/to tqshape/to make/to mold/to build up/(P)/ -���ȿ����Ѥ��� [�������Ȥ�������] /(exp) to change the tqshape and color of/ -���ɤ� [�����ɤ�] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ -���շ� [����������] /(n) (MA) tqshape-of-the-mind fist/Hsing I Chuan/ +�� [������] /(n) form/shape/figure/type/(P)/ +��������� [�������������] /(exp) to get out of shape/to lose shape/ +���Ť��� [�������Ť���] /(v5r) to form/to shape/to make/to mold/to build up/(P)/ +���ȿ����Ѥ��� [�������Ȥ�������] /(exp) to change the shape and color of/ +���ɤ� [�����ɤ�] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ +���շ� [����������] /(n) (MA) shape-of-the-mind fist/Hsing I Chuan/ ���� [��������] /(n) the form and its shadow/things inseparable/ ���� [��������] /(n) ruin/wreck/mere skeleton/framework/ ������ [����������] /(n) becoming a mere shell or dead letter/ ���� [�����Ф���] /for form's sake/ ���� [������] /(n) memento/souvenir/(P)/ ����ʬ�� [�����ߤ櫓] /(n) distribution of mementos/ -����� [�������Ť���] /(v5r) to form/to tqshape/to make/to mold/to build up/ +����� [�������Ť���] /(v5r) to form/to shape/to make/to mold/to build up/ ������ [��������] /(adj-no,n) physical/material/ �������� [������������] /(n) physical sciences/ ������ [���������礦] /(n) metaphysical/ @@ -38587,12 +38587,12 @@ ���� [��������] /(n) form and nature/ ����ž�� [�������ĤƤ�] /transformation/ ����Ƴ�� [�������Ĥɤ��ˤ夦] /transduction/ -����� [�����ɤ�] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ +����� [�����ɤ�] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ ���� [�������礦] /(n) scenic beauty/ -���� [�������礦] /(n) tqshape/figure/image/ -���ݲ� [�������礦��] /(n) giving tqshape to/ -���� [�������礦] /(n) tqshape/form/(P)/ -����������� [�������礦��������������] /tqshape memory alloy/ +���� [�������礦] /(n) shape/figure/image/ +���ݲ� [�������礦��] /(n) giving shape to/ +���� [�������礦] /(n) shape/form/(P)/ +����������� [�������礦��������������] /shape memory alloy/ ������ [�ʤ�դ�] /(n) one's appearance/ ���� [��������] /(n) condition/situation/prospects/(P)/ ���� [��������] /(n,vs) formation/(P)/ @@ -38604,10 +38604,10 @@ ���� [��������] /(n) traces/evidence/(P)/ ���� [���礦����] /(n) features/look/aspect/phase/form/ ���� [��������] /(n) features/look/aspect/phase/form/ -��¤�� [�������Ť���] /(v5r) to form/to tqshape/to make/to mold/to build up/ -���� [��������] /(n) form/tqshape/figure/ +��¤�� [�������Ť���] /(v5r) to form/to shape/to make/to mold/to build up/ +���� [��������] /(n) form/shape/figure/ ���� [�ʤ꤫����] /one's appearance/ -���� [��������] /(n) form/tqshape/figure/(P)/ +���� [��������] /(n) form/shape/figure/(P)/ ���ֳ� [������������] /(n) morphology/ ������ [����������] /(n) morpheme/ ������ [������������] /(n) morphology/ @@ -39778,7 +39778,7 @@ ��ˤ� [�Ĥ�����] /(adj-na,n) monthly/ ��ˤ���־� [�Ĥ�������夦���㤸�礦] /parking lot rented on a monthly basis/ ��� [���Ĥ���] /Mondays and Fridays/ -��� [�Ĥ�����] /(n) crescent tqshape/ +��� [�Ĥ�����] /(n) crescent shape/ ��� [���ä���] /(n) laurel/the moon/ ��˴� [���ä�������] /(n) laurel wreath/ ��˼� [���ä�������] /(n) laurel tree/bay tree/ @@ -39972,7 +39972,7 @@ ���� [����] /(n) fencer/swordsman/ ���� [���㤯] /(n) fencer/swordsman/ ���� [�������] /(n) cup-and-ball game/ -���� [����] /sword tqshape/ +���� [����] /sword shape/ ���� [����] /(n) sword play/samurai drama/(P)/ ���� [����] /(n) weapons/arms/ ���� [����] /(n) master fencer/ @@ -39980,7 +39980,7 @@ ���� [����] /(n) fencer/(P)/ ���� [����] /sacred sword and jewels/ ���� [�����] /(n) fencing/ -���� [���礦] /sword-tqshaped/ +���� [���礦] /sword-shaped/ ���� [����] /(n) point of a sword/ ���� [����] /sword belt/ ��ƻ [����ɤ�] /(n) kendo/swordmanship/fencing/(P)/ @@ -40046,7 +40046,7 @@ ���� [����뤤] /(n) stronghold/ ��ϴ [�������] /(adj-na,n) solid/ �� [����] /(adj-na,n) disagreeable/detestable/unpleasant/reluctant/(P)/ -���� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +���� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ ���� [���餤] /(adj-na,n) dislike/hate/(P)/ ������ [���餤��] /do not like/dislike/ ���� [���餦] /(v5u) to hate/to dislike/to loathe/(P)/ @@ -40068,7 +40068,7 @@ ������ʪ [�������֤�] /(adj-na) anaerobe/ ���� [����] /(n) suspicion/(P)/ ������ [������] /(n) suspect/ -���� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +���� [���䤤��] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ ��̣ [�����] /(adj-na,n) disagreeableness/gaudiness/sarcasm/ ���� [����] /(v5t) to erect/to be erected/to be built/(P)/ ���Ƥ� [���Ƥ�] /(v1) to build/to construct/(P)/ @@ -42599,7 +42599,7 @@ ��� [��������] /(n) following or later or last clause or article, etc./ ��� [������] /(n-adv,n-t) afterwards/ ����� [���ꤴ��] /(n,vs) recoil/hesitation/flinching/shrinking back/ -�庫 [��������] /(n) grandtqchildren/posterity/ +�庫 [��������] /(n) grandchildren/posterity/ ��� [������] /(n) second wife/(P)/ ��� [���Ȥ���] /(n) second crop/ �建 [���Ȥ���] /(n) placenta/afterbirth/secundina/ @@ -43633,7 +43633,7 @@ ���� [������] /(n) accusation/prosecution/(P)/ ���� [��������] /(n) public funeral/ ��¹�� [�����礦] /(n) ginkgo/maidenhair tree/ -��ã [�������] /(n) kings/tqchildren of nobles/young nobleman/ +��ã [�������] /(n) kings/children of nobles/young nobleman/ ��ã [��������] /(n) official announcement/ ���� [��������] /(n) public corporation/(P)/ ���Ľ��� [�������夦����] /public housing/ @@ -43786,7 +43786,7 @@ ������ [���ɤ狼��] /(n) kidnapper/ ������ [���ɤ狼��] /(v5s) to kidnap/ ������ [�������礦] /(n) summons/warrant of arrest/ -���� [�ޤ�����] /(n) (ancient) comma-tqshaped jewels/ +���� [�ޤ�����] /(n) (ancient) comma-shaped jewels/ ���� [�����Ф�] /(n) slope/incline/gradient/grade/pitch/(P)/ ��α [������夦] /(n) detention/confinement/ ���� [���Ĥ�] /(adj) cordial/kind/warm(hearted)/thick/deep/(P)/ @@ -43895,7 +43895,7 @@ ������ [�������줤] /(adj-na,n) speaking elegantly/speaking clearly/not coveting food/speaking like an innocent person/ ���� [�����褻] /(n) spiritualism/necromancy/ ���� [������] /(n) bad breath/intimation/ -���� [�������] /(n) the mouth/tqshape of the mouth/near an entrance/ +���� [�������] /(n) the mouth/shape of the mouth/near an entrance/ ���� [�������礦] /(n) affidavit/deposition/ ������ [�������礦����] /affidavit/deposition/ ���Ҥä��� [�����ϤФä���] /acting smart/bragging/ @@ -43908,7 +43908,7 @@ ������ [��������] /(n,vs) quarrel/dispute/ ������ [��������] /(n,vs) quarrel/dispute/ ������ [����������] /(adj) discreet/tight-lipped/ -���� [�������] /(n) the mouth/tqshape of the mouth/near an entrance/ +���� [�������] /(n) the mouth/shape of the mouth/near an entrance/ �����餷 [�����٤餷] /(n) reducing the mouths to feed/ ������ [�������Ȥ�] /(n) words in common use/ ���Ǥ� [����������] /(n) verbal promise/ @@ -44033,8 +44033,8 @@ ���� [������] /(n) oral tradition/legend/folklore/ ��ɦ [�����Ҥ�] /(n) moustache/ ����Ĵˡ [�����֤��礦�ۤ�] /(adj-na,n) poor talker/ -���դ� [�����Ĥ�] /(n) (1) (in the tqshape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ -���դ� [�����Ť�] /(n) (1) (in the tqshape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ +���դ� [�����Ĥ�] /(n) (1) (in the shape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ +���դ� [�����Ť�] /(n) (1) (in the shape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ ���դ����� [�����Ť����Ф�] /cigarette with a mouthpiece/ ���դ� [�����Ť�] /(n) kiss/ ���դ��� [�����Ť���] /(v1) to kiss/ @@ -44247,7 +44247,7 @@ ���� [������] /(n) (baseball) good hit/ ���Ǽ� [����������] /good batter/ ���˻� [��������] /(n) handsome man/ -��Ĵ [�������礦] /(adj-na,n) favourable/promising/satisfactory/in good tqshape/(P)/ +��Ĵ [�������礦] /(adj-na,n) favourable/promising/satisfactory/in good shape/(P)/ ��Ũ�� [�����Ƥ�����] /(n) worthy rival or opponent/ ��Ŭ [�����Ƥ�] /(adj-na,n) ideal/fit/fitted/fitting/suitable/ ��ŷ [�����Ƥ�] /(n) fine weather/(P)/ @@ -47765,7 +47765,7 @@ ���� [�������夦] /recasting/ ��Ĵ [�������礦] /(n,vs) reexamination/reinvestigation/ ��Ĵ�� [�������礦��] /re-examination/reinvestigation/ -��Ĵ�� [�������礦����] /readjustment/retqalignment/ +��Ĵ�� [�������礦����] /readjustment/realignment/ ��ľ�ܿ��� [�������礯���Ĥ�����] /(n) redirect examination/ ����� [�����Ƥ���] /(n) (math) redefinition/ ����� [�����Ƥ�����] /proposing again/ @@ -47790,7 +47790,7 @@ ��dz [�����ͤ�] /(n) recurrence/revival/resuscitation/(P)/ ���� [�����Ϥ�] /(int,n) worshipping again/bowing twice/epistolary clothing/ ���� [�����Ϥ�] /(n) second defeat/ -������ [�����Ϥ���] /(n) rearrangement/reallocation/retqalignment/ +������ [�����Ϥ���] /(n) rearrangement/reallocation/realignment/ ������ [�����Ϥ���] /redistribution/ ����ʬ [�����Ϥ��֤�] /redistribution/ ��ȯ [�����Ϥ�] /(n) return/relapse/reoccurrence/(P)/ @@ -47961,7 +47961,7 @@ �� [�Ĥ�] /(n) (hum) wife/(P)/ �ʤκ� [�ĤޤΤ�] /status of wifehood/ �ʸ� [�Ĥޤ�] /(n) (pair of) wooden doors in the interior of a home/ -�ʻ� [������] /(n) wife and tqchildren/(P)/ +�ʻ� [������] /(n) wife and children/(P)/ �ʻҤ�Ȥ��� [��������������] /(exp) to be accompanied by one's family/ �ʻһ��� [���������] /man with wife and kid(s)/ �ʼ� [��������] /(n) wife/ @@ -48599,7 +48599,7 @@ ������� [�������㤷�餺] /anonymous/ ���̤�� [��������ߤ��礦] /anonymous/author unknown/ ��� [������] /farm/workshop/ -��� [������] /(n,vs) drawing (figures)/construction (in tqgeometry)/ +��� [������] /(n,vs) drawing (figures)/construction (in geometry)/ ���� [��������] /(n,vs) frame/draw up/make/producing/creating/preparing/writing/(P)/ �������� [���������������] /implementation technique/ ������ [������������] /implementor/author/ @@ -49019,7 +49019,7 @@ �����ޤ� [�ߤĤ���] /(n) folded in three/ ������ [�ߤĤ���] /(n) set of three/ ����·�� [�ߤĤ�����] /(n) three-piece suit/ -������ [�ߤĤɤ⤨] /(n) 3 fat-comma tqshapes arranged to form a circle/ +������ [�ߤĤɤ⤨] /(n) 3 fat-comma shapes arranged to form a circle/ ����Ⱦ [�ߤĤФ�] /(n) three-stroke alarm/ �����Ԥ� [�ߤĤ���] /(n) braided cord/ ������ [�ߤĤޤ�] /(n) three-pronged fork/ @@ -49206,7 +49206,7 @@ ������ [����ˤ�] /trio/gang of three/threesome/ ���� [����] /(adj-no,n) eloquent/ �������� [����Τ���] /eloquent tongue/ -���� [����] /tqchildren of nisei/3rd generation in US/ +���� [����] /children of nisei/3rd generation in US/ ���� [����] /(n) past and present and future existences/ ������ [������] /(n) the Book of Divination/ ���纵 [����] /(n) (MA) trident dagger/ @@ -49253,7 +49253,7 @@ ������ [�ߤä�����] /three days/ ������ [�ߤ�����] /(ik) (n) new moon/crescent moon/ ������ [�ߤ��Ť�] /(n) new moon/crescent moon/(P)/ -������� [�ߤ��Ť�����] /(adj-no) crescent tqshape/ +������� [�ߤ��Ť�����] /(adj-no) crescent shape/ �������� [�ߤä��ߤФ�] /3 days and 3 nights/ �������� [�ߤä��ߤ�] /3 days and 3 nights/ ����ŷ�� [�ߤä��Ƥ�] /(n) a short-lived rule/being in power only for a brief period/brief championship/ @@ -49473,7 +49473,7 @@ ���� [��ޤ�] /(n) speculative spirit/ ���� [���礦] /(n) gorge/ravine/gap/ ���� [��ޤ���] /(n) gorge/ravine/gap/ -���� [��ޤ���] /(n) mountain-tqshaped/(P)/ +���� [��ޤ���] /(n) mountain-shaped/(P)/ ������ [��ޤ�������] /prefecture in the Touhoku area/ ���� [����] /(n) mountain path/ ���� [����] /(n) mountain range/mountain system/(P)/ @@ -49580,7 +49580,7 @@ ���Ĥ� [��ޤʤ�] /(n) rumbling of a mountain/ ���� [������] /(n) temple gate/ ���� [�����] /(n) hills and fields/countryside/(P)/ -���� [����褦] /(n) in the tqshape or form of a mountain/ +���� [����褦] /(n) in the shape or form of a mountain/ ���� [�䤮] /(n) goat/ ���Ӻ� [�䤮��] /(n) Capricorn/ ����ɦ [�䤮�Ҥ�] /goatee/ @@ -50521,7 +50521,7 @@ ������ [���ޤ��ؤ�] /(n) companion (sister) volume (to)/sequel (to)/ ��̻ [���ͤळ] /(n) the husband of one's elder sister/ ���Ϳͷ� [���ͤ��ޤˤ礦] /paper doll modeled after a kimono-clad woman/ -�� [������] /(n) figure/tqshape/appearance/(P)/ +�� [������] /(n) figure/shape/appearance/(P)/ �Ѥ� [��������魯] /(exp) to make an appearance/ �Ѥ�ä� [��������] /(exp) to disappear/ �ѳ� [��������] /(n) portrait/ @@ -50534,9 +50534,9 @@ �� [��] /(n,n-suf) child/(P)/ �� [��] /(n) first sign of Chinese zodiac (The Rat, 11p.m.-1a.m., north, November)/ �ҡ�¹�� [��������] /(n) posterity/one's descendants/ -�Ҥɤ� [���ɤ�] /(n) child/tqchildren/ -�Ҥɤ⤿�� [���ɤ⤿��] /(n) tqchildren/ -�Ҥɤ�ã [���ɤ⤿��] /(n) tqchildren/ +�Ҥɤ� [���ɤ�] /(n) child/children/ +�Ҥɤ⤿�� [���ɤ⤿��] /(n) children/ +�Ҥɤ�ã [���ɤ⤿��] /(n) children/ �Ҥι� [�ͤΤ���] /midnight/ �Ҥλ� [�ͤΤȤ�] /midnight/ �Ҥ뤳�ȿƤ�ǡ���� [����ߤ뤳�Ȥ���ˤ�����] /(exp) The parent is the best judge of the child/ @@ -50545,7 +50545,7 @@ �ҥޥ��� [���ޥ���] /wealthy women who strive to follow the fashions exactly and be seen in all the right place/ �Ұ³� [���䤹����] /cowrie shell/ �Ұ³� [���䤹����] /(n) cowrie/cowry/ -�Ұ�� [��������] /(n,vs) raising tqchildren/ +�Ұ�� [��������] /(n,vs) raising children/ �Ҳ� [������] /(n) consonant/ �Ҳ��� [������] /consonant cluster/ �Ҳ��� [������] /consonantal/ @@ -50562,23 +50562,23 @@ �ҵ�Ŧ�� [�����夦�Ƥ������] /(n) hysterectomy/ �ҵ��� [�����夦����] /uterine cervix/ �ҵ� [������] /(n) calf/(P)/ -�Ҷ� [���ɤ�] /(n) child/tqchildren/(P)/ +�Ҷ� [���ɤ�] /(n) child/children/(P)/ �Ҷ����ߤ� [���ɤ⤸�ߤ�] /childish/ -�Ҷ����� [���ɤ⤿��] /(n) tqchildren/ -�Ҷ��˳ݤ��� [���ɤ�ˤ�����] /(exp) to depend on one's tqchildren/ -�Ҷ��˴Ť� [���ɤ�ˤ��ޤ�] /be indulgent to (one's) tqchildren/ -�Ҷ��˸ä�ͷ�� [���ɤ�ˤޤ��äƤ�����] /(exp) to join tqchildren at play/ +�Ҷ����� [���ɤ⤿��] /(n) children/ +�Ҷ��˳ݤ��� [���ɤ�ˤ�����] /(exp) to depend on one's children/ +�Ҷ��˴Ť� [���ɤ�ˤ��ޤ�] /be indulgent to (one's) children/ +�Ҷ��˸ä�ͷ�� [���ɤ�ˤޤ��äƤ�����] /(exp) to join children at play/ �Ҷ����� [���ɤ�Τ�] /Children's Day Holiday (May 5th)/ �Ҷ���ع��˾夲�� [���ɤ�ä����ˤ�����] /(exp) to send one's child to school/ �Ҷ���ǥ�� [���ɤ��Ϥ��] /(exp) to conceive/to become pregnant/ �Ҷ����� [���ɤ⤢�Ĥ���] /(n) treating someone like a child/ �Ҷ��� [���ɤ⤴����] /(n) childlike mind/judgment as a child/ �Ҷ����ߤ� [���ɤ⤸�ߤ�] /childish/ -�Ҷ�ã [���ɤ⤿��] /(n) tqchildren/ +�Ҷ�ã [���ɤ⤿��] /(n) children/ �Ҷ����� [���ɤ�٤�] /(n) child's room/nursery/ -�Ҷ��� [���ɤ�դ�] /(n) tqchildren's clothing/ -�Ҷ��� [���ɤ�褦] /(adj-no) for use by tqchildren/ -�Ҷ�Ϣ�� [���ɤ⤺��] /accompanied by tqchildren/ +�Ҷ��� [���ɤ�դ�] /(n) children's clothing/ +�Ҷ��� [���ɤ�褦] /(adj-no) for use by children/ +�Ҷ�Ϣ�� [���ɤ⤺��] /accompanied by children/ �Ҷ��٤� [���ɤ���ޤ�] /(n) mere child's play/kid stuff/childish trick/ �Ҷ� [�����礯] /(n) (computer) slave station/ �Ҹ� [������] /(n) puppy/ @@ -50597,13 +50597,13 @@ �Ҽ� [�����] /(n) babysitter/nursemaid/(P)/ �Ҽ鱴 [����ꤦ��] /(n) lullaby/ �Ҽ�� [����ꤦ��] /(n) lullaby/(P)/ -�Ҽ� [������] /(n) tqchildren/descendants/ +�Ҽ� [������] /(n) children/descendants/ �ҽ� [������] /(n) child/(P)/ ��© [������] /(n) (hon) son/(P)/ ��¹ [������] /(n) descendants/posterity/offspring/(P)/ -������ [����������] /(adj-na,n) many tqchildren/large family/ +������ [����������] /(adj-na,n) many children/large family/ ���� [���Ƥ�] /(n) young(er) people/(P)/ -���� [����] /(n) tqchildren/ +���� [����] /(n) children/ ���� [���֤�] /piglet/ ��ǭ [���ͤ�] /(n) kitten/ ��ǯ [�ͤ��ߤɤ�] /year of the rat/ @@ -50611,17 +50611,17 @@ ��ǹ�� [���Τ�����] /(n) ascomycete/sac fungus/ ���� [������] /(n) pony/ ����Ǻ [���ܤ�Τ�] /(adj-na,n) indulgent/fond/ -��ʡ�� [���֤�����] /(n) person blessed with many tqchildren/ +��ʡ�� [���֤�����] /(n) person blessed with many children/ ��ʬ [���֤�] /(n) henchman/follower/ ����� [���Ȥ�] /(game of) catch-the-child/ -���� [��������] /(n) the treasure that is tqchildren/tqchildren/ +���� [��������] /(n) the treasure that is children/children/ ���� [������] /(n) child's role in Noh dance/ ��˼ [���ܤ�] /(n) ovary (of plants)/ ���� [���䤯] /(n) dramatic role for child/child actor/(P)/ ���� [���ҤĤ�] /(n) lamb/ ���� [���褦] /(n) cotyledon/seed leaf (i.e. the first leaves to emerge when a seed sprouts)/ -��Υ�� [���Фʤ�] /(n) parents' ability (or inability) to let go of their tqchildren/ -��Ϣ�� [���Ĥ�] /taking one's tqchildren along/ +��Υ�� [���Фʤ�] /(n) parents' ability (or inability) to let go of their children/ +��Ϣ�� [���Ĥ�] /taking one's children along/ ���� [������] /(n) eclampsia/ �� [�����Ф�] /(n) corpse/ �ӳ� [������] /(n) body/corpse/remains/ @@ -50944,7 +50944,7 @@ �ظƤδ� [�����Τ���] /hailing distance/ �ظ� [������] /(n) OO (object oriented)/directional (microphone)/ �ظ��� [����������] /(n) directivity/ -�ظ������� [�����������Ф��䤯] /tqshaped charge/ +�ظ������� [�����������Ф��䤯] /shaped charge/ �غ� [�����ޤ�] /(n) (MA) two-pronged weapon for catching a criminal/man-catcher war fork/ �غ��� [��Ӥ���] /(v5s) to point at/(P)/ �ػȤ� [��ӤŤ���] /(n) fingering/ @@ -51129,7 +51129,7 @@ �ޤ��路�� [�����路��] /with branches crossing each other/ �ޤ���� [������] /(exp) to prune a tree/ �ޤ����� [������Ϥ���] /(exp) to trim (prune) a tree/ -���� [�����֤�] /(n) tqshape of a tree/ramifications/ +���� [�����֤�] /(n) shape of a tree/ramifications/ ���� [�����줶����] /(n) variety of cherry tree with drooping branches/weeping cherry/ ����� [�������ʤ�] /(n) weeping willow/ ��� [�����줶����] /(n) variety of cherry tree with drooping branches/weeping cherry/ @@ -51917,7 +51917,7 @@ ���ߤ� [�Ϥɤ�] /(n) brake/(P)/ ���� [������] /(n) quality of teeth/ ���� [�Ϥ����] /(n) gear/cog-wheel/(P)/ -���� [�����礦] /(n) dentation/tooth tqshape/ +���� [�����礦] /(n) dentation/tooth shape/ ������ [������] /dental nerve/ ���� [������] /(n) (tooth) pulp/ ���� [������] /(n) hard tooth tartar/calculus deposit/ @@ -52151,9 +52151,9 @@ �� [��] /(n-suf) child/(P)/ ���� [����] /(n) mere child's play/ ���� [������] /(n) boys and girls/ -���� [������] /tqchildren/ -��¹ [������] /(n) tqchildren and grandtqchildren/descendants/ -��Ƹ [���ɤ�] /(n) tqchildren/juvenile/(P)/ +���� [������] /children/ +��¹ [������] /(n) children and grandchildren/descendants/ +��Ƹ [���ɤ�] /(n) children/juvenile/(P)/ ��Ƹ�� [���ɤ���] /(n) pictures drawn by a child/ ��Ƹ���� [���ɤ����㤯����] /(n) child abuse/ ��Ƹ�� [���ɤ�����] /(n) juvenile play/ @@ -53154,7 +53154,7 @@ ���� [��������] /(n-adv) July/(P)/ ���� [��������] /(n) the seven wise men/ ������ [��������] /(n) seven-stringed koto/ -���� [����������] /(n) (1) festival (shrine visit) by tqchildren aged 7, 5 and 3/(2) lucky numbers 7, 5 and 3/(P)/ +���� [����������] /(n) (1) festival (shrine visit) by children aged 7, 5 and 3/(2) lucky numbers 7, 5 and 3/(P)/ ������ [����ʤ�] /(n) sacred shrine rope/ ����Ĵ [���������礦] /(n) seven-and-five-syllable meter/ ���� [�ʤʤҤ���] /(n) profiting from the influence of another/ @@ -53203,8 +53203,8 @@ ����Ļ [���������礦] /(n) turkey/ ������ [�������ɤ�] /(adj-na,n) great trouble/difficulty/ ���� [������] /(n) celebration of a child's seventh day/ -��ͼ [��������] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for tqchildren's artistic development/ -��ͼ [���ʤФ�] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for tqchildren's artistic development/(P)/ +��ͼ [��������] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for children's artistic development/ +��ͼ [���ʤФ�] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for children's artistic development/(P)/ ���� [�����褦] /(n) the seven luminaries (sun, moon, and five planets)/the seven days of the week/ ����ɽ [�����褦�Ҥ礦] /(n) calendar/ ���� [�������] /(n) earthen charcoal brazier (for cooking)/ @@ -54914,7 +54914,7 @@ ��ݤ��� [�Ƥ�����] /(v1) to handle/to manage/to work with/to rear/to look after/to have experience with/ ��ݤ� [�Ƥ�����] /(n) (1) clue/key/(2) contact/trail/scent/track/(3) on hand/handhold/ ��褱 [�Ƥ���] /(exp) (1) doing one's own flower arranging/(2) marrying or making a mistress of a geisha/ -�괬�� [�Ƥޤ�] /(n) (1) winding or rolling by hand/(2) hand-rolled sushi, usually cone-tqshaped/ +�괬�� [�Ƥޤ�] /(n) (1) winding or rolling by hand/(2) hand-rolled sushi, usually cone-shaped/ �괬���� [�Ƥޤ�����] /sushi wrapped in nori/ �괷�餷 [�Ƥʤ餷] /(n) practice/exercise/training/ ��� [�Ƥ���] /(n) wiles/ @@ -56378,7 +56378,7 @@ ���ߤ� [���ߤ�] /(n) dwelling/house/residence/den/habitat/ ���߲� [���ߤ�] /(n) dwelling/house/residence/den/habitat/ ���ߴ���� [���ߤʤ��] /(v1) to get used to living in/ -���߹Ӥ餹 [���ߤ��餹] /(v5s) to leave a house in bad tqshape/ +���߹Ӥ餹 [���ߤ��餹] /(v5s) to leave a house in bad shape/ ���߹��� [���ߤ���] /(adj-no,n) live-in/ ���߹��� [���ߤ���] /(v5m) to be a live-in employee/to live in/to live with/ ���߽� [���ߤ�] /(n) dwelling/house/residence/den/habitat/ @@ -57463,8 +57463,8 @@ �������� [�Ǥ������] /if at all possible/(P)/ �����¤� [�Ǥ��뤫����] /as .. as one can/ �����¤���� [�Ǥ��뤫���ꤽ����] /as soon as possible/ASAP/ -����Ǥ� [�Ǥ��Ф�] /(n) (1) result/effect/performance/success/(2) workmanship/execution/tqshape and quality of (an article)/finishing touches/ -����ɤ� [�Ǥ��Ф�] /(n) (1) result/effect/performance/success/(2) workmanship/execution/tqshape and quality of (an article)/finishing touches/ +����Ǥ� [�Ǥ��Ф�] /(n) (1) result/effect/performance/success/(2) workmanship/execution/shape and quality of (an article)/finishing touches/ +����ɤ� [�Ǥ��Ф�] /(n) (1) result/effect/performance/success/(2) workmanship/execution/shape and quality of (an article)/finishing touches/ ������ [�Ǥ�������] /(v1) to be too much/to be too good to be true/ ������ [�Ǥ�������] /result/effect/performance/success/ ����� [�Ǥ�����] /(n) yield/crop/production/(P)/ @@ -58405,7 +58405,7 @@ ���äݤ� [����ʤäݤ�] /womanly/feminine/womanish/effeminate/ ���ȵ���� [����ʤȤ������] /(exp) to flirt with a woman/ ���ȸ��� [����ʤȤޤ����] /(exp) to sleep with a woman/ -���˲����� [����ʤˤФ���] /(exp) to assume the tqshape of a woman/to change into a woman/ +���˲����� [����ʤˤФ���] /(exp) to assume the shape of a woman/to change into a woman/ ���˶��� [����ʤˤ��뤦] /(exp) to run mad after a girl/ ���˿���å���� [����ʤˤ������Ф���] /(exp) to be fascinated (captivated) by a woman/ �����Լ�ͳ [����ʤˤդ��椦] /a guy who never gets the women/nerd/ @@ -58458,7 +58458,7 @@ ���� [���ʤ�] /(n) woman/girl/ ���� [���礷] /(n) woman/girl/(P)/ ���ҳ��� [���礷��������] /female student/ -���Ҷ� [����ʤ��ɤ�] /(n) women and tqchildren/ +���Ҷ� [����ʤ��ɤ�] /(n) women and children/ ���ҹ� [���礷����] /(n) girls' school/ ���ҹ� [���礷����] /(n) girls' high school/ ���ҹ��� [���礷��������] /female high-school student/ @@ -58723,7 +58723,7 @@ �� [������] /(n) (1) workman/artisan/mechanic/carpenter/(2) means/idea/ ���� [���礦��] /(n) affectation/desire to be impressive/ �� [�ޤ�] /(n) (1) measure/unit of volume (1.8l)/(2) square container, e.g. a box/(P)/ -���� [�ޤ�����] /(n) square (tqshape)/ +���� [�ޤ�����] /(n) square (shape)/ ���� [�ޤ�����] /(n) tatami "box seat" for four people at sumo or kabuki/ ���� [���礦����] /rising up/ ���� [�ޤ���] /(n) (1) measure/(2) square (of graph paper)/(3) box/ @@ -59332,10 +59332,10 @@ ���� [���礦����] /(n) short interval of leisure/ ���� [���礦����] /short break or breather/lull/ ���� [���礦����] /(n) short rest/recess/ -����̱ [���礦�����ߤ�] /(n) the rising generation/tqchildren/ +����̱ [���礦�����ߤ�] /(n) the rising generation/children/ ���� [���礦��] /(n) major/lieutenant commander/wing commander/(P)/ ���� [���礦��] /(n) low birth rate/ -���Ҳ� [���礦����] /(n) declining birth rates/decrease in the number of tqchildren/ +���Ҳ� [���礦����] /(n) declining birth rates/decrease in the number of children/ ������ [���礦���ۤ�] /small capital/ ���� [���礦��] /(n-adv,n-t) one's early days/little while/ ���� [���礦����] /young person/ @@ -59832,7 +59832,7 @@ �Ȥ��֤� [�Ƥ꤫����] /(n) reflection/ �Ȥ��֤� [�Ƥ꤫����] /(v5s) to reflect/to throw back light/ �Ȥ� [�Ƥ�] /(v5r,vi) to shine/(P)/ -�Ȥ�Ȥ�˷�� [�Ƥ�Ƥ�ܤ���] /(n) paper doll to which Japanese tqchildren pray for fine weather/ +�Ȥ�Ȥ�˷�� [�Ƥ�Ƥ�ܤ���] /(n) paper doll to which Japanese children pray for fine weather/ �Ȥ줯���� [�Ƥ줯����] /(adj) embarrassing/awkward/ �Ȥ�� [�Ƥ��] /(v1) to be shy/to feel awkward/(P)/ �Ȥ챣�� [�Ƥ줫����] /(n) hiding one's embarrassment/ @@ -59852,7 +59852,7 @@ �ȼ�ˡ [���礦����ۤ�] /irradiation/ �ȼ��� [���礦�����] /irradiation field (of X-rays)/ �ȼ� [���礦���㤯] /(n) sight (of a firearm)/ -�Ƚ� [���礦�����] /(n) tqalignment/(P)/ +�Ƚ� [���礦�����] /(n) alignment/(P)/ �Ƚ�� [���礦�����] /(n) sighting device/sights/ �Ⱦ� [�Ƥ�䤭] /(n) cooking method (broiled with sweet soy marinade)/ ���� [���礦����] /(n) bead or front sight of a firearm/ @@ -60046,7 +60046,7 @@ �� [����] /(n) elephant/(P)/ �ݤ��� [��������] /elephant/ �ݤ�ɡ [�����ΤϤ�] /trunk of an elephant/ -�ݤ� [�����ɤ�] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ +�ݤ� [�����ɤ�] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ �ݲ� [������] /(n) ivory/(P)/ �ݲ���� [�������ΤȤ�] /ivory tower/ �ݲ糤�� [��������������] /(the Republic of) Ivory Coast/ @@ -60916,7 +60916,7 @@ ���ڽ� [���礦�ɤ��夦] /(n) Pure Land sect (of Buddhism)/Jodo (sect)/ ���ڿ��� [���礦�ɤ��夦] /Jodo Shinshu (offshoot of the Jodo sect)/(P)/ ������ [���礦���] /(n) ballad drama/drama narrator for the bunraku theatre/ -�� [���礦] /(n,n-suf) tqshape/(P)/ +�� [���礦] /(n,n-suf) shape/(P)/ ���� [���礦���礦] /(n) state of affairs (around you)/situation/circumstances/(P)/ �����ˤ�ä� [���礦���礦�ˤ�ä�] /depending on the situation/depending on circumstances/ �����˰ͤ� [���礦���礦�ˤ��] /(col) It depends on the situation/ @@ -61377,7 +61377,7 @@ ���ѥ� [���礯�ѥ�] /(n) plain bread/(P)/ ���㤤 [����������] /(n) discrepancy/different or conflicting opinions/(P)/ ���㤦 [����������] /(v5u) to cross each other/to run counter to/to differ/to clash/to go awry/(P)/ -���� [���礯����] /educating tqchildren to have a good diet/ +���� [���礯����] /educating children to have a good diet/ ���� [���礯��] /(n) dietary cure/ ������ˡ [���礯����礦�ۤ�] /dietary cure/ ���� [���礯����] /(n) table salt/(P)/ @@ -63252,7 +63252,7 @@ �˻ɤ� [�Ϥꤵ��] /(n) pincushion/ �˽� [�����] /(n) acupuncture/ �˾����� [���礦�ܤ�����] /(adj-na,n) exaggeration/making a mountain out of a molehill/ -�˾� [�Ϥꤸ�礦] /(adj-no) needle-tqshaped/pointed/ +�˾� [�Ϥꤸ�礦] /(adj-no) needle-shaped/pointed/ ������ [�Ϥꤻ��ܤ�] /(n) porcupinefish/ ���� [�Ϥ�ͤ���] /(n) hedgehog/porcupine/ ����ε [�Ϥ�⤰��] /(n) spiny anteater/echidna/ @@ -63885,7 +63885,7 @@ �ز� [�����] /(n) encampment/ �س� [����] /(n) ancient soldier's straw hat/party rank and file/ �ط� [����] /(n) (military) formation/ -�ؼ�� [����Ȥ�] /(n) tqchildren's game in which the aim is to occupy the other's home base/ +�ؼ�� [����Ȥ�] /(n) children's game in which the aim is to occupy the other's home base/ �ؼ�� [����ɤ�] /(v5r) to encamp/to take up positions/ ������ [���������] /(n) war drum/ ���� [�����] /(n) (military) encampment/position/(P)/ @@ -64546,8 +64546,8 @@ �� [����] /(n) drill/auger/ ����� [������] /(n) (tail)spin/ �� [�Ĥ�] /(n) spindle/ -��� [�Ĥब��] /(adj-no) spindle-tqshaped/fusiform/ -��� [�������礦] /spindle tqshaped/ +��� [�Ĥब��] /(adj-no) spindle-shaped/fusiform/ +��� [�������礦] /spindle shaped/ ��� [������] /(adj-na,n) voluntary/optional/(P)/ ��ն� [����������] /(n) a voluntary muscle/ ��� [��������] /(n) best/greatest/first/(P)/ @@ -65412,7 +65412,7 @@ ������ [����������] /astral body/ ���� [�ۤ�����] /(n) starry sky/(P)/ ���� [�ۤ�����] /(n) stardust/ -���� [�ۤ�����] /(n) star tqshape/pentagram/ +���� [�ۤ�����] /(n) star shape/pentagram/ ������ [�ۤ��Ť���] /(n) starry night/ ������ [�ۤ��Ť���] /(n) starry night/ ���� [������] /(n) constellation/(P)/ @@ -65595,7 +65595,7 @@ ��³ [��������] /(n) book or document and its supplement/ ��¿�ѷ� [��������������] /(n) (math) regular polygon/ ��¿���� [���������] /(n) regular polyhedron/ -���� [���礦����] /(n) natural tqshape/one's true colors/true character/consciousness/senses/(P)/ +���� [���礦����] /(n) natural shape/one's true colors/true character/consciousness/senses/(P)/ ���� [��������] /(adj-na,n) fairness/justice/ ���� [�������㤯] /(n) legal wife/her child/main family/ ���� [�����Ƥ�] /(n) legal wife/her child/main family/ @@ -67107,7 +67107,7 @@ �ֻ� [�����դ�] /(n) goods sold/clearance sale/ �ֻ� [��������] /(n) rust/ �ֻ� [������] /(n) baby/ -�ֻ� [������] /(n) (arch) imperial tqchildren/imperial child/ +�ֻ� [������] /(n) (arch) imperial children/imperial child/ �ֻ� [��������] /(n) draft papers/callup notice/ �ֻ� [������餵��] /(n) purplish red/ �ֻ� [������] /(n) deficit/go in the red/(P)/ @@ -68065,7 +68065,7 @@ �������� [���Ǥ�餤] /(adj-no) inherited/ ������ [�����Ф���] /(v5r) to be forward/to be impertinent/ ������ [����������] /(n) postpone/(P)/ -���� [�����֤�] /(adj-na,n) thicker towards the end/club-tqshaped/ +���� [�����֤�] /(adj-na,n) thicker towards the end/club-shaped/ ���ߤ� [��������] /(n) payment in advance/ ���� [�������] /(n) family predecessor/previous age/previous generation/(P)/ ��ã [�������] /(n) guide/leader/pioneer/ @@ -68173,7 +68173,7 @@ ��� [����] /(n-adv,n-t) all ages/great antiquity/eternity/ �麹���� [���Ф�٤�] /(adj-na,n) an infinite variety of/ ��� [���Ȥ�] /(n) millennium/one thousand years/(P)/ -��а� [���Ȥ�����] /(n) red and white candy stick sold at tqchildren's festivals/ +��а� [���Ȥ�����] /(n) red and white candy stick sold at children's festivals/ ��� [����] /(n) thousand years/long time/millennium/perpetuity/ ��ܰ�� [������������] /(n) once in a lifetime (opportunity)/(a golden opportunity that may) happen only once in a thousand years/ �黰�� [����ߤĤ�] /broker/land agent/great liar/unreliable person/ @@ -68600,12 +68600,12 @@ �� [������] /(n) folding fan/(P)/ ��Ω�Ƥ� [���������Ƥ�] /(v1) to fan incessantly/to agitate/to instigate/ �� [������] /(v5g) to fan/to flap/(P)/ -��� [����������] /(n) fan tqshape/(P)/ -��� [����] /(n) fan tqshape/(P)/ +��� [����������] /(n) fan shape/(P)/ +��� [����] /(n) fan shape/(P)/ ��� [����] /(n) folding fan/(P)/ ��� [���礦] /(n) sensational/ ���Ū [���礦�Ƥ�] /(adj-na) inflammatory/lascivious/sensational/ -��� [���礦] /(n) fan form (tqshape)/ +��� [���礦] /(n) fan form (shape)/ ����� [���礦��] /(n) alluvial fan or delta/ ��ư [����ɤ�] /(n,vs) agitation/abetting/(P)/ ��ư�� [����ɤ�����] /agitator/ @@ -68867,7 +68867,7 @@ ������� [�����] /line graph/line chart/ ����« [���ˤ���] /fascicle/fiber bundle/ ���� [����] /(n) line drawing/ -���� [����] /(n) (1) line/straight tqalignment/(2) (math) linear/ +���� [����] /(n) (1) line/straight alignment/(2) (math) linear/ ������� [���������] /(n) linear precedence/LP/ ������� [������������] /linear algebra/ �������� [���������] /linear logic/ @@ -70665,7 +70665,7 @@ ��� [������] /(n) mutual affection or love/ ����갦 [��������������] /(n) mutual love/ ��� [������] /(n) resemblance/similarity/analogy/(P)/ -����� [����������] /(n) (in tqgeometry) similar figures/ +����� [����������] /(n) (in geometry) similar figures/ ����� [�������Ƥ�] /(n) point of likeness (between)/resemblance/similarity/ ����� [�������] /(n) joint ownership/sharing/going Dutch/ �꼡���� [�����Ĥ���] /(adv) one after the other/successively/ @@ -71909,7 +71909,7 @@ ¹�μ� [�ޤ��Τ�] /(n) back scratcher/ ¹���� [�ޤ��Ӥ�] /(n) citation at second remove/second hand citation/ ¹�� [�ޤ����礯] /(n) (computer) sub-node/sub-station/ -¹�� [�ޤ���] /(n) tqchildren and grandtqchildren/posterity/descendants/ +¹�� [�ޤ���] /(n) children and grandchildren/posterity/descendants/ ¹©�� [�ޤ��ह��] /grandson/ ¹��� [�ޤ��Ǥ�] /(n) disciples of one's disciples/ ¹̼ [�ޤ��ह��] /(n) granddaughter/(P)/ @@ -72518,7 +72518,7 @@ �ɼ�� [�����Ȥ�] /(n) helmsman/coxwain/steering/guidance/ �ɼ� [������] /(n) helmsman/coxswain/ �ʱ� [������] /(n) ellipse/ -�ʱ߷� [������] /(n) elliptical tqshape/(P)/ +�ʱ߷� [������] /(n) elliptical shape/(P)/ ������ [�����] /(n) dharani/spell/litany/Sanskrit multi-syllabic chant/ �̡��û� [�����ä�] /(n) unmanageable child/spoiled child/spoilt/ �̲ۻ� [������] /(n) cheap sweets/(P)/ @@ -72549,7 +72549,7 @@ �Τ��˴��餹 [������व�ˤʤ餹] /(exp) to inure oneself to cold/ �Τ��魯 [�����魯] /(exp) to parry/to dodge/ �ΤФ� [�������ΤФ�] /(exp) to stretch (unbend) oneself/ -�Τ����� [������ʤ�] /(exp) to take form (tqshape)/ +�Τ����� [������ʤ�] /(exp) to take form (shape)/ �Τ��ˤ��� [���������] /(exp) to be lazy/ �Τ�ȿ�餹 [������餹] /(exp) to bend oneself backward/ �Τ�ʴ�ˤ��� [������ˤ���] /working assiduously/ @@ -72824,7 +72824,7 @@ �ӻ� [���Ӥ���] /(n) wrapper band/ �ӽˤ� [���Ӥ��襤] /(n) obi-tying ceremony designed to ensure safe birth of a child/ �ӽ� [���������] /(n,vs) taking out/using at home/ -�Ӿ� [���Ӥ��礦] /(adj-no,n) belt-tqshaped/ +�Ӿ� [���Ӥ��礦] /(adj-no,n) belt-shaped/ �Ӿ��� [�������礦�ۤ�����] /(n) shingles/herpes zoster/ �ӿ� [���Ӥ���] /(n) thick obi sash/sash padding/ �ӿ� [���Ӥ���] /(n) thick obi sash/sash padding/ @@ -73130,8 +73130,8 @@ �� [�ޤ椺��] /(n) blackened eyebrows/eyebrow pencil/ ���� [��������] /blackish blue/ �� [����] /(n) (red) snapper/schnapper/sea bream/(P)/ -��� [�����䤭] /(n) fish-tqshaped pancake filled with bean jam/ -��Ƥ� [�����䤭] /(n) fish-tqshaped pancake filled with bean jam/ +��� [�����䤭] /(n) fish-shaped pancake filled with bean jam/ +��Ƥ� [�����䤭] /(n) fish-shaped pancake filled with bean jam/ ���� [�����ᤷ] /(n) rice with minced sea bream (tai)/ �� [����] /(n) price/materials/substitution/ �� [����] /(n-suf) (1) charge/cost/price/(2) switchboard/ @@ -73348,7 +73348,7 @@ �礽�줿 [�������줿] /(n) outrageous/monstrous/appalling/inordinate/ ��äԤ� [�����äԤ�] /(adv) openly/in public/without hesitation/ ��ʤ꾮�ʤ� [�����ʤꤷ�礦�ʤ�] /(exp) to a greater or lesser extent (degree)/more or less/ -��λ� [�����Τ�] /(n,vs) tqshape of the "dai" kanji (esp. person with arms and legs outstretched)/ +��λ� [�����Τ�] /(n,vs) shape of the "dai" kanji (esp. person with arms and legs outstretched)/ ���ǭ���� [�����Τͤ�����] /ardent cat lover (fancier)/ ��ޤ� [�����ޤ�] /(adj-na,n) rough/broad/generous/general/(P)/ ��ޤ��˸����� [�����ޤ��ˤ�����] /generally speaking/ @@ -74197,7 +74197,7 @@ á���ڤ� [����������] /(v5r) to mangle/to hack down/to chop down/ á���� [����������] /(n) chopping block/springboard for discussion/ á���繩 [������������] /clumsy carpenter/ -á��ľ�� [�������ʤ���] /(v5s) to beat into tqshape/ +á��ľ�� [�������ʤ���] /(v5s) to beat into shape/ á���٤� [�������Ĥ֤�] /(v5s) to smash up/to defeat crushingly/ á����� [����������] /(n) sacrifice sale/ á���դ��� [�������Ĥ���] /(v1) to strike/to throw/to slap something onto/ @@ -74776,7 +74776,7 @@ ü�� [�Ϥ�����] /(n) foreword/preface/introduction/postscript/ ü�� [�Ϥ�����] /(n) lowly maidservant/ ü�� [�Ϥ���] /(n) fraction/ -ü�� [����] /(adj-na,n) tqshapely/graceful/ +ü�� [����] /(adj-na,n) shapely/graceful/ ü�� [����] /(adj-na,n) handsome/noble/ ü�ڤ� [�Ϥ���] /(n) scrap of cloth/odds and ends/ ü�ޤ� [�Ϥ�����] /(v5r) to tuck up/to abridge/ @@ -75112,7 +75112,7 @@ ���� [������] /(n) greater waterfall (of the two)/ ��ǭ [���ͤ�] /(n) tomcat/male cat/ ����Ϥ [���Ȥ��֤�] /(n) (public) baths for men/ -��ʢ [���Ȥ��Ф�] /(n) woman who has borne only male tqchildren/ +��ʢ [���Ȥ��Ф�] /(n) woman who has borne only male children/ ��ʪ [���Ȥ����] /(n) men's/for men/ ��ʸ�� [���Ȥ��⤸] /(n) man's handwriting/kanji/ ���ؽ� [���Ȥ��٤�] /(n) men's toilet/ @@ -75408,9 +75408,9 @@ ���� [���ͤ���] /(n) shrewmouse/shrew/ ���� [������] /(n) stratum/layer/(P)/ ���� [������] /(n) geographic features/divination based on the lay of the land/ -��¢ [������] /(n) Ksitigarbha (bodhisattva who looks over tqchildren, travellers and the underworld)/the Receptacle of Earth/(P)/ +��¢ [������] /(n) Ksitigarbha (bodhisattva who looks over children, travellers and the underworld)/the Receptacle of Earth/(P)/ ��¢�� [����������] /(n) gentle and round face/ -��¢º [����������] /(n) Jizo (guardian deity of tqchildren)/(image of) Khitigarbha-bodhisattva/ +��¢º [����������] /(n) Jizo (guardian deity of children)/(image of) Khitigarbha-bodhisattva/ ��³�� [���ĤŤ�] /(n) adjoining land/ ���ж� [����������] /(adj-no) surface-to-air/ ������ [��������] /(adj-no) surface-to-surface/ @@ -75706,7 +75706,7 @@ ���� [�������] /(n) bamboo grove/ ���� [�����Ф䤷] /(n) bamboo thicket/ ���� [�������] /(n) bamboo thicket/(P)/ -���� [������] /(n) tube-tqshaped fish-paste cake/ +���� [������] /(n) tube-shaped fish-paste cake/ ������ [�������] /(n) flour paste cake in the form of a tube/ ���� [�����Ϥ�] /(n) history/ ��� [�����ܤ���] /(n) bamboo broom/ @@ -75942,7 +75942,7 @@ ��ʪ�� [����Τ�����] /dressed in a kimono/ ��ʪ�� [����Τ�] /kimono material/ ���� [���㤯�٤�] /arriving in America/ -������ [��������] /(n) worn out of tqshape/ +������ [��������] /(n) worn out of shape/ ��˹ [���㤯�ܤ�] /(n,vs) putting on one's hat/ ���Ĥ� [���֤���] /(n) bundling up (in layers of clothes)/ ���Ĥ�� [���֤����] /(v1) to be thickly clad/ @@ -76474,7 +76474,7 @@ ��� [�Ҥ뤲] /(n) lunch/midday meal/ �� [�Ϥ���] /(n) pillar/post/(P)/ ����� [�Ϥ���ɤ���] /(n) wall clock/ -��� [���夦���礦] /(n) in the tqshape of a pillar or column/ +��� [���夦���礦] /(n) in the shape of a pillar or column/ ���� [���夦����] /(n) pillar/cornerstone/ ���� [���夦��] /(n) plinth/ ��Ƭ [���夦�Ȥ�] /(n) capital of column/ @@ -76545,7 +76545,7 @@ ����Τ餻 [�ष�Τ��餻] /(exp,n) foreboding/ ��⻦���� [�ष�⤳������] /(exp) innocent-looking/looking as though butter would not melt in the mouth/ ��� [�ष����] /(exp) to control one's temper/ -��� [�ष������] /(n) tqchildren's medicine for nervousness/snack for an empty stomach/ +��� [�ष������] /(n) children's medicine for nervousness/snack for an empty stomach/ ��� [�ष������] /(n) deworming medicine/ � [���夦����] /(n) insect damage/ ��� [�ष�ܤ�] /(n) airing out/ @@ -76566,7 +76566,7 @@ ����� [�ष����] /(n) insect peddler/ ������ [�ष�դ���] /(n) incantation to rid a child of worms/ ��ʢ [�ष�Ф�] /(n) stomach pain due to worms/ -���� [�ष������] /(n) tqchildren's medicine for nervousness/ +���� [�ष������] /(n) children's medicine for nervousness/ �����͵��� [���夦�褦�Ȥä�����] /appendicitis/ ���� [���夦���] /(n) (1) insect egg(s)/(2) parasite egg(s)/ ���� [���夦�뤤] /(n) worms and insects/ @@ -76697,7 +76697,7 @@ ������ [���礦����] /clove oil/ ���� [���礦��] /(n) clove/ ���� [�Ƥ���] /(n) letter "T"/ -������ [�Ƥ�������] /(n) T-tqshaped/ +������ [�Ƥ�������] /(n) T-shaped/ �������구 [�Ƥ����������礦��] /T square/ ������ [�Ƥ�������] /(n) T bandage/ �����구 [�Ƥ������礦��] /(n) T square/ @@ -76808,8 +76808,8 @@ ĥ���դ��� [�Ϥ�Ĥ���] /(v1) to attach to a flat surface with glue/to paste/to stick/to affix/ ĥ�������� [�Ϥꤵ����] /(v1) to burst (open)/to break/to split/ ĥ�� [�Ϥ�] /(v5r,vi,vt) to stick/to paste/to put/to affix/to stretch/to spread/to strain/to stick out/to slap/to be expensive/to tighten/(P)/ -ĥ�� [�Ϥ꤫��] /(n) penis-tqshaped device, traditionally made of horn, shell or papier mache/dildo/ -ĥ�� [�Ϥ꤬��] /(n) penis-tqshaped device, traditionally made of horn, shell or papier mache/dildo/ +ĥ�� [�Ϥ꤫��] /(n) penis-shaped device, traditionally made of horn, shell or papier mache/dildo/ +ĥ�� [�Ϥ꤬��] /(n) penis-shaped device, traditionally made of horn, shell or papier mache/dildo/ ĥ�� [�Ϥꤳ] /(n) papier mache/ ĥ�ܿ� [���礦�ۤ�ˤ�] /(n) ringleader/originator/perpetrator/(P)/ ĥ�� [���礦��礯] /(n) tension/tensile strength/ @@ -76892,7 +76892,7 @@ ī�� [���礦����] /(n) morning assembly (school)/ ī�� [���礦����] /(n) morning newspaper/(P)/ ī�� [������] /(n) during the morning/ -ī�� [��������] /(n) (1) funnel tqshaped/bell (i.e. of a trumpet)/(2) morning-glory (flower)/(P)/ +ī�� [��������] /(n) (1) funnel shaped/bell (i.e. of a trumpet)/(2) morning-glory (flower)/(P)/ ī���� [����������] /(n) staying out all night and coming home in the morning/ ī���� [��������] /(n) early rising/ ī�� [���礦��] /(n) court council/privy council/ @@ -78284,7 +78284,7 @@ �ߤ�ê [�Ĥ����] /(n) suspended shelf/ �ߤ�ŷ�� [�Ĥ�Ƥ礦] /(n) suspended ceiling/ �ߤ����� [�Ĥ�ɤ�����] /(n) hanging lantern/ -�ߤ��� [�Ĥ��] /(n) slant or almond-tqshaped eyes/ +�ߤ��� [�Ĥ��] /(n) slant or almond-shaped eyes/ �ߤ��� [�Ĥ��] /(n) (gymnastic) rings/ �ߤ��� [�Ĥ꤫��] /gondola/ �ߤ� [�Ĥ�] /(v5r) to hang/(P)/ @@ -78571,9 +78571,9 @@ ��� [�Ƥ����夦] /(n) regular holiday/(P)/ ����� [�Ƥ����夦��] /(n) regular holiday/(P)/ ��� [�Ƥ����礦] /regular employment/ -�귿 [�Ƥ�����] /(n) fixed form/regular tqshape/stereotyped/(P)/ +�귿 [�Ƥ�����] /(n) fixed form/regular shape/stereotyped/(P)/ �귿�� [�Ƥ�������] /(n) fixed form poetry/ -��� [�Ƥ�����] /(n) fixed form/regular tqshape/stereotyped/(P)/ +��� [�Ƥ�����] /(n) fixed form/regular shape/stereotyped/(P)/ �������ʪ [�Ƥ����������椦�Ӥ�֤�] /(n) non-standard-sized mail/ ���ư�� [�Ƥ������ɤ���] /finite verb/ �����ʪ [�Ƥ������椦�Ӥ�֤�] /standard size mail/ @@ -78688,7 +78688,7 @@ ��Ʀ [�����ޤ�] /(n) blister (on the sole of the foot)/corn/ ������ [��������] /(n) bottoming out (of prices)/(P)/ ��ȴ�� [�����̤�] /(adj-na,n) bottomless/ -���� [�Ƥ��ؤ�] /(n) base (tqgeometry, society)/(P)/ +���� [�Ƥ��ؤ�] /(n) base (geometry, society)/(P)/ ���� [�Ƥ��ۤ�] /(n) original text/draft/ ��̵�� [�����ʤ�] /(n) bottomless/ ���� [�Ƥ����] /(n) the base/ @@ -79083,7 +79083,7 @@ Ŭ�� [�Ƥ��줤] /(n) exemplification/ Ŭ�� [�Ƥ��줤] /(n) suitable age/(P)/ Ŭ��� [�Ƥ��줤��] /(n) marriageable age/(P)/ -ŭ�� [���֤��] /(n) arrow to which is attached a turnip-tqshaped whistle made of hollowed-out wood or deer horn/ +ŭ�� [���֤��] /(n) arrow to which is attached a turnip-shaped whistle made of hollowed-out wood or deer horn/ Ů�餹 [���ܤ餹] /(v5s) (1) to drown/(2) to cause to be indulged or addicted/ Ů��� [���ܤ��] /(v1) to be drowned/to indulge in/(P)/ Ů����� [���ܤ줳��] /(v5m) to drown/to get addicted/to become infatuated/ @@ -79484,7 +79484,7 @@ ŷŨ [�Ƥ�Ƥ�] /(n) natural enemy/ ŷư�� [�Ƥ�ɤ�����] /(n) Ptolemaic theory/ ŷƲ [�Ƥ�ɤ�] /(n) heaven/paradise/ -ŷƸ [�Ƥ�ɤ�] /cherub/gods disguised as tqchildren/tqchildren parading as cherubs/ +ŷƸ [�Ƥ�ɤ�] /cherub/gods disguised as children/children parading as cherubs/ ŷƻ [�Ƥ�Ȥ�] /(n) Providence/the sun/way of heaven/destiny/divine justice/ ŷƻ [�Ƥ�ɤ�] /(n) Providence/the sun/way of heaven/destiny/divine justice/ ŷƻ�� [�Ƥ�Ȥ��ܤ�] /(adj-no) sun-dried/ @@ -80254,7 +80254,7 @@ �ɤ골 [�̤ꤨ] /(n) picture for coloring in/ �ɤ���� [�̤ꤳ��] /(v5m) to paint over heavily/to plaster up/ �ɤ����� [�̤ꤳ���] /(v1) to seal up/ -�ɤ��ؤ��� [�̤꤫����] /(v1) to tqrepaint/(P)/ +�ɤ��ؤ��� [�̤꤫����] /(v1) to repaint/(P)/ �ɤ��٤� [�̤�Ĥ֤�] /(v5s) to paint out/ �ɤ�Ȥ [�̤�Ф�] /(n) lacquered chopsticks/ �ɤ��դ��� [�̤�Ĥ���] /(v1) to daub/to smear/ @@ -80653,7 +80653,7 @@ �� [��ä�] /(n) servant/fellow/ �� [���] /(n) (vulg) fellow/guy/chap/(P)/ �ۤ��� [��ä�����] /(n) guy/fellow/chap/footman/attendant/ -���� [��ä�����] /(n) kite tqshaped like a footman/ +���� [��ä�����] /(n) kite shaped like a footman/ ���� [��Ĥ�] /(n) they/those guys/ ��Ʀ�� [��ä��ɤ���] /(n) cold tofu cut into cubes/ ���� [�ɤϤ�] /(n) guys/fellows/ @@ -81482,7 +81482,7 @@ ���� [�ĤĤ�] /(n) round well/(P)/ ������ [�ĤĤ��Ť�] /(n) well curb of a round well/ ���� [�ĤĤ���] /(n) the sound of gunfire/ -���� [�ĤĤ���] /(n) tube-tqshaped/cylindrical/ +���� [�ĤĤ���] /(n) tube-shaped/cylindrical/ ���� [�Ȥ����礦] /cylindrical/ ���ڤ� [�ĤĤ���] /(n) round slices/ ���� [�ĤĤ���] /(n) nozzle/muzzle/gunpoint/ @@ -82014,8 +82014,8 @@ Ʊ�� [�ɤ����礯] /(n) the said bureau/the same bureau/(P)/ Ʊ�� [�ɤ���] /(n) same ward/ Ʊ�� [�ɤ�����] /(n) kun homophone/ -Ʊ�� [�ɤ�����] /(n) isomorphism/same tqshape/same type/same pattern/ -Ʊ�� [�ɤ�����] /(n) isomorphism/same tqshape/same type/same pattern/ +Ʊ�� [�ɤ�����] /(n) isomorphism/same shape/same type/same pattern/ +Ʊ�� [�ɤ�����] /(n) isomorphism/same shape/same type/same pattern/ Ʊ�� [�ɤ�����] /(n) matter for mutual congratulation/ Ʊ�� [�ɤ�����] /(n) affiliated/akin/ Ʊ�Ͽ� [�ɤ��������礯] /(n) similar color/ @@ -82137,7 +82137,7 @@ Ʊ�� [�ɤ���] /(n) the same place/that place/(P)/ Ʊ�� [�ɤ����㤯] /(n) arriving at the same moment/ ƱĮ [�ɤ����礦] /(n) the same town/that town/(P)/ -ƱĴ [�ɤ����礦] /(n,vs) sympathy/agree with/tqalignment/tuning/(P)/ +ƱĴ [�ɤ����礦] /(n,vs) sympathy/agree with/alignment/tuning/(P)/ ƱĴ�� [�ɤ����礦����] /(n) fellow traveler/sympathizer/ Ʊ�� [�ɤ��Ƥ�] /(n) identification/ Ʊ���� [�ɤ��Ƥ���] /same level/same extent/ @@ -82276,17 +82276,17 @@ Ʒ����ĥ [�ɤ������������礦] /(n) pupil dilation/ Ʒ�� [�ɤ���] /(n) pupil/ Ƹ [����] /(n) child/(P)/ -Ƹ�� [���٤���] /(n) tqchildren's (folk) song/ -Ƹ�� [�ɤ���] /(n) pictures drawn by child/pictures for tqchildren/ +Ƹ�� [���٤���] /(n) children's (folk) song/ +Ƹ�� [�ɤ���] /(n) pictures drawn by child/pictures for children/ Ƹ�� [�ɤ�����] /(n) child-faced/(P)/ Ƹ�� [�ɤ���] /(n) boy/kid/child/ Ƹ�� [�ɤ�����] /(n) (little) girl/ Ƹ�� [�ɤ�����] /(n) child's mind/naivete/(P)/ Ƹ�� [�ɤ��Ƥ�] /(n) (col) chastity/(Catholic) nun/male virgin/ -Ƹ�� [�ɤ��褦] /(n) tqchildren's song/nursery rhyme/(P)/ +Ƹ�� [�ɤ��褦] /(n) children's song/nursery rhyme/(P)/ Ƹ�� [�ɤ���] /(n) fairy-tale/(P)/ -Ƹ�÷� [�ɤ��爐��] /(n) play or production for tqchildren/ -Ƹ�ú�� [�ɤ��蘆�ä�] /(n) writer of stories for tqchildren/ +Ƹ�÷� [�ɤ��爐��] /(n) play or production for children/ +Ƹ�ú�� [�ɤ��蘆�ä�] /(n) writer of stories for children/ ƹ [�ɤ�] /(n) trunk/body/frame/(P)/ ƹ��Ĺ�� [�ɤ����ʤ���] /having a long body/ ƹ���失�� [�ɤ���Ĥ���] /(exp) to put on body armor/ @@ -82554,7 +82554,7 @@ �ü� [�Ȥ�����] /(n) exclusive photographing (e.g. for a magazine)/ �ü� [�Ȥ�����] /(n) amnesty/(P)/ �ü� [�Ȥ�����] /(adj-na,n) special/unique/(P)/ -�ü�ص� [�Ȥ����夬�ä��夦] /special class for handicapped tqchildren/ +�ü�ص� [�Ȥ����夬�ä��夦] /special class for handicapped children/ �ü쵡ǽ [�Ȥ����夭�Τ�] /special function/ �ü���� [�Ȥ����夳����] /(n) special effects/ �ü�� [�Ȥ����夳��] /(n) special steel/ @@ -85852,10 +85852,10 @@ ��ķ�� [���ޤȤ�] /(n) leapfrogging/ ���ɤ� [���ޤ���] /(n) loading a horse with passengers or baggage/driving a horse into a pen/katydid/ ���� [�ФƤ�] /(n) horse's hooves/ -������ [�ФƤ�����] /(n) horseshoe-tqshaped/ +������ [�ФƤ�����] /(n) horseshoe-shaped/ ���᳭ [�ޤƤ���] /(n) razor clam/ ��Ƭ [�ФȤ�] /Hayagriva/Horsehead (tantric Buddhist deity)/ -��Ƭ�Ѳ� [�ФȤ�����Τ�] /(n) Kannon image decorated with an ornament in the tqshape of a horse's head/ +��Ƭ�Ѳ� [�ФȤ�����Τ�] /(n) Kannon image decorated with an ornament in the shape of a horse's head/ ���� [�Фˤ�] /(n) horsemeat/ ���� [���ޤФ�] /(n) horse botfly/ ����Ϣ�� [�ФФ��礦] /(n) post (horse racing)/ @@ -86985,7 +86985,7 @@ Ȣ�� [�Ϥ��ˤ�] /(n) miniature garden/ Ȣ���� [�Ϥ�����] /(adj-no,n) cased/boxed/ Ȣ����̼ [�Ϥ�����ह��] /(n) girl who has led a sheltered life/ -Ȣ�ϼ� [�Ϥ��Ф���] /(n) box-tqshaped (horse-drawn) carriage/ +Ȣ�ϼ� [�Ϥ��Ф���] /(n) box-shaped (horse-drawn) carriage/ Ȣ�� [�Ϥ��ޤ���] /(n) pillow encased in a box/ Ȣ�� [�Ϥ���ʤ�] /(n) Japanese aspen/white poplar/ Ȥ [�Ϥ�] /(n) chopsticks/(P)/ @@ -87049,8 +87049,8 @@ Ȭ������ [��Ĥ���] /(n) tearing limb from limb/tearing apart/cutting (a person) to pieces/ Ȭ�λ� [�Ϥ��Τ�] /(n) figure eight/ Ȭ�Ķ� [��ĤϤ�] /(kyb:) cinnamon-cookie/ -Ȭ�ѷ� [�Ϥä�������] /(n) eight-sided tqshape/octagon/ -Ȭ�ѷ� [�Ϥä��ä���] /(n) eight-sided tqshape/octagon/ +Ȭ�ѷ� [�Ϥä�������] /(n) eight-sided shape/octagon/ +Ȭ�ѷ� [�Ϥä��ä���] /(n) eight-sided shape/octagon/ Ȭ�� [�Ϥä���] /(n) inside cloth used around cuff and hem/ Ȭ�� [��ĤϤ�] /(kyb:) cinnamon-cookie/ Ȭ�˷� [�Ϥä��礯����] /(n) (MA) Eight Extremities Fist/ @@ -87106,7 +87106,7 @@ Ȭʬ���� [�Ϥ��֤����] /(n) 8th note/(P)/ Ȭʬ�� [�Ϥ��֤�] /(n) eight-tenths/ Ȭʬ�� [�Ϥ��֤��] /(n) eight-tenths/ -Ȭʸ�� [�Ϥ����] /(n) (in) the tqshape of the character hachi (eight)/ +Ȭʸ�� [�Ϥ����] /(n) (in) the shape of the character hachi (eight)/ Ȭ�շ� [�Ϥ��ؤ�] /octagon/ Ȭ���� [�Ϥäݤ�����] /(n) chop suey/ Ȭ�� [�Ϥäݤ�] /(n) all sides/(P)/ @@ -87534,8 +87534,8 @@ Ⱦ�� [�Ϥ�] /(n-adv,n-t) half-moon/half month/semicircle/ Ⱦ�� [�Ϥ�Ĥ�] /(n-adv,n-t) half-moon/half month/semicircle/(P)/ Ⱦ� [�Ϥä���] /a semimonthly/ -Ⱦ��� [�ϤĤ���] /(adj-no) semicircular/crescent-tqshaped/half-moon/ -Ⱦ��� [�ϤĤ���] /(adj-no) semicircular/crescent-tqshaped/half-moon/ +Ⱦ��� [�ϤĤ���] /(adj-no) semicircular/crescent-shaped/half-moon/ +Ⱦ��� [�ϤĤ���] /(adj-no) semicircular/crescent-shaped/half-moon/ Ⱦ���� [�ϤĤ٤�] /(n) semilunar valve/ Ⱦ�� [�Ϥ�] /(n) stub (of a ticket)/ Ⱦ�� [�Ϥ�] /(n,vs) reduction by half/halve/(P)/ @@ -87649,7 +87649,7 @@ ȿ�꤯���֤� [���꤯�꤫����] /(v1) to throw one's chest out/to hold one's head high/ ȿ�궶 [����Ϥ�] /(n) arched bridge/ ȿ�궶 [����Ф�] /(n) arched bridge/ -ȿ��� [���꤫��] /warped tqshape/ +ȿ��� [���꤫��] /warped shape/ ȿ��� [�����] /(n) strutting/sticking out the chest/ ȿ���֤� [���꤫����] /(v5r) to warp/to bend backwards/to throw the head (or shoulders) back/to throw out the chest/ ȿ�� [������] /(v5r,vi) to change/to turn over/to turn upside down/(P)/ @@ -87980,7 +87980,7 @@ ���� [�Ϥ��] /(n) luxuriant growth/(P)/ �̼� [�Ϥ�ˤ�] /(n) (Buddh) wisdom/Prajnaparamita/Perfection of Wisdom/ �� [�Ϥ�] /(n,n-suf) fiefdom/domain (precursor to current prefectures)/(P)/ -�ͳ� [�Ϥ�] /(n) school for samurai tqchildren/ +�ͳ� [�Ϥ�] /(n) school for samurai children/ �� [�Ϥ�] /(n) feudal lord/daimyo/ �� [�Ϥ�] /(n) clan school/han school/ �ͻ� [�Ϥ�] /(n) currency issued by a feudal clan/ @@ -88187,10 +88187,10 @@ �ܾ� [�Ҥ��礦] /(n) this wretch (oneself)/you wretch/ ���� [�Ҥ���] /(adj-na,n) low class/ ��¯ [�Ҥ���] /(adj-na,n) vulgarity/vulgarism/vulgar/coarse/ -��° [�Ҥ���] /(n) lineal descendants (beyond grandtqchildren)/ +��° [�Ҥ���] /(n) lineal descendants (beyond grandchildren)/ ���� [�Ҥ��] /(adj-na,n) mean/foul play/cowardly/base/(P)/ ������ [�Ҥ�Ĥ���] /mean bastard/sneak/heel/despicable person/ -��֤ [�Ҥ���] /(oK) (n) lineal descendants (beyond grandtqchildren)/ +��֤ [�Ҥ���] /(oK) (n) lineal descendants (beyond grandchildren)/ ���� [�Ҥ襤] /(adj-na,n) obscene/ ���� [�Ҥ���] /(adj-na,n) humble (condition)/lowly (position)/ ���� [�Ҥ���] /(adj-na,n) low rank/wickedness/vulgarity/ @@ -88981,7 +88981,7 @@ ���� [�Ӥ�] /(n) excellent performance/fine play/ ���� [�Ӥ���] /(n) praiseworthy undertaking/commendable act/ ���� [�ߤ���] /beautiful sky/ -���� [�Ӥ���] /(n) beautiful form or tqshape/beauty/ +���� [�Ӥ���] /(n) beautiful form or shape/beauty/ ���� [�Ӥ���] /(n) beautiful scenery/ ���� [�Ӥ���] /beautiful port/ ���� [�ߤ���] /(adj-na,n) splendid/magnificent/beautiful/admirable/ @@ -89177,8 +89177,8 @@ ɨƬ [�Ҥ�������] /(n) kneecap/ ɨ��� [�Ҥ��Ӥ礦��] /(n) keeping time by tapping one's knees/ ɨ�� [�Ҥ��ޤ���] /(n) sleeping with one's head in another's lap/ -ɩ�� [�Ҥ�����] /(n) diamond tqshape/ -ɩ�� [�Ҥ����] /(n) rhombus-tqshaped tqmochi/ +ɩ�� [�Ҥ�����] /(n) diamond shape/ +ɩ�� [�Ҥ����] /(n) rhombus-shaped tqmochi/ ɪ [�Ҥ�] /(n) (uk) elbow/(P)/ ɪ�� [�Ҥ�����] /(n) armrest/elbow rest/ ɪ�ݤ� [�Ҥ�����] /(n) arm of a chair/ @@ -89779,7 +89779,7 @@ �ʥץ� [���ʥץ�] /(abbr) Shinagawa Prince Hotel/ �ʰ� [�Ҥ�] /(n) grace/dignity/grade/nobility/quality/(P)/ �ʳ� [�Ҥ�] /(n) dignity/(P)/ -�ʷ� [���ʤ�����] /(n) quality and tqshape/birth or appearance/ +�ʷ� [���ʤ�����] /(n) quality and shape/birth or appearance/ �ʹ� [�Ҥ�] /(n) (moral) conduct/behaviour/deportment/ �ʹ����� [�Ҥ��ۤ�����] /(adj-na,n) irreproachable conduct/ �ʹ������ʿ� [�Ҥ��ۤ������ʤҤ�] /person of good conduct/ @@ -89949,8 +89949,8 @@ �Բ� [�դ���] /(adj-na,n) unpleasant/displeasure/discomfort/(P)/ �Բ��ؿ� [�դ���������] /(n) discomfort index/ �Գ��� [�դ�������] /(n) nonexpansion/localization/nonaggravation/ -�Գʹ� [�դ��ä���] /(adj-na,n) tqshapeless/mistqshapen/awkward/clumsy/ -�Գʹ� [�֤��ä���] /(adj-na,n) tqshapeless/mistqshapen/awkward/clumsy/ +�Գʹ� [�դ��ä���] /(adj-na,n) shapeless/misshapen/awkward/clumsy/ +�Գʹ� [�֤��ä���] /(adj-na,n) shapeless/misshapen/awkward/clumsy/ �ԳΤ� [�դ�����] /(adj-na,n) unreliable/uncertain/indefinite/(P)/ �Գμ� [�դ�������] /(adj-na,n) uncertain/unreliable/inauthentic/(P)/ �Գ��� [�դ����Ƥ�] /(adj-na,n) uncertain/indefinite/ @@ -89961,7 +89961,7 @@ �ԳФ��� [�դ�����Ȥ�] /(exp) to suffer a defeat/ �Գм� [�դ������] /(n) shallow thinker/indecisive person/ �Գ� [�դ���] /(adj-na) unlearned/uneducated/ -�Գ湥 [�֤��ä���] /(adj-na,n) untqshapeliness/clumsiness/ +�Գ湥 [�֤��ä���] /(adj-na,n) unshapeliness/clumsiness/ �Գ貽 [�դ��Ĥ�] /(n) inactivity/ �Գ��� [�դ��ä���] /(adj-no) (chemically) inert/ �Գ������� [�դ��ä�������] /inert gas/ @@ -90188,7 +90188,7 @@ ������ [�դ�������] /(adj-na,n) poor result/bad record/failure/ ����Ω [�դ������] /(n) failure/rejection/rupture/(P)/ ���� [�դ���] /(adj-na,n) irregular/ -������ [�դ�������] /(n) non-conformance/non-tqalignment/non-correspondence/free-thinking/ +������ [�դ�������] /(n) non-conformance/non-alignment/non-correspondence/free-thinking/ ������� [�դ�����������] /nonconformist/free-thinker/ ����̮ [�դ����ߤ㤯] /(n) irregular pulse/arrhythmia/(P)/ ���� [�դ���] /(adj-na,n) injustice/unfairness/iniquity/impropriety/irregularity/dishonesty/illegality/(P)/ @@ -90448,7 +90448,7 @@ ����� [�դ䤸�礦] /(n) nightless gay quarters/nightless city/ ������ [�դ椫��] /(adj-na,n) discomfort/unpleasantness/disagreeableness/unhappiness/(P)/ ��ͽ [�դ�] /(n) indisposition/emperor's illness/unhappiness/ -���� [�֤���] /(adj-na,n) untqshapely/unsightly/clumsy/unpresentable/uncouth/ +���� [�֤���] /(adj-na,n) unshapely/unsightly/clumsy/unpresentable/uncouth/ ������ [�դ褦����] /(n) insolubility/ ���� [�դ褦] /(adj-na,n) non-business/of no use/waste (products)/unnecessary/ ���Ѱ� [�դ褦��] /(adj-na,n) unpreparedness/carelessness/(P)/ @@ -90795,7 +90795,7 @@ �ޤ� [������] /(v5k) to help/to save/to rescue/ �ޤ��� [��������] /(v1) to help/to save/to rescue/to give relief to/to spare (life)/to reinforce/to promote/to abet/ �ޤ������� [������������] /to help a person to his (her) feet/ -�ް� [�դ���] /(n,vs) bringing up (tqchildren)/ +�ް� [�դ���] /(n,vs) bringing up (children)/ �� [�դ���] /(n) land east of China/Japan/ �� [�դ�] /(n) ration/stipend/allowance/ ���� [�դ��ޤ�] /(n) stipend in rice/ @@ -91030,7 +91030,7 @@ ��� [�Ϥ���] /(n) body/ ���� [�Ϥ���] /(n) underwear/ ���� [�դ褦] /(n) cotton rose/lotus/ -������ [�դ褦�ۤ�] /(n) Mt Fuji (lotus-tqshaped mountain)/ +������ [�դ褦�ۤ�] /(n) Mt Fuji (lotus-shaped mountain)/ �� [��] /(n) (sheet) music/(musical) note/(musical) score/ ���� [�դ��] /(n) page-turner (music)/ ����ɤ� [�դ���] /(exp) to read music/ @@ -91266,7 +91266,7 @@ ������ͥ [�֤����Ϥ��椦] /stage actor or actress/ �����餱 [�֤����ޤ�] /stage fright/ ���� [�֤�������] /(n) offstage/backstage/behind the scenes/(P)/ -���� [�ޤ�����] /(n) fan-tqshaped kinoku (mushroom) with multiple layers/ +���� [�ޤ�����] /(n) fan-shaped kinoku (mushroom) with multiple layers/ ��Ƨ [�֤Ȥ�] /(n) dancing/(P)/ ��Ƨ�� [�֤Ȥ�����] /(n) ball/dance/ ��Ƨ���� [�֤Ȥ����礦��] /dance instructor/ @@ -92033,7 +92033,7 @@ ʪ��ʬ���ä� [��ΤΤ狼�ä�] /fair-minded/sensible/ ʪ�Ƥ� [��Τ���] /(n) anxiety/worry/ ʪ�� [��Τ���] /(n) cover/under cover/shelter/hiding/(P)/ -ʪ�� [��Τ���] /(n) a form/a tqshape/ +ʪ�� [��Τ���] /(n) a form/a shape/ ʪ�ۤ� [��Τ���] /(n) with something in between/ ʪ�� [��Τ���] /(n) sounds/(P)/ ʪ�� [�֤ä�] /(n) prices of commodities/prices (in general)/cost-of-living/(P)/ @@ -93084,7 +93084,7 @@ ʿ̱��� [�ؤ��ߤ央] /detqmocracy/ ʿ�� [�ؤ��ᤤ] /(adj-na,n) clear/simple/ ʿ�� [�ؤ����] /(n) level surface/plane/(P)/ -ʿ�̴����� [�ؤ��������] /plane tqgeometry/ +ʿ�̴����� [�ؤ��������] /plane geometry/ ʿ�̶� [�ؤ���礦] /(n) plane mirror/ ʿ�̷� [�ؤ����] /plane figure/ ʿ�̸� [�ؤ������] /(n) grade crossing/level crossing/ @@ -94284,7 +94284,7 @@ ��ɫ [�ۤҤ�] /(n,vs) giving the Emperor advice on affairs of state/assistance/counsel/ ���� [�ۤ褯] /(n,vs) aid/assistance/ �� [��] /(n) ear (of plant)/head (of plant)/(P)/ -��� [�������礦] /(adj-no,n) tqshaped like an ear of grain/ +��� [�������礦] /(adj-no,n) shaped like an ear of grain/ ����ֽ� [�������礦������] /spike (type of plant)/ ���� [�ۤ���] /(n) tip of an ear/ ���� [�ۤʤ�] /(n) waving heads (of grain)/ @@ -94389,7 +94389,7 @@ ��ҷ�Ģ [�ܤ������Ƥ��礦] /maternity record book/ ����� [�ϤϤ�����] /(n) cottonweed/ ���ǯ�� [�ܤ��ͤ�] /allowance for fatherless families/ -����� [�ܤ���礦] /(n) home for mothers and tqchildren/ +����� [�ܤ���礦] /(n) home for mothers and children/ �콸�� [�ܤ��夦����] /(n) population (statistics)/parent set/ ��� [�ϤϤ���] /(n) (pol) mother/ ��� [�ϤϤ���] /(n) mother/(P)/ @@ -94753,7 +94753,7 @@ ���� [�ۤ��ܤ�] /(adv,conj,n-adv,n-t) persons/this and that/here and there/everywhere/any way/all sides/all gentlemen/all people/(P)/ ���� [�ۤ���] /(n) direction/(P)/ ���̳� [�ۤ�������] /(n) azimuth/ -���� [�ۤ�����] /(n) squares and circles/square and round tqshapes/ +���� [�ۤ�����] /(n) squares and circles/square and round shapes/ ������ [�ۤ���������] /(n) calcite/ ���� [�ۤ�����] /(n) direction/way/compass point/(P)/ ����� [�ۤ�����] /(n) graph paper/section paper/ @@ -95393,7 +95393,7 @@ ������ [�ܤ������㤯] /(n) bar magnet/ ���� [�ܤ�����] /(n) stripes/ ���� [�ܤ������] /(n) bojutsu (art of using a stick as a weapon)/cudgels/ -���� [�ܤ����礦] /(n) cylinder or rod-tqshaped/ +���� [�ܤ����礦] /(n) cylinder or rod-shaped/ ���ڤ� [�ܤ�����] /(n) stick/piece of wood/bit of a broken pole/ ���� [�ܤ�����] /(n) straight line/ ���Ȥ� [�ܤ�����] /(n) galley setting/ @@ -95420,7 +95420,7 @@ �»� [�ܤ���] /(n) spinning/spun cotton (wool)/ �¿� [�ܤ����礯] /(n) spinning and weaving/(P)/ �¿� [�ܤ�����] /(n) spindle/ -�¿�� [�ܤ���������] /(n) spindle-tqshaped/ +�¿�� [�ܤ���������] /(n) spindle-shaped/ ���� [�ܤ�����] /(n) spinning/(P)/ ���ӹ� [�ܤ���������] /a spinner/spinning mill employee/ ���ӹ��� [�ܤ������������礦] /spinning mill/cotton mill/ @@ -96471,7 +96471,7 @@ �� [�ޤ�] /(n) cocoon/(P)/ ����ݤ��� [�ޤ����] /(v1) to spin a cocoon/ ���� [����] /price of a cocoon/ -���� [�ޤ����] /(n) New Year's decoration with cocoon-tqshaped cakes/ +���� [�ޤ����] /(n) New Year's decoration with cocoon-shaped cakes/ ���� [���̤���] /(n) silk thread/ ���� [����] /(n) silk thread/(P)/ ���� [������夦] /(n) pongee (unbleached silk)/ @@ -97496,7 +97496,7 @@ ̵�¾�� [����礦����] /riding free of charge/ ̵�� [��Ĥ�] /(n) painless/ ̵��ʬ�� [��Ĥ��֤�٤�] /painless childbirth/ -̵��� [��Ƥ�����] /(adj-na,n) amorphous/tqshapeless/ +̵��� [��Ƥ�����] /(adj-na,n) amorphous/shapeless/ ̵�긫 [��Ƥ�����] /(adj-na,n) lacking fixed principles or opinions/ ̵�� [��Ƥ�����] /(adj-na,n) nonresistance/ ̵��� [��Ƥ��������央] /(n) (the principle of) nonresistance/ @@ -97570,7 +97570,7 @@ ̵�ȵ���ž [���礦��Ƥ�] /driving without a license/ ̵�� [��⤦] /hairless/ ̵ͷ�� [��椦�Ӥ礦] /somnambulism/sleep-walking/ -̵�� [�֤���] /(adj-na,n) untqshapely/unsightly/clumsy/unpresentable/uncouth/ +̵�� [�֤���] /(adj-na,n) unshapely/unsightly/clumsy/unpresentable/uncouth/ ̵�� [��褦] /(adj-na,adj-no,n) useless/futility/needlessness/unnecessariness/(P)/ ̵�Ѥ�Ĺʪ [��褦�Τ��礦�֤�] /useless object/deadwood/ ̵�ѿ� [�֤褦����] /(adj-na,n) insecurity/carelessness/ @@ -98541,7 +98541,7 @@ �ڳ� [���Ф�] /(n) wood ashes/ �ڴ� [��ä���] /(n) woodwind/wooden pipe/bobbin/ �ڴɳڴ� [��ä��ä�] /woodwind instrument/ -�ڵ� [�⤯����] /(n) fish-tqshaped wooden temple drum/ +�ڵ� [�⤯����] /(n) fish-shaped wooden temple drum/ �ڶ� [��ä���] /(n) xylophone/ �ڶ� [�⤯����] /Thursday and Friday/ �ڶ��� [�⤯�����] /Thursday, Friday and Saturday/ @@ -98845,8 +98845,8 @@ ��ȴ�� [��̤�] /(adj-no,n) principal/main/important/fashionable/(P)/ ��ȴ���̤� [��̤��ɤ���] /(n) principal street/ ���� [�ޤӤ���] /(n) visor/eyeshade/ -��ɡ [��Ϥ�] /(n) tqshape/form/ -��ɡ���դ� [��Ϥʤ��Ĥ�] /(exp) to take a concrete tqshape/ +��ɡ [��Ϥ�] /(n) shape/form/ +��ɡ���դ� [��Ϥʤ��Ĥ�] /(exp) to take a concrete shape/ ��ɡΩ [��Ϥʤ���] /(n) looks/features/ ��ɡΩ�� [��Ϥʤ���] /(n) looks/features/ ��ɸ [�⤯�Ҥ礦] /(n) mark/objective/target/(P)/ @@ -100785,7 +100785,7 @@ �Ļ��� [�褦����] /(n) infancy/ �Ļ��Ի� [�褦�����㤯����] /(n) massacre of the innocents/ �Ļ����� [�褦�����礦����] /early childhood education/ -�Ļ��� [�褦����] /(n) words tqchildren use/ +�Ļ��� [�褦����] /(n) words children use/ �Ļ����� [�褦��������] /infanticide/ �Ļ���˴Ψ [�褦�����ܤ����] /(n) infant mortality rate/ �Ļ�������ɸ��� [�褦���ȤĤ����礦��������] /(n) sudden infant death syndrome (SIDS)/ @@ -101397,7 +101397,7 @@ ���ĥ�� [�ĤФ���Ϥ�] /(exp) to spread the wings/ �㻿 [�褯����] /(n,vs) supporting/countenance/assistance/ ����� [�褯����⤯] /chiroptera/ -��� [�褯���礦] /(n) wing tqshape/ +��� [�褯���礦] /(n) wing shape/ ���� [�褯�Ȥ�] /wing (of a building)/ ������ [�褯���] /(n) wing area/ ���� [�褯�褯] /(adj-na,n) prudent/very careful/ @@ -101779,14 +101779,14 @@ ��ǹ [����Τ�] /(n) yolk sac/ ��� [���] /(n) eggshell/ ��� [���] /(n) fallopian tube/oviduct/(P)/ -��� [���ޤ�����] /(n) oval/egg-tqshaped/(P)/ -��� [���] /(n) oval/egg-tqshaped/(P)/ +��� [���ޤ�����] /(n) oval/egg-shaped/(P)/ +��� [���] /(n) oval/egg-shaped/(P)/ ���˦ [����ܤ�] /(n) ovum/egg cell/ ��� [���] /(n) ovum/ovule/egg cell/(P)/ ��� [���ޤ�����] /(n) eggnog/ ��� [���ޤ��䤭] /(n) fried eggs/omelet/ ��Ƥ� [���ޤ��䤭] /(n) fried eggs/omelet/ -��� [��礦] /egg-tqshaped/ +��� [��礦] /egg-shaped/ �� [���ޤ�����] /(n) yellowish color/ ���� [���] /(n) oviparity/produced from eggs/ ����ưʪ [����ɤ��֤�] /oviparous animal/ @@ -102236,7 +102236,7 @@ Χ���� [��������] /(n) honest or conscientious person/ Χ�� [�����] /(adj-na,n) honesty/integrity/ Χ���� [��������] /(n) honest or conscientious person/ -Χ�� [��Ĥ�] /(n) well-tqshaped verse/ +Χ�� [��Ĥ�] /(n) well-shaped verse/ Χ�� [��ä�] /(n) Buddhist priest/ Χ�� [��ä�] /(n) ancient Chinese verse form/ Χ�� [��ä���] /(n) a modality (in gagaku)/ @@ -102433,7 +102433,7 @@ Ω�β��� [��ä������礦] /stereophonic sound/ Ω�β��� [��ä���������] /stereochemistry/ Ω�δ� [��ä�������] /(n) feeling of solidity/three-dimensionality/drawing highlights/ -Ω�δ����� [��ä�����������] /solid tqgeometry/ +Ω�δ����� [��ä�����������] /solid geometry/ Ω�ζ� [��ä������礦] /(n) stereoscope/ Ω�θ� [��ä���������] /multi-level crossing/ Ω�κ��� [��ä�����������] /draping/ @@ -103442,14 +103442,14 @@ �ش� [���] /(n) gang rape/ �ص� [���] /wheel track/ �ض� [��礦] /(n) bicycle industry/ -�ط� [���] /(adj-no,n) ring-tqshaped/circular/ +�ط� [���] /(adj-no,n) ring-shaped/circular/ �ع� [���] /(n) people taking turns reading and explaining a book/ �غ� [�蘆] /(n) a loop/a trap/ �غ� [���] /(n) rotation of crops/ �غ� [���] /(n) rotation of crops/ �ؾ� [��礦] /(n,vs) trolling/singing in a circular canon/round/ �ؾ�� [��Τ�] /(n) riding (a horse) in a circle/ -�ؾ� [��礦] /(adj-no,n) ring-tqshaped/annular/ +�ؾ� [��礦] /(adj-no,n) ring-shaped/annular/ ���� [���] /(n) (in botany) verticillation/ ���ڤ� [�冷��] /(n) round slices/(P)/ ��¢ [���] /(n) rotating shelf for sutras/ @@ -103573,9 +103573,9 @@ ����켭ŵ [�뤤�������Ƥ�] /thesaurus/ ��� [�뤤��] /(n) similar phrase/ �ෲ [�뤤����] /(n) (math) class group/ -� [�뤤����] /(n) similar tqshape/similar type/pattern/(P)/ +� [�뤤����] /(n) similar shape/similar type/pattern/(P)/ �Ū [�뤤�����Ƥ�] /(adj-na) stereotyped/patterned/typical/ -��� [�뤤����] /(n) similar tqshape/similar type/pattern/ +��� [�뤤����] /(n) similar shape/similar type/pattern/ ��� [�뤤��] /(n) synonym/ � [�뤤����] /(n) collection of similar objects/classification by similarity/ ��� [�뤤��] /(n) analogous/(P)/ @@ -103898,7 +103898,7 @@ ��� [�줤����] /(n) genius/beauty/charm/ ��� [�줤����] /(n) beautiful woman/beauty/belle/ ��ɮ [�줤�Ҥ�] /(n) beautiful brushwork or writing/ -���� [�줤�褦] /(n) beautiful tqshape or form/ +���� [�줤�褦] /(n) beautiful shape or form/ ���路�� [�줤�줤����] /(adj) ostentatious/gaudy/showy/ �� [��襤] /(n) (one's) age/(P)/ �� [�����] /(n) calendar/almanac/(P)/ @@ -104143,7 +104143,7 @@ ϡ���� [�����] /(n) Chinese milk vetch/ ϡ���� [��Ĥ�] /name of a famous Buddhist nun/ ϡ�� [���] /(n) lotus root/ -ϡ�� [������] /(n) lotus-tqshaped pedestal for images of the Buddha/ +ϡ�� [������] /(n) lotus-shaped pedestal for images of the Buddha/ Ϣ [���] /(n) party/company/group/(P)/ Ϣ�ʤ� [�Ĥ�ʤ�] /(v5r) to extend/to stretch out/to stand in a row/(P)/ Ϣ�ͤ� [�Ĥ�ͤ�] /(v1) to link/to join/to put together/(P)/ @@ -104338,7 +104338,7 @@ ϩ�� [�����礦] /(n) (on the) road/(on the) way/(P)/ ϩ����� [�����礦���夦����] /(n) parking on the streets/ ϩ���Ⱥ� [�����礦�Ϥ�] /(n) street crime/ -ϩ�� [������] /(n) route/line/tqalignment/(P)/ +ϩ�� [������] /(n) route/line/alignment/(P)/ ϩ���˱�ä� [������ˤ��ä�] /along the route (line)/ ϩ�� [����] /(n) alley/alleyway/lane/(P)/ ϩ�� [���Ƥ�] /(n) distance/ @@ -105108,8 +105108,8 @@ �ɿ� [��Ӥ�] /lonesome sleep/ �ɿ� [��ӤӤ�] /lonesome person/unwanted person/poverty-stricken person/ ���� [��Ӥ���] /sad voice/ -�ʤ� [�������ޤ�] /(n) (uk) appearance/tqshape/figure/bearing/ -�ʤޤ� [�������ޤ�] /(n) (uk) appearance/tqshape/figure/bearing/ +�ʤ� [�������ޤ�] /(n) (uk) appearance/shape/figure/bearing/ +�ʤޤ� [�������ޤ�] /(n) (uk) appearance/shape/figure/bearing/ �ʤ� [��������] /(v5m) (uk) to stand (still) a while/to loiter/to stop/(P)/ ��Ω [������] /(n,vs) standing still/ �� [����] /healthy/correct/ @@ -105740,7 +105740,7 @@ ��� [�ɤ��夦����] /(n) dreadnought/ �� [��礯] /(n) curve/crook/bend/ �� [���] /crescent/ -��� [��Ĥ��礦] /crescent tqshape/ +��� [��Ĥ��礦] /crescent shape/ �� [���ˤ夦] /(n) gulf/ �� [��礯] /(n) curve/crook/bend/ �� [���ˤ夦] /(n) curved indentation (esp. in stomach)/ @@ -106051,7 +106051,7 @@ ۹ͫ [���椦] /(n) absurd fear/needless anxiety/ ���� [�����] /(n,n-adv,n-t) (1) end leaves/top leaves/last leaves/ �� [�ޤ�] /(n) (1) measure/unit of volume (1.8l)/(2) square container, e.g. a box/ -�Ʒ� [�ޤ�����] /(n) square (tqshape)/ +�Ʒ� [�ޤ�����] /(n) square (shape)/ ���� [�ޤ�����] /(n) tatami "box seat" for four people at sumo or kabuki/ ���� [�ޤ���] /(n) (1) measure/(2) square (of graph paper)/(3) box/ �� [����] /(n) shackles/fetters/irons/handcuffs/bonds/ @@ -106105,7 +106105,7 @@ ܪ�� [�����Ф���] /(n) beam balance/steelyard/ ܴ�� [��������] /(n) printed style writing/(P)/ ܸ [������] /(n) wedge/link pin/ -ܸ�� [�����Ӥ���] /(adj-na,n) (uk) wedge-tqshape/ +ܸ�� [�����Ӥ���] /(adj-na,n) (uk) wedge-shape/ ܸ��ʸ�� [�����Ӥ����⤸] /(n) cuneiform (writing)/ ܻ [�����] /(n) sawara cypress/Chamaecyparis pisifera/ ܿ�� [�䤷] /(n) palm tree/ @@ -106536,7 +106536,7 @@ �ˤ߹�碌�� [�ˤ�ߤ��碌��] /(v1) to compare and take into consideration/ �ˤ��դ��� [�ˤ�ߤĤ���] /(v1) to glare at/ �ˤ� [�ˤ��] /(v5m) to glare at/to scowl at/to keep an eye on/(P)/ -�ˤ�ä� [�ˤ��ä�] /(n) staring-out (down) game/game in which two tqchildren looking at each other try to make the opponents laugh first/ +�ˤ�ä� [�ˤ��ä�] /(n) staring-out (down) game/game in which two children looking at each other try to make the opponents laugh first/ �ˤ�Ĥ��� [�ͤ�Ĥ���] /(v1) to glare or scowl at/ �ˤ��դ��� [�ͤ�Ĥ���] /(v1) to glare or scowl at/ �� [�ޤĤ�] /(n) (uk) eyelashes/ @@ -107037,7 +107037,7 @@ �꧷� [�Ȥ���������] /(n) (MA) praying mantis style/ � [�Ҥ�] /(n) toad/ 걳� [�Ҥ�������] /(n) toad/ -걸� [������ޤ�] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ +걸� [������ޤ�] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ � [�Ҥ�] /(n) toad/ ��� [������] /(n) mole cricket/ ��� [����] /(n) mole cricket/ @@ -107388,7 +107388,7 @@ � [��������] /(n) clamp/cramp (metal)/ ﲻ� [��������] /(n) massacre/extermination/ ﻤ�� [����Ф��] /(v1) to inlay/to set/to stud/to enchase (a thing) with/to mount (gem)/ -ﻹ� [�뤳��] /(n) carve/engrave/tqshape (sentences)/ +ﻹ� [�뤳��] /(n) carve/engrave/shape (sentences)/ ﻹ� [�뤳��] /(n) painstaking efforts/ P�ʸ [�Ӥ��������] /(exp) be penniless/not have a cent/ � [�Ĥ�] /(n) (1) guard on sword, polearms, etc./(2) brim/ @@ -107514,7 +107514,7 @@ [�Ҥ礦�Ҥ礦] /(adj-na,n) aloof from the world/ ��� [�Ҥ礦����] /(adj-na,n) casually/aimlessly/abruptly/unexpectedly/ �� [�Ҥ礦�Ҥ礦] /(adj-na,n) aloof from the world/ -�� [���礦��] /(n) gyoza (Japanese crescent-tqshaped pan-fried dumplings stuffed with minced pork and vegetables)/(P)/ +�� [���礦��] /(n) gyoza (Japanese crescent-shaped pan-fried dumplings stuffed with minced pork and vegetables)/(P)/ � [����] /(n) (uk) red bean jam/anko/(P)/ �� [����] /(n) thick starchy sauce made of kuzu or katakuriko flour/ [����] /(n) (uk) red bean jam/anko/(P)/ diff --git a/kiten/kanjidic b/kiten/kanjidic index 0c2e3f1f..92fc1d8d 100644 --- a/kiten/kanjidic +++ b/kiten/kanjidic @@ -689,7 +689,7 @@ �� 373E U73ea B96 S10 N2937 V3638 L2564 MN20972 MP7.0914 P1-4-6 I4f6.4 Q1411.4 Ygui1 Wgyu ���� ���� {jade scepter or tablet (authority symbol)} �� 373F U578b B32 G4 S9 F482 N1077 V1010 H2638 DK1685 L680 K423 DO685 MN5030 MP3.0171 E468 IN888 DS595 DT523 DJ1318 DG353 P2-6-3 I3b6.11 Q1210.4 DR3272 Yxing2 Whyeong ���� ���� -���� {mould} {type} {model} �� 3740 U5951 B37 G8 S9 F898 N1177 V1155 H2639 DK1686 L1549 K1153 O980 DO1132 MN5917X MP3.0589 E1195 IN565 DJ751 DG417 P2-6-3 I2f7.6 Q5743.2 DR1463 Yqi4 Yxie4 Yqie4 Wgye Wgeul ���� ����.�� {pledge} {promise} {vow} -�� 3741 U5f62 B59 G2 S7 F418 N1589 V1713 H846 DK565 L1711 K408 O414 DO223 MN9969 MP4.0784 E104 IN395 DS200 DT141 DC306 DJ509 DB3.6 DG615 P1-4-3 I3j4.1 Q1242.2 DR3260 Yxing2 Whyeong ���� ���祦 ���� -���� ������ �ʤ� T1 �� {tqshape} {form} {style} +�� 3741 U5f62 B59 G2 S7 F418 N1589 V1713 H846 DK565 L1711 K408 O414 DO223 MN9969 MP4.0784 E104 IN395 DS200 DT141 DC306 DJ509 DB3.6 DG615 P1-4-3 I3j4.1 Q1242.2 DR3260 Yxing2 Whyeong ���� ���祦 ���� -���� ������ �ʤ� T1 �� {shape} {form} {style} �� 3742 U5f84 B60 G4 S8 XJ0574D XJ06D74 F1435 N1602 V1730 H291 DK216 L882 K1451 O576 DO1630 MN10080P MP4.0820 E845 IN1475 DT502 DJ1448 DG622 P1-3-5 I3i5.5 Q2721.4 DR2072 Yjing4 Wgyeong ���� �ߤ� ���ߤ� �����錄�� �������� {diameter} {path} {method} �� 3743 U6075 B61 G8 S10 XJ0582A F925 N1681 V1847 H2659 DK1704 L612 K875 O1226 DO1498 MN10618P MP4.1049 E1196 IN1219 DJ1077 DG781 P2-6-4 I4k6.16 Q5033.6 DR1558 Yhui4 Whye ���� �� �ᤰ.�� �ᤰ.�� T1 ���� �� ���� ���Ȥ� ���� �ؤ� �� �䤹 {favor} {blessing} {grace} {kindness} �� 3744 U6176 B53 C61 G8 S15 F1300 N1539 V1967 H3173 DK2029 L2001 K962 O2425 DO1033 MN11145 MP4.1168 E1204 IN1632 DJ1732 DG799 P3-3-12 I3q12.8 Q0024.7 DR567 Yqing4 Wgyeong Wgang ���� �����.�� T1 �� ����� �� �ߤ� �� �䤹 �褷 {jubilation} {congratulate} {rejoice} {be happy} @@ -1081,7 +1081,7 @@ �� 3B4E U58eb B33 G4 S3 F526 N1160 V1117 H3405 DK2129 L319 K301 O41 DO59 MN5638 MP3.0279 E494 IN572 DS410 DT441 DC386 DJ755 DG393 P4-3-2 I3p0.1 Q4010.0 DR1472 Yshi4 Wsa �� T1 �� �� T2 ����餤 {gentleman} {samurai} �� 3B4F U59cb B38 G3 S8 XJ13037 XJ1326B F244 N1208 V1203 H281 DK211 L747 K465 O1092 DO545 MN6166 MP3.0661 E288 IN494 DS225 DT299 DC321 DJ129 DB2.16 DG439 P1-3-5 I3e5.9 Q4346.0 DR1777 Yshi3 Wsi �� �Ϥ�.��� -�Ϥ�.��� �Ϥ�.�ޤ� T1 ��� {commence} {begin} �� 3B50 U59c9 B38 G2 S8 XJ1393D F1473 N1207 V1201 H280 DK210 L413 K1329 O847 DO120 MN6165 MP3.0661 E498 IN407 DS413 DT159 DJ77 DB3.15 DG438 P1-3-5 I3e5.8 Q4042.7 DR1744 ZSP1-3-4 Yzi3 Wja �� ���� �Ϥ� {elder sister} -�� 3B51 U59ff B38 G6 S9 F441 N1215 V1216 H2636 DK1684 L474 K592 O1217 DO1133 MN6257X MP3.0699 E877 IN929 DT883 DJ661 DG429 P2-6-3 I3e6.10 Q3740.4 DR369 Yzi1 Wja �� ������ T1 ���� {figure} {form} {tqshape} +�� 3B51 U59ff B38 G6 S9 F441 N1215 V1216 H2636 DK1684 L474 K592 O1217 DO1133 MN6257X MP3.0699 E877 IN929 DT883 DJ661 DG429 P2-6-3 I3e6.10 Q3740.4 DR369 Yzi1 Wja �� ������ T1 ���� {figure} {form} {shape} �� 3B52 U5b50 B39 G1 S3 F72 N1264 V1281 H3390 DK2125 L95 K56 O38 DO61 MN6930 MP3.0776 E25 IN103 DS31 DT18 DC42 DJ69 DB2.18 DG455 P4-3-1 I2c0.1 Q1740.7 DR3547 ZSP4-2-1 Yzi3 Yzi2 Yzi5 Wja �� �� �� �� -�� �� T1 �� �� �� �� �� �ͤ� {child} {sign of the rat} {11PM-1AM} {first sign of Chinese zodiac} �� 3B53 U5c4d B44 S9 N1391 V1420 H3099 L2222 MN7688 MP4.0152 P3-3-6 I3r6.2 Q7721.1 Yshi1 Wsi �� �����Ф� {corpse} �� 3B54 U5e02 B8 C50 G2 S5 F42 N284 V1549 H1993 DK1258 L412 K78 O195 DO119 MN8775 MP4.0397 E130 IN181 DS222 DT109 DC305 DJ547 DB2.4 DG556 P2-2-3 I2j3.1 Q0022.7 DR444 ZBP4-4-3 Yshi4 Wsi �� ���� T1 �� �� {market} {city} {town} @@ -1375,7 +1375,7 @@ �� 3E5A U8a3c B149 G5 S12 XJ06B7A F306 N4341 V5589 H1506 DK1010 L380 K430 O1660 DO697 MN35341 MP10.0423 E715 IN484 DS816 DT754 DC448 DJ666 DG1672 P1-7-5 I7a5.5 Q0161.1 DR3073 Yzheng4 Wjeung ���祦 ������ {evidence} {proof} {certificate} �� 3E5B U8a54 B149 G8 S12 F2239 N4333 V5581 H1505 DK1009 L342 K2023 O1658 DO1213 MN35379 MP10.0429 E1407 IN1885 DJ1935 DG1673 P1-7-5 I7a5.10 Q0766.2 DR3077 Yzhao4 Wjo ���祦 �ߤ��ȤΤ� T1 ���Ȥ� �Τ� {imperial edict} �� 3E5C U8a73 B149 G8 S13 F1178 N4357 V5607 H1526 DK1026 L550 K1172 O1927 DO896 MN35446 MP10.0456 E1409 IN1577 DJ944 DG1682 P1-7-6 I7a6.12 Q0865.1 DR3055 Yxiang2 Wsang Wyang ���祦 ����.���� �Ĥޤ�.�餫 T1 �褷 {detailed} {full} {minute} {accurate} {well-informed} -�� 3E5D U8c61 B152 G4 S12 F394 N4472 V5744 H2134 DK1350 L1976 K575 O1761 DO809 MN36372 MP10.0657 E533 IN739 DS663 DT591 DJ939 DG1718 P2-2-10 I2n10.1 Q2723.2 DR2551 ZPP2-6-6 Yxiang4 Wsang ���祦 ���� ������.�� T1 ���� {elephant} {pattern after} {imitate} {image} {tqshape} {sign (of the times)} +�� 3E5D U8c61 B152 G4 S12 F394 N4472 V5744 H2134 DK1350 L1976 K575 O1761 DO809 MN36372 MP10.0657 E533 IN739 DS663 DT591 DJ939 DG1718 P2-2-10 I2n10.1 Q2723.2 DR2551 ZPP2-6-6 Yxiang4 Wsang ���祦 ���� ������.�� T1 ���� {elephant} {pattern after} {imitate} {image} {shape} {sign (of the times)} �� 3E5E U8cde B42 C154 G4 S15 F426 N1372 V5815 H2618 DK1677 L796 K507 O2377 DO621 MN36813 MP10.0774 E511 IN500 DS641 DT625 DJ711 DG1738 P2-5-10 I3n12.1 Q9080.6 DR1061 ZPP2-3-12 Yshang3 Wsang ���祦 ��.��� {prize} {reward} {praise} �� 3E5F U91a4 B164 S17 XJ16273 F2485 N4801 V6186 L2746 MN40011X MP11.0394 P2-10-7 Q2760.1 Yjiang4 Wjang ���祦 �Ҥ��� {a kind of miso} �� 3E60 U9266 B167 S13 N4839 V6246 L2770 O1941 MN40322 MP11.0522 P1-8-5 I8a5.7 Q8111.1 Yzheng1 Wjeong ���� ���祦 ���� {bell} {gong} {chimes} @@ -2357,7 +2357,7 @@ ɦ 4926 U9aed B190 S16 S17 XJ16829 N5262 V6812 L2047 O2697 MN45399X MP12.0641 P2-10-6 I3j13.2 Q7211.1 Yzi1 Wja �� �Ҥ� �����Ҥ� {beard} {mustache} ɧ 4927 U5f66 B117 C59 G9 S9 F1117 N3347 V1714 H3295 DK2072 L1716 K1076 O1007 DO1931 MN9981 MP4.0793 IN2067 P3-6-3 I5b4.4 Q0022.2 DR460 ZPP2-2-7 ZPP2-4-5 Yyan4 Weon ���� �Ҥ� T1 �褷 �� �Ҥ� �䤹 {lad} {boy (ancient)} ɨ 4928 U819d B130 S15 F2320 N3814 V4868 L2461 O2281 MN29837 MP9.0361 P1-4-11 I4b11.4 Q7423.2 DR3942 Yxi1 Wseul ���� �Ҥ� {knee} {lap} -ɩ 4929 U83f1 B140 S11 F1229 N3977 V5092 L1517 K980 O1449 MN31219X MP9.0723 P2-3-8 I3k8.20 Q4440.7 DR1967 ZRP2-4-8 Yling2 Wreung ��祦 �Ҥ� {diamond (tqshape)} {water chestnut} {rhombus} +ɩ 4929 U83f1 B140 S11 F1229 N3977 V5092 L1517 K980 O1449 MN31219X MP9.0723 P2-3-8 I3k8.20 Q4440.7 DR1967 ZRP2-4-8 Yling2 Wreung ��祦 �Ҥ� {diamond (shape)} {water chestnut} {rhombus} ɪ 492A U8098 B130 S7 S9 N3730 V4761 L2464 MN29268 MP9.0253 P1-4-3 I4b3.3 Q7420.0 Yzhou3 Wju ���奦 �Ҥ� {elbow} {arm} ɫ 492B U5f3c B57 S12 XJ13C6F N1573 V1697 O2092 MN9826 MP4.0765 P1-3-9 I3h9.2 Q1722.7 Ybi4 Wpil �ҥ� ����.���� ����� T1 ���� ������ {help} ɬ 492C U5fc5 B3 G4 S5 F265 N129 V1781 H15 DK6 L635 K292 O120 DO281 MN10299 MP4.0951 E568 IN520 DS497 DT453 DC188 DJ423 DB3.16 DG767 P1-1-4 I0a5.16 Q3300.0 DR359 ZPP4-5-4 Ybi4 Wpil �ҥ� ���ʤ�.�� {invariably} {certain} {inevitable} @@ -2500,7 +2500,7 @@ �� 4A57 U904d B162 G8 S12 S11 F1845 N4718 V6086 H3136 DK2002 L1824 K1861 O1805 DO1279 MN39001P MP11.0112 E1783 IN1160 DJ1177 DG711 P3-3-9 I2q9.16 Q3330.2 DR3053 Ybian4 Ypian4 Wpyeon �إ� ���ޤ�.�� {everywhere} {times} {widely} {generally} �� 4A58 U4fbf B9 G4 S9 F729 N450 V219 H95 DK71 L991 K578 DO265 MN659 MP1.0772 E582 IN330 DS510 DT533 DJ227 DB3.8 DG101 P1-2-7 I2a7.5 Q2124.6 DR2166 Ybian4 Ypian2 Wpyeon Wbyeon �٥� �ӥ� ����.�� {convenience} �� 4A59 U52c9 B4 C19 G3 S10 F1066 N228 V543 H3318 DK2088 L1975 K946 O1263 DO852 MN2384P MP2.0390 E390 IN735 DS317 DT366 DJ140 DB2.11 DG219 P3-8-2 I2n8.1 Q2421.2 DR2557 Ymian3 Wmyeon �٥� �Ĥ�.��� T1 �Ҥ� ��� {exertion} -�� 4A5A U5a29 B38 S11 N1219 V1233 MN6337 MP3.0714 P1-3-8 Q4741.6 ZRP1-3-7 Ymian3 Ywan3 Wman �٥� {bear (tqchildren)} +�� 4A5A U5a29 B38 S11 N1219 V1233 MN6337 MP3.0714 P1-3-8 Q4741.6 ZRP1-3-7 Ymian3 Ywan3 Wman �٥� {bear (children)} �� 4A5B U5f01 B28 C55 G5 S5 XJ0517E XJ05221 XJ06122 XJ06D67 F619 N846 V1663 H2004 DK1264 L742 K793 O275 DO513 MN9588 MP4.0664 E786 IN711 DS715 DT654 DJ1116 DG262 P2-2-3 I0a5.30 Q2344.0 Ybian4 Wbyeon Wban �٥� �إ� �來��.���� ��.���� �ϤʤӤ� ���餽.�� T1 �� {valve} {petal} {braid} {speech} {dialect} {discrimination} {dispose of} {distinguish} �� 4A5C U97ad B177 S18 N5104 V6595 L2783 O2752 MN42937 MP12.0171 P1-9-9 I3k15.8 Q4154.6 Ybian1 Wpyeon �٥� �إ� ��� ������� {whip} {rod} �� 4A5D U4fdd B9 G5 S9 F146 N455 V222 H96 DK72 L997 K166 O781 DO351 MN702 MP1.0788 E787 IN489 DS716 DT705 DC163 DJ665 DG102 P1-2-7 I2a7.11 Q2629.4 DR2164 Ybao3 Wbo �� �ۥ� ����.�� T1 �� �� �� ��� �䤹 �䤹�� {protect} {guarantee} {keep} {preserve} {sustain} {support} @@ -2968,7 +2968,7 @@ Т 5022 U4e10 B1 S4 XH262 N11 V11 MN22 MP1.0264 P4-4-1 I2m2.3 Q1020.7 Ygai4 Wgal Wgae ���� ��.�� {beggar} {beg} {give} У 5023 U4e15 B1 S5 V18 O163 MN30 MP1.0267 P2-4-1 I0a5.2 Q1010.9 Ypi1 Wbi �� ����.���� {large} {great} {grand} {glorious} {distinguished} Ф 5024 U4e2a B9 C2 S3 XH1960 N340 V25 H1959 MN70 MP1.0286 P2-2-1 Q8020.0 Yge4 Wga Wgae �� �� {counter for articles} {individual} -Х 5025 U4e31 B2 S5 V29 MN77 MP1.0318 P1-2-3 I0a5.4 Q2277.0 Yguan4 Wgwan ���� ���� {saguaro-like kanji} {horn-tqshaped locks of hair} {young} {tender} +Х 5025 U4e31 B2 S5 V29 MN77 MP1.0318 P1-2-3 I0a5.4 Q2277.0 Yguan4 Wgwan ���� ���� {saguaro-like kanji} {horn-shaped locks of hair} {young} {tender} Ц 5026 U4e36 B3 S1 V32 H3344 MN91 MP1.0320 P4-1-4 I0a1.3 Q3000.0 Yzhu3 Wju ���� T2 �Ƥ� {dot} {tick or dot radical (no. 3)} Ч 5027 U4e3c B4 C3 S5 F2088 N171 V37 L2884 O206 MN101 MP1.0337 P4-5-4 I0a5.40 Q5500.0 Yjing3 Ydan3 Wjeong �ȥ� ���� ���祦 ���� �ɤ�֤� {bowl} {bowl of food} Ш 5028 U4e3f B4 S1 V39 H3345 MN106 MP1.0338 P4-1-4 I0a1.2 Q2000.0 Ypie3 Wbyeol �إ� ���� �褦 T1 �� T2 �� �Τ����� {kana-no radical (no. 4)} @@ -3101,7 +3101,7 @@ �� 5149 U5191 B130 C13 S9 XH3747 V395 MN1537 MP2.0117 P2-5-4 I2r7.2 Q5022.7 Yzhou4 Wju ���奦 ���֤� ����� {helmet} �� 514A U5193 B13 S10 V396 MN1540 MP2.0120 P2-5-5 I0a10.14 Q5555.7 Q5544.7 Ygou4 Wgu ���� ����.���� {put together} {inner palace} �� 514B U5195 B13 S11 N624 V397 MN1545 MP2.0120 P2-2-9 Q6041.6 Ymian3 Wmyeon �٥� ��� ������ {crown} -�� 514C U5196 B14 S2 V398 H3353 MN1565 MP2.0122 P4-2-1 I2i0.1 Q3702.0 Ymi4 Wmyeog �٥� T2 �狼���� �٤������� {wa-tqshaped crown radical (no. 14)} +�� 514C U5196 B14 S2 V398 H3353 MN1565 MP2.0122 P4-2-1 I2i0.1 Q3702.0 Ymi4 Wmyeog �٥� T2 �狼���� �٤������� {wa-shaped crown radical (no. 14)} �� 514D U51a4 B14 S10 XJ05563 F2382 N631 V404 MN1587X MP2.0128 P2-2-8 Q3741.3 Yyuan1 Wweon ���� {false charge} {hatred} �� 514E U51a6 B14 S10 XJ05564 XJ13A5A XH1313 V402 MN1590 MP2.0133 P2-2-8 Q3721.4 Ykou4 Wgu ���� ����.���� {foe} {enemy} {revenge} {grudge} {feud} �� 514F U51a2 B14 S10 XH1120 V403 MN1585 MP2.0127 P2-2-8 I2i8.1 Q3723.2 Yzhong3 Wchong ���祦 �Ĥ� ����.�� {mound} {hillock} @@ -3488,15 +3488,15 @@ �� 5554 U5b55 B39 S5 N1266 V1283 L2208 O274 MN6938 MP3.0815 P2-2-3 I2c2.1 Q1740.7 Yyun4 Wing �襦 �Ϥ�.�� T1 �Ϥ�� ��� {become pregnant} �� 5555 U5b5a B39 S7 V1286 O483 MN6948 MP3.0824 P2-4-3 I2c4.2 Q2040.7 Yfu2 Wbu �� ���ޤ� �Ϥ���.�� {sincere} {nourish} {encase} �� 5556 U5b5b B39 S7 V1288 MN6949 MP3.0824 P2-4-3 I2k4.1 Q4040.7 Ybei4 Wpae Wbal �ϥ� �֥� �ܥ� {comet} {dark} {obscure} -�� 5557 U5b65 B39 S8 V1290 MN6967 MP3.0858 P2-5-3 I2c5.2 Q4740.7 Ynu2 Wno �� �� �Ĥޤ� {child} {wife and tqchildren} {servant} {slave} +�� 5557 U5b65 B39 S8 V1290 MN6967 MP3.0858 P2-5-3 I2c5.2 Q4740.7 Ynu2 Wno �� �� �Ĥޤ� {child} {wife and children} {servant} {slave} �� 5558 U5b69 B39 S9 N1272 V1295 MN6977 MP3.0585 P1-3-6 I2c6.1 Q1048.2 Yhai2 Whae ���� ���� ���Τߤ� {baby} {infancy} �� 5559 U5b70 B8 C39 S11 N316 V1297 MN6995 MP3.0877 P1-8-3 I3d7.14 Q0541.7 Q0441.7 Yshu2 Wsug ���奯 ������ ���� {which} {how} {who} -�� 555A U5b73 B12 C39 S12 N603 V1299 MN7011X MP3.0879 P2-3-9 I2o9.2 Q4440.7 Yzi1 Yzi4 Wja �� �� ��.�� ����.�� {increase} {bear tqchildren} {also N1274} +�� 555A U5b73 B12 C39 S12 N603 V1299 MN7011X MP3.0879 P2-3-9 I2o9.2 Q4440.7 Yzi1 Yzi4 Wja �� �� ��.�� ����.�� {increase} {bear children} {also N1274} �� 555B U5b75 B4 C39 S14 N244 V1301 MN7021 MP3.0880 P1-4-10 I3n10.5 Q7274.7 Yfu1 Wbu �� ��.���� {hatch} {incubate} �� 555C U5b78 B39 S16 XJ03358 XJ0555D XJ14157 XH2889 XH1271 N1275 V1302 H2898 MN7033 MP3.0881 P2-13-3 Q7740.7 Yxue2 Yxiao2 Whag ���� �ޤ�.�� T1 ���Ȥ� {learning} {knowledge} {school} �� 555D U6588 B67 S7 XJ03358 XJ0555C XJ14157 XH1271 N2065 V2365 H2039 MN13453 MP5.0602 P2-2-5 Q0040.7 Yxue2 Whag ���� �ޤ�.�� {learning} {knowledge} {school} �� 555E U5b7a B39 S17 N1276 V1303 MN7042 MP3.0893 P1-3-14 I2c14.1 Q1142.7 Yru2 Yru4 Wyu ���� �����ʤ� ���Τߤ� {child} -�� 555F U5b80 B40 S3 V1304 H3425 MN7054 MP3.0895 P4-3-4 I3m0.1 Q3032.7 Ymian2 Wmyeon �٥� ��� T2 �������� {tqshaped crown} +�� 555F U5b80 B40 S3 V1304 H3425 MN7054 MP3.0895 P4-3-4 I3m0.1 Q3032.7 Ymian2 Wmyeon �٥� ��� T2 �������� {shaped crown} �� 5560 U5b83 B40 S5 V1306 MN7057 MP3.0897 P2-3-2 I3m2.3 Q3071.1 Yta1 Wda Wsa �� �ؤ� {other} �� 5561 U5ba6 B40 S10 S9 N1298 V1325 MN7138 MP3.1004 P2-3-7 I3m7.14 Q3071.7 Yhuan4 Whwan ���� �Ĥ��� {official} �� 5562 U5bb8 B40 S10 N1305 V1331 MN7171 MP3.1032 P2-3-7 I3m7.13 Q3023.2 Ychen2 Wsin ���� �Τ� {eaves} {palace} {imperial courtesy} @@ -3582,7 +3582,7 @@ �� 5654 U5dac B46 S16 V1514 MN8510 MP4.0309 P1-3-13 I3o13.3 Q2875.3 Yyi1 Weui �� {high} {steep} �� 5655 U5dae B46 S16 XH5000 N1437 V1513 H759 MN8520 MP4.0309 P1-3-13 I3o13.2 Q2878.6 Yxian3 Wheom ���� ����.���� {inaccessible place} {impregnable position} {steep place} {sharp eyes} �� 5656 U5dbd B46 S17 XJ03359 XH208 F2135 N1439 V1516 H2377 L2987 O2775 MN8566 MP4.0314 P2-3-14 Q2223.4 Yyue4 Wag ���� ���� T1 ���� {peak} -�� 5657 U5d90 B46 S14 V1508 MN8447 MP4.0304 P2-3-11 I3o11.4 Q2221.4 Ylong2 Wryung ��� ��ޤΤ����� {tqshape of a mountain} +�� 5657 U5d90 B46 S14 V1508 MN8447 MP4.0304 P2-3-11 I3o11.4 Q2221.4 Ylong2 Wryung ��� ��ޤΤ����� {shape of a mountain} �� 5658 U5db7 B46 S17 N1441 V1518 O2774 MN8545 MP4.0311 P2-3-14 I3o14.1 Q2248.1 Yyi2 Weui Weog ���祯 �� ����.�� {wise} �� 5659 U5dbc B46 S16 N1438 V1515 MN8561 MP4.0313 P1-3-13 I3o13.1 Q2778.1 Yyu3 Wseo ���� ���� {island} �� 565A U5dc9 B46 S20 V1520 MN8618 MP4.0313 P1-3-17 I3o18.1 Q2771.6 Ychan2 Wcham ���� ���� {rising precipitously} {rising steeply} @@ -4610,7 +4610,7 @@ �� 614E U75a5 B104 S9 N3026 V3781 MN22057 MP7.1157 P3-5-4 I5i4.3 Q0012.8 Yjie4 Wgae ���� �Ϥ��� {scabby eruption} �� 614F U75a3 B104 S9 XJ0666F N3027 V3782 MN22050 MP7.1157 P3-5-4 I5i4.1 Q0011.4 Yyou2 Wu �� �楦 ���� {wart} �� 6150 U75c2 B104 S10 N3038 V3793 MN22122 MP7.1167 P3-5-5 I5i5.7 Q0016.0 Yjia1 Wga �� �� ���� ����.�֤� {scab} {dry up} {slough} -�� 6151 U75b3 B104 S10 N3032 V3789 MN22085 MP7.1161 P3-5-5 I5i5.1 Q0017.5 Ygan1 Wgam ���� {tqchildren's diseases} +�� 6151 U75b3 B104 S10 N3032 V3789 MN22085 MP7.1161 P3-5-5 I5i5.1 Q0017.5 Ygan1 Wgam ���� {children's diseases} �� 6152 U75c3 B104 S10 N3034 V3790 MN22124 MP7.1167 P3-5-5 I5i5.11 Q0013.2 Yxuan2 Whyeon ���� ���� {cramps} �� 6153 U75b5 B104 S11 N3047 V3805 H3282 MN22089X MP7.1161 P3-5-6 I5i6.3 Q0011.1 ZSP3-5-5 Yci1 Yci2 Wja �� ���� {crack} {flaw} {scratch} {speck} �� 6154 U75bd B104 S10 N3031 V3787 MN22106 MP7.1163 P3-5-5 I5i5.5 Q0011.7 Yju1 Wjeo �� ���� ���� {carbuncle} @@ -4749,7 +4749,7 @@ �� 627B U78bc B112 S15 V4030 MN24368 MP8.0389 P1-5-10 I5a10.1 Q1162.7 Yma3 Wma �� �� �䤢�� �䤢�� {number} {wharf} {agate} {yard (91.44 cm)} �� 627C U78c5 B112 S15 V4032 MN24386 MP8.0391 P1-5-10 I5a10.4 Q1062.7 Ybang4 Ypang1 Ypang2 Wbang Wpaeng �ܥ� �ۥ� �ݤ�� {become obstructed} {pound (sterling, lb)} �� 627D U78ca B112 S15 N3213 V4036 MN24394 MP8.0392 P2-5-10 I5a10.8 Q1066.1 Ylei3 Wroe �饤 {many stones} -�� 627E U78ec B112 S16 V4042 MN24454 MP8.0401 P2-11-5 I5a11.4 Q4760.1 Yqing4 Wgyeong ���� {upside-V-tqshaped gong} +�� 627E U78ec B112 S16 V4042 MN24454 MP8.0401 P2-11-5 I5a11.4 Q4760.1 Yqing4 Wgyeong ���� {upside-V-shaped gong} � 6321 U78e7 B112 S16 V4041 MN24448 MP8.0398 P1-5-11 I5a11.3 Q1568.6 Yqi4 Wjeog ���� ����� {expanse of sand} {pebbly beach} � 6322 U78da B112 S16 N3219 V4043 MN24418 MP8.0396 P1-5-11 I5a11.1 Q1564.3 Yzhuan1 Wjeon ���� ����� {tile} � 6323 U78fd B112 S17 V4047 MN24494 MP8.0405 P1-5-12 I5a12.3 Q1461.1 Yqiao1 Wgyo ���� ���祦 {rocky} {barren} diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index a17583f4..64cdb941 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -172,7 +172,7 @@ void TopLevel::addToList() if (learnList.isEmpty()) createLearn(); else - StatusBar->message(i18n("%1 added to learn list of all open learn windows").tqarg(toAddKanji.kanji())); + StatusBar->message(i18n("%1 added to learn list of all open learn windows").arg(toAddKanji.kanji())); emit add(toAddKanji); } @@ -257,12 +257,12 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) addAction->setEnabled(true); - _ResultView->append(TQString("<p>%1</p>").tqarg(i18n("HTML Entity: %1").tqarg(TQString("&#x%1;").tqarg(TQString::number(toAddKanji.kanji().tqat(0).tqunicode(), 16))))); // show html entity + _ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).tqunicode(), 16))))); // show html entity // now show some compounds in which this kanji appears TQString kanji = toAddKanji.kanji(); - _ResultView->addHeader(i18n("%1 in compounds").tqarg(kanji)); + _ResultView->addHeader(i18n("%1 in compounds").arg(kanji)); Dict::SearchResult compounds = _Asyndeta.retrieveIndex()->search(TQRegExp(kanji), kanji, true); bool common = true; @@ -498,7 +498,7 @@ void TopLevel::strokeSearch() // must be in kanjidic mode kanjiCB->setChecked(true); - doSearch(TQString("S%1 ").tqarg(strokesString), regexp); + doSearch(TQString("S%1 ").arg(strokesString), regexp); } void TopLevel::gradeSearch() @@ -519,7 +519,7 @@ void TopLevel::gradeSearch() return; } - TQString text = TQString("G%1 ").tqarg(grade); + TQString text = TQString("G%1 ").arg(grade); TQRegExp regexp = TQRegExp(text); kanjiCB->setChecked(true); @@ -585,7 +585,7 @@ void TopLevel::setResults(unsigned int results, unsigned int fullNum) TQString str = i18n("%n result","%n results",results); if (results < fullNum) - str += i18n(" out of %1").tqarg(fullNum); + str += i18n(" out of %1").arg(fullNum); StatusBar->message(str); setCaption(str); @@ -681,7 +681,7 @@ TQRegExp TopLevel::readingSearchItems(bool kanji) else regexp = "\\[%1\\]"; - regexp = regexp.tqarg(text); + regexp = regexp.arg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -699,7 +699,7 @@ TQRegExp TopLevel::kanjiSearchItems(bool beginning) else regexp = "^%1\\W"; - regexp = regexp.tqarg(text); + regexp = regexp.arg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -717,7 +717,7 @@ TQRegExp TopLevel::searchItems() else regexp = "%1"; - regexp = regexp.tqarg(text); + regexp = regexp.arg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -772,12 +772,12 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign already = true; } - hist.text = i18n("Radical(s): %1").tqarg(prettyRadicalString); + hist.text = i18n("Radical(s): %1").arg(prettyRadicalString); if (strokes) - hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").tqarg(prettyRadicalString).tqarg(strokes), true)); + hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").arg(prettyRadicalString).arg(strokes), true)); else - hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").tqarg(prettyRadicalString), true)); + hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").arg(prettyRadicalString), true)); TQString strokesString; if (strokes) @@ -800,7 +800,7 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign for (it = list.begin(); it != list.end(); ++it) { - Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").tqarg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked()); + Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").arg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked()); hist.outOf += results.outOf; if (results.count < 1) diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp index e691f506..6ae2da6c 100644 --- a/kiten/kloader.cpp +++ b/kiten/kloader.cpp @@ -79,7 +79,7 @@ bool KLoader::open(void) { if(!d->file->open(IO_ReadOnly)) { - d->error = i18n("Could not read from %1.").tqarg(d->url.prettyURL()); + d->error = i18n("Could not read from %1.").arg(d->url.prettyURL()); return false; } } @@ -87,14 +87,14 @@ bool KLoader::open(void) { if(!KIO::NetAccess::download(d->url, d->tempFile)) { - d->error = i18n("Could not read from %1.").tqarg(d->url.prettyURL()); + d->error = i18n("Could not read from %1.").arg(d->url.prettyURL()); return false; } d->file = new TQFile(d->tempFile); if(!d->file->open(IO_ReadOnly)) { - d->error = i18n("Could not read from %1.").tqarg(d->tempFile); + d->error = i18n("Could not read from %1.").arg(d->tempFile); return false; } } diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp index 2ce2edb4..8e36f6d1 100644 --- a/kiten/ksaver.cpp +++ b/kiten/ksaver.cpp @@ -85,7 +85,7 @@ bool KSaver::open(void) } else { - d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL()); + d->error = i18n("Could not write to %1.").arg(d->url.prettyURL()); return false; } } diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 2b4aa2d3..16c5baeb 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -299,7 +299,7 @@ void Learn::update() TQString kanji = curKanji.kanji(); Dict::SearchResult compounds = index->search(TQRegExp(kanji), kanji, true); - View->addHeader(i18n("%1 in compounds").tqarg(kanji)); + View->addHeader(i18n("%1 in compounds").arg(kanji)); for (TQValueListIterator<Dict::Entry> it = compounds.list.begin(); it != compounds.list.end(); ++it) { @@ -315,12 +315,12 @@ void Learn::updateGrade() int grade = getCurrentGrade(); TQString regexp("G%1 "); - regexp = regexp.tqarg(grade); + regexp = regexp.arg(grade); Dict::SearchResult result = index->searchKanji(TQRegExp(regexp), regexp, false); list = result.list; - statusBar()->message(i18n("%1 entries in grade %2").tqarg(list.count()).tqarg(grade)); + statusBar()->message(i18n("%1 entries in grade %2").arg(list.count()).arg(grade)); list.remove(list.begin()); current = list.begin(); @@ -351,7 +351,7 @@ void Learn::read(const KURL &url) // ignore whitespace if (!kanji.isSpace()) { - TQRegExp regexp ( TQString("^%1\\W").tqarg(kanji) ); + TQRegExp regexp ( TQString("^%1\\W").arg(kanji) ); Dict::SearchResult res = index->searchKanji(regexp, kanji, false); Dict::Entry first = Dict::firstEntry(res); if (first.extendedKanjiInfo()) @@ -444,7 +444,7 @@ void Learn::write(const KURL &url) stream.setCodec(&codec); for (TQListViewItemIterator it(List); it.current(); ++it) - stream << it.current()->text(0).tqat(0); + stream << it.current()->text(0).at(0); if (!saver.close()) { @@ -456,7 +456,7 @@ void Learn::write(const KURL &url) setClean(); - statusBar()->message(i18n("%1 written").tqarg(url.prettyURL())); + statusBar()->message(i18n("%1 written").arg(url.prettyURL())); } void Learn::saveScores() @@ -485,13 +485,13 @@ void Learn::add(Dict::Entry toAdd, bool noEmit) { if (it.current()->text(0) == kanji) { - statusBar()->message(i18n("%1 already on your list").tqarg(kanji)); + statusBar()->message(i18n("%1 already on your list").arg(kanji)); return; } } } - statusBar()->message(i18n("%1 added to your list").tqarg(kanji)); + statusBar()->message(i18n("%1 added to your list").arg(kanji)); KConfig &config = *Config::self()->config(); int score = 0; @@ -515,7 +515,7 @@ void Learn::addAll() int grade = getCurrentGrade(); TQString regexp("G%1 "); - regexp = regexp.tqarg(grade); + regexp = regexp.arg(grade); Dict::SearchResult result = index->searchKanji(TQRegExp(regexp), regexp, false); for (TQValueListIterator<Dict::Entry> i = result.list.begin(); i != result.list.end(); ++i) @@ -607,7 +607,7 @@ void Learn::del() void Learn::print() { View->clear(); - View->addHeader(TQString("<h1>%1</h1>").tqarg(i18n("Learning List")), 1); + View->addHeader(TQString("<h1>%1</h1>").arg(i18n("Learning List")), 1); TQListViewItemIterator it(List); for (; it.current(); ++it) @@ -774,7 +774,7 @@ void Learn::qnew() // new quiz kanji nogood = false; statusBar()->clear(); - statusBar()->message(TQString("%1 %2 %3").tqarg(curItem->text(0)).tqarg(curItem->text(1)).tqarg(curItem->text(2))); + statusBar()->message(TQString("%1 %2 %3").arg(curItem->text(0)).arg(curItem->text(1)).arg(curItem->text(2))); backAct->setEnabled(true); diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index b2a86f39..9f65a4a4 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -59,7 +59,7 @@ void ResultView::addResult(Dict::Entry result, bool common) { if (result.dictName() != "__NOTSET") { - addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).tqarg(result.dictName()), 5); + addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).arg(result.dictName()), 5); return; } if (result.header() != "__NOTSET") @@ -70,9 +70,9 @@ void ResultView::addResult(Dict::Entry result, bool common) TQString html; if (result.kanaOnly()) - html = TQString("<p><font size=\"+2\">%1</font> ").tqarg(result.firstReading()); + html = TQString("<p><font size=\"+2\">%1</font> ").arg(result.firstReading()); else - html = TQString("<p><font size=\"+2\">%1</font>: %2 ").tqarg(putchars(result.kanji())).tqarg(result.firstReading()); + html = TQString("<p><font size=\"+2\">%1</font>: %2 ").arg(putchars(result.kanji())).arg(result.firstReading()); TQStringList::Iterator it; TQStringList Meanings = result.meanings(); @@ -103,7 +103,7 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) { if (result.dictName() != "__NOTSET") { - addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).tqarg(result.dictName()), 5); + addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).arg(result.dictName()), 5); return; } if (result.header() != "__NOTSET") @@ -113,15 +113,15 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) } TQString html; - html = TQString("<p><font size=\"+3\">%1</font>: %2 ").tqarg(putchars(result.kanji())); + html = TQString("<p><font size=\"+3\">%1</font>: %2 ").arg(putchars(result.kanji())); unsigned int freq = result.freq(); if (freq == 0) // does it have a frequency? - html = html.tqarg(i18n("Rare")); + html = html.arg(i18n("Rare")); else // this isn't a number of times, it's simply an index of // probability - html = html.tqarg(i18n("Probability rank #%1").tqarg(freq)); + html = html.arg(i18n("Probability rank #%1").arg(freq)); html += "<br />"; @@ -171,25 +171,25 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) switch (result.grade()) { case 0: - html = html.tqarg(i18n("None")); + html = html.arg(i18n("None")); break; case 8: - html = html.tqarg(i18n("In Jouyou")); + html = html.arg(i18n("In Jouyou")); break; case 9: - html = html.tqarg(i18n("In Jinmeiyou")); + html = html.arg(i18n("In Jinmeiyou")); break; default: - html = html.tqarg(result.grade()); + html = html.arg(result.grade()); } - html = html.tqarg(result.strokes()); + html = html.arg(result.strokes()); if (result.miscount() != 0) - html.append(i18n(" Common Miscount: %1.").tqarg(result.miscount())); + html.append(i18n(" Common Miscount: %1.").arg(result.miscount())); if (!!rad.radical()) - html.append(i18n(" Largest radical: %1, with %2 strokes.").tqarg(TQString("<a href=\"__radical:%1\">%2</a>").tqarg(rad.radical()).tqarg(rad.radical())).tqarg(rad.strokes())); + html.append(i18n(" Largest radical: %1, with %2 strokes.").arg(TQString("<a href=\"__radical:%1\">%2</a>").arg(rad.radical()).arg(rad.radical())).arg(rad.strokes())); html += "</p>"; @@ -198,7 +198,7 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) void ResultView::addHeader(const TQString &header, unsigned int degree) { - append(TQString("<h%1>%2</h%3>").tqarg(degree).tqarg(header).tqarg(degree)); + append(TQString("<h%1>%2</h%3>").arg(degree).arg(header).arg(degree)); } TQString ResultView::putchars(const TQString &text) @@ -212,7 +212,7 @@ TQString ResultView::putchars(const TQString &text) for (unsigned i = 0; i < len; i++) { if (Dict::textType(TQString(text.at(i))) == Dict::Text_Kanji) - ret.append(TQString("<a href=\"%1\">%1</a>").tqarg(text.tqat(i)).tqarg(text.tqat(i))); + ret.append(TQString("<a href=\"%1\">%1</a>").arg(text.at(i)).arg(text.at(i))); else ret.append(text.at(i)); } @@ -251,7 +251,7 @@ void ResultView::print(TQString title) TQRect body(dpix, dpiy, metrics.width() - margin * dpix / margin * 2, metrics.height() - margin * dpiy / margin * 2); - TQSimpleRichText richText(title.isNull()? printText : i18n("<h1>Search for \"%1\"</h1>").tqarg(title) + printText, font(), context(), styleSheet(), mimeSourceFactory(), body.height(), TQt::black, false); + TQSimpleRichText richText(title.isNull()? printText : i18n("<h1>Search for \"%1\"</h1>").arg(title) + printText, font(), context(), styleSheet(), mimeSourceFactory(), body.height(), TQt::black, false); richText.setWidth(&p, body.width()); TQRect view(body); int page = 1; @@ -268,7 +268,7 @@ void ResultView::print(TQString title) TQFont myFont(font()); myFont.setPointSize(9); p.setFont(myFont); - TQString footer(TQString("%1 - Kiten").tqarg(TQString::number(page))); + TQString footer(TQString("%1 - Kiten").arg(TQString::number(page))); p.drawText(view.right() - p.fontMetrics().width(footer), view.bottom() + p.fontMetrics().ascent() + 5, footer); @@ -391,7 +391,7 @@ void eEdit::save() text.append(" "); if (!kanji.isEmpty()) - text.append(TQString("[%1] ").tqarg(reading)); + text.append(TQString("[%1] ").arg(reading)); text.append(meanings); if (common) |