am e88afe3e: (-s ours) am 146990b7: (-s ours) Import translations. DO NOT MERGE

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