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

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