am cd4c6c4d: (-s ours) am a07590a8: Import translations. DO NOT MERGE

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