am 71a04642: (-s ours) am 5d95f0c5: (-s ours) Import translations. DO NOT MERGE

* commit '71a046428e4477f563f5fb71f0f3c46097953be2':