Adapted translations to new behaviour
Merge branch 'master' of github.com:webtsys/Translations

B:w
i
Fixes for a.