am 0aabafe3: (-s ours) am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation.  DO NOT MERGE

Merge commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e'

* commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE