Fixed some nls annotations
Merge branch 'Bug408862-2' of git@github.com:gabrielluong/orion.client.git into Bug408862-2