IDE, LCL: adapted error messages to changed IDE main menu layout

git-svn-id: trunk@30598 -
This commit is contained in:
maxim 2011-05-07 15:41:03 +00:00
parent b7f0a998e7
commit 82a8e18101
4 changed files with 21 additions and 25 deletions

View File

@ -649,12 +649,12 @@ resourcestring
lisisAlreadyPartOfTheProject = '%s is already part of the Project.'; lisisAlreadyPartOfTheProject = '%s is already part of the Project.';
lisRemoveFromProject = 'Remove from project'; lisRemoveFromProject = 'Remove from project';
lisCreateAProjectFirst = 'Create a project first!'; lisCreateAProjectFirst = 'Create a project first!';
lisTheTestDirectoryCouldNotBeFoundSeeEnvironmentOpt = 'The Test Directory ' lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt = 'The Test Directory '
+'could not be found:%s%s%s%s%s(see environment options)'; +'could not be found:%s%s%s%s%s(see IDE options)';
lisBuildNewProject = 'Build new project'; lisBuildNewProject = 'Build new project';
lisTheProjectMustBeSavedBeforeBuildingIfYouSetTheTest = 'The project must ' lisTheProjectMustBeSavedBeforeBuildingIfYouSetTheTest = 'The project must '
+'be saved before building%sIf you set the Test Directory in the ' +'be saved before building%sIf you set the Test Directory in the '
+'environment options,%syou can create new projects and build them at ' +'IDE options,%syou can create new projects and build them at '
+'once.%sSave project?'; +'once.%sSave project?';
lisProjectSuccessfullyBuilt = 'Project %s%s%s successfully built'; lisProjectSuccessfullyBuilt = 'Project %s%s%s successfully built';
lisExecutingCommandBefore = 'Executing command before'; lisExecutingCommandBefore = 'Executing command before';
@ -1938,7 +1938,7 @@ resourcestring
dlgCCOTestCompilingEmptyFile = 'Test: Compiling an empty file ...'; dlgCCOTestCompilingEmptyFile = 'Test: Compiling an empty file ...';
lisCCOInvalidTestDir = 'Invalid Test Directory'; lisCCOInvalidTestDir = 'Invalid Test Directory';
lisCCOCheckTestDir = 'Please check the Test directory under %s' lisCCOCheckTestDir = 'Please check the Test directory under %s'
+'Environment -> Environment Options -> Files -> Directory for building test projects'; +'Tools -> Options -> Files -> Directory for building test projects';
lisCCOUnableToCreateTestFile = 'Unable to create Test File'; lisCCOUnableToCreateTestFile = 'Unable to create Test File';
lisCCOUnableToCreateTestPascalFile = 'Unable to create Test pascal file "%s".'; lisCCOUnableToCreateTestPascalFile = 'Unable to create Test pascal file "%s".';
dlgCCOTestToolCompilingEmptyFile = 'Test: Compiling an empty file'; dlgCCOTestToolCompilingEmptyFile = 'Test: Compiling an empty file';
@ -2698,8 +2698,6 @@ resourcestring
srkmecBuildLazarus = 'Build lazarus'; srkmecBuildLazarus = 'Build lazarus';
srkmecExtTool = 'External tool %d'; srkmecExtTool = 'External tool %d';
srkmecCustomTool = 'Custom tool %d'; srkmecCustomTool = 'Custom tool %d';
// environment menu
srkmecEnvironmentOptions = 'IDE options'; srkmecEnvironmentOptions = 'IDE options';
lisKMEditorOptions = 'Editor options'; lisKMEditorOptions = 'Editor options';
lisKMEditCodeTemplates = 'Edit Code Templates'; lisKMEditCodeTemplates = 'Edit Code Templates';
@ -2922,7 +2920,7 @@ resourcestring
lisOptionsChangedRecompilingCleanWithB = 'Options changed, recompiling ' lisOptionsChangedRecompilingCleanWithB = 'Options changed, recompiling '
+'clean with -B'; +'clean with -B';
lisCompilerHintYouCanSetTheCompilerPath = 'Hint: you can set the compiler ' lisCompilerHintYouCanSetTheCompilerPath = 'Hint: you can set the compiler '
+'path in Environment->Environment options->Files->Compiler Path'; +'path in Tools -> Options-> Files -> Compiler Path';
lisCompilerNOTELoadingOldCodetoolsOptionsFile = 'NOTE: loading old ' lisCompilerNOTELoadingOldCodetoolsOptionsFile = 'NOTE: loading old '
+'codetools options file: '; +'codetools options file: ';
lisCompilerNOTECodetoolsConfigFileNotFoundUsingDefaults = 'NOTE: codetools ' lisCompilerNOTECodetoolsConfigFileNotFoundUsingDefaults = 'NOTE: codetools '
@ -3418,8 +3416,8 @@ resourcestring
+'%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 Environment -> Debugger ' +'s%sdoes not exist or is not executable.%s%sSee Tools -> Options -> Debugger '
+'Options'; +'options';
lisUnableToRun = 'Unable to run'; lisUnableToRun = 'Unable to run';
lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP = 'The destination ' lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP = 'The destination '
+'directory %s%s%s does not exist.%sPlease check the project target file ' +'directory %s%s%s does not exist.%sPlease check the project target file '
@ -4208,37 +4206,35 @@ resourcestring
lisInvalidCompilerFilename = 'Invalid Compiler Filename'; lisInvalidCompilerFilename = 'Invalid Compiler Filename';
lisTheCurrentCompilerFilenameIsNotAValidExecutablePlease = 'The current ' lisTheCurrentCompilerFilenameIsNotAValidExecutablePlease = 'The current '
+'compiler filename %s%s%s%sis not a valid executable.%sPlease check ' +'compiler filename %s%s%s%sis not a valid executable.%sPlease check '
+'Environment -> Environment Options -> Files'; +'Tools -> Options -> Files';
lisFreePascalSourcesNotFound = 'Free Pascal Sources not found'; lisFreePascalSourcesNotFound = 'Free Pascal Sources not found';
lisTheFreePascalSourceDirectoryWasNotFoundSomeCodeFun = 'The Free Pascal ' lisTheFreePascalSourceDirectoryWasNotFoundSomeCodeFun = 'The Free Pascal '
+'source directory was not found.%sSome code functions will not work.%sIt ' +'source directory was not found.%sSome code functions will not work.%sIt '
+'is recommended that you install it and set the path%sEnvironment -> ' +'is recommended that you install it and set the path%sTools -> '
+'Environment Options -> Files'; +'Options -> Files';
lisInvalidFreePascalSourceDirectory = 'Invalid Free Pascal source directory'; lisInvalidFreePascalSourceDirectory = 'Invalid Free Pascal source directory';
lisTheCurrentFreePascalSourceDirectoryDoesNotLookCorr2 = 'The current Free ' lisTheCurrentFreePascalSourceDirectoryDoesNotLookCorr2 = 'The current Free '
+'Pascal source directory %s%s%s%sdoes not look correct.%sCheck ' +'Pascal source directory %s%s%s%sdoes not look correct.%sCheck '
+'Environment -> Environment Options -> Files'; +'Tools -> Options -> Files';
lisLazarusDirectoryNotFound = 'Lazarus directory not found'; lisLazarusDirectoryNotFound = 'Lazarus directory not found';
lisTheCurrentLazarusDirectoryDoesNotLookCorrectWithou2 = 'The current ' lisTheCurrentLazarusDirectoryDoesNotLookCorrectWithou2 = 'The current '
+'Lazarus directory %s%s%s%sdoes not look correct.%sWithout it You will ' +'Lazarus directory %s%s%s%sdoes not look correct.%sWithout it You will '
+'not be able to create LCL applications.%sCheck Environment -> ' +'not be able to create LCL applications.%sCheck Tools -> '
+'Environment Options -> Files'; +'Options -> Files';
lisTheCurrentLazarusDirectoryDoesNotLookCorrectWithou = 'The current ' lisTheCurrentLazarusDirectoryDoesNotLookCorrectWithou = 'The current '
+'Lazarus directory %s%s%s%sdoes not look correct.%sWithout it You will ' +'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 ' +'not be able to create LCL applications.%sChoose Ok to choose the '
+'default %s%s%s.%sOtherwise check Environment -> Environment Options -> ' +'default %s%s%s.%sOtherwise check Tools -> Options -> '
+'Files'; +'Files';
lisTheLazarusDirectoryWasNotFoundYouWillNotBeAbleToCr = 'The Lazarus ' lisTheLazarusDirectoryWasNotFoundYouWillNotBeAbleToCr = 'The Lazarus '
+'directory was not found.%sYou will not be able to create LCL ' +'directory was not found.%sYou will not be able to create LCL '
+'applications.%sPlease check Environment -> Environment Options -> Files'; +'applications.%sPlease check Tools -> Options -> Files';
lisTheCurrentFreePascalSourceDirectoryDoesNotLookCorr = 'The current Free ' lisTheCurrentFreePascalSourceDirectoryDoesNotLookCorr = 'The current Free '
+'Pascal source directory %s%s%s%sdoes not look correct.%sChoose Ok to ' +'Pascal source directory %s%s%s%sdoes not look correct.%sChoose Ok to '
+'choose the default %s%s%s.%sOtherwise check Environment -> Environment ' +'choose the default %s%s%s.%sOtherwise check Tools -> Options -> Files';
+'Options -> Files';
lisTheCurrentCompilerFilenameIsNotAValidExecutableCho = 'The current ' lisTheCurrentCompilerFilenameIsNotAValidExecutableCho = 'The current '
+'compiler filename %s%s%s%sis not a valid executable.%sChoose Ok to ' +'compiler filename %s%s%s%sis not a valid executable.%sChoose Ok to '
+'choose the default %s%s%s.%sOtherwise check Environment -> Environment ' +'choose the default %s%s%s.%sOtherwise check Tools -> Options -> Files';
+'Options -> Files';
// Help Options // Help Options
lisHlpOptsHelpOptions = 'Help Options'; lisHlpOptsHelpOptions = 'Help Options';

