diff --git a/lang/es.po b/lang/es.po
index 6119cf8d..9fce8e95 100644
--- a/lang/es.po
+++ b/lang/es.po
@@ -947,7 +947,7 @@ msgid ""
msgstr ""
#: MainWindow#71
-msgid "The following error occured:"
+msgid "The following error occurred:"
msgstr ""
#: MainWindow#72
diff --git a/lang/fr.po b/lang/fr.po
index 7ef70830..27871567 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -1156,7 +1156,7 @@ msgstr ""
"%1"
#: MainWindow#84
-msgid "The following error occured:"
+msgid "The following error occurred:"
msgstr "L'erreur suivante s'est produite:"
#: MainWindow#85
diff --git a/lang/tr.po b/lang/tr.po
index 2895561f..9ed8b5cb 100644
--- a/lang/tr.po
+++ b/lang/tr.po
@@ -960,7 +960,7 @@ msgid ""
msgstr ""
#: MainWindow#70
-msgid "The following error occured:"
+msgid "The following error occurred:"
msgstr ""
#: MainWindow#71
diff --git a/lang/xca.pot b/lang/xca.pot
index 8efdbda3..b519a5bb 100644
--- a/lang/xca.pot
+++ b/lang/xca.pot
@@ -1112,7 +1112,7 @@ msgid ""
msgstr ""
#: MainWindow#84
-msgid "The following error occured:"
+msgid "The following error occurred:"
msgstr ""
#: MainWindow#85
diff --git a/lang/xca_de.ts b/lang/xca_de.ts
index 34ce0229..0829e7ab 100644
--- a/lang/xca_de.ts
+++ b/lang/xca_de.ts
@@ -1082,7 +1082,7 @@ Dies löscht den Schlüssel '%1' und macht ihn nicht-exportierbar
- The following error occured:
+ The following error occurred:
Der folgende Fehler ist aufgetreten:
diff --git a/lang/xca_es.ts b/lang/xca_es.ts
index 48f6a85d..41a1a2fc 100644
--- a/lang/xca_es.ts
+++ b/lang/xca_es.ts
@@ -1360,7 +1360,7 @@ This will delete the key '%1' and make it unexportable
- The following error occured:
+ The following error occurred:
diff --git a/lang/xca_fr.ts b/lang/xca_fr.ts
index 972bd3fd..218cdca0 100644
--- a/lang/xca_fr.ts
+++ b/lang/xca_fr.ts
@@ -1352,7 +1352,7 @@ Cela détruirait la clé '%1' et la rendrait non-exportable.
- The following error occured:
+ The following error occurred:
L'erreur suivante s'est produite:
diff --git a/lang/xca_hr.ts b/lang/xca_hr.ts
index e9cb6c0d..888f3f37 100644
--- a/lang/xca_hr.ts
+++ b/lang/xca_hr.ts
@@ -1518,7 +1518,7 @@ To će obrisati ključ '%1' i zabraniti njegov izvoz
- The following error occured:
+ The following error occurred:
Desila se sljedeća greška:
diff --git a/lang/xca_ru.ts b/lang/xca_ru.ts
index ac36bd46..3642bb91 100644
--- a/lang/xca_ru.ts
+++ b/lang/xca_ru.ts
@@ -1083,7 +1083,7 @@ This will delete the key '%1' and make it unexportable
- The following error occured:
+ The following error occurred:
Внимание произошла ошибка:
diff --git a/lang/xca_tr.ts b/lang/xca_tr.ts
index 3b594c93..f3ed5fce 100644
--- a/lang/xca_tr.ts
+++ b/lang/xca_tr.ts
@@ -1399,7 +1399,7 @@ This will delete the key '%1' and make it unexportable
- The following error occured:
+ The following error occurred:
diff --git a/lib/import.cpp b/lib/import.cpp
index cc42f6c2..8075bb40 100644
--- a/lib/import.cpp
+++ b/lib/import.cpp
@@ -148,7 +148,7 @@ int read_dump(const char *filename, db_base **dbs, char *md5, int md5_len)
pki->oldFromData((unsigned char*)p, retlen);
db->insert(pki);
} catch (errorEx &err) {
- printf("Error catched for '%s'\n", CCHAR(pki->getIntName()));
+ printf("Error caught for '%s'\n", CCHAR(pki->getIntName()));
}
}
} else if (md5) {
diff --git a/lib/pki_scard.cpp b/lib/pki_scard.cpp
index c2eb077d..85f90875 100644
--- a/lib/pki_scard.cpp
+++ b/lib/pki_scard.cpp
@@ -266,7 +266,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
break;
#endif
default:
- throw errorEx(QString("Unkown Keytype %d").arg(pk->type));
+ throw errorEx(QString("Unknown Keytype %d").arg(pk->type));
}
return attrs;
@@ -419,7 +419,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
}
#endif
default:
- throw errorEx(QString("Unkown Keytype %d").arg(pkey->type));
+ throw errorEx(QString("Unknown Keytype %d").arg(pkey->type));
}
diff --git a/widgets/MW_menu.cpp b/widgets/MW_menu.cpp
index 510b1a56..88c68982 100644
--- a/widgets/MW_menu.cpp
+++ b/widgets/MW_menu.cpp
@@ -380,7 +380,7 @@ void MainWindow::setOptFlags(QString flags)
else if (flag == "disable_netscape")
pki_x509::disable_netscape = true;
else if (!flag.isEmpty())
- fprintf(stderr, "Unkown flag '%s'\n", CCHAR(flag));
+ fprintf(stderr, "Unknown flag '%s'\n", CCHAR(flag));
}
if (old_disable_netscape != pki_x509::disable_netscape) {
certView->showHideSections();
diff --git a/widgets/MainWindow.cpp b/widgets/MainWindow.cpp
index 152c4fed..f4ad80d0 100644
--- a/widgets/MainWindow.cpp
+++ b/widgets/MainWindow.cpp
@@ -782,7 +782,7 @@ void MainWindow::Error(errorEx &err)
{
if (err.isEmpty())
return;
- QString msg = tr("The following error occured:") + "\n" + err.getString();
+ QString msg = tr("The following error occurred:") + "\n" + err.getString();
xcaWarning box(NULL, msg);
box.addButton(QMessageBox::Apply)->setText(tr("Copy to Clipboard"));
box.addButton(QMessageBox::Ok);