Merge change 23023 into eclair

* changes:
  Armor string format tokens with translation placeholders.