Adding keys to the Localization files, fixing content
Fixing conflicts and merging monster
Merge pull request #1338 from ORCID/bibtexTwoSteps

Adding keys to the Localization files, fixing content