IDE: More hard-coded quotations in resourcestrings.

git-svn-id: trunk@45520 -
This commit is contained in:
juha 2014-06-15 11:52:15 +00:00
parent 75b7c1bd1e
commit a912107bf0
23 changed files with 162 additions and 196 deletions

View File

@ -1556,8 +1556,8 @@ begin
on E: Exception do begin
DebugLn('TDesigner.InvokeComponentEditor ERROR: ',E.Message);
IDEMessageDialog(Format(lisErrorIn, [CompEditor.ClassName]),
Format(lisTheComponentEditorOfClassHasCreatedTheError, ['"',
CompEditor.ClassName, '"', LineEnding, '"', E.Message, '"']),
Format(lisTheComponentEditorOfClassHasCreatedTheError,
[CompEditor.ClassName, LineEnding, E.Message]),
mtError,[mbOk]);
end;
end;
@ -3168,9 +3168,9 @@ begin
on E: Exception do begin
DebugLn('TDesigner.OnComponentEditorVerbMenuItemClick ERROR: ',E.Message);
IDEMessageDialog(Format(lisErrorIn, [PopupMenuComponentEditor.ClassName]),
Format(lisTheComponentEditorOfClassInvokedWithVerbHasCreated, ['"',
PopupMenuComponentEditor.ClassName, '"', LineEnding, IntToStr(Verb), '"',
VerbCaption, '"', LineEnding, LineEnding, '"', E.Message, '"']),
Format(lisTheComponentEditorOfClassInvokedWithVerbHasCreated,
[PopupMenuComponentEditor.ClassName, LineEnding, IntToStr(Verb),
VerbCaption, LineEnding, LineEnding, E.Message]),
mtError,[mbOk]);
end;
end;

View File

@ -331,9 +331,8 @@ begin
CurClass:=CurClass.ClassParent;
end;
end;
IDEMessageDialog(lisClassNotFound, Format(lisOIFClassNotFound, ['"', NewClassName,
'"']), mtError,
[mbOk]);
IDEMessageDialog(lisClassNotFound,
Format(lisOIFClassNotFound, [NewClassName]), mtError, [mbOk]);
end;
procedure TOIAddRemoveFavoriteDlg.SetObjectInspector(const AValue: TObjectInspectorDlg);

View File

