am e8432ae6: (-s ours) am 9006a566: Import translations. DO NOT MERGE

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