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

IDE: Use hard-coded quotation in some resourcestrings instead of %s parameters.

Browse Source 
Makes Format() calls and translations easier although initially creates fuzzy lines in PO files.

git-svn-id: trunk@45519 -
This commit is contained in:
juha 2014-06-15 11:52:01 +00:00
parent 5b42042d6f
commit 75b7c1bd1e
15 changed files with 192 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
converter/missingpropertiesdlg.pas
View File

@ -298,7 +298,7 @@ begin
except except
on E: Exception do begin on E: Exception do begin
Result:=QuestionDlg(lisCodeToolsDefsReadError, Format( Result:=QuestionDlg(lisCodeToolsDefsReadError, Format(
lisUnableToReadFileError, ['"', aFilename, '"', LineEnding, E.Message]), lisUnableToReadFileError, [aFilename, LineEnding, E.Message]),
mtError,[mrIgnore,mrAbort],0); mtError,[mrIgnore,mrAbort],0);
if Result=mrIgnore then // The caller will continue like nothing happened. if Result=mrIgnore then // The caller will continue like nothing happened.
Result:=mrOk; Result:=mrOk;
@ -312,7 +312,7 @@ begin
except except
on E: Exception do begin on E: Exception do begin
Result:=QuestionDlg(lisFormatError, Result:=QuestionDlg(lisFormatError,
Format(lisUnableToConvertFileError, ['"',aFilename,'"',LineEnding,E.Message]), Format(lisUnableToConvertFileError, [aFilename, LineEnding, E.Message]),
mtError,[mrIgnore,mrAbort],0); mtError,[mrIgnore,mrAbort],0);
if Result=mrIgnore then if Result=mrIgnore then
Result:=mrOk; Result:=mrOk;
@ -327,7 +327,7 @@ begin
except except
on E: Exception do begin on E: Exception do begin
Result:=MessageDlg(lisCodeToolsDefsWriteError, Result:=MessageDlg(lisCodeToolsDefsWriteError,
Format(lisUnableToWriteFileError, ['"',aFilename,'"',LineEnding,E.Message]), Format(lisUnableToWriteFileError, [aFilename, LineEnding, E.Message]),
mtError,[mbIgnore,mbAbort],0); mtError,[mbIgnore,mbAbort],0);
if Result=mrIgnore then if Result=mrIgnore then
Result:=mrOk; Result:=mrOk;

36
ide/buildmanager.pas
View File

