paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 19:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: resource strings

Browse Source 
git-svn-id: trunk@30048 -
This commit is contained in:
mattias 2011-03-28 08:07:46 +00:00
parent 85e8f8b7a0
commit 36ea500f81
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/lazarusidestrconsts.pas
View File

@ -2947,6 +2947,7 @@ resourcestring
// codetools defines // codetools defines
lisCodeToolsDefsCodeToolsDefinesPreview = 'CodeTools Defines Preview'; lisCodeToolsDefsCodeToolsDefinesPreview = 'CodeTools Defines Preview';
lisCodeToolsDefsWriteError = 'Write error'; lisCodeToolsDefsWriteError = 'Write error';
lisErrorWritingFile = 'Error writing file "%s"';
lisFPDocErrorWriting = 'Error writing "%s"%s%s'; lisFPDocErrorWriting = 'Error writing "%s"%s%s';
lisFPDocFPDocSyntaxError = 'FPDoc syntax error'; lisFPDocFPDocSyntaxError = 'FPDoc syntax error';
lisFPDocThereIsASyntaxErrorInTheFpdocElement = 'There is a syntax error in ' lisFPDocThereIsASyntaxErrorInTheFpdocElement = 'There is a syntax error in '

4
ide/main.pp
View File

@ -7624,7 +7624,7 @@ begin
AnUnitInfo:=AnUnitInfo.NextPartOfProject; AnUnitInfo:=AnUnitInfo.NextPartOfProject;
end; end;
// check if compiler options contains paths of ObsoleteUnitPaths // check if compiler options contain paths of ObsoleteUnitPaths
if ObsoleteUnitPaths<>'' then begin if ObsoleteUnitPaths<>'' then begin
ProjUnitPaths:=AProject.CompilerOptions.OtherUnitFiles; ProjUnitPaths:=AProject.CompilerOptions.OtherUnitFiles;
p:=1; p:=1;
@ -7651,7 +7651,7 @@ begin
AProject.CompilerOptions.OtherUnitFiles:=ProjUnitPaths; AProject.CompilerOptions.OtherUnitFiles:=ProjUnitPaths;
end; end;
// check if compiler options contains paths of ObsoleteIncPaths // check if compiler options contain paths of ObsoleteIncPaths
if ObsoleteIncPaths<>'' then begin if ObsoleteIncPaths<>'' then begin
ProjIncPaths:=AProject.CompilerOptions.IncludePath; ProjIncPaths:=AProject.CompilerOptions.IncludePath;
p:=1; p:=1;

5
ide/searchfrm.pas
View File

@ -394,6 +394,7 @@ var
SrcEdit.Selection:=AReplace; SrcEdit.Selection:=AReplace;
// count total replacements and adjust offsets // count total replacements and adjust offsets
aLineCount:=LineEndCount(AReplace,aLastLineLength); aLineCount:=LineEndCount(AReplace,aLastLineLength);
//debugln(['DoReplaceLine Replace="',dbgstr(AReplace),'" aLineCount=',aLineCount,' aLastLineLength=',aLastLineLength]);
if aLineCount>0 then begin if aLineCount>0 then begin
// replaced with multiple lines // replaced with multiple lines
LastReplaceColOffset:=aLastLineLength+1-FoundEndPos.X; LastReplaceColOffset:=aLastLineLength+1-FoundEndPos.X;
@ -463,8 +464,8 @@ var
if (TheFileName<>'') then begin if (TheFileName<>'') then begin
OriginalFile.Source:=NewText; OriginalFile.Source:=NewText;
if (not OriginalFile.SaveToFile(TheFileName)) then begin if (not OriginalFile.SaveToFile(TheFileName)) then begin
CurResult:=MessageDlg('Write error', CurResult:=MessageDlg(lisCodeToolsDefsWriteError,
'Error writing file "'+TheFileName+'"', Format(lisErrorWritingFile, [TheFileName]),
mtError,[mbCancel,mbAbort],0); mtError,[mbCancel,mbAbort],0);
if CurResult=mrAbort then DoAbort; if CurResult=mrAbort then DoAbort;
end; end;