am 6316f5ff: (-s ours) am 8d2d3d46: (-s ours) Import translations. DO NOT MERGE

* commit '6316f5ff2a8c3de69e6580c9220809242683f0c1':
  Import translations. DO NOT MERGE