am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import translations. DO NOT MERGE * commit '6f3df8c8': Import translations. DO NOT MERGE