locale fixes (readded some stuff after phase2 update)
Merge pull request #17 from MichaelKohler/localefixes

locale fixes (readded some stuff after phase2 update)