Restored changes to translations affected by merge