diff --git a/README.md b/README.md index cf4f5d77..b7b89208 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is a fork of [EdytorNC](https://github.com/artur3/EdytorNC), a text editor for CNC programmers. - [Some features](#some-features) -- [Some shotcuts](#some-shotcuts) +- [Some shortcuts](#some-shortcuts) - [Getting GCodeWorkShop](#getting-gcodeworkshop) - [Command line options](#command-line-options) @@ -37,7 +37,7 @@ Some features * Solutions of triangles calculation -Some shotcuts +Some shortcuts ------------ * `Ctrl+;` Comments/uncomments selected text with semicolon ; @@ -49,7 +49,7 @@ Some shotcuts operations directly in editor. You can select address (eg `X123.45`) before pressing `Ctrl+0` (`Ctrl+Double Click` will do the same), value will be entered in the calc. - After presing `Enter` (and if no error) result will be pasted in cursor + After pressing `Enter` (and if no error) result will be pasted in cursor position. Supported operators: `+` `-` `*` `/` `SIN(x)` `COS(x)` `TAN(x)` `SQRT(x)` `SQR(x)` `ABS(x)` `TRUNC(x)` `PI` diff --git a/addons/src/bhc/bhcdialog.cpp b/addons/src/bhc/bhcdialog.cpp index 090e47a9..643bc1b2 100644 --- a/addons/src/bhc/bhcdialog.cpp +++ b/addons/src/bhc/bhcdialog.cpp @@ -429,7 +429,7 @@ void BHCDialog::computeButtonClicked() drawing->printText(textPosX, textPosY, 2 - dir, QString(tr("Angle of first hole : %1")).arg(firstAngle), col); drawing->printText(textPosX, textPosY, 3 - dir, - QString(tr("Angle beetwen holes : %1")).arg(angleBeetwen), col); + QString(tr("Angle between holes : %1")).arg(angleBeetwen), col); drawing->printText(textPosX, textPosY, 4 - dir, QString(tr("Center position : X%1 Y%2")).arg(xCenter).arg(yCenter), col); firstAngle += roate; diff --git a/addons/src/bhc/bhctab.ui b/addons/src/bhc/bhctab.ui index ac8e96d8..a4bb5627 100644 --- a/addons/src/bhc/bhctab.ui +++ b/addons/src/bhc/bhctab.ui @@ -145,7 +145,7 @@ - Angle beetwen holes : + Angle between holes : angleBeetwenInput diff --git a/addons/src/compilemacro/utils-compilemacro.cpp b/addons/src/compilemacro/utils-compilemacro.cpp index 3ba466db..e6ef4e49 100644 --- a/addons/src/compilemacro/utils-compilemacro.cpp +++ b/addons/src/compilemacro/utils-compilemacro.cpp @@ -194,7 +194,7 @@ void Utils::CompileMacro::setError(int error, const QString& tx) break; case ERR_DOUBLE_DOT: - m_status = tr("Decimal point or minus writed two times !\n\"%1\"").arg(tx); + m_status = tr("Decimal point or minus written two times !\n\"%1\"").arg(tx); break; default: diff --git a/addons/src/renumber/renumberdialog.ui b/addons/src/renumber/renumberdialog.ui index f98f9dd7..c5d35a7c 100644 --- a/addons/src/renumber/renumberdialog.ui +++ b/addons/src/renumber/renumberdialog.ui @@ -213,7 +213,7 @@ true - Just write N at begining of line and use this function to replace N with correct line number + Just write N at beginning of line and use this function to replace N with correct line number Renumber lines marked 'N' diff --git a/common.pri b/common.pri index 7c49439b..af7eef73 100644 --- a/common.pri +++ b/common.pri @@ -7,7 +7,7 @@ CONFIG(debug, debug|release) { CONFIG *= warn_on } else { BUILD_FLAG = release - # Supress debug message + # Suppress debug message DEFINES *= QT_NO_DEBUG_OUTPUT # QT_NO_INFO_OUTPUT } diff --git a/gcodefileserver/gcodefileserver.cpp b/gcodefileserver/gcodefileserver.cpp index 254bd5b1..39c7c974 100644 --- a/gcodefileserver/gcodefileserver.cpp +++ b/gcodefileserver/gcodefileserver.cpp @@ -100,7 +100,7 @@ GCodeFileServer::~GCodeFileServer() void GCodeFileServer::closeEvent(QCloseEvent* event) { // QMessageBox::StandardButton result = QMessageBox::warning(this, tr("GCodeWorkShop - Serial port file server"), - // tr("You are trying to close a file server.\nAre you shure?"), + // tr("You are trying to close a file server.\nAre you sure?"), // QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); // if(result == QMessageBox::No) diff --git a/gcodeshared/include/utils/configpage.h b/gcodeshared/include/utils/configpage.h index 8d8be079..3c370a6d 100644 --- a/gcodeshared/include/utils/configpage.h +++ b/gcodeshared/include/utils/configpage.h @@ -113,14 +113,14 @@ public slots: /** * @brief Actions when confirm the changes made. * - * This is happend by pressing the "OK" button. + * This occurs when pressing the "OK" button. */ virtual void accept() {} /** * @brief Actions when rejecting the changes made. * - * This is happend by pressing the "Cancel" button. If you have @link start() backup@endlink + * This occurs when pressing the "Cancel" button. If you have @link start() backup@endlink * your settings, it's time to apply them. */ virtual void reject() {} @@ -128,7 +128,7 @@ public slots: /** * @brief Actions when requesting default settings. * - * This is happend by pressing the "Default" button. If you implement this feature, + * This occurs when pressing the "Default" button. If you implement this feature, * override the hasReset() function so that it returns @c true. */ virtual void reset() {} diff --git a/gcodeshared/serialportconfigdialog.ui b/gcodeshared/serialportconfigdialog.ui index 13ba4d3e..4e8e109d 100644 --- a/gcodeshared/serialportconfigdialog.ui +++ b/gcodeshared/serialportconfigdialog.ui @@ -647,7 +647,7 @@ Set XON or XOFF to 0 if you want disable it. Automatically close transmission dialog after the last character was sent/received. -This setting is also used in file server mode to detect end of incoming transmission and gives time to operator to swich CNC into reciving mode. +This setting is also used in file server mode to detect end of incoming transmission and gives time to operator to switch CNC into receiving mode. s @@ -742,7 +742,7 @@ Works only when receiving file. - Delete all control chracters (<0x3F; >0x7F) from recieved file + Delete all control characters (<0x3F; >0x7F) from received file Delete control chars @@ -775,7 +775,7 @@ Works only when receiving file. Use this to remove some unwanted characters from received data. -Vailid QtRegExp should be entered. +Valid QtRegExp should be entered. 128 @@ -944,7 +944,7 @@ Vailid QtRegExp should be entered. - <html><head/><body><p>These characters will be added at the end of the program.</p><p>You can write here:</p><p> Plain text</p><p>AND/OR</p><p> Hex codes of ASCII characters.</p><p> Example: </p><p> % 0x0A 0x0D - % and new line characters</p><p> 0x20 0x0A 0x0D - space character and new line characters</p><p> Space and control characters can only be written as hex numbers:</p><p> 0x20 (space), 0x13 (XOFF), 0x11 (XON) ...</p><p>AND/OR</p><p> Special characters codes can be used:</p><p> LF - Line Feed also Carrige Return (replaced later by end of block characters)</p><p> SP - Space</p><p> TAB - Tabulation</p><p> FN - File name</p><p> FE - File name Extension (part after dot)</p><p> FA - File name extension Appended at end of file name (part after _ character and before dot)</p></body></html> + <html><head/><body><p>These characters will be added at the end of the program.</p><p>You can write here:</p><p> Plain text</p><p>AND/OR</p><p> Hex codes of ASCII characters.</p><p> Example: </p><p> % 0x0A 0x0D - % and new line characters</p><p> 0x20 0x0A 0x0D - space character and new line characters</p><p> Space and control characters can only be written as hex numbers:</p><p> 0x20 (space), 0x13 (XOFF), 0x11 (XON) ...</p><p>AND/OR</p><p> Special characters codes can be used:</p><p> LF - Line Feed also Carriage Return (replaced later by end of block characters)</p><p> SP - Space</p><p> TAB - Tabulation</p><p> FN - File name</p><p> FE - File name Extension (part after dot)</p><p> FA - File name extension Appended at end of file name (part after _ character and before dot)</p></body></html> 128 @@ -963,7 +963,7 @@ Vailid QtRegExp should be entered. - <html><head/><body><p>These characters will be added at the beginning of the program. </p><p>You can write here:</p><p> Plain text</p><p>AND/OR</p><p> Hex codes of ASCII characters.</p><p> Example: </p><p> % 0x0A 0x0D - % and new line characters</p><p> 0x20 0x0A 0x0D - space character and new line characters</p><p> Space and control characters can only be written as hex numbers:</p><p> 0x20 (space), 0x13 (XOFF), 0x11 (XON) ...</p><p>AND/OR</p><p> Special characters codes can be used:</p><p> LF - Line Feed also Carrige Return (replaced later by end of block characters)</p><p> SP - Space</p><p> TAB - Tabulation</p><p> FN - File name</p><p> FE - File name Extension (part after dot)</p><p> FA - File name extension Appended at end of file name (part after _ character and before dot)</p></body></html> + <html><head/><body><p>These characters will be added at the beginning of the program. </p><p>You can write here:</p><p> Plain text</p><p>AND/OR</p><p> Hex codes of ASCII characters.</p><p> Example: </p><p> % 0x0A 0x0D - % and new line characters</p><p> 0x20 0x0A 0x0D - space character and new line characters</p><p> Space and control characters can only be written as hex numbers:</p><p> 0x20 (space), 0x13 (XOFF), 0x11 (XON) ...</p><p>AND/OR</p><p> Special characters codes can be used:</p><p> LF - Line Feed also Carriage Return (replaced later by end of block characters)</p><p> SP - Space</p><p> TAB - Tabulation</p><p> FN - File name</p><p> FE - File name Extension (part after dot)</p><p> FA - File name extension Appended at end of file name (part after _ character and before dot)</p></body></html> 128 @@ -1012,7 +1012,7 @@ Vailid QtRegExp should be entered. - Line (block) endings charcters. + Line (block) endings characters. Only uppercase LF, CR character are allowed. @@ -1172,7 +1172,7 @@ Only uppercase LF, CR character are allowed. If 0 then waits for XON, if >0 waits for timeout or XON, which one first. -This setting works also with hardware flow control, put 0 to XON or XOFF characters to start trasmission without waiting for XON. +This setting works also with hardware flow control, put 0 to XON or XOFF characters to start transmission without waiting for XON. This setting is ignored in serial File Server. @@ -1303,7 +1303,7 @@ If the file name has not been automatically detected, the file name will be the - <html><head/><body><p>If checked, filename of program to save will be taken from program name eg O0051, :1246, %MPF456, %_N_PR25475002_MPF, $O0004.MIN%... </p><p>If filename will be empty (not found) user definied regular expression will be used. If not found date-time code will be uased as filename. </p><p><br/></p><p>If checked, user definied regular expression will be used first, if not found name of program will be used and if not found date-code.</p><p><br/></p></body></html> + <html><head/><body><p>If checked, filename of program to save will be taken from program name eg O0051, :1246, %MPF456, %_N_PR25475002_MPF, $O0004.MIN%... </p><p>If filename will be empty (not found) user defined regular expression will be used. If not found date-time code will be uased as filename. </p><p><br/></p><p>If checked, user defined regular expression will be used first, if not found name of program will be used and if not found date-code.</p><p><br/></p></body></html> Built-in name detection diff --git a/gcodeshared/serialporttestdialog.cpp b/gcodeshared/serialporttestdialog.cpp index 4ff5c936..b554fcc6 100644 --- a/gcodeshared/serialporttestdialog.cpp +++ b/gcodeshared/serialporttestdialog.cpp @@ -320,7 +320,7 @@ void SerialPortTestDialog::updateLeds() } count++; - errorLabel->setText(tr("Recived: %1 bytes.").arg(count)); + errorLabel->setText(tr("Received: %1 bytes.").arg(count)); tx = ch; qApp->processEvents(); @@ -430,7 +430,7 @@ void SerialPortTestDialog::showError(int error) { switch (error) { case QSerialPort::NoError: - errorLabel->setText("No Error has occured"); + errorLabel->setText("No Error has occurred"); break; case QSerialPort::DeviceNotFoundError: diff --git a/gcodeshared/serialtransmissiondialog.cpp b/gcodeshared/serialtransmissiondialog.cpp index 656cd7c2..9d68af71 100644 --- a/gcodeshared/serialtransmissiondialog.cpp +++ b/gcodeshared/serialtransmissiondialog.cpp @@ -295,7 +295,7 @@ void SerialTransmissionDialog::updateStatus() } } } else { - if (writeBufferIterator != serialPortWriteBuffer.end()) { // try to restart trasmission + if (writeBufferIterator != serialPortWriteBuffer.end()) { // try to restart transmission serialPortBytesWritten(0); } @@ -351,7 +351,7 @@ void SerialTransmissionDialog::showSerialPortError(QSerialPort::SerialPortError switch (error) { case QSerialPort::NoError: - text = tr("No Error has occured"); + text = tr("No Error has occurred"); //statusBar()->showMessage(text); return; @@ -457,7 +457,7 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes) sendTimeoutCountner = 0; sendTimeoutTimer->stop(); setLabelText(tr("OK:\t Sending completed."), serverMode, true); - setLabelText(tr("Wainting for data...")); + setLabelText(tr("Waiting for data...")); setRange(0, 0); } else { autoCloseCountner = portSettings.autoCloseTimeout; @@ -530,7 +530,7 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes) // if(QString(buff).contains(endOfProgChar) && (!endOfProgChar.isEmpty())) // { // qDebug() << "endOfProgChar" << endOfProgChar; -// qDebug() << "Procces data" << processReceivedData(); +// qDebug() << "Process data" << processReceivedData(); // } // } @@ -695,7 +695,7 @@ void SerialTransmissionDialog::prepareDataBeforeSending(QString* data) auto behavior = Qt::SkipEmptyParts; #endif serialPortWriteBuffer = data->split("\n", behavior); - // insert line endings. \r is replaced with choosen line ending + // insert line endings. \r is replaced with chosen line ending serialPortWriteBuffer.replaceInStrings("\r", portSettings.eobChar); noOfBytes = serialPortWriteBuffer.join("").length(); // get new size @@ -1116,7 +1116,7 @@ QStringList SerialTransmissionDialog::guessFileName(QString* text) } //************************************************************************************************** -// Save received program to a file. Return filename and empty program text if succes or leave program text unchanged +// Save received program to a file. Return filename and empty program text if successful or leave program text unchanged //************************************************************************************************** QString SerialTransmissionDialog::saveDataToFile(QString* text) @@ -1474,7 +1474,7 @@ void SerialTransmissionDialog::fileServerBytesWritten(qint64 bytes) void SerialTransmissionDialog::sendTimeoutTimerTimeout() { if (sendTimeoutCountner == 0) { - setLabelText(tr("ERROR:\t Sending timedout. Reseting."), serverMode, true); + setLabelText(tr("ERROR:\t Sending timedout. Resetting."), serverMode, true); sendTimeoutTimer->stop(); reset(false); return; diff --git a/gcodeshared/utils/medium.cpp b/gcodeshared/utils/medium.cpp index 65a57870..8270dae8 100644 --- a/gcodeshared/utils/medium.cpp +++ b/gcodeshared/utils/medium.cpp @@ -64,10 +64,10 @@ Medium::Medium(QObject* parent) : setupDirs(); mShareDirs.append(COLON); - qDebug() << "Seting directoryes:"; + qDebug() << "Setting directories:"; qDebug() << " translation " << mTranslationDirs; qDebug() << " config " << mSettingsDir; - qDebug() << " programm data " << mShareDirs; + qDebug() << " program data " << mShareDirs; QString settingFile = mSettingsDir; settingFile.append(SLASH).append(APP_NAME).append(".ini"); diff --git a/gcodeworkshop/include/document.h b/gcodeworkshop/include/document.h index 0035bb15..3757ed32 100644 --- a/gcodeworkshop/include/document.h +++ b/gcodeworkshop/include/document.h @@ -40,8 +40,8 @@ class QWidget; * * The derived class must have a unique type returned by type(). The value returned by * brief() is used in a widget with a list of open documents. The guessFileName() function - * is called when an unitled document is saved to guess a possible file name. Whether the - * document is unitled can be checked using the isUntitled() function. + * is called when an untitled document is saved to guess a possible file name. Whether the + * document is untitled can be checked using the isUntitled() function. * * The class has an associated widget, accessible using widget() function. The descendants * must call setWidget() in the constructor to associate the widget with the document. diff --git a/gcodeworkshop/src/documentmanager.cpp b/gcodeworkshop/src/documentmanager.cpp index 39540793..0568b0bf 100644 --- a/gcodeworkshop/src/documentmanager.cpp +++ b/gcodeworkshop/src/documentmanager.cpp @@ -141,7 +141,7 @@ DocumentStyle::Ptr DocumentManager::documentStyle(const QString& type) const DocumentProducer* producer = documentProducer(type); if (!producer) { - qWarning() << "DocumentManager::documentStyle() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::documentStyle() : The" << type << "type is not registered." ; return DocumentStyle::Ptr(new DocumentStyle()); } @@ -159,7 +159,7 @@ void DocumentManager::setDocumentStyle(const DocumentStyle::Ptr& style) DocumentProducer* producer = documentProducer(type); if (!producer) { - qWarning() << "DocumentManager::setDocumentStyle() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::setDocumentStyle() : The" << type << "type is not registered." ; return; } @@ -171,7 +171,7 @@ DocumentWidgetProperties::Ptr DocumentManager::documentWidgetProperties(const QS DocumentProducer* producer = documentProducer(type); if (!producer) { - qWarning() << "DocumentManager::documentWidgetProperties() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::documentWidgetProperties() : The" << type << "type is not registered." ; return DocumentWidgetProperties::Ptr(new DocumentWidgetProperties()); } @@ -189,7 +189,7 @@ void DocumentManager::setDocumentWidgetProperties(const DocumentWidgetProperties DocumentProducer* producer = documentProducer(type); if (!producer) { - qWarning() << "DocumentManager::setDocumentWidgetProperties() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::setDocumentWidgetProperties() : The" << type << "type is not registered." ; return; } @@ -201,7 +201,7 @@ void DocumentManager::updateDocuments(const QString& type) DocumentProducer* producer = documentProducer(type); if (!producer) { - qWarning() << "DocumentManager::updateDocuments() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::updateDocuments() : The" << type << "type is not registered." ; return; } @@ -217,7 +217,7 @@ Document* DocumentManager::createDocument(const QString& type, const QString& id DocumentProducer* producer = documentProducer(type); if (!producer) { - qWarning() << "DocumentManager::createDocument() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::createDocument() : The" << type << "type is not registered." ; return nullptr; } @@ -239,7 +239,7 @@ DocumentInfo::Ptr DocumentManager::createDocumentInfo(const QString& type) if (producer) { info = producer->createDocumentInfo(); } else { - qWarning() << "DocumentManager::createDocumentInfo() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::createDocumentInfo() : The" << type << "type is not registered." ; } return DocumentInfo::Ptr(info); @@ -253,7 +253,7 @@ DocumentStyle::Ptr DocumentManager::createDocumentStyle(const QString& type) if (producer) { style = producer->createDocumentStyle(); } else { - qWarning() << "DocumentManager::createDocumentStyle() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::createDocumentStyle() : The" << type << "type is not registered." ; } return DocumentStyle::Ptr(style); @@ -267,7 +267,7 @@ DocumentWidgetProperties::Ptr DocumentManager::createDocumentWidgetProperties(co if (producer) { properties = producer->createDocumentWidgetProperties(); } else { - qWarning() << "DocumentManager::createDocumentWidgetProperties() : The" << type << "type is not registred." ; + qWarning() << "DocumentManager::createDocumentWidgetProperties() : The" << type << "type is not registered." ; } return DocumentWidgetProperties::Ptr(properties); @@ -328,7 +328,7 @@ void DocumentManager::registerDocumentProducer(DocumentProducer* producer) const QString& type = producer->documentType(); if (m_producers.contains(type)) { - qWarning() << "DocumentManager::registerProducer() : The" << type << "type always registred." ; + qWarning() << "DocumentManager::registerProducer() : The" << type << "type always registered." ; return; } diff --git a/gcodeworkshop/src/gcodeworkshop.cpp b/gcodeworkshop/src/gcodeworkshop.cpp index 27d81893..0f5b9581 100644 --- a/gcodeworkshop/src/gcodeworkshop.cpp +++ b/gcodeworkshop/src/gcodeworkshop.cpp @@ -507,7 +507,7 @@ bool GCodeWorkShop::save(Document* doc, bool forceSaveAs) } if (QFileInfo(oldFileName).suffix() == "") { - // sometimes when file has no extension QFileDialog::getSaveFileName will no apply choosen filter (extension) + // sometimes when file has no extension QFileDialog::getSaveFileName will not apply chosen filter (extension) oldFileName.append(".nc"); } @@ -1687,8 +1687,8 @@ void GCodeWorkShop::createActions() closeAllAct->setToolTip(tr("Close all the windows")); connect(closeAllAct, SIGNAL(triggered()), this, SLOT(closeAllMdiWindows())); - tileHAct = new QAction(QIcon(":/images/tile_h.png"), tr("Tile &horyzontally"), this); - tileHAct->setToolTip(tr("Tile the windows horyzontally")); + tileHAct = new QAction(QIcon(":/images/tile_h.png"), tr("Tile &horizontally"), this); + tileHAct->setToolTip(tr("Tile the windows horizontally")); connect(tileHAct, SIGNAL(triggered()), ui->mdiArea, SLOT(tileSubWindows())); tileVAct = new QAction(QIcon(":/images/tile_v.png"), tr("Tile &vertycally"), this); @@ -2319,7 +2319,7 @@ void GCodeWorkShop::createFindToolBar() findEdit->setToolTip( tr("Letter$$ - matches any number.

Letter$max$min - matches number <=max >=min.

" \ - "

$min can be ommited, then equal 0

" \ + "

$min can be omitted, then equal 0

" \ "

X$100$-10 - matches all X with value -10 to 100

")); CapsLockEventFilter* findEditEventFilter = new CapsLockEventFilter(findEdit); connect(this, SIGNAL(intCapsLockChanged(bool)), findEditEventFilter, SLOT(setCapsLockEnable(bool))); @@ -3333,7 +3333,7 @@ void GCodeWorkShop::updateSessionMenus(const QStringList& sessionList) { sessionsMenu->clear(); - // TODO memory leack? + // TODO memory leak? QActionGroup* actionGroup = new QActionGroup(sessionsMenu); actionGroup->setExclusive(true); diff --git a/gcodeworkshop/src/inlinecalc.cpp b/gcodeworkshop/src/inlinecalc.cpp index 068e0803..3df7f9b2 100644 --- a/gcodeworkshop/src/inlinecalc.cpp +++ b/gcodeworkshop/src/inlinecalc.cpp @@ -47,7 +47,7 @@ InLineCalc::InLineCalc(QWidget* parent) : QLineEdit(parent) "ABS(x)\n" + "TRUNC(x)\n" + "PI\n" + - tr("Press Enter to accept or click anywere to canacel")); + tr("Press Enter to accept or click anywhere to cancel")); connect(this, SIGNAL(editingFinished()), this, SLOT(done())); diff --git a/gcodeworkshop/src/setupdialog.ui b/gcodeworkshop/src/setupdialog.ui index e79bc679..22f744ff 100644 --- a/gcodeworkshop/src/setupdialog.ui +++ b/gcodeworkshop/src/setupdialog.ui @@ -270,7 +270,7 @@ - Backgroud + Background true @@ -309,10 +309,10 @@ - Highlighed current line color + Highlighted current line color - Hi&ghlighed current line color + Hi&ghlighted current line color false @@ -512,7 +512,7 @@ - Show all avalaible codecs + Show all available codecs diff --git a/gcodeworkshop/src/tooltips.h b/gcodeworkshop/src/tooltips.h index 957f36f7..c6121837 100644 --- a/gcodeworkshop/src/tooltips.h +++ b/gcodeworkshop/src/tooltips.h @@ -268,7 +268,7 @@ QString writeTooltipFile() settings.setValue("G97", _TR("G97 Sxx - constant spindle speed xx")); settings.setValue("NCYL", - _TR("NCYL - if specified in fixed cycle, positioning to the definied hole position is performed, but the cycle axis does not operate")); + _TR("NCYL - if specified in fixed cycle, positioning to the defined hole position is performed, but the cycle axis does not operate")); settings.setValue("NOEX", _TR("NOEX - if specified in fixed cycle, no axis movements may be performed")); @@ -294,10 +294,10 @@ QString writeTooltipFile() _TR("DFUP[val] - unit integer implementation (raising)")); settings.setValue("MOD", _TR("MOD[val,yy] - remainder of val/yy")); - settings.setValue("VDIN", _TR("VDIN[xx] - imput variable no. xx")); + settings.setValue("VDIN", _TR("VDIN[xx] - input variable no. xx")); settings.setValue("VDOUT", _TR("VDOUT[xx] - output variable no. xx")); settings.setValue("VUACM", - _TR("VUACM[n]='text' - sub message for user definied alarms, n - subscript expression, text - max. 16 chracters")); + _TR("VUACM[n]='text' - sub message for user defined alarms, n - subscript expression, text - max. 16 characters")); settings.setValue("MODIN", _TR("MODIN Onnnn [Q]xx - subprogram call after axis movement, nnnn - prog. name, xx - number of repetitions")); @@ -320,10 +320,10 @@ QString writeTooltipFile() settings.setValue("EQ", _TR("EQ - equal to")); settings.setValue("NE", _TR("NE - not equal to")); - settings.setValue("GT", _TR("GT - greather than")); + settings.setValue("GT", _TR("GT - greater than")); settings.setValue("LE", _TR("LE - less than or equal to")); settings.setValue("LT", _TR("LT - less than")); - settings.setValue("GE", _TR("GE - greather than or equal to")); + settings.setValue("GE", _TR("GE - greater than or equal to")); settings.setValue("IF", _TR("IF[condition] Nxxxx - if condition is true goto block xxxx")); @@ -480,16 +480,16 @@ QString writeTooltipFile() settings.setValue("EQ", _TR("EQ - equal to")); settings.setValue("NE", _TR("NE - not equal to")); - settings.setValue("GT", _TR("GT - greather than")); + settings.setValue("GT", _TR("GT - greater than")); settings.setValue("LE", _TR("LE - less than or equal to")); settings.setValue("LT", _TR("LT - less than")); - settings.setValue("GE", _TR("GE - greather than or equal to")); + settings.setValue("GE", _TR("GE - greater than or equal to")); settings.setValue("IF", _TR("IF[condition]do something - if condition is true do something")); settings.setValue("GOTO", _TR("GOTOnnnn - jump to block nnnn")); settings.setValue("WHILE", - _TR("WHILE[condition] DOn
...
commands
...
ENDn - loop - while condition true do commands beetwen DOn and ENDn")); + _TR("WHILE[condition] DOn
...
commands
...
ENDn - loop - while condition true do commands between DOn and ENDn")); settings.setValue("END", _TR("ENDn - end of WHILE DOn loop")); settings.setValue("EOR", _TR("EOR - exclusive OR")); @@ -572,9 +572,9 @@ QString writeTooltipFile() settings.setValue("@124", _TR("@124 R|Kyy R|Kxx Knnnn - if yy is less than xx jump to nnnn")); settings.setValue("@125", - _TR("@125 R|Kyy R|Kxx Knnnn - if yy is greather than or equal to xx jump to nnnn")); + _TR("@125 R|Kyy R|Kxx Knnnn - if yy is greater than or equal to xx jump to nnnn")); settings.setValue("@126", - _TR("@126 R|Kyy R|Kxx Knnnn - if yy is greather than xx jump to nnnn")); + _TR("@126 R|Kyy R|Kxx Knnnn - if yy is greater than xx jump to nnnn")); settings.setValue("@620", _TR("@620 Rxx - increment value in param. xx")); settings.setValue("@621", _TR("@621 Rxx - decrement value in param. xx")); diff --git a/install/build-helper.sh b/install/build-helper.sh index 487a915f..9fccee7c 100755 --- a/install/build-helper.sh +++ b/install/build-helper.sh @@ -44,10 +44,10 @@ Options: By default this is /_ -q qmake The name or full path of the qmake utility. In some distributives, qmake for Qt 6 is named qmake6. - -s suffux The suffix that will be added to the package name after the + -s suffix The suffix that will be added to the package name after the version and before the architecture type. Nothing is added by default. - -v version Define the package version. By default version gettings from + -v version Define the package version. By default version settings from the version.h file. -w browser Define the webengine to be used. Possible values: WebEngine or WebKit (default).