From a845c5158e7931561d92180738092d240d44d0aa Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 25 Jun 2018 14:31:17 +0300 Subject: [PATCH] Typo-fix by Kunda http://www.salome-platform.org/forum/forum_9/625363577 --- bin/salome_utils.py | 2 +- src/AppQuickStart/app-template/CMakeLists.txt | 4 ++-- src/Container/SALOME_ContainerManager.cxx | 4 ++-- src/DSC/DSC_User/Datastream/Calcium/calciumP.h | 2 +- src/KERNEL_PY/kernel/kernelpy_autotest.sh.in | 2 +- src/Launcher/BatchTest.cxx | 4 ++-- src/Launcher/Launcher_Job.cxx | 2 +- src/Logger/SALOME_Trace.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx | 4 ++-- src/SALOMELocalTrace/utilities.h | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/salome_utils.py b/bin/salome_utils.py index 5c2297330..d3a91ebf0 100644 --- a/bin/salome_utils.py +++ b/bin/salome_utils.py @@ -244,7 +244,7 @@ def getTmpDir(): def generateFileName( dir, prefix = None, suffix = None, extension = None, unique = False, separator = "_", hidden = False, **kwargs ): """ - Generate file name by sepecified parameters. If necessary, file name + Generate file name by specified parameters. If necessary, file name can be generated to be unique. Parameters: diff --git a/src/AppQuickStart/app-template/CMakeLists.txt b/src/AppQuickStart/app-template/CMakeLists.txt index f1c320af5..44e0f1774 100644 --- a/src/AppQuickStart/app-template/CMakeLists.txt +++ b/src/AppQuickStart/app-template/CMakeLists.txt @@ -49,7 +49,7 @@ SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL" IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") FIND_PACKAGE(SalomeKERNEL REQUIRED) - KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA + KERNEL_WITH_CORBA() # check whether KERNEL built with CORBA ELSE(EXISTS ${KERNEL_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) @@ -79,7 +79,7 @@ SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI REQUIRED) - SALOME_GUI_WITH_CORBA() #remove this line if you don't need GUI module builded with CORBA + SALOME_GUI_WITH_CORBA() #remove this line if you don't need GUI module built with CORBA #remove unnecessary options from this list (see SALOME_GUI_MODE() macro description) SALOME_GUI_MODE(SALOME_USE_SALOMEOBJECT SALOME_USE_OCCVIEWER SALOME_USE_VTKVIEWER SALOME_USE_PYCONSOLE OPTIONAL SALOME_USE_PLOT2DVIEWER SALOME_USE_GLVIEWER SALOME_USE_GRAPHICSVIEW diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index 81ff3e15f..12a34fb7a 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -1621,7 +1621,7 @@ SALOME_ContainerManager::BuildCommandToLaunchPaCOProxyContainer(const Engines::C remote_execution = true; } - // Log environnement + // Log environment std::string log_type(""); char * get_val = GetenvThreadSafe("PARALLEL_LOG"); if (get_val) @@ -1687,7 +1687,7 @@ SALOME_ContainerManager::BuildCommandToLaunchPaCONodeContainer(const Engines::Co ParserResourcesType resource_definition = _resManager->GetResourceDefinition(params.resource_params.name.in()); - // Log environnement + // Log environment std::string log_type(""); char * get_val = GetenvThreadSafe("PARALLEL_LOG"); if (get_val) diff --git a/src/DSC/DSC_User/Datastream/Calcium/calciumP.h b/src/DSC/DSC_User/Datastream/Calcium/calciumP.h index 695e92fe5..f0836b52f 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/calciumP.h +++ b/src/DSC/DSC_User/Datastream/Calcium/calciumP.h @@ -510,7 +510,7 @@ "Error in instance launching", "Communication error", "Error in the instance", - "Environnement variable CAL_MODE is not set", + "Environment variable CAL_MODE is not set", "Disconnected instance", }; diff --git a/src/KERNEL_PY/kernel/kernelpy_autotest.sh.in b/src/KERNEL_PY/kernel/kernelpy_autotest.sh.in index c8eb0232f..a8e6a1899 100644 --- a/src/KERNEL_PY/kernel/kernelpy_autotest.sh.in +++ b/src/KERNEL_PY/kernel/kernelpy_autotest.sh.in @@ -30,7 +30,7 @@ # # This first list does not need a SALOME application. Only the -# environnement is required (for example, run these script in a +# environment is required (for example, run these script in a # session obtained with runSession listfiles="\ unittester.py \ diff --git a/src/Launcher/BatchTest.cxx b/src/Launcher/BatchTest.cxx index c9b96b257..0517ab4d5 100644 --- a/src/Launcher/BatchTest.cxx +++ b/src/Launcher/BatchTest.cxx @@ -172,13 +172,13 @@ BatchTest::test_filecopy() return result; } - // Writing into the tempory file + // Writing into the temporary file command = "echo Hello > " + _test_filename; status = system(command.c_str()); if(status) { std::ostringstream oss; oss << status; - result += "Error in creating tempory file ! status = "; + result += "Error in creating temporary file ! status = "; result += oss.str(); return result; } diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx index 0541c5cd0..cbe54ef97 100644 --- a/src/Launcher/Launcher_Job.cxx +++ b/src/Launcher/Launcher_Job.cxx @@ -659,7 +659,7 @@ Launcher::Job::common_job_params() params[Batch::LAUNCHER_FILE] = _launcher_file; params[Batch::LAUNCHER_ARGS] = _launcher_args; - // If result_directory is not defined, we use HOME environnement + // If result_directory is not defined, we use HOME environment if (_result_directory == "") #ifndef WIN32 _result_directory = getenv("HOME"); diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx index 2278daa99..e10e70396 100644 --- a/src/Logger/SALOME_Trace.cxx +++ b/src/Logger/SALOME_Trace.cxx @@ -71,7 +71,7 @@ int SALOME_Trace::Initialize(CORBA::ORB_ptr theOrb) { CORBA::Object_var theObj; CORBA::Object_var obj; - // searchin for naming service for 0.25*40=10 seconds + // searching for naming service for 0.25*40=10 seconds for (i = 1; i <= NumberOfTries; i++) { #ifndef WIN32 if (i != 1) nanosleep(&ts_req,&ts_rem); diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx index ac12499f3..8beba4c6f 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx @@ -145,8 +145,8 @@ public: static std::string getStudyScript(SALOMEDSImpl_Study* study, int savePoint, const std::string& theID = ""); /*! - Returns a default Python script that set ups visual parameters for the given module - shift is a string that contain spaces to make valid Python script indentaion + Returns a default Python script that sets up visual parameters for the given module + shift is a string that contain spaces to make valid Python script indentation */ static std::string getDefaultScript(SALOMEDSImpl_Study* study, const std::string& moduleName, diff --git a/src/SALOMELocalTrace/utilities.h b/src/SALOMELocalTrace/utilities.h index dbfa0d34b..e2d34fd4f 100644 --- a/src/SALOMELocalTrace/utilities.h +++ b/src/SALOMELocalTrace/utilities.h @@ -55,7 +55,7 @@ #define MESS_END std::endl; LocalTraceBufferPool::instance()->insert(NORMAL_MESS, os.str().c_str()); #define MESS_ABORT std::endl; LocalTraceBufferPool::instance()->insert(ABORT_MESS, os.str().c_str()); -// Macroses for messages with separated structure in c++ file in _DUBUG mode +// Macros for messages with separated structure in c++ file in _DEBUG mode #define MESSAGE_BEGIN(msg) {std::ostringstream ss; ss <<__FILE__ <<" ["<<__LINE__<<"] : "<< msg; LocalTraceBufferPool::instance()->insert(NORMAL_MESS, ss.str().c_str());} #define MESSAGE_ADD(msg) {std::ostringstream ss; ss << msg; LocalTraceBufferPool::instance()->insert(NORMAL_MESS, ss.str().c_str());} #define MESSAGE_END(msg) {std::ostringstream ss; ss << msg << std::endl; LocalTraceBufferPool::instance()->insert(NORMAL_MESS, ss.str().c_str());} -- 2.39.2