update exefile
add console version
update dat/*

add descript/ja/cards.txt of Transifex latest
update descript/ja/backgrounds.txt to Transifex latest
update descript/ja/gods.txt to Transifex latest
update descript/ja/species.txt to Transifex latest
update descript/ja/spells.txt to Transifex latest

remove files

Merge branch 'update_descript' into update_exefile

Conflicts:
	crawl/dat/descript/ja/backgrounds.txt
	crawl/dat/descript/ja/species.txt
	crawl/dat/descript/ja/spells.txt

fix descript/ja/*

update exefile
add console version
update dat/*

add descript/ja/cards.txt of Transifex latest
update descript/ja/backgrounds.txt to Transifex latest
update descript/ja/gods.txt to Transifex latest
update descript/ja/species.txt to Transifex latest
update descript/ja/spells.txt to Transifex latest

remove files

Merge branch 'update_descript' into update_exefile

Conflicts:
	crawl/dat/descript/ja/backgrounds.txt
	crawl/dat/descript/ja/species.txt
	crawl/dat/descript/ja/spells.txt

fix descript/ja/*

Merge branch 'update_exefile' of github.com:dis-/dcss_ja into update_exefile

Conflicts:
	crawl/dat/descript/ja/backgrounds.txt
	crawl/dat/descript/ja/species.txt
	crawl/dat/descript/ja/spells.txt