am bb5aa487: am 077cf819: Import translations. DO NOT MERGE

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