Allow to combine multiple scopes and locale-specific files

Can you also release a new 2.1.x version with this PR, please?