Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

Fix translation issue and compile issue on Windows.

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2013-11-09 22:24:39 +03:30
parent 478af279da
commit d1f0b1776a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/network/networkmanager.cpp
View File

@ -476,7 +476,7 @@ void NetworkManager::proxyAuthentication(const QNetworkProxy &proxy, QAuthentica
connect(box, SIGNAL(rejected()), dialog, SLOT(reject())); connect(box, SIGNAL(rejected()), dialog, SLOT(reject()));
connect(box, SIGNAL(accepted()), dialog, SLOT(accept())); 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())); label->setText(tr("A username and password are being requested by proxy %1. ").arg(proxy.hostName()));
formLa->addRow(label); formLa->addRow(label);

2
src/main/main.cpp
View File

@ -113,6 +113,7 @@ void qupzilla_signal_handler(int s)
} }
#endif // defined(Q_OS_LINUX) || defined(__GLIBC__) #endif // defined(Q_OS_LINUX) || defined(__GLIBC__)
#ifndef Q_OS_WIN
#if (QT_VERSION < 0x050000) #if (QT_VERSION < 0x050000)
void msgHandler(QtMsgType type, const char* msg) void msgHandler(QtMsgType type, const char* msg)
{ {
@ -156,6 +157,7 @@ void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString
} }
} }
#endif #endif
#endif
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

5
translations/empty.ts
View File

@ -2569,6 +2569,11 @@ Please install latest version of QupZilla.</source>
<source>Proxy authorisation required</source> <source>Proxy authorisation required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../src/lib/network/networkmanager.cpp" line="479"/>
<source>Remember username and password for this proxy.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../src/lib/network/networkmanager.cpp" line="481"/> <location filename="../src/lib/network/networkmanager.cpp" line="481"/>
<source>A username and password are being requested by proxy %1. </source> <source>A username and password are being requested by proxy %1. </source>