Added good amount of internationalization
Fixing merged files