浏览代码

* patch by Don Siders: Fixes spelling, grammar errors in source and compiler messages, resolves #39434

florian 3 年之前
父节点
当前提交
03ce23246f

+ 1 - 1
compiler/msg/errorct.msg

@@ -1510,7 +1510,7 @@ asmr_d_finish_reading=07001_DL_S'ha finalitzat l'analizaci
 asmr_e_none_label_contain_at=07002_E_Un patró que no és una etiqueta conté @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_S'ha produït un error mentre es muntava el desplaçament del registre
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_S'està utilitzant OFFSET sense identificador

+ 1 - 1
compiler/msg/errorda.msg

@@ -2555,7 +2555,7 @@ asmr_d_finish_reading=07001_DL_Afslutter assembler-parsing ($1)
 asmr_e_none_label_contain_at=07002_E_Ikke-label navn indeholder @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Fejl under opbygning af struktur-offset
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET brugt uden navn

+ 1 - 1
compiler/msg/errores.msg

@@ -2502,7 +2502,7 @@ asmr_d_finish_reading=07001_DL_Finalizado interpretado de ensamblador de estilo
 asmr_e_none_label_contain_at=07002_E_Una patrón que no es una etiqueta contiene @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Error construyendo desplazamiento de registro (record)
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET usado sin identificador

+ 1 - 1
compiler/msg/errorf.msg

@@ -1334,7 +1334,7 @@ asmr_e_none_label_contain_at=07002_E_Non-label pattern contains @
 asmr_w_override_op_not_supported=07003_W_Override operator not supported
 % The Override operator is not supported
 asmr_e_building_record_offset=07004_E_Error building record offset
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET used without identifier

+ 1 - 1
compiler/msg/errorfi.msg

@@ -2517,7 +2517,7 @@ asmr_d_finish_reading=07001_DL_Analyse assembleur de style $1 termin
 asmr_e_none_label_contain_at=07002_E_Un identificateur qui n'est pas un label contient @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Erreur de construction de l'offset du record
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET utilisé sans identificateur

+ 1 - 1
compiler/msg/errorhe.msg

@@ -1730,7 +1730,7 @@ asmr_d_finish_reading=07001_DL_
 asmr_e_none_label_contain_at=07002_E_úáðéú ììà úååéú îëéìä àú äúå @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_ùâéàä ááðééú äéñè äøùåîä
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_ðòùä ùéîåù áOFFSET ììà îæää

+ 1 - 1
compiler/msg/errorheu.msg

@@ -2508,7 +2508,7 @@ asmr_d_finish_reading=07001_DL_הסתיים ניתוח סגנון אסמבלר $
 asmr_e_none_label_contain_at=07002_E_תבנית ללא תווית מכילה את התו @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_שגיאה בבניית היסט הרשומה
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_נעשה שימוש בOFFSET ללא מזהה

+ 1 - 1
compiler/msg/erroriu.msg

@@ -1870,7 +1870,7 @@ asmr_d_finish_reading=07001_DL_Fine analisi assembler stile $1
 asmr_e_none_label_contain_at=07002_E_Il pattern contiene @ ma non è una label
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Errore nella costruzione dell'offset di un record
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_usato OFFSET senza identificatore

+ 1 - 1
compiler/msg/errorn.msg

@@ -2511,7 +2511,7 @@ asmr_d_finish_reading=07001_DL_Gedaan met verwerken van $1 assembler
 asmr_e_none_label_contain_at=07002_E_Symbool dat geen label is bevat "@"
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Fout bij berekenen offset in record
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET gebruikt zonder symbool

+ 1 - 1
compiler/msg/errorpl.msg

@@ -1519,7 +1519,7 @@ asmr_d_finish_reading=07001_DL_Zako
 asmr_e_none_label_contain_at=07002_E_½aden identyfikator (poza etykietami) nie mo¾e zawiera† @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Bˆ¥d tworzenia offsetu rekordu
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET u¾yty bez identyfikatora

+ 1 - 1
compiler/msg/errorpli.msg

@@ -1519,7 +1519,7 @@ asmr_d_finish_reading=07001_DL_Zako
 asmr_e_none_label_contain_at=07002_E_¯aden identyfikator (poza etykietami) nie mo¿e zawieraæ @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_B³±d tworzenia offsetu rekordu
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET u¿yty bez identyfikatora

+ 1 - 1
compiler/msg/errorpt.msg

@@ -2212,7 +2212,7 @@ asmr_d_finish_reading=07001_DL_Finalizada $1 an
 asmr_e_none_label_contain_at=07002_E_PadrÆo nÆo-r¢tulo contˆm @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Erro construindo deslocamento registro
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_'OFFSET' usado sem identificador