@ -168,7 +168,7 @@ begin
if (NewPkgName='') or (not IsValidIdent(NewPkgName)) then begin
IDEMessageDialog(lisProjAddInvalidPackagename,
Format(lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag,
['"', NewPkgName, '"', LineEnding]),
[NewPkgName, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -176,7 +176,7 @@ begin
// check if package is already required
if LazProject.FindDependencyByName(NewPkgName)<>nil then begin
IDEMessageDialog(lisProjAddDependencyAlreadyExists,
Format(lisProjAddTheProjectHasAlreadyADependency, ['"', NewPkgName, '"']),
Format(lisProjAddTheProjectHasAlreadyADependency, [NewPkgName]),
mtError,[mbCancel]);
exit;
end;
@ -185,8 +185,7 @@ begin
if not PackageGraph.DependencyExists(NewDependency,fpfSearchAllExisting)
then begin
IDEMessageDialog(lisProjAddPackageNotFound,
Format(lisProjAddTheDependencyWasNotFound,
['"', NewDependency.AsString, '"', LineEnding]),
Format(lisProjAddTheDependencyWasNotFound,[NewDependency.AsString, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -260,7 +259,7 @@ begin
begin
IDEMessageDialog(lisProjAddInvalidVersion,
Format(lisProjAddTheMinimumVersionIsInvalid,
['"', DependMinVersionEdit.Text, '"', LineEnding, LineEnding]),
[DependMinVersionEdit.Text, LineEnding, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -272,7 +271,7 @@ begin
begin
IDEMessageDialog(lisProjAddInvalidVersion,
Format(lisProjAddTheMaximumVersionIsInvalid,
['"', DependMaxVersionEdit.Text, '"', LineEnding, LineEnding]),
[DependMaxVersionEdit.Text, LineEnding, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -568,8 +567,7 @@ begin
NewUnitName:=ExtractFileNameOnly(NewFilename);
if (NewUnitName='') or not (IsValidUnitName(NewUnitName)) then begin
IDEMessageDialog(lisProjAddInvalidPascalUnitName,
Format(lisProjAddTheUnitNameIsNotAValidPascalIdentifier, ['"',
NewUnitName, '"']),
Format(lisProjAddTheUnitNameIsNotAValidPascalIdentifier, [NewUnitName]),
mtWarning, [mbIgnore, mbCancel]);
exit;
end;
@ -578,7 +576,7 @@ begin
if ConflictFile<>nil then begin
IDEMessageDialog(lisProjAddUnitNameAlreadyExists,
Format(lisProjAddTheUnitNameAlreadyExistsInTheProject,
['"', NewUnitName, '"', LineEnding, '"', ConflictFile.Filename, '"']),
[NewUnitName, LineEnding, ConflictFile.Filename]),
mtWarning, [mbCancel, mbIgnore]);
exit;
end;
@ -590,7 +588,7 @@ begin
if CompareText(OtherUnitName, NewUnitName)=0 then begin
IDEMessageDialog(lisProjAddUnitNameAlreadyExists,
Format(lisProjAddTheUnitNameAlreadyExistsInTheSelection,
['"', NewUnitName, '"', LineEnding, '"', OtherFile, '"']),
[NewUnitName, LineEnding, OtherFile]),
mtWarning, [mbCancel]);
exit;
end;

View File

@ -1373,7 +1373,7 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
{$ELSE}
TheOutputFilter.ReadConstLine(
Format(lisWarningAmbiguousFileFoundSourceFileIs,
['"', AmbiguousFilename, '"', '"', AFilename, '"']), true);
[AmbiguousFilename, AFilename]), true);
{$ENDIF}
end;
end;

View File

@ -661,8 +661,7 @@ begin
end;
OpenMenuItem.Visible:=true;
CopyDescriptionMenuItem.Caption:=lisCopyDescription;
CopyIdentifierMenuItem.Caption:=Format(lisCopyIdentifier, ['"', Identifier,
'"']);
CopyIdentifierMenuItem.Caption:=Format(lisCopyIdentifier, [Identifier]);
CopyDescriptionMenuItem.Visible:=true;
CopyIdentifierMenuItem.Visible:=Identifier<>'';
CopySeparatorMenuItem.Visible:=true;

View File

@ -1470,7 +1470,7 @@ begin
DebugLn(['TCodeHelpManager.LoadFPDocFile '+ADocFile.DocErrorMsg]);
if not (chofQuiet in Flags) then begin
IDEMessageDialog(lisErrorReadingXML,
Format(lisErrorReadingXmlFile, ['"', CurFilename, '"', LineEnding, E.Message]),
Format(lisErrorReadingXmlFile, [CurFilename, LineEnding, E.Message]),
mtError, [mbCancel]);
end;
end;

View File

@ -920,7 +920,7 @@ begin
if (a<0) or (a=TemplateIndex) then
ModalResult:=mrOk
else begin
AText:=Format(lisCodeTemplATokenAlreadyExists, ['"', TokenEdit.Text, '"']);
AText:=Format(lisCodeTemplATokenAlreadyExists, [TokenEdit.Text]);
ACaption:=lisCodeTemplError;
IDEMessageDialog(ACaption,AText,mterror,[mbok]);
end;

View File

@ -727,8 +727,8 @@ begin
if IDEMessageDialog(lisFileNotFound,
Format(lisTheFileWasNotFoundDoYouWantToLocateItYourself,
['"', SrcFile, '"', LineEnding, LineEnding, LineEnding])
,mtConfirmation, [mbYes, mbNo]) <> mrYes
[SrcFile, LineEnding, LineEnding, LineEnding]),
mtConfirmation, [mbYes, mbNo]) <> mrYes
then Exit;
repeat
@ -1338,7 +1338,7 @@ begin
then begin
if not (dlfLoadError in CurrentSourceUnitInfo.Flags) then begin
IDEMessageDialog(lisDebugUnableToLoadFile,
Format(lisDebugUnableToLoadFile2, ['"', SrcFullName, '"']),
Format(lisDebugUnableToLoadFile2, [SrcFullName]),
mtError,[mbCancel]);
CurrentSourceUnitInfo.Flags := CurrentSourceUnitInfo.Flags + [dlfLoadError];
end;
@ -2285,7 +2285,7 @@ begin
then begin
IDEMessageDialog(lisUnableToRun,
Format(lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki,
['"', NewWorkingDir, '"', LineEnding]),
[NewWorkingDir, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -2296,7 +2296,7 @@ begin
then begin
IDEMessageDialog(lisUnableToRun,
Format(lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP,
['"', NewWorkingDir, '"', LineEnding]),
[NewWorkingDir, LineEnding]),
mtError,[mbCancel]);
exit;
end;

View File

@ -212,8 +212,7 @@ begin
ProcName:=GetProcName;
if (ProcName='') or (not IsValidIdent(ProcName)) then begin
IDEMessageDialog(lisInvalidProcName,
Format(lisSVUOisNotAValidIdentifier, ['"', ProcName, '"']),
mtError,[mbCancel]);
Format(lisSVUOisNotAValidIdentifier, [ProcName]), mtError,[mbCancel]);
ModalResult:=mrNone;
exit;
end;

View File

@ -584,8 +584,7 @@ begin
NewIdentifier:=NewEdit.Text;
if (NewIdentifier='') or (not IsValidIdent(NewIdentifier)) then begin
IDEMessageDialog(lisFRIInvalidIdentifier,
Format(lisSVUOisNotAValidIdentifier, ['"', NewIdentifier, '"']), mtError,
[mbCancel]);
Format(lisSVUOisNotAValidIdentifier, [NewIdentifier]), mtError, [mbCancel]);
ModalResult:=mrNone;
exit;
end;

View File

@ -149,7 +149,7 @@ begin
on E: Exception do
begin
Result:=MessageDlg(lisIECOErrorLoadingXml,
Format(lisIECOErrorLoadingXmlFile, ['"', Filename, '"', LineEnding, E.Message]),
Format(lisIECOErrorLoadingXmlFile, [Filename, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
@ -181,7 +181,7 @@ begin
on E: Exception do
begin
Result:=MessageDlg(lisIECOErrorAccessingXml,
Format(lisIECOErrorAccessingXmlFile, ['"', Filename, '"', LineEnding, E.Message]),
Format(lisIECOErrorAccessingXmlFile, [Filename, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;

View File

@ -759,11 +759,11 @@ resourcestring
lisBusy = 'Busy';
lisCanNotTestTheCompilerWhileDebuggingOrCompiling = 'Cannot test the '
+'compiler while debugging or compiling.';
lisProjectSuccessfullyBuilt = 'Project %s%s%s successfully built';
lisProjectSuccessfullyBuilt = 'Project "%s" successfully built';
lisExecutingCommandBefore = 'Executing command before';
lisProject2 = 'Project: ';
lisExecutingCommandAfter = 'Executing command after';
lisNoProgramFileSFound = 'No program file %s%s%s found.';
lisNoProgramFileSFound = 'No program file "%s" found.';
lisNotNow = 'Not now';
lisYouCanNotBuildLazarusWhileDebuggingOrCompiling = 'You cannot build '
+'Lazarus while debugging or compiling.';
@ -820,13 +820,12 @@ resourcestring
+'warnings by inserting IDE directives {%H-}';
lisHideMessageAtByInsertingIDEDirectiveH = 'Hide message at %s by inserting '
+'IDE directive {%H-}';
lisHideMessageByInsertingIDEDirectiveH = 'Hide message by inserting IDE '
+'directive {%H-}';
lisOIFClassNotFound = 'Class %s%s%s not found.';
lisClassIsNotARegisteredComponentClassUnableToPaste = 'Class %s%s%s is not '
lisHideMessageByInsertingIDEDirectiveH = 'Hide message by inserting IDE directive {%H-}';
lisOIFClassNotFound = 'Class "%s" not found.';
lisClassIsNotARegisteredComponentClassUnableToPaste = 'Class "%s" is not '
+'a registered component class.%sUnable to paste.';
lisControlNeedsParent = 'Control needs parent';
lisTheClassIsATControlAndCanNotBePastedOntoANonContro = 'The class %s%s%s '
lisTheClassIsATControlAndCanNotBePastedOntoANonContro = 'The class "%s" '
+'is a TControl and cannot be pasted onto a non control.%sUnable to paste.';
lisConversionError = 'Conversion error';
lisUnableToConvertComponentTextIntoBinaryFormat = 'Unable to convert '
@ -843,24 +842,23 @@ resourcestring
lisNoResourceStringSectionFound = 'No ResourceString Section found';
lisUnableToFindAResourceStringSectionInThisOrAnyOfThe = 'Unable to find a '
+'ResourceString section in this or any of the used units.';
lisComponentNameIsNotAValidIdentifier = 'Component name %s%s%s is not a '
+'valid identifier';
lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier';
lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.';
lisOwnerIsAlreadyUsedByTReaderTWriterPleaseChooseAnot = '''Owner'' is '
+'already used by TReader/TWriter. Please choose another name.';
lisDuplicateNameAComponentNamedAlreadyExistsInTheInhe = 'Duplicate name: A '
+'component named %s%s%s already exists in the inherited component %s';
lisComponentNameIsKeyword = 'Component name %s%s%s is keyword';
+'component named "%s" already exists in the inherited component %s';
lisComponentNameIsKeyword = 'Component name "%s" is keyword';
lisThereIsAlreadyAComponentClassWithTheName = 'There is already a component '
+'class with the name %s.';
lisTheUnitItselfHasAlreadyTheNamePascalIdentifiersMus = 'The unit itself '
+'has already the name %s%s%s. Pascal identifiers must be unique.';
+'has already the name "%s". Pascal identifiers must be unique.';
lisUnableToRenameVariableInSource = 'Unable to rename variable in source.';
lisUnableToUpdateCreateFormStatementInProjectSource = 'Unable to update '
+'CreateForm statement in project source';
lisThereIsAlreadyAFormWithTheName = 'There is already a form with the name %s%s%s';
lisThereIsAlreadyAFormWithTheName = 'There is already a form with the name "%s"';
lisThereIsAlreadyAUnitWithTheNamePascalIdentifiersMus = 'There is already a '
+'unit with the name %s%s%s. Pascal identifiers must be unique.';
+'unit with the name "%s". Pascal identifiers must be unique.';
lisThisComponentAlreadyContainsAClassWithTheName = 'This component already '
+'contains a class with the name %s.';
lisSeeMessages = 'See messages.';
@ -872,7 +870,7 @@ resourcestring
+'FPC and the FPC sources from http://sourceforge.net/projects/lazarus/?'
+'source=directory';
lisSaveChanges = 'Save changes?';
lisSaveFileBeforeClosingForm = 'Save file %s%s%s%sbefore closing form %s%s%s?';
lisSaveFileBeforeClosingForm = 'Save file "%s"%sbefore closing form "%s"?';
lisUnableToRenameFormInSource = 'Unable to rename form in source.';
lisTheComponentIsInheritedFromToRenameAnInheritedComp = 'The component %s '
+'is inherited from %s.%sTo rename an inherited component open the '
@ -883,7 +881,7 @@ resourcestring
lisPleaseFixTheErrorInTheMessageWindow = 'Please fix the error shown in the'
+' message window, which is normally below the source editor.';
lisMethodClassNotFound = 'Method class not found';
lisClassOfMethodNotFound = 'Class %s%s%s of method %s%s%s not found.';
lisClassOfMethodNotFound = 'Class "%s" of method "%s" not found.';
lisUnableToRenameMethodPleaseFixTheErrorShownInTheMessag = 'Unable to rename '
+'method. Please fix the error shown in the message window.';
lisStopDebugging = 'Stop Debugging?';
@ -901,7 +899,7 @@ resourcestring
+'the new FPC resources, which requires at least FPC 2.4';
lisInfoBuildError = 'Error ...';
lisCreateDirectory = 'Create directory?';
lisTheOutputDirectoryIsMissing = 'The output directory %s%s%s is missing.';
lisTheOutputDirectoryIsMissing = 'The output directory "%s" is missing.';
lisCreateIt = 'Create it';
lisInfoBuildSuccess = 'Success ...';
lisInfoBuildAbort = 'Aborted ...';
@ -928,8 +926,8 @@ resourcestring
lisIECOLoadOrSaveCompilerOptions = 'Load or Save Compiler Options';
lisIECOErrorAccessingXml = 'Error accessing xml';
lisIECOErrorLoadingXml = 'Error loading xml';
lisIECOErrorLoadingXmlFile = 'Error loading xml file %s%s%s:%s%s';
lisIECOErrorAccessingXmlFile = 'Error accessing xml file %s%s%s:%s%s';
lisIECOErrorLoadingXmlFile = 'Error loading xml file "%s":%s%s';
lisIECOErrorAccessingXmlFile = 'Error accessing xml file "%s":%s%s';
lisIECORecentFiles = 'Recent files';
lisIECOSaveToRecent = 'Save to recent';
lisIECOLoadRecent = 'Load recent';
@ -937,7 +935,7 @@ resourcestring
lisIECOLoadFromFile = 'Load from file';
lisLazarusFile = 'Lazarus file';
lisDebugUnableToLoadFile = 'Unable to load file';
lisDebugUnableToLoadFile2 = 'Unable to load file %s%s%s.';
lisDebugUnableToLoadFile2 = 'Unable to load file "%s".';
lisOpenProjectFile = 'Open Project File';
lisLazarusProjectInfoFile = 'Lazarus Project Info file';
lisAllFiles = 'All Files';
@ -1355,7 +1353,7 @@ resourcestring
lisEnvOptDlgInvalidDebuggerFilename = 'Invalid debugger filename';
lisEnvOptDlgInvalidDebuggerFilenameMsg = 'The debugger file "%s" is not an executable.';
lisEnvOptDlgDirectoryNotFound = 'Directory not found';
lisDirectoryNotFound = 'Directory %s%s%s not found.';
lisDirectoryNotFound = 'Directory "%s" not found.';
lisRemoveFromSearchPath = 'Remove from search path';
lisTheDirectoryWasNotFound = 'The directory %s was not found.';
lisInstallationFailed = 'Installation failed';
@ -2200,7 +2198,7 @@ resourcestring
lisTreeNeedsRefresh = 'Tree needs refresh';
lisEMDEmptyMethods = 'Empty Methods';
lisEMDSearchInTheseClassSections = 'Search in these class sections:';
lisUnableToLoadPackage = 'Unable to load package %s%s%s';
lisUnableToLoadPackage = 'Unable to load package "%s"';
lisSAMThisMethodCanNotBeOverriddenBecauseItIsDefinedInTh = 'This method can '
+'not be overridden because it is defined in the current class';
lisSAMIsAnAbstractClassItHasAbstractMethods = '%s is an abstract class, it '
@ -2359,7 +2357,7 @@ resourcestring
dlgRunOUserOverrides = 'User overrides';
dlgIncludeSystemVariables = 'Include system variables';
lisRunParamsFileNotExecutable = 'File not executable';
lisRunParamsTheHostApplicationIsNotExecutable = 'The host application %s%s%s is not executable.';
lisRunParamsTheHostApplicationIsNotExecutable = 'The host application "%s" is not executable.';
dlgTextToFind = '&Text to find';
dlgReplaceWith = '&Replace with';
dlgFROpts = 'Options';
@ -2415,7 +2413,7 @@ resourcestring
lisRoot = 'Root';
lisCopyDescription = 'Copy description to clipboard';
lisUseIdentifierInAt = 'Use identifier %s in %s at %s';
lisCopyIdentifier = 'Copy %s%s%s to clipboard';
lisCopyIdentifier = 'Copy "%s" to clipboard';
lisExpandAllPackages = 'Expand all packages';
lisCollapseAllPackages = 'Collapse all packages';
lisExpandAllUnits = 'Expand all units';
@ -2496,12 +2494,11 @@ resourcestring
uemBookmarkN = 'Bookmark';
lisChangeEncoding = 'Change Encoding';
lisChangeFile = 'Change file';
lisEncodingOfFileOnDiskIsNewEncodingIs =
'Encoding of file %s%s%s%son disk is %s. New encoding is %s.';
lisEncodingOfFileOnDiskIsNewEncodingIs = 'Encoding of file "%s"%son disk is %s. New encoding is %s.';
lisReopenWithAnotherEncoding = 'Reopen with another encoding';
lisAbandonChanges = 'Abandon changes?';
lisAllYourModificationsToWillBeLostAndTheFileReopened = 'All your modificatio'
+'ns to %s%s%s%swill be lost and the file reopened.';
lisAllYourModificationsToWillBeLostAndTheFileReopened = 'All your modifications '
+'to "%s"%swill be lost and the file reopened.';
lisOpenLfm = 'Open %s';
lisUtf8WithBOM = 'UTF-8 with BOM';
uemToggleBookmark = '&Toggle Bookmark';
@ -2559,14 +2556,13 @@ resourcestring
lisThereWasAnErrorWhileCopyingTheComponentStreamToCli = 'There was an error '
+'while copying the component stream to clipboard:%s%s';
lisErrorIn = 'Error in %s';
lisTheComponentEditorOfClassInvokedWithVerbHasCreated = 'The component '
+'editor of class %s%s%s%sinvoked with verb #%s %s%s%s%shas created the '
+'error:%s%s%s%s';
lisTheComponentEditorOfClassInvokedWithVerbHasCreated = 'The component editor of '
+'class "%s"%sinvoked with verb #%s "%s"%shas created the error:%s"%s"';
lisReset = 'Reset';
lisResetLeftTopWidthHeightOfSelectedComponentsToTheir = 'Reset Left, Top, '
+'Width, Height of selected components to their ancestor values?';
lisTheComponentEditorOfClassHasCreatedTheError = 'The component editor of '
+'class %s%s%s has created the error:%s%s%s%s';
+'class "%s" has created the error:%s"%s"';
fdInvalidMultiselectionText='Multiselected components must be of a single form.';
lisInvalidDelete = 'Invalid delete';
lisTheComponentIsInheritedFromToDeleteAnInheritedComp = 'The component %s '
@ -3345,7 +3341,7 @@ resourcestring
lisCodeTemplChange = 'Change';
lisCodeTemplToken = 'Token:';
lisCodeTemplComment = 'Comment:';
lisCodeTemplATokenAlreadyExists = ' A token %s%s%s already exists! ';
lisCodeTemplATokenAlreadyExists = ' A token "%s" already exists! ';
lisCodeTemplError = 'Error';
lisUnableToFindTheComponentClassItIsNotRegisteredViaR = 'Unable to find the '
+'component class "%s".%sIt is not registered via RegisterClass and no lfm'
@ -3368,8 +3364,8 @@ resourcestring
lisMakeResStrPleaseChooseAResourcestring = 'Please choose a resourcestring '
+'section from the list.';
lisMakeResStrResourcestringAlreadyExis = 'Resourcestring already exists';
lisMakeResStrChooseAnotherName = 'The resourcestring %s%s%s already exists.%'
+'sPlease choose another name.%sUse Ignore to add it anyway.';
lisMakeResStrChooseAnotherName = 'The resourcestring "%s" already exists.'
+'%sPlease choose another name.%sUse Ignore to add it anyway.';
lisMakeResStrStringConstantInSource = 'String constant in source';
lisMakeResStrConversionOptions = 'Conversion Options';
lisMakeResStrIdentifierPrefix = 'Identifier prefix:';
@ -3446,8 +3442,7 @@ resourcestring
lisUESearchStringNotFound = 'Search string ''%s'' not found!';
lisUESearchStringContinueBeg = 'Continue search from the beginning?';
lisUESearchStringContinueEnd = 'Continue search from the end?';
lisUEReplaceThisOccurrenceOfWith = 'Replace this occurrence of %s%s%s%s '
+'with %s%s%s?';
lisUEReplaceThisOccurrenceOfWith = 'Replace this occurrence of "%s"%s with "%s"?';
lisUESearching = 'Searching: %s';
lisUEModeSeparator = '/';
lisUEGotoLine = 'Goto line:';
@ -3464,7 +3459,7 @@ resourcestring
// System Variables Override Dialog
lisSVUOInvalidVariableName = 'Invalid variable name';
lisSVUOisNotAValidIdentifier = '%s%s%s is not a valid identifier.';
lisSVUOisNotAValidIdentifier = '"%s" is not a valid identifier.';
lisFRIIdentifier = 'Identifier: %s';
lisSVUOOverrideSystemVariable = 'Override system variable';
@ -3550,8 +3545,7 @@ resourcestring
lisUnableToDeleteAmbiguousFile = 'Unable to delete ambiguous file "%s"';
lisErrorRenamingFile = 'Error renaming file';
lisUnableToRenameAmbiguousFileTo = 'Unable to rename ambiguous file "%s"%sto "%s"';
lisWarningAmbiguousFileFoundSourceFileIs = 'Warning: ambiguous file found: %'
+'s%s%s. Source file is: %s%s%s';
lisWarningAmbiguousFileFoundSourceFileIs = 'Warning: ambiguous file found: "%s". Source file is: "%s"';
lisAmbiguousFileFound = 'Ambiguous file found';
lisThereIsAFileWithTheSameNameAndASimilarExtension = 'There is a file with '
+'the same name and a similar extension ond disk%sFile: %s%sAmbiguous '
@ -3563,7 +3557,7 @@ resourcestring
+'Version is lower than the Minimim Version.';
lisProjAddInvalidPackagename = 'Invalid packagename';
lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag = 'The package '
+'name %s%s%s is invalid.%sPlase choose an existing package.';
+'name "%s" is invalid.%sPlase choose an existing package.';
lisProjAddDependencyAlreadyExists = 'Dependency already exists';
lisVersionMismatch = 'Version mismatch';
lisUnableToAddTheDependencyBecauseThePackageHasAlread = 'Unable to add the '
@ -3572,7 +3566,7 @@ resourcestring
lisUnableToAddTheDependencyBecauseThisWouldCreateA = 'Unable to add the '
+'dependency %s, because this would create a circular dependency. Dependency %s';
lisProjAddTheProjectHasAlreadyADependency = 'The project has already a '
+'dependency for the package %s%s%s.';
+'dependency for the package "%s".';
lisProjAddPackageNotFound = 'Package not found';
lisLDTheUnitIsNotOwnedBeAnyPackageOrProjectPleaseAddThe = 'The unit %s is '
+'not owned be any package or project.%sPlease add the unit to a package '
@ -3588,23 +3582,22 @@ resourcestring
lisLDDoesNotHaveAnyValidFPDocPathUnableToCreateTheFpdo = '%s does not have '
+'any valid FPDoc path.%sUnable to create the fpdoc file for %s';
lisErrorReadingXML = 'Error reading XML';
lisErrorReadingXmlFile = 'Error reading xml file %s%s%s%s%s';
lisErrorReadingXmlFile = 'Error reading xml file "%s"%s%s';
lisPkgThisFileIsNotInAnyLoadedPackage = 'This file is not in any loaded package.';
lisProjAddTheDependencyWasNotFound = 'The dependency %s%s%s was not found.%'
+'sPlease choose an existing package.';
lisProjAddTheDependencyWasNotFound = 'The dependency "%s" was not found.%sPlease choose an existing package.';
lisProjAddInvalidVersion = 'Invalid version';
lisProjAddTheMinimumVersionIsInvalid = 'The Minimum Version %s%s%s is '
lisProjAddTheMinimumVersionIsInvalid = 'The Minimum Version "%s" is '
+'invalid.%sPlease use the format major.minor.release.build%sFor exmaple: 1.0.20.10';
lisProjAddTheMaximumVersionIsInvalid = 'The Maximum Version %s%s%s is '
lisProjAddTheMaximumVersionIsInvalid = 'The Maximum Version "%s" is '
+'invalid.%sPlease use the format major.minor.release.build%sFor exmaple: 1.0.20.10';
lisProjAddInvalidPascalUnitName = 'Invalid Pascal unit name';
lisProjAddTheUnitNameIsNotAValidPascalIdentifier = 'The unit name %s%s%s is '
lisProjAddTheUnitNameIsNotAValidPascalIdentifier = 'The unit name "%s" is '
+'not a valid Pascal identifier.';
lisProjAddUnitNameAlreadyExists = 'Unit name already exists';
lisProjAddTheUnitNameAlreadyExistsInTheProject = 'The unit name %s%s%s '
+'already exists in the project%swith file: %s%s%s.';
lisProjAddTheUnitNameAlreadyExistsInTheSelection = 'The unit name %s%s%s '
+'already exists in the selection%swith file: %s%s%s.';
lisProjAddTheUnitNameAlreadyExistsInTheProject = 'The unit name "%s" '
+'already exists in the project%swith file: "%s".';
lisProjAddTheUnitNameAlreadyExistsInTheSelection = 'The unit name "%s" '
+'already exists in the selection%swith file: "%s".';
lisProjAddToProject = 'Add to Project';
lisProjAddNewRequirement = 'New Requirement';
lisProjAddEditorFile = 'Add Editor Files';
@ -3642,7 +3635,7 @@ resourcestring
lisCleanUpUnitPath = 'Clean up unit path?';
lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt =
'The directory "%s" is no longer needed in the unit path.%sRemove it?';
lisTheFileWasNotFoundDoYouWantToLocateItYourself = 'The file %s%s%s%swas '
lisTheFileWasNotFoundDoYouWantToLocateItYourself = 'The file "%s"%swas '
+'not found.%sDo you want to locate it yourself ?%s';
lisRunToFailed = 'Run-to failed';
lisDbgMangNoDebuggerSpecified = 'No debugger specified';
@ -3662,10 +3655,10 @@ resourcestring
+'s%sdoes not exist or is not executable.%s%sSee Tools -> Options -> Debugger options';
lisUnableToRun = 'Unable to run';
lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP = 'The destination '
+'directory %s%s%s does not exist.%sPlease check the project target file '
+'directory "%s" does not exist.%sPlease check the project target file '
+'name Menu > Project > Project Options.';
lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki = 'The working '
+'directory %s%s%s does not exist.%sPlease check the working directory in '
+'directory "%s" does not exist.%sPlease check the working directory in '
+'Menu > Run > Run parameters.';
lisPleaseOpenAUnitBeforeRun = 'Please open a unit before run.';
lisHitCount = 'Hitcount';
@ -3771,30 +3764,29 @@ resourcestring
+'extension .lpk';
lisPkgMangInvalidPackageName = 'Invalid package name';
lisPkgMangInvalidPackageName2 = 'Invalid Package Name';
lisPkgMangThePackageNameIsNotAValidPackageNamePleaseChooseAn = 'The package '
+'name %s%s%s is not a valid package name%sPlease choose another name (e.'
+'g. package1.lpk)';
lisPkgMangThePackageNameIsNotAValidPackageNamePleaseChooseAn = 'The package name '
+'"%s" is not a valid package name%sPlease choose another name (e.g. package1.lpk)';
lisPkgMangRenameFileLowercase = 'Rename File lowercase?';
lisPkgMangShouldTheFileRenamedLowercaseTo = 'Should the file be renamed '
+'lowercase to%s%s%s%s?';
+'lowercase to%s"%s"?';
lisPkgMangPackageNameAlreadyExists = 'Package name already exists';
lisNameConflict = 'Name conflict';
lisThePackageAlreadyContainsAUnitWithThisName = 'The package already '
+'contains a unit with this name.';
lisPkgMangThereIsAlreadyAnotherPackageWithTheName = 'There is already '
+'another package with the name %s%s%s.%sConflict package: %s%s%s%sFile: %s%s%s';
+'another package with the name "%s".%sConflict package: "%s"%sFile: "%s"';
lisPkgMangFilenameIsUsedByProject = 'Filename is used by project';
lisPkgMangTheFileNameIsPartOfTheCurrentProject = 'The file name %s%s%s is '
lisPkgMangTheFileNameIsPartOfTheCurrentProject = 'The file name "%s" is '
+'part of the current project.%sProjects and Packages should not share files.';
lisPkgMangFilenameIsUsedByOtherPackage = 'Filename is used by other package';
lisPkgMangTheFileNameIsUsedByThePackageInFile = 'The file name %s%s%s is '
+'used by%sthe package %s%s%s%sin file %s%s%s.';
lisPkgMangTheFileNameIsUsedByThePackageInFile = 'The file name "%s" is '
+'used by%sthe package "%s"%sin file "%s".';
lisPkgMangReplaceFile = 'Replace File';
lisPkgMangReplaceExistingFile = 'Replace existing file %s%s%s?';
lisPkgMangReplaceExistingFile = 'Replace existing file "%s"?';
lisPkgMangDeleteOldPackageFile = 'Delete Old Package File?';
lisPkgMangDeleteOldPackageFile2 = 'Delete old package file %s%s%s?';
lisPkgMangDeleteOldPackageFile2 = 'Delete old package file "%s"?';
lisPkgMangDeleteFailed = 'Delete failed';
lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file %s%s%s%s'
lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file "%s"%s'
+'was found in one of the source directories of the package %s and looks '
+'like a compiled unit. Compiled units must be in the output directory of '
+'the package, otherwise other packages can get problems using this '
@ -3808,9 +3800,8 @@ resourcestring
lisPkgMangThereIsAnUnsavedPackageInTheRequiredPackages = 'There is an '
+'unsaved package in the required packages. See package graph.';
lisPkgMangBrokenDependency = 'Broken dependency';
lisPkgMangTheProjectRequiresThePackageButItWasNotFound = 'The project '
+'requires the package %s%s%s.%sBut it was not found. See Project -> '
+'Project Inspector.';
lisPkgMangTheProjectRequiresThePackageButItWasNotFound = 'The project requires '
+'the package "%s".%sBut it was not found. See Project -> Project Inspector.';
lisPkgMangRequiredPackagesWereNotFound = 'One or more required packages were not '
+'found. See package graph for details.';
lisPkgMangCircularDependencies = 'Circular dependencies found';
@ -3824,17 +3815,17 @@ resourcestring
lisPkgMangThereIsACircularDependency = 'There is a circular dependency in the '
+'packages. See package graph.';
lisPkgMangThereAreTwoUnitsWithTheSameName1From2From = 'There are two units '
+'with the same name:%s%s1. %s%s%s from %s%s2. %s%s%s from %s%s%s';
+'with the same name:%s%s1. "%s" from %s%s2. "%s" from %s%s%s';
lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2 = 'There is a unit '
+'with the same name as a package:%s%s1. %s%s%s from %s%s2. %s%s%s%s';
+'with the same name as a package:%s%s1. "%s" from %s%s2. "%s%s%s';
lisPkgMangAmbiguousUnitsFound = 'Ambiguous units found';
lisPkgMangBothPackagesAreConnectedThisMeansEitherOnePackageU = '%sBoth '
+'packages are connected. This means, either one package uses the other, '
+'or they are both used by a third package.';
lisPkgMangThereIsAFPCUnitWithTheSameNameFrom = 'There is a FPC unit with '
+'the same name as:%s%s%s%s%s from %s%s%s';
+'the same name as:%s%s"%s" from %s%s%s';
lisPkgMangThereIsAFPCUnitWithTheSameNameAsAPackage = 'There is a FPC unit '
+'with the same name as a package:%s%s%s%s%s%s';
+'with the same name as a package:%s%s"%s%s%s';
lisPkgMangErrorWritingFile = 'Error writing file';
lisProjMangUnableToWriteStateFileForProjectError = 'Unable to write state '
+'file for project %s%sError: %s';

View File

@ -6747,9 +6747,8 @@ begin
and (not DirPathExistsCached(UnitOutputDirectory)) then begin
if not FileIsInPath(UnitOutputDirectory,WorkingDir) then begin
Result:=IDEQuestionDialog(lisCreateDirectory,
Format(lisTheOutputDirectoryIsMissing, ['"', UnitOutputDirectory, '"']
),
mtConfirmation, [mrYes, lisCreateIt, mrCancel], '');
Format(lisTheOutputDirectoryIsMissing, [UnitOutputDirectory]),
mtConfirmation, [mrYes, lisCreateIt, mrCancel]);
if Result<>mrYes then exit;
end;
Result:=ForceDirectoryInteractive(UnitOutputDirectory,[mbRetry]);
@ -6768,9 +6767,8 @@ begin
and (not DirPathExistsCached(TargetExeDirectory)) then begin
if not FileIsInPath(TargetExeDirectory,WorkingDir) then begin
Result:=IDEQuestionDialog(lisCreateDirectory,
Format(lisTheOutputDirectoryIsMissing, ['"', TargetExeDirectory, '"']
),
mtConfirmation, [mrYes, lisCreateIt, mrCancel], '');
Format(lisTheOutputDirectoryIsMissing, [TargetExeDirectory]),
mtConfirmation, [mrYes, lisCreateIt, mrCancel]);
if Result<>mrYes then exit;
end;
Result:=ForceDirectoryInteractive(TargetExeDirectory,[mbRetry]);
@ -6904,8 +6902,7 @@ begin
// execute compilation tool 'After'
if not (pbfSkipTools in Flags) then begin
ToolAfter:=TProjectCompilationToolOptions(
Project1.CompilerOptions.ExecuteAfter);
ToolAfter:=TProjectCompilationToolOptions(Project1.CompilerOptions.ExecuteAfter);
// no need to check for mrOk, we are exit if it wasn't
if (AReason in ToolAfter.CompileReasons) then begin
Result:=Project1.CompilerOptions.ExecuteAfter.Execute(
@ -6925,8 +6922,7 @@ begin
Project1.ProjResources.DoAfterBuild(AReason, Project1.IsVirtual);
{$IFDEF EnableOldExtTools}
// add success message
MessagesView.AddMsg(Format(lisProjectSuccessfullyBuilt, ['"',
Project1.GetTitleOrName, '"']),'',-1);
MessagesView.AddMsg(Format(lisProjectSuccessfullyBuilt, [Project1.GetTitleOrName]),'',-1);
CompileProgress.Ready(lisInfoBuildSuccess);
{$ENDIF}
finally
@ -6996,7 +6992,7 @@ begin
and not FileExistsUTF8(ProgramFilename)
then begin
IDEMessageDialog(lisFileNotFound,
Format(lisNoProgramFileSFound, ['"', ProgramFilename, '"']),
Format(lisNoProgramFileSFound, [ProgramFilename]),
mtError,[mbCancel]);
Exit;
end;
@ -8791,8 +8787,7 @@ begin
ARegComp:=IDEComponentPalette.FindComponent(NewClassName);
if ARegComp=nil then begin
IDEMessageDialog(lisClassNotFound,
Format(lisClassIsNotARegisteredComponentClassUnableToPaste, ['"',
NewClassName, '"', LineEnding]),
Format(lisClassIsNotARegisteredComponentClassUnableToPaste,[NewClassName,LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -8800,8 +8795,7 @@ begin
// check if there is a valid parent
if (ParentControl=nil) and ARegComp.IsTControl then begin
IDEMessageDialog(lisControlNeedsParent,
Format(lisTheClassIsATControlAndCanNotBePastedOntoANonContro, ['"',
NewClassName, '"', LineEnding]),
Format(lisTheClassIsATControlAndCanNotBePastedOntoANonContro,[NewClassName,LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -10949,10 +10943,9 @@ begin
if AnUnitInfo.NeedsSaveToDisk
then begin
case IDEQuestionDialog(lisSaveChanges,
Format(lisSaveFileBeforeClosingForm, ['"',
AnUnitInfo.Filename, '"', LineEnding, '"',
ADesigner.LookupRoot.Name, '"']),
mtConfirmation,[mrYes,mrNoToAll,lisNo,mrCancel],'') of
Format(lisSaveFileBeforeClosingForm,
[AnUnitInfo.Filename, LineEnding, ADesigner.LookupRoot.Name]),
mtConfirmation,[mrYes,mrNoToAll,lisNo,mrCancel],'') of
mrYes: begin
if DoSaveEditorFile(ASrcEdit,[sfCheckAmbiguousFiles])<>mrOk
then Exit;
@ -10999,17 +10992,17 @@ var
begin
if SysUtils.CompareText(ActiveUnitInfo.Unit_Name,AName)=0 then
raise Exception.Create(Format(
lisTheUnitItselfHasAlreadyTheNamePascalIdentifiersMus, ['"', AName, '"']));
lisTheUnitItselfHasAlreadyTheNamePascalIdentifiersMus, [AName]));
if ActiveUnitInfo.IsPartOfProject then begin
// check if component name already exists in project
i:=Project1.IndexOfUnitWithComponentName(AName,true,ActiveUnitInfo);
if i>=0 then
raise Exception.Create(Format(lisThereIsAlreadyAFormWithTheName, ['"', AName, '"']));
raise Exception.Create(Format(lisThereIsAlreadyAFormWithTheName, [AName]));
// check if pascal identifier already exists in the units
i:=Project1.IndexOfUnitWithName(AName,true,nil);
if i>=0 then
raise Exception.Create(Format(
lisThereIsAlreadyAUnitWithTheNamePascalIdentifiersMus, ['"', AName, '"']));
lisThereIsAlreadyAUnitWithTheNamePascalIdentifiersMus, [AName]));
end;
// check if classname
@ -11025,7 +11018,7 @@ var
// check if keyword
if CodeToolBoss.IsKeyWord(ActiveUnitInfo.Source,AName) then
raise Exception.Create(Format(lisComponentNameIsKeyword, ['"', AName, '"']));
raise Exception.Create(Format(lisComponentNameIsKeyword, [AName]));
// check if registered component class
RegComp:=IDEComponentPalette.FindComponent(AName);
@ -11073,9 +11066,8 @@ var
if (InheritedComponent.Owner<>nil)
and (InheritedComponent.Owner.FindComponent(NewName)<>nil) then
begin
raise EComponentError.Createfmt(
lisDuplicateNameAComponentNamedAlreadyExistsInTheInhe, ['"',
NewName, '"', dbgsName(InheritedComponent.Owner)]);
raise EComponentError.Createfmt(lisDuplicateNameAComponentNamedAlreadyExistsInTheInhe,
[NewName, dbgsName(InheritedComponent.Owner)]);
end;
end else begin
// rename component and references in code
@ -11176,7 +11168,7 @@ var
begin
DebugLn('TMainIDE.OnDesignerRenameComponent Old=',AComponent.Name,':',AComponent.ClassName,' New=',NewName,' Owner=',dbgsName(AComponent.Owner));
if (not IsValidIdent(NewName)) or (NewName='') then
raise Exception.Create(Format(lisComponentNameIsNotAValidIdentifier, ['"',Newname,'"']));
raise Exception.Create(Format(lisComponentNameIsNotAValidIdentifier, [Newname]));
if WordIsKeyWord.DoItCaseInsensitive(PChar(NewName))
or WordIsDelphiKeyWord.DoItCaseInsensitive(PChar(NewName))
or WordIsPredefinedFPCIdentifier.DoItCaseInsensitive(PChar(NewName))
@ -12434,8 +12426,7 @@ begin
ActiveUnitInfo:=Project1.UnitWithComponentClassName(AnInheritedClassName);
if ActiveUnitInfo=nil then begin
IDEMessageDialog(lisMethodClassNotFound,
Format(lisClassOfMethodNotFound, ['"', AnInheritedClassName, '"', '"',
AInheritedMethodName, '"']),
Format(lisClassOfMethodNotFound, [AnInheritedClassName, AInheritedMethodName]),
mtError,[mbCancel],'');
exit;
end;

View File

@ -247,10 +247,8 @@ begin
if ResStrExistsInAnySection(IdentifierEdit.Text)
and (not ResStrExistsWithSameValue(IdentifierEdit.Text)) then begin
if IDEMessageDialog(lisMakeResStrResourcestringAlreadyExis,
Format(lisMakeResStrChooseAnotherName, ['"', IdentifierEdit.Text, '"',
#13, #13]),
mtWarning,[mbOk,mbIgnore])
=mrOk
Format(lisMakeResStrChooseAnotherName,[IdentifierEdit.Text,LineEnding,LineEnding]),
mtWarning,[mbOk,mbIgnore]) = mrOk
then
exit;
end;

View File

@ -468,11 +468,10 @@ begin
OpenDialog.Filename := HostApplicationEdit.Text;
if OpenDialog.Execute then
begin
if (FileIsExecutable(OpenDialog.Filename)) or
(IDEMessageDialog(lisRunParamsFileNotExecutable,
Format(lisRunParamsTheHostApplicationIsNotExecutable,
['"', OpenDialog.Filename, '"']), mtWarning, [mbCancel, mbIgnore]) =
mrIgnore) then
if (FileIsExecutable(OpenDialog.Filename))
or (IDEMessageDialog(lisRunParamsFileNotExecutable,
Format(lisRunParamsTheHostApplicationIsNotExecutable,[OpenDialog.Filename]),
mtWarning, [mbCancel, mbIgnore]) = mrIgnore) then
begin
HostApplicationEdit.Text := OpenDialog.Filename;
end;

View File

@ -3202,8 +3202,7 @@ begin
CenterCursor(True);
CenterCursorHoriz(hcmSoftKeepEOL);
AText:=Format(lisUEReplaceThisOccurrenceOfWith,
['"', Shorten(ASearch), '"', LineEnding, '"', Shorten(AReplace), '"']);
AText:=Format(lisUEReplaceThisOccurrenceOfWith,[Shorten(ASearch),LineEnding,Shorten(AReplace)]);
GetDialogPosition(300,150,X,Y);
a:=MessageDlgPos(AText,mtconfirmation,
@ -6017,21 +6016,20 @@ begin
CurResult:=mrCancel
else
CurResult:=IDEQuestionDialog(lisChangeEncoding,
Format(lisEncodingOfFileOnDiskIsNewEncodingIs, ['"',
SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrOk, lisReopenWithAnotherEncoding, mrCancel], '');
Format(lisEncodingOfFileOnDiskIsNewEncodingIs,
[SrcEdit.CodeBuffer.Filename, LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrOk, lisReopenWithAnotherEncoding, mrCancel]);
end else begin
if SrcEdit.CodeBuffer.IsVirtual then
CurResult:=IDEQuestionDialog(lisChangeEncoding,
Format(lisEncodingOfFileOnDiskIsNewEncodingIs, ['"',
SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrYes, lisChangeFile, mrCancel], '')
Format(lisEncodingOfFileOnDiskIsNewEncodingIs,
[SrcEdit.CodeBuffer.Filename, LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrYes, lisChangeFile, mrCancel])
else
CurResult:=IDEQuestionDialog(lisChangeEncoding,
Format(lisEncodingOfFileOnDiskIsNewEncodingIs, ['"',
SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrYes, lisChangeFile, mrOk,
lisReopenWithAnotherEncoding, mrCancel], '');
Format(lisEncodingOfFileOnDiskIsNewEncodingIs,
[SrcEdit.CodeBuffer.Filename, LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrYes,lisChangeFile,mrOk,lisReopenWithAnotherEncoding,mrCancel]);
end;
if CurResult=mrYes then begin
// change file
@ -6050,7 +6048,7 @@ begin
if SrcEdit.Modified then begin
if IDEQuestionDialog(lisAbandonChanges,
Format(lisAllYourModificationsToWillBeLostAndTheFileReopened,
['"', SrcEdit.CodeBuffer.Filename, '"', LineEnding]),
[SrcEdit.CodeBuffer.Filename, LineEnding]),
mtConfirmation,[mbOk,mbAbort],'')<>mrOk
then begin
exit;

View File

@ -86,7 +86,7 @@ begin
v:=Trim(VariableEdit.Text);
if not IsValidIdent(v) then begin
if IDEMessageDialog(lisSVUOInvalidVariableName,
Format(lisSVUOisNotAValidIdentifier, ['"', v, '"']),
Format(lisSVUOisNotAValidIdentifier, [v]),
mtWarning,[mbCancel,mbIgnore])=mrCancel
then ModalResult := mrNone; //cancel close
end;

View File

@ -257,8 +257,8 @@ begin
except
on E: Exception do begin
MessageDlg(lisInvalidFilter,
Format(lisInvalidExpression, [LineEnding, Expr, LineEnding, E.Message]), mtError, [
mbCancel], 0);
Format(lisInvalidExpression, [LineEnding, Expr, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
if not Result then exit;

View File

@ -133,7 +133,7 @@ begin
if not DirPathExists(CurDir) then
begin
DlgResult := QuestionDlg(lisEnvOptDlgDirectoryNotFound,
Format(lisDirectoryNotFound, ['"', CurDir, '"']),
Format(lisDirectoryNotFound, [CurDir]),
mtError, [mrIgnore, mrYes, lisRemoveFromSearchPath, mrCancel], 0);
case DlgResult of
mrIgnore: ;

View File

@ -125,7 +125,7 @@ begin
if not DirPathExists(CurDir) then
begin
DlgResult := QuestionDlg(lisEnvOptDlgDirectoryNotFound,
Format(lisDirectoryNotFound, ['"', CurDir, '"']),
Format(lisDirectoryNotFound, [CurDir]),
mtError, [mrIgnore, mrYes, lisRemoveFromSearchPath, mrCancel], 0);
case DlgResult of
mrIgnore: ;

View File

@ -793,8 +793,7 @@ begin
except
on E: Exception do begin
MessageDlg(lisCodeToolsDefsWriteError,
Format(lisErrorWritingPackageListToFile,
[LineEnding, AFilename, LineEnding, E.Message]),
Format(lisErrorWritingPackageListToFile,[LineEnding,AFilename,LineEnding,E.Message]),
mtError, [mbCancel], 0);
end;
end;
@ -863,8 +862,7 @@ begin
except
on E: Exception do begin
MessageDlg(lisCodeToolsDefsReadError,
Format(lisErrorReadingPackageListFromFile,
[LineEnding, AFilename, LineEnding, E.Message]),
Format(lisErrorReadingPackageListFromFile,[LineEnding,AFilename,LineEnding,E.Message]),
mtError, [mbCancel], 0);
end;
end;

View File

@ -4512,8 +4512,8 @@ var
if (AmbiguousFilename='') then exit;
if not YesToAll then
Result:=IDEMessageDialog(lisAmbiguousUnitFound,
Format(lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac, ['"',
AmbiguousFilename, '"', LineEnding, APackage.IDAsString, LineEnding, LineEnding]),
Format(lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac,
[AmbiguousFilename, LineEnding, APackage.IDAsString, LineEnding, LineEnding]),
mtWarning,[mbYes,mbYesToAll,mbNo,mbAbort])
else
Result:=mrYesToAll;

View File

@ -543,11 +543,12 @@ begin
for i:=0 to PkgWithProjOverriddenOutDirs.Count-1 do begin
CurPkg:=TLazPackage(PkgWithProjOverriddenOutDirs[i]);
OutDir:=CreateRelativePath(CurPkg.GetOutputDirectory,CurPkg.Directory);
s+=CurPkg.Name+': '+OutDir+#13;
s+=CurPkg.Name+': '+OutDir+LineEnding;
end;
if IDEMessageDialog(lisConfirmation,
Format(lisPkgTheProjectOverridesTheOutputDirectoryOfTheFollowin, [#13,
#13, #13, s]), mtWarning, [mbOk, mbCancel])<>mrOk
Format(lisPkgTheProjectOverridesTheOutputDirectoryOfTheFollowin,
[LineEnding, LineEnding, LineEnding, s]),
mtWarning, [mbOk, mbCancel])<>mrOk
then
exit(mrCancel);
// remember the answer
@ -575,7 +576,7 @@ begin
if OpenResult<>lprSuccess then begin
if not Quiet then
IDEMessageDialog(lisCCOErrorCaption,
Format(lisUnableToLoadPackage, ['"', CurDependency.AsString, '"']),
Format(lisUnableToLoadPackage, [CurDependency.AsString]),
mtError,[mbCancel]);
exit;
end;
@ -1122,8 +1123,8 @@ begin
// check filename
if (NewPkgName='') or (not IsValidUnitName(NewPkgName)) then begin
Result:=IDEMessageDialog(lisPkgMangInvalidPackageName,
Format(lisPkgMangThePackageNameIsNotAValidPackageNamePleaseChooseAn, [
'"', NewPkgName, '"', LineEnding]),
Format(lisPkgMangThePackageNameIsNotAValidPackageNamePleaseChooseAn,
[NewPkgName, LineEnding]),
mtInformation,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -1137,8 +1138,7 @@ begin
if EnvironmentOptions.CharcaseFileAction = ccfaAsk then
begin
if IDEMessageDialog(lisPkgMangRenameFileLowercase,
Format(lisPkgMangShouldTheFileRenamedLowercaseTo,
[LineEnding, '"', LowerFilename, '"']),
Format(lisPkgMangShouldTheFileRenamedLowercaseTo,[LineEnding, LowerFilename]),
mtConfirmation,[mbYes,mbNo])=mrYes
then
NewFileName:=LowerFilename;
@ -1166,9 +1166,8 @@ begin
ConflictPkg:=PackageGraph.FindPackageWithName(NewPkgName,APackage);
if ConflictPkg<>nil then begin
Result:=IDEMessageDialog(lisPkgMangPackageNameAlreadyExists,
Format(lisPkgMangThereIsAlreadyAnotherPackageWithTheName, ['"',
NewPkgName, '"', LineEnding, '"', ConflictPkg.IDAsString, '"', LineEnding, '"',
ConflictPkg.Filename, '"']),
Format(lisPkgMangThereIsAlreadyAnotherPackageWithTheName,
[NewPkgName, LineEnding, ConflictPkg.IDAsString, LineEnding, ConflictPkg.Filename]),
mtInformation,[mbRetry,mbAbort,mbIgnore]);
if Result=mrAbort then exit;
if Result<>mrIgnore then continue; // try again
@ -1178,8 +1177,7 @@ begin
if (NewMainUnitFileName<>'')
and (Project1.ProjectUnitWithFilename(NewMainUnitFileName)<>nil) then begin
Result:=IDEMessageDialog(lisPkgMangFilenameIsUsedByProject,
Format(lisPkgMangTheFileNameIsPartOfTheCurrentProject, ['"',
NewFilename, '"', LineEnding]),
Format(lisPkgMangTheFileNameIsPartOfTheCurrentProject,[NewFilename,LineEnding]),
mtInformation,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -1191,9 +1189,8 @@ begin
PkgFile:=PackageGraph.FindFileInAllPackages(NewMainUnitFileName,true,false);
if PkgFile<>nil then begin
Result:=IDEMessageDialog(lisPkgMangFilenameIsUsedByOtherPackage,
Format(lisPkgMangTheFileNameIsUsedByThePackageInFile, ['"',
NewFilename, '"', LineEnding, '"', PkgFile.LazPackage.IDAsString, '"',
LineEnding, '"', PkgFile.LazPackage.Filename, '"']),
Format(lisPkgMangTheFileNameIsUsedByThePackageInFile, [NewFilename, LineEnding,
PkgFile.LazPackage.IDAsString, LineEnding, PkgFile.LazPackage.Filename]),
mtWarning,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -1221,14 +1218,14 @@ begin
begin
if FileExistsUTF8(NewFileName) then begin
Result:=IDEMessageDialog(lisPkgMangReplaceFile,
Format(lisPkgMangReplaceExistingFile, ['"', NewFilename, '"']),
Format(lisPkgMangReplaceExistingFile, [NewFilename]),
mtConfirmation,[mbOk,mbCancel]);
if Result<>mrOk then exit;
end;
if FileExistsUTF8(NewMainUnitFileName) then
begin
Result:=IDEMessageDialog(lisPkgMangReplaceFile,
Format(lisPkgMangReplaceExistingFile, ['"', NewFilename, '"']),
Format(lisPkgMangReplaceExistingFile, [NewFilename]),
mtConfirmation,[mbOk,mbCancel]);
if Result<>mrOk then exit;
end;
@ -1257,7 +1254,7 @@ begin
if FileExistsUTF8(OldPkgFilename)
and (CompareFilenames(OldPkgFilename,NewFilename)<>0) then begin
if IDEMessageDialog(lisPkgMangDeleteOldPackageFile,
Format(lisPkgMangDeleteOldPackageFile2, ['"', OldPkgFilename, '"']),
Format(lisPkgMangDeleteOldPackageFile2, [OldPkgFilename]),
mtConfirmation,[mbYes,mbNo])=mrYes
then begin
if DeleteFileUTF8(OldPkgFilename) then begin
@ -1317,7 +1314,7 @@ begin
MainIDE.DoShowProjectInspector(true);
Result:=IDEMessageDialogAb(lisPkgMangBrokenDependency,
Format(lisPkgMangTheProjectRequiresThePackageButItWasNotFound,
['"', Dependency.AsString, '"', LineEnding]),
[Dependency.AsString, LineEnding]),
mtError,Btns,ShowAbort);
if not ShowAbort then
Result := mrCancel; // User confirmed error, implicitly cancel the action
@ -1377,13 +1374,13 @@ begin
then begin
if (PkgFile1<>nil) and (PkgFile2<>nil) then begin
s:=Format(lisPkgMangThereAreTwoUnitsWithTheSameName1From2From, [LineEnding,
LineEnding, '"', PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString,
LineEnding, '"', PkgFile2.Filename, '"', PkgFile2.LazPackage.IDAsString,
LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString,
LineEnding, PkgFile2.Filename, PkgFile2.LazPackage.IDAsString,
LineEnding, LineEnding]);
end else if (PkgFile1<>nil) and (ConflictPkg<>nil) then begin
s:=Format(lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2, [LineEnding,
LineEnding, '"', PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString,
LineEnding, '"', ConflictPkg.IDAsString, LineEnding, LineEnding]);
LineEnding, PkgFile1.Filename, PkgFile1.LazPackage.IDAsString,
LineEnding, ConflictPkg.IDAsString, LineEnding, LineEnding]);
end else
s:='Internal inconsistency FindAmbiguousUnits: '
+'Please report this bug and how you got here.'+LineEnding;
@ -1401,10 +1398,10 @@ begin
then begin
if (ConflictPkg<>nil) then begin
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameAsAPackage, [LineEnding,
LineEnding, '"', ConflictPkg.IDAsString, LineEnding, LineEnding]);
LineEnding, ConflictPkg.IDAsString, LineEnding, LineEnding]);
end else if (PkgFile1<>nil) then begin
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameFrom, [LineEnding, LineEnding, '"',
PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString, LineEnding, LineEnding]);
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameFrom, [LineEnding, LineEnding,
PkgFile1.Filename, PkgFile1.LazPackage.IDAsString, LineEnding, LineEnding]);
end else
s:='Internal inconsistency FindFPCConflictUnits: '
+'Please report this bug and how you got here.'+LineEnding;