am fd2c2e62: (-s ours) am 298d8232: (-s ours) Import translations. DO NOT MERGE
* commit 'fd2c2e627089c6f4355aad477cb1cc90c52365b3': Import translations. DO NOT MERGEmain
commit
29cfa87b31
* commit 'fd2c2e627089c6f4355aad477cb1cc90c52365b3': Import translations. DO NOT MERGEmain