am 829c1e17: (-s ours) am a525a0d7: (-s ours) am f9c54fb1: (-s ours) Import translations. DO NOT MERGE * commit '829c1e17':