FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-30 09:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some strings updated.

Browse Source
This commit is contained in:
Martin Rotter 2016-01-04 10:08:32 +01:00
parent 0d3663b93a
commit 4affb202d9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network-web/basenetworkaccessmanager.cpp
View File

@ -63,7 +63,7 @@ void BaseNetworkAccessManager::loadSettings() {
} }
void BaseNetworkAccessManager::onSslErrors(QNetworkReply *reply, const QList<QSslError> &error) { 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); reply->ignoreSslErrors(error);
} }

6
src/services/standard/gui/formstandardfeeddetails.cpp
View File

@ -130,15 +130,15 @@ void FormStandardFeedDetails::onDescriptionChanged(const QString &new_descriptio
void FormStandardFeedDetails::onUrlChanged(const QString &new_url) { void FormStandardFeedDetails::onUrlChanged(const QString &new_url) {
if (QRegExp(URL_REGEXP).exactMatch(new_url)) { if (QRegExp(URL_REGEXP).exactMatch(new_url)) {
// New url is well-formed. // 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()) { else if (!new_url.simplified().isEmpty()) {
// New url is not well-formed but is not empty on the other hand. // 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 { else {
// New url is empty. // 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(); checkOkButtonEnabled();

6
src/services/tt-rss/gui/formeditfeed.cpp
View File

@ -105,15 +105,15 @@ void FormEditFeed::performAction() {
void FormEditFeed::onUrlChanged(const QString &new_url) { void FormEditFeed::onUrlChanged(const QString &new_url) {
if (QRegExp(URL_REGEXP).exactMatch(new_url)) { if (QRegExp(URL_REGEXP).exactMatch(new_url)) {
// New url is well-formed. // 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()) { else if (!new_url.isEmpty()) {
// New url is not well-formed but is not empty on the other hand. // 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 { else {
// New url is empty. // 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."));
} }
} }