am 566aff4d: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE

* commit '566aff4d55aac8ff4b7711e4d72ed99e7e83b526':