Merge branch 'hotfix/set-time-locale'
improved plugin translation detection
Merge branch 'hotfix/fix-plugin-templ-trans' into develop