more i18n work
Better context for translations
better context for ungettext
Adjust parens
This should not have been removed