Fix: Merge Conflict on feature/localization

Created by: harshzalavadiya

Description of PR Resolving merge conflict with master branch plus updated translations

I tried following your instructions instructions IDK I might be doing something wrong but rebasing and dropping all commits shows no diff and can't create PR due to that

checkout this rebased branch with dropped commits shows no merge conflict resoltion diff https://github.com/harshzalavadiya/covid19india-react/pull/3

@jeremyphilemon, I guess you have to rebase this since I have no right to rebase on feature/localization sorry

Type of PR

• Bugfix
• New feature

Relevant Issues
NA

Checklist

• Compiles and passes lint tests
• Properly formatted
• Tested on desktop
• Tested on phone

Screenshots NA