added some plurals checking, need to merge later
Merge branch 'master' into local
finished empty languag inputs