summaryrefslogtreecommitdiffstats
path: root/kiten
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:55:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:55:10 -0600
commit746abe84406ed1ec1a8dc68f29ce0ab8322ccc80 (patch)
tree34a73ef7b8771de54099eeffb941117e49a8865e /kiten
parent999f961ff5278b84c8ffd8a91addb9343e589cf0 (diff)
downloadtdeedu-746abe84406ed1ec1a8dc68f29ce0ab8322ccc80.tar.gz
tdeedu-746abe84406ed1ec1a8dc68f29ce0ab8322ccc80.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kiten')
-rw-r--r--kiten/dict.cpp6
-rw-r--r--kiten/edict540
-rw-r--r--kiten/kanjidic26
-rw-r--r--kiten/kiten.cpp26
-rw-r--r--kiten/kloader.cpp6
-rw-r--r--kiten/ksaver.cpp2
-rw-r--r--kiten/learn.cpp22
-rw-r--r--kiten/widgets.cpp38
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 @@
怪獣映画 [かいじゅうえいが] /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 @@
再燃 [さいねん] /(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/
鐚一文 [びたいちもん] /(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 574baa56..53b52a46 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("&amp;#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("&amp;#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)