am 32af7f74: (-s ours) am 270c0dec: Import translations. DO NOT MERGE
* commit '32af7f74258d6fabe68f984f57bf5e950e6c2eb5': Import translations. DO NOT MERGEmain
commit
82b4f15a88
* commit '32af7f74258d6fabe68f984f57bf5e950e6c2eb5': Import translations. DO NOT MERGEmain