am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

* commit 'ca43ef6bc7ea52efb17718017e1f883e33504c05':
  Import revised translations.  DO NOT MERGE