--- langdrill-0.3.orig/debian/control +++ langdrill-0.3/debian/control @@ -0,0 +1,23 @@ +Source: langdrill +Section: text +Priority: optional +Maintainer: Debian Games Team +Uploaders: Sam Hocevar (Debian packages) , Barry deFreese +Build-Depends: debhelper (>= 5.0), quilt, libvdk2-dev (>= 2.4.0-3), libgnomeui-dev (>= 2.0) +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/langdrill/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/langdrill/?op=log + +Package: langdrill +Architecture: any +Depends: ${shlibs:Depends} +Recommends: xfonts-intl-japanese +Suggests: skkinput | kinput2 | kinput2-wnn | kinput2-canna +Description: language drills to test vocabulary + langdrill is a helper for testing your foreign language vocabulary. + It uses GTK+ toolkit and VDK (a C++ wrapper arround GTK+). langdrill + looks similar to JavaDrill. + . + Support for displaying Japanese characters is included. For this, Japanese + fonts must be installed on your system, for instance the xfonts-intl-japanese + package. --- langdrill-0.3.orig/debian/changelog +++ langdrill-0.3/debian/changelog @@ -0,0 +1,274 @@ +langdrill (0.3-7) unstable; urgency=low + + [ Ansgar Burchardt ] + * debian/menu: + + Set section to Applications/Education instead of Games/Puzzles + * debian/control: + + Change section to text instead of games + + Depend on debhelper (>= 5.0) + * debian/rules: + + Don't ignore `make clean' errors + + [ Eddy Petrișor ] + * add missing Vcs-Svn headers + + [ Barry deFreese ] + * Add myself to uploaders. + * Acknowledge NMUs. + * Add empty watch file to make lintian happy. + * Bump Standards Version to 3.8.1. (No changes needed). + + -- Barry deFreese Wed, 18 Mar 2009 16:22:06 -0400 + +langdrill (0.3-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Apply patch 010_min_max.diff fixing build with GCC 4.2 (closes: #385521). + + -- Mark Brown Sun, 02 Sep 2007 11:58:22 +0100 + +langdrill (0.3-6) unstable; urgency=low + + * Moved packaging to the Debian Games Team. + * Use quilt for patch management. + * debian/control: + + Set policy to 3.7.2. + + Build-depend on quilt. + + Set section to games instead of gnome. + + * debian/patches/000_pkg_config.diff: + + New patch courtesy of Matt Kraai -- use pkg-config to find the cairo.h + include path (Closes: #355991). + + * debian/patches/010_cxx_standard.diff: + + New patch from old diff.gz -- compilation fix for newer g++. + + * debian/patches/010_vdk_updates.diff: + + New patch from old diff.gz -- compilation fix for newer VDK versions. + + * debian/patches/020_documentation.diff: + + New patch from old diff.gz -- minor documentation fixes. + + * debian/patches/030_french_utf8.diff: + + New patch from old diff.gz -- convert the French drill to UTF-8. + + * debian/patches/030_japanese.diff: + + New patch from old diff.gz -- Japanese improvements. + + * debian/patches/030_swedish.diff: + + New patch from old diff.gz -- user-contributed Swedish drill. + + -- Sam Hocevar (Debian packages) Wed, 17 May 2006 01:33:21 +0200 + +langdrill (0.3-5) unstable; urgency=low + + * Rebuild for the C++ transition. + * debian/control: + + Set policy to 3.6.2.1. + + Build-depend on libvdk2-dev (>= 2.4.0-3). + + Fixed grammar in the long description. + * debian/rules: + + Use dh_installman instead of dh_installmanpages. + * debian/copyright: + + Fixed old FSF address. + + Added proper copyright holders. + * src/main.hh src/config.cc src/config.hh: + + Fixed use of deprecated C++ headers. + * src/main.cc: + + Fixed event handling in the simple quizz panel (Closes: #310765). + + -- Sam Hocevar (Debian packages) Mon, 31 Oct 2005 23:50:59 +0100 + +langdrill (0.3-4) unstable; urgency=low + + * Rebuilt with most recent VDK2. + * Converted all drill files to UTF-8. + + -- Sam Hocevar (Debian packages) Thu, 21 Oct 2004 15:51:36 +0200 + +langdrill (0.3-3) unstable; urgency=low + + * debian/control: + + Set policy to 3.6.1.1. + * src/main.cc: + + Ported langdrill to the newest vdk2 API (Closes: #264701). + + -- Sam Hocevar (Debian packages) Tue, 10 Aug 2004 20:35:11 +0200 + +langdrill (0.3-2) unstable; urgency=low + + * debian/control: + + Fixed the long description: Japanese support is no longer minor. + + Set policy to 3.6.1.0. + * src/*.drill: + + User-contributed Swedish drill. + + Minor fixes to the Japanese drill. + * README: + + Updated the homepage address (Closes: #245857). + + -- Sam Hocevar (Debian packages) Tue, 1 Jun 2004 21:21:27 -0300 + +langdrill (0.3-1) unstable; urgency=low + + * No longer a native Debian package. I'm fed up with full source uploads + when only minor changes are done to the package. + * Rebuilt with libvdk2 2.0.3-3. + + -- Sam Hocevar (Debian packages) Thu, 7 Aug 2003 15:50:38 +0200 + +langdrill (0.2.1-11) unstable; urgency=low + + * Rebuilt against libvdk2-2 so that numentries work again. + * debian/control: + + Set policy to 3.6.0. No changes required. + + Updated libvdk2-dev build-dependency to (>= 2.0.3-2). + + Updated debhelper build-dependency to (>= 4.0) because of debian/compat. + + -- Sam Hocevar (Debian packages) Tue, 29 Jul 2003 15:24:27 +0200 + +langdrill (0.2.1-10) unstable; urgency=low + + * debian/control: + + Changed the libgnome2-dev build dependency to libgnomeui-dev (>= 2.0) so + that we can use the Gtk headers as well. + + -- Sam Hocevar (Debian packages) Sun, 15 Jun 2003 15:27:28 +0200 + +langdrill (0.2.1-9) unstable; urgency=low + + * debian/control: + + Set policy to 3.5.10. + + Set section to gnome. + * debian/copyright: + + Added the "On Debian systems, the GPL is in ..." blurb. + * Removed debian/postinst, debian/postrm and debian/prerm because debhelper + kindly does all the hard job for us. + * Changes to the appearance: + + Ported to GTK 2 and VDK 2. + + Converted internal strings to UTF-8 so that weird locale settings are no + longer needed to display Japanese since Pango properly handles UTF-8 for + us. This will allow new languages to be easily added (Closes: #167204). + + Swapped the word list and the lesson list. + * Changes to the data path handling: + + Changed data dir from /usr/share/vdk/langdrill to /usr/share/langdrill. + + The load dialog directly starts in /usr/share/langdrill. + + Do not change the working directory. + * Fixed the spelling for "quizzes". + * Added a small French drill file. + + -- Sam Hocevar (Debian packages) Tue, 10 Jun 2003 18:17:56 +0200 + +langdrill (0.2.1-8) unstable; urgency=low + + * New maintainer (Closes: #88244). + * Rebuilt on an up-to-date sid (Closes: #186631). + + -- Samuel Hocevar Wed, 23 Apr 2003 05:21:58 +0200 + +langdrill (0.2.1-7) unstable; urgency=low + + * A fucked-up upload. + + -- Samuel Hocevar Sat, 19 Apr 2003 18:05:07 +0200 + +langdrill (0.2.1-6) unstable; urgency=low + + * QA upload. + * Change 'include' to '#include' in default /etc/langdrill.rc + (closes: #129919). + + -- Colin Watson Thu, 18 Apr 2002 01:10:48 +0100 + +langdrill (0.2.1-5) unstable; urgency=low + + * Set maintainer address to QA group. + * fix spelling error in description (closes: #124858) + * fix typos in default.drill, pathch thanks to + Christian Ohm (closes: #129921) + * fix build on current gnome-dev + + -- David Kimdon Mon, 4 Feb 2002 01:25:06 -0800 + +langdrill (0.2.1-4) unstable; urgency=low + + * NMU + * Simple recompile to fix bug #93081 + * Minor lintian fixes + + -- David Starner Fri, 24 Aug 2001 21:05:00 -0500 + +langdrill (0.2.1-3) unstable; urgency=low + + * compiled with vdk 1.0.1 + * moved to /usr/share/doc + * set /etc/langdrill.rc as a conffile + + -- Ionutz Borcoman Wed, 6 Oct 1999 00:16:20 +0900 + +langdrill (0.2.1-2) unstable; urgency=low + + * Recompiled with vdk 0.6.3. + + -- Ionutz Borcoman Fri, 12 Mar 1999 19:45:00 +0900 + +langdrill (0.2.1-1) unstable; urgency=low + + * New upstream release (minor changes). + * Recompiled with vdk 0.6.1. + + -- Ionutz Borcoman Fri, 12 Mar 1999 19:45:00 +0900 + +langdrill (0.2.0-3) unstable; urgency=low + + * Corrected bug with Text widget. + + -- Ionutz Borcoman Fri, 12 Mar 1999 19:45:00 +0900 + +langdrill (0.2.0-2) unstable; urgency=low + + * Updated the default.drill and the langdrill.rc files. + + -- Ionutz Borcoman Fri, 12 Mar 1999 19:45:00 +0900 + +langdrill (0.2.0-1) unstable; urgency=low + + * Compiled with gtk 1.2 and vdk 0.6. + + -- Ionutz Borcoman Fri, 12 Mar 1999 19:45:00 +0900 + +langdrill (0.2.0) unstable; urgency=low + + * New release. Some bugfixes. Added support for skkinput and kinput2. + + -- Ionutz Borcoman Tue, 26 Jan 1999 19:45:00 +0900 + +langdrill (0.1.9) unstable; urgency=low + + * This is just to correct my own errors in working with my cvs. + + -- Ionutz Borcoman Sun, 18 Jan 1999 06:35:26 +0900 + +langdrill (0.1.8) unstable; urgency=low + + * Improved timer page. + + -- Ionutz Borcoman Sun, 18 Jan 1999 06:30:26 +0900 + +langdrill (0.1.7) unstable; urgency=low + + * Added timer page. + + -- Ionutz Borcoman Sun, 17 Jan 1999 06:30:26 +0900 + +langdrill (0.1.6) unstable; urgency=low + + * New improved version of langdrill. Compiled with gtk 1.1.12 and unreleased VDK 0.5.0. + + -- Ionutz Borcoman Fri, 8 Jan 1999 06:30:26 +0900 + +langdrill (0.1.5) unstable; urgency=low + + * Initial Release. + + -- Ionutz Borcoman Tue, 15 Dec 1998 14:55:00 +0900 + --- langdrill-0.3.orig/debian/docs +++ langdrill-0.3/debian/docs @@ -0,0 +1 @@ +BUGS NEWS README TODO --- langdrill-0.3.orig/debian/menu +++ langdrill-0.3/debian/menu @@ -0,0 +1,2 @@ +?package(langdrill):command="/usr/bin/langdrill" needs="X11" \ + section="Applications/Education" title="Language drills" --- langdrill-0.3.orig/debian/watch +++ langdrill-0.3/debian/watch @@ -0,0 +1 @@ +#langdrill is no longer maintained upstream and is now maintained by Sam Hocevar. --- langdrill-0.3.orig/debian/compat +++ langdrill-0.3/debian/compat @@ -0,0 +1 @@ +5 --- langdrill-0.3.orig/debian/dirs +++ langdrill-0.3/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +usr/share/langdrill --- langdrill-0.3.orig/debian/copyright +++ langdrill-0.3/debian/copyright @@ -0,0 +1,24 @@ +This package was written by Ionutz Borcoman +on Tue, 15 Dec 1998 14:55:00 +0900. It is now maintained by Sam Hocevar + since Wed, 23 Apr 2003 05:21:58 +0200. + +Copyright (c) 1999-2003 Ionutz Borcoman +Copyright (c) 2003-2005 Sam Hocevar + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- langdrill-0.3.orig/debian/rules +++ langdrill-0.3/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# MAde with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + $(MAKE) MY_DEBIAN_SYSTEM=1 + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + $(MAKE) distclean + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=`pwd`/debian/langdrill MY_DEBIAN_SYSTEM=1 + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install +# dh_testversion + dh_testdir + dh_testroot + dh_installdocs +# dh_installexamples + dh_installmenu +# dh_installemacsen +# dh_installinit +# dh_installcron + dh_installman docs/langdrill.1 +# dh_undocumented + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms +# dh_suidregister + dh_installdeb + dh_shlibdeps + dh_gencontrol +# dh_makeshlibs + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- langdrill-0.3.orig/debian/patches/030_swedish.diff +++ langdrill-0.3/debian/patches/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. ++ --- langdrill-0.3.orig/debian/patches/030_japanese.diff +++ langdrill-0.3/debian/patches/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. --- langdrill-0.3.orig/debian/patches/series +++ langdrill-0.3/debian/patches/series @@ -0,0 +1,8 @@ +000_pkg_config.diff +010_cxx_standard.diff +010_vdk_updates.diff +010_min_max.diff +020_documentation.diff +030_french_utf8.diff +030_japanese.diff +030_swedish.diff --- langdrill-0.3.orig/debian/patches/020_documentation.diff +++ langdrill-0.3/debian/patches/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: --- langdrill-0.3.orig/debian/patches/010_cxx_standard.diff +++ langdrill-0.3/debian/patches/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++; --- langdrill-0.3.orig/debian/patches/000_pkg_config.diff +++ langdrill-0.3/debian/patches/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 --- langdrill-0.3.orig/debian/patches/010_vdk_updates.diff +++ langdrill-0.3/debian/patches/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" +- " \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; + } + + --- langdrill-0.3.orig/debian/patches/010_min_max.diff +++ langdrill-0.3/debian/patches/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