am 6c4a86a6: (-s ours) am e5f447bf: (-s ours) Import translations. DO NOT MERGE

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