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

* commit 'b509a853d9c4a60f754a29aed5207ce6643c101d':