Fix some places where localization strings are wrongly used. #504
Address review comments.
Merge pull request #533 from fred-wang/issue504-bis

Resolves issue #504