am 8217e7a7: (-s ours) am 0360e6f5: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '8217e7a7aca36acb7fcf960eeadbd3c84e26408c':
  Import revised translations.  DO NOT MERGE