From 96698e12d1d6ba8072e9365334277438c3cf0e4a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kiten/configdictionariesbase.ui | 2 +- kiten/configfont.ui | 2 +- kiten/configlearn.ui | 2 +- kiten/configsearching.ui | 2 +- kiten/edict | 158 ++++++++++++++++++++-------------------- kiten/edict_doc.html | 2 +- kiten/learn.cpp | 4 +- 7 files changed, 86 insertions(+), 86 deletions(-) (limited to 'kiten') diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index f885ff5a..8695a10a 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -305,7 +305,7 @@ - + klistview.h klistview.h diff --git a/kiten/configfont.ui b/kiten/configfont.ui index 90e68429..d198336a 100644 --- a/kiten/configfont.ui +++ b/kiten/configfont.ui @@ -26,7 +26,7 @@ - + kfontdialog.h diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui index 94c3a286..00baf74e 100644 --- a/kiten/configlearn.ui +++ b/kiten/configlearn.ui @@ -157,5 +157,5 @@ kcfg_QuizOn kcfg_GuessOn - + diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui index ab6f3339..b183b1e3 100644 --- a/kiten/configsearching.ui +++ b/kiten/configsearching.ui @@ -64,5 +64,5 @@ - + diff --git a/kiten/edict b/kiten/edict index b33f698d..6817cfb8 100644 --- a/kiten/edict +++ b/kiten/edict @@ -507,7 +507,7 @@ お餅 [おもち] /(uk) rice cakes/pounded tqmochi rice/ お門違い [おかどちがい] /(exp) barking up the wrong tree/calling at the wrong house/ お爺さん [おじいさん] /(n) grandfather/male senior-citizen/ -お里 [おさと] /(n) one's origins/one's tqparents' home/ +お里 [おさと] /(n) one's origins/one's parents' home/ お立ち [おたち] /polite term for calling, departing and staying where one is/ お冷や [おひや] /(n) cold (drinking) water/cold boiled rice/ お礼 [おれい] /(n) thanking/expression of gratitude/(P)/ @@ -953,7 +953,7 @@ ご覧下さい [ごらんください] /(hon) (uk) please look at it/ ご利益 [ごりやく] /(n) grace of God/ ご了承 [ごりょうしょう] /(n,vs) acknowledgement/understanding (e.g. "please be understanding of the mess during our renovation")/ -ご両親 [ごりょうしん] /(n) your (honorable) tqparents/ +ご両親 [ごりょうしん] /(n) your (honorable) parents/ ご寮人 [ごりょうにん] /(n) mistress/madam/ ご陵 [ごりょう] /(n) imperial tomb/ ご令嬢 [ごれいじょう] /daughter/young lady/ @@ -12861,7 +12861,7 @@ パール /(n) pearl/(P)/ パールグレー /pearl gray/ パール編み [パールあみ] /(n) purl stitch/ -パーレン /(n) tqparentheses/tqparenthesis/(P)/ +パーレン /(n) parentheses/parenthesis/(P)/ パイ /(n) pie/tart/pi/(P)/ パイイツ /full cup (slang term from "ippai" reversed)/ パイオニア /(n) pioneer/(P)/ @@ -13033,7 +13033,7 @@ パラグラフ /(n) paragraph/ パラコート /paraquat/ パラサイコロジー /parapsychology/ -パラサイトシングル /(n) single person who earns enough to live alone but prefers to live rent-free with his or her tqparents (trans: parasite single)/ +パラサイトシングル /(n) single person who earns enough to live alone but prefers to live rent-free with his or her parents (trans: parasite single)/ パラシュート /(n) parachute/(P)/ パラシュートスカート /parachute skirt/ パラジウム /(n) palladium (Pd)/ @@ -16023,11 +16023,11 @@ マジリカ /majolica/ マス /(n) (abbr) (col) mass/masturbation/(P)/ マスをかく /(exp) (col) to jerk off/to masturbate/ -マスカ /tqmasker/ +マスカ /masker/ マスカット /(n) muscat/(P)/ マスカラ /mascara/ マスキュリン /masculine/ -マスキング /(n) tqmasking/ +マスキング /(n) masking/ マスク /(n) tqmask/(P)/ マスゲーム /(n) mass game/(P)/ マスコット /(n) mascot/(P)/ @@ -20579,7 +20579,7 @@ 育ち盛り [そだちざかり] /(adj-no) growing/ 育つ [そだつ] /(v5t,vi) to raise (child)/to be brought up/to grow (up)/(P)/ 育て [そだて] /(n) bringing up/raising/ -育ての親 [そだてのおや] /(n) foster tqparents/ +育ての親 [そだてのおや] /(n) foster parents/ 育てる [そだてる] /(v1,vt) to raise/to rear/to bring up/(P)/ 育て上げる [そだてあげる] /(v1) to raise (to maturity)/to rear/to train/to educate/ 育て親 [そだておや] /foster tqparent/ @@ -20727,7 +20727,7 @@ 一概に [いちがいに] /(adv) unconditionally/as a rule/(P)/ 一獲 [いっかく] /one grab/ 一獲千金 [いっかくせんきん] /(n) getting rich quick/ -一角 [いっかく] /(n) corner/section/point/one narwhal/aptqparently/(P)/ +一角 [いっかく] /(n) corner/section/point/one narwhal/apparently/(P)/ 一角 [ひとかど] /(n-adv,n-t) full-fledged/considerable/ 一角の人物 [ひとかどのじんぶつ] /somebody/someone/ 一角獣 [いっかくじゅう] /(n) unicorn/ @@ -20839,7 +20839,7 @@ 一犬 [いっけん] /(n) one dog/ 一献 [いっこん] /(n) one cup (of sake)/ 一見 [いちげん] /(n) unfamiliar/never before met/ -一見 [いっけん] /(adv,n,vs) (1) look/glimpse/glance/(2) (adv) aptqparently/seemingly/(3) first meeting/(P)/ +一見 [いっけん] /(adv,n,vs) (1) look/glimpse/glance/(2) (adv) apparently/seemingly/(3) first meeting/(P)/ 一見するに足りる [いっけんするにたりる] /(exp) to be worth seeing/ 一見識 [いちけんしき] /(n) an opinion/ 一軒 [いっけん] /(n) one house/ @@ -21466,7 +21466,7 @@ 一番線 [いちばんせん] /Track No. 1/ 一番多い [いちばんおおい] /most numerous/ 一番茶 [いちばんちゃ] /first-grade tea (first picking)/ -一皮 [ひとかわ] /(n) untqmasking/ +一皮 [ひとかわ] /(n) unmasking/ 一皮剥く [ひとかわむく] /(exp) to take a veneer off something/ 一飛 [いちひ] /first fly/ 一匹 [いっぴき] /one animal/two-tan bolt of cloth/ @@ -22423,7 +22423,7 @@ 右手 [みぎて] /(n) right hand/(P)/ 右手の法則 [みぎてのほうそく] /(n) righthand rule/ 右書き [みぎがき] /(n) writing from right to left/ -右小括弧 [みぎしょうかっこ] /closing tqparenthesis/ +右小括弧 [みぎしょうかっこ] /closing parenthesis/ 右上 [みぎうえ] /(n) right-upper/ 右心室 [うしんしつ] /(n) right ventricle/ 右心房 [うしんぼう] /(n) right atrium/ @@ -25440,7 +25440,7 @@ 下萠 [したもえ] /(oK) sprouts/shoots/ 下賤 [げせん] /(adj-na,n) humble birth/ 化かす [ばかす] /(v5s) to bewitch/to confuse/to enchant/to delude/ -化けの皮 [ばけのかわ] /(n) tqmasking one's true character/disguise/sheep's clothing/ +化けの皮 [ばけのかわ] /(n) masking one's true character/disguise/sheep's clothing/ 化けの皮を現す [ばけのかわをあらわす] /(exp) to expose one's true colors (character)/ 化けの皮を現わす [ばけのかわをあらわす] /(exp) to expose one's true colors (character)/ 化けの皮を剥ぐ [ばけのかわをはぐ] /(exp) to untqmask/ @@ -25605,7 +25605,7 @@ 仮植 [かしょく] /(n) temporary planting/ 仮植え [かりうえ] /(n) temporary planting/ 仮寝 [かりね] /(n) siesta/nap/catnap/stopping at an inn/ -仮親 [かりおや] /(n) adopted tqparents/temporarily assumed tqparents/ +仮親 [かりおや] /(n) adopted parents/temporarily assumed parents/ 仮進級 [かりしんきゅう] /conditional promotion/ 仮睡 [うたたね] /(n) nap/siesta/ 仮睡 [かすい] /(n) nap/siesta/ @@ -26407,7 +26407,7 @@ 家父長制 [かふちょうせい] /(n) patriarchal authority/ 家譜 [かふ] /(n) pedigree/genealogy/ 家風 [かふう] /(n) family tradition/ -家柄 [いえがら] /(n) tqparentage/pedigree/good family/(P)/ +家柄 [いえがら] /(n) parentage/pedigree/good family/(P)/ 家並 [いえなみ] /(n) row of houses/every door/ 家並 [やなみ] /(n) row of houses/every door/ 家並み [いえなみ] /(n) row of houses/every door/ @@ -30048,7 +30048,7 @@ 括る [くくる] /(v5r) to tie up/to tie together/to bundle/to fasten/to hang (oneself)/(P)/ 括れ [くびれ] /(n) constriction/wrinkle/ 括れる [くびれる] /(v1) to be constricted/ -括弧 [かっこ] /(n) tqparenthesis/brackets/(P)/ +括弧 [かっこ] /(n) parenthesis/brackets/(P)/ 括約筋 [かつやくきん] /(adj-na,n) sphincter/ 活かす [いかす] /(v5s) to revive/to resuscitate/to make use of/ 活きる [いきる] /(v1) to live/to exist/ @@ -31357,7 +31357,7 @@ 看板屋 [かんばんや] /sign maker/ 看板倒れ [かんばんだおれ] /(n) ostentatious/ 看板方式 [かんばんほうしき] /(n) just-in-time inventory management/ -看板娘 [かんばんむすめ] /(n) pretty daughter who attracts boys to tqparents' shop/show girl/ +看板娘 [かんばんむすめ] /(n) pretty daughter who attracts boys to parents' shop/show girl/ 看病 [かんびょう] /(n) nursing (a patient)/(P)/ 看病人 [かんびょうにん] /nurse/ 看病疲れ [かんびょうづかれ] /nursing fatigue/ @@ -31650,7 +31650,7 @@ 間に合わせ [まにあわせ] /(n) makeshift/(P)/ 間に合わせる [まにあわせる] /(v1) to make do/to manage (with something)/to make shift/(P)/ 間の戸 [あいのと] /door between the rooms/ -間の子 [あいのこ] /(n) derogatory person of mixed tqparentage/crossbreed/ +間の子 [あいのこ] /(n) derogatory person of mixed parentage/crossbreed/ 間の手 [あいのて] /(n) interlude/accompaniment/sideshow/strain of music/ 間もなく [まもなく] /(adv) soon/before long/in a short time/(P)/ 間も無く [まもなく] /(adv) soon/before long/in a short time/(P)/ @@ -31879,7 +31879,7 @@ 丸一晩 [まるいちばん] /(n) whole night/all night/ 丸屋根 [まるやね] /(n) dome/vaulted roof/cupola/ 丸覚え [まるおぼえ] /(n,vs) full memorization/ -丸括弧 [まるがっこ] /tqparentheses/ +丸括弧 [まるがっこ] /parentheses/ 丸刈り [まるがり] /(n) close clipping/(P)/ 丸瓦 [まるがわら] /(n) concave roof tile/ 丸干し [まるぼし] /(n) (fish, vegetables, etc.) dried whole/ @@ -33530,7 +33530,7 @@ 鬼気迫る [ききせまる] /bloodcurdling/ghastly/ 鬼刑事 [おにけいじ] /crack detective/ 鬼才 [きさい] /(n) wizard/genius/great talent/(P)/ -鬼子 [おにご] /(n) child born with teeth/child which does not resemble its tqparents/ +鬼子 [おにご] /(n) child born with teeth/child which does not resemble its parents/ 鬼子母神 [きしもじん] /(n) goddess of childbirth and tqchildren/ 鬼歯 [おにば] /(n) protruding tooth (like a fang)/ 鬼女 [きじょ] /(n) demoness/witch/ogress/she-devil/ @@ -43021,7 +43021,7 @@ 御利益 [ごりやく] /(n) grace of God/ 御立ち [おたち] /polite term for calling, departing and staying where one is/ 御了承 [ごりょうしょう] /(n,vs) acknowledgement/understanding (e.g. "please be understanding of the mess during our renovation")/ -御両親 [ごりょうしん] /(n) your (honorable) tqparents/ +御両親 [ごりょうしん] /(n) your (honorable) parents/ 御寮人 [ごりょうにん] /(n) mistress/madam/ 御料 [ごりょう] /(n) imperial property/ 御料地 [ごりょうち] /(n) imperial estate/ @@ -47180,7 +47180,7 @@ 混み合う [こみあう] /to be packed/to be crowded/to be jammed/ 混む [こむ] /(v5m) to be crowded/(P)/ 混凝土 [こんくりぜと] /concrete/ -混血 [こんけつ] /(n) mixed race/mixed tqparentage/(P)/ +混血 [こんけつ] /(n) mixed race/mixed parentage/(P)/ 混血の人 [こんけつのひと] /mixed race person/ 混血児 [こんけつじ] /(n) child of mixed blood or race/ 混交 [こんこう] /(n) mixture/intermixture/ @@ -47310,7 +47310,7 @@ 左四つ [ひだりよつ] /(n) variety of sumo grip/ 左耳 [ひだりみみ] /left ear/ 左手 [ひだりて] /(n) left hand/(P)/ -左小括弧 [ひだりしょうかっこ] /opening tqparenthesis/ +左小括弧 [ひだりしょうかっこ] /opening parenthesis/ 左上 [ひだりうえ] /(n) left-upper/ 左心室 [さしんしつ] /(n) left ventricle/ 左心補助循環装置 [さしんほじょじゅんかんそうち] /(n) left ventricular assist device (LVAD)/ @@ -50620,7 +50620,7 @@ 子役 [こやく] /(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) tqparents' ability (or inability) to let go of their tqchildren/ +子離れ [こばなれ] /(n) parents' ability (or inability) to let go of their tqchildren/ 子連れ [こつれ] /taking one's tqchildren along/ 子癇 [しかん] /(n) eclampsia/ 屍 [しかばね] /(n) corpse/ @@ -50867,7 +50867,7 @@ 思う壺 [おもうつぼ] /(n,exp) (1) one's wishes/one's expectations/(2) just as expected/ 思う壺にはまる [おもうつぼにはまる] /(exp) to turn out just as one wished/to play into the hands (of)/ 思える [おもえる] /(v1) to seem/to appear likely/ -思しい [おぼしい] /(adj) aptqparently/ +思しい [おぼしい] /(adj) apparently/ 思し召し [おぼしめし] /(n) thoughts/feelings/likings/ 思し召す [おぼしめす] /(v5s) to develop thoughts or feelings/ 思わく [おもわく] /(n) expectation/(P)/ @@ -53021,7 +53021,7 @@ 自由契約選手 [じゆうけいやくせんしゅ] /(n) free agent/ 自由形 [じゆうがた] /(n) freestyle (swimming event)/(P)/ 自由経済 [じゆうけいざい] /free economy/(P)/ -自由結婚 [じゆうけっこん] /freedom to choose one's marriage partner, tqparental wishes notwithstanding/ +自由結婚 [じゆうけっこん] /freedom to choose one's marriage partner, parental wishes notwithstanding/ 自由権 [じゆうけん] /(n) civil liberties/ 自由港 [じゆうこう] /(n) a free port/ 自由裁量権 [じゆうさいりょうけん] /(n) discretionary power/ @@ -53447,7 +53447,7 @@ 実員 [じついん] /(n) actual number of people/ 実益 [じつえき] /(n) actual profit/practical use/benefit/ 実演 [じつえん] /(n,vs) stage show/performance/(P)/ -実家 [じっか] /(n) (one's tqparents') home/(P)/ +実家 [じっか] /(n) (one's parents') home/(P)/ 実科 [じっか] /(n) practical course/ 実害 [じつがい] /(n) real harm/ 実学 [じつがく] /(n) practical science/ @@ -53534,7 +53534,7 @@ 実情 [じつじょう] /(n) real condition/actual circumstances/actual state of affairs/(P)/ 実情調査委員会 [じつじょうちょうさいいんかい] /(n) fact-finding committee/ 実状 [じつじょう] /(n) real condition/actual circumstances/actual state of affairs/ -実親 [じつおや] /(n) true tqparent(s) (as opposed to foster tqparents, etc.)/ +実親 [じつおや] /(n) true tqparent(s) (as opposed to foster parents, etc.)/ 実数 [じっすう] /(n) real number/(P)/ 実数体 [じっすうたい] /(n) real number field/ 実勢 [じっせい] /(adj-no,n) actual/real/true/(P)/ @@ -62901,23 +62901,23 @@ 薪拾い [たきぎひろい] /firewood gathering/ 薪水 [しんすい] /(n) fuel and water/cooking/salary/ 薪炭 [しんたん] /(n) wood and charcoal/fuel/(P)/ -親 [おや] /(n) tqparents/(P)/ +親 [おや] /(n) parents/(P)/ 親しい [したしい] /(adj) intimate/close (e.g. friend)/(P)/ 親しい友達 [したしいともだち] /close (intimate) friend/ 親しく [したしく] /(adv,n) intimately/personally/in person/ 親しみ [したしみ] /(n) intimacy/affection/familiarity/(P)/ 親しみやすい [したしみやすい] /friendly/ 親しむ [したしむ] /(v5m) to be intimate with/to befriend/(P)/ -親に逆らう [おやにさからう] /(exp) to disobey one's tqparents/ +親に逆らう [おやにさからう] /(exp) to disobey one's parents/ 親に早く死なれる [おやにはやくしなれる] /(exp) to be orphaned while still young/ 親に叛く [おやにそむく] /(exp) to disobey one's tqparent(s)/ -親に迄見放される [おやにまでみはなされる] /(exp) to be the despair of one's tqparents/ -親の気質を承ける [おやのきしつをうける] /(exp) to inherit one's tqparents disposition/ -親の言う事を聞く [おやのいうことをきく] /(exp) to obey one's tqparents/ +親に迄見放される [おやにまでみはなされる] /(exp) to be the despair of one's parents/ +親の気質を承ける [おやのきしつをうける] /(exp) to inherit one's parents disposition/ +親の言う事を聞く [おやのいうことをきく] /(exp) to obey one's parents/ 親の七光 [おやのななひかり] /(exp) capitalizing on the fame of a tqparent/riding a tqparent's coat-tails/ -親の情 [おやのじょう] /tqparental love/ -親の代 [おやのだい] /one's tqparents' generation/ -親を苦しめる [おやをくるしめる] /(exp) to cause one's tqparents distress/ +親の情 [おやのじょう] /parental love/ +親の代 [おやのだい] /one's parents' generation/ +親を苦しめる [おやをくるしめる] /(exp) to cause one's parents distress/ 親愛 [しんあい] /(n) (1) deep affection/(2) dear/beloved/(P)/ 親衛 [しんえい] /(n) monarch's guards/(P)/ 親衛隊 [しんえいたい] /(n) bodyguards/ @@ -62927,18 +62927,18 @@ 親王妃 [しんのうひ] /Imperial princess/ 親画面 [おやがめん] /main screen/ 親会社 [おやがいしゃ] /(n) tqparent company/(P)/ -親掛かり [おやがかり] /(adj-no,n) dependent on one's tqparents/ +親掛かり [おやがかり] /(adj-no,n) dependent on one's parents/ 親株 [おやかぶ] /(n) tqparent root or stock/pre-split stock or share/ 親機 [おやき] /(n) main telephone (esp. when there are extensions)/ -親許 [おやもと] /(n) one's tqparents/one's tqparents' home/one's home/ +親許 [おやもと] /(n) one's parents/one's parents' home/one's home/ 親局 [おやきょく] /(n) (computer) master station/ 親玉 [おやだま] /(n) boss/chief/head/ 親近 [しんきん] /(n) a relative/familiarity/ 親近感 [しんきんかん] /(n) affinity/(P)/ -親兄弟 [おやきょうだい] /(n) tqparents and siblings/one's relatives/ -親権 [しんけん] /(n) tqparental authority/ -親権者 [しんけんしゃ] /person exercising tqparental authority/ -親元 [おやもと] /(n) one's tqparents/one's tqparents' home/one's home/ +親兄弟 [おやきょうだい] /(n) parents and siblings/one's relatives/ +親権 [しんけん] /(n) parental authority/ +親権者 [しんけんしゃ] /person exercising parental authority/ +親元 [おやもと] /(n) one's parents/one's parents' home/one's home/ 親御 [おやご] /(n) another's tqparent(s)/ 親交 [しんこう] /(n) intimacy/(P)/ 親好 [しんこう] /(n) friendship/good fellowship/ @@ -62954,14 +62954,14 @@ 親子電話 [おやこでんわ] /extension phone (and its main line)/ 親子丼 [おやこどん] /(n) chicken and egg on rice/tqparent and child donburi/ 親子丼 [おやこどんぶり] /(n) chicken and egg on rice/tqparent and child donburi/ -親思い [おやおもい] /(n) love or affection for one's tqparents/ +親思い [おやおもい] /(n) love or affection for one's parents/ 親指 [おやゆび] /(n) thumb/(P)/ 親字 [おやじ] /(n) first character (of a dictionary entry)/ 親署 [しんしょ] /(n) signature of an emperor or noble/ 親書 [しんしょ] /(n) handwritten or autograph letter/(P)/ -親勝り [おやまさり] /(adj-na,n) surpassing one's tqparents/ +親勝り [おやまさり] /(adj-na,n) surpassing one's parents/ 親譲り [おやゆずり] /(n) inheritance from a tqparent/(P)/ -親心 [おやごころ] /(n) tqparental love or affection/ +親心 [おやごころ] /(n) parental love or affection/ 親身 [しんみ] /(adj-na,n) relative/kind/cordial/ 親政 [しんせい] /(n) direct Imperial rule/ 親戚 [しんせき] /(n) relative/(P)/ @@ -62992,7 +62992,7 @@ 親任 [しんにん] /(n) imperial appointment/ 親任官 [しんにんかん] /(n) official appointed by the Emperor/ 親任式 [しんにんしき] /investing of an official appointed by the Emperor/ -親馬鹿 [おやばか] /(n) (over) fond tqparents/ +親馬鹿 [おやばか] /(n) (over) fond parents/ 親筆 [しんぴつ] /(n) the handwriting of a high-ranking person/ 親不孝 [おやふこう] /(adj-na,n) lack of filial piety/(P)/ 親父 [おやじ] /(gikun) (n) one's father/old man/one's boss/ @@ -63008,13 +63008,13 @@ 親睦会 [しんぼくかい] /(n) informal social gathering/ 親密 [しんみつ] /(adj-na,n) intimacy/friendship/(P)/ 親密感 [しんみつかん] /feeling of affinity/friendship/ -親無し [おやなし] /(n) tqparentless/ -親無し子 [おやなしご] /(n) tqparentless child/orphan/ +親無し [おやなし] /(n) parentless/ +親無し子 [おやなしご] /(n) parentless child/orphan/ 親木 [おやぎ] /(n) stock (from which a graft is taken)/ 親爺 [おやじ] /(gikun) (n) one's father/old man/one's boss/ 親友 [しんゆう] /(n) close friend/bosom (old, intimate) friend/buddy/crony/chum/(P)/ -親里 [おやざと] /(n) the home of one's tqparents/ -親離れ [おやばなれ] /(n,vs) independence from tqparents/ +親里 [おやざと] /(n) the home of one's parents/ +親離れ [おやばなれ] /(n,vs) independence from parents/ 親臨 [しんりん] /(n) visit by an emperor or noble/ 親類 [しんるい] /(n) relation/kin/(P)/ 親類縁者 [しんるいえんじゃ] /(n) one's relatives by blood and marriage (in blood and law)/one's kith and kin/ @@ -65823,7 +65823,7 @@ 生まれ立て [うまれたて] /(n) newborn/ 生み [うみ] /(n) production/bringing into the world/(physical) birth/(P)/ 生みつける [うみつける] /(v1) to lay/to spawn/ -生みの親 [うみのおや] /(exp,n) one's true tqparents/founder/creator/(P)/ +生みの親 [うみのおや] /(exp,n) one's true parents/founder/creator/(P)/ 生み出す [うみだす] /(v5s) (1) to bring forth/to bear/to give birth to/to produce/(2) to invent/(P)/ 生み付ける [うみつける] /(v1) to lay/to spawn/ 生み落す [うみおとす] /(v5s) to give birth to/to drop (calf or foal)/ @@ -65848,7 +65848,7 @@ 生演奏 [なまえんそう] /(n) live music or performance/ 生温い [なまぬるい] /(adj) lukewarm/halfhearted/ 生化学 [せいかがく] /(n) biochemistry/(P)/ -生家 [せいか] /(n) (tqparents') home/(P)/ +生家 [せいか] /(n) (parents') home/(P)/ 生花 [いけばな] /(n) (1) flower arrangement/(P)/ 生花 [せいか] /(n) (1) flower arrangement/(2) fresh flowers/ 生菓子 [なまがし] /(n) fresh Japanese sweets (usually containing red bean paste)/ @@ -69791,7 +69791,7 @@ 祖先伝来 [そせんでんらい] /hereditary/ 祖廟 [そびょう] /(n) mausoleum containing the remains of one's ancestors/ 祖父 [そふ] /(n) grandfather/(P)/ -祖父母 [そふぼ] /(n) grandtqparents/(P)/ +祖父母 [そふぼ] /(n) grandparents/(P)/ 祖母 [そぼ] /(n) grandmother/(P)/ 租界 [そかい] /(n) concession/settlement/(P)/ 租借 [そしゃく] /(n,vs) lease/ @@ -69908,7 +69908,7 @@ 素人目 [しろうとめ] /(n) inexpert or untrained eyes/ 素人離れ [しろうとばなれ] /(n,vs) amateur as good as a professional/ 素数 [そすう] /(n) prime numbers/ -素姓 [すじょう] /(n) birth/tqparentage/lineage/background/identity/ +素姓 [すじょう] /(n) birth/parentage/lineage/background/identity/ 素性 [すじょう] /(n) birth/lineage/origin/identity/history/ 素性構造 [そせいこうぞう] /(n) feature structures/ 素晴らしい [すばらしい] /(adj) wonderful/splendid/magnificent/(P)/ @@ -70368,9 +70368,9 @@ 挿図 [そうず] /(n) illustration/ 挿入 [そうにゅう] /(n,vs) insertion/incorporation/infixing/(P)/ 挿入モード [そうにゅうモード] /insert mode/ -挿入句 [そうにゅうく] /(n) tqparenthetical expression/ +挿入句 [そうにゅうく] /(n) parenthetical expression/ 挿入図 [そうにゅうず] /inserted figure/ -挿入文 [そうにゅうぶん] /(n) tqparenthetic sentence/ +挿入文 [そうにゅうぶん] /(n) parenthetic sentence/ 挿抜 [そうばつ] /(n,vs) insertion/extraction/ 挿話 [そうわ] /(n) episode/(P)/ 挿話的 [そうわてき] /(adj-na) episodic/ @@ -71614,7 +71614,7 @@ 足踏み [あしぶみ] /(n,vs) stepping/stamping/marking time/(P)/ 足馴らし [あしならし] /(n) walking practice/warming-up/ 足入れ [あしいれ] /(n) tentative marriage/ -足入れ婚 [あしいれこん] /marriage in which the bride lives temporarily in her tqparents' home/ +足入れ婚 [あしいれこん] /marriage in which the bride lives temporarily in her parents' home/ 足任せ [あしまかせ] /(n) walking wherever one's legs lead one/wandering/ 足拍子 [あしびょうし] /(n) beating time with one's foot/ 足繁く [あしげく] /(adv) frequently/ @@ -78948,7 +78948,7 @@ 摘出 [てきしゅつ] /(n,vs) picking out/exposing/taking out/(P)/ 摘心 [てきしん] /(n) thinning (buds and branches)/ 摘芯 [てきしん] /(n) thinning (buds and branches)/ -摘発 [てきはつ] /(n,vs) exposing/untqmasking/laying bare/(P)/ +摘発 [てきはつ] /(n,vs) exposing/unmasking/laying bare/(P)/ 摘要 [てきよう] /(n) summary/outline/ 摘録 [てきろく] /(n) summary/ 敵 [かたき] /(n) enemy/rival/(P)/ @@ -82162,7 +82162,7 @@ 同筆 [どうひつ] /(n) the same handwriting/ 同病 [どうびょう] /(n) the same sickness/(P)/ 同病相憐れむ [どうびょうあいあわれむ] /(exp) Fellow sufferers pity each other/ -同父母 [どうふぼ] /(n) the same tqparents/ +同父母 [どうふぼ] /(n) the same parents/ 同封 [どうふう] /(n,vs) enclosure (e.g. in a letter)/(P)/ 同腹 [どうふく] /(n) born of the same mother/kindred spirits/ 同腹仔 [どうふくし] /litter/ @@ -83092,7 +83092,7 @@ 届出 [とどけで] /(n,vs) report/notification/ 届書 [とどけがき] /(n) (written) report or notification/ 届書 [とどけしょ] /(n) (written) report or notification/ -鳶が鷹を生む [とんびがたかをうむ] /(exp) Even plain tqparents can produce a genius child/ +鳶が鷹を生む [とんびがたかをうむ] /(exp) Even plain parents can produce a genius child/ 鳶口 [とびぐち] /(n) firefighter's hook/ 鳶職 [とびしょく] /(n) scaffolding or construction worker/ 鳶職人 [とびしょくにん] /scaffold constructor/steeplejack/ @@ -83978,7 +83978,7 @@ 二伸 [にしん] /(n) postscript/PS/ 二心 [にしん] /(n) duplicity/treachery/double-dealing/ 二心 [ふたごころ] /(n) duplicity/treachery/double-dealing/ -二親 [ふたおや] /(n) tqparents/both tqparents/ +二親 [ふたおや] /(n) parents/both parents/ 二親等 [にしんとう] /(n) relation in the second degree/ 二進 [にしん] /(adj-na,n) binary/ 二進も三進も [にっちもさっちも] /(adv,exp) in no way/ @@ -83999,7 +83999,7 @@ 二人分 [ふたりぶん] /two persons' portion/ 二人目 [ふたりめ] /second person/ 二人連れ [ふたりづれ] /party of two/ -二世 [にせい] /(n) second generation/two existences/the present and the future/junior/the second (king of the same name)/American-born Japanese/foreigner of Japanese tqparentage/(P)/ +二世 [にせい] /(n) second generation/two existences/the present and the future/junior/the second (king of the same name)/American-born Japanese/foreigner of Japanese parentage/(P)/ 二世の契り [にせのちぎり] /(n) marriage vows/ 二世の固め [にせのかため] /marriage vows/ 二世の約束 [にせのやくそく] /marriage vows/ @@ -87817,7 +87817,7 @@ 反粒子 [はんりゅうし] /(n) antiparticle/ 反例 [はんれい] /(n) counterexample/ 反論 [はんろん] /(n,vs) objection/refutation/rebuttal/(P)/ -反哺 [はんぽ] /(n) caring for one's tqparents in return/ +反哺 [はんぽ] /(n) caring for one's parents in return/ 反噬 [はんぜい] /(n) turning against one's master/returning evil for good/ 反撥 [はんぱつ] /(n) repelling/repulsion/opposition/rally (of the market)/ 反芻 [はんすう] /(n) chewing the cud/rumination/ @@ -89164,7 +89164,7 @@ 膝の皿 [ひざのさら] /kneecap/ 膝を交えて [ひざをまじえて] /intimately/sitting knee to knee/ 膝を崩す [ひざをくずす] /(exp) to sit at ease/ -膝下 [しっか] /(n) at the knees of one's tqparents/at home/ +膝下 [しっか] /(n) at the knees of one's parents/at home/ 膝蓋骨 [しつがいこつ] /(n) kneecap/patella/ 膝蓋腱反射 [しつがいけんはんしゃ] /kneecap (patellar) reflex/ 膝掛け [ひざかけ] /(n) lap blanket/ @@ -90051,7 +90051,7 @@ 不公平競争 [ふこうへいきょうそう] /unfair competition/ 不向き [ふむき] /(adj-na,n) unfit/unsuitable/unmarketable/ 不好き [ぶすき] /(n) no liking for/no interest in/ -不孝 [ふこう] /(adj-na,n) undutifulness to one's tqparents/lack of filial piety/(P)/ +不孝 [ふこう] /(adj-na,n) undutifulness to one's parents/lack of filial piety/(P)/ 不幸 [ふこう] /(adj-na,n) unhappiness/sorrow/misfortune/disaster/accident/death/(P)/ 不幸が重なる [ふこうがかさなる] /(exp) to have a series of misfortunes/ 不幸せ [ふしあわせ] /(adj-na,n) unhappiness/misfortune/ill luck/(P)/ @@ -90963,8 +90963,8 @@ 父の日 [ちちのひ] /Father's Day/ 父君 [ちちぎみ] /(n) father/ 父君 [ふくん] /(n) father/ -父兄 [ふけい] /(n) guardians/tqparents and older brothers/(P)/ -父兄会 [ふけいかい] /(n) tqparents' association/ +父兄 [ふけい] /(n) guardians/parents and older brothers/(P)/ +父兄会 [ふけいかい] /(n) parents' association/ 父系 [ふけい] /(n) agnate/ 父権 [ふけん] /(n) paternal rights/ 父御 [ちちご] /(n) (another's respected) father/ @@ -90979,10 +90979,10 @@ 父性 [ふせい] /(n) paternity/ 父性愛 [ふせいあい] /paternal love/ 父祖 [ふそ] /(n) ancestors/ -父母 [ちちはは] /(n) father and mother/tqparents/ -父母 [ふぼ] /(n) father and mother/tqparents/(P)/ -父母の許 [ふぼのもと] /under one's tqparents roof/ -父母会 [ふぼかい] /(n) a tqparents' association/ +父母 [ちちはは] /(n) father and mother/parents/ +父母 [ふぼ] /(n) father and mother/parents/(P)/ +父母の許 [ふぼのもと] /under one's parents roof/ +父母会 [ふぼかい] /(n) a parents' association/ 父方 [ちちかた] /(n) father's side of family/(P)/ 父無し子 [ちちなしご] /(n) fatherless or illegitimate child/ 父無し子 [ててなしご] /(n) fatherless or illegitimate child/ @@ -97614,7 +97614,7 @@ 無論 [むろん] /(adv) of course/naturally/(P)/ 無聊 [ぶりょう] /(adj-na,n) boredom/ennui/ 無辜 [むこ] /(n) innocent/blameless/ -牟子 [ぼうし] /cap worn by tqmasked dancer (cap covers hair and nape and reaches to the shoulders)/ +牟子 [ぼうし] /cap worn by masked dancer (cap covers hair and nape and reaches to the shoulders)/ 矛 [ほこ] /(n) halberd/arms/(P)/ 矛盾 [むじゅん] /(n,vs) contradiction/inconsistency/(P)/ 矛盾語法 [むじゅんごほう] /(n) oxymoron/ @@ -101273,7 +101273,7 @@ 養い [やしない] /(n) nutrition/nourishment/nurture/bringing up/rearing/ 養い育てる [やしないそだてる] /(v1) to bring up/to foster/to rear/ 養い子 [やしないご] /(n) foster child/ -養い親 [やしないおや] /(n) godtqparents/foster tqparents/ +養い親 [やしないおや] /(n) godparents/foster parents/ 養う [やしなう] /(v5u) to rear/to maintain/to cultivate/(P)/ 養育 [よういく] /(n) bringing up/rearing/upbringing/(P)/ 養育費 [よういくひ] /child-rearing expenses/ @@ -101308,7 +101308,7 @@ 養豚 [ようとん] /(n) pig-keeping/pig farming/(P)/ 養豚場 [ようとんじょう] /pig or hog farm/ 養父 [ようふ] /(n) foster father/adoptive father/(P)/ -養父母 [ようふぼ] /(n) adoptive tqparents/(P)/ +養父母 [ようふぼ] /(n) adoptive parents/(P)/ 養分 [ようぶん] /(n) nourishment/nutrient/ 養母 [ようぼ] /(n) foster mother/adoptive mother/ 養蜂 [ようほう] /(n) beekeeping/apiculture/ @@ -102105,7 +102105,7 @@ 里 [さと] /(n) (country) home/village/ 里 [り] /(n) ri (old measure)/2.44 miles/(P)/ 里芋 [さといも] /(n) taro (potato)/ -里帰り [さとがえり] /(n) visiting one's tqparents/new bride's first visit to tqparents/(P)/ +里帰り [さとがえり] /(n) visiting one's parents/new bride's first visit to parents/(P)/ 里言 [りげん] /(n) dialect/ 里言葉 [さとことば] /(n) dialect/(historical) language used toward customers by women in the drinking-world establishment/ 里子 [さとご] /(n) foster child/(P)/ @@ -102915,9 +102915,9 @@ 両手利 [りょうてきき] /ambidextrous (person)/ 両種 [りょうしゅ] /both kinds/ 両職を兼ねる [りょうしょくをかねる] /(exp) to hold two offices concurrently/ -両親 [ふたおや] /(n) tqparents/both tqparents/ -両親 [りょうしん] /(n) tqparents/both tqparents/(P)/ -両親を失う [りょうしんをうしなう] /(exp) to be bereft of one's tqparents/ +両親 [ふたおや] /(n) parents/both parents/ +両親 [りょうしん] /(n) parents/both parents/(P)/ +両親を失う [りょうしんをうしなう] /(exp) to be bereft of one's parents/ 両人 [りょうにん] /(n) both people/ 両刃 [もろは] /(adj-no,n) double-edged sword/ 両刃 [りょうば] /(adj-no,n) double-edged sword/ @@ -106804,7 +106804,7 @@ 脛巾 [はばき] /(n) leggings/ 脛骨 [けいこつ] /(n) tibia/shinbone/ 脛当て [すねあて] /(n) greaves/shin guards/ -脛齧り [すねかじり] /(n) sponging off one's tqparents/ +脛齧り [すねかじり] /(n) sponging off one's parents/ 脩 [しゅう] /dried meat/dry up/ 脩竹 [しゅうちく] /(n) tall bamboo/ 腋下 [えきか] /(n) armpit/ @@ -106865,7 +106865,7 @@ 舁き上げる [かきあげる] /(v1) to shoulder (palanquin)/ 舁き入れる [かきいれる] /(v1) to carry in/ 舅 [しゅうと] /(n) father-in-law/(P)/ -舅姑 [きゅうこ] /(n) tqparents-in-law/ +舅姑 [きゅうこ] /(n) parents-in-law/ 與太者 [よたもの] /(n) (uk) hooligan/layabout/good-for-nothing/gangster/ 與論 [よろん] /(oK) (n) public opinion/ 舐ぶる [ねぶる] /(io) (v5r) to lick/ diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index b762bf44..af268309 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -257,7 +257,7 @@ KANJI [kantan] /simple (an)/ In early 2001, as part of the JMdict project (see below), I completely revised this system, instead introducing a comprehensive system of Part of Speech (POS) tags. In the EDICT version of the file these tags usually appear in -tqparentheses +parentheses at the start of the entry, separated into general tags and POS tags. Where a tag applies to a single gloss or meaning, it will be included there instead.

diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 79493131..ecdc011b 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -60,10 +60,10 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const const int Learn::numberOfAnswers = 5; -Learn::Learn(Dict::Index *tqparentDict, TQWidget *tqparent, const char *name) +Learn::Learn(Dict::Index *parentDict, TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name), initialized(false), isMod(false), prevItem(0), curItem(0) { - index = tqparentDict; + index = parentDict; TQWidget *dummy = new TQWidget(this); setCentralWidget(dummy); -- cgit v1.2.1