Merge changes I33bf228d,I18d2329e into honeycomb-mr1

* changes:
  Remove unneeded large-screen-specific translations.
  Mark placeholders in format strings as placeholders.