Changed: #878 Fix typos in comments/code

code/nel/include/nel/3d/computed_string.h

@@ -188,7 +188,7 @@ public:
 	 */
 	float StringLine;
 
-	/// Optionnal: each render*() method can draw a subset of letters. Default is 0/FFFFFFFF
+	/// Optional: each render*() method can draw a subset of letters. Default is 0/FFFFFFFF
 	uint32	SelectStart;
 	uint32	SelectSize;
 

code/nel/include/nel/3d/ps_mesh.h

@@ -398,7 +398,7 @@ protected:
 	void				releaseShapes();
 
 
-	/** Compute (optionnal) mesh colors.
+	/** Compute (optional) mesh colors.
 	  * \param startIndex   Index of the mesh being processed
 	  * \param toProcess    Number of meshs to process
 	  */

code/nel/include/nel/3d/transform.h

@@ -663,7 +663,7 @@ protected:
 	 */
 	virtual	sint			renderSkinGroupGeom(float /* alphaMRM */, uint /* remainingVertices */, uint8 * /* dest */) {return 0;}
 	/** if supportSkinGrouping(), called to render the primitives of the already skinned vertices (VB activated in the driver)
-	 *	Optionnaly, fill specRdrPasses with specular rdrPass to sort (used for specular grouping).
+	 *	Optionally, fill specRdrPasses with specular rdrPass to sort (used for specular grouping).
 	 *	\param baseVertex value to add to each PBlock index.
 	 */
 	virtual	void			renderSkinGroupPrimitives(uint /* baseVertex */, std::vector<CSkinSpecularRdrPass> &/* specularRdrPasses */, uint /* skinIndex */) { }

code/nel/include/nel/misc/bitmap.h

@@ -572,7 +572,7 @@ public:
 	 * \param tiled If false coordinate are clamped, else the bitmap is considered to tile
 	 */
 	CRGBAF getColor (float x, float y) const;
-	// Get Color with optionnal tiling on axis
+	// Get Color with optional tiling on axis
 	CRGBAF getColor (float x, float y, bool tileU, bool tileV) const;
 
 

code/nel/include/nel/misc/dummy_window.h

@@ -28,7 +28,7 @@
 namespace NLMISC
 {
 
-/** A simple invisible win32 window, with an optionnal message handling function.
+/** A simple invisible win32 window, with an optional message handling function.
   * Possible uses include :
   * - Creating an icon in the tray (require a window to be passed)
   * - Creating a message queue (in order to use an IPC mechanism such as WM_COPYDATA)
@@ -42,7 +42,7 @@ class CDummyWindow
 {
 public:
 	CDummyWindow();
-	/** Init a dummy window, with an optionnal message handling procedure
+	/** Init a dummy window, with an optional message handling procedure
 	  * \return true on success
 	  */
 	bool init(HINSTANCE hInstance, WNDPROC winProc = NULL);

code/nel/src/3d/driver/direct3d/driver_direct3d.cpp

@@ -1779,35 +1779,30 @@ IDriver::TMessageBoxId CDriverD3D::systemMessageBox (const char* message, const
 }
 
 // ***************************************************************************
-
 bool CDriverD3D::activate()
 {
 	return true;
 }
 
 // ***************************************************************************
-
 bool CDriverD3D::isActive ()
 {
 	return (IsWindow(_HWnd) != 0);
 }
 
 // ***************************************************************************
-
 nlWindow CDriverD3D::getDisplay()
 {
 	return _HWnd;
 }
 
 // ***************************************************************************
-
 NLMISC::IEventEmitter	*CDriverD3D::getEventEmitter()
 {
 	return &_EventEmitter;
 }
 
 // ***************************************************************************
-
 void CDriverD3D::getWindowSize (uint32 &width, uint32 &height)
 {
 	H_AUTO_D3D(CDriverD3D_getWindowSize);
@@ -1825,7 +1820,6 @@ void CDriverD3D::getWindowPos (sint32 &x, sint32 &y)
 }
 
 // ***************************************************************************
-
 uint32 CDriverD3D::getImplementationVersion () const
 {
 	H_AUTO_D3D(CDriverD3D_getImplementationVersion);
@@ -1833,21 +1827,18 @@ uint32 CDriverD3D::getImplementationVersion () const
 }
 
 // ***************************************************************************
-
 const char *CDriverD3D::getDriverInformation ()
 {
 	return "Directx 9 NeL Driver";
 }
 
 // ***************************************************************************
-
 uint8 CDriverD3D::getBitPerPixel ()
 {
 	return _CurrentMode.Depth;
 }
 
 // ***************************************************************************
-
 bool CDriverD3D::clear2D(CRGBA rgba)
 {
 	H_AUTO_D3D(CDriverD3D_clear2D);
@@ -2712,7 +2703,7 @@ const char *CDriverD3D::getVideocardInformation ()
 		return name;
 	}
 	else
-		return "Can't get video card informations";
+		return "Can't get video card information";
 }
 
 // ***************************************************************************

