Merge lp:~ubuntu-weilnetz/ocsinventory-windows-agent/ocsinventory-windows-agent into lp:ocsinventory-windows-agent

[Stefan Weil]

Fix typos (mostly in comments) found by Codespell.

Unmerged revisions

505. By Stefan Weil <email address hidden> on 2015-05-07

Fix typos (most of them were reported by Codespell)

=== modified file 'Agent/CapDownload.h'
--- Agent/CapDownload.h	2013-03-28 13:49:37 +0000
+++ Agent/CapDownload.h	2015-05-07 18:53:51 +0000
@@ -48,7 +48,7 @@
 
 protected: // Attributes
 	CObArray m_tPackages;				// Array of package to process
-	CString m_csDownloadFragLatency;	// Time to wait betwen fragment downloaded
+	CString m_csDownloadFragLatency;	// Time to wait between fragment downloaded
 	CString m_csDownloadCycleLatency;	// Time to wait between download cycle
 	CString m_csDownloadPeriodLatency;	// Time to wait between each cycle priority ( = period)
 	CString m_csDownloadPeriodLength;	// Number of period in a download cycle
 
=== modified file 'Agent/CapExecute.cpp'
--- Agent/CapExecute.cpp	2013-12-27 12:43:13 +0000
+++ Agent/CapExecute.cpp	2015-05-07 18:53:51 +0000
@@ -119,7 +119,7 @@
 					continue;
 				}
 				m_pLogger->log( LOG_PRIORITY_WARNING, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output encoded to UTF-8, trying to reload XML document"), cFinder.GetFilePath());
-				// UTF-8 encode successfull, try to reload
+				// UTF-8 encode successful, try to reload
 				if (!myXml.LoadFile( csOutputFile))
 				{
 					m_pLogger->log( LOG_PRIORITY_ERROR, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output is not a valid XML document"), cFinder.GetFilePath());
 
=== modified file 'Agent/CapacityAbstract.cpp'
--- Agent/CapacityAbstract.cpp	2011-05-19 16:55:18 +0000
+++ Agent/CapacityAbstract.cpp	2015-05-07 18:53:51 +0000
@@ -38,7 +38,7 @@
 {
 }
 
-// Intialization
+// Initialization
 void CCapacityAbstract::setProlog( CPrologRequest *pProlog)
 {
 	m_pProlog = pProlog;
 
=== modified file 'Agent/OCSInventory.cpp'
--- Agent/OCSInventory.cpp	2014-04-09 16:22:56 +0000
+++ Agent/OCSInventory.cpp	2015-05-07 18:53:51 +0000
@@ -212,7 +212,7 @@
 		 ****/
 		if (m_pConfig->isLocalRequired())
 		{
-			m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode actived by /LOCAL argument: No network connection"));
+			m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode activated by /LOCAL argument: No network connection"));
 			csMessage.Format( _T( "%s\\%s.ocs"), m_pConfig->getLocalInventoryFolder(), getOcsDeviceID()->getDeviceID());
 			// Create local connection object
 			if ((pConnexion = new CConnexionLocal( csMessage)) == NULL)
@@ -322,7 +322,7 @@
 						DeleteFile( csLabelFile);
 					}
 					else
-						m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label sucessfully retrieved")); 
+						m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label successfully retrieved")); 
 				}
 
 			}
 
=== modified file 'Agent/PluginApi.h'
--- Agent/PluginApi.h	2012-08-29 09:30:04 +0000
+++ Agent/PluginApi.h	2015-05-07 18:53:51 +0000
@@ -36,7 +36,7 @@
 extern "C" {
 #endif
 
-// Hook called when agent loads, typicaly used to initialize plugin
+// Hook called when agent loads, typically used to initialize plugin
 typedef int (*HOOK_START)(void);
 OCSINVENTORY_API_EXPORTED int OCS_CALL_START_EXPORTED();
 // Hook called before sending prolog to server, typically used to add/modify information to prolog request
 
=== modified file 'Agent/Plugins.cpp'
--- Agent/Plugins.cpp	2012-08-29 09:30:04 +0000
+++ Agent/Plugins.cpp	2015-05-07 18:53:51 +0000
@@ -141,7 +141,7 @@
 			nCount++;
 		}
 		cFinder.Close();
-		m_pLogger->log(LOG_PRIORITY_DEBUG,  _T( "DLL PLUGIN => %d DLL Plug-in(s) succesfully loaded on %d DLL(s) found"), nPlugin, nCount);
+		m_pLogger->log(LOG_PRIORITY_DEBUG,  _T( "DLL PLUGIN => %d DLL Plug-in(s) successfully loaded on %d DLL(s) found"), nPlugin, nCount);
 		return nPlugin;
 	}
 	catch (CException *pEx)
 
=== modified file 'Agent/Plugins.h'
--- Agent/Plugins.h	2012-08-29 09:30:04 +0000
+++ Agent/Plugins.h	2015-05-07 18:53:51 +0000
@@ -45,7 +45,7 @@
 	CPlugins();
 	virtual ~CPlugins();
 
-	// Call plugin Hook when agent loads, typicaly used to initialize plugin
+	// Call plugin Hook when agent loads, typically used to initialize plugin
 	void startHook();
 	// Call plugin Hook before sending prolog to server, typically used to add/modify information to prolog request
 	void prologWriteHook(CPrologRequest*);
 
=== modified file 'CHANGELOG'
--- CHANGELOG	2014-05-16 22:32:18 +0000
+++ CHANGELOG	2015-05-07 18:53:51 +0000
@@ -10,7 +10,7 @@
 2.1.0.4
   * Get DMI data using OcsWmi DLL, instead of using own WMI code
   * Fix bug #1062582 Windows agent leaks handles by initializing COM and COM Security into main executable, instead of DLL
-  * Enable more detailled debug logs, and fixes small issues
+  * Enable more detailed debug logs, and fixes small issues
 2.1.0.3
   * Fix XSLT for displaying CPU into "show computer information" command of systrau applet
   * Fix Processor S/N filled with CPU Status if no serial number exist
@@ -25,9 +25,9 @@
   * Fix Bug #1217435: Packager tries to shutdown ocs service twice when upgrading from 1.X agent
   * Fix bug displaying before installation user notification at the end of installation, instead of post installation notification text
   * Add package command start date/time and timeout date/time to log
-  * Fix bug #1184426: Retreive processor Serial Number
+  * Fix bug #1184426: Retrieve processor Serial Number
   * Fix bug disabling ability to control command execution timeout from server
-  * Try to retreive CPU S/N using WMI
+  * Try to retrieve CPU S/N using WMI
   * There is now DMI table type greater than 127, so remove type lower and upper bound check
   * WMI meory bank type codes are not the same as DMI codes
   * Add printer information (Print server name and share, resolution, comment, Is printer shared, Is printer on network)
@@ -52,7 +52,7 @@
   * Fix bug #1045784: Ensure timestamp exists before verify expiration
   * Add download error to differenciate full download timeout ERR_TIMEOUT, execute error crashing agent and entering in loop (ERR_EXECUTE_TOO_MANY_TRY) or execute timeout (ERR_EXECUTE_TIMEOUT).
   * Rename ERR_ALREADY_SETUP en SUCCESS_ALREADY_SETUP 
-  * Bug #1031935: Windows MAK or VLK activation key are not stored on computer, so unable to retreive and set explicit message
+  * Bug #1031935: Windows MAK or VLK activation key are not stored on computer, so unable to retrieve and set explicit message
   * Fix bug #980740: As we only read process output each 200ms, we have to read output even after process exited, to capture last outputed data by process
 2.0.5.0
   * Enhanced dynamic DLL plugin API
@@ -104,7 +104,7 @@
 2.0.2, aka 2.0.2.0
   * Fix Bug #872768: Crash in Registry.cpp - "Run-Time Check Failure #2 - Stack around the variable 'lpstrData' was corrupted."
   * Ensure all array and objects are correctly freed
-  * Fix Bug #859574: Switch to WMI to retreive Bios infos even if DMI access is successfull, but serial or model is not valid
+  * Fix Bug #859574: Switch to WMI to retrieve Bios infos even if DMI access is successful, but serial or model is not valid
   * Fix Bug #435068: Do not register multiple time a monitor with the same serial
   * Fix Bug #860466: Propagate inherited permissions from $AppData\OCS Inventory NG\Agent to Download directory
 2.0.1, aka 2.0.1.0
@@ -124,7 +124,7 @@
   * When upgrading from agent 1.X, do not copy cacert.pem from INSTDIR to APPDATADIR if file exists into APPDATADIR, to allow changing cacert.pem using Packager
   * Send setup result to server when deploying new OCS agent, without interfering with other package download
   * Fix bug #783611  semicolon added to Type under Bios when using WMI
-  * When using WMI, get S/N from Win32_Bios, and if not availble, try Win32_SystemEnclosure then Win32_Baseboard
+  * When using WMI, get S/N from Win32_Bios, and if not available, try Win32_SystemEnclosure then Win32_Baseboard
   * Fix memory leak in WMI Storage query
   * Delete OCS agent setup done file if found, when cleaning a package
   * Build libcurl using _BIND_TO_CURRENT_VCLIBS_VERSION preprocessor define to bind it to the installed CRT versions, and include libcurl manifest as resource into DLL
@@ -133,7 +133,7 @@
   * Fix memory leak into OCsWmi.dll
   * Fix bogus network adapter description in some Cyrillic OS (perhaps other charset affected)
 2.0.0.18
-  * Uses MS CRT/MFC 9.00.21022.8 on Windows 2000 to fix compatibilty problem of MS11-025 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx)
+  * Uses MS CRT/MFC 9.00.21022.8 on Windows 2000 to fix compatibility problem of MS11-025 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx)
   * In NOTIFY mode, update only network inventory state, to avoid service launching agent every minute !
   * In NOTIFY mode, do not launch Registry, Download or Ipdiscover capacity, neither VBS or executable plugins (only DLL plugins)
   * Fix some other memory leaks
