Merge translations so we don't lose translations, fixing issue #1