code/nel/src/3d/driver/direct3d/driver_direct3d.h

@@ -774,7 +774,7 @@ public:
 	virtual void			forceTextureResize(uint divisor);
 	virtual void			forceNativeFragmentPrograms(bool /* nativeOnly */) {} // ignored
 
-	// Driver informations
+	// Driver information
 	virtual uint			getNumAdapter() const;
 	virtual bool			getAdapter(uint adapter, CAdapter &desc) const;
 	virtual bool			setAdapter(uint adapter);

code/nel/src/3d/water_shape.cpp

@@ -149,20 +149,20 @@ static const char *WaterVpBump1LayersCode =
  ADD R0, R2, -R1;				#compute reflection vector			\n\
  MAD o[TEX1], R0, c[8], c[8];									    \n\
 ";
-/** Optionnal diffuse texture in stage 3
+/** Optional diffuse texture in stage 3
   */
 static const char *WaterVpDiffuseMapStage3Code =
 "DP4 o[TEX3].x, R4, c[13]; #compute uv for diffuse texture					\n\
  DP4 o[TEX3].y, R4, c[14];													\n\
 ";
-/** Optionnal diffuse texture in stage 2
+/** Optional diffuse texture in stage 2
   */
 static const char *WaterVpDiffuseMapStage2Code =
 "DP4 o[TEX2].x, R4, c[13]; #compute uv for diffuse texture					\n\
  DP4 o[TEX2].y, R4, c[14];													\n\
 ";
 
-/** Optionnal diffuse texture in stage 1
+/** Optional diffuse texture in stage 1
   */
 static const char *WaterVpDiffuseMapStage1Code =
 "DP4 o[TEX1].x, R4, c[13]; #compute uv for diffuse texture					\n\

code/nel/src/misc/di_keyboard_device.h

