fix custom build + displaying name (#2668)

* fix custom build name

* remove html and argument from tr()
This commit is contained in:
tooomm 2017-04-30 16:20:29 +02:00 committed by GitHub
parent cbd9d2c4fc
commit 339945e089
2 changed files with 2 additions and 2 deletions

View file

@ -201,7 +201,7 @@ if(PROJECT_VERSION_LABEL)
set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_LABEL}")
endif()
set(PROJECT_VERSION_FRIENDLY "${PROJECT_VERSION}<br>(${GIT_COMMIT_DATE_FRIENDLY})")
set(PROJECT_VERSION_FRIENDLY "${PROJECT_VERSION} (${GIT_COMMIT_DATE_FRIENDLY})")
# Format: <program name>[-ReleaseName]-MAJ.MIN.PATCH[-prerelease_label]
set(PROJECT_VERSION_FILENAME "${PROJECT_NAME}")

View file

@ -285,7 +285,7 @@ void MainWindow::actAbout()
{
QMessageBox mb(QMessageBox::NoIcon, tr("About Cockatrice"), QString(
"<font size=\"8\"><b>Cockatrice</b></font><br>"
+ tr("Version<br>%1").arg(VERSION_STRING)
+ tr("Version") + QString(" %1").arg(VERSION_STRING)
+ "<br><br><b><a href='" + GITHUB_PAGES_URL + "'>" + tr("Cockatrice Webpage") + "</a></b><br>"
+ "<br><br><b>" + tr("Project Manager:") + "</b><br>Gavin Bisesi<br><br>"
+ "<b>" + tr("Past Project Managers:") + "</b><br>Max-Wilhelm Bruker<br>Marcus Schütz<br><br>"