From ca2e3e5eabf7dad01cc76348bf72c33779a20c75 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 29 Apr 2017 22:45:25 +0200 Subject: [PATCH] trial_error --- cockatrice/src/dlg_update.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/dlg_update.cpp b/cockatrice/src/dlg_update.cpp index faa87274..8cb36aa5 100644 --- a/cockatrice/src/dlg_update.cpp +++ b/cockatrice/src/dlg_update.cpp @@ -117,8 +117,8 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas QMessageBox::information(this, tr("Cockatrice Update"), tr("Cockatrice is up to date!") + "

" + tr("You are already running the latest version available in the chosen release channel.") + "
" - + tr("Current version") + QString(": %1
").arg(settingsCache->getUpdateReleaseChannel()->getName().toUtf8()) - + tr("Current release channel") + QString(": %1").arg(VERSION_STRING)); + + tr("Current version") + QString(": %1
").arg(VERSION_STRING) + + tr("Current release channel") + QString(": %1").arg(settingsCache->getUpdateReleaseChannel()->getName().toUtf8())); return; } @@ -131,7 +131,7 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas reply = QMessageBox::question(this, tr("Update Available"), tr("A new version of Cockatrice is available!") + "

" + tr("New version") + QString(": %1
").arg(release->getName()) - + tr("Publishing date") + QString(": %2 (").arg(publishDate, release->getDescriptionUrl()) + tr("Changelog") + ")

" + + tr("Publishing date") + QString(": %1 (").arg(publishDate, release->getDescriptionUrl()) + tr("Changelog") + ")

" + tr("Do you want to update now?"), QMessageBox::Yes | QMessageBox::No); @@ -140,10 +140,10 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas } else { QMessageBox::information(this, tr("Cockatrice Update"), tr("A new version of Cockatrice is available!") + "

" - + tr("New version") + ": %1
" - + tr("Publishing date") + ": %2 (" + tr("Changelog") + ")

" + + tr("New version") + QString(": %1
").arg(release->getName()) + + tr("Publishing date") + QString(": %1 (").arg(publishDate, release->getDescriptionUrl()) + tr("Changelog") + ")

" + tr("Unfortunately there are no download packages available for your operating system. \nYou may have to build from source yourself.") + "

" - + tr("Please check the download page manually and visit the wiki for instructions on compiling.")).arg(release->getName(), publishDate, release->getDescriptionUrl()); + + tr("Please check the download page manually and visit the wiki for instructions on compiling.")); } }