@@ -59,7 +59,7 @@ public:
 	///\name Object
 	//@{
 		/** Create a keyboard device, that must then be deleted by the caller
-		  * An optionnal WinEventEmiter can be provided, so that its flags can be in sync
+		  * An optional WinEventEmiter can be provided, so that its flags can be in sync
 		  * with a win32 keyboard flags (shift, ctrl, and alt)
 		  */
 		static CDIKeyboard *createKeyboardDevice(IDirectInput8 *di8,

code/nel/src/sound/driver/openal/sound_driver_al.cpp

@@ -59,7 +59,7 @@ void alTestWarning(const char *src)
 	switch (errcode)
 	{
 	case AL_NO_ERROR: break;
-	case AL_INVALID_NAME: nlwarning("AL: Invalid Name paramater passed to AL call (%s)", src); break;
+	case AL_INVALID_NAME: nlwarning("AL: Invalid Name parameter passed to AL call (%s)", src); break;
 	case AL_INVALID_ENUM: nlwarning("AL: Invalid parameter passed to AL call (%s)", src); break;
 	case AL_INVALID_VALUE: nlwarning("AL: Invalid enum parameter value (%s)", src); break;
 	case AL_INVALID_OPERATION: nlwarning("AL: Illegal call (%s)", src); break;

code/nel/tools/3d/object_viewer/object_viewer.cfg

@@ -37,7 +37,7 @@ recursive_search_pathes=
 // can load dds if the tga is not available
 extensions_remapping = { "tga", "dds" };
 
-camera_focal = 75; // this is optionnal
+camera_focal = 75; // this is optional
 
 // sound related vars
 packed_sheet_path   		= "R:\code\ryzom\data\sound";
@@ -46,33 +46,33 @@ sample_path			= "R:\code\ryzom\data\sound\samplebanks\";
 //
 
 // Vegetable Landscape Setup (for vegetable edition). search_pathes must be OK.
-veget_tile_bank= "";				// this is optionnal, but obligatory for Vegetable Edit to work properly
+veget_tile_bank= "";				// this is optional, but obligatory for Vegetable Edit to work properly
-veget_tile_far_bank= "";		// this is optionnal, but obligatory for Vegetable Edit to work properly
+veget_tile_far_bank= "";		// this is optional, but obligatory for Vegetable Edit to work properly
-veget_landscape_zones=						// this is optionnal, but obligatory for Vegetable Edit to work properly
+veget_landscape_zones=						// this is optional, but obligatory for Vegetable Edit to work properly
 {
 };
-veget_landscape_threshold= 0.01;			// this is optionnal
+veget_landscape_threshold= 0.01;			// this is optional
-veget_landscape_tile_near= 50;				//  this is optionnal
+veget_landscape_tile_near= 50;				//  this is optional
-veget_landscape_ambient = {17, 54, 100} ;	//  this is optionnal
+veget_landscape_ambient = {17, 54, 100} ;	//  this is optional
-veget_landscape_diffuse = {241, 226, 244} ;	//  this is optionnal
+veget_landscape_diffuse = {241, 226, 244} ;	//  this is optional
-veget_landscape_snap_height= 1.70;		//  this is optionnal
+veget_landscape_snap_height= 1.70;		//  this is optional
 
 // veget setup
-veget_texture= "";	// this is optionnal, but important for Vegetable Edit to behave properly
+veget_texture= "";	// this is optional, but important for Vegetable Edit to behave properly
-veget_ambient= {80, 80, 80};		// this is optionnal
+veget_ambient= {80, 80, 80};		// this is optional
-veget_diffuse= {255, 255, 255};		// this is optionnal. NB: works like veget_landscape_diffuse (ie maxLightFactor possible)
+veget_diffuse= {255, 255, 255};		// this is optional. NB: works like veget_landscape_diffuse (ie maxLightFactor possible)
-veget_light_dir= {0, 1, -1};		// this is optionnal
+veget_light_dir= {0, 1, -1};		// this is optional
-veget_wind_dir= {1, 1, 0};		// this is optionnal
+veget_wind_dir= {1, 1, 0};		// this is optional
-veget_wind_freq= 0.5;			// this is optionnal
+veget_wind_freq= 0.5;			// this is optional
-veget_wind_power= 1;			// this is optionnal
+veget_wind_power= 1;			// this is optional
-veget_wind_bend_min= 0;			// this is optionnal
+veget_wind_bend_min= 0;			// this is optional
 
 // scene_light setup
-scene_light_enabled		=	1;					// this is optionnal. Usefull to load Igs with lights and see correct ligthing
+scene_light_enabled		=	1;					// this is optional. Usefull to load Igs with lights and see correct ligthing
-scene_light_sun_specular=	{255, 255, 255};	// this is optionnal
+scene_light_sun_specular=	{255, 255, 255};	// this is optional
-scene_light_sun_diffuse	=	{255, 255, 255};	// this is optionnal
+scene_light_sun_diffuse	=	{255, 255, 255};	// this is optional
-scene_light_sun_ambiant	=	{64, 64, 64};		// this is optionnal
+scene_light_sun_ambiant	=	{64, 64, 64};		// this is optional
-scene_light_sun_dir		=	{1, 0, -1};			// this is optionnal
+scene_light_sun_dir		=	{1, 0, -1};			// this is optional
 
 
 // scale the played position of all the skeletons by this value (default 1).

code/nel/tools/3d/object_viewer/object_viewer.h

@@ -345,7 +345,7 @@ public:
 	// @}
 
 	/** an interface for objects that want to be called during the loop
-	  * First use : display of an optionnal bbox for a particle system
+	  * First use : display of an optional bbox for a particle system
 	  */
 	struct IMainLoopCallBack
 	{

code/nel/tools/3d/object_viewer/object_viewer.rc

@@ -1318,14 +1318,14 @@ END
 
 IDD_VEGETABLE_SELECT_OTHER DIALOG DISCARDABLE  0, 0, 187, 146
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select An Other Vegetable"
+CAPTION "Select Another Vegetable"
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
     LISTBOX         IDC_LIST1,5,5,95,130,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                     WS_TABSTOP
-    LTEXT           "Selet the vegetable to copy colors from",IDC_STATIC,110,
+    LTEXT           "Select the vegetable to copy colors from",IDC_STATIC,110,
                     75,75,35
 END
 

code/ryzom/client/src/actions.h

@@ -191,10 +191,10 @@ public:
 		// Init default values
 		CParameter ();
 
-		// The parameter name (optionnal)
+		// The parameter name (optional)
 		std::string		Name;
 
-		// The parameter localized name (optionnal)
+		// The parameter localized name (optional)
 		std::string		LocalizedName;
 
 		// Default value

code/ryzom/client/src/bg_downloader_access.cpp

@@ -279,7 +279,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run()
 					for (uint catIndex = 0; catIndex < bnpCatSet.categoryCount(); ++catIndex)
 					{
 						const CBNPCategory	&cat = bnpCatSet.getCategory(catIndex);
-						if (cat.isOptional()) // NB : 'optionnal' flag meaning has changed : it now means 'Mainland Patch'
+						if (cat.isOptional()) // NB : 'optional' flag meaning has changed : it now means 'Mainland Patch'
 											  // until an enum is added
 						{
 							for (uint f = 0; f < cat.fileCount(); ++f)

code/ryzom/client/src/client_sheets/sbrick_sheet.cpp

@@ -167,7 +167,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
 			if(bf != BRICK_FAMILIES::Unknown)
 				OptionalFamilies.push_back( bf );
 			else
-				nlwarning("Unknown optionnal family %s",sTmp.c_str());
+				nlwarning("Unknown optional family %s",sTmp.c_str());
 		}
 	}
 

code/ryzom/client/src/input.cpp

@@ -114,7 +114,7 @@ bool	InitMouseWithCursor (bool hardware)
 				return false;
 		}
 
-		// Update mouse informations
+		// Update mouse information
 		UpdateMouse ();
 
 		if (InitMouseFirstTime)

code/ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -532,7 +532,7 @@ public:
 		CCDBNodeLeaf *progs = im->getDbProp("SERVER:TARGET:PROGRAMMES", false);
 		if (!progs)
 		{
-			nlwarning("<CHandlerContextMissions::execute> can't retrieve programms.");
+			nlwarning("<CHandlerContextMissions::execute> can't retrieve programs.");
 			return;
 		}
 		bool missionsToDo = (progs->getValue32() & (1 << BOTCHATTYPE::AvailableMissionFamily)) != 0;

code/ryzom/client/src/interface_v3/chat_window.h

@@ -63,7 +63,7 @@ struct CChatWindowDesc
 	std::string				AHOnCloseButton;
 	std::string				AHOnCloseButtonParams;
 	std::string				HeaderColor;
-	// default ctor : build optionnal parameters with their default values
+	// default ctor : build optional parameters with their default values
 	CChatWindowDesc();
 };
 

code/ryzom/client/src/interface_v3/dbctrl_sheet.h

@@ -670,7 +670,7 @@ protected:
 	// For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand
 	CDBCtrlSheet		*_OtherHandItemFilter;
 
-	// This String is optionnal and usage dependent for Item, Macro, or Sentence
+	// This String is optional and usage dependent for Item, Macro, or Sentence
 	std::string			_OptString;
 
 	CCDBNodeLeaf		*_GrayedLink;

code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp

@@ -464,7 +464,7 @@ void			CDBGroupBuildPhrase::fillSelectionMain(uint index)
 		filterBrickSetuped(bricks);
 	}
 
