am a016baa7: (-s ours) am 422a1164: am a2d3a036: Import translations. DO NOT MERGE

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