Borked code

Hmm. CVS update seems to have borked (bjorked if you're swedish) my local source code. I'll have to pull out what I've changed, get a fresh set from CVS, and reapply my changes. I'd rather not loose the hour this will take, but what do you do?
Lots of interest in getting I18N/l10n output working from the system. The idea is, if we can show this working from a dev system it'll really give us a great advantage in getting rolled out in Japan.
Okay, got that all fixed.
Working on some code for handling the "Inbox" concept. I think tracking what a user does with their inbox will only take a couple days to work out. I decided to work on this code, rather than the stored procs, because Derek is out until later today. Seems his boy needs to get his tonsils out.
Lunch has gone and passed. Derek is still not here, but I've passed a bunch of text to Dale for it to be translated into various langauges. I18N of report moves forward thusly.
While Dale does his language magic, I've switched gears onto project #2, which is tracking survey response use. The app is having problems starting up, so I've missed something in the hibernate config.
Dale has gotten back with translated text, done through babelfish. I see that three other localized values need to be set up through the .properties files:

• KEY_MCD_DissatissifactionReasons
• KEY_MCD_Service_Option
• KEY_MCD_QSC_Critical_Driver