-	// For optionnal or credit, filter by BrickExclusion.
+	// For optional or credit, filter by BrickExclusion.
 	if(index>=1/*+_NumMandatories*/)
 		filterBrickExclusion(bricks, index);
 
@@ -967,7 +967,7 @@ void			CDBGroupBuildPhrase::updateParamHrc(uint index)
 
 	// **** From the current View setup of 'word', build the Parameter Hierarchy (in simple tree form)
 	CParamTreeNode		rootNode(NULL);
-	// NB: here rootNode represent the Main (ie mandatory, optionnal or credit) brick. Therefore, it is not a real parameter.
+	// NB: here rootNode represent the Main (ie mandatory, optional or credit) brick. Therefore, it is not a real parameter.
 	rootNode.Brick= word->Slot.Brick->asSBrickSheet();
 	rootNode.Valid= true;
 	rootNode.ViewParamFamilies= word->Slot.ViewParamFamilies;

code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h

@@ -25,7 +25,7 @@
 
 // ***************************************************************************
 /**
- * Special IconList for displaying Phrase Sheet. Optionnaly display progression info
+ * Special IconList for displaying Phrase Sheet. Optionally display progression info
  * \author Lionel Berenguier
  * \author Nevrax France
  * \date 2004

code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h

@@ -25,7 +25,7 @@
 
 // ***************************************************************************
 /**
- * Special TextList for displaying Phrase Sheet. Optionnaly display progression info
+ * Special TextList for displaying Phrase Sheet. Optionally display progression info
  * \author Lionel Berenguier
  * \author Nevrax France
  * \date 2003

code/ryzom/client/src/interface_v3/group_html.cpp

@@ -672,7 +672,7 @@ bool scanHTMLColor(const char *src, CRGBA &dest)
 		src = scanColorComponent(src, result.A);
 		if (!src)
 		{
-			// Alpha is optionnal
+			// Alpha is optional
 			result.A = 255;
 		}
 		dest = result;

code/ryzom/client/src/interface_v3/group_tree.h

@@ -33,7 +33,7 @@ class CGroupTree : public CInterfaceGroup
 public:
 
 	struct SNode;
-	// optionnal callback that is called when a node has been added
+	// optional callback that is called when a node has been added
 	struct INodeAddedCallback
 	{
 		/** A node has just been added in the CGroupTree object

code/ryzom/client/src/interface_v3/interface_parser.cpp

@@ -1362,7 +1362,7 @@ bool CInterfaceParser::parseLink(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	{
 		splitLinkTargets(std::string((const char*)ptr), parentGroup, targets);
 	}
-	// optionnal action handler
+	// optional action handler
 	std::string action;
 	std::string params;
 	std::string cond;
@@ -3065,7 +3065,7 @@ bool CInterfaceParser::parseCareerGenerator(xmlNodePtr /* cur */)
 		return false;
 
 
