diff --git a/doc/xca.1 b/doc/xca.1 index 2813ef38..045e26dd 100644 --- a/doc/xca.1 +++ b/doc/xca.1 @@ -17,7 +17,7 @@ A GUI for handling X509 certificates, RSA/DSA/EC keys, PKCS#10 Requests and CRLs .br .SH "DESCRIPTION" This application is intended as CA, certificate- and Key store. It uses a single file to store the items. -Supported are Certificate signing requests (PKCS#10), Certificates (X509v3), RSA, DSA and EC keys and Certificate revokation lists. +Supported are Certificate signing requests (PKCS#10), Certificates (X509v3), RSA, DSA and EC keys and Certificate revocation lists. The signing of requests, and the creation of selfsigned certificates is supported. Both can use templates for simplicity. The PKI structures can be imported and exported in several formats diff --git a/lang/es.po b/lang/es.po index a7357b88..6119cf8d 100644 --- a/lang/es.po +++ b/lang/es.po @@ -2062,7 +2062,7 @@ msgstr "" #: db_crl#8 msgid "" -"The revokation list already exists in the database as:\n" +"The revocation list already exists in the database as:\n" "'%1'\n" "and so it was not imported" msgstr "" @@ -2671,24 +2671,24 @@ msgid "Internal error: Unexpected message: %1 %2" msgstr "" #: pki_crl#1 -msgid "Successfully imported the revokation list '%1'" +msgid "Successfully imported the revocation list '%1'" msgstr "" #: pki_crl#2 -msgid "Delete the revokation list '%1'?" +msgid "Delete the revocation list '%1'?" msgstr "" #: pki_crl#3 -msgid "Successfully created the revokation list '%1'" +msgid "Successfully created the revocation list '%1'" msgstr "" #: pki_crl#4 -msgid "Delete the %1 revokation lists: %2?" +msgid "Delete the %1 revocation lists: %2?" msgstr "" #: pki_crl#5 msgid "" -"Unable to load the revokation list in file %1. Tried PEM and DER formatted " +"Unable to load the revocation list in file %1. Tried PEM and DER formatted " "CRL." msgstr "" diff --git a/lang/fr.po b/lang/fr.po index 07beb4b7..41556807 100644 --- a/lang/fr.po +++ b/lang/fr.po @@ -423,7 +423,7 @@ msgid "All files ( * )" msgstr "Tous les fichiers ( * )" #: ExportDialog#7 -msgid "PEM Text format format with headers" +msgid "PEM Text format with headers" msgstr "Format textuel PEM avec des en-têtes" #: ExportDialog#8 @@ -2330,7 +2330,7 @@ msgstr "Numéro de la liste de révocation" #: db_crl#8 msgid "" -"The revokation list already exists in the database as:\n" +"The revocation list already exists in the database as:\n" "'%1'\n" "and so it was not imported" msgstr "" @@ -3066,24 +3066,24 @@ msgid "Internal error: Unexpected message: %1 %2" msgstr "Erreur interne: message inattendu: %1 %2" #: pki_crl#1 -msgid "Successfully imported the revokation list '%1'" +msgid "Successfully imported the revocation list '%1'" msgstr "La liste de révocation '%1' a été importée avec succès" #: pki_crl#2 -msgid "Delete the revokation list '%1'?" +msgid "Delete the revocation list '%1'?" msgstr "Détruire la liste de révocation '%1' ?" #: pki_crl#3 -msgid "Successfully created the revokation list '%1'" +msgid "Successfully created the revocation list '%1'" msgstr "La liste de révocation '%1' a été créée avec succès" #: pki_crl#4 -msgid "Delete the %1 revokation lists: %2?" +msgid "Delete the %1 revocation lists: %2?" msgstr "Détruire les %1 listes de révocation: %2 ?" #: pki_crl#5 msgid "" -"Unable to load the revokation list in file %1. Tried PEM and DER formatted " +"Unable to load the revocation list in file %1. Tried PEM and DER formatted " "CRL." msgstr "" "Impossible de charger le liste de révocation du fichier %1. Les formats PEM " diff --git a/lang/tr.po b/lang/tr.po index f58f594f..2895561f 100644 --- a/lang/tr.po +++ b/lang/tr.po @@ -2076,7 +2076,7 @@ msgstr "" #: db_crl#8 msgid "" -"The revokation list already exists in the database as:\n" +"The revocation list already exists in the database as:\n" "'%1'\n" "and so it was not imported" msgstr "" @@ -2697,24 +2697,24 @@ msgid "Internal error: Unexpected message: %1 %2" msgstr "" #: pki_crl#1 -msgid "Successfully imported the revokation list '%1'" +msgid "Successfully imported the revocation list '%1'" msgstr "" #: pki_crl#2 -msgid "Delete the revokation list '%1'?" +msgid "Delete the revocation list '%1'?" msgstr "" #: pki_crl#3 -msgid "Successfully created the revokation list '%1'" +msgid "Successfully created the revocation list '%1'" msgstr "" #: pki_crl#4 -msgid "Delete the %1 revokation lists: %2?" +msgid "Delete the %1 revocation lists: %2?" msgstr "" #: pki_crl#5 msgid "" -"Unable to load the revokation list in file %1. Tried PEM and DER formatted " +"Unable to load the revocation list in file %1. Tried PEM and DER formatted " "CRL." msgstr "" diff --git a/lang/xca.pot b/lang/xca.pot index 988d4f8f..b171663e 100644 --- a/lang/xca.pot +++ b/lang/xca.pot @@ -411,7 +411,7 @@ msgid "All files ( * )" msgstr "" #: ExportDialog#7 -msgid "PEM Text format format with headers" +msgid "PEM Text format with headers" msgstr "" #: ExportDialog#8 @@ -2244,7 +2244,7 @@ msgstr "" #: db_crl#8 msgid "" -"The revokation list already exists in the database as:\n" +"The revocation list already exists in the database as:\n" "'%1'\n" "and so it was not imported" msgstr "" @@ -2964,24 +2964,24 @@ msgid "Internal error: Unexpected message: %1 %2" msgstr "" #: pki_crl#1 -msgid "Successfully imported the revokation list '%1'" +msgid "Successfully imported the revocation list '%1'" msgstr "" #: pki_crl#2 -msgid "Delete the revokation list '%1'?" +msgid "Delete the revocation list '%1'?" msgstr "" #: pki_crl#3 -msgid "Successfully created the revokation list '%1'" +msgid "Successfully created the revocation list '%1'" msgstr "" #: pki_crl#4 -msgid "Delete the %1 revokation lists: %2?" +msgid "Delete the %1 revocation lists: %2?" msgstr "" #: pki_crl#5 msgid "" -"Unable to load the revokation list in file %1. Tried PEM and DER formatted " +"Unable to load the revocation list in file %1. Tried PEM and DER formatted " "CRL." msgstr "" diff --git a/lang/xca_de.ts b/lang/xca_de.ts index 2318a3b3..79386446 100644 --- a/lang/xca_de.ts +++ b/lang/xca_de.ts @@ -531,7 +531,7 @@ PEM ist eine base64 kodierte PEM Datei im Textformat - PEM Text format format with headers + PEM Text format with headers PEM Textformat mit Kopf- und Fußzeilen @@ -2996,7 +2996,7 @@ Grösse %3 - The revokation list already exists in the database as: + The revocation list already exists in the database as: '%1' and so it was not imported Die Sperrliste existiert bereits in der Datenbank als: @@ -4022,17 +4022,17 @@ und wurde daher nicht importiert pki_crl - Delete the revokation list '%1'? + Delete the revocation list '%1'? Die Sperrliste '%1' löschen? - Successfully created the revokation list '%1' + Successfully created the revocation list '%1' Die Sperrliste '%1' wurde erfolgreich erstellt - Delete the %1 revokation lists: %2? + Delete the %1 revocation lists: %2? Die %1 Sperrlisten: %2 löschen? @@ -4047,12 +4047,12 @@ und wurde daher nicht importiert - Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL. + Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL. Konnte die Sperrliste %1 nicht laden. Ist weder eine PEM noch eine DER formatierte CRL. - Successfully imported the revokation list '%1' + Successfully imported the revocation list '%1' Die Sperrliste '%1' wurde erfolgreich importiert diff --git a/lang/xca_es.ts b/lang/xca_es.ts index a9f4a8e4..25cde46d 100644 --- a/lang/xca_es.ts +++ b/lang/xca_es.ts @@ -464,7 +464,7 @@ - PEM Text format format with headers + PEM Text format with headers @@ -2742,7 +2742,7 @@ Size: %3 - The revokation list already exists in the database as: + The revocation list already exists in the database as: '%1' and so it was not imported @@ -3609,27 +3609,27 @@ and thus was not stored pki_crl - Successfully imported the revokation list '%1' + Successfully imported the revocation list '%1' - Delete the revokation list '%1'? + Delete the revocation list '%1'? - Successfully created the revokation list '%1' + Successfully created the revocation list '%1' - Delete the %1 revokation lists: %2? + Delete the %1 revocation lists: %2? - Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL. + Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL. diff --git a/lang/xca_fr.ts b/lang/xca_fr.ts index 63588304..535755d9 100644 --- a/lang/xca_fr.ts +++ b/lang/xca_fr.ts @@ -475,7 +475,7 @@ - PEM Text format format with headers + PEM Text format with headers Format textuel PEM avec des en-têtes @@ -2748,7 +2748,7 @@ Taille: %3 - The revokation list already exists in the database as: + The revocation list already exists in the database as: '%1' and so it was not imported Cette liste de révocation figure déjà dans la base de données sous le nom: @@ -3618,27 +3618,27 @@ En conséquence, elle n'a pas été chargée pki_crl - Successfully imported the revokation list '%1' + Successfully imported the revocation list '%1' La liste de révocation '%1' a été importée avec succès - Delete the revokation list '%1'? + Delete the revocation list '%1'? Détruire la liste de révocation '%1' ? - Successfully created the revokation list '%1' + Successfully created the revocation list '%1' La liste de révocation '%1' a été créée avec succès - Delete the %1 revokation lists: %2? + Delete the %1 revocation lists: %2? Détruire les %1 listes de révocation: %2 ? - Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL. + Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL. Impossible de charger le liste de révocation du fichier %1. Les formats PEM et DER ont été essayés. diff --git a/lang/xca_hr.ts b/lang/xca_hr.ts index 3e111d91..1316e310 100644 --- a/lang/xca_hr.ts +++ b/lang/xca_hr.ts @@ -544,7 +544,7 @@ PEM je base64 kodirana DER datoteka - PEM Text format format with headers + PEM Text format with headers @@ -2984,7 +2984,7 @@ Veličina: %3 - The revokation list already exists in the database as: + The revocation list already exists in the database as: '%1' and so it was not imported Popis opozvanih potvrda već postoji u bazi podataka kao: @@ -4041,27 +4041,27 @@ i zbog toga nije spreman pki_crl - Successfully imported the revokation list '%1' + Successfully imported the revocation list '%1' Uspješno uvezen popis opozvanih potvrda '%1' - Delete the revokation list '%1'? + Delete the revocation list '%1'? Obrisati listu opozvanih potvrda '%1'? - Successfully created the revokation list '%1' + Successfully created the revocation list '%1' Uspješno izrađen popis opozvanih potvrda '%1' - Delete the %1 revokation lists: %2? + Delete the %1 revocation lists: %2? Obriši %1 popis opozvanih potvrda '%2'? - Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL. + Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL. Nije moguće učitati popis opozvanih potvrda %1. Proban je PEM i DER format CRL. diff --git a/lang/xca_ru.ts b/lang/xca_ru.ts index 1a2e23b2..16a98dec 100644 --- a/lang/xca_ru.ts +++ b/lang/xca_ru.ts @@ -501,7 +501,7 @@ - PEM Text format format with headers + PEM Text format with headers @@ -2911,7 +2911,7 @@ Size: %3 - The revokation list already exists in the database as: + The revocation list already exists in the database as: '%1' and so it was not imported @@ -3812,27 +3812,27 @@ and thus was not stored - Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL. + Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL. Не удается загрузить список отзыва сертификатов из файла %1. Формат файла, содержащий CRL должен быть PEM или DER. - Successfully imported the revokation list '%1' + Successfully imported the revocation list '%1' Список отзыва '%1' импортирован успешно - Delete the revokation list '%1'? + Delete the revocation list '%1'? Удалить список отзыва '%1'? - Successfully created the revokation list '%1' + Successfully created the revocation list '%1' Список отзыва '%1' создан успешно - Delete the %1 revokation lists: %2? + Delete the %1 revocation lists: %2? Удалить %1 списки отзыва: %2? diff --git a/lang/xca_tr.ts b/lang/xca_tr.ts index cdced12e..3bfbfd44 100644 --- a/lang/xca_tr.ts +++ b/lang/xca_tr.ts @@ -521,7 +521,7 @@ PEM base64 kodlanmış DER dosyası - PEM Text format format with headers + PEM Text format with headers @@ -2827,7 +2827,7 @@ Size: %3 - The revokation list already exists in the database as: + The revocation list already exists in the database as: '%1' and so it was not imported @@ -3714,27 +3714,27 @@ and thus was not stored pki_crl - Successfully imported the revokation list '%1' + Successfully imported the revocation list '%1' - Delete the revokation list '%1'? + Delete the revocation list '%1'? - Successfully created the revokation list '%1' + Successfully created the revocation list '%1' - Delete the %1 revokation lists: %2? + Delete the %1 revocation lists: %2? - Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL. + Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL. diff --git a/lib/db.h b/lib/db.h index 4865c01a..991a3fdc 100644 --- a/lib/db.h +++ b/lib/db.h @@ -27,7 +27,7 @@ enum pki_type { asym_key, x509_req, x509, - revokation, + revocation, tmpl, setting, smartCard, diff --git a/lib/db_crl.cpp b/lib/db_crl.cpp index ceca59bc..2d8a8a50 100644 --- a/lib/db_crl.cpp +++ b/lib/db_crl.cpp @@ -19,7 +19,7 @@ db_crl::db_crl(QString db, MainWindow *mw) :db_x509name(db,mw) { class_name = "crls"; - pkitype << revokation; + pkitype << revocation; updateHeaders(); loadContainer(); } @@ -100,7 +100,7 @@ pki_base *db_crl::insert(pki_base *item) pki_crl *crl = (pki_crl *)item; pki_crl *oldcrl = (pki_crl *)getByReference(crl); if (oldcrl) { - XCA_INFO(tr("The revokation list already exists in the database as:\n'%1'\nand so it was not imported").arg(oldcrl->getIntName())); + XCA_INFO(tr("The revocation list already exists in the database as:\n'%1'\nand so it was not imported").arg(oldcrl->getIntName())); delete(crl); return NULL; } @@ -177,7 +177,7 @@ pki_crl *db_crl::newItem(pki_x509 *cert) crl->createCrl(cert->getIntName(), cert); QList list = mainwin->certs->getIssuedCerts(cert); - bool reason = dlg->revokationReasons->isChecked(); + bool reason = dlg->revocationReasons->isChecked(); for (int i =0; iisRevoked() ) { crl->addRev(list.at(i)->getRev(reason)); diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp index 53d76217..060fb665 100644 --- a/lib/db_x509.cpp +++ b/lib/db_x509.cpp @@ -50,7 +50,7 @@ dbheaderList db_x509::getHeaders() new dbheader(HD_cert_notAfter, true, tr("Expiry date"), tr("not After")) << new dbheader(HD_cert_trust, false,tr("Trust state")) << - new dbheader(HD_cert_revokation,false, tr("Revocation")) << + new dbheader(HD_cert_revocation,false, tr("Revocation")) << new dbheader(HD_cert_crl_expire,true, tr("CRL Expiration")); return h; } diff --git a/lib/headerlist.h b/lib/headerlist.h index 8e89eabb..8c6f8911 100644 --- a/lib/headerlist.h +++ b/lib/headerlist.h @@ -28,7 +28,7 @@ #define HD_cert_notBefore -11 #define HD_cert_notAfter -12 #define HD_cert_trust -13 -#define HD_cert_revokation -14 +#define HD_cert_revocation -14 #define HD_cert_ca -15 #define HD_cert_md5fp -16 #define HD_cert_sha1fp -17 diff --git a/lib/main.cpp b/lib/main.cpp index 98d7f2a1..fe3f4f38 100644 --- a/lib/main.cpp +++ b/lib/main.cpp @@ -188,7 +188,7 @@ int main_extract(int argc, char *argv[]) if (pkiname == "cert") pkitype = x509; else if (pkiname == "crl") - pkitype = revokation; + pkitype = revocation; else if (pkiname == "req") pkitype = x509_req; else { @@ -211,7 +211,7 @@ int main_extract(int argc, char *argv[]) switch (pkitype) { case x509: pki = new pki_x509(name); break; case x509_req: pki = new pki_x509req(name); break; - case revokation: pki = new pki_crl(name); break; + case revocation: pki = new pki_crl(name); break; default: return usage_extract(argv); } if (pki->getVersion() < head.version) { diff --git a/lib/pki_crl.cpp b/lib/pki_crl.cpp index ca81d594..469b8135 100644 --- a/lib/pki_crl.cpp +++ b/lib/pki_crl.cpp @@ -21,7 +21,7 @@ pki_crl::pki_crl(const QString name ) class_name="pki_crl"; pki_openssl_error(); dataVersion=1; - pkiType=revokation; + pkiType=revocation; } void pki_crl::fromPEM_BIO(BIO *bio, QString name) @@ -43,11 +43,11 @@ QString pki_crl::getMsg(msg_type msg) * %1 will be replaced by the internal name of the CRL */ switch (msg) { - case msg_import: return tr("Successfully imported the revokation list '%1'"); - case msg_delete: return tr("Delete the revokation list '%1'?"); - case msg_create: return tr("Successfully created the revokation list '%1'"); + case msg_import: return tr("Successfully imported the revocation list '%1'"); + case msg_delete: return tr("Delete the revocation list '%1'?"); + case msg_create: return tr("Successfully created the revocation list '%1'"); /* %1: Number of CRLs; %2: list of CRL names */ - case msg_delete_multi: return tr("Delete the %1 revokation lists: %2?"); + case msg_delete_multi: return tr("Delete the %1 revocation lists: %2?"); } return pki_base::getMsg(msg); } @@ -67,7 +67,7 @@ void pki_crl::fload(const QString fname) if (pki_ign_openssl_error()) { if (_crl) X509_CRL_free(_crl); - throw errorEx(tr("Unable to load the revokation list in file %1. Tried PEM and DER formatted CRL.").arg(fname)); + throw errorEx(tr("Unable to load the revocation list in file %1. Tried PEM and DER formatted CRL.").arg(fname)); } if (crl) X509_CRL_free(crl); diff --git a/lib/pki_x509.cpp b/lib/pki_x509.cpp index 08e674a7..db8caf25 100644 --- a/lib/pki_x509.cpp +++ b/lib/pki_x509.cpp @@ -531,7 +531,7 @@ QByteArray pki_x509::toData() ba += i2d(); // cert ba += db::intToData(trust); ba += db::boolToData(isrevoked); - ba += revoked.i2d(); // revokation date + ba += revoked.i2d(); // revocation date // the serial if this is a CA ba += db::stringToData(caSerial.toHex()); @@ -835,7 +835,7 @@ QVariant pki_x509::column_data(dbheader *hd) return QVariant(getNotAfter().toSortable()); case HD_cert_trust: return QVariant(truststatus[getTrust()]); - case HD_cert_revokation: + case HD_cert_revocation: return QVariant(isRevoked() ? getRevoked().toSortable() : ""); case HD_cert_crl_expire: diff --git a/misc/xca.nsi b/misc/xca.nsi index fc526578..9cab20df 100755 --- a/misc/xca.nsi +++ b/misc/xca.nsi @@ -290,10 +290,10 @@ SectionEnd LangString DESC_SecShortcut ${LANG_FRENCH} "Raccourcis sur le bureau et dans le menu." LangString DESC_SecFiles ${LANG_ENGLISH} "File association for *.xdb *.xca *.pem and 'open with' for *.crt *.crl *.pfx *.p7b *.cer" - LangString DESC_SecFiles ${LANG_GERMAN} "Registrierung der Dateiendung *.xdb *.xca *.pem und 'open with' fr *.crt *.crl *.pfx *.p7b *.cer" + LangString DESC_SecFiles ${LANG_GERMAN} "Registrierung der Dateiendung *.xdb *.xca *.pem und 'ffnen mit' fr *.crt *.crl *.pfx *.p7b *.cer" LangString DESC_SecFiles ${LANG_FRENCH} "Application par dfault pour *.xdb *.xca *.pem et 'Ouvrir avec' for *.crt *.crl *.pfx *.p7b *.cer" - LangString DESC_SecTrans ${LANG_ENGLISH} "Translations for german, russian, spanish, french, croatian and russian." + LangString DESC_SecTrans ${LANG_ENGLISH} "Translations for german, russian, spanish, french and croatian." LangString DESC_SecTrans ${LANG_GERMAN} "bersetzungen in deutsch, russisch, spanisch kroatisch und franzsisch." LangString DESC_SecTrans ${LANG_FRENCH} "Traductions pour l'allemand, le russe, l'espagnol, le franais et le croate." diff --git a/ui/NewCrl.ui b/ui/NewCrl.ui index 7e3bb96d..65e3dd69 100644 --- a/ui/NewCrl.ui +++ b/ui/NewCrl.ui @@ -222,7 +222,7 @@ - + Revocation reasons diff --git a/widgets/ExportDialog.cpp b/widgets/ExportDialog.cpp index 0ea5f36f..06961021 100644 --- a/widgets/ExportDialog.cpp +++ b/widgets/ExportDialog.cpp @@ -46,7 +46,7 @@ ExportDialog::ExportDialog(MainWindow *mw, QString title, QString filt, for (int i=0; i < exportType::ETYPE_max; i++) help.append(QString()); help[exportType::Separator] = "What the heck!?"; - help[exportType::PEM] = tr("PEM Text format format with headers"); + help[exportType::PEM] = tr("PEM Text format with headers"); help[exportType::PEM_chain] = tr("Concatenated text format of the complete certificate chain in one PEM file"); help[exportType::PEM_trusted] = tr("Concatenated text format of all trusted certificates in one PEM file"); diff --git a/widgets/MW_database.cpp b/widgets/MW_database.cpp index 80c2b189..5b850b49 100644 --- a/widgets/MW_database.cpp +++ b/widgets/MW_database.cpp @@ -213,7 +213,7 @@ void MainWindow::undelete() case asym_key: item = new pki_evp(name); break; case x509_req: item = new pki_x509req(name); break; case x509: item = new pki_x509(name); break; - case revokation: item = new pki_crl(name); break; + case revocation: item = new pki_crl(name); break; case tmpl: item = new pki_temp(name); break; case smartCard: item = new pki_scard(name); break; default: continue;