IDE: resourcestrings

git-svn-id: trunk@41327 -
This commit is contained in:
mattias 2013-05-20 14:51:14 +00:00
parent 283f8dfbbf
commit e06d6d07ee
3 changed files with 8 additions and 5 deletions

View File

@ -303,7 +303,7 @@ end;
function TargetsPrefix: string; function TargetsPrefix: string;
begin begin
Result:='Targets: '; Result:=lisMMTargets;
end; end;
function AddMatrixTarget(Matrix: TGroupedMatrix; StorageGroup: TGroupedMatrixGroup function AddMatrixTarget(Matrix: TGroupedMatrix; StorageGroup: TGroupedMatrixGroup
@ -326,7 +326,7 @@ var
begin begin
Result:=CheckBuildMatrixTargetsSyntax(Targets); Result:=CheckBuildMatrixTargetsSyntax(Targets);
if Result<>'' then begin if Result<>'' then begin
Result:='Warning: '+Result; Result:=lisWarning+Result;
exit; exit;
end; end;
p:=1; p:=1;
@ -499,7 +499,7 @@ begin
SplitMatrixMacro(ValueRow.Value,MacroName,MacroValue,true); SplitMatrixMacro(ValueRow.Value,MacroName,MacroValue,true);
except except
on E: EMMMacroSyntaxException do begin on E: EMMMacroSyntaxException do begin
h:='Error: '+E.Message; h:=lisError+E.Message;
end; end;
end; end;
end; end;

View File

@ -5688,6 +5688,7 @@ resourcestring
lisMMExpectedAfterMacroNameButFound = 'expected ":=" after macro name, but ' lisMMExpectedAfterMacroNameButFound = 'expected ":=" after macro name, but '
+'found "%s"'; +'found "%s"';
lisMMApplyToAllPackages = 'Apply to all packages.'; lisMMApplyToAllPackages = 'Apply to all packages.';
lisMMTargets = 'Targets: ';
lisMMApplyToAllPackagesAndProjects = 'Apply to all packages and projects.'; lisMMApplyToAllPackagesAndProjects = 'Apply to all packages and projects.';
lisMMApplyToProject = 'Apply to project.'; lisMMApplyToProject = 'Apply to project.';
lisMMApplyToAllPackagesMatching = 'Apply to all packages matching name "%s"'; lisMMApplyToAllPackagesMatching = 'Apply to all packages matching name "%s"';
@ -5708,6 +5709,7 @@ resourcestring
lisMMDeleteTheSelectedTargetOrOption = 'Delete the selected target or option'; lisMMDeleteTheSelectedTargetOrOption = 'Delete the selected target or option';
lisMMSetS = 'Set "%s"'; lisMMSetS = 'Set "%s"';
lisMMValueS = 'Value "%s"'; lisMMValueS = 'Value "%s"';
lisMMInvalidCharacterAt = 'invalid character "%s" at %s';
implementation implementation

View File

@ -27,7 +27,7 @@ interface
uses uses
Classes, SysUtils, contnrs, LazConfigStorage, Laz2_XMLCfg, LazLogger, Classes, SysUtils, contnrs, LazConfigStorage, Laz2_XMLCfg, LazLogger,
FileProcs, KeywordFuncLists; FileProcs, KeywordFuncLists, LazarusIDEStrConsts;
const const
BuildMatrixProjectName = '#project'; BuildMatrixProjectName = '#project';
@ -247,7 +247,8 @@ var
procedure WarnInvalidChar; procedure WarnInvalidChar;
begin begin
Result:='invalid character "'+dbgstr(p^)+'" at '+IntToStr(p-PChar(Targets)+1); Result:=Format(lisMMInvalidCharacterAt, [dbgstr(p^), IntToStr(p-PChar(
Targets)+1)]);
end; end;
begin begin