View File

@ -11284,7 +11284,7 @@ begin
if (EnvironmentOptions.TestBuildDirectory='') if (EnvironmentOptions.TestBuildDirectory='')
or (not DirPathExists(EnvironmentOptions.TestBuildDirectory)) then begin or (not DirPathExists(EnvironmentOptions.TestBuildDirectory)) then begin
if (EnvironmentOptions.TestBuildDirectory<>'') then begin if (EnvironmentOptions.TestBuildDirectory<>'') then begin
MessageDlg(Format(lisTheTestDirectoryCouldNotBeFoundSeeEnvironmentOpt, [ MessageDlg(Format(lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt, [
#13, '"', EnvironmentOptions.TestBuildDirectory, '"', #13]), mtError, [ #13, '"', EnvironmentOptions.TestBuildDirectory, '"', #13]), mtError, [
mbCancel], 0); mbCancel], 0);
Result:=mrCancel; Result:=mrCancel;

View File

@ -335,7 +335,7 @@ begin
if CommandLine='' then begin if CommandLine='' then begin
if (HelpDatabases<>nil) if (HelpDatabases<>nil)
and (CompareText(HelpDatabases.ClassName,'TIDEHelpDatabases')=0) then and (CompareText(HelpDatabases.ClassName,'TIDEHelpDatabases')=0) then
ErrMsg:=Format(hhsHelpNoHTMLBrowserFoundPleaseDefineOneInHelpConfigureHe, ErrMsg:=Format(hhsHelpNoHTMLBrowserFoundPleaseDefineOne,
[ #13]) [ #13])
else else
ErrMsg:=hhsHelpNoHTMLBrowserFound; ErrMsg:=hhsHelpNoHTMLBrowserFound;

View File

@ -415,8 +415,8 @@ resourceString
+'unable to find file %s%s%s.'; +'unable to find file %s%s%s.';
hhsHelpTheMacroSInBrowserParamsWillBeReplacedByTheURL = 'The macro %s in ' hhsHelpTheMacroSInBrowserParamsWillBeReplacedByTheURL = 'The macro %s in '
+'BrowserParams will be replaced by the URL.'; +'BrowserParams will be replaced by the URL.';
hhsHelpNoHTMLBrowserFoundPleaseDefineOneInHelpConfigureHe = 'No HTML ' hhsHelpNoHTMLBrowserFoundPleaseDefineOne = 'No HTML '
+'Browser found.%sPlease define one in Environment -> Options -> Help -> Help Options'; +'Browser found.%sPlease define one in Tools -> Options -> Help -> Help Options';
hhsHelpNoHTMLBrowserFound = 'Unable to find a HTML browser.'; hhsHelpNoHTMLBrowserFound = 'Unable to find a HTML browser.';
hhsHelpBrowserNotFound = 'Browser %s%s%s not found.'; hhsHelpBrowserNotFound = 'Browser %s%s%s not found.';
hhsHelpBrowserNotExecutable = 'Browser %s%s%s not executable.'; hhsHelpBrowserNotExecutable = 'Browser %s%s%s not executable.';