diff options
-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.tdevelop | 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/ �IJ� [������] /(n) Diet/congress/parliament/(P)/ �IJ��� [���������央] /(n) parliamentarism/ -�IJ���̱���� [�����������ߤ夷�央] /(n) parliamentary detqmocracy/ +�IJ���̱���� [�����������ߤ夷�央] /(n) parliamentary democracy/ �IJ����� [������������] /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.tdevelop b/kmplot/KmPlot.tdevelop index b981a6c2..5e48c5d2 100644 --- a/kmplot/KmPlot.tdevelop +++ b/kmplot/KmPlot.tdevelop @@ -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 |