fix for some javascript translations
Merge branch 'hotfixes'

Conflicts:
	admin/edit.php