am 7aa40c19: (-s ours) Import translations. DO NOT MERGE * commit '7aa40c19f5a1a5770742251e53d7f2496f7ef27a': Import translations. DO NOT MERGE