am b2ffcd64: (-s ours) Import translations. DO NOT MERGE
* commit 'b2ffcd6424eaed951302889079773f6a51c9d380': Import translations. DO NOT MERGEmain
commit
0de11871c5
* commit 'b2ffcd6424eaed951302889079773f6a51c9d380': Import translations. DO NOT MERGEmain