am 7d565a1c: (-s ours) am 8d71f0ab: (-s ours) Import translations. DO NOT MERGE

* commit '7d565a1c5d3df4aecf0499197ff794816393ca73':
  Import translations. DO NOT MERGE