[X2Go-Commits] [x2goclient] 02/04: src/onmainwindow.cpp: fix user-facing error messages in Windows X.Org Server startup functions.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 14 04:12:21 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit e4de760c1739a8e7343fc5918a8684905f583e59
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Jun 14 01:55:17 2018 +0200
src/onmainwindow.cpp: fix user-facing error messages in Windows X.Org Server startup functions.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 15 +++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5fca3a7..a64afa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,6 +82,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
- src/onmainwindow.cpp: fix compile error on OS X/macOS.
- copy-deps-win32.bat: update to 20160121-4 Cygwin bundle, shipping with
chgrp.
+ - src/onmainwindow.cpp: fix user-facing error messages in Windows X.Org
+ Server startup functions.
* x2goclient.spec:
- Remove plugin references.
* debian/rules:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index fd4951b..fa39cd8 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10117,8 +10117,9 @@ void ONMainWindow::startXOrg (std::size_t start_offset)
{
QMessageBox::critical (
0,QString::null,
- tr ( "Can't start X.Org Server.\n"
- "Please check your installation." ) );
+ tr ( "Can't start X.Org Server." )
+ + "\n"
+ + tr ( "Please check your installation." ) );
close();
}
// #ifdef CFGCLIENT
@@ -10147,8 +10148,9 @@ void ONMainWindow::slotCheckXOrgConnection()
x2goDebug << "Unable to start X.Org Server for " << x_start_limit_ << " times, terminating.";
QMessageBox::critical (NULL, QString::null,
- tr ("X.Org Server did not launch correctly after three tries.\n"
- "Please check your installation."));
+ tr ("X.Org Server did not launch correctly after %n tries.", "%n will be substituted with the current number of tries", x_start_tries_)
+ + "\n"
+ + tr ("Please check your installation."));
close ();
@@ -10198,8 +10200,9 @@ void ONMainWindow::slotCheckXOrgConnection()
}
else {
QMessageBox::critical (NULL, QString::null,
- tr ("Can't start X.Org Server.\n"
- "Please check your installation."));
+ tr ("Can't start X.Org Server.")
+ + "\n"
+ + tr ("Please check your installation."));
close();
return;
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list