@@ -199,7 +199,7 @@
 	* Activate minimal log file ocsinventory.log by default into %PROGRAMDATA%\OCS Inventory NG\Agent
 	* Delay WMI first use until app start, to fix hang under Vista and higher. WMI cannot be used until WinMain starts
 	* Review WMI code, and use WMI to get Logical drives
-	* Add service description and dependancies to standards windows services RPCSS, EventLog, WMI and Tcpip
+	* Add service description and dependencies to standards windows services RPCSS, EventLog, WMI and Tcpip
 	* Bug #568534 and #493609: Add 64 bits support for registry key
 	* Bug #563796: NOTIFY should send the IPGATEWAY	
 	* Bug #484115: Frequency of inventory for ip_discover computer 
 
=== modified file 'ComHTTP/HTTPCrypt.cpp'
--- ComHTTP/HTTPCrypt.cpp	2011-07-13 08:55:00 +0000
+++ ComHTTP/HTTPCrypt.cpp	2015-05-07 18:53:51 +0000
@@ -120,7 +120,7 @@
 
 BOOL CHTTPCrypt::encrypt( CString &csInput, CString &csOutput)
 {
-    BYTE pInitVector[AES_BLOCK_SIZE];	// Random generated intialization vector
+    BYTE pInitVector[AES_BLOCK_SIZE];	// Random generated initialization vector
     EVP_CIPHER_CTX oEncCtx;				// Cipher context
     const EVP_CIPHER *oChiper = NULL;	// Cipher object
     LPBYTE pInBuffer = NULL,			// Input buffer for data to encipher
 
=== modified file 'Download/Download.h'
--- Download/Download.h	2014-04-09 16:22:56 +0000
+++ Download/Download.h	2015-05-07 18:53:51 +0000
@@ -70,7 +70,7 @@
 	CLog	*m_pLogger;
 	CConfig	*m_pConfig;
 	CConnexionAbstract	*m_pConnexion;
-	UINT	m_uDownloadFragLatency;		// Time to wait betwen fragment downloaded
+	UINT	m_uDownloadFragLatency;		// Time to wait between fragment downloaded
 	UINT	m_uDownloadCycleLatency;	// Time to wait between download cycle
 	UINT	m_uDownloadPeriodLatency;	// Time to wait between each cycle priority ( = period)
 	UINT	m_uDownloadPeriodLength;	// Number of period in a download cycle
 
=== modified file 'Download/Package.cpp'
--- Download/Package.cpp	2014-06-10 16:56:21 +0000
+++ Download/Package.cpp	2015-05-07 18:53:51 +0000
@@ -104,7 +104,7 @@
 
 		if (m_csAction == OCS_DOWNLOAD_ACTION_LAUNCH)
 		{
-			// In LAUNCH, command is in the NAME atribute
+			// In LAUNCH, command is in the NAME attribute
 			if( !ExpandEnvironmentStrings( m_csName, cCommand, 255 ))
 			{
 				return FALSE;
@@ -705,7 +705,7 @@
 	// Check if first fragment exist
 	csFile.Format( _T( "%s\\%s\\%s-1"), getDownloadFolder(), m_csID, m_csID);
 	if (fileExists( csFile))
-		// Package not built, or previous build unsuccessfull
+		// Package not built, or previous build unsuccessful
 		return FALSE;
 	// Check if ZIP exist
 	csFile.Format( _T( "%s\\%s\\%s"), getDownloadFolder(), m_csID, OCS_DOWNLOAD_BUILD);
 
=== modified file 'Download/Package.h'
--- Download/Package.h	2014-06-10 16:56:21 +0000
+++ Download/Package.h	2015-05-07 18:53:51 +0000
@@ -104,7 +104,7 @@
 	BOOL regReadPackageDigest( CString &csDigest);
 	// Delete package digest from registry
 	BOOL regDeletePackageDigest();
-	// Is execution result successfull
+	// Is execution result successful
 	BOOL isExecSuccessful( int nExitCode, CString &csStatus);
 
 protected:
@@ -131,7 +131,7 @@
 	CString m_csNotifyText;		// Before package action user notification text
 	BOOL m_bNotifyCanAbort;		// Is user able to abort package setup
 	BOOL m_bNotifyCanDelay;		// Is user able to report package setup at next agent execution
-	BOOL m_bNeedDoneAction;		// Do we have to notify user after package successfull execution
+	BOOL m_bNeedDoneAction;		// Do we have to notify user after package successful execution
 	CString m_csNeedDoneActionText; // After package success notification text
 };
 
 
=== modified file 'External_Deps/OCS_Make_Required_Libs.bat'
--- External_Deps/OCS_Make_Required_Libs.bat	2014-08-25 13:08:56 +0000
+++ External_Deps/OCS_Make_Required_Libs.bat	2015-05-07 18:53:51 +0000
@@ -212,7 +212,7 @@
 echo * Please, fix problem before trying to build OCS Inventory NG !         *
 echo *                                                                       *
 echo * Here is some common errors:                                           *
-echo * - Have you reviewed paths at the begining of this batch file ?        *
+echo * - Have you reviewed paths at the beginning of this batch file ?        *
 echo * - Have you updated Visual C++ version in cURL Makefile ?              *
 echo * - Have you build ZipArchive "Release Unicode STL MD DLL" ?            *
 echo *                                                                       *
 
=== modified file 'NSIS_agent_setup/Agent.ini'
--- NSIS_agent_setup/Agent.ini	2011-09-06 17:39:00 +0000
+++ NSIS_agent_setup/Agent.ini	2015-05-07 18:53:51 +0000
@@ -53,7 +53,7 @@
 
 [Field 7]
 Type=Checkbox
-Text=Do not registrer service - agent must be launched manually (= /NO_SERVICE) 
+Text=Do not register service - agent must be launched manually (= /NO_SERVICE) 
 Left=15
 Right=290
 Top=89
@@ -71,7 +71,7 @@
 
 [Field 9]
 Type=Checkbox
-Text=Immediatly launch inventory (= /NOW)
+Text=Immediately launch inventory (= /NOW)
 Left=15
 Right=290
 Top=120
 
=== modified file 'NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi'
--- NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi	2014-08-24 07:54:24 +0000
+++ NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi	2015-05-07 18:53:51 +0000
@@ -557,7 +557,7 @@
     WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "0"
     goto ParseCmd_Now_End
 ParseCmd_Now:
-    ; Immediately maunch inventory
+    ; Immediately launch inventory
 	WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "1"
 ParseCmd_Now_End:
 	; Remove parsed arg from command line
@@ -1517,7 +1517,7 @@
     IfErrors 0 +3
 	StrCpy $logBuffer "Failed to remove key, but non blocking !"
 	Call Write_Log
-	; Ensure service uninstall and migration process successfull
+	; Ensure service uninstall and migration process successful
     IfFileExists "$INSTDIR\PsApi.dll" TestInstall_Upgrade_Error
 	StrCpy $logBuffer "$\r$\nMigration process from old agent 4000 series succesfull, continuing setup...$\r$\n"
 	Call Write_Log
@@ -1571,7 +1571,7 @@
         Call Write_Log
     	strcpy $installSatus ":("
         clearerrors
-	    ; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER)
+	    ; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatibility only (DO NOT WORK ON XP AND HIGHER)
      	SetOutPath "$INSTDIR"
       	File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.CRT.manifest"
        	Iferrors 0 +5
@@ -1597,7 +1597,7 @@
         Call Write_Log
   	    strcpy $installSatus ":("
 	    clearerrors
-	    ; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER)
+	    ; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatibility only (DO NOT WORK ON XP AND HIGHER)
 	    File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.MFC.manifest"
 	    Iferrors 0 +5
 	    StrCpy $logBuffer "$logBuffer ERROR copying \Microsoft.VC90.MFC.manifest $\r$\n"
