am 6d1e7ca3: (-s ours) am 6b7b9b4a: Import translations. DO NOT MERGE

* commit '6d1e7ca30e3dc68f20c8b796748dfc822905f267':
  Import translations. DO NOT MERGE