am 2330a54f: (-s ours) am b509a853: (-s ours) am 8aa955dc: (-s ours) Import translations. DO NOT MERGE

* commit '2330a54f0246609d5dbbb08b3731fe71176845c3':