diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index 85fb9771d..144b3aac0 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -476,7 +476,7 @@ void NetworkManager::proxyAuthentication(const QNetworkProxy &proxy, QAuthentica connect(box, SIGNAL(rejected()), dialog, SLOT(reject())); connect(box, SIGNAL(accepted()), dialog, SLOT(accept())); - QCheckBox* rememberCheck = new QCheckBox("Remember username and password for this proxy.", dialog); + QCheckBox* rememberCheck = new QCheckBox(tr("Remember username and password for this proxy."), dialog); label->setText(tr("A username and password are being requested by proxy %1. ").arg(proxy.hostName())); formLa->addRow(label); diff --git a/src/main/main.cpp b/src/main/main.cpp index 5da0d8978..e6a56eaf3 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -113,6 +113,7 @@ void qupzilla_signal_handler(int s) } #endif // defined(Q_OS_LINUX) || defined(__GLIBC__) +#ifndef Q_OS_WIN #if (QT_VERSION < 0x050000) void msgHandler(QtMsgType type, const char* msg) { @@ -156,6 +157,7 @@ void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString } } #endif +#endif int main(int argc, char* argv[]) { diff --git a/translations/empty.ts b/translations/empty.ts index 8791e5c4b..e355ace04 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -2569,6 +2569,11 @@ Please install latest version of QupZilla. Proxy authorisation required + + + Remember username and password for this proxy. + + A username and password are being requested by proxy %1.