updates translations
Merge branch 'master' of github.com:kodgemisi/confdeck

Conflicts:
	config/locales/tr.yml