Issue #201 - Move expressions to translatable strings