am 79cda583: (-s ours) am f2545189: am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE * commit '79cda583':