fix some issue of l10n
Merge branch 'master' of https://github.com/appsgate2015/appsgate