+ 1 - 1
compiler/msg/errorptu.msg

@@ -2515,7 +2515,7 @@ asmr_d_finish_reading=07001_DL_Finalizada $1 análise estilo assembler
 asmr_e_none_label_contain_at=07002_E_Padrão não-rótulo contêm @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Erro construindo deslocamento registro
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_'OFFSET' usado sem identificador

+ 1 - 1
compiler/msg/errorues.msg

@@ -2496,7 +2496,7 @@ asmr_d_finish_reading=07001_DL_Finalizado interpretado de ensamblador de estilo
 asmr_e_none_label_contain_at=07002_E_Una patrón que no es una etiqueta contiene @
 % A identifier which isn't a label can't contain a @.
 asmr_e_building_record_offset=07004_E_Error construyendo desplazamiento de registro (record)
-% There has an error occured while building the offset of a record/object
+% An error occurred while building the offset of a record/object
 % structure, this can happend when there is no field specified at all or
 % an unknown field identifier is used.
 asmr_e_offset_without_identifier=07005_E_OFFSET usado sin identificador

+ 1 - 1
packages/fcl-web/src/base/fphttpserver.pp

@@ -98,7 +98,7 @@ Type
     procedure DoHandleRequest; virtual;
     // Read request headers
     Function ReadRequestHeaders : TFPHTTPConnectionRequest;
-    // Check if we have keep-alive and no errors occured
+    // Check if we have keep-alive and no errors occurred
     Function AllowNewRequest : Boolean;
     // Check if there is a new request pending, i.e. there is data.
     Function RequestPending : Boolean;

+ 1 - 1
packages/ptc/src/win32/directx/p_dinput.pp

@@ -3142,7 +3142,7 @@ const
   DIERR_NOINTERFACE               = E_NOINTERFACE;
 
 (*
- * An undetermined error occured inside the DInput subsystem
+ * An undetermined error occurred inside the DInput subsystem
  *)
   DIERR_GENERIC                   = E_FAIL;
 

+ 2 - 2
packages/tcl/tests/tcl_demo.pp

@@ -49,7 +49,7 @@ begin
           Tcl_AppendResult(interp, ['bad # arg: ', ArgvItem(argv,0), ' num1 num2 [..numN]', nil]);
           {* Under Win32 calling of this function can cause crash *}
 
-          Test_max:=TCL_ERROR;         {* Error was occured *}
+          Test_max:=TCL_ERROR;         {* Error has occurred *}
           exit;                        {* Leave *}
      end;
 
@@ -61,7 +61,7 @@ begin
           if (not is_num(arg)) then    {* Is right number? *}
           begin
                Tcl_AppendResult(interp,[' "', arg, '" is not a valid integer value']);
-               Test_max:=TCL_ERROR;    {* Error was occured *}
+               Test_max:=TCL_ERROR;    {* Error has occurred *}
                exit;                   {* leave *}
           end;
           Value:=StrToInt(arg);        {* Convert PChar->Integer *}

+ 1 - 1
packages/univint/src/ATSUnicodeDrawing.pas

@@ -1534,7 +1534,7 @@ function ATSUOffsetToPosition( iTextLayout: ATSUTextLayout; iOffset: UniCharArra
  *  Parameters:
  *    
  *    iTextLayout:
- *      The layout in which the mouse down event occured.
+ *      The layout in which the mouse down event occurred.
  *    
  *    iLocationX:
  *      The x-coordinate of the event, in local coordinates, relative

+ 2 - 2
packages/univint/src/CFNetDiagnostics.pas

@@ -242,12 +242,12 @@ type
 	CFNetDiagnosticStatusValues = SInt32;
 const
 {
-   * There is no status, but no error has occured
+   * There is no status, but no error has occurred
    }
 	kCFNetDiagnosticNoErr = 0;
 
   {
-   * An error occured that prevented the call from completing
+   * An error occurred that prevented the call from completing
    }
 	kCFNetDiagnosticErr = -66560;
 

+ 1 - 1
packages/univint/src/CFNetServices.pas

@@ -295,7 +295,7 @@ type
 	CFNetServicesError = SInt32;
 const
 {
-   * An error of unknown type has occured.
+   * An error of unknown type has occurred.
    }
 	kCFNetServicesErrorUnknown = -72000;
 

+ 2 - 2
packages/univint/src/CFURL.pas

@@ -1254,7 +1254,7 @@ type
 	@param relativeToURL If non-NULL, the created bookmark will be relative to the given url.  If kCFURLBookmarkCreationWithSecurityScope is given as
                 an option and relativeToURL is non-NULL, then a collection-scoped bookmark is created which enables future access to url provided the caller has
                 access to relativeURL.
-	@param error	If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occured during creation of the bookmark data
+	@param error	If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occurred during creation of the bookmark data
 	@result	A CFDataRef containing an data, which can be later be passed to CFURLCreateByResolvingBookmarkData() or to CFURLCopyPropertiesForKeysFromBookmarkData() / CFURLCopyPropertyForKeyFromBookmarkData() }
 function CFURLCreateBookmarkData( allocator: CFAllocatorRef; url: CFURLRef; options: CFURLBookmarkCreationOptions; resourcePropertiesToInclude: CFArrayRef; relativeToURL: CFURLRef; error: CFErrorRefPtr ): CFDataRef; external name '_CFURLCreateBookmarkData';
 (* CF_AVAILABLE_STARTING(10_6, 4_0) *)
