Ensured language keys and update code
Merge branch 'nts' of github.com:cognovis/po into nts