am 24acd22f: (-s ours) am 4bfba71f: (-s ours) am b571b926: (-s ours) Import translations. DO NOT MERGE * commit '24acd22f': Import translations. DO NOT MERGE