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

IDE: ... and more hard-coded quotations in resourcestrings.

Browse Source 
git-svn-id: trunk@45521 -
This commit is contained in:
juha 2014-06-15 11:52:27 +00:00
parent a912107bf0
commit 4fbeea1dfd
18 changed files with 226 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
converter/convertdelphi.pas
View File

@ -825,7 +825,7 @@ begin
Result:=PrevResult; Result:=PrevResult;
if Result=mrCancel then begin if Result=mrCancel then begin
Result:=QuestionDlg(lisConvDelphiFailedConvertingUnit, Result:=QuestionDlg(lisConvDelphiFailedConvertingUnit,
Format(lisConvDelphiFailedToConvertUnit, [LineEnding,fOrigUnitFilename,LineEnding]), Format(lisConvDelphiFailedToConvertUnit, [fOrigUnitFilename]),
mtWarning, [mrIgnore, lisIgnoreAndContinue, mrAbort], 0); mtWarning, [mrIgnore, lisIgnoreAndContinue, mrAbort], 0);
case Result of case Result of
mrIgnore : Result:=mrOK; mrIgnore : Result:=mrOK;

2
debugger/breakpointsdlg.pp
View File

@ -620,7 +620,7 @@ begin
if (CurItem=nil) then exit; if (CurItem=nil) then exit;
Filename:=TIDEBreakpoint(CurItem.Data).Source; Filename:=TIDEBreakpoint(CurItem.Data).Source;
if MessageDlg(lisDeleteAllBreakpoints, if MessageDlg(lisDeleteAllBreakpoints,
Format(lisDeleteAllBreakpoints2, ['"', Filename, '"']), Format(lisDeleteAllBreakpoints2, [Filename]),
mtConfirmation,[mbYes,mbCancel],0)<>mrYes mtConfirmation,[mbYes,mbCancel],0)<>mrYes
then exit; then exit;
for n := lvBreakPoints.Items.Count - 1 downto 0 do for n := lvBreakPoints.Items.Count - 1 downto 0 do

3
designer/objinspext.pas
View File

@ -357,8 +357,7 @@ end;
procedure TOIAddRemoveFavoriteDlg.UpdateLabel; procedure TOIAddRemoveFavoriteDlg.UpdateLabel;
begin begin
NoteLabel.Caption:=Format(lisOIFChooseABaseClassForTheFavoriteProperty, [ NoteLabel.Caption:=Format(lisOIFChooseABaseClassForTheFavoriteProperty, [PropertyName]);
'"', PropertyName, '"']);
end; end;
procedure TOIAddRemoveFavoriteDlg.UpdateComboBox; procedure TOIAddRemoveFavoriteDlg.UpdateComboBox;

12
ide/buildlazdialog.pas
View File

@ -266,9 +266,8 @@ begin
if DirectoryIsWritableCached(Dir) then exit(true); if DirectoryIsWritableCached(Dir) then exit(true);
Result:=false; Result:=false;
IDEMessageDialog(lisBuildingLazarusFailed, IDEMessageDialog(lisBuildingLazarusFailed,
Format(lisThisSetOfOptionsToBuildLazarusIsNotSupportedByThis, Format(lisThisSetOfOptionsToBuildLazarusIsNotSupportedByThis,[LineEnding,Dir,LineEnding]),
[LineEnding, '"', Dir, '"', LineEnding]), mtError,[mbCancel]);
mtError,[mbCancel]);
end; end;
procedure TLazarusBuilder.CleanLazarusSrcDir(Dir: string; Recursive: boolean = true); procedure TLazarusBuilder.CleanLazarusSrcDir(Dir: string; Recursive: boolean = true);
@ -454,9 +453,8 @@ begin
Executable:=FindDefaultMakePath; Executable:=FindDefaultMakePath;
if (Executable='') or (not FileExistsUTF8(Executable)) then begin if (Executable='') or (not FileExistsUTF8(Executable)) then begin
IDEMessageDialog(lisMakeNotFound, IDEMessageDialog(lisMakeNotFound,
Format(lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa, Format(lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa, [LineEnding]),
['"', '"', LineEnding, LineEnding]), mtError, [mbCancel]);
mtError,[mbCancel]);
exit; exit;
end; end;
end; end;
@ -939,7 +937,7 @@ var
begin begin
IDEDialogLayoutList.ApplyLayout(Self,700,480); IDEDialogLayoutList.ApplyLayout(Self,700,480);
Caption := Format(lisConfigureBuildLazarus, ['"', '"']); Caption := lisConfigureBuildLazarus;
PageControl1.ActivePage:=BuildTabSheet; PageControl1.ActivePage:=BuildTabSheet;
BuildTabSheet.Caption:=lisBuildCaption; BuildTabSheet.Caption:=lisBuildCaption;

8
ide/checkcompileropts.pas
View File

@ -417,11 +417,9 @@ begin
p:=1; p:=1;
repeat repeat
SrcDir:=GetNextDirectoryInSearchPath(UnitPath,p); SrcDir:=GetNextDirectoryInSearchPath(UnitPath,p);
if SearchDirectoryInSearchPath(OtherSrcPath,SrcDir)>0 then begin if SearchDirectoryInSearchPath(OtherSrcPath,SrcDir)>0 then
AddWarning(Format( AddWarning(Format(lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac,
lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac, ['"', [CurOptions.GetOwnerName, SrcDir, UsedPkg.Name]));
CurOptions.GetOwnerName, '"', '"', SrcDir, '"', UsedPkg.Name]));
end;
until p>length(UnitPath); until p>length(UnitPath);
end; end;
finally finally

6
ide/debugmanager.pas
View File

@ -2161,7 +2161,7 @@ begin
else begin else begin
IDEMessageDialog(lisLaunchingApplicationInvalid, IDEMessageDialog(lisLaunchingApplicationInvalid,
Format(lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta, Format(lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta,
['"', LaunchingCmdLine, '"', LineEnding, LineEnding, LineEnding]), [LaunchingCmdLine, LineEnding, LineEnding, LineEnding]),
mtError, [mbOK]); mtError, [mbOK]);
Exit; Exit;
end; end;
@ -2175,8 +2175,8 @@ begin
ClearPathAndExe ClearPathAndExe
else begin else begin
IDEMessageDialog(lisDebuggerInvalid, IDEMessageDialog(lisDebuggerInvalid,
Format(lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro, ['"', Format(lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro,
EnvironmentOptions.DebuggerFilename, '"', LineEnding, LineEnding, LineEnding]), [EnvironmentOptions.DebuggerFilename, LineEnding, LineEnding, LineEnding]),
mtError,[mbOK]); mtError,[mbOK]);
Exit; Exit;
end; end;

7
ide/dialogprocs.pas
View File

