diff --git a/lang/es.po b/lang/es.po index 9fce8e95..5b8bbec9 100644 --- a/lang/es.po +++ b/lang/es.po @@ -1768,7 +1768,7 @@ msgid "Repeat %1" msgstr "" #: PwDialog#5 -msgid "%1 missmatch" +msgid "%1 mismatch" msgstr "" #: PwDialog#6 @@ -2875,7 +2875,7 @@ msgid "Please insert card: %1 %2 [%3] with Serial: %4" msgstr "" #: pki_scard#11 -msgid "Public Key missmatch. Please re-import card" +msgid "Public Key mismatch. Please re-import card" msgstr "" #: pki_scard#12 diff --git a/lang/fr.po b/lang/fr.po index 27871567..969823ad 100644 --- a/lang/fr.po +++ b/lang/fr.po @@ -1880,7 +1880,7 @@ msgid "Repeat %1" msgstr "Répéter %1" #: PwDialog#4 -msgid "%1 missmatch" +msgid "%1 mismatch" msgstr "%1 ne correspond pas" #: PwDialog#5 @@ -2339,7 +2339,7 @@ msgid "..." msgstr "..." #: SearchPkcs11#4 -msgid "include sub directorys" +msgid "Include subdirectories" msgstr "include les sous-dossiers" #: SearchPkcs11#5 @@ -3220,7 +3220,7 @@ msgid "Please insert card: %1 %2 [%3] with Serial: %4" msgstr "SVP insérer la carte %1 %2 [%3] avec le numéro de série: %4" #: pki_scard#10 -msgid "Public Key missmatch. Please re-import card" +msgid "Public Key mismatch. Please re-import card" msgstr "La clé publique ne correspond pas. Veuillez re-importer la carte" #: pki_scard#11 diff --git a/lang/sk.po b/lang/sk.po index ac6a20a1..f21aad66 100644 --- a/lang/sk.po +++ b/lang/sk.po @@ -1855,7 +1855,7 @@ msgid "Repeat %1" msgstr "Opakovať %1" #: PwDialog#4 -msgid "%1 missmatch" +msgid "%1 mismatch" msgstr "%1 nezhoda" #: PwDialog#5 @@ -2314,7 +2314,7 @@ msgid "..." msgstr "..." #: SearchPkcs11#4 -msgid "include sub directorys" +msgid "Include subdirectories" msgstr "Zahrnúť podadresáre" #: SearchPkcs11#5 diff --git a/lang/tr.po b/lang/tr.po index 9ed8b5cb..38d44052 100644 --- a/lang/tr.po +++ b/lang/tr.po @@ -1783,7 +1783,7 @@ msgid "Repeat %1" msgstr "" #: PwDialog#5 -msgid "%1 missmatch" +msgid "%1 mismatch" msgstr "" #: PwDialog#6 @@ -2901,7 +2901,7 @@ msgid "Please insert card: %1 %2 [%3] with Serial: %4" msgstr "" #: pki_scard#11 -msgid "Public Key missmatch. Please re-import card" +msgid "Public Key mismatch. Please re-import card" msgstr "" #: pki_scard#12 diff --git a/lang/xca.pot b/lang/xca.pot index 3a5c5b00..51f3ba2d 100644 --- a/lang/xca.pot +++ b/lang/xca.pot @@ -1848,7 +1848,7 @@ msgid "Repeat %1" msgstr "" #: PwDialog#4 -msgid "%1 missmatch" +msgid "%1 mismatch" msgstr "" #: PwDialog#5 @@ -2299,7 +2299,7 @@ msgid "..." msgstr "" #: SearchPkcs11#4 -msgid "include sub directorys" +msgid "Include subdirectories" msgstr "" #: SearchPkcs11#5 @@ -3156,7 +3156,7 @@ msgid "Please insert card: %1 %2 [%3] with Serial: %4" msgstr "" #: pki_scard#10 -msgid "Public Key missmatch. Please re-import card" +msgid "Public Key mismatch. Please re-import card" msgstr "" #: pki_scard#11 diff --git a/lang/xca_de.ts b/lang/xca_de.ts index b402d4a6..aeebd90c 100644 --- a/lang/xca_de.ts +++ b/lang/xca_de.ts @@ -2485,7 +2485,7 @@ Insbesondere sind in der PKCS#11 Spezifikation EC und DSA signaturen nur mit SHA - %1 missmatch + %1 mismatch Keine %1 übereinstimmung @@ -3058,7 +3058,7 @@ in Bibliothek %3 - include sub directorys + Include subdirectories Unterverzeichnisse einschliessen @@ -4655,7 +4655,7 @@ und wurde daher nicht importiert - Public Key missmatch. Please re-import card + Public Key mismatch. Please re-import card Öffentlicher Schlüssel passt nicht. Bitte Chipkarte neu importieren diff --git a/lang/xca_es.ts b/lang/xca_es.ts index b982d5ba..f38f75d6 100644 --- a/lang/xca_es.ts +++ b/lang/xca_es.ts @@ -2248,7 +2248,7 @@ Especially EC and DSA are only defined with SHA1 in the PKCS#11 specification. - %1 missmatch + %1 mismatch @@ -2810,7 +2810,7 @@ In library %3 - include sub directorys + Include subdirectories @@ -4060,7 +4060,7 @@ and thus was not stored - Public Key missmatch. Please re-import card + Public Key mismatch. Please re-import card diff --git a/lang/xca_fr.ts b/lang/xca_fr.ts index 8916923d..3c96fdc9 100644 --- a/lang/xca_fr.ts +++ b/lang/xca_fr.ts @@ -2249,7 +2249,7 @@ En particulier, EC et DSA ne sont définis qu'avec SHA1 dans la spécificat - %1 missmatch + %1 mismatch %1 ne correspond pas @@ -2808,7 +2808,7 @@ Dans la bibliothèque %3 - include sub directorys + Include subdirectories include les sous-dossiers @@ -3918,7 +3918,7 @@ En conséquence, elle n'a pas été chargée - Public Key missmatch. Please re-import card + Public Key mismatch. Please re-import card La clé publique ne correspond pas. Veuillez re-importer la carte diff --git a/lang/xca_hr.ts b/lang/xca_hr.ts index f2a55dcc..e1621c18 100644 --- a/lang/xca_hr.ts +++ b/lang/xca_hr.ts @@ -2532,7 +2532,7 @@ Posebno EC i DSA su samo definirani sa SHA1 u PKCS#11 specifikaciji. - %1 missmatch + %1 mismatch %1 je neodgovarajući @@ -3095,7 +3095,7 @@ U knjižnici %3 - include sub directorys + Include subdirectories Uključi podmape @@ -4733,7 +4733,7 @@ i zbog toga nije spreman - Public Key missmatch. Please re-import card + Public Key mismatch. Please re-import card Neodgovarajući javni ključ. Molimo ponovo umetnite karticu diff --git a/lang/xca_ru.ts b/lang/xca_ru.ts index 860517a7..6f2e4076 100644 --- a/lang/xca_ru.ts +++ b/lang/xca_ru.ts @@ -2241,7 +2241,7 @@ Especially EC and DSA are only defined with SHA1 in the PKCS#11 specification. - %1 missmatch + %1 mismatch %1 не соответствуют @@ -3895,7 +3895,7 @@ and thus was not stored - Public Key missmatch. Please re-import card + Public Key mismatch. Please re-import card Ошибка открытого ключа. Пожалуйста, импортируйте карту снова diff --git a/lang/xca_sk.ts b/lang/xca_sk.ts index 93280fa4..62ca63fb 100644 --- a/lang/xca_sk.ts +++ b/lang/xca_sk.ts @@ -2248,7 +2248,7 @@ Najmä EC a DSA sú v špecifikácii PKCS#11 definované len s SHA1. - %1 missmatch + %1 mismatch %1 nezhoda @@ -2807,7 +2807,7 @@ V knižnici %3 - include sub directorys + Include subdirectories Zahrnúť podadresáre diff --git a/lang/xca_tr.ts b/lang/xca_tr.ts index cd6288f4..6852d677 100644 --- a/lang/xca_tr.ts +++ b/lang/xca_tr.ts @@ -2353,7 +2353,7 @@ Especially EC and DSA are only defined with SHA1 in the PKCS#11 specification. - %1 missmatch + %1 mismatch @@ -2915,7 +2915,7 @@ In library %3 - include sub directorys + Include subdirectories @@ -4157,7 +4157,7 @@ and thus was not stored - Public Key missmatch. Please re-import card + Public Key mismatch. Please re-import card diff --git a/lib/pki_scard.cpp b/lib/pki_scard.cpp index 60ccf145..85c8e001 100644 --- a/lib/pki_scard.cpp +++ b/lib/pki_scard.cpp @@ -608,7 +608,7 @@ bool pki_scard::prepare_card(slotid *slot, bool verifyPubkey) const if (EVP_PKEY_cmp(key, pkey) == 1) return true; if (!object_id.isEmpty()) - XCA_WARN(tr("Public Key missmatch. Please re-import card")); + XCA_WARN(tr("Public Key mismatch. Please re-import card")); } return false; } diff --git a/widgets/PwDialog.cpp b/widgets/PwDialog.cpp index cff81cec..6e6dbd09 100644 --- a/widgets/PwDialog.cpp +++ b/widgets/PwDialog.cpp @@ -95,7 +95,7 @@ void PwDialog::setRW(bool write) void PwDialog::accept() { if (wrDialog && (passA->text() != passB->text())) { - XCA_WARN(tr("%1 missmatch").arg(pi->getType())); + XCA_WARN(tr("%1 mismatch").arg(pi->getType())); return; } QString pw = passB->text();