am 6ce4a3bc: (-s ours) am e9363fce: (-s ours) am b2e8cd6e: (-s ours) Import translations. DO NOT MERGE

* commit '6ce4a3bc083a7dbcc7ffa2bebff242638d7f8e61':