From ab2ca6d527d08f84f858ed0481254a80e6b7700d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Tue, 19 Dec 2017 22:33:05 +0100 Subject: [PATCH] Fixed text & descriptions for transports --- server/src/uds/transports/NX/NXTransport.py | 5 ++--- server/src/uds/transports/NX/TSNXTransport.py | 5 ++--- server/src/uds/transports/RDP/RDPTransport.py | 6 +++--- server/src/uds/transports/RDP/TRDPTransport.py | 6 +++--- server/src/uds/transports/SPICE/SPICETransport.py | 6 +++--- server/src/uds/transports/SPICE/TSPICETransport.py | 6 +++--- server/src/uds/transports/X2GO/TX2GOTransport.py | 6 +++--- server/src/uds/transports/X2GO/X2GOTransport.py | 6 +++--- 8 files changed, 22 insertions(+), 24 deletions(-) diff --git a/server/src/uds/transports/NX/NXTransport.py b/server/src/uds/transports/NX/NXTransport.py index f909d6f5a..e8dd68a5c 100644 --- a/server/src/uds/transports/NX/NXTransport.py +++ b/server/src/uds/transports/NX/NXTransport.py @@ -27,7 +27,6 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ''' Created on Jul 29, 2011 @@ -55,9 +54,9 @@ class NXTransport(Transport): Provides access via RDP to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('NX Transport (direct)') + typeName = _('NX Transport') typeType = 'NXTransport' - typeDescription = _('NX Transport for direct connection') + typeDescription = _('NX Protocol. Firect connection.') iconFile = 'nx.png' needsJava = True # If this transport needs java for rendering protocol = protocols.NX diff --git a/server/src/uds/transports/NX/TSNXTransport.py b/server/src/uds/transports/NX/TSNXTransport.py index 05177a83a..c140b1478 100644 --- a/server/src/uds/transports/NX/TSNXTransport.py +++ b/server/src/uds/transports/NX/TSNXTransport.py @@ -27,7 +27,6 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ''' Created on Jul 29, 2011 @@ -60,9 +59,9 @@ class TSNXTransport(Transport): Provides access via RDP to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('NX Transport (tunneled)') + typeName = _('NX Transport') typeType = 'TSNXTransport' - typeDescription = _('NX Transport for tunneled connection') + typeDescription = _('NX protocol. Tunneled connection.') iconFile = 'nx.png' needsJava = True # If this transport needs java for rendering protocol = protocols.NX diff --git a/server/src/uds/transports/RDP/RDPTransport.py b/server/src/uds/transports/RDP/RDPTransport.py index 43d34ad55..109e45db8 100644 --- a/server/src/uds/transports/RDP/RDPTransport.py +++ b/server/src/uds/transports/RDP/RDPTransport.py @@ -44,7 +44,7 @@ logger = logging.getLogger(__name__) READY_CACHE_TIMEOUT = 30 -__updated__ = '2017-12-18' +__updated__ = '2017-12-19' class RDPTransport(BaseRDPTransport): @@ -52,9 +52,9 @@ class RDPTransport(BaseRDPTransport): Provides access via RDP to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('RDP Transport (direct)') + typeName = _('RDP Transport') typeType = 'RDPTransport' - typeDescription = _('RDP Transport for direct connection') + typeDescription = _('RDP Protocol. Direct connection.') useEmptyCreds = BaseRDPTransport.useEmptyCreds fixedName = BaseRDPTransport.fixedName diff --git a/server/src/uds/transports/RDP/TRDPTransport.py b/server/src/uds/transports/RDP/TRDPTransport.py index db3c5d21d..51c709e5a 100644 --- a/server/src/uds/transports/RDP/TRDPTransport.py +++ b/server/src/uds/transports/RDP/TRDPTransport.py @@ -48,7 +48,7 @@ import logging import random import string -__updated__ = '2017-12-18' +__updated__ = '2017-12-19' logger = logging.getLogger(__name__) @@ -60,9 +60,9 @@ class TRDPTransport(BaseRDPTransport): Provides access via RDP to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('RDP Transport (tunneled)') + typeName = _('RDP Transport') typeType = 'TSRDPTransport' - typeDescription = _('RDP Transport with tunneled connection') + typeDescription = _('RDP Protocol. Tunneled connection.') needsJava = True # If this transport needs java for rendering protocol = protocols.RDP group = TUNNELED_GROUP diff --git a/server/src/uds/transports/SPICE/SPICETransport.py b/server/src/uds/transports/SPICE/SPICETransport.py index b691dd93f..fa300cfe9 100644 --- a/server/src/uds/transports/SPICE/SPICETransport.py +++ b/server/src/uds/transports/SPICE/SPICETransport.py @@ -39,7 +39,7 @@ from .RemoteViewerFile import RemoteViewerFile import logging -__updated__ = '2017-05-09' +__updated__ = '2017-12-19' logger = logging.getLogger(__name__) @@ -49,9 +49,9 @@ class SPICETransport(BaseSpiceTransport): Provides access via SPICE to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('SPICE Transport (direct)') + typeName = _('SPICE Transport') typeType = 'SPICETransport' - typeDescription = _('SPICE Transport for direct connection (EXPERIMENTAL)') + typeDescription = _('SPICE Protocol. Direct connection.') # useEmptyCreds = BaseSpiceTransport.useEmptyCreds # fixedName = BaseSpiceTransport.fixedName diff --git a/server/src/uds/transports/SPICE/TSPICETransport.py b/server/src/uds/transports/SPICE/TSPICETransport.py index 590aa3226..fcd22d635 100644 --- a/server/src/uds/transports/SPICE/TSPICETransport.py +++ b/server/src/uds/transports/SPICE/TSPICETransport.py @@ -47,7 +47,7 @@ import logging import random import string -__updated__ = '2017-05-09' +__updated__ = '2017-12-19' logger = logging.getLogger(__name__) @@ -57,9 +57,9 @@ class TSPICETransport(BaseSpiceTransport): Provides access via SPICE to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('SPICE Transport (tunneled)') + typeName = _('SPICE Transport ') typeType = 'TSSPICETransport' - typeDescription = _('SPICE Transport for tunneled connection (EXPERIMENTAL)') + typeDescription = _('SPICE Protocol. Tunneled connection.') needsJava = True # If this transport needs java for rendering protocol = protocols.SPICE group = TUNNELED_GROUP diff --git a/server/src/uds/transports/X2GO/TX2GOTransport.py b/server/src/uds/transports/X2GO/TX2GOTransport.py index 20094866a..15f459d34 100644 --- a/server/src/uds/transports/X2GO/TX2GOTransport.py +++ b/server/src/uds/transports/X2GO/TX2GOTransport.py @@ -45,7 +45,7 @@ import logging import random import string -__updated__ = '2017-12-14' +__updated__ = '2017-12-19' logger = logging.getLogger(__name__) @@ -55,9 +55,9 @@ class TX2GOTransport(BaseX2GOTransport): Provides access via SPICE to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('X2Go Transport Experimental (tunneled)') + typeName = _('X2Go Transport (Experimental)') typeType = 'TX2GOTransport' - typeDescription = _('X2Go Transport for tunneled connection (EXPERIMENTAL)') + typeDescription = _('X2Go Protocol (Experimental). Tunneled connection.') group = TUNNELED_GROUP tunnelServer = gui.TextField(label=_('Tunnel server'), order=1, tooltip=_('IP or Hostname of tunnel server sent to client device ("public" ip) and port. (use HOST:PORT format)'), tab=gui.TUNNEL_TAB) diff --git a/server/src/uds/transports/X2GO/X2GOTransport.py b/server/src/uds/transports/X2GO/X2GOTransport.py index 2642e67be..e20b46e86 100644 --- a/server/src/uds/transports/X2GO/X2GOTransport.py +++ b/server/src/uds/transports/X2GO/X2GOTransport.py @@ -40,7 +40,7 @@ from . import x2gofile import logging -__updated__ = '2017-12-14' +__updated__ = '2017-12-19' logger = logging.getLogger(__name__) @@ -50,9 +50,9 @@ class X2GOTransport(BaseX2GOTransport): Provides access via SPICE to service. This transport can use an domain. If username processed by authenticator contains '@', it will split it and left-@-part will be username, and right password ''' - typeName = _('X2Go Transport Experimental (direct)') + typeName = _('X2Go Transport Experimental') typeType = 'X2GOTransport' - typeDescription = _('X2Go Transport for direct connection (EXPERIMENTAL)') + typeDescription = _('X2Go Protocol (Experimental). Direct connection.') fixedName = BaseX2GOTransport.fixedName # fullScreen = BaseX2GOTransport.fullScreen