@@ -1278,7 +1278,7 @@ function CFURLCreateBookmarkData( allocator: CFAllocatorRef; url: CFURLRef; opti
 	@param isStale If non-NULL, on exit will be set to true if during resolution any of the properties in the bookmark no longer seemed to match the
 		corresponding properties on the returned file.  Clients, upon seeing a stale representation, may want to replace whatever stored bookmark data they
 		have saved and create a new one.
-	@param error	If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occured during resolution of the bookmark data
+	@param error	If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occurred during resolution of the bookmark data
 	@result A CFURLRef of a file which is the closest match to the file the bookmark data }
 function CFURLCreateByResolvingBookmarkData( allocator: CFAllocatorRef; bookmark: CFDataRef; options: CFURLBookmarkResolutionOptions; relativeToURL: CFURLRef; resourcePropertiesToInclude: CFArrayRef; isStale: BooleanPtr; error: CFErrorRefPtr ): CFURLRef; external name '_CFURLCreateByResolvingBookmarkData';
 (* CF_AVAILABLE_STARTING(10_6, 4_0) *)

+ 2 - 2
packages/univint/src/CFURLEnumerator.pas

@@ -259,10 +259,10 @@ type
 const
   kCFURLEnumeratorSuccess = 1;                    { The enumeration was successful. The url output parameter is valid. }
   kCFURLEnumeratorEnd = 2;                        { The enumeration is complete. }
