diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui index cd532356d..6ab30e721 100644 --- a/src/gui/formsettings.ui +++ b/src/gui/formsettings.ui @@ -88,7 +88,7 @@ - 4 + 6 @@ -414,8 +414,8 @@ MySQL backend will automatically use database with name "rssguard". Do 0 0 - 740 - 451 + 100 + 30 @@ -492,8 +492,8 @@ MySQL backend will automatically use database with name "rssguard". Do 0 0 - 734 - 425 + 167 + 219 @@ -1332,7 +1332,7 @@ MySQL backend will automatically use database with name "rssguard". Do ms - 1000 + 100 15000 diff --git a/src/network-web/networkfactory.cpp b/src/network-web/networkfactory.cpp index 26fe108df..fab628c77 100755 --- a/src/network-web/networkfactory.cpp +++ b/src/network-web/networkfactory.cpp @@ -62,16 +62,22 @@ QString NetworkFactory::networkErrorText(QNetworkReply::NetworkError error_code) //: Network status. return tr("protocol error"); + case QNetworkReply::ContentAccessDenied: + return tr("access to content was denied"); + case QNetworkReply::HostNotFoundError: //: Network status. return tr("host not found"); + case QNetworkReply::OperationCanceledError: + case QNetworkReply::TimeoutError: + return tr("connection timed out or was cancelled"); + case QNetworkReply::RemoteHostClosedError: case QNetworkReply::ConnectionRefusedError: //: Network status. return tr("connection refused"); - case QNetworkReply::TimeoutError: case QNetworkReply::ProxyTimeoutError: //: Network status. return tr("connection timed out");