From 36ea500f812069fc66177dcea1fac97fc57f248f Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 28 Mar 2011 08:07:46 +0000 Subject: [PATCH] IDE: resource strings git-svn-id: trunk@30048 - --- ide/lazarusidestrconsts.pas | 1 + ide/main.pp | 4 ++-- ide/searchfrm.pas | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index d50317f979..df8c225de8 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -2947,6 +2947,7 @@ resourcestring // codetools defines lisCodeToolsDefsCodeToolsDefinesPreview = 'CodeTools Defines Preview'; lisCodeToolsDefsWriteError = 'Write error'; + lisErrorWritingFile = 'Error writing file "%s"'; lisFPDocErrorWriting = 'Error writing "%s"%s%s'; lisFPDocFPDocSyntaxError = 'FPDoc syntax error'; lisFPDocThereIsASyntaxErrorInTheFpdocElement = 'There is a syntax error in ' diff --git a/ide/main.pp b/ide/main.pp index d610229c43..ed78a1900d 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -7624,7 +7624,7 @@ begin AnUnitInfo:=AnUnitInfo.NextPartOfProject; end; - // check if compiler options contains paths of ObsoleteUnitPaths + // check if compiler options contain paths of ObsoleteUnitPaths if ObsoleteUnitPaths<>'' then begin ProjUnitPaths:=AProject.CompilerOptions.OtherUnitFiles; p:=1; @@ -7651,7 +7651,7 @@ begin AProject.CompilerOptions.OtherUnitFiles:=ProjUnitPaths; end; - // check if compiler options contains paths of ObsoleteIncPaths + // check if compiler options contain paths of ObsoleteIncPaths if ObsoleteIncPaths<>'' then begin ProjIncPaths:=AProject.CompilerOptions.IncludePath; p:=1; diff --git a/ide/searchfrm.pas b/ide/searchfrm.pas index a3c08159ee..bdadf9121b 100644 --- a/ide/searchfrm.pas +++ b/ide/searchfrm.pas @@ -394,6 +394,7 @@ var SrcEdit.Selection:=AReplace; // count total replacements and adjust offsets aLineCount:=LineEndCount(AReplace,aLastLineLength); + //debugln(['DoReplaceLine Replace="',dbgstr(AReplace),'" aLineCount=',aLineCount,' aLastLineLength=',aLastLineLength]); if aLineCount>0 then begin // replaced with multiple lines LastReplaceColOffset:=aLastLineLength+1-FoundEndPos.X; @@ -463,8 +464,8 @@ var if (TheFileName<>'') then begin OriginalFile.Source:=NewText; if (not OriginalFile.SaveToFile(TheFileName)) then begin - CurResult:=MessageDlg('Write error', - 'Error writing file "'+TheFileName+'"', + CurResult:=MessageDlg(lisCodeToolsDefsWriteError, + Format(lisErrorWritingFile, [TheFileName]), mtError,[mbCancel,mbAbort],0); if CurResult=mrAbort then DoAbort; end;