The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some pedantic edits

Browse Source
This commit is contained in:
PF4Public 2016-03-06 02:58:43 +03:00 committed by Christian Hohnstaedt
parent 968d5354df
commit c0130feafa
20 changed files with 168 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/xca.sgml
View File

@ -493,8 +493,8 @@ or disable it completely by setting it to <tt>Not defined</tt>
<p>
The <tt>not Before</tt> field is set to the current date and time of the
operating system and the <tt>not After</tt> field is set to the current
The <tt>Not before</tt> field is set to the current date and time of the
operating system and the <tt>Not after</tt> 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.
<enum>
<item>Click on the <bf>Templates</bf> tab.
<item>Click on the <bf>New template</bf> button
<item>Click on the <bf>New Template</bf> button
<item>Select an appropriate value for the Preset Template Values, then
click <bf>OK</bf>
<item>Under the <bf>Subject</bf> tab, specify an internal name for the

270
lang/xca_ru.ts
View File

@ -53,12 +53,7 @@
<translation>Не доступен</translation>
</message>
<message>
<location line="+25"/>
<source>Details of the certificate</source>
<translation>Сведения о сертификате</translation>
</message>
<message>
<location line="+9"/>
<location line="+34"/>
<source>Signer unknown</source>
<translation>Подписавший неизвестен</translation>
</message>
@ -99,6 +94,7 @@
</message>
<message>
<location filename="../ui/CertDetail.ui" line="+36"/>
<location filename="../widgets/CertDetail.cpp" line="-76"/>
<source>Details of the Certificate</source>
<translation>Сведения о сертификате</translation>
</message>
@ -214,7 +210,7 @@
</message>
<message>
<location line="+13"/>
<location filename="../widgets/CertDetail.cpp" line="-124"/>
<location filename="../widgets/CertDetail.cpp" line="-48"/>
<source>Show config</source>
<translation>Показать конфигурацию</translation>
</message>
@ -300,7 +296,7 @@
<message>
<location line="+2"/>
<location line="+22"/>
<source>Edit times</source>
<source>Edit dates</source>
<translation>Изменить период</translation>
</message>
<message>
@ -473,12 +469,12 @@
</message>
<message>
<location line="+9"/>
<source>Next Update</source>
<source>Next update</source>
<translation>Следующее обновление</translation>
</message>
<message>
<location line="+7"/>
<source>Last Update</source>
<source>Last update</source>
<translation>Последнее обновление</translation>
</message>
<message>
@ -701,18 +697,14 @@
<translation>&amp;Готово</translation>
</message>
<message>
<location filename="../widgets/ImportMulti.cpp" line="+105"/>
<location line="+144"/>
<source>The type of the Item &apos;%1&apos; is not recognized</source>
<translation>Невозможно определить тип &apos;%1&apos;</translation>
</message>
<message>
<location line="+48"/>
<location filename="../widgets/ImportMulti.cpp" line="+297"/>
<source>Details of the item &apos;%1&apos; cannot be shown</source>
<translation>Невозможно отобразить сведения о &apos;%1&apos;</translation>
</message>
<message>
<location line="+3"/>
<location line="-192"/>
<location line="+144"/>
<location line="+51"/>
<source>The type of the item &apos;%1&apos; is not recognized</source>
<translation>Невозможно определить тип &apos;%1&apos;</translation>
</message>
@ -1002,7 +994,12 @@ This will delete the key &apos;%1&apos; and make it unexportable</source>
<translation>Язык</translation>
</message>
<message>
<location line="+63"/>
<location line="+49"/>
<source>Paste PEM file</source>
<translation>Вставить файл PEM</translation>
</message>
<message>
<location line="+14"/>
<source>Extra</source>
<translation>Дополнительно</translation>
</message>
@ -1125,7 +1122,7 @@ This will delete the key &apos;%1&apos; and make it unexportable</source>
</message>
<message>
<location line="+28"/>
<source>&amp;New template</source>
<source>&amp;New Template</source>
<translation>&amp;Новый шаблон</translation>
</message>
<message>
@ -1215,7 +1212,12 @@ This will delete the key &apos;%1&apos; and make it unexportable</source>
<translation>PEM файл</translation>
</message>
<message>
<location line="+107"/>
<location line="+102"/>
<source>Database dump ( *.dump );; All files ( * )</source>
<translation>Дамп базы данных ( *.dump );; Все файлы ( * )</translation>
</message>
<message>
<location line="+5"/>
<source>Import password</source>
<translation>Пароль при импорте</translation>
</message>
@ -1240,27 +1242,22 @@ This will delete the key &apos;%1&apos; and make it unexportable</source>
<translation>И&amp;мпорт</translation>
</message>
<message>
<location line="+9"/>
<source>paste PEM file</source>
<translation>Вставить PEM данные</translation>
</message>
<message>
<location line="+30"/>
<location line="+39"/>
<source>About</source>
<translation>О программе</translation>
</message>
<message>
<location line="+71"/>
<source>Database dump ( *.dump );;All files ( * )</source>
<translation>Дамп базы данных ( *.dump );;Все файлы ( * )</translation>
</message>
<message>
<location filename="../widgets/MainWindow.cpp" line="-547"/>
<source>Import PEM data</source>
<translation>Импорт PEM данные</translation>
</message>
<message>
<location line="+43"/>
<location line="+36"/>
<source>Please enter the new SO PIN (PUK) for the token &apos;%1&apos;</source>
<translation>Пожалуйста, введите новый PIN SO (PUK) для модуля защиты &apos;%1&apos;</translation>
</message>
<message>
<location line="+7"/>
<source>The new label of the token &apos;%1&apos;</source>
<translation>Новое название модуля защиты &apos;%1&apos;</translation>
</message>
@ -1291,7 +1288,7 @@ Please enter the DH parameter bits</source>
Пожалуйста, введите желаемую длину параметров</translation>
</message>
<message>
<location filename="../widgets/MW_menu.cpp" line="-133"/>
<location filename="../widgets/MW_menu.cpp" line="-62"/>
<source>&amp;New DataBase</source>
<translation>&amp;Новая база данных</translation>
</message>
@ -1331,12 +1328,7 @@ Please enter the DH parameter bits</source>
<translation>Пожалуйста, введите первоначальный PIN SO (PUK) для модуля защиты &apos;%1&apos;</translation>
</message>
<message>
<location line="+6"/>
<source>Please enter the new SO PIN (PUK) of the token &apos;%1&apos;</source>
<translation>Пожалуйста, введите новый PIN SO (PUK) для модуля защиты &apos;%1&apos;</translation>
</message>
<message>
<location line="+116"/>
<location line="+122"/>
<source>The token &apos;%1&apos; did not contain any keys or certificates</source>
<translation>Модуль защиты &apos;%1&apos; не содержит ни ключей, ни сертификатов</translation>
</message>
@ -1405,17 +1397,7 @@ Please enter the DH parameter bits</source>
<translation>Новый CRL</translation>
</message>
<message>
<location line="+76"/>
<source>next update</source>
<translation>Следующее обновление</translation>
</message>
<message>
<location line="-14"/>
<source>last update</source>
<translation>Последнее обновление</translation>
</message>
<message>
<location line="+43"/>
<location line="+105"/>
<source>Days</source>
<translation>Дней</translation>
</message>
@ -1445,7 +1427,12 @@ Please enter the DH parameter bits</source>
<translation>Применить</translation>
</message>
<message>
<location line="+58"/>
<location line="+21"/>
<source>CRL number</source>
<translation>Порядковый номер CRL</translation>
</message>
<message>
<location line="+37"/>
<source>Hash algorithm</source>
<translation>Алгоритм подписи</translation>
</message>
@ -1465,12 +1452,17 @@ Please enter the DH parameter bits</source>
<translation>Параметры</translation>
</message>
<message>
<location line="+9"/>
<source>CRL Number</source>
<translation>Порядковый номер CRL</translation>
<location line="-87"/>
<source>Last update</source>
<translation>Последнее обновление</translation>
</message>
<message>
<location line="+17"/>
<location line="+14"/>
<source>Next update</source>
<translation>Следующее обновление</translation>
</message>
<message>
<location line="+99"/>
<source>Revocation reasons</source>
<translation>Указывать причину отзыва</translation>
</message>
@ -1478,13 +1470,7 @@ Please enter the DH parameter bits</source>
<context>
<name>NewKey</name>
<message>
<location filename="../ui/NewKey.ui" line="+14"/>
<location line="+25"/>
<source>New key</source>
<translation>Новый ключ</translation>
</message>
<message>
<location line="+47"/>
<location filename="../ui/NewKey.ui" line="+86"/>
<source>Please give a name to the new key and select the desired keysize</source>
<translation>Введите название нового ключа и задайте параметры ключа</translation>
</message>
@ -1499,7 +1485,12 @@ Please enter the DH parameter bits</source>
<translation>Внутреннее имя</translation>
</message>
<message>
<location line="+56"/>
<location line="+49"/>
<source>Curve name</source>
<translation>Эллиптическая кривая</translation>
</message>
<message>
<location line="+7"/>
<source>Keysize</source>
<translation>Длина ключа</translation>
</message>
@ -1519,7 +1510,9 @@ Please enter the DH parameter bits</source>
<translation>Внутреннее имя нового ключа</translation>
</message>
<message>
<location line="+3"/>
<location line="-107"/>
<location line="+25"/>
<location line="+85"/>
<source>New Key</source>
<translation>Новый ключ</translation>
</message>
@ -1528,11 +1521,6 @@ Please enter the DH parameter bits</source>
<source>Keytype</source>
<translation>Тип ключа</translation>
</message>
<message>
<location line="-27"/>
<source>Curve</source>
<translation>Эллиптическая кривая</translation>
</message>
<message>
<location filename="../widgets/NewKey.cpp" line="+180"/>
<source>Create</source>
@ -2316,13 +2304,13 @@ Especially EC and DSA are only defined with SHA1 in the PKCS#11 specification.</
</message>
<message>
<location line="-96"/>
<source>PKI Keys ( *.pem *.der *.key );;PKCS#8 Keys ( *.p8 *.pk8 );;SSH Public Keys ( *.pub );;</source>
<translation>Ключи PKI ( *.pem *.der *.key );;Ключи PKCS#8 ( *.p8 *.pk8 );;Открытые ключи SSH ( *.pub );;</translation>
<source>PKI Keys ( *.pem *.der *.key );; PKCS#8 Keys ( *.p8 *.pk8 );; SSH Public Keys ( *.pub );;</source>
<translation>Ключи PKI ( *.pem *.der *.key );; Ключи PKCS#8 ( *.p8 *.pk8 );; Открытые ключи SSH ( *.pub );;</translation>
</message>
<message>
<location line="+15"/>
<source>PKCS#10 CSR ( *.pem *.der *.csr );;Netscape Request ( *.spkac *.spc );;</source>
<translation>PKCS#10 CSR ( *.pem *.der *.csr );;Запрос Netscape ( *.spkac *.spc );;</translation>
<source>PKCS#10 CSR ( *.pem *.der *.csr );; Netscape Request ( *.spkac *.spc );;</source>
<translation>PKCS#10 CSR ( *.pem *.der *.csr );; Запрос Netscape ( *.spkac *.spc );;</translation>
</message>
<message>
<location line="+14"/>
@ -2623,8 +2611,8 @@ In library %3
</message>
<message>
<location line="+1"/>
<source>subject alternative name</source>
<translation>Альтернативное название субъекта</translation>
<source>Subject alternative name</source>
<translation>Альтернативное имя субъекта</translation>
</message>
<message>
<location line="+1"/>
@ -2634,12 +2622,12 @@ In library %3
<message>
<location line="+1"/>
<source>Subject key identifier</source>
<translation type="unfinished">Идентификатор ключа субъекта</translation>
<translation>Идентификатор ключа субъекта</translation>
</message>
<message>
<location line="+1"/>
<source>Authority key identifier</source>
<translation type="unfinished">Идентификатор ключа ЦС</translation>
<translation>Идентификатор ключа ЦС</translation>
</message>
<message>
<location line="+1"/>
@ -2820,7 +2808,7 @@ In library %3
</message>
<message>
<location line="+7"/>
<source>include sub directorys</source>
<source>Include subdirectories</source>
<translation>Включая подпапки</translation>
</message>
<message>
@ -2930,7 +2918,7 @@ In library %3
</message>
<message>
<location line="+2"/>
<source>Public Key</source>
<source>Public key</source>
<translation>Открытый ключ</translation>
</message>
</context>
@ -3085,7 +3073,7 @@ Size: %3
</message>
<message>
<location line="+1"/>
<source>PEM Files( *.pem );; All files ( * )</source>
<source>PEM files ( *.pem );; All files ( * )</source>
<translation>Файлы PEM ( *.pem );; Все файлы ( * )</translation>
</message>
</context>
@ -3124,7 +3112,7 @@ Size: %3
<message>
<location line="+1"/>
<source>CRL number</source>
<translation>Порядковый номер CRL</translation>
<translation>Кол. отозванных</translation>
</message>
<message>
<location line="+119"/>
@ -3304,8 +3292,8 @@ and will be completed by the new, private part of the key</source>
</message>
<message>
<location line="+1"/>
<source>XCA templates ( *.xca);; All files ( * )</source>
<translation>XCA шаблоны ( *.xca);; Все файлы ( * )</translation>
<source>XCA templates ( *.xca );; All files ( * )</source>
<translation>XCA шаблоны ( *.xca );; Все файлы ( * )</translation>
</message>
<message>
<location line="-122"/>
@ -3321,12 +3309,7 @@ and will be completed by the new, private part of the key</source>
<translation>Серийный номер</translation>
</message>
<message>
<location line="+7"/>
<source>not After</source>
<translation>Сертификат действителен по</translation>
</message>
<message>
<location line="+1"/>
<location line="+8"/>
<source>Trust state</source>
<translation>Состояние доверия</translation>
</message>
@ -3346,32 +3329,12 @@ and will be completed by the new, private part of the key</source>
<translation>отражает расширение основных настроек</translation>
</message>
<message>
<location line="+2"/>
<source>md5 fingerprint</source>
<translation>Отпечаток MD5</translation>
</message>
<message>
<location line="+1"/>
<source>sha1 fingerprint</source>
<translation>Отпечаток SHA1</translation>
</message>
<message>
<location line="+1"/>
<source>sha256 fingerprint</source>
<translation>Отпечаток SHA256</translation>
</message>
<message>
<location line="+1"/>
<location line="+5"/>
<source>Start date</source>
<translation>Действителен с</translation>
</message>
<message>
<location line="+1"/>
<source>not Before</source>
<translation>Сертификат действителен с</translation>
</message>
<message>
<location line="+5"/>
<location line="+6"/>
<source>CRL Expiration</source>
<translation>CRL действителен до</translation>
</message>
@ -3411,7 +3374,42 @@ and will be completed by the new, private part of the key</source>
<translation>ЦС</translation>
</message>
<message>
<location line="+626"/>
<location line="+3"/>
<source>MD5 fingerprint</source>
<translation>Отпечаток MD5</translation>
</message>
<message>
<location line="+1"/>
<source>SHA1 fingerprint</source>
<translation>Отпечаток SHA1</translation>
</message>
<message>
<location line="+1"/>
<source>SHA256 fingerprint</source>
<translation>Отпечаток SHA256</translation>
</message>
<message>
<location line="+591"/>
<source>PKCS#7 chain</source>
<translation>Цепочка PKCS#7</translation>
</message>
<message>
<location line="+6"/>
<source>PKCS#12 chain</source>
<translation>Цепочка PKCS#12</translation>
</message>
<message>
<location line="+15"/>
<source>PKCS#7 trusted</source>
<translation>Доверенный PKCS#7</translation>
</message>
<message>
<location line="+2"/>
<source>PKCS#7 all</source>
<translation>Всё PKCS#7</translation>
</message>
<message>
<location line="+7"/>
<source>Certificate export</source>
<translation>Экспортировать сертификат</translation>
</message>
@ -3428,7 +3426,7 @@ and will be completed by the new, private part of the key</source>
<message>
<location line="+363"/>
<source> days</source>
<translation>дней</translation>
<translation> дней</translation>
</message>
<message>
<location line="-757"/>
@ -3440,37 +3438,27 @@ and so it was not imported</source>
и поэтому не был импортирован</translation>
</message>
<message>
<location line="+299"/>
<location line="-288"/>
<source>Not before</source>
<translation>Сертификат действителен с</translation>
</message>
<message>
<location line="+2"/>
<source>Not after</source>
<translation>Сертификат действителен по</translation>
</message>
<message>
<location line="+585"/>
<source>PEM chain</source>
<translation>Цепочка PEM</translation>
</message>
<message>
<location line="+2"/>
<source>PKCS #7 chain</source>
<translation>Цепочка PKCS #7</translation>
</message>
<message>
<location line="+6"/>
<source>PKCS #12 chain</source>
<translation>Цепочка PKCS #12</translation>
</message>
<message>
<location line="+9"/>
<location line="+17"/>
<source>PEM + key</source>
<translation>PEM + ключ</translation>
</message>
<message>
<location line="+6"/>
<source>PKCS #7 trusted</source>
<translation>Доверенный PKCS #7</translation>
</message>
<message>
<location line="+2"/>
<source>PKCS #7 all</source>
<translation>Всё PKCS #7</translation>
</message>
<message>
<location line="+2"/>
<location line="+10"/>
<source>PEM trusted</source>
<translation>Доверенный PEM</translation>
</message>
@ -3575,7 +3563,7 @@ and thus was not stored</source>
</message>
<message>
<location line="+1"/>
<source>Signature Algorithm</source>
<source>Signature algorithm</source>
<translation>Алгоритм подписи</translation>
</message>
<message>
@ -3586,7 +3574,7 @@ and thus was not stored</source>
<message>
<location line="+1"/>
<source>Config files ( *.conf *.cnf);; All files ( * )</source>
<translation>Файлы настроек ( *.conf *.cnf);; Все файлы ( * )</translation>
<translation>Файлы настроек ( *.conf *.cnf );; Все файлы ( * )</translation>
</message>
<message>
<location line="+25"/>
@ -3794,7 +3782,7 @@ and thus was not stored</source>
</message>
<message>
<location line="+9"/>
<source>public key</source>
<source>Public key</source>
<translation>Открытый ключ</translation>
</message>
<message>
@ -4068,7 +4056,7 @@ and thus was not stored</source>
<message>
<location line="+522"/>
<source>Not trusted</source>
<translation>Нет доверия</translation>
<translation>Не доверенный</translation>
</message>
<message>
<location line="+0"/>

