am c86df7b9: (-s ours) am 2e59fdd3: (-s ours) Import translations. DO NOT MERGE

* commit 'c86df7b917b23ea122c87a6789e31b11d3a41712':
  Import translations. DO NOT MERGE