Skip to content

Commit 70da532

Browse files
luzpazu-235
authored andcommitted
Fix various typos
Found via `codespell -q 3 -D ../dictionary.txt -S "./lang,./3rdparty" -L adrress,childs,diamon,doubleclick,evalute,highligh,hight,inout,roate,speedin`
1 parent f5fb858 commit 70da532

19 files changed

+65
-65
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This is a fork of [EdytorNC](https://github.com/artur3/EdytorNC), a text editor
55
for CNC programmers.
66

77
- [Some features](#some-features)
8-
- [Some shotcuts](#some-shotcuts)
8+
- [Some shortcuts](#some-shortcuts)
99
- [Getting GCodeWorkShop](#getting-gcodeworkshop)
1010
- [Command line options](#command-line-options)
1111

@@ -37,7 +37,7 @@ Some features
3737
* Solutions of triangles calculation
3838

3939

40-
Some shotcuts
40+
Some shortcuts
4141
------------
4242

4343
* `Ctrl+;` Comments/uncomments selected text with semicolon ;
@@ -49,7 +49,7 @@ Some shotcuts
4949
operations directly in editor. You can select address (eg `X123.45`) before
5050
pressing `Ctrl+0` (`Ctrl+Double Click` will do the same), value will be
5151
entered in the calc.
52-
After presing `Enter` (and if no error) result will be pasted in cursor
52+
After pressing `Enter` (and if no error) result will be pasted in cursor
5353
position. Supported operators: `+` `-` `*` `/` `SIN(x)` `COS(x)` `TAN(x)`
5454
`SQRT(x)` `SQR(x)` `ABS(x)` `TRUNC(x)` `PI`
5555

addons/src/bhc/bhcdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ void BHCDialog::computeButtonClicked()
429429
drawing->printText(textPosX, textPosY, 2 - dir,
430430
QString(tr("Angle of first hole : %1")).arg(firstAngle), col);
431431
drawing->printText(textPosX, textPosY, 3 - dir,
432-
QString(tr("Angle beetwen holes : %1")).arg(angleBeetwen), col);
432+
QString(tr("Angle between holes : %1")).arg(angleBeetwen), col);
433433
drawing->printText(textPosX, textPosY, 4 - dir,
434434
QString(tr("Center position : X%1 Y%2")).arg(xCenter).arg(yCenter), col);
435435
firstAngle += roate;

addons/src/bhc/bhctab.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
</sizepolicy>
146146
</property>
147147
<property name="text">
148-
<string>Angle beetwen holes :</string>
148+
<string>Angle between holes :</string>
149149
</property>
150150
<property name="buddy">
151151
<cstring>angleBeetwenInput</cstring>

addons/src/compilemacro/utils-compilemacro.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void Utils::CompileMacro::setError(int error, const QString& tx)
194194
break;
195195

196196
case ERR_DOUBLE_DOT:
197-
m_status = tr("Decimal point or minus writed two times !\n\"%1\"").arg(tx);
197+
m_status = tr("Decimal point or minus written two times !\n\"%1\"").arg(tx);
198198
break;
199199

200200
default:

addons/src/renumber/renumberdialog.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
<bool>true</bool>
214214
</property>
215215
<property name="toolTip">
216-
<string>Just write N at begining of line and use this function to replace N with correct line number</string>
216+
<string>Just write N at beginning of line and use this function to replace N with correct line number</string>
217217
</property>
218218
<property name="text">
219219
<string>Renumber lines marked 'N'</string>

common.pri

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CONFIG(debug, debug|release) {
77
CONFIG *= warn_on
88
} else {
99
BUILD_FLAG = release
10-
# Supress debug message
10+
# Suppress debug message
1111
DEFINES *= QT_NO_DEBUG_OUTPUT # QT_NO_INFO_OUTPUT
1212
}
1313

gcodefileserver/gcodefileserver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ GCodeFileServer::~GCodeFileServer()
100100
void GCodeFileServer::closeEvent(QCloseEvent* event)
101101
{
102102
// QMessageBox::StandardButton result = QMessageBox::warning(this, tr("GCodeWorkShop - Serial port file server"),
103-
// tr("You are trying to close a file server.\nAre you shure?"),
103+
// tr("You are trying to close a file server.\nAre you sure?"),
104104
// QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
105105

106106
// if(result == QMessageBox::No)

gcodeshared/include/utils/configpage.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,22 +113,22 @@ public slots:
113113
/**
114114
* @brief Actions when confirm the changes made.
115115
*
116-
* This is happend by pressing the "OK" button.
116+
* This occurs when pressing the "OK" button.
117117
*/
118118
virtual void accept() {}
119119

120120
/**
121121
* @brief Actions when rejecting the changes made.
122122
*
123-
* This is happend by pressing the "Cancel" button. If you have @link start() backup@endlink
123+
* This occurs when pressing the "Cancel" button. If you have @link start() backup@endlink
124124
* your settings, it's time to apply them.
125125
*/
126126
virtual void reject() {}
127127

128128
/**
129129
* @brief Actions when requesting default settings.
130130
*
131-
* This is happend by pressing the "Default" button. If you implement this feature,
131+
* This occurs when pressing the "Default" button. If you implement this feature,
132132
* override the hasReset() function so that it returns @c true.
133133
*/
134134
virtual void reset() {}

gcodeshared/serialportconfigdialog.ui

+8-8
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ Set XON or XOFF to 0 if you want disable it.</string>
647647
<widget class="QSpinBox" name="autoCloseSpinBox">
648648
<property name="toolTip">
649649
<string>Automatically close transmission dialog after the last character was sent/received.
650-
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>
650+
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>
651651
</property>
652652
<property name="suffix">
653653
<string>s</string>
@@ -742,7 +742,7 @@ Works only when receiving file.</string>
742742
<item>
743743
<widget class="QCheckBox" name="deleteControlChars">
744744
<property name="toolTip">
745-
<string>Delete all control chracters (&lt;0x3F; &gt;0x7F) from recieved file</string>
745+
<string>Delete all control characters (&lt;0x3F; &gt;0x7F) from received file</string>
746746
</property>
747747
<property name="text">
748748
<string>Delete control chars</string>
@@ -775,7 +775,7 @@ Works only when receiving file.</string>
775775
<widget class="QLineEdit" name="removeLineEdit">
776776
<property name="toolTip">
777777
<string>Use this to remove some unwanted characters from received data.
778-
Vailid QtRegExp should be entered.</string>
778+
Valid QtRegExp should be entered.</string>
779779
</property>
780780
<property name="maxLength">
781781
<number>128</number>
@@ -944,7 +944,7 @@ Vailid QtRegExp should be entered.</string>
944944
<item row="2" column="2">
945945
<widget class="QLineEdit" name="eotInput">
946946
<property name="toolTip">
947-
<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>
947+
<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>
948948
</property>
949949
<property name="maxLength">
950950
<number>128</number>
@@ -963,7 +963,7 @@ Vailid QtRegExp should be entered.</string>
963963
</sizepolicy>
964964
</property>
965965
<property name="toolTip">
966-
<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>
966+
<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>
967967
</property>
968968
<property name="maxLength">
969969
<number>128</number>
@@ -1012,7 +1012,7 @@ Vailid QtRegExp should be entered.</string>
10121012
<item row="3" column="2">
10131013
<widget class="QComboBox" name="eobComboBox">
10141014
<property name="toolTip">
1015-
<string>Line (block) endings charcters.
1015+
<string>Line (block) endings characters.
10161016
Only uppercase LF, CR character are allowed.</string>
10171017
</property>
10181018
<property name="editable">
@@ -1172,7 +1172,7 @@ Only uppercase LF, CR character are allowed.</string>
11721172
<widget class="QSpinBox" name="startDelaySpinBox">
11731173
<property name="toolTip">
11741174
<string>If 0 then waits for XON, if &gt;0 waits for timeout or XON, which one first.
1175-
This setting works also with hardware flow control, put 0 to XON or XOFF characters to start trasmission without waiting for XON.
1175+
This setting works also with hardware flow control, put 0 to XON or XOFF characters to start transmission without waiting for XON.
11761176
This setting is ignored in serial File Server.</string>
11771177
</property>
11781178
<property name="suffix">
@@ -1303,7 +1303,7 @@ If the file name has not been automatically detected, the file name will be the
13031303
<item row="0" column="0">
13041304
<widget class="QCheckBox" name="detectFormFileNameCheckBox">
13051305
<property name="toolTip">
1306-
<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>
1306+
<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>
13071307
</property>
13081308
<property name="text">
13091309
<string>Built-in name detection</string>

gcodeshared/serialporttestdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ void SerialPortTestDialog::updateLeds()
320320
}
321321

322322
count++;
323-
errorLabel->setText(tr("Recived: %1 bytes.").arg(count));
323+
errorLabel->setText(tr("Received: %1 bytes.").arg(count));
324324
tx = ch;
325325

326326
qApp->processEvents();
@@ -430,7 +430,7 @@ void SerialPortTestDialog::showError(int error)
430430
{
431431
switch (error) {
432432
case QSerialPort::NoError:
433-
errorLabel->setText("No Error has occured");
433+
errorLabel->setText("No Error has occurred");
434434
break;
435435

436436
case QSerialPort::DeviceNotFoundError:

gcodeshared/serialtransmissiondialog.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ void SerialTransmissionDialog::updateStatus()
295295
}
296296
}
297297
} else {
298-
if (writeBufferIterator != serialPortWriteBuffer.end()) { // try to restart trasmission
298+
if (writeBufferIterator != serialPortWriteBuffer.end()) { // try to restart transmission
299299
serialPortBytesWritten(0);
300300
}
301301

@@ -351,7 +351,7 @@ void SerialTransmissionDialog::showSerialPortError(QSerialPort::SerialPortError
351351

352352
switch (error) {
353353
case QSerialPort::NoError:
354-
text = tr("No Error has occured");
354+
text = tr("No Error has occurred");
355355
//statusBar()->showMessage(text);
356356
return;
357357

@@ -457,7 +457,7 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes)
457457
sendTimeoutCountner = 0;
458458
sendTimeoutTimer->stop();
459459
setLabelText(tr("OK:\t Sending completed."), serverMode, true);
460-
setLabelText(tr("Wainting for data..."));
460+
setLabelText(tr("Waiting for data..."));
461461
setRange(0, 0);
462462
} else {
463463
autoCloseCountner = portSettings.autoCloseTimeout;
@@ -530,7 +530,7 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes)
530530
// if(QString(buff).contains(endOfProgChar) && (!endOfProgChar.isEmpty()))
531531
// {
532532
// qDebug() << "endOfProgChar" << endOfProgChar;
533-
// qDebug() << "Procces data" << processReceivedData();
533+
// qDebug() << "Process data" << processReceivedData();
534534
// }
535535

536536
// }
@@ -695,7 +695,7 @@ void SerialTransmissionDialog::prepareDataBeforeSending(QString* data)
695695
auto behavior = Qt::SkipEmptyParts;
696696
#endif
697697
serialPortWriteBuffer = data->split("\n", behavior);
698-
// insert line endings. \r is replaced with choosen line ending
698+
// insert line endings. \r is replaced with chosen line ending
699699
serialPortWriteBuffer.replaceInStrings("\r", portSettings.eobChar);
700700

701701
noOfBytes = serialPortWriteBuffer.join("").length(); // get new size
@@ -1116,7 +1116,7 @@ QStringList SerialTransmissionDialog::guessFileName(QString* text)
11161116
}
11171117

11181118
//**************************************************************************************************
1119-
// Save received program to a file. Return filename and empty program text if succes or leave program text unchanged
1119+
// Save received program to a file. Return filename and empty program text if successful or leave program text unchanged
11201120
//**************************************************************************************************
11211121

11221122
QString SerialTransmissionDialog::saveDataToFile(QString* text)
@@ -1474,7 +1474,7 @@ void SerialTransmissionDialog::fileServerBytesWritten(qint64 bytes)
14741474
void SerialTransmissionDialog::sendTimeoutTimerTimeout()
14751475
{
14761476
if (sendTimeoutCountner == 0) {
1477-
setLabelText(tr("ERROR:\t Sending timedout. Reseting."), serverMode, true);
1477+
setLabelText(tr("ERROR:\t Sending timedout. Resetting."), serverMode, true);
14781478
sendTimeoutTimer->stop();
14791479
reset(false);
14801480
return;

gcodeshared/utils/medium.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ Medium::Medium(QObject* parent) :
6464
setupDirs();
6565
mShareDirs.append(COLON);
6666

67-
qDebug() << "Seting directoryes:";
67+
qDebug() << "Setting directories:";
6868
qDebug() << " translation " << mTranslationDirs;
6969
qDebug() << " config " << mSettingsDir;
70-
qDebug() << " programm data " << mShareDirs;
70+
qDebug() << " program data " << mShareDirs;
7171

7272
QString settingFile = mSettingsDir;
7373
settingFile.append(SLASH).append(APP_NAME).append(".ini");

gcodeworkshop/include/document.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class QWidget;
4040
*
4141
* The derived class must have a unique type returned by type(). The value returned by
4242
* brief() is used in a widget with a list of open documents. The guessFileName() function
43-
* is called when an unitled document is saved to guess a possible file name. Whether the
44-
* document is unitled can be checked using the isUntitled() function.
43+
* is called when an untitled document is saved to guess a possible file name. Whether the
44+
* document is untitled can be checked using the isUntitled() function.
4545
*
4646
* The class has an associated widget, accessible using widget() function. The descendants
4747
* must call setWidget() in the constructor to associate the widget with the document.

0 commit comments

Comments
 (0)