@ -1342,7 +1342,7 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
begin begin
if not DeleteFileUTF8(AmbiguousFilename) then begin if not DeleteFileUTF8(AmbiguousFilename) then begin
Result:=IDEMessageDialog(lisErrorDeletingFile, Result:=IDEMessageDialog(lisErrorDeletingFile,
Format(lisUnableToDeleteAmbiguousFile, ['"', AmbiguousFilename, '"']), Format(lisUnableToDeleteAmbiguousFile, [AmbiguousFilename]),
mtError,[mbOk,mbAbort]); mtError,[mbOk,mbAbort]);
end else end else
Result:=mrOk; Result:=mrOk;
@ -1356,8 +1356,7 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
if not FileProcs.RenameFileUTF8(AmbiguousFilename,NewFilename) then if not FileProcs.RenameFileUTF8(AmbiguousFilename,NewFilename) then
begin begin
Result:=IDEMessageDialog(lisErrorRenamingFile, Result:=IDEMessageDialog(lisErrorRenamingFile,
Format(lisUnableToRenameAmbiguousFileTo, Format(lisUnableToRenameAmbiguousFileTo,[AmbiguousFilename,LineEnding,NewFilename]),
['"', AmbiguousFilename, '"', LineEnding, '"', NewFilename, '"']),
mtError,[mbOk,mbAbort]); mtError,[mbOk,mbAbort]);
end else end else
Result:=mrOk; Result:=mrOk;
@ -1369,8 +1368,8 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
if Compiling then begin if Compiling then begin
{$IFNDEF EnableOldExtTools} {$IFNDEF EnableOldExtTools}
IDEMessagesWindow.AddCustomMessage(mluError, IDEMessagesWindow.AddCustomMessage(mluError,
Format('ambiguous file found: %s%s%s. Source file is: %s%s%s', Format('ambiguous file found: "%s". Source file is: "%s"',
['"', AmbiguousFilename, '"', '"', AFilename, '"'])); [AmbiguousFilename, AFilename]));
{$ELSE} {$ELSE}
TheOutputFilter.ReadConstLine( TheOutputFilter.ReadConstLine(
Format(lisWarningAmbiguousFileFoundSourceFileIs, Format(lisWarningAmbiguousFileFoundSourceFileIs,
@ -1475,8 +1474,8 @@ begin
CurFilename:=ADirectory+FileInfo.Name; CurFilename:=ADirectory+FileInfo.Name;
if EnvironmentOptions.AmbiguousFileAction=afaAsk then begin if EnvironmentOptions.AmbiguousFileAction=afaAsk then begin
if IDEMessageDialog(lisDeleteAmbiguousFile, if IDEMessageDialog(lisDeleteAmbiguousFile,
Format(lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete, ['"', Format(lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete,
CurFilename, '"', LineEnding, '"', ShortFilename, '"', LineEnding, LineEnding]), [CurFilename, LineEnding, ShortFilename, LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrNo mtConfirmation,[mbYes,mbNo])=mrNo
then continue; then continue;
end; end;
@ -1484,7 +1483,7 @@ begin
then begin then begin
if not DeleteFileUTF8(CurFilename) then begin if not DeleteFileUTF8(CurFilename) then begin
IDEMessageDialog(lisDeleteFileFailed, IDEMessageDialog(lisDeleteFileFailed,
Format(lisPkgMangUnableToDeleteFile, ['"', CurFilename, '"']), Format(lisPkgMangUnableToDeleteFile, [CurFilename]),
mtError,[mbOk]); mtError,[mbOk]);
end; end;
end else if EnvironmentOptions.AmbiguousFileAction=afaAutoRename then end else if EnvironmentOptions.AmbiguousFileAction=afaAutoRename then
@ -1678,7 +1677,7 @@ begin
if not DirPathExists(SubDir) then begin if not DirPathExists(SubDir) then begin
if not CreateDirUTF8(SubDir) then begin if not CreateDirUTF8(SubDir) then begin
Result:=IDEMessageDialog(lisCCOWarningCaption, Result:=IDEMessageDialog(lisCCOWarningCaption,
Format(lisUnableToCreateBackupDirectory, ['"',SubDir, '"']) Format(lisUnableToCreateBackupDirectory, [SubDir])
,mtWarning,[mbAbort,mbRetry,mbIgnore]); ,mtWarning,[mbAbort,mbRetry,mbIgnore]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
if Result=mrIgnore then Result:=mrOk; if Result=mrIgnore then Result:=mrOk;
@ -1708,10 +1707,8 @@ begin
if FileExistsUTF8(BackupFilename) then begin if FileExistsUTF8(BackupFilename) then begin
if not DeleteFileUTF8(BackupFilename) then begin if not DeleteFileUTF8(BackupFilename) then begin
ACaption:=lisDeleteFileFailed; ACaption:=lisDeleteFileFailed;
AText:=Format(lisUnableToRemoveOldBackupFile, ['"', BackupFilename, AText:=Format(lisUnableToRemoveOldBackupFile,[BackupFilename]);
'"']); Result:=IDEMessageDialog(ACaption,AText,mtError,[mbAbort,mbRetry,mbIgnore]);
Result:=IDEMessageDialog(ACaption,AText,mtError,
[mbAbort,mbRetry,mbIgnore]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
if Result=mrIgnore then Result:=mrOk; if Result=mrIgnore then Result:=mrOk;
end; end;
@ -1741,10 +1738,8 @@ begin
if FileExistsUTF8(CounterFilename) then begin if FileExistsUTF8(CounterFilename) then begin
if not DeleteFileUTF8(CounterFilename) then begin if not DeleteFileUTF8(CounterFilename) then begin
ACaption:=lisDeleteFileFailed; ACaption:=lisDeleteFileFailed;
AText:=Format(lisUnableToRemoveOldBackupFile, ['"', AText:=Format(lisUnableToRemoveOldBackupFile,[CounterFilename]);
CounterFilename, '"']); Result:=IDEMessageDialog(ACaption,AText,mtError,[mbAbort,mbRetry,mbIgnore]);
Result:=IDEMessageDialog(ACaption,AText,mtError,
[mbAbort,mbRetry,mbIgnore]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
if Result=mrIgnore then Result:=mrOk; if Result=mrIgnore then Result:=mrOk;
end; end;
@ -1759,8 +1754,8 @@ begin
BackupFilename+IntToStr(i+1)) then BackupFilename+IntToStr(i+1)) then
begin begin
ACaption:=lisRenameFileFailed; ACaption:=lisRenameFileFailed;
AText:=Format(lisUnableToRenameFileTo, ['"', BackupFilename+IntToStr AText:=Format(lisUnableToRenameFileTo,
(i), '"', '"', BackupFilename+IntToStr(i+1), '"']); [BackupFilename+IntToStr(i), BackupFilename+IntToStr(i+1)]);
Result:=IDEMessageDialog(ACaption,AText,mtError, Result:=IDEMessageDialog(ACaption,AText,mtError,
[mbAbort,mbRetry,mbIgnore]); [mbAbort,mbRetry,mbIgnore]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
@ -1777,8 +1772,7 @@ begin
if not IDEProcs.BackupFile(Filename, BackupFilename) then if not IDEProcs.BackupFile(Filename, BackupFilename) then
begin begin
ACaption := lisBackupFileFailed; ACaption := lisBackupFileFailed;
AText := Format(lisUnableToBackupFileTo, ['"', Filename, '"', '"', AText := Format(lisUnableToBackupFileTo, [Filename, BackupFilename]);
BackupFilename, '"']);
Result := IDEMessageDialog(ACaption,AText,mterror,[mbabort,mbretry,mbignore]); Result := IDEMessageDialog(ACaption,AText,mterror,[mbabort,mbretry,mbignore]);
if Result = mrAbort then exit; if Result = mrAbort then exit;
if Result = mrIgnore then Result := mrOk; if Result = mrIgnore then Result := mrOk;

5
ide/buildprojectdlg.pas
View File

@ -545,9 +545,8 @@ begin
if FileExistsUTF8(Filename) and (not DeleteFileUTF8(Filename)) if FileExistsUTF8(Filename) and (not DeleteFileUTF8(Filename))
and (not Quiet) then begin and (not Quiet) then begin
Result:=IDEQuestionDialog(lisDeleteFileFailed, Result:=IDEQuestionDialog(lisDeleteFileFailed,
Format(lisPkgMangUnableToDeleteFile, ['"', Filename, '"']), Format(lisPkgMangUnableToDeleteFile, [Filename]),
mtError, mtError, [mrRetry, mrCancel, mrNo, lisCCOSkip, mrNoToAll, lisSkipErrors]);
[mrRetry, mrCancel, mrNo, lisCCOSkip, mrNoToAll, lisSkipErrors]);
if Result=mrNoToAll then begin if Result=mrNoToAll then begin
Quiet:=true; Quiet:=true;
break; break;

2
ide/cleandirdlg.pas
View File

@ -433,7 +433,7 @@ begin
break; break;
end else begin end else begin
MsgResult:=MessageDlg(lisErrorDeletingFile, MsgResult:=MessageDlg(lisErrorDeletingFile,
Format(lisPkgMangUnableToDeleteFile, ['"', Filename, '"']), Format(lisPkgMangUnableToDeleteFile, [Filename]),
mtError,[mbAbort,mbIgnore,mbRetry],0); mtError,[mbAbort,mbIgnore,mbRetry],0);
if (MsgResult=mrIgnore) then break; if (MsgResult=mrIgnore) then break;
if MsgResult=mrAbort then exit; if MsgResult=mrAbort then exit;

2
ide/codehelp.pas
View File

@ -1310,7 +1310,7 @@ begin
Result:=CodeToolBoss.CreateFile(ExpandedFilename); Result:=CodeToolBoss.CreateFile(ExpandedFilename);
if Result=nil then begin if Result=nil then begin
IDEMessageDialog(lisUnableToCreateFile, IDEMessageDialog(lisUnableToCreateFile,
Format(lisUnableToCreateFile4, [ExpandedFilename]), mtError, [mbCancel]); Format(lisUnableToCreateFile2, [ExpandedFilename]), mtError, [mbCancel]);
exit; exit;
end; end;

33
ide/dialogprocs.pas
View File

@ -138,8 +138,7 @@ begin
end else begin end else begin
DlgButtons:=[mbCancel,mbRetry]+ExtraButtons; DlgButtons:=[mbCancel,mbRetry]+ExtraButtons;
Result:=IDEMessageDialog(lisUnableToRenameFile, Result:=IDEMessageDialog(lisUnableToRenameFile,
Format(lisUnableToRenameFileTo2, Format(lisUnableToRenameFileTo2, [SrcFilename, LineEnding, DestFilename]),
['"', SrcFilename, '"', LineEnding, '"', DestFilename, '"']),
mtError,DlgButtons); mtError,DlgButtons);
if (Result<>mrRetry) then exit; if (Result<>mrRetry) then exit;
end; end;
@ -166,7 +165,7 @@ begin
end else begin end else begin
DlgButtons:=[mbCancel,mbRetry]+ExtraButtons; DlgButtons:=[mbCancel,mbRetry]+ExtraButtons;
Result:=IDEMessageDialog(lisUnableToCopyFile, Result:=IDEMessageDialog(lisUnableToCopyFile,
Format(lisUnableToCopyFileTo,['"',SrcFilename,'"',LineEnding,'"',DestFilename,'"']), Format(lisUnableToCopyFileTo, [SrcFilename, LineEnding, DestFilename]),
mtError,DlgButtons); mtError,DlgButtons);
if (Result<>mrRetry) then exit; if (Result<>mrRetry) then exit;
end; end;
@ -205,8 +204,7 @@ begin
Result:=mrCancel; Result:=mrCancel;
end else begin end else begin
ACaption:=lisFileNotText; ACaption:=lisFileNotText;
AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway, AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway,[AFilename,LineEnding,LineEnding]);
['"', AFilename, '"', LineEnding, LineEnding]);
Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation, Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation,
[mbOk, mbIgnore],ShowAbort); [mbOk, mbIgnore],ShowAbort);
end; end;
@ -231,10 +229,8 @@ begin
Result:=mrCancel Result:=mrCancel
else begin else begin
ACaption:=lisReadError; ACaption:=lisReadError;
AText:=Format(lisUnableToReadFile2, ['"', AFilename, '"']); AText:=Format(lisUnableToReadFile2, [AFilename]);
Result:=IDEMessageDialogAb(ACaption,AText,mtError, Result:=IDEMessageDialogAb(ACaption,AText,mtError,[mbRetry,mbIgnore],ShowAbort);
[mbRetry,mbIgnore],
ShowAbort);
if Result=mrAbort then exit; if Result=mrAbort then exit;
end; end;
end; end;
@ -253,7 +249,7 @@ begin
Result:=mrOk; Result:=mrOk;
end else begin end else begin
Result:=IDEMessageDialog(lisCodeToolsDefsWriteError, Result:=IDEMessageDialog(lisCodeToolsDefsWriteError,
Format(lisUnableToWrite2, ['"', ACodeBuffer.Filename, '"']), Format(lisUnableToWrite2, [ACodeBuffer.Filename]),
mtError,[mbAbort,mbRetry,mbIgnore]); mtError,[mbAbort,mbRetry,mbIgnore]);
end; end;
until Result<>mrRetry; until Result<>mrRetry;
@ -400,7 +396,7 @@ begin
break; break;
end else begin end else begin
Result:=IDEMessageDialog(lisUnableToCreateFile, Result:=IDEMessageDialog(lisUnableToCreateFile,
Format(lisUnableToCreateFilename, ['"', Filename, '"']), Format(lisUnableToCreateFile2, [Filename]),
mtError,ErrorButtons+[mbCancel]); mtError,ErrorButtons+[mbCancel]);
if Result<>mrRetry then exit; if Result<>mrRetry then exit;
end; end;
@ -433,15 +429,15 @@ begin
fs.Free; fs.Free;
except except
Result:=IDEMessageDialog(lisUnableToCreateFile, Result:=IDEMessageDialog(lisUnableToCreateFile,
Format(lisUnableToCreateFilename, ['"', AFilename, '"']), mtError, [ Format(lisUnableToCreateFile2, [AFilename]),
mbCancel, mbAbort]); mtError, [mbCancel, mbAbort]);
exit; exit;
end; end;
end else begin end else begin
// file already exists // file already exists
if WarnOverwrite then begin if WarnOverwrite then begin
Result:=IDEQuestionDialog(lisOverwriteFile, Result:=IDEQuestionDialog(lisOverwriteFile,
Format(lisAFileAlreadyExistsReplaceIt, ['"', AFilename, '"', LineEnding]), Format(lisAFileAlreadyExistsReplaceIt, [AFilename, LineEnding]),
mtConfirmation, [mrYes, lisOverwriteFileOnDisk, mbCancel]); mtConfirmation, [mrYes, lisOverwriteFileOnDisk, mbCancel]);
if Result=mrCancel then exit; if Result=mrCancel then exit;
end; end;
@ -483,7 +479,7 @@ begin
end; end;
except except
Result:=IDEMessageDialog(lisUnableToReadFile, Result:=IDEMessageDialog(lisUnableToReadFile,
Format(lisUnableToReadFile2, ['"', AFilename, '"']), Format(lisUnableToReadFile2, [AFilename]),
mtError, [mbCancel, mbAbort]); mtError, [mbCancel, mbAbort]);
exit; exit;
end; end;
@ -518,8 +514,7 @@ begin
end else begin end else begin
// ask which filename to use // ask which filename to use
case IDEQuestionDialog(lisFileIsSymlink, case IDEQuestionDialog(lisFileIsSymlink,
Format(lisTheFileIsASymlinkOpenInstead, Format(lisTheFileIsASymlinkOpenInstead,[Filename,LineEnding,LineEnding,TargetFilename]),
['"', Filename, '"', LineEnding, LineEnding, '"', TargetFilename, '"']),
mtConfirmation, [mbYes, lisOpenTarget, mbNo, lisOpenSymlink, mbCancel]) mtConfirmation, [mbYes, lisOpenTarget, mbNo, lisOpenSymlink, mbCancel])
of of
mrYes: Filename:=TargetFilename; mrYes: Filename:=TargetFilename;
@ -566,7 +561,7 @@ begin
if not DirPathExists(Dir) then begin if not DirPathExists(Dir) then begin
while not CreateDirUTF8(Dir) do begin while not CreateDirUTF8(Dir) do begin
Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory, Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisUnableToCreateDirectory, ['"', Dir, '"']), Format(lisUnableToCreateDirectory, [Dir]),
mtError,ErrorButtons+[mbCancel]); mtError,ErrorButtons+[mbCancel]);
if Result<>mrRetry then exit; if Result<>mrRetry then exit;
end; end;
@ -598,7 +593,7 @@ begin
if not FileExistsUTF8(Filename) then exit; if not FileExistsUTF8(Filename) then exit;
if not DeleteFileUTF8(Filename) then begin if not DeleteFileUTF8(Filename) then begin
Result:=IDEMessageDialogAb(lisDeleteFileFailed, Result:=IDEMessageDialogAb(lisDeleteFileFailed,
Format(lisPkgMangUnableToDeleteFile, ['"', Filename, '"']), Format(lisPkgMangUnableToDeleteFile, [Filename]),
mtError,[mbCancel,mbRetry]+ErrorButtons-[mbAbort],mbAbort in ErrorButtons); mtError,[mbCancel,mbRetry]+ErrorButtons-[mbAbort],mbAbort in ErrorButtons);
if Result<>mrRetry then exit; if Result<>mrRetry then exit;
end; end;

5
ide/examplemanager.pas
View File

@ -279,9 +279,8 @@ begin
fSelectedFilename:=s; fSelectedFilename:=s;
ModalResult:=mrYes; // mrYes means the selected file will be opened. ModalResult:=mrYes; // mrYes means the selected file will be opened.
end end
else begin else
ShowMessage(Format(lisFileNotFound3, [s])); ShowMessage(Format(lisFileNotFound2, [s]));
end;
end; end;
end; end;

139
ide/lazarusidestrconsts.pas
View File

@ -198,8 +198,8 @@ resourcestring
lisProjectMacroProperties = 'Project macro properties'; lisProjectMacroProperties = 'Project macro properties';
lisOpenProject2 = 'Open project'; lisOpenProject2 = 'Open project';
lisFileHasNoProject = 'File has no project'; lisFileHasNoProject = 'File has no project';
lisTheFileIsNotALazarusProjectCreateANewProjectForThi = 'The file %s%s%s is ' lisTheFileIsNotALazarusProjectCreateANewProjectForThi = 'The file "%s" is '
+'not a Lazarus project.%sCreate a new project for this %s?'; +'not a Lazarus project.%sCreate a new project for this "%s"?';
lisCreateProject = 'Create project'; lisCreateProject = 'Create project';
lisKMSaveProject = 'Save project'; lisKMSaveProject = 'Save project';
lisKMCloseProject = 'Close project'; lisKMCloseProject = 'Close project';
@ -579,12 +579,11 @@ resourcestring
lisDelphiUnit = 'Delphi unit'; lisDelphiUnit = 'Delphi unit';
lisDelphiProject = 'Delphi project'; lisDelphiProject = 'Delphi project';
lisDelphiPackage = 'Delphi package'; lisDelphiPackage = 'Delphi package';
lisUnableToReadFileError = 'Unable to read file %s%s%s%sError: %s';
lisFormatError = 'Format error'; lisFormatError = 'Format error';
lisLFMFileCorrupt = 'LFM file corrupt'; lisLFMFileCorrupt = 'LFM file corrupt';
lisUnableToFindAValidClassnameIn = 'Unable to find a valid classname in %s%s%s'; lisUnableToFindAValidClassnameIn = 'Unable to find a valid classname in "%s"';
lisUnableToConvertFileError = 'Unable to convert file %s%s%s%sError: %s'; lisUnableToConvertFileError = 'Unable to convert file "%s"%sError: %s';
lisUnableToWriteFileError = 'Unable to write file %s%s%s%sError: %s'; lisUnableToWriteFileError = 'Unable to write file "%s"%sError: %s';
lisMissingUnitsComment = 'Comment Out'; lisMissingUnitsComment = 'Comment Out';
lisMissingUnitsForDelphi = 'For Delphi only'; lisMissingUnitsForDelphi = 'For Delphi only';
lisMissingUnitsSearch = 'Search Unit Path'; lisMissingUnitsSearch = 'Search Unit Path';
@ -646,8 +645,7 @@ resourcestring
lisFilesHaveRightEncoding = '*** All found files already have the right encoding ***'; lisFilesHaveRightEncoding = '*** All found files already have the right encoding ***';
lisnoname = 'noname'; lisnoname = 'noname';
lisTheDestinationDirectoryDoesNotExist = 'The destination directory%s%s%s%s ' lisTheDestinationDirectoryDoesNotExist = 'The destination directory%s"%s" does not exist.';
+'does not exist.';
lisRenameFile = 'Rename file?'; lisRenameFile = 'Rename file?';
lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC = 'This looks like a ' lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC = 'This looks like a '
+'Pascal file.%sIt is recommended to use lower case filenames, to avoid ' +'Pascal file.%sIt is recommended to use lower case filenames, to avoid '
@ -656,65 +654,60 @@ resourcestring
lisRenameToLowercase = 'Rename to lowercase'; lisRenameToLowercase = 'Rename to lowercase';
lisKeepName = 'Keep name'; lisKeepName = 'Keep name';
lisOverwriteFile = 'Overwrite file?'; lisOverwriteFile = 'Overwrite file?';
lisAFileAlreadyExistsReplaceIt = 'A file %s%s%s already exists.%sReplace it?'; lisAFileAlreadyExistsReplaceIt = 'A file "%s" already exists.%sReplace it?';
lisOverwriteFileOnDisk = 'Overwrite file on disk'; lisOverwriteFileOnDisk = 'Overwrite file on disk';
lisAmbiguousFilesFound = 'Ambiguous files found'; lisAmbiguousFilesFound = 'Ambiguous files found';
lisThereAreOtherFilesInTheDirectoryWithTheSameName = 'There are other files ' lisThereAreOtherFilesInTheDirectoryWithTheSameName = 'There are other files '
+'in the directory with the same name,%swhich only differ in case:%s%s%' +'in the directory with the same name,%swhich only differ in case:%s%s%'
+'sDelete them?'; +'sDelete them?';
lisDeleteOldFile = 'Delete old file %s%s%s?'; lisDeleteOldFile = 'Delete old file "%s"?';
lisDeletingOfFileFailed = 'Deleting of file %s%s%s failed.'; lisDeletingOfFileFailed = 'Deleting of file "%s" failed.';
lisStreamingError = 'Streaming error'; lisStreamingError = 'Streaming error';
lisUnableToStreamT = 'Unable to stream %s:T%s.'; lisUnableToStreamT = 'Unable to stream %s:T%s.';
lisPathToInstance = 'Path to failed Instance:'; lisPathToInstance = 'Path to failed Instance:';
lisResourceSaveError = 'Resource save error'; lisResourceSaveError = 'Resource save error';
lisUnableToAddResourceHeaderCommentToResourceFile = 'Unable to add resource ' lisUnableToAddResourceHeaderCommentToResourceFile = 'Unable to add resource '
+'header comment to resource file %s%s%s%s.%sProbably a syntax error.'; +'header comment to resource file %s"%s".%sProbably a syntax error.';
lisUnableToAddResourceTFORMDATAToResourceFileProbably = 'Unable to add ' lisUnableToAddResourceTFORMDATAToResourceFileProbably = 'Unable to add '
+'resource T%s:FORMDATA to resource file %s%s%s%s.%sProbably a syntax error.'; +'resource T%s:FORMDATA to resource file %s"%s".%sProbably a syntax error.';
lisUnableToCreateFile2 = 'Unable to create file %s%s%s';
lisContinueWithoutLoadingForm = 'Continue without loading form'; lisContinueWithoutLoadingForm = 'Continue without loading form';
lisCancelLoadingUnit = 'Cancel loading unit'; lisCancelLoadingUnit = 'Cancel loading unit';
lisAbortAllLoading = 'Abort all loading'; lisAbortAllLoading = 'Abort all loading';
lisSkipFile = 'Skip file'; lisSkipFile = 'Skip file';
lisUnableToTransformBinaryComponentStreamOfTIntoText = 'Unable to transform ' lisUnableToTransformBinaryComponentStreamOfTIntoText = 'Unable to transform '
+'binary component stream of %s:T%s into text.'; +'binary component stream of %s:T%s into text.';
lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject = 'The file %s%s%s%' lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject = 'The file "%s"%swas not '
+'swas not found.%sIgnore will go on loading the project,%sAbort will ' +'found.%sIgnore will go on loading the project,%sAbort will stop the loading.';
+'stop the loading.';
lisSkipFileAndContinueLoading = 'Skip file and continue loading'; lisSkipFileAndContinueLoading = 'Skip file and continue loading';
lisAbortLoadingProject = 'Abort loading project'; lisAbortLoadingProject = 'Abort loading project';
lisFileNotFound2 = 'File %s%s%s not found.%s'; lisFileNotFound2 = 'File "%s" not found.';
lisFileNotFoundDoYouWantToCreateIt = 'File %s%s%s not found.%sDo you want ' lisFileNotFoundDoYouWantToCreateIt = 'File "%s" not found.%sDo you want to create it?';
+'to create it?%s';
lisProjectInfoFileDetected = 'Project info file detected'; lisProjectInfoFileDetected = 'Project info file detected';
lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarusP = 'The file %s seems ' lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarusP = 'The file %s seems '
+'to be the program file of an existing Lazarus Project.'; +'to be the program file of an existing Lazarus Project.';
lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file %s%s%s%sseems to ' lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file "%s"%sseems to '
+'be a program. Close current project and create a new Lazarus project ' +'be a program. Close current project and create a new Lazarus project '
+'for this program?%s"No" will load the file as normal source.'; +'for this program?%s"No" will load the file as normal source.';
lisProgramDetected = 'Program detected'; lisProgramDetected = 'Program detected';
lisUnableToConvertTextFormDataOfFileIntoBinaryStream = 'Unable to convert ' lisUnableToConvertTextFormDataOfFileIntoBinaryStream = 'Unable to convert '
+'text form data of file %s%s%s%s%sinto binary stream. (%s)'; +'text form data of file %s"%s"%sinto binary stream. (%s)';
lisSaveProject = 'Save project %s (*%s)'; lisSaveProject = 'Save project %s (*%s)';
lisRemoveUnitPath = 'Remove unit path?'; lisRemoveUnitPath = 'Remove unit path?';
lisTheDirectoryContainsNoProjectUnitsAnyMoreRemoveThi = 'The directory "%s" ' lisTheDirectoryContainsNoProjectUnitsAnyMoreRemoveThi = 'The directory "%s" '
+'contains no project units any more. Remove this directory from the ' +'contains no project units any more. Remove this directory from the '
+'project''s unit search path?'; +'project''s unit search path?';
lisInvalidProjectFilename = 'Invalid project filename'; lisInvalidProjectFilename = 'Invalid project filename';
lisisAnInvalidProjectNamePleaseChooseAnotherEGProject = '%s%s%s is an ' lisisAnInvalidProjectNamePleaseChooseAnotherEGProject = '"%s" is an '
+'invalid project name.%sPlease choose another (e.g. project1.lpi)'; +'invalid project name.%sPlease choose another (e.g. project1.lpi)';
lisChooseADifferentName = 'Choose a different name'; lisChooseADifferentName = 'Choose a different name';
lisTheProjectInfoFileIsEqualToTheProjectMainSource = 'The project info ' lisTheProjectInfoFileIsEqualToTheProjectMainSource = 'The project info '
+'file %s%s%s%sis equal to the project main source file!'; +'file "%s"%sis equal to the project main source file!';
lisUnitIdentifierExists = 'Unit identifier exists'; lisUnitIdentifierExists = 'Unit identifier exists';
lisThereIsAUnitWithTheNameInTheProjectPleaseChoose = 'There is a unit with the ' lisThereIsAUnitWithTheNameInTheProjectPleaseChoose = 'There is a unit with the '
+'name %s%s%s in the project.%sPlease choose a different name'; +'name "%s" in the project.%sPlease choose a different name';
lisErrorCreatingFile = 'Error creating file'; lisErrorCreatingFile = 'Error creating file';
lisUnableToCreateFile3 = 'Unable to create file%s%s%s%s';
lisCopyError2 = 'Copy error'; lisCopyError2 = 'Copy error';
lisSourceDirectoryDoesNotExist = 'Source directory %s%s%s does not exist.'; lisSourceDirectoryDoesNotExist = 'Source directory "%s" does not exist.';
lisUnableToCopyFileTo = 'Unable to copy file %s%s%s%sto %s%s%s';
lisSorryThisTypeIsNotYetImplemented = 'Sorry, this type is not yet implemented'; lisSorryThisTypeIsNotYetImplemented = 'Sorry, this type is not yet implemented';
lisFileHasChangedSave = 'File "%s" has changed. Save?'; lisFileHasChangedSave = 'File "%s" has changed. Save?';
lisUnitHasChangedSave = 'Unit "%s" has changed. Save?'; lisUnitHasChangedSave = 'Unit "%s" has changed. Save?';
@ -726,31 +719,27 @@ resourcestring
lisOpenPackage = 'Open Package?'; lisOpenPackage = 'Open Package?';
lisOpenThePackage = 'Open the package %s?'; lisOpenThePackage = 'Open the package %s?';
lisRevertFailed = 'Revert failed'; lisRevertFailed = 'Revert failed';
lisFileIsVirtual = 'File %s%s%s is virtual.'; lisFileIsVirtual = 'File "%s" is virtual.';
lisUnableToWrite = 'Unable to write %s%s%s%s%s.';
lisFileNotText = 'File not text'; lisFileNotText = 'File not text';
lisUnableToRenameFile = 'Unable to rename file'; lisUnableToRenameFile = 'Unable to rename file';
lisUnableToCopyFile = 'Unable to copy file'; lisUnableToCopyFile = 'Unable to copy file';
lisWriteError = 'Write Error'; lisWriteError = 'Write Error';
lisUnableToWriteFile2 = 'Unable to write file "%s".';
lisByte = '%s byte'; lisByte = '%s byte';
lisFileDoesNotLookLikeATextFileOpenItAnyway = lisFileDoesNotLookLikeATextFileOpenItAnyway =
'File %s%s%s%sdoes not look like a text file.%sOpen it anyway?'; 'File "%s"%sdoes not look like a text file.%sOpen it anyway?';
lisUnableToCreateBackupDirectory = 'Unable to create backup directory %s%s%s.'; lisUnableToCreateBackupDirectory = 'Unable to create backup directory "%s".';
lisSourceAndDestinationAreTheSame = 'Source and Destination are the same:%s%s'; lisSourceAndDestinationAreTheSame = 'Source and Destination are the same:%s%s';
lisUnableToRenameFileTo2 = 'Unable to rename file %s%s%s%sto %s%s%s.';
lisInvalidCommand = 'Invalid command'; lisInvalidCommand = 'Invalid command';
lisTheCommandAfterIsNotExecutable = 'The command after %s%s%s is not executable.'; lisTheCommandAfterIsNotExecutable = 'The command after "%s" is not executable.';
lisUnableToCleanUpDestinationDirectory = 'Unable to clean up destination directory'; lisUnableToCleanUpDestinationDirectory = 'Unable to clean up destination directory';
lisCommandAfterInvalid = 'Command after invalid'; lisCommandAfterInvalid = 'Command after invalid';
lisTheCommandAfterPublishingIsInvalid = 'The command after publishing is invalid:%s%s%s%s'; lisTheCommandAfterPublishingIsInvalid = 'The command after publishing is invalid:%s"%s"';
lisUnableToCleanUpPleaseCheckPermissions = 'Unable to clean up %s%s%s.%' lisUnableToCleanUpPleaseCheckPermissions = 'Unable to clean up "%s".%sPlease check permissions.';
+'sPlease check permissions.';
lisCommandAfterPublishingModule = 'Command after publishing module'; lisCommandAfterPublishingModule = 'Command after publishing module';
lisUnableToAddToProjectBecauseThereIsAlreadyAUnitWith = 'Unable to add %s ' lisUnableToAddToProjectBecauseThereIsAlreadyAUnitWith = 'Unable to add %s '
+'to project, because there is already a unit with the same name in the Project.'; +'to project, because there is already a unit with the same name in the Project.';
lisAddToProject = 'Add %s to project?'; lisAddToProject = 'Add %s to project?';
lisTheFile = 'The file %s%s%s'; lisTheFile = 'The file "%s"';
lisAddToUnitSearchPath = 'Add to unit search path?'; lisAddToUnitSearchPath = 'Add to unit search path?';
lisAddToIncludeSearchPath = 'Add to include search path?'; lisAddToIncludeSearchPath = 'Add to include search path?';
lisTheNewIncludeFileIsNotYetInTheIncludeSearchPathAdd = lisTheNewIncludeFileIsNotYetInTheIncludeSearchPathAdd =
@ -761,7 +750,7 @@ resourcestring
lisRemoveFromProject = 'Remove from Project'; lisRemoveFromProject = 'Remove from Project';
lisCreateAProjectFirst = 'Create a project first!'; lisCreateAProjectFirst = 'Create a project first!';
lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt = 'The Test Directory ' lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt = 'The Test Directory '
+'could not be found:%s%s%s%s%s(see IDE options)'; +'could not be found:%s"%s"%s(see IDE options)';
lisBuildNewProject = 'Build new project'; lisBuildNewProject = 'Build new project';
lisTheProjectMustBeSavedBeforeBuildingIfYouSetTheTest = 'The project must ' lisTheProjectMustBeSavedBeforeBuildingIfYouSetTheTest = 'The project must '
+'be saved before building%sIf you set the Test Directory in the ' +'be saved before building%sIf you set the Test Directory in the '
@ -780,8 +769,9 @@ resourcestring
+'Lazarus while debugging or compiling.'; +'Lazarus while debugging or compiling.';
lisReadError = 'Read Error'; lisReadError = 'Read Error';
lisUnableToReadFile = 'Unable to read file'; lisUnableToReadFile = 'Unable to read file';
lisUnableToReadFile2 = 'Unable to read file %s%s%s.'; lisUnableToReadFile2 = 'Unable to read file "%s".';
lisUnableToReadTheProjectInfoFile = 'Unable to read the project info file%s%s%s%s.'; lisUnableToReadFileError = 'Unable to read file "%s"%sError: %s';
lisUnableToReadTheProjectInfoFile = 'Unable to read the project info file%s"%s".';
lisUnableToReadLpi = 'Unable to read lpi'; lisUnableToReadLpi = 'Unable to read lpi';
lisStrangeLpiFile = 'Strange lpi file'; lisStrangeLpiFile = 'Strange lpi file';
lisTheFileDoesNotLookLikeALpiFile = 'The file %s does not look like a lpi file.'; lisTheFileDoesNotLookLikeALpiFile = 'The file %s does not look like a lpi file.';
@ -792,27 +782,27 @@ resourcestring
+'packages contain a unit with the same name.'; +'packages contain a unit with the same name.';
lisIgnoreAll = 'Ignore all'; lisIgnoreAll = 'Ignore all';
lisDeleteFileFailed = 'Delete file failed'; lisDeleteFileFailed = 'Delete file failed';
lisUnableToRemoveOldBackupFile = 'Unable to remove old backup file %s%s%s!'; lisUnableToRemoveOldBackupFile = 'Unable to remove old backup file "%s"!';
lisRenameFileFailed = 'Rename file failed'; lisRenameFileFailed = 'Rename file failed';
lisUnableToRenameFileTo = 'Unable to rename file %s%s%s to %s%s%s!'; lisUnableToRenameFileTo = 'Unable to rename file "%s" to "%s"!';
lisUnableToRenameFileTo2= 'Unable to rename file "%s"%sto "%s".';
lisBackupFileFailed = 'Backup file failed'; lisBackupFileFailed = 'Backup file failed';
lisUnableToBackupFileTo = 'Unable to backup file %s%s%s to %s%s%s!'; lisUnableToBackupFileTo = 'Unable to backup file "%s" to "%s"!';
lisFileNotLowercase = 'File not lowercase'; lisFileNotLowercase = 'File not lowercase';
lisTheUnitIsNotLowercaseTheFreePascalCompiler = 'The unit filename %s%s%s is ' lisTheUnitIsNotLowercaseTheFreePascalCompiler = 'The unit filename "%s" is '
+'not lowercase.%sThe Free Pascal compiler does not search for all cases.' +'not lowercase.%sThe Free Pascal compiler does not search for all cases.'
+' It is recommended to use lowercase filename.%s%sRename file lowercase?'; +' It is recommended to use lowercase filename.%s%sRename file lowercase?';
lisDeleteAmbiguousFile = 'Delete ambiguous file?'; lisDeleteAmbiguousFile = 'Delete ambiguous file?';
lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete = 'Ambiguous file ' lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete = 'Ambiguous file '
+'found: %s%s%s%sThis file can be mistaken with %s%s%s%s%sDelete the ' +'found: "%s"%sThis file can be mistaken with "%s"%s%sDelete the ambiguous file?';
+'ambiguous file?';
lisLazarusEditorV = 'Lazarus IDE v%s'; lisLazarusEditorV = 'Lazarus IDE v%s';
lisnewProject = '(new project)'; lisnewProject = '(new project)';
liscompiling = '%s (compiling ...)'; liscompiling = '%s (compiling ...)';
lisdebugging = '%s (debugging ...)'; lisdebugging = '%s (debugging ...)';
lisRunning = '%s (running ...)'; lisRunning = '%s (running ...)';
lisUnableToFindFile = 'Unable to find file %s%s%s.'; lisUnableToFindFile = 'Unable to find file "%s".';
lisUnableToFindFileCheckSearchPathInProjectCompilerOption = 'Unable to find ' lisUnableToFindFileCheckSearchPathInProjectCompilerOption = 'Unable to find '
+'file %s%s%s.%sIf it belongs to your project, check search path ' +'file "%s".%sIf it belongs to your project, check search path '
+'in%sProject -> Compiler Options -> Search Paths -> Other Unit Files.' +'in%sProject -> Compiler Options -> Search Paths -> Other Unit Files.'
+' If this file belongs to a package, check the appropriate package compiler' +' If this file belongs to a package, check the appropriate package compiler'
+' options. If this file belongs to Lazarus, make sure compiling clean.' +' options. If this file belongs to Lazarus, make sure compiling clean.'
@ -1010,7 +1000,7 @@ resourcestring
+'As Lazarus is growing we need more developers.'; +'As Lazarus is growing we need more developers.';
lisAboutNoContributors = 'Cannot find contributors list.'; lisAboutNoContributors = 'Cannot find contributors list.';
lisUnitNameAlreadyExistsCap = 'Unitname already in project'; lisUnitNameAlreadyExistsCap = 'Unitname already in project';
lisTheUnitAlreadyExists = 'The unit %s%s%s already exists.'; lisTheUnitAlreadyExists = 'The unit "%s" already exists.';
lisForceRenaming = 'Force renaming'; lisForceRenaming = 'Force renaming';
lisCancelRenaming = 'Cancel renaming'; lisCancelRenaming = 'Cancel renaming';
lisAbortAll = 'Abort all'; lisAbortAll = 'Abort all';
@ -3365,12 +3355,12 @@ resourcestring
+'designer.%sThe class %s does not descend from a designable class like ' +'designer.%sThe class %s does not descend from a designable class like '
+'TForm or TDataModule.'; +'TForm or TDataModule.';
lisUnableToLoadTheComponentClassBecauseItDependsOnIts = 'Unable to load the ' lisUnableToLoadTheComponentClassBecauseItDependsOnIts = 'Unable to load the '
+'component class %s%s%s, because it depends on itself.'; +'component class "%s", because it depends on itself.';
lisCancelLoadingThisComponent = 'Cancel loading this component'; lisCancelLoadingThisComponent = 'Cancel loading this component';
lisAbortWholeLoading = 'Abort whole loading'; lisAbortWholeLoading = 'Abort whole loading';
lisIgnoreUseTFormAsAncestor = 'Ignore, use TForm as ancestor'; lisIgnoreUseTFormAsAncestor = 'Ignore, use TForm as ancestor';
lisTheResourceClassDescendsFromProbablyThisIsATypoFor = 'The resource ' lisTheResourceClassDescendsFromProbablyThisIsATypoFor = 'The resource '
+'class %s%s%s descends from %s%s%s. Probably this is a typo for TForm.'; +'class "%s" descends from "%s". Probably this is a typo for TForm.';
// make resource string dialog // make resource string dialog
lisMakeResourceString = 'Make ResourceString'; lisMakeResourceString = 'Make ResourceString';
@ -3541,13 +3531,15 @@ resourcestring
// file checks // file checks
lisUnableToCreateFile = 'Unable to create file'; lisUnableToCreateFile = 'Unable to create file';
lisUnableToCreateFile4 = 'Unable to create file %s'; lisUnableToCreateFile2 = 'Unable to create file "%s"';
lisCanNotCreateFile = 'Cannot create file %s%s%s'; lisUnableToCreateFile3 = 'Unable to create file%s"%s"';
lisUnableToCopyFileTo = 'Unable to copy file "%s"%sto "%s"';
lisCanNotCreateFile = 'Cannot create file "%s"';
lisExtendUnitPath = 'Extend unit path?'; lisExtendUnitPath = 'Extend unit path?';
lisTheDirectoryIsNotYetInTheUnitPathAddIt = 'The directory %s%s%s is not ' lisTheDirectoryIsNotYetInTheUnitPathAddIt = 'The directory "%s" is not yet in the unit path.%sAdd it?';
+'yet in the unit path.%sAdd it?'; lisUnableToWrite2 = 'Unable to write "%s"';
lisUnableToCreateFilename = 'Unable to create file %s%s%s.';
lisUnableToWriteFile = 'Unable to write file'; lisUnableToWriteFile = 'Unable to write file';
lisUnableToWriteFile2 = 'Unable to write file "%s".';
lisUnableToWriteToFile2 = 'Unable to write to file "%s".'; lisUnableToWriteToFile2 = 'Unable to write to file "%s".';
lisFileIsNotWritable = 'File is not writable'; lisFileIsNotWritable = 'File is not writable';
lisErrorDeletingFile = 'Error deleting file'; lisErrorDeletingFile = 'Error deleting file';
@ -3555,10 +3547,9 @@ resourcestring
lisTheFileMaskIsNotAValidRegularExpression = 'The file mask "%s" is not a ' lisTheFileMaskIsNotAValidRegularExpression = 'The file mask "%s" is not a '
+'valid regular expression.'; +'valid regular expression.';
lisTheFileMaskIsInvalid = 'The file mask "%s" is invalid.'; lisTheFileMaskIsInvalid = 'The file mask "%s" is invalid.';
lisUnableToDeleteAmbiguousFile = 'Unable to delete ambiguous file %s%s%s'; lisUnableToDeleteAmbiguousFile = 'Unable to delete ambiguous file "%s"';
lisErrorRenamingFile = 'Error renaming file'; lisErrorRenamingFile = 'Error renaming file';
lisUnableToRenameAmbiguousFileTo = 'Unable to rename ambiguous file %s%s%s%' lisUnableToRenameAmbiguousFileTo = 'Unable to rename ambiguous file "%s"%sto "%s"';
+'sto %s%s%s';
lisWarningAmbiguousFileFoundSourceFileIs = 'Warning: ambiguous file found: %' lisWarningAmbiguousFileFoundSourceFileIs = 'Warning: ambiguous file found: %'
+'s%s%s. Source file is: %s%s%s'; +'s%s%s. Source file is: %s%s%s';
lisAmbiguousFileFound = 'Ambiguous file found'; lisAmbiguousFileFound = 'Ambiguous file found';
@ -3649,8 +3640,8 @@ resourcestring
lisExecutionStopped = 'Execution stopped'; lisExecutionStopped = 'Execution stopped';
lisFileNotFound = 'File not found'; lisFileNotFound = 'File not found';
lisCleanUpUnitPath = 'Clean up unit path?'; lisCleanUpUnitPath = 'Clean up unit path?';
lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt = 'The directory %s%s%' lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt =
+'s is no longer needed in the unit path.%sRemove it?'; 'The directory "%s" is no longer needed in the unit path.%sRemove it?';
lisTheFileWasNotFoundDoYouWantToLocateItYourself = 'The file %s%s%s%swas ' lisTheFileWasNotFoundDoYouWantToLocateItYourself = 'The file %s%s%s%swas '
+'not found.%sDo you want to locate it yourself ?%s'; +'not found.%sDo you want to locate it yourself ?%s';
lisRunToFailed = 'Run-to failed'; lisRunToFailed = 'Run-to failed';
@ -3808,7 +3799,7 @@ resourcestring
+'like a compiled unit. Compiled units must be in the output directory of ' +'like a compiled unit. Compiled units must be in the output directory of '
+'the package, otherwise other packages can get problems using this ' +'the package, otherwise other packages can get problems using this '
+'package.%s%sDelete ambiguous file?'; +'package.%s%sDelete ambiguous file?';
lisPkgMangUnableToDeleteFile = 'Unable to delete file %s%s%s.'; lisPkgMangUnableToDeleteFile = 'Unable to delete file "%s".';
lisSkipErrors = 'Skip errors'; lisSkipErrors = 'Skip errors';
lisDeleteAllTheseFiles = 'Delete all these files?'; lisDeleteAllTheseFiles = 'Delete all these files?';
lisPkgMangUnsavedPackage = 'Unsaved package'; lisPkgMangUnsavedPackage = 'Unsaved package';
@ -3855,7 +3846,7 @@ resourcestring
lisPkgMangUnableToReadStateFileOfPackageError = 'Unable to read state file %' lisPkgMangUnableToReadStateFileOfPackageError = 'Unable to read state file %'
+'s%s%s%sof package %s.%sError: %s'; +'s%s%s%sof package %s.%sError: %s';
lisPkgMangUnableToCreateDirectory = 'Unable to create directory'; lisPkgMangUnableToCreateDirectory = 'Unable to create directory';
lisUnableToCreateDirectory = 'Unable to create directory %s%s%s.'; lisUnableToCreateDirectory = 'Unable to create directory "%s".';
lisPkgMangUnableToCreateOutputDirectoryForPackage = 'Unable to create ' lisPkgMangUnableToCreateOutputDirectoryForPackage = 'Unable to create '
+'output directory %s%s%s%sfor package %s.'; +'output directory %s%s%s%sfor package %s.';
lisPkgMangUnableToDeleteFilename = 'Unable to delete file'; lisPkgMangUnableToDeleteFilename = 'Unable to delete file';
@ -3894,7 +3885,7 @@ resourcestring
lisPkgMangInvalidPackageFilename = 'Invalid package filename'; lisPkgMangInvalidPackageFilename = 'Invalid package filename';
lisPkgMangThePackageFileNameInIsNotAValidLazarusPackageName = 'The package ' lisPkgMangThePackageFileNameInIsNotAValidLazarusPackageName = 'The package '
+'file name %s%s%s in%s%s%s%s is not a valid Lazarus package name.'; +'file name %s%s%s in%s%s%s%s is not a valid Lazarus package name.';
lisPkgMangFileNotFound = 'File %s%s%s not found.'; lisPkgMangFileNotFound = 'File "%s" not found.';
lisPkgMangErrorReadingPackage = 'Error Reading Package'; lisPkgMangErrorReadingPackage = 'Error Reading Package';
lisPkgUnableToReadPackageFileError = 'Unable to read package file %s%s%s.%sError: %s'; lisPkgUnableToReadPackageFileError = 'Unable to read package file %s%s%s.%sError: %s';
lisPkgMangFilenameDiffersFromPackagename = lisPkgMangFilenameDiffersFromPackagename =
@ -4708,15 +4699,13 @@ resourcestring
rsFilterTheListWithString = 'Filter the lines in list with a string'; rsFilterTheListWithString = 'Filter the lines in list with a string';
// Application Bundle // Application Bundle
lisUnableToWrite2 = 'Unable to write %s%s%s';
lisErrorLoadingFrom = 'Error loading %s from%s%s%s%s'; lisErrorLoadingFrom = 'Error loading %s from%s%s%s%s';
lisErrorSavingTo = 'Error saving %s to%s%s%s%s'; lisErrorSavingTo = 'Error saving %s to%s%s%s%s';
lisXMLError = 'XML Error'; lisXMLError = 'XML Error';
lisXMLParserErrorInFileError = 'XML parser error in file %s%sError: %s'; lisXMLParserErrorInFileError = 'XML parser error in file %s%sError: %s';
lisUnableToWriteXmlStreamToError = 'Unable to write xml stream to %s%sError: %s'; lisUnableToWriteXmlStreamToError = 'Unable to write xml stream to %s%sError: %s';
lisFileIsSymlink = 'File is symlink'; lisFileIsSymlink = 'File is symlink';
lisTheFileIsASymlinkOpenInstead = 'The file %s%s%s is a symlink.%s%sOpen %s%' lisTheFileIsASymlinkOpenInstead = 'The file "%s" is a symlink.%s%sOpen "%s" instead?';
+'s%s instead?';
lisOpenTarget = 'Open target'; lisOpenTarget = 'Open target';
lisOpenSymlink = 'Open symlink'; lisOpenSymlink = 'Open symlink';
lisFileLinkError = 'File link error'; lisFileLinkError = 'File link error';
@ -4908,15 +4897,15 @@ resourcestring
+'not be deleted, because it is not owned by %s.'; +'not be deleted, because it is not owned by %s.';
lisFilter3 = 'Filter: %s'; lisFilter3 = 'Filter: %s';
lisInvalidPublishingDirectory = 'Invalid publishing Directory'; lisInvalidPublishingDirectory = 'Invalid publishing Directory';
lisSourceDirectoryAndDestinationDirectoryAreTheSameMa = 'Source directory %' lisSourceDirectoryAndDestinationDirectoryAreTheSameMa = 'Source directory '
+'s%s%s%sand destination directory %s%s%s%sare the same.%s%sMaybe you ' +'"%s"%sand destination directory "%s"%sare the same.%s%sMaybe you '
+'misunderstand this feature.%sIt will clean/recreate the destination ' +'misunderstand this feature.%sIt will clean/recreate the destination '
+'directory%sand copies the package/project into it.'; +'directory%sand copies the package/project into it.';
lisClearDirectory = 'Clear Directory?'; lisClearDirectory = 'Clear Directory?';
lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil = 'In order to create ' lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil = 'In order to create '
+'a clean copy of the project/package, all files in the following ' +'a clean copy of the project/package, all files in the following '
+'directory will be deleted and all its content will be lost.%s%sDelete ' +'directory will be deleted and all its content will be lost.%s%sDelete '
+'all files in %s%s%s?'; +'all files in "%s"?';
lisFileExtensionOfPrograms = 'File extension of programs'; lisFileExtensionOfPrograms = 'File extension of programs';
lisEveryNThLineNumber = 'Every n-th line number'; lisEveryNThLineNumber = 'Every n-th line number';
lisShowOverviewGutter = 'Show overview Gutter'; lisShowOverviewGutter = 'Show overview Gutter';
@ -4972,8 +4961,7 @@ resourcestring
+'environmentoptions.xml'; +'environmentoptions.xml';
lisOverrideTheProjectBuildMode = '%soverride the project or IDE build mode.'; lisOverrideTheProjectBuildMode = '%soverride the project or IDE build mode.';
lisProjectChangedOnDisk = 'Project changed on disk'; lisProjectChangedOnDisk = 'Project changed on disk';
lisTheProjectInformationFileHasChangedOnDisk = 'The project information ' lisTheProjectInformationFileHasChangedOnDisk = 'The project information file "%s"%shas changed on disk.';
+'file %s%s%s%shas changed on disk.';
lisReopenProject = 'Reopen project'; lisReopenProject = 'Reopen project';
rsScanners = 'Scanners'; rsScanners = 'Scanners';
rsAvailableScanners = 'Available scanners'; rsAvailableScanners = 'Available scanners';
@ -5132,8 +5120,7 @@ resourcestring
lisThisFunctionNeedsAnOpenLfmFileInTheSourceEditor = 'This function needs ' lisThisFunctionNeedsAnOpenLfmFileInTheSourceEditor = 'This function needs '
+'an open .lfm file in the source editor.'; +'an open .lfm file in the source editor.';
lisNoPascalFile = 'No Pascal file'; lisNoPascalFile = 'No Pascal file';
lisUnableToFindPascalUnitPasPpForLfmFile = 'Unable to find Pascal unit (.' lisUnableToFindPascalUnitPasPpForLfmFile = 'Unable to find Pascal unit (.pas, .pp) for .lfm file%s"%s"';
+'pas, .pp) for .lfm file%s%s%s%s';
lisLFMIsOk = 'LFM is ok'; lisLFMIsOk = 'LFM is ok';
lisClassesAndPropertiesExistValuesWereNotChecked = 'Classes and properties ' lisClassesAndPropertiesExistValuesWereNotChecked = 'Classes and properties '
+'exist. Values were not checked.'; +'exist. Values were not checked.';

31
ide/main.pp
View File

@ -6300,7 +6300,7 @@ begin
// check if file exists // check if file exists
if not FileExistsCached(AFilename) then begin if not FileExistsCached(AFilename) then begin
ACaption:=lisFileNotFound; ACaption:=lisFileNotFound;
AText:=Format(lisPkgMangFileNotFound, ['"', AFilename, '"']); AText:=Format(lisPkgMangFileNotFound, [AFilename]);
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbAbort]); Result:=IDEMessageDialog(ACaption, AText, mtError, [mbAbort]);
exit; exit;
end; end;
@ -6324,14 +6324,13 @@ begin
if (not FileUtil.FileIsText(AFilename,FileReadable)) and FileReadable then if (not FileUtil.FileIsText(AFilename,FileReadable)) and FileReadable then
begin begin
ACaption:=lisFileNotText; ACaption:=lisFileNotText;
AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway, AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway,[AFilename,LineEnding,LineEnding]);
['"', AFilename, '"', LineEnding, LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtConfirmation, [mbYes, mbAbort]); Result:=IDEMessageDialog(ACaption, AText, mtConfirmation, [mbYes, mbAbort]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
end; end;
if not FileReadable then begin if not FileReadable then begin
Result:=IDEQuestionDialog(lisUnableToReadFile, Result:=IDEQuestionDialog(lisUnableToReadFile,
Format(lisUnableToReadFile2, ['"', AFilename, '"']), Format(lisUnableToReadFile2, [AFilename]),
mtError, [mrCancel, lisSkipFile, mrAbort, lisAbortAllLoading]); mtError, [mrCancel, lisSkipFile, mrAbort, lisAbortAllLoading]);
exit; exit;
end; end;
@ -6496,7 +6495,7 @@ begin
if (TestDir<>'') then begin if (TestDir<>'') then begin
IDEMessageDialog(lisCCOErrorCaption, IDEMessageDialog(lisCCOErrorCaption,
Format(lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt, Format(lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt,
[LineEnding, '"', EnvironmentOptions.TestBuildDirectory, '"', LineEnding]), [LineEnding, EnvironmentOptions.TestBuildDirectory, LineEnding]),
mtError, [mbCancel]); mtError, [mbCancel]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
@ -8522,12 +8521,12 @@ begin
end; end;
end else begin end else begin
if FilenameIsAbsolute(Filename) then begin if FilenameIsAbsolute(Filename) then begin
IDEMessageDialog(lisInformation, Format(lisUnableToFindFile, ['"', IDEMessageDialog(lisInformation,
Filename, '"']), mtInformation,[mbOk]) Format(lisUnableToFindFile, [Filename]), mtInformation,[mbOk])
end else if Filename<>'' then begin end else if Filename<>'' then begin
IDEMessageDialog(lisInformation, Format( IDEMessageDialog(lisInformation,
lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"', Format(lisUnableToFindFileCheckSearchPathInProjectCompilerOption,
Filename, '"', LineEnding, LineEnding]), [Filename, LineEnding, LineEnding]),
mtInformation,[mbOk]); mtInformation,[mbOk]);
end; end;
end; end;
@ -8647,13 +8646,13 @@ begin
end; end;
end else if AFilename<>'' then begin end else if AFilename<>'' then begin
if FilenameIsAbsolute(AFilename) then begin if FilenameIsAbsolute(AFilename) then begin
IDEMessageDialog(lisInformation, Format(lisUnableToFindFile, ['"', IDEMessageDialog(lisInformation,
AFilename, '"']), mtInformation,[mbOk]); Format(lisUnableToFindFile, [AFilename]), mtInformation,[mbOk]);
end else if AFileName<>'' then begin end else if AFileName<>'' then begin
IDEMessageDialog(lisInformation, Format( IDEMessageDialog(lisInformation,
lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"', Format(lisUnableToFindFileCheckSearchPathInProjectCompilerOption,
AFilename, '"', LineEnding, LineEnding]), [AFilename, LineEnding, LineEnding]),
mtInformation,[mbOk]); mtInformation,[mbOk]);
end; end;
end; end;
end;//if end;//if

