am 955ace24: (-s ours) am eca9587c: (-s ours) am 830e0701: (-s ours) Import translations. DO NOT MERGE

* commit '955ace240ff9881ef7d47605adbe6aae43014376':
  Import translations. DO NOT MERGE