am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

* commit '287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
  Import revised translations.  DO NOT MERGE