-  kCFURLEnumeratorError = 3;			    { An error occured during enumeration. The retained error output parameter describes the error. }
+  kCFURLEnumeratorError = 3;			    { An error occurred during enumeration. The retained error output parameter describes the error. }
   kCFURLEnumeratorDirectoryPostOrderSuccess = 4;  { The enumeration was successful. The url output parameter is for a directory after all of directory's descendants have been visited (post-order). This result will only be returned for directories when both the kCFURLEnumeratorDescendRecursively and kCFURLEnumeratorIncludeDirectoriesPostOrder options are passed to CFURLEnumeratorCreateForDirectoryURL. }
 
-{ CFURLEnumeratorGetNextURL - Advances the enumerator. If kCFURLEnumeratorSuccess is returned, the url output parameter returns the next URL found. If kCFURLEnumeratorError is returned, an error has occured and the error output parameter describes the error. If kCFURLEnumeratorEnd, the enumeration is finished.
+{ CFURLEnumeratorGetNextURL - Advances the enumerator. If kCFURLEnumeratorSuccess is returned, the url output parameter returns the next URL found. If kCFURLEnumeratorError is returned, an error has occurred and the error output parameter describes the error. If kCFURLEnumeratorEnd, the enumeration is finished.
 
 The url output parameter, if returned, is not retained. The error output parameter, if returned, is retained and must be released.
 }

+ 2 - 2
packages/univint/src/Menus.pas

@@ -5455,7 +5455,7 @@ const
  *    instead of this API. If you use the standard window Carbon event
  *    handler on your windows, you can also use a
  *    kEventControlContextualMenuClick event handler to be notified
- *    when a contextual menu click has occured; in this case, you do
+ *    when a contextual menu click has occurred; in this case, you do
  *    not need to call this API.
  *  
  *  Mac OS X threading:
@@ -5502,7 +5502,7 @@ function IsShowContextualMenuClick( const (*var*) inEvent: EventRecord ): Boolea
  *    If you use the standard window Carbon event handler on your
  *    windows, you can also use a kEventControlContextualMenuClick
  *    event handler to be notified when a contextual menu click has
- *    occured; in this case, you do not need to call this API.
+ *    occurred; in this case, you do not need to call this API.
  *  
  *  Mac OS X threading:
  *    Not thread safe

+ 1 - 1
packages/univint/src/OpenTransport.pas

@@ -784,7 +784,7 @@ type
    Events are divided into numerous categories:
    
    1. (0x0000xxxx) The core XTI events have identifiers of the form
-      T_XXXX.  These signal that an XTI event has occured on a stream.
+      T_XXXX.  These signal that an XTI event has occurred on a stream.
    2. (0x1000xxxx) Private events are reserved for protocol specific
       events.  Each protocol stack defines them as appropriate for
       its own usage.

+ 1 - 1
packages/univint/src/SCSI.pas

@@ -819,7 +819,7 @@ const
 	scsiIdentifyMessageRejected = scsiErrorBase + 12; { -7924 =                        }
 	scsiMessageRejectReceived = scsiErrorBase + 13; { -7923 = Message reject received           }
 	scsiSCSIBusReset = scsiErrorBase + 14; { -7922 = SCSI bus reset sent/received    }
-	scsiParityError = scsiErrorBase + 15; { -7921 = Uncorrectable parity error occured     }
+	scsiParityError = scsiErrorBase + 15; { -7921 = Uncorrectable parity error occurred     }
 	scsiAutosenseFailed = scsiErrorBase + 16; { -7920 = Autosense: Request sense cmd fail  }
 	scsiUnused11 = scsiErrorBase + 17; { -7919 =                        }
 	scsiDataRunError = scsiErrorBase + 18; { -7918 = Data overrun/underrun error     }

+ 1 - 1
packages/univint/src/SKSummary.pas

@@ -445,7 +445,7 @@ function SKSummaryCopyParagraphSummaryString( summary: SKSummaryRef; numParagrap
  *    
  *    outParagraphIndexOfSentences:
  *      array for returning the index of the paragraph in which
- *      sentence occured
+ *      sentence occurred
  *  
  *  Availability:
  *    Mac OS X:         in version 10.4 and later in CoreServices.framework

+ 1 - 1
packages/univint/src/WSProtocolHandler.pas

@@ -278,7 +278,7 @@ function WSProtocolHandlerGetTypeID: CFTypeID; external name '_WSProtocolHandler
  *      SOAP).
  *  
  *  Result:
- *    a WSProtocolHandlerRef, NULL if a parse error occured.
+ *    a WSProtocolHandlerRef, NULL if a parse error occurred.
  *  
  *  Availability:
  *    Mac OS X:         in version 10.3 and later but deprecated in 10.8

+ 1 - 1
packages/univint/src/WSTypes.pas

@@ -230,7 +230,7 @@ uses MacTypes,CFBase;
 
 const
 	errWSInternalError = -65793; { An internal framework error }
-	errWSTransportError = -65794; { A network error occured }
+	errWSTransportError = -65794; { A network error occurred }
 	errWSParseError = -65795; { The server response wasn't valid XML }
 	errWSTimeoutError = -65796; { The invocation timed out }
 

+ 1 - 1
tests/test/tstack.pp

@@ -35,7 +35,7 @@ begin
   exitproc:=saveexit;
   if errorcode<>0 then
     begin
-      Writeln('An error occured at level ',level);
+      Writeln('An error occurred at level ',level);
       if errorcode=202 then
         begin
           Writeln('Stack overflow correctly handled');

+ 3 - 3
tests/test/units/math/tmask.inc

@@ -8,7 +8,7 @@ try
   writeln('no exception was raised');
 except on E:Exception do
   begin
-    writeln('Exception occured: ',E.Message);
+    writeln('Exception occurred: ',E.Message);
     caught := true;
   end;
 end;
@@ -29,7 +29,7 @@ try
   writeln('no exception was raised');
 except on E:Exception do
   begin
-    writeln('Exception occured: ',E.Message);
+    writeln('Exception occurred: ',E.Message);
     caught := true;
   end;
 end;
@@ -49,7 +49,7 @@ try
   writeln('no exception was raised');
 except on E:Exception do
   begin
-    writeln('Exception occured: ',E.Message);
+    writeln('Exception occurred: ',E.Message);
     caught := true;
   end;
 end;

+ 1 - 1
tests/webtbs/tw16884.pp

@@ -43,7 +43,7 @@ begin
 
   if ThreadState = 1 then
     begin
-      writeln(Format('ThreadState = %d - constructor race condition occured (should be 2)', [FThreadState])); { we should get the Value 2 here every time, not 1. }
+      writeln(Format('ThreadState = %d - constructor race condition occurred (should be 2)', [FThreadState])); { we should get the Value 2 here every time, not 1. }
       ATestFailed := True;
       readwritebarrier;
     end

+ 1 - 1
tests/webtbs/tw7100.pp

@@ -44,7 +44,7 @@ begin
       result := 1;
     except
       result := -1;
-      write('(exception occured) ');
+      write('(exception occurred) ');
     end;
   end;
 end;