am 2efb58fc: (-s ours) Import translations. DO NOT MERGE
* commit '2efb58fc9822fed6df8b93aff62db455ab5b68a9': Import translations. DO NOT MERGEmain
commit
a0d769f3f0
* commit '2efb58fc9822fed6df8b93aff62db455ab5b68a9': Import translations. DO NOT MERGEmain