am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE

* commit '8dafc8e834036ffded3644ba06ad4164ee7e755f':
  Import translations. DO NOT MERGE