From 0a028ce833b76dcfd347320ef58fa74e5e6308ed Mon Sep 17 00:00:00 2001 From: Hunter Sezen Date: Mon, 19 Mar 2018 22:33:55 +0000 Subject: misc/langdrill: Added (language drill tests). Signed-off-by: David Spencer --- misc/langdrill/000_pkg_config.diff | 21 + misc/langdrill/010_cxx_standard.diff | 33 + misc/langdrill/010_min_max.diff | 21 + misc/langdrill/010_vdk_updates.diff | 61 ++ misc/langdrill/020_documentation.diff | 15 + misc/langdrill/030_french_utf8.diff | 40 ++ misc/langdrill/030_japanese.diff | 1126 +++++++++++++++++++++++++++++++++ misc/langdrill/030_swedish.diff | 248 ++++++++ misc/langdrill/040_link.diff | 21 + misc/langdrill/050_cflags.diff | 61 ++ misc/langdrill/050_install.diff | 63 ++ misc/langdrill/README | 2 + misc/langdrill/langdrill.SlackBuild | 100 +++ misc/langdrill/langdrill.info | 10 + misc/langdrill/slack-desc | 19 + 15 files changed, 1841 insertions(+) create mode 100644 misc/langdrill/000_pkg_config.diff create mode 100644 misc/langdrill/010_cxx_standard.diff create mode 100644 misc/langdrill/010_min_max.diff create mode 100644 misc/langdrill/010_vdk_updates.diff create mode 100644 misc/langdrill/020_documentation.diff create mode 100644 misc/langdrill/030_french_utf8.diff create mode 100644 misc/langdrill/030_japanese.diff create mode 100644 misc/langdrill/030_swedish.diff create mode 100644 misc/langdrill/040_link.diff create mode 100644 misc/langdrill/050_cflags.diff create mode 100644 misc/langdrill/050_install.diff create mode 100644 misc/langdrill/README create mode 100644 misc/langdrill/langdrill.SlackBuild create mode 100644 misc/langdrill/langdrill.info create mode 100644 misc/langdrill/slack-desc (limited to 'misc') 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 + #include +-#include ++#include + #include + #include + +--- langdrill-0.3.orig/src/main.hh ++++ langdrill-0.3/src/main.hh +@@ -29,7 +29,7 @@ + #ifndef __main_hh__ + #define __main_hh__ + +-#include ++#include + #include + #include + +--- 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 +- MessageBox( " Let's talk about Language Drills", +- " Brought to you by\n" +- " Ionutz Borcoman\n" +- " \n" +- " \n" +- " \n" +- " Nothing would have been possible without\n" +- " Mario Motta's VDK\n" +- " " +- "\n", +- MB_OK | MB_ICONINFORMATION ) ; ++ VDKMessageBox( " Let's talk about Language Drills", ++ " Brought to you by\n" ++ " Ionutz Borcoman\n" ++ " \n" ++ " \n" ++ " \n" ++ " Nothing would have been possible without\n" ++ " Mario Motta's VDK\n" ++ " " ++ "\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 . + + 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 +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: -- cgit v1.2.3