@@ -1913,14 +1913,14 @@
 
 
 #####################################################################
-# This function writes install status into log file when sucessfull install
+# This function writes install status into log file when successful install
 #####################################################################
 Function .onInstSuccess
 	strcmp "$installSatus" ";-)" 0 onInstSuccess_Error
 	Push "SUCCESS"
 	Call WriteAgentSetupDone
 	${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
-	StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfuly installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n "
+	StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfully installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n "
 	Call Write_Log
 	goto onInstSuccess_end
 onInstSuccess_Error:
 
=== modified file 'NSIS_agent_setup/Readme.txt'
--- NSIS_agent_setup/Readme.txt	2012-07-30 20:07:46 +0000
+++ NSIS_agent_setup/Readme.txt	2015-05-07 18:53:51 +0000
@@ -36,7 +36,7 @@
 
 MS11-025 critical fix introduces incompatibilty problem of MS CRT/MFC 9.0 with
 Windows 2000 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx).
-So for Windows 2000 only, w've choosen to install original MS CRT/MFC 
+So for Windows 2000 only, we have chosen to install original MS CRT/MFC 
 9.00.21022.8 provided with Visual C++ 2008 without Service Pack or hot fixes.
 You must put these files into "vc2008_redist_9.00.21022.8_for_Windows_2000"
 sub directory before building NSIS installer.
