am 1480f390: (-s ours) am cd2eba3d: (-s ours) Import translations. DO NOT MERGE

* commit '1480f39073e525cdb9feecbc39fdd7e20ab8a036':