From 869d24f7d1d72967b8712f0e231febd3cdb74a08 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 2 Jun 2016 20:01:09 +0000 Subject: [PATCH] * spelling mistakes fpc repo part, mantis #30233 git-svn-id: trunk@33882 - --- ide/fp.pas | 2 +- ide/fphelp.pas | 4 ++-- ide/wconstse.inc | 2 +- packages/cdrom/src/fpcddb.pp | 2 +- packages/fcl-db/src/base/dbconst.pas | 2 +- packages/fcl-db/src/sqlite/sqliteds.pas | 2 +- packages/fcl-net/src/httpsvlt.pp | 2 +- packages/fcl-sdo/src/base/sdo_consts.pas | 2 +- packages/fcl-sdo/src/base/sdo_xpath_helper.pas | 2 +- packages/fcl-xml/src/xmltextreader.pp | 2 +- packages/fcl-xml/tests/testgen.pp | 2 +- packages/fv/src/editors.pas | 2 +- packages/fv/src/strtxt.inc | 2 +- rtl/macos/system.pp | 2 +- rtl/objpas/sysconst.pp | 2 +- utils/delp.pp | 2 +- utils/fpdoc/dglobals.pp | 2 +- utils/fpdoc/dwriter.pp | 2 +- utils/fpdoc/fpclasschart.pp | 2 +- utils/fpdoc/makeskel.pp | 2 +- utils/fpdoc/unitdiff.pp | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ide/fp.pas b/ide/fp.pas index e3889c7df8..36bc227b4e 100644 --- a/ide/fp.pas +++ b/ide/fp.pas @@ -525,7 +525,7 @@ BEGIN end; if ideapp.displaymode=dmUser then begin - writeln('Fatal exception occured while in user screen mode. File save message boxes'); + writeln('Fatal exception occurred while in user screen mode. File save message boxes'); writeln('cannot be displayed. We are sorry, but need to terminate now.'); halt(255); end; diff --git a/ide/fphelp.pas b/ide/fphelp.pas index 3315790e29..f5bc312150 100644 --- a/ide/fphelp.pas +++ b/ide/fphelp.pas @@ -96,7 +96,7 @@ const hint_systemmenu = 'System menu'; hint_update = 'Refresh and redraw display'; hint_about = 'Show version and copyright information'; - hint_filemenu = 'File managment commands (Open, New, Save, etc.)'; + hint_filemenu = 'File management commands (Open, New, Save, etc.)'; hint_filenew = 'Create a new file in a new edit window'; hint_filenewfromtemplate='Create a new file using a code template'; hint_fileopen = 'Locate and open a file in an edit window'; @@ -204,7 +204,7 @@ const hint_openini = 'Load a previously saved options file'; hint_saveini = 'Save all the changes made in the options menu'; hint_saveasini = 'Save all the changes made under a different name'; - hint_windowmenu = 'Windows managment commands'; + hint_windowmenu = 'Windows management commands'; hint_tile = 'Arrange windows on desktop by tiling'; hint_cascade = 'Arrange windows on desktop by cascading'; hint_closeall = 'Close all windows on the desktop'; diff --git a/ide/wconstse.inc b/ide/wconstse.inc index 81ec61df67..e67fa85ed4 100644 --- a/ide/wconstse.inc +++ b/ide/wconstse.inc @@ -90,7 +90,7 @@ label_name = '~N~ame'; msg_searchstringnotfound = 'Search string not found.'; - msg_replacethisoccourence = 'Replace this occurence?'; + msg_replacethisoccourence = 'Replace this occurrence?'; msg_fileexistsoverwrite = 'File %s already exists. Overwrite?'; msg_readingwinclipboard = 'Reading windows clipboard'; msg_copyingwinclipboard = 'Copying to windows clipboard'; diff --git a/packages/cdrom/src/fpcddb.pp b/packages/cdrom/src/fpcddb.pp index 2ab085beb9..2da43fa2d5 100644 --- a/packages/cdrom/src/fpcddb.pp +++ b/packages/cdrom/src/fpcddb.pp @@ -184,7 +184,7 @@ implementation Resourcestring SErrNoDisk = 'No disk active'; SErrInvalidTrackNo = 'Invalid track number: %d'; - SErrParsingLine = 'An error occured while parsing line %d of the response: %s'; + SErrParsingLine = 'An error occurred while parsing line %d of the response: %s'; SErrCDDBResponse = 'CDDB error in command response: %s'; function DiscIDToStr(ID: Integer): String; diff --git a/packages/fcl-db/src/base/dbconst.pas b/packages/fcl-db/src/base/dbconst.pas index 7a575c651e..fdf0376a63 100644 --- a/packages/fcl-db/src/base/dbconst.pas +++ b/packages/fcl-db/src/base/dbconst.pas @@ -87,7 +87,7 @@ Resourcestring SInvalidSearchFieldType = 'Searching in fields of type %s is not supported'; SDatasetEmpty = 'The dataset is empty'; SFieldIsNull = 'The field is null'; - SOnUpdateError = 'An error occured while applying the updates in a record: %s'; + SOnUpdateError = 'An error occurred while applying the updates in a record: %s'; SApplyRecNotSupported = 'Applying updates is not supported by this TDataset descendent'; SNoWhereFields = 'No %s query specified and failed to generate one. (No fields for inclusion in where statement found)'; SNoUpdateFields = 'No %s query specified and failed to generate one. (No fields found for insert- or update-statement found)'; diff --git a/packages/fcl-db/src/sqlite/sqliteds.pas b/packages/fcl-db/src/sqlite/sqliteds.pas index 2330eb0fb1..af82880c31 100644 --- a/packages/fcl-db/src/sqlite/sqliteds.pas +++ b/packages/fcl-db/src/sqlite/sqliteds.pas @@ -325,7 +325,7 @@ begin Exit; end; else - Result := 'Unknow Return Value'; + Result := 'Unknown Return Value'; end; Result := Result + ' - ' + sqlite_error_string(FReturnCode); end; diff --git a/packages/fcl-net/src/httpsvlt.pp b/packages/fcl-net/src/httpsvlt.pp index 24364711c3..84db07745b 100644 --- a/packages/fcl-net/src/httpsvlt.pp +++ b/packages/fcl-net/src/httpsvlt.pp @@ -478,7 +478,7 @@ begin except on e: Exception do begin - s := 'An error occured: ' + ' ' + e.Message; + s := 'An error occurred: ' + ' ' + e.Message; ResponseHeader.ContentType := 'text/plain'; ResponseStream.Write(s[1], Length(s)); end; diff --git a/packages/fcl-sdo/src/base/sdo_consts.pas b/packages/fcl-sdo/src/base/sdo_consts.pas index 506f71d00b..5ad96d27a3 100644 --- a/packages/fcl-sdo/src/base/sdo_consts.pas +++ b/packages/fcl-sdo/src/base/sdo_consts.pas @@ -117,7 +117,7 @@ resourcestring SERR_OperationNotAllowedOnActivePool = 'Operation not allowed on an active pool.'; SERR_ParamaterNotFound = 'Parameter non found : "%s".'; SERR_Parsing = 'Parsing "%s" ...'; - SERR_RecordExtendedRttiNotFound = 'Record extended RTTI informations not found in type registry : "%s".'; + SERR_RecordExtendedRttiNotFound = 'Record extended RTTI information not found in type registry : "%s".'; SERR_RootObjectCannotBeNIL = 'The root object cannot be NIL.'; SERR_SchemaNodeRequiredAttribute = 'The Schema node must have at least the "%s" attribute.'; SERR_SerializerInitializationException = 'Unable to initialize the serializer of that type : "%s".'; diff --git a/packages/fcl-sdo/src/base/sdo_xpath_helper.pas b/packages/fcl-sdo/src/base/sdo_xpath_helper.pas index e0b91be787..5608553620 100644 --- a/packages/fcl-sdo/src/base/sdo_xpath_helper.pas +++ b/packages/fcl-sdo/src/base/sdo_xpath_helper.pas @@ -1085,7 +1085,7 @@ var locTmpNode := FTermStack.Pop() as TXPathNode; if not locTmpNode.InheritsFrom(TXPathRigthSquareBraketNode) then begin FTermStack.Push(locTmpNode); - raise EXpathException.Create('Predicate begining expected.'); + raise EXpathException.Create('Predicate beginning expected.'); end; FreeAndNil(locTmpNode); locExp := FTermStack.Pop() as TXPathNode; diff --git a/packages/fcl-xml/src/xmltextreader.pp b/packages/fcl-xml/src/xmltextreader.pp index 5084e9c76a..cb41afc98d 100644 --- a/packages/fcl-xml/src/xmltextreader.pp +++ b/packages/fcl-xml/src/xmltextreader.pp @@ -2211,7 +2211,7 @@ begin SkipWhitespace; CheckName([cnToken]); if not AttDef.AddEnumToken(FName.Buffer, FName.Length) then - ValidationError('Duplicate token in enumerated attibute declaration', [], FName.Length); + ValidationError('Duplicate token in enumerated attribute declaration', [], FName.Length); SkipWhitespace; until not CheckForChar('|'); ExpectChar(')'); diff --git a/packages/fcl-xml/tests/testgen.pp b/packages/fcl-xml/tests/testgen.pp index 3a6bfcc10f..c0420351e7 100644 --- a/packages/fcl-xml/tests/testgen.pp +++ b/packages/fcl-xml/tests/testgen.pp @@ -932,7 +932,7 @@ begin try ConvertTest(root, sl); except - Writeln('An exception occured while converting ', casename); + Writeln('An exception occurred while converting ', casename); raise; end; if sl.Count > 0 then diff --git a/packages/fv/src/editors.pas b/packages/fv/src/editors.pas index 4503b8359c..11ca11b2bc 100644 --- a/packages/fv/src/editors.pas +++ b/packages/fv/src/editors.pas @@ -428,7 +428,7 @@ resourcestring sClipboard='Clipboard'; sReformatNotPossible='Paragraph reformat not possible while trying to wrap current line with current margins.'; sReformattingTheDocument='Reformatting the document:'; sReplaceNotPossible='Wordwrap on: Replace not possible in current margins when at end of line.'; - sReplaceThisOccurence='Replace this occurence?'; + sReplaceThisOccurence='Replace this occurrence?'; sRightMargin='Right Margin'; sSearchStringNotFound='Search string not found.'; sSelectWhereToBegin='Please select where to begin.'; diff --git a/packages/fv/src/strtxt.inc b/packages/fv/src/strtxt.inc index 361b1b98b7..cb2164f938 100644 --- a/packages/fv/src/strtxt.inc +++ b/packages/fv/src/strtxt.inc @@ -75,7 +75,7 @@ const standard_string_count=107; (nr:sReplace;text:'Replace'), (nr:sReplaceFile;text:'Replace file?'#13#10#13#3'%s'), (nr:sReplaceNotPossible;text:'Wordwrap on: Replace not possible in current margins when at end of line.'), - (nr:sReplaceThisOccurence;text:'Replace this occurence?'), + (nr:sReplaceThisOccurence;text:'Replace this occurrence?'), (nr:sRightMargin;text:'Right Margin'), (nr:sSaveAs;text:'Save As'), (nr:sScrollbarIcons;text:'Scroll bar icons'), diff --git a/rtl/macos/system.pp b/rtl/macos/system.pp index 54d2b00f7e..72e0b2a43c 100644 --- a/rtl/macos/system.pp +++ b/rtl/macos/system.pp @@ -450,7 +450,7 @@ begin if IsConsole then Writeln( '### Program exited with exit code ' + s) else if macosHasSysDebugger then - DebugStr('A possible error occured, exit code: ' + s + '. Type "g" and return to continue.') + DebugStr('A possible error occurred, exit code: ' + s + '. Type "g" and return to continue.') else {Be quiet} end; diff --git a/rtl/objpas/sysconst.pp b/rtl/objpas/sysconst.pp index 7f0ed5fcbc..e32966d96b 100644 --- a/rtl/objpas/sysconst.pp +++ b/rtl/objpas/sysconst.pp @@ -129,7 +129,7 @@ const SVarUnexpected = 'Unexpected variant error'; SZeroDivide = 'Floating point division by zero'; - SFallbackError = 'An error, whose error code is larger than can be returned to the OS, has occured'; + SFallbackError = 'An error, whose error code is larger than can be returned to the OS, has occurred'; SNoToolserver = 'Toolserver is not installed, cannot execute Tool'; diff --git a/utils/delp.pp b/utils/delp.pp index 4f893443b9..9664b4bb0e 100644 --- a/utils/delp.pp +++ b/utils/delp.pp @@ -167,7 +167,7 @@ begin writeln(' -r Recurse into directories.'); writeln(' -n Do not actually delete files.'); writeln(' -m N Maximum depth to recurse into directories (1 based, zero is no max).'); - writeln(' -q Quietly perfoms deleting.'); + writeln(' -q Quietly performs deleting.'); writeln(' -v Verbose (print names of deleted files).'); Halt(1); end; diff --git a/utils/fpdoc/dglobals.pp b/utils/fpdoc/dglobals.pp index a335e93fb8..01a8b82698 100644 --- a/utils/fpdoc/dglobals.pp +++ b/utils/fpdoc/dglobals.pp @@ -163,7 +163,7 @@ resourcestring SUsageOption140 = '--lang=lng Select output language.'; SUsageOption150 = '--ostarget=value Set the target OS for the scanner.'; SUsageOption160 = '--output=name use name as the output name.'; - SUsageOption170 = ' Each backend interpretes this as needed.'; + SUsageOption170 = ' Each backend interprets this as needed.'; SUsageOption180 = '--package=name Set the package name for which to create output,'; SUsageOption190 = ' e.g. --package=fcl'; SUsageOption200 = '--project=file Use file as project file'; diff --git a/utils/fpdoc/dwriter.pp b/utils/fpdoc/dwriter.pp index f0fe1de813..02de0304d6 100644 --- a/utils/fpdoc/dwriter.pp +++ b/utils/fpdoc/dwriter.pp @@ -28,7 +28,7 @@ interface uses Classes, DOM, dGlobals, PasTree, SysUtils; resourcestring - SErrFileWriting = 'An error occured during writing of file "%s": %s'; + SErrFileWriting = 'An error occurred during writing of file "%s": %s'; SErrInvalidShortDescr = 'Invalid short description'; SErrInvalidDescr = 'Invalid description (illegal XML element: "%s")'; diff --git a/utils/fpdoc/fpclasschart.pp b/utils/fpdoc/fpclasschart.pp index 0bc3a585c9..b70ebb4d37 100644 --- a/utils/fpdoc/fpclasschart.pp +++ b/utils/fpdoc/fpclasschart.pp @@ -712,7 +712,7 @@ begin if FileExists(MOFilename) then gettext.TranslateResourceStrings(MoFileName) else - writeln('NOTE: unable to find tranlation file ',MOFilename); + writeln('NOTE: unable to find translation file ',MOFilename); // Translate internal documentation strings TranslateDocStrings(DocLang); end; diff --git a/utils/fpdoc/makeskel.pp b/utils/fpdoc/makeskel.pp index d68e792115..3c5a9b7abe 100644 --- a/utils/fpdoc/makeskel.pp +++ b/utils/fpdoc/makeskel.pp @@ -588,7 +588,7 @@ begin if FileExists(MOFilename) then gettext.TranslateResourceStrings(MoFileName) else - writeln('NOTE: unable to find tranlation file ',MOFilename); + writeln('NOTE: unable to find translation file ',MOFilename); // Translate internal documentation strings TranslateDocStrings(DocLang); end; diff --git a/utils/fpdoc/unitdiff.pp b/utils/fpdoc/unitdiff.pp index da638f32be..a7259cb472 100644 --- a/utils/fpdoc/unitdiff.pp +++ b/utils/fpdoc/unitdiff.pp @@ -189,7 +189,7 @@ begin if FileExists(MOFilename) then gettext.TranslateResourceStrings(MoFileName) else - writeln('NOTE: unable to find tranlation file ',MOFilename); + writeln('NOTE: unable to find translation file ',MOFilename); // Translate internal documentation strings TranslateDocStrings(DocLang); end;