I had the same problem when I merged last night after the translation was merged, but merging again this morning (by removing the translation file) the problem fixed by itself, the translation was properly readded.