Fix various typos

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`
 

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;

addons/src/bhc/bhctab.ui

@@ -145,7 +145,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Angle beetwen holes :</string>
+           <string>Angle between holes :</string>
           </property>
           <property name="buddy">
            <cstring>angleBeetwenInput</cstring>

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:

addons/src/renumber/renumberdialog.ui

@@ -213,7 +213,7 @@
          <bool>true</bool>
         </property>
         <property name="toolTip">
-         <string>Just write N at begining of line and use this function to replace N with correct line number</string>
+         <string>Just write N at beginning of line and use this function to replace N with correct line number</string>
         </property>
         <property name="text">
          <string>Renumber lines marked 'N'</string>

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
 }
 

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)

gcodeshared/include/utils/configpage.h

@@ -113,22 +113,22 @@ 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() {}
 
 	/**
 	 * @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() {}

gcodeshared/serialportconfigdialog.ui

@@ -647,7 +647,7 @@ Set XON or XOFF to 0 if you want disable it.</string>
           <widget class="QSpinBox" name="autoCloseSpinBox">
            <property name="toolTip">
             <string>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.</string>
+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.</string>
            </property>
            <property name="suffix">
             <string>s</string>
@@ -742,7 +742,7 @@ Works only when receiving file.</string>
        <item>
         <widget class="QCheckBox" name="deleteControlChars">
          <property name="toolTip">
-          <string>Delete all control chracters (&lt;0x3F; &gt;0x7F) from recieved file</string>
+          <string>Delete all control characters (&lt;0x3F; &gt;0x7F) from received file</string>
          </property>
          <property name="text">
           <string>Delete control chars</string>
@@ -775,7 +775,7 @@ Works only when receiving file.</string>
           <widget class="QLineEdit" name="removeLineEdit">
            <property name="toolTip">
             <string>Use this to remove some unwanted characters from received data.
-Vailid QtRegExp should be entered.</string>
+Valid QtRegExp should be entered.</string>
            </property>
            <property name="maxLength">
             <number>128</number>
@@ -944,7 +944,7 @@ Vailid QtRegExp should be entered.</string>
          <item row="2" column="2">
           <widget class="QLineEdit" name="eotInput">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These characters will be added at the end of the program.&lt;/p&gt;&lt;p&gt;You can write here:&lt;/p&gt;&lt;p&gt;	Plain text&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Hex codes of ASCII characters.&lt;/p&gt;&lt;p&gt;	Example: &lt;/p&gt;&lt;p&gt;	% 0x0A 0x0D - % and new line characters&lt;/p&gt;&lt;p&gt;	0x20 0x0A 0x0D - space character and new line characters&lt;/p&gt;&lt;p&gt;	Space and control characters can only be written as hex numbers:&lt;/p&gt;&lt;p&gt;	0x20 (space), 0x13 (XOFF), 0x11 (XON) ...&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Special characters codes can be used:&lt;/p&gt;&lt;p&gt;	LF - Line Feed also Carrige Return (replaced later by end of block characters)&lt;/p&gt;&lt;p&gt;	SP - Space&lt;/p&gt;&lt;p&gt;	TAB - Tabulation&lt;/p&gt;&lt;p&gt;	FN - File name&lt;/p&gt;&lt;p&gt;	FE - File name Extension (part after dot)&lt;/p&gt;&lt;p&gt;	FA - File name extension Appended at end of file name (part after _ character and before dot)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These characters will be added at the end of the program.&lt;/p&gt;&lt;p&gt;You can write here:&lt;/p&gt;&lt;p&gt;	Plain text&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Hex codes of ASCII characters.&lt;/p&gt;&lt;p&gt;	Example: &lt;/p&gt;&lt;p&gt;	% 0x0A 0x0D - % and new line characters&lt;/p&gt;&lt;p&gt;	0x20 0x0A 0x0D - space character and new line characters&lt;/p&gt;&lt;p&gt;	Space and control characters can only be written as hex numbers:&lt;/p&gt;&lt;p&gt;	0x20 (space), 0x13 (XOFF), 0x11 (XON) ...&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Special characters codes can be used:&lt;/p&gt;&lt;p&gt;	LF - Line Feed also Carriage Return (replaced later by end of block characters)&lt;/p&gt;&lt;p&gt;	SP - Space&lt;/p&gt;&lt;p&gt;	TAB - Tabulation&lt;/p&gt;&lt;p&gt;	FN - File name&lt;/p&gt;&lt;p&gt;	FE - File name Extension (part after dot)&lt;/p&gt;&lt;p&gt;	FA - File name extension Appended at end of file name (part after _ character and before dot)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="maxLength">
             <number>128</number>
@@ -963,7 +963,7 @@ Vailid QtRegExp should be entered.</string>
             </sizepolicy>
            </property>
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These characters will be added at the beginning of the program. &lt;/p&gt;&lt;p&gt;You can write here:&lt;/p&gt;&lt;p&gt;	Plain text&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Hex codes of ASCII characters.&lt;/p&gt;&lt;p&gt;	Example: &lt;/p&gt;&lt;p&gt;	% 0x0A 0x0D - % and new line characters&lt;/p&gt;&lt;p&gt;	0x20 0x0A 0x0D - space character and new line characters&lt;/p&gt;&lt;p&gt;	Space and control characters can only be written as hex numbers:&lt;/p&gt;&lt;p&gt;	0x20 (space), 0x13 (XOFF), 0x11 (XON) ...&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Special characters codes can be used:&lt;/p&gt;&lt;p&gt;	LF - Line Feed also Carrige Return (replaced later by end of block characters)&lt;/p&gt;&lt;p&gt;	SP - Space&lt;/p&gt;&lt;p&gt;	TAB - Tabulation&lt;/p&gt;&lt;p&gt;	FN - File name&lt;/p&gt;&lt;p&gt;	FE - File name Extension (part after dot)&lt;/p&gt;&lt;p&gt;	FA - File name extension Appended at end of file name (part after _ character and before dot)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These characters will be added at the beginning of the program. &lt;/p&gt;&lt;p&gt;You can write here:&lt;/p&gt;&lt;p&gt;	Plain text&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Hex codes of ASCII characters.&lt;/p&gt;&lt;p&gt;	Example: &lt;/p&gt;&lt;p&gt;	% 0x0A 0x0D - % and new line characters&lt;/p&gt;&lt;p&gt;	0x20 0x0A 0x0D - space character and new line characters&lt;/p&gt;&lt;p&gt;	Space and control characters can only be written as hex numbers:&lt;/p&gt;&lt;p&gt;	0x20 (space), 0x13 (XOFF), 0x11 (XON) ...&lt;/p&gt;&lt;p&gt;AND/OR&lt;/p&gt;&lt;p&gt;	Special characters codes can be used:&lt;/p&gt;&lt;p&gt;	LF - Line Feed also Carriage Return (replaced later by end of block characters)&lt;/p&gt;&lt;p&gt;	SP - Space&lt;/p&gt;&lt;p&gt;	TAB - Tabulation&lt;/p&gt;&lt;p&gt;	FN - File name&lt;/p&gt;&lt;p&gt;	FE - File name Extension (part after dot)&lt;/p&gt;&lt;p&gt;	FA - File name extension Appended at end of file name (part after _ character and before dot)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="maxLength">
             <number>128</number>
@@ -1012,7 +1012,7 @@ Vailid QtRegExp should be entered.</string>
          <item row="3" column="2">
           <widget class="QComboBox" name="eobComboBox">
            <property name="toolTip">
-            <string>Line (block) endings charcters.
+            <string>Line (block) endings characters.
 Only uppercase LF, CR character are allowed.</string>
            </property>
            <property name="editable">
@@ -1172,7 +1172,7 @@ Only uppercase LF, CR character are allowed.</string>
              <widget class="QSpinBox" name="startDelaySpinBox">
               <property name="toolTip">
                <string>If 0 then waits for XON, if &gt;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.</string>
               </property>
               <property name="suffix">
@@ -1303,7 +1303,7 @@ If the file name has not been automatically detected, the file name will be the
           <item row="0" column="0">
            <widget class="QCheckBox" name="detectFormFileNameCheckBox">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked, filename of program to save will be taken from program name eg O0051, :1246, %MPF456, %_N_PR25475002_MPF, $O0004.MIN%... &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked, filename of program to save will be taken from program name eg O0051, :1246, %MPF456, %_N_PR25475002_MPF, $O0004.MIN%... &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Built-in name detection</string>

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:

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;

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");

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.