am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE * commit 'c90aa638': Import translations. DO NOT MERGE