misc: unify terminology
8+3 filename → 8.3 filename
be ware → beware
{cannot, can not, can't, could not, couldn't} → unable to
familly → family
file name → filename
informations → information
plateform → platform
trial → attempt
trying to → attempting to
{web-server, webserver} → Web server
Change-Id: I33b1a0091b5af4f0f055bd4c21b2a05a39adbc50
GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/issues/1730
diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index b78d63f..629f4c7 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -98,7 +98,7 @@
fileutils::loadFile(crl)));
} catch (const std::exception& e) {
if (logger_)
- logger_->warn("Can't load revocation list: %s", e.what());
+ logger_->warn("Unable to load revocation list: %s", e.what());
}
}
@@ -126,7 +126,7 @@
}
} catch (const std::exception& e) {
if (logger_)
- logger_->warn("Can't load OCSP revocation status: {:s}", e.what());
+ logger_->warn("Unable to load OCSP revocation status: {:s}", e.what());
}
}
}
@@ -183,7 +183,7 @@
}
} catch (const std::exception& e) {
if (logger_)
- logger_->warn("Can't load certificate: {:s}", e.what());
+ logger_->warn("Unable to load certificate: {:s}", e.what());
}
return {};
}
@@ -296,7 +296,7 @@
ids.emplace_back(e.first->first);
} catch (const std::exception& e) {
if (logger_)
- logger_->warn("Can't load certificate: {:s}", e.what());
+ logger_->warn("Unable to load certificate: {:s}", e.what());
}
}
paths_.emplace(path, std::move(scerts));
@@ -432,7 +432,7 @@
pinRevocationList(id, *crl);
} catch (...) {
if (logger_)
- logger_->warn("Can't add revocation list");
+ logger_->warn("Unable to add revocation list");
}
}
@@ -576,7 +576,7 @@
crt_status.second.allowed = allowed;
setStoreCertStatus(*cert, allowed);
} else {
- // Can't find certificate
+ // Unable to find certificate
unknownCertStatus_[cert_id].allowed = allowed;
}
} else {
diff --git a/src/security/diffie-hellman.cpp b/src/security/diffie-hellman.cpp
index 9c69f8b..cfba720 100644
--- a/src/security/diffie-hellman.cpp
+++ b/src/security/diffie-hellman.cpp
@@ -127,7 +127,7 @@
}
return params;
}
- // JAMI_ERR("Can't generate DH params.");
+ // JAMI_ERR("Unable to generate DH params.");
return {};
}
}
diff --git a/src/security/threadloop.h b/src/security/threadloop.h
index 67b43ff..b1cfdef 100644
--- a/src/security/threadloop.h
+++ b/src/security/threadloop.h
@@ -95,7 +95,7 @@
void wait_for(const std::chrono::duration<Rep, Period>& rel_time)
{
if (std::this_thread::get_id() != get_id())
- throw std::runtime_error("can not call wait_for outside thread context");
+ throw std::runtime_error("Unable to call wait_for outside thread context");
std::unique_lock lk(mutex_);
cv_.wait_for(lk, rel_time, [this]() { return isStopping(); });
@@ -105,7 +105,7 @@
bool wait_for(const std::chrono::duration<Rep, Period>& rel_time, Pred&& pred)
{
if (std::this_thread::get_id() != get_id())
- throw std::runtime_error("can not call wait_for outside thread context");
+ throw std::runtime_error("Unable to call wait_for outside thread context");
std::unique_lock lk(mutex_);
return cv_.wait_for(lk, rel_time, [this, pred] { return isStopping() || pred(); });
@@ -115,7 +115,7 @@
void wait(Pred&& pred)
{
if (std::this_thread::get_id() != get_id())
- throw std::runtime_error("Can not call wait outside thread context");
+ throw std::runtime_error("Unable to call wait outside thread context");
std::unique_lock lk(mutex_);
cv_.wait(lk, [this, p = std::forward<Pred>(pred)] { return isStopping() || p(); });
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index 8d3539a..4e6952e 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -496,7 +496,7 @@
params_.ca_list.c_str(),
GNUTLS_X509_FMT_DER);
if (ret < 0)
- throw std::runtime_error("can't load CA " + params_.ca_list + ": "
+ throw std::runtime_error("Unable to load CA " + params_.ca_list + ": "
+ std::string(gnutls_strerror(ret)));
if (params_.logger)
@@ -531,7 +531,7 @@
certs.size(),
params_.cert_key->x509_key);
if (ret < 0)
- throw std::runtime_error("can't load certificate: " + std::string(gnutls_strerror(ret)));
+ throw std::runtime_error("Unable to load certificate: " + std::string(gnutls_strerror(ret)));
if (params_.logger)
params_.logger->d("[TLS] User identity loaded");