Commit 762f2827 authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Unify spelling of "user ID"

Always capitalize "ID". Don't use a hyphen.

GnuPG-bug-id: 5916
parent 5c51fa73
......@@ -196,16 +196,16 @@ void AddUserIDCommand::Private::createJob()
void AddUserIDCommand::Private::showErrorDialog(const Error &err)
{
error(xi18nc("@info",
"<para>An error occurred while trying to add the user-id: "
"<para>An error occurred while trying to add the user ID: "
"<message>%1</message></para>",
QString::fromLocal8Bit(err.asString())),
i18nc("@title:window", "Add User-ID Error"));
i18nc("@title:window", "Add User ID Error"));
}
void AddUserIDCommand::Private::showSuccessDialog()
{
information(i18nc("@info", "User-ID successfully added."),
i18nc("@title:window", "Add User-ID Succeeded"));
information(i18nc("@info", "User ID successfully added."),
i18nc("@title:window", "Add User ID Succeeded"));
}
#undef d
......
......@@ -192,7 +192,7 @@ void CertifyCertificateCommand::doStart()
for (const UserID &uid : std::as_const(d->uids))
if (qstricmp(uid.parent().primaryFingerprint(), key.primaryFingerprint()) != 0) {
qCWarning(KLEOPATRA_LOG) << "User-ID <-> Key mismatch!";
qCWarning(KLEOPATRA_LOG) << "User ID <-> Key mismatch!";
d->finished();
return;
}
......
......@@ -544,7 +544,7 @@ static void handleOwnerTrust(const std::vector<ImportResultData> &results)
"<para>The key has the fingerprint:<nl/>"
"<numid>%1</numid>"
"</para>"
"<para>And claims the User IDs:"
"<para>And claims the user IDs:"
"<list><item>%2</item></list>"
"</para>"
"Is this your own key? (Set trust level to ultimate)",
......
......@@ -221,7 +221,7 @@ void RevokeCertificationCommand::doStart()
for (const UserID &uid : std::as_const(d->uids))
if (qstricmp(uid.parent().primaryFingerprint(), d->certificationTarget.primaryFingerprint()) != 0) {
qCWarning(KLEOPATRA_LOG) << "User-ID <-> Key mismatch!";
qCWarning(KLEOPATRA_LOG) << "User ID <-> Key mismatch!";
d->finished();
return;
}
......
......@@ -183,7 +183,7 @@ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurat
mFetchMissingSignerKeysCB->setToolTip(
xi18nc("@info:tooltip",
"If enabled, then Kleopatra will automatically try to retrieve the keys "
"that were used to certify the user ids of newly imported OpenPGP keys."));
"that were used to certify the user IDs of newly imported OpenPGP keys."));
connect(mFetchMissingSignerKeysCB, &QCheckBox::toggled,
q, &DirectoryServicesConfigurationPage::markAsChanged);
glay->addWidget(mFetchMissingSignerKeysCB, row, 0, 1, 3);
......
......@@ -502,7 +502,7 @@ void CertificateDetailsWidget::Private::setupCommonProperties()
QStringList tagList;
for (const auto &tag: uid.remarks(Tags::tagKeys(), err)) {
if (err) {
qCWarning(KLEOPATRA_LOG) << "Getting remarks for user id" << uid.id() << "failed:" << err;
qCWarning(KLEOPATRA_LOG) << "Getting remarks for user ID" << uid.id() << "failed:" << err;
}
tagList << QString::fromStdString(tag);
}
......@@ -516,7 +516,7 @@ void CertificateDetailsWidget::Private::setupCommonProperties()
if (canRevokeUID) {
auto button = new QPushButton;
button->setIcon(QIcon::fromTheme(QStringLiteral("entry-delete")));
button->setToolTip(i18n("Revoke this User ID"));
button->setToolTip(i18n("Revoke this user ID"));
button->setMaximumWidth(32);
QObject::connect(button, &QPushButton::clicked,
q, [this, uid]() { revokeUID(uid); });
......
......@@ -183,7 +183,7 @@ public:
int i = 0;
for (const auto &uid: key.userIDs()) {
if (uid.isRevoked() || uid.isInvalid()) {
// Skip user ID's that cannot really be certified.
// Skip user IDs that cannot really be certified.
i++;
continue;
}
......@@ -480,14 +480,14 @@ public:
if (c_remark) {
const QString candidate = QString::fromUtf8(c_remark);
if (candidate != remark) {
qCDebug(KLEOPATRA_LOG) << "Different remarks on user ids. Taking last.";
qCDebug(KLEOPATRA_LOG) << "Different remarks on user IDs. Taking last.";
remark = candidate;
uidsWithRemark.clear();
}
uidsWithRemark.push_back(uid);
}
}
// Only select the user ids with the correct remark
// Only select the user IDs with the correct remark
if (!remark.isEmpty()) {
selectUserIDs(uidsWithRemark);
}
......@@ -582,7 +582,7 @@ public:
if (mTarget.isNull() || mSecKeySelect->currentKey().isNull()) {
return false;
}
// do not accept empty list of user ids
// do not accept empty list of user IDs
if (selectedUserIDs().empty()) {
return false;
}
......
......@@ -35,10 +35,10 @@ public:
/* Get the key to certify */
GpgME::Key target() const;
/* Select specific user ids. Default: all */
/* Select specific user IDs. Default: all */
void selectUserIDs(const std::vector<GpgME::UserID> &uids);
/* The user ids that should be signed */
/* The user IDs that should be signed */
std::vector<unsigned int> selectedUserIDs() const;
/* The secret key selected */
......
......@@ -37,10 +37,10 @@ public:
/* Get the key to revoke certifications of */
GpgME::Key target() const;
/* Select specific user ids. Default: all */
/* Select specific user IDs. Default: all */
void setSelectUserIDs(const std::vector<GpgME::UserID> &uids);
/* The user ids whose certifications shall be revoked */
/* The user IDs whose certifications shall be revoked */
std::vector<GpgME::UserID> selectedUserIDs() const;
/* Set the selected certification key. Default: last used key */
......
......@@ -55,7 +55,7 @@ WebOfTrustDialog::WebOfTrustDialog(QWidget *parent)
mFetchKeysBtn = bbox->addButton(i18nc("@action:button", "Fetch Missing Keys"),
QDialogButtonBox::ActionRole);
mFetchKeysBtn->setToolTip(i18nc("@info:tooltip", "Look up and import all keys that were used to certify the user ids of this key"));
mFetchKeysBtn->setToolTip(i18nc("@info:tooltip", "Look up and import all keys that were used to certify the user IDs of this key"));
connect(mFetchKeysBtn, &QPushButton::pressed, this, &WebOfTrustDialog::fetchMissingKeys);
#ifndef QGPGME_SUPPORTS_RECEIVING_KEYS_BY_KEY_ID
mFetchKeysBtn->setVisible(false);
......
......@@ -261,7 +261,7 @@
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="uidGB">
<property name="title">
<string>Additional User-IDs</string>
<string>Additional User IDs</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
......
......@@ -1937,7 +1937,7 @@ void AdvancedSettingsDialog::updateWidgetVisibility()
}
ui.uidGB->setVisible(protocol == OpenPGP);
ui.uidGB->setEnabled(false);
ui.uidGB->setToolTip(i18nc("@info:tooltip", "Adding more than one User ID is not yet implemented."));
ui.uidGB->setToolTip(i18nc("@info:tooltip", "Adding more than one user ID is not yet implemented."));
ui.emailGB->setVisible(protocol == CMS);
ui.dnsGB->setVisible(protocol == CMS);
ui.uriGB->setVisible(protocol == CMS);
......
......@@ -447,7 +447,7 @@ void KeyListController::createActions(KActionCollection *coll)
nullptr, nullptr, nullptr, QString(), false, true
},
{
"certificates_add_userid", i18n("Add User-ID..."), QString(),
"certificates_add_userid", i18n("Add User ID..."), QString(),
nullptr, nullptr, nullptr, QString(), false, true
},
// Tools menu
......
Supports Markdown
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