@@ -82,4 +82,4 @@
 
 We hope it will works for you !
 
-OCS Inventory Team
 \ No newline at end of file
+OCS Inventory Team
 
=== modified file 'OCSInventory Front/Config.cpp'
--- OCSInventory Front/Config.cpp	2011-09-06 17:39:00 +0000
+++ OCSInventory Front/Config.cpp	2015-05-07 18:53:51 +0000
@@ -180,7 +180,7 @@
 	m_csLocal.ReleaseBuffer();
 	//  Scan for installed software or not
 	m_bNoSoftware = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoSoftware"), FALSE, m_csConfigFile);
-	//  Scanning HKEY_CURRENT_USER hive for printers and sofware
+	//  Scanning HKEY_CURRENT_USER hive for printers and software
 	m_bHKCU = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "HKCU"), FALSE, m_csConfigFile);
 	//  Disable prompting user for TAG value
 	m_bNoTag = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoTAG"), FALSE, m_csConfigFile);
 
=== modified file 'OCSInventory Front/Config.h'
--- OCSInventory Front/Config.h	2011-09-06 17:39:00 +0000
+++ OCSInventory Front/Config.h	2015-05-07 18:53:51 +0000
@@ -107,7 +107,7 @@
 	// What's the content of TAG (/TAG:"tag value")
 	BOOL isTagTextProvided();
 	LPCTSTR getTagText();
-	// Does agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU)
+	// Does agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU)
 	BOOL isHkcuRequired();
 	// Is Inventory forced (/FORCE)
 	BOOL isForceInventoryRequired();
@@ -141,7 +141,7 @@
 	void setIpDiscoverLatency(LPCTSTR lpstrLatency = NULL);
 	// Does agent launches a fast IpDiscover scan, without taking care of network load, or not
 	void setFastIpRequired( BOOL bFast = TRUE);
-	// Set if agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU)
+	// Set if agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU)
 	void setHkcuRequired( BOOL bHKCU = TRUE);
 	// Set Communication Provider DLL to use without extension .DLL
 	void setCommunicationProvider( LPCTSTR lpstrDll);
 
=== modified file 'OCSInventory Front/Deviceid.cpp'
--- OCSInventory Front/Deviceid.cpp	2011-05-19 16:55:18 +0000
+++ OCSInventory Front/Deviceid.cpp	2015-05-07 18:53:51 +0000
@@ -145,7 +145,7 @@
 		delete pCb;
 		return FALSE;
 	}
-	// All sucessfull
+	// All successful
 	delete pCb;
 	return TRUE;
 }
 
=== modified file 'OCSInventory Front/ExecCommand.h'
--- OCSInventory Front/ExecCommand.h	2012-09-26 16:31:18 +0000
+++ OCSInventory Front/ExecCommand.h	2015-05-07 18:53:51 +0000
@@ -51,7 +51,7 @@
    * We don't care about command ending, so stdout and stderr
    * will not be grabbed, and we will not try to get process
    * exit code
-   * Return EXEC_SUCCESSFULL if all successfull
+   * Return EXEC_SUCCESSFULL if all successful
    *        EXEC_ERROR_START_COMMAND if start command error
    */
   int execNoWait(LPCTSTR lpstrCommand, LPCTSTR lpstrPath);
@@ -59,12 +59,12 @@
   /**
    * Exec command in the directory path. Make sure that the
    * executable is either in the path or specify the full path.
-   * We will try to get process exit code (use getExitCode() to retreive it).
+   * We will try to get process exit code (use getExitCode() to retrieve it).
    * If bCapture is TRUE, stdout and stderr will be grabbed (use getOutput() 
-   * to retreive it)
+   * to retrieve it)
    * We will wait until command end (but if command starts other
    * processes/threads, we will not be able to wait for those ending)
-   * Return EXEC_SUCCESSFULL if all successfull
+   * Return EXEC_SUCCESSFULL if all successful
    *        EXEC_ERROR_START_COMMAND if start command error
    *        EXEC_ERROR_WAIT_COMMAND if wait or get exit code/ouput error,
    */
@@ -75,7 +75,7 @@
    * executable is either in the path or specify the full path.
    * Wait for command AND ALL others threads/processes it may launch to finish.
    * In this case, we try get exit code, but NOT stdout and stderr
-   * Return EXEC_SUCCESSFULL if all successfull
+   * Return EXEC_SUCCESSFULL if all successful
    *        EXEC_ERROR_START_COMMAND if start command error
    *        EXEC_ERROR_WAIT_COMMAND if wait error,
    */
 
=== modified file 'OCSInventory Front/InventoryRequest.cpp'
--- OCSInventory Front/InventoryRequest.cpp	2014-08-06 15:06:08 +0000
+++ OCSInventory Front/InventoryRequest.cpp	2015-05-07 18:53:51 +0000
@@ -156,7 +156,7 @@
 		m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Port(s)"), m_PortList.GetCount());
 		// Update System Controllers
 		bSuccess = bSuccess && m_pTheDB->UpdateSystemControllers( m_SystemControllerList);
-		m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Controler(s)"), m_SystemControllerList.GetCount());
+		m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Controller(s)"), m_SystemControllerList.GetCount());
 		// Update System Slots
 		bSuccess = bSuccess && m_pTheDB->UpdateSystemSlots( m_SlotList);
 		m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Slot(s)"), m_SlotList.GetCount());
@@ -710,7 +710,7 @@
 	if (!m_pSysInfo->getSystemControllers( &m_SystemControllerList))
 		m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system controlers"));
 	else
-		m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controler(s) found"),
+		m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controller(s) found"),
 					  m_SystemControllerList.GetCount());
 	// Get Physical storage devices
 	if (!m_pSysInfo->getStoragePeripherals( &m_StorageList))
 
=== modified file 'OCSInventory Front/Log.h'
--- OCSInventory Front/Log.h	2011-05-04 13:48:35 +0000
+++ OCSInventory Front/Log.h	2015-05-07 18:53:51 +0000
@@ -24,7 +24,7 @@
 
 /* OCS Inventory NG log modes
    /DEBUG=0 => default mode 
-   /DEBUG=1 => DEBUG mode, for more detailled logs
+   /DEBUG=1 => DEBUG mode, for more detailed logs
    /DEBUG=2 => TRACE mode, for full logs, including XML and SysInfo logs
 */
 