@ -531,9 +531,8 @@ begin
{$IFDEF Unix} {$IFDEF Unix}
if FpReadLink(LinkFilename)=TargetFilename then exit(mrOk); if FpReadLink(LinkFilename)=TargetFilename then exit(mrOk);
while FPSymLink(PChar(TargetFilename),PChar(LinkFilename)) <> 0 do begin while FPSymLink(PChar(TargetFilename),PChar(LinkFilename)) <> 0 do begin
Result:=IDEMessageDialog(lisCodeToolsDefsWriteError, Format( Result:=IDEMessageDialog(lisCodeToolsDefsWriteError,
lisUnableToCreateLinkWithTarget, ['"', Format(lisUnableToCreateLinkWithTarget, [LinkFilename, TargetFilename]),
LinkFilename, '"', '"', TargetFilename, '"']),
mtError,ErrorButtons+[mbCancel,mbRetry],''); mtError,ErrorButtons+[mbCancel,mbRetry],'');
if Result<>mrRetry then exit; if Result<>mrRetry then exit;
end; end;
@ -578,7 +577,7 @@ function CheckDirectoryIsWritable(const Filename: string;
begin begin
while not DirectoryIsWritable(Filename) do begin while not DirectoryIsWritable(Filename) do begin
Result:=IDEMessageDialog(lisDirectoryNotWritable, Result:=IDEMessageDialog(lisDirectoryNotWritable,
Format(lisTheDirectoryIsNotWritable, ['"', Filename, '"']), Format(lisTheDirectoryIsNotWritable, [Filename]),
mtError,ErrorButtons+[mbCancel,mbRetry]); mtError,ErrorButtons+[mbCancel,mbRetry]);
if Result<>mrRetry then exit; if Result<>mrRetry then exit;
end; end;

19
ide/frames/compiler_buildmacro_options.pas
View File

@ -142,7 +142,7 @@ begin
// check syntax // check syntax
if (S='') or (not IsValidIdent(S)) then begin if (S='') or (not IsValidIdent(S)) then begin
IDEMessageDialog(lisCCOErrorCaption, IDEMessageDialog(lisCCOErrorCaption,
Format(lisInvalidMacroTheMacroMustBeAPascalIdentifie, ['"', S, '"']), Format(lisInvalidMacroTheMacroMustBeAPascalIdentifie, [S]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -190,7 +190,7 @@ begin
or (SysUtils.CompareText('LCLWidgetType',S)=0) or (SysUtils.CompareText('LCLWidgetType',S)=0)
then begin then begin
IDEMessageDialog(lisCCOErrorCaption, IDEMessageDialog(lisCCOErrorCaption,
Format(lisThereIsAlreadyAMacroWithTheName, ['"', S, '"']), Format(lisThereIsAlreadyAMacroWithTheName, [S]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -201,7 +201,7 @@ begin
Vars:=GetBuildMacroValues(TBaseCompilerOptions(BuildMacros.Owner),false); Vars:=GetBuildMacroValues(TBaseCompilerOptions(BuildMacros.Owner),false);
if (Vars<>nil) and Vars.IsDefined(PChar(S)) then begin if (Vars<>nil) and Vars.IsDefined(PChar(S)) then begin
DlgResult:=MessageDlg(lisCCOWarningCaption, DlgResult:=MessageDlg(lisCCOWarningCaption,
Format(lisThereIsAlreadyAMacroWithTheName, ['"', S, '"']), Format(lisThereIsAlreadyAMacroWithTheName, [S]),
mtWarning,[mbCancel,mbIgnore],0); mtWarning,[mbCancel,mbIgnore],0);
if DlgResult<>mrIgnore then if DlgResult<>mrIgnore then
exit; exit;
@ -223,8 +223,7 @@ begin
Index:=Node.Index; Index:=Node.Index;
Index:=BuildMacro.Values.IndexOf(S); Index:=BuildMacro.Values.IndexOf(S);
if (Index>=0) and (Index<>Node.Index) then begin if (Index>=0) and (Index<>Node.Index) then begin
IDEMessageDialog(lisCCOErrorCaption, IDEMessageDialog(lisCCOErrorCaption, Format(lisDuplicateFoundOfValue, [S]),
Format(lisDuplicateFoundOfValue, ['"', S, '"']),
mtError,[mbCancel]); mtError,[mbCancel]);
S:=BuildMacro.Values[Node.Index]; S:=BuildMacro.Values[Node.Index];
exit; exit;
@ -296,15 +295,14 @@ begin
if NodeType=cbmntValue then if NodeType=cbmntValue then
begin begin
aValue:=SelTVNode.Text; aValue:=SelTVNode.Text;
if IDEMessageDialog(lisConfirmDelete, if IDEMessageDialog(lisConfirmDelete, Format(lisDeleteValue, [aValue]),
Format(lisDeleteValue, ['"', aValue, '"']),
mtConfirmation,[mbYes,mbCancel])<>mrYes mtConfirmation,[mbYes,mbCancel])<>mrYes
then exit; then exit;
i:=aBuildMacro.Values.IndexOf(aValue); i:=aBuildMacro.Values.IndexOf(aValue);
if i>=0 then aBuildMacro.Values.Delete(i); if i>=0 then aBuildMacro.Values.Delete(i);
end else begin end else begin
if IDEMessageDialog(lisConfirmDelete, if IDEMessageDialog(lisConfirmDelete,
Format(lisDeleteMacro, ['"', aBuildMacro.Identifier, '"']), Format(lisDeleteMacro, [aBuildMacro.Identifier]),
mtConfirmation,[mbYes,mbCancel])<>mrYes mtConfirmation,[mbYes,mbCancel])<>mrYes
then exit; then exit;
i:=BuildMacros.IndexOfIdentifier(aBuildMacro.Identifier); i:=BuildMacros.IndexOfIdentifier(aBuildMacro.Identifier);
@ -457,10 +455,9 @@ begin
BuildMacroDescriptionEdit.Text:=aBuildMacro.Description; BuildMacroDescriptionEdit.Text:=aBuildMacro.Description;
BMAddMacroValueSpeedButton.Hint:=Format(lisAddValueToMacro, [aBuildMacro.Identifier]); BMAddMacroValueSpeedButton.Hint:=Format(lisAddValueToMacro, [aBuildMacro.Identifier]);
if NodeType=cbmntBuildMacro then if NodeType=cbmntBuildMacro then
BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteMacro, ['"',aBuildMacro.Identifier,'"']) BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteMacro, [aBuildMacro.Identifier])
else else
BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteValue2, [BuildMacrosTreeView. BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteValue2, [BuildMacrosTreeView.Selected.Text]);
Selected.Text]);
end else begin end else begin
BuildMacroSelectedGroupBox.Caption:=lisNoMacroSelected; BuildMacroSelectedGroupBox.Caption:=lisNoMacroSelected;
BuildMacroSelectedGroupBox.Enabled:=false; BuildMacroSelectedGroupBox.Enabled:=false;

2
ide/imexportcompileropts.pas
View File

@ -341,7 +341,7 @@ begin
if FileExistsUTF8(AFilename) then begin if FileExistsUTF8(AFilename) then begin
MsgResult:=MessageDlg(lisIECOExportFileExists, MsgResult:=MessageDlg(lisIECOExportFileExists,
Format(lisIECOExportFileExistsOpenFileAndReplaceOnlyCompilerOpti, Format(lisIECOExportFileExistsOpenFileAndReplaceOnlyCompilerOpti,
['"', AFilename, '"', LineEnding, LineEnding]), [AFilename, LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbCancel],0); mtConfirmation,[mbYes,mbCancel],0);
if MsgResult<>mrYes then exit; if MsgResult<>mrYes then exit;
end; end;

5
ide/keymapping.pp
View File

@ -2895,7 +2895,7 @@ begin
AddDefault(C, 'Detach from program', srkmecDetach, ecDetach); AddDefault(C, 'Detach from program', srkmecDetach, ecDetach);
AddDefault(C, 'Build File', lisMenuBuildFile, ecBuildFile); AddDefault(C, 'Build File', lisMenuBuildFile, ecBuildFile);
AddDefault(C, 'Run File', lisMenuRunFile, ecRunFile); AddDefault(C, 'Run File', lisMenuRunFile, ecRunFile);
AddDefault(C, 'Config "Build File"', Format(lisKMConfigBuildFile, ['"', '"']), ecConfigBuildFile); AddDefault(C, 'Config "Build File"', lisKMConfigBuildFile, ecConfigBuildFile);
AddDefault(C, 'Inspect', lisKMInspect, ecInspect); AddDefault(C, 'Inspect', lisKMInspect, ecInspect);
AddDefault(C, 'Evaluate/Modify', lisKMEvaluateModify, ecEvaluate); AddDefault(C, 'Evaluate/Modify', lisKMEvaluateModify, ecEvaluate);
AddDefault(C, 'Add watch', lisKMAddWatch, ecAddWatch); AddDefault(C, 'Add watch', lisKMAddWatch, ecAddWatch);
@ -2927,8 +2927,7 @@ begin
AddDefault(C, 'External Tools settings', lisKMExternalToolsSettings, ecExtToolSettings); AddDefault(C, 'External Tools settings', lisKMExternalToolsSettings, ecExtToolSettings);
AddDefault(C, 'Example Projects', lisKMExampleProjects, ecManageExamples); AddDefault(C, 'Example Projects', lisKMExampleProjects, ecManageExamples);
AddDefault(C, 'Build Lazarus', lisMenuBuildLazarus, ecBuildLazarus); AddDefault(C, 'Build Lazarus', lisMenuBuildLazarus, ecBuildLazarus);
AddDefault(C, 'Configure "Build Lazarus"', AddDefault(C, 'Configure "Build Lazarus"', lisConfigureBuildLazarus, ecConfigBuildLazarus);
Format(lisConfigureBuildLazarus, ['"', '"']), ecConfigBuildLazarus);
AddDefault(C, 'Diff editor files', lisKMDiffEditorFiles, ecDiff); AddDefault(C, 'Diff editor files', lisKMDiffEditorFiles, ecDiff);
AddDefault(C, 'Convert DFM file to LFM', lisKMConvertDFMFileToLFM, ecConvertDFM2LFM); AddDefault(C, 'Convert DFM file to LFM', lisKMConvertDFMFileToLFM, ecConvertDFM2LFM);
AddDefault(C, 'Convert Delphi unit to Lazarus unit', AddDefault(C, 'Convert Delphi unit to Lazarus unit',

244
ide/lazarusidestrconsts.pas
View File

@ -465,7 +465,7 @@ resourcestring
lisMenuRunParameters = 'Run &Parameters ...'; lisMenuRunParameters = 'Run &Parameters ...';
lisMenuBuildFile = 'Build File'; lisMenuBuildFile = 'Build File';
lisMenuRunFile = 'Run File'; lisMenuRunFile = 'Run File';
lisKMConfigBuildFile = 'Config %sBuild File%s'; lisKMConfigBuildFile = 'Config "Build File"';
lisKMInspect = 'Inspect'; lisKMInspect = 'Inspect';
lisKMEvaluateModify = 'Evaluate/Modify'; lisKMEvaluateModify = 'Evaluate/Modify';
lisKMAddWatch = 'Add watch'; lisKMAddWatch = 'Add watch';
@ -920,9 +920,8 @@ resourcestring
lisProjectSRaisedExceptionAtAddress = '%0:s%0:s At address %1:x'; lisProjectSRaisedExceptionAtAddress = '%0:s%0:s At address %1:x';
lisPEEditVirtualUnit = 'Edit Virtual Unit'; lisPEEditVirtualUnit = 'Edit Virtual Unit';
lisIECOExportFileExists = 'Export file exists'; lisIECOExportFileExists = 'Export file exists';
lisIECOExportFileExistsOpenFileAndReplaceOnlyCompilerOpti = 'Export file %s%' lisIECOExportFileExistsOpenFileAndReplaceOnlyCompilerOpti = 'Export file "%s" exists.'
+'s%s exists.%sOpen file and replace only compiler options?%s(Other ' +'%sOpen file and replace only compiler options?%s(Other settings will be kept.)';
+'settings will be kept.)';
lisIECOLoadOrSaveCompilerOptions = 'Load or Save Compiler Options'; lisIECOLoadOrSaveCompilerOptions = 'Load or Save Compiler Options';
lisIECOErrorAccessingXml = 'Error accessing xml'; lisIECOErrorAccessingXml = 'Error accessing xml';
lisIECOErrorLoadingXml = 'Error loading xml'; lisIECOErrorLoadingXml = 'Error loading xml';
@ -1357,8 +1356,8 @@ resourcestring
lisRemoveFromSearchPath = 'Remove from search path'; lisRemoveFromSearchPath = 'Remove from search path';
lisTheDirectoryWasNotFound = 'The directory %s was not found.'; lisTheDirectoryWasNotFound = 'The directory %s was not found.';
lisInstallationFailed = 'Installation failed'; lisInstallationFailed = 'Installation failed';
lisPkgMangThePackageFailedToCompileRemoveItFromTheInstallati = 'The package %' lisPkgMangThePackageFailedToCompileRemoveItFromTheInstallati = 'The package "%s" '
+'s%s%s failed to compile.%sRemove it from the installation list?'; +'failed to compile.%sRemove it from the installation list?';
lisEnvOptDlgTestDirNotFoundMsg = 'Test directory "%s" not found.'; lisEnvOptDlgTestDirNotFoundMsg = 'Test directory "%s" not found.';
// editor options // editor options
@ -3089,10 +3088,10 @@ resourcestring
lisCleanLazarusSource = 'Clean Lazarus Source'; lisCleanLazarusSource = 'Clean Lazarus Source';
lisBuildIDE = 'Build IDE'; lisBuildIDE = 'Build IDE';
lisMakeNotFound = 'Make not found'; lisMakeNotFound = 'Make not found';
lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa = 'The program %smake%' lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa = 'The program "make" '
+'s was not found.%sThis tool is needed to build Lazarus.%s'; +'was not found.%sThis tool is needed to build Lazarus.';
lisIDE = 'IDE'; lisIDE = 'IDE';
lisConfigureBuildLazarus = 'Configure %sBuild Lazarus%s'; lisConfigureBuildLazarus = 'Configure "Build Lazarus"';
lisLazBuildOptions = 'Options:'; lisLazBuildOptions = 'Options:';
lisLazBuildTargetOS = 'Target OS:'; lisLazBuildTargetOS = 'Target OS:';
lisLazBuildTargetCPU = 'Target CPU:'; lisLazBuildTargetCPU = 'Target CPU:';
@ -3644,15 +3643,14 @@ resourcestring
+'a Debugger in the debugger options dialog in the menu.'; +'a Debugger in the debugger options dialog in the menu.';
lisDbgMangSetTheBreakpointAnyway = 'Set the breakpoint anyway'; lisDbgMangSetTheBreakpointAnyway = 'Set the breakpoint anyway';
lisLaunchingApplicationInvalid = 'Launching application invalid'; lisLaunchingApplicationInvalid = 'Launching application invalid';
lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta = 'The launching ' lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta = 'The launching application '
+'application %s%s%' +'"%s"%sdoes not exist or is not executable.%s%sSee Run -> Run parameters -> Local';
+'s%sdoes not exist or is not executable.%s%sSee Run -> Run parameters -> Local';
lisTheLaunchingApplicationBundleDoesNotExists = 'The Application Bundle %s' lisTheLaunchingApplicationBundleDoesNotExists = 'The Application Bundle %s'
+'%sneeded for execution does not exist or is not executable.%sDo you want to create one?' +'%sneeded for execution does not exist or is not executable.%sDo you want to create one?'
+'%s%sSee Project -> Project Options -> Application for settings.'; +'%s%sSee Project -> Project Options -> Application for settings.';
lisDebuggerInvalid = 'Debugger invalid'; lisDebuggerInvalid = 'Debugger invalid';
lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro = 'The debugger %s%s%' lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro = 'The debugger "%s"%s'
+'s%sdoes not exist or is not executable.%s%sSee Tools -> Options -> Debugger options'; +'does not exist or is not executable.%s%sSee Tools -> Options -> Debugger options';
lisUnableToRun = 'Unable to run'; lisUnableToRun = 'Unable to run';
lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP = 'The destination ' lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP = 'The destination '
+'directory "%s" does not exist.%sPlease check the project target file ' +'directory "%s" does not exist.%sPlease check the project target file '
@ -3830,33 +3828,30 @@ resourcestring
lisProjMangUnableToWriteStateFileForProjectError = 'Unable to write state ' lisProjMangUnableToWriteStateFileForProjectError = 'Unable to write state '
+'file for project %s%sError: %s'; +'file for project %s%sError: %s';
lisPkgMangUnableToWriteStateFileOfPackageError = 'Unable to write state ' lisPkgMangUnableToWriteStateFileOfPackageError = 'Unable to write state '
+'file %s%s%s%sof package %s.%sError: %s'; +'file "%s"%sof package %s.%sError: %s';
lisPkgMangErrorReadingFile = 'Error reading file'; lisPkgMangErrorReadingFile = 'Error reading file';
lisProjMangUnableToReadStateFileOfProjectError = 'Unable to read state ' lisProjMangUnableToReadStateFileOfProjectError = 'Unable to read state '
+'file %s of project %s%sError: %s'; +'file %s of project %s%sError: %s';
lisPkgMangUnableToReadStateFileOfPackageError = 'Unable to read state file %' lisPkgMangUnableToReadStateFileOfPackageError = 'Unable to read state file '
+'s%s%s%sof package %s.%sError: %s'; +'"%s"%sof package %s.%sError: %s';
lisPkgMangUnableToCreateDirectory = 'Unable to create directory'; lisPkgMangUnableToCreateDirectory = 'Unable to create directory';
lisUnableToCreateDirectory = 'Unable to create directory "%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"%sfor package %s.';
lisPkgMangUnableToDeleteFilename = 'Unable to delete file'; lisPkgMangUnableToDeleteFilename = 'Unable to delete file';
lisPkgMangUnableToDeleteOldStateFileForPackage = 'Unable to delete old ' lisPkgMangUnableToDeleteOldStateFileForPackage = 'Unable to delete old '
+'state file %s%s%s%sfor package %s.'; +'state file "%s"%sfor package %s.';
lisPkgMangUnableToCreatePackageSourceDirectoryForPackage = 'Unable to ' lisPkgMangUnableToCreatePackageSourceDirectoryForPackage = 'Unable to '
+'create package source directory %s%s%s%sfor package %s.'; +'create package source directory "%s"%sfor package %s.';
lisPkgMangUnableToLoadPackage = 'Unable to load package'; lisPkgMangUnableToLoadPackage = 'Unable to load package';
lisPkgMangUnableToOpenThePackage = 'Unable to open the package %s%s%s.%' lisPkgMangUnableToOpenThePackage = 'Unable to open the package "%s".%s'
+'sThis package was marked for installation.'; +'This package was marked for installation.';
lisOpenPackage2 = 'Open package %s'; lisOpenPackage2 = 'Open package %s';
lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name %s%s%s of%' lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name "%s" of%s'
+'sthe file %s%s%s is invalid.'; +'the file "%s" is invalid.';
lisLazbuildIsNonInteractiveAbortingNow = '%s%s%s%slazbuild is non '
+'interactive, aborting now.';
lisPkgMangPackageConflicts = 'Package conflicts'; lisPkgMangPackageConflicts = 'Package conflicts';
lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a ' lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a package "%s" '
+'package %s%s%s loaded%sfrom file %s%s%s.%sSee Package -> Package ' +'loaded%sfrom file "%s".%sSee Package -> Package Graph.%sReplace is impossible.';
+'Graph.%sReplace is impossible.';
lisPkgMangSavePackage = 'Save package?'; lisPkgMangSavePackage = 'Save package?';
lisPkgMangLoadingPackageWillReplacePackage = 'Loading package %s will ' lisPkgMangLoadingPackageWillReplacePackage = 'Loading package %s will '
+'replace package %s%sfrom file %s.%sThe old package is modified.%s%sSave ' +'replace package %s%sfrom file %s.%sThe old package is modified.%s%sSave '
@ -3872,25 +3867,23 @@ resourcestring
lisUnitInPackage = '%s unit %s in package %s%s'; lisUnitInPackage = '%s unit %s in package %s%s';
lisPkgMangSkipThisPackage = 'Skip this package'; lisPkgMangSkipThisPackage = 'Skip this package';
lisPkgMangInvalidFileExtension = 'Invalid file extension'; lisPkgMangInvalidFileExtension = 'Invalid file extension';
lisPkgMangTheFileIsNotALazarusPackage = 'The file %s%s%s is not a Lazarus package.'; lisPkgMangTheFileIsNotALazarusPackage = 'The file "%s" is not a Lazarus package.';
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" in%s"%s" is not a valid Lazarus package name.';
lisPkgMangFileNotFound = 'File "%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".%sError: %s';
lisPkgMangFilenameDiffersFromPackagename = lisPkgMangFilenameDiffersFromPackagename = 'Filename differs from Packagename';
'Filename differs from Packagename'; lisPkgMangTheFilenameDoesNotCorrespondToThePackage = 'The filename "%s" does not '
lisPkgMangTheFilenameDoesNotCorrespondToThePackage = 'The filename %s%s%s ' +'correspond to the package name "%s" in the file.%sChange package name to "%s"?';
+'does not correspond to the package name %s%s%s in the file.%sChange '
+'package name to %s%s%s?';
lisSuspiciousIncludePath = 'Suspicious include path'; lisSuspiciousIncludePath = 'Suspicious include path';
lisThePackageAddsThePathToTheIncludePathOfTheIDEThisI = 'The package %s ' lisThePackageAddsThePathToTheIncludePathOfTheIDEThisI = 'The package %s '
+'adds the path "%s" to the include path of the IDE.%sThis is probably a ' +'adds the path "%s" to the include path of the IDE.%sThis is probably a '
+'misconfiguration of the package.'; +'misconfiguration of the package.';
lisPkgMangErrorWritingPackage = 'Error Writing Package'; lisPkgMangErrorWritingPackage = 'Error Writing Package';
lisPkgMangUnableToWritePackageToFileError = 'Unable to write package %s%s%s%' lisPkgMangUnableToWritePackageToFileError = 'Unable to write package "%s"%sto '
+'sto file %s%s%s.%sError: %s'; +'file "%s".%sError: %s';
lisSeeProjectProjectInspector = '%sSee Project -> Project Inspector'; lisSeeProjectProjectInspector = '%sSee Project -> Project Inspector';
lisPkgMangTheFollowingPackageFailedToLoad = 'The following package failed to load:'; lisPkgMangTheFollowingPackageFailedToLoad = 'The following package failed to load:';
lisPkgMangTheFollowingPackagesFailedToLoad = 'The following packages failed to load:'; lisPkgMangTheFollowingPackagesFailedToLoad = 'The following packages failed to load:';
@ -3913,11 +3906,10 @@ resourcestring
lisPkgMangPleaseSaveTheFileBeforeAddingItToAPackage = 'Please save the file ' lisPkgMangPleaseSaveTheFileBeforeAddingItToAPackage = 'Please save the file '
+'before adding it to a package.'; +'before adding it to a package.';
lisPkgMangFileIsInProject = 'File is in Project'; lisPkgMangFileIsInProject = 'File is in Project';
lisPkgMangWarningTheFileBelongsToTheCurrentProject = 'Warning: The file %s%' lisPkgMangWarningTheFileBelongsToTheCurrentProject = 'Warning: The file "%s"%s'
+'s%s%sbelongs to the current project.'; +'belongs to the current project.';
lisPkgMangFileIsAlreadyInPackage = 'File is already in package'; lisPkgMangFileIsAlreadyInPackage = 'File is already in package';
lisPkgMangTheFileIsAlreadyInThePackage = 'The file %s%s%s%sis already in ' lisPkgMangTheFileIsAlreadyInThePackage = 'The file "%s"%sis already in the package %s.';
+'the package %s.';
lisPkgMangPackageIsNoDesigntimePackage = 'Package is not a designtime package'; lisPkgMangPackageIsNoDesigntimePackage = 'Package is not a designtime package';
lisPkgMangThePackageIsARuntimeOnlyPackageRuntimeOnlyPackages = 'The package %' lisPkgMangThePackageIsARuntimeOnlyPackageRuntimeOnlyPackages = 'The package %'
+'s is a runtime only package.%sRuntime only packages cannot be ' +'s is a runtime only package.%sRuntime only packages cannot be '
@ -3928,8 +3920,8 @@ resourcestring
lisPkgMangInstallingThePackageWillAutomaticallyInstallThePac = 'Installing ' lisPkgMangInstallingThePackageWillAutomaticallyInstallThePac = 'Installing '
+'the package %s will automatically install the package:'; +'the package %s will automatically install the package:';
lisPkgMangRebuildLazarus = 'Rebuild Lazarus?'; lisPkgMangRebuildLazarus = 'Rebuild Lazarus?';
lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus = 'The package %' lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus = 'The package "%s" '
+'s%s%s was marked for installation.%sCurrently Lazarus only supports ' +'was marked for installation.%sCurrently Lazarus only supports '
+'static linked packages. The real installation needs rebuilding and ' +'static linked packages. The real installation needs rebuilding and '
+'restarting of Lazarus.%s%sDo you want to rebuild Lazarus now?'; +'restarting of Lazarus.%s%sDo you want to rebuild Lazarus now?';
lisPkgMangPackageIsRequired = 'Package is required'; lisPkgMangPackageIsRequired = 'Package is required';
@ -3937,22 +3929,21 @@ resourcestring
+'s is required by %s, which is marked for installation.%sSee package graph.'; +'s is required by %s, which is marked for installation.%sSee package graph.';
lisPkgMangUninstallPackage = 'Uninstall package?'; lisPkgMangUninstallPackage = 'Uninstall package?';
lisPkgMangUninstallPackage2 = 'Uninstall package %s?'; lisPkgMangUninstallPackage2 = 'Uninstall package %s?';
lisPkgMangThePackageWasMarkedCurrentlyLazarus = 'The package %s%s%s was ' lisPkgMangThePackageWasMarkedCurrentlyLazarus = 'The package "%s" was marked.'
+'marked.%sCurrently Lazarus only supports static linked packages. The ' +'%sCurrently Lazarus only supports static linked packages. The real un-installation '
+'real un-installation needs rebuilding and restarting of Lazarus.%s%' +'needs rebuilding and restarting of Lazarus.%s%sDo you want to rebuild Lazarus now?';
+'sDo you want to rebuild Lazarus now?';
lisPkgMangThisIsAVirtualPackageItHasNoSourceYetPleaseSaveThe = 'This is a ' lisPkgMangThisIsAVirtualPackageItHasNoSourceYetPleaseSaveThe = 'This is a '
+'virtual package. It has no source yet. Please save the package first.'; +'virtual package. It has no source yet. Please save the package first.';
lisPkgMangPleaseCompileThePackageFirst = 'Please compile the package first.'; lisPkgMangPleaseCompileThePackageFirst = 'Please compile the package first.';
lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound = 'The package %' lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound = 'The package "%s" '
+'s%s%s is marked for installation, but cannot be found.%sRemove ' +'is marked for installation, but cannot be found.%sRemove '
+'dependency from the installation list of packages?'; +'dependency from the installation list of packages?';
lisERRORInvalidBuildMode = 'ERROR: invalid build mode "%s"'; lisERRORInvalidBuildMode = 'ERROR: invalid build mode "%s"';
lisAvailableProjectBuildModes = 'Available project build modes:'; lisAvailableProjectBuildModes = 'Available project build modes:';
lisThisProjectHasOnlyTheDefaultBuildMode = 'This project has only the default build mode.'; lisThisProjectHasOnlyTheDefaultBuildMode = 'This project has only the default build mode.';
lisPkgMangstaticPackagesConfigFile = 'static packages config file'; lisPkgMangstaticPackagesConfigFile = 'static packages config file';
lisPkgMangUnableToCreateTargetDirectoryForLazarus = 'Unable to create ' lisPkgMangUnableToCreateTargetDirectoryForLazarus = 'Unable to create '
+'target directory for Lazarus:%s%s%s%s.%sThis directory is needed for ' +'target directory for Lazarus:%s"%s".%sThis directory is needed for '
+'the new changed Lazarus IDE with your custom packages.'; +'the new changed Lazarus IDE with your custom packages.';
lisPkgMangCompilingPackage = 'Compiling package %s'; lisPkgMangCompilingPackage = 'Compiling package %s';
lisPkgMangErrorUpdatingPoFilesFailedForPackage = 'Error: updating po files ' lisPkgMangErrorUpdatingPoFilesFailedForPackage = 'Error: updating po files '
@ -3971,12 +3962,12 @@ resourcestring
lisPkgSysCanNotRegisterComponentsWithoutUnit = 'Cannot register components ' lisPkgSysCanNotRegisterComponentsWithoutUnit = 'Cannot register components '
+'without unit'; +'without unit';
lisPkgSysInvalidComponentClass = 'Invalid component class'; lisPkgSysInvalidComponentClass = 'Invalid component class';
lisPkgSysComponentClassAlreadyDefined = 'Component Class %s%s%s already defined'; lisPkgSysComponentClassAlreadyDefined = 'Component Class "%s" already defined';
lisPkgSysRegisterUnitWasCalledButNoPackageIsRegistering = 'RegisterUnit was ' lisPkgSysRegisterUnitWasCalledButNoPackageIsRegistering = 'RegisterUnit was '
+'called, but no package is registering.'; +'called, but no package is registering.';
lisPkgSysUnitName = '%s%sUnit Name: %s%s%s'; lisPkgSysUnitName = '%s%sUnit Name: "%s"';
lisPkgSysFileName = '%s%sFile Name: %s%s%s'; lisPkgSysFileName = '%s%sFile Name: "%s"';
lisPkgSysLPKFilename = '%s%slpk file: %s%s%s'; lisPkgSysLPKFilename = '%s%slpk file: "%s"';
lisPkgSysTheLpkFileWasNotFound = '%s%sThe lpk file was not found.'; lisPkgSysTheLpkFileWasNotFound = '%s%sThe lpk file was not found.';
lisPkgSysPackageRegistrationError = 'Package registration error'; lisPkgSysPackageRegistrationError = 'Package registration error';
lisPkgSysThisIsTheDefaultPackageUsedOnlyForComponents = 'This is the ' lisPkgSysThisIsTheDefaultPackageUsedOnlyForComponents = 'This is the '
@ -3988,9 +3979,8 @@ resourcestring
+'deactivated. Please fix this.'; +'deactivated. Please fix this.';
lisPkgSysPackageFileNotFound = 'Package file not found'; lisPkgSysPackageFileNotFound = 'Package file not found';
lisPkgMangTheFileOfPackageWasNotFound = 'The file "%s" of package %s was not found.'; lisPkgMangTheFileOfPackageWasNotFound = 'The file "%s" of package %s was not found.';
lisPkgSysThePackageIsInstalledButNoValidPackageFileWasFound = 'The package %' lisPkgSysThePackageIsInstalledButNoValidPackageFileWasFound = 'The package "%s" is installed, '
+'s%s%s is installed, but no valid package file (.lpk) was found.%sA broken ' +'but no valid package file (.lpk) was found.%sA broken dummy package was created.';
+'dummy package was created.';
// package defs // package defs
lisPkgDefsOutputDirectory = 'Output directory'; lisPkgDefsOutputDirectory = 'Output directory';
@ -4001,11 +3991,11 @@ resourcestring
// add active file to package dialog // add active file to package dialog
lisAF2PInvalidPackage = 'Invalid Package'; lisAF2PInvalidPackage = 'Invalid Package';
lisAF2PInvalidPackageID = 'Invalid package ID: %s%s%s'; lisAF2PInvalidPackageID = 'Invalid package ID: "%s"';
lisAF2PPackageNotFound = 'Package %s%s%s not found.'; lisAF2PPackageNotFound = 'Package "%s" not found.';
lisAF2PPackageIsReadOnly = 'Package is read only'; lisAF2PPackageIsReadOnly = 'Package is read only';
lisAF2PThePackageIsReadOnly = 'The package %s is read only.'; lisAF2PThePackageIsReadOnly = 'The package %s is read only.';
lisAF2PTheFileIsAlreadyInThePackage = 'The file %s%s%s%sis already in the package %s.'; lisAF2PTheFileIsAlreadyInThePackage = 'The file "%s"%sis already in the package %s.';
lisAF2PUnitName = 'Unit name: '; lisAF2PUnitName = 'Unit name: ';
lisAF2PHasRegisterProcedure = 'Has Register procedure'; lisAF2PHasRegisterProcedure = 'Has Register procedure';
lisAF2PFileType = 'File type'; lisAF2PFileType = 'File type';
@ -4019,72 +4009,68 @@ resourcestring
// add to package dialog // add to package dialog
lisA2PInvalidFilename = 'Invalid filename'; lisA2PInvalidFilename = 'Invalid filename';
lisA2PTheFilenameIsAmbiguousPleaseSpecifiyAFilename = 'The filename %s%s%s ' lisA2PTheFilenameIsAmbiguousPleaseSpecifiyAFilename = 'The filename "%s" '
+'is ambiguous, because the package has no default directory yet.%s' +'is ambiguous, because the package has no default directory yet.%s'
+'Please specify a filename with full path.'; +'Please specify a filename with full path.';
lisA2PFileNotUnit = 'File not unit'; lisA2PFileNotUnit = 'File not unit';
lisA2PPascalUnitsMustHaveTheExtensionPPOrPas = 'Pascal units must have the ' lisA2PPascalUnitsMustHaveTheExtensionPPOrPas = 'Pascal units must have the '
+'extension .pp or .pas'; +'extension .pp or .pas';
lisA2PisNotAValidUnitName = '%s%s%s is not a valid unit name.'; lisA2PisNotAValidUnitName = '"%s" is not a valid unit name.';
lisA2PUnitnameAlreadyExists = 'Unitname already exists'; lisA2PUnitnameAlreadyExists = 'Unitname already exists';
lisA2PTheUnitnameAlreadyExistsInThisPackage = 'The unitname %s%s%s already ' lisA2PTheUnitnameAlreadyExistsInThisPackage = 'The unitname "%s" already '
+'exists in this package.'; +'exists in this package.';
lisA2PTheUnitnameAlreadyExistsInThePackage = 'The unitname %s%s%s already ' lisA2PTheUnitnameAlreadyExistsInThePackage = 'The unitname "%s" already '
+'exists in the package:%s%s'; +'exists in the package:%s%s';
lisA2PFileAlreadyExistsInThePackage = 'File %s%s%s already exists in the package.'; lisA2PFileAlreadyExistsInThePackage = 'File "%s" already exists in the package.';
lisA2PAmbiguousUnitName = 'Ambiguous Unit Name'; lisA2PAmbiguousUnitName = 'Ambiguous Unit Name';
lisA2PTheUnitNameIsTheSameAsAnRegisteredComponent = 'The unit name %s%s%s ' lisA2PTheUnitNameIsTheSameAsAnRegisteredComponent = 'The unit name "%s" is the '
+'is the same as a registered component.%sUsing this can cause strange ' +'same as a registered component.%sUsing this can cause strange error messages.';
+'error messages.'; lisA2PExistingFile2 = 'Existing file: "%s"';
lisA2PExistingFile2 = 'Existing file: %s%s%s';
lisA2PFileAlreadyExists = 'File already exists'; lisA2PFileAlreadyExists = 'File already exists';
lisA2PFileIsUsed = 'File is used'; lisA2PFileIsUsed = 'File is used';
lisA2PTheFileIsPartOfTheCurrentProjectItIsABadIdea = 'The file %s%s%s is ' lisA2PTheFileIsPartOfTheCurrentProjectItIsABadIdea = 'The file "%s" is part of the '
+'part of the current project.%sIt is a bad idea to share files between ' +'current project.%sIt is a bad idea to share files between projects and packages.';
+'projects and packages.';
lisA2PTheMaximumVersionIsLowerThanTheMinimimVersion = 'The Maximum Version ' lisA2PTheMaximumVersionIsLowerThanTheMinimimVersion = 'The Maximum Version '
+'is lower than the Minimim Version.'; +'is lower than the Minimim Version.';
lisA2PThePackageNameIsInvalidPleaseChooseAnExisting = 'The package name %s%s%' lisA2PThePackageNameIsInvalidPleaseChooseAnExisting = 'The package name "%s" '
+'s is invalid.%sPlease choose an existing package.'; +'is invalid.%sPlease choose an existing package.';
lisA2PThePackageHasAlreadyADependencyForThe = 'The package already has a ' lisA2PThePackageHasAlreadyADependencyForThe = 'The package already has a '
+'dependency on the package %s%s%s.'; +'dependency on the package "%s".';
lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting = 'No package found ' lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting = 'No package found '
+'for dependency %s%s%s.%sPlease choose an existing package.'; +'for dependency "%s".%sPlease choose an existing package.';
lisA2PInvalidUnitName = 'Invalid Unit Name'; lisA2PInvalidUnitName = 'Invalid Unit Name';
lisA2PTheUnitNameAndFilenameDiffer = 'The unit name %s%s%s%sand filename %s%' lisA2PTheUnitNameAndFilenameDiffer = 'The unit name "%s"%sand filename "%s" differ.';
+'s%s differ.';
lisA2PInvalidFile = 'Invalid file'; lisA2PInvalidFile = 'Invalid file';
lisA2PAPascalUnitMustHaveTheExtensionPPOrPas = 'A Pascal unit must have the ' lisA2PAPascalUnitMustHaveTheExtensionPPOrPas = 'A Pascal unit must have the '
+'extension .pp or .pas'; +'extension .pp or .pas';
lisA2PInvalidAncestorType = 'Invalid Ancestor Type'; lisA2PInvalidAncestorType = 'Invalid Ancestor Type';
lisA2PTheAncestorTypeIsNotAValidPascalIdentifier = 'The ancestor type %s%s%' lisA2PTheAncestorTypeIsNotAValidPascalIdentifier = 'The ancestor type "%s" '
+'s is not a valid Pascal identifier.'; +'is not a valid Pascal identifier.';
lisA2PPageNameTooLong = 'Page Name too long'; lisA2PPageNameTooLong = 'Page Name too long';
lisA2PThePageNameIsTooLongMax100Chars = 'The page name %s%s%s is too long (' lisA2PThePageNameIsTooLongMax100Chars = 'The page name "%s" is too long (max 100 chars).';
+'max 100 chars).';
lisA2PUnitNameInvalid = 'Unit Name Invalid'; lisA2PUnitNameInvalid = 'Unit Name Invalid';
lisA2PTheUnitNameDoesNotCorrespondToTheFilename = 'The unit name %s%s%s ' lisA2PTheUnitNameDoesNotCorrespondToTheFilename = 'The unit name "%s" '
+'does not correspond to the filename.'; +'does not correspond to the filename.';
lisA2PInvalidClassName = 'Invalid Class Name'; lisA2PInvalidClassName = 'Invalid Class Name';
lisA2PTheClassNameIsNotAValidPascalIdentifier = 'The class name %s%s%s is ' lisA2PTheClassNameIsNotAValidPascalIdentifier = 'The class name "%s" is '
+'not a valid Pascal identifier.'; +'not a valid Pascal identifier.';
lisA2PInvalidCircularDependency = 'Invalid Circular Dependency'; lisA2PInvalidCircularDependency = 'Invalid Circular Dependency';
lisA2PTheClassNameAndAncestorTypeAreTheSame = 'The class name %s%s%s and ' lisA2PTheClassNameAndAncestorTypeAreTheSame = 'The class name "%s" and '
+'ancestor type %s%s%s are the same.'; +'ancestor type "%s" are the same.';
lisA2PAmbiguousAncestorType = 'Ambiguous Ancestor Type'; lisA2PAmbiguousAncestorType = 'Ambiguous Ancestor Type';
lisA2PTheAncestorTypeHasTheSameNameAsTheUnit = 'The ancestor type %s%s%s ' lisA2PTheAncestorTypeHasTheSameNameAsTheUnit = 'The ancestor type "%s" '
+'has the same name as%sthe unit %s%s%s.'; +'has the same name as%sthe unit "%s".';
lisA2PAmbiguousClassName = 'Ambiguous Class Name'; lisA2PAmbiguousClassName = 'Ambiguous Class Name';
lisA2PTheClassNameHasTheSameNameAsTheUnit = 'The class name %s%s%s has the ' lisA2PTheClassNameHasTheSameNameAsTheUnit = 'The class name "%s" has the '
+'same name as%sthe unit %s%s%s.'; +'same name as%sthe unit "%s".';
lisA2PClassNameAlreadyExists = 'Class Name already exists'; lisA2PClassNameAlreadyExists = 'Class Name already exists';
lisA2PTheClassNameExistsAlreadyInPackageFile = 'The class name %s%s%s ' lisA2PTheClassNameExistsAlreadyInPackageFile = 'The class name "%s" '
+'exists already in%sPackage %s%sFile: %s%s%s'; +'exists already in%sPackage %s%sFile: "%s"';
lisA2PTheMinimumVersionIsInvalidPleaseUseTheFormatMajor = 'The Minimum ' lisA2PTheMinimumVersionIsInvalidPleaseUseTheFormatMajor = 'The Minimum '
+'Version %s%s%s is invalid.%sPlease use the format major.minor.release.' +'Version "%s" is invalid.%sPlease use the format major.minor.release.'
+'build%sFor exmaple: 1.0.20.10'; +'build%sFor exmaple: 1.0.20.10';
lisA2PTheMaximumVersionIsInvalidPleaseUseTheFormatMajor = 'The Maximum ' lisA2PTheMaximumVersionIsInvalidPleaseUseTheFormatMajor = 'The Maximum '
+'Version %s%s%s is invalid.%sPlease use the format major.minor.release.' +'Version "%s" is invalid.%sPlease use the format major.minor.release.'
+'build%sFor exmaple: 1.0.20.10'; +'build%sFor exmaple: 1.0.20.10';
lisA2PNewFile = 'New File'; lisA2PNewFile = 'New File';
lisA2PNewComponent = 'New Component'; lisA2PNewComponent = 'New Component';
@ -4156,21 +4142,19 @@ resourcestring
lisPckEditInstall = 'Install'; lisPckEditInstall = 'Install';
lisPckEditUninstall = 'Uninstall'; lisPckEditUninstall = 'Uninstall';
lisPckEditViewPackageSource = 'View Package Source'; lisPckEditViewPackageSource = 'View Package Source';
lisPckEditPackageHasChangedSavePackage = 'Package %s%s%s has changed.%sSave package?'; lisPckEditPackageHasChangedSavePackage = 'Package "%s" has changed.%sSave package?';
lisPckEditPage = '%s, Page: %s'; lisPckEditPage = '%s, Page: %s';
lisPckEditRemoveFile2 = 'Remove file?'; lisPckEditRemoveFile2 = 'Remove file?';
lisPckEditRemoveFileFromPackage = 'Remove file %s%s%s%sfrom package %s%s%s?'; lisPckEditRemoveFileFromPackage = 'Remove file "%s"%sfrom package "%s"?';
lisPckEditRemoveDependency2 = 'Remove Dependency?'; lisPckEditRemoveDependency2 = 'Remove Dependency?';
lisPckEditRemoveDependencyFromPackage = 'Remove dependency %s%s%s%sfrom ' lisPckEditRemoveDependencyFromPackage = 'Remove dependency "%s"%sfrom package "%s"?';
+'package %s%s%s?'; lisRemoveDependenciesFromPackage = 'Remove %s dependencies from package "%s"?';
lisRemoveDependenciesFromPackage =
'Remove %s dependencies from package "%s"?';
lisPckEditInvalidMinimumVersion = 'Invalid minimum version'; lisPckEditInvalidMinimumVersion = 'Invalid minimum version';
lisPckEditTheMinimumVersionIsNotAValidPackageVersion = 'The minimum ' lisPckEditTheMinimumVersionIsNotAValidPackageVersion = 'The minimum '
+'version %s%s%s is not a valid package version.%s(good example 1.2.3.4)'; +'version "%s" is not a valid package version.%s(good example 1.2.3.4)';
lisPckEditInvalidMaximumVersion = 'Invalid maximum version'; lisPckEditInvalidMaximumVersion = 'Invalid maximum version';
lisPckEditTheMaximumVersionIsNotAValidPackageVersion = 'The maximum ' lisPckEditTheMaximumVersionIsNotAValidPackageVersion = 'The maximum '
+'version %s%s%s is not a valid package version.%s(good example 1.2.3.4)'; +'version "%s" is not a valid package version.%s(good example 1.2.3.4)';
lisPckEditCompileEverything = 'Compile everything?'; lisPckEditCompileEverything = 'Compile everything?';
lisPckEditReCompileThisAndAllRequiredPackages = 'Re-Compile this and all ' lisPckEditReCompileThisAndAllRequiredPackages = 'Re-Compile this and all '
+'required packages?'; +'required packages?';
@ -4213,9 +4197,8 @@ resourcestring
lisPckEditReadOnly = 'Read Only: %s'; lisPckEditReadOnly = 'Read Only: %s';
lisPckEditModified = 'Modified: %s'; lisPckEditModified = 'Modified: %s';
lisPkgEditNewUnitNotInUnitpath = 'New unit not in unitpath'; lisPkgEditNewUnitNotInUnitpath = 'New unit not in unitpath';
lisPkgEditTheFileIsCurrentlyNotInTheUnitpathOfThePackage = 'The file %s%s%s%' lisPkgEditTheFileIsCurrentlyNotInTheUnitpathOfThePackage = 'The file "%s"%s'
+'sis currently not in the unit path of the package.%s%sAdd %s%s%s to ' +'is currently not in the unit path of the package.%s%sAdd "%s" to unit path?';
+'unit path?';
lisPENewFileNotInIncludePath = 'New file not in include path'; lisPENewFileNotInIncludePath = 'New file not in include path';
lisPETheFileIsCurrentlyNotInTheIncludePathOfThePackageA = 'The file "%s" is ' lisPETheFileIsCurrentlyNotInTheIncludePathOfThePackageA = 'The file "%s" is '
+'currently not in the include path of the package.%sAdd "%s" to the ' +'currently not in the include path of the package.%sAdd "%s" to the '
@ -4262,7 +4245,7 @@ resourcestring
lisPckOptsLinker = 'Linker'; lisPckOptsLinker = 'Linker';
lisPckOptsCustom = 'Custom'; lisPckOptsCustom = 'Custom';
lisPckOptsInvalidPackageType = 'Invalid package type'; lisPckOptsInvalidPackageType = 'Invalid package type';
lisPckOptsThePackageHasTheAutoInstallFlagThisMeans = 'The package %s%s%s ' lisPckOptsThePackageHasTheAutoInstallFlagThisMeans = 'The package "%s" '
+'has the auto install flag.%sThis means it will be installed in the IDE. ' +'has the auto install flag.%sThis means it will be installed in the IDE. '
+'Installation packages%smust be designtime Packages.'; +'Installation packages%smust be designtime Packages.';
lisPckOptsPackageOptions = 'Package Options'; lisPckOptsPackageOptions = 'Package Options';
@ -4394,13 +4377,6 @@ resourcestring
lisProcedureWithInterface = 'Procedure with interface'; lisProcedureWithInterface = 'Procedure with interface';
lisSubProcedure = 'Sub Procedure'; lisSubProcedure = 'Sub Procedure';
lisSubProcedureOnSameLevel = 'Sub Procedure on same level'; lisSubProcedureOnSameLevel = 'Sub Procedure on same level';
lisTheCurrentLazarusDirectoryDoesNotLookCorrectWithou = 'The current '
+'Lazarus directory %s%s%s%sdoes not look correct.%sWithout it You will '
+'not be able to create LCL applications.%sChoose Ok to choose the '
+'default %s%s%s.%sOtherwise check Tools -> Options -> Files';
lisTheCurrentFreePascalSourceDirectoryDoesNotLookCorr = 'The current Free '
+'Pascal source directory %s%s%s%sdoes not look correct.%sChoose Ok to '
+'choose the default %s%s%s.%sOtherwise check Tools -> Options -> Files';
// Help Options // Help Options
lisHlpOptsHelpOptions = 'Help Options'; lisHlpOptsHelpOptions = 'Help Options';
@ -4480,8 +4456,7 @@ resourcestring
lisNPCreateANewProject = 'Create a new project'; lisNPCreateANewProject = 'Create a new project';
lisNPCreate = 'Create'; lisNPCreate = 'Create';
lisOIFChooseABaseClassForTheFavoriteProperty = 'Choose a base class for ' lisOIFChooseABaseClassForTheFavoriteProperty = 'Choose a base class for the favorite property "%s".';
+'the favorite property %s%s%s.';
lisOIFAddToFavoriteProperties = 'Add to favorite properties'; lisOIFAddToFavoriteProperties = 'Add to favorite properties';
lisOIFRemoveFromFavoriteProperties = 'Remove from favorite properties'; lisOIFRemoveFromFavoriteProperties = 'Remove from favorite properties';
lisReplacingSelectionFailed = 'Replacing selection failed.'; lisReplacingSelectionFailed = 'Replacing selection failed.';
@ -4757,7 +4732,7 @@ resourcestring
lisDeleteBreakpointForAddress = 'Delete breakpoint for address %s?'; lisDeleteBreakpointForAddress = 'Delete breakpoint for address %s?';
lisDeleteBreakpointForWatch = 'Delete watchpoint for "%s"?'; lisDeleteBreakpointForWatch = 'Delete watchpoint for "%s"?';
lisDeleteAllBreakpoints = 'Delete all breakpoints?'; lisDeleteAllBreakpoints = 'Delete all breakpoints?';
lisDeleteAllBreakpoints2 = 'Delete all breakpoints in file %s%s%s?'; lisDeleteAllBreakpoints2 = 'Delete all breakpoints in file "%s"?';
lisGroupNameInput = 'Group name:'; lisGroupNameInput = 'Group name:';
lisGroupNameInvalid = 'BreakpointGroup name must be a valid Pascal identifier name.'; lisGroupNameInvalid = 'BreakpointGroup name must be a valid Pascal identifier name.';
lisGroupNameEmptyClearInstead = 'The group name cannot be empty. Clear breakpoints'' group(s)?'; lisGroupNameEmptyClearInstead = 'The group name cannot be empty. Clear breakpoints'' group(s)?';
@ -4907,7 +4882,7 @@ resourcestring
lisInsertPrintshortTag2 = 'Insert printshort tag'; lisInsertPrintshortTag2 = 'Insert printshort tag';
lisDeleteOldFile2 = 'Delete old file?'; lisDeleteOldFile2 = 'Delete old file?';
lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac = 'The unit search ' lisTheUnitSearchPathOfContainsTheSourceDirectoryOfPac = 'The unit search '
+'path of %s%s%s contains the source directory %s%s%s of package %s'; +'path of "%s" contains the source directory "%s" of package %s';
lisFPCVersionEG222 = 'FPC Version (e.g. 2.2.2)'; lisFPCVersionEG222 = 'FPC Version (e.g. 2.2.2)';
lisMissingIdentifiers = 'Missing identifiers'; lisMissingIdentifiers = 'Missing identifiers';
lisChooseAFPDocLink = 'Choose a FPDoc link'; lisChooseAFPDocLink = 'Choose a FPDoc link';
@ -4932,7 +4907,7 @@ resourcestring
+'filenames with full path or with relative path'; +'filenames with full path or with relative path';
lisDeleteSelectedFiles = 'Delete selected files'; lisDeleteSelectedFiles = 'Delete selected files';
lisAddFilesInDirectory = 'Add Files in Directory'; lisAddFilesInDirectory = 'Add Files in Directory';
lisUnableToCreateLinkWithTarget = 'Unable to create link %s%s%s with target %s%s%s'; lisUnableToCreateLinkWithTarget = 'Unable to create link "%s" with target "%s"';
lisBuildAllFilesOfProjectPackageIDE = lisBuildAllFilesOfProjectPackageIDE =
'build all files of project/package/IDE'; 'build all files of project/package/IDE';
lisApplyBuildFlagsBToDependenciesToo = 'apply build flags (-B) to dependencies too'; lisApplyBuildFlagsBToDependenciesToo = 'apply build flags (-B) to dependencies too';
@ -5005,14 +4980,13 @@ resourcestring
lisValues = 'Values'; lisValues = 'Values';
lisIDEMacros = 'IDE Macros'; lisIDEMacros = 'IDE Macros';
lisConfirmDelete = 'Confirm delete'; lisConfirmDelete = 'Confirm delete';
lisDeleteMacro = 'Delete macro %s%s%s?'; lisDeleteMacro = 'Delete macro "%s"?';
lisValue2 = 'Value%s'; lisValue2 = 'Value%s';
lisDeleteValue = 'Delete value %s%s%s'; lisDeleteValue = 'Delete value "%s"';
lisInvalidMacroTheMacroMustBeAPascalIdentifie = 'Invalid ' lisInvalidMacroTheMacroMustBeAPascalIdentifie = 'Invalid '
+'macro %s%s%s. The macro name must be a Pascal identifier.'; +'macro "%s". The macro name must be a Pascal identifier.';
lisThereIsAlreadyAMacroWithTheName = 'There is already a macro ' lisThereIsAlreadyAMacroWithTheName = 'There is already a macro with the name "%s".';
+'with the name %s%s%s.'; lisDuplicateFoundOfValue = 'Duplicate found of value "%s".';
lisDuplicateFoundOfValue = 'Duplicate found of value %s%s%s.';
lisCreateFunction = 'Create function'; lisCreateFunction = 'Create function';
lisResult2 = 'Result:'; lisResult2 = 'Result:';
lisTheIdentifierIsAUnitPleaseUseTheFileSaveAsFunction = 'The identifier is ' lisTheIdentifierIsAUnitPleaseUseTheFileSaveAsFunction = 'The identifier is '
@ -5047,12 +5021,12 @@ resourcestring
+'target OS=%s and CPU=%s.%sThe system.ppu for this target was not found ' +'target OS=%s and CPU=%s.%sThe system.ppu for this target was not found '
+'in the FPC binary directories. %sMake sure fpc is installed correctly ' +'in the FPC binary directories. %sMake sure fpc is installed correctly '
+'for this target and the fpc.cfg contains the right directories.'; +'for this target and the fpc.cfg contains the right directories.';
lisCouldNotRemoveFromMainSource = 'Could not remove %s%s%s from main source!'; lisCouldNotRemoveFromMainSource = 'Could not remove "%s" from main source!';
lisCouldNotAddToMainSource = 'Could not add %s%s%s to main source!'; lisCouldNotAddToMainSource = 'Could not add "%s" to main source!';
lisCouldNotRemoveRFromMainSource = 'Could not remove %s{$R %s%s} from main source!'; lisCouldNotRemoveRFromMainSource = 'Could not remove "{$R %s}" from main source!';
lisCouldNotAddRToMainSource = 'Could not add %s{$R %s%s} to main source!'; lisCouldNotAddRToMainSource = 'Could not add "{$R %s}" to main source!';
lisCouldNotRemoveIFromMainSource = 'Could not remove %s{$I %s%s} from main source!'; lisCouldNotRemoveIFromMainSource = 'Could not remove "{$I %s}" from main source!';
lisCouldNotAddIToMainSource = 'Could not add %s{$I %s%s} to main source!'; lisCouldNotAddIToMainSource = 'Could not add "{$I %s}" to main source!';
lisFailedToLoadFoldStat = 'Failed to load fold state'; lisFailedToLoadFoldStat = 'Failed to load fold state';
lisUppercaseString = 'uppercase string'; lisUppercaseString = 'uppercase string';
lisUppercaseStringGivenAsParameter = 'Uppercase string given as parameter'; lisUppercaseStringGivenAsParameter = 'Uppercase string given as parameter';
@ -5177,11 +5151,11 @@ resourcestring
+'not be used by other packages/projects'; +'not be used by other packages/projects';
lisShowGlyphsFor = 'Show Glyphs for:'; lisShowGlyphsFor = 'Show Glyphs for:';
lisDirectoryNotWritable = 'Directory not writable'; lisDirectoryNotWritable = 'Directory not writable';
lisTheDirectoryIsNotWritable = 'The directory %s%s%s is not writable.'; lisTheDirectoryIsNotWritable = 'The directory "%s" is not writable.';
lisBuildingLazarusFailed = 'Building Lazarus failed'; lisBuildingLazarusFailed = 'Building Lazarus failed';
lisThisSetOfOptionsToBuildLazarusIsNotSupportedByThis = 'This set of ' lisThisSetOfOptionsToBuildLazarusIsNotSupportedByThis = 'This set of '
+'options to build Lazarus is not supported by this installation.%sThe ' +'options to build Lazarus is not supported by this installation.%sThe '
+'directory %s%s%s is not writable.%sSee the Lazarus website for other ' +'directory "%s" is not writable.%sSee the Lazarus website for other '
+'ways to install Lazarus.'; +'ways to install Lazarus.';
lisIDEBuildOptions = 'IDE build options'; lisIDEBuildOptions = 'IDE build options';
lisPathOfTheInstantfpcCache = 'path of the instantfpc cache'; lisPathOfTheInstantfpcCache = 'path of the instantfpc cache';
@ -5312,7 +5286,7 @@ resourcestring
lisConvDelphiBeginCodeToolsFailed = 'BeginCodeTools failed!'; lisConvDelphiBeginCodeToolsFailed = 'BeginCodeTools failed!';
lisConvDelphiError = 'Error="%s"'; lisConvDelphiError = 'Error="%s"';
lisConvDelphiFailedConvertingUnit = 'Failed converting unit'; lisConvDelphiFailedConvertingUnit = 'Failed converting unit';
lisConvDelphiFailedToConvertUnit = 'Failed to convert unit%s%s%s'; lisConvDelphiFailedToConvertUnit = 'Failed to convert unit "%s"';
lisConvDelphiExceptionDuringConversion = 'Exception happened during unit conversion.' lisConvDelphiExceptionDuringConversion = 'Exception happened during unit conversion.'
+' Continuing with form files of already converted units...'; +' Continuing with form files of already converted units...';
lisConvDelphiUnitnameExistsInLCL = 'Unitname exists in LCL'; lisConvDelphiUnitnameExistsInLCL = 'Unitname exists in LCL';

12
ide/projectresources.pas
View File

@ -595,7 +595,7 @@ begin
if not CodeToolBoss.RemoveUnitFromAllUsesSections(CodeBuf, LazResourcesUnit) then if not CodeToolBoss.RemoveUnitFromAllUsesSections(CodeBuf, LazResourcesUnit) then
begin begin
Result := False; Result := False;
Messages.Add(Format(lisCouldNotRemoveFromMainSource, ['"',LazResourcesUnit,'"'])); Messages.Add(Format(lisCouldNotRemoveFromMainSource, [LazResourcesUnit]));
debugln(['TProjectResources.UpdateMainSourceFile removing LResources from all uses sections failed']); debugln(['TProjectResources.UpdateMainSourceFile removing LResources from all uses sections failed']);
end; end;
end; end;
@ -606,7 +606,7 @@ begin
if not CodeToolBoss.AddUnitToMainUsesSection(CodeBuf, LazResourcesUnit,'') then if not CodeToolBoss.AddUnitToMainUsesSection(CodeBuf, LazResourcesUnit,'') then
begin begin
Result := False; Result := False;
Messages.Add(Format(lisCouldNotAddToMainSource, ['"',LazResourcesUnit,'"'])); Messages.Add(Format(lisCouldNotAddToMainSource, [LazResourcesUnit]));
debugln(['TProjectResources.UpdateMainSourceFile adding LResources to main source failed']); debugln(['TProjectResources.UpdateMainSourceFile adding LResources to main source failed']);
end; end;
end; end;
@ -622,7 +622,7 @@ begin
if not CodeToolBoss.RemoveDirective(NewCode, NewX, NewY, true) then if not CodeToolBoss.RemoveDirective(NewCode, NewX, NewY, true) then
begin begin
Result := False; Result := False;
Messages.Add(Format(lisCouldNotRemoveRFromMainSource, ['"', Filename, '"'])); Messages.Add(Format(lisCouldNotRemoveRFromMainSource, [Filename]));
debugln(['TProjectResources.UpdateMainSourceFile failed: removing resource directive']); debugln(['TProjectResources.UpdateMainSourceFile failed: removing resource directive']);
end; end;
end; end;
@ -634,7 +634,7 @@ begin
if not CodeToolBoss.AddResourceDirective(CodeBuf, Filename, false, Directive) then if not CodeToolBoss.AddResourceDirective(CodeBuf, Filename, false, Directive) then
begin begin
Result := False; Result := False;
Messages.Add(Format(lisCouldNotAddRToMainSource, ['"', Filename, '"'])); Messages.Add(Format(lisCouldNotAddRToMainSource, [Filename]));
debugln(['TProjectResources.UpdateMainSourceFile failed: adding resource directive']); debugln(['TProjectResources.UpdateMainSourceFile failed: adding resource directive']);
end; end;
end; end;
@ -652,7 +652,7 @@ begin
if not CodeToolBoss.RemoveDirective(NewCode, NewX, NewY, true) then if not CodeToolBoss.RemoveDirective(NewCode, NewX, NewY, true) then
begin begin
Result := False; Result := False;
Messages.Add(Format(lisCouldNotRemoveIFromMainSource, ['"', Filename, '"'])); Messages.Add(Format(lisCouldNotRemoveIFromMainSource, [Filename]));
debugln(['TProjectResources.UpdateMainSourceFile removing include directive from main source failed']); debugln(['TProjectResources.UpdateMainSourceFile removing include directive from main source failed']);
Exit; Exit;
end; end;
@ -666,7 +666,7 @@ begin
Filename,'') then Filename,'') then
begin begin
Result := False; Result := False;
Messages.Add(Format(lisCouldNotAddIToMainSource, ['"', Filename, '"'])); Messages.Add(Format(lisCouldNotAddIToMainSource, [Filename]));
debugln(['TProjectResources.UpdateMainSourceFile adding include directive to main source failed']); debugln(['TProjectResources.UpdateMainSourceFile adding include directive to main source failed']);
Exit; Exit;
end; end;

7
packager/addfiletoapackagedlg.pas
View File

@ -141,7 +141,7 @@ begin
// check package ID // check package ID
if not PkgID.StringToID(PackagesComboBox.Text) then begin if not PkgID.StringToID(PackagesComboBox.Text) then begin
MessageDlg(lisAF2PInvalidPackage, MessageDlg(lisAF2PInvalidPackage,
Format(lisAF2PInvalidPackageID, ['"', PackagesComboBox.Text, '"']), Format(lisAF2PInvalidPackageID, [PackagesComboBox.Text]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;
@ -149,7 +149,7 @@ begin
APackage:=PackageGraph.FindPackageWithID(PkgID); APackage:=PackageGraph.FindPackageWithID(PkgID);
if APackage=nil then begin if APackage=nil then begin
MessageDlg(lisProjAddPackageNotFound, MessageDlg(lisProjAddPackageNotFound,
Format(lisAF2PPackageNotFound, ['"', PkgID.IDAsString, '"']), Format(lisAF2PPackageNotFound, [PkgID.IDAsString]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;
@ -166,8 +166,7 @@ begin
PkgFile:=APackage.FindPkgFile(aFilename,true,false); PkgFile:=APackage.FindPkgFile(aFilename,true,false);
if PkgFile<>nil then begin if PkgFile<>nil then begin
MessageDlg(lisPkgMangFileIsAlreadyInPackage, MessageDlg(lisPkgMangFileIsAlreadyInPackage,
Format(lisAF2PTheFileIsAlreadyInThePackage, Format(lisAF2PTheFileIsAlreadyInThePackage,[aFilename,LineEnding,APackage.IDAsString]),
['"', aFilename, '"', LineEnding, APackage.IDAsString]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;

58
packager/addtopackagedlg.pas
View File

@ -261,8 +261,7 @@ begin
AFilename:=LazPackage.Directory+AFilename AFilename:=LazPackage.Directory+AFilename
else begin else begin
IDEMessageDialog(lisA2PInvalidFilename, IDEMessageDialog(lisA2PInvalidFilename,
Format(lisA2PTheFilenameIsAmbiguousPleaseSpecifiyAFilename, Format(lisA2PTheFilenameIsAmbiguousPleaseSpecifiyAFilename,[AFilename,LineEnding]),
['"', AFilename, '"', LineEnding]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -284,9 +283,9 @@ begin
if FilenameIsAbsolute(AFilename) then begin if FilenameIsAbsolute(AFilename) then begin
PkgFile:=LazPackage.FindPkgFile(AFilename,true,false); PkgFile:=LazPackage.FindPkgFile(AFilename,true,false);
if PkgFile<>nil then begin if PkgFile<>nil then begin
Msg:=Format(lisA2PFileAlreadyExistsInThePackage, ['"',AFilename,'"']); Msg:=Format(lisA2PFileAlreadyExistsInThePackage, [AFilename]);
if PkgFile.Filename<>AFilename then if PkgFile.Filename<>AFilename then
Msg:=Msg+LineEnding+Format(lisA2PExistingFile2, ['"',PkgFile.Filename,'"']); Msg:=Msg+LineEnding+Format(lisA2PExistingFile2, [PkgFile.Filename]);
IDEMessageDialog(lisA2PFileAlreadyExists, Msg, mtError, [mbCancel]); IDEMessageDialog(lisA2PFileAlreadyExists, Msg, mtError, [mbCancel]);
exit; exit;
end; end;
@ -299,8 +298,7 @@ begin
OnGetIDEFileInfo(nil,AFilename,[ifsPartOfProject],IDEFileFlags); OnGetIDEFileInfo(nil,AFilename,[ifsPartOfProject],IDEFileFlags);
if (ifsPartOfProject in IDEFileFlags) then begin if (ifsPartOfProject in IDEFileFlags) then begin
IDEMessageDialog(lisA2PFileIsUsed, IDEMessageDialog(lisA2PFileIsUsed,
Format(lisA2PTheFileIsPartOfTheCurrentProjectItIsABadIdea, Format(lisA2PTheFileIsPartOfTheCurrentProjectItIsABadIdea,[AFilename,LineEnding]),
['"', AFilename, '"', LineEnding]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -322,7 +320,7 @@ begin
AnUnitName:=ExtractFileNameOnly(AFilename); AnUnitName:=ExtractFileNameOnly(AFilename);
if not IsValidUnitName(AnUnitName) then begin if not IsValidUnitName(AnUnitName) then begin
IDEMessageDialog(lisA2PFileNotUnit, IDEMessageDialog(lisA2PFileNotUnit,
Format(lisA2PisNotAValidUnitName, ['"', AnUnitName, '"']), Format(lisA2PisNotAValidUnitName, [AnUnitName]),
mtWarning,[mbCancel]); mtWarning,[mbCancel]);
exit; exit;
end; end;
@ -332,7 +330,7 @@ begin
if PkgFile<>nil then begin if PkgFile<>nil then begin
// a unit with this name already exists in this package => warn // a unit with this name already exists in this package => warn
if IDEMessageDialog(lisA2PUnitnameAlreadyExists, if IDEMessageDialog(lisA2PUnitnameAlreadyExists,
Format(lisA2PTheUnitnameAlreadyExistsInThisPackage, ['"',AnUnitName,'"']), Format(lisA2PTheUnitnameAlreadyExistsInThisPackage, [AnUnitName]),
mtError,[mbCancel,mbIgnore])<>mrIgnore then exit; mtError,[mbCancel,mbIgnore])<>mrIgnore then exit;
end else begin end else begin
PkgFile:=PackageGraph.FindUnit(LazPackage,AnUnitName,true,true); PkgFile:=PackageGraph.FindUnit(LazPackage,AnUnitName,true,true);
@ -340,7 +338,7 @@ begin
// there is already a unit with this name in another package => warn // there is already a unit with this name in another package => warn
if IDEMessageDialog(lisA2PUnitnameAlreadyExists, if IDEMessageDialog(lisA2PUnitnameAlreadyExists,
Format(lisA2PTheUnitnameAlreadyExistsInThePackage, Format(lisA2PTheUnitnameAlreadyExistsInThePackage,
['"', AnUnitName, '"', LineEnding, PkgFile.LazPackage.IDAsString]), [AnUnitName, LineEnding, PkgFile.LazPackage.IDAsString]),
mtWarning,[mbCancel,mbIgnore])<>mrIgnore then exit; mtWarning,[mbCancel,mbIgnore])<>mrIgnore then exit;
end; end;
end; end;
@ -390,8 +388,7 @@ begin
if (NewPkgName='') or (not IsValidUnitName(NewPkgName)) then begin if (NewPkgName='') or (not IsValidUnitName(NewPkgName)) then begin
if not Quiet then if not Quiet then
IDEMessageDialog(lisProjAddInvalidPackagename, IDEMessageDialog(lisProjAddInvalidPackagename,
Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting, Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting,[NewPkgName,LineEnding]),
['"', NewPkgName, '"', LineEnding]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit(mrCancel); exit(mrCancel);
end; end;
@ -403,7 +400,7 @@ begin
then begin then begin
if WarnIfAlreadyThere then if WarnIfAlreadyThere then
IDEMessageDialog(lisProjAddDependencyAlreadyExists, IDEMessageDialog(lisProjAddDependencyAlreadyExists,
Format(lisA2PThePackageHasAlreadyADependencyForThe, ['"', NewPkgName, '"']), Format(lisA2PThePackageHasAlreadyADependencyForThe, [NewPkgName]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit(mrIgnore); exit(mrIgnore);
end; end;
@ -414,7 +411,7 @@ begin
if not Quiet then if not Quiet then
IDEMessageDialog(lisProjAddPackageNotFound, IDEMessageDialog(lisProjAddPackageNotFound,
Format(lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting, Format(lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting,
['"', NewDependency.AsString, '"', LineEnding]), [NewDependency.AsString, LineEnding]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit(mrCancel); exit(mrCancel);
end; end;
@ -659,8 +656,8 @@ begin
ExtractFileNameOnly(CurParams.UnitFilename))<>0 ExtractFileNameOnly(CurParams.UnitFilename))<>0
then begin then begin
if IDEMessageDialog(lisA2PInvalidUnitName, if IDEMessageDialog(lisA2PInvalidUnitName,
Format(lisA2PTheUnitNameAndFilenameDiffer, ['"', CurParams.Unit_Name, Format(lisA2PTheUnitNameAndFilenameDiffer,
'"', LineEnding, '"', CurParams.UnitFilename, '"']), [CurParams.Unit_Name, LineEnding, CurParams.UnitFilename]),
mtError,[mbIgnore,mbCancel])<>mrIgnore mtError,[mbIgnore,mbCancel])<>mrIgnore
then begin then begin
FilesListView.Items.Delete(i); FilesListView.Items.Delete(i);
@ -836,7 +833,7 @@ begin
// check Ancestor Type // check Ancestor Type
if not IsValidIdent(Params.AncestorType) then begin if not IsValidIdent(Params.AncestorType) then begin
IDEMessageDialog(lisA2PInvalidAncestorType, IDEMessageDialog(lisA2PInvalidAncestorType,
Format(lisA2PTheAncestorTypeIsNotAValidPascalIdentifier, ['"',Params.AncestorType, '"']), Format(lisA2PTheAncestorTypeIsNotAValidPascalIdentifier, [Params.AncestorType]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -844,7 +841,7 @@ begin
// check pagename // check pagename
if length(Params.PageName)>100 then begin if length(Params.PageName)>100 then begin
IDEMessageDialog(lisA2PPageNameTooLong, IDEMessageDialog(lisA2PPageNameTooLong,
Format(lisA2PThePageNameIsTooLongMax100Chars, ['"', Params.PageName, '"']), Format(lisA2PThePageNameIsTooLongMax100Chars, [Params.PageName]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -853,7 +850,7 @@ begin
if CompareText(Params.Unit_name,ExtractFileNameOnly(Params.UnitFilename))<>0 if CompareText(Params.Unit_name,ExtractFileNameOnly(Params.UnitFilename))<>0
then begin then begin
IDEMessageDialog(lisA2PUnitNameInvalid, IDEMessageDialog(lisA2PUnitNameInvalid,
Format(lisA2PTheUnitNameDoesNotCorrespondToTheFilename, ['"',Params.Unit_Name, '"']), Format(lisA2PTheUnitNameDoesNotCorrespondToTheFilename, [Params.Unit_Name]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -861,7 +858,7 @@ begin
// check classname // check classname
if not IsValidIdent(Params.NewClassName) then begin if not IsValidIdent(Params.NewClassName) then begin
IDEMessageDialog(lisA2PInvalidClassName, IDEMessageDialog(lisA2PInvalidClassName,
Format(lisA2PTheClassNameIsNotAValidPascalIdentifier, ['"',Params.NewClassName, '"']), Format(lisA2PTheClassNameIsNotAValidPascalIdentifier, [Params.NewClassName]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -869,7 +866,7 @@ begin
// check classname<>ancestortype // check classname<>ancestortype
if CompareText(Params.NewClassName,Params.AncestorType)=0 then begin if CompareText(Params.NewClassName,Params.AncestorType)=0 then begin
IDEMessageDialog(lisA2PInvalidCircularDependency, IDEMessageDialog(lisA2PInvalidCircularDependency,
Format(lisA2PTheClassNameAndAncestorTypeAreTheSame, ['"',Params.NewClassName, '"', '"', Params.AncestorType, '"']), Format(lisA2PTheClassNameAndAncestorTypeAreTheSame,[Params.NewClassName,Params.AncestorType]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -878,8 +875,8 @@ begin
PkgFile:=PackageGraph.FindUnit(LazPackage,Params.AncestorType,true,true); PkgFile:=PackageGraph.FindUnit(LazPackage,Params.AncestorType,true,true);
if PkgFile<>nil then begin if PkgFile<>nil then begin
if IDEMessageDialog(lisA2PAmbiguousAncestorType, if IDEMessageDialog(lisA2PAmbiguousAncestorType,
Format(lisA2PTheAncestorTypeHasTheSameNameAsTheUnit, ['"',Params.AncestorType, Format(lisA2PTheAncestorTypeHasTheSameNameAsTheUnit,
'"', LineEnding, '"', PkgFile.Filename, '"']), [Params.AncestorType, LineEnding, PkgFile.Filename]),
mtError,[mbCancel,mbIgnore])<>mrIgnore mtError,[mbCancel,mbIgnore])<>mrIgnore
then then
exit; exit;
@ -889,8 +886,8 @@ begin
PkgFile:=PackageGraph.FindUnit(LazPackage,Params.NewClassName,true,true); PkgFile:=PackageGraph.FindUnit(LazPackage,Params.NewClassName,true,true);
if PkgFile<>nil then begin if PkgFile<>nil then begin
if IDEMessageDialog(lisA2PAmbiguousClassName, if IDEMessageDialog(lisA2PAmbiguousClassName,
Format(lisA2PTheClassNameHasTheSameNameAsTheUnit, ['"',Params.AncestorType, Format(lisA2PTheClassNameHasTheSameNameAsTheUnit,
'"', LineEnding, '"', PkgFile.Filename, '"']), [Params.AncestorType, LineEnding, PkgFile.Filename]),
mtError,[mbCancel,mbIgnore])<>mrIgnore mtError,[mbCancel,mbIgnore])<>mrIgnore
then then
exit; exit;
@ -900,9 +897,8 @@ begin
PkgComponent:=TPkgComponent(IDEComponentPalette.FindComponent(Params.NewClassname)); PkgComponent:=TPkgComponent(IDEComponentPalette.FindComponent(Params.NewClassname));
if PkgComponent<>nil then begin if PkgComponent<>nil then begin
if IDEMessageDialog(lisA2PClassNameAlreadyExists, if IDEMessageDialog(lisA2PClassNameAlreadyExists,
Format(lisA2PTheClassNameExistsAlreadyInPackageFile, ['"',Params.NewClassName, Format(lisA2PTheClassNameExistsAlreadyInPackageFile, [Params.NewClassName, LineEnding,
'"', LineEnding, PkgComponent.PkgFile.LazPackage.IDAsString, PkgComponent.PkgFile.LazPackage.IDAsString, LineEnding, PkgComponent.PkgFile.Filename]),
LineEnding, '"', PkgComponent.PkgFile.Filename, '"']),
mtError,[mbCancel,mbIgnore])<>mrIgnore mtError,[mbCancel,mbIgnore])<>mrIgnore
then then
exit; exit;
@ -954,8 +950,8 @@ begin
if not NewDependency.MinVersion.ReadString(DependMinVersionEdit.Text) then if not NewDependency.MinVersion.ReadString(DependMinVersionEdit.Text) then
begin begin
IDEMessageDialog(lisProjAddInvalidVersion, IDEMessageDialog(lisProjAddInvalidVersion,
Format(lisA2PTheMinimumVersionIsInvalidPleaseUseTheFormatMajor, ['"', Format(lisA2PTheMinimumVersionIsInvalidPleaseUseTheFormatMajor,
DependMinVersionEdit.Text, '"', LineEnding, LineEnding]), [DependMinVersionEdit.Text, LineEnding, LineEnding]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;
@ -966,8 +962,8 @@ begin
if not NewDependency.MaxVersion.ReadString(DependMaxVersionEdit.Text) then if not NewDependency.MaxVersion.ReadString(DependMaxVersionEdit.Text) then
begin begin
IDEMessageDialog(lisProjAddInvalidVersion, IDEMessageDialog(lisProjAddInvalidVersion,
Format(lisA2PTheMaximumVersionIsInvalidPleaseUseTheFormatMajor, ['"', Format(lisA2PTheMaximumVersionIsInvalidPleaseUseTheFormatMajor,
DependMaxVersionEdit.Text, '"', LineEnding, LineEnding]), [DependMaxVersionEdit.Text, LineEnding, LineEnding]),
mtError,[mbCancel]); mtError,[mbCancel]);
exit; exit;
end; end;

2
packager/frames/package_integration_options.pas
View File

@ -241,7 +241,7 @@ function TPackageIntegrationOptionsFrame.ShowMsgPackageTypeMustBeDesign: boolean
begin begin
if MessageDlg(lisPckOptsInvalidPackageType, if MessageDlg(lisPckOptsInvalidPackageType,
Format(lisPckOptsThePackageHasTheAutoInstallFlagThisMeans, Format(lisPckOptsThePackageHasTheAutoInstallFlagThisMeans,
['"', FLazPackage.IDAsString, '"', LineEnding, LineEnding]), [FLazPackage.IDAsString, LineEnding, LineEnding]),
mtWarning, [mbIgnore, mbCancel], 0) <> mrIgnore then mtWarning, [mbIgnore, mbCancel], 0) <> mrIgnore then
begin begin
Result := True; Result := True;

21
packager/packageeditor.pas
View File

@ -1131,8 +1131,7 @@ begin
and (not LazPackage.ReadOnly) and LazPackage.Modified then begin and (not LazPackage.ReadOnly) and LazPackage.Modified then begin
MsgResult:=MessageDlg(lisPkgMangSavePackage, MsgResult:=MessageDlg(lisPkgMangSavePackage,
Format(lisPckEditPackageHasChangedSavePackage, Format(lisPckEditPackageHasChangedSavePackage, [LazPackage.IDAsString, LineEnding]),
['"',LazPackage.IDAsString,'"',LineEnding]),
mtConfirmation,[mbYes,mbNo,mbAbort],0); mtConfirmation,[mbYes,mbNo,mbAbort],0);
case MsgResult of case MsgResult of
mrYes: mrYes:
@ -1229,13 +1228,13 @@ begin
MainUnitSelected:=true; MainUnitSelected:=true;
if FileWarning='' then if FileWarning='' then
FileWarning:=Format(lisPckEditRemoveFileFromPackage, FileWarning:=Format(lisPckEditRemoveFileFromPackage,
['"', CurFile.Filename, '"', LineEnding, '"', LazPackage.IDAsString, '"']); [CurFile.Filename, LineEnding, LazPackage.IDAsString]);
end else if Item is TPkgDependency then begin end else if Item is TPkgDependency then begin
CurDependency:=TPkgDependency(Item); CurDependency:=TPkgDependency(Item);
inc(PkgCount); inc(PkgCount);
if PkgWarning='' then if PkgWarning='' then
PkgWarning:=Format(lisPckEditRemoveDependencyFromPackage, ['"', PkgWarning:=Format(lisPckEditRemoveDependencyFromPackage,
CurDependency.AsString, '"', LineEnding, '"', LazPackage.IDAsString, '"']); [CurDependency.AsString, LineEnding, LazPackage.IDAsString]);
end; end;
end; end;
if (FileCount=0) and (PkgCount=0) then begin if (FileCount=0) and (PkgCount=0) then begin
@ -1496,8 +1495,8 @@ begin
NewDependency.Flags:=NewDependency.Flags+[pdfMinVersion]; NewDependency.Flags:=NewDependency.Flags+[pdfMinVersion];
if not NewDependency.MinVersion.ReadString(MinVersionEdit.Text) then begin if not NewDependency.MinVersion.ReadString(MinVersionEdit.Text) then begin
MessageDlg(lisPckEditInvalidMinimumVersion, MessageDlg(lisPckEditInvalidMinimumVersion,
Format(lisPckEditTheMinimumVersionIsNotAValidPackageVersion, ['"', Format(lisPckEditTheMinimumVersionIsNotAValidPackageVersion,
MinVersionEdit.Text, '"', LineEnding]), [MinVersionEdit.Text, LineEnding]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;
@ -1510,8 +1509,8 @@ begin
NewDependency.Flags:=NewDependency.Flags+[pdfMaxVersion]; NewDependency.Flags:=NewDependency.Flags+[pdfMaxVersion];
if not NewDependency.MaxVersion.ReadString(MaxVersionEdit.Text) then begin if not NewDependency.MaxVersion.ReadString(MaxVersionEdit.Text) then begin
MessageDlg(lisPckEditInvalidMaximumVersion, MessageDlg(lisPckEditInvalidMaximumVersion,
Format(lisPckEditTheMaximumVersionIsNotAValidPackageVersion, ['"', Format(lisPckEditTheMaximumVersionIsNotAValidPackageVersion,
MaxVersionEdit.Text, '"', LineEnding]), [MaxVersionEdit.Text, LineEnding]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;
@ -2756,8 +2755,8 @@ begin
if (IgnoreUnitPaths<>nil) and (IgnoreUnitPaths.Contains(ShortDirectory)) if (IgnoreUnitPaths<>nil) and (IgnoreUnitPaths.Contains(ShortDirectory))
then exit; then exit;
if MessageDlg(lisPkgEditNewUnitNotInUnitpath, if MessageDlg(lisPkgEditNewUnitNotInUnitpath,
Format(lisPkgEditTheFileIsCurrentlyNotInTheUnitpathOfThePackage, ['"', Format(lisPkgEditTheFileIsCurrentlyNotInTheUnitpathOfThePackage,
AnUnitFilename,'"',LineEnding,LineEnding,LineEnding,'"',ShortDirectory,'"']), [AnUnitFilename, LineEnding, LineEnding, LineEnding, ShortDirectory]),
mtConfirmation,[mbYes,mbNo],0)<>mrYes mtConfirmation,[mbYes,mbNo],0)<>mrYes
then begin then begin
if IgnoreUnitPaths=nil then if IgnoreUnitPaths=nil then

45
packager/packagesystem.pas
View File

@ -721,8 +721,8 @@ begin
if not ForceDirectoriesUTF8(Directory) then begin if not ForceDirectoriesUTF8(Directory) then begin
if Verbose then begin if Verbose then begin
IDEMessageDialog(lisPkgMangUnableToCreateDirectory, IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisPkgMangUnableToCreateOutputDirectoryForPackage, ['"', Format(lisPkgMangUnableToCreateOutputDirectoryForPackage,
Directory, '"', LineEnding, APackage.IDAsString]), [Directory, LineEnding, APackage.IDAsString]),
mtError,[mbCancel]); mtError,[mbCancel]);
end; end;
debugln(['TLazPackageGraph.OutputDirectoryIsWritable unable to create directory "',Directory,'"']); debugln(['TLazPackageGraph.OutputDirectoryIsWritable unable to create directory "',Directory,'"']);
@ -1538,8 +1538,7 @@ begin
if (IDEComponentPalette<>nil) if (IDEComponentPalette<>nil)
and (IDEComponentPalette.FindComponent(CurClassname)<>nil) then begin and (IDEComponentPalette.FindComponent(CurClassname)<>nil) then begin
RegistrationError( RegistrationError(
Format(lisPkgSysComponentClassAlreadyDefined, ['"', Format(lisPkgSysComponentClassAlreadyDefined, [CurComponent.ClassName]));
CurComponent.ClassName, '"']));
end; end;
if AbortRegistration then exit; if AbortRegistration then exit;
// add the component to the package owning the file // add the component to the package owning the file
@ -1567,16 +1566,13 @@ begin
if FRegistrationPackage.Missing then if FRegistrationPackage.Missing then
ErrorMsg:=Format(lisPkgSysTheLpkFileWasNotFound, [ErrorMsg, LineEnding]) ErrorMsg:=Format(lisPkgSysTheLpkFileWasNotFound, [ErrorMsg, LineEnding])
else else
ErrorMsg:=Format(lisPkgSysLPKFilename, [ErrorMsg, LineEnding, '"', ErrorMsg:=Format(lisPkgSysLPKFilename, [ErrorMsg, LineEnding, FRegistrationPackage.Filename]);
FRegistrationPackage.Filename, '"']);
// current unitname // current unitname
if FRegistrationUnitName<>'' then if FRegistrationUnitName<>'' then
ErrorMsg:=Format(lisPkgSysUnitName, [ErrorMsg, LineEnding, '"', ErrorMsg:=Format(lisPkgSysUnitName, [ErrorMsg, LineEnding, FRegistrationUnitName]);
FRegistrationUnitName, '"']);
// current file // current file
if FRegistrationFile<>nil then if FRegistrationFile<>nil then
ErrorMsg:=Format(lisPkgSysFileName, [ErrorMsg, LineEnding, '"', ErrorMsg:=Format(lisPkgSysFileName, [ErrorMsg, LineEnding, FRegistrationFile.Filename]);
FRegistrationFile.Filename, '"']);
end; end;
// append message // append message
if Msg<>'' then if Msg<>'' then
@ -1813,7 +1809,7 @@ begin
Dependency.AddToList(FirstAutoInstallDependency,pdlRequires); Dependency.AddToList(FirstAutoInstallDependency,pdlRequires);
if OpenDependency(Dependency,false)<>lprSuccess then begin if OpenDependency(Dependency,false)<>lprSuccess then begin
IDEMessageDialog(lisPkgMangUnableToLoadPackage, IDEMessageDialog(lisPkgMangUnableToLoadPackage,
Format(lisPkgMangUnableToOpenThePackage, ['"', PackageName, '"', LineEnding]), Format(lisPkgMangUnableToOpenThePackage, [PackageName, LineEnding]),
mtWarning,[mbOk]); mtWarning,[mbOk]);
continue; continue;
end; end;
@ -2746,8 +2742,8 @@ begin
except except
on E: Exception do begin on E: Exception do begin
Result:=IDEMessageDialogAb(lisPkgMangErrorWritingFile, Result:=IDEMessageDialogAb(lisPkgMangErrorWritingFile,
Format(lisPkgMangUnableToWriteStateFileOfPackageError, ['"', StateFile, Format(lisPkgMangUnableToWriteStateFileOfPackageError,
'"', LineEnding, APackage.IDAsString, LineEnding, E.Message]), [StateFile, LineEnding, APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel],ShowAbort); mtError,[mbCancel],ShowAbort);
exit; exit;
end; end;
@ -2819,8 +2815,8 @@ begin
Result:=mrOk; Result:=mrOk;
end else begin end else begin
Result:=IDEMessageDialogAb(lisPkgMangErrorReadingFile, Result:=IDEMessageDialogAb(lisPkgMangErrorReadingFile,
Format(lisPkgMangUnableToReadStateFileOfPackageError, ['"', Format(lisPkgMangUnableToReadStateFileOfPackageError,
StateFile, '"', LineEnding, APackage.IDAsString, LineEnding, E.Message]), [StateFile, LineEnding, APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel],ShowAbort); mtError,[mbCancel],ShowAbort);
end; end;
exit; exit;
@ -3721,7 +3717,8 @@ begin
// list // list
MsgResult:=IDEQuestionDialog(lisInstallationFailed, MsgResult:=IDEQuestionDialog(lisInstallationFailed,
Format(lisPkgMangThePackageFailedToCompileRemoveItFromTheInstallati, Format(lisPkgMangThePackageFailedToCompileRemoveItFromTheInstallati,
['"', APackage.IDAsString, '"', LineEnding]), mtConfirmation, [APackage.IDAsString, LineEnding]),
mtConfirmation,
[mrYes, lisRemoveFromInstallList, mrIgnore, lisKeepInInstallList]); [mrYes, lisRemoveFromInstallList, mrIgnore, lisKeepInInstallList]);
if MsgResult=mrIgnore then if MsgResult=mrIgnore then
IgnoreQuestions.Add(GetIgnoreIdentifier,iiid24H) IgnoreQuestions.Add(GetIgnoreIdentifier,iiid24H)
@ -3805,8 +3802,8 @@ begin
except except
on E: Exception do begin on E: Exception do begin
Result:=IDEMessageDialog(lisPkgMangErrorWritingFile, Result:=IDEMessageDialog(lisPkgMangErrorWritingFile,
Format(lisPkgMangUnableToWriteStateFileOfPackageError, ['"', TargetCompiledFile, Format(lisPkgMangUnableToWriteStateFileOfPackageError,
'"', LineEnding, APackage.IDAsString, LineEnding, E.Message]), [TargetCompiledFile, LineEnding, APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel],''); mtError,[mbCancel],'');
exit; exit;
end; end;
@ -4407,8 +4404,8 @@ begin
// delete old Compile State file // delete old Compile State file
if FileExistsUTF8(StateFile) and not DeleteFileUTF8(StateFile) then begin if FileExistsUTF8(StateFile) and not DeleteFileUTF8(StateFile) then begin
Result:=IDEMessageDialog(lisPkgMangUnableToDeleteFilename, Result:=IDEMessageDialog(lisPkgMangUnableToDeleteFilename,
Format(lisPkgMangUnableToDeleteOldStateFileForPackage, ['"', StateFile, Format(lisPkgMangUnableToDeleteOldStateFileForPackage,
'"', LineEnding, APackage.IDAsString]), [StateFile, LineEnding, APackage.IDAsString]),
mtError,[mbCancel,mbAbort]); mtError,[mbCancel,mbAbort]);
exit; exit;
end; end;
@ -4418,8 +4415,8 @@ begin
// create the package src directory // create the package src directory
if not ForceDirectoriesUTF8(PkgSrcDir) then begin if not ForceDirectoriesUTF8(PkgSrcDir) then begin
Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory, Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisPkgMangUnableToCreatePackageSourceDirectoryForPackage, ['"', Format(lisPkgMangUnableToCreatePackageSourceDirectoryForPackage,
PkgSrcDir, '"', LineEnding, APackage.IDAsString]), [PkgSrcDir, LineEnding, APackage.IDAsString]),
mtError,[mbCancel,mbAbort]); mtError,[mbCancel,mbAbort]);
exit; exit;
end; end;
@ -5372,8 +5369,8 @@ begin
then begin then begin
// tell the user // tell the user
CurResult:=IDEQuestionDialog(lisPkgSysPackageFileNotFound, CurResult:=IDEQuestionDialog(lisPkgSysPackageFileNotFound,
Format(lisPkgSysThePackageIsInstalledButNoValidPackageFileWasFound, ['"', Format(lisPkgSysThePackageIsInstalledButNoValidPackageFileWasFound,
BrokenPackage.Name, '"', LineEnding]), [BrokenPackage.Name, LineEnding]),
mtError,[mrOk,mrYesToAll,'Skip these warnings']); mtError,[mrOk,mrYesToAll,'Skip these warnings']);
if CurResult=mrYesToAll then if CurResult=mrYesToAll then
Quiet:=true; Quiet:=true;

47
packager/pkgmanager.pas
View File

@ -1933,8 +1933,8 @@ begin
// check Package Name // check Package Name
if (APackage.Name='') or (not IsValidUnitName(APackage.Name)) then begin if (APackage.Name='') or (not IsValidUnitName(APackage.Name)) then begin
Result:=IDEMessageDialog(lisPkgMangInvalidPackageName2, Result:=IDEMessageDialog(lisPkgMangInvalidPackageName2,
Format(lisPkgMangThePackageNameOfTheFileIsInvalid, ['"', APackage.Name, Format(lisPkgMangThePackageNameOfTheFileIsInvalid,
'"', LineEnding, '"', APackage.Filename, '"']), [APackage.Name, LineEnding, APackage.Filename]),
mtError,[mbCancel,mbAbort]); mtError,[mbCancel,mbAbort]);
exit; exit;
end; end;
@ -1944,9 +1944,8 @@ begin
if ConflictPkg<>nil then begin if ConflictPkg<>nil then begin
if not PackageGraph.PackageCanBeReplaced(ConflictPkg,APackage) then begin if not PackageGraph.PackageCanBeReplaced(ConflictPkg,APackage) then begin
Result:=IDEMessageDialog(lisPkgMangPackageConflicts, Result:=IDEMessageDialog(lisPkgMangPackageConflicts,
Format(lisPkgMangThereIsAlreadyAPackageLoadedFromFile, ['"', Format(lisPkgMangThereIsAlreadyAPackageLoadedFromFile,
ConflictPkg.IDAsString, '"', LineEnding, '"', ConflictPkg.Filename, '"', [ConflictPkg.IDAsString, LineEnding, ConflictPkg.Filename, LineEnding, LineEnding]),
LineEnding, LineEnding]),
mtError,[mbCancel,mbAbort]); mtError,[mbCancel,mbAbort]);
exit; exit;
end; end;
@ -2266,7 +2265,7 @@ begin
if (CompareFileExt(AFilename,'.lpk',false)<>0) if (CompareFileExt(AFilename,'.lpk',false)<>0)
and (not (pofRevert in Flags)) then begin and (not (pofRevert in Flags)) then begin
DoQuestionDlg(lisPkgMangInvalidFileExtension, DoQuestionDlg(lisPkgMangInvalidFileExtension,
Format(lisPkgMangTheFileIsNotALazarusPackage, ['"', AFilename, '"'])); Format(lisPkgMangTheFileIsNotALazarusPackage, [AFilename]));
RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile); RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile);
SetRecentPackagesMenu; SetRecentPackagesMenu;
exit; exit;
@ -2278,8 +2277,8 @@ begin
and ((AlternativePkgName='') or (not IsValidUnitName(AlternativePkgName))) and ((AlternativePkgName='') or (not IsValidUnitName(AlternativePkgName)))
then begin then begin
DoQuestionDlg(lisPkgMangInvalidPackageFilename, DoQuestionDlg(lisPkgMangInvalidPackageFilename,
Format(lisPkgMangThePackageFileNameInIsNotAValidLazarusPackageName, ['"', Format(lisPkgMangThePackageFileNameInIsNotAValidLazarusPackageName,
AlternativePkgName, '"', LineEnding, '"', AFilename, '"'])); [AlternativePkgName, LineEnding, AFilename]));
RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile); RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile);
SetRecentPackagesMenu; SetRecentPackagesMenu;
exit; exit;
@ -2334,8 +2333,7 @@ begin
except except
on E: Exception do begin on E: Exception do begin
DoQuestionDlg(lisPkgMangErrorReadingPackage, DoQuestionDlg(lisPkgMangErrorReadingPackage,
Format(lisPkgUnableToReadPackageFileError, ['"', AFilename, '"', Format(lisPkgUnableToReadPackageFileError, [AFilename, LineEnding, E.Message]));
LineEnding, E.Message]));
exit; exit;
end; end;
end; end;
@ -2346,9 +2344,8 @@ begin
// check if package name and file name correspond // check if package name and file name correspond
if (SysUtils.CompareText(AlternativePkgName,APackage.Name)<>0) then begin if (SysUtils.CompareText(AlternativePkgName,APackage.Name)<>0) then begin
Result:=IDEMessageDialog(lisPkgMangFilenameDiffersFromPackagename, Result:=IDEMessageDialog(lisPkgMangFilenameDiffersFromPackagename,
Format(lisPkgMangTheFilenameDoesNotCorrespondToThePackage, ['"', Format(lisPkgMangTheFilenameDoesNotCorrespondToThePackage,
ExtractFileName(AFilename), '"', '"', APackage.Name, '"', LineEnding, '"', [ExtractFileName(AFilename), APackage.Name, LineEnding, AlternativePkgName]),
AlternativePkgName, '"']),
mtConfirmation,[mbYes,mbCancel,mbAbort]); mtConfirmation,[mbYes,mbCancel,mbAbort]);
if Result<>mrYes then exit; if Result<>mrYes then exit;
APackage.Name:=AlternativePkgName; APackage.Name:=AlternativePkgName;
@ -2459,9 +2456,8 @@ begin
except except
on E: Exception do begin on E: Exception do begin
Result:=IDEMessageDialog(lisPkgMangErrorWritingPackage, Result:=IDEMessageDialog(lisPkgMangErrorWritingPackage,
Format(lisPkgMangUnableToWritePackageToFileError, ['"', Format(lisPkgMangUnableToWritePackageToFileError,
APackage.IDAsString, '"', LineEnding, '"', APackage.Filename, '"', LineEnding, [APackage.IDAsString, LineEnding, APackage.Filename, LineEnding, E.Message]),
E.Message]),
mtError,[mbAbort,mbCancel]); mtError,[mbAbort,mbCancel]);
exit; exit;
end; end;
@ -3720,9 +3716,8 @@ begin
// check if file is part of project // check if file is part of project
if ActiveUnitInfo.IsPartOfProject then begin if ActiveUnitInfo.IsPartOfProject then begin
Result:=IDEMessageDialog(lisPkgMangFileIsInProject, Result:=IDEMessageDialog(lisPkgMangFileIsInProject,
Format(lisPkgMangWarningTheFileBelongsToTheCurrentProject, Format(lisPkgMangWarningTheFileBelongsToTheCurrentProject,[Filename,LineEnding]),
['"', Filename, '"', LineEnding]) mtWarning,[mbIgnore,mbCancel]);
,mtWarning,[mbIgnore,mbCancel]);
if Result<>mrIgnore then exit; if Result<>mrIgnore then exit;
end; end;
@ -3731,7 +3726,7 @@ begin
if PkgFile<>nil then begin if PkgFile<>nil then begin
Result:=IDEMessageDialog(lisPkgMangFileIsAlreadyInPackage, Result:=IDEMessageDialog(lisPkgMangFileIsAlreadyInPackage,
Format(lisPkgMangTheFileIsAlreadyInThePackage, Format(lisPkgMangTheFileIsAlreadyInThePackage,
['"', Filename, '"', LineEnding, PkgFile.LazPackage.IDAsString]), [Filename, LineEnding, PkgFile.LazPackage.IDAsString]),
mtWarning,[mbIgnore,mbCancel]); mtWarning,[mbIgnore,mbCancel]);
if Result<>mrIgnore then exit; if Result<>mrIgnore then exit;
end; end;
@ -4067,7 +4062,7 @@ begin
// ask user to rebuild Lazarus now // ask user to rebuild Lazarus now
Result:=IDEMessageDialog(lisPkgMangRebuildLazarus, Result:=IDEMessageDialog(lisPkgMangRebuildLazarus,
Format(lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus, Format(lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus,
['"', APackage.IDAsString, '"', LineEnding, LineEnding, LineEnding]), [APackage.IDAsString, LineEnding, LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbNo]); mtConfirmation,[mbYes,mbNo]);
if Result<>mrYes then begin if Result<>mrYes then begin
Result:=mrOk; Result:=mrOk;
@ -4149,7 +4144,7 @@ begin
// ask user to rebuilt Lazarus now // ask user to rebuilt Lazarus now
Result:=IDEMessageDialog(lisPkgMangRebuildLazarus, Result:=IDEMessageDialog(lisPkgMangRebuildLazarus,
Format(lisPkgMangThePackageWasMarkedCurrentlyLazarus, Format(lisPkgMangThePackageWasMarkedCurrentlyLazarus,
['"', APackage.IDAsString, '"', LineEnding, LineEnding, LineEnding]), [APackage.IDAsString, LineEnding, LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbNo]); mtConfirmation,[mbYes,mbNo]);
if Result=mrNo then begin if Result=mrNo then begin
Result:=mrOk; Result:=mrOk;
@ -4500,8 +4495,8 @@ begin
if OldDependency.LoadPackageResult<>lprSuccess then begin if OldDependency.LoadPackageResult<>lprSuccess then begin
if not AutoRemove then begin if not AutoRemove then begin
Result:=IDEMessageDialog(lisProjAddPackageNotFound, Result:=IDEMessageDialog(lisProjAddPackageNotFound,
Format(lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound, [ Format(lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound,
'"', OldDependency.AsString, '"', LineEnding]), [OldDependency.AsString, LineEnding]),
mtError,[mbYes,mbYesToAll,mbAbort]); mtError,[mbYes,mbYesToAll,mbAbort]);
case Result of case Result of
mrYes: ; mrYes: ;
@ -4554,8 +4549,8 @@ begin
TargetDir:=TrimFilename(TargetDir); TargetDir:=TrimFilename(TargetDir);
if not ForceDirectory(TargetDir) then begin if not ForceDirectory(TargetDir) then begin
Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory, Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisPkgMangUnableToCreateTargetDirectoryForLazarus, [LineEnding, '"', Format(lisPkgMangUnableToCreateTargetDirectoryForLazarus,
TargetDir, '"', LineEnding]), [LineEnding, TargetDir, LineEnding]),
mtError,[mbCancel,mbAbort]); mtError,[mbCancel,mbAbort]);
exit; exit;
end; end;