From 3a62f3d2f53c6ed79c2150dfab4b3a64b3320b09 Mon Sep 17 00:00:00 2001 From: maxim Date: Wed, 23 Dec 2015 23:24:27 +0000 Subject: [PATCH] H2Pas: fixed typos, bug #29244 git-svn-id: trunk@51013 - --- components/h2pas/h2pasconvert.pas | 4 +-- components/h2pas/h2passtrconsts.pas | 40 ++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/components/h2pas/h2pasconvert.pas b/components/h2pas/h2pasconvert.pas index f5f3950cd0..d1c07a31a3 100644 --- a/components/h2pas/h2pasconvert.pas +++ b/components/h2pas/h2pasconvert.pas @@ -3780,7 +3780,7 @@ end; class function TPostH2PasTools.ClassDescription: string; begin - Result := Format(h2pPostH2PasASetOfCommonToolsToRunAfterH2pasPhReplace, [#13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13]) + Result := Format(h2pPostH2PasASetOfCommonToolsToRunAfterH2pasPhReplace, [#13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13, #13]) ; end; @@ -4462,7 +4462,7 @@ end; class function TConvertEnumsToTypeDef.ClassDescription: string; begin - Result := h2pGiveAnoymousCEnumsATypedefName; + Result := h2pGiveAnonymousCEnumsATypedefName; end; function TConvertEnumsToTypeDef.Execute(aText: TIDETextConverter diff --git a/components/h2pas/h2passtrconsts.pas b/components/h2pas/h2passtrconsts.pas index 9f7672a909..eff4868a82 100644 --- a/components/h2pas/h2passtrconsts.pas +++ b/components/h2pas/h2passtrconsts.pas @@ -40,7 +40,7 @@ resourcestring h2pAddIncludedHFiles = 'Add included .h files'; h2pMergeAllButThis = 'Merge all but this'; h2pMergeFile = 'Merge file'; - h2pH2pasOptions = 'h2pas Options'; + h2pH2pasOptions = 'H2Pas Options'; h2pOptions = 'Options'; h2pDUseExternalForAllProcedures = '-d Use external; for all procedures'; h2pDUseExternalLibnameNameFunc__nameForFunctions = '-D Use external libname name "func__name" for functions'; @@ -61,19 +61,19 @@ resourcestring h2pOutputExtensionOfNewFile = 'Output extension of new file'; h2pOutputDirectory = 'Output directory'; h2pLLibraryName = '-l Library name'; - h2pBeforeH2pas = 'Before h2pas'; - h2pConversionsBeforeRunningH2pas = 'Conversions before running h2pas'; - h2pAfterH2pas = 'After h2pas'; - h2pConversionsAfterRunningH2pas = 'Conversions after running h2pas'; + h2pBeforeH2pas = 'Before H2Pas'; + h2pConversionsBeforeRunningH2pas = 'Conversions before running H2Pas'; + h2pAfterH2pas = 'After H2Pas'; + h2pConversionsAfterRunningH2pas = 'Conversions after running H2Pas'; h2pSettings = 'Settings'; - h2pH2pasProgramPath = 'h2pas program path'; + h2pH2pasProgramPath = 'H2Pas program path'; h2pOpenLastSettingsOnStart = 'Open last settings on start'; h2pSaveSettingsAs = 'Save settings as ...'; h2pNewClearSettings = 'New/Clear settings'; h2pOpenSettings = '&Open Settings'; h2pSaveSettings = '&Save Settings'; - h2pRunH2pas = 'Run h2pas'; - h2pRunH2pasAndCompile = 'Run h2pas and compile'; + h2pRunH2pas = 'Run H2Pas'; + h2pRunH2pasAndCompile = 'Run H2Pas and compile'; h2pClose = '&Close'; h2pSaveChanges = 'Save changes?'; h2pSaveSettings2 = 'Save settings?'; @@ -84,7 +84,7 @@ resourcestring h2pRemoveAllFiles = 'Remove all files'; h2pAddHFiles2 = 'Add *.h files ...'; h2pAddHFiles3 = 'Add .h files?'; - h2pAddTheseHFilesToH2pasProject = 'Add these .h files to h2pas project?%s%s%s'; + h2pAddTheseHFilesToH2pasProject = 'Add these .h files to H2Pas project?%s%s%s'; h2pDeleteTheseHFilesFromList = 'Delete these .h files from list?%s%s%s'; h2pFile = 'File: %s'; h2pERRORFileNotFound2 = 'ERROR: file not found'; @@ -93,7 +93,7 @@ resourcestring h2pIncludes = 'Includes:'; h2pIncludedBy = 'Included by:'; h2pNoFileSelected = 'No file selected.'; - h2pAddSearchAndReplaceToolBeforeH2pas = 'Add "search and replace" tool before h2pas'; + h2pAddSearchAndReplaceToolBeforeH2pas = 'Add "search and replace" tool before H2Pas'; h2pIncludedBy2 = '%s (included by %s)'; h2pNothingToDo = 'Nothing to do'; h2pPleaseEnableAtLeastOneCHeaderFileThatIsNotMerged = 'Please enable at least one c header file that is not merged.'; @@ -102,13 +102,13 @@ resourcestring h2pReadError = 'Read error'; h2pErrorReadingGlobalConfig = 'Error reading global config:%s%s'; h2pSaveProjectAsH2p = 'Save project as ... (*.h2p)'; - h2pH2pasProjectH2pH2pAllFiles = 'h2pas project (*.h2p)|*.h2p|All files (*.*)|%s'; + h2pH2pasProjectH2pH2pAllFiles = 'H2Pas project (*.h2p)|*.h2p|All files (*.*)|%s'; h2pReplaceFile = 'Replace file?'; h2pTheFileAlreadyExists = 'The file "%s"%salready exists.'; h2pFileNotFound = 'File not found'; h2pFileNotFound2 = 'File not found: "%s"'; h2pErrorReadingProjectFromFile = 'Error reading project from file%s%s%s%s%s'; - h2pFilenameOfH2pasProgram = 'Filename of h2pas program'; + h2pFilenameOfH2pasProgram = 'Filename of H2Pas program'; h2pOpenProjectH2p = 'Open project (*.h2p) ...'; h2pCHeaderFileHHAllFiles = 'C header file (*.h)|*.h|All files (*.*)|%s'; h2pTextConversionToolsEditor = 'Text conversion tools editor'; @@ -128,7 +128,7 @@ resourcestring h2pDoYouReallyWantToDelete = 'Do you really want to delete "%s"?'; h2pDelete = 'Delete'; h2pTH2PasDialogH2pasOptionsCheckGroupItemClickUnknown = 'TH2PasDialog.h2pasOptionsCheckGroupItemClick: Unknown option %s'; - h2pH2pasProject = 'h2pas project'; + h2pH2pasProject = 'H2Pas project'; h2pOverwrite = 'Overwrite'; h2pCancel = 'Cancel'; h2pSelectAClass = '&Select a class'; @@ -139,22 +139,22 @@ resourcestring h2pTAddToUsesSectionExecuteInvalidUnitname = 'TAddToUsesSection.Execute invalid unitname "%s"'; h2pAddUnitsToUsesSection = 'Add units to uses section'; h2pTAddToUsesSectionExecuteFileIsNotPascal = 'TAddToUsesSection.Execute file is not pascal: '; - h2pCommentFunctionsThatAreTooComplexForH2pas = 'Comment functions that are too complex for h2pas'; - h2pCommentMacrosThatAreTooComplexForH2pas = 'Comment macros that are too complex for h2pas'; - h2pGiveAnoymousCEnumsATypedefName = 'Give anoymous c enums a typedef name'; + h2pCommentFunctionsThatAreTooComplexForH2pas = 'Comment functions that are too complex for H2Pas'; + h2pCommentMacrosThatAreTooComplexForH2pas = 'Comment macros that are too complex for H2Pas'; + h2pGiveAnonymousCEnumsATypedefName = 'Give anonymous C enums a typedef name'; h2pAddMissingPointerTypesLikePPPChar = 'Add missing pointer types like PPPChar'; h2pRemoveDoubleSemicolons = 'Remove double semicolons'; h2pFixForwardDefinitionsByReordering = 'Fix forward definitions by reordering'; h2pConvertFunctionTypesToPointers = 'Convert function types to pointers'; h2pRemoveAllIncludeDirectives = 'Remove all include directives'; h2pTPostH2PasToolsExecuteAddToUsesSectionInvalidUnitn = 'TPostH2PasTools.Execute.AddToUsesSection invalid unitname "%s"'; - h2pPostH2PasASetOfCommonToolsToRunAfterH2pasPhReplace = 'Post H2Pas - a set of common tools to run after h2pas%sphReplaceUnitFilenameWithUnitName - Replace "unit filename;" with "unit name;"%sphRemoveIncludeDirectives - Remove include directivesphRemoveSystemTypes - Remove type redefinitons like PLongint%sphFixH2PasMissingIFDEFsInUnit - add missing IFDEFs for function bodies%sphReduceCompilerDirectivesInUnit - removes unneeded directives%sphRemoveRedefinedPointerTypes - Remove redefined pointer types%sphRemoveEmptyTypeVarConstSections - Remove empty type/var/const sections%sphReplaceImplicitTypes - Search implicit types in parameters and add types for them%sphFixArrayOfParameterType - Replace "array of )" with "array of const)"%sphRemoveRedefinitionsInUnit - Removes redefinitions of types, variables, constants and resourcestrings%sphFixAliasDefinitionsInUnit - fix section type of alias definitions%sphReplaceConstFunctionsInUnit - replace simple assignment functions with constants%' - +'sphReplaceTypeCastFunctionsInUnit - replace simple type cast functions with types%sphFixForwardDefinitions - fix forward definitions by reordering%sphAddUnitsToUsesSection - add units to uses section%s'; - h2pPreH2PasASetOfCommonToolsToRunBeforeH2pasPhRemoveC = 'Pre H2Pas - a set of common tools to run before h2pas%sphRemoveCPlusPlusExternCTool - Remove C++ ''extern "C"'' lines%sphRemoveEmptyCMacrosTool - Remove empty C macros%sphReplaceEdgedBracketPairWithStar - Replace [] with *%sphReplace0PointerWithNULL - Replace macro values 0 pointer like (char *)0%sphConvertFunctionTypesToPointers - Convert function types to pointers%sphConvertEnumsToTypeDef - Convert anonymous enums to typedef enums%sphCommentComplexCMacros - Comment macros too complex for h2pas%sphCommentComplexCFunctions - Comment functions too complex for h2pas%s'; + h2pPostH2PasASetOfCommonToolsToRunAfterH2pasPhReplace = 'Post H2Pas - a set of common tools to run after H2Pas%sphReplaceUnitFilenameWithUnitName - Replace "unit filename;" with "unit name;"%sphRemoveIncludeDirectives - Remove include directives%sphRemoveSystemTypes - Remove type redefinitons like PLongint%sphFixH2PasMissingIFDEFsInUnit - Add missing IFDEFs for function bodies%sphReduceCompilerDirectivesInUnit - Removes unneeded directives%sphRemoveRedefinedPointerTypes - Remove redefined pointer types%sphRemoveEmptyTypeVarConstSections - Remove empty type/var/const sections%sphReplaceImplicitTypes - Search implicit types in parameters and add types for them%sphFixArrayOfParameterType - Replace "array of )" with "array of const)"%sphRemoveRedefinitionsInUnit - Removes redefinitions of types, variables, constants and resourcestrings%sphFixAliasDefinitionsInUnit - Fix section type of alias definitions%sphReplaceConstFunctionsInUnit - Replace simple assignment functions with constants%' + +'sphReplaceTypeCastFunctionsInUnit - Replace simple type cast functions with types%sphFixForwardDefinitions - Fix forward definitions by reordering%sphAddUnitsToUsesSection - Add units to uses section%s'; + h2pPreH2PasASetOfCommonToolsToRunBeforeH2pasPhRemoveC = 'Pre H2Pas - a set of common tools to run before H2Pas%sphRemoveCPlusPlusExternCTool - Remove C++ ''extern "C"'' lines%sphRemoveEmptyCMacrosTool - Remove empty C macros%sphReplaceEdgedBracketPairWithStar - Replace [] with *%sphReplace0PointerWithNULL - Replace macro values 0 pointer like (char *)0%sphConvertFunctionTypesToPointers - Convert function types to pointers%sphConvertEnumsToTypeDef - Convert anonymous enums to typedef enums%sphCommentComplexCMacros - Comment macros too complex for H2Pas%sphCommentComplexCFunctions - Comment functions too complex for H2Pas%s'; h2pReplaceSimpleFunctionsWithTypeCasts = 'Replace simple functions with type casts'; h2pReplaceSimpleFunctionsWithConstants = 'Replace simple functions with constants'; h2pReduceCompilerDirectivesInPascalFileShortensExpres = 'Reduce compiler directives in pascal file%sShortens expressions in $IF directives%sand removes unneeded $IFDEF and $DEFINE directives.'; - h2pAddMissingH2pasIFDEFsForFunctionBodies = 'Add missing h2pas IFDEFs for function bodies'; + h2pAddMissingH2pasIFDEFsForFunctionBodies = 'Add missing H2Pas IFDEFs for function bodies'; h2pFixesSectionTypeOfAliasDefinitionsInPascalUnitChec = 'Fixes section type of alias definitions in pascal unit%sChecks all alias definitions of the form%sconst LeftSide = RightSide;%slooks up RightSide in the unit and if RightSide is a type or var, changes the section accordingly'; h2pRemoveRedefinitionsInPascalUnit = 'Remove redefinitions in pascal unit'; h2pFixOpenArraysReplaceArrayOfWithArrayOfConst = 'Fix open arrays%sReplace "array of )" with "array of const)"';