2
lib/db_base.cpp
View File

@ -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);

2
lib/db_temp.cpp
View File

@ -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);

18
lib/db_x509.cpp
View File

@ -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",

2
lib/db_x509super.cpp
View File

@ -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)

2
lib/func.cpp
View File

@ -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");

6
lib/load_obj.cpp
View File

@ -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");
}

2
lib/pki_key.cpp
View File

@ -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)

4
ui/CrlDetail.ui
View File

@ -185,14 +185,14 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Next Update</string>
<string>Next update</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Last Update</string>
<string>Last update</string>
</property>
</widget>
</item>

2
ui/MainWindow.ui
View File

@ -360,7 +360,7 @@
<item>
<widget class="QPushButton" name="BNnewTemp">
<property name="text">
<string>&amp;New template</string>
<string>&amp;New Template</string>
</property>
</widget>
</item>

6
ui/NewCrl.ui
View File

@ -89,7 +89,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>last update</string>
<string>Last update</string>
</property>
</widget>
</item>
@ -103,7 +103,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>next update</string>
<string>Next update</string>
</property>
</widget>
</item>
@ -185,7 +185,7 @@
<item row="3" column="0">
<widget class="QCheckBox" name="setCrlNumber">
<property name="text">
<string>CRL Number</string>
<string>CRL number</string>
</property>
<property name="checked">
<bool>true</bool>

6
ui/NewKey.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>New key</string>
<string>New Key</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@ -36,7 +36,7 @@
</font>
</property>
<property name="text">
<string>New key</string>
<string>New Key</string>
</property>
</widget>
</item>
@ -148,7 +148,7 @@
<item row="5" column="1">
<widget class="QLabel" name="curveLabel">
<property name="text">
<string>Curve</string>
<string>Curve name</string>
</property>
</widget>
</item>

2
ui/SearchPkcs11.ui
View File

@ -61,7 +61,7 @@
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="subdirs">
<property name="text">
<string>include sub directorys</string>
<string>Include subdirectories</string>
</property>
</widget>
</item>

2
widgets/CertDetail.cpp
View File

@ -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);

4
widgets/CertExtend.cpp
View File

@ -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"));

4
widgets/ImportMulti.cpp
View File

@ -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;

4
widgets/MW_menu.cpp
View File

@ -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;

2
widgets/MainWindow.cpp
View File

@ -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);
}

2
widgets/X509SuperTreeView.cpp
View File

@ -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());
}