@@ -71,7 +71,7 @@
 	// Trace log for full mode debug
 	void log_trace( LPCTSTR lpstrFormat, va_list args);
 
-private: // Atributes
+private: // Attributes
 	// Log filename
 	CString m_csFileName;
 	// The log file opened
 
=== modified file 'OCSInventory Front/Markup.cpp'
--- OCSInventory Front/Markup.cpp	2012-10-25 19:49:58 +0000
+++ OCSInventory Front/Markup.cpp	2015-05-07 18:53:51 +0000
@@ -169,7 +169,7 @@
 			{
 				// This a test child, remove it...
 				m_pCurrentNode->RemoveChild( pChild);
-				// ...and restart from the begining of childs
+				// ...and restart from the beginning of childs
 				pChild = NULL;
 			}
 		}
 
=== modified file 'OCSInventory Front/OcsUtils.cpp'
--- OCSInventory Front/OcsUtils.cpp	2014-08-24 07:40:05 +0000
+++ OCSInventory Front/OcsUtils.cpp	2015-05-07 18:53:51 +0000
@@ -385,7 +385,7 @@
 	UINT uLength;
 
 	OpenSSL_add_all_digests();
-	// Set the algorythm
+	// Set the algorithm
 	if (!(evpMD = EVP_get_digestbyname( GetAnsiFromUnicode( lpstrAlgo))))
 		// Unsupported digest
 		return FALSE;
 
=== modified file 'OCSInventory Front/RequestAbstract.cpp'
--- OCSInventory Front/RequestAbstract.cpp	2011-05-19 16:55:18 +0000
+++ OCSInventory Front/RequestAbstract.cpp	2015-05-07 18:53:51 +0000
@@ -81,7 +81,7 @@
 		csXml.Delete( nIndex, nCount - nIndex);
 		// and insert space
 		csXml.Insert( nIndex, " ");
-		// Find next occurence
+		// Find next occurrence
 		nIndex = csXml.Find( "&#x", nIndex);
 	}
 	m_cmXml.SetDoc( csXml);
 
=== modified file 'OCSInventory Front/commonDownload.h'
--- OCSInventory Front/commonDownload.h	2013-03-19 18:25:18 +0000
+++ OCSInventory Front/commonDownload.h	2015-05-07 18:53:51 +0000
@@ -101,7 +101,7 @@
 BOOL OCSINVENTORYFRONT_API resumeDownload();
 // If suspend file exists, download is suspended
 BOOL OCSINVENTORYFRONT_API isDownloadSuspended();
-// Get exclusive acces to download directory by locking lock file
+// Get exclusive access to download directory by locking lock file
 BOOL OCSINVENTORYFRONT_API lockDownload();
 // Release exclusive access
 BOOL OCSINVENTORYFRONT_API unlockDownload();
 
=== modified file 'OPTIONS.TXT'
--- OPTIONS.TXT	2011-09-06 17:39:00 +0000
+++ OPTIONS.TXT	2015-05-07 18:53:51 +0000
@@ -62,7 +62,7 @@
 /server=http[s]://server.domain.tld[:port]/ocsinventory
                                             Agent try to connect to Communication Server address and port Listening on http[s]://server.domain.tld[:port]/ocsinventory
 	
-/ssl=0|1                                    When usng SSL connections, 0 => SSL without certificate validation, 1 => SSL with server certificate validation required (needs CA certificate)   
+/ssl=0|1                                    When using SSL connections, 0 => SSL without certificate validation, 1 => SSL with server certificate validation required (needs CA certificate)   
 
 /ca="path_to_cabundle.pem"                  Path to CA certificate chain file in PEM format, for server certificate validation
     
@@ -94,7 +94,7 @@
 ; Enable local inventory mode (path to folder to store .ocs file => enabled,
 ; empty => disabled) 
 Local=
-; Enable agent scanning HKEY_CURRENT_USER hive for printers and sofware
+; Enable agent scanning HKEY_CURRENT_USER hive for printers and software
 ; (0 => disabled, 1 => enabled) 
 HKCU=0
 ; Disable scanning computer for installed software (0 => software scan allowed, 1 => disabled) 
 
=== modified file 'OcsNotifyUser/OcsNotifyUser.h'
--- OcsNotifyUser/OcsNotifyUser.h	2012-10-26 00:23:27 +0000
+++ OcsNotifyUser/OcsNotifyUser.h	2015-05-07 18:53:51 +0000
@@ -60,7 +60,7 @@
 
 protected: //Attributes
 	CLog	*m_pLogger;
-	UINT	m_uNotifcation;		// Notifcation type
+	UINT	m_uNotifcation;		// Notification type
 	CString m_csMessage;		// Message to display to user
 	BOOL	m_bCancel;			// Is cancel allowed or not
 	BOOL	m_bDelay;			// Is delaying action allowed or not
 
=== modified file 'OcsSystray/SystemTray.cpp'
--- OcsSystray/SystemTray.cpp	2010-07-07 20:56:04 +0000
+++ OcsSystray/SystemTray.cpp	2015-05-07 18:53:51 +0000
@@ -53,7 +53,7 @@
 //                       Explorer crashed
 //                       Fixed resource leak in SetIcon
 //						 Animate() now checks for empty icon list - Anton Treskunov
-//						 Added the virutal CustomizeMenu() method - Anton Treskunov
+//						 Added the virtual CustomizeMenu() method - Anton Treskunov
 //                       
 //
 // This code may be used in compiled form in any way you desire. This
@@ -112,7 +112,7 @@
     Initialise();
 }
 
