am 8c6c90ca: (-s ours) am 342a66c8: (-s ours) Import translations. DO NOT MERGE

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