Fix possible l10n errors
Merge branch 'master' into polish
Update polish translations