fix merge problems in translations.coffee