StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr680'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-09 13:42:31 +01:00
commit c16fc197c4
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ qrc_*
Makefile
qtox
*.qm
*.orig

2
src/widget/form/addfriendform.cpp
View File

@ -97,7 +97,7 @@ void AddFriendForm::onSendTriggered()
} else {
if (Settings::getInstance().getUseProxy())
{
QMessageBox::StandardButton btn = QMessageBox::warning(main, "qTox", tr("qTox needs to use the Tox DNS, but can't do it through a proxy\n\
QMessageBox::StandardButton btn = QMessageBox::warning(main, "qTox", tr("qTox needs to use the Tox DNS, but can't do it through a proxy.\n\
Ignore the proxy and connect to the Internet directly ?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
if (btn != QMessageBox::Ok)
return;