am d3017c71: (-s ours) am fe97647f: Import revised translations. DO NOT MERGE
* commit 'd3017c7120bcb7b16173bbb5dc68a74e6d5de13d': Import revised translations. DO NOT MERGEmain
commit
9c6307ba4e
* commit 'd3017c7120bcb7b16173bbb5dc68a74e6d5de13d': Import revised translations. DO NOT MERGEmain