Merge pull request #1597 from sumobi/master

Update text strings
Make country abbreviations translatable