Tool to assist integrating source text fixes back into source code

It is a common scenario that the translator who uses Linguist finds mistakes in the source text.
To record his corrections, he can create a "fixed source" "translation" file simultaneously with the actual translation.
The missing piece to make the process of fixing the actual source text smooth is a tool which would be able to automatically integrate the corrected source strings into the source code.