L10N part 5 - another fix
L10N Part 6 - fixing minor submit issues