am 29cff2d2: (-s ours) Import translations. DO NOT MERGE
* commit '29cff2d21aae2dbde622f99240cfe4d19fbc5e4a': Import translations. DO NOT MERGE
This commit is contained in: