am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '20040dafbc5f0a0b432d9c41c2da6d7ba7791327':
  Import translations. DO NOT MERGE