am 79842aa2: (-s ours) Import translations. DO NOT MERGE
* commit '79842aa208201211f1c6dd30eef035a419d6683b': Import translations. DO NOT MERGEmain
commit
d9ffed3878
* commit '79842aa208201211f1c6dd30eef035a419d6683b': Import translations. DO NOT MERGEmain