am ba792ed5: (-s ours) am 2156c386: Import translations. DO NOT MERGE

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