-	// knownWindow (optionnal)
+	// knownWindow (optional)
 	prop = xmlGetProp (cur, (xmlChar*)"known_window");
 	if(prop) knownWindow= (const char*)prop;
 

code/ryzom/client/src/interface_v3/lua_helper.h

@@ -246,7 +246,7 @@ public:
 	const void			*toPointer(int index = -1);
 	/** Helper functions : get value of the wanted type in the top table after conversion
 	* A default value is used if the stack entry is NULL.
-	* If conversion fails then an exception is thrown (with optionnal msg)
+	* If conversion fails then an exception is thrown (with optional msg)
 	*/
 	bool				getTableBooleanValue(const char *name, bool        defaultValue= false);
 	double				getTableNumberValue(const char *name,  double      defaultValue= 0);

code/ryzom/client/src/interface_v3/obs_huge_list.cpp

@@ -149,7 +149,7 @@ bool CHugeListObs::init()
 	_HasNext =	im->getDbProp(dbPath + ":HAS_NEXT", false);
 	if (!_HasNext) return false;
 
-	// optionnal (rolemaster Trading only)
+	// optional (rolemaster Trading only)
 	_RoleMasterFlagDB = im->getDbProp(dbPath + ":ROLEMASTER_FLAGS", false);
 	_RoleMasterRaceDB = im->getDbProp(dbPath + ":ROLEMASTER_RACE", false);
 

code/ryzom/client/src/interface_v3/people_list.h

@@ -67,7 +67,7 @@ public:
 	CPeopleList();
 	/** create a list of people from the given description
 	  * \param desc description of the people list
-	  * \param chat optionnal chat box in the list
+	  * \param chat optional chat box in the list
 	  * \return true if the list could be
 	  */
 	bool create(const CPeopleListDesc &desc, const CChatWindowDesc *chat = NULL);

code/ryzom/client/src/interface_v3/view_text_id.h

@@ -122,7 +122,7 @@ protected:
 	// If true, setTextFormatted() is used instead of setText()
 	bool					_IsTextFormatTaged;
 
-	// Optionnal ucstring modifier
+	// Optional ucstring modifier
 	IOnReceiveTextId		*_StringModifier;
 
 	#if defined(NL_DEBUG)

code/ryzom/client/src/login.cpp

@@ -1580,7 +1580,7 @@ void initPatch()
 }
 
 // ***************************************************************************
