Improved logic statement

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Updated text strings to include text domain

Signed-off-by: Elliot Condon <e@elliotcondon.com>