This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 0ea98113111b76bb6fbe6b1204ff34facc7cdd2b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:03:04 2018 +0100 dlg.ui: Update the about dialog. --- debian/changelog | 1 + dlg.ui | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08adbca..1721724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium - Drop forgotten-to-remove man8 man pages (moved over to x2goserver src:pkg). - Re-generate .ts translation files (run Qt5's lupdate). + - dlg.ui: Update the about dialog. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/dlg.ui b/dlg.ui index 356917b..8ed2792 100644 --- a/dlg.ui +++ b/dlg.ui @@ -76,10 +76,14 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></string> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></string> </property> <property name="wordWrap" > <bool>true</bool> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git