-CSystemTray::CSystemTray(CWnd* pParent,             // The window that will recieve tray notifications
+CSystemTray::CSystemTray(CWnd* pParent,             // The window that will receive tray notifications
                          UINT uCallbackMessage,     // the callback message to send to parent
                          LPCTSTR szToolTip,         // tray icon tooltip
                          HICON icon,                // Handle to icon
 
=== modified file 'README.TXT'
--- README.TXT	2011-11-25 14:46:24 +0000
+++ README.TXT	2015-05-07 18:53:51 +0000
@@ -24,12 +24,12 @@
 ============
 
 - Microsoft Visual C++ 2008 SP1 or higher
-- Perl 5.8 or newer for building dependancies (you can use XAMPP perl addon)
+- Perl 5.8 or newer for building dependencies (you can use XAMPP perl addon)
 - Source code exported from Launchpad Bazaar repository. 
   svn co https://
 
 
-BUILDING DEPENDANCIES
+BUILDING DEPENDENCIES
 =====================
 
 OCS Inventory NG Agent for Windows needs followong libraries:
@@ -59,7 +59,7 @@
 http://blog.kalmbach-software.de/2009/05/27/deployment-of-vc2008-apps-without-installing-anything/)
 Save and build to create unicode DLL for ZipArchive Library.
 
-Script for building dependancy automatically fixess cURL and net-snmp Makefiles for Visual C++ 2008,
+Script for building dependency automatically fixess cURL and net-snmp Makefiles for Visual C++ 2008,
 by adding "/D_BIND_TO_CURRENT_VCLIBS_VERSION" to the CFLAGS. As is, libcurl and net-snmp
 DLL will be binded to lastest Visual C++ 2008 SP1 CRT versions.
 
@@ -89,7 +89,7 @@
 Then, launch script "OCS_Make_Required_Libs.bat" to create all libs and prepare for building OCS agent.
 
 
-BUIDLING AGENT
+BUILDING AGENT
 ==============
 
 You need Visual C++ 2008, which includes MS Windows SDK 6.0A.
@@ -100,4 +100,4 @@
 
 We hope it will works for you !
 
-OCS Inventory Team
 \ No newline at end of file
+OCS Inventory Team
 
=== modified file 'Service/NTService.cpp'
--- Service/NTService.cpp	2012-07-25 16:38:31 +0000
+++ Service/NTService.cpp	2015-05-07 18:53:51 +0000
@@ -213,7 +213,7 @@
                                          szFilePath,				// Main binary
                                          NULL,						// Load order group
                                          NULL,						// Tag ID to order service start in group
-                                         lpstrDependancies,			// Service dependancies
+                                         lpstrDependancies,			// Service dependencies
                                          NULL,						// Service runs under Local system account,
                                          NULL);						// so no user and password
     if (!hService) 
 
=== modified file 'Service/OcsService.cpp'
--- Service/OcsService.cpp	2014-04-09 16:22:56 +0000
+++ Service/OcsService.cpp	2015-05-07 18:53:51 +0000
@@ -488,7 +488,7 @@
 			{
 				if (!bNotifyInventory && isInventoryStateChanged())
 				{
-					// Inventory state changed, force inventory immediatly
+					// Inventory state changed, force inventory immediately
 					m_iTToWait = 0;
 					bNotifyInventory = TRUE;
 				}
@@ -691,7 +691,7 @@
 		// Create inventory
 		if ((pRequest = new CInventoryRequest()) == NULL)
 		{
-			LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "Unable to retreive inventory informations"));
+			LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "Unable to retrieve inventory informations"));
 			return FALSE;
 		}
 		if (!pRequest->final())
@@ -723,7 +723,7 @@
 	catch (CException *pEx)
 	{
 		pEx->Delete();
-		LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occured while trying to generate inventory informations"));
+		LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occurred while trying to generate inventory informations"));
 		return FALSE;
 	}
 }
@@ -755,7 +755,7 @@
 	catch (CException *pEx)
 	{
 		pEx->Delete();
-		LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occured while rotating log files"));
+		LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occurred while rotating log files"));
 		return FALSE;
 	}
 	return TRUE;
 
=== modified file 'SysInfo/DMI.cpp'
--- SysInfo/DMI.cpp	2014-08-06 15:06:08 +0000
+++ SysInfo/DMI.cpp	2015-05-07 18:53:51 +0000
@@ -291,7 +291,7 @@
 	DmiHeader *dmi;
 
 	if (bStart)
-		// Search from begining of tables
+		// Search from beginning of tables
 		nPosition = 0;
 
 	while (nPosition < m_nStructureLength)
 
=== modified file 'SysInfo/DMI.h'
--- SysInfo/DMI.h	2014-04-09 17:35:05 +0000
+++ SysInfo/DMI.h	2015-05-07 18:53:51 +0000
@@ -86,7 +86,7 @@
 	BOOL CheckSum(const BYTE *buf, int length);
 	// Get length of DMI table at position nPosition
 	int GetTableLength( int nPosition);
-	// Get next DMI table of type uType, and start seraching form begining
+	// Get next DMI table of type uType, and start seraching form beginning
 	// of table, or from current position
 	UCHAR *GetNextTable( UCHAR uType, BOOL bStart = FALSE);
 
 
=== modified file 'SysInfo/Dtwinver.cpp'
--- SysInfo/Dtwinver.cpp	2013-05-28 09:08:01 +0000
+++ SysInfo/Dtwinver.cpp	2015-05-07 18:53:51 +0000
@@ -1531,7 +1531,7 @@
     }
   #endif
   
-  #else //We must be runing on an emulated or real version of Win16 or DOS
+  #else //We must be running on an emulated or real version of Win16 or DOS
     lpVersionInformation->EmulatedProcessorType = IA32_PROCESSOR; //We can only be running x86-32 code from Win16 or DOS
 
     #ifdef _WINDOWS //Running on some version of Windows                   
@@ -1639,7 +1639,7 @@
         _fstrcpy(lpVersionInformation->szUnderlyingCSDVersion, "");
       }
     #else //Must be some version of real or emulated DOS
-      //Retreive the current version of emulated DOS
+      //Retrieve the current version of emulated DOS
       BYTE DosMinor;
       BYTE DosMajor;
       _asm
@@ -3054,7 +3054,7 @@
     //puts in the ProductSuite. In Windows 2000 Datacenter it does not matter as it
     //supports GetVersionEx using a OSVERSIONINFOEX structure.
 
-    //Turn on appropiate fields in the "wSuiteMask" bit field
+    //Turn on appropriate fields in the "wSuiteMask" bit field
     if (_tcsicmp(lpszSuite, _T("Terminal Server")) == 0) 
       lpVersionInformation->dwSuiteMask |= COSVERSION_SUITE_TERMINAL;
     else if ((_tcsicmp(lpszSuite, _T("SBS")) == 0) || (_tcsicmp(lpszSuite, _T("Small Business")) == 0))
 
=== modified file 'SysInfo/EDID.cpp'
--- SysInfo/EDID.cpp	2013-11-27 16:28:03 +0000
+++ SysInfo/EDID.cpp	2015-05-07 18:53:51 +0000
@@ -415,7 +415,7 @@
 	}
 	memset( szResult, 0, 15);
 	strncpy( szResult, (LPCSTR) (lpByte+DESCRIPTOR_DATA_OFFSET), 14);