13
ide/project.pp
View File

@ -1595,9 +1595,8 @@ begin
NewSource:=CodeToolBoss.LoadFile(Filename,true,Revert); NewSource:=CodeToolBoss.LoadFile(Filename,true,Revert);
if NewSource=nil then begin if NewSource=nil then begin
ACaption:=lisCodeToolsDefsReadError; ACaption:=lisCodeToolsDefsReadError;
AText:=Format(lisUnableToReadFile2, ['"', Filename, '"']); AText:=Format(lisUnableToReadFile2, [Filename]);
Result:=Application.MessageBox(PChar(AText),PChar(ACaption) Result:=Application.MessageBox(PChar(AText),PChar(ACaption),MB_ABORTRETRYIGNORE);
,MB_ABORTRETRYIGNORE);
if Result in [mrAbort,mrIgnore] then if Result in [mrAbort,mrIgnore] then
exit; exit;
end else begin end else begin
@ -2930,8 +2929,8 @@ begin
except except
on E: Exception do begin on E: Exception do begin
IDEMessageDialog(lisUnableToReadLpi, IDEMessageDialog(lisUnableToReadLpi,
Format(lisUnableToReadTheProjectInfoFile,[LineEnding, Filename])+LineEnding Format(lisUnableToReadTheProjectInfoFile,[LineEnding,Filename])+LineEnding+E.Message,
+E.Message, mtError, [mbOk]); mtError, [mbOk]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
end; end;
@ -2958,8 +2957,8 @@ begin
except except
on E: Exception do begin on E: Exception do begin
IDEMessageDialog(lisUnableToReadLpi, IDEMessageDialog(lisUnableToReadLpi,
Format(lisUnableToReadTheProjectInfoFile,[LineEnding,PIFile])+LineEnding Format(lisUnableToReadTheProjectInfoFile,[LineEnding,PIFile])+LineEnding+E.Message,
+E.Message, mtError, [mbOk]); mtError, [mbOk]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
end; end;

4
ide/projectuserresources.pas
View File

@ -190,9 +190,9 @@ begin
end end
else else
{$IFNDEF EnableOldExtTools} {$IFNDEF EnableOldExtTools}
IDEMessagesWindow.AddCustomMessage(mluError,Format(lisFileNotFound2, ['"', Filename, '"', ''])); IDEMessagesWindow.AddCustomMessage(mluError,Format(lisFileNotFound2, [Filename]));
{$ELSE} {$ELSE}
IDEMessagesWindow.AddMsg(Format(lisFileNotFound2, ['"', Filename, '"', '']), '', -1); IDEMessagesWindow.AddMsg(Format(lisFileNotFound2, [Filename]), '', -1);
{$ENDIF} {$ENDIF}
end; end;

137
ide/sourcefilemanager.pas
View File

@ -1583,7 +1583,7 @@ begin
AFileName:=DiskFilename; AFileName:=DiskFilename;
if NewUnitInfo.IsVirtual then begin if NewUnitInfo.IsVirtual then begin
if (not (ofQuiet in Flags)) then begin if (not (ofQuiet in Flags)) then begin
IDEMessageDialog(lisRevertFailed, Format(lisFileIsVirtual, ['"',AFilename,'"']), IDEMessageDialog(lisRevertFailed, Format(lisFileIsVirtual, [AFilename]),
mtInformation,[mbCancel]); mtInformation,[mbCancel]);
end; end;
Result:=mrCancel; Result:=mrCancel;
@ -1636,8 +1636,7 @@ begin
if (ofRevert in Flags) then begin if (ofRevert in Flags) then begin
// revert failed, due to missing file // revert failed, due to missing file
if not (ofQuiet in Flags) then begin if not (ofQuiet in Flags) then begin
IDEMessageDialog(lisRevertFailed, Format(lisPkgMangFileNotFound, ['"', IDEMessageDialog(lisRevertFailed, Format(lisPkgMangFileNotFound, [AFilename]),
AFilename, '"']),
mtError,[mbCancel]); mtError,[mbCancel]);
end; end;
Result:=mrCancel; Result:=mrCancel;
@ -2262,8 +2261,7 @@ begin
if Project1.HasProjectInfoFileChangedOnDisk then begin if Project1.HasProjectInfoFileChangedOnDisk then begin
if IDEQuestionDialog(lisProjectChangedOnDisk, if IDEQuestionDialog(lisProjectChangedOnDisk,
Format(lisTheProjectInformationFileHasChangedOnDisk, Format(lisTheProjectInformationFileHasChangedOnDisk,[Project1.ProjectInfoFile,LineEnding]),
['"', Project1.ProjectInfoFile, '"', LineEnding]),
mtConfirmation, [mrYes, lisReopenProject, mrIgnore], '')=mrYes mtConfirmation, [mrYes, lisReopenProject, mrIgnore], '')=mrYes
then begin then begin
MainIDE.DoOpenProjectFile(Project1.ProjectInfoFile,[]); MainIDE.DoOpenProjectFile(Project1.ProjectInfoFile,[]);
@ -2333,16 +2331,15 @@ begin
case ErrorData.Error of case ErrorData.Error of
ceSrcDirDoesNotExists: ceSrcDirDoesNotExists:
IDEMessageDialog(lisCopyError2, IDEMessageDialog(lisCopyError2,
Format(lisSourceDirectoryDoesNotExist, ['"', ErrorData.Param1, '"']), Format(lisSourceDirectoryDoesNotExist, [ErrorData.Param1]),
mtError,[mbCancel]); mtError,[mbCancel]);
ceCreatingDirectory: ceCreatingDirectory:
IDEMessageDialog(lisCopyError2, IDEMessageDialog(lisCopyError2,
Format(lisUnableToCreateDirectory, ['"', ErrorData.Param1, '"']), Format(lisUnableToCreateDirectory, [ErrorData.Param1]),
mtError,[mbCancel]); mtError,[mbCancel]);
ceCopyFileError: ceCopyFileError:
IDEMessageDialog(lisCopyError2, IDEMessageDialog(lisCopyError2,
Format(lisUnableToCopyFileTo, ['"', ErrorData.Param1, '"', LineEnding, '"', Format(lisUnableToCopyFileTo, [ErrorData.Param1, LineEnding, ErrorData.Param1]),
ErrorData.Param1, '"']),
mtError,[mbCancel]); mtError,[mbCancel]);
end; end;
end; end;
@ -2360,7 +2357,7 @@ var
procedure ShowErrorForCommandAfter; procedure ShowErrorForCommandAfter;
begin begin
IDEMessageDialog(lisInvalidCommand, IDEMessageDialog(lisInvalidCommand,
Format(lisTheCommandAfterIsNotExecutable, ['"', CmdAfterExe, '"']), Format(lisTheCommandAfterIsNotExecutable, [CmdAfterExe]),
mtError,[mbCancel]); mtError,[mbCancel]);
end; end;
@ -2382,8 +2379,8 @@ begin
if CompareFilenames(SrcDir,DestDir)=0 if CompareFilenames(SrcDir,DestDir)=0
then begin then begin
IDEMessageDialog(lisInvalidPublishingDirectory, IDEMessageDialog(lisInvalidPublishingDirectory,
Format(lisSourceDirectoryAndDestinationDirectoryAreTheSameMa, ['"', SrcDir, '"', Format(lisSourceDirectoryAndDestinationDirectoryAreTheSameMa, [SrcDir, LineEnding,
LineEnding, '"', DestDir, '"', LineEnding, LineEnding, LineEnding, LineEnding, LineEnding]), DestDir, LineEnding, LineEnding, LineEnding, LineEnding, LineEnding]),
mtError, [mbCancel]); mtError, [mbCancel]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
@ -2411,8 +2408,8 @@ begin
end; end;
if not FileIsExecutableCached(CmdAfterExe) then begin if not FileIsExecutableCached(CmdAfterExe) then begin
IDEMessageDialog(lisCommandAfterInvalid, IDEMessageDialog(lisCommandAfterInvalid,
Format(lisTheCommandAfterPublishingIsInvalid, Format(lisTheCommandAfterPublishingIsInvalid, [LineEnding, CmdAfterExe]),
[LineEnding, '"', CmdAfterExe, '"']), mtError, [mbCancel]); mtError, [mbCancel]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
end; end;
@ -2423,14 +2420,13 @@ begin
// ask user, if destination can be delete // ask user, if destination can be delete
if IDEMessageDialog(lisClearDirectory, if IDEMessageDialog(lisClearDirectory,
Format(lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil, Format(lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil,
[LineEnding, LineEnding, '"', DestDir, '"']), mtConfirmation, [LineEnding, LineEnding, DestDir]), mtConfirmation, [mbYes,mbNo])<>mrYes
[mbYes,mbNo])<>mrYes
then then
exit(mrCancel); exit(mrCancel);
if (not DeleteDirectory(ChompPathDelim(DestDir),true)) then begin if (not DeleteDirectory(ChompPathDelim(DestDir),true)) then begin
IDEMessageDialog(lisUnableToCleanUpDestinationDirectory, IDEMessageDialog(lisUnableToCleanUpDestinationDirectory,
Format(lisUnableToCleanUpPleaseCheckPermissions,['"',DestDir,'"',LineEnding]), Format(lisUnableToCleanUpPleaseCheckPermissions, [DestDir, LineEnding]),
mtError,[mbOk]); mtError,[mbOk]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
@ -2735,9 +2731,9 @@ begin
if (ActiveUnitInfo=nil) then exit; if (ActiveUnitInfo=nil) then exit;
if ActiveUnitInfo.IsPartOfProject then begin if ActiveUnitInfo.IsPartOfProject then begin
if not ActiveUnitInfo.IsVirtual then if not ActiveUnitInfo.IsVirtual then
s:=Format(lisTheFile, ['"', ActiveUnitInfo.Filename, '"']) s:=Format(lisTheFile, [ActiveUnitInfo.Filename])
else else
s:=Format(lisTheFile, ['"', ActiveSourceEditor.PageName, '"']); s:=Format(lisTheFile, [ActiveSourceEditor.PageName]);
s:=Format(lisisAlreadyPartOfTheProject, [s]); s:=Format(lisisAlreadyPartOfTheProject, [s]);
IDEMessageDialog(lisInformation, s, mtInformation, [mbOk]); IDEMessageDialog(lisInformation, s, mtInformation, [mbOk]);
exit; exit;
@ -3410,8 +3406,8 @@ begin
AFilename:=LPIFilename; AFilename:=LPIFilename;
end else begin end else begin
if IDEQuestionDialog(lisFileHasNoProject, if IDEQuestionDialog(lisFileHasNoProject,
Format(lisTheFileIsNotALazarusProjectCreateANewProjectForThi, [ Format(lisTheFileIsNotALazarusProjectCreateANewProjectForThi,
'"', AFilename, '"', LineEnding, '"'+lowercase(SourceType)+'"']), [AFilename, LineEnding, lowercase(SourceType)]),
mtConfirmation, [mrYes, lisCreateProject, mrCancel])<>mrYes mtConfirmation, [mrYes, lisCreateProject, mrCancel])<>mrYes
then then
exit; exit;
@ -3959,8 +3955,7 @@ begin
NewFilePath:=ExtractFilePath(NewFilename); NewFilePath:=ExtractFilePath(NewFilename);
if not DirPathExists(NewFilePath) then begin if not DirPathExists(NewFilePath) then begin
ACaption:=lisEnvOptDlgDirectoryNotFound; ACaption:=lisEnvOptDlgDirectoryNotFound;
AText:=Format(lisTheDestinationDirectoryDoesNotExist, AText:=Format(lisTheDestinationDirectoryDoesNotExist, [LineEnding, NewFilePath]);
[LineEnding, '"', NewFilePath, '"']);
Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation,[mbCancel],CanAbort); Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation,[mbCancel],CanAbort);
exit; exit;
end; end;
@ -3986,7 +3981,7 @@ begin
if Project1.IndexOfUnitWithName(NewUnitName,true,AnUnitInfo)>=0 then if Project1.IndexOfUnitWithName(NewUnitName,true,AnUnitInfo)>=0 then
begin begin
Result:=IDEQuestionDialogAb(lisUnitNameAlreadyExistsCap, Result:=IDEQuestionDialogAb(lisUnitNameAlreadyExistsCap,
Format(lisTheUnitAlreadyExists, ['"', NewUnitName, '"']), Format(lisTheUnitAlreadyExists, [NewUnitName]),
mtConfirmation, [mrIgnore, lisForceRenaming, mtConfirmation, [mrIgnore, lisForceRenaming,
mrCancel, lisCancelRenaming, mrCancel, lisCancelRenaming,
mrAbort, lisAbortAll], not CanAbort); mrAbort, lisAbortAll], not CanAbort);
@ -4027,7 +4022,7 @@ begin
or (CompareFilenames(NewFilename,AFilename)<>0)) or (CompareFilenames(NewFilename,AFilename)<>0))
and FileExistsUTF8(NewFilename) then begin and FileExistsUTF8(NewFilename) then begin
ACaption:=lisOverwriteFile; ACaption:=lisOverwriteFile;
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewFilename, '"', LineEnding]); AText:=Format(lisAFileAlreadyExistsReplaceIt, [NewFilename, LineEnding]);
Result:=IDEQuestionDialogAb(ACaption, AText, mtConfirmation, Result:=IDEQuestionDialogAb(ACaption, AText, mtConfirmation,
[mrYes, lisOverwriteFileOnDisk, mrCancel, [mrYes, lisOverwriteFileOnDisk, mrCancel,
mrAbort, lisAbortAll], not CanAbort); mrAbort, lisAbortAll], not CanAbort);
@ -4271,7 +4266,7 @@ begin
begin begin
ACaption:=lisResourceSaveError; ACaption:=lisResourceSaveError;
AText:=Format(lisUnableToAddResourceHeaderCommentToResourceFile, [ AText:=Format(lisUnableToAddResourceHeaderCommentToResourceFile, [
LineEnding, '"', LRSCode.FileName, '"', LineEnding]); LineEnding, LRSCode.FileName, LineEnding]);
Result:=IDEMessageDialog(ACaption,AText,mtError,[mbIgnore,mbAbort]); Result:=IDEMessageDialog(ACaption,AText,mtError,[mbIgnore,mbAbort]);
if Result<>mrIgnore then exit; if Result<>mrIgnore then exit;
end; end;
@ -4281,8 +4276,7 @@ begin
begin begin
ACaption:=lisResourceSaveError; ACaption:=lisResourceSaveError;
AText:=Format(lisUnableToAddResourceTFORMDATAToResourceFileProbably, AText:=Format(lisUnableToAddResourceTFORMDATAToResourceFileProbably,
[AnUnitInfo.ComponentName, [AnUnitInfo.ComponentName, LineEnding, LRSCode.FileName, LineEnding] );
LineEnding, '"', LRSCode.FileName, '"', LineEnding] );
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbIgnore, mbAbort]); Result:=IDEMessageDialog(ACaption, AText, mtError, [mbIgnore, mbAbort]);
if Result<>mrIgnore then exit; if Result<>mrIgnore then exit;
end else begin end else begin
@ -4304,7 +4298,7 @@ begin
LFMCode:=CodeToolBoss.CreateFile(LFMFilename); LFMCode:=CodeToolBoss.CreateFile(LFMFilename);
if LFMCode=nil then begin if LFMCode=nil then begin
Result:=IDEQuestionDialog(lisUnableToCreateFile, Result:=IDEQuestionDialog(lisUnableToCreateFile,
Format(lisUnableToCreateFile2, ['"', LFMFilename, '"']), Format(lisUnableToCreateFile2, [LFMFilename]),
mtWarning, [mrIgnore, lisContinueWithoutLoadingForm, mtWarning, [mrIgnore, lisContinueWithoutLoadingForm,
mrCancel, lisCancelLoadingUnit, mrCancel, lisCancelLoadingUnit,
mrAbort, lisAbortAllLoading]); mrAbort, lisAbortAllLoading]);
@ -4514,13 +4508,11 @@ begin
// -> remove lfm file, so that it will not be auto loaded on next open // -> remove lfm file, so that it will not be auto loaded on next open
if (FileExistsUTF8(NewLFMFilename)) if (FileExistsUTF8(NewLFMFilename))
and (not DeleteFileUTF8(NewLFMFilename)) and (not DeleteFileUTF8(NewLFMFilename))
and (IDEMessageDialog(lisPkgMangDeleteFailed, Format(lisDeletingOfFileFailed, [ and (IDEMessageDialog(lisPkgMangDeleteFailed,
'"', NewLFMFilename, '"']), mtError, [mbIgnore, mbCancel])=mrCancel) Format(lisDeletingOfFileFailed, [NewLFMFilename]),
then mtError, [mbIgnore, mbCancel])=mrCancel)
begin then
Result:=mrCancel; exit(mrCancel);
exit;
end;
end; end;
// create new source with the new filename // create new source with the new filename
@ -4529,7 +4521,7 @@ begin
NewSource.Source:=OldSourceCode; NewSource.Source:=OldSourceCode;
if NewSource=nil then begin if NewSource=nil then begin
Result:=IDEMessageDialog(lisUnableToCreateFile, Result:=IDEMessageDialog(lisUnableToCreateFile,
Format(lisCanNotCreateFile, ['"', NewFilename, '"']), Format(lisCanNotCreateFile, [NewFilename]),
mtError,[mbCancel,mbAbort]); mtError,[mbCancel,mbAbort]);
exit; exit;
end; end;
@ -4550,8 +4542,7 @@ begin
if SearchDirectoryInSearchPath(OldUnitPath,NewFilePath,1)<1 then begin if SearchDirectoryInSearchPath(OldUnitPath,NewFilePath,1)<1 then begin
//DebugLn('TLazSourceFileManager.RenameUnit NewFilePath="',NewFilePath,'" OldUnitPath="',OldUnitPath,'"'); //DebugLn('TLazSourceFileManager.RenameUnit NewFilePath="',NewFilePath,'" OldUnitPath="',OldUnitPath,'"');
if IDEMessageDialog(lisExtendUnitPath, if IDEMessageDialog(lisExtendUnitPath,
Format(lisTheDirectoryIsNotYetInTheUnitPathAddIt, Format(lisTheDirectoryIsNotYetInTheUnitPathAddIt,[NewFilePath,LineEnding]),
['"', NewFilePath, '"', LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrYes then mtConfirmation,[mbYes,mbNo])=mrYes then
begin begin
Project1.CompilerOptions.OtherUnitFiles:= Project1.CompilerOptions.OtherUnitFiles:=
@ -4694,7 +4685,7 @@ begin
and (CompareFilenames(OldFilePath,NewFilePath)=0) and (CompareFilenames(OldFilePath,NewFilePath)=0)
and (CompareFilenames(AmbiguousFiles[0],ExtractFilename(OldFilename))=0) and (CompareFilenames(AmbiguousFiles[0],ExtractFilename(OldFilename))=0)
then then
AmbiguousText:=Format(lisDeleteOldFile, ['"', ExtractFilename(OldFilename), '"']) AmbiguousText:=Format(lisDeleteOldFile, [ExtractFilename(OldFilename)])
else else
AmbiguousText:=Format(lisThereAreOtherFilesInTheDirectoryWithTheSameName, AmbiguousText:=Format(lisThereAreOtherFilesInTheDirectoryWithTheSameName,
[LineEnding, LineEnding, AmbiguousFiles.Text, LineEnding]); [LineEnding, LineEnding, AmbiguousFiles.Text, LineEnding]);
@ -4707,12 +4698,11 @@ begin
AmbiguousFilename:=NewFilePath+AmbiguousFiles[i]; AmbiguousFilename:=NewFilePath+AmbiguousFiles[i];
if (FileExistsUTF8(AmbiguousFilename)) if (FileExistsUTF8(AmbiguousFilename))
and (not DeleteFileUTF8(AmbiguousFilename)) and (not DeleteFileUTF8(AmbiguousFilename))
and (IDEMessageDialog(lisPkgMangDeleteFailed, Format(lisDeletingOfFileFailed, and (IDEMessageDialog(lisPkgMangDeleteFailed,
['"', AmbiguousFilename, '"']), mtError, [mbIgnore, mbCancel])=mrCancel) then Format(lisDeletingOfFileFailed, [AmbiguousFilename]),
begin mtError, [mbIgnore, mbCancel])=mrCancel)
Result:=mrCancel; then
exit; exit(mrCancel);
end;
end; end;
end; end;
finally finally
@ -4733,8 +4723,7 @@ begin
Project1.CompilerOptions.GetUnitPath(false),OldFilePath,1)<1) Project1.CompilerOptions.GetUnitPath(false),OldFilePath,1)<1)
then begin then begin
if IDEMessageDialog(lisCleanUpUnitPath, if IDEMessageDialog(lisCleanUpUnitPath,
Format(lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt, Format(lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt,[OldFilePath,LineEnding]),
['"', OldFilePath, '"', LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrYes then mtConfirmation,[mbYes,mbNo])=mrYes then
begin begin
Project1.CompilerOptions.OtherUnitFiles:= Project1.CompilerOptions.OtherUnitFiles:=
@ -4747,8 +4736,7 @@ begin
// delete old pas, .pp, .ppu // delete old pas, .pp, .ppu
if (CompareFilenames(NewFilename,OldFilename)<>0) if (CompareFilenames(NewFilename,OldFilename)<>0)
and OldFileExisted then begin and OldFileExisted then begin
if IDEMessageDialog(lisDeleteOldFile2, if IDEMessageDialog(lisDeleteOldFile2, Format(lisDeleteOldFile,[OldFilename]),
Format(lisDeleteOldFile, ['"', OldFilename, '"']),
mtConfirmation,[mbYes,mbNo])=mrYes then mtConfirmation,[mbYes,mbNo])=mrYes then
begin begin
Result:=DeleteFileInteractive(OldFilename,[mbAbort]); Result:=DeleteFileInteractive(OldFilename,[mbAbort]);
@ -4855,7 +4843,7 @@ begin
if AskUser then begin if AskUser then begin
Result:=IDEQuestionDialog(lisFileNotLowercase, Result:=IDEQuestionDialog(lisFileNotLowercase,
Format(lisTheUnitIsNotLowercaseTheFreePascalCompiler, Format(lisTheUnitIsNotLowercaseTheFreePascalCompiler,
['"', OldFilename, '"', LineEnding, LineEnding, LineEnding]), [OldFilename, LineEnding, LineEnding, LineEnding]),
mtConfirmation,[mrYes,mrIgnore,lisNo,mrAbort],''); mtConfirmation,[mrYes,mrIgnore,lisNo,mrAbort],'');
if Result<>mrYes then exit; if Result<>mrYes then exit;
end; end;
@ -4878,7 +4866,7 @@ begin
// this is a file, that was loaded last time, but was removed from disk // this is a file, that was loaded last time, but was removed from disk
Result:=IDEQuestionDialog(lisFileNotFound, Result:=IDEQuestionDialog(lisFileNotFound,
Format(lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject, Format(lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject,
['"', AFilename, '"', LineEnding, LineEnding, LineEnding]), [AFilename, LineEnding, LineEnding, LineEnding]),
mtError, [mrIgnore, lisSkipFileAndContinueLoading, mtError, [mrIgnore, lisSkipFileAndContinueLoading,
mrAbort, lisAbortLoadingProject]); mrAbort, lisAbortLoadingProject]);
exit; exit;
@ -4891,14 +4879,14 @@ begin
if ofOnlyIfExists in Flags if ofOnlyIfExists in Flags
then begin then begin
IDEMessageDialog(lisFileNotFound, IDEMessageDialog(lisFileNotFound,
Format(lisFileNotFound2, ['"',AFilename,'"',LineEnding]), mtInformation,[mbCancel]); Format(lisFileNotFound2, [AFilename])+LineEnding, mtInformation,[mbCancel]);
// cancel loading file // cancel loading file
Exit; Exit;
end; end;
if IDEMessageDialog(lisFileNotFound, if IDEMessageDialog(lisFileNotFound,
Format(lisFileNotFoundDoYouWantToCreateIt, ['"',AFilename,'"',LineEnding,LineEnding]), Format(lisFileNotFoundDoYouWantToCreateIt,[AFilename,LineEnding])+LineEnding,
mtInformation,[mbYes,mbNo])=mrYes then mtInformation,[mbYes,mbNo])=mrYes then
begin begin
// create new file // create new file
NewFlags:=[nfOpenInEditor,nfCreateDefaultSrc]; NewFlags:=[nfOpenInEditor,nfCreateDefaultSrc];
@ -4961,7 +4949,7 @@ begin
end; end;
end else begin end else begin
AText:=Format(lisTheFileSeemsToBeAProgramCloseCurrentProject, AText:=Format(lisTheFileSeemsToBeAProgramCloseCurrentProject,
['"', AFilename, '"', LineEnding, LineEnding]); [AFilename, LineEnding, LineEnding]);
ACaption:=lisProgramDetected; ACaption:=lisProgramDetected;
if IDEMessageDialog(ACaption, AText, mtConfirmation, [mbYes,mbNo])=mrYes then if IDEMessageDialog(ACaption, AText, mtConfirmation, [mbYes,mbNo])=mrYes then
begin begin
@ -5079,8 +5067,7 @@ begin
end; end;
if UnitFilename='' then begin if UnitFilename='' then begin
IDEMessageDialog(lisNoPascalFile, IDEMessageDialog(lisNoPascalFile,
Format(lisUnableToFindPascalUnitPasPpForLfmFile, Format(lisUnableToFindPascalUnitPasPpForLfmFile,[LineEnding, LFMUnitInfo.Filename]),
[LineEnding, '"', LFMUnitInfo.Filename, '"']),
mtError,[mbCancel]); mtError,[mbCancel]);
Result:=mrCancel; Result:=mrCancel;
exit; exit;
@ -5413,7 +5400,7 @@ begin
if (NewClassName='') or (LFMType='') then begin if (NewClassName='') or (LFMType='') then begin
DebugLn(['TLazSourceFileManager.LoadLFM LFM file corrupt']); DebugLn(['TLazSourceFileManager.LoadLFM LFM file corrupt']);
Result:=IDEMessageDialog(lisLFMFileCorrupt, Result:=IDEMessageDialog(lisLFMFileCorrupt,
Format(lisUnableToFindAValidClassnameIn, ['"', LFMBuf.Filename, '"']), Format(lisUnableToFindAValidClassnameIn, [LFMBuf.Filename]),
mtError,[mbIgnore,mbCancel,mbAbort]); mtError,[mbIgnore,mbCancel,mbAbort]);
exit; exit;
end; end;
@ -5504,7 +5491,7 @@ begin
DumpExceptionBackTrace; DumpExceptionBackTrace;
ACaption:=lisFormatError; ACaption:=lisFormatError;
AText:=Format(lisUnableToConvertTextFormDataOfFileIntoBinaryStream, AText:=Format(lisUnableToConvertTextFormDataOfFileIntoBinaryStream,
[LineEnding, '"', LFMBuf.Filename, '"', LineEnding, E.Message]); [LineEnding, LFMBuf.Filename, LineEnding, E.Message]);
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbOk, mbCancel]); Result:=IDEMessageDialog(ACaption, AText, mtError, [mbOk, mbCancel]);
if Result=mrCancel then Result:=mrAbort; if Result=mrCancel then Result:=mrAbort;
exit; exit;
@ -5726,9 +5713,9 @@ begin
if (DescendantClassName<>'') if (DescendantClassName<>'')
and (SysUtils.CompareText(AComponentClassName,'TCustomForm')=0) then begin and (SysUtils.CompareText(AComponentClassName,'TCustomForm')=0) then begin
// this is a common user mistake // this is a common user mistake
IDEMessageDialog(lisCodeTemplError, Format( IDEMessageDialog(lisCodeTemplError,
lisTheResourceClassDescendsFromProbablyThisIsATypoFor, ['"', Format(lisTheResourceClassDescendsFromProbablyThisIsATypoFor,
DescendantClassName, '"', '"', AComponentClassName, '"']), [DescendantClassName, AComponentClassName]),
mtError,[mbCancel]); mtError,[mbCancel]);
Result:=false; Result:=false;
exit; exit;
@ -6341,9 +6328,8 @@ begin
// check for cycles // check for cycles
if AnUnitInfo.LoadingComponent then begin if AnUnitInfo.LoadingComponent then begin
Result:=IDEQuestionDialog(lisCodeTemplError, Format( Result:=IDEQuestionDialog(lisCodeTemplError,
lisUnableToLoadTheComponentClassBecauseItDependsOnIts, ['"', Format(lisUnableToLoadTheComponentClassBecauseItDependsOnIts, [AComponentClassName]),
AComponentClassName, '"']),
mtError, [mrCancel, lisCancelLoadingThisComponent, mtError, [mrCancel, lisCancelLoadingThisComponent,
mrAbort, lisAbortWholeLoading]); mrAbort, lisAbortWholeLoading]);
exit; exit;
@ -6983,8 +6969,7 @@ begin
NewProgramName:=ExtractFileNameOnly(AFilename); NewProgramName:=ExtractFileNameOnly(AFilename);
if (NewProgramName='') or (not IsValidUnitName(NewProgramName)) then begin if (NewProgramName='') or (not IsValidUnitName(NewProgramName)) then begin
Result:=IDEMessageDialog(lisInvalidProjectFilename, Result:=IDEMessageDialog(lisInvalidProjectFilename,
Format(lisisAnInvalidProjectNamePleaseChooseAnotherEGProject, ['"', Format(lisisAnInvalidProjectNamePleaseChooseAnotherEGProject,[SaveDialog.Filename,LineEnding]),
SaveDialog.Filename, '"', LineEnding]),
mtInformation,[mbRetry,mbAbort]); mtInformation,[mbRetry,mbAbort]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
continue; // try again continue; // try again
@ -7017,8 +7002,7 @@ begin
if (CompareFilenames(NewLPIFilename, NewProgramFilename) = 0) then if (CompareFilenames(NewLPIFilename, NewProgramFilename) = 0) then
begin begin
ACaption:=lisChooseADifferentName; ACaption:=lisChooseADifferentName;
AText:=Format(lisTheProjectInfoFileIsEqualToTheProjectMainSource, [ AText:=Format(lisTheProjectInfoFileIsEqualToTheProjectMainSource,[NewLPIFilename,LineEnding]);
'"', NewLPIFilename, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbAbort,mbRetry]); Result:=IDEMessageDialog(ACaption, AText, mtError, [mbAbort,mbRetry]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
continue; // try again continue; // try again
@ -7029,8 +7013,7 @@ begin
Project1.MainUnitInfo)>=0) then Project1.MainUnitInfo)>=0) then
begin begin
ACaption:=lisUnitIdentifierExists; ACaption:=lisUnitIdentifierExists;
AText:=Format(lisThereIsAUnitWithTheNameInTheProjectPleaseChoose, ['"', AText:=Format(lisThereIsAUnitWithTheNameInTheProjectPleaseChoose,[NewProgramName,LineEnding]);
NewProgramName, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption,AText,mtError,[mbRetry,mbAbort]); Result:=IDEMessageDialog(ACaption,AText,mtError,[mbRetry,mbAbort]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
continue; // try again continue; // try again
@ -7052,7 +7035,7 @@ begin
if FileExistsUTF8(NewLPIFilename) then if FileExistsUTF8(NewLPIFilename) then
begin begin
ACaption:=lisOverwriteFile; ACaption:=lisOverwriteFile;
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewLPIFilename, '"', LineEnding]); AText:=Format(lisAFileAlreadyExistsReplaceIt, [NewLPIFilename, LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtConfirmation, [mbOk, mbCancel]); Result:=IDEMessageDialog(ACaption, AText, mtConfirmation, [mbOk, mbCancel]);
if Result=mrCancel then exit; if Result=mrCancel then exit;
end end
@ -7061,8 +7044,7 @@ begin
if FileExistsUTF8(NewProgramFilename) then if FileExistsUTF8(NewProgramFilename) then
begin begin
ACaption:=lisOverwriteFile; ACaption:=lisOverwriteFile;
AText:=Format(lisAFileAlreadyExistsReplaceIt, AText:=Format(lisAFileAlreadyExistsReplaceIt, [NewProgramFilename, LineEnding]);
['"', NewProgramFilename, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtConfirmation,[mbOk,mbCancel]); Result:=IDEMessageDialog(ACaption, AText, mtConfirmation,[mbOk,mbCancel]);
if Result=mrCancel then exit; if Result=mrCancel then exit;
end; end;
@ -7107,8 +7089,9 @@ begin
// switch MainUnitInfo.Source to new code // switch MainUnitInfo.Source to new code
NewBuf := CodeToolBoss.CreateFile(NewProgramFilename); NewBuf := CodeToolBoss.CreateFile(NewProgramFilename);
if NewBuf=nil then begin if NewBuf=nil then begin
Result:=IDEMessageDialog(lisErrorCreatingFile, Format(lisUnableToCreateFile3, [ Result:=IDEMessageDialog(lisErrorCreatingFile,
LineEnding, '"', NewProgramFilename, '"']), mtError, [mbCancel]); Format(lisUnableToCreateFile3, [LineEnding, NewProgramFilename]),
mtError, [mbCancel]);
exit; exit;
end; end;

2
packager/addtopackagedlg.pas
View File

@ -273,7 +273,7 @@ begin
if (not FileExistsUTF8(AFilename)) then begin if (not FileExistsUTF8(AFilename)) then begin
if AddFileType=d2ptUnit then begin if AddFileType=d2ptUnit then begin
IDEMessageDialog(lisFileNotFound, IDEMessageDialog(lisFileNotFound,
Format(lisPkgMangFileNotFound, ['"', AFilename, '"']), Format(lisPkgMangFileNotFound, [AFilename]),
mtError, [mbCancel]); mtError, [mbCancel]);
exit; exit;
end; end;

12
packager/packagesystem.pas
View File

@ -4522,13 +4522,11 @@ var
if Result in [mrYes,mrYesToAll] then begin if Result in [mrYes,mrYesToAll] then begin
YesToAll:=Result=mrYesToAll; YesToAll:=Result=mrYesToAll;
if (not DeleteFileUTF8(AmbiguousFilename)) if (not DeleteFileUTF8(AmbiguousFilename))
and (IDEMessageDialog(lisPkgMangDeleteFailed, Format(lisDeletingOfFileFailed, and (IDEMessageDialog(lisPkgMangDeleteFailed,
['"', AmbiguousFilename, '"']), mtError, [mbIgnore, mbCancel]) Format(lisDeletingOfFileFailed, [AmbiguousFilename]),
<>mrIgnore) then mtError, [mbIgnore, mbCancel])<>mrIgnore)
begin then
Result:=mrCancel; exit(mrCancel);
exit;
end;
Result:=mrOk; Result:=mrOk;
end else end else
break; break;

5
packager/pkgmanager.pas
View File

@ -1265,8 +1265,7 @@ begin
EnvironmentOptions.RecentPackageFiles,rltFile); EnvironmentOptions.RecentPackageFiles,rltFile);
end else begin end else begin
IDEMessageDialog(lisPkgMangDeleteFailed, IDEMessageDialog(lisPkgMangDeleteFailed,
Format(lisPkgMangUnableToDeleteFile, ['"', OldPkgFilename, '"']), Format(lisPkgMangUnableToDeleteFile, [OldPkgFilename]), mtError, [mbOk]);
mtError, [mbOk]);
end; end;
end; end;
end; end;
@ -2309,7 +2308,7 @@ begin
if not FileExistsUTF8(AFilename) then begin if not FileExistsUTF8(AFilename) then begin
IDEMessageDialog(lisFileNotFound, IDEMessageDialog(lisFileNotFound,
Format(lisPkgMangFileNotFound, ['"', AFilename, '"']), Format(lisPkgMangFileNotFound, [AFilename]),
mtError,[mbCancel]); mtError,[mbCancel]);
RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile); RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile);
SetRecentPackagesMenu; SetRecentPackagesMenu;