am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE

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