-// Called after the check has been done. The page is full of optionnal categories that must be selected for patching
+// Called after the check has been done. The page is full of optional categories that must be selected for patching
 class CAHLoginPatch : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
@@ -1638,7 +1638,7 @@ class CAHLoginPatch : public IActionHandler
 REGISTER_ACTION_HANDLER (CAHLoginPatch, "login_patch");
 
 // ***************************************************************************
-// Called after the check has been done. The page is full of optionnal categories that must be selected for patching
+// Called after the check has been done. The page is full of optional categories that must be selected for patching
 class CAHClosePatch : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
@@ -2174,7 +2174,7 @@ void initDataScan()
 }
 
 // ***************************************************************************
-// Called after the check has been done. The page is full of optionnal categories that must be selected for patching
+// Called after the check has been done. The page is full of optional categories that must be selected for patching
 class CAHOnScanDataStart : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)

code/ryzom/client/src/login_patch.cpp

@@ -3018,10 +3018,10 @@ void CScanDataThread::run ()
 // ****************************************************************************
 uint32 CPatchManager::SPatchInfo::getAvailablePatchsBitfield() const
 {
-	// About the test (until a patch enum is added, we use the 'optionnal' flag)
+	// About the test (until a patch enum is added, we use the 'optional' flag)
-	// Non optionnal -> must patch it (will be for RoS)
+	// Non optional -> must patch it (will be for RoS)
-	// Optionnal -> Will be for Mainland
+	// Optional -> Will be for Mainland
-	// Required : stands for 'bnp' required by the Optionnal bnps !! so ignore only RoS is wanted
+	// Required : stands for 'bnp' required by the Optional bnps !! so ignore only RoS is wanted
 
 	uint32 result = 0;
 	if (!NonOptCat.empty())

code/ryzom/client/src/login_patch.h

@@ -89,7 +89,7 @@ public:
 	struct SFileToPatch
 	{
 		std::string			FileName;			// Dest file for the patch
-		std::string			SrcFileName;		// Optionnal src file to which apply patch (empty unless some version of the file, possibly with
+		std::string			SrcFileName;		// Optional src file to which apply patch (empty unless some version of the file, possibly with
 												// all patchs applied, was found in the /unpack directory due to a download by the background downloader)
 		std::vector<uint32>	Patches;
 		std::vector<uint32>	PatcheSizes;
@@ -178,7 +178,7 @@ public:
 	// if the checkThread ended and is ok then the getDesc* methods can be called
 	bool isCheckThreadEnded(bool &ok);
 
-	// Get all the optionnal categories to display for patching
+	// Get all the optional categories to display for patching
 	void getInfoToDisp(SPatchInfo &piOut);
 
 	void forceStopCheckThread();

code/ryzom/client/src/misc.cpp

@@ -400,11 +400,11 @@ bool computeAnimSet(const CAnimationSet *&animSet, MBEHAV::EMode mode, const str
 
 //-----------------------------------------------
 // dump :
-// Create a file with informations to debug.
+// Create a file with information to debug.
 //-----------------------------------------------
 void dump(const std::string &name)
 {
-	// Write informations to start as the version
+	// Write information to start as the version
 	COFile fStart;
 	if(fStart.open(name + "_start.rec", false, false))
 	{
@@ -477,7 +477,7 @@ void loadDump(const std::string &name)
 {
 	CVectorD currentPos;
 
-	// Load informations to start as the version
+	// Load information to start as the version
 	CIFile fStart;
 	if(fStart.open(name + "_start.rec", false))
 	{

code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp

@@ -55,7 +55,7 @@ CVariable<string>	SaveShardRoot("variables", "SaveShardRoot", "Root directory of
 // stats variables
 CVariable<NLMISC::TTime> BSLastAckTime("BSIF", "BSLastAckTime", "The timestamp of the last ack received from backup system", 0, 0, true);
 CVariable<NLMISC::TTime> BSTimeSinceLastAck("BSIF", "BSTimeSinceLastAck", "The time since the last ack from the backup system", 0, 0, true);
-CVariable<NLMISC::TTime> BSLastAckDelay("BSIF", "BSLastAckDelay", "The time it took for the last received ack to be recieved from slowest of our connected BS services", 0, 0, true);
+CVariable<NLMISC::TTime> BSLastAckDelay("BSIF", "BSLastAckDelay", "The time it took for the last received ack to be received from slowest of our connected BS services", 0, 0, true);
 CVariable<uint32>		 BSResponseTime("BSIF", "BSResponseTime", "Latest/average time (in sec) between BS request and response", 0, 20, false );
 
 
@@ -220,7 +220,7 @@ NLMISC::CSmartPtr<IBackupGenericAckCallback>	CBackupInterfaceSingleton::popGener
 	// if there are untreated callbacks in the generic responses container then yell
 	while (!_GenericResponses.empty() && sint32(_GenericResponses.front().first-requestId)<0)
 	{
-		STOP("Skipping untreated generic callback for request: "<<_GenericResponses.front().first<<" becuase we are treating request id: "<<requestId);
+		STOP("Skipping untreated generic callback for request: "<<_GenericResponses.front().first<<" because we are treating request id: "<<requestId);
 		_GenericResponses.pop_front();
 	}
 

code/ryzom/common/src/game_share/msg_ais_egs_gen.h

@@ -861,7 +861,7 @@ namespace RYMSG
 		bool	_DontFollow;
 		// if that bot is a building bot it will be caught by outpost system
 		bool	_BuildingBot;
-		// optionnal and rare properties
+		// optional and rare properties
 		std::vector< std::string >	_OptionalProperties;
 		// List of news channel.
 		std::vector< std::string >	_NewsChannels;
@@ -1224,7 +1224,7 @@ namespace RYMSG
 				_BuildingBot = value;
 
 		}
-			// optionnal and rare properties
+			// optional and rare properties
 		const std::vector< std::string > &getOptionalProperties() const
 		{
 			return _OptionalProperties;

code/ryzom/server/src/admin_modules/aes_client_module.cpp

@@ -183,7 +183,7 @@ namespace ADMIN
 			// precompute the service name
 			_ServiceAlias = makeServiceAlias();
 
-			// loop for an optionnal 'dontUseShardOrders' flag in init params
+			// loop for an optional 'dontUseShardOrders' flag in init params
 			const TParsedCommandLine *duso = pcl.getParam("dontUseShardOrders");
 			if (duso != NULL)
 				_DontUseShardOrders = (duso->ParamValue == "true" || duso->ParamName == "1");

code/ryzom/server/src/ai_share/primitive_parser.cpp

@@ -671,7 +671,7 @@ static void addGroupDescriptionToEventAction(const CAIAliasDescriptionNode *tree
 			case AITypeFolder:
 			{
 				string cname = nodeClass(child);
-				// parse optionnal group descriptions			
+				// parse optional group descriptions			
 				if (cname == "group_descriptions")
 				{										
 					CAIActions::exec("SETACTN", treeNode?treeNode->getAlias():uniqueId);

code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp

@@ -1280,7 +1280,7 @@ void CCreature::setBotDescription( const CGenNpcDescMsgImp& description )
 		_ContextTexts[i].second = description.getContextOptions()[i].getDetail();
 	}
 
-	// let's parse optionnal properties
+	// let's parse optional properties
 	for ( uint i = 0; i < description.getOptionalProperties().size(); i++ )
 	{
 		std::vector< std::string > result;

code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp

@@ -559,7 +559,7 @@ void CStaticBrick::readStaticBrick( const NLGEORGES::UFormElm &root, const NLMIS
 			if(bf != BRICK_FAMILIES::Unknown)
 				OptionalFamilies.insert( bf );
 			else
-				nlwarning("Unknown optionnal family %s",value.c_str());
+				nlwarning("Unknown optional family %s",value.c_str());
 		}
 	}
 	

code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp

@@ -58,7 +58,7 @@ void CAIInfosOnEntityMsgImp::callback (const std::string &name, NLNET::TServiceI
 	CEntityBase *entity = CEntityBaseManager::getEntityBasePtr(EntityRowId);
 	if (!entity)
 	{
-		nlwarning("<CAIInfosOnEntityMsgImp> recieved infos on unknown entity");
+		nlwarning("<CAIInfosOnEntityMsgImp> received infos on unknown entity");
 		return;
 	}
 

code/ryzom/server/src/entities_game_service/player_manager/cdb.h

@@ -327,7 +327,7 @@ protected:
 	/// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group
 	bool					_Atomic;
 
-	/// Optionnal callback pointer.
+	/// Optional callback pointer.
 	TNodeChangeCallback		_ChangeCallback;
 
 };

code/ryzom/server/src/entities_game_service/player_manager/character.h

@@ -1304,7 +1304,7 @@ public:
 	sint processMissionMultipleEvent( CMissionEvent & event, TAIAlias alias = CAIAliasTranslator::Invalid);
 	/// process a mission event for the missions took by this player
 	bool processMissionUserEvent(std::list< CMissionEvent* > & eventList,TAIAlias alias);
-	/// process a mission event for a specific mission and optionnally for a specific step
+	/// process a mission event for a specific mission and optionally for a specific step
 	bool processMissionStepUserEvent(std::list< CMissionEvent* > & eventList, uint missionAlias, uint32 stepIndex );
 	/// make a mission advance through bot chat
 	void botChatMissionAdvance( uint8 index );

code/ryzom/server/src/input_output_service/commands.cpp

@@ -615,7 +615,7 @@ NLMISC_COMMAND( displayChatClients, "Display the list of clients", "" )
 	return true;
 }
 
-NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionnaly, display universe chat group and/or player audience groups", "[universe] [player]" )
+NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionally, display universe chat group and/or player audience groups", "[universe] [player]" )
 {
 	bool displayUniverse = false;
 	bool playerAudience = false;
@@ -638,7 +638,7 @@ NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionnaly,
 	return true;
 }
 
-NLMISC_COMMAND( displayChatAudience, "Display the current chat dynamic audience for a player, optionnaly, force the update", "<playerId> [update]" )
+NLMISC_COMMAND( displayChatAudience, "Display the current chat dynamic audience for a player, optionally, force the update", "<playerId> [update]" )
 {
 	bool update = false;
 	if (args.size() < 1)

code/ryzom/server/src/logger_service/log_query.cpp

@@ -733,7 +733,7 @@ bool CQueryParser::parseDATE(CQueryParser::iterator &it, CQueryParser::iterator
 			goto noHour;
 		if (!parseINT(it, end))
 			goto noHour;
-		// optionnal sec
+		// optional sec
 		rew = it;
 		if (getNextToken(it, end).TokenType != tt_COLON)
 			goto noHour;

code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h

@@ -115,7 +115,7 @@ public:
 		return _VarName;
 	}
 	
-	/// Evaluate the content of the variable with an optionnal sub part.
+	/// Evaluate the content of the variable with an optional sub part.
 	virtual std::string evalVar(const std::string &subPart) = 0;
 	
 	/** Factory method to create new variable. Caller become responsible
@@ -435,7 +435,7 @@ public:
 	/** Install the generated script into the destination primitive files */
 	bool installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, const std::string &primFileName);
 
-	/// Publish the modified to the path paramater
+	/// Publish the modified to the path parameter
 	bool publishFiles(const std::string &serverPathPrim, const std::string &serverPathText, const std::string &localPathText);
 
 	/// Search for text in the file : add it if it's not in

code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp

@@ -1741,7 +1741,7 @@ class CContentKill : public CContentObjective
 
 		}
 
-		// add optionnal place
+		// add optional place
 		if (!_Place._VarValue.empty())
 		{
 			for (uint i=0; i<predef.size(); ++i)

code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp

@@ -448,7 +448,7 @@ public:
 				}
 			}
 		}
-		// look for an optionnal jump
+		// look for an optional jump
 		child = getPrimitiveChild(prim, TPrimitiveClassPredicate("jump_to"));
 		if (child)
 		{

code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp

@@ -457,7 +457,7 @@ private:
 	string					_ReqSkill;
 	/// The list of properties
 	vector<TItemProperty>	_Properties;
-	// Optionnal action (enchantement)
+	// Optional action (enchantement)
 	string					_Action;
 	// Name of the item
 	CPhrase					_ItemPhrase;

code/ryzom/tools/translation_tools/main.cpp

@@ -153,7 +153,7 @@ void showUsage(char *exeName)
 	LOG("    extract_bot_names [-r]\n");
 	LOG("    extract_new_sheet_names [-r]\n");
 	LOG("\n");
-	LOG("Language code are ISO 639-2 + optionnaly ISO 3166 country code.\n");
+	LOG("Language code are ISO 639-2 + optionally ISO 3166 country code.\n");
 	LOG("Reference language is always the first language in languages.txt\n");
 }