Browse Source

Merge branch 'pr1726'

pull/1728/head
tux3 10 years ago
parent
commit
c3927f9cfc
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
  1. 4
      src/core/core.cpp

4
src/core/core.cpp

@ -869,7 +869,7 @@ QByteArray Core::loadToxSave(QString path)
{ {
qWarning() << "Profile "<<QFileInfo(path).baseName()<<" is already in use, pick another"; qWarning() << "Profile "<<QFileInfo(path).baseName()<<" is already in use, pick another";
GUI::showWarning(tr("Profile already in use"), GUI::showWarning(tr("Profile already in use"),
tr("Your profile is already used by another qTox\n" tr("This profile is already used by another qTox instance\n"
"Please select another profile")); "Please select another profile"));
QString tmppath = Settings::getInstance().askProfiles(); QString tmppath = Settings::getInstance().askProfiles();
if (tmppath.isEmpty()) if (tmppath.isEmpty())
@ -967,7 +967,7 @@ void Core::switchConfiguration(const QString& _profile)
{ {
qWarning() << "Profile "<<profile<<" is already in use, pick another"; qWarning() << "Profile "<<profile<<" is already in use, pick another";
GUI::showWarning(tr("Profile already in use"), GUI::showWarning(tr("Profile already in use"),
tr("Your profile is already used by another qTox instance\n" tr("This profile is already used by another qTox instance\n"
"Please select another profile")); "Please select another profile"));
do { do {
profile = Settings::getInstance().askProfiles(); profile = Settings::getInstance().askProfiles();

Loading…
Cancel
Save