diff -r 71b9d7ea4885 -r 7c81eb58b618 Makefile
--- a/Makefile	Fri Mar 03 14:00:29 2017 +0200
+++ b/Makefile	Fri Mar 03 14:01:45 2017 +0200
@@ -458,39 +458,39 @@
 FREQ_FILTER += -12000f:wordlist/oanc.freq
 
 .PHONY: freq
-freq: dist/wordlist/gadict_en-ru+uk.list py/gadict_freq.py $(FREQ_DEP) $(BUILD_SCRIPTS)
-	python3 -B py/gadict_freq.py +b:dist/wordlist/gadict_en-ru+uk.list $(FREQ_FILTER)
+freq: dist/wordlist/gadict.list py/gadict_freq.py $(FREQ_DEP) $(BUILD_SCRIPTS)
+	python3 -B py/gadict_freq.py +b:dist/wordlist/gadict.list $(FREQ_FILTER)
 
 .PHONY: missing
 missing: missing-words missing-stat
 
 .PHONY: missing-words
-missing-words: dist/wordlist/gadict_en-ru+uk.list $(FREQ_DEP) $(BUILD_SCRIPTS)
+missing-words: dist/wordlist/gadict.list $(FREQ_DEP) $(BUILD_SCRIPTS)
 	@echo ===== VOA =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +b:dist/wordlist/voa.list
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +b:dist/wordlist/voa.list
 	@echo ===== GSL =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/gsl.freq
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/gsl.freq
 	@echo ===== AWL =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/awl.freq
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/awl.freq
 	@echo ===== NGSL =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/ngsl.freq
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/ngsl.freq
 	@echo ===== NAWL =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/nawl.freq
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/nawl.freq
 	@echo ===== BSL =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +b:wordlist/bsl.var
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +b:wordlist/bsl.var
 	@echo ===== TSL =====
-	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +b:wordlist/tsl.var
+	python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +b:wordlist/tsl.var
 
 .PHONY: missing-stat
-missing-stat: dist/wordlist/gadict_en-ru+uk.list $(FREQ_DEP) $(BUILD_SCRIPTS)
+missing-stat: dist/wordlist/gadict.list $(FREQ_DEP) $(BUILD_SCRIPTS)
 	@echo ====== Missing words stat =======
-	@printf "%4s: %4s / %4s\n" VOA `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +b:dist/wordlist/voa.list | wc -l` `wc -l <dist/wordlist/voa.list`
-	@printf "%4s: %4s / %4s\n" GSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/gsl.freq | wc -l` `wc -l <wordlist/gsl.freq`
-	@printf "%4s: %4s / %4s\n" AWL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/awl.freq | wc -l` `wc -l <wordlist/awl.freq`
-	@printf "%4s: %4s / %4s\n" NGSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/ngsl.freq | wc -l` `wc -l <wordlist/ngsl.freq`
-	@printf "%4s: %4s / %4s\n" NAWL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +f:wordlist/nawl.freq | wc -l` `wc -l <wordlist/nawl.freq`
-	@printf "%4s: %4s / %4s\n" BSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +b:wordlist/bsl.var | wc -l` `wc -l <wordlist/bsl.var`
-	@printf "%4s: %4s / %4s\n" TSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict_en-ru+uk.list +b:wordlist/tsl.var | wc -l` `wc -l <wordlist/tsl.var`
+	@printf "%4s: %4s / %4s\n" VOA `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +b:dist/wordlist/voa.list | wc -l` `wc -l <dist/wordlist/voa.list`
+	@printf "%4s: %4s / %4s\n" GSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/gsl.freq | wc -l` `wc -l <wordlist/gsl.freq`
+	@printf "%4s: %4s / %4s\n" AWL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/awl.freq | wc -l` `wc -l <wordlist/awl.freq`
+	@printf "%4s: %4s / %4s\n" NGSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/ngsl.freq | wc -l` `wc -l <wordlist/ngsl.freq`
+	@printf "%4s: %4s / %4s\n" NAWL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +f:wordlist/nawl.freq | wc -l` `wc -l <wordlist/nawl.freq`
+	@printf "%4s: %4s / %4s\n" BSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +b:wordlist/bsl.var | wc -l` `wc -l <wordlist/bsl.var`
+	@printf "%4s: %4s / %4s\n" TSL `python3 -B py/gadict_freq.py -b:dist/wordlist/gadict.list +b:wordlist/tsl.var | wc -l` `wc -l <wordlist/tsl.var`
 
 dist/wordlist/%.list: %.gadict py/gadict_headwords.py $(BUILD_SCRIPTS) | dist/wordlist/
 	python3 -B py/gadict_headwords.py  $< $@
@@ -539,15 +539,15 @@
 
 # -B  suppress __pycache__ dir
 
-dist/dictd/gadict_en-ru+uk.c5: gadict_en-ru+uk.gadict $(FREQLIST_DEP) py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/
+dist/dictd/gadict.c5: gadict.gadict $(FREQLIST_DEP) py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/
 	python3 -B py/gadict_c5.py $(FREQLIST_OPT)  $< $@
-	echo "gadict En-Ru+Uk"> dist/dictd/gadict_en-ru+uk.c5.name
+	echo "gadict En-Ru+Uk"> dist/dictd/gadict.c5.name
 
-dist/dictd/gadict_en-ru.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/
+dist/dictd/gadict_en-ru.c5: gadict.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/
 	python3 -B py/gadict_c5.py  $< $@ -lang:ru
 	echo "gadict En-Ru"> dist/dictd/gadict_en-ru.c5.name
 
-dist/dictd/gadict_en-uk.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/
+dist/dictd/gadict_en-uk.c5: gadict.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/
 	python3 -B py/gadict_c5.py  $< $@ -lang:uk
 	echo "gadict En-Uk"> dist/dictd/gadict_en-uk.c5.name
 
@@ -575,7 +575,7 @@
 dist/anki/%.apkg: %.gadict py/gadict.py py/gadict_srs_anki.py $(FREQLIST_DEP) $(MAKEFILE_LIST) | dist/anki/
 	PYTHONPATH=/usr/share/anki: python -B py/gadict_srs_anki.py -name=$* -rich -delfile=$*.del $(FREQLIST_OPT) $< $@
 
-dist/srs/gadict_en-ru+uk.tab.txt: gadict_en-ru+uk.gadict py/gadict.py py/gadict_srs_tab.py $(MAKEFILE_LIST) | dist/srs/
+dist/srs/gadict.tab.txt: gadict.gadict py/gadict.py py/gadict_srs_tab.py $(MAKEFILE_LIST) | dist/srs/
 	python3 -B py/gadict_srs_tab.py  $< $@ -lang:ru,uk
 
 dist/srs/%.tab.txt: %.gadict py/gadict.py py/gadict_srs_tab.py $(MAKEFILE_LIST) | dist/srs/
@@ -704,7 +704,7 @@
 #   $ sudo apt-get install python3-enchant hunspell-en-us hunspell-en-gb hunspell-en-au hunspell-en-ca
 .PHONY: check
 check:
-	python3 -B py/gadict_spellcheck.py gadict_en-ru+uk.gadict
+	python3 -B py/gadict_spellcheck.py gadict.gadict
 
 ################################################################
 # Clean targets.