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

Merge commit 'bf992c5b8417c41779e6cb5890b65949dc3353bf' into gingerbread

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