diff --git a/components/synedit/syneditstrconst.pp b/components/synedit/syneditstrconst.pp index 78a1a39709..7afb5c7454 100644 --- a/components/synedit/syneditstrconst.pp +++ b/components/synedit/syneditstrconst.pp @@ -104,8 +104,8 @@ resourcestring SYNS_AttrMiscellaneous = 'Miscellaneous'; SYNS_AttrNamespaceAttrName = 'Namespace Attribute Name'; SYNS_AttrNamespaceAttrValue = 'Namespace Attribute Value'; - SYNS_AttrNamespaceIdentDef = 'Namespace Ident Definition'; - SYNS_AttrNamespaceIdentPrefix = 'Namespace Ident Prefix'; + SYNS_AttrNamespaceIdentDef = 'Namespace Identifier Definition'; + SYNS_AttrNamespaceIdentPrefix = 'Namespace Identifier Prefix'; SYNS_AttrNamespaceColon = 'Namespace Colon'; SYNS_AttrNonReservedKeyword = 'Non-reserved keyword'; SYNS_AttrNull = 'Null'; diff --git a/components/synedit/synhighlighterxml.pas b/components/synedit/synhighlighterxml.pas index fe8ed85337..bd3b48bbe9 100644 --- a/components/synedit/synhighlighterxml.pas +++ b/components/synedit/synhighlighterxml.pas @@ -74,7 +74,7 @@ type ); TtkTokenDecorator = (tdNone, - tdNameSpacePrefix, tdNameSpaceColon, tdNameSpaceDefintion, + tdNameSpacePrefix, tdNameSpaceColon, tdNameSpaceDefinition, tdNameSpaceNoneStart, tdNameSpaceNoneEnd // no decoratar / used for merge-bounds ); @@ -755,7 +755,7 @@ begin while (fLine[Run] in NameChars) do Inc(Run); if (rfNameSpace in fRangeFlags) then begin fTokenID := tknsAttribute; - fTokenDecorator := tdNameSpaceDefintion; + fTokenDecorator := tdNameSpaceDefinition; end else begin fTokenID := tkAttribute; @@ -1032,7 +1032,7 @@ var tdNameSpacePrefix, tdNameSpaceNoneStart: begin b := fLineLen + 1; end; tdNameSpaceColon: begin a := 1; b := fLineLen + 1; end; - tdNameSpaceDefintion, + tdNameSpaceDefinition, tdNameSpaceNoneEnd: begin a := 1; end; end; Result.SetFrameBoundsLog(a, b); @@ -1070,7 +1070,7 @@ begin fNamespaceColonAttri.SetFrameBoundsLog(x1, x2); fProcessingInstructionAttriResult.Merge(fNamespaceColonAttri, LeftCol, RightCol); end; - tdNameSpaceDefintion: begin + tdNameSpaceDefinition: begin InitMergeRes; fNamespaceDefinitionAttri.SetFrameBoundsLog(x1, x2); fProcessingInstructionAttriResult.Merge(fNamespaceDefinitionAttri, LeftCol, RightCol);