-	// Ignore space characters at begining
+	// Ignore space characters at beginning
 	for (i=0; i<strlen( szResult) && szResult[i]==' '; i++);
 	m_csBuffer.Format( "%s", szResult+i);
 	return m_csBuffer;
 
=== modified file 'SysInfo/EDID.h'
--- SysInfo/EDID.h	2010-12-08 22:42:33 +0000
+++ SysInfo/EDID.h	2015-05-07 18:53:51 +0000
@@ -75,7 +75,7 @@
     BYTE Vertical_Frequency;
 } EDIDMode;
 
-// Format of Detailed_Timing_DescriptionX if it is a Detailled Timing
+// Format of Detailed_Timing_DescriptionX if it is a Detailed Timing
 typedef struct tag_EDID_Detailled_Timing
 {
 	BYTE Horizontal_Frequency;	// horizontal frequency in kHz (if 00h, may be text)(see #00135)
@@ -160,7 +160,7 @@
     BYTE Checksum; // (radix-complement: 256-low byte of 16-bit sum of 00h-7Eh)
 } Standard_EDID;
 
- // Detailled Timing enumeration types
+ // Detailed Timing enumeration types
 enum DetailTiming
 {
     Detailed_Timing_Description = 0,
@@ -191,7 +191,7 @@
 	BOOL		ParseEDID( LPBYTE lpByte, Standard_EDID &myEDID);
 	// Return manufacturer code (3 letters)
 	LPCSTR		GetManufacturerID(BYTE ID[2]);
-	// Retreive EDID data from registry
+	// Retrieve EDID data from registry
 	BOOL		GetDisplayEDID( HDEVINFO hDeviceInfoSet, SP_DEVINFO_DATA *pDevInfoData, Standard_EDID &myEDID);
 	// Decode DPMS flags to get monitor type
 	LPCSTR		DecodeDPMSFlag( BYTE Flag);
 
=== modified file 'SysInfo/Registry.cpp'
--- SysInfo/Registry.cpp	2014-08-06 15:06:08 +0000
+++ SysInfo/Registry.cpp	2015-05-07 18:53:51 +0000
@@ -2023,7 +2023,7 @@
 
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find Floppy Controllers in HKLM\\%s...\n"),
 			NT_CONTROLER_FLOPPY_KEY);
-	// Windows NT => Open the floppy controler key
+	// Windows NT => Open the floppy controller key
 	if (RegOpenKeyEx( m_hKey, NT_CONTROLER_FLOPPY_KEY, 0, KEY_READ|KEY_WOW64_64KEY, &hKeyEnum) == ERROR_SUCCESS)
 	{
 		// Enum the devices subkeys to find devices
@@ -2136,7 +2136,7 @@
 	}
 	else
 		AddLog( _T( "\tFailed because no valid object !\n"));
-	// Windows NT => Open the IDE controler key
+	// Windows NT => Open the IDE controller key
 	uIndex = 0;
 	dwIndexEnum = 0;
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find IDE Controllers in HKLM\\%s...\n"),
@@ -2253,7 +2253,7 @@
 	}
 	else
 		AddLog( _T( "\tFailed because no valid object !\n"));
-	// Windows NT => Open the SCSI controler key
+	// Windows NT => Open the SCSI controller key
 	uIndex = 0;
 	dwIndexEnum = 0;
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find SCSI Controllers in HKLM\\%s...\n"),
@@ -2370,7 +2370,7 @@
 	}
 	else
 		AddLog( _T( "\tFailed because no valid object !\n"));
-	// Windows NT => Open the InfraRed controler key
+	// Windows NT => Open the InfraRed controller key
 	uIndex = 0;
 	dwIndexEnum = 0;
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find InfraRed Controllers in HKLM\\%s...\n"),
@@ -2447,7 +2447,7 @@
 									   csSubKey, NT_CONTROLER_INFRARED_VERSION_VALUE);
 					csVersion = NOT_AVAILABLE;
 				}
-				// Ensure it is a controler
+				// Ensure it is a controller
 				if (GetValue( hKeyObject, NT_CONTROLER_INFRARED_CONTROLER_VALUE, csValue) == ERROR_SUCCESS)
 				{
 					bHaveToStore = TRUE;
@@ -2498,7 +2498,7 @@
 	}
 	else
 		AddLog( _T( "\tFailed because no valid object !\n"));
-	// Windows NT => Open the USB controler key
+	// Windows NT => Open the USB controller key
 	uIndex = 0;
 	dwIndexEnum = 0;
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find USB Controllers in HKLM\\%s...\n"),
@@ -2575,7 +2575,7 @@
 									   csSubKey, NT_CONTROLER_USB_VERSION_VALUE);
 					csVersion = NOT_AVAILABLE;
 				}
-				// Ensure it is a controler
+				// Ensure it is a controller
 				if (GetValue( hKeyObject, NT_CONTROLER_USB_CONTROLER_VALUE, csValue) == ERROR_SUCCESS)
 				{
 					bHaveToStore = TRUE;
@@ -2626,7 +2626,7 @@
 	}
 	else
 		AddLog( _T( "\tFailed because no valid object !\n"));
-	// Windows NT => Open the IEEE1394 controler key
+	// Windows NT => Open the IEEE1394 controller key
 	uIndex = 0;
 	dwIndexEnum = 0;
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find IEEE1394 Controllers in HKLM\\%s...\n"),
@@ -2743,7 +2743,7 @@
 	}
 	else
 		AddLog( _T( "\tFailed because no valid object !\n"));
-	// Windows NT => Open the PCMCIA controler key
+	// Windows NT => Open the PCMCIA controller key
 	uIndex = 0;
 	dwIndexEnum = 0;
 	AddLog( _T( "Registry NT GetSystemControllers: Trying to find PCMCIA Controllers in HKLM\\%s...\n"),
 
=== modified file 'SysInfo/SnmpAPI.cpp'
--- SysInfo/SnmpAPI.cpp	2011-05-19 16:55:18 +0000
+++ SysInfo/SnmpAPI.cpp	2015-05-07 18:53:51 +0000
@@ -121,7 +121,7 @@
 //* network traffic via a WebPage.
 //* http://www.ee.ethz.ch/~oetiker/webtools/mrtg/
 //*
-//* Copyright (c) 1996-2001 Tobias Oetiker and all the Contributers
+//* Copyright (c) 1996-2001 Tobias Oetiker and all the Contributors
 //* to MRTG
 //* All rights reserved.
 //*                                                                     
 
=== modified file 'SysInfo/StoragePeripheral.cpp'
--- SysInfo/StoragePeripheral.cpp	2014-08-24 07:40:05 +0000
+++ SysInfo/StoragePeripheral.cpp	2015-05-07 18:53:51 +0000
@@ -160,7 +160,7 @@
 		}
 		StrForSQL( m_csSN);
 		if (is_printable( m_csSN))
