am e9160a24: (-s ours) am 6c886cd3: Import translations. DO NOT MERGE

* commit 'e9160a243154b338653e43e3e415caa84c2790ae':
  Import translations. DO NOT MERGE