[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.1-4-gabe39fc
X2go dev team
git-admin at x2go.org
Wed Nov 23 11:52:14 CET 2011
The branch, master has been updated
via abe39fcf1dc8658cc3114f03d4452948acb8ab97 (commit)
from ec8764469157522d3126a69499835c75e0e81a3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit abe39fcf1dc8658cc3114f03d4452948acb8ab97
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date: Wed Nov 23 11:51:17 2011 +0100
Connectivity test dialog to use with a broker
-----------------------------------------------------------------------
Summary of changes:
contest.cpp | 207 +++++++++++
contest.h | 59 +++
contest.ui | 282 +++++++++++++++
debian/changelog | 1 +
httpbrokerclient.cpp | 29 ++-
httpbrokerclient.h | 5 +
icons/32x32/contest.png | Bin 0 -> 1267 bytes
onmainwindow.cpp | 20 +
onmainwindow.h | 3 +
onmainwindow_part3.cpp | 7 +-
onmainwindow_privat.h | 3 +-
resources.rcc | 1 +
x2goclient.pro | 4 +-
x2goclient_de.ts | 921 +++++++++++++++++++++++++++++------------------
x2goclient_fr.ts | 917 +++++++++++++++++++++++++++++------------------
x2goclient_ru.ts | 921 +++++++++++++++++++++++++++++------------------
16 files changed, 2323 insertions(+), 1057 deletions(-)
create mode 100644 contest.cpp
create mode 100644 contest.h
create mode 100644 contest.ui
create mode 100644 icons/32x32/contest.png
The diff of changes is:
diff --git a/contest.cpp b/contest.cpp
new file mode 100644
index 0000000..2fe6895
--- /dev/null
+++ b/contest.cpp
@@ -0,0 +1,207 @@
+/*
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 2011 Oleksandr Shneyder
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "contest.h"
+#include "x2gologdebug.h"
+#include <QTimer>
+#include "httpbrokerclient.h"
+#include <QPushButton>
+
+ConTest::ConTest(HttpBrokerClient* broker, QUrl url, QWidget* parent, Qt::WindowFlags f): QDialog(parent, f)
+{
+ socket=0l;
+ setupUi(this);
+ this->broker=broker;
+ brokerUrl=url;
+ timer=new QTimer(this);
+ connect(timer,SIGNAL(timeout()),this,SLOT(slotTimer()));
+ connect(broker,SIGNAL(connectionTime(int,int)),this, SLOT(slotConSpeed(int,int)));
+ start();
+}
+
+ConTest::~ConTest()
+{
+
+}
+
+void ConTest::resetSocket()
+{
+ if (socket)
+ {
+ socket->disconnectFromHost();
+ socket->close();
+ delete socket;
+ socket=0l;
+ }
+}
+
+
+void ConTest::reset()
+{
+ timer->stop();
+ lhttps->setText("");
+ lssh->setText("");
+ lspeed->setText("");
+ prhttps->setValue(0);
+ prspeed->setValue(0);
+ prssh->setValue(0);
+ httpsOk=false;
+ resetSocket();
+ buttonBox->button(QDialogButtonBox::Retry)->setEnabled(false);
+}
+
+void ConTest::start()
+{
+ reset();
+ testConnection(HTTPS);
+}
+
+void ConTest::testConnection(tests test)
+{
+ time=0;
+ timer->start(100);
+ resetSocket();
+ currentTest=test;
+ if (test==SPEED)
+ {
+ if (!httpsOk)
+ {
+ slotConSpeed(1,0);
+ return;
+ }
+ broker->testConnection();
+ return;
+ }
+ socket=new QTcpSocket(this);
+ socket->connectToHost(brokerUrl.host(),test);
+ connect( socket,SIGNAL(connected()),this,SLOT(slotConnected()));
+ connect( socket, SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(slotError(QAbstractSocket::SocketError)));
+}
+
+
+void ConTest::slotConnected()
+{
+ x2goDebug<<"connected\n";
+ timer->stop();
+ QPalette pal=lhttps->palette();
+ pal.setColor(QPalette::WindowText, Qt::green);
+ switch (currentTest)
+ {
+ case HTTPS:
+ prhttps->setValue(100);
+ lhttps->setText(tr("OK"));
+ lhttps->setPalette(pal);
+ httpsOk=true;
+ testConnection(SSH);
+ break;
+ case SSH:
+ prssh->setValue(100);
+ lssh->setText(tr("OK"));
+ lssh->setPalette(pal);
+ testConnection(SPEED);
+ break;
+ default:
+ break;
+ }
+}
+
+void ConTest::slotConSpeed(int msecElapsed, int bytesRecived)
+{
+ timer->stop();
+ prspeed->setValue(100);
+ double sec=msecElapsed/1000.;
+ int KB=bytesRecived/1024;
+ int Kbsec=(int)(KB/sec)*8;
+
+ QPalette pal=lspeed->palette();
+ pal.setColor(QPalette::WindowText, Qt::green);
+
+ if (Kbsec<1000)
+ pal.setColor(QPalette::WindowText, Qt::yellow);
+ if (Kbsec<512)
+ pal.setColor(QPalette::WindowText, Qt::red);
+
+ lspeed->setPalette(pal);
+ lspeed->setText(QString::number(Kbsec)+" Kb/s");
+ buttonBox->button(QDialogButtonBox::Retry)->setEnabled(true);
+}
+
+
+void ConTest::slotError(QAbstractSocket::SocketError socketError)
+{
+ QString error;
+ if (socketError==QAbstractSocket::SocketTimeoutError)
+ error=tr("Socket operation timed out");
+ else
+ error=socket->errorString();
+
+ x2goDebug<<"Error: "<<error<<endl;
+ timer->stop();
+ QPalette pal=lhttps->palette();
+ pal.setColor(QPalette::WindowText, Qt::red);
+ switch (currentTest)
+ {
+ case HTTPS:
+ prhttps->setValue(100);
+ lhttps->setText(tr("Failed: ")+error);
+ lhttps->setPalette(pal);
+ testConnection(SSH);
+ break;
+ case SSH:
+ prssh->setValue(100);
+ lssh->setText(tr("Failed: ")+error);
+ lssh->setPalette(pal);
+ testConnection(SPEED);
+ break;
+ default:
+ break;
+ }
+}
+
+
+void ConTest::slotTimer()
+{
+ time++;
+ if (time>150)
+ {
+ if (currentTest==SSH || currentTest==HTTPS)
+ {
+ socket->close();
+ slotError(QAbstractSocket::SocketTimeoutError);
+ }
+ }
+ QProgressBar* bar=0l;
+ switch (currentTest)
+ {
+ case SSH:
+ bar=prssh;
+ break;
+ case HTTPS:
+ bar=prhttps;
+ break;
+ case SPEED:
+ bar=prspeed;
+ break;
+ }
+ if (bar->value()==100)
+ bar->setValue(0);
+ else
+ bar->setValue(bar->value()+10);
+
+}
diff --git a/contest.h b/contest.h
new file mode 100644
index 0000000..ca34c57
--- /dev/null
+++ b/contest.h
@@ -0,0 +1,59 @@
+/*
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 2011 Oleksandr Shneyder
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef CONTEST_H
+#define CONTEST_H
+
+#include <QDialog>
+#include "ui_contest.h"
+#include <QUrl>
+#include <QTcpSocket>
+
+class HttpBrokerClient;
+class QTcpSocket;
+class QTimer;
+
+class ConTest : public QDialog, public Ui_ConTest
+{
+ Q_OBJECT
+public:
+ ConTest(HttpBrokerClient* broker, QUrl url, QWidget* parent = 0, Qt::WindowFlags f = 0);
+ virtual ~ConTest();
+private:
+ enum tests {SSH=22,HTTPS=443,SPEED} currentTest;
+ void reset();
+ void testConnection(tests test);
+ void resetSocket();
+private slots:
+ void slotConnected();
+ void slotError(QAbstractSocket::SocketError socketError);
+ void slotTimer();
+ void slotConSpeed(int msecElapsed, int bytesRecived);
+private:
+ HttpBrokerClient* broker;
+ QUrl brokerUrl;
+ QTcpSocket* socket;
+ QTimer* timer;
+ int time;
+ bool httpsOk;
+public slots:
+ void start();
+};
+
+#endif // CONTEST_H
diff --git a/contest.ui b/contest.ui
new file mode 100644
index 0000000..70d0cd1
--- /dev/null
+++ b/contest.ui
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ConTest</class>
+ <widget class="QDialog" name="ConTest">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>291</width>
+ <height>147</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Connectivity test</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>HTTPS connection:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>SSH connection:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Connection speed:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QProgressBar" name="prhttps">
+ <property name="value">
+ <number>24</number>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ <property name="invertedAppearance">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QProgressBar" name="prssh">
+ <property name="value">
+ <number>24</number>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QProgressBar" name="prspeed">
+ <property name="value">
+ <number>24</number>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="lhttps">
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>146</red>
+ <green>145</green>
+ <blue>144</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="text">
+ <string>Failed</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lssh">
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>146</red>
+ <green>145</green>
+ <blue>144</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="text">
+ <string>Failed</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lspeed">
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>146</red>
+ <green>145</green>
+ <blue>144</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="text">
+ <string>0 Kb/s</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>4</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Retry</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>ConTest</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>281</x>
+ <y>132</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>146</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>ConTest</receiver>
+ <slot>start()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>242</x>
+ <y>122</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>4</x>
+ <y>84</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+ <slots>
+ <slot>start()</slot>
+ </slots>
+</ui>
diff --git a/debian/changelog b/debian/changelog
index 0fcd9e8..3bee26d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x2goclient (3.99.0.2-0~x2go1) UNRELEASED; urgency=low
[ Oleksandr Shneyder ]
* QTcpSocket working not correct with some Antiviral software ( for example Avast) under windows. Fixing this by replacing it with Winsocks
+ * Connectivity test dialog to use with a broker
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 13 Oct 2011 01:59:41 +0200
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 0e0a6ab..ed05fd8 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -105,6 +105,20 @@ void HttpBrokerClient::changePassword(QString newPass)
}
+void HttpBrokerClient::testConnection()
+{
+ QString req;
+ QTextStream ( &req ) <<
+ "task=testcon";
+
+ QUrl lurl ( config->brokerurl );
+ httpSessionAnswer.close();
+ httpSessionAnswer.setData ( 0,0 );
+ requestTime.start();
+ testConRequest=http->post ( lurl.path(),req.toUtf8(),&httpSessionAnswer );
+
+}
+
void HttpBrokerClient::createIniFile(const QString& content)
{
@@ -296,8 +310,14 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error )
return;
}
-// QString answer ( httpSiAnswer.data() );
-// x2goDebug<<"cmd request answer: "<<answer;
+ if (id==testConRequest)
+ {
+
+ //x2goDebug<<"cmd request answer: "<<answer;
+ x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"recieved:"<<httpSessionAnswer.size()<<endl;
+ emit connectionTime(requestTime.elapsed(),httpSessionAnswer.size());
+ return;
+ }
if ( id== sessionsRequest || id == selSessRequest || id==chPassRequest)
{
QString answer ( httpSessionAnswer.data() );
@@ -426,6 +446,7 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors )
if ( mcert==cert )
{
http->ignoreSslErrors();
+ requestTime.restart();
return;
}
}
@@ -497,8 +518,8 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors )
fl.close();
http->ignoreSslErrors();
x2goDebug<<"store certificate in "<<homeDir+"/ssl/exceptions/"+
- lurl.host() +"/"+fname;
-
+ lurl.host() +"/"+fname;
+ requestTime.restart();
}
else
emit fatalHttpError();
diff --git a/httpbrokerclient.h b/httpbrokerclient.h
index 43d65e5..02d519c 100644
--- a/httpbrokerclient.h
+++ b/httpbrokerclient.h
@@ -15,6 +15,7 @@
#include <QSslError>
#include <QBuffer>
#include <QObject>
+#include <QDateTime>
/**
@author Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
*/
@@ -31,6 +32,7 @@ public:
QString getSInfoFromBroker ( bool getKey=false );
void selectUserSession(const QString& session );
void changePassword(QString newPass);
+ void testConnection();
private:
QBuffer httpSIAnswer;
QBuffer httpCmdAnswer;
@@ -42,10 +44,12 @@ private:
int selSessRequest;
int cmdRequest;
int chPassRequest;
+ int testConRequest;
QString newBrokerPass;
ConfigFile* config;
ONMainWindow* mainWindow;
void createIniFile(const QString& content);
+ QTime requestTime;
private slots:
void slotRequestFinished ( int id, bool error );
@@ -64,6 +68,7 @@ signals:
void sessionsLoaded();
void getSession( QString );
void passwordChanged( QString );
+ void connectionTime(int, int);
};
#endif
diff --git a/icons/32x32/contest.png b/icons/32x32/contest.png
new file mode 100644
index 0000000..2c49e92
Binary files /dev/null and b/icons/32x32/contest.png differ
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index da1d947..ecafee0 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -72,6 +72,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
proxyWinId=0;
embedParent=embedChild=0l;
defaultSession=false;
+ connTest=false;
defaultUser=false;
defaultWidth=800;
defaultHeight=600;
@@ -687,6 +688,16 @@ void ONMainWindow::initWidgetsNormal()
SLOT ( slotChangeBrokerPass()) );
act_changeBrokerPass->setEnabled(false);
}
+
+ if(connTest)
+ {
+ act_testCon=new QAction (
+ QIcon ( iconsPath ( "/32x32/contest.png" ) ),
+ tr ( "&Connectivity test..." ),
+ this );
+ connect ( act_testCon,SIGNAL ( triggered(bool)),this,
+ SLOT ( slotTestConnection()) );
+ }
QAction *act_tb=new QAction ( tr ( "Show toolbar" ),this );
@@ -735,6 +746,8 @@ void ONMainWindow::initWidgetsNormal()
menu_opts->addAction ( act_tb );
if(changeBrokerPass)
menu_opts->addAction(act_changeBrokerPass);
+ if(connTest)
+ menu_opts->addAction(act_testCon);
QMenu* menu_help=menuBar()->addMenu ( tr ( "&Help" ) );
if(supportMenuFile!=QString::null)
@@ -755,6 +768,8 @@ void ONMainWindow::initWidgetsNormal()
stb->addAction ( act_set );
if(changeBrokerPass)
stb->addAction(act_changeBrokerPass);
+ if(connTest)
+ stb->addAction(act_testCon);
if ( !showToolBar )
stb->hide();
@@ -818,6 +833,11 @@ void ONMainWindow::slotPassChanged(const QString& result)
}
+void ONMainWindow::slotTestConnection()
+{
+ ConTest test( broker, config.brokerurl, this);
+ test.exec();
+}
void ONMainWindow::slotChangeBrokerPass()
{
diff --git a/onmainwindow.h b/onmainwindow.h
index e518358..0fe58f7 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -471,6 +471,7 @@ private:
bool managedMode;
bool brokerMode;
bool changeBrokerPass;
+ bool connTest;
bool embedMode;
QString statusString;
int defaultLink;
@@ -596,6 +597,7 @@ private:
QAction *act_embedContol;
QAction *act_embedToolBar;
QAction *act_changeBrokerPass;
+ QAction *act_testCon;
QToolBar *stb;
@@ -803,6 +805,7 @@ private slots:
void slotUnameChanged ( const QString& text );
void slotPassEnter();
void slotChangeBrokerPass();
+ void slotTestConnection();
void slotCheckPortableDir();
void readUsers();
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index 1bc6564..8fc3122 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -230,6 +230,11 @@ bool ONMainWindow::parseParameter ( QString param )
cleanAllFiles=true;
return true;
}
+ if(param == "--connectivity-test")
+ {
+ connTest=true;
+ return true;
+ }
if ( param=="--no-menu" )
{
@@ -1514,7 +1519,7 @@ void ONMainWindow::slotSupport()
void ONMainWindow::slotAbout()
{
QString aboutStr=tr (
- "</b><br> (C. 2006-2010 <b>obviously nice</b>: "
+ "</b><br> (C. 2006-2011 <b>obviously nice</b>: "
"Oleksandr Shneyder, Heinz-Markus Graesing)<br>" );
if ( embedMode )
aboutStr+=tr ( "<br>x2goplugin mode was sponsored by "
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index a2d54aa..a97e961 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -66,7 +66,7 @@
#include <QFileDialog>
#include <QHttp>
#include <QUrl>
-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>
#include <QPlastiqueStyle>
#include "sshprocess.h"
#include "imgframe.h"
@@ -77,6 +77,7 @@
#include "brokerpassdlg.h"
#include "sshmasterconnection.h"
+#include "contest.h"
#if !defined Q_OS_WIN
#include <sys/mount.h>
diff --git a/resources.rcc b/resources.rcc
index a22aaa9..ebc6380 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -43,6 +43,7 @@
<file>icons/32x32/auth.png</file>
<file>icons/32x32/x2goclient.png</file>
<file>icons/32x32/resolution.png</file>
+ <file>icons/32x32/contest.png</file>
<file>icons/16x16/audio.png</file>
<file>icons/16x16/file-open.png</file>
<file>icons/16x16/delete.png</file>
diff --git a/x2goclient.pro b/x2goclient.pro
index 6393fcf..a7deb90 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -10,7 +10,7 @@ CONFIG += $$(X2GO_CLIENT_TARGET)
CONFIG += $$(X2GO_LINUX_STATIC)
#CONFIG += console
-FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui
+FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui contest.ui
TRANSLATIONS += x2goclient_de.ts
TRANSLATIONS += x2goclient_ru.ts
@@ -48,6 +48,7 @@ HEADERS += configdialog.h \
onmainwindow_privat.h \
x2gosettings.h \
brokerpassdlg.h \
+ contest.h \
xsettingswidget.h
SOURCES += sharewidget.cpp \
@@ -84,6 +85,7 @@ SOURCES += sharewidget.cpp \
ongetpass.cpp \
x2gosettings.cpp \
brokerpassdlg.cpp \
+ contest.cpp \
xsettingswidget.cpp
LIBS += -lssh
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index d188f44..01de7a5 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -2,6 +2,42 @@
<!DOCTYPE TS>
<TS version="2.0" language="de">
<context>
+ <name>BrokerPassDialogUi</name>
+ <message>
+ <location filename="brokerpassdialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">Dialog</translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="22"/>
+ <source>Old password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="36"/>
+ <source>New password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="50"/>
+ <source>Confirm password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="79"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BrokerPassDlg</name>
+ <message>
+ <location filename="brokerpassdlg.cpp" line="41"/>
+ <source>Passwords do not match</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CUPSPrintWidget</name>
<message>
<location filename="cupsprintwidget.cpp" line="65"/>
@@ -90,7 +126,7 @@
<context>
<name>ConfigDialog</name>
<message>
- <location filename="configdialog.cpp" line="81"/>
+ <location filename="configdialog.cpp" line="87"/>
<source>Use LDAP</source>
<translation>benutze LDAP</translation>
</message>
@@ -99,22 +135,22 @@
<translation type="obsolete">LDAP Einstellungen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="105"/>
+ <location filename="configdialog.cpp" line="111"/>
<source>Server URL:</source>
<translation>Server URL:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="106"/>
+ <location filename="configdialog.cpp" line="112"/>
<source>BaseDN:</source>
<translation>BaseDN:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="286"/>
+ <location filename="configdialog.cpp" line="292"/>
<source>&OK</source>
<translation>&OK</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="287"/>
+ <location filename="configdialog.cpp" line="293"/>
<source>&Cancel</source>
<translation>A&bbrechen</translation>
</message>
@@ -147,7 +183,7 @@
<translation type="obsolete">Displaynummer:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="310"/>
+ <location filename="configdialog.cpp" line="316"/>
<source>Settings</source>
<translation>Konfiguration</translation>
</message>
@@ -176,29 +212,29 @@
<translation type="obsolete">Suche X11 Applikation</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="490"/>
- <location filename="configdialog.cpp" line="508"/>
- <location filename="configdialog.cpp" line="527"/>
+ <location filename="configdialog.cpp" line="503"/>
+ <location filename="configdialog.cpp" line="521"/>
+ <location filename="configdialog.cpp" line="540"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="491"/>
+ <location filename="configdialog.cpp" line="504"/>
<source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
<translation>x2goclient konnte keine passende X11 Installation finden. Bitte Installieren Sie Apple X11 oder wählen Sie den Pfad zu einer gültigen Installation</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="509"/>
+ <location filename="configdialog.cpp" line="522"/>
<source>Your are using X11 (Apple X-Window Server) version </source>
<translation>Sie verwenden die Apple X11 Umgebung in der Version </translation>
</message>
<message>
- <location filename="configdialog.cpp" line="511"/>
+ <location filename="configdialog.cpp" line="524"/>
<source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
<translation>. Es ist bekannt, dass bei dieser Version Darstellungsprobleme bei 24 Farbtiefe auftreten. Wir empfehlen Ihnen ein Update auf eine neuere Version (http://trac.macosforge.org/projects/xquartz).</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="528"/>
+ <location filename="configdialog.cpp" line="541"/>
<source>No suitable X11 application found in selected path</source>
<translation>Unter dem angegebenden Pfad konnte keine gültige X11 Installation gefunden werden</translation>
</message>
@@ -211,99 +247,100 @@
<translation type="obsolete">LDAP Einstellungen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="108"/>
+ <location filename="configdialog.cpp" line="114"/>
<source>Failover server 1 URL:</source>
<translation>Failover Server 1 URL:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="110"/>
+ <location filename="configdialog.cpp" line="116"/>
<source>Failover server 2 URL:</source>
<translation>Failover Server 2 URL:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="192"/>
+ <location filename="configdialog.cpp" line="198"/>
+ <location filename="configdialog.cpp" line="340"/>
<source>X-Server settings</source>
<translation>X-Server Konfiguration</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="201"/>
+ <location filename="configdialog.cpp" line="207"/>
<source>X11 application:</source>
<translation>X11 Applikation:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="212"/>
+ <location filename="configdialog.cpp" line="218"/>
<source>X11 version:</source>
<translation>X11 Version:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="227"/>
+ <location filename="configdialog.cpp" line="233"/>
<source>Find X11 application</source>
<translation>Suche X11 Applikation</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="244"/>
+ <location filename="configdialog.cpp" line="250"/>
<source>Clientside SSH port for file system export usage:</source>
<translation>SSH Port für die Dateisystemfreigabe auf Clientseite:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="44"/>
+ <location filename="configdialog.cpp" line="50"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="330"/>
+ <location filename="configdialog.cpp" line="336"/>
<source>Printing</source>
<translation>Druck</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="254"/>
+ <location filename="configdialog.cpp" line="260"/>
<source>Start session embedded inside website</source>
<translation>Sitzung innerhalb einer Webseite anzeigen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="53"/>
+ <location filename="configdialog.cpp" line="59"/>
<source>Display icon in system tray</source>
<translation>Symbol im Systemabschnitt der Kontrolleiste anzeigen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="60"/>
+ <location filename="configdialog.cpp" line="66"/>
<source>Hide to system tray when minimized</source>
<translation>In den Systemabschnitt der Kontrolleiste minimieren</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="61"/>
+ <location filename="configdialog.cpp" line="67"/>
<source>Hide to system tray when closed</source>
<translation>Statt SchlieÃen in den Systemabschnitt der Kontrolleiste minimieren</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="62"/>
+ <location filename="configdialog.cpp" line="68"/>
<source>Hide to system tray after connection is established</source>
<translation>Bei Verbindung in den Systemabschnitt der Kontrolleiste minimieren</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="63"/>
+ <location filename="configdialog.cpp" line="69"/>
<source>Restore from system tray after session is disconnected</source>
<translation>Nach Verbindungsende wiederherstellen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="258"/>
- <location filename="configdialog.cpp" line="554"/>
- <location filename="configdialog.cpp" line="566"/>
+ <location filename="configdialog.cpp" line="264"/>
+ <location filename="configdialog.cpp" line="567"/>
+ <location filename="configdialog.cpp" line="579"/>
<source>Advanced options</source>
<translation>Erweiterte Einstellungen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="285"/>
+ <location filename="configdialog.cpp" line="291"/>
<source>Defaults</source>
<translation>Voreinstellungen</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="564"/>
+ <location filename="configdialog.cpp" line="577"/>
<source>&Connection</source>
<translation>&Verbindung</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="565"/>
+ <location filename="configdialog.cpp" line="578"/>
<source>&Settings</source>
<translation>&Einstellungen</translation>
</message>
@@ -805,118 +842,125 @@ sound system connections through firewalls</source>
<context>
<name>HttpBrokerClient</name>
<message>
- <location filename="httpbrokerclient.cpp" line="96"/>
+ <location filename="httpbrokerclient.cpp" line="164"/>
<source>us</source>
<translation>de</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="99"/>
+ <location filename="httpbrokerclient.cpp" line="167"/>
<source>pc105/us</source>
<translation>pc105/de</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="236"/>
+ <location filename="httpbrokerclient.cpp" line="294"/>
+ <location filename="httpbrokerclient.cpp" line="308"/>
+ <location filename="httpbrokerclient.cpp" line="345"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="324"/>
+ <location filename="httpbrokerclient.cpp" line="309"/>
+ <source>Login failed!<br>Please try again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="httpbrokerclient.cpp" line="433"/>
<source><br><b>Server uses an invalid security certificate.</b><br><br></source>
<translation><br><b>Server benutzt ein ungültiges Zertifikat.</b><br><br></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="327"/>
+ <location filename="httpbrokerclient.cpp" line="436"/>
<source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
<translation><p style='background:#FFFFDC;'>Sie sollten keine Ausnahme setzen, wenn Sie sich in einem Netzwerk befinden, dem sich nicht vertrauen oder wenn Sie für diese Verbindung bereits eine Ausnahme akzeptiert haben.</p></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="332"/>
+ <location filename="httpbrokerclient.cpp" line="441"/>
<source>Secure connection failed</source>
<translation>Sichere Verbindung fehlgeschlagen</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="337"/>
+ <location filename="httpbrokerclient.cpp" line="446"/>
<source>Issued to:
</source>
<translation>Issued to:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="338"/>
- <location filename="httpbrokerclient.cpp" line="350"/>
+ <location filename="httpbrokerclient.cpp" line="447"/>
+ <location filename="httpbrokerclient.cpp" line="459"/>
<source>Common Name(CN) </source>
<translation>Common Name(CN) </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="341"/>
- <location filename="httpbrokerclient.cpp" line="353"/>
+ <location filename="httpbrokerclient.cpp" line="450"/>
+ <location filename="httpbrokerclient.cpp" line="462"/>
<source>Organization(O) </source>
<translation>Organization(O) </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="344"/>
- <location filename="httpbrokerclient.cpp" line="356"/>
+ <location filename="httpbrokerclient.cpp" line="453"/>
+ <location filename="httpbrokerclient.cpp" line="465"/>
<source>Organizational Unit(OU) </source>
<translation>Organizational Unit(OU) </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="347"/>
+ <location filename="httpbrokerclient.cpp" line="456"/>
<source>Serial Number </source>
<translation>Serial Number </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="349"/>
+ <location filename="httpbrokerclient.cpp" line="458"/>
<source>Issued by:
</source>
<translation>Issued by:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="360"/>
+ <location filename="httpbrokerclient.cpp" line="469"/>
<source>Validity:
</source>
<translation>Validity:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="361"/>
+ <location filename="httpbrokerclient.cpp" line="470"/>
<source>Issued on </source>
<translation>Issued on </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="362"/>
+ <location filename="httpbrokerclient.cpp" line="471"/>
<source>expires on </source>
<translation>expires on </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="363"/>
+ <location filename="httpbrokerclient.cpp" line="472"/>
<source>Fingerprints:
</source>
<translation>Fingerprints:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="364"/>
+ <location filename="httpbrokerclient.cpp" line="473"/>
<source>SHA1 </source>
<translation>SHA1 </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="366"/>
+ <location filename="httpbrokerclient.cpp" line="475"/>
<source>MD5 </source>
<translation>MD5 </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="372"/>
+ <location filename="httpbrokerclient.cpp" line="481"/>
<source>Exit X2Go Client</source>
<translation>X2Go Client beenden</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="374"/>
+ <location filename="httpbrokerclient.cpp" line="483"/>
<source>Add exception</source>
<translation>Ausnahme hinzufügen</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="237"/>
+ <location filename="httpbrokerclient.cpp" line="346"/>
<source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
<translation>Die aktuelle Sitzung wurde unterbrochen. Um erneut Zugriff auf ihre Sitzung zu erhalten, kehren Sie zur Startseite zurück oder aktualisieren Sie die aktuelle Seite über den Browserbefehl "Aktuelle Seite neu laden".</translation>
</message>
@@ -924,35 +968,41 @@ sound system connections through firewalls</source>
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="79"/>
+ <location filename="onmainwindow.cpp" line="80"/>
+ <location filename="onmainwindow_part3.cpp" line="307"/>
<source>us</source>
<translation>de</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="80"/>
+ <location filename="onmainwindow.cpp" line="81"/>
<source>pc105/us</source>
<translation>pc105/de</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="550"/>
- <location filename="onmainwindow.cpp" line="1578"/>
- <location filename="onmainwindow_part3.cpp" line="1513"/>
+ <location filename="onmainwindow.cpp" line="329"/>
+ <source>Support ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="601"/>
+ <location filename="onmainwindow.cpp" line="1782"/>
+ <location filename="onmainwindow_part3.cpp" line="1636"/>
<source>Session:</source>
<translation>Sitzung:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="602"/>
+ <location filename="onmainwindow.cpp" line="653"/>
<source>&Quit</source>
<translation>&Beenden</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="603"/>
+ <location filename="onmainwindow.cpp" line="654"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="604"/>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="655"/>
+ <location filename="onmainwindow.cpp" line="940"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
@@ -961,7 +1011,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">&Neue Sitzung ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="608"/>
+ <location filename="onmainwindow.cpp" line="659"/>
<source>Ctrl+N</source>
<translation>Strg+N</translation>
</message>
@@ -970,7 +1020,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">Sitzungsverwaltung...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="614"/>
+ <location filename="onmainwindow.cpp" line="665"/>
<source>Ctrl+E</source>
<translation>Strg+E</translation>
</message>
@@ -979,7 +1029,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">LDAP &Konfiguration ...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1820"/>
+ <location filename="onmainwindow_part4.cpp" line="2052"/>
<source>Restore toolbar</source>
<translation>Wergzeugleiste wieder anzeigen</translation>
</message>
@@ -988,158 +1038,176 @@ sound system connections through firewalls</source>
<translation type="obsolete">Ãber X2GO Client</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="628"/>
+ <location filename="onmainwindow.cpp" line="698"/>
<source>About Qt</source>
<translation>Ãber QT</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2275"/>
+ <location filename="onmainwindow_part2.cpp" line="2456"/>
<source>Session</source>
<translation>Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="644"/>
+ <location filename="onmainwindow.cpp" line="715"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation>Strg +Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="650"/>
+ <location filename="onmainwindow.cpp" line="721"/>
<source>&Session</source>
<translation>&Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="651"/>
+ <location filename="onmainwindow.cpp" line="722"/>
<source>&Options</source>
<translation>&Einstellungen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
+ <location filename="onmainwindow.cpp" line="739"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1217"/>
+ <location filename="onmainwindow_part4.cpp" line="1423"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1246"/>
+ <location filename="onmainwindow_part4.cpp" line="1424"/>
+ <source>Keyboard layout:</source>
+ <translation type="unfinished">Tastaturlayout:</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1465"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1248"/>
- <location filename="onmainwindow_part4.cpp" line="1524"/>
- <location filename="onmainwindow_part4.cpp" line="1526"/>
+ <location filename="onmainwindow_part4.cpp" line="1467"/>
+ <location filename="onmainwindow_part4.cpp" line="1756"/>
+ <location filename="onmainwindow_part4.cpp" line="1758"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1269"/>
- <location filename="onmainwindow.cpp" line="1297"/>
- <location filename="onmainwindow.cpp" line="1305"/>
- <location filename="onmainwindow.cpp" line="1436"/>
- <location filename="onmainwindow.cpp" line="1463"/>
- <location filename="onmainwindow.cpp" line="1466"/>
- <location filename="onmainwindow.cpp" line="1896"/>
- <location filename="onmainwindow.cpp" line="1910"/>
- <location filename="onmainwindow.cpp" line="1923"/>
- <location filename="onmainwindow.cpp" line="1957"/>
- <location filename="onmainwindow.cpp" line="2002"/>
- <location filename="onmainwindow_part2.cpp" line="237"/>
- <location filename="onmainwindow_part2.cpp" line="413"/>
- <location filename="onmainwindow_part2.cpp" line="1154"/>
- <location filename="onmainwindow_part2.cpp" line="1223"/>
- <location filename="onmainwindow_part2.cpp" line="1267"/>
- <location filename="onmainwindow_part2.cpp" line="1647"/>
- <location filename="onmainwindow_part2.cpp" line="1673"/>
- <location filename="onmainwindow_part2.cpp" line="1798"/>
- <location filename="onmainwindow_part3.cpp" line="197"/>
- <location filename="onmainwindow_part3.cpp" line="661"/>
- <location filename="onmainwindow_part3.cpp" line="740"/>
- <location filename="onmainwindow_part3.cpp" line="984"/>
- <location filename="onmainwindow_part3.cpp" line="1112"/>
- <location filename="onmainwindow_part3.cpp" line="1165"/>
- <location filename="onmainwindow_part3.cpp" line="1456"/>
- <location filename="onmainwindow_part3.cpp" line="1458"/>
- <location filename="onmainwindow_part3.cpp" line="1688"/>
- <location filename="onmainwindow_part3.cpp" line="1736"/>
- <location filename="onmainwindow_part3.cpp" line="1764"/>
- <location filename="onmainwindow_part3.cpp" line="2130"/>
- <location filename="onmainwindow_part3.cpp" line="2145"/>
- <location filename="onmainwindow_part3.cpp" line="2199"/>
+ <location filename="onmainwindow_part4.cpp" line="2252"/>
+ <source>Invalid reply from broker</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="807"/>
+ <location filename="onmainwindow.cpp" line="830"/>
+ <location filename="onmainwindow.cpp" line="1471"/>
+ <location filename="onmainwindow.cpp" line="1499"/>
+ <location filename="onmainwindow.cpp" line="1507"/>
+ <location filename="onmainwindow.cpp" line="1640"/>
+ <location filename="onmainwindow.cpp" line="1667"/>
+ <location filename="onmainwindow.cpp" line="1670"/>
+ <location filename="onmainwindow.cpp" line="1917"/>
+ <location filename="onmainwindow.cpp" line="2140"/>
+ <location filename="onmainwindow.cpp" line="2154"/>
+ <location filename="onmainwindow.cpp" line="2167"/>
+ <location filename="onmainwindow.cpp" line="2201"/>
+ <location filename="onmainwindow.cpp" line="2246"/>
+ <location filename="onmainwindow_part2.cpp" line="297"/>
+ <location filename="onmainwindow_part2.cpp" line="473"/>
+ <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="781"/>
+ <location filename="onmainwindow_part2.cpp" line="1232"/>
+ <location filename="onmainwindow_part2.cpp" line="1293"/>
+ <location filename="onmainwindow_part2.cpp" line="1344"/>
+ <location filename="onmainwindow_part2.cpp" line="1377"/>
+ <location filename="onmainwindow_part2.cpp" line="1421"/>
+ <location filename="onmainwindow_part2.cpp" line="1801"/>
+ <location filename="onmainwindow_part2.cpp" line="1827"/>
+ <location filename="onmainwindow_part2.cpp" line="1958"/>
+ <location filename="onmainwindow_part3.cpp" line="202"/>
+ <location filename="onmainwindow_part3.cpp" line="768"/>
+ <location filename="onmainwindow_part3.cpp" line="848"/>
+ <location filename="onmainwindow_part3.cpp" line="1092"/>
+ <location filename="onmainwindow_part3.cpp" line="1220"/>
+ <location filename="onmainwindow_part3.cpp" line="1273"/>
+ <location filename="onmainwindow_part3.cpp" line="1579"/>
+ <location filename="onmainwindow_part3.cpp" line="1581"/>
+ <location filename="onmainwindow_part3.cpp" line="1811"/>
+ <location filename="onmainwindow_part3.cpp" line="1859"/>
+ <location filename="onmainwindow_part3.cpp" line="1887"/>
+ <location filename="onmainwindow_part3.cpp" line="2257"/>
+ <location filename="onmainwindow_part3.cpp" line="2272"/>
+ <location filename="onmainwindow_part3.cpp" line="2326"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="1748"/>
+ <location filename="onmainwindow_part4.cpp" line="1980"/>
+ <location filename="onmainwindow_part4.cpp" line="2251"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2118"/>
- <location filename="onmainwindow_part3.cpp" line="64"/>
+ <location filename="onmainwindow.cpp" line="2372"/>
+ <location filename="onmainwindow_part3.cpp" line="68"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2189"/>
+ <location filename="onmainwindow.cpp" line="2443"/>
<source> on </source>
<translation> on </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="694"/>
- <location filename="onmainwindow.cpp" line="1571"/>
- <location filename="onmainwindow_part3.cpp" line="1506"/>
- <location filename="onmainwindow_part4.cpp" line="1216"/>
+ <location filename="onmainwindow.cpp" line="776"/>
+ <location filename="onmainwindow.cpp" line="1775"/>
+ <location filename="onmainwindow_part3.cpp" line="1629"/>
+ <location filename="onmainwindow_part4.cpp" line="1422"/>
<source>Login:</source>
<translation>Benutzername:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="877"/>
- <location filename="onmainwindow_part4.cpp" line="1520"/>
+ <location filename="onmainwindow_part2.cpp" line="1002"/>
+ <location filename="onmainwindow_part4.cpp" line="1752"/>
<source>Select session:</source>
<translation>Wähle Sitzung:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1522"/>
+ <location filename="onmainwindow_part4.cpp" line="1754"/>
<source>Resume</source>
<translation>Fortfahren</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="428"/>
- <location filename="onmainwindow.cpp" line="747"/>
- <location filename="onmainwindow_part2.cpp" line="2019"/>
- <location filename="onmainwindow_part4.cpp" line="1529"/>
+ <location filename="onmainwindow.cpp" line="479"/>
+ <location filename="onmainwindow.cpp" line="927"/>
+ <location filename="onmainwindow_part2.cpp" line="2200"/>
+ <location filename="onmainwindow_part4.cpp" line="1761"/>
<source>Suspend</source>
<translation>Anhalten</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="431"/>
- <location filename="onmainwindow.cpp" line="748"/>
- <location filename="onmainwindow_part4.cpp" line="1377"/>
- <location filename="onmainwindow_part4.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="482"/>
+ <location filename="onmainwindow.cpp" line="928"/>
+ <location filename="onmainwindow_part4.cpp" line="1609"/>
+ <location filename="onmainwindow_part4.cpp" line="1763"/>
<source>Terminate</source>
<translation>Beenden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1766"/>
<source>New</source>
<translation>Neu</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2277"/>
- <location filename="onmainwindow_part4.cpp" line="1601"/>
- <location filename="onmainwindow_part4.cpp" line="1623"/>
+ <location filename="onmainwindow_part2.cpp" line="2458"/>
+ <location filename="onmainwindow_part4.cpp" line="1833"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
<source>Display</source>
<translation>Display</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1603"/>
+ <location filename="onmainwindow_part4.cpp" line="1835"/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1609"/>
+ <location filename="onmainwindow_part4.cpp" line="1841"/>
<source>Server</source>
<translation>Server</translation>
</message>
@@ -1148,20 +1216,20 @@ sound system connections through firewalls</source>
<translation type="obsolete">Startzeit</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1614"/>
+ <location filename="onmainwindow_part4.cpp" line="1846"/>
<source>Client IP</source>
<translation>Client IP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="893"/>
- <location filename="onmainwindow_part2.cpp" line="987"/>
- <location filename="onmainwindow_part2.cpp" line="1983"/>
+ <location filename="onmainwindow_part2.cpp" line="1018"/>
+ <location filename="onmainwindow_part2.cpp" line="1112"/>
+ <location filename="onmainwindow_part2.cpp" line="2164"/>
<source>running</source>
<translation>aktiv</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="895"/>
- <location filename="onmainwindow_part2.cpp" line="1166"/>
+ <location filename="onmainwindow_part2.cpp" line="1020"/>
+ <location filename="onmainwindow_part2.cpp" line="1305"/>
<source>suspended</source>
<translation>angehalten</translation>
</message>
@@ -1174,46 +1242,46 @@ sound system connections through firewalls</source>
<translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1825"/>
+ <location filename="onmainwindow_part2.cpp" line="1985"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>SSL Tunnel kann nicht erzeugt werden:
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1048"/>
- <location filename="onmainwindow_part2.cpp" line="1827"/>
- <location filename="onmainwindow_part2.cpp" line="2195"/>
+ <location filename="onmainwindow_part2.cpp" line="1153"/>
+ <location filename="onmainwindow_part2.cpp" line="1173"/>
+ <location filename="onmainwindow_part2.cpp" line="1987"/>
+ <location filename="onmainwindow_part2.cpp" line="2376"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="138"/>
- <location filename="onmainwindow_part2.cpp" line="142"/>
- <location filename="onmainwindow_part2.cpp" line="1967"/>
+ <location filename="onmainwindow.cpp" line="143"/>
+ <location filename="onmainwindow_part2.cpp" line="184"/>
+ <location filename="onmainwindow_part2.cpp" line="2148"/>
<source>connecting</source>
<translation>verbinde</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1975"/>
+ <location filename="onmainwindow_part2.cpp" line="2156"/>
<source>starting</source>
<translation>starte</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1977"/>
+ <location filename="onmainwindow_part2.cpp" line="2158"/>
<source>resuming</source>
<translation>aktiviere</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2039"/>
- <location filename="onmainwindow_part2.cpp" line="2307"/>
- <location filename="onmainwindow_part2.cpp" line="2325"/>
+ <location filename="onmainwindow_part2.cpp" line="2220"/>
+ <location filename="onmainwindow_part2.cpp" line="2488"/>
+ <location filename="onmainwindow_part2.cpp" line="2506"/>
<source>Connection timeout, aborting</source>
<translation>Zeitüberschreitung</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2040"/>
+ <location filename="onmainwindow_part2.cpp" line="2221"/>
<source>aborting</source>
<translation>Abbruch</translation>
</message>
@@ -1222,7 +1290,7 @@ sound system connections through firewalls</source>
<translation type="obsolete"><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1376"/>
+ <location filename="onmainwindow_part4.cpp" line="1608"/>
<source>Abort</source>
<translation>Abbruch</translation>
</message>
@@ -1231,49 +1299,76 @@ sound system connections through firewalls</source>
<translation type="obsolete">Zeige Details</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="384"/>
+ <location filename="onmainwindow_part3.cpp" line="404"/>
+ <source> (can't open file)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="415"/>
+ <location filename="onmainwindow_part3.cpp" line="425"/>
+ <location filename="onmainwindow_part3.cpp" line="435"/>
+ <source> (file not exists)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="459"/>
+ <source> (directory not exists)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="487"/>
<source>wrong value for argument"--link"</source>
<translation>unerwarteter Wert "--link"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="402"/>
+ <location filename="onmainwindow_part3.cpp" line="505"/>
<source>wrong value for argument"--sound"</source>
<translation>unerwarteter Wert "--sound"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="419"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
+ <location filename="onmainwindow_part3.cpp" line="522"/>
+ <location filename="onmainwindow_part3.cpp" line="533"/>
<source>wrong value for argument"--geometry"</source>
<translation>unerwarteter Wert "--geometry"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="448"/>
+ <location filename="onmainwindow_part3.cpp" line="551"/>
<source>wrong value for argument"--set-kbd"</source>
<translation>unerwarteter Wert "--set-kbd"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="465"/>
+ <location filename="onmainwindow_part3.cpp" line="568"/>
<source>wrong value for argument"--ldap"</source>
<translation>unerwarteter Wert "--ldap"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="560"/>
+ <location filename="onmainwindow_part3.cpp" line="663"/>
<source>wrong value for argument"--pack"</source>
<translation>unerwarteter Wert "--pack"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="568"/>
- <location filename="onmainwindow_part3.cpp" line="571"/>
+ <location filename="onmainwindow_part3.cpp" line="671"/>
+ <location filename="onmainwindow_part3.cpp" line="674"/>
<source>wrong parameter: </source>
<translation>unerwarteter Wert: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="617"/>
+ <location filename="onmainwindow_part3.cpp" line="724"/>
<source>Available pack methodes:</source>
<translation>Liste aller Packmethoden:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1459"/>
+ <location filename="onmainwindow_part3.cpp" line="1511"/>
+ <source>Support</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="1516"/>
+ <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="1582"/>
<source>Please check LDAP Settings</source>
<translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
</message>
@@ -1286,15 +1381,15 @@ sound system connections through firewalls</source>
<translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="230"/>
- <location filename="onmainwindow_part2.cpp" line="1147"/>
- <location filename="onmainwindow_part2.cpp" line="1216"/>
- <location filename="onmainwindow_part2.cpp" line="1249"/>
- <location filename="onmainwindow_part3.cpp" line="654"/>
- <location filename="onmainwindow_part3.cpp" line="733"/>
- <location filename="onmainwindow_part3.cpp" line="1105"/>
- <location filename="onmainwindow_part3.cpp" line="1158"/>
- <location filename="onmainwindow_part3.cpp" line="2123"/>
+ <location filename="onmainwindow_part2.cpp" line="290"/>
+ <location filename="onmainwindow_part2.cpp" line="1286"/>
+ <location filename="onmainwindow_part2.cpp" line="1370"/>
+ <location filename="onmainwindow_part2.cpp" line="1403"/>
+ <location filename="onmainwindow_part3.cpp" line="761"/>
+ <location filename="onmainwindow_part3.cpp" line="841"/>
+ <location filename="onmainwindow_part3.cpp" line="1213"/>
+ <location filename="onmainwindow_part3.cpp" line="1266"/>
+ <location filename="onmainwindow_part3.cpp" line="2250"/>
<source><b>Connection failed</b>
</source>
<translation><b>Verbindung fehlgeschlagen</b>
@@ -1305,22 +1400,22 @@ sound system connections through firewalls</source>
<translation type="obsolete">es konnte kein Server gefunden werden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1616"/>
+ <location filename="onmainwindow_part4.cpp" line="1848"/>
<source>Session ID</source>
<translation>Sitzungs ID</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1111"/>
+ <location filename="onmainwindow_part2.cpp" line="1250"/>
<source>suspending</source>
<translation>anhalten</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1133"/>
+ <location filename="onmainwindow_part2.cpp" line="1272"/>
<source>terminating</source>
<translation>beende</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="191"/>
+ <location filename="onmainwindow_part3.cpp" line="196"/>
<source><b>Connection failed</b>
:
</source>
@@ -1373,17 +1468,17 @@ sound system connections through firewalls</source>
<translation type="obsolete"><b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1252"/>
+ <location filename="onmainwindow_part2.cpp" line="1406"/>
<source><b>Wrong Password!</b><br><br></source>
<translation><b>Falsches Passwort!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="487"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
<source>wrong value for argument"--ldap1"</source>
<translation>unerwarteter Wert "--ldap1"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="506"/>
+ <location filename="onmainwindow_part3.cpp" line="609"/>
<source>wrong value for argument"--ldap2"</source>
<translation>unerwarteter Wert "--ldap2"</translation>
</message>
@@ -1412,12 +1507,12 @@ sound system connections through firewalls</source>
<translation type="obsolete">Usage: x2goclient [Options] Options: --help Print this message --help-pack Print availabel pack methods --no-menu Hide menu bar --maximize Start maximized --add-to-known-hosts Add RSA key fingerprint to .ssh/known_hosts if authenticity of server can't be established --ldap=<host:port:dn> Start with LDAP Support. Example: --ldap=ldapserver:389:o=organization,c=de --ldap1=<host:port> LDAP Failover Server #1 --ldap2=<host:port> LDAP Failover Server #2 --command=<cmd> Set default command, default value 'KDE' --sound=<0|1> Enable sound, default value '1' --geomerty=<W>x<H>|fullscreen Set default geometry, default value '800x600' --link=<modem|isdn|adsl|wan
|lan> Set default link type, default 'lan' --pack=<packmethod> Set default pack method, default '16m-jpeg-9' --kbd-layout=<layout> Set default keyboard layout, default 'us' --kbd-type=<typed> Set default keyboard type, default 'pc105/us' --set-kbd=<0|1> Overwrite current keyboard settings, default '0'</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1765"/>
+ <location filename="onmainwindow_part3.cpp" line="1888"/>
<source>Unable to create file: </source>
<translation>Datei konnte nicht erzeugt werden: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1689"/>
+ <location filename="onmainwindow_part3.cpp" line="1812"/>
<source>No valid card found</source>
<translation>Es wurde keine gültige Karte gefunden</translation>
</message>
@@ -1426,13 +1521,13 @@ sound system connections through firewalls</source>
<translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="308"/>
+ <location filename="onmainwindow.cpp" line="325"/>
<source>&Settings ...</source>
<translation>&Konfiguration ...</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="612"/>
- <location filename="onmainwindow_part3.cpp" line="638"/>
+ <location filename="onmainwindow_part3.cpp" line="719"/>
+ <location filename="onmainwindow_part3.cpp" line="745"/>
<source>Options</source>
<translation>Einstellungen</translation>
</message>
@@ -1441,14 +1536,14 @@ sound system connections through firewalls</source>
<translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1926"/>
- <location filename="onmainwindow_part3.cpp" line="1951"/>
+ <location filename="onmainwindow_part3.cpp" line="2053"/>
+ <location filename="onmainwindow_part3.cpp" line="2078"/>
<source>Can't connect to X-Server</source>
<translation>Verbindung zu X-Server konnte nicht hergestellt werden</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1927"/>
- <location filename="onmainwindow_part3.cpp" line="1952"/>
+ <location filename="onmainwindow_part3.cpp" line="2054"/>
+ <location filename="onmainwindow_part3.cpp" line="2079"/>
<source>Can't connect to X-Server
Please check your settings</source>
<translation>Verbindung zu X-Server konnte nicht hergestellt werden
@@ -1459,40 +1554,40 @@ Please check your settings</source>
<translation type="obsolete">X-Server konnte nicht gestartet werden</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="2087"/>
<source>Can't start X Server
Please check your settings</source>
<translation>X-Server konnte nicht gestartet werden
Ãberprüfen Sie Ihre Einstellungen</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1029"/>
- <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1154"/>
+ <location filename="onmainwindow_part2.cpp" line="1174"/>
<source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
<translation>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem <b>Verlust der ganzen Sitzung</b>. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf </translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1037"/>
+ <location filename="onmainwindow_part2.cpp" line="1162"/>
<source>24 or 32</source>
<translation>24 oder 32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
- <location filename="onmainwindow_part2.cpp" line="1058"/>
+ <location filename="onmainwindow_part2.cpp" line="1163"/>
+ <location filename="onmainwindow_part2.cpp" line="1183"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
<translation> bit zu ändern und den verwendeten X-server neu zu starten, bevor Sie sich mit der Sitzung verbinden. Trotzdem versuchen die Sitzung fortzuführen?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="1041"/>
- <location filename="onmainwindow_part2.cpp" line="1061"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="1166"/>
+ <location filename="onmainwindow_part2.cpp" line="1186"/>
<source>Yes</source>
<translation>Ja</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="1042"/>
- <location filename="onmainwindow_part2.cpp" line="1062"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="1167"/>
+ <location filename="onmainwindow_part2.cpp" line="1187"/>
<source>No</source>
<translation>Nein</translation>
</message>
@@ -1509,42 +1604,42 @@ Please check your settings</source>
<translation type="obsolete"></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="152"/>
<source>OpenOffice.org</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="148"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<source>Terminal</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="349"/>
+ <location filename="onmainwindow_part2.cpp" line="409"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1605"/>
+ <location filename="onmainwindow_part4.cpp" line="1837"/>
<source>Command</source>
<translation>Befehl</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1607"/>
+ <location filename="onmainwindow_part4.cpp" line="1839"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="901"/>
+ <location filename="onmainwindow_part2.cpp" line="1026"/>
<source>Desktop</source>
<translation>Desktopumgebung</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="903"/>
+ <location filename="onmainwindow_part2.cpp" line="1028"/>
<source>single application</source>
<translation>Anwendung</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="905"/>
+ <location filename="onmainwindow_part2.cpp" line="1030"/>
<source>shadow session</source>
<translation></translation>
</message>
@@ -1553,209 +1648,242 @@ Please check your settings</source>
<translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2146"/>
+ <location filename="onmainwindow_part3.cpp" line="2273"/>
<source>Unable to execute: </source>
<translation>Befehl konnte nicht ausgeführt werden:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="121"/>
+ <location filename="onmainwindow.cpp" line="126"/>
<source>X2Go client</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="145"/>
+ <location filename="onmainwindow.cpp" line="150"/>
<source>Internet browser</source>
<translation>Webbrowser</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="146"/>
+ <location filename="onmainwindow.cpp" line="151"/>
<source>Email client</source>
<translation>E-Mail-Programm</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="607"/>
+ <location filename="onmainwindow.cpp" line="658"/>
<source>&New session ...</source>
<translation>&Neue Sitzung ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="613"/>
+ <location filename="onmainwindow.cpp" line="664"/>
<source>Session management...</source>
<translation>Sitzungsverwaltung...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="622"/>
- <location filename="onmainwindow.cpp" line="642"/>
+ <location filename="onmainwindow.cpp" line="692"/>
+ <location filename="onmainwindow.cpp" line="713"/>
<source>Show toolbar</source>
<translation>Zeige Wergzeugleiste</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="311"/>
- <location filename="onmainwindow_part3.cpp" line="1413"/>
+ <location filename="onmainwindow.cpp" line="336"/>
+ <location filename="onmainwindow_part3.cpp" line="1536"/>
<source>About X2GO client</source>
<translation>Ãber X2GO Client</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1270"/>
- <location filename="onmainwindow.cpp" line="1437"/>
- <location filename="onmainwindow.cpp" line="1467"/>
+ <location filename="onmainwindow.cpp" line="1472"/>
+ <location filename="onmainwindow.cpp" line="1641"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>Please check LDAP settings</source>
<translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1304"/>
+ <location filename="onmainwindow.cpp" line="1506"/>
<source>no X2Go server found in LDAP </source>
<translation>LDAP enthält keinen X2Go Server </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1821"/>
+ <location filename="onmainwindow.cpp" line="2065"/>
<source>Are you sure you want to delete this session?</source>
<translation>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="233"/>
- <location filename="onmainwindow_part2.cpp" line="1150"/>
- <location filename="onmainwindow_part2.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="194"/>
- <location filename="onmainwindow_part3.cpp" line="657"/>
- <location filename="onmainwindow_part3.cpp" line="736"/>
- <location filename="onmainwindow_part3.cpp" line="1108"/>
- <location filename="onmainwindow_part3.cpp" line="1161"/>
- <location filename="onmainwindow_part3.cpp" line="2126"/>
+ <location filename="onmainwindow_part2.cpp" line="293"/>
+ <location filename="onmainwindow_part2.cpp" line="1289"/>
+ <location filename="onmainwindow_part2.cpp" line="1373"/>
+ <location filename="onmainwindow_part3.cpp" line="199"/>
+ <location filename="onmainwindow_part3.cpp" line="764"/>
+ <location filename="onmainwindow_part3.cpp" line="844"/>
+ <location filename="onmainwindow_part3.cpp" line="1216"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
+ <location filename="onmainwindow_part3.cpp" line="2253"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>Falsches Passwort!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="414"/>
+ <location filename="onmainwindow_part2.cpp" line="474"/>
<source>No server availabel</source>
<translation>es konnte kein Server gefunden werden</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="743"/>
- <location filename="onmainwindow_part2.cpp" line="1887"/>
+ <location filename="onmainwindow.cpp" line="923"/>
+ <location filename="onmainwindow_part2.cpp" line="2061"/>
<source>Not connected</source>
<oldsource>Active connection</oldsource>
<translation>Nicht verbunden</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2279"/>
- <location filename="onmainwindow_part4.cpp" line="1612"/>
+ <location filename="onmainwindow_part2.cpp" line="2460"/>
+ <location filename="onmainwindow_part4.cpp" line="1844"/>
<source>Creation time</source>
<translation>Startzeit</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1645"/>
- <location filename="onmainwindow_part3.cpp" line="982"/>
+ <location filename="onmainwindow_part2.cpp" line="1799"/>
+ <location filename="onmainwindow_part3.cpp" line="1090"/>
<source>Unable to create folder:</source>
<translation>Ordner kann nicht erzeugt werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="47"/>
+ <location filename="onmainwindow_part2.cpp" line="79"/>
<source>Host key for server changed.
It is now: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="48"/>
+ <location filename="onmainwindow_part2.cpp" line="80"/>
<source>For security reasons, connection will be stopped</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="58"/>
+ <location filename="onmainwindow_part2.cpp" line="90"/>
<source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="78"/>
+ <location filename="onmainwindow_part2.cpp" line="110"/>
<source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="83"/>
+ <location filename="onmainwindow_part2.cpp" line="115"/>
<source>The server is unknown. Do you trust the host key?
Public key hash: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="94"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="126"/>
<source>Host key verification failed</source>
<translation type="unfinished">Host key verification failed</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="109"/>
+ <location filename="onmainwindow_part2.cpp" line="141"/>
<source>Authentification failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1671"/>
+ <location filename="onmainwindow_part2.cpp" line="483"/>
+ <location filename="onmainwindow_part2.cpp" line="782"/>
+ <location filename="onmainwindow_part2.cpp" line="1233"/>
+ <location filename="onmainwindow_part2.cpp" line="1345"/>
+ <source>Server not availabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part2.cpp" line="1825"/>
<source>Unable to write file:</source>
<translation>Datei kann nicht geschrieben werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1796"/>
- <location filename="onmainwindow_part3.cpp" line="2197"/>
+ <location filename="onmainwindow_part2.cpp" line="1956"/>
+ <location filename="onmainwindow_part3.cpp" line="2324"/>
<source>Unable to create SSL tunnel:
</source>
<translation>SSL Tunnel kann nicht erzeugt werden:
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1368"/>
+ <location filename="onmainwindow_part4.cpp" line="1600"/>
<source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
<translation><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="425"/>
- <location filename="onmainwindow.cpp" line="746"/>
- <location filename="onmainwindow_part4.cpp" line="1378"/>
+ <location filename="onmainwindow.cpp" line="476"/>
+ <location filename="onmainwindow.cpp" line="926"/>
+ <location filename="onmainwindow_part4.cpp" line="1610"/>
<source>Share folder...</source>
<translation>Ordner freigeben...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1380"/>
+ <location filename="onmainwindow_part4.cpp" line="1612"/>
<source>Show details</source>
<translation>Zeige Details</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1414"/>
+ <location filename="onmainwindow_part3.cpp" line="1537"/>
<source><b>X2Go client V. </source>
<translation><b>X2Go Client V. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1737"/>
+ <location filename="onmainwindow_part3.cpp" line="1860"/>
<source>This card is unknown by X2Go system</source>
<translation>Diese Karte ist dem X2Go System unbekannt</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2162"/>
+ <location filename="onmainwindow_part3.cpp" line="2289"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation>Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel
Bitte installieren sie eine neuere Version von x2goserver</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="618"/>
+ <location filename="onmainwindow.cpp" line="675"/>
<source>&Create session icon on desktop...</source>
<translation>&Desktopsymbol erzeugen...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="684"/>
+ <source>&Set broker password...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="807"/>
+ <source>Operation failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="811"/>
+ <source>Password changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="830"/>
+ <source>Wrong password!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="879"/>
+ <source><b>Authentication</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="920"/>
<source>Restore</source>
<translation>Wiederhestellen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="771"/>
+ <location filename="onmainwindow.cpp" line="951"/>
<source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
<oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
<translation>Linke Mousetaste: verstecken/wiederherstellen - rechte Mousetaste: Kontextmenü</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1601"/>
+ <location filename="onmainwindow.cpp" line="1805"/>
<source>Create session icon on desktop</source>
<translation>Desktopsymbol erzeugen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1602"/>
+ <location filename="onmainwindow.cpp" line="1806"/>
<source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
Use x2goclient hidden mode?</source>
@@ -1764,39 +1892,44 @@ Use x2goclient hidden mode?</source>
Wollen SIe den versteckten Modus nutzen?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1613"/>
+ <location filename="onmainwindow.cpp" line="1817"/>
<source>New Session</source>
<translation>Neue Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2177"/>
+ <location filename="onmainwindow.cpp" line="1917"/>
+ <source>X2Go sessions not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="2431"/>
<source>RDP connection</source>
<translation>RDP Verbindung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1867"/>
<source>X2Go Link to session </source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="437"/>
- <location filename="onmainwindow_part4.cpp" line="857"/>
+ <location filename="onmainwindow.cpp" line="488"/>
+ <location filename="onmainwindow_part4.cpp" line="1054"/>
<source>Detach X2Go window</source>
<translation>Fenster abkoppeln</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1776"/>
- <location filename="onmainwindow_part4.cpp" line="832"/>
+ <location filename="onmainwindow_part2.cpp" line="1930"/>
+ <location filename="onmainwindow_part4.cpp" line="1029"/>
<source>Attach X2Go window</source>
<translation>Fenster einbetten</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1952"/>
+ <location filename="onmainwindow_part2.cpp" line="2133"/>
<source>Finished</source>
<translation>Beendet</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2196"/>
+ <location filename="onmainwindow_part2.cpp" line="2377"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation>Die Sitzung wird beendet. Sind Sie sicher?<br>Ungespeicherte Dokumente gehen verloren</translation>
@@ -1806,26 +1939,27 @@ Unsaved documents will be lost</source>
<translation type="obsolete"></b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1974"/>
- <location filename="onmainwindow_part4.cpp" line="309"/>
+ <location filename="onmainwindow_part3.cpp" line="2101"/>
+ <location filename="onmainwindow_part4.cpp" line="422"/>
+ <location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
Please check your installation</source>
<translation>X-Server lässt sich nicht starten.
Bitte überprüfen Sie Ihre Installation</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="921"/>
+ <location filename="onmainwindow_part4.cpp" line="1118"/>
<source>X2Go Session</source>
<translation>X2Go Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="440"/>
- <location filename="onmainwindow_part4.cpp" line="1832"/>
+ <location filename="onmainwindow.cpp" line="491"/>
+ <location filename="onmainwindow_part4.cpp" line="2064"/>
<source>Minimize toolbar</source>
<translation>Symbole verstecken</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1865"/>
+ <location filename="onmainwindow_part4.cpp" line="2097"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation><br><b> zum Wiederherstellen <br> der Werkzeugleiste <br> hier klicken </b><br></translation>
</message>
@@ -1834,7 +1968,7 @@ Bitte überprüfen Sie Ihre Installation</translation>
<translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1749"/>
+ <location filename="onmainwindow_part4.cpp" line="1981"/>
<source>sshd not started, you'll need sshd for printing and file sharing
you can install sshd with
<b>sudo apt-get install openssh-server</b></source>
@@ -1843,78 +1977,79 @@ Sie können SSHD über folgenden Befehl installieren:
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2185"/>
+ <location filename="onmainwindow.cpp" line="2439"/>
<source>Connection to local desktop</source>
<translation>Zugriff auf lokalen Desktop</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="938"/>
+ <location filename="onmainwindow_part2.cpp" line="1063"/>
<source>Information</source>
<translation>Hinweis</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="952"/>
- <location filename="onmainwindow_part4.cpp" line="1933"/>
+ <location filename="onmainwindow_part2.cpp" line="1077"/>
+ <location filename="onmainwindow_part4.cpp" line="2165"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="959"/>
+ <location filename="onmainwindow_part2.cpp" line="1084"/>
<source>Select desktop:</source>
<translation>Desktopauswahl:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1540"/>
+ <location filename="onmainwindow_part4.cpp" line="1772"/>
<source>View only</source>
<translation>Nur betrachten</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1620"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>User</source>
<translation>Benutzer</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2181"/>
+ <location filename="onmainwindow.cpp" line="2435"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="939"/>
+ <location filename="onmainwindow_part2.cpp" line="1064"/>
<source>No accessible desktop found</source>
<translation>Kein freigegebener Desktop gefunden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1537"/>
+ <location filename="onmainwindow_part4.cpp" line="1769"/>
<source>Full access</source>
<translation>Vollzugriff</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1651"/>
+ <location filename="onmainwindow_part4.cpp" line="1883"/>
<source>Only my desktops</source>
<translation>Nur eigene Desktops</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="433"/>
+ <location filename="onmainwindow.cpp" line="484"/>
<source>Reconnect</source>
<translation>Neu verbinden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2009"/>
+ <location filename="onmainwindow.cpp" line="834"/>
+ <location filename="onmainwindow.cpp" line="2354"/>
+ <location filename="onmainwindow_part4.cpp" line="2234"/>
<source>Connecting to broker</source>
<translation>Verbinden mit Broker</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1393"/>
<source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
- <translation></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ <translation type="obsolete"></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1397"/>
+ <location filename="onmainwindow_part3.cpp" line="1520"/>
<source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
<translation><br>x2goplugin Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1401"/>
+ <location filename="onmainwindow_part3.cpp" line="1524"/>
<source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
<translation><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
</message>
@@ -1929,7 +2064,7 @@ Sie können SSHD über folgenden Befehl installieren:
<translation>ISO8859-1</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1103"/>
+ <location filename="onmainwindow_part4.cpp" line="1300"/>
<source>wrong value for argument"speed"</source>
<translation>wrong value for argument"speed"</translation>
</message>
@@ -2163,31 +2298,31 @@ Beispiel:
<translation type="obsolete">Aktiviere Audiounterstützung</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="229"/>
+ <location filename="sessionbutton.cpp" line="270"/>
<source>New Session</source>
<translation>Neue Sitzung</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="251"/>
+ <location filename="sessionbutton.cpp" line="312"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="322"/>
- <location filename="sessionbutton.cpp" line="334"/>
- <location filename="sessionbutton.cpp" line="571"/>
+ <location filename="sessionbutton.cpp" line="383"/>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="635"/>
<source>fullscreen</source>
<translation>Vollbild</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="356"/>
- <location filename="sessionbutton.cpp" line="483"/>
+ <location filename="sessionbutton.cpp" line="417"/>
+ <location filename="sessionbutton.cpp" line="547"/>
<source>Enabled</source>
<translation>aktiviert</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="358"/>
- <location filename="sessionbutton.cpp" line="485"/>
+ <location filename="sessionbutton.cpp" line="419"/>
+ <location filename="sessionbutton.cpp" line="549"/>
<source>Disabled</source>
<translation>deaktiviert</translation>
</message>
@@ -2196,64 +2331,74 @@ Beispiel:
<translation type="obsolete">/usr/bin/startkde</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="329"/>
- <location filename="sessionbutton.cpp" line="348"/>
+ <location filename="sessionbutton.cpp" line="390"/>
+ <location filename="sessionbutton.cpp" line="409"/>
<source>window</source>
<translation>Fenster</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="113"/>
+ <location filename="sessionbutton.cpp" line="114"/>
<source>Session preferences...</source>
<translation>Sitzungseinstellungen...</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="117"/>
+ <location filename="sessionbutton.cpp" line="118"/>
<source>Create session icon on desktop...</source>
<translation>Desktopsymbol erzeugen...</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="122"/>
+ <location filename="sessionbutton.cpp" line="123"/>
<source>Delete session</source>
<translation>Sitzung entfernen</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="135"/>
+ <location filename="sessionbutton.cpp" line="136"/>
<source>Session actions</source>
<translation>Optionen</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="136"/>
+ <location filename="sessionbutton.cpp" line="137"/>
<source>Select type</source>
<translation>Typ</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="138"/>
+ <location filename="sessionbutton.cpp" line="139"/>
<source>Select resolution</source>
<translation>Auflösung</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="139"/>
+ <location filename="sessionbutton.cpp" line="140"/>
<source>Toggle sound support</source>
<translation>Sound</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="262"/>
- <location filename="sessionbutton.cpp" line="294"/>
- <location filename="sessionbutton.cpp" line="524"/>
+ <location filename="sessionbutton.cpp" line="275"/>
+ <source>running</source>
+ <translation type="unfinished">aktiv</translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="279"/>
+ <source>suspended</source>
+ <translation type="unfinished">angehalten</translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="323"/>
+ <location filename="sessionbutton.cpp" line="355"/>
+ <location filename="sessionbutton.cpp" line="588"/>
<source>RDP connection</source>
<translation>RDP Verbindung</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="264"/>
- <location filename="sessionbutton.cpp" line="288"/>
- <location filename="sessionbutton.cpp" line="518"/>
+ <location filename="sessionbutton.cpp" line="325"/>
+ <location filename="sessionbutton.cpp" line="349"/>
+ <location filename="sessionbutton.cpp" line="582"/>
<source>Connection to local desktop</source>
<translation>Zugriff auf lokalen Desktop</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="263"/>
- <location filename="sessionbutton.cpp" line="300"/>
- <location filename="sessionbutton.cpp" line="530"/>
+ <location filename="sessionbutton.cpp" line="324"/>
+ <location filename="sessionbutton.cpp" line="361"/>
+ <location filename="sessionbutton.cpp" line="594"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
@@ -2660,82 +2805,82 @@ sound system connections through firewalls</source>
<context>
<name>SshMasterConnection</name>
<message>
- <location filename="sshmasterconnection.cpp" line="95"/>
+ <location filename="sshmasterconnection.cpp" line="100"/>
<source>Can not initialize libssh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="115"/>
+ <location filename="sshmasterconnection.cpp" line="120"/>
<source>Can not create ssh session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="128"/>
+ <location filename="sshmasterconnection.cpp" line="135"/>
<source>Can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="155"/>
+ <location filename="sshmasterconnection.cpp" line="171"/>
<source>Authentication failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="171"/>
+ <location filename="sshmasterconnection.cpp" line="187"/>
<source>channel_forward_listen failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="482"/>
+ <location filename="sshmasterconnection.cpp" line="498"/>
<source>Can not open file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="494"/>
+ <location filename="sshmasterconnection.cpp" line="510"/>
<source>Can not create remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="507"/>
+ <location filename="sshmasterconnection.cpp" line="523"/>
<source>Can not write to remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="557"/>
+ <location filename="sshmasterconnection.cpp" line="573"/>
<source>can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="666"/>
+ <location filename="sshmasterconnection.cpp" line="682"/>
<source>channel_open_forward failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="685"/>
+ <location filename="sshmasterconnection.cpp" line="701"/>
<source>channel_open_session failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="692"/>
+ <location filename="sshmasterconnection.cpp" line="708"/>
<source>channel_request_exec failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="757"/>
+ <location filename="sshmasterconnection.cpp" line="773"/>
<source>error writing to socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="775"/>
+ <location filename="sshmasterconnection.cpp" line="791"/>
<source>error reading channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="821"/>
<source>channel_write failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="817"/>
+ <location filename="sshmasterconnection.cpp" line="833"/>
<source>error reading tcp socket</source>
<translation type="unfinished"></translation>
</message>
@@ -2743,17 +2888,93 @@ sound system connections through firewalls</source>
<context>
<name>SshProcess</name>
<message>
- <location filename="sshprocess.cpp" line="80"/>
+ <location filename="sshprocess.cpp" line="92"/>
<source>Error creating socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshprocess.cpp" line="97"/>
+ <location filename="sshprocess.cpp" line="110"/>
<source>Error binding </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>XSettingsWidget</name>
+ <message>
+ <location filename="xsettingswidget.cpp" line="50"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingswidget.cpp" line="52"/>
+ <source>Executable (*.exe)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>XSettingsWidgetUI</name>
+ <message>
+ <location filename="xsettingsui.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished">Form</translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="27"/>
+ <source>You must restart the X2go Client for the changes to take effect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="50"/>
+ <source>use integrated X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="60"/>
+ <source>use custom X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="70"/>
+ <source>custom X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="78"/>
+ <source>executable:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="101"/>
+ <source>start X-Server on X2Go client start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="113"/>
+ <source>command line options:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="125"/>
+ <source>X-Server command line options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="131"/>
+ <source>window mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="141"/>
+ <source>fullscreen mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="151"/>
+ <source>single application:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>sshProcess</name>
<message>
<source>Unable to create: </source>
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index b846d89..6fcba31 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -2,6 +2,42 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
+ <name>BrokerPassDialogUi</name>
+ <message>
+ <location filename="brokerpassdialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="22"/>
+ <source>Old password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="36"/>
+ <source>New password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="50"/>
+ <source>Confirm password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="79"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BrokerPassDlg</name>
+ <message>
+ <location filename="brokerpassdlg.cpp" line="41"/>
+ <source>Passwords do not match</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CUPSPrintWidget</name>
<message>
<location filename="cupsprintwidget.cpp" line="65"/>
@@ -90,156 +126,157 @@
<context>
<name>ConfigDialog</name>
<message>
- <location filename="configdialog.cpp" line="44"/>
+ <location filename="configdialog.cpp" line="50"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="53"/>
+ <location filename="configdialog.cpp" line="59"/>
<source>Display icon in system tray</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="60"/>
+ <location filename="configdialog.cpp" line="66"/>
<source>Hide to system tray when minimized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="61"/>
+ <location filename="configdialog.cpp" line="67"/>
<source>Hide to system tray when closed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="62"/>
+ <location filename="configdialog.cpp" line="68"/>
<source>Hide to system tray after connection is established</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="63"/>
+ <location filename="configdialog.cpp" line="69"/>
<source>Restore from system tray after session is disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="81"/>
+ <location filename="configdialog.cpp" line="87"/>
<source>Use LDAP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="105"/>
+ <location filename="configdialog.cpp" line="111"/>
<source>Server URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="106"/>
+ <location filename="configdialog.cpp" line="112"/>
<source>BaseDN:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="108"/>
+ <location filename="configdialog.cpp" line="114"/>
<source>Failover server 1 URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="110"/>
+ <location filename="configdialog.cpp" line="116"/>
<source>Failover server 2 URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="192"/>
+ <location filename="configdialog.cpp" line="198"/>
+ <location filename="configdialog.cpp" line="340"/>
<source>X-Server settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="201"/>
+ <location filename="configdialog.cpp" line="207"/>
<source>X11 application:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="212"/>
+ <location filename="configdialog.cpp" line="218"/>
<source>X11 version:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="227"/>
+ <location filename="configdialog.cpp" line="233"/>
<source>Find X11 application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="244"/>
+ <location filename="configdialog.cpp" line="250"/>
<source>Clientside SSH port for file system export usage:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="254"/>
+ <location filename="configdialog.cpp" line="260"/>
<source>Start session embedded inside website</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="258"/>
- <location filename="configdialog.cpp" line="554"/>
- <location filename="configdialog.cpp" line="566"/>
+ <location filename="configdialog.cpp" line="264"/>
+ <location filename="configdialog.cpp" line="567"/>
+ <location filename="configdialog.cpp" line="579"/>
<source>Advanced options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="285"/>
+ <location filename="configdialog.cpp" line="291"/>
<source>Defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="286"/>
+ <location filename="configdialog.cpp" line="292"/>
<source>&OK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="287"/>
+ <location filename="configdialog.cpp" line="293"/>
<source>&Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="310"/>
+ <location filename="configdialog.cpp" line="316"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="330"/>
+ <location filename="configdialog.cpp" line="336"/>
<source>Printing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="490"/>
- <location filename="configdialog.cpp" line="508"/>
- <location filename="configdialog.cpp" line="527"/>
+ <location filename="configdialog.cpp" line="503"/>
+ <location filename="configdialog.cpp" line="521"/>
+ <location filename="configdialog.cpp" line="540"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="491"/>
+ <location filename="configdialog.cpp" line="504"/>
<source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="509"/>
+ <location filename="configdialog.cpp" line="522"/>
<source>Your are using X11 (Apple X-Window Server) version </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="511"/>
+ <location filename="configdialog.cpp" line="524"/>
<source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="528"/>
+ <location filename="configdialog.cpp" line="541"/>
<source>No suitable X11 application found in selected path</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="564"/>
+ <location filename="configdialog.cpp" line="577"/>
<source>&Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="configdialog.cpp" line="565"/>
+ <location filename="configdialog.cpp" line="578"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
@@ -435,114 +472,121 @@
<context>
<name>HttpBrokerClient</name>
<message>
- <location filename="httpbrokerclient.cpp" line="96"/>
+ <location filename="httpbrokerclient.cpp" line="164"/>
<source>us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="99"/>
+ <location filename="httpbrokerclient.cpp" line="167"/>
<source>pc105/us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="236"/>
+ <location filename="httpbrokerclient.cpp" line="294"/>
+ <location filename="httpbrokerclient.cpp" line="308"/>
+ <location filename="httpbrokerclient.cpp" line="345"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="237"/>
+ <location filename="httpbrokerclient.cpp" line="309"/>
+ <source>Login failed!<br>Please try again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="httpbrokerclient.cpp" line="346"/>
<source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="324"/>
+ <location filename="httpbrokerclient.cpp" line="433"/>
<source><br><b>Server uses an invalid security certificate.</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="327"/>
+ <location filename="httpbrokerclient.cpp" line="436"/>
<source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="332"/>
+ <location filename="httpbrokerclient.cpp" line="441"/>
<source>Secure connection failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="337"/>
+ <location filename="httpbrokerclient.cpp" line="446"/>
<source>Issued to:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="338"/>
- <location filename="httpbrokerclient.cpp" line="350"/>
+ <location filename="httpbrokerclient.cpp" line="447"/>
+ <location filename="httpbrokerclient.cpp" line="459"/>
<source>Common Name(CN) </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="341"/>
- <location filename="httpbrokerclient.cpp" line="353"/>
+ <location filename="httpbrokerclient.cpp" line="450"/>
+ <location filename="httpbrokerclient.cpp" line="462"/>
<source>Organization(O) </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="344"/>
- <location filename="httpbrokerclient.cpp" line="356"/>
+ <location filename="httpbrokerclient.cpp" line="453"/>
+ <location filename="httpbrokerclient.cpp" line="465"/>
<source>Organizational Unit(OU) </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="347"/>
+ <location filename="httpbrokerclient.cpp" line="456"/>
<source>Serial Number </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="349"/>
+ <location filename="httpbrokerclient.cpp" line="458"/>
<source>Issued by:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="360"/>
+ <location filename="httpbrokerclient.cpp" line="469"/>
<source>Validity:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="361"/>
+ <location filename="httpbrokerclient.cpp" line="470"/>
<source>Issued on </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="362"/>
+ <location filename="httpbrokerclient.cpp" line="471"/>
<source>expires on </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="363"/>
+ <location filename="httpbrokerclient.cpp" line="472"/>
<source>Fingerprints:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="364"/>
+ <location filename="httpbrokerclient.cpp" line="473"/>
<source>SHA1 </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="366"/>
+ <location filename="httpbrokerclient.cpp" line="475"/>
<source>MD5 </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="372"/>
+ <location filename="httpbrokerclient.cpp" line="481"/>
<source>Exit X2Go Client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="374"/>
+ <location filename="httpbrokerclient.cpp" line="483"/>
<source>Add exception</source>
<translation type="unfinished"></translation>
</message>
@@ -550,711 +594,786 @@
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="79"/>
+ <location filename="onmainwindow.cpp" line="80"/>
+ <location filename="onmainwindow_part3.cpp" line="307"/>
<source>us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="80"/>
+ <location filename="onmainwindow.cpp" line="81"/>
<source>pc105/us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="121"/>
+ <location filename="onmainwindow.cpp" line="126"/>
<source>X2Go client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="138"/>
- <location filename="onmainwindow_part2.cpp" line="142"/>
- <location filename="onmainwindow_part2.cpp" line="1967"/>
+ <location filename="onmainwindow.cpp" line="143"/>
+ <location filename="onmainwindow_part2.cpp" line="184"/>
+ <location filename="onmainwindow_part2.cpp" line="2148"/>
<source>connecting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="145"/>
+ <location filename="onmainwindow.cpp" line="150"/>
<source>Internet browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="146"/>
+ <location filename="onmainwindow.cpp" line="151"/>
<source>Email client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="152"/>
<source>OpenOffice.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="148"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<source>Terminal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="308"/>
+ <location filename="onmainwindow.cpp" line="325"/>
<source>&Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="311"/>
- <location filename="onmainwindow_part3.cpp" line="1413"/>
+ <location filename="onmainwindow.cpp" line="329"/>
+ <source>Support ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="336"/>
+ <location filename="onmainwindow_part3.cpp" line="1536"/>
<source>About X2GO client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="425"/>
- <location filename="onmainwindow.cpp" line="746"/>
- <location filename="onmainwindow_part4.cpp" line="1378"/>
+ <location filename="onmainwindow.cpp" line="476"/>
+ <location filename="onmainwindow.cpp" line="926"/>
+ <location filename="onmainwindow_part4.cpp" line="1610"/>
<source>Share folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="428"/>
- <location filename="onmainwindow.cpp" line="747"/>
- <location filename="onmainwindow_part2.cpp" line="2019"/>
- <location filename="onmainwindow_part4.cpp" line="1529"/>
+ <location filename="onmainwindow.cpp" line="479"/>
+ <location filename="onmainwindow.cpp" line="927"/>
+ <location filename="onmainwindow_part2.cpp" line="2200"/>
+ <location filename="onmainwindow_part4.cpp" line="1761"/>
<source>Suspend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="431"/>
- <location filename="onmainwindow.cpp" line="748"/>
- <location filename="onmainwindow_part4.cpp" line="1377"/>
- <location filename="onmainwindow_part4.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="482"/>
+ <location filename="onmainwindow.cpp" line="928"/>
+ <location filename="onmainwindow_part4.cpp" line="1609"/>
+ <location filename="onmainwindow_part4.cpp" line="1763"/>
<source>Terminate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="433"/>
+ <location filename="onmainwindow.cpp" line="484"/>
<source>Reconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="437"/>
- <location filename="onmainwindow_part4.cpp" line="857"/>
+ <location filename="onmainwindow.cpp" line="488"/>
+ <location filename="onmainwindow_part4.cpp" line="1054"/>
<source>Detach X2Go window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="440"/>
- <location filename="onmainwindow_part4.cpp" line="1832"/>
+ <location filename="onmainwindow.cpp" line="491"/>
+ <location filename="onmainwindow_part4.cpp" line="2064"/>
<source>Minimize toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="550"/>
- <location filename="onmainwindow.cpp" line="1578"/>
- <location filename="onmainwindow_part3.cpp" line="1513"/>
+ <location filename="onmainwindow.cpp" line="601"/>
+ <location filename="onmainwindow.cpp" line="1782"/>
+ <location filename="onmainwindow_part3.cpp" line="1636"/>
<source>Session:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="602"/>
+ <location filename="onmainwindow.cpp" line="653"/>
<source>&Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="603"/>
+ <location filename="onmainwindow.cpp" line="654"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="604"/>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="655"/>
+ <location filename="onmainwindow.cpp" line="940"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="607"/>
+ <location filename="onmainwindow.cpp" line="658"/>
<source>&New session ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="608"/>
+ <location filename="onmainwindow.cpp" line="659"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="613"/>
+ <location filename="onmainwindow.cpp" line="664"/>
<source>Session management...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="614"/>
+ <location filename="onmainwindow.cpp" line="665"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="618"/>
+ <location filename="onmainwindow.cpp" line="675"/>
<source>&Create session icon on desktop...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="622"/>
- <location filename="onmainwindow.cpp" line="642"/>
+ <location filename="onmainwindow.cpp" line="684"/>
+ <source>&Set broker password...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="692"/>
+ <location filename="onmainwindow.cpp" line="713"/>
<source>Show toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="628"/>
+ <location filename="onmainwindow.cpp" line="698"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="644"/>
+ <location filename="onmainwindow.cpp" line="715"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="650"/>
+ <location filename="onmainwindow.cpp" line="721"/>
<source>&Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="651"/>
+ <location filename="onmainwindow.cpp" line="722"/>
<source>&Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
+ <location filename="onmainwindow.cpp" line="739"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="694"/>
- <location filename="onmainwindow.cpp" line="1571"/>
- <location filename="onmainwindow_part3.cpp" line="1506"/>
- <location filename="onmainwindow_part4.cpp" line="1216"/>
+ <location filename="onmainwindow.cpp" line="776"/>
+ <location filename="onmainwindow.cpp" line="1775"/>
+ <location filename="onmainwindow_part3.cpp" line="1629"/>
+ <location filename="onmainwindow_part4.cpp" line="1422"/>
<source>Login:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="807"/>
+ <source>Operation failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="811"/>
+ <source>Password changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="830"/>
+ <source>Wrong password!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="879"/>
+ <source><b>Authentication</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="920"/>
<source>Restore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="743"/>
- <location filename="onmainwindow_part2.cpp" line="1887"/>
+ <location filename="onmainwindow.cpp" line="923"/>
+ <location filename="onmainwindow_part2.cpp" line="2061"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="771"/>
+ <location filename="onmainwindow.cpp" line="951"/>
<source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
<oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1269"/>
- <location filename="onmainwindow.cpp" line="1297"/>
- <location filename="onmainwindow.cpp" line="1305"/>
- <location filename="onmainwindow.cpp" line="1436"/>
- <location filename="onmainwindow.cpp" line="1463"/>
- <location filename="onmainwindow.cpp" line="1466"/>
- <location filename="onmainwindow.cpp" line="1896"/>
- <location filename="onmainwindow.cpp" line="1910"/>
- <location filename="onmainwindow.cpp" line="1923"/>
- <location filename="onmainwindow.cpp" line="1957"/>
- <location filename="onmainwindow.cpp" line="2002"/>
- <location filename="onmainwindow_part2.cpp" line="237"/>
- <location filename="onmainwindow_part2.cpp" line="413"/>
- <location filename="onmainwindow_part2.cpp" line="1154"/>
- <location filename="onmainwindow_part2.cpp" line="1223"/>
- <location filename="onmainwindow_part2.cpp" line="1267"/>
- <location filename="onmainwindow_part2.cpp" line="1647"/>
- <location filename="onmainwindow_part2.cpp" line="1673"/>
- <location filename="onmainwindow_part2.cpp" line="1798"/>
- <location filename="onmainwindow_part3.cpp" line="197"/>
- <location filename="onmainwindow_part3.cpp" line="661"/>
- <location filename="onmainwindow_part3.cpp" line="740"/>
- <location filename="onmainwindow_part3.cpp" line="984"/>
- <location filename="onmainwindow_part3.cpp" line="1112"/>
- <location filename="onmainwindow_part3.cpp" line="1165"/>
- <location filename="onmainwindow_part3.cpp" line="1456"/>
- <location filename="onmainwindow_part3.cpp" line="1458"/>
- <location filename="onmainwindow_part3.cpp" line="1688"/>
- <location filename="onmainwindow_part3.cpp" line="1736"/>
- <location filename="onmainwindow_part3.cpp" line="1764"/>
- <location filename="onmainwindow_part3.cpp" line="2130"/>
- <location filename="onmainwindow_part3.cpp" line="2145"/>
- <location filename="onmainwindow_part3.cpp" line="2199"/>
+ <location filename="onmainwindow.cpp" line="807"/>
+ <location filename="onmainwindow.cpp" line="830"/>
+ <location filename="onmainwindow.cpp" line="1471"/>
+ <location filename="onmainwindow.cpp" line="1499"/>
+ <location filename="onmainwindow.cpp" line="1507"/>
+ <location filename="onmainwindow.cpp" line="1640"/>
+ <location filename="onmainwindow.cpp" line="1667"/>
+ <location filename="onmainwindow.cpp" line="1670"/>
+ <location filename="onmainwindow.cpp" line="1917"/>
+ <location filename="onmainwindow.cpp" line="2140"/>
+ <location filename="onmainwindow.cpp" line="2154"/>
+ <location filename="onmainwindow.cpp" line="2167"/>
+ <location filename="onmainwindow.cpp" line="2201"/>
+ <location filename="onmainwindow.cpp" line="2246"/>
+ <location filename="onmainwindow_part2.cpp" line="297"/>
+ <location filename="onmainwindow_part2.cpp" line="473"/>
+ <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="781"/>
+ <location filename="onmainwindow_part2.cpp" line="1232"/>
+ <location filename="onmainwindow_part2.cpp" line="1293"/>
+ <location filename="onmainwindow_part2.cpp" line="1344"/>
+ <location filename="onmainwindow_part2.cpp" line="1377"/>
+ <location filename="onmainwindow_part2.cpp" line="1421"/>
+ <location filename="onmainwindow_part2.cpp" line="1801"/>
+ <location filename="onmainwindow_part2.cpp" line="1827"/>
+ <location filename="onmainwindow_part2.cpp" line="1958"/>
+ <location filename="onmainwindow_part3.cpp" line="202"/>
+ <location filename="onmainwindow_part3.cpp" line="768"/>
+ <location filename="onmainwindow_part3.cpp" line="848"/>
+ <location filename="onmainwindow_part3.cpp" line="1092"/>
+ <location filename="onmainwindow_part3.cpp" line="1220"/>
+ <location filename="onmainwindow_part3.cpp" line="1273"/>
+ <location filename="onmainwindow_part3.cpp" line="1579"/>
+ <location filename="onmainwindow_part3.cpp" line="1581"/>
+ <location filename="onmainwindow_part3.cpp" line="1811"/>
+ <location filename="onmainwindow_part3.cpp" line="1859"/>
+ <location filename="onmainwindow_part3.cpp" line="1887"/>
+ <location filename="onmainwindow_part3.cpp" line="2257"/>
+ <location filename="onmainwindow_part3.cpp" line="2272"/>
+ <location filename="onmainwindow_part3.cpp" line="2326"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="1748"/>
+ <location filename="onmainwindow_part4.cpp" line="1980"/>
+ <location filename="onmainwindow_part4.cpp" line="2251"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1270"/>
- <location filename="onmainwindow.cpp" line="1437"/>
- <location filename="onmainwindow.cpp" line="1467"/>
+ <location filename="onmainwindow.cpp" line="1472"/>
+ <location filename="onmainwindow.cpp" line="1641"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>Please check LDAP settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1304"/>
+ <location filename="onmainwindow.cpp" line="1506"/>
<source>no X2Go server found in LDAP </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1601"/>
+ <location filename="onmainwindow.cpp" line="1805"/>
<source>Create session icon on desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1602"/>
+ <location filename="onmainwindow.cpp" line="1806"/>
<source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
Use x2goclient hidden mode?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1613"/>
+ <location filename="onmainwindow.cpp" line="1817"/>
<source>New Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1867"/>
<source>X2Go Link to session </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1821"/>
+ <location filename="onmainwindow.cpp" line="1917"/>
+ <source>X2Go sessions not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="2065"/>
<source>Are you sure you want to delete this session?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2118"/>
- <location filename="onmainwindow_part3.cpp" line="64"/>
+ <location filename="onmainwindow.cpp" line="2372"/>
+ <location filename="onmainwindow_part3.cpp" line="68"/>
<source>KDE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2177"/>
+ <location filename="onmainwindow.cpp" line="2431"/>
<source>RDP connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2181"/>
+ <location filename="onmainwindow.cpp" line="2435"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2185"/>
+ <location filename="onmainwindow.cpp" line="2439"/>
<source>Connection to local desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2189"/>
+ <location filename="onmainwindow.cpp" line="2443"/>
<source> on </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="230"/>
- <location filename="onmainwindow_part2.cpp" line="1147"/>
- <location filename="onmainwindow_part2.cpp" line="1216"/>
- <location filename="onmainwindow_part2.cpp" line="1249"/>
- <location filename="onmainwindow_part3.cpp" line="654"/>
- <location filename="onmainwindow_part3.cpp" line="733"/>
- <location filename="onmainwindow_part3.cpp" line="1105"/>
- <location filename="onmainwindow_part3.cpp" line="1158"/>
- <location filename="onmainwindow_part3.cpp" line="2123"/>
+ <location filename="onmainwindow_part2.cpp" line="290"/>
+ <location filename="onmainwindow_part2.cpp" line="1286"/>
+ <location filename="onmainwindow_part2.cpp" line="1370"/>
+ <location filename="onmainwindow_part2.cpp" line="1403"/>
+ <location filename="onmainwindow_part3.cpp" line="761"/>
+ <location filename="onmainwindow_part3.cpp" line="841"/>
+ <location filename="onmainwindow_part3.cpp" line="1213"/>
+ <location filename="onmainwindow_part3.cpp" line="1266"/>
+ <location filename="onmainwindow_part3.cpp" line="2250"/>
<source><b>Connection failed</b>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="233"/>
- <location filename="onmainwindow_part2.cpp" line="1150"/>
- <location filename="onmainwindow_part2.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="194"/>
- <location filename="onmainwindow_part3.cpp" line="657"/>
- <location filename="onmainwindow_part3.cpp" line="736"/>
- <location filename="onmainwindow_part3.cpp" line="1108"/>
- <location filename="onmainwindow_part3.cpp" line="1161"/>
- <location filename="onmainwindow_part3.cpp" line="2126"/>
+ <location filename="onmainwindow_part2.cpp" line="293"/>
+ <location filename="onmainwindow_part2.cpp" line="1289"/>
+ <location filename="onmainwindow_part2.cpp" line="1373"/>
+ <location filename="onmainwindow_part3.cpp" line="199"/>
+ <location filename="onmainwindow_part3.cpp" line="764"/>
+ <location filename="onmainwindow_part3.cpp" line="844"/>
+ <location filename="onmainwindow_part3.cpp" line="1216"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
+ <location filename="onmainwindow_part3.cpp" line="2253"/>
<source><b>Wrong password!</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="349"/>
+ <location filename="onmainwindow_part2.cpp" line="409"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="414"/>
+ <location filename="onmainwindow_part2.cpp" line="474"/>
<source>No server availabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="877"/>
- <location filename="onmainwindow_part4.cpp" line="1520"/>
+ <location filename="onmainwindow_part2.cpp" line="1002"/>
+ <location filename="onmainwindow_part4.cpp" line="1752"/>
<source>Select session:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="893"/>
- <location filename="onmainwindow_part2.cpp" line="987"/>
- <location filename="onmainwindow_part2.cpp" line="1983"/>
+ <location filename="onmainwindow_part2.cpp" line="1018"/>
+ <location filename="onmainwindow_part2.cpp" line="1112"/>
+ <location filename="onmainwindow_part2.cpp" line="2164"/>
<source>running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="895"/>
- <location filename="onmainwindow_part2.cpp" line="1166"/>
+ <location filename="onmainwindow_part2.cpp" line="1020"/>
+ <location filename="onmainwindow_part2.cpp" line="1305"/>
<source>suspended</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="901"/>
+ <location filename="onmainwindow_part2.cpp" line="1026"/>
<source>Desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="903"/>
+ <location filename="onmainwindow_part2.cpp" line="1028"/>
<source>single application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="905"/>
+ <location filename="onmainwindow_part2.cpp" line="1030"/>
<source>shadow session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="938"/>
+ <location filename="onmainwindow_part2.cpp" line="1063"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="939"/>
+ <location filename="onmainwindow_part2.cpp" line="1064"/>
<source>No accessible desktop found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="952"/>
- <location filename="onmainwindow_part4.cpp" line="1933"/>
+ <location filename="onmainwindow_part2.cpp" line="1077"/>
+ <location filename="onmainwindow_part4.cpp" line="2165"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="959"/>
+ <location filename="onmainwindow_part2.cpp" line="1084"/>
<source>Select desktop:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1048"/>
- <location filename="onmainwindow_part2.cpp" line="1827"/>
- <location filename="onmainwindow_part2.cpp" line="2195"/>
+ <location filename="onmainwindow_part2.cpp" line="1153"/>
+ <location filename="onmainwindow_part2.cpp" line="1173"/>
+ <location filename="onmainwindow_part2.cpp" line="1987"/>
+ <location filename="onmainwindow_part2.cpp" line="2376"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1029"/>
- <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1154"/>
+ <location filename="onmainwindow_part2.cpp" line="1174"/>
<source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1037"/>
+ <location filename="onmainwindow_part2.cpp" line="1162"/>
<source>24 or 32</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
- <location filename="onmainwindow_part2.cpp" line="1058"/>
+ <location filename="onmainwindow_part2.cpp" line="1163"/>
+ <location filename="onmainwindow_part2.cpp" line="1183"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="1041"/>
- <location filename="onmainwindow_part2.cpp" line="1061"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="1166"/>
+ <location filename="onmainwindow_part2.cpp" line="1186"/>
<source>Yes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="47"/>
+ <location filename="onmainwindow_part2.cpp" line="79"/>
<source>Host key for server changed.
It is now: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="48"/>
+ <location filename="onmainwindow_part2.cpp" line="80"/>
<source>For security reasons, connection will be stopped</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="58"/>
+ <location filename="onmainwindow_part2.cpp" line="90"/>
<source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="78"/>
+ <location filename="onmainwindow_part2.cpp" line="110"/>
<source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="83"/>
+ <location filename="onmainwindow_part2.cpp" line="115"/>
<source>The server is unknown. Do you trust the host key?
Public key hash: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="1042"/>
- <location filename="onmainwindow_part2.cpp" line="1062"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="1167"/>
+ <location filename="onmainwindow_part2.cpp" line="1187"/>
<source>No</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="94"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="126"/>
<source>Host key verification failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="109"/>
+ <location filename="onmainwindow_part2.cpp" line="141"/>
<source>Authentification failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1111"/>
+ <location filename="onmainwindow_part2.cpp" line="483"/>
+ <location filename="onmainwindow_part2.cpp" line="782"/>
+ <location filename="onmainwindow_part2.cpp" line="1233"/>
+ <location filename="onmainwindow_part2.cpp" line="1345"/>
+ <source>Server not availabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part2.cpp" line="1250"/>
<source>suspending</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1133"/>
+ <location filename="onmainwindow_part2.cpp" line="1272"/>
<source>terminating</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1252"/>
+ <location filename="onmainwindow_part2.cpp" line="1406"/>
<source><b>Wrong Password!</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1645"/>
- <location filename="onmainwindow_part3.cpp" line="982"/>
+ <location filename="onmainwindow_part2.cpp" line="1799"/>
+ <location filename="onmainwindow_part3.cpp" line="1090"/>
<source>Unable to create folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1671"/>
+ <location filename="onmainwindow_part2.cpp" line="1825"/>
<source>Unable to write file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1776"/>
- <location filename="onmainwindow_part4.cpp" line="832"/>
+ <location filename="onmainwindow_part2.cpp" line="1930"/>
+ <location filename="onmainwindow_part4.cpp" line="1029"/>
<source>Attach X2Go window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1796"/>
- <location filename="onmainwindow_part3.cpp" line="2197"/>
+ <location filename="onmainwindow_part2.cpp" line="1956"/>
+ <location filename="onmainwindow_part3.cpp" line="2324"/>
<source>Unable to create SSL tunnel:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1825"/>
+ <location filename="onmainwindow_part2.cpp" line="1985"/>
<source>Unable to create SSL Tunnel:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1952"/>
+ <location filename="onmainwindow_part2.cpp" line="2133"/>
<source>Finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1975"/>
+ <location filename="onmainwindow_part2.cpp" line="2156"/>
<source>starting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1977"/>
+ <location filename="onmainwindow_part2.cpp" line="2158"/>
<source>resuming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2039"/>
- <location filename="onmainwindow_part2.cpp" line="2307"/>
- <location filename="onmainwindow_part2.cpp" line="2325"/>
+ <location filename="onmainwindow_part2.cpp" line="2220"/>
+ <location filename="onmainwindow_part2.cpp" line="2488"/>
+ <location filename="onmainwindow_part2.cpp" line="2506"/>
<source>Connection timeout, aborting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2040"/>
+ <location filename="onmainwindow_part2.cpp" line="2221"/>
<source>aborting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2196"/>
+ <location filename="onmainwindow_part2.cpp" line="2377"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2275"/>
+ <location filename="onmainwindow_part2.cpp" line="2456"/>
<source>Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2277"/>
- <location filename="onmainwindow_part4.cpp" line="1601"/>
- <location filename="onmainwindow_part4.cpp" line="1623"/>
+ <location filename="onmainwindow_part2.cpp" line="2458"/>
+ <location filename="onmainwindow_part4.cpp" line="1833"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2279"/>
- <location filename="onmainwindow_part4.cpp" line="1612"/>
+ <location filename="onmainwindow_part2.cpp" line="2460"/>
+ <location filename="onmainwindow_part4.cpp" line="1844"/>
<source>Creation time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="191"/>
+ <location filename="onmainwindow_part3.cpp" line="196"/>
<source><b>Connection failed</b>
:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="384"/>
+ <location filename="onmainwindow_part3.cpp" line="404"/>
+ <source> (can't open file)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="415"/>
+ <location filename="onmainwindow_part3.cpp" line="425"/>
+ <location filename="onmainwindow_part3.cpp" line="435"/>
+ <source> (file not exists)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="459"/>
+ <source> (directory not exists)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="487"/>
<source>wrong value for argument"--link"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="402"/>
+ <location filename="onmainwindow_part3.cpp" line="505"/>
<source>wrong value for argument"--sound"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="419"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
+ <location filename="onmainwindow_part3.cpp" line="522"/>
+ <location filename="onmainwindow_part3.cpp" line="533"/>
<source>wrong value for argument"--geometry"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="448"/>
+ <location filename="onmainwindow_part3.cpp" line="551"/>
<source>wrong value for argument"--set-kbd"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="465"/>
+ <location filename="onmainwindow_part3.cpp" line="568"/>
<source>wrong value for argument"--ldap"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="487"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
<source>wrong value for argument"--ldap1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="506"/>
+ <location filename="onmainwindow_part3.cpp" line="609"/>
<source>wrong value for argument"--ldap2"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="560"/>
+ <location filename="onmainwindow_part3.cpp" line="663"/>
<source>wrong value for argument"--pack"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="568"/>
- <location filename="onmainwindow_part3.cpp" line="571"/>
+ <location filename="onmainwindow_part3.cpp" line="671"/>
+ <location filename="onmainwindow_part3.cpp" line="674"/>
<source>wrong parameter: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="612"/>
- <location filename="onmainwindow_part3.cpp" line="638"/>
+ <location filename="onmainwindow_part3.cpp" line="719"/>
+ <location filename="onmainwindow_part3.cpp" line="745"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="617"/>
+ <location filename="onmainwindow_part3.cpp" line="724"/>
<source>Available pack methodes:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1393"/>
- <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <location filename="onmainwindow_part3.cpp" line="1511"/>
+ <source>Support</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="1516"/>
+ <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1397"/>
+ <location filename="onmainwindow_part3.cpp" line="1520"/>
<source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1401"/>
+ <location filename="onmainwindow_part3.cpp" line="1524"/>
<source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1414"/>
+ <location filename="onmainwindow_part3.cpp" line="1537"/>
<source><b>X2Go client V. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1459"/>
+ <location filename="onmainwindow_part3.cpp" line="1582"/>
<source>Please check LDAP Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1689"/>
+ <location filename="onmainwindow_part3.cpp" line="1812"/>
<source>No valid card found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1737"/>
+ <location filename="onmainwindow_part3.cpp" line="1860"/>
<source>This card is unknown by X2Go system</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1765"/>
+ <location filename="onmainwindow_part3.cpp" line="1888"/>
<source>Unable to create file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1926"/>
- <location filename="onmainwindow_part3.cpp" line="1951"/>
+ <location filename="onmainwindow_part3.cpp" line="2053"/>
+ <location filename="onmainwindow_part3.cpp" line="2078"/>
<source>Can't connect to X-Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1927"/>
- <location filename="onmainwindow_part3.cpp" line="1952"/>
+ <location filename="onmainwindow_part3.cpp" line="2054"/>
+ <location filename="onmainwindow_part3.cpp" line="2079"/>
<source>Can't connect to X-Server
Please check your settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="2087"/>
<source>Can't start X Server
Please check your settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1974"/>
- <location filename="onmainwindow_part4.cpp" line="309"/>
+ <location filename="onmainwindow_part3.cpp" line="2101"/>
+ <location filename="onmainwindow_part4.cpp" line="422"/>
+ <location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
Please check your installation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2146"/>
+ <location filename="onmainwindow_part3.cpp" line="2273"/>
<source>Unable to execute: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2162"/>
+ <location filename="onmainwindow_part3.cpp" line="2289"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
@@ -1272,121 +1391,133 @@ Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="921"/>
+ <location filename="onmainwindow_part4.cpp" line="1118"/>
<source>X2Go Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1217"/>
+ <location filename="onmainwindow_part4.cpp" line="1423"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1246"/>
+ <location filename="onmainwindow_part4.cpp" line="1424"/>
+ <source>Keyboard layout:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1465"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1248"/>
- <location filename="onmainwindow_part4.cpp" line="1524"/>
- <location filename="onmainwindow_part4.cpp" line="1526"/>
+ <location filename="onmainwindow_part4.cpp" line="1467"/>
+ <location filename="onmainwindow_part4.cpp" line="1756"/>
+ <location filename="onmainwindow_part4.cpp" line="1758"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1368"/>
+ <location filename="onmainwindow_part4.cpp" line="1600"/>
<source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1376"/>
+ <location filename="onmainwindow_part4.cpp" line="1608"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1380"/>
+ <location filename="onmainwindow_part4.cpp" line="1612"/>
<source>Show details</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1522"/>
+ <location filename="onmainwindow_part4.cpp" line="1754"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1766"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1537"/>
+ <location filename="onmainwindow_part4.cpp" line="1769"/>
<source>Full access</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1540"/>
+ <location filename="onmainwindow_part4.cpp" line="1772"/>
<source>View only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1603"/>
+ <location filename="onmainwindow_part4.cpp" line="1835"/>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1605"/>
+ <location filename="onmainwindow_part4.cpp" line="1837"/>
<source>Command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1607"/>
+ <location filename="onmainwindow_part4.cpp" line="1839"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1609"/>
+ <location filename="onmainwindow_part4.cpp" line="1841"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1614"/>
+ <location filename="onmainwindow_part4.cpp" line="1846"/>
<source>Client IP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1616"/>
+ <location filename="onmainwindow_part4.cpp" line="1848"/>
<source>Session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1620"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>User</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1651"/>
+ <location filename="onmainwindow_part4.cpp" line="1883"/>
<source>Only my desktops</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1749"/>
+ <location filename="onmainwindow_part4.cpp" line="1981"/>
<source>sshd not started, you'll need sshd for printing and file sharing
you can install sshd with
<b>sudo apt-get install openssh-server</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1820"/>
+ <location filename="onmainwindow_part4.cpp" line="2052"/>
<source>Restore toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1865"/>
+ <location filename="onmainwindow_part4.cpp" line="2097"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2009"/>
+ <location filename="onmainwindow_part4.cpp" line="2252"/>
+ <source>Invalid reply from broker</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="834"/>
+ <location filename="onmainwindow.cpp" line="2354"/>
+ <location filename="onmainwindow_part4.cpp" line="2234"/>
<source>Connecting to broker</source>
<translation type="unfinished"></translation>
</message>
@@ -1401,7 +1532,7 @@ you can install sshd with
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1103"/>
+ <location filename="onmainwindow_part4.cpp" line="1300"/>
<source>wrong value for argument"speed"</source>
<translation type="unfinished"></translation>
</message>
@@ -1605,93 +1736,103 @@ lpr -P hp_laserjet</source>
<context>
<name>SessionButton</name>
<message>
- <location filename="sessionbutton.cpp" line="113"/>
+ <location filename="sessionbutton.cpp" line="114"/>
<source>Session preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="117"/>
+ <location filename="sessionbutton.cpp" line="118"/>
<source>Create session icon on desktop...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="122"/>
+ <location filename="sessionbutton.cpp" line="123"/>
<source>Delete session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="135"/>
+ <location filename="sessionbutton.cpp" line="136"/>
<source>Session actions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="136"/>
+ <location filename="sessionbutton.cpp" line="137"/>
<source>Select type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="138"/>
+ <location filename="sessionbutton.cpp" line="139"/>
<source>Select resolution</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="139"/>
+ <location filename="sessionbutton.cpp" line="140"/>
<source>Toggle sound support</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="229"/>
+ <location filename="sessionbutton.cpp" line="270"/>
<source>New Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="251"/>
+ <location filename="sessionbutton.cpp" line="275"/>
+ <source>running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="279"/>
+ <source>suspended</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="312"/>
<source>KDE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="262"/>
- <location filename="sessionbutton.cpp" line="294"/>
- <location filename="sessionbutton.cpp" line="524"/>
+ <location filename="sessionbutton.cpp" line="323"/>
+ <location filename="sessionbutton.cpp" line="355"/>
+ <location filename="sessionbutton.cpp" line="588"/>
<source>RDP connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="263"/>
- <location filename="sessionbutton.cpp" line="300"/>
- <location filename="sessionbutton.cpp" line="530"/>
+ <location filename="sessionbutton.cpp" line="324"/>
+ <location filename="sessionbutton.cpp" line="361"/>
+ <location filename="sessionbutton.cpp" line="594"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="264"/>
- <location filename="sessionbutton.cpp" line="288"/>
- <location filename="sessionbutton.cpp" line="518"/>
+ <location filename="sessionbutton.cpp" line="325"/>
+ <location filename="sessionbutton.cpp" line="349"/>
+ <location filename="sessionbutton.cpp" line="582"/>
<source>Connection to local desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="322"/>
- <location filename="sessionbutton.cpp" line="334"/>
- <location filename="sessionbutton.cpp" line="571"/>
+ <location filename="sessionbutton.cpp" line="383"/>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="635"/>
<source>fullscreen</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="329"/>
- <location filename="sessionbutton.cpp" line="348"/>
+ <location filename="sessionbutton.cpp" line="390"/>
+ <location filename="sessionbutton.cpp" line="409"/>
<source>window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="356"/>
- <location filename="sessionbutton.cpp" line="483"/>
+ <location filename="sessionbutton.cpp" line="417"/>
+ <location filename="sessionbutton.cpp" line="547"/>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="358"/>
- <location filename="sessionbutton.cpp" line="485"/>
+ <location filename="sessionbutton.cpp" line="419"/>
+ <location filename="sessionbutton.cpp" line="549"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -2081,82 +2222,82 @@ sound system connections through firewalls</source>
<context>
<name>SshMasterConnection</name>
<message>
- <location filename="sshmasterconnection.cpp" line="95"/>
+ <location filename="sshmasterconnection.cpp" line="100"/>
<source>Can not initialize libssh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="115"/>
+ <location filename="sshmasterconnection.cpp" line="120"/>
<source>Can not create ssh session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="128"/>
+ <location filename="sshmasterconnection.cpp" line="135"/>
<source>Can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="155"/>
+ <location filename="sshmasterconnection.cpp" line="171"/>
<source>Authentication failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="171"/>
+ <location filename="sshmasterconnection.cpp" line="187"/>
<source>channel_forward_listen failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="482"/>
+ <location filename="sshmasterconnection.cpp" line="498"/>
<source>Can not open file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="494"/>
+ <location filename="sshmasterconnection.cpp" line="510"/>
<source>Can not create remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="507"/>
+ <location filename="sshmasterconnection.cpp" line="523"/>
<source>Can not write to remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="557"/>
+ <location filename="sshmasterconnection.cpp" line="573"/>
<source>can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="666"/>
+ <location filename="sshmasterconnection.cpp" line="682"/>
<source>channel_open_forward failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="685"/>
+ <location filename="sshmasterconnection.cpp" line="701"/>
<source>channel_open_session failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="692"/>
+ <location filename="sshmasterconnection.cpp" line="708"/>
<source>channel_request_exec failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="757"/>
+ <location filename="sshmasterconnection.cpp" line="773"/>
<source>error writing to socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="775"/>
+ <location filename="sshmasterconnection.cpp" line="791"/>
<source>error reading channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="821"/>
<source>channel_write failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="817"/>
+ <location filename="sshmasterconnection.cpp" line="833"/>
<source>error reading tcp socket</source>
<translation type="unfinished"></translation>
</message>
@@ -2164,14 +2305,90 @@ sound system connections through firewalls</source>
<context>
<name>SshProcess</name>
<message>
- <location filename="sshprocess.cpp" line="80"/>
+ <location filename="sshprocess.cpp" line="92"/>
<source>Error creating socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshprocess.cpp" line="97"/>
+ <location filename="sshprocess.cpp" line="110"/>
<source>Error binding </source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>XSettingsWidget</name>
+ <message>
+ <location filename="xsettingswidget.cpp" line="50"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingswidget.cpp" line="52"/>
+ <source>Executable (*.exe)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>XSettingsWidgetUI</name>
+ <message>
+ <location filename="xsettingsui.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="27"/>
+ <source>You must restart the X2go Client for the changes to take effect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="50"/>
+ <source>use integrated X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="60"/>
+ <source>use custom X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="70"/>
+ <source>custom X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="78"/>
+ <source>executable:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="101"/>
+ <source>start X-Server on X2Go client start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="113"/>
+ <source>command line options:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="125"/>
+ <source>X-Server command line options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="131"/>
+ <source>window mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="141"/>
+ <source>fullscreen mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="151"/>
+ <source>single application:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
</TS>
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index 01ade0b..46271fe 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -2,6 +2,42 @@
<!DOCTYPE TS>
<TS version="2.0" language="ru">
<context>
+ <name>BrokerPassDialogUi</name>
+ <message>
+ <location filename="brokerpassdialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">Ðиалог</translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="22"/>
+ <source>Old password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="36"/>
+ <source>New password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="50"/>
+ <source>Confirm password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="brokerpassdialog.ui" line="79"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BrokerPassDlg</name>
+ <message>
+ <location filename="brokerpassdlg.cpp" line="41"/>
+ <source>Passwords do not match</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CUPSPrintWidget</name>
<message>
<location filename="cupsprintwidget.cpp" line="65"/>
@@ -90,7 +126,7 @@
<context>
<name>ConfigDialog</name>
<message>
- <location filename="configdialog.cpp" line="81"/>
+ <location filename="configdialog.cpp" line="87"/>
<source>Use LDAP</source>
<translation>ÐÑполÑзоваÑÑ LDAP</translation>
</message>
@@ -99,12 +135,12 @@
<translation type="obsolete">УÑÑановки LDAP</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="105"/>
+ <location filename="configdialog.cpp" line="111"/>
<source>Server URL:</source>
<translation>URL СеÑвеÑа:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="106"/>
+ <location filename="configdialog.cpp" line="112"/>
<source>BaseDN:</source>
<translation>BaseDN:</translation>
</message>
@@ -153,17 +189,17 @@
<translation type="obsolete">РабоÑий каÑалог:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="286"/>
+ <location filename="configdialog.cpp" line="292"/>
<source>&OK</source>
<translation>&OK</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="287"/>
+ <location filename="configdialog.cpp" line="293"/>
<source>&Cancel</source>
<translation>Ð&Ñмена</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="310"/>
+ <location filename="configdialog.cpp" line="316"/>
<source>Settings</source>
<translation>УÑÑановки</translation>
</message>
@@ -184,29 +220,29 @@
<translation type="obsolete">ÐоиÑк X11</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="490"/>
- <location filename="configdialog.cpp" line="508"/>
- <location filename="configdialog.cpp" line="527"/>
+ <location filename="configdialog.cpp" line="503"/>
+ <location filename="configdialog.cpp" line="521"/>
+ <location filename="configdialog.cpp" line="540"/>
<source>Warning</source>
<translation>ÐÑедÑпÑеждение</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="491"/>
+ <location filename="configdialog.cpp" line="504"/>
<source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
<translation>x2goclient не Ñмог найÑи ÑÑÑановленное на ÐаÑем компÑÑÑеÑе пÑиложение X11. ÐожалÑйÑÑа ÑÑÑановиÑе X11 или ÑкажиÑе пÑÑÑ Ðº ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ Ð¿ÑиложениÑ</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="509"/>
+ <location filename="configdialog.cpp" line="522"/>
<source>Your are using X11 (Apple X-Window Server) version </source>
<translation>ÐÑ Ð¸ÑполÑзÑеÑе пÑиложение X11 веÑÑии </translation>
</message>
<message>
- <location filename="configdialog.cpp" line="511"/>
+ <location filename="configdialog.cpp" line="524"/>
<source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
<translation>. ÐÐ°Ð½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ Ð¸Ð¼ÐµÐµÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð¸Ð·Ð¾Ð±Ñажением в 24-Ñ
биÑнÑÑ
ÑвеÑовÑÑ
ÑежимаÑ
. ÐбновиÑе пожалÑйÑÑа ваÑе X11 пÑиложение (http://trac.macosforge.org/projects/xquartz).</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="528"/>
+ <location filename="configdialog.cpp" line="541"/>
<source>No suitable X11 application found in selected path</source>
<translation>ÐÑиложение X11 не найдено в заданом каÑалоге</translation>
</message>
@@ -219,99 +255,100 @@
<translation type="obsolete">УÑÑановки LDAP</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="108"/>
+ <location filename="configdialog.cpp" line="114"/>
<source>Failover server 1 URL:</source>
<translation>Failover Server 1 URL:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="110"/>
+ <location filename="configdialog.cpp" line="116"/>
<source>Failover server 2 URL:</source>
<translation>Failover Server 2 URL:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="192"/>
+ <location filename="configdialog.cpp" line="198"/>
+ <location filename="configdialog.cpp" line="340"/>
<source>X-Server settings</source>
<translation>УÑÑановки X-СеÑвеÑа</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="201"/>
+ <location filename="configdialog.cpp" line="207"/>
<source>X11 application:</source>
<translation>X11:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="212"/>
+ <location filename="configdialog.cpp" line="218"/>
<source>X11 version:</source>
<translation>ÐеÑÑÐ¸Ñ X11:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="227"/>
+ <location filename="configdialog.cpp" line="233"/>
<source>Find X11 application</source>
<translation>ÐоиÑк X11</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="244"/>
+ <location filename="configdialog.cpp" line="250"/>
<source>Clientside SSH port for file system export usage:</source>
<translation>SSH поÑÑ Ð½Ð° ÑÑоÑоне клиенÑа Ð´Ð»Ñ ÑкÑпоÑÑа Ñайловой ÑиÑÑемÑ:</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="44"/>
+ <location filename="configdialog.cpp" line="50"/>
<source>General</source>
<translation>ÐбÑие</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="330"/>
+ <location filename="configdialog.cpp" line="336"/>
<source>Printing</source>
<translation>ÐеÑаÑÑ</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="254"/>
+ <location filename="configdialog.cpp" line="260"/>
<source>Start session embedded inside website</source>
<translation>ÐÑобÑажаÑÑ ÑеÑÑÐ¸Ñ Ð²ÑÑÑоенной в веб ÑÑÑаниÑÑ</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="53"/>
+ <location filename="configdialog.cpp" line="59"/>
<source>Display icon in system tray</source>
<translation>ÐÑобÑажаÑÑ Ð¿Ð¸ÐºÑогÑÐ°Ð¼Ñ Ð² ÑиÑÑемном ÑÑее</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="60"/>
+ <location filename="configdialog.cpp" line="66"/>
<source>Hide to system tray when minimized</source>
<translation>СпÑÑÑаÑÑ Ð² ÑиÑÑемнÑй ÑÑей пÑи ÑвоÑаÑивании</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="61"/>
+ <location filename="configdialog.cpp" line="67"/>
<source>Hide to system tray when closed</source>
<translation>СпÑÑÑаÑÑ Ð² ÑиÑÑемнÑй ÑÑей пÑи закÑÑÑии</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="62"/>
+ <location filename="configdialog.cpp" line="68"/>
<source>Hide to system tray after connection is established</source>
<translation>СпÑÑÑаÑÑ Ð² ÑиÑÑемнÑй ÑÑей поÑле ÑÑÑановки ÑоединениÑ</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="63"/>
+ <location filename="configdialog.cpp" line="69"/>
<source>Restore from system tray after session is disconnected</source>
<translation>ÐоÑÑÑановиÑÑ Ð¿Ñи ÑазÑÑве ÑоединениÑ</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="258"/>
- <location filename="configdialog.cpp" line="554"/>
- <location filename="configdialog.cpp" line="566"/>
+ <location filename="configdialog.cpp" line="264"/>
+ <location filename="configdialog.cpp" line="567"/>
+ <location filename="configdialog.cpp" line="579"/>
<source>Advanced options</source>
<translation>ÐÑодвинÑÑÑе ÑÑÑановки</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="285"/>
+ <location filename="configdialog.cpp" line="291"/>
<source>Defaults</source>
<translation>Ðо ÑмолÑаниÑ</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="564"/>
+ <location filename="configdialog.cpp" line="577"/>
<source>&Connection</source>
<translation>С&оединение</translation>
</message>
<message>
- <location filename="configdialog.cpp" line="565"/>
+ <location filename="configdialog.cpp" line="578"/>
<source>&Settings</source>
<translation>&УÑÑановки</translation>
</message>
@@ -837,118 +874,125 @@ sound system connections through firewalls</source>
<context>
<name>HttpBrokerClient</name>
<message>
- <location filename="httpbrokerclient.cpp" line="96"/>
+ <location filename="httpbrokerclient.cpp" line="164"/>
<source>us</source>
<translation>ru</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="99"/>
+ <location filename="httpbrokerclient.cpp" line="167"/>
<source>pc105/us</source>
<translation>pc105/ru</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="236"/>
+ <location filename="httpbrokerclient.cpp" line="294"/>
+ <location filename="httpbrokerclient.cpp" line="308"/>
+ <location filename="httpbrokerclient.cpp" line="345"/>
<source>Error</source>
<translation>ÐÑибка</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="324"/>
+ <location filename="httpbrokerclient.cpp" line="309"/>
+ <source>Login failed!<br>Please try again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="httpbrokerclient.cpp" line="433"/>
<source><br><b>Server uses an invalid security certificate.</b><br><br></source>
<translation><br><b>СеÑÐ²ÐµÑ Ð¸ÑполÑзÑÐµÑ Ð½ÐµÐ´Ð¾ÑÑовеÑнÑй SSL ÑеÑÑиÑикаÑ.</b><br><br></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="327"/>
+ <location filename="httpbrokerclient.cpp" line="436"/>
<source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
<translation><p style='background:#FFFFDC;'>Ðам не ÑледÑÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑÑ Ð¸ÑклÑÑение еÑли Ð²Ñ Ð¸ÑполÑзÑеÑе инÑеÑÐ½ÐµÑ Ñоединение в коÑоÑом Ð²Ñ Ð½Ðµ полноÑÑÑÑ ÑвеÑÐµÐ½Ñ Ð¸Ð»Ð¸ еÑли Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±Ñли Ð±Ñ Ð¿Ð¾Ð»ÑÑиÑÑ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð¾Ðµ пÑедÑпÑежедение пÑи Ñоединении Ñ ÑÑим ÑеÑвеÑом</p></translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="332"/>
+ <location filename="httpbrokerclient.cpp" line="441"/>
<source>Secure connection failed</source>
<translation>ÐезопаÑное Ñоединение невозможно</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="337"/>
+ <location filename="httpbrokerclient.cpp" line="446"/>
<source>Issued to:
</source>
<translation>Issued to:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="338"/>
- <location filename="httpbrokerclient.cpp" line="350"/>
+ <location filename="httpbrokerclient.cpp" line="447"/>
+ <location filename="httpbrokerclient.cpp" line="459"/>
<source>Common Name(CN) </source>
<translation>Common Name(CN) </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="341"/>
- <location filename="httpbrokerclient.cpp" line="353"/>
+ <location filename="httpbrokerclient.cpp" line="450"/>
+ <location filename="httpbrokerclient.cpp" line="462"/>
<source>Organization(O) </source>
<translation>Organization(O) </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="344"/>
- <location filename="httpbrokerclient.cpp" line="356"/>
+ <location filename="httpbrokerclient.cpp" line="453"/>
+ <location filename="httpbrokerclient.cpp" line="465"/>
<source>Organizational Unit(OU) </source>
<translation>Organizational Unit(OU) </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="347"/>
+ <location filename="httpbrokerclient.cpp" line="456"/>
<source>Serial Number </source>
<translation>Serial Number </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="349"/>
+ <location filename="httpbrokerclient.cpp" line="458"/>
<source>Issued by:
</source>
<translation>Issued by:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="360"/>
+ <location filename="httpbrokerclient.cpp" line="469"/>
<source>Validity:
</source>
<translation>Validity:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="361"/>
+ <location filename="httpbrokerclient.cpp" line="470"/>
<source>Issued on </source>
<translation>Issued on </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="362"/>
+ <location filename="httpbrokerclient.cpp" line="471"/>
<source>expires on </source>
<translation>expires on </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="363"/>
+ <location filename="httpbrokerclient.cpp" line="472"/>
<source>Fingerprints:
</source>
<translation>Fingerprints:
</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="364"/>
+ <location filename="httpbrokerclient.cpp" line="473"/>
<source>SHA1 </source>
<translation>SHA1 </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="366"/>
+ <location filename="httpbrokerclient.cpp" line="475"/>
<source>MD5 </source>
<translation>MD5 </translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="372"/>
+ <location filename="httpbrokerclient.cpp" line="481"/>
<source>Exit X2Go Client</source>
<translation>ÐÑÑ
од</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="374"/>
+ <location filename="httpbrokerclient.cpp" line="483"/>
<source>Add exception</source>
<translation>ÐобавиÑÑ Ð¸ÑклÑÑение</translation>
</message>
<message>
- <location filename="httpbrokerclient.cpp" line="237"/>
+ <location filename="httpbrokerclient.cpp" line="346"/>
<source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
<translation>ÐаÑа ÑеÑÑÐ¸Ñ Ð±Ð¾Ð»ÑÑе не дейÑÑвиÑелÑна. ЧÑÐ¾Ð±Ñ Ð¿ÑодолжиÑÑ Ñоединение, веÑниÑеÑÑ Ð½Ð° ÑÑÑаниÑÑ ÑегиÑÑÑаÑии или иÑполÑзÑйÑе ÑÑнкÑÐ¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÑÑаниÑÑ Ð±ÑоÑзеÑа.</translation>
</message>
@@ -956,35 +1000,41 @@ sound system connections through firewalls</source>
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="79"/>
+ <location filename="onmainwindow.cpp" line="80"/>
+ <location filename="onmainwindow_part3.cpp" line="307"/>
<source>us</source>
<translation>ru</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="80"/>
+ <location filename="onmainwindow.cpp" line="81"/>
<source>pc105/us</source>
<translation>pc105/ru</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="550"/>
- <location filename="onmainwindow.cpp" line="1578"/>
- <location filename="onmainwindow_part3.cpp" line="1513"/>
+ <location filename="onmainwindow.cpp" line="329"/>
+ <source>Support ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="601"/>
+ <location filename="onmainwindow.cpp" line="1782"/>
+ <location filename="onmainwindow_part3.cpp" line="1636"/>
<source>Session:</source>
<translation>СеÑÑиÑ:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="602"/>
+ <location filename="onmainwindow.cpp" line="653"/>
<source>&Quit</source>
<translation>&ÐÑÑ
од</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="603"/>
+ <location filename="onmainwindow.cpp" line="654"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="604"/>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="655"/>
+ <location filename="onmainwindow.cpp" line="940"/>
<source>Quit</source>
<translation>ÐÑÑ
од</translation>
</message>
@@ -993,7 +1043,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">&ÐÐ¾Ð²Ð°Ñ ÑеÑÑÐ¸Ñ ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="608"/>
+ <location filename="onmainwindow.cpp" line="659"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
@@ -1002,17 +1052,17 @@ sound system connections through firewalls</source>
<translation type="obsolete">УпÑавление ÑеÑÑиÑми...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="614"/>
+ <location filename="onmainwindow.cpp" line="665"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="308"/>
+ <location filename="onmainwindow.cpp" line="325"/>
<source>&Settings ...</source>
<translation>&УÑÑановки ...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1820"/>
+ <location filename="onmainwindow_part4.cpp" line="2052"/>
<source>Restore toolbar</source>
<translation>ÐоÑÑÑановиÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑменÑов</translation>
</message>
@@ -1021,103 +1071,121 @@ sound system connections through firewalls</source>
<translation type="obsolete">РпÑогÑамме "X2GO Client"</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="628"/>
+ <location filename="onmainwindow.cpp" line="698"/>
<source>About Qt</source>
<translation>Ð Qt</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2275"/>
+ <location filename="onmainwindow_part2.cpp" line="2456"/>
<source>Session</source>
<translation>СеÑÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="644"/>
+ <location filename="onmainwindow.cpp" line="715"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="650"/>
+ <location filename="onmainwindow.cpp" line="721"/>
<source>&Session</source>
<translation>&СеÑÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="651"/>
+ <location filename="onmainwindow.cpp" line="722"/>
<source>&Options</source>
<translation>&ÐпÑии</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
+ <location filename="onmainwindow.cpp" line="739"/>
<source>&Help</source>
<translation>&ÐомоÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="694"/>
- <location filename="onmainwindow.cpp" line="1571"/>
- <location filename="onmainwindow_part3.cpp" line="1506"/>
- <location filename="onmainwindow_part4.cpp" line="1216"/>
+ <location filename="onmainwindow.cpp" line="776"/>
+ <location filename="onmainwindow.cpp" line="1775"/>
+ <location filename="onmainwindow_part3.cpp" line="1629"/>
+ <location filename="onmainwindow_part4.cpp" line="1422"/>
<source>Login:</source>
<translation>ÐолÑзоваÑелÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1217"/>
+ <location filename="onmainwindow_part4.cpp" line="1423"/>
<source>Password:</source>
<translation>ÐаÑолÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1246"/>
+ <location filename="onmainwindow_part4.cpp" line="1424"/>
+ <source>Keyboard layout:</source>
+ <translation type="unfinished">РаÑкладка ÐлавиаÑÑÑÑ:</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1465"/>
<source>Ok</source>
<translation>ÐÐ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1248"/>
- <location filename="onmainwindow_part4.cpp" line="1524"/>
- <location filename="onmainwindow_part4.cpp" line="1526"/>
+ <location filename="onmainwindow_part4.cpp" line="1467"/>
+ <location filename="onmainwindow_part4.cpp" line="1756"/>
+ <location filename="onmainwindow_part4.cpp" line="1758"/>
<source>Cancel</source>
<translation>ÐÑмена</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1269"/>
- <location filename="onmainwindow.cpp" line="1297"/>
- <location filename="onmainwindow.cpp" line="1305"/>
- <location filename="onmainwindow.cpp" line="1436"/>
- <location filename="onmainwindow.cpp" line="1463"/>
- <location filename="onmainwindow.cpp" line="1466"/>
- <location filename="onmainwindow.cpp" line="1896"/>
- <location filename="onmainwindow.cpp" line="1910"/>
- <location filename="onmainwindow.cpp" line="1923"/>
- <location filename="onmainwindow.cpp" line="1957"/>
- <location filename="onmainwindow.cpp" line="2002"/>
- <location filename="onmainwindow_part2.cpp" line="237"/>
- <location filename="onmainwindow_part2.cpp" line="413"/>
- <location filename="onmainwindow_part2.cpp" line="1154"/>
- <location filename="onmainwindow_part2.cpp" line="1223"/>
- <location filename="onmainwindow_part2.cpp" line="1267"/>
- <location filename="onmainwindow_part2.cpp" line="1647"/>
- <location filename="onmainwindow_part2.cpp" line="1673"/>
- <location filename="onmainwindow_part2.cpp" line="1798"/>
- <location filename="onmainwindow_part3.cpp" line="197"/>
- <location filename="onmainwindow_part3.cpp" line="661"/>
- <location filename="onmainwindow_part3.cpp" line="740"/>
- <location filename="onmainwindow_part3.cpp" line="984"/>
- <location filename="onmainwindow_part3.cpp" line="1112"/>
- <location filename="onmainwindow_part3.cpp" line="1165"/>
- <location filename="onmainwindow_part3.cpp" line="1456"/>
- <location filename="onmainwindow_part3.cpp" line="1458"/>
- <location filename="onmainwindow_part3.cpp" line="1688"/>
- <location filename="onmainwindow_part3.cpp" line="1736"/>
- <location filename="onmainwindow_part3.cpp" line="1764"/>
- <location filename="onmainwindow_part3.cpp" line="2130"/>
- <location filename="onmainwindow_part3.cpp" line="2145"/>
- <location filename="onmainwindow_part3.cpp" line="2199"/>
+ <location filename="onmainwindow_part4.cpp" line="2252"/>
+ <source>Invalid reply from broker</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="807"/>
+ <location filename="onmainwindow.cpp" line="830"/>
+ <location filename="onmainwindow.cpp" line="1471"/>
+ <location filename="onmainwindow.cpp" line="1499"/>
+ <location filename="onmainwindow.cpp" line="1507"/>
+ <location filename="onmainwindow.cpp" line="1640"/>
+ <location filename="onmainwindow.cpp" line="1667"/>
+ <location filename="onmainwindow.cpp" line="1670"/>
+ <location filename="onmainwindow.cpp" line="1917"/>
+ <location filename="onmainwindow.cpp" line="2140"/>
+ <location filename="onmainwindow.cpp" line="2154"/>
+ <location filename="onmainwindow.cpp" line="2167"/>
+ <location filename="onmainwindow.cpp" line="2201"/>
+ <location filename="onmainwindow.cpp" line="2246"/>
+ <location filename="onmainwindow_part2.cpp" line="297"/>
+ <location filename="onmainwindow_part2.cpp" line="473"/>
+ <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="781"/>
+ <location filename="onmainwindow_part2.cpp" line="1232"/>
+ <location filename="onmainwindow_part2.cpp" line="1293"/>
+ <location filename="onmainwindow_part2.cpp" line="1344"/>
+ <location filename="onmainwindow_part2.cpp" line="1377"/>
+ <location filename="onmainwindow_part2.cpp" line="1421"/>
+ <location filename="onmainwindow_part2.cpp" line="1801"/>
+ <location filename="onmainwindow_part2.cpp" line="1827"/>
+ <location filename="onmainwindow_part2.cpp" line="1958"/>
+ <location filename="onmainwindow_part3.cpp" line="202"/>
+ <location filename="onmainwindow_part3.cpp" line="768"/>
+ <location filename="onmainwindow_part3.cpp" line="848"/>
+ <location filename="onmainwindow_part3.cpp" line="1092"/>
+ <location filename="onmainwindow_part3.cpp" line="1220"/>
+ <location filename="onmainwindow_part3.cpp" line="1273"/>
+ <location filename="onmainwindow_part3.cpp" line="1579"/>
+ <location filename="onmainwindow_part3.cpp" line="1581"/>
+ <location filename="onmainwindow_part3.cpp" line="1811"/>
+ <location filename="onmainwindow_part3.cpp" line="1859"/>
+ <location filename="onmainwindow_part3.cpp" line="1887"/>
+ <location filename="onmainwindow_part3.cpp" line="2257"/>
+ <location filename="onmainwindow_part3.cpp" line="2272"/>
+ <location filename="onmainwindow_part3.cpp" line="2326"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="1748"/>
+ <location filename="onmainwindow_part4.cpp" line="1980"/>
+ <location filename="onmainwindow_part4.cpp" line="2251"/>
<source>Error</source>
<translation>ÐÑибка</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1459"/>
+ <location filename="onmainwindow_part3.cpp" line="1582"/>
<source>Please check LDAP Settings</source>
<translation>ÐÑовеÑÑе наÑÑÑойки LDAP</translation>
</message>
@@ -1130,32 +1198,32 @@ sound system connections through firewalls</source>
<translation type="obsolete">УдалиÑÑ ÑеÑÑиÑ?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2118"/>
- <location filename="onmainwindow_part3.cpp" line="64"/>
+ <location filename="onmainwindow.cpp" line="2372"/>
+ <location filename="onmainwindow_part3.cpp" line="68"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2189"/>
+ <location filename="onmainwindow.cpp" line="2443"/>
<source> on </source>
<translation> на </translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="230"/>
- <location filename="onmainwindow_part2.cpp" line="1147"/>
- <location filename="onmainwindow_part2.cpp" line="1216"/>
- <location filename="onmainwindow_part2.cpp" line="1249"/>
- <location filename="onmainwindow_part3.cpp" line="654"/>
- <location filename="onmainwindow_part3.cpp" line="733"/>
- <location filename="onmainwindow_part3.cpp" line="1105"/>
- <location filename="onmainwindow_part3.cpp" line="1158"/>
- <location filename="onmainwindow_part3.cpp" line="2123"/>
+ <location filename="onmainwindow_part2.cpp" line="290"/>
+ <location filename="onmainwindow_part2.cpp" line="1286"/>
+ <location filename="onmainwindow_part2.cpp" line="1370"/>
+ <location filename="onmainwindow_part2.cpp" line="1403"/>
+ <location filename="onmainwindow_part3.cpp" line="761"/>
+ <location filename="onmainwindow_part3.cpp" line="841"/>
+ <location filename="onmainwindow_part3.cpp" line="1213"/>
+ <location filename="onmainwindow_part3.cpp" line="1266"/>
+ <location filename="onmainwindow_part3.cpp" line="2250"/>
<source><b>Connection failed</b>
</source>
<translation><b>ÐÑибка ÑоединениÑ</b><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1252"/>
+ <location filename="onmainwindow_part2.cpp" line="1406"/>
<source><b>Wrong Password!</b><br><br></source>
<translation><b>ÐевеÑнÑй паÑолÑ!</b><br><br></translation>
</message>
@@ -1164,51 +1232,51 @@ sound system connections through firewalls</source>
<translation type="obsolete">Ðе доÑÑÑпен ни один ÑеÑвеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="877"/>
- <location filename="onmainwindow_part4.cpp" line="1520"/>
+ <location filename="onmainwindow_part2.cpp" line="1002"/>
+ <location filename="onmainwindow_part4.cpp" line="1752"/>
<source>Select session:</source>
<translation>СеÑÑиÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1522"/>
+ <location filename="onmainwindow_part4.cpp" line="1754"/>
<source>Resume</source>
<translation>ÐоÑÑÑановиÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="428"/>
- <location filename="onmainwindow.cpp" line="747"/>
- <location filename="onmainwindow_part2.cpp" line="2019"/>
- <location filename="onmainwindow_part4.cpp" line="1529"/>
+ <location filename="onmainwindow.cpp" line="479"/>
+ <location filename="onmainwindow.cpp" line="927"/>
+ <location filename="onmainwindow_part2.cpp" line="2200"/>
+ <location filename="onmainwindow_part4.cpp" line="1761"/>
<source>Suspend</source>
<translation>ÐÑеÑваÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="431"/>
- <location filename="onmainwindow.cpp" line="748"/>
- <location filename="onmainwindow_part4.cpp" line="1377"/>
- <location filename="onmainwindow_part4.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="482"/>
+ <location filename="onmainwindow.cpp" line="928"/>
+ <location filename="onmainwindow_part4.cpp" line="1609"/>
+ <location filename="onmainwindow_part4.cpp" line="1763"/>
<source>Terminate</source>
<translation>ÐавеÑÑиÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1766"/>
<source>New</source>
<translation>ÐоваÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2277"/>
- <location filename="onmainwindow_part4.cpp" line="1601"/>
- <location filename="onmainwindow_part4.cpp" line="1623"/>
+ <location filename="onmainwindow_part2.cpp" line="2458"/>
+ <location filename="onmainwindow_part4.cpp" line="1833"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
<source>Display</source>
<translation>ÐиÑплей</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1603"/>
+ <location filename="onmainwindow_part4.cpp" line="1835"/>
<source>Status</source>
<translation>СÑаÑÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1609"/>
+ <location filename="onmainwindow_part4.cpp" line="1841"/>
<source>Server</source>
<translation>СеÑвеÑ</translation>
</message>
@@ -1217,112 +1285,120 @@ sound system connections through firewalls</source>
<translation type="obsolete">ÐÑÐµÐ¼Ñ ÑозданиÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1614"/>
+ <location filename="onmainwindow_part4.cpp" line="1846"/>
<source>Client IP</source>
<translation>IP клиенÑа</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1616"/>
+ <location filename="onmainwindow_part4.cpp" line="1848"/>
<source>Session ID</source>
<translation>ID ÑеÑÑии</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="893"/>
- <location filename="onmainwindow_part2.cpp" line="987"/>
- <location filename="onmainwindow_part2.cpp" line="1983"/>
+ <location filename="onmainwindow_part2.cpp" line="1018"/>
+ <location filename="onmainwindow_part2.cpp" line="1112"/>
+ <location filename="onmainwindow_part2.cpp" line="2164"/>
<source>running</source>
<translation>акÑивна</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="895"/>
- <location filename="onmainwindow_part2.cpp" line="1166"/>
+ <location filename="onmainwindow_part2.cpp" line="1020"/>
+ <location filename="onmainwindow_part2.cpp" line="1305"/>
<source>suspended</source>
<translation>пÑеÑвана</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1048"/>
- <location filename="onmainwindow_part2.cpp" line="1827"/>
- <location filename="onmainwindow_part2.cpp" line="2195"/>
+ <location filename="onmainwindow_part2.cpp" line="1153"/>
+ <location filename="onmainwindow_part2.cpp" line="1173"/>
+ <location filename="onmainwindow_part2.cpp" line="1987"/>
+ <location filename="onmainwindow_part2.cpp" line="2376"/>
<source>Warning</source>
<translation>ÐÑедÑпÑеждение</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1029"/>
- <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1154"/>
+ <location filename="onmainwindow_part2.cpp" line="1174"/>
<source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
<translation>ÐлÑбина ÑвеÑа ваÑего диÑÐ¿Ð»ÐµÑ Ð½Ðµ ÑооÑвеÑÑÑвÑÐµÑ Ð³Ð»Ñбине ÑвеÑа данной ÑеÑÑии. ÐÑо Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð¼ÐµÑаÑÑ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑеÑÑии и в болÑÑинÑÑве ÑлÑÑаев<b>ÑеÑÑÐ¸Ñ Ð±ÑÐ´ÐµÑ ÑÑеÑÑна</b> РекомендÑеÑÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð³Ð»ÑÐ±Ð¸Ð½Ñ ÑвеÑа ваÑего диÑÐ¿Ð»ÐµÑ Ð½Ð°(sp)</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1037"/>
+ <location filename="onmainwindow_part2.cpp" line="1162"/>
<source>24 or 32</source>
<translation>24 или 32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
- <location filename="onmainwindow_part2.cpp" line="1058"/>
+ <location filename="onmainwindow_part2.cpp" line="1163"/>
+ <location filename="onmainwindow_part2.cpp" line="1183"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
<translation> Ð±Ð¸Ñ Ð¸ пеÑезапÑÑÑиÑÑ X-ÑеÑÐ²ÐµÑ Ð´Ð¾ воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑеÑÑии.<br>ÐопÑобоваÑÑ Ð²Ð¾ÑÑÑановиÑÑ ÑеÑÑÐ¸Ñ Ð½Ðµ ÑмоÑÑÑ Ð½Ð° данное пÑедÑпÑеждение?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="1041"/>
- <location filename="onmainwindow_part2.cpp" line="1061"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="1166"/>
+ <location filename="onmainwindow_part2.cpp" line="1186"/>
<source>Yes</source>
<translation>Ðа</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="47"/>
+ <location filename="onmainwindow_part2.cpp" line="79"/>
<source>Host key for server changed.
It is now: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="48"/>
+ <location filename="onmainwindow_part2.cpp" line="80"/>
<source>For security reasons, connection will be stopped</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="58"/>
+ <location filename="onmainwindow_part2.cpp" line="90"/>
<source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="78"/>
+ <location filename="onmainwindow_part2.cpp" line="110"/>
<source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="83"/>
+ <location filename="onmainwindow_part2.cpp" line="115"/>
<source>The server is unknown. Do you trust the host key?
Public key hash: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="1042"/>
- <location filename="onmainwindow_part2.cpp" line="1062"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="1167"/>
+ <location filename="onmainwindow_part2.cpp" line="1187"/>
<source>No</source>
<translation>ÐеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="87"/>
- <location filename="onmainwindow_part2.cpp" line="94"/>
+ <location filename="onmainwindow_part2.cpp" line="119"/>
+ <location filename="onmainwindow_part2.cpp" line="126"/>
<source>Host key verification failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="109"/>
+ <location filename="onmainwindow_part2.cpp" line="141"/>
<source>Authentification failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1111"/>
+ <location filename="onmainwindow_part2.cpp" line="483"/>
+ <location filename="onmainwindow_part2.cpp" line="782"/>
+ <location filename="onmainwindow_part2.cpp" line="1233"/>
+ <location filename="onmainwindow_part2.cpp" line="1345"/>
+ <source>Server not availabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part2.cpp" line="1250"/>
<source>suspending</source>
<translation>пÑеÑÑваеÑÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1133"/>
+ <location filename="onmainwindow_part2.cpp" line="1272"/>
<source>terminating</source>
<translation>завеÑÑаеÑÑÑ</translation>
</message>
@@ -1335,38 +1411,38 @@ Public key hash: </source>
<translation type="obsolete">Ðевозможно запиÑаÑÑ Ñайл:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1825"/>
+ <location filename="onmainwindow_part2.cpp" line="1985"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ SSL ÑÑнелÑ:
</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="138"/>
- <location filename="onmainwindow_part2.cpp" line="142"/>
- <location filename="onmainwindow_part2.cpp" line="1967"/>
+ <location filename="onmainwindow.cpp" line="143"/>
+ <location filename="onmainwindow_part2.cpp" line="184"/>
+ <location filename="onmainwindow_part2.cpp" line="2148"/>
<source>connecting</source>
<translation>Ñоединение</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1975"/>
+ <location filename="onmainwindow_part2.cpp" line="2156"/>
<source>starting</source>
<translation>запÑÑк</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1977"/>
+ <location filename="onmainwindow_part2.cpp" line="2158"/>
<source>resuming</source>
<translation>воÑÑÑановление</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2039"/>
- <location filename="onmainwindow_part2.cpp" line="2307"/>
- <location filename="onmainwindow_part2.cpp" line="2325"/>
+ <location filename="onmainwindow_part2.cpp" line="2220"/>
+ <location filename="onmainwindow_part2.cpp" line="2488"/>
+ <location filename="onmainwindow_part2.cpp" line="2506"/>
<source>Connection timeout, aborting</source>
<translation>ТаймаÑÑ ÑоединениÑ, оÑмена</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2040"/>
+ <location filename="onmainwindow_part2.cpp" line="2221"/>
<source>aborting</source>
<translation>оÑмена</translation>
</message>
@@ -1375,7 +1451,7 @@ Public key hash: </source>
<translation type="obsolete"><b>ID ÑеÑÑии:<br>СеÑвеÑ:<br>ÐолÑзоваÑелÑ:<br>ÐиÑплей:<br>ÐÑÐµÐ¼Ñ ÑозданиÑ:<br>СÑаÑÑÑ:</b></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1376"/>
+ <location filename="onmainwindow_part4.cpp" line="1608"/>
<source>Abort</source>
<translation>ÐÑмена</translation>
</message>
@@ -1388,7 +1464,7 @@ Public key hash: </source>
<translation type="obsolete">ÐоказаÑÑ Ð´ÐµÑали</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="191"/>
+ <location filename="onmainwindow_part3.cpp" line="196"/>
<source><b>Connection failed</b>
:
</source>
@@ -1396,64 +1472,91 @@ Public key hash: </source>
</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="384"/>
+ <location filename="onmainwindow_part3.cpp" line="404"/>
+ <source> (can't open file)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="415"/>
+ <location filename="onmainwindow_part3.cpp" line="425"/>
+ <location filename="onmainwindow_part3.cpp" line="435"/>
+ <source> (file not exists)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="459"/>
+ <source> (directory not exists)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="487"/>
<source>wrong value for argument"--link"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="402"/>
+ <location filename="onmainwindow_part3.cpp" line="505"/>
<source>wrong value for argument"--sound"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="419"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
+ <location filename="onmainwindow_part3.cpp" line="522"/>
+ <location filename="onmainwindow_part3.cpp" line="533"/>
<source>wrong value for argument"--geometry"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="448"/>
+ <location filename="onmainwindow_part3.cpp" line="551"/>
<source>wrong value for argument"--set-kbd"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="465"/>
+ <location filename="onmainwindow_part3.cpp" line="568"/>
<source>wrong value for argument"--ldap"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="487"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
<source>wrong value for argument"--ldap1"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="506"/>
+ <location filename="onmainwindow_part3.cpp" line="609"/>
<source>wrong value for argument"--ldap2"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="560"/>
+ <location filename="onmainwindow_part3.cpp" line="663"/>
<source>wrong value for argument"--pack"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="568"/>
- <location filename="onmainwindow_part3.cpp" line="571"/>
+ <location filename="onmainwindow_part3.cpp" line="671"/>
+ <location filename="onmainwindow_part3.cpp" line="674"/>
<source>wrong parameter: </source>
<translation>wrong parameter: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="612"/>
- <location filename="onmainwindow_part3.cpp" line="638"/>
+ <location filename="onmainwindow_part3.cpp" line="719"/>
+ <location filename="onmainwindow_part3.cpp" line="745"/>
<source>Options</source>
<translation>ÐпÑии</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="617"/>
+ <location filename="onmainwindow_part3.cpp" line="724"/>
<source>Available pack methodes:</source>
<translation>Available pack methodes:</translation>
</message>
<message>
+ <location filename="onmainwindow_part3.cpp" line="1511"/>
+ <source>Support</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="1516"/>
+ <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ </message>
+ <message>
<source>Can't read host rsa key:</source>
<translation type="obsolete">Ðевозможно пÑоÑиÑаÑÑ RSA клÑÑ:</translation>
</message>
@@ -1480,7 +1583,7 @@ Public key hash: </source>
<translation type="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑной инÑоÑмаÑии.</transl
ation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1689"/>
+ <location filename="onmainwindow_part3.cpp" line="1812"/>
<source>No valid card found</source>
<translation>ФоÑÐ¼Ð°Ñ ÐºÐ°ÑÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑен</translation>
</message>
@@ -1489,19 +1592,19 @@ Public key hash: </source>
<translation type="obsolete">ÐÑа каÑÑа не ÑконÑигÑÑиÑована Ð´Ð»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ X2Go</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1765"/>
+ <location filename="onmainwindow_part3.cpp" line="1888"/>
<source>Unable to create file: </source>
<translation>Ðевозможно ÑоздаÑÑ Ñайл: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1926"/>
- <location filename="onmainwindow_part3.cpp" line="1951"/>
+ <location filename="onmainwindow_part3.cpp" line="2053"/>
+ <location filename="onmainwindow_part3.cpp" line="2078"/>
<source>Can't connect to X-Server</source>
<translation>Ðевозможно пÑиÑоединиÑÑÑÑ Ðº X-ÑеÑвеÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1927"/>
- <location filename="onmainwindow_part3.cpp" line="1952"/>
+ <location filename="onmainwindow_part3.cpp" line="2054"/>
+ <location filename="onmainwindow_part3.cpp" line="2079"/>
<source>Can't connect to X-Server
Please check your settings</source>
<translation>Ðевозможно пÑиÑоединиÑÑÑÑ Ðº X-ÑеÑвеÑÑ
@@ -1512,7 +1615,7 @@ Please check your settings</source>
<translation type="obsolete">Ðевозможно запÑÑÑиÑÑ X-СеÑвеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="2087"/>
<source>Can't start X Server
Please check your settings</source>
<translation>Ðевозможно запÑÑÑиÑÑ X-СеÑвеÑ
@@ -1531,42 +1634,42 @@ Please check your settings</source>
<translation type="obsolete">ÐоÑÑовÑй клиенÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="152"/>
<source>OpenOffice.org</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="148"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<source>Terminal</source>
<translation>ТеÑминал</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="349"/>
+ <location filename="onmainwindow_part2.cpp" line="409"/>
<source>unknown</source>
<translation>неизвеÑÑно</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1605"/>
+ <location filename="onmainwindow_part4.cpp" line="1837"/>
<source>Command</source>
<translation>Ðоманда</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1607"/>
+ <location filename="onmainwindow_part4.cpp" line="1839"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="901"/>
+ <location filename="onmainwindow_part2.cpp" line="1026"/>
<source>Desktop</source>
<translation>ÐконнÑй менеджеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="903"/>
+ <location filename="onmainwindow_part2.cpp" line="1028"/>
<source>single application</source>
<translation>пÑиложение</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="905"/>
+ <location filename="onmainwindow_part2.cpp" line="1030"/>
<source>shadow session</source>
<translation>ÑÐµÐ½ÐµÐ²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
@@ -1575,171 +1678,196 @@ Please check your settings</source>
<translation type="obsolete"><br>ÐÑибка наÑÑÑоек "sudo"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2146"/>
+ <location filename="onmainwindow_part3.cpp" line="2273"/>
<source>Unable to execute: </source>
<translation>Ðевозможно вÑполниÑÑ: </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="121"/>
+ <location filename="onmainwindow.cpp" line="126"/>
<source>X2Go client</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="145"/>
+ <location filename="onmainwindow.cpp" line="150"/>
<source>Internet browser</source>
<translation>Ðеб-бÑоÑзеÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="146"/>
+ <location filename="onmainwindow.cpp" line="151"/>
<source>Email client</source>
<translation>ÐоÑÑовÑй клиенÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="607"/>
+ <location filename="onmainwindow.cpp" line="658"/>
<source>&New session ...</source>
<translation>&ÐÐ¾Ð²Ð°Ñ ÑеÑÑÐ¸Ñ ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="613"/>
+ <location filename="onmainwindow.cpp" line="664"/>
<source>Session management...</source>
<translation>УпÑавление ÑеÑÑиÑми...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="622"/>
- <location filename="onmainwindow.cpp" line="642"/>
+ <location filename="onmainwindow.cpp" line="692"/>
+ <location filename="onmainwindow.cpp" line="713"/>
<source>Show toolbar</source>
<translation>ÐÐ°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑменÑов</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="311"/>
- <location filename="onmainwindow_part3.cpp" line="1413"/>
+ <location filename="onmainwindow.cpp" line="336"/>
+ <location filename="onmainwindow_part3.cpp" line="1536"/>
<source>About X2GO client</source>
<translation>РпÑогÑамме "X2GO Client"</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1270"/>
- <location filename="onmainwindow.cpp" line="1437"/>
- <location filename="onmainwindow.cpp" line="1467"/>
+ <location filename="onmainwindow.cpp" line="1472"/>
+ <location filename="onmainwindow.cpp" line="1641"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>Please check LDAP settings</source>
<translation>ÐÑовеÑÑÑе наÑÑÑойки LDAP</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1304"/>
+ <location filename="onmainwindow.cpp" line="1506"/>
<source>no X2Go server found in LDAP </source>
<translation>СеÑÐ²ÐµÑ X2Go не найден в LDAP </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1821"/>
+ <location filename="onmainwindow.cpp" line="2065"/>
<source>Are you sure you want to delete this session?</source>
<translation>УдалиÑÑ ÑеÑÑиÑ?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="233"/>
- <location filename="onmainwindow_part2.cpp" line="1150"/>
- <location filename="onmainwindow_part2.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="194"/>
- <location filename="onmainwindow_part3.cpp" line="657"/>
- <location filename="onmainwindow_part3.cpp" line="736"/>
- <location filename="onmainwindow_part3.cpp" line="1108"/>
- <location filename="onmainwindow_part3.cpp" line="1161"/>
- <location filename="onmainwindow_part3.cpp" line="2126"/>
+ <location filename="onmainwindow_part2.cpp" line="293"/>
+ <location filename="onmainwindow_part2.cpp" line="1289"/>
+ <location filename="onmainwindow_part2.cpp" line="1373"/>
+ <location filename="onmainwindow_part3.cpp" line="199"/>
+ <location filename="onmainwindow_part3.cpp" line="764"/>
+ <location filename="onmainwindow_part3.cpp" line="844"/>
+ <location filename="onmainwindow_part3.cpp" line="1216"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
+ <location filename="onmainwindow_part3.cpp" line="2253"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>ÐевеÑнÑй паÑолÑ!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="414"/>
+ <location filename="onmainwindow_part2.cpp" line="474"/>
<source>No server availabel</source>
<translation>Ðе доÑÑÑпен ни один ÑеÑвеÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="743"/>
- <location filename="onmainwindow_part2.cpp" line="1887"/>
+ <location filename="onmainwindow.cpp" line="923"/>
+ <location filename="onmainwindow_part2.cpp" line="2061"/>
<source>Not connected</source>
<oldsource>Active connection</oldsource>
<translation>Соединение не ÑÑÑановлено</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2279"/>
- <location filename="onmainwindow_part4.cpp" line="1612"/>
+ <location filename="onmainwindow_part2.cpp" line="2460"/>
+ <location filename="onmainwindow_part4.cpp" line="1844"/>
<source>Creation time</source>
<translation>ÐÑÐµÐ¼Ñ ÑозданиÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1645"/>
- <location filename="onmainwindow_part3.cpp" line="982"/>
+ <location filename="onmainwindow_part2.cpp" line="1799"/>
+ <location filename="onmainwindow_part3.cpp" line="1090"/>
<source>Unable to create folder:</source>
<translation>Ðевозможно ÑоздаÑÑ ÐºÐ°Ñалог:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1671"/>
+ <location filename="onmainwindow_part2.cpp" line="1825"/>
<source>Unable to write file:</source>
<translation>Ðевозможно запиÑаÑÑ Ñайл:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1796"/>
- <location filename="onmainwindow_part3.cpp" line="2197"/>
+ <location filename="onmainwindow_part2.cpp" line="1956"/>
+ <location filename="onmainwindow_part3.cpp" line="2324"/>
<source>Unable to create SSL tunnel:
</source>
<translation>ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ SSL ÑÑнелÑ:
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1368"/>
+ <location filename="onmainwindow_part4.cpp" line="1600"/>
<source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
<translation><b>ID ÑеÑÑии:<br>СеÑвеÑ:<br>ÐолÑзоваÑелÑ:<br>ÐиÑплей:<br>ÐÑÐµÐ¼Ñ ÑозданиÑ:<br>СÑаÑÑÑ:</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="425"/>
- <location filename="onmainwindow.cpp" line="746"/>
- <location filename="onmainwindow_part4.cpp" line="1378"/>
+ <location filename="onmainwindow.cpp" line="476"/>
+ <location filename="onmainwindow.cpp" line="926"/>
+ <location filename="onmainwindow_part4.cpp" line="1610"/>
<source>Share folder...</source>
<translation>ÐкÑпоÑÑ ÐºÐ°Ñалога...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1380"/>
+ <location filename="onmainwindow_part4.cpp" line="1612"/>
<source>Show details</source>
<translation>ÐоказаÑÑ Ð´ÐµÑали</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1414"/>
+ <location filename="onmainwindow_part3.cpp" line="1537"/>
<source><b>X2Go client V. </source>
<translation><b>X2Go Client V. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1737"/>
+ <location filename="onmainwindow_part3.cpp" line="1860"/>
<source>This card is unknown by X2Go system</source>
<translation>ÐÑа каÑÑа не ÑконÑигÑÑиÑована Ð´Ð»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ X2Go</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2162"/>
+ <location filename="onmainwindow_part3.cpp" line="2289"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation>УдаленнÑй ÑеÑÐ²ÐµÑ Ð½Ðµ поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑкÑпоÑÑ Ñайловой ÑиÑÑÐµÐ¼Ñ ÑеÑез SSH ÑÑннелÑ
ÐожалÑйÑÑа обновиÑе Ð¿Ð°ÐºÐµÑ x2goserver</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="618"/>
+ <location filename="onmainwindow.cpp" line="675"/>
<source>&Create session icon on desktop...</source>
<translation>&СоздаÑÑ ÑÑлÑк ÑеÑÑии на ÑабоÑем ÑÑоле...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="684"/>
+ <source>&Set broker password...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="807"/>
+ <source>Operation failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="811"/>
+ <source>Password changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="830"/>
+ <source>Wrong password!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="879"/>
+ <source><b>Authentication</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="920"/>
<source>Restore</source>
<translation>ÐоÑÑÑановиÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="771"/>
+ <location filename="onmainwindow.cpp" line="951"/>
<source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
<oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
<translation>ЩелÑок левой кнопкой: ÑпÑÑÑаÑÑ/воÑÑÑановиÑÑ - пÑавой: оÑобÑазиÑÑ ÐºÐ¾Ð½ÑекÑÑное менÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1601"/>
+ <location filename="onmainwindow.cpp" line="1805"/>
<source>Create session icon on desktop</source>
<translation>СоздаÑÑ ÑÑлÑк ÑеÑÑии на ÑабоÑем ÑÑоле</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1602"/>
+ <location filename="onmainwindow.cpp" line="1806"/>
<source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
Use x2goclient hidden mode?</source>
@@ -1748,39 +1876,44 @@ Use x2goclient hidden mode?</source>
ÐкÑивиÑоваÑÑ ÑкÑÑÑÑй Ñежим?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1613"/>
+ <location filename="onmainwindow.cpp" line="1817"/>
<source>New Session</source>
<translation>ÐÐ¾Ð²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2177"/>
+ <location filename="onmainwindow.cpp" line="1917"/>
+ <source>X2Go sessions not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="2431"/>
<source>RDP connection</source>
<translation>RDP Ñоединение</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1867"/>
<source>X2Go Link to session </source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="437"/>
- <location filename="onmainwindow_part4.cpp" line="857"/>
+ <location filename="onmainwindow.cpp" line="488"/>
+ <location filename="onmainwindow_part4.cpp" line="1054"/>
<source>Detach X2Go window</source>
<translation>ÐÑÑоединиÑÑ Ð¾ÐºÐ½Ð¾</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1776"/>
- <location filename="onmainwindow_part4.cpp" line="832"/>
+ <location filename="onmainwindow_part2.cpp" line="1930"/>
+ <location filename="onmainwindow_part4.cpp" line="1029"/>
<source>Attach X2Go window</source>
<translation>ÐÑиÑоединиÑÑ Ð¾ÐºÐ½Ð¾</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1952"/>
+ <location filename="onmainwindow_part2.cpp" line="2133"/>
<source>Finished</source>
<translation>завеÑÑена</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2196"/>
+ <location filename="onmainwindow_part2.cpp" line="2377"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation>ÐÑ ÑвеÑенÑ, ÑÑо Ñ
оÑиÑе ÑдалиÑÑ ÑÑÑ ÑеÑÑиÑ?
@@ -1791,26 +1924,27 @@ Unsaved documents will be lost</source>
<translation type="obsolete"></b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑÐ
½Ð¾Ð¹ инÑоÑмаÑии. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1974"/>
- <location filename="onmainwindow_part4.cpp" line="309"/>
+ <location filename="onmainwindow_part3.cpp" line="2101"/>
+ <location filename="onmainwindow_part4.cpp" line="422"/>
+ <location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
Please check your installation</source>
<translation>Ðевозможно запÑÑÑиÑÑ X Server
ÐеÑеÑÑÑановиÑе X2Go Client</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="921"/>
+ <location filename="onmainwindow_part4.cpp" line="1118"/>
<source>X2Go Session</source>
<translation>СеÑÑÐ¸Ñ X2Go</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="440"/>
- <location filename="onmainwindow_part4.cpp" line="1832"/>
+ <location filename="onmainwindow.cpp" line="491"/>
+ <location filename="onmainwindow_part4.cpp" line="2064"/>
<source>Minimize toolbar</source>
<translation>СвеÑнÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1865"/>
+ <location filename="onmainwindow_part4.cpp" line="2097"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation><br><b> ЩелкниÑе по ÑÑой иконке <br> ÑÑÐ¾Ð±Ñ Ð²Ð¾ÑÑÑановиÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑменÑов </b><br></translation>
</message>
@@ -1819,7 +1953,7 @@ Please check your installation</source>
<translation type="obsolete">Ðевозможно оÑкÑÑÑÑ Ñайл:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1749"/>
+ <location filename="onmainwindow_part4.cpp" line="1981"/>
<source>sshd not started, you'll need sshd for printing and file sharing
you can install sshd with
<b>sudo apt-get install openssh-server</b></source>
@@ -1828,78 +1962,79 @@ you can install sshd with
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2185"/>
+ <location filename="onmainwindow.cpp" line="2439"/>
<source>Connection to local desktop</source>
<translation>Соединение Ñ Ð»Ð¾ÐºÐ°Ð»ÑнÑм деÑкÑопом</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="938"/>
+ <location filename="onmainwindow_part2.cpp" line="1063"/>
<source>Information</source>
<translation>ÐнÑоÑмаÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="952"/>
- <location filename="onmainwindow_part4.cpp" line="1933"/>
+ <location filename="onmainwindow_part2.cpp" line="1077"/>
+ <location filename="onmainwindow_part4.cpp" line="2165"/>
<source>Filter</source>
<translation>ФилÑÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="959"/>
+ <location filename="onmainwindow_part2.cpp" line="1084"/>
<source>Select desktop:</source>
<translation>ÐÑбÑаÑÑ Ð´ÐµÑкÑоп:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1540"/>
+ <location filename="onmainwindow_part4.cpp" line="1772"/>
<source>View only</source>
<translation>ТолÑко ÑмоÑÑеÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1620"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>User</source>
<translation>ÐолÑзоваÑелÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2181"/>
+ <location filename="onmainwindow.cpp" line="2435"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="939"/>
+ <location filename="onmainwindow_part2.cpp" line="1064"/>
<source>No accessible desktop found</source>
<translation>ÐоÑÑÑпнÑй деÑкÑоп не найден</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1537"/>
+ <location filename="onmainwindow_part4.cpp" line="1769"/>
<source>Full access</source>
<translation>ÐолнÑй доÑÑÑп</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1651"/>
+ <location filename="onmainwindow_part4.cpp" line="1883"/>
<source>Only my desktops</source>
<translation>ТолÑко мои деÑкÑопÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="433"/>
+ <location filename="onmainwindow.cpp" line="484"/>
<source>Reconnect</source>
<translation>ÐовÑоÑиÑÑ Ñоединение</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2009"/>
+ <location filename="onmainwindow.cpp" line="834"/>
+ <location filename="onmainwindow.cpp" line="2354"/>
+ <location filename="onmainwindow_part4.cpp" line="2234"/>
<source>Connecting to broker</source>
<translation>Соединение Ñ Ð±ÑокеÑом</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1393"/>
<source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
- <translation></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ <translation type="obsolete"></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1397"/>
+ <location filename="onmainwindow_part3.cpp" line="1520"/>
<source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
<translation><br>x2goplugin бÑл ÑазÑабоÑан пÑи поддеÑжке <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1401"/>
+ <location filename="onmainwindow_part3.cpp" line="1524"/>
<source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
<translation><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑной инÑоÑмаÑии.</translation>
</message>
@@ -1914,7 +2049,7 @@ you can install sshd with
<translation>KOI8-R</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1103"/>
+ <location filename="onmainwindow_part4.cpp" line="1300"/>
<source>wrong value for argument"speed"</source>
<translation>wrong value for argument"speed"</translation>
</message>
@@ -2148,93 +2283,103 @@ Example:
<translation type="obsolete">ÐкÑивиÑоваÑÑ Ð·Ð²Ñк</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="229"/>
+ <location filename="sessionbutton.cpp" line="270"/>
<source>New Session</source>
<translation>ÐÐ¾Ð²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="322"/>
- <location filename="sessionbutton.cpp" line="334"/>
- <location filename="sessionbutton.cpp" line="571"/>
+ <location filename="sessionbutton.cpp" line="383"/>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="635"/>
<source>fullscreen</source>
<translation>ÐолноÑкÑÐ°Ð½Ð½Ð°Ñ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="356"/>
- <location filename="sessionbutton.cpp" line="483"/>
+ <location filename="sessionbutton.cpp" line="417"/>
+ <location filename="sessionbutton.cpp" line="547"/>
<source>Enabled</source>
<translation>акÑивиÑован</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="358"/>
- <location filename="sessionbutton.cpp" line="485"/>
+ <location filename="sessionbutton.cpp" line="419"/>
+ <location filename="sessionbutton.cpp" line="549"/>
<source>Disabled</source>
<translation>деакÑивиÑован</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="329"/>
- <location filename="sessionbutton.cpp" line="348"/>
+ <location filename="sessionbutton.cpp" line="390"/>
+ <location filename="sessionbutton.cpp" line="409"/>
<source>window</source>
<translation>окно</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="113"/>
+ <location filename="sessionbutton.cpp" line="114"/>
<source>Session preferences...</source>
<translation>УÑÑановки ÑеÑÑии...</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="117"/>
+ <location filename="sessionbutton.cpp" line="118"/>
<source>Create session icon on desktop...</source>
<translation>СоздаÑÑ ÑÑлÑк ÑеÑÑии на ÑабоÑем ÑÑоле...</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="122"/>
+ <location filename="sessionbutton.cpp" line="123"/>
<source>Delete session</source>
<translation>УдалиÑÑ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="135"/>
+ <location filename="sessionbutton.cpp" line="136"/>
<source>Session actions</source>
<translation>ÐпÑии</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="136"/>
+ <location filename="sessionbutton.cpp" line="137"/>
<source>Select type</source>
<translation>Тип ÑеÑÑии</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="138"/>
+ <location filename="sessionbutton.cpp" line="139"/>
<source>Select resolution</source>
<translation>ÐÑбÑаÑÑ ÑазÑеÑение</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="139"/>
+ <location filename="sessionbutton.cpp" line="140"/>
<source>Toggle sound support</source>
<translation>ÐвÑк</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="251"/>
+ <location filename="sessionbutton.cpp" line="275"/>
+ <source>running</source>
+ <translation type="unfinished">акÑивна</translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="279"/>
+ <source>suspended</source>
+ <translation type="unfinished">пÑеÑвана</translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="312"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="262"/>
- <location filename="sessionbutton.cpp" line="294"/>
- <location filename="sessionbutton.cpp" line="524"/>
+ <location filename="sessionbutton.cpp" line="323"/>
+ <location filename="sessionbutton.cpp" line="355"/>
+ <location filename="sessionbutton.cpp" line="588"/>
<source>RDP connection</source>
<translation>RDP Ñоединение</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="264"/>
- <location filename="sessionbutton.cpp" line="288"/>
- <location filename="sessionbutton.cpp" line="518"/>
+ <location filename="sessionbutton.cpp" line="325"/>
+ <location filename="sessionbutton.cpp" line="349"/>
+ <location filename="sessionbutton.cpp" line="582"/>
<source>Connection to local desktop</source>
<translation>Соединение Ñ Ð»Ð¾ÐºÐ°Ð»ÑнÑм деÑкÑопом</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="263"/>
- <location filename="sessionbutton.cpp" line="300"/>
- <location filename="sessionbutton.cpp" line="530"/>
+ <location filename="sessionbutton.cpp" line="324"/>
+ <location filename="sessionbutton.cpp" line="361"/>
+ <location filename="sessionbutton.cpp" line="594"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
@@ -2641,82 +2786,82 @@ sound system connections through firewalls</source>
<context>
<name>SshMasterConnection</name>
<message>
- <location filename="sshmasterconnection.cpp" line="95"/>
+ <location filename="sshmasterconnection.cpp" line="100"/>
<source>Can not initialize libssh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="115"/>
+ <location filename="sshmasterconnection.cpp" line="120"/>
<source>Can not create ssh session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="128"/>
+ <location filename="sshmasterconnection.cpp" line="135"/>
<source>Can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="155"/>
+ <location filename="sshmasterconnection.cpp" line="171"/>
<source>Authentication failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="171"/>
+ <location filename="sshmasterconnection.cpp" line="187"/>
<source>channel_forward_listen failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="482"/>
+ <location filename="sshmasterconnection.cpp" line="498"/>
<source>Can not open file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="494"/>
+ <location filename="sshmasterconnection.cpp" line="510"/>
<source>Can not create remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="507"/>
+ <location filename="sshmasterconnection.cpp" line="523"/>
<source>Can not write to remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="557"/>
+ <location filename="sshmasterconnection.cpp" line="573"/>
<source>can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="666"/>
+ <location filename="sshmasterconnection.cpp" line="682"/>
<source>channel_open_forward failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="685"/>
+ <location filename="sshmasterconnection.cpp" line="701"/>
<source>channel_open_session failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="692"/>
+ <location filename="sshmasterconnection.cpp" line="708"/>
<source>channel_request_exec failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="757"/>
+ <location filename="sshmasterconnection.cpp" line="773"/>
<source>error writing to socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="775"/>
+ <location filename="sshmasterconnection.cpp" line="791"/>
<source>error reading channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="821"/>
<source>channel_write failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="817"/>
+ <location filename="sshmasterconnection.cpp" line="833"/>
<source>error reading tcp socket</source>
<translation type="unfinished"></translation>
</message>
@@ -2724,17 +2869,93 @@ sound system connections through firewalls</source>
<context>
<name>SshProcess</name>
<message>
- <location filename="sshprocess.cpp" line="80"/>
+ <location filename="sshprocess.cpp" line="92"/>
<source>Error creating socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshprocess.cpp" line="97"/>
+ <location filename="sshprocess.cpp" line="110"/>
<source>Error binding </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>XSettingsWidget</name>
+ <message>
+ <location filename="xsettingswidget.cpp" line="50"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingswidget.cpp" line="52"/>
+ <source>Executable (*.exe)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>XSettingsWidgetUI</name>
+ <message>
+ <location filename="xsettingsui.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished">ФоÑма</translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="27"/>
+ <source>You must restart the X2go Client for the changes to take effect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="50"/>
+ <source>use integrated X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="60"/>
+ <source>use custom X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="70"/>
+ <source>custom X-Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="78"/>
+ <source>executable:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="101"/>
+ <source>start X-Server on X2Go client start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="113"/>
+ <source>command line options:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="125"/>
+ <source>X-Server command line options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="131"/>
+ <source>window mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="141"/>
+ <source>fullscreen mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="xsettingsui.ui" line="151"/>
+ <source>single application:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>sshProcess</name>
<message>
<source>Unable to create: </source>
hooks/post-receive
--
x2goclient.git (X2go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2go Client).
More information about the x2go-commits
mailing list