am 96c86af0: (-s ours) Import translations. DO NOT MERGE
* commit '96c86af0b5d79cc3ebaf139b7877377c3dca32dd': Import translations. DO NOT MERGEmain
commit
e8bbcb1d74
* commit '96c86af0b5d79cc3ebaf139b7877377c3dca32dd': Import translations. DO NOT MERGEmain