diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 14:36:03 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-22 20:50:35 +0100 |
commit | ba9cc0960f4022b51ac8e89d22e720ae1c04d72c (patch) | |
tree | 2e1db4ca621b2a9f432edfed4fc14cca2a1cbece | |
parent | 8cac570f91c43870f80aa18c8e6ab05cc711e8b5 (diff) | |
download | tdeedu-ba9cc0960f4022b51ac8e89d22e720ae1c04d72c.tar.gz tdeedu-ba9cc0960f4022b51ac8e89d22e720ae1c04d72c.zip |
Fix inadvertent tqt changes.
(cherry picked from commit 5be9ca7ecea7e43e106ab48ef21fc8555a58bea0)
-rw-r--r-- | kgeography/data/africa.kgm | 2 | ||||
-rw-r--r-- | kgeography/data/world.kgm | 4 | ||||
-rw-r--r-- | kig/modes/base_mode.cc | 24 | ||||
-rw-r--r-- | kig/modes/construct_mode.cc | 8 | ||||
-rw-r--r-- | kiten/edict | 146 | ||||
-rw-r--r-- | kiten/kanjidic | 4 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/pl/A.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/pl/V.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/A.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/BC.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/GHI1.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/M.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/P2.kvtml | 2 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/QR.kvtml | 4 | ||||
-rw-r--r-- | klatin/klatin/data/vocab/sk/TU.kvtml | 4 | ||||
-rw-r--r-- | kmplot/KmPlot.kdevelop | 2 | ||||
-rw-r--r-- | kstars/kstars/data/Cities.dat | 2 | ||||
-rw-r--r-- | kstars/kstars/data/info_url.dat | 2 |
18 files changed, 108 insertions, 108 deletions
diff --git a/kgeography/data/africa.kgm b/kgeography/data/africa.kgm index 718997b6..a5654132 100644 --- a/kgeography/data/africa.kgm +++ b/kgeography/data/africa.kgm @@ -138,7 +138,7 @@ </color> </division> <division> - <name>Detqmocratic Republic of the Congo</name> + <name>Democratic Republic of the Congo</name> <flag>congo_kinshasa.png</flag> <capital>Kinshasa</capital> <color> diff --git a/kgeography/data/world.kgm b/kgeography/data/world.kgm index 2acca4f0..7d1701d7 100644 --- a/kgeography/data/world.kgm +++ b/kgeography/data/world.kgm @@ -111,7 +111,7 @@ </color> </division> <division> - <name>Detqmocratic Republic of the Congo</name> + <name>Democratic Republic of the Congo</name> <flag>congo_kinshasa.png</flag> <capital>Kinshasa</capital> <color> @@ -1730,7 +1730,7 @@ </color> </division> <division> - <name>Detqmocratic People's Republic of Korea</name> + <name>Democratic People's Republic of Korea</name> <flag>nkorea.png</flag> <capital>Pyeongyang</capital> <color> diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index b4f33b21..487eaf9e 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -46,9 +46,9 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); - if( tqmoco.empty() ) + if( moco.empty() ) { // clicked on an empty spot --> we show the rectangle for // selecting stuff... @@ -66,8 +66,8 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) void BaseMode::leftMouseMoved( TQMouseEvent* e, KigWidget* w ) { - if( !tqmoco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) - dragObject( tqmoco, mplc, *w, + if( !moco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) + dragObject( moco, mplc, *w, ( e->state() & (ShiftButton | ControlButton ) ) != 0 ); } @@ -79,16 +79,16 @@ void BaseMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrl = ( e->state() & ControlButton ) != 0; bool keyShift = ( e->state() & ShiftButton ) != 0; - if ( ! tqmoco.empty() ) + if ( ! moco.empty() ) { if ( keyShift ) { - int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, tqmoco ); + int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, moco ); if ( id >= 0 ) - o = tqmoco[id]; + o = moco[id]; } else - o = tqmoco.front(); + o = moco.front(); } leftClickedObject( o, e->pos(), *v, keyCtrl ); } @@ -100,7 +100,7 @@ void BaseMode::midClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); } void BaseMode::midReleased( TQMouseEvent* e, KigWidget* v ) @@ -119,9 +119,9 @@ void BaseMode::rightClicked( TQMouseEvent* e, KigWidget* w ) w->setCursor( KCursor::arrowCursor() ); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); + moco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); - rightClicked( tqmoco, mplc, *w ); + rightClicked( moco, mplc, *w ); } void BaseMode::mouseMoved( TQMouseEvent* e, KigWidget* w ) @@ -151,7 +151,7 @@ void BaseMode::enableActions() std::vector<ObjectHolder*> BaseMode::oco() { - return tqmoco; + return moco; } TQPoint BaseMode::pointLocation() diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index f2d5f2ed..eddac9e1 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -69,15 +69,15 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrlOrShift = ( e->state() & ( ControlButton | ShiftButton) ) != 0; - std::vector<ObjectHolder*> tqmoco = oco(); - if ( ! tqmoco.empty() ) + std::vector<ObjectHolder*> moco = oco(); + if ( ! moco.empty() ) { std::vector<ObjectHolder*> goodargs; - if ( !tqmoco.empty() ) + if ( !moco.empty() ) { std::vector<ObjectHolder*>::const_iterator it; std::vector<ObjectCalcer*> testargs = getCalcers( mparents ); - for ( std::vector<ObjectHolder*>::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i ) + for ( std::vector<ObjectHolder*>::const_iterator i = moco.begin(); i != moco.end(); ++i ) { it = std::find( mparents.begin(), mparents.end(), *i ); bool newdup = diff --git a/kiten/edict b/kiten/edict index 2a5ae421..1cc221eb 100644 --- a/kiten/edict +++ b/kiten/edict @@ -504,7 +504,7 @@ ¤ªÌܸ«ÆÀ [¤ª¤á¤ß¤¨] /(n) an appearance/an audience/ ¤ªÌܽÐÅÙ¤¤ [¤ª¤á¤Ç¤¿¤¤] /(n) (uk) happy event/matter for congratulation/auspicious event/pregnancy/ ¤ªÌܽÐÅÙ¤¦ [¤ª¤á¤Ç¤È¤¦] /(ateji) (int) (uk) Congratulations!/an auspicious occasion!/(P)/ -¤ªÌß [¤ª¤â¤Á] /(uk) rice cakes/pounded tqmochi rice/ +¤ªÌß [¤ª¤â¤Á] /(uk) rice cakes/pounded mochi rice/ ¤ªÌç°ã¤¤ [¤ª¤«¤É¤Á¤¬¤¤] /(exp) barking up the wrong tree/calling at the wrong house/ ¤ªÌ줵¤ó [¤ª¤¸¤¤¤µ¤ó] /(n) grandfather/male senior-citizen/ ¤ªÎ¤ [¤ª¤µ¤È] /(n) one's origins/one's parents' home/ @@ -3638,7 +3638,7 @@ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥»¥ª¥ê¡¼ /information theory/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥½¥µ¥¤¥¨¥Æ¥£¡¼ /information society/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ç¥£¥¹¥¯¥í¡¼¥¸¥ã¡¼ /information disclosure/ -¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ç¥â¥¯¥é¥·¡¼ /information detqmocracy/ +¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ç¥â¥¯¥é¥·¡¼ /information democracy/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ö¥í¡¼¥«¡¼ /information broker/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥×¥í¥»¥Ã¥µ¡¼ /information processor/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥×¥í¥»¥Ã¥·¥ó¥° /information processing/ @@ -5351,7 +5351,7 @@ ¥«¥ê¥°¥é¥Õ¥£¡¼ /calligraphy/ ¥«¥ê¥¹¥Þ /(n) charisma/(P)/ ¥«¥ê¥¹¥Þ¥Á¥Ã¥¯ /charismatic/ -¥«¥ê¥ËÇÙ±ê [¥«¥ê¥Ë¤Ï¤¤¤¨¤ó] /(n) pneutqmocystis carinii pneumonia/ +¥«¥ê¥ËÇÙ±ê [¥«¥ê¥Ë¤Ï¤¤¤¨¤ó] /(n) pneumocystis carinii pneumonia/ ¥«¥ê¥Õ /(n) calif/ ¥«¥ê¥Õ¥©¥ë¥Ë¥¢ /California/(P)/ ¥«¥ê¥Õ¥©¥ë¥Ë¥¢¥í¡¼¥ë /California roll/ @@ -6345,7 +6345,7 @@ ¥°¥é¥¹¥Õ¥¡¥¤¥Ð¡¼¥Ý¡¼¥ë /(n) glass fiber pole/ ¥°¥é¥¹¥Ü¡¼¥È /(n) glass boat/ ¥°¥é¥¹¥ê¥¹¥È /(n) GRAS list/Generally Recognized as Safe list/ -¥°¥é¥¹¥ë¡¼¥È¥Ç¥â¥¯¥é¥·¡¼ /(n) grassroots detqmocracy/ +¥°¥é¥¹¥ë¡¼¥È¥Ç¥â¥¯¥é¥·¡¼ /(n) grassroots democracy/ ¥°¥é¥¹¥í¥Ã¥É /(n) glass fiber rod/ ¥°¥é¥¿¥ó /(fr:) (n) gratin/(P)/ ¥°¥é¥Á¥§ /(it:) thank you (it: grazie)/(P)/ @@ -7409,7 +7409,7 @@ ¥µ¡¼¥á¥Ã¥È /cermet (ceramic metal)/ ¥µ¡¼¥á¥ó /(col) sperm/semen/cum/ ¥µ¡¼¥â¥¨¥ì¥á¥ó¥È /thermoelement/ -¥µ¡¼¥â¥³¥ó¥¯¥ê¡¼¥È /thertqmoconcrete/ +¥µ¡¼¥â¥³¥ó¥¯¥ê¡¼¥È /thermoconcrete/ ¥µ¡¼¥â¥¹¥¿¥Ã¥È /(n) thermostat/ ¥µ¡¼¥â¥á¡¼¥¿¡¼ /thermometer/ ¥µ¡¼¥â¥ó /(n) salmon/(P)/ @@ -9527,7 +9527,7 @@ ¥¹¥â¡¼¥¯ /smoke/ ¥¹¥â¡¼¥¯¥µ¡¼¥â¥ó /(n) smoked salmon/ ¥¹¥â¡¼¥¯¥Á¡¼¥º /(n) smoked cheese/ -¥¹¥â¥Ã¥¯ /(n) stqmock/smoking jacket/ +¥¹¥â¥Ã¥¯ /(n) smock/smoking jacket/ ¥¹¥â¥Ã¥° /(n) smog/(P)/ ¥¹¥â¥ó /(n) subacute myelo-optico-neuropathy (SMON)/ ¥¹¥é¥¤¥¹ /(n) slice/(P)/ @@ -10882,9 +10882,9 @@ ¥Ç¥á¥ê¥Ã¥È /(n) demerit/(P)/ ¥Ç¥â /(n) (abbr) demo/demonstration/(P)/ ¥Ç¥â¡¼¥Ë¥Ã¥·¥å /(de:) (adj-na,n) devilish (de: daemonisch)/ -¥Ç¥â¥¯¥é¥·¡¼ /(n) detqmocracy/(P)/ -¥Ç¥â¥¯¥é¥Ã¥È /detqmocrat/(P)/ -¥Ç¥â¥¯¥é¥Æ¥£¥Ã¥¯ /(adj-na) detqmocratic/ +¥Ç¥â¥¯¥é¥·¡¼ /(n) democracy/(P)/ +¥Ç¥â¥¯¥é¥Ã¥È /democrat/(P)/ +¥Ç¥â¥¯¥é¥Æ¥£¥Ã¥¯ /(adj-na) democratic/ ¥Ç¥â¥°¥é¥Õ¥£¥Ã¥¯ /demographic/ ¥Ç¥â¥¸¥å¥ì¡¼¥¿ /(n) demodulator/ ¥Ç¥â¥Æ¡¼¥× /demonstration tape/ @@ -11343,7 +11343,7 @@ ¥É¥¤¥Ä¥Þ¥ë¥¯ /Deutschmark/ ¥É¥¤¥Ä¸ì [¥É¥¤¥Ä¤´] /(n) German language/ ¥É¥¤¥Ä¿Í [¥É¥¤¥Ä¤¸¤ó] /German person/ -¥É¥¤¥Ä̱¼ç¶¦Ï¹ñ [¥É¥¤¥Ä¤ß¤ó¤·¤å¤¤ç¤¦¤ï¤³¤¯] /German Detqmocratic Republic (i.e. former East Germany)/ +¥É¥¤¥Ä̱¼ç¶¦Ï¹ñ [¥É¥¤¥Ä¤ß¤ó¤·¤å¤¤ç¤¦¤ï¤³¤¯] /German Democratic Republic (i.e. former East Germany)/ ¥É¥¤¥ÄϢˮ¶¦Ï¹ñ [¥É¥¤¥Ä¤ì¤ó¤Ý¤¦¤¤ç¤¦¤ï¤³¤¯] /Federal Republic of Germany (former West Germany)/ ¥É¥¤¥È /(abbr) a do-it-yourself store/ ¥É¥¤¥ê¡¼ /doily/ @@ -12375,7 +12375,7 @@ ¥Ï¥ó¥Ö¥ë /humble/ ¥Ï¥ó¥Ö¥ë¥¯ /Hamburg/(P)/ ¥Ï¥ó¥Þ¡¼ /(n) hammer/(P)/ -¥Ï¥ó¥â¥Ã¥¯ /(n) hamtqmock/ +¥Ï¥ó¥â¥Ã¥¯ /(n) hammock/ ¥Ï²»µ¹æ [¥Ï¤ª¤ó¤¤´¤¦] /(n) C clef/ ¥Ï¹Ô [¥Ï¤®¤ç¤¦] /(n) classification for Japanese verb with the dictionary form ending in "hu or fu"/ ¥ÏûĴ [¥Ï¤¿¤ó¤Á¤ç¤¦] /(n) C minor/ @@ -15419,7 +15419,7 @@ ¥Û¥â¥¨¥ì¥¯¥È¥¹ /Homo erectus/ ¥Û¥â¥²¥Ê¥¤¥º /(n) homogenize/ ¥Û¥â¥µ¥Ô¥¨¥ó¥¹ /Homo sapiens/ -¥Û¥â¥·¥¹¥Æ¥¤¥ó /(n) hotqmocysteine/ +¥Û¥â¥·¥¹¥Æ¥¤¥ó /(n) homocysteine/ ¥Û¥â¥¸¥Ê¥¤¥º /homogenize/ ¥Û¥â¥»¥¯¥·¥ã¥ë /homosexual/ ¥Û¥â¥Ï¥Ó¥ê¥¹ /Homo habilis/ @@ -16048,7 +16048,7 @@ ¥Þ¥¹¥¿¡¼¥Õ¥¡¥¤¥ë /master file/ ¥Þ¥¹¥¿¡¼¥×¥é¥ó /(n) master plan/ ¥Þ¥¹¥¿¡¼¥Ù¡¼¥·¥ç¥ó /(n) masturbation/ -¥Þ¥¹¥Ç¥â¥¯¥é¥·¡¼ /mass detqmocracy/ +¥Þ¥¹¥Ç¥â¥¯¥é¥·¡¼ /mass democracy/ ¥Þ¥¹¥È /(n) mast/(P)/ ¥Þ¥¹¥Õ¥¡¥Ã¥·¥ç¥ó /mass fashion/ ¥Þ¥¹¥×¥í /(n) (abbr) mass production/ @@ -16772,7 +16772,7 @@ ¥á¥í¥É¥é¥Þ /(n) melodrama/soap opera/(P)/ ¥á¥í¥á¥í /(adj-na,n,adv) falling down drunk/ ¥á¥í¥ó /(n) melon/(P)/ -¥á¥ó¥·¥§¥Ó¥ /(ru:) (n) mensheviki (member of the non-Leninist wing of the Russian Social Detqmocratic Workers' Party (cf. Bolshevik)/(P)/ +¥á¥ó¥·¥§¥Ó¥ /(ru:) (n) mensheviki (member of the non-Leninist wing of the Russian Social Democratic Workers' Party (cf. Bolshevik)/(P)/ ¥á¥ó¥¹ /(n) menses/(P)/ ¥á¥ó¥º¥¦¥¨¥¢ /menswear/ ¥á¥ó¥½¡¼¥ë /menthol/ @@ -16841,7 +16841,7 @@ ¥â¡¼¥ë¥Õ¥¡¥Ö¥ê¥Ã¥¯ /(n) chenille (trans: mole fabric)/ ¥â¥¢¥ì /Moire/(P)/ ¥â¥¤¥¹¥Á¥ã¡¼ /moisture/ -¥â¥«¥·¥ç¥ó /tqmoccasin/ +¥â¥«¥·¥ç¥ó /moccasin/ ¥â¥¬ /(n) (abbr) modern girl/flapper (slang from the 1920s)/ ¥â¥¥·¥Õ¥í¥¥µ¥·¥ó /(n) Moxifloxacin/ ¥â¥µ¥É /Mossad (Israeli secret service)/(P)/ @@ -16877,7 +16877,7 @@ ¥â¥Á¡¼¥Õ /(n) motif/(P)/ ¥â¥Á¥Ù¡¼¥·¥ç¥ó /(n) motivation/ ¥â¥Á¥Ù¡¼¥·¥ç¥ó¥ì¥µ¡¼¥Á /motivation research/ -¥â¥Ã¥¯¥¢¥Ã¥× /tqmock-up/(P)/ +¥â¥Ã¥¯¥¢¥Ã¥× /mock-up/(P)/ ¥â¥Ã¥È¡¼ /(n) motto/(P)/ ¥â¥Ã¥Ö /(n) mob/ ¥â¥Ã¥× /(n) mop/ @@ -18706,7 +18706,7 @@ °¤Êò [¤¢¤Û¤¦] /(adj-na,n) fool/simpleton/idiot/(P)/ °¤Êò¤é¤·¤¤ [¤¢¤Û¤é¤·¤¤] /(adj) ridiculous/ °¤Êò½¤¤ [¤¢¤Û¤¯¤µ¤¤] /(adj) ridiculous/ -°¤ÊòÂËÍå·Ð [¤¢¤Û¤À¤é¤¤ç¤¦] /(n) tqmock Buddhist sutra/ +°¤ÊòÂËÍå·Ð [¤¢¤Û¤À¤é¤¤ç¤¦] /(n) mock Buddhist sutra/ °¤Ë¼ [¤¢¤Û¤¦] /(adj-na,n) fool/simpleton/idiot/ °¤Ë¼Ä» [¤¢¤Û¤¦¤É¤ê] /(n) albatross/ °¤ÌïÂË [¤¢¤ß¤À] /(n) (Buddh) Amitabha/ @@ -19435,7 +19435,7 @@ °ÂÅÚÅí»³»þÂå [¤¢¤º¤Á¤â¤â¤ä¤Þ¤¸¤À¤¤] /Azuchi-Momoyama period (1558-1600 CE)/ °ÂÇ« [¤¢¤ó¤Í¤¤] /(adj-na,n) public peace/ °ÂÇ«Ãá½ø [¤¢¤ó¤Í¤¤¤Á¤Ä¤¸¤ç] /law and order/ -°ÂÇÜÀîÌß [¤¢¤Ù¤«¤ï¤â¤Á] /(n) (uk) rice cakes (tqmochi) with Kinako/ +°ÂÇÜÀîÌß [¤¢¤Ù¤«¤ï¤â¤Á] /(n) (uk) rice cakes (mochi) with Kinako/ °ÂÇä¤ê [¤ä¤¹¤¦¤ê] /(n) discount/bargain sale/selling cheaply/(P)/ °ÂÈÝ [¤¢¤ó¤Ô] /(n) safety/welfare/well-being/(P)/ °ÂÉáÀÁ [¤ä¤¹¤Ö¤·¤ó] /(n) cheap structure/ @@ -23495,7 +23495,7 @@ ±ßµ¬ [¤¨¤ó¤] /(n) pair of compasses/ ±ßµ¹æ [¤¨¤ó¤¤´¤¦] /(n) yen symbol ("Y" with "=" superimposed)/ ±ßµ°Æ» [¤¨¤ó¤¤É¤¦] /(n) circular orbit/ -±ßµÖ [¤¨¤ó¤¤å¤¦] /(n) knoll/humtqmock/ +±ßµÖ [¤¨¤ó¤¤å¤¦] /(n) knoll/hummock/ ±ßµï [¤Þ¤É¤¤] /(n) small gathering/happy circle/ ±ß¶À [¤¨¤ó¤¤ç¤¦] /(n) round mirror/ ±ß¶À [¤Þ¤ë¤«¤¬¤ß] /(n) round mirror/ @@ -24808,7 +24808,7 @@ ²´Ã°³¤Ï· [¤Ü¤¿¤ó¤¨¤Ó] /(n) type of shrimp/ ²´Ã°Àã [¤Ü¤¿¤ó¤æ¤] /(n) large snowflakes/ ²´Ã°Èé [¤Ü¤¿¤ó¤Ô] /(n) peony root bark/ -²´Ã°Ìß [¤Ü¤¿¤â¤Á] /(n) Adzuki bean tqmochi/ +²´Ã°Ìß [¤Ü¤¿¤â¤Á] /(n) Adzuki bean mochi/ ²´Ã°óÀÓ§ [¤Ü¤¿¤ó¤¤¤ó¤³] /(n) lovebird/ ²´Ä» [¤ª¤ó¤É¤ê] /(n) cock/rooster/ ²´Ç [¤ª¤¹¤Í¤³] /tomcat/ @@ -30569,7 +30569,7 @@ ´¨É÷ [¤«¤ó¤×¤¦] /(n) cold wind/ ´¨Ê« [¤«¤ó¤Ö¤Ê] /(n) crucian caught in midwinter/ ´¨ÌÀ¤± [¤«¤ó¤¢¤±] /(n) the beginning of spring/ -´¨Ìß [¤«¤ó¤â¤Á] /(n) tqmochi made in winter/ +´¨Ìß [¤«¤ó¤â¤Á] /(n) mochi made in winter/ ´¨Ìë [¤«¤ó¤ä] /(n) cold night/ ´¨Íñ [¤«¤ó¤¿¤Þ¤´] /(n) egg laid in winter/ ´¨Î® [¤«¤ó¤ê¤å¤¦] /(n) cold current/ @@ -33719,7 +33719,7 @@ µ¼¸ÅŵŪ [¤®¤³¤Æ¤ó¤Æ¤] /(adj-na) pseudoclassic/ µ¼¸Åʸ [¤®¤³¤Ö¤ó] /(n) classical style/ µ¼»à [¤®¤·] /(n) feigning death/ -µ¼»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/tqmock/ +µ¼»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/mock/ µ¼¿Í [¤®¤¸¤ó] /(n) personification/ µ¼¿Í²½ [¤®¤¸¤ó¤«] /(n) personification/ µ¼¿ÍË¡ [¤®¤·¤ó¤Û¤¦] /(n) personification/ @@ -33763,7 +33763,7 @@ µ¿±À [¤®¤¦¤ó] /(n) cloud of suspicion/ µ¿µÁ [¤®¤®] /(n) doubt/(P)/ µ¿¹ö [¤®¤´¤¯] /(n) scandal/graft case/(P)/ -µ¿»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/tqmock/(P)/ +µ¿»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/mock/(P)/ µ¿»÷¥³¥ì¥é [¤®¤¸¥³¥ì¥é] /para-cholera/suspected case of cholera/ µ¿»÷Âθ³ÎÅË¡ [¤®¤¸¤¿¤¤¤±¤ó¤ê¤ç¤¦¤Û¤¦] /(n) exposure therapy/ µ¿»÷ľÀÜÌÜŪ¸ì [¤®¤¸¤Á¤ç¤¯¤»¤Ä¤â¤¯¤Æ¤¤´] /pseudo-direct object/ @@ -33872,7 +33872,7 @@ µÄ±¡Æâ³ÕÀ© [¤®¤¤¤ó¤Ê¤¤¤«¤¯¤»¤¤] /(n) parliamentary system of government/ µÄ²ñ [¤®¤«¤¤] /(n) Diet/congress/parliament/(P)/ µÄ²ñ¼çµÁ [¤®¤«¤¤¤·¤å¤®] /(n) parliamentarism/ -µÄ²ñÀ©Ì±¼ç¼çµÁ [¤®¤«¤¤¤»¤¤¤ß¤ó¤·¤å¤·¤å¤®] /(n) parliamentary detqmocracy/ +µÄ²ñÀ©Ì±¼ç¼çµÁ [¤®¤«¤¤¤»¤¤¤ß¤ó¤·¤å¤·¤å¤®] /(n) parliamentary democracy/ µÄ²ñÀ¯¼£ [¤®¤«¤¤¤»¤¤¤¸] /parliamentarism/parliamentary government/ µÄ·è [¤®¤±¤Ä] /(n,vs) resolution/decision/vote/(P)/ µÄ·èµ¡´Ø [¤®¤±¤Ä¤¤«¤ó] /(n) legislative organ/ @@ -36187,7 +36187,7 @@ ¶ÀÂæ [¤¤ç¤¦¤À¤¤] /(n) dresser/(P)/ ¶ÀÈÄ [¤«¤¬¤ß¤¤¤¿] /(n) panel/scene-panel/ ¶ÀÌÌ [¤¤ç¤¦¤á¤ó] /(n) mirror surface/ -¶ÀÌß [¤«¤¬¤ß¤â¤Á] /(n) orange-flavoured tqmochi/ +¶ÀÌß [¤«¤¬¤ß¤â¤Á] /(n) orange-flavoured mochi/ ¶Á [¤Ò¤Ó¤] /(io) (n) echo/sound/reverberation/noise/(P)/ ¶Á¤ [¤Ò¤Ó¤] /(n) echo/sound/reverberation/noise/(P)/ ¶Á¤ÅϤë [¤Ò¤Ó¤¤ï¤¿¤ë] /(v5r) to resound/ @@ -37593,7 +37593,7 @@ ¶òÌä [¤°¤â¤ó] /(n) foolish question/ ¶òÎô [¤°¤ì¤Ä] /(adj-na,n) foolishness/stupidity/silliness/ ¶òÏ¢Ââ [¤°¤ì¤ó¤¿¤¤] /(n) gang of young toughs/(P)/ -¶òÏ® [¤°¤í¤¦] /(n,vs) tqmockery/derision/ridicule/ +¶òÏ® [¤°¤í¤¦] /(n,vs) mockery/derision/ridicule/ ¶òÏÀ [¤°¤í¤ó] /(n) foolish argument or view/ ¶ó [¤ª¤½¤ì] /(n) fear/anxiety/concern/uneasiness/(P)/ ¶óÈþ¿ÍÁð [¤°¤Ó¤¸¤ó¤½¤¦] /(n) field poppy/ @@ -52116,7 +52116,7 @@ »÷¹ç¤ï¤·¤¤ [¤Ë¤¢¤ï¤·¤¤] /(adj) well-matched/suitable/becoming/ »÷¼©Èó [¤¨¤»] /(adj-na,n) false/pseudo-/ »÷Ä̤¦ [¤Ë¤«¤è¤¦] /(v5u) to resemble closely/(P)/ -»÷Èó [¤¨¤»] /(adj-na,n,pref) false/would-be/sham/pretended/tqmock/spurious/pseudo/quasi/ +»÷Èó [¤¨¤»] /(adj-na,n,pref) false/would-be/sham/pretended/mock/spurious/pseudo/quasi/ »÷Èó»ö [¤¨¤»¤´¤È] /laughable affair/unlaudable affair/something unreliable/ »÷Èó¼Ô [¤¨¤»¤â¤Î] /(n) sham/fraud/counterfeit/impostor/pretender/ »÷Èó¾Ð¤¤ [¤¨¤»¤ï¤é¤¤] /(n) smirk/affected smile/ @@ -52763,7 +52763,7 @@ ¼«¸ÊÌ·½â [¤¸¤³¤à¤¸¤å¤ó] /(n) self-contradiction/ ¼«¸ÊÌȱÖÉÔÁ´ [¤¸¤³¤á¤ó¤¨¤¤Õ¤¼¤ó] /(n) autoimmune disorder/ ¼«¸Êή [¤¸¤³¤ê¤å¤¦] /(n) one's own style/self-taught manner/ -¼«¸ø̱ [¤¸¤³¤¦¤ß¤ó] /(n) (abbr) Liberal Detqmocratic Party, Komeito and Detqmocratic Socialist Party/ +¼«¸ø̱ [¤¸¤³¤¦¤ß¤ó] /(n) (abbr) Liberal Democratic Party, Komeito and Democratic Socialist Party/ ¼«¹© [¤¸¤³¤¦] /automobile industry/ ¼«¹ñ [¤¸¤³¤¯] /(n) one's own country/(P)/ ¼«¹ñ¸ì [¤¸¤³¤¯¤´] /one's native language/ @@ -52998,9 +52998,9 @@ ¼«Ë½¼«´þ [¤¸¤Ü¤¦¤¸¤] /(adj-na,n) desperation/despair/self-abandonment/ ¼«Ëý [¤¸¤Þ¤ó] /(n,vs) pride/boast/(P)/ ¼«ËýÏà [¤¸¤Þ¤ó¤Ð¤Ê¤·] /(n) boastful speech/bragging/ -¼«Ì± [¤¸¤ß¤ó] /(abbr) Liberal Detqmocratic Party/LDP/(P)/ -¼«Ì±ÅÞ [¤¸¤ß¤ó¤È¤¦] /LDP/Liberal Detqmocratic Party/(P)/ -¼«Ì±ÅÞ§ [¤¸¤ß¤ó¤È¤¦¤½¤¯] /rules of the Liberal Detqmocratic Party/ +¼«Ì± [¤¸¤ß¤ó] /(abbr) Liberal Democratic Party/LDP/(P)/ +¼«Ì±ÅÞ [¤¸¤ß¤ó¤È¤¦] /LDP/Liberal Democratic Party/(P)/ +¼«Ì±ÅÞ§ [¤¸¤ß¤ó¤È¤¦¤½¤¯] /rules of the Liberal Democratic Party/ ¼«ÌÀ [¤¸¤á¤¤] /(adj-na,adj-no,n) obvious/self-evident/axiomatic/self-explanatory/(P)/ ¼«ÌÀ¤ÎÍý [¤¸¤á¤¤¤Î¤ê] /self-evident truth/truism/axiom/ ¼«ÌÇ [¤¸¤á¤Ä] /(n,vs) ruining oneself/destroying oneself/(P)/ @@ -53042,8 +53042,8 @@ ¼«Í³ËÇ°× [¤¸¤æ¤¦¤Ü¤¦¤¨¤] /free trade/ ¼«Í³ËÇ°×ÂÓ°è [¤¸¤æ¤¦¤Ü¤¦¤¨¤¤¿¤¤¤¤¤] /free trade zone/free trade area/ ¼«Í³ËÇ°×ÃÏ°è [¤¸¤æ¤¦¤Ü¤¦¤¨¤¤Á¤¤¤] /free trade zone/free trade area/ -¼«Í³Ì±¸¢ÏÀ [¤¸¤æ¤¦¤ß¤ó¤±¤ó¤í¤ó] /(early Meiji era) detqmocratic rights ideology/ -¼«Í³Ì±¼çÅÞ [¤¸¤æ¤¦¤ß¤ó¤·¤å¤È¤¦] /LDP/Liberal Detqmocratic Party/ +¼«Í³Ì±¸¢ÏÀ [¤¸¤æ¤¦¤ß¤ó¤±¤ó¤í¤ó] /(early Meiji era) democratic rights ideology/ +¼«Í³Ì±¼çÅÞ [¤¸¤æ¤¦¤ß¤ó¤·¤å¤È¤¦] /LDP/Liberal Democratic Party/ ¼«Í³ÌäÂê [¤¸¤æ¤¦¤â¤ó¤À¤¤] /(in competitive sports) a free exercise/ ¼«Í³Ï«Æ¯¼Ô [¤¸¤æ¤¦¤í¤¦¤É¤¦¤·¤ã] /day laborer/ ¼«Í¾ [¤¸¤è] /(n) the others/the remainder/ @@ -53582,7 +53582,7 @@ ¼Âʪ [¤¸¤Ä¤Ö¤Ä] /(n) real thing/original/(P)/ ¼Âʪ¼è°ú [¤¸¤Ä¤Ö¤Ä¤È¤ê¤Ò¤] /cash transaction/ ¼ÂʪÂç [¤¸¤Ä¤Ö¤Ä¤À¤¤] /(n) actual size/ -¼ÂʪÂçÌÏ·¿ [¤¸¤Ä¤Ö¤Ä¤À¤¤¤â¤±¤¤] /(n) full-size model/tqmock-up/ +¼ÂʪÂçÌÏ·¿ [¤¸¤Ä¤Ö¤Ä¤À¤¤¤â¤±¤¤] /(n) full-size model/mock-up/ ¼ÂʪÉÁ¼Ì [¤¸¤Ä¤Ö¤Ä¤Ó¤ç¤¦¤·¤ã] /model drawing/ ¼ÂÊì [¤¸¤Ä¤Ü] /(n) real (own) mother/ ¼ÂÊñ [¤¸¤Ã¤Ý¤¦] /(n) ball cartridge/ @@ -53895,9 +53895,9 @@ ¼Ò²ñÊݸ±Ä£ [¤·¤ã¤«¤¤¤Û¤±¤ó¤Á¤ç¤¦] /Social Insurance Agency/(P)/ ¼Ò²ñÊݾã [¤·¤ã¤«¤¤¤Û¤·¤ç¤¦] /social security/(P)/ ¼Ò²ñÊô»Å [¤·¤ã¤«¤¤¤Û¤¦¤·] /(n) voluntary social service/ -¼Ò²ṉ̃¼ç¡¹µÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social detqmocracy/ -¼Ò²ṉ̃¼ç¼çµÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social detqmocracy/ -¼Ò²ṉ̃¼çÅÞ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤È¤¦] /Social Detqmocratic Party/ +¼Ò²ṉ̃¼ç¡¹µÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social democracy/ +¼Ò²ṉ̃¼ç¼çµÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social democracy/ +¼Ò²ṉ̃¼çÅÞ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤È¤¦] /Social Democratic Party/ ¼Ò²ñÌÌ [¤·¤ã¤«¤¤¤á¤ó] /(n) society or local news page/(P)/ ¼Ò²ñÌäÂê [¤·¤ã¤«¤¤¤â¤ó¤À¤¤] /social problem/(P)/ ¼Ò³° [¤·¤ã¤¬¤¤] /(n) outside the company/(P)/ @@ -53945,7 +53945,7 @@ ¼ÒÈñ [¤·¤ã¤Ò] /(n) company expenses/at company expense/ ¼ÒÉÐ [¤·¤ã¤Ò¤ó] /(n) a company guest/ ¼ÒÉ÷ [¤·¤ã¤Õ¤¦] /(n) corporate culture/company climate or spirit/the way a company does things/ -¼Ò̱ÅÞ [¤·¤ã¤ß¤ó¤È¤¦] /Social Detqmocratic Party (abbr.)/(P)/ +¼Ò̱ÅÞ [¤·¤ã¤ß¤ó¤È¤¦] /Social Democratic Party (abbr.)/(P)/ ¼Ò̳ [¤·¤ã¤à] /(n) company business/clerical work at a shrine/ ¼Ò̳½ê [¤·¤ã¤à¤·¤ç] /(n) shrine office/ ¼Ò̾ [¤·¤ã¤á¤¤] /(n) name of company/(P)/ @@ -60161,7 +60161,7 @@ ¾å¤¹ [¤Î¤Ü¤¹] /(kyb:) (v5s) to raise/to record/to bring up (a matter)/to serve (food)/to send some one out/ ¾å¤»¤ë [¤Î¤Ü¤»¤ë] /(kyb:) (v1) to raise/to record/to bring up (a matter)/to serve (food)/to send some on out/(P)/ ¾å¤Ã¦ [¤¦¤ï¤Ã¤«¤ï] /(n) upper side/surface/ -¾å¤ÃÄ¥¤ê [¤¦¤ï¤Ã¤Ñ¤ê] /(n) overalls/wrapper/duster/stqmock/ +¾å¤ÃÄ¥¤ê [¤¦¤ï¤Ã¤Ñ¤ê] /(n) overalls/wrapper/duster/smock/ ¾å¤ÃÄ´»Ò [¤¦¤ï¤Ã¤Á¤ç¤¦¤·] /(adj-na,n) flippant/frivolous/shallow/(P)/ ¾å¤ÃÌÌ [¤¦¤ï¤Ã¤Ä¤é] /(n) surface/appearances/ ¾å¤Ä¤ [¤¦¤ï¤Ä¤] /superscript/ @@ -63743,7 +63743,7 @@ ¿Í̱½êÍ [¤¸¤ó¤ß¤ó¤·¤ç¤æ¤¦] /people's ownership/publically owned/ ¿Í̱ÀïÀþ [¤¸¤ó¤ß¤ó¤»¤ó¤»¤ó] /(n) popular front/(P)/ ¿Í̱Åêɼ [¤¸¤ó¤ß¤ó¤È¤¦¤Ò¤ç¤¦] /plebiscite/referendum/ -¿Í̱̱¼ç¶¦Ï¹ñ [¤¸¤ó¤ß¤ó¤ß¤ó¤·¤å¤¤ç¤¦¤ï¤³¤¯] /(n) people's detqmocratic republic/ +¿Í̱̱¼ç¶¦Ï¹ñ [¤¸¤ó¤ß¤ó¤ß¤ó¤·¤å¤¤ç¤¦¤ï¤³¤¯] /(n) people's democratic republic/ ¿Í̾ [¤¸¤ó¤á¤¤] /(n) person's name/(P)/ ¿Í̾¼½ñ [¤¸¤ó¤á¤¤¤¸¤·¤ç] /biographical dictionary/ ¿Í̾¼Åµ [¤¸¤ó¤á¤¤¤¸¤Æ¤ó] /biographical dictionary/ @@ -67162,7 +67162,7 @@ ÀÖÇ® [¤»¤¤Í¤Ä] /(n) red hot/ ÀÖÇí¤± [¤¢¤«¤à¤±] /(n) scraped skin/ ÀÖÈ© [¤¢¤«¤Ï¤À] /(n) grazed skin/abraded skin/bare of trees/ -ÀÖÈÓ [¤»¤¤Ï¤ó] /(n) red rice (beans and tqmochi) for auspicious occasions/(P)/ +ÀÖÈÓ [¤»¤¤Ï¤ó] /(n) red rice (beans and mochi) for auspicious occasions/(P)/ ÀÖÉ¡ [¤¢¤«¤Ï¤Ê] /(n) red nose/ ÀÖÉÏ [¤»¤¤Ò¤ó] /(n) extreme poverty/ ÀÖÉæ [¤¢¤«¤Ï¤À] /(n) grazed skin/abraded skin/bare of trees/ @@ -70924,7 +70924,7 @@ Á𡹠[¤½¤¦¤½¤¦] /(adj-na,int,n) brevity/rudeness/hurry/ Áð¤Îº¬ [¤¯¤µ¤Î¤Í] /(exp,n) grassroots/rank and file/the roots of grass/(P)/ Áð¤Îº¬±¿Æ° [¤¯¤µ¤Î¤Í¤¦¤ó¤É¤¦] /(n) grass-roots movement/ -Áð¤Îº¬Ì±¼ç¼çµÁ [¤¯¤µ¤Î¤Í¤ß¤ó¤·¤å¤·¤å¤®] /(n) grass-roots detqmocracy/ +Áð¤Îº¬Ì±¼ç¼çµÁ [¤¯¤µ¤Î¤Í¤ß¤ó¤·¤å¤·¤å¤®] /(n) grass-roots democracy/ Áð¤ÎÍÕ [¤¯¤µ¤Î¤Ï] /blade of grass/ Áð¤à¤·¤ê [¤¯¤µ¤à¤·¤ê] /(n) weeding/weeder/weeding fork/ Áð°Ã [¤½¤¦¤¢¤ó] /(n) thatched hut/ @@ -76921,7 +76921,7 @@ Ä«Á¯ÀïÁè [¤Á¤ç¤¦¤»¤ó¤»¤ó¤½¤¦] /(n) Korean war/ Ä«Á¯È¾Åç [¤Á¤ç¤¦¤»¤ó¤Ï¤ó¤È¤¦] /Korean peninsula/(P)/ Ä«Á¯È¾Å票¥Í¥ë¥®¡¼³«È¯µ¡¹½ [¤Á¤ç¤¦¤»¤ó¤Ï¤ó¤È¤¦¥¨¥Í¥ë¥®¡¼¤«¤¤¤Ï¤Ä¤¤³¤¦] /Korean Energy Development Organization (KEDO)/ -Ä«Á¯Ì±¼ç¼çµÁ¿Í̱¶¦Ï¹ñ [¤Á¤ç¤¦¤»¤ó¤ß¤ó¤·¤å¤·¤å¤®¤¸¤ó¤ß¤ó¤¤ç¤¦¤ï¤³¤¯] /People's Detqmocratic Republic of Korea (North Korea)/(P)/ +Ä«Á¯Ì±¼ç¼çµÁ¿Í̱¶¦Ï¹ñ [¤Á¤ç¤¦¤»¤ó¤ß¤ó¤·¤å¤·¤å¤®¤¸¤ó¤ß¤ó¤¤ç¤¦¤ï¤³¤¯] /People's Democratic Republic of Korea (North Korea)/(P)/ Ä«Á᤯ [¤¢¤µ¤Ï¤ä¤¯] /early in the morning/ īĬ [¤¢¤µ¤·¤ª] /(n) morning tide/ Ä«Äî [¤Á¤ç¤¦¤Æ¤¤] /(n) Imperial Court/ @@ -77353,7 +77353,7 @@ Ĺºê¸© [¤Ê¤¬¤µ¤¤±¤ó] /prefecture on the island of Kyuushuu/ Ĺ»Í³Ñ [¤Ê¤¬¤·¤«¤¯] /(n) rectangle/ Ĺ»Ò [¤Á¤ç¤¦¤·] /(n) eldest child or son/ -Ĺ»ý [¤Ê¤¬¤â¤Á] /(n,vs) (1) long-lasting/long-wearing/wears well/(2) nagatqmochi/large oblong chest (for clothing, personal effects, etc.)/ +Ĺ»ý [¤Ê¤¬¤â¤Á] /(n,vs) (1) long-lasting/long-wearing/wears well/(2) nagamochi/large oblong chest (for clothing, personal effects, etc.)/ Ĺ»ý¤Á [¤Ê¤¬¤â¤Á] /(n,vs) (1) long-lasting/long-wearing/wears well/(P)/ Ĺ»þ´Ö [¤Á¤ç¤¦¤¸¤«¤ó] /(n-adv,n-t) long period of time/long playing/(P)/ Ĺ¼´ [¤Á¤ç¤¦¤¸¤¯] /(n) major axis/ @@ -77624,7 +77624,7 @@ ľÀÜÈæ³Ó [¤Á¤ç¤¯¤»¤Ä¤Ò¤«¤¯] /direct comparison/ ľÀÜÈñ [¤Á¤ç¤¯¤»¤Ä¤Ò] /(n) direct cost/ ľÀÜË¡ [¤Á¤ç¤¯¤»¤Ä¤Û¤¦] /(n) direct method/indicative mood/ -ľÀÜ̱¼çÀ© [¤Á¤ç¤¯¤»¤Ä¤ß¤ó¤·¤å¤»¤¤] /direct detqmocracy/ +ľÀÜ̱¼çÀ© [¤Á¤ç¤¯¤»¤Ä¤ß¤ó¤·¤å¤»¤¤] /direct democracy/ ľÀÜÌÜŪ¸ì [¤Á¤ç¤¯¤»¤Ä¤â¤¯¤Æ¤¤´] /(n) (gram) direct object/ ľÀÜϫ̳Èñ [¤Á¤ç¤¯¤»¤Ä¤í¤¦¤à¤Ò] /(n) direct labor costs/ ľÀÜÏÃË¡ [¤Á¤ç¤¯¤»¤Ä¤ï¤Û¤¦] /direct quotation/ @@ -78278,7 +78278,7 @@ Äߤê¼ê [¤Ä¤ê¤Æ] /(n) hanger/ Äߤê½Ð¤· [¤Ä¤ê¤À¤·] /(n) sumo winning technique where the opponent is lifted out by his belt/ Äߤê½Ð¤¹ [¤Ä¤ê¤À¤¹] /(v5s) to hold (the opponent) in the arms and carry him out of the ring/ -Äߤ꾲 [¤Ä¤ê¤É¤³] /(n) hamtqmock/ +Äߤ꾲 [¤Ä¤ê¤É¤³] /(n) hammock/ Äߤê¾â [¤Ä¤ê¤¬¤Í] /(n) temple bell (for striking)/ Äߤê¾å¤²¤ë [¤Ä¤ê¤¢¤²¤ë] /(v1) to hang up/to suspend/to raise/to lift/ Äߤêê [¤Ä¤ê¤À¤Ê] /(n) suspended shelf/ @@ -78316,7 +78316,7 @@ Äà¤ê½® [¤Ä¤ê¤Ö¤Í] /(n) fishing boat/ Äà¤ê½Ð¤¹ [¤Ä¤ê¤À¤¹] /(v5s) to pull out a fish/to lure/ Äà¤ê½ñ¤ [¤Ä¤ê¤¬¤] /family chart and personal history (omiai)/ -Äà¤ê¾² [¤Ä¤ê¤É¤³] /(n) hamtqmock/ +Äà¤ê¾² [¤Ä¤ê¤É¤³] /(n) hammock/ Äà¤ê¾â [¤Ä¤ê¤¬¤Í] /(n) temple bell (for striking)/ Äà¤ê¾âÁð [¤Ä¤ê¤¬¤Í¤½¤¦] /(n) campanula/bellflower/ Äà¤ê¾âÃî [¤Ä¤ê¤¬¤Í¤à¤·] /(n) bell animalcule (insect)/ @@ -85058,7 +85058,7 @@ Ç®Ãæ [¤Í¤Ã¤Á¤å¤¦] /(n) nuts!/enthusiasm/zeal/mania/(P)/ Ç®ÅÁƳ [¤Í¤Ä¤Ç¤ó¤É¤¦] /(n) heat conduction/ Ç®ÅÁƳΨ [¤Í¤Ä¤Ç¤ó¤É¤¦¤ê¤Ä] /(n) thermal conductivity/ -Ç®ÅÅÂÐ [¤Í¤Ä¤Ç¤ó¤Ä¤¤] /(n) thertqmocouple/ +Ç®ÅÅÂÐ [¤Í¤Ä¤Ç¤ó¤Ä¤¤] /(n) thermocouple/ Ç®ÅÙ [¤Í¤Ä¤É] /(n) degree of heat/temperature/enthusiasm/ Ç®Åò [¤Í¤Ã¤È¤¦] /(n) boiling water/(P)/ ǮƮ [¤Í¤Ã¤È¤¦] /(n) fierce fighting/ @@ -88722,7 +88722,7 @@ ÈóÊÑ´¹ [¤Ò¤Ø¤ó¤«¤ó] /non-conversion/ Èó˾ [¤Ò¤Ü¤¦] /(n) inordinate ambition/ ÈóËÞ [¤Ò¤Ü¤ó] /(adj-na,n) prodigy/rare/unique/extraordinary/ -Èó̱¼ç [¤Ò¤ß¤ó¤·¤å] /undetqmocratic/ +Èó̱¼ç [¤Ò¤ß¤ó¤·¤å] /undemocratic/ ÈóÌ¿ [¤Ò¤á¤¤] /(n) unnatural or untimely death/ ÈóÍý [¤Ò¤ê] /(n) unreasonable/illogical/ ÈóÎÉ¿´Åª [¤Ò¤ê¤ç¤¦¤·¤ó¤Æ¤] /(adj-na) unscrupulous/dishonest/irresponsibly done (work, etc.)/ @@ -89178,7 +89178,7 @@ ɨÇï»Ò [¤Ò¤¶¤Ó¤ç¤¦¤·] /(n) keeping time by tapping one's knees/ ɨËí [¤Ò¤¶¤Þ¤¯¤é] /(n) sleeping with one's head in another's lap/ É©·Á [¤Ò¤·¤¬¤¿] /(n) diamond shape/ -É©Ìß [¤Ò¤·¤â¤Á] /(n) rhombus-shaped tqmochi/ +É©Ìß [¤Ò¤·¤â¤Á] /(n) rhombus-shaped mochi/ ɪ [¤Ò¤¸] /(n) (uk) elbow/(P)/ ɪ³Ý [¤Ò¤¸¤«¤±] /(n) armrest/elbow rest/ ɪ³Ý¤± [¤Ò¤¸¤«¤±] /(n) arm of a chair/ @@ -93081,7 +93081,7 @@ Ê¿Ëë [¤Ò¤é¤Þ¤¯] /(n) rank-and-file wrestlers in sumo's highest division/(P)/ Ê¿Ì® [¤Ø¤¤¤ß¤ã¤¯] /(n) normal pulse/ ʿ̱ [¤Ø¤¤¤ß¤ó] /(n) commoner/plebeian/ -ʿ̱¼çµÁ [¤Ø¤¤¤ß¤ó¤·¤å¤®] /detqmocracy/ +ʿ̱¼çµÁ [¤Ø¤¤¤ß¤ó¤·¤å¤®] /democracy/ Ê¿ÌÀ [¤Ø¤¤¤á¤¤] /(adj-na,n) clear/simple/ Ê¿ÌÌ [¤Ø¤¤¤á¤ó] /(n) level surface/plane/(P)/ Ê¿ÌÌ´ö²¿³Ø [¤Ø¤¤¤á¤ó¤¤«¤¬¤¯] /plane geometry/ @@ -97026,7 +97026,7 @@ ̱·Ý [¤ß¤ó¤²¤¤] /(n) folk craft/folk art/(P)/ ̱·ÝÉÊ [¤ß¤ó¤²¤¤¤Ò¤ó] /(n) (article of) folk craft/ ̱¸¢ [¤ß¤ó¤±¤ó] /(n) civil rights/ -̱¸¢¼çµÁ [¤ß¤ó¤±¤ó¤·¤å¤®] /detqmocracy (as propounded by Sun Yat-sen)/ +̱¸¢¼çµÁ [¤ß¤ó¤±¤ó¤·¤å¤®] /democracy (as propounded by Sun Yat-sen)/ ̱¸Í [¤ß¤ó¤³] /private house/ ̱¹ñ [¤ß¤ó¤³¤¯] /(Republic of) China (i.e. Taiwan)/ ̱»ö [¤ß¤ó¤¸] /(n) civil affairs/civil case/(P)/ @@ -97039,20 +97039,20 @@ ̱»öŪ [¤ß¤ó¤¸¤Æ¤] /(adj-na) civil/ ̱»öˡΧÉÞ½õ [¤ß¤ó¤¸¤Û¤¦¤ê¤Ä¤Õ¤¸¤ç] /(n) civil legal aid system (e.g. legal aid for poor people)/ ̱»öˡΧÉÞ½õÀ©ÅÙ [¤ß¤ó¤¸¤Û¤¦¤ê¤Ä¤Õ¤¸¤ç¤»¤¤¤É] /(n) civil legal aid system (e.g. legal aid for poor people)/ -̱¼ÒÅÞ [¤ß¤ó¤·¤ã¤È¤¦] /Detqmocratic Socialist Party/(P)/ -̱¼ç [¤ß¤ó¤·¤å] /(n) detqmocratic/the head of the nation/(P)/ -̱¼ç²½ [¤ß¤ó¤·¤å¤«] /(n,vs) detqmocratization/detqmocratize/ -̱¼ç²½±¿Æ° [¤ß¤ó¤·¤å¤«¤¦¤ó¤É¤¦] /(n) detqmocratic movement/movement towards detqmocracy/ -̱¼ç²þ³× [¤ß¤ó¤·¤å¤«¤¤¤«¤¯] /(n) detqmocratic reform/ -̱¼ç³èÆ°²È [¤ß¤ó¤·¤å¤«¤Ä¤É¤¦¤«] /(n) detqmocratic activist/ -̱¼ç¹ñ [¤ß¤ó¤·¤å¤³¤¯] /(n) detqmocratic state/(P)/ -̱¼ç¼çµÁ [¤ß¤ó¤·¤å¤·¤å¤®] /(n) detqmocracy/(P)/ -̱¼ç¼çµÁ¹ñ²È [¤ß¤ó¤·¤å¤·¤å¤®¤³¤Ã¤«] /(n) detqmocratic nation/ -̱¼çÀ¯¼£ [¤ß¤ó¤·¤å¤»¤¤¤¸] /(n) detqmocratic government/ -̱¼çÀ¯ÂÎ [¤ß¤ó¤·¤å¤»¤¤¤¿¤¤] /(n) detqmocratic form of government/ -̱¼çŪ [¤ß¤ó¤·¤å¤Æ¤] /(adj-na) detqmocratic/(P)/ -̱¼çÅÞ [¤ß¤ó¤·¤å¤È¤¦] /Detqmocratic party/(P)/ -̱¼çÅÞÁ´¹ñ°Ñ°÷²ñ [¤ß¤ó¤·¤å¤È¤¦¤¼¤ó¤³¤¯¤¤¤¤¤ó¤«¤¤] /Detqmocratic National Committee (US)/DNC/ +̱¼ÒÅÞ [¤ß¤ó¤·¤ã¤È¤¦] /Democratic Socialist Party/(P)/ +̱¼ç [¤ß¤ó¤·¤å] /(n) democratic/the head of the nation/(P)/ +̱¼ç²½ [¤ß¤ó¤·¤å¤«] /(n,vs) democratization/democratize/ +̱¼ç²½±¿Æ° [¤ß¤ó¤·¤å¤«¤¦¤ó¤É¤¦] /(n) democratic movement/movement towards democracy/ +̱¼ç²þ³× [¤ß¤ó¤·¤å¤«¤¤¤«¤¯] /(n) democratic reform/ +̱¼ç³èÆ°²È [¤ß¤ó¤·¤å¤«¤Ä¤É¤¦¤«] /(n) democratic activist/ +̱¼ç¹ñ [¤ß¤ó¤·¤å¤³¤¯] /(n) democratic state/(P)/ +̱¼ç¼çµÁ [¤ß¤ó¤·¤å¤·¤å¤®] /(n) democracy/(P)/ +̱¼ç¼çµÁ¹ñ²È [¤ß¤ó¤·¤å¤·¤å¤®¤³¤Ã¤«] /(n) democratic nation/ +̱¼çÀ¯¼£ [¤ß¤ó¤·¤å¤»¤¤¤¸] /(n) democratic government/ +̱¼çÀ¯ÂÎ [¤ß¤ó¤·¤å¤»¤¤¤¿¤¤] /(n) democratic form of government/ +̱¼çŪ [¤ß¤ó¤·¤å¤Æ¤] /(adj-na) democratic/(P)/ +̱¼çÅÞ [¤ß¤ó¤·¤å¤È¤¦] /Democratic party/(P)/ +̱¼çÅÞÁ´¹ñ°Ñ°÷²ñ [¤ß¤ó¤·¤å¤È¤¦¤¼¤ó¤³¤¯¤¤¤¤¤ó¤«¤¤] /Democratic National Committee (US)/DNC/ ̱¼û [¤ß¤ó¤¸¤å] /(n) civilian requirements/(P)/ ̱¼ûÉÊ [¤ß¤ó¤¸¤å¤Ò¤ó] /consumer goods/ ̱½° [¤ß¤ó¤·¤å¤¦] /(n) people/populace/masses/(P)/ @@ -97064,13 +97064,13 @@ ̱¿´ [¤ß¤ó¤·¤ó] /(n) popular sentiment/ ̱¿Í [¤ß¤ó¤¸¤ó] /the people/the public/ ̱¿ôµ [¤ß¤ó¤¹¤¦¤] /the Book of Numbers (in the Bible)/ -̱À¯ [¤ß¤ó¤»¤¤] /(n) detqmocracy/civil government/(P)/ +̱À¯ [¤ß¤ó¤»¤¤] /(n) democracy/civil government/(P)/ ̱À¯Ä¹´± [¤ß¤ó¤»¤¤¤Á¤ç¤¦¤«¤ó] /civil governor/ ̱À¸ [¤ß¤ó¤»¤¤] /(n) (1) consumer/(2) civilian/(3) people's welfare or livelihood/(P)/ ̱À¸°Ñ°÷ [¤ß¤ó¤»¤¤¤¤¤¤¤ó] /district welfare officer/ ̱À¸ÍÑ [¤ß¤ó¤»¤¤¤è¤¦] /(adj-no) consumer (use)/ ̱À¸Íѵ¡ [¤ß¤ó¤»¤¤¤è¤¦¤] /(n) consumer equipment/ -̱ÀÄ [¤ß¤ó¤»¤¤] /(n) Detqmocratic Youth League of Japan/ +̱ÀÄ [¤ß¤ó¤»¤¤] /(n) Democratic Youth League of Japan/ ̱Áª [¤ß¤ó¤»¤ó] /(n) popular election/ ̱Áð [¤¿¤ß¤¯¤µ] /(n) people/populace/ ̱Áð [¤¿¤ß¤°¤µ] /(n) people/populace/ @@ -97094,7 +97094,7 @@ ̱²ÂçµÔ»¦ [¤ß¤ó¤¾¤¯¤À¤¤¤®¤ã¤¯¤µ¤Ä] /racial genocide/ ̱²Ū [¤ß¤ó¤¾¤¯¤Æ¤] /(adj-na) racial/ ̱ÃÄ [¤ß¤ó¤À¤ó] /(n) foreign-settlement corporation/ -̱Äê·ûË¡ [¤ß¤ó¤Æ¤¤¤±¤ó¤Ý¤¦] /(n) detqmocratic constitution/ +̱Äê·ûË¡ [¤ß¤ó¤Æ¤¤¤±¤ó¤Ý¤¦] /(n) democratic constitution/ ̱ÅÙ [¤ß¤ó¤É] /(n) cultural standard/ ̱ÆÁ [¤ß¤ó¤È¤¯] /national morality/ ̱Çñ [¤ß¤ó¤Ñ¤¯] /(n) private residence temporarily taking lodgers/ @@ -97104,7 +97104,7 @@ ̱Êü [¤ß¤ó¤Ý¤¦] /(n) commercial broadcast/(P)/ ̱ˡ [¤ß¤ó¤Ý¤¦] /(n) civil law/civil code/(P)/ ̱˾ [¤ß¤ó¤Ü¤¦] /(n) hopes of the people/ -̱ËܼçµÁ [¤ß¤ó¤Ý¤ó¤·¤å¤®] /(n) detqmocracy/ +̱ËܼçµÁ [¤ß¤ó¤Ý¤ó¤·¤å¤®] /(n) democracy/ ̱ÌóÀâ [¤ß¤ó¤ä¤¯¤»¤Ä] /social-contract theory/ ̱ÌóÏÀ [¤ß¤ó¤ä¤¯¤í¤ó] /social-contract theory/ Ì±Í [¤ß¤ó¤æ¤¦] /(n) private ownership/ @@ -98262,14 +98262,14 @@ ÌÍÕÀ [¤á¤ó¤Þ] /(n) bamboo shoots boiled, sliced, fermented, dried or preserved in salt, then soaked in hot water and sea salt/ ÌÍÕÀ [¥á¥ó¥Þ] /(n) bamboo shoots boiled, sliced, fermented, dried or preserved in salt, then soaked in hot water and sea salt/ ÌÎ [¤â] /(n,vs) copy/imitate/ -Ìε¼ [¤â¤®] /(n,adj-no) imitation/sham/tqmock/ +Ìε¼ [¤â¤®] /(n,adj-no) imitation/sham/mock/ Ìε¼»î¸³ [¤â¤®¤·¤±¤ó] /sham (trial) examination/ Ìκ÷ [¤â¤µ¤¯] /(n) groping (for)/ ÌÎ¼Ì [¤â¤·¤ã] /(n,vs) copy (of the real thing)/copying/reproduction/tracing/ ÌΤ [¤â¤¾¤¦] /(n) counterfeit/imitation/ ÌÎÇ× [¤â¤¦¤Ñ¤¤] /(vs) identifying a piece by touch in a mahjong game/ ÌÎÊï [¤â¤Û¤¦] /(n,vs) imitation/copying/ -Ìϵ¼ [¤â¤®] /(n,adj-no) imitation/sham/tqmock/(P)/ +Ìϵ¼ [¤â¤®] /(n,adj-no) imitation/sham/mock/(P)/ Ìϵ¼»î¸³ [¤â¤®¤·¤±¤ó] /trial examination/sham examination/(P)/ Ìϵ¼Àï [¤â¤®¤»¤ó] /sham battle/ Ìϵ¼Å¹ [¤â¤®¤Æ¤ó] /(n) refreshment booth/ @@ -105537,7 +105537,7 @@ Ó޾Р[¤Á¤ç¤¦¤·¤ç¤¦] /(n,vs) scorn/sneer/ Ó޾Ф¦ [¤¢¤¶¤ï¤é¤¦] /(v5u) (uk) to sneer at/to ridicule/ ÓÞÇÍ [¤Á¤ç¤¦¤Ð] /(n) taunt/insult/abuse/ -ÓÞÏ® [¤Á¤ç¤¦¤í¤¦] /(n) scorn/tqmockery/ridicule/ +ÓÞÏ® [¤Á¤ç¤¦¤í¤¦] /(n) scorn/mockery/ridicule/ Óß [¤µ¤¾] /(adv) (uk) I am sure/certainly/no doubt/(P)/ Óߤ«¤· [¤µ¤¾¤«¤·] /(adv) (uk) certainly/surely/ Óà [¤¢¤¢] /(int) (uk) Ah!/Oh!/Alas!/ diff --git a/kiten/kanjidic b/kiten/kanjidic index 92fc1d8d..55136de7 100644 --- a/kiten/kanjidic +++ b/kiten/kanjidic @@ -2677,7 +2677,7 @@ ÌÌ 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon ¥á¥ó ¥Ù¥ó ¤ª¤â ¤ª¤â¤Æ ¤Ä¤é T1 ¤ª ¤º¤é ¤Û¤ª¤Ä¤ ¤â {mask} {face} {features} {surface} ÌÍ 4C4D U9eba B199 S16 XJ07351 XJ16C70 F2331 N5389 V7038 L2752 O2910 MN47827X MP12.0936 P3-7-9 Q4124.6 Q4140.6 ZRP3-11-9 Ymian4 Wmyeon ¥á¥ó ¥Ù¥ó ¤à¤®¤³ {noodles} {wheat flour} ÌÎ 4C4E U6478 B64 S13 N1974 V2250 H691 O1836 MN12644X MP5.0371 P1-3-10 I3c10.13 Q5403.4 ZRP1-3-11 Ymo1 Ymo2 Wmo Wmag ¥â ¥â¥¦ ¥Ð¥¯ ¥Ü ¥Þ¥¯ {search} {imitate} {copy} -ÌÏ 4C4F U6a21 B75 G6 S14 F668 N2345 V2825 H1050 DK720 L229 K691 O2104 DO1218 MN15453X MP6.0533 E980 IN1425 DT980 DJ1160 DG1109 P1-4-10 I4a10.16 Q4493.4 DR1863 Ymo2 Ymu2 Wmo ¥â ¥Ü T1 ¤¬¤ß {imitation} {copy} {tqmock} +ÌÏ 4C4F U6a21 B75 G6 S14 F668 N2345 V2825 H1050 DK720 L229 K691 O2104 DO1218 MN15453X MP6.0533 E980 IN1425 DT980 DJ1160 DG1109 P1-4-10 I4a10.16 Q4493.4 DR1863 Ymo2 Ymu2 Wmo ¥â ¥Ü T1 ¤¬¤ß {imitation} {copy} {mock} ÌÐ 4C50 U8302 B140 G8 S8 F1188 N3915 V4998 H2245 DK1435 L360 K1166 O691 DO1799 MN30833P MP9.0596 E1850 IN1467 DJ1840 DG650 P2-3-5 I3k5.7 Q4425.3 DR1959 Ymao4 Wmu ¥â ¤·¤².¤ë T1 ¤¦¤à¤µ ¤ ¤· ¤Ä¤È¤à ¤à ¤â¤Æ {overgrown} {grow thick} {be luxuriant} ÌÑ 4C51 U5984 B8 C38 G8 S6 F2264 N288 V1177 H2016 DK1273 L487 K1937 MN6063 MP3.0659 E1851 IN1376 DJ1696 DG424 P2-2-4 I2j4.6 Q0040.4 DR469 Ywang4 Wmang ¥â¥¦ ¥Ü¥¦ ¤ß¤À.¤ê¤Ë {delusion} {unnecessarily} {without authority} {reckless} ÌÒ 4C52 U5b5f B39 G9 S8 F2127 N1269 V1291 H2220 DK1412 L2872 O667 MN6960 MP3.0833 IN2049 P2-3-5 I2c5.1 Q1710.7 ZSP2-2-5 Ymeng4 Wmaeng Wmang ¥â¥¦ ¥Ü¥¦ ¥ß¥ç¥¦ ¤«¤·¤é T1 ¤¿¤±¤· ¤¿¤± ¤Ï¤ë ¤Ï¤¸¤á ¤Ä¤È¤à ¤ª¤µ ¤Ï¤¤ {chief} {beginning} @@ -2693,7 +2693,7 @@ ÌÜ 4C5C U76ee B109 G1 S5 F76 N3127 V3906 H3043 DK1927 L15 K65 O191 DO22 MN23105 MP8.0153 E72 IN55 DS25 DT48 DC91 DJ168 DB3.11 DG1376 P3-3-2 I5c0.1 Q6010.1 DR3979 ZPP4-5-1 Ymu4 Wmog ¥â¥¯ ¥Ü¥¯ ¤á -¤á ¤Þ- T1 ¤µ¤«¤ó ¤µ¤¬¤ó ¤µ¤Ã¤« ¤µ¤Ä¤« {eye} {class} {look} {insight} {experience} {care} {favor} ÌÝ 4C5D U6762 B75 S7 N2177 V2548 O486 MN14487 MP6.0168 P2-4-3 I4a3.13 Q4010.1 Wmog ¥â¥¯ {woodworker} {(kokuji)} ÌÞ 4C5E U52ff B20 S4 N743 V569 H2943 L1049 O110 MN2501 MP2.0425 P3-2-2 I0a4.11 Q2722.0 ZPP4-4-4 Ywu4 Wmul Wmol ¥â¥Á ¥Ö¥Ä ¥Ü¥Ä ¤Ê¤«.¤ì ¤Ê¤· {not} {must not} {do not} {be not} -Ìß 4C5F U9905 B184 S14 XJ07136 F2152 N5166 V6689 L2802 O2346 MN44133X MP12.0393 P1-8-6 Q8874.1 DR2855 Ybing3 Wbyeong ¥Ø¥¤ ¥Ò¥ç¥¦ ¤â¤Á ¤â¤Á¤¤ {tqmochi rice cake} +Ìß 4C5F U9905 B184 S14 XJ07136 F2152 N5166 V6689 L2802 O2346 MN44133X MP12.0393 P1-8-6 Q8874.1 DR2855 Ybing3 Wbyeong ¥Ø¥¤ ¥Ò¥ç¥¦ ¤â¤Á ¤â¤Á¤¤ {mochi rice cake} Ìà 4C60 U5c24 B3 C43 S4 N128 V1399 H3023 L2087 O106 MN7543 MP4.0112 P3-3-1 I0a4.20 Q4301.0 ZPP4-4-4 Yyou2 Wu ¥æ¥¦ ¤â¤Ã¤È.¤â ¤È¤¬.¤á¤ë {reasonable} {just} {natural} {superb} {outstanding} {plausible} Ìá 4C61 U623b B63 G8 S7 F890 N1818 V2051 H1942 DK1234 L1081 K923 DO1850 MN11707X MP5.0060 E1920 IN1238 DJ1201 DG842 P2-1-6 I4m3.1 Q3023.4 DR3063 ZPP3-4-3 Yli4 Wryeo Wryeol ¥ì¥¤ ¤â¤É.¤¹ ¤â¤É.¤ë {re-} {return} {revert} {resume} {restore} {go backwards} Ìâ 4C62 U7c7e B119 S9 N3464 V4384 L2651 O887 MN26853X MP8.0887 P1-6-3 Q9795.0 Yni2 Win ¤â¤ß {unhulled rice} {(kokuji)} diff --git a/klatin/klatin/data/vocab/pl/A.kvtml b/klatin/klatin/data/vocab/pl/A.kvtml index 61e8c134..3ccf4856 100644 --- a/klatin/klatin/data/vocab/pl/A.kvtml +++ b/klatin/klatin/data/vocab/pl/A.kvtml @@ -187,6 +187,6 @@ </e> <e> <o>auxilium (2)</o> - <t>potqmoc</t> + <t>pomoc</t> </e> </kvtml> diff --git a/klatin/klatin/data/vocab/pl/V.kvtml b/klatin/klatin/data/vocab/pl/V.kvtml index d793ed8a..6ace2e9a 100644 --- a/klatin/klatin/data/vocab/pl/V.kvtml +++ b/klatin/klatin/data/vocab/pl/V.kvtml @@ -3,7 +3,7 @@ <kvtml> <e> <o>valde</o> - <t>bardzo, tqmocno, gwaÅ‚townie</t> + <t>bardzo, mocno, gwaÅ‚townie</t> </e> <e> <o>vale</o> diff --git a/klatin/klatin/data/vocab/sk/A.kvtml b/klatin/klatin/data/vocab/sk/A.kvtml index 56c5f2f2..f8cbd879 100644 --- a/klatin/klatin/data/vocab/sk/A.kvtml +++ b/klatin/klatin/data/vocab/sk/A.kvtml @@ -187,6 +187,6 @@ </e> <e> <o>auxilium (2)</o> - <t>podpora, potqmoc</t> + <t>podpora, pomoc</t> </e> </kvtml> diff --git a/klatin/klatin/data/vocab/sk/BC.kvtml b/klatin/klatin/data/vocab/sk/BC.kvtml index 0d31ad31..fc4da165 100644 --- a/klatin/klatin/data/vocab/sk/BC.kvtml +++ b/klatin/klatin/data/vocab/sk/BC.kvtml @@ -39,7 +39,7 @@ </e> <e> <o>capio (3)</o> - <t>braÅ¥, uchopiÅ¥, chápaÅ¥, ztqmocniÅ¥ sa</t> + <t>braÅ¥, uchopiÅ¥, chápaÅ¥, zmocniÅ¥ sa</t> </e> <e> <o>captivus (2)</o> diff --git a/klatin/klatin/data/vocab/sk/GHI1.kvtml b/klatin/klatin/data/vocab/sk/GHI1.kvtml index 17d88b20..3a37603c 100644 --- a/klatin/klatin/data/vocab/sk/GHI1.kvtml +++ b/klatin/klatin/data/vocab/sk/GHI1.kvtml @@ -127,7 +127,7 @@ </e> <e> <o>imperium (2)</o> - <t>vláda, zvrchovaná tqmoc, rozkaz</t> + <t>vláda, zvrchovaná moc, rozkaz</t> </e> <e> <o>impero (1)</o> diff --git a/klatin/klatin/data/vocab/sk/M.kvtml b/klatin/klatin/data/vocab/sk/M.kvtml index e18e12c0..ea61fd1d 100644 --- a/klatin/klatin/data/vocab/sk/M.kvtml +++ b/klatin/klatin/data/vocab/sk/M.kvtml @@ -3,7 +3,7 @@ <kvtml> <e> <o>magnopere</o> - <t>veľmi, tqmoc</t> + <t>veľmi, moc</t> </e> <e> <o>magnus</o> diff --git a/klatin/klatin/data/vocab/sk/P2.kvtml b/klatin/klatin/data/vocab/sk/P2.kvtml index 15c91231..9b2cf3aa 100644 --- a/klatin/klatin/data/vocab/sk/P2.kvtml +++ b/klatin/klatin/data/vocab/sk/P2.kvtml @@ -47,7 +47,7 @@ </e> <e> <o>possum (irreg)</o> - <t>môcÅ¥, byÅ¥ schopný, maÅ¥ tqmoc, dokázaÅ¥</t> + <t>môcÅ¥, byÅ¥ schopný, maÅ¥ moc, dokázaÅ¥</t> </e> <e> <o>post + acc</o> diff --git a/klatin/klatin/data/vocab/sk/QR.kvtml b/klatin/klatin/data/vocab/sk/QR.kvtml index 0517ac99..7db08854 100644 --- a/klatin/klatin/data/vocab/sk/QR.kvtml +++ b/klatin/klatin/data/vocab/sk/QR.kvtml @@ -67,7 +67,7 @@ </e> <e> <o>rapio (3)</o> - <t>uchvátiÅ¥, ztqmocniÅ¥ sa</t> + <t>uchvátiÅ¥, zmocniÅ¥ sa</t> </e> <e> <o>re-</o> @@ -95,7 +95,7 @@ </e> <e> <o>regnum (2)</o> - <t>najvyÅ¡Å¡ia tqmoc, kráľovstvo, majetok</t> + <t>najvyÅ¡Å¡ia moc, kráľovstvo, majetok</t> </e> <e> <o>regredior (3)</o> diff --git a/klatin/klatin/data/vocab/sk/TU.kvtml b/klatin/klatin/data/vocab/sk/TU.kvtml index 3f5bf6ce..a9d9c264 100644 --- a/klatin/klatin/data/vocab/sk/TU.kvtml +++ b/klatin/klatin/data/vocab/sk/TU.kvtml @@ -27,7 +27,7 @@ </e> <e> <o>tantus</o> - <t>tak veľký, len toľko, tqmocný, slávny</t> + <t>tak veľký, len toľko, mocný, slávny</t> </e> <e> <o>templum (2)</o> @@ -43,7 +43,7 @@ </e> <e> <o>teneo (2)</o> - <t>držaÅ¥, maÅ¥ v tqmoci</t> + <t>držaÅ¥, maÅ¥ v moci</t> </e> <e> <o>terra (1)</o> diff --git a/kmplot/KmPlot.kdevelop b/kmplot/KmPlot.kdevelop index 2bb7059b..c430df75 100644 --- a/kmplot/KmPlot.kdevelop +++ b/kmplot/KmPlot.kdevelop @@ -143,7 +143,7 @@ <hidenonlocation>false</hidenonlocation> </groups> <tree> - <hidepatterns>*.o,*.lo,CVS,*.tqmoc,*~</hidepatterns> + <hidepatterns>*.o,*.lo,CVS,*.moc,*~</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> </kdevfileview> diff --git a/kstars/kstars/data/Cities.dat b/kstars/kstars/data/Cities.dat index 4528bb50..2adacf45 100644 --- a/kstars/kstars/data/Cities.dat +++ b/kstars/kstars/data/Cities.dat @@ -1271,7 +1271,7 @@ Kings Beach : Queensland : Australia Kingsport : Tennessee : USA : 36 : 32 : 42 : N : 82 : 32 : 35 : W : -5.0 : US Kingston : : Jamaica : 18 : 0 : 0 : N : 76 : 44 : 59 : W : -5.0 : -- Kingston : Ontario : Canada : 44 : 13 : 11 : N : 76 : 35 : 59 : W : -5.0 : US -Kinshasa : : Congo (Detqmocratic Republic) : 4 : 22 : 58 : S : 15 : 26 : 59 : E : x : -- +Kinshasa : : Congo (Democratic Republic) : 4 : 22 : 58 : S : 15 : 26 : 59 : E : x : -- Kiruna : : Sweden : 67 : 49 : 0 : N : 20 : 19 : 0 : E : 1.0 : EU Kisangani : : Dem rep of Congo : 0 : 31 : 0 : N : 25 : 11 : 0 : E : 1.0 : -- Kismayu : : Somalia : 0 : 23 : 0 : S : 42 : 33 : 0 : E : 3.0 : -- diff --git a/kstars/kstars/data/info_url.dat b/kstars/kstars/data/info_url.dat index c3c0e8d4..225a24d5 100644 --- a/kstars/kstars/data/info_url.dat +++ b/kstars/kstars/data/info_url.dat @@ -185,7 +185,7 @@ Mars:NASA JPL Page:http://www.jpl.nasa.gov/solar_system/planets/mars_index.html Mars:Welcome to Mars!:http://www.amnh.org/rose/mars/index.html Mars:The Whole Mars Catalog:http://www.spaceref.com/mars/ Mars:The Mars Society:http://www.marssociety.org/ -Mars:The "face" on Mars:http://mars.jpl.nasa.gov/mgs/msss/camera/images/tqmoc_5_24_01/face/index.html +Mars:The "face" on Mars:http://mars.jpl.nasa.gov/mgs/msss/camera/images/moc_5_24_01/face/index.html Jupiter:Wikipedia Page:http://en.wikipedia.org/wiki/Jupiter_(planet) Jupiter:SEDS Information Page:http://www.seds.org/nineplanets/nineplanets/jupiter.html Jupiter:NASA JPL Page:http://www.jpl.nasa.gov/solar_system/planets/jupiter_index.html |