am 8f737ee8: (-s ours) am 3e2d53b0: (-s ours) Import translations. DO NOT MERGE

* commit '8f737ee801eeab24272216e4fae1c8e05ad42860':