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

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