am ca2ae438: (-s ours) am 3e48bde0: (-s ours) Import translations. DO NOT MERGE

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