am 85a5eb02: (-s ours) am c428e3b2: (-s ours) am 1ed2a9d6: (-s ours) Import translations. DO NOT MERGE

* commit '85a5eb02c8de728631036dad3b1b19be0dccd9fe':