diff options
| -rw-r--r-- | misc/langdrill/000_pkg_config.diff | 21 | ||||
| -rw-r--r-- | misc/langdrill/010_cxx_standard.diff | 33 | ||||
| -rw-r--r-- | misc/langdrill/010_min_max.diff | 21 | ||||
| -rw-r--r-- | misc/langdrill/010_vdk_updates.diff | 61 | ||||
| -rw-r--r-- | misc/langdrill/020_documentation.diff | 15 | ||||
| -rw-r--r-- | misc/langdrill/030_french_utf8.diff | 40 | ||||
| -rw-r--r-- | misc/langdrill/030_japanese.diff | 1126 | ||||
| -rw-r--r-- | misc/langdrill/030_swedish.diff | 248 | ||||
| -rw-r--r-- | misc/langdrill/040_link.diff | 21 | ||||
| -rw-r--r-- | misc/langdrill/050_cflags.diff | 61 | ||||
| -rw-r--r-- | misc/langdrill/050_install.diff | 63 | ||||
| -rw-r--r-- | misc/langdrill/README | 2 | ||||
| -rw-r--r-- | misc/langdrill/langdrill.SlackBuild | 100 | ||||
| -rw-r--r-- | misc/langdrill/langdrill.info | 10 | ||||
| -rw-r--r-- | misc/langdrill/slack-desc | 19 |
15 files changed, 1841 insertions, 0 deletions
diff --git a/misc/langdrill/000_pkg_config.diff b/misc/langdrill/000_pkg_config.diff new file mode 100644 index 0000000000..fe19bcb5ec --- /dev/null +++ b/misc/langdrill/000_pkg_config.diff @@ -0,0 +1,21 @@ +diff -ru langdrill-0.3-orig/src/Makefile langdrill-0.3/src/Makefile +--- langdrill-0.3-orig/src/Makefile 2006-03-14 23:46:31.000000000 -0800 ++++ langdrill-0.3/src/Makefile 2006-03-14 23:48:17.000000000 -0800 +@@ -16,7 +16,7 @@ + DEF_FLAGS = -DTARGET='"$(TARGET)"' \ + -DDRILL_DEF='"$(DRILL_DEF)"' \ + -DDRILL_DIR='"$(DRILL_DIR)"' \ +- -I /usr/include/gtk-2.0/ ++ `pkg-config --cflags gtk+-2.0` + + ###### Test for Debian GNU/Linux + # If your system is not Debian GNU/Linux please modify the values after +@@ -37,7 +37,7 @@ + endif + + CC = g++ +-LFLAGS = `vdk-config-2 --libs` ++LFLAGS = `vdk-config-2 --libs` `pkg-config --libs gtk+-2.0` + + + ####### Implicit rules diff --git a/misc/langdrill/010_cxx_standard.diff b/misc/langdrill/010_cxx_standard.diff new file mode 100644 index 0000000000..1a22aaddcc --- /dev/null +++ b/misc/langdrill/010_cxx_standard.diff @@ -0,0 +1,33 @@ +--- langdrill-0.3.orig/src/config.hh ++++ langdrill-0.3/src/config.hh +@@ -31,7 +31,7 @@ + + #include <stdio.h> + #include <string.h> +-#include <fstream.h> ++#include <fstream> + #include <stdlib.h> + #include <vdk/dlist.h> + +--- langdrill-0.3.orig/src/main.hh ++++ langdrill-0.3/src/main.hh +@@ -29,7 +29,7 @@ + #ifndef __main_hh__ + #define __main_hh__ + +-#include <fstream.h> ++#include <fstream> + #include <unistd.h> + #include <time.h> + +--- langdrill-0.3.orig/src/config.cc ++++ langdrill-0.3/src/config.cc +@@ -347,7 +347,7 @@ + char message[MAX_CHARS_FOR_MESSAGE]; + iconv_t direct = (iconv_t)-1, reverse = (iconv_t)-1; + +- ifstream in(_name); ++ std::ifstream in(_name); + while(1){ + in.getline(buff,MAX_CHARS_FOR_STRING); + lineNr++; diff --git a/misc/langdrill/010_min_max.diff b/misc/langdrill/010_min_max.diff new file mode 100644 index 0000000000..a55f3f7101 --- /dev/null +++ b/misc/langdrill/010_min_max.diff @@ -0,0 +1,21 @@ +The minimum and maximum operators were never terribly portable and have +been dropped by GCC 4.2. +Index: langdrill-0.3/src/main.cc +=================================================================== +--- langdrill-0.3.orig/src/main.cc 2007-07-15 12:52:38.000000000 +0100 ++++ langdrill-0.3/src/main.cc 2007-07-15 12:54:01.000000000 +0100 +@@ -460,9 +460,11 @@ + // keys. In such a case, we must take some precations + setActiveButtons( keyTotalNr ); + +- // is this minimum operator portable ?? +- // it should work with egcs at least !! +- int cols = keyTotalNr <? atoi(_setup.quizzAnswerNr); ++ int cols; ++ if (keyTotalNr < atoi(_setup.quizzAnswerNr)) ++ cols = keyTotalNr; ++ else ++ cols = atoi(_setup.quizzAnswerNr); + + int rows = keyTotalNr; + int *set = new int[cols]; diff --git a/misc/langdrill/010_vdk_updates.diff b/misc/langdrill/010_vdk_updates.diff new file mode 100644 index 0000000000..447054e370 --- /dev/null +++ b/misc/langdrill/010_vdk_updates.diff @@ -0,0 +1,61 @@ +--- langdrill-0.3.orig/src/main.cc ++++ langdrill-0.3/src/main.cc +@@ -962,17 +962,17 @@ + MyLangForm::AboutClicked( VDKObject*) + { + Application()-> +- MessageBox( " Let's talk about Language Drills", +- " Brought to you by\n" +- " Ionutz Borcoman\n" +- " <borco@usa.net>\n" +- " <borco@borco-ei.eng.hokudai.ac.jp>\n" +- " \n" +- " Nothing would have been possible without\n" +- " Mario Motta's VDK\n" +- " <mmotta@guest.net>" +- "\n", +- MB_OK | MB_ICONINFORMATION ) ; ++ VDKMessageBox( " Let's talk about Language Drills", ++ " Brought to you by\n" ++ " Ionutz Borcoman\n" ++ " <borco@usa.net>\n" ++ " <borco@borco-ei.eng.hokudai.ac.jp>\n" ++ " \n" ++ " Nothing would have been possible without\n" ++ " Mario Motta's VDK\n" ++ " <mmotta@guest.net>" ++ "\n", ++ VDK_OK | VDK_ICONINFORMATION ) ; + return true; + } + +@@ -985,12 +985,12 @@ + if( _timerRunning==true + || _timerCheck->Checked==true ){ + bool answ = ( Application()-> +- MessageBox("Language Drill Message", +- " Are you sure you want to close \n" +- " the Language Drills ?\n" +- " The Timer seems to be active !", +- MB_YESNO) +- == IDYES ); ++ VDKMessageBox("Language Drill Message", ++ " Are you sure you want to close \n" ++ " the Language Drills ?\n" ++ " The Timer seems to be active !", ++ VDK_YESNO) ++ == VDK_IDYES ); + if( answ == false ){ + return true; + } else { +@@ -1052,8 +1052,9 @@ + gtk_signal_emit_stop_by_name( GTK_OBJECT(_simpleQuizzText->WrappedWidget()), + "key_press_event"); + QuizzAnswerClicked( obj ); ++ return true; + } +- return true; ++ return false; + } + + diff --git a/misc/langdrill/020_documentation.diff b/misc/langdrill/020_documentation.diff new file mode 100644 index 0000000000..0bc5bc4495 --- /dev/null +++ b/misc/langdrill/020_documentation.diff @@ -0,0 +1,15 @@ +--- langdrill-0.3.orig/README ++++ langdrill-0.3/README +@@ -1,9 +1,9 @@ + This is langrill, a language drill program. It is used to test your +-vocabulary in foreign languages. It has some Japanese support included. ++vocabulary in foreign languages. It has Japanese support included. + +-http://borco-ei.eng.hokudai.ac.jp/~borco/vdk/langdrill.html ++http://storm.prohosting.com/borco/programming/langdrill.html + +-Mail suggestions and bug reports to borco@borco-ei.eng.hokudai.ac.jp. ++Mail suggestions and bug reports to Ionutz Borcoman <borco@go.ro>. + + This program is inspired from JavaDrill. However no code from JavaDrill + was used. JavaDrill can be found at: diff --git a/misc/langdrill/030_french_utf8.diff b/misc/langdrill/030_french_utf8.diff new file mode 100644 index 0000000000..5d71d72f4e --- /dev/null +++ b/misc/langdrill/030_french_utf8.diff @@ -0,0 +1,40 @@ +--- langdrill-0.3.orig/src/french.drill ++++ langdrill-0.3/src/french.drill +@@ -2,9 +2,6 @@ + sense=0 + directSenseName=French + reverseSenseName=English +-# UTF-8 is the default encoding +-directEncoding=ISO-8859-1 +-reverseEncoding=UTF-8 + quizzAnswerNr=8 + hQuizz=40 + wQuizz=300 +@@ -24,7 +21,7 @@ + useTimer=1 + + [Numbers] +-z้ro=zero ++zรฉro=zero + un=one + deux=two + trois=three +@@ -95,15 +92,15 @@ + [Time: Months] + + janvier=January +-f้vrier=February ++fรฉvrier=February + mars=March + avril=April + mai=May + juin=June + juillet=July +-ao๛t=August ++aoรปt=August + septembre=September + octobre=October + novembre=November +-d้cembre=December ++dรฉcembre=December + diff --git a/misc/langdrill/030_japanese.diff b/misc/langdrill/030_japanese.diff new file mode 100644 index 0000000000..8555a43fb0 --- /dev/null +++ b/misc/langdrill/030_japanese.diff @@ -0,0 +1,1126 @@ +--- langdrill-0.3.orig/src/Makefile ++++ langdrill-0.3/src/Makefile +@@ -11,7 +11,7 @@ + MAN_PAGE = ../docs/langdrill.1 + + DRILL_DEF = default.drill +-DRILL_SUP = romaji.drill french.drill ++DRILL_SUP = japanese.drill romaji.drill french.drill + + DEF_FLAGS = -DTARGET='"$(TARGET)"' \ + -DDRILL_DEF='"$(DRILL_DEF)"' \ +@@ -76,6 +76,6 @@ + install: all + install -d $(BIN_DIR) $(DRILL_DIR) $(MAN_DIR) + install ./$(TARGET) $(BIN_DIR) +- install -m644 $(DRILL_DEF) $(DRILL_DIR) +- install -m644 $(MAN_PAGE) $(MAN_DIR) + install -m644 $(DRILL_SUP) $(DRILL_DIR) ++ ln -sf japanese.drill $(DRILL_DIR)/$(DRILL_DEF) ++ install -m644 $(MAN_PAGE) $(MAN_DIR) +--- langdrill-0.3.orig/src/japanese.drill ++++ langdrill-0.3/src/japanese.drill +@@ -0,0 +1,1103 @@ ++[Application] ++sense=0 ++directSenseName=Japanese ++reverseSenseName=English ++quizzAnswerNr=8 ++hQuizz=40 ++wQuizz=300 ++# the timer value is given in minutes. ++# it represents the time between the automatical ++# activation of the langdrill. ++timer=10 ++# use this to set how many good answers the langdrill ++# waits till hides by itself. limitedAnswer must be 1 ++# for this to take effect ++limitedAnswerNr=25 ++limitedAnswers=1 ++ ++# set to 1 if you want the window to be hidden when you ++# try to close it and the useTimer is 1 ++hideWindow=0 ++useTimer=1 ++ ++[Hiragana] ++ใ=a ++ใ=i ++ใ=u ++ใ=e ++ใ=o ++ ++ใ=ka ++ใ=ki ++ใ=ku ++ใ=ke ++ใ=ko ++ ++ใ=sa ++ใ=shi ++ใ=su ++ใ=se ++ใ=so ++ ++ใ=ta ++ใก=chi ++ใค=tsu ++ใฆ=te ++ใจ=to ++ ++ใช=na ++ใซ=ni ++ใฌ=nu ++ใญ=ne ++ใฎ=no ++ ++ใฏ=ha ++ใฒ=hi ++ใต=fu ++ใธ=he ++ใป=ho ++ ++ใพ=ma ++ใฟ=mi ++ใ=mu ++ใ=me ++ใ=mo ++ ++ใ=ya ++ใ=yu ++ใ=yo ++ ++ใ=ra ++ใ=ri ++ใ=ru ++ใ=re ++ใ=ro ++ ++ใ=wa ++ใ=o (wo) ++ ++ใ=n ++ ++[Katakana] ++ใข=A ++ใค=I ++ใฆ=U ++ใจ=E ++ใช=O ++ ++ใซ=KA ++ใญ=KI ++ใฏ=KU ++ใฑ=KE ++ใณ=KO ++ ++ใต=SA ++ใท=SHI ++ใน=SU ++ใป=SE ++ใฝ=SO ++ ++ใฟ=TA ++ใ=CHI ++ใ=TSU ++ใ=TE ++ใ=TO ++ ++ใ=NA ++ใ=NI ++ใ=NU ++ใ=NE ++ใ=NO ++ ++ใ=HA ++ใ=HI ++ใ=FU ++ใ=HE ++ใ=HO ++ ++ใ=MA ++ใ=MI ++ใ =MU ++ใก=ME ++ใข=MO ++ ++ใค=YA ++ใฆ=YU ++ใจ=YO ++ ++ใฉ=RA ++ใช=RI ++ใซ=RU ++ใฌ=RE ++ใญ=RO ++ ++ใฏ=WA ++ใฒ=O ++ ++ใณ=N ++ ++[Numbers] ++ใใ=0 ++ใใก=1 ++ใซ=2 ++ใใ=3 ++ใ / ใใ=4 ++ใ=5 ++ใใ=6 ++ใใก / ใชใช=7 ++ใฏใก=8 ++ใ / ใใ
ใ=9 ++ใใ
ใ=10 ++ใใ
ใใใก=11 ++ใใ
ใใซ=12 ++ใใ
ใใใ=13 ++ใใ
ใใใ=14 ++ใใ
ใใ=15 ++ใใ
ใใใ=16 ++ใใ
ใใชใช=17 ++ใใ
ใใฏใก=18 ++ใใ
ใใใ
ใ=19 ++ใซใใ
ใ=20 ++ใซใใ
ใใใก=21 ++ใซใใ
ใใซ=22 ++ใซใซใใ
ใใใ=23 ++ใซใใ
ใใใ=24 ++ใซใใ
ใใ=25 ++ใซใใ
ใใใ=26 ++ใซใใ
ใใชใช=27 ++ใซใใ
ใใฏใก=28 ++ใซใใ
ใใใ
ใ=29 ++ใใใใ
ใ=30 ++ใใใใ
ใใใก=31 ++ใใใใ
ใใซ=32 ++ใใใใ
ใใใ=33 ++ใใใใ
ใใใ=34 ++ใใใใ
ใใ=35 ++ใใใใ
ใใใ=36 ++ใใใใ
ใใชใช=37 ++ใใใใ
ใใฏใก=38 ++ใใใใ
ใใใ
ใ=39 ++ใใใใ
ใ=40 ++ใใใ
ใ=50 ++ใใใใ
ใ=60 ++ใชใชใใ
ใ=70 ++ใฏใกใใ
ใ=80 ++ใใ
ใใใ
ใ=90 ++ใฒใใ=100 ++ใซใฒใใ=200 ++ใใใณใใ=300 ++ใใใฒใใ=400 ++ใใฒใใ=500 ++ใใฃใดใใ=600 ++ใชใชใฒใใ=700 ++ใฏใฃใดใใ=800 ++ใใ
ใใฒใใ=900 ++ใใ=1000 ++ใซใใ=2000 ++ใใใใ=3000 ++ใใใใ=4000 ++ใใใ=5000 ++ใใใใ=6000 ++ใชใชใใ=7000 ++ใฏใฃใใ=8000 ++ใใ
ใใใ=9000 ++ใฒใใใพใ=10000 ++ ++ ++[Time: Days of the week] ++ ++ใใคใใใณ ๏ผปๆๆๆฅ๏ผฝ=Monday ++ใใใใณ ๏ผป็ซๆๆฅ๏ผฝ=Tuesday ++ใใใใใณ ๏ผปๆฐดๆๆฅ๏ผฝ=Wednesday ++ใใใใใณ ๏ผปๆจๆๆฅ๏ผฝ=Thursday ++ใใใใใณ ๏ผป้ๆๆฅ๏ผฝ=Friday ++ใฉใใใณ ๏ผปๅๆๆฅ๏ผฝ=Saturday ++ใซใกใใใณ ๏ผปๆฅๆๆฅ๏ผฝ=Sunday ++ใชใใใใณ=What day of the week ++ๆฅ ๏ผใฒ๏ผ=sun; sunshine; day ++ๆๆฅ ๏ผใใใณ๏ผ=day of the week ++ ++ ++[Time: Days of the month] ++ ++ใคใใใก=first day of the month ++ใตใคใ=second, two days ++ใฟใฃใ=third, three days ++ใใฃใ=fourth, four days ++ใใคใ=fifth, five days ++ใใใ=sixth, six days ++ใชใฎใ=seventh, seven days ++ใใใ=eight, eight days ++ใใใฎใ=ninth, nine days ++ใจใใ=tenth, ten days ++ใใ
ใใใฃใ=fourteenth, forteen days ++ใฏใคใ=twentieth, twenty days ++ใซใใ
ใใใฃใ=twenty fourth, twenty four days ++ใผใซใก=-th day of the month, -days ++ใชใใซใก=which day of the month, how many days ++ ++ ++[Time: General] ++ ++ใใค=when ++ ++ใใพ=now ++ใผใ=- o'clock ++ใผใตใ๏ผใผใทใ๏ผ=- minutes ++ใฏใ=half past ++ใชใใ=what time ++ใชใใทใ=how many minutes ++ ++ใใใ=a.m., morning ++ใใ=p.m., afternoon ++ ++ใใ=morning ++ใฒใ=day time, noon ++ใฐใ๏ผใใ๏ผ=night, evening ++ ++ใใจใจใ=the day before yesterday ++ใใฎใ=yesterday ++ใใใ=today ++ใใใ=tomorrow ++ใใใฃใฆ=the day after tomorrow ++ ++ใใ=this morning ++ใใใฐใ=tonight ++ ++ใพใใใ=every morning ++ใพใใฐใ=every night ++ใพใใซใก=every day ++ ++ใใใ=from ~ ++ใใพใง=up to ~, untill ~ ++ ++ใผใใค=-th month of the year ++ใชใใใค=what month ++ ++ใใใใ
ใ=last week ++ใใใใ
ใ=this week ++ใใใใ
ใ=next week ++ ++ใใใใค=last month ++ใใใใค=this month ++ใใใใค=next month ++ ++ใใใญใ=last year ++ใใจใ=this year ++ใใใญใ=next year ++ ++ใใใ=~ times ++ ++ใใกใซใก๏ผ๏ผโใซใก๏ผ=one day (as a period of time) ++ใใใใ=~ hour (s) ++ใใใ
ใใใ=~ week (s) ++ใใใใค=~ month (s) ++ใใญใ=~ year (s) ++ใฉใฎใใใ=how long, how many ++ใใใใ=about ~ (referring to an amount or period of time) ++ ++ใใใใ=and, then (the next thing), furthermore ++ ++ใฒใพ๏ผปใช๏ผฝ=free time ++ ++[Words: Lesson 1] ++ ++ใใใ=I ++ใใใใใก=we ++ใใชใ=you ++ใใฎใฒใจ=that person, he, she ++ใฟใชใใ=ladies and gentlemen, all of you ++ ++ใใใใ=teacher, instructor ++ใใใใ
ใใใ=trainee ++ใใใ=Mr. Mrs. Miss ++ ++ใ ใใใฉใชใ=who ++ ++ใฏใ=yes ++ใใใ=no ++ ++ใงใใ=electricity, electric light ++ใใใ=machinery ++ใใฉใใใ=automobile, car ++ใณใณใใฅใผใฟใผ=computer ++ ++ใใใใ=speciality, specialization of study ++ ++โใใ=~ years old ++ ++ใชใใใใใใใใค=how old ++ ++ใซใปใ=Japan ++ใคใณใ=India ++ใคใณใใใทใข=Indonesia ++ใใใใ=Korea ++ใกใ
ใใใ=China ++ใใฃใชใใณ=Philippines ++ใฟใค=Thailand ++ใใฌใผใทใข=Malaysia ++ ++ใใใ=a national of ~ ++ ++ใใฏใใใใใพใใ=Good morning. ++ใฏใใใพใใฆใ=How do you do ? ++ใฉใใใใใใใ=Nice to meet you. ++ ++ ++[Words: Lesson 2] ++ ++ใใ=this (thing here) ++ใใ=that (thing near you) ++ใใ=that (thing over there) ++ ++ใใฎใ=this ~ (here) ++ใใฎใ=that ~ (near you) ++ใใฎใ=that ~ (over you) ++ ++ใปใ=book ++ใใฃใ=magazine ++ใใใ=dictionary ++ใใผใ=notebook ++ใใฟ=paper ++ใใใถใ=newspaper ++ใฆใใฟ=letter ++ใใใดใค=pencil ++ใใผใซใใณ=ballpoint pen ++ใทใฃใผใใใณใทใซ=propelling pencil ++ ++ใใฐใ=tabacco, cigarette ++ใใใ=match ++ใฉใคใฟใผ=(chigarette) lighter ++ใฏใใใ=ashtray ++ใใ=key ++ใจใใ=watch, clock ++ใใฐใ=bag, briefcase ++ใฏใ=box ++ใใผใใฌใณใผใใผ=tape recorder ++ใงใใ=telephone ++ใใ=chair ++ใคใใ=desk ++ใพใฉ=window ++ใใข=door ++ ++ใฉใธใช=radio ++ใใฌใ=television ++ใซใกใฉ=camera ++ ++ใชใ=what ++ใใ=so ++ ++ใใญใใใใพใใ=Please. (when asking for a favour) ++ใฉใใใ=Please. Here you are. (when offering something) ++ ++๏ผปใฉใใ๏ผฝใใใใจใใใใพใใ=Thank you [very much]. ++ใ=Oh ! Ah ! (when suddenly remembering or noticing something) ++ใกใใฃใจ=a little, for a moment ++ใพใฃใฆใใ ใใใ=Please wait. ++ใกใใใพใใ=No, it isn't. You are wrong. ++ ++ ++[Words: Lesson 3] ++ ++ใใ=here, this place ++ใใ=there, that place near you ++ใใใ=that place over you ++ใฉใ=where ++ ++ใใกใ=this way, polite of "koko" ++ใใกใ=that way, polite of "soko" ++ใใกใ=that way, polite of "asoko" ++ใฉใกใ=which way, polite of "doko" ++ ++ใใใใใค=classroom ++ใใใใฉใ=dining hall, canteen ++ใใฆใใใ๏ผใใคใฌ๏ผ=toilet ++ใญใใผ=lobby ++ใใใคใ=reception desk ++ใใใใ=office ++ใธใ=room ++ใซใ=garden ++๏ผปใใใใ
ใ๏ผฝใปใณใฟใผ=the center [for trainees] ++ใจใฌใใผใฟใผ=elevator, lift ++ ++ใใก=house ++ใใใใ=company ++ใใซ=country ++ ++ใใใฐ=counter, department (in a department store) ++ ++ใผใใ=-th floor ++ ++ใผใใ=-yen ++ใใใ=how much ++ ++ใฒใใ=a hundred ++ใใ=a thousand ++ใผใพใ=ten thousand ++ ++ใขใกใชใซ=the United States ++ใคใฎใชใน=Britain, the United Kingdom ++ ++๏ผปใกใใฃใจ๏ผฝใใฟใพใใใ=Excuse me. ++ใฉใใ=Thank you. (alone expresses casual thanks) ++ใใใฃใใใ๏ผปใพใ๏ผฝใ=Welcome. May I help you ? (greeting to a customer or a guest) ++ใใใ=Well. O.K. ++๏ผปใใ๏ผฝใใใ ใใใ=Please give me [this]. ++ ++[Words: Lesson 4] ++ ++ใใใพใ=get up ++ใญใพใ=sleep, go to bed ++ใฏใใใใพใ=work ++ใใใฟใพใ=take a rest, take a holiday ++ในใใใใใใพใ=study ++ใใใใพใ=finish ++ ++ใใพ=now ++ใผใ=- o'clock ++ใผใตใ๏ผใผใทใ๏ผ=- minutes ++ใฏใ=half past ++ใชใใ=what time ++ใชใใทใ=how many minutes ++ ++ใใใ=a.m., morning ++ใใ=p.m., afternoon ++ ++ใใ=morning ++ใฒใ=day time, noon ++ใฐใ๏ผใใ๏ผ=night, evening ++ ++ใใจใจใ=the day before yesterday ++ใใฎใ=yesterday ++ใใใ=today ++ใใใ=tomorrow ++ใใใฃใฆ=the day after tomorrow ++ ++ใใ=this morning ++ใใใฐใ=tonight ++ ++ใพใใใ=every morning ++ใพใใฐใ=every night ++ใพใใซใก=every day ++ ++ใซใปใใ=the Japanese language ++ในใใใใ=study (noun) ++ใใใ=lecture ++ใใใใ=(factory) visit for study and observation ++ ++ใใใ=from ~ ++ใใพใง=up to ~, untill ~ ++ ++ใใคใใใณ=Monday ++ใใใใณ=Tuesday ++ใใใใใณ=Wednesday ++ใใใใใณ=Thursday ++ใใใใใณ=Friday ++ใฉใใใณ=Saturday ++ใซใกใใใณ=Sunday ++ใชใใใใณ=What day of the week ++ ++ใใใงใใใ=I see. (When making agreeable response) ++ใใใธใใงใใญใ=It must be hard for you (When expressing appreciation or sympathy) ++ ++ ++[Words: Lesson 5] ++ ++ใใใพใ=go ++ใใพใ=come ++ใใใใพใ=go home, return (vb.I) ++ ++ใใใใใ=factory ++ใใ=railway station ++ใใใใ=bank ++ใณใใใใ=hospital ++ใใใผใ=department store ++ในใผใใผ=supermarket ++ใปใใ=bookshop ++ใใ=~ store ++ ++ใผใใค=-th month of the year ++ใชใใใค=what month ++ ++ใคใใใก=first day of the month ++ใตใคใ=second, two days ++ใฟใฃใ=third, three days ++ใใฃใ=fourth, four days ++ใใคใ=fifth, five days ++ใใใ=sixth, six days ++ใชใฎใ=seventh, seven days ++ใใใ=eight, eight days ++ใใใฎใ=ninth, nine days ++ใจใใ=tenth, ten days ++ใใ
ใใใฃใ=fourteenth, forteen days ++ใฏใคใ=twentieth, twenty days ++ใซใใ
ใใใฃใ=twenty fourth, twenty four days ++ใผใซใก=-th day of the month, -days ++ใชใใซใก=which day of the month, how many days ++ใใค=when ++ ++ใใใใ
ใ=last week ++ใใใใ
ใ=this week ++ใใใใ
ใ=next week ++ ++ใใใใค=last month ++ใใใใค=this month ++ใใใใค=next month ++ ++ใใใญใ=last year ++ใใจใ=this year ++ใใใญใ=next year ++ ++ใฒใใใ=aircraft ++ใตใญ=ship ++ใงใใใ=electric train ++ใใน=bus ++ใฟใฏใทใผ=taxi ++ใกใใฆใค=subway ++ใใใใใใ=the Shinkansen, the bullet train ++ใใใใฆ=on foot ++ ++ใฒใจ=person ++ใจใใ ใก=friend ++ใใใณใจ=sweethart ++ใฒใจใใง=alone ++ ++ใผใฐใใใ=platform -, -th platform ++ ++ ++[Words: Lesson 6] ++ใในใพใ=eat ++ใฎใฟใพใ=drink ++ใใใพใ๏ผปใใฐใใใ๏ผฝ=smoke [a cigarette] ++ใใใพใ=write, draw, paint ++ใใฟใพใ=read ++ใใใพใ=listen ++ใฟใพใ=see, look at, watch ++ใใใพใ=buy ++ใจใใพใ๏ผปใใใใใใ๏ผฝ=take [a photograph] ++ใใฃใใ
ใใใพใ=do practical thing ++ใใพใ๏ผปใใณใใณใใ๏ผฝ=play [table tennis] ++ใใพใ=do ++ใใใพใ๏ผปใใจใใ ใกใซใ๏ผฝ=meet [a friend] ++ ++ใใฏใ=a meal, cooked rice ++ใใใใฏใ=breakfast ++ใฒใใใฏใ=lunch ++ใฐใใใฏใ=supper ++ใใณ=bread ++ใใพใ=egg ++ใซใ=meat ++ใใใช=fish ++ใใใ=vegetable ++ใใใ=apple ++ ++ใใ
ใใซใ
ใ๏ผใใซใฏ๏ผ=milk ++ใใกใ=green tea ++ใณใผใใผ=coffee ++ใใใกใ=black tea ++ใธใฅใผใน=juice ++ใใผใซ=beer ++๏ผปใใผ๏ผฝใใ=alcohol, Japanese rice wine ++ใฟใ=water ++ ++ใใฏใฟใค=necktie ++ใทใฃใ=shirt ++ใใค=shoes ++ใใผใ๏ผใซใปใใใใผใ๏ผ=(cassette) tape ++ใใฃใซใ =film ++ใใใใ=photograph ++ใใใ=movie ++ใใณใใณ=table-tennis ++ ++ใชใซ=what ++ ++ใใฃใใใซ=together ++ ++ใใใใ=after that, and than ++ ++ใใจใ=and (conjunction used only with nouns) ++ ++ใใใใ=Hello. (on the telephone) ++ ++๏ผปใใใ๏ผฝใฒใพใงใใ.=Are you free [tomorrow] ? ++ใใ=Yes ++ใใใงใใญใ=That's good. ++ใใใใพใใใ=I see. O.K. ++ใพใใใใใ=See you tomorrow. ++ ++ ++[Words: Lesson 7] ++ ++ใใใพใ=cut ++ใใ
ใใใใพใ=repair ++ใใใพใ๏ผปใงใใใใ๏ผฝ=make a phone call ++ ++;; give && receive verbs ++ใใใใพใ=receives ++ใใใพใ=gives ++ ++ใใใพใ=lends ++ใใใพใ=borrows ++ ++ใชใใใพใ=learns ++ใใใใพใ=teaches ++ ++ใฏใ=chopsticks ++ใใคใ=knife ++ใใฉใผใฏ=fork ++ในใใผใณ=spoon ++ ++ใฏใใฟ=scissors ++ใใฉใคใใผ=screwdriver ++ในใใ=spanner, wrench ++ใใณใ=cutting pliers ++ ++ใใใญ=money ++ใใฌใผใณใ=present, gift ++ใฌใใผใ=report ++ ++ใใใ=family ++ใใจใใใ=father ++ใใใใใ=mother ++ใใซใใใ=elder brother ++ใใญใใใ=elder sister ++ใใจใใจ=young brother ++ใใใใจ=young sister ++ใใใใ=(someone's else) wife ++ใใชใ=(one's own) wife ++ใใ
ใใ=(one's own) husband ++ใใใ
ใใ=(someone's else) husband ++ใใฉใ=child ++ ++ใใใ=the English language ++ใใ=~language ++ ++ใใ=already ++ใพใ =not yet ++ ++ใใใใ=Soon, from now on. ++ ++ใใใงใจใใใใใพใใ=Congratulations. (birthday, New Year's Day, ...) ++ใใ=wow, oh ! (expression of surprise) ++ใฉใใใใใพใใฆใ=Never mind. Not at all. You're welcome. ++ใใ๏ผปใทใฃใ๏ผฝใงใใญใ=It's a nice [shirt], isn't it. ++ ++ ++[Words: Lesson 8] ++ ++ใใใ๏ผใช๏ผ=beautiful, clean ++ใใณใตใ ๏ผใช๏ผ=handsome ++ใใใใค๏ผใช๏ผ=kind ++ใใใ๏ผใช๏ผ=famous ++ใใใ๏ผใช๏ผ=healthy, sound, cheerful ++ใใใ๏ผใช๏ผ=quiet ++ใซใใใ๏ผใช๏ผ=lively ++ ++ใใใใ=big, large ++ใกใใใ=small, little ++ใใใใใ=new ++ใตใใ=old (not of age) ++ใใ๏ผใใ๏ผ=good ++ใใใ=bad ++ใใคใ=hot ++ใใใ=cold, chilly (weather) ++ใคใใใ=cold (temperature) ++ใใใใใ=difficult ++ใใใใ=easy ++ใใใ=expensive; tall, high ++ใใใ=cheap ++ใฒใใ=low ++ใใใใใ=interesting ++ใใใใ=tasty, delicious ++ ++ใใใ=white ++ใใใ=black ++ใใใ=red ++ใใใ=blue ++ ++ใใใ=examination ++ใใ
ใใ ใ=homework ++ใในใใฎ=food ++ใใใ=cherry blossom ++ใฏใช=flower ++ใพใก=town ++ใใพ=mountain ++ใตใใใ=Mt. Fuji ++ใจใใ=place ++ ++ใฉใ=how ++ใฉใใชใ=what kind of ~ ++ใฉใ=which one ++ ++ใใใธใ=very ++ใใพใ=not so ~ (used in a negative sentence) ++ ++ใใใฆ=and (connecting sentences) ++ ++ใใใใ=~, but ~ ++ ++ใใ=Hi! (used by males, this is a casual greeting) ++ ++ใใฐใใใงใใญใ=Long time no see. ++ใใใใใงใใใ=How are you? ++ใฉใใใใกใใธใ=this way, please. ++๏ผใณใผใใผ๏ผใฏใใใใงใใใ=Won't you have (a cup of coffee)? ++ใใใ ใใพใใ=Thank you. I accept. (customarily said before a meal) ++ใใกใใใใพ๏ผใงใใ๏ผใ=That was delicious. ++ใใใงใใญใ=Well let me see. (pausing) ++ ++ ++[Words: Lesson 9] ++ ++ใใใใพใ=understand ++ใใใพใ=have ++ ++ใใ๏ผใช๏ผ=like ++ใใใ๏ผใช๏ผ=dislike ++ใใใใ๏ผใช๏ผ=good at ++ใธใ๏ผใช๏ผ=poor at ++ ++ใฒใใใช=Hiragana script ++ใใใใช=Katakana Script ++ใญใผใใ=The Roman alphabet ++ใใใ=Chinese characters ++ ++ใใใใ=dish (cooked food), cooking ++ใใ ใใฎ=fruit ++ใฎใฟใพใ=drinks ++ใถใใซใ=pork ++ใจใใซใ=chicken ++ใใ
ใใซใ=beef ++ใฟใใ=orange ++ใใใ=banana ++ ++ใใใใ=music ++ใใ=song ++ใใณใน=dance ++ใฎใฟใผ=guitar ++ในใใผใ=sport ++ใตใใซใผ=soccer ++ใใใน=tennis ++ ++ใใใ=time ++ ++ใใใใ=many, much ++ใใใ=a little, few ++ใใ=well ++ใ ใใใ=almost, roughly ++ใใใใ=not at all (used in negative sentence) ++ ++ใใกใใ=of course ++ ++ใฉใใฆ=why ++ใใใ=because ~ ++ ++ใณใใใ=illness ++ใใใ=medicine ++ใใใพ=head ++ใใชใ=stomach ++ใใใ๏ผใใใพใใ๏ผ=have a (stomach) ache ++ใญใคใใใใพใ=have a fever ++ใใใใฒใใ
ใพใใ=have caught a cold ++ใใใฟใพใ๏ผใใใใใใ๏ผ=take a day off (from the company) ++ ++ใชใใงใใใ=May I help you? ++ใใฟใพใใใใExcuse me, but when ~ ++ใฉใใใพใใใใ=What's the matter (with you)? ++ ++ ++[Words: Lesson 10] ++ ++ใใพใ=exist, be (living things) ++ใใใพใ=exist, be (inanimate things) ++ ++ใใใใ๏ผปใช๏ผฝ=various ++ ++ใใ=on, above ++ใใ=under, below, beneath ++ใพใ=front ++ใใใ=back, behind ++ใฟใ=right (side) ++ใฒใ ใ=left (side) ++ใชใ=in, inside ++ใใจ=outside ++ใจใชใ=next (door) ++ใใใ =between, among ++ใกใใ=near ++ ++ใใฎ=thing ++ใกใ=map ++ใใใดใ =eraser ++ใปใญใใผใ=sellotape, clear adhesive tape ++ใใใใญใน=stapler ++ใในใใผใ=passport ++ใใใ=bed ++ ++ใใจใใฎใฒใจ=man ++ใใใชใฎใฒใจ=woman ++ใใจใใฎใ=boy ++ใใใชใฎใ=girl ++ ++ใฌในใใฉใณ=restaurant ++ใใใใ=park ++ใใใใใ=embassy ++ใใใณใใใใ=post office ++ใในใ=post box ++ใใฃใใ=school ++ ++ใใใ= ~ and ~ and so on ++ ++ใใฎใ=Excuse me, but (used when talking to someone with hesitation) ++ใใฃใฆใพใใใพใใ=I'm going to leave now. ++ใใฃใฆใใใฃใใใใ=I hope you have a pleasant trip. Have a good time. ++ ++ ++[Words: Lesson 11] ++ ++ใใพใใ๏ผปใใฉใใใ๏ผฝ=have [a child] ++ใใพใใ๏ผปใซใปใใซใ๏ผฝ=stay, be [in Japan] ++ใใใใพใ=take (referring to time) ++ ++ใฒใจใค=one (when counting things) ++ใตใใค=two (when counting things) ++ใฟใฃใค=three (when counting things) ++ใใฃใค=four (when counting things) ++ใใคใค=five (when counting things) ++ใใฃใค=six (when counting things) ++ใชใชใค=seven (when counting things) ++ใใฃใค=eight (when counting things) ++ใใใฎใค=nine (when counting things) ++ใจใ=ten (when counting things) ++ใใใค=how many (when counting things) ++ ++ใฒใจใ=one person ++ใตใใ=two persons ++ใใซใ=~ people ++ ++ใใ ใ=(counter for machines, cars, ...) ++ใใพใ=(counter for paper, stamps, ...) ++ใใใ=~ times ++ ++ใใใใ ใ=brothers and sisters ++ ++ใใฃใท=ticket ++ใตใใจใ=envelope ++ใใฃใฆ=postage stamp ++ใจใขใกใผใซ=airmail ++ใซใใค=baggage, parcel ++ ++ใใกใซใก๏ผ๏ผโใซใก๏ผ=one day (as a period of time) ++ใใใใ=~ hour(s) ++ใใใ
ใใใ=~ week(s) ++ใใใใค=~ month(s) ++ใใญใ=~ year(s) ++ใฉใฎใใใ=how long, how many ++ใใใใ=about ~ (referring to an amount or period of time) ++ ++ใใใถใง=in total ++ ++ใใ ใ=only ~, exactly ++ ++ใใใใ=and, then (the next thing), furthermore ++ ++ ++[Words: Lesson 12] ++ ++ใฒใพ๏ผปใช๏ผฝ=free time ++ ++ใใใใใ=busy ++ใกใใ=near ++ใจใใ=far ++ใฏใใ=early, fast ++ใใใ=slow ++ใใใใ๏ผปใฒใจใใ๏ผฝ=many [people] ++ใใใชใใ๏ผปใฒใจใใ๏ผฝ=few [people] ++ใใใใใ=warm ++ใใใใ=cool ++ใใพใ=sweet ++ใใใ=hot (taste), spicy ++ใใฎใใ=enjoyable, pleasant ++ใใใ=young ++ใใใ๏ผปใณใผใใผใ๏ผฝ=prefer [coffee] ++ ++ใฆใใ=weather, fine weather ++ใใ=rain ++ใใ=snow ++ใใใ=cloudy ++ ++ใใใฟ=holiday, an absence ++ใใใใ=trip, tour ++ใใผใใฃใผ=party ++ใฟใ=store, shop ++ใฏใฉใน=a class (a group of students) ++ ++ใฉใกใ=which (from two) ++ใฉใกใใ=both ++ ++ใใกใฐใ=number one, the most ~ ++ใจใฆใ=very ++ใใฃใจ=far~, much ~ (comparing one thing with others) ++ ++ใงใ=but ++ ++ใใ ใใพใ=I'm home. (used by the one returning home) ++ใใใใใชใใใ=Welcome home ! (said to one just returned home) ++ใคใใใพใใใ=(I'm) tired. ++ ++ ++[Words: Lesson 13] ++ ++ใใใณใพใใ๏ผฉ๏ผใใใถใใใใใง๏ผ=enjoy oneself, play ++ใใใใพใ๏ผปใซใใคใใ๏ผฝ๏ผใใใใใใใฃใฆ๏ผ=send [baggage, parcel] ++ใใใพใใ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=change ++ใใฃใใใใพใใ๏ผฉ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=get married ++ใใใใฎใใพใใ๏ผฉ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=do shopping ++ใใใฝใใพใ๏ผปใใใใใใ๏ผฝใ๏ผฉ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=take a walk [in the park] ++ใใใถใคใใพใ๏ผปใพใกใใ๏ผฝใ๏ผฉ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=do sightseeing [in a town] ++ใใใใใใพใ๏ผปใใใใใใใ๏ผฝใ๏ผฉ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=visit [a factory] ++ใฏใใใพใ๏ผปใธใใซใ๏ผฝใ๏ผฉ๏ผใฏใใใใฏใใฃใฆ๏ผ=enter [the room] ++ใงใพใ๏ผปใธใใใ๏ผฝใ๏ผฉ๏ผฉ๏ผใงใใใงใฆ๏ผ=go out [of the room] ++ ++ใปใใ=want (something) ++ ++ใใใช=video cassette recorder, video tape ++ใฉใธใซใป=radio cassette tape recorder ++ในใใฌใช=stereo ++ใใใพ=vehicle ++ใใฟใใ=souvenir, present ++ ++ใใคใ=always ++ใจใใฉใ=sometimes ++ ++ใฉใใ=somewhere, some place ++ใชใซใ=something ++ ++ใใใฆใใใงใใญใ=Nice weather, isn't it ? ++ใใใงใใญใ=Yes, it is. I agree. ++ ++ใใชใใใใใพใใใ=(I'm) hungry. ++ใใชใใใใฃใฑใใงใใ=(I'm) full. ++ใฎใฉใใใใใพใใใ=(I'm) thirsty. ++ใใใใพใใใใ=Let's do that. (when agreeing with someone's suggestion) ++ ++ ++[Words: Lesson 14] ++ ++ใใณใพใ ๏ผฉ๏ผใใถใใใใง๏ผ=call ++ใใใใพใ ๏ผฉ๏ผใใใใใใใใง๏ผ=hurry ++ใพใกใพใ ๏ผฉ๏ผใพใคใใพใฃใฆ๏ผ=wait ++ใจใใพใ ๏ผฉ๏ผใจใใใจใฃใฆ๏ผ=take ++ใฆใคใ ใใพใใ๏ผฉ๏ผใฆใคใ ใใใฆใคใใฃใฆ๏ผ=help (with a task) ++ใใใพใใ๏ผฉ๏ผใใใใใฃใฆ๏ผ=say ++ใฏใชใใพใ ๏ผฉ๏ผใฏใชใใใฏใชใใฆ๏ผ=speak ++ใใผใใพใใ๏ผฉ๏ผฉ๏ผใใผใใใใใผใใฆ๏ผ=remember, memorize ++ใใใใพใใ๏ผฉ๏ผฉ๏ผใใใใใ ใใใใฆ๏ผ=tell, teach ++ใฟใใพใใ๏ผฉ๏ผฉ๏ผใฟใใใ ใฟใใฆ๏ผ=show ++ใตใใพใ๏ผปใใใใ๏ผฝใ๏ผฉ๏ผใตใใ ใตใใฆ๏ผ=rain ++ ++ใใจใฐ=word, language ++ใชใพใ=name ++ใใ
ใใใ=address ++ใงใใใฐใใใ=telephone number ++ใใ=salt ++ใใจใ=sugar ++ใใ=umbrella ++ ++ใฟใคใ=typewriter, typewriting ++ใฏใผใใญ=word processor ++ ++ใคใใใใ=method of use ++ใใใใ=method of writing ++ใใฟใใ=method of reading ++ ++ใใฃใใ=slowly ++ใใใใกใฉ=one more time, once more ++ใพใ=again, next time ++ใใใใใ=a little more ++ใฏใใ=fast, early ++ใใ=immediately ++ใใจใง=later ++ ++๏ผปใใใใฎ๏ผฝใฏใใใพใใใใ=Don't you have [a cheaper one] ? ++ใใกใใฏใใใใงใใใ=How about this ? ++ใใใ=how; in what way ++ใใใ๏ผ๏ผ๏ผ=Hmm ... (when wondering what to do) ++๏ผปใฉใใ๏ผฝใใฟใพใใใ=I'm [very] sorry. (an apology) ++ใพใใใพใใ=I'll come again. (can be used as an excuse when leaving a shop without buying anything) ++ ++ ++[Words: Lesson 15] ++ ++ใคใใใพใ ๏ผฉ๏ผใคใใใใคใใฃใฆ๏ผ=use ++ใคใใพใ ๏ผฉ๏ผฉ๏ผใคใใใใคใใฆ๏ผ=turn on (a light, ...) ++ใใใพใ ๏ผฉ๏ผใใใใใใฆ๏ผ=turn off (a light, ...) ++ใใใพใ ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=open ++ใใใพใ ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=shut ++ใใใใพใ๏ผปใใใซใ๏ผฝ ๏ผฉ๏ผใใใใใใใฃใฆ๏ผ=sit down [on a chair] ++ใใกใพใ ๏ผฉ๏ผใใคใใใฃใฆ๏ผ=stand up ++ใใใพใ ๏ผฉ๏ผใใใใใใฆ๏ผ=put ++ใคใใใพใ ๏ผฉ๏ผใคใใใใคใใฃใฆ๏ผ=make, produce ++ใใใพใ ๏ผฉ๏ผใใใ ใใฃใฆ๏ผ=sell ++ใใใพใ ๏ผฉ๏ผใใใใใฃใฆ๏ผ=get to know ++ใใกใพใ ๏ผฉ๏ผใใคใใใฃใฆ๏ผ=hold ++ใใฟใพใ ๏ผฉ๏ผใใใ ใใใง๏ผ=be going to live ++ ++ใใฃใฆใใพใ=know ++ใใฃใฆใใพใ=be holding, have ++ใใใงใใพใ๏ผปใจใใใใใซใผ๏ผฝ=live [in Tokyo] ++ ++ใใใใ=no smoking ++ ++ใใใฒใ=products ++ใใฃใใ=soaps ++ใฟใชใซ=towel ++ ++ใฉใใใ=single, unmaried ++ ++๏ผปใ๏ผฝใใใจ=work, business ++ใจใณใธใใข=engineer ++ใใใใใใ=company employee ++ใใใใใใ=bank employee ++ใใใใ=student ++ ++ใ ใใใ=university ++ ++ใใ ใฎ๏ผปใใใจ๏ผฝ=elder [elder sister] ++ใใ ใฎ๏ผปใใใจ๏ผฝ=younger [younger sister] ++ใใใใจใใ=(someone else's) younger sister ++ ++[Words: Lesson 17] ++ ++ใใใใพใ ๏ผฉ๏ผฉ๏ผใใใใใใใใใฆ๏ผ=forget ++ใชใใใพใ ๏ผฉ๏ผใชใใใใชใใใฆ๏ผ=lose ++ใใใฑใใใพใ ๏ผฉ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=worry ++ใ ใ ใคใใพใ ๏ผปใใใพใซใ๏ผฝ ๏ผฉ๏ผฉ๏ผใ ใ ใคใใใใ ใ ใคใใฆ๏ผ=pay attention to [a car] ++ใใใพใ ๏ผฉ๏ผฉ๏ผใใใใใใใฆ๏ผ=put in, insert ++ใ ใใพใ ๏ผฉ๏ผใ ใใใ ใใฆ๏ผ=take out, hand in ++ใจใใพใ ๏ผฉ๏ผฉ๏ผใจใใใใจใใฆ๏ผ=stop, park (a car) ++ใใใใพใ ๏ผฉ๏ผใใใใใใใใฆ๏ผ=give back ++ใฏใใใพใ ๏ผฉ๏ผใฏใใใใฏใใฃใฆ๏ผ=pay ++ใฌใใพใ ๏ผฉ๏ผใฌใใใฌใใง๏ผ=take off (clothes, shoes, etc.) ++ใใใใพใ ๏ผปใใใ ใซ ใ๏ผฝใ๏ผฉ๏ผใใใใใใใฃใฆ๏ผ=touch [a machine] ++ ++ใใใใค๏ผปใช๏ผฝ=important, precious ++ใใใ=Brilliant! Great! (express astonishment and admiration) ++ ++ใใถใชใ=dangerous ++ ++ใใจ=sound ++ใญใใใ=robot ++ใใใ=permission ++ในใคใใ=switch ++ ++ใฏใผใฉใผ=air conditioner ++ใใผใฟใผ=heater ++ ++ใพใใใ
ใ=every week ++ ++ใใพใงใซ=before ~, by ~ (indicating time limit) ++ ++ใงใใใ=therefore, so ++ ++ใ ใใงใใ=That's not good. You must not. ++ใใใญใใงใใ=I'm sorry (to hear that). That's a pity. diff --git a/misc/langdrill/030_swedish.diff b/misc/langdrill/030_swedish.diff new file mode 100644 index 0000000000..86e8ce12a1 --- /dev/null +++ b/misc/langdrill/030_swedish.diff @@ -0,0 +1,248 @@ +--- langdrill-0.3.orig/src/Makefile ++++ langdrill-0.3/src/Makefile +@@ -11,7 +11,7 @@ + MAN_PAGE = ../docs/langdrill.1 + + DRILL_DEF = default.drill +-DRILL_SUP = japanese.drill romaji.drill french.drill ++DRILL_SUP = japanese.drill romaji.drill french.drill swedish.drill + + DEF_FLAGS = -DTARGET='"$(TARGET)"' \ + -DDRILL_DEF='"$(DRILL_DEF)"' \ +--- langdrill-0.3.orig/src/swedish.drill ++++ langdrill-0.3/src/swedish.drill +@@ -0,0 +1,234 @@ ++[Application] ++sense=0 ++directSenseName=Swedish ++reverseSenseName=English ++quizzAnswerNr=8 ++hQuizz=40 ++wQuizz=300 ++# the timer value is given in minutes. ++# it represents the time between the automatical ++# activation of the langdrill. ++timer=10 ++# use this to set how many good answers the langdrill ++# waits till hides by itself. limitedAnswer must be 1 ++# for this to take effect ++limitedAnswerNr=25 ++limitedAnswers=1 ++ ++# set to 1 if you want the window to be hidden when you ++# try to close it and the useTimer is 1 ++hideWindow=0 ++useTimer=1 ++ ++[Numbers] ++noll=zero ++ett=one ++tvรฅ=two ++tre=three ++fyra=four ++fem=five ++sex=six ++sju=seven ++รฅtta=eight ++nio=nine ++tio=ten ++elva=eleven ++tolv=twelve ++tretton=thirteen ++fjorton=fourteen ++femton=fifteen ++sexton=sixteen ++sjutton=seventeen ++arton=eighteen ++nitton=nineteen ++tjugo=twenty ++tjugoett=twenty-one ++tjugotvรฅ=twenty-two ++tjugotre=twenty-three ++tjugofyra=twenty-four ++tjugofem=twenty-five ++tjugosex=twenty-six ++tjugosju=twenty-seven ++tjugoรฅtta=twenty-eight ++tjugonio=twenty-nine ++trettio=thirty ++fyrtio=forty ++femtio=fifty ++sextio=sixty ++sjuttio=seventy ++รฅttio=eighty ++nittio=ninety ++hundra=one hundred ++tvรฅhundra=two hundred ++trehundra=three hundred ++fyrahundra=four hundred ++femhundra=five hundred ++sexhundra=six hundred ++sjuhundra=seven hundred ++รฅttahundra=eight hundred ++niohundra=nine hundred ++tusen=one thousand ++tvรฅtusen=two thousand ++tretusen=three thousand ++fyratusen=four thousand ++femtusen=five thousand ++sextusen=six thousand ++sjutusen=seven thousand ++รฅttatusen=eight thousand ++niotusen=nine thousand ++tiotusen=ten thousand ++ ++ ++[Time: Days of the week] ++ ++mรฅndag=Monday ++tisdag=Tuesday ++onsdag=Wednesday ++torsdag=Thursday ++fredag=Friday ++lรถrdag=Saturday ++sรถndag=Sunday ++ ++ ++[Time: Months] ++ ++januari=January ++februari=February ++mars=March ++april=April ++maj=May ++juni=June ++juli=July ++augusti=August ++september=September ++oktober=October ++november=November ++december=December ++ ++ ++[Expressions] ++ ++Hej!=Hi! ++Hejdรฅ! (alt. Adjรถ!)=Goodbye! ++Tack sรฅ mycket!=Thank you very much! (when reciving things, etc.) ++Hur รคr det? (alt. Hur stรฅr det till?)=How are you? ++Ursรคkta.=Excuse me. ++Fรถrlรฅt (sรฅ mycket). (alt. Jag รคr ledsen.)=I'm (really) sorry. ++Godmorgon!=Goodmorning! ++ ++ ++[Words: Pronouns] ++ ++jag=I ++mig (alt. mej)=me ++du=you ++dig (alt. dej)=you (obj.) ++hon=she ++henne=her (obj.) ++han=he ++honom=him ++det/den=it ++vi=we ++oss=us ++ni=you (pl.) ++er=you (pl. obj.) ++de (alt. dom)=they ++dem (alt. dom)=them ++ ++ ++[Words: Nature] ++ ++ett trรคd=a tree ++en sjรถ=a lake ++en fรฅgel=a bird ++en sten=a stone ++en blomma=a flower ++ett djur=an animal ++ett hav=a sea ++en buske=a shrub ++en katt=a cat ++ett berg=a mountain ++en fjรคril=a butterfly ++en drake=a dragon ++en fisk=a fish ++ ++ ++[Words: Verbs] ++ ++att vara (jag/du/.. รคr)=to be (I/you/.. am/are/..) ++att ha (jag/du/.. har)=to have (I/you/.. have/..) ++att se (jag/du/.. ser)=to see (I/you/.. see/..) ++att sรคga (jag/du/.. sรคger)=to say (I/you/.. say/..) ++att frรฅga (jag/du/.. frรฅgar)=to ask (I/you/.. ask/..) ++att gรฅ (jag/du/.. gรฅr)=to walk (I/you/.. walk/..) ++att sova (jag/du/.. sover)=to sleep (I/you/.. sleep/..) ++att รคta (jag/du/.. รคter)=to eat (I/you/.. eat/..) ++att komma (jag/du/.. kommer)=to come (I/you/.. come) ++att ge (jag/du/.. ger)=to give (I/you/.. give) ++ ++ ++[Lesson: ?] ++ ++Jag frรฅgar dej (en sak).=I am asking you (something). ++Ser du honom?=Are you seeing him? ++Jag ser honom.=I am seeing him. ++Jag รคr en fisk.=I'm a fish. ++Vi sover hรคr.=We are sleeping here. ++Hon ger en sten till mej.=She is giving me a stone. ++ ++ ++[Words: ?] ++ ++en sak=a thing ++hur=how ++till=to ++var=where ++ ++ ++[Lesson: Age] ++ ++en รฅlder=an age ++ett รฅr=a year ++gammal=old ++ung=young ++Hur gammal รคr du?=How old are you? ++Jag รคr fyrtiotvรฅ รฅr (gammal).=I am forty-two years (old). ++Du รคr tjugosju รฅr (gammal).=You are twenty-seven years (old). ++De รคr arton รฅr (gammla).=They are eighteen years (old). ++Hon รคr femtio รฅr (gammal).=She is fifty years (old). ++Han รคr trettionio รฅr (gammal).=He is thirty-nine years (old). ++Jag รคr รฅtta รฅr (gammal).=I am eight years (old). ++Det รคr tre รฅr (gammalt).=It is three years (old). ++Du รคr ung.=You are young. ++Du รคr gammal.=You are old. ++ ++ ++[Words: Countries] ++ ++Australien=Australia ++Brasilien=Brazil ++Italien=Italy ++Spanien=Spain ++Rumรคnien=Romania ++Danmark=Denmark ++Sverige=Sweden ++Norge=Norway ++Kina=China ++Kanada=Canada ++Frankrike=France ++Japan=Japan ++Grรถnland=Greenland ++Island=Iceland ++Tyskland=Germany ++Ryssland=Russia ++Greekland=Greece ++England=England ++USA=USA ++Amerika=America ++ ++ ++[Lesson: ?2] ++ ++Var kommer du ifrรฅn?=Where are you from? ++Jag kommer ifrรฅn Grรถnland.=I am from Greenland. ++ diff --git a/misc/langdrill/040_link.diff b/misc/langdrill/040_link.diff new file mode 100644 index 0000000000..cf11143cff --- /dev/null +++ b/misc/langdrill/040_link.diff @@ -0,0 +1,21 @@ +From: Markus Koschany <apo@debian.org> +Date: Fri, 19 Jan 2018 10:39:45 +0100 +Subject: link against only needed libraries + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index c0b467b..aec5e4e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -37,7 +37,7 @@ else + endif + + CC = g++ +-LFLAGS = `vdk-config-2 --libs` `pkg-config --libs gtk+-2.0` ++LFLAGS = -Wl,--as-needed `vdk-config-2 --libs` `pkg-config --libs gtk+-2.0` + + + ####### Implicit rules diff --git a/misc/langdrill/050_cflags.diff b/misc/langdrill/050_cflags.diff new file mode 100644 index 0000000000..52dccb8c48 --- /dev/null +++ b/misc/langdrill/050_cflags.diff @@ -0,0 +1,61 @@ +diff -ur langdrill-0.3/src/Makefile langdrill-0.3/src/Makefile +--- langdrill-0.3/src/Makefile 2018-03-19 10:15:09.855912688 -0700 ++++ langdrill-0.3/src/Makefile 2018-03-19 10:13:38.535093214 -0700 +@@ -16,7 +16,9 @@ + DEF_FLAGS = -DTARGET='"$(TARGET)"' \ + -DDRILL_DEF='"$(DRILL_DEF)"' \ + -DDRILL_DIR='"$(DRILL_DIR)"' \ +- `pkg-config --cflags gtk+-2.0` ++ `pkg-config --cflags gtk+-2.0` \ ++ `vdk-config-2 --cflags` \ ++ -Wall + + ###### Test for Debian GNU/Linux + # If your system is not Debian GNU/Linux please modify the values after +@@ -27,16 +29,15 @@ + DRILL_DIR=$(DESTDIR)/usr/share/langdrill + BIN_DIR=$(DESTDIR)/usr/bin + MAN_DIR=$(DESTDIR)/usr/share/man/man1 +- CFLAGS = -Wall `vdk-config-2 --cflags` $(DEF_FLAGS) + else + MY_MESSAGE_OF_THE_DAY=">>" $(TARGET) compilled for NON-Debian GNU/Linux system. "<<" + DRILL_DIR=$(DESTDIR)/usr/local/share/langdrill + BIN_DIR=$(DESTDIR)/usr/local/bin + MAN_DIR=$(DESTDIR)/usr/local/man/man1 +- CFLAGS = -Wall -g `vdk-config-2 --cflags` $(DEF_FLAGS) + endif + + CC = g++ ++CFLAGS = -g + LFLAGS = -Wl,--as-needed `vdk-config-2 --libs` `pkg-config --libs gtk+-2.0` + + +@@ -45,7 +46,7 @@ + .SUFFIXES: .cc + + .cc.o: $(SRC) +- $(CC) $(CFLAGS) -c $*.cc -o $@ ++ $(CC) $(CFLAGS) $(DEF_FLAGS) -c $*.cc -o $@ + + ####### Build rules + +@@ -62,16 +63,16 @@ + + $(TARGET): tarclean $(OBJ) + @echo $(MY_MESSAGE_OF_THE_DAY) +- $(CC) $(CFLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) ++ $(CC) $(CFLAGS) $(DEF_FLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) + + run: tarclean $(OBJ) + @echo $(MY_MESSAGE_OF_THE_DAY) +- $(CC) $(CFLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) ++ $(CC) $(CFLAGS) $(DEF_FLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) + ./$(TARGET) + + build: clean tarclean $(OBJ) + @echo $(MY_MESSAGE_OF_THE_DAY) +- $(CC) $(CFLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) ++ $(CC) $(CFLAGS) $(DEF_FLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) + + install: all + install -d $(BIN_DIR) $(DRILL_DIR) $(MAN_DIR) diff --git a/misc/langdrill/050_install.diff b/misc/langdrill/050_install.diff new file mode 100644 index 0000000000..2af54f7851 --- /dev/null +++ b/misc/langdrill/050_install.diff @@ -0,0 +1,63 @@ +diff -ur langdrill-0.3/src/Makefile langdrill-0.3/src/Makefile +--- langdrill-0.3/src/Makefile 2018-03-19 09:36:36.277390675 -0700 ++++ langdrill-0.3/src/Makefile 2018-03-19 09:55:06.065284069 -0700 +@@ -1,6 +1,5 @@ + ###### Files & Directories + DESTDIR= +-MY_DEBIAN_SYSTEM= + + + SRC = main.cc\ +@@ -20,21 +19,10 @@ + `vdk-config-2 --cflags` \ + -Wall + +-###### Test for Debian GNU/Linux +-# If your system is not Debian GNU/Linux please modify the values after +-# "else" statement. Modifying the values before else is useless, unless +-# you also set MY_DEBIAN_SYSTEM=1 +-ifeq ($(MY_DEBIAN_SYSTEM),1) +- MY_MESSAGE_OF_THE_DAY=">>" $(TARGET) compilled for Debian GNU/Linux system. "<<" +- DRILL_DIR=$(DESTDIR)/usr/share/langdrill +- BIN_DIR=$(DESTDIR)/usr/bin +- MAN_DIR=$(DESTDIR)/usr/share/man/man1 +-else +- MY_MESSAGE_OF_THE_DAY=">>" $(TARGET) compilled for NON-Debian GNU/Linux system. "<<" +- DRILL_DIR=$(DESTDIR)/usr/local/share/langdrill +- BIN_DIR=$(DESTDIR)/usr/local/bin +- MAN_DIR=$(DESTDIR)/usr/local/man/man1 +-endif ++PREFIX ?= /usr/local ++DRILL_DIR ?= $(PREFIX)/share/langdrill ++BIN_DIR ?= $(PREFIX)/bin ++MAN_DIR ?= $(PREFIX)/share/man + + CC = g++ + CFLAGS = -g +@@ -62,21 +50,18 @@ + rm -f $(TARGET) core *~ + + $(TARGET): tarclean $(OBJ) +- @echo $(MY_MESSAGE_OF_THE_DAY) + $(CC) $(CFLAGS) $(DEF_FLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) + + run: tarclean $(OBJ) +- @echo $(MY_MESSAGE_OF_THE_DAY) + $(CC) $(CFLAGS) $(DEF_FLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) + ./$(TARGET) + + build: clean tarclean $(OBJ) +- @echo $(MY_MESSAGE_OF_THE_DAY) + $(CC) $(CFLAGS) $(DEF_FLAGS) -o $(TARGET) $(OBJ) $(LFLAGS) + + install: all +- install -d $(BIN_DIR) $(DRILL_DIR) $(MAN_DIR) +- install ./$(TARGET) $(BIN_DIR) +- install -m644 $(DRILL_SUP) $(DRILL_DIR) +- ln -sf japanese.drill $(DRILL_DIR)/$(DRILL_DEF) +- install -m644 $(MAN_PAGE) $(MAN_DIR) ++ install -d $(DESTDIR)$(BIN_DIR) $(DESTDIR)$(DRILL_DIR) $(DESTDIR)$(MAN_DIR)/man1 ++ install ./$(TARGET) $(DESTDIR)$(BIN_DIR) ++ install -m644 $(DRILL_SUP) $(DESTDIR)$(DRILL_DIR) ++ ln -sf japanese.drill $(DESTDIR)$(DRILL_DIR)/$(DRILL_DEF) ++ install -m644 $(MAN_PAGE) $(DESTDIR)$(MAN_DIR)/man1 diff --git a/misc/langdrill/README b/misc/langdrill/README new file mode 100644 index 0000000000..3cd2bf0a44 --- /dev/null +++ b/misc/langdrill/README @@ -0,0 +1,2 @@ +This is langrill, a language drill program. It is used to test your +vocabulary in foreign languages. diff --git a/misc/langdrill/langdrill.SlackBuild b/misc/langdrill/langdrill.SlackBuild new file mode 100644 index 0000000000..298cdcf189 --- /dev/null +++ b/misc/langdrill/langdrill.SlackBuild @@ -0,0 +1,100 @@ +#!/bin/sh + +# Slackware build script for langdrill + +# Copyright 2018 Hunter Sezen California, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=langdrill +VERSION=${VERSION:-0.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -eu + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +for patch in $CWD/0?0_*.diff; do + patch -p1 < "$patch" +done + +make \ + PREFIX=/usr \ + CFLAGS="$SLKCFLAGS" + +make install \ + DESTDIR=$PKG \ + PREFIX=/usr \ + MAN_DIR=/usr/man + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS BUGS COPYING INSTALL NEWS README THANKS TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/langdrill/langdrill.info b/misc/langdrill/langdrill.info new file mode 100644 index 0000000000..ab90139f53 --- /dev/null +++ b/misc/langdrill/langdrill.info @@ -0,0 +1,10 @@ +PRGNAM="langdrill" +VERSION="0.3" +HOMEPAGE="https://tracker.debian.org/pkg/langdrill" +DOWNLOAD="http://http.debian.net/debian/pool/main/l/langdrill/langdrill_0.3.orig.tar.gz" +MD5SUM="70afbf1d33ead7cec4dbf5d2d0782c4c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="vdk" +MAINTAINER="Hunter Sezen" +EMAIL="orbea@fredslev.dk" diff --git a/misc/langdrill/slack-desc b/misc/langdrill/slack-desc new file mode 100644 index 0000000000..a4507b07d1 --- /dev/null +++ b/misc/langdrill/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +langdrill: langdrill (language drill tests) +langdrill: +langdrill: This is langrill, a language drill program. It is used to test your +langdrill: vocabulary in foreign languages. +langdrill: +langdrill: Homepage: https://tracker.debian.org/pkg/langdrill +langdrill: +langdrill: +langdrill: +langdrill: +langdrill: |