From d33b3cd8f793165a54617802b4a3a23ceb0ac279 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 25 Jan 2011 18:13:08 +0000 Subject: [PATCH] IDE: resource strings git-svn-id: trunk@29199 - --- ide/compileroptions.pp | 4 ++-- ide/frames/compiler_path_options.pas | 29 ++++++++++++++-------------- ide/lazarusidestrconsts.pas | 23 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index 683465bb49..2096be8321 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -72,7 +72,7 @@ uses // IDEIntf ProjectIntf, MacroIntf, IDEExternToolIntf, SrcEditorIntf, IDEOptionsIntf, // IDE - IDEProcs, IDEMsgIntf, LazConf, TransferMacros, CompOptsModes; + LazarusIDEStrConsts, IDEProcs, IDEMsgIntf, LazConf, TransferMacros, CompOptsModes; type @@ -3489,7 +3489,7 @@ begin if ParsedStamp[Option]<>CompilerParseStamp then begin if Parsing[Option] then begin DebugLn('TParsedCompilerOptions.GetParsedValue Circle in Options: ',ParsedCompilerOptStringNames[Option],' Unparsed="',UnparsedValues[Option],'"'); - ParsedError(Option,'Circle in macros'); + ParsedError(Option, lisCircleInMacros); exit(''); end; Parsing[Option]:=true; diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas index 0e64f86a5a..2a48f0304f 100644 --- a/ide/frames/compiler_path_options.pas +++ b/ide/frames/compiler_path_options.pas @@ -162,33 +162,34 @@ begin o:=FCompilerOpts.ParsedOpts.ParsedErrorOption; case o of pcosBaseDir: - Msg:='I wonder how you did that: Error in the base directory:'; + Msg:=lisIWonderHowYouDidThatErrorInTheBaseDirectory; pcosUnitPath: - Msg:='Error in the search path for "Other unit files":'; + Msg:=lisErrorInTheSearchPathForOtherUnitFiles; pcosIncludePath: - Msg:='Error in the search path for "Include files":'; + Msg:=lisErrorInTheSearchPathForIncludeFiles; pcosObjectPath: - Msg:='Error in the search path for "Object files":'; + Msg:=lisErrorInTheSearchPathForObjectFiles; pcosLibraryPath: - Msg:='Error in the search path for "Libraries":'; + Msg:=lisErrorInTheSearchPathForLibraries; pcosSrcPath: - Msg:='Error in the search path for "Other sources":'; + Msg:=lisErrorInTheSearchPathForOtherSources; pcosLinkerOptions: - Msg:='Error in the custom linker options (Linking / Pass options to linker):'; + Msg:=lisErrorInTheCustomLinkerOptionsLinkingPassOptionsToL; pcosCustomOptions: - Msg:='Error in the custom compiler options (Other):'; + Msg:=lisErrorInTheCustomCompilerOptionsOther; pcosOutputDir: - Msg:='Error in the "unit output directory":'; + Msg:=lisErrorInTheUnitOutputDirectory; pcosCompilerPath: - Msg:='Error in the compiler file name:'; + Msg:=lisErrorInTheCompilerFileName; pcosDebugPath: - Msg:='Error in the "Debugger path addition":'; + Msg:=lisErrorInTheDebuggerPathAddition; else - Msg:='I wonder how you did that. Error in the '+ParsedCompilerOptStringNames[o]+':'; + Msg:=Format(lisIWonderHowYouDidThatErrorInThe, [ + ParsedCompilerOptStringNames[o]]); end; Msg:=Msg+#13+FCompilerOpts.ParsedOpts.ParsedErrorMsg+#13 - +'Value: '+dbgstr(FCompilerOpts.ParsedOpts.UnparsedValues[o]); - IDEMessageDialog('Error',Msg,mtError,[mbCancel]); + +lisValue3+dbgstr(FCompilerOpts.ParsedOpts.UnparsedValues[o]); + IDEMessageDialog(lisCCOErrorCaption, Msg, mtError, [mbCancel]); exit; end; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index f04919419d..82532e21d7 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -1748,6 +1748,28 @@ resourcestring +'on the items tree to get the popupmenu with all available package ' +'functions.'; dlgSearchPaths = 'Paths'; + lisIWonderHowYouDidThatErrorInTheBaseDirectory = 'I wonder how you did ' + +'that: Error in the base directory:'; + lisErrorInTheSearchPathForOtherUnitFiles = 'Error in the search path for "' + +'Other unit files":'; + lisErrorInTheSearchPathForIncludeFiles = 'Error in the search path for "' + +'Include files":'; + lisErrorInTheSearchPathForObjectFiles = 'Error in the search path for "' + +'Object files":'; + lisErrorInTheSearchPathForLibraries = 'Error in the search path for "' + +'Libraries":'; + lisErrorInTheSearchPathForOtherSources = 'Error in the search path for "' + +'Other sources":'; + lisErrorInTheCustomLinkerOptionsLinkingPassOptionsToL = 'Error in the ' + +'custom linker options (Linking / Pass options to linker):'; + lisErrorInTheCustomCompilerOptionsOther = 'Error in the custom compiler ' + +'options (Other):'; + lisErrorInTheUnitOutputDirectory = 'Error in the "unit output directory":'; + lisErrorInTheCompilerFileName = 'Error in the compiler file name:'; + lisErrorInTheDebuggerPathAddition = 'Error in the "Debugger path addition":'; + lisIWonderHowYouDidThatErrorInThe = 'I wonder how you did that. Error in ' + +'the %s:'; + lisValue3 = 'Value: '; dlgCOParsing = 'Parsing'; dlgCodeGeneration = 'Code generation'; dlgCOLinking = 'Linking'; @@ -5145,6 +5167,7 @@ resourcestring lisPEDirectories = 'Directories'; lisSelectAnotherLCLWidgetSetMacroLCLWidgetType = 'Select another LCL widget ' +'set (macro LCLWidgetType)'; + lisCircleInMacros = 'Circle in macros'; implementation