suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Application.cpp English editing

Browse Source 
Edit English in comments and warning messages
This commit is contained in:
Timothy Hobbs 2015-12-12 01:22:14 +01:00
parent 3dcc557e65
commit 7da3c663c6
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/App/Application.cpp
View File

@ -281,7 +281,7 @@ void Application::renameDocument(const char *OldName, const char *NewName)
Document* Application::newDocument(const char * Name, const char * UserName)
{
// get anyway a valid name!
// get a valid name anyway!
if (!Name || Name[0] == '\0')
Name = "Unnamed";
string name = getUniqueDocumentName(Name);
@ -342,7 +342,7 @@ bool Application::closeDocument(const char* name)
return false;
// Trigger observers before removing the document from the internal map.
// Some observers might rely on that this document is still there.
// Some observers might rely on this document still being there.
signalDeleteDocument(*pos->second);
// For exception-safety use a smart pointer
@ -478,7 +478,7 @@ void Application::setActiveDocument(Document* pDoc)
void Application::setActiveDocument(const char *Name)
{
// Allows that no active document is set.
// If no active document is set, resort to a default.
if (*Name == '\0') {
_pActiveDoc = 0;
return;
@ -632,7 +632,7 @@ void Application::addImportType(const char* Type, const char* ModuleName)
pos = item.filter.find("*.", next);
}
// Due to branding stuff replace FreeCAD through the application name
// Due to branding stuff replace "FreeCAD" with the branded application name
if (strncmp(Type, "FreeCAD", 7) == 0) {
std::string AppName = Config()["ExeName"];
AppName += item.filter.substr(7);
@ -745,7 +745,7 @@ void Application::addExportType(const char* Type, const char* ModuleName)
pos = item.filter.find("*.", next);
}
// Due to branding stuff replace FreeCAD through the application name
// Due to branding stuff replace "FreeCAD" with the branded application name
if (strncmp(Type, "FreeCAD", 7) == 0) {
std::string AppName = Config()["ExeName"];
AppName += item.filter.substr(7);
@ -977,7 +977,7 @@ void my_terminate_handler()
void unexpection_error_handler()
{
std::cerr << "Unexpected error occurred..." << std::endl;
// try to throw to give the user evantually a change to save
// try to throw an exception and give the user chance to save their work
#if !defined(_DEBUG)
throw Base::Exception("Unexpected error occurred! Please save your work under a new file name and restart the application!");
#endif
@ -1032,7 +1032,7 @@ void Application::init(int argc, char ** argv)
initApplication();
}
catch (...) {
// force to flush the log
// force the log to flush
destructObserver();
throw;
}
@ -1327,7 +1327,7 @@ void Application::processFiles(const std::list<std::string>& files)
Base::Interpreter().loadModule(file.fileNamePure().c_str());
}
catch(const PyException&) {
// if module load not work, just try run the script (run in __main__)
// if loading the module does not work, try just running the script (run in __main__)
Base::Interpreter().runFile(file.filePath().c_str(),true);
}
}
@ -1449,9 +1449,9 @@ void Application::LoadParameters(void)
if (_pcSysParamMngr->LoadOrCreateDocument(mConfig["SystemParameter"].c_str()) && !(mConfig["Verbose"] == "Strict")) {
// Configuration file optional when using as Python module
if (!Py_IsInitialized()) {
Console().Warning(" Parameter not existing, write initial one\n");
Console().Message(" This warning normally means that FreeCAD is running the first time\n"
" or the configuration was deleted or moved. Build up the standard\n"
Console().Warning(" Parameter does not exist, writing initial one\n");
Console().Message(" This warning normally means that FreeCAD is running for the first time\n"
" or the configuration was deleted or moved. FreeCAD is generating the standard\n"
" configuration.\n");
}
}
@ -1483,10 +1483,10 @@ void Application::LoadParameters(void)
// Configuration file optional when using as Python module
if (!Py_IsInitialized()) {
Console().Warning(" User settings not existing, write initial one\n");
Console().Message(" This warning normally means that FreeCAD is running the first time\n"
Console().Warning(" User settings do not exist, writing initial one\n");
Console().Message(" This warning normally means that FreeCAD is running for the first time\n"
" or your configuration was deleted or moved. The system defaults\n"
" will be reestablished for you.\n");
" will be automatically generated for you.\n");
}
}
}
@ -1511,7 +1511,7 @@ namespace boost { namespace program_options {
#endif
#endif
#if 0 // it seemse the SUSE has fixed the broken boost package
#if 0 // it seems that SUSE has fixed the broken boost package
// reported for SUSE in issue #0000208
#if defined(__GNUC__)
#if BOOST_VERSION == 104400
@ -1578,7 +1578,7 @@ ostream& operator<<(ostream& os, const vector<T>& v)
void Application::ParseOptions(int ac, char ** av)
{
// Declare a group of options that will be
// allowed only on command line
// allowed only on the command line
options_description generic("Generic options");
generic.add_options()
("version,v", "Prints version string")
@ -1590,8 +1590,8 @@ void Application::ParseOptions(int ac, char ** av)
;
// Declare a group of options that will be
// allowed both on command line and in
// config file
// allowed both on the command line and in
// the config file
std::string descr("Writes a log file to:\n");
descr += mConfig["UserAppData"];
descr += mConfig["ExeName"];
@ -1610,8 +1610,8 @@ void Application::ParseOptions(int ac, char ** av)
;
// Hidden options, will be allowed both on command line and
// in config file, but will not be shown to the user.
// Hidden options, will be allowed both on the command line and
// in the config file, but will not be shown to the user.
boost::program_options::options_description hidden("Hidden options");
hidden.add_options()
("input-file", boost::program_options::value< vector<string> >(), "input file")
@ -1642,7 +1642,7 @@ void Application::ParseOptions(int ac, char ** av)
#endif
;
// Ignored options, will be savely ignored. Mostly uses by underlaying libs.
// Ignored options, will be safely ignored. Mostly used by underlaying libs.
//boost::program_options::options_description x11("X11 options");
//x11.add_options()
// ("display", boost::program_options::value< string >(), "set the X-Server")
@ -1859,7 +1859,7 @@ void Application::ExtractUserPath()
mConfig["DocPath"] = mConfig["AppHomePath"] + "doc" + PATHSEP;
#if defined(FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_BSD)
// Default paths for the user depending stuff on the platform
// Default paths for the user specific stuff
struct passwd *pwd = getpwuid(getuid());
if (pwd == NULL)
throw Base::Exception("Getting HOME path from system failed!");
@ -1873,8 +1873,8 @@ void Application::ExtractUserPath()
throw Base::Exception(str.str());
}
// Try to write into our data path, therefore we must create some directories, first.
// If 'AppDataSkipVendor' is defined the value of 'ExeVendor' must not be part of
// In order to write into our data path, we must create some directories, first.
// If 'AppDataSkipVendor' is defined, the value of 'ExeVendor' must not be part of
// the path.
appData += PATHSEP;
appData += ".";
@ -1911,7 +1911,7 @@ void Application::ExtractUserPath()
mConfig["UserAppData"] = appData;
#elif defined(FC_OS_MACOSX)
// Default paths for the user depending stuff on the platform
// Default paths for the user specific stuff on the platform
struct passwd *pwd = getpwuid(getuid());
if (pwd == NULL)
throw Base::Exception("Getting HOME path from system failed!");
@ -1929,7 +1929,7 @@ void Application::ExtractUserPath()
throw Base::Exception(str.str());
}
// Try to write into our data path, therefore we must create some directories, first.
// In order to write to our data path, we must create some directories, first.
// If 'AppDataSkipVendor' is defined the value of 'ExeVendor' must not be part of
// the path.
appData += PATHSEP;
@ -1994,7 +1994,7 @@ void Application::ExtractUserPath()
throw Base::Exception(str.str());
}
// Try to write into our data path, therefore we must create some directories, first.
// In order to write to our data path we must create some directories first.
// If 'AppDataSkipVendor' is defined the value of 'ExeVendor' must not be part of
// the path.
if (mConfig.find("AppDataSkipVendor") == mConfig.end()) {
@ -2042,7 +2042,7 @@ void Application::ExtractUserPath()
std::string Application::FindHomePath(const char* sCall)
{
// We have three ways to start this application either use one of the both executables or
// We have three ways to start this application either use one of the two executables or
// import the FreeCAD.so module from a running Python session. In the latter case the
// Python interpreter is already initialized.
std::string absPath;
@ -2115,7 +2115,7 @@ std::string Application::FindHomePath(const char* call)
#elif defined (FC_OS_WIN32)
std::string Application::FindHomePath(const char* sCall)
{
// We have three ways to start this application either use one of the both executables or
// We have three ways to start this application either use one of the two executables or
// import the FreeCAD.pyd module from a running Python session. In the latter case the
// Python interpreter is already initialized.
wchar_t szFileName [MAX_PATH];