Fixes formatting of localized strings.

This should fix several CLI issues that were filed with latest build,
including BZ #1007128.