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

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