[X2Go-Commits] [x2godesktopsharing] 01/04: Rephrase notifications (we need a i18n run already anyway...).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit 896f5c8364cea786ab210ff1a6b0e87a33ecd06f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 12 16:07:51 2018 +0100

    Rephrase notifications (we need a i18n run already anyway...).
---
 accessdialog.cpp |  4 ++--
 debian/changelog |  1 +
 sharetray.cpp    | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/accessdialog.cpp b/accessdialog.cpp
index fc2e156..9c05fd9 100644
--- a/accessdialog.cpp
+++ b/accessdialog.cpp
@@ -31,12 +31,12 @@ AccessWindow::AccessWindow(QString uname, QString hname, QWidget *parent)
 	icon->setPixmap ( QPixmap (":icons/svg/dialog-question.svg") );
 	vtexticonbox->addWidget(icon, 1, Qt::AlignLeft);
 	QLabel *text = new QLabel();
-	text->setText(QString(tr("Accept %1 from %2 ?")).arg(uname).arg(hname));
+	text->setText(QString(tr("Accept user \"%1\" from host [%2]?")).arg(uname).arg(hname));
 	vtexticonbox->addWidget(text, 1, Qt::AlignLeft);
 	hbox->addLayout(vtexticonbox);
 
 	/* the check box (remember this setting for user X) */
-	checkBox=new QCheckBox(QString(tr("Save selection for %1")).arg(uname),this);
+	checkBox=new QCheckBox(QString(tr("Remember selection for user \"%1\".")).arg(uname),this);
 	hbox->addWidget(checkBox, 1, Qt::AlignLeft);
 
 	/* dialog buttons */
diff --git a/debian/changelog b/debian/changelog
index 1529988..1bb9bf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
     - Replace QMessageBox based access dialog by a QDialog based access dialog.
       QMessageBox in Qt5 is not suitable for adding a QCheckBox widget into it
       anymore.
+    - Rephrase notifications (we need a i18n run already anyway...).
   * debian/*:
     + Convert to DH packaging style. Build against Qt5.
   * debian/control:
diff --git a/sharetray.cpp b/sharetray.cpp
index 2889f27..9f62445 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -409,7 +409,7 @@ QString ShareTray::getSocketAnswer ( QString message )
 	QString remote_user=lst[10];
 	if ( getAccess ( remote_user, client ) ==QDialog::Accepted )
 	{
-		trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) );
+		trayMessage ( tr ( "Access granted" ),QString ( tr ( "User \"%1\" ([%2]): Access granted." ) ).arg (remote_user ).arg ( client ) );
 		//start agent
 		QProcess proc ( this );
 		lst.removeAt ( 0 );;
@@ -432,20 +432,20 @@ QString ShareTray::getSocketAnswer ( QString message )
 			qDebug() <<"agent pid: "<<pid;
 			AccessAction *act=new AccessAction (
 			    pid,remote_user,client,
-			    QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ),
+			    QString ( tr ( "Disconnect \"%1\" (on host [%2])" ) ).arg ( remote_user ).arg ( client ),
 			    this );
 			menu->insertAction ( menu->actions() [0],act );
 			connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this,
 			          SLOT ( slotCloseConnection ( AccessAction* ) ) );
 			trayMessage ( tr ( "Remote connection" ),
 			              QString (
-			                  tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) );
+			                  tr ( "User \"%1\" ([%2]) is now connected." ) ).arg ( remote_user ).arg ( client ) );
 			setTrayIcon();
 			return output;
 		}
 	}
 	trayMessage ( tr ( "Access denied" ),QString (
-	              tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) );
+	              tr ( "User \"%1\" ([%2]): Access denied." ) ).arg ( remote_user ).arg ( client ) );
 	return "DENY access denied user";
 }
 
@@ -527,7 +527,7 @@ void ShareTray::slotTimer()
 		{
 			trayMessage ( tr ( "User disconnected" ),
 			              QString (
-			                  tr ( "%1(%2) disconnected" ) ).arg (
+			                  tr ( "User \"%1\" ([%2]) disconnected" ) ).arg (
 			                  action->user() ).arg ( action->host() ) );
 			menu->removeAction ( action );
 			delete action;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git