diff --git a/doc/xca.sgml b/doc/xca.sgml index ea8dfa3a..64b7c17f 100644 --- a/doc/xca.sgml +++ b/doc/xca.sgml @@ -493,8 +493,8 @@ or disable it completely by setting it to Not defined

-The not Before field is set to the current date and time of the -operating system and the not After field is set to the current +The Not before field is set to the current date and time of the +operating system and the Not after field is set to the current date and time plus the specified time range. When applying time ranges, the expiry date (not after) is calculated by taking the currently configured start date (not before) and adding the time range. @@ -1576,7 +1576,7 @@ applied together with the HTTPS_client or HTTPS_server template. Click on the Templates tab. - Click on the New template button + Click on the New Template button Select an appropriate value for the Preset Template Values, then click OK Under the Subject tab, specify an internal name for the diff --git a/lang/xca_ru.ts b/lang/xca_ru.ts index 8df95c3f..ae7563e8 100644 --- a/lang/xca_ru.ts +++ b/lang/xca_ru.ts @@ -53,12 +53,7 @@ Не доступен - - Details of the certificate - Сведения о сертификате - - - + Signer unknown Подписавший неизвестен @@ -99,6 +94,7 @@ + Details of the Certificate Сведения о сертификате @@ -214,7 +210,7 @@ - + Show config Показать конфигурацию @@ -300,7 +296,7 @@ - Edit times + Edit dates Изменить период @@ -473,12 +469,12 @@ - Next Update + Next update Следующее обновление - Last Update + Last update Последнее обновление @@ -701,18 +697,14 @@ &Готово - - - The type of the Item '%1' is not recognized - Невозможно определить тип '%1' - - - + Details of the item '%1' cannot be shown Невозможно отобразить сведения о '%1' - + + + The type of the item '%1' is not recognized Невозможно определить тип '%1' @@ -1002,7 +994,12 @@ This will delete the key '%1' and make it unexportable Язык - + + Paste PEM file + Вставить файл PEM + + + Extra Дополнительно @@ -1125,7 +1122,7 @@ This will delete the key '%1' and make it unexportable - &New template + &New Template &Новый шаблон @@ -1215,7 +1212,12 @@ This will delete the key '%1' and make it unexportable PEM файл - + + Database dump ( *.dump );; All files ( * ) + Дамп базы данных ( *.dump );; Все файлы ( * ) + + + Import password Пароль при импорте @@ -1240,27 +1242,22 @@ This will delete the key '%1' and make it unexportable И&мпорт - - paste PEM file - Вставить PEM данные - - - + About О программе - - - Database dump ( *.dump );;All files ( * ) - Дамп базы данных ( *.dump );;Все файлы ( * ) - Import PEM data Импорт PEM данные - + + Please enter the new SO PIN (PUK) for the token '%1' + Пожалуйста, введите новый PIN SO (PUK) для модуля защиты '%1' + + + The new label of the token '%1' Новое название модуля защиты '%1' @@ -1291,7 +1288,7 @@ Please enter the DH parameter bits Пожалуйста, введите желаемую длину параметров - + &New DataBase &Новая база данных @@ -1331,12 +1328,7 @@ Please enter the DH parameter bits Пожалуйста, введите первоначальный PIN SO (PUK) для модуля защиты '%1' - - Please enter the new SO PIN (PUK) of the token '%1' - Пожалуйста, введите новый PIN SO (PUK) для модуля защиты '%1' - - - + The token '%1' did not contain any keys or certificates Модуль защиты '%1' не содержит ни ключей, ни сертификатов @@ -1405,17 +1397,7 @@ Please enter the DH parameter bits Новый CRL - - next update - Следующее обновление - - - - last update - Последнее обновление - - - + Days Дней @@ -1445,7 +1427,12 @@ Please enter the DH parameter bits Применить - + + CRL number + Порядковый номер CRL + + + Hash algorithm Алгоритм подписи @@ -1465,12 +1452,17 @@ Please enter the DH parameter bits Параметры - - CRL Number - Порядковый номер CRL + + Last update + Последнее обновление - + + Next update + Следующее обновление + + + Revocation reasons Указывать причину отзыва @@ -1478,13 +1470,7 @@ Please enter the DH parameter bits NewKey - - - New key - Новый ключ - - - + Please give a name to the new key and select the desired keysize Введите название нового ключа и задайте параметры ключа @@ -1499,7 +1485,12 @@ Please enter the DH parameter bits Внутреннее имя - + + Curve name + Эллиптическая кривая + + + Keysize Длина ключа @@ -1519,7 +1510,9 @@ Please enter the DH parameter bits Внутреннее имя нового ключа - + + + New Key Новый ключ @@ -1528,11 +1521,6 @@ Please enter the DH parameter bits Keytype Тип ключа - - - Curve - Эллиптическая кривая - Create @@ -2316,13 +2304,13 @@ Especially EC and DSA are only defined with SHA1 in the PKCS#11 specification. - PKI Keys ( *.pem *.der *.key );;PKCS#8 Keys ( *.p8 *.pk8 );;SSH Public Keys ( *.pub );; - Ключи PKI ( *.pem *.der *.key );;Ключи PKCS#8 ( *.p8 *.pk8 );;Открытые ключи SSH ( *.pub );; + PKI Keys ( *.pem *.der *.key );; PKCS#8 Keys ( *.p8 *.pk8 );; SSH Public Keys ( *.pub );; + Ключи PKI ( *.pem *.der *.key );; Ключи PKCS#8 ( *.p8 *.pk8 );; Открытые ключи SSH ( *.pub );; - PKCS#10 CSR ( *.pem *.der *.csr );;Netscape Request ( *.spkac *.spc );; - PKCS#10 CSR ( *.pem *.der *.csr );;Запрос Netscape ( *.spkac *.spc );; + PKCS#10 CSR ( *.pem *.der *.csr );; Netscape Request ( *.spkac *.spc );; + PKCS#10 CSR ( *.pem *.der *.csr );; Запрос Netscape ( *.spkac *.spc );; @@ -2623,8 +2611,8 @@ In library %3 - subject alternative name - Альтернативное название субъекта + Subject alternative name + Альтернативное имя субъекта @@ -2634,12 +2622,12 @@ In library %3 Subject key identifier - Идентификатор ключа субъекта + Идентификатор ключа субъекта Authority key identifier - Идентификатор ключа ЦС + Идентификатор ключа ЦС @@ -2820,7 +2808,7 @@ In library %3 - include sub directorys + Include subdirectories Включая подпапки @@ -2930,7 +2918,7 @@ In library %3 - Public Key + Public key Открытый ключ @@ -3085,7 +3073,7 @@ Size: %3 - PEM Files( *.pem );; All files ( * ) + PEM files ( *.pem );; All files ( * ) Файлы PEM ( *.pem );; Все файлы ( * ) @@ -3124,7 +3112,7 @@ Size: %3 CRL number - Порядковый номер CRL + Кол. отозванных @@ -3304,8 +3292,8 @@ and will be completed by the new, private part of the key - XCA templates ( *.xca);; All files ( * ) - XCA шаблоны ( *.xca);; Все файлы ( * ) + XCA templates ( *.xca );; All files ( * ) + XCA шаблоны ( *.xca );; Все файлы ( * ) @@ -3321,12 +3309,7 @@ and will be completed by the new, private part of the key Серийный номер - - not After - Сертификат действителен по - - - + Trust state Состояние доверия @@ -3346,32 +3329,12 @@ and will be completed by the new, private part of the key отражает расширение основных настроек - - md5 fingerprint - Отпечаток MD5 - - - - sha1 fingerprint - Отпечаток SHA1 - - - - sha256 fingerprint - Отпечаток SHA256 - - - + Start date Действителен с - - not Before - Сертификат действителен с - - - + CRL Expiration CRL действителен до @@ -3411,7 +3374,42 @@ and will be completed by the new, private part of the key ЦС - + + MD5 fingerprint + Отпечаток MD5 + + + + SHA1 fingerprint + Отпечаток SHA1 + + + + SHA256 fingerprint + Отпечаток SHA256 + + + + PKCS#7 chain + Цепочка PKCS#7 + + + + PKCS#12 chain + Цепочка PKCS#12 + + + + PKCS#7 trusted + Доверенный PKCS#7 + + + + PKCS#7 all + Всё PKCS#7 + + + Certificate export Экспортировать сертификат @@ -3428,7 +3426,7 @@ and will be completed by the new, private part of the key days - дней + дней @@ -3440,37 +3438,27 @@ and so it was not imported и поэтому не был импортирован - + + Not before + Сертификат действителен с + + + + Not after + Сертификат действителен по + + + PEM chain Цепочка PEM - - PKCS #7 chain - Цепочка PKCS #7 - - - - PKCS #12 chain - Цепочка PKCS #12 - - - + PEM + key PEM + ключ - - PKCS #7 trusted - Доверенный PKCS #7 - - - - PKCS #7 all - Всё PKCS #7 - - - + PEM trusted Доверенный PEM @@ -3575,7 +3563,7 @@ and thus was not stored - Signature Algorithm + Signature algorithm Алгоритм подписи @@ -3586,7 +3574,7 @@ and thus was not stored Config files ( *.conf *.cnf);; All files ( * ) - Файлы настроек ( *.conf *.cnf);; Все файлы ( * ) + Файлы настроек ( *.conf *.cnf );; Все файлы ( * ) @@ -3794,7 +3782,7 @@ and thus was not stored - public key + Public key Открытый ключ @@ -4068,7 +4056,7 @@ and thus was not stored Not trusted - Нет доверия + Не доверенный diff --git a/lib/db_base.cpp b/lib/db_base.cpp index 68784a1f..bcddaf34 100644 --- a/lib/db_base.cpp +++ b/lib/db_base.cpp @@ -628,7 +628,7 @@ void db_base::store(QModelIndexList indexes) QString fn = mainwin->getPath() + QDir::separator() + "export.pem"; QString s = QFileDialog::getSaveFileName(mainwin, tr("Save %1 items in one file as").arg(indexes.size()), fn, - tr("PEM Files( *.pem );; All files ( * )")); + tr("PEM files ( *.pem );; All files ( * )")); if (s.isEmpty()) return; s = nativeSeparator(s); diff --git a/lib/db_temp.cpp b/lib/db_temp.cpp index fc2babf0..1edfda1c 100644 --- a/lib/db_temp.cpp +++ b/lib/db_temp.cpp @@ -167,7 +167,7 @@ void db_temp::store(QModelIndex index) temp->getUnderlinedName() + ".xca"; QString s = QFileDialog::getSaveFileName(mainwin, tr("Save template as"), fn, - tr("XCA templates ( *.xca);; All files ( * )")); + tr("XCA templates ( *.xca );; All files ( * )")); if (s.isEmpty()) return; s = nativeSeparator(s); diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp index f39899ba..849e9acd 100644 --- a/lib/db_x509.cpp +++ b/lib/db_x509.cpp @@ -57,13 +57,13 @@ dbheaderList db_x509::getHeaders() h << new dbheader(HD_cert_ca, true, tr("CA"), tr("reflects the basic Constraints extension")) << new dbheader(HD_cert_serial, true, tr("Serial")) << - new dbheader(HD_cert_md5fp, false,tr("md5 fingerprint")) << - new dbheader(HD_cert_sha1fp, false,tr("sha1 fingerprint")) << - new dbheader(HD_cert_sha256fp, false,tr("sha256 fingerprint")) << + new dbheader(HD_cert_md5fp, false,tr("MD5 fingerprint")) << + new dbheader(HD_cert_sha1fp, false,tr("SHA1 fingerprint")) << + new dbheader(HD_cert_sha256fp, false,tr("SHA256 fingerprint")) << new dbheader(HD_cert_notBefore, false,tr("Start date"), - tr("not Before")) << + tr("Not before")) << new dbheader(HD_cert_notAfter, true, tr("Expiry date"), - tr("not After")) << + tr("Not after")) << new dbheader(HD_cert_trust, false,tr("Trust state")) << new dbheader(HD_cert_revocation,false, tr("Revocation")) << new dbheader(HD_cert_crl_expire,true, tr("CRL Expiration")); @@ -659,13 +659,13 @@ void db_x509::store(QModelIndexList list) exportType(exportType::PEM_chain, "pem", tr("PEM chain")) << exportType(exportType::PKCS7_chain, "p7b", - tr("PKCS #7 chain")); + tr("PKCS#7 chain")); } if (privkey && privkey->isPrivKey() && !privkey->isToken()) { if (chain) { usual << exportType(exportType::PKCS12_chain, "p12", - tr("PKCS #12 chain")); + tr("PKCS#12 chain")); types << exportType(exportType::PKCS12, "p12", "PKCS #12"); } else { @@ -680,9 +680,9 @@ void db_x509::store(QModelIndexList list) } types << exportType() << exportType(exportType::PKCS7_trusted, "p7b", - tr("PKCS #7 trusted")) << + tr("PKCS#7 trusted")) << exportType(exportType::PKCS7_all, "p7b", - tr("PKCS #7 all")) << + tr("PKCS#7 all")) << exportType(exportType::PEM_trusted, "pem", tr("PEM trusted")) << exportType(exportType::PEM_all, "pem", diff --git a/lib/db_x509super.cpp b/lib/db_x509super.cpp index b0c217c0..a9daa052 100644 --- a/lib/db_x509super.cpp +++ b/lib/db_x509super.cpp @@ -60,7 +60,7 @@ dbheaderList db_x509super::getHeaders() h << new dbheader(HD_x509key_name, false, tr("Key name"), tr("Internal name of the key")) << - new dbheader(HD_x509_sigalg, false, tr("Signature Algorithm")); + new dbheader(HD_x509_sigalg, false, tr("Signature algorithm")); foreach(int nid, v3nid) diff --git a/lib/func.cpp b/lib/func.cpp index f4eb6168..f6742b4e 100644 --- a/lib/func.cpp +++ b/lib/func.cpp @@ -464,7 +464,7 @@ void dn_translations_setup() dn_translations[NID_pkcs9_challengePassword] = QObject::tr("Challenge password"); dn_translations[NID_basic_constraints] = QObject::tr("Basic Constraints"); - dn_translations[NID_subject_alt_name] = QObject::tr("subject alternative name"); + dn_translations[NID_subject_alt_name] = QObject::tr("Subject alternative name"); dn_translations[NID_issuer_alt_name] = QObject::tr("issuer alternative name"); dn_translations[NID_subject_key_identifier] = QObject::tr("Subject key identifier"); dn_translations[NID_authority_key_identifier] = QObject::tr("Authority key identifier"); diff --git a/lib/load_obj.cpp b/lib/load_obj.cpp index f3c903da..b809f786 100644 --- a/lib/load_obj.cpp +++ b/lib/load_obj.cpp @@ -49,8 +49,8 @@ load_base::~load_base() load_key::load_key() :load_base() { - filter = QObject::tr("PKI Keys ( *.pem *.der *.key );;" - "PKCS#8 Keys ( *.p8 *.pk8 );;" + filter = QObject::tr("PKI Keys ( *.pem *.der *.key );; " + "PKCS#8 Keys ( *.p8 *.pk8 );; " "SSH Public Keys ( *.pub );;") + filter; caption = QObject::tr("Import RSA key"); } @@ -64,7 +64,7 @@ pki_base * load_key::newItem() load_req::load_req() :load_base() { - filter = QObject::tr("PKCS#10 CSR ( *.pem *.der *.csr );;" + filter = QObject::tr("PKCS#10 CSR ( *.pem *.der *.csr );; " "Netscape Request ( *.spkac *.spc );;") + filter; caption = QObject::tr("Import Request"); } diff --git a/lib/pki_key.cpp b/lib/pki_key.cpp index eb195bb1..2a9a3f18 100644 --- a/lib/pki_key.cpp +++ b/lib/pki_key.cpp @@ -162,7 +162,7 @@ QString pki_key::getIntNameWithType() { return QString("%1 (%2:%3%4)").arg(getIntName()).arg(getTypeString()). arg(length()).arg(isPubKey() ? - QString(" ") + tr("public key") : QString("")); + QString(" ") + tr("Public key") : QString("")); } QString pki_key::removeTypeFromIntName(QString n) diff --git a/ui/CrlDetail.ui b/ui/CrlDetail.ui index 81c50f18..ed18c90f 100644 --- a/ui/CrlDetail.ui +++ b/ui/CrlDetail.ui @@ -185,14 +185,14 @@ - Next Update + Next update - Last Update + Last update diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui index f239898c..df3ef346 100644 --- a/ui/MainWindow.ui +++ b/ui/MainWindow.ui @@ -360,7 +360,7 @@ - &New template + &New Template diff --git a/ui/NewCrl.ui b/ui/NewCrl.ui index 375adf38..80acc3f4 100644 --- a/ui/NewCrl.ui +++ b/ui/NewCrl.ui @@ -89,7 +89,7 @@ - last update + Last update @@ -103,7 +103,7 @@ - next update + Next update @@ -185,7 +185,7 @@ - CRL Number + CRL number true diff --git a/ui/NewKey.ui b/ui/NewKey.ui index 4bec10b4..8d686860 100644 --- a/ui/NewKey.ui +++ b/ui/NewKey.ui @@ -11,7 +11,7 @@ - New key + New Key @@ -36,7 +36,7 @@ - New key + New Key @@ -148,7 +148,7 @@ - Curve + Curve name diff --git a/ui/SearchPkcs11.ui b/ui/SearchPkcs11.ui index e12416af..7f17fbbe 100644 --- a/ui/SearchPkcs11.ui +++ b/ui/SearchPkcs11.ui @@ -61,7 +61,7 @@ - include sub directorys + Include subdirectories diff --git a/widgets/CertDetail.cpp b/widgets/CertDetail.cpp index 8b40d001..095ac02e 100644 --- a/widgets/CertDetail.cpp +++ b/widgets/CertDetail.cpp @@ -78,7 +78,7 @@ void CertDetail::setX509super(pki_x509super *x) void CertDetail::setCert(pki_x509 *cert) { image->setPixmap(*MainWindow::certImg); - headerLabel->setText(tr("Details of the certificate")); + headerLabel->setText(tr("Details of the Certificate")); try { setX509super(cert); diff --git a/widgets/CertExtend.cpp b/widgets/CertExtend.cpp index 08abf98b..7c4cfed9 100644 --- a/widgets/CertExtend.cpp +++ b/widgets/CertExtend.cpp @@ -42,7 +42,7 @@ void CertExtend::accept() if (notBefore->getDate() < signer->getNotBefore()) { QString text = tr("The certificate will be earlier valid than the signer. This is probably not what you want."); xcaWarning msg(this, text); - msg.addButton(QMessageBox::Ok)->setText(tr("Edit times")); + msg.addButton(QMessageBox::Ok)->setText(tr("Edit dates")); msg.addButton(QMessageBox::Close)->setText(tr("Abort rollout")); msg.addButton(QMessageBox::Apply)->setText(tr("Continue rollout")); msg.addButton(QMessageBox::Yes)->setText(tr("Adjust date and continue")); @@ -64,7 +64,7 @@ void CertExtend::accept() !noWellDefinedExpDate->isChecked()) { QString text = tr("The certificate will be longer valid than the signer. This is probably not what you want."); xcaWarning msg(this, text); - msg.addButton(QMessageBox::Ok)->setText(tr("Edit times")); + msg.addButton(QMessageBox::Ok)->setText(tr("Edit dates")); msg.addButton(QMessageBox::Close)->setText(tr("Abort rollout")); msg.addButton(QMessageBox::Apply)->setText(tr("Continue rollout")); msg.addButton(QMessageBox::Yes)->setText(tr("Adjust date and continue")); diff --git a/widgets/ImportMulti.cpp b/widgets/ImportMulti.cpp index 9a7ffa50..641c2032 100644 --- a/widgets/ImportMulti.cpp +++ b/widgets/ImportMulti.cpp @@ -102,7 +102,7 @@ void ImportMulti::addItem(pki_base *pki) delete pm; } else { - XCA_WARN(tr("The type of the Item '%1' is not recognized"). + XCA_WARN(tr("The type of the item '%1' is not recognized"). arg(cn)); } } @@ -246,7 +246,7 @@ pki_base *ImportMulti::import(QModelIndex &idx) db = select_db(cn); if (!db) { - XCA_WARN(tr("The type of the Item '%1' is not recognized"). + XCA_WARN(tr("The type of the item '%1' is not recognized"). arg(cn)); delete pki; return NULL; diff --git a/widgets/MW_menu.cpp b/widgets/MW_menu.cpp index 8471fcba..c866a716 100644 --- a/widgets/MW_menu.cpp +++ b/widgets/MW_menu.cpp @@ -121,7 +121,7 @@ void MainWindow::init_menu() import->addAction(tr("Template"), tempView, SLOT(load()) ); import->addAction(tr("Revocation list"), crlView, SLOT(load())); import->addAction(tr("PEM file"), this, SLOT(loadPem()) ); - import->addAction(tr("paste PEM file"), this, SLOT(pastePem())); + import->addAction(tr("Paste PEM file"), this, SLOT(pastePem())); token = menuBar()->addMenu(tr("&Token")); token->addAction(tr("&Manage Security token"), this, @@ -224,7 +224,7 @@ void MainWindow::import_dbdump() if (!keys) return; QString file = QFileDialog::getOpenFileName(this, tr(XCA_TITLE), homedir, - tr("Database dump ( *.dump );;All files ( * )")); + tr("Database dump ( *.dump );; All files ( * )")); if (file.isEmpty()) return; diff --git a/widgets/MainWindow.cpp b/widgets/MainWindow.cpp index f8d236b2..d3eeb820 100644 --- a/widgets/MainWindow.cpp +++ b/widgets/MainWindow.cpp @@ -420,7 +420,7 @@ void MainWindow::initToken() if (ti.tokenInitialized()) { ret = PwDialog::execute(&p, &pin, false); } else { - p.setDescription(tr("Please enter the new SO PIN (PUK) of the token '%1'"). + p.setDescription(tr("Please enter the new SO PIN (PUK) for the token '%1'"). arg(slotname) + "\n" + ti.pinInfo()); ret = PwDialog::execute(&p, &pin, true); } diff --git a/widgets/X509SuperTreeView.cpp b/widgets/X509SuperTreeView.cpp index 5d835ba1..33e82f05 100644 --- a/widgets/X509SuperTreeView.cpp +++ b/widgets/X509SuperTreeView.cpp @@ -27,7 +27,7 @@ void X509SuperTreeView::fillContextMenu(QMenu *menu, QMenu *subExport, transform = menu->addMenu(tr("Transform")); transform->addAction(tr("Template"), this, SLOT(toTemplate()))->setEnabled(!x->isSpki()); - transform->addAction(tr("Public Key"), this, + transform->addAction(tr("Public key"), this, SLOT(extractPubkey()))->setEnabled(!x->getRefKey()); }