-			// Hex decode successfull
+			// Hex decode successful
 			return;
 	}
 	// Not hex encoded (or hex decode failed), ensure printable
 
=== modified file 'SysInfo/SysInfo.cpp'
--- SysInfo/SysInfo.cpp	2014-05-16 20:32:33 +0000
+++ SysInfo/SysInfo.cpp	2015-05-07 18:53:51 +0000
@@ -147,7 +147,7 @@
 				}
 				else if (os.IsWindowsME(&osvi))
 				{
-					csName = _T( "Microsoft Windows Millenium");
+					csName = _T( "Microsoft Windows Millennium");
 					csComment.Empty();
 				}
 				else
 
=== modified file 'SysInfo/VMSystem.h'
--- SysInfo/VMSystem.h	2011-03-24 13:26:32 +0000
+++ SysInfo/VMSystem.h	2015-05-07 18:53:51 +0000
@@ -20,13 +20,13 @@
 	CVMSystem(void);
 	~CVMSystem(void);
 
-	// Try to detect hypervisor we're runnning on using Bios
+	// Try to detect hypervisor we're running on using Bios
 	BOOL DetectVM( CBios *pBios, CString &csVMSystem);
-	// Try to detect hypervisor we're runnning on using System controller
+	// Try to detect hypervisor we're running on using System controller
 	BOOL DetectVM( CSystemControllerList *pMyList, CString &csVMSystem);
-	// Try to detect hypervisor we're runnning on using Storage Peripherals
+	// Try to detect hypervisor we're running on using Storage Peripherals
 	BOOL DetectVM( CStoragePeripheralList *pMyList, CString &csVMSystem);
-	// Try to detect hypervisor we're runnning on using Video Adapter
+	// Try to detect hypervisor we're running on using Video Adapter
 	BOOL DetectVM( CVideoAdapterList *pMyList, CString &csVMSystem);
 protected:
 	// Try to find Hypervisor signature into a string
 
=== modified file 'TestSysInfo/TestSysInfoDlg.cpp'
--- TestSysInfo/TestSysInfoDlg.cpp	2013-07-22 16:30:50 +0000
+++ TestSysInfo/TestSysInfoDlg.cpp	2015-05-07 18:53:51 +0000
@@ -968,7 +968,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "Video Controler infos"));
+	m_List.AddString( _T( "Video Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_VideoController")))
 	{
@@ -1263,7 +1263,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "Floppy Controler infos"));
+	m_List.AddString( _T( "Floppy Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_FloppyController")))
 	{
@@ -1302,7 +1302,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "IDE Controler infos"));
+	m_List.AddString( _T( "IDE Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_IDEController")))
 	{
@@ -1341,7 +1341,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "SCSI Controler infos"));
+	m_List.AddString( _T( "SCSI Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_SCSIController")))
 	{
@@ -1388,7 +1388,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "InfraRed Controler infos"));
+	m_List.AddString( _T( "InfraRed Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_InfraredDevice")))
 	{
@@ -1427,7 +1427,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "USB Controler infos"));
+	m_List.AddString( _T( "USB Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_USBController")))
 	{
@@ -1466,7 +1466,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "IEEE 1394 Controler infos"));
+	m_List.AddString( _T( "IEEE 1394 Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_1394Controller")))
 	{
@@ -1505,7 +1505,7 @@
 	}
 
 	m_List.AddString( _T( "------------------------------------------------------"));
-	m_List.AddString( _T( "PCMCIA Controler infos"));
+	m_List.AddString( _T( "PCMCIA Controller infos"));
 	m_List.AddString( _T( "------------------------------------------------------"));
 	if (myWmiDll.BeginEnumClassObject( _T( "Win32_PCMCIAController")))
 	{
 
=== modified file 'logon/OcsLogon.nsi'
--- logon/OcsLogon.nsi	2014-01-08 16:29:30 +0000
+++ logon/OcsLogon.nsi	2015-05-07 18:53:51 +0000
@@ -60,7 +60,7 @@
 # Global variables
 #####################################################################
 var /GLOBAL nGpo                  ; Set to 1 if /GPO is provided
-var /GLOBAL nShowlog              ; Set to 1 if /SHOWLOG is provided, to display log file at the end of exec, usefull for debugging
+var /GLOBAL nShowlog              ; Set to 1 if /SHOWLOG is provided, to display log file at the end of exec, useful for debugging
 var /GLOBAL nUninstall            ; Set to 1 if /Uninstall is provided
 var /GLOBAL nForce                ; Do we overwrite installed version (=1) or not (=0)
 var /GLOBAL nTimeOut              ; Download timeout (default 60 sec)
 
=== modified file 'logon/Readme.txt'
--- logon/Readme.txt	2011-05-27 13:56:11 +0000
+++ logon/Readme.txt	2015-05-07 18:53:51 +0000
@@ -18,7 +18,7 @@
 By default, OcsLogon try to download and install standard Agent setup file 
 "ocsagent.exe", but it can also use "ocspackage.exe", file created by OCS
 Inventory NG Packager, which can embbed certificate file and can be executed
-under a fixed administrator account. This is usefull when user logon script 
+under a fixed administrator account. This is useful when user logon script 
 is used in Samba domain, to allow installation process by non administrator
 users.       
 
 
=== modified file 'ocsinventory.ini.sample'
--- ocsinventory.ini.sample	2010-07-07 20:56:04 +0000
+++ ocsinventory.ini.sample	2015-05-07 18:53:51 +0000
@@ -5,7 +5,7 @@
 ; Enable local inventory mode (path to folder to store .ocs file => enabled,
 ; empty => disabled) 
 Local=
-; Enable agent scanning HKEY_CURRENT_USER hive for printers and sofware
+; Enable agent scanning HKEY_CURRENT_USER hive for printers and software
 ; (0 => disabled, 1 => enabled) 
 HKCU=0
 ; Disable prompting user for TAG value (0 => prompt allowed, 1 => disabled)