Browse Source

* some more "occured", mantis #31112

git-svn-id: trunk@35121 -
marco 8 years ago
parent
commit
dce9b9c68c

+ 2 - 2
packages/fcl-web/src/base/iniwebsession.pp

@@ -340,7 +340,7 @@ end;
 
 
 destructor TIniWebSession.Destroy;
 destructor TIniWebSession.Destroy;
 begin
 begin
-  // In case an exception occured and UpdateResponse is not called,
+  // In case an exception occurred and UpdateResponse is not called,
   // write the updates to disk and free FIniFile
   // write the updates to disk and free FIniFile
   FreeIniFile;
   FreeIniFile;
   inherited Destroy;
   inherited Destroy;
@@ -376,7 +376,7 @@ begin
   SID := '';
   SID := '';
   FSessionStarted := False;
   FSessionStarted := False;
   FTerminated := False;
   FTerminated := False;
-  // If a exception occured during a prior request FIniFile is still not freed
+  // If a exception occurred during a prior request FIniFile is still not freed
   if assigned(FIniFile) then FreeIniFile;
   if assigned(FIniFile) then FreeIniFile;
   If (SessionCookie='') then
   If (SessionCookie='') then
     SessionCookie:=SFPWebSession;
     SessionCookie:=SFPWebSession;

+ 1 - 1
packages/fpgtk/src/fpgtkext.pp

@@ -214,7 +214,7 @@ implementation
 
 
 resourcestring
 resourcestring
   rsNothingToRun = 'No main window defined, nothing to do...';
   rsNothingToRun = 'No main window defined, nothing to do...';
-  rsErrorTitle = 'Error occured';
+  rsErrorTitle = 'Error occurred';
   rsMessageTitle = 'Message';
   rsMessageTitle = 'Message';
   sErrWrongItemType = 'Items in list are not from TFPgtkMenuItem class.';
   sErrWrongItemType = 'Items in list are not from TFPgtkMenuItem class.';
 
 

+ 1 - 1
packages/fpmkunit/src/fpmkunit.pp

@@ -7570,7 +7570,7 @@ Var
             // The thread has completed compiling the package
             // The thread has completed compiling the package
             if AThread.CompilationOK then
             if AThread.CompilationOK then
               AThread.APackage.FTargetState:=tsCompiled
               AThread.APackage.FTargetState:=tsCompiled
-            else // A problem occured, stop the compilation
+            else // A problem occurred, stop the compilation
               begin
               begin
               ErrorState:=true;
               ErrorState:=true;
               ErrorMessage:=AThread.ErrorMessage;
               ErrorMessage:=AThread.ErrorMessage;

+ 1 - 1
packages/winunits-base/src/commctrl.pp

@@ -8414,7 +8414,7 @@ TYPE
 CONST
 CONST
          MCN_GETDAYSTATE                = (MCN_FIRST + 3);
          MCN_GETDAYSTATE                = (MCN_FIRST + 3);
 
 
-// MCN_SELECT is sent whenever a selection has occured (via mouse or keyboard)
+// MCN_SELECT is sent whenever a selection has occurred (via mouse or keyboard)
 //
 //
 TYPE
 TYPE
 
 

+ 1 - 1
packages/winunits-base/src/dwmapi.pp

@@ -239,7 +239,7 @@ type
     cFramesAvailable: DWM_FRAME_COUNT;
     cFramesAvailable: DWM_FRAME_COUNT;
 
 
     // number of rendered frames that were never
     // number of rendered frames that were never
-    // displayed because composition occured too late
+    // displayed because composition occurred too late
     cFramesDropped: DWM_FRAME_COUNT;
     cFramesDropped: DWM_FRAME_COUNT;
 
 
     // number of times an old frame was composed
     // number of times an old frame was composed

+ 1 - 1
packages/winunits-jedi/src/jwaimagehlp.pas

@@ -2162,7 +2162,7 @@ type
 // The exception information stream contains the id of the thread that caused
 // The exception information stream contains the id of the thread that caused
 // the exception (ThreadId), the exception record for the exception
 // the exception (ThreadId), the exception record for the exception
 // (ExceptionRecord) and an RVA to the thread context where the exception
 // (ExceptionRecord) and an RVA to the thread context where the exception
-// occured.
+// occurred.
 //
 //
 
 
   PMINIDUMP_EXCEPTION_STREAM = ^MINIDUMP_EXCEPTION_STREAM;
   PMINIDUMP_EXCEPTION_STREAM = ^MINIDUMP_EXCEPTION_STREAM;

+ 1 - 1
packages/winunits-jedi/src/jwawinbase.pas

@@ -1361,7 +1361,7 @@ const
   {$EXTERNALSYM EV_ERR}
   {$EXTERNALSYM EV_ERR}
   EV_RING     = $0100; // Ring signal detected
   EV_RING     = $0100; // Ring signal detected
   {$EXTERNALSYM EV_RING}
   {$EXTERNALSYM EV_RING}
-  EV_PERR     = $0200; // Printer error occured
+  EV_PERR     = $0200; // Printer error occurred
   {$EXTERNALSYM EV_PERR}
   {$EXTERNALSYM EV_PERR}
   EV_RX80FULL = $0400; // Receive buffer is 80 percent full
   EV_RX80FULL = $0400; // Receive buffer is 80 percent full
   {$EXTERNALSYM EV_RX80FULL}
   {$EXTERNALSYM EV_RX80FULL}

+ 1 - 1
packages/winunits-jedi/src/jwawinioctl.pas

@@ -2005,7 +2005,7 @@ type
 //                                                   //
 //                                                   //
 // The following structures define disk performance  //
 // The following structures define disk performance  //
 // statistics: specifically the locations of all the //
 // statistics: specifically the locations of all the //
-// reads and writes which have occured on the disk.  //
+// reads and writes which have occurred on the disk.  //
 //                                                   //
 //                                                   //
 // To use these structures, you must issue an IOCTL_ //
 // To use these structures, you must issue an IOCTL_ //
 // DISK_HIST_STRUCTURE (with a DISK_HISTOGRAM) to    //
 // DISK_HIST_STRUCTURE (with a DISK_HISTOGRAM) to    //

+ 1 - 1
packages/winunits-jedi/src/jwawinwlx.pas

@@ -112,7 +112,7 @@ const
 //          DLL whether this constitutes a workstation locking event.
 //          DLL whether this constitutes a workstation locking event.
 //
 //
 //      SCRNSVR_ACTIVITY - used to indicate that keyboard or mouse
 //      SCRNSVR_ACTIVITY - used to indicate that keyboard or mouse
-//          activity occured while a secure screensaver was active.
+//          activity occurred while a secure screensaver was active.
 //
 //
 //      SC_INSERT - used to indicate that a smart card has been inserted
 //      SC_INSERT - used to indicate that a smart card has been inserted
 //          to a compatible device
 //          to a compatible device