Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Change some more wording away from Certificate

Mostly for the newcertificatewizard. We use Key Pair or
key pair now if we can't avoid it.

Sometimes we use _public_ key to make it clear that it is
intended to be published.

The wording OpenPGP Certificate never gained traction and is
confusing to most users it's also not consistent in Kleo itself.

This also removes the placebo text entry field in the key creation
wizard as users were very confused by that and it does not really
do something.
parent fb49747b
......@@ -10,7 +10,7 @@
</rect>
</property>
<property name="windowTitle" >
<string>Certificate Server Certificate Lookup</string>
<string>Lookup on Server</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
......
......@@ -10,10 +10,10 @@
</rect>
</property>
<property name="title" >
<string comment="@title" >Choose Certificate Format</string>
<string comment="@title" >Choose Format</string>
</property>
<property name="subTitle" >
<string>Please choose which type of certificate you want to create. </string>
<string>Please choose which type you want to create. </string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<property name="sizeConstraint" >
......
......@@ -5,7 +5,7 @@
<string comment="@title" >Enter Details</string>
</property>
<property name="subTitle" >
<string>Please enter your personal details below. If you want more control over the certificate parameters, click on the Advanced Settings button.</string>
<string>Please enter your personal details below. If you want more control over the parameters, click on the Advanced Settings button.</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
......
......@@ -2,10 +2,7 @@
<class>Kleo::NewCertificateUi::KeyCreationPage</class>
<widget class="QWizardPage" name="Kleo::NewCertificateUi::KeyCreationPage" >
<property name="title" >
<string comment="@title" >Creating Key...</string>
</property>
<property name="subTitle" >
<string>Your key is being created.</string>
<string comment="@title" >Creating Key Pair...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<property name="sizeConstraint" >
......@@ -14,16 +11,13 @@
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>The process of creating a key requires large amounts of random numbers. To foster this process, you can use the entry field below to enter some gibberish. The text itself does not matter - only the inter-character timing. You can also move this window around with your mouse, or start some disk-intensive application.</string>
<string>The process of creating a key requires large amounts of random numbers. This may require several minutes...</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="plainTextEdit" />
</item>
</layout>
</widget>
<resources/>
......
......@@ -795,7 +795,7 @@ public:
{
ui.setupUi(this);
setCommitPage(true);
setButtonText(QWizard::CommitButton, i18nc("@action", "Create Key"));
setButtonText(QWizard::CommitButton, i18nc("@action", "Create"));
}
void initializePage() override {
......@@ -852,7 +852,7 @@ private:
connect(j, SIGNAL(result(GpgME::KeyGenerationResult,QByteArray,QString)),
this, SLOT(slotResult(GpgME::KeyGenerationResult,QByteArray,QString)));
if (const Error err = j->start(createGnupgKeyParms()))
setField(QStringLiteral("error"), i18n("Could not start certificate creation: %1",
setField(QStringLiteral("error"), i18n("Could not start key pair creation: %1",
QString::fromLocal8Bit(err.asString())));
else {
job = j;
......@@ -869,14 +869,14 @@ private Q_SLOTS:
if (result.error().code()) {
setField(QStringLiteral("error"), result.error().isCanceled()
? i18n("Operation canceled.")
: i18n("Could not create certificate: %1",
: i18n("Could not create key pair: %1",
QString::fromLocal8Bit(result.error().asString())));
setField(QStringLiteral("url"), QString());
setField(QStringLiteral("result"), QString());
} else if (pgp()) {
setField(QStringLiteral("error"), QString());
setField(QStringLiteral("url"), QString());
setField(QStringLiteral("result"), i18n("Certificate created successfully.\n"
setField(QStringLiteral("result"), i18n("Key pair created successfully.\n"
"Fingerprint: %1", QLatin1String(result.fingerprint())));
} else {
QFile file(tmpDir().absoluteFilePath(QStringLiteral("request.p10")));
......@@ -890,7 +890,7 @@ private Q_SLOTS:
file.write(request);
setField(QStringLiteral("error"), QString());
setField(QStringLiteral("url"), QUrl::fromLocalFile(file.fileName()).toString());
setField(QStringLiteral("result"), i18n("Certificate created successfully."));
setField(QStringLiteral("result"), i18n("Key pair created successfully."));
}
}
setField(QStringLiteral("fingerprint"), QString::fromLatin1(result.fingerprint()));
......@@ -1058,8 +1058,8 @@ private Q_SLOTS:
return;
}
invokeMailer(QString(), // to
i18n("My new OpenPGP certificate"), // subject
i18n("Please find attached my new OpenPGP certificate."), // body
i18n("My new public OpenPGP key"), // subject
i18n("Please find attached my new public OpenPGP key."), // body
fileName);
}
......@@ -1183,7 +1183,7 @@ public:
tmp(QDir::temp().absoluteFilePath(QStringLiteral("kleo-"))),
ui(q)
{
q->setWindowTitle(i18nc("@title", "Certificate Creation Wizard"));
q->setWindowTitle(i18nc("@title", "Key Pair Creation Wizard"));
}
private:
......@@ -1695,7 +1695,7 @@ QString OverviewPage::i18nFormatGnupgKeyParms(bool details) const
} else {
s << Row< >(i18n("Key Strength:"), i18n("default"));
}
s << Row< >(i18n("Certificate Usage:"), i18nCombinedKeyUsages().join(i18nc("separator for key usages", ",&nbsp;")));
s << Row< >(i18n("Usage:"), i18nCombinedKeyUsages().join(i18nc("separator for key usages", ",&nbsp;")));
if (const Subkey::PubkeyAlgo subkey = subkeyType()) {
s << Row< >(i18n("Subkey Type:"), QLatin1String(Subkey::publicKeyAlgorithmAsString(subkey)));
if (is_ecdh(subkeyType())) {
......
......@@ -2,10 +2,10 @@
<class>Kleo::NewCertificateUi::OverviewPage</class>
<widget class="QWizardPage" name="Kleo::NewCertificateUi::OverviewPage" >
<property name="title" >
<string comment="@title" >Review Certificate Parameters</string>
<string comment="@title" >Review Parameters</string>
</property>
<property name="subTitle" >
<string>Please review the certificate parameters before proceeding to create the certificate.</string>
<string>Please review the parameters before proceeding.</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
......
......@@ -72,14 +72,14 @@
<item>
<widget class="QPushButton" name="sendCertificateByEMailPB" >
<property name="text" >
<string>Send Certificate By EMail...</string>
<string>Send Public Key By EMail...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="uploadToKeyserverPB" >
<property name="text" >
<string>Upload Certificate To Directory Service...</string>
<string>Upload Public Key To Directory Service...</string>
</property>
</widget>
</item>
......
......@@ -371,7 +371,7 @@ void KeyListController::createActions(KActionCollection *coll)
const action_data action_data[] = {
// File menu
{
"file_new_certificate", i18n("New Keypair..."), QString(),
"file_new_certificate", i18n("New Key Pair..."), QString(),
"view-certificate-add", nullptr, nullptr, QStringLiteral("Ctrl+N"), false, true
},
{
......
......@@ -66,25 +66,25 @@ public:
KLEOPATRA_VERSION_STRING);
const QString introduction = i18n("Kleopatra is a front-end for the crypto software <a href=\"https://gnupg.org\">GnuPG</a>.");
const QString keyExplanation = i18n("For most actions you need either a public certificate (key) from others or a private key of your own.");
const QString keyExplanation = i18n("For most actions you need either a public key (certificate) or your own private key.");
const QString privateKeyExplanation = i18n("The private key is needed to decrypt or sign.");
const QString publicKeyExplanation = i18n("The certificate (public key) can be used by others to verify your identity or encrypt to you.");
const QString publicKeyExplanation = i18n("The public key can be used by others to verify your identity or encrypt to you.");
const QString wikiUrl = i18nc("More info about public key cryptography, please link to your local version of Wikipedia",
"https://en.wikipedia.org/wiki/Public-key_cryptography");
const QString learnMore = i18nc("%1 is link a wiki article", "You can learn more about this on <a href=\"%1\">Wikipedia</a>", wikiUrl);
const QString learnMore = i18nc("%1 is link a wiki article", "You can learn more about this on <a href=\"%1\">Wikipedia</a>.", wikiUrl);
auto label = new QLabel(templ.arg(welcome).arg(introduction).arg(keyExplanation).arg(privateKeyExplanation).arg(publicKeyExplanation).arg(learnMore));
label->setTextInteractionFlags(Qt::TextBrowserInteraction);
label->setOpenExternalLinks(true);
auto genKeyAction = new QAction(q);
genKeyAction->setText(i18n("Generate Keypair"));
genKeyAction->setText(i18n("New Key Pair..."));
genKeyAction->setIcon(QIcon::fromTheme("view-certificate-add"));
auto importAction = new QAction(q);
importAction->setText(i18n("Import Certificates"));
importAction->setText(i18n("Import..."));
importAction->setIcon(QIcon::fromTheme("view-certificate-import"));
connect(importAction, &QAction::triggered, q, [this] () { import(); });
......@@ -94,14 +94,14 @@ public:
mGenerateBtn->setDefaultAction(genKeyAction);
mGenerateBtn->setIconSize(QSize(64, 64));
mGenerateBtn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
mGenerateBtn->setToolTip(i18n("Create a new OpenPGP Keypair") + QStringLiteral("<br>") +
i18n("To create an S/MIME certificate request use \"New Keypair\" from the 'File' Menu instead"));
mGenerateBtn->setToolTip(i18n("Create a new OpenPGP key pair") + QStringLiteral("<br>") +
i18n("To create an S/MIME certificate request use \"New Key Pair\" from the 'File' Menu instead"));
mImportBtn = new QToolButton();
mImportBtn->setDefaultAction(importAction);
mImportBtn->setIconSize(QSize(64, 64));
mImportBtn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
mImportBtn->setToolTip(i18n("Import a Certificate from a file.") + QStringLiteral("<br>") +
mImportBtn->setToolTip(i18n("Import from a file.") + QStringLiteral("<br>") +
i18n("To import from a public keyserver use \"Lookup on Server\" instead."));
auto btnLayout = new QHBoxLayout;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment