aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/m_key_server_sync/KeyServerList.cpp2
-rw-r--r--src/m_key_server_sync/KeyServerList.h4
-rw-r--r--src/m_key_server_sync/KeyServerProbe.cpp2
-rw-r--r--src/m_key_server_sync/KeyServerSettingsPage.cpp4
-rw-r--r--src/m_key_server_sync/KeyServerSyncModule.cpp4
-rw-r--r--src/m_key_server_sync/PKSInterface.cpp4
-rw-r--r--src/m_key_server_sync/SearchKeyDialog.cpp8
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts2
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts2
16 files changed, 23 insertions, 23 deletions
diff --git a/src/m_key_server_sync/KeyServerList.cpp b/src/m_key_server_sync/KeyServerList.cpp
index bbb9f7f..b4267d7 100644
--- a/src/m_key_server_sync/KeyServerList.cpp
+++ b/src/m_key_server_sync/KeyServerList.cpp
@@ -285,7 +285,7 @@ auto SyncRoute() -> Route {
// VKS first where the server has it: it confirms the address by email and
// keeps third-party signatures out. HKP is the fallback, not the
- // preference — but it does carry both operations, so a server that only
+ // preference -- but it does carry both operations, so a server that only
// speaks HKP is a reason to change protocol, never a reason to go
// somewhere else.
if (entry.vks) return {entry.url, true};
diff --git a/src/m_key_server_sync/KeyServerList.h b/src/m_key_server_sync/KeyServerList.h
index 0c140fb..21d4a6f 100644
--- a/src/m_key_server_sync/KeyServerList.h
+++ b/src/m_key_server_sync/KeyServerList.h
@@ -107,13 +107,13 @@ auto Urls() -> QStringList;
* @brief The server to use for an operation needing @p capability.
*
* Prefers the user's default, and only looks past it when that server is known
- * not to speak the protocol — a server nobody has probed yet is still worth
+ * not to speak the protocol -- a server nobody has probed yet is still worth
* trying, since an explicit choice should not be quietly overridden by a gap in
* our knowledge. Falls back to the default rather than returning nothing: a
* real network error tells the user far more than an operation that silently
* does nothing.
*
- * Only for operations that genuinely cannot be carried out any other way —
+ * Only for operations that genuinely cannot be carried out any other way --
* searching parses HKP output. Publish and refresh work over either protocol
* and must use @ref SyncRoute instead, so that they stay on the server the
* user chose.
diff --git a/src/m_key_server_sync/KeyServerProbe.cpp b/src/m_key_server_sync/KeyServerProbe.cpp
index 4124a6a..8506182 100644
--- a/src/m_key_server_sync/KeyServerProbe.cpp
+++ b/src/m_key_server_sync/KeyServerProbe.cpp
@@ -64,7 +64,7 @@ constexpr int kProbeTimeoutMs = 8000;
* plain text. Rejecting on the header alone would throw out one of the most
* widely used key servers there is.
*
- * A mislabelled one-liner and a real 404 page are still easy to tell apart —
+ * A mislabeled one-liner and a real 404 page are still easy to tell apart --
* the page is a document, and it says so in its first bytes.
*/
auto LooksLikeHtml(const QString& content_type, const QByteArray& body)
diff --git a/src/m_key_server_sync/KeyServerSettingsPage.cpp b/src/m_key_server_sync/KeyServerSettingsPage.cpp
index 53b197b..6ffe576 100644
--- a/src/m_key_server_sync/KeyServerSettingsPage.cpp
+++ b/src/m_key_server_sync/KeyServerSettingsPage.cpp
@@ -205,7 +205,7 @@ void KeyServerSettingsPage::slot_remove() {
entries_.removeAt(row);
// Removing the default has to hand the role to somebody, or every operation
- // would fall back to whatever happened to be first anyway — better to make
+ // would fall back to whatever happened to be first anyway -- better to make
// that explicit and visible in the table.
if (default_url_ == removed) {
default_url_ = entries_.isEmpty() ? QString() : entries_.first().url;
@@ -285,7 +285,7 @@ void KeyServerSettingsPage::apply_probe_result(
if (!result.Conforms()) {
// The entry stays. A server can be down, or behind a network that is
// blocking it right now, and dropping it would make the user retype the
- // address to find out — Test Selected re-runs this whenever they want.
+ // address to find out -- Test Selected re-runs this whenever they want.
QMessageBox::warning(
this, tr("Key Server Not Verified"),
tr("%1 did not answer as a key server.\n\n%2\n\nIt has been added and "
diff --git a/src/m_key_server_sync/KeyServerSyncModule.cpp b/src/m_key_server_sync/KeyServerSyncModule.cpp
index e4a81b0..dcc5827 100644
--- a/src/m_key_server_sync/KeyServerSyncModule.cpp
+++ b/src/m_key_server_sync/KeyServerSyncModule.cpp
@@ -132,8 +132,8 @@ auto ConfirmHkpPublish(QWidget* parent, const QString& url) -> bool {
"%1 does not support verified publishing (VKS), so the key "
"would be uploaded over HKP instead.\n\n"
"The server will not confirm your email address, and the "
- "upload cannot be undone — HKP key servers do not let keys be "
- "removed.\n\n"
+ "upload cannot be undone: HKP key servers do not allow keys "
+ "to be removed.\n\n"
"Publish to %1 anyway?")
.arg(host),
QMessageBox::Ok | QMessageBox::Cancel,
diff --git a/src/m_key_server_sync/PKSInterface.cpp b/src/m_key_server_sync/PKSInterface.cpp
index 7cc119d..1ad8fb3 100644
--- a/src/m_key_server_sync/PKSInterface.cpp
+++ b/src/m_key_server_sync/PKSInterface.cpp
@@ -80,8 +80,8 @@ auto GetKeySizeDescription(const QString& algo_id, const QString& key_size)
// Algorithms that fix their parameters in the algorithm ID are reported
// inconsistently: keys.openpgp.org gives Ed448 its real 456, others send 0.
- // Show a real figure when there is one, and a dash rather than "0 bits" —
- // which reads as a broken key — when there is not.
+ // Show a real figure when there is one, and a dash rather than "0 bits" --
+ // which reads as a broken key -- when there is not.
bool ok = false;
const auto bits = key_size.toInt(&ok);
if (!ok || bits <= 0) return "-";
diff --git a/src/m_key_server_sync/SearchKeyDialog.cpp b/src/m_key_server_sync/SearchKeyDialog.cpp
index 3017d2b..082963f 100644
--- a/src/m_key_server_sync/SearchKeyDialog.cpp
+++ b/src/m_key_server_sync/SearchKeyDialog.cpp
@@ -50,7 +50,7 @@ constexpr int kKeyHandleRole = Qt::UserRole + 1;
/// Where the key ID lives inside the fingerprint depends on the key version: a
/// v4 fingerprint (SHA-1, 40 hex) ends with it, while a v6 fingerprint
/// (SHA-256, 64 hex) starts with it (RFC 9580 §5.5.4.3). Blindly taking the
-/// last 16 chars — as this used to — turns a v6 fingerprint into a handle no
+/// last 16 chars -- as this used to -- turns a v6 fingerprint into a handle no
/// keyserver can resolve.
auto ShortenKeyHandle(const QString& handle) -> QString {
if (handle.size() == 64) return handle.left(16);
@@ -61,7 +61,7 @@ auto ShortenKeyHandle(const QString& handle) -> QString {
/// Render a keyserver timestamp.
///
/// The machine-readable format leaves a field empty to mean the date does not
-/// apply — a key with no expiry sends nothing at all. Feeding that straight to
+/// apply -- a key with no expiry sends nothing at all. Feeding that straight to
/// fromSecsSinceEpoch() printed 1970-01-01, which reads as an expired key.
auto FormatKeyServerDate(const QString& seconds, const QString& absent)
-> QString {
@@ -121,7 +121,7 @@ void SearchKeyDialog::init_ui() {
ui_->searchEdit->setFocus();
// The list comes from Settings now. The box stays editable so a one-off
- // server can still be typed in, but only what is configured is offered — and
+ // server can still be typed in, but only what is configured is offered -- and
// an ad-hoc address is not silently added to the list.
ui_->keyServerComboBox->addItems(KeyServerList::Urls());
@@ -289,7 +289,7 @@ void SearchKeyDialog::slot_search_finished_pks(
int row = 0;
for (const auto& key : keys) {
auto* keyid_item = new QTableWidgetItem(ShortenKeyHandle(key.keyid));
- // Import must look the key up by whatever the server reported — for a v6
+ // Import must look the key up by whatever the server reported -- for a v6
// key that is the full 64-hex fingerprint, which the cell no longer shows.
keyid_item->setData(kKeyHandleRole, key.keyid);
ui_->tableWidget->setItem(row, 0, keyid_item);
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
index 6baba87..29c582a 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
@@ -87,7 +87,7 @@ Fehler: %2</translation>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 unterstützt keine verifizierte Veröffentlichung (VKS), daher würde der Schlüssel stattdessen über HKP hochgeladen werden.
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
index fbf14c9..22647c9 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
@@ -34,7 +34,7 @@
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation type="unfinished"></translation>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
index 631f9b7..8e6a22c 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
@@ -87,7 +87,7 @@ Error: %2</translation>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 no admite la publicación verificada (VKS), por lo que la clave se cargaría a través de HKP.
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
index c5a4b0e..47e0744 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
@@ -87,7 +87,7 @@ Erreur : %2</translation>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 ne prend pas en charge la publication vérifiée (VKS), la clé serait donc téléversée via HKP à la place.
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
index 75795b4..3462e05 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
@@ -87,7 +87,7 @@ Errore: %2</translation>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 non supporta la pubblicazione verificata (VKS), quindi la chiave verrebbe caricata tramite HKP.
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
index bb61724..eaf4144 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
@@ -27,7 +27,7 @@
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 nie obsługuje weryfikowanego publikowania (VKS), więc klucz zostanie wysłany przez HKP.
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
index 0f9a3e5..6614bd0 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
@@ -80,7 +80,7 @@ Error: %2</source>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 не поддерживает проверенную публикацию (VKS), поэтому ключ будет загружен через HKP.
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
index 231a794..089af5f 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
@@ -87,7 +87,7 @@ Error: %2</source>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 不支持已验证发布（VKS），因此密钥将通过 HKP 上传。
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
index 8070f94..738a6dc 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
@@ -87,7 +87,7 @@ Error: %2</source>
<location filename="../KeyServerSyncModule.cpp" line="129"/>
<source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-The server will not confirm your email address, and the upload cannot be undone — HKP key servers do not let keys be removed.
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
Publish to %1 anyway?</source>
<translation>%1 不支援驗證發布（VKS），因此金鑰將改為透過 HKP 上傳。
generated by cgit (git 2.51.2) at 2026-10-25 07:26:24 +0100