am 6a5bb0d3: (-s ours) am 87b15e21: (-s ours) Import translations. DO NOT MERGE

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