diff --git a/src/network-web/basenetworkaccessmanager.cpp b/src/network-web/basenetworkaccessmanager.cpp index 45bfaf81b..2e45daa09 100755 --- a/src/network-web/basenetworkaccessmanager.cpp +++ b/src/network-web/basenetworkaccessmanager.cpp @@ -63,7 +63,7 @@ void BaseNetworkAccessManager::loadSettings() { } void BaseNetworkAccessManager::onSslErrors(QNetworkReply *reply, const QList<QSslError> &error) { - qWarning("SSL errors for '%s': '%s' (code %d).", qPrintable(reply->url().toString()), qPrintable(reply->errorString()), (int) reply->error()); + qWarning("Ignoring SSL errors for '%s': '%s' (code %d).", qPrintable(reply->url().toString()), qPrintable(reply->errorString()), (int) reply->error()); reply->ignoreSslErrors(error); } diff --git a/src/services/standard/gui/formstandardfeeddetails.cpp b/src/services/standard/gui/formstandardfeeddetails.cpp index 7d24e49f4..091f99718 100755 --- a/src/services/standard/gui/formstandardfeeddetails.cpp +++ b/src/services/standard/gui/formstandardfeeddetails.cpp @@ -130,15 +130,15 @@ void FormStandardFeedDetails::onDescriptionChanged(const QString &new_descriptio void FormStandardFeedDetails::onUrlChanged(const QString &new_url) { if (QRegExp(URL_REGEXP).exactMatch(new_url)) { // New url is well-formed. - m_ui->m_txtUrl->setStatus(LineEditWithStatus::Ok, tr("The url is ok.")); + m_ui->m_txtUrl->setStatus(LineEditWithStatus::Ok, tr("The URL is ok.")); } else if (!new_url.simplified().isEmpty()) { // New url is not well-formed but is not empty on the other hand. - m_ui->m_txtUrl->setStatus(LineEditWithStatus::Warning, tr("The url does not meet standard pattern. Does your url start with \"http://\" or \"https://\" prefix.")); + m_ui->m_txtUrl->setStatus(LineEditWithStatus::Warning, tr("The URL does not meet standard pattern. Does your URL start with \"http://\" or \"https://\" prefix.")); } else { // New url is empty. - m_ui->m_txtUrl->setStatus(LineEditWithStatus::Error, tr("The url is empty.")); + m_ui->m_txtUrl->setStatus(LineEditWithStatus::Error, tr("The URL is empty.")); } checkOkButtonEnabled(); diff --git a/src/services/tt-rss/gui/formeditfeed.cpp b/src/services/tt-rss/gui/formeditfeed.cpp index 9c09c657a..de7c0436e 100755 --- a/src/services/tt-rss/gui/formeditfeed.cpp +++ b/src/services/tt-rss/gui/formeditfeed.cpp @@ -105,15 +105,15 @@ void FormEditFeed::performAction() { void FormEditFeed::onUrlChanged(const QString &new_url) { if (QRegExp(URL_REGEXP).exactMatch(new_url)) { // New url is well-formed. - m_ui->m_txtUrl->setStatus(LineEditWithStatus::Ok, tr("The url is ok.")); + m_ui->m_txtUrl->setStatus(LineEditWithStatus::Ok, tr("The URL is ok.")); } else if (!new_url.isEmpty()) { // New url is not well-formed but is not empty on the other hand. - m_ui->m_txtUrl->setStatus(LineEditWithStatus::Warning, tr("The url does not meet standard pattern. Does your url start with \"http://\" or \"https://\" prefix.")); + m_ui->m_txtUrl->setStatus(LineEditWithStatus::Warning, tr("The URL does not meet standard pattern. Does your URL start with \"http://\" or \"https://\" prefix.")); } else { // New url is empty. - m_ui->m_txtUrl->setStatus(LineEditWithStatus::Error, tr("The url is empty.")); + m_ui->m_txtUrl->setStatus(LineEditWithStatus::Error, tr("The URL is empty.")); } }