am e461dc6f: Armor string format tokens with translation placeholders.

Merge commit 'e461dc6ffe0cf1fdd70bb855303418fc343a857b'

* commit 'e461dc6ffe0cf1fdd70bb855303418fc343a857b':
  Armor string format tokens with translation placeholders.