englishification for swift branch
Merge pull request #2970 from orta/swift

@marius => englishification for swift branch