summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Fok <foka@debian.org>2018-06-14 13:37:20 -0600
committerIru Cai (vimacs) <mytbk920423@gmail.com>2018-06-15 00:43:25 +0000
commit3ee241328fdb9210a10fa6f1eca2664a5c30fdf5 (patch)
treec9af6973b1bcf84948368a8fb3ee0c01cd6923c2
parent7c1e8b2bde592430934a96d3f6e2815956fc26f1 (diff)
downloadfqterm-3ee241328fdb9210a10fa6f1eca2664a5c30fdf5.tar.xz
Fix some minor typos
Credit: "Unknow" was detected by Lintian, see https://bugs.debian.org/898537
Diffstat
-rw-r--r--INSTALL.txt2
-rw-r--r--res/script/buildindex.js4
-rw-r--r--res/script/download.py8
-rw-r--r--res/script/downloadelite.js4
-rw-r--r--res/script/downloadelite_smth.js4
-rw-r--r--res/script/system.py2
-rw-r--r--src/fqterm/fqterm_python.cpp10
-rw-r--r--src/terminal/internal/fqterm_decode.cpp10
-rw-r--r--src/terminal/internal/fqterm_telnet.cpp6
-rw-r--r--src/terminal/internal/fqterm_telnet.h6
-rw-r--r--src/ui/statusBar.cpp2
11 files changed, 29 insertions, 29 deletions
diff --git a/INSTALL.txt b/INSTALL.txt
index fa6e66c..c60a761 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -141,7 +141,7 @@ below to setup the development environment.
For other versions of Visual Studio, please see the help
message of CMake by running "cmake --help".
-5. Start coding/buiding/debugging as usual using Visual Studio.
+5. Start coding/building/debugging as usual using Visual Studio.
6. Enable IP location detection feature.
diff --git a/res/script/buildindex.js b/res/script/buildindex.js
index d5235d4..b40ba22 100644
--- a/res/script/buildindex.js
+++ b/res/script/buildindex.js
@@ -15,7 +15,7 @@ var make_html_header = function(num)
'</head>\n'+
'<body>\n'+
'<p><b><h1>FQTerm Article Downloader</h1></b></p>\n'+
- '<p><p align=center><a href=' + (num - 1) + '.html>Prevoius</a>\n'+
+ '<p><p align=center><a href=' + (num - 1) + '.html>Previous</a>\n'+
'<a href=index.html>Index</a>\n'+
'<a href=' + (num + 1) + '.html>Next</a></p align=center></p>'+
'<hr><p></p>\n';
@@ -26,7 +26,7 @@ var make_html_ender = function(num)
{
num = parseInt(num);
var result = '<hr><p></p>\n'+
- '<p><p align=center><a href=' + (num - 1) + '.html>Prevoius</a>\n'+
+ '<p><p align=center><a href=' + (num - 1) + '.html>Previous</a>\n'+
'<a href=index.html>Index</a>\n'+
'<a href=' + (num + 1) + '.html>Next</a></p align=center></p>\n'+
'<p><b>FQTerm --- BBS client based on Qt library</b><p>\n'+
diff --git a/res/script/download.py b/res/script/download.py
index 8a5a815..e0571b3 100644
--- a/res/script/download.py
+++ b/res/script/download.py
@@ -6,8 +6,8 @@ download the directory
* add this changelog
Notes:
- 1. make sure the path is empty, otherwise mkdir complain and stopped
- 2. the time for sleep() varies dependent on sites
+ 1. make sure the path is empty, otherwise mkdir would complain and stop
+ 2. the time for sleep() varies depending on sites
3. tested for FireBird BBS only
Bugs:
1.
@@ -49,7 +49,7 @@ def write_html_header(hfile, num):
</head>""")
hfile.write("<body>")
hfile.write("<p><b><h1>FQTerm Article Downloader</h1></b></p>")
- txt="""<p><p align=center><a href=%d.html>Prevoius</a>
+ txt="""<p><p align=center><a href=%d.html>Previous</a>
<a href=index.html>Index</a>
<a href=%d.html>Next</a></p align=center></p>""" % (num-1,num+1)
hfile.write(txt)
@@ -57,7 +57,7 @@ def write_html_header(hfile, num):
def write_html_ender(hfile,num):
hfile.write("<hr><p></p>")
- txt="""<p><p align=center><a href=%d.html>Prevoius</a>
+ txt="""<p><p align=center><a href=%d.html>Previous</a>
<a href=index.html>Index</a>
<a href=%d.html>Next</a></p align=center></p>""" % (num-1,num+1)
hfile.write(txt)
diff --git a/res/script/downloadelite.js b/res/script/downloadelite.js
index b835d6b..eddf3c3 100644
--- a/res/script/downloadelite.js
+++ b/res/script/downloadelite.js
@@ -34,7 +34,7 @@ var make_html_header = function(num)
'</head>\n'+
'<body>\n'+
'<p><b><h1>FQTerm Article Downloader</h1></b></p>\n'+
- '<p><p align=center><a href=' + (num - 1) + '.html>Prevoius</a>\n'+
+ '<p><p align=center><a href=' + (num - 1) + '.html>Previous</a>\n'+
'<a href=index.html>Index</a>\n'+
'<a href=' + (num + 1) + '.html>Next</a></p align=center></p>'+
'<hr><p></p>\n';
@@ -45,7 +45,7 @@ var make_html_ender = function(num)
{
num = parseInt(num);
var result = '<hr><p></p>\n'+
- '<p><p align=center><a href=' + (num - 1) + '.html>Prevoius</a>\n'+
+ '<p><p align=center><a href=' + (num - 1) + '.html>Previous</a>\n'+
'<a href=index.html>Index</a>\n'+
'<a href=' + (num + 1) + '.html>Next</a></p align=center></p>\n'+
'<p><b>FQTerm --- BBS client based on Qt library</b><p>\n'+
diff --git a/res/script/downloadelite_smth.js b/res/script/downloadelite_smth.js
index 42a9d2f..808e0af 100644
--- a/res/script/downloadelite_smth.js
+++ b/res/script/downloadelite_smth.js
@@ -55,7 +55,7 @@ var make_html_header = function(num)
'</head>\n'+
'<body>\n'+
'<p><b><h1>FQTerm Article Downloader</h1></b></p>\n'+
- '<p><p align=center><a href=' + (num - 1) + '.html>Prevoius</a>\n'+
+ '<p><p align=center><a href=' + (num - 1) + '.html>Previous</a>\n'+
'<a href=index.html>Index</a>\n'+
'<a href=' + (num + 1) + '.html>Next</a></p align=center></p>'+
'<hr><p></p>\n';
@@ -66,7 +66,7 @@ var make_html_ender = function(num)
{
num = parseInt(num);
var result = '<hr><p></p>\n'+
- '<p><p align=center><a href=' + (num - 1) + '.html>Prevoius</a>\n'+
+ '<p><p align=center><a href=' + (num - 1) + '.html>Previous</a>\n'+
'<a href=index.html>Index</a>\n'+
'<a href=' + (num + 1) + '.html>Next</a></p align=center></p>\n'+
'<p><b>FQTerm --- BBS client based on Qt library</b><p>\n'+
diff --git a/res/script/system.py b/res/script/system.py
index 70f9c51..078535f 100644
--- a/res/script/system.py
+++ b/res/script/system.py
@@ -24,7 +24,7 @@ def previewYTHT(lp):
if re.search('http://ytht.net/Ytht.Net' \
'(\S+)/con\?B=(\d+)&F=M\.(\d+)\.A', URL) != None:
# ytht article URL
- print 'Analizing ytht article URL'
+ print 'Analyzing ytht article URL'
f_con = urllib.urlopen(URL)
con = f_con.read()
f_con.close()
diff --git a/src/fqterm/fqterm_python.cpp b/src/fqterm/fqterm_python.cpp
index b4d710e..fcb071f 100644
--- a/src/fqterm/fqterm_python.cpp
+++ b/src/fqterm/fqterm_python.cpp
@@ -125,8 +125,8 @@ QString getErrOutputFile(FQTermWindow *lp) {
return getPath(USER_CONFIG) + str2;
}
-// copy current artcle for back compatible use only
-// for new coder please use getArticle
+// copy current article, for backward-compatible use only.
+// for new code, please use getArticle
static PyObject *fqterm_copyArticle(PyObject *, PyObject *args) {
long lp;
if (!PyArg_ParseTuple(args, "l", &lp)) {
@@ -140,7 +140,7 @@ static PyObject *fqterm_copyArticle(PyObject *, PyObject *args) {
QReadWriteLock& bufferLock = termWindow_->getSession()->getBufferLock();
QReadLocker locker(&bufferLock);
while (1) {
- // check it there is duplicated string
+ // check if there is duplicated string
// it starts from the end in the range of one screen height
// so this is a non-greedy match
QString strTemp;
@@ -156,7 +156,7 @@ static PyObject *fqterm_copyArticle(PyObject *, PyObject *args) {
}
QStringList::Iterator it2 = it;
bool dup = true;
- // match more to see if its duplicated
+ // match more to see if it's duplicated
for (int j = 0; j <= i; j++, it2++) {
QString str1;
termWindow_->getSession()->getBuffer()->getTextLineInTerm(j)->getAllPlainText(str1);
@@ -237,7 +237,7 @@ static PyObject *fqterm_getArticle(PyObject *, PyObject *args) {
}
QStringList::Iterator it2 = it;
bool dup = true;
- // match more to see if its duplicated
+ // match more to see if it's duplicated
for (int j = 0; j <= i && it2 != strList.end(); j++, it2++) {
QString str1;
termWindow_->getSession()->getBuffer()->getTextLineInTerm(j)->getAllPlainText(str1);
diff --git a/src/terminal/internal/fqterm_decode.cpp b/src/terminal/internal/fqterm_decode.cpp
index 49aa364..e88be45 100644
--- a/src/terminal/internal/fqterm_decode.cpp
+++ b/src/terminal/internal/fqterm_decode.cpp
@@ -324,7 +324,7 @@ const char *FQTermDecode::getStateName(const StateOption *state) {
} else if (state == VT100StateMachine::title_state_) {
return "VT100StateMachine::title_state_";
} else {
- return "Unknow";
+ return "Unknown";
}
}
@@ -436,7 +436,7 @@ static int utf8_expected_byte_count(char first_byte)
{
char expected = 0;
if (!(first_byte & 0x80))
- return 0; //1 byte ascii
+ return 0; //1 byte ASCII
else
expected++;
if (!(first_byte & 0x40))
@@ -463,7 +463,7 @@ static int gdbnbig5_expected_byte_count(char first_byte)
{
char expected = 0;
if (!(first_byte & 0x80))
- return 0; //1 byte ascii
+ return 0; //1 byte ASCII
else
expected++;
return expected;
@@ -582,12 +582,12 @@ int FQTermDecode::processInput(QByteArray& result)
// fill letters into char buffer
// TODO: this function may contain bug, need double-check.
-// 1. input should be ascii-compitable encoding.
+// 1. input should be ASCII-compatible encoding.
void FQTermDecode::normalInput() {
FQ_FUNC_TRACE("ansi", 8);
- // TODO_UTF16: check ascii-incompitable encoding.
+ // TODO_UTF16: check ASCII-incompatible encoding.
if (signed(inputData_[dataIndex_]) < 0x20 && signed(inputData_[dataIndex_]) >= 0x00) {
// not print char
return ;
diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp
index 7d710a9..179082c 100644
--- a/src/terminal/internal/fqterm_telnet.cpp
+++ b/src/terminal/internal/fqterm_telnet.cpp
@@ -1012,13 +1012,13 @@ int FQTermTelnet::ttputc(int c) {
xputc_up((char)c); /* print uninterpretted */
return 0;
}
- /* no data, if in SYNCH */
+ /* no data, if in SYNCH */
/*
if (synching)
return 0;
*/
- /* TODO: FQTermTelnet does not interpret NVT code, provide datas to upper
- layer directly. So, <cr><lf> will not be replaced with <lf>
+ /* TODO: FQTermTelnet does not interpret NVT code, provide data to upper
+ layer directly. So, <cr><lf> will not be replaced with <lf>
*/
xputc_up((char)c);
diff --git a/src/terminal/internal/fqterm_telnet.h b/src/terminal/internal/fqterm_telnet.h
index 0a0ba01..5f6447c 100644
--- a/src/terminal/internal/fqterm_telnet.h
+++ b/src/terminal/internal/fqterm_telnet.h
@@ -58,7 +58,7 @@ struct fsm_trans {
// Telnet connection, a wrapper of socket.
// It will translate raw NVT data from low level socket to ansi data,
// and then upper level application can read it.
-// It also can send ascii data (0~127).
+// It also can send ASCII data (0~127).
class FQTermTelnet: public QObject {
Q_OBJECT;
public:
@@ -72,7 +72,7 @@ class FQTermTelnet: public QObject {
const QString &strProxyPwd);
void connectHost(const QString &hostname, quint16 portnumber);
- // Read ansi data.
+ // Read ANSI data.
int read(char *data, uint maxlen);
// Write data raw data
@@ -88,7 +88,7 @@ class FQTermTelnet: public QObject {
conn_info_t *connectionInfo() { return socket->connectionInfo(); }
signals:
- void readyRead(int, int); // There are datas to be read out
+ void readyRead(int, int); // There are data to be read out
void TelnetState(int); // The state telnet, defined as TSXXXX in fqterm.h
void requestUserPwd(QString *user, QString *pwd, bool *isOK);
void warnInsecure(const QString&, bool *isOK);
diff --git a/src/ui/statusBar.cpp b/src/ui/statusBar.cpp
index 155f01d..b15084a 100644
--- a/src/ui/statusBar.cpp
+++ b/src/ui/statusBar.cpp
@@ -360,7 +360,7 @@ ProgressBar &StatusBar::newProgressOperation(QObject *owner) {
QObject *owner = (QObject*)sender(); //HACK deconsting it
KIO::Job *job = dynamic_cast<KIO::Job*>( owner );
- //FIXME doesn't seem to work for KIO::DeleteJob, it has it's own error handler and returns no error too
+ //FIXME doesn't seem to work for KIO::DeleteJob, it has its own error handler and returns no error too
// if you try to delete http urls for instance <- KDE SUCKS!
if( job && job->error() )
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 03:28:35 +0000