patches from debian packaging team #24

qterm · May 12, 2020 · 722ebe7 · 722ebe7
1 parent b9bab6b
commit 722ebe7
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/qtermcanvas.cpp b/src/qtermcanvas.cpp
@@ -158,7 +158,7 @@ void Canvas::resizeImage(double ratio)
     QSize szImg = szImage;
     QSize origSize = img.size();
     szImg *= (1 + ratio);
-    //we dont need so big
+    //we don't need so big
     if (szImg.width()/origSize.width() > 4 || szImg.height()/origSize.height() > 4)
         return;
     szImage = szImg;

diff --git a/src/qtermiplocation.cpp b/src/qtermiplocation.cpp
@@ -195,7 +195,7 @@ bool IPLocation::getLocation(QString& url, QString& country, QString& city)
             city.replace(rec, 8, "");
 
     } else {// not in this range... miss
-        country = "unkown"; city = "";
+        country = "unknown"; city = "";
     }// if ip_start<=ip<=ip_end
     return true;
 }

diff --git a/src/qtermsocket.h b/src/qtermsocket.h
@@ -1,7 +1,7 @@
 #ifndef QTERMSOCKET_H
 #define QTERMSOCKET_H
 
-// _OS_X_ not defined if i dont include it
+// _OS_X_ not defined if i don't include it
 #include <QtGlobal>
 #include <QtCore/QObject>
 #include <QtNetwork/QTcpSocket>

diff --git a/src/qtermzmodem.cpp b/src/qtermzmodem.cpp
@@ -2608,7 +2608,7 @@ int Zmodem::GotRinit(ZModem *info)
 
     itFile = strFileList.begin();
     QFileInfo fi(*itFile);
-    qDebug("files to be transfered %d", strFileList.count());
+    qDebug("files to be transferred %d", strFileList.count());
     char *filename = strdup(fi.absoluteFilePath().toLatin1());
     char *rfilename = strdup(fi.fileName().toLatin1());
     ZmodemTFile(filename, rfilename,

diff --git a/src/qtermzmodem.h b/src/qtermzmodem.h
@@ -111,7 +111,7 @@ typedef enum zmstate {
 typedef struct {
     int ifd ;  /* input fd, for use by caller's routines */
     int ofd ;  /* output fd, for use by caller's routines */
-    FILE *file ;  /* file being transfered */
+    FILE *file ;  /* file being transferred */
     int zrinitflags ; /* receiver capabilities, see below */
     int zsinitflags ; /* sender capabilities, see below */
     char *attn ;  /* attention string, see below */

diff --git a/src/shortcutsdialog.cpp b/src/shortcutsdialog.cpp
@@ -151,7 +151,7 @@ bool ShortcutsDialog::eventFilter(QObject *object, QEvent *event)
     int key = keyevent->key();
     Qt::KeyboardModifiers mod = keyevent->modifiers();
 
-    // dont accept Mdodifiers only
+    // don't accept Mdodifiers only
     if (key == Qt::Key_Meta || key == Qt::Key_Alt || key == Qt::Key_AltGr
             || key == Qt::Key_Shift || key == Qt::Key_Control)
         return false;

diff --git a/src/ssh/auth.cpp b/src/ssh/auth.cpp
@@ -262,7 +262,7 @@ void SSH2Auth::publicKeyAuth()
     } else if (m_keyType == SSH_RSA) {
         m_out->putString("ssh-rsa");
     } else {
-        qDebug("Unknow public key type");
+        qDebug("Unknown public key type");
         failureHandler();
         return;
     }

diff --git a/src/zmodemdialog.cpp b/src/zmodemdialog.cpp
@@ -44,7 +44,7 @@ void zmodemDialog::clearErrorLog()
 void zmodemDialog::slotCancel()
 {
 	QMessageBox mb( "QTerm",
-			"We dont support cancel operation yet. "
+			"We don't support cancel operation yet. "
 			"But you can try, it will crash when downloading.\n"
 			"Do you want to continue?",
             QMessageBox::Warning,