"Sylvain Petreolle" <spetreolle at yahoo.fr> wrote: > Notepad now uses NLS. > > Please remove notepad.rc, that defined > old macro system for language resources. Please resend with resolved CVS conflicts. Search for <<<<<<< and >>>>>>> in your patch. -- Dmitry.