From 1e724738bab3c20ea8507acfdab4efddbee319fb Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 11 Feb 2013 22:24:48 +0100 Subject: [PATCH] Changed: French comments translated to English --- .../driver/opengl/mac/cocoa_event_emitter.cpp | 2 +- .../plugin_max/nel_patch_converter/script.cpp | 18 +++++++++--------- code/nel/tools/3d/tile_edit/TileCtrl.h | 2 +- .../src/interfaces_manager/chat_control.cpp | 2 +- .../ryzom/server/src/ai_service/ai_bot_npc.cpp | 4 ++-- .../server/src/ai_service/ai_grp_fauna.cpp | 8 ++++---- .../server/src/ai_service/alias_tree_owner.cpp | 2 +- .../server/src/ai_service/family_behavior.cpp | 2 +- .../building_manager/building_unit_test.cpp | 2 +- .../game_item_manager/player_inv_xchg.h | 2 +- .../game_item_manager/player_inventory.h | 2 +- .../outpost_manager/outpost.h | 2 +- .../outpost_manager/outpost_guild_db_updater.h | 6 +++--- .../outpost_manager/outpost_squad.h | 2 +- .../outpost_manager/outpost_version_adapter.h | 2 +- .../player_manager/character_respawn_points.h | 2 +- .../player_manager/item_service_manager.cpp | 4 ++-- .../player_manager/item_service_manager.h | 2 +- .../pvp_manager/pvp_safe_zone.h | 2 +- .../pvp_manager/pvp_zone.h | 6 +++--- .../server/src/entities_game_service/stat_db.h | 6 +++--- .../src/mail_forum_service/hof_generator.h | 2 +- .../mail_forum_service/shard_stat_db_manager.h | 10 +++++----- .../server/src/server_share/stat_db_tree.h | 2 +- .../src/server_share/stat_db_tree_visitor.h | 2 +- .../world_editor_plugin/plugin.cpp | 4 ++-- code/ryzom/tools/translation_tools/main.cpp | 2 +- 27 files changed, 51 insertions(+), 51 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp index 15bb40d28..d290e0cee 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp @@ -209,7 +209,7 @@ static bool isTextKeyEvent(NSEvent* event) /* TODO check why iswprint(character) does not solve it. - it always returns false, even for Ï€, é, ... + it always returns false, even for non-ASCII characters */ // characters > 127 but not printable if( nelKey == NLMISC::KeyF1 || nelKey == NLMISC::KeyF2 || diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp index c2e80e06b..8acae94bd 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp @@ -78,9 +78,9 @@ namespace std #include "nel/misc/file.h" #include "nel/misc/common.h" -#include "..\nel_patch_lib\rpo.h" -#include "..\nel_mesh_lib\export_nel.h" -#include "..\nel_mesh_lib\export_appdata.h" +#include "../nel_patch_lib/rpo.h" +#include "../nel_mesh_lib/export_nel.h" +#include "../nel_mesh_lib/export_appdata.h" #include "nel/3d/zone.h" #include "nel/3d/zone_symmetrisation.h" @@ -135,12 +135,12 @@ def_visible_primitive( set_tile_bank, "NelSetTileBank"); def_visible_primitive( export_zone, "ExportRykolZone"); def_visible_primitive( import_zone, "NeLImportZone"); -/* permettre l'acces Eauto/manual intrior edges -faire une methode pour interfacer la fonction compute interior edge -donner un acces Etiledmode/patchmode (on/off) -faire un getselectedvertex -faire un getselectedpatch -faire un getselectedtile */ +/* allows access to auto/manual interior edges +create a method to interface compute interior edge function +give access to tiledmode/patchmode (on/off) +use getselectedvertex +use getselectedpatch +use getselectedtile */ /*def_visible_primitive( set_interior_mode, "SetRykolInteriorMode"); def_visible_primitive( set_vertex_count, "GetRykolVertexCount");*/ diff --git a/code/nel/tools/3d/tile_edit/TileCtrl.h b/code/nel/tools/3d/tile_edit/TileCtrl.h index 9d1f54327..bbb5eca08 100644 --- a/code/nel/tools/3d/tile_edit/TileCtrl.h +++ b/code/nel/tools/3d/tile_edit/TileCtrl.h @@ -72,7 +72,7 @@ public: void DeleteAll(); //efface provisoirement les sections DIB et les *Bits; void Reload(CDC *pDC,tilelist::iterator iFirst,int n); //recharge en memoire une tranche de tiles int last_id; - tilelist::iterator iFirst,iLast; //index du premier et du dernier element chargé en memoire + tilelist::iterator iFirst,iLast; // first and last index loaded in memory }; diff --git a/code/ryzom/client/src/interfaces_manager/chat_control.cpp b/code/ryzom/client/src/interfaces_manager/chat_control.cpp index 9be33a153..44068c84a 100644 --- a/code/ryzom/client/src/interfaces_manager/chat_control.cpp +++ b/code/ryzom/client/src/interfaces_manager/chat_control.cpp @@ -274,7 +274,7 @@ void CChatControl::add(const ucstring &text) //----------------------------------------------- void CChatControl::display() { - // \todo GUIGUI : remove this damn thing after the UBI démo. + // \todo GUIGUI : remove this damn thing after the UBI demo. const CRGBA playerColors[10] = { CRGBA(250,250, 10), // 0 : Jaune diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp index a87b05865..cb183850e 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp @@ -875,9 +875,9 @@ Colors are something like that: 2: VERT CITRON VERT CITRON GREEN 3: VERT VERT TURQUOISE 4: BLEU BLEU BLUE -5: ROUGE foncé ROUGE (tout court) CRIMSON +5: ROUGE fonce ROUGE (tout court) CRIMSON 6: BLANC JAUNE WHITE -7: NOIR BLEU très foncé BLACK +7: NOIR BLEU tres fonce BLACK 3D column is (probably) used for equipment */ diff --git a/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp b/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp index bebaa89b3..2bab5200d 100644 --- a/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp +++ b/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp @@ -197,12 +197,12 @@ CBotFauna* CSpawnGroupFauna::findLeader() while (it!=itEnd) { CBotFauna* botPtr = static_cast(*it); - if (botPtr->isSpawned()) // si le bot est spawné. + if (botPtr->isSpawned()) // if bot is spawned { - if (botPtr->getSpawnObj()->isAlive()) // s'il est en vie. + if (botPtr->getSpawnObj()->isAlive()) // is alive { possibleLeader=botPtr; - if (_TargetPlace->atPlace(possibleLeader->getSpawn()->pos())) // et éventuellement s'il est dans la place. + if (_TargetPlace->atPlace(possibleLeader->getSpawn()->pos())) // and eventually in place return possibleLeader; } } @@ -1032,7 +1032,7 @@ void CGrpFauna::setPopulation(CPopulation* pop) if (pop && pop->size()==0) // no population record :( pop=NULL; - if (sameAliasPop) // Alias already présent ? + if (sameAliasPop) // Alias already present ? { index = sameAliasPop->getChildIndex(); _Populations.addChild(pop, index); // automatic deletion with smart pointers diff --git a/code/ryzom/server/src/ai_service/alias_tree_owner.cpp b/code/ryzom/server/src/ai_service/alias_tree_owner.cpp index fe47e9635..d8c963c9e 100644 --- a/code/ryzom/server/src/ai_service/alias_tree_owner.cpp +++ b/code/ryzom/server/src/ai_service/alias_tree_owner.cpp @@ -129,7 +129,7 @@ void CAliasTreeOwner::updateAliasTree(const CAIAliasDescriptionNode &newTree) CAliasTreeOwner* child = cont->getAliasChildByAlias(newAliasChild->getAlias()); if (!child) // a child related to this alias not yet exists .. { - // so we ask to create one objet of this type ( implémentation is specialized :) ) + // so we ask to create one objet of this type ( implementation is specialized :) ) // giving it the so precious CAIAliasDescriptionNode. // assumes that it adds the child to its parent ( check by the next assert ). child=childOwner->createChild(cont,newAliasChild); diff --git a/code/ryzom/server/src/ai_service/family_behavior.cpp b/code/ryzom/server/src/ai_service/family_behavior.cpp index f178c21b7..6612d19db 100644 --- a/code/ryzom/server/src/ai_service/family_behavior.cpp +++ b/code/ryzom/server/src/ai_service/family_behavior.cpp @@ -421,7 +421,7 @@ void CFamilyBehavior::update(uint32 nbTicks) || !grp->isSpawned()) break; -// rajouter un test sur la validité du groupe par rapport aux flags des zones occupées pour savoir s'il faut le despawner .. :) +// add a check if group is valid related to used regions flags to know if we need to despawn it bool alreadyDespawned=false; breakable diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp b/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp index a93bcf185..977696af7 100644 --- a/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp +++ b/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp @@ -66,7 +66,7 @@ static CEntityId createFakeCharacter(uint32 playerId, const string & name, EGSPD /** * Class used to test building manager - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h index ab468098b..65b875723 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h @@ -26,7 +26,7 @@ /** * CExchangeView * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Matthieu 'Trap' Besson * \author Nevrax France * \date February 2005 diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h index 76494810b..e88c9bf88 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h @@ -381,7 +381,7 @@ private: /** * CCharacterInvView * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date February 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h index a0f37df42..64b6c893d 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h @@ -34,7 +34,7 @@ * All classes in this file : * \author Nicolas Brigand * \author Olivier Cado - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Jérôme Vuarand * \author Nevrax France * \date 2005 diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h index 91c470eb2..55be3dbee 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h @@ -30,7 +30,7 @@ class COutpost; /** * Base class to manipulate the outpost guild client database. * - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date october 2005 */ @@ -102,7 +102,7 @@ private: /** * This class updates the outpost guild client database. * - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date october 2005 */ @@ -158,7 +158,7 @@ typedef NLMISC::CSmartPtr COutpostGuildDBUpdaterPtr; /** * This class clears the outpost guild client database. * - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date october 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h index 16ad90783..15e2040fd 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h @@ -25,7 +25,7 @@ * All classes in this file : * \author Nicolas Brigand * \author Olivier Cado - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Jérôme Vuarand * \author Nevrax France * \date 2005 diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h index 88eaea193..89fa637f7 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h @@ -22,7 +22,7 @@ class COutpost; /** * Singleton class used to adapt different version of COutpost - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h b/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h index 9c972748b..b53329096 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h @@ -34,7 +34,7 @@ class CCharacter; /** * CCharacterRespawnPoints * This class contains code and data relative to the player respawn points. - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp index c21346bbc..2644c4f87 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp @@ -48,7 +48,7 @@ CItemServiceManager * CItemServiceManager::_Instance = NULL; /** * Base class for persistent item service providers (ISP) * WARNING: this class should never modify client->getPersistentItemServices() vector (only CItemServiceManager should do) - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2005 */ @@ -76,7 +76,7 @@ private: /** * Base class for item service providers * WARNING: this class should never modify client->getPersistentItemServices() vector (only CItemServiceManager should do) - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h index ce2758b8a..c896fb13f 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h @@ -33,7 +33,7 @@ class IItemServiceProvider; /** * This class provides services associated to items (aka "item services") - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h index 5d51285b2..05f529ffe 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h @@ -26,7 +26,7 @@ /** * A PVP safe zone - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h index 8370a40d4..132c02d95 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h @@ -60,7 +60,7 @@ class CPVPSafeZone; /** * Base class of PVP zones - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ @@ -188,7 +188,7 @@ private: /** * A PVP versus zone : 2 clans fight there - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ @@ -257,7 +257,7 @@ private: /** * A PVP guild zone : guilds fight there - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ diff --git a/code/ryzom/server/src/entities_game_service/stat_db.h b/code/ryzom/server/src/entities_game_service/stat_db.h index 39ca77a67..ac25b1c5e 100644 --- a/code/ryzom/server/src/entities_game_service/stat_db.h +++ b/code/ryzom/server/src/entities_game_service/stat_db.h @@ -30,7 +30,7 @@ class CFileDescription; /** * This class collects leaves and furnishes their persistent data for backup * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -63,7 +63,7 @@ private: /** * This class collects all leaves and furnishes the message data for MFS init * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -83,7 +83,7 @@ private: /** * This class displays a node of SDB * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/mail_forum_service/hof_generator.h b/code/ryzom/server/src/mail_forum_service/hof_generator.h index a7b2774d6..96381d7ee 100644 --- a/code/ryzom/server/src/mail_forum_service/hof_generator.h +++ b/code/ryzom/server/src/mail_forum_service/hof_generator.h @@ -27,7 +27,7 @@ * It parses all the 'HoF Data Template' files (.hdt) * and generates data in PHP scripts for all shards * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h b/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h index 68b2f212c..dde776280 100644 --- a/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h +++ b/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h @@ -26,7 +26,7 @@ typedef NLMISC::CSmartPtr CShardStatDBPtr; /** * This class manages player and guild names for SDB * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -52,7 +52,7 @@ private: /** * This class displays a node of SDB * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -105,7 +105,7 @@ private: /** * This class provides a read-only access to a shard SDB copy * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -143,7 +143,7 @@ private: /** * A shard SDB copy * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -189,7 +189,7 @@ private: * This manager keeps copies of shard statistical databases up-to-date * and furnishes a read-only access to the shard SDB copies * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/server_share/stat_db_tree.h b/code/ryzom/server/src/server_share/stat_db_tree.h index 3b98be248..7e512a40f 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree.h +++ b/code/ryzom/server/src/server_share/stat_db_tree.h @@ -229,7 +229,7 @@ private: /** * This class removes entities (players and guilds) through a SDB node * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h index 6baf0242e..d4d44ee6f 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h +++ b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h @@ -27,7 +27,7 @@ class CStatDBTableLeaf; /** * SDB node visitor (visitor design pattern). * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp index ecd051b0b..3cf2a00b7 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp @@ -38,9 +38,9 @@ Voici la d -5) World_Editor_Service utilise un cache pour stocker les déplacements des joueurs, afin de n'envoyer que ce qui bouge +5) World_Editor_Service uses a cache to save players moves, to be able to send only moving entities -6) World_Editor_Plugin utilise aussi un cache avec un pointeur sur les Primitives, afin de ne modifier dans WE que ce qui bouge +6) World_Editor_Plugin uses too a cache with a pointer on Primitives, to modify only moving entities in WE */ #include "stdafx.h" diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp index d8839f1ff..3ec5a8b4a 100644 --- a/code/ryzom/tools/translation_tools/main.cpp +++ b/code/ryzom/tools/translation_tools/main.cpp @@ -3139,7 +3139,7 @@ int main(int argc, char *argv[]) { uint64 hash = makeHash(ucstring("Bonjour le monde !")); nldebug("%s", hashToString(hash).c_str()); - hash = makeHash(ucstring("Une autre cléf")); + hash = makeHash(ucstring("Une autre clef")); nldebug("%s", hashToString(hash).c_str()); } */