Revert "Refactor lang file, edit flash message copy"
Merge pull request #285 from Zidisha/revert-283-translation-labels

Revert "Refactor lang file, edit flash message copy"