move translations for provider types to the message bundle
Merge branch 'refs/heads/master' into 2.1