fixes #2239
fixes, l10n