po changed in branch
fix test.po
test
bowhja
Merge branch 'master' into feature/new-po

Conflicts:
	test.po

Conflicts:
	test.po

Conflicts:
	test.po

Conflicts:
	test.po
Merge pull request #1 from lukin0110/feature/new-po

Feature/new po