[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.2.0
X2Go dev team
git-admin at x2go.org
Wed Apr 4 11:54:17 CEST 2012
The branch, build-main has been updated
via 7b871ac84fc2877af240ec5a4a6172d1eaec61b3 (commit)
via e4a9dc4118a99050a9f0a9a1d459c3ebd33ac77f (commit)
via c52f0ad4025111590c8160325feee8c652934d80 (commit)
via 2016373e77172c9bea8990319244363b82df9f17 (commit)
via 8e54131c45359c54d8241dda25ffaa2f69e8e249 (commit)
via 342bb695167c1808bbf969e56a3d23c136df70cb (commit)
via 0aa476e1f80f8dfb19843a3257f641a36fce9800 (commit)
via d21f730472d689a71323a2a1345379649896351d (commit)
via bdecf63922e7f24ceb9e69fe48369f010ab80cf1 (commit)
via 8dd4fca284fbaa90680879a86015c4c82e98b51e (commit)
via d45a91d7a9b022e3c4775c57e85f34b89b571872 (commit)
via 91549d868c72112ffa816a74e4eb89355c030170 (commit)
via 73455d7e0d31d274d511fcb8dde60304831e9478 (commit)
via 4689d9fe019ad708241a041c99febaa0f11a9a96 (commit)
via c9fc33a3a50ab36da34fd6014b868a9235b0808b (commit)
from 188aa3277110f48cdc58754b69a7b1c9a9e63cdc (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
appdialog.cpp | 198 ++++++
userbutton.h => appdialog.h | 69 ++-
appdialog.ui | 193 ++++++
debian/changelog | 22 +
desktop/x2goclient.desktop | 2 +-
icons/128x128/x2go.png | Bin 3502 -> 6210 bytes
icons/22x22/applications-development.png | Bin 0 -> 977 bytes
icons/22x22/applications-education.png | Bin 0 -> 644 bytes
icons/22x22/applications-games.png | Bin 0 -> 688 bytes
icons/22x22/applications-graphics.png | Bin 0 -> 1523 bytes
icons/22x22/applications-internet.png | Bin 0 -> 1355 bytes
icons/22x22/applications-multimedia.png | Bin 0 -> 1353 bytes
icons/22x22/applications-office.png | Bin 0 -> 804 bytes
icons/22x22/applications-other.png | Bin 0 -> 775 bytes
icons/22x22/applications-system.png | Bin 0 -> 1403 bytes
icons/22x22/applications-utilities.png | Bin 0 -> 888 bytes
icons/22x22/preferences-system.png | Bin 0 -> 1350 bytes
icons/32x32/apps.png | Bin 0 -> 1664 bytes
icons/32x32/open_dir.png | Bin 0 -> 476 bytes
icons/32x32/stop_session.png | Bin 0 -> 1093 bytes
icons/32x32/suspend_session.png | Bin 0 -> 229 bytes
onmainwindow.cpp | 129 ++++-
onmainwindow.h | 53 ++-
onmainwindow_part2.cpp | 39 +-
onmainwindow_part3.cpp | 405 +++++++++----
onmainwindow_part4.cpp | 119 +++--
onmainwindow_privat.h | 3 +
resources.rcc | 15 +
sessionbutton.cpp | 32 +-
sessionbutton.h | 3 +-
sessionwidget.cpp | 23 +-
sessionwidget.h | 72 ++--
sshmasterconnection.cpp | 23 +
userbutton.cpp | 79 ++--
version.h | 2 +-
x2goclient.pro | 28 +-
x2goclient_de.ts | 811 +++++++++++++++----------
x2goclient_en.ts | 806 +++++++++++++++----------
x2goclient_fr.ts | 806 +++++++++++++++----------
x2goclient_nb_no.ts | 811 +++++++++++++++----------
x2goclient_ru.ts | 971 +++++++++++++++++-------------
x2goclient_sv.ts | 811 +++++++++++++++----------
x2goclient_zh_tw.ts | 811 +++++++++++++++----------
x2goplugin.rc | 10 +-
x2gosettings.cpp | 11 +-
46 files changed, 4668 insertions(+), 2691 deletions(-)
create mode 100644 appdialog.cpp
copy userbutton.h => appdialog.h (57%)
create mode 100644 appdialog.ui
create mode 100644 icons/22x22/applications-development.png
create mode 100644 icons/22x22/applications-education.png
create mode 100644 icons/22x22/applications-games.png
create mode 100644 icons/22x22/applications-graphics.png
create mode 100644 icons/22x22/applications-internet.png
create mode 100644 icons/22x22/applications-multimedia.png
create mode 100644 icons/22x22/applications-office.png
create mode 100644 icons/22x22/applications-other.png
create mode 100644 icons/22x22/applications-system.png
create mode 100644 icons/22x22/applications-utilities.png
create mode 100644 icons/22x22/preferences-system.png
create mode 100644 icons/32x32/apps.png
create mode 100644 icons/32x32/open_dir.png
create mode 100644 icons/32x32/stop_session.png
create mode 100644 icons/32x32/suspend_session.png
The diff of changes is:
diff --git a/VERSION b/VERSION
index bac3e99..1296fd3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.1.1
+3.99.2.0
diff --git a/appdialog.cpp b/appdialog.cpp
new file mode 100644
index 0000000..ebab99d
--- /dev/null
+++ b/appdialog.cpp
@@ -0,0 +1,198 @@
+/**************************************************************************
+* Copyright (C) 2005-2012 by Oleksandr Shneyder *
+* oleksandr.shneyder at obviously-nice.de *
+* *
+* 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 2 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, write to the *
+* Free Software Foundation, Inc., *
+* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+***************************************************************************/
+#include "appdialog.h"
+#include "onmainwindow.h"
+
+AppDialog::AppDialog(ONMainWindow* parent):QDialog(parent)
+{
+ setupUi(this);
+ mw=parent;
+
+ media=0;
+ dev=0;
+ edu=0;
+ game=0;
+ graph=0;
+ net=0;
+ office=0;
+ set=0;
+ sys=0;
+ util=0;
+ other=0;
+ startButton->setEnabled(false);
+
+ loadApps();
+}
+
+AppDialog::~AppDialog()
+{
+
+}
+
+void AppDialog::slotSearchChanged(QString text)
+{
+ QTreeWidgetItemIterator it(treeWidget);
+ while (*it)
+ {
+ QString exec=(*it)->data(0,Qt::UserRole).toString();
+ QString comment=(*it)->data(0,Qt::UserRole+1).toString();
+ QString name=(*it)->text(0);
+ if ((*it)->childCount()==0)
+ {
+ if (text.length()<2)
+ {
+ (*it)->setHidden(false);
+ (*it)->setSelected(false);
+ }
+ else
+ {
+ if (exec.indexOf(text, 0,Qt::CaseInsensitive)!= -1 ||
+ comment.indexOf(text, 0,Qt::CaseInsensitive)!= -1 ||
+ name.indexOf(text, 0,Qt::CaseInsensitive)!= -1 )
+ {
+ treeWidget->clearSelection();
+ (*it)->setSelected(true);
+ (*it)->setHidden(false);
+ treeWidget->scrollToItem((*it));
+ }
+ else
+ {
+ (*it)->setHidden(true);
+ (*it)->setSelected(false);
+ }
+ }
+ }
+ ++it;
+ }
+}
+
+QTreeWidgetItem* AppDialog::initTopItem(QString text, QPixmap icon)
+{
+ QTreeWidgetItem* item;
+ item=new QTreeWidgetItem(treeWidget);
+ item->setText(0,text);
+ item->setFlags(Qt::ItemIsEnabled);
+ item->setIcon(0,icon);
+ return item;
+}
+
+void AppDialog::loadApps()
+{
+ QTreeWidgetItem* parent;
+ foreach (Application app, mw->getApplications())
+ {
+ switch (app.category)
+ {
+ case Application::MULTIMEDIA:
+ if (!media)
+ media=initTopItem(tr("Multimedia"), QPixmap(":/icons/22x22/applications-multimedia.png"));
+ parent=media;
+ break;
+ case Application::DEVELOPMENT:
+ if (!dev)
+ dev=initTopItem(tr("Development"), QPixmap(":/icons/22x22/applications-development.png"));
+ parent=dev;
+ break;
+ case Application::EDUCATION:
+ if (!edu)
+ edu=initTopItem(tr("Education"), QPixmap(":/icons/22x22/applications-education.png"));
+ parent=edu;
+ break;
+ case Application::GAME:
+ if (!game)
+ game=initTopItem(tr("Game"), QPixmap(":/icons/22x22/applications-games.png"));
+ parent=game;
+ break;
+ case Application::GRAPHICS:
+ if (!graph)
+ graph=initTopItem(tr("Graphics"), QPixmap(":/icons/22x22/applications-graphics.png"));
+ parent=graph;
+ break;
+ case Application::NETWORK:
+ if (!net)
+ net=initTopItem(tr("Network"), QPixmap(":/icons/22x22/applications-internet.png"));
+ parent=net;
+ break;
+ case Application::OFFICE:
+ if (!office)
+ office=initTopItem(tr("Office"), QPixmap(":/icons/22x22/applications-office.png"));
+ parent=office;
+ break;
+ case Application::SETTINGS:
+ if (!set)
+ set=initTopItem(tr("Settings"), QPixmap(":/icons/22x22/preferences-system.png"));
+ parent=set;
+ break;
+ case Application::SYSTEM:
+ if (!sys)
+ sys=initTopItem(tr("System"), QPixmap(":/icons/22x22/applications-system.png"));
+ parent=sys;
+ break;
+ case Application::UTILITY:
+ if (!util)
+ util=initTopItem(tr("Utility"), QPixmap(":/icons/22x22/applications-utilities.png"));
+ parent=util;
+ break;
+ case Application::OTHER:
+ if (!other)
+ other=initTopItem(tr("Other"), QPixmap(":/icons/22x22/applications-other.png"));
+ parent=other;
+ break;
+ }
+
+ QTreeWidgetItem* it;
+ if (app.category==Application::TOP)
+ it=new QTreeWidgetItem(treeWidget);
+ else
+ it=new QTreeWidgetItem(parent);
+ it->setText(0, app.name);
+ it->setToolTip(0,app.comment);
+ it->setIcon(0,app.icon);
+ it->setData(0, Qt::UserRole, app.exec);
+ it->setData(0, Qt::UserRole+1, app.comment);
+ }
+ treeWidget->sortItems(0,Qt::AscendingOrder);
+}
+
+void AppDialog::slotSelectedChanged()
+{
+ startButton->setEnabled(false);
+ if (treeWidget->selectedItems().count())
+ {
+ startButton->setEnabled(true);
+ }
+}
+
+void AppDialog::slotDoubleClicked(QTreeWidgetItem* item)
+{
+ QString exec=item->data(0,Qt::UserRole).toString();
+ if (exec.length()>0)
+ mw->runApplication(exec);
+}
+
+void AppDialog::slotStartSelected()
+{
+ if (treeWidget->selectedItems().count()>0)
+ {
+ QString exec=treeWidget->selectedItems()[0]->data(0,Qt::UserRole).toString();
+ if (exec.length()>0)
+ mw->runApplication(exec);
+ }
+}
diff --git a/userbutton.h b/appdialog.h
similarity index 57%
copy from userbutton.h
copy to appdialog.h
index 7606d97..9fb7bd6 100644
--- a/userbutton.h
+++ b/appdialog.h
@@ -1,6 +1,6 @@
/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.de *
+ * Copyright (C) 2005-2012 by Oleksandr Shneyder *
+ * oleksandr.shneyder at obviously-nice.de *
* *
* 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 *
@@ -17,40 +17,41 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef USERBUTTON_H
-#define USERBUTTON_H
+#ifndef APPDIALOG_H
+#define APPDIALOG_H
-#include "x2goclientconfig.h"
-#include <QPushButton>
+#include <QObject>
+#include "ui_appdialog.h"
-/**
- at author Oleksandr Shneyder
-*/
-
-class QPixmap;
+class QTreeWidgetItem;
class ONMainWindow;
-class UserButton : public QPushButton
-{
- Q_OBJECT
- public:
- UserButton ( ONMainWindow* wnd, QWidget *parent,
- QString username, QString fullName,
- QPixmap& foto, QPalette& backGround,
- int width=0,int height=0 );
- ~UserButton();
- QString username() {return user;}
- QString fullName() {return fname;}
- const QPixmap& foto() {return image;}
- const QPixmap& background() {return bg;}
- private:
- QString user;
- QString fname;
- QPixmap image;
- QPixmap bg;
- private slots:
- void slotClicked();
- signals:
- void userSelected ( UserButton* );
+class AppDialog: public QDialog, public Ui_AppDialog
+{
+ Q_OBJECT
+public:
+ AppDialog(ONMainWindow *parent = 0);
+ ~AppDialog();
+private:
+ void loadApps();
+ QTreeWidgetItem* initTopItem(QString text, QPixmap icon=QPixmap());
+ ONMainWindow* mw;
+ QTreeWidgetItem* media;
+ QTreeWidgetItem* dev;
+ QTreeWidgetItem* edu;
+ QTreeWidgetItem* game;
+ QTreeWidgetItem* graph;
+ QTreeWidgetItem* net;
+ QTreeWidgetItem* office;
+ QTreeWidgetItem* set;
+ QTreeWidgetItem* sys;
+ QTreeWidgetItem* util;
+ QTreeWidgetItem* other;
+private slots:
+ void slotSelectedChanged();
+ void slotStartSelected();
+ void slotDoubleClicked(QTreeWidgetItem* item);
+ void slotSearchChanged(QString text);
};
-#endif
+
+#endif // APPDIALOG_H
diff --git a/appdialog.ui b/appdialog.ui
new file mode 100644
index 0000000..703c9f4
--- /dev/null
+++ b/appdialog.ui
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AppDialog</class>
+ <widget class="QDialog" name="AppDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>510</width>
+ <height>400</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Published Applications</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QTreeWidget" name="treeWidget">
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>true</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>true</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>false</bool>
+ </property>
+ <property name="expandsOnDoubleClick">
+ <bool>false</bool>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ <column>
+ <property name="text">
+ <string notr="true">1</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Search:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QPushButton" name="startButton">
+ <property name="text">
+ <string>&Start</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="closeButton">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>closeButton</sender>
+ <signal>clicked()</signal>
+ <receiver>AppDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>475</x>
+ <y>372</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>468</x>
+ <y>286</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>treeWidget</sender>
+ <signal>itemSelectionChanged()</signal>
+ <receiver>AppDialog</receiver>
+ <slot>slotSelectedChanged()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>180</x>
+ <y>121</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>468</x>
+ <y>144</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>startButton</sender>
+ <signal>clicked()</signal>
+ <receiver>AppDialog</receiver>
+ <slot>slotStartSelected()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>462</x>
+ <y>18</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>453</x>
+ <y>78</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>treeWidget</sender>
+ <signal>itemDoubleClicked(QTreeWidgetItem*,int)</signal>
+ <receiver>AppDialog</receiver>
+ <slot>slotDoubleClicked(QTreeWidgetItem*)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>266</x>
+ <y>226</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>459</x>
+ <y>200</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lineEdit</sender>
+ <signal>textChanged(QString)</signal>
+ <receiver>AppDialog</receiver>
+ <slot>slotSearchChanged(QString)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>167</x>
+ <y>378</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>444</x>
+ <y>314</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+ <slots>
+ <slot>slotSelectedChanged()</slot>
+ <slot>slotStartSelected()</slot>
+ <slot>slotDoubleClicked(QTreeWidgetItem*)</slot>
+ <slot>slotSearchChanged(QString)</slot>
+ </slots>
+</ui>
diff --git a/debian/changelog b/debian/changelog
index 43f67dd..49f5464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+x2goclient (3.99.2.0-0~x2go1) unstable; urgency=low
+
+ [ Oleksandr Shneyder ]
+ * New upstream version (3.99.2.0):
+ - Support for "published applications".
+ Sponsored by Stefan Baur (http://www.baur-itcs.de).
+ - Command line argument "--session-conf=<file>": path to alternative
+ session config.
+ - Fixed bug "light font colour on light background" by dark colour schema.
+ - Make X2Go system tray icon not transparent.
+ - Replace text on buttons "Application", "Share folder", "Suspend",
+ "Terminate" with icons to fit in dialog window.
+ - Support for SVG icons for published applications
+ - Set "nofocus" policy for tool buttons.
+ - Some improvements when using pgp card.
+ - Setting TCP_NODELAY for sockets on reverse tunnel and ssh session.
+ - Support for category X2Go-Top to display published applications on top
+ of application menu.
+ - Exporting PULSE_CLIENTCONFIG when running published applications.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 04 Apr 2012 11:52:07 +0200
+
x2goclient (3.99.1.1-0~x2go1) unstable; urgency=low
[ Oleksandr Shneyder ]
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index fd29411..5e806a0 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Version=3.99.1.1
+Version=3.99.2.0
Type=Application
Name=X2Go Client
Exec=/usr/bin/x2goclient
diff --git a/icons/128x128/x2go.png b/icons/128x128/x2go.png
index 6bf39cd..43e5f87 100644
Binary files a/icons/128x128/x2go.png and b/icons/128x128/x2go.png differ
diff --git a/icons/22x22/applications-development.png b/icons/22x22/applications-development.png
new file mode 100644
index 0000000..656ac3d
Binary files /dev/null and b/icons/22x22/applications-development.png differ
diff --git a/icons/22x22/applications-education.png b/icons/22x22/applications-education.png
new file mode 100644
index 0000000..7c1d933
Binary files /dev/null and b/icons/22x22/applications-education.png differ
diff --git a/icons/22x22/applications-games.png b/icons/22x22/applications-games.png
new file mode 100644
index 0000000..50f62a1
Binary files /dev/null and b/icons/22x22/applications-games.png differ
diff --git a/icons/22x22/applications-graphics.png b/icons/22x22/applications-graphics.png
new file mode 100644
index 0000000..162b10f
Binary files /dev/null and b/icons/22x22/applications-graphics.png differ
diff --git a/icons/22x22/applications-internet.png b/icons/22x22/applications-internet.png
new file mode 100644
index 0000000..0348b21
Binary files /dev/null and b/icons/22x22/applications-internet.png differ
diff --git a/icons/22x22/applications-multimedia.png b/icons/22x22/applications-multimedia.png
new file mode 100644
index 0000000..3213ad5
Binary files /dev/null and b/icons/22x22/applications-multimedia.png differ
diff --git a/icons/22x22/applications-office.png b/icons/22x22/applications-office.png
new file mode 100644
index 0000000..ae877d5
Binary files /dev/null and b/icons/22x22/applications-office.png differ
diff --git a/icons/22x22/applications-other.png b/icons/22x22/applications-other.png
new file mode 100644
index 0000000..c68db38
Binary files /dev/null and b/icons/22x22/applications-other.png differ
diff --git a/icons/22x22/applications-system.png b/icons/22x22/applications-system.png
new file mode 100644
index 0000000..9ab8c04
Binary files /dev/null and b/icons/22x22/applications-system.png differ
diff --git a/icons/22x22/applications-utilities.png b/icons/22x22/applications-utilities.png
new file mode 100644
index 0000000..5b44ae1
Binary files /dev/null and b/icons/22x22/applications-utilities.png differ
diff --git a/icons/22x22/preferences-system.png b/icons/22x22/preferences-system.png
new file mode 100644
index 0000000..4207a3e
Binary files /dev/null and b/icons/22x22/preferences-system.png differ
diff --git a/icons/32x32/apps.png b/icons/32x32/apps.png
new file mode 100644
index 0000000..6281943
Binary files /dev/null and b/icons/32x32/apps.png differ
diff --git a/icons/32x32/open_dir.png b/icons/32x32/open_dir.png
new file mode 100644
index 0000000..8222226
Binary files /dev/null and b/icons/32x32/open_dir.png differ
diff --git a/icons/32x32/stop_session.png b/icons/32x32/stop_session.png
new file mode 100644
index 0000000..e96e746
Binary files /dev/null and b/icons/32x32/stop_session.png differ
diff --git a/icons/32x32/suspend_session.png b/icons/32x32/suspend_session.png
new file mode 100644
index 0000000..50bcb55
Binary files /dev/null and b/icons/32x32/suspend_session.png differ
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index aa15ae6..4ba3231 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -37,6 +37,8 @@ void x2goSession::operator = ( const x2goSession& s )
bool ONMainWindow::portable=false;
QString ONMainWindow::homeDir;
+QString ONMainWindow::sessionCfg;
+
#ifdef Q_OS_WIN
QString ONMainWindow::u3Device;
@@ -99,6 +101,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
lastSession=0l;
changeBrokerPass=false;
+ appSeparator=0;
+
+
#ifdef Q_OS_WIN
clientSshPort="7022";
pulsePort=4713;
@@ -164,16 +169,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
widgetExtraStyle =new QPlastiqueStyle();
#endif
- QDesktopWidget wd;
-// x2goDebug<<"Desktop geometry:"<<wd.screenGeometry();
- if ( wd.screenGeometry().width() <1024 ||
- wd.screenGeometry().height() <768 )
- {
- miniMode=true;
- x2goDebug<<"Switching to \"mini\" mode";
- }
-
-
agentCheckTimer=new QTimer ( this );
connect ( agentCheckTimer,SIGNAL ( timeout() ),this,
SLOT ( slotCheckAgentProcess() ) );
@@ -260,6 +255,19 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
QTimer::singleShot ( 10, this, SLOT ( slotResize() ) );
}
+
+ QDesktopWidget wd;
+
+ x2goDebug<<"primary screen geometry: "<<wd.screenGeometry(wd.screenNumber(this));
+
+ if ( wd.screenGeometry(wd.screenNumber(this)).width() <1024 ||
+ wd.screenGeometry(wd.screenNumber(this)).height() <768 )
+ {
+ miniMode=true;
+ x2goDebug<<"Switching to \"mini\" mode";
+ }
+
+
if ( usePGPCard )
{
QTimer::singleShot ( 10, this, SLOT ( slotStartPGPAuth() ) );
@@ -988,7 +996,6 @@ void ONMainWindow::trayIconInit()
delete trayIconMenu;
trayIcon=0l;
trayIconMenu=0l;
-
}
}
else
@@ -998,13 +1005,39 @@ void ONMainWindow::trayIconInit()
trayIconMenu = new QMenu(this);
trayIconMenu->addAction(tr("Restore"),this, SLOT(showNormal()));
-
trayIconActiveConnectionMenu = trayIconMenu->addMenu(tr("Not connected"));
+ appMenu[Application::MULTIMEDIA]=initTrayAppMenu(tr("Multimedia"),
+ QPixmap(":/icons/22x22/applications-multimedia.png"));
+ appMenu[Application::DEVELOPMENT]=initTrayAppMenu(tr("Development"),
+ QPixmap(":/icons/22x22/applications-development.png"));
+ appMenu[Application::EDUCATION]=initTrayAppMenu(tr("Education"),
+ QPixmap(":/icons/22x22/applications-education.png"));
+ appMenu[Application::GAME]=initTrayAppMenu(tr("Game"),
+ QPixmap(":/icons/22x22/applications-games.png"));
+ appMenu[Application::GRAPHICS]=initTrayAppMenu(tr("Graphics"),
+ QPixmap(":/icons/22x22/applications-graphics.png"));
+ appMenu[Application::NETWORK]=initTrayAppMenu(tr("Network"),
+ QPixmap(":/icons/22x22/applications-internet.png"));
+ appMenu[Application::OFFICE]=initTrayAppMenu(tr("Office"),
+ QPixmap(":/icons/22x22/applications-office.png"));
+ appMenu[Application::SETTINGS]=initTrayAppMenu(tr("Settings"),
+ QPixmap(":/icons/22x22/preferences-system.png"));
+ appMenu[Application::SYSTEM]=initTrayAppMenu(tr("System"),
+ QPixmap(":/icons/22x22/applications-system.png"));
+ appMenu[Application::UTILITY]=initTrayAppMenu(tr("Utility"),
+ QPixmap(":/icons/22x22/applications-utilities.png"));
+ appMenu[Application::OTHER]=initTrayAppMenu(tr("Other"),
+ QPixmap(":/icons/22x22/applications-other.png"));
+ appSeparator=trayIconActiveConnectionMenu->addSeparator();
+
trayIconActiveConnectionMenu->addAction(tr ("Share folder..." ),this, SLOT(slotExportDirectory()));
trayIconActiveConnectionMenu->addAction(tr("Suspend"),this, SLOT(slotSuspendSessFromSt()));
trayIconActiveConnectionMenu->addAction(tr("Terminate"),this, SLOT(slotTermSessFromSt()));
+ connect (trayIconActiveConnectionMenu, SIGNAL(triggered(QAction*)), this,
+ SLOT(slotAppMenuTriggered(QAction*)));
+
if (sessionStatusDlg && sessionStatusDlg->isVisible())
{
@@ -1014,7 +1047,9 @@ void ONMainWindow::trayIconInit()
trayIconActiveConnectionMenu->setTitle(lastUser->username());
}
else
+ {
trayIconActiveConnectionMenu->setEnabled(false);
+ }
trayIconMenu->addSeparator();
trayIconMenu->addAction(tr("Quit"),this, SLOT(trayQuit()));
@@ -1030,10 +1065,76 @@ void ONMainWindow::trayIconInit()
trayIcon->setToolTip(tr("Left mouse button to hide/restore - Right mouse button to display context menu"));
}
trayIcon->show();
+ plugAppsInTray();
}
#endif
}
+QMenu* ONMainWindow::initTrayAppMenu(QString text, QPixmap icon)
+{
+ QMenu* menu=trayIconActiveConnectionMenu->addMenu(text);
+ menu->setIcon(icon);
+ return menu;
+}
+
+
+void ONMainWindow::slotAppMenuTriggered(QAction* action)
+{
+ x2goDebug<<"slotAppMenuTriggered :"<<action->data().toString()<<endl;
+ if(action->data().toString() != "")
+ runApplication(action->data().toString());
+}
+
+void ONMainWindow::plugAppsInTray()
+{
+ if (!trayIcon)
+ return;
+ removeAppsFromTray();
+ x2goDebug<<"plugging apps\n";
+ bool empty=true;
+ topActions.clear();
+ foreach(Application app, applications)
+ {
+ QAction* act;
+ if(app.category==Application::TOP)
+ {
+ act=new QAction(app.icon,app.name,trayIconActiveConnectionMenu);
+ trayIconActiveConnectionMenu->insertAction(appSeparator, act);
+ topActions.append(act);
+ }
+ else
+ {
+ act=appMenu[app.category]->addAction(app.icon,app.name);
+ appMenu[app.category]->menuAction()->setVisible(true);
+ }
+ act->setToolTip(app.comment);
+ act->setData(app.exec);
+ empty=false;
+ }
+ if (!empty)
+ appSeparator->setVisible(true);
+}
+
+
+void ONMainWindow::removeAppsFromTray()
+{
+ if (!trayIcon)
+ return;
+ x2goDebug<<"remove apps\n";
+ for (int i=0;i<=Application::OTHER;++i)
+ {
+ appMenu[i]->clear();
+ appMenu[i]->menuAction()->setVisible(false);
+ }
+ foreach (QAction* act, topActions)
+ {
+ trayIconActiveConnectionMenu->removeAction(act);
+ delete act;
+ }
+ topActions.clear();
+ appSeparator->setVisible(false);
+}
+
QString ONMainWindow::findTheme ( QString /*theme*/ )
{
@@ -1358,16 +1459,12 @@ void ONMainWindow::loadSettings()
{
X2goSettings st ( "sizes" );
-
mwSize=st.setting()->value ( "mainwindow/size",
( QVariant ) QSize ( 800,600 ) ).toSize();
mwPos=st.setting()->value ( "mainwindow/pos",
( QVariant ) QPoint ( 20,20 ) ).toPoint();
mwMax=st.setting()->value ( "mainwindow/maximized",
( QVariant ) false ).toBool();
- // tray stuff
-// trayQuitInfoShown = st1.value( "trayQuitInfoShown", false ).toBool();
-
X2goSettings st1 ( "settings" );
diff --git a/onmainwindow.h b/onmainwindow.h
index 1f2f08f..4a17a92 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -1,7 +1,7 @@
/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.de *
+ * Copyright (C) 2005-2012 by Oleksandr Shneyder *
+ * oleksandr.shneyder at obviously-nice.de *
* *
* 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 *
@@ -55,6 +55,7 @@
#if defined(CFGPLUGIN) && defined(Q_OS_LINUX)
class QX11EmbedContainer;
#endif
+class QToolButton;
class QTemporaryFile;
class QLineEdit;
class QFrame;
@@ -118,6 +119,22 @@ struct serv
QString sshPort;
};
+struct Application
+{
+ QString name;
+ QString comment;
+ QString exec;
+ QPixmap icon;
+ enum {MULTIMEDIA, DEVELOPMENT, EDUCATION, GAME,
+ GRAPHICS, NETWORK, OFFICE,
+ SETTINGS, SYSTEM, UTILITY, OTHER, TOP
+ } category;
+ static bool lessThen(Application t1, Application t2)
+ {
+ return (t1.name.compare(t2.name,Qt::CaseInsensitive)<0);
+ }
+};
+
struct x2goSession
{
QString agentPid;
@@ -131,6 +148,7 @@ struct x2goSession
QString grPort;
QString sndPort;
QString fsPort;
+ bool published;
int colorDepth;
bool fullscreen;
enum {DESKTOP,ROOTLESS,SHADOW} sessionType;
@@ -417,6 +435,16 @@ public:
{
return !noSessionEdit;
}
+ const QList<Application>& getApplications()
+ {
+ return applications;
+ }
+ static QString getSessionConf()
+ {
+ return sessionCfg;
+ }
+
+ void runApplication(QString exec);
SshMasterConnection* findServerSshConnection(QString host);
@@ -514,9 +542,9 @@ private:
static QString homeDir;
int retSessions;
QList<serv> x2goServers;
+ QList<Application> applications;
QPushButton* bSusp;
- QPushButton* sbExp;
QPushButton* bTerm;
QPushButton* bNew;
QPushButton* bShadow;
@@ -556,8 +584,10 @@ private:
QString readExportsFrom;
QString readLoginsFrom;
QPushButton* sOk;
- QPushButton* sbSusp;
- QPushButton* sbTerm;
+ QToolButton* sbSusp;
+ QToolButton* sbExp;
+ QToolButton* sbTerm;
+ QToolButton* sbApps;
QCheckBox* sbAdv;
QPushButton* sCancel;
QString resolution;
@@ -606,6 +636,7 @@ private:
QAction *act_embedToolBar;
QAction *act_changeBrokerPass;
QAction *act_testCon;
+ QList <QAction*> topActions;
QToolBar *stb;
@@ -618,6 +649,7 @@ private:
QString nick;
QString nfsPort;
QString mntPort;
+ static QString sessionCfg;
QProcess* ssh;
QProcess* soundServer;
QProcess* scDaemon;
@@ -746,6 +778,10 @@ private:
QSystemTrayIcon *trayIcon;
QMenu *trayIconMenu;
QMenu *trayIconActiveConnectionMenu;
+
+ QAction* appSeparator;
+ QMenu* appMenu[Application::OTHER+1];
+
bool trayEnabled;
bool trayMinToTray;
bool trayNoclose;
@@ -799,6 +835,10 @@ private:
QString password, bool autologin, bool krbLogin, bool getSrv=false);
void setProxyWinTitle();
QRect proxyWinGeometry();
+ void readApplications();
+ void removeAppsFromTray();
+ void plugAppsInTray();
+ QMenu* initTrayAppMenu(QString text, QPixmap icon);
protected:
@@ -815,8 +855,10 @@ private slots:
void slotCheckXOrgConnection();
#endif
private slots:
+ void slotAppDialog();
void slotShowPassForm();
void displayUsers();
+ void slotAppMenuTriggered ( QAction * action );
void slotPassChanged(const QString& result);
void slotResize ( const QSize sz );
void slotUnameChanged ( const QString& text );
@@ -840,6 +882,7 @@ private slots:
void slotChangeKbdLayout(const QString& layout);
void slotSyncX();
void slotShutdownThinClient();
+ void slotReadApplications(bool result, QString output, SshProcess* proc );
public slots:
void slotConfig();
diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp
index e8df279..9412f9d 100644
--- a/onmainwindow_part2.cpp
+++ b/onmainwindow_part2.cpp
@@ -20,6 +20,7 @@
#include "onmainwindow_privat.h"
+
void ONMainWindow::slotSshConnectionOk()
{
x2goDebug<<"ssh connection ok"<<endl;
@@ -235,6 +236,8 @@ bool ONMainWindow::startSession ( const QString& sid )
user=getCurrentUname();
runRemoteCommand=true;
shadowSession=false;
+ applications.clear();
+ removeAppsFromTray();
if ( managedMode )
{
@@ -276,8 +279,9 @@ bool ONMainWindow::startSession ( const QString& sid )
user=st.setting()->value ( sid+"/user",
( QVariant ) QString::null ).toString();
login->setText(user);
- sshPort=st.setting()->value ( sid+"/sshport",
- ( QVariant ) "22" ).toString();
+ sshPort=config.sshport;
+ /* sshPort=st.setting()->value ( sid+"/sshport",
+ ( QVariant ) "22" ).toString();*/
}
if (sshConnection)
sshConnection->disconnectSession();
@@ -446,6 +450,7 @@ void ONMainWindow::startNewSession()
int speed;
bool usekbd;
bool rootless=false;
+ resumingSession.published=false;
bool setDPI=defaultSetDPI;
uint dpi=defaultDPI;
QString layout;
@@ -454,7 +459,7 @@ void ONMainWindow::startNewSession()
QString xdmcpServer;
runRemoteCommand=true;
QString host=QString::null;
-
+ removeAppsFromTray();
if ( useLdap )
{
pack=defaultPack;
@@ -546,6 +551,8 @@ void ONMainWindow::startNewSession()
rootless=st->setting()->value ( sid+"/rootless",
( QVariant ) false ).toBool();
+ resumingSession.published=st->setting()->value ( sid+"/published",
+ ( QVariant ) false ).toBool();
xdmcpServer=st->setting()->value ( sid+"/xdmcpserver",
( QVariant )
"localhost" ).toString();
@@ -707,6 +714,11 @@ void ONMainWindow::startNewSession()
sessTypeStr="R ";
if ( shadowSession )
sessTypeStr="S ";
+ if ( resumingSession.published)
+ {
+ sessTypeStr="P ";
+ command="PUBLISHED";
+ }
QString dpiEnv;
QString xdmcpEnv;
if ( runRemoteCommand==false && command=="XDMCP" )
@@ -757,7 +769,8 @@ void ONMainWindow::startNewSession()
void ONMainWindow::resumeSession ( const x2goSession& s )
{
newSession=false;
-
+ applications.clear();
+ removeAppsFromTray();
QString passwd=getCurrentPass();
QString user=getCurrentUname();
QString host=s.server;
@@ -772,6 +785,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
bool usekbd;
QString layout;
QString type;
+ removeAppsFromTray();
if ( useLdap )
{
@@ -954,6 +968,15 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
type="query";
#endif
+ if (s.sessionId.indexOf("RPUBLISHED")!=-1)
+ {
+ resumingSession.published=true;
+ sbApps->setDisabled(true);
+ }
+ else
+ resumingSession.published=false;
+
+
if ( selectSessionDlg->isVisible() )
{
@@ -1576,6 +1599,8 @@ void ONMainWindow::slotRetResumeSess ( bool result,
x2goDebug<<"new fs_port: "<<resumingSession.fsPort<<endl;
}
}
+ if (resumingSession.published)
+ readApplications();
}
if ( !useLdap )
{
@@ -2234,7 +2259,7 @@ void ONMainWindow::slotProxyStderr()
exportTimer->start ( 2000 );
}
}
- sbSusp->setText ( tr ( "Suspend" ) );
+ sbSusp->setToolTip ( tr ( "Suspend" ) );
if ( newSession )
{
runCommand();
@@ -2483,6 +2508,10 @@ void ONMainWindow::setStatStatus ( QString status )
slVal->setFixedSize ( slVal->sizeHint() );
sessionStatusDlg->show();
+ if (resumingSession.published)
+ sbApps->show();
+ else
+ sbApps->hide();
}
else
{
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index 21434e2..350a648 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -20,7 +20,6 @@
#include "onmainwindow_privat.h"
-
x2goSession ONMainWindow::getNewSessionFromString ( const QString& string )
{
QStringList lst=string.split ( '|' );
@@ -37,6 +36,12 @@ x2goSession ONMainWindow::getNewSessionFromString ( const QString& string )
}
+void ONMainWindow::slotAppDialog()
+{
+ AppDialog dlg(this);
+ dlg.exec();
+}
+
void ONMainWindow::runCommand()
{
QString passwd=getCurrentPass();
@@ -49,13 +54,14 @@ void ONMainWindow::runCommand()
QString rdpWidth;
QString rdpHeight;
bool rootless=false;
+ resumingSession.published=false;
if ( !embedMode )
{
X2goSettings* st;
- if(!brokerMode)
- st=new X2goSettings( "sessions" );
- else
- st=new X2goSettings(config.iniFile, QSettings::IniFormat);
+ if (!brokerMode)
+ st=new X2goSettings( "sessions" );
+ else
+ st=new X2goSettings(config.iniFile, QSettings::IniFormat);
if ( useLdap )
@@ -73,7 +79,9 @@ void ONMainWindow::runCommand()
sid+"/rdpserver",
( QVariant ) "" ).toString();
rootless=st->setting()->value ( sid+"/rootless",
- ( QVariant ) false ).toBool();
+ ( QVariant ) false ).toBool();
+ resumingSession.published=st->setting()->value ( sid+"/published",
+ ( QVariant ) false ).toBool();
rdpFS=st->setting()->value (
sid+"/fullscreen",
@@ -95,6 +103,11 @@ void ONMainWindow::runCommand()
}
if ( rootless )
sessionType="R";
+ if ( resumingSession.published )
+ {
+ sessionType="P";
+ command="PUBLISHED";
+ }
if ( command=="KDE" )
{
@@ -186,6 +199,16 @@ void ONMainWindow::runCommand()
#endif
}
+
+void ONMainWindow::runApplication(QString exec)
+{
+ SshProcess* proc=new SshProcess ( sshConnection, this );
+ proc->startNormal ("PULSE_CLIENTCONFIG=~/.x2go/C-"+
+ resumingSession.sessionId+"/.pulse-client.conf DISPLAY=:"+
+ resumingSession.display+
+ " setsid "+exec+">& /dev/null & exit");
+}
+
void ONMainWindow::slotRetRunCommand ( bool result, QString output,
SshProcess* proc )
{
@@ -203,6 +226,150 @@ void ONMainWindow::slotRetRunCommand ( bool result, QString output,
QMessageBox::Ok,
QMessageBox::NoButton );
}
+ else
+ {
+ if (resumingSession.published)
+ readApplications();
+ }
+}
+
+void ONMainWindow::readApplications()
+{
+ SshProcess* proc=new SshProcess ( sshConnection, this );
+ connect ( proc,SIGNAL ( sshFinished ( bool, QString,
+ SshProcess* ) ),
+ this,SLOT ( slotReadApplications ( bool,
+ QString,
+ SshProcess* ) ) );
+ proc->startNormal ( "x2gogetapps" );
+ sbApps->setEnabled(false);
+}
+
+void ONMainWindow::slotReadApplications(bool result, QString output,
+ SshProcess* proc )
+{
+ if ( proc )
+ delete proc;
+ if ( result==false )
+ {
+ QString message=tr ( "<b>Connection failed</b>\n:\n" ) +output;
+ if ( message.indexOf ( "publickey,password" ) !=-1 )
+ {
+ message=tr ( "<b>Wrong password!</b><br><br>" ) +
+ message;
+ }
+ QMessageBox::critical ( 0l,tr ( "Error" ),message,
+ QMessageBox::Ok,
+ QMessageBox::NoButton );
+ return;
+ }
+ sbApps->setEnabled(true);
+ applications.clear();
+ QString locallong=QLocale::system().name();
+ QString localshort=QLocale::system().name().split("_")[0];
+
+ foreach(QString appstr, output.split("</desktop>",QString::SkipEmptyParts))
+ {
+ bool localcomment=false;
+ bool localname=false;
+ Application app;
+ app.category=Application::OTHER;
+ QStringList lines=appstr.split("\n", QString::SkipEmptyParts);
+ for (int i=0; i<lines.count(); ++i)
+ {
+ QString line=lines[i];
+ if (line.indexOf("Name["+localshort+"]=")!=-1 || line.indexOf("Name["+locallong+"]=")!=-1)
+ {
+ app.name=QString::fromUtf8(line.split("=")[1].toAscii());
+// x2goDebug<<"local name: "<<app.name<<endl;
+ localname=true;
+ }
+ if (line.indexOf("Comment["+localshort+"]=")!=-1 || line.indexOf("Comment["+locallong+"]=")!=-1)
+ {
+ app.comment=QString::fromUtf8(line.split("=")[1].toAscii());
+// x2goDebug<<"local comment: "<<app.comment<<endl;
+ localcomment=true;
+ }
+ if (line.indexOf("Name=")!=-1 && !localname)
+ {
+ app.name=line.split("=")[1];
+// x2goDebug<<"name: "<<app.name<<endl;
+ }
+ if (line.indexOf("Comment=")!=-1 && !localcomment)
+ {
+ app.comment=line.split("=")[1];
+// x2goDebug<<"comment: "<<app.comment<<endl;
+ }
+ if (line.indexOf("Exec=")!=-1)
+ {
+ app.exec=line.split("=")[1];
+ app.exec.replace("%f","",Qt::CaseInsensitive);
+ app.exec.replace("%u","",Qt::CaseInsensitive);
+// x2goDebug<<"exec: "<<app.exec<<endl;
+ }
+ if (line.indexOf("Categories=")!=-1)
+ {
+ if (line.indexOf("Audio")!=-1)
+ app.category=Application::MULTIMEDIA;
+ if (line.indexOf("Vide")!=-1)
+ app.category=Application::MULTIMEDIA;
+ if (line.indexOf("Development")!=-1)
+ app.category=Application::DEVELOPMENT;
+ if (line.indexOf("Education")!=-1)
+ app.category=Application::EDUCATION;
+ if (line.indexOf("Game")!=-1)
+ app.category=Application::GAME;
+ if (line.indexOf("Graphics")!=-1)
+ app.category=Application::GRAPHICS;
+ if (line.indexOf("Network")!=-1)
+ app.category=Application::NETWORK;
+ if (line.indexOf("Office")!=-1)
+ app.category=Application::OFFICE;
+ if (line.indexOf("Settings")!=-1)
+ app.category=Application::SETTINGS;
+ if (line.indexOf("System")!=-1)
+ app.category=Application::SYSTEM;
+ if (line.indexOf("Utility")!=-1)
+ app.category=Application::UTILITY;
+ if (line.indexOf("X2Go-Top",0,Qt::CaseInsensitive)!=-1)
+ app.category=Application::TOP;
+ }
+ if (line.indexOf("<icon>")!=-1)
+ {
+ bool isSvg=false;
+ line=lines[++i];
+ QByteArray pic;
+ while (line.indexOf("</icon>")==-1)
+ {
+ pic+=QByteArray::fromBase64(line.toAscii());
+ line=lines[++i];
+ if (QString(QByteArray::fromBase64(line.toAscii())).indexOf("</svg>",Qt::CaseInsensitive)!=-1)
+ {
+ isSvg=true;
+ }
+ }
+ if (!isSvg)
+ app.icon.loadFromData(pic);
+ else
+ {
+ QPixmap pix(32,32);
+ QSvgRenderer svgRenderer( pic );
+ QPainter pixPainter(&pix);
+ svgRenderer.render(&pixPainter);
+ app.icon=pix;
+ }
+ }
+ }
+ if (app.name.length()>0)
+ {
+ if (app.comment.length()<=0)
+ app.comment=app.name;
+ applications.append(app);
+ }
+ }
+
+ qSort(applications.begin(), applications.end(),Application::lessThen);
+ plugAppsInTray();
}
@@ -230,10 +397,10 @@ bool ONMainWindow::parseParameter ( QString param )
cleanAllFiles=true;
return true;
}
- if(param == "--connectivity-test")
+ if (param == "--connectivity-test")
{
- connTest=true;
- return true;
+ connTest=true;
+ return true;
}
if ( param=="--no-menu" )
@@ -254,14 +421,14 @@ bool ONMainWindow::parseParameter ( QString param )
}
if (param == "--thinclient")
{
- thinMode=true;
- startMaximized=true;
- return true;
+ thinMode=true;
+ startMaximized=true;
+ return true;
}
if (param == "--haltbt")
{
- showHaltBtn=true;
- return true;
+ showHaltBtn=true;
+ return true;
}
if ( param=="--hide" )
{
@@ -288,12 +455,12 @@ bool ONMainWindow::parseParameter ( QString param )
noSessionEdit=true;
return true;
}
- if( param=="--change-broker-pass")
+ if ( param=="--change-broker-pass")
{
- changeBrokerPass=true;
- return true;
+ changeBrokerPass=true;
+ return true;
}
-
+
QString setting,value;
QStringList vals=param.split ( "=" );
@@ -324,8 +491,8 @@ bool ONMainWindow::parseParameter ( QString param )
if ( setting=="--kbd-layout" )
{
defaultLayout=value.split(",",QString::SkipEmptyParts);
- if(defaultLayout.size()==0)
- defaultLayout<<tr("us");
+ if (defaultLayout.size()==0)
+ defaultLayout<<tr("us");
return true;
}
if ( setting=="--session" )
@@ -334,6 +501,11 @@ bool ONMainWindow::parseParameter ( QString param )
defaultSessionName=value;
return true;
}
+ if ( setting=="--session-conf" )
+ {
+ ONMainWindow::sessionCfg=value;
+ return true;
+ }
if ( setting=="--sessionid" )
{
defaultSession=true;
@@ -405,84 +577,84 @@ bool ONMainWindow::parseParameter ( QString param )
embedParent=value.toLong();
return true;
}
- if( setting == "--broker-url")
+ if ( setting == "--broker-url")
{
- brokerMode=true;
- noSessionEdit=true;
- config.brokerurl=value;
- return true;
+ brokerMode=true;
+ noSessionEdit=true;
+ config.brokerurl=value;
+ return true;
}
- if( setting == "--broker-name")
+ if ( setting == "--broker-name")
{
- config.brokerName=value;
- return true;
+ config.brokerName=value;
+ return true;
}
- if( setting == "--auth-id")
+ if ( setting == "--auth-id")
{
- QFile file(value);
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- {
- printError ( param + tr(" (can't open file)"));
- return false;
- }
- QTextStream in(&file);
- config.brokerUserId = in.readLine();
- return true;
+ QFile file(value);
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+ {
+ printError ( param + tr(" (can't open file)"));
+ return false;
+ }
+ QTextStream in(&file);
+ config.brokerUserId = in.readLine();
+ return true;
}
- if(setting == "--support-menu")
+ if (setting == "--support-menu")
{
- if(! QFile::exists(value))
- {
- printError( param + tr(" (file not exists)"));
- return false;
- }
- supportMenuFile=value;
- return true;
+ if (! QFile::exists(value))
+ {
+ printError( param + tr(" (file not exists)"));
+ return false;
+ }
+ supportMenuFile=value;
+ return true;
}
- if(setting == "--background")
+ if (setting == "--background")
{
- if(! QFile::exists(value))
- {
- printError( param + tr(" (file not exists)"));
- return false;
- }
- BGFile=value;
- return true;
+ if (! QFile::exists(value))
+ {
+ printError( param + tr(" (file not exists)"));
+ return false;
+ }
+ BGFile=value;
+ return true;
}
- if(setting == "--session-icon")
+ if (setting == "--session-icon")
{
- if(! QFile::exists(value))
- {
- printError( param + tr(" (file not exists)"));
- return false;
- }
- SPixFile=value;
- return true;
+ if (! QFile::exists(value))
+ {
+ printError( param + tr(" (file not exists)"));
+ return false;
+ }
+ SPixFile=value;
+ return true;
}
- if(setting == "--home")
+ if (setting == "--home")
{
- QDir dr;
-
+ QDir dr;
+
#ifdef Q_OS_WIN
- int find=value.indexOf("(");
- int lind=value.indexOf(")");
- if(find!=-1 && lind !=-1)
- {
- QString label=value.mid(find+1,lind-find-1);
- x2goDebug<< "searching for drive with label: "<<label;
- QString drive=wapiGetDriveByLabel(label);
- value.replace("("+label+")",drive);
- x2goDebug<<"new path: "<<value;
- }
+ int find=value.indexOf("(");
+ int lind=value.indexOf(")");
+ if (find!=-1 && lind !=-1)
+ {
+ QString label=value.mid(find+1,lind-find-1);
+ x2goDebug<< "searching for drive with label: "<<label;
+ QString drive=wapiGetDriveByLabel(label);
+ value.replace("("+label+")",drive);
+ x2goDebug<<"new path: "<<value;
+ }
#endif
- if(! dr.exists(value))
- {
- printError( param + tr(" (directory not exists)"));
- return false;
- }
- homeDir=value;
- portableDataPath=value;
- return true;
+ if (! dr.exists(value))
+ {
+ printError( param + tr(" (directory not exists)"));
+ return false;
+ }
+ homeDir=value;
+ portableDataPath=value;
+ return true;
}
printError ( param );
@@ -705,7 +877,7 @@ void ONMainWindow::showHelp()
"--help-pack\t\t\t show available pack methods\n"
"--no-menu\t\t\t hide menu bar\n"
"--no-session-edit\t\t not allow user to edit preconfigured\n"
- "sessions\n"
+ "\t\t\t\t sessions\n"
"--maximize\t\t\t start maximized\n"
"--hide\t\t\t\t start hidden\n"
"--portable\t\t\t start in \"portable\" mode\n"
@@ -735,10 +907,11 @@ void ONMainWindow::showHelp()
"--pack=<packmethod>\t\t set default pack method, default "
"'16m-jpeg-9'\n"
"--kbd-layout=<layout>\t\t set default keyboard layout or layouts\n"
- "comma separated\n"
+ "\t\t\t\t comma separated\n"
"--kbd-type=<typed>\t\t set default keyboard type\n"
- "--home=<dir>\t\t set users home directory\n"
- "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" ;
+ "--home=<dir>\t\t\t set users home directory\n"
+ "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n"
+ "--session-conf=<file>\t\t\t path to alternative session config\n";
qCritical ( "%s",helpMsg.toLocal8Bit().data() );
QMessageBox::information ( this,tr ( "Options" ),helpMsg );
}
@@ -829,22 +1002,22 @@ void ONMainWindow::slotGetServers ( bool result, QString output,
listedSessions.clear();
retSessions=0;
- if(sshConnection)
- sshConnection->disconnectSession();
+ if (sshConnection)
+ sshConnection->disconnectSession();
QString passwd;
QString user=getCurrentUname();
passwd=getCurrentPass();
- for(int i=0; i< serverSshConnections.count();++i)
+ for (int i=0; i< serverSshConnections.count();++i)
{
- if(serverSshConnections[i])
- serverSshConnections[i]->disconnectSession();
+ if (serverSshConnections[i])
+ serverSshConnections[i]->disconnectSession();
}
serverSshConnections.clear();
for ( int j=0;j<x2goServers.size();++j )
{
QString host=x2goServers[j].name;
- sshPort=x2goServers[j].sshPort;
- serverSshConnections<<startSshConnection ( host,sshPort,acceptRsa,user,passwd,true,false,true);
+ sshPort=x2goServers[j].sshPort;
+ serverSshConnections<<startSshConnection ( host,sshPort,acceptRsa,user,passwd,true,false,true);
}
}
@@ -860,7 +1033,7 @@ void ONMainWindow::slotListAllSessions ( bool result,QString output,
if ( proc )
delete proc;
proc=0;
-
+
if ( result==false )
{
QString message=tr ( "<b>Connection failed</b>\n" ) +output;
@@ -942,10 +1115,10 @@ void ONMainWindow::slotExportDirectory()
return;
bool hide_after=false;
- if(isHidden())
+ if (isHidden())
{
- showNormal();
- hide_after=true;
+ showNormal();
+ hide_after=true;
}
QString path;
if ( !useLdap && !embedMode )
@@ -955,12 +1128,12 @@ void ONMainWindow::slotExportDirectory()
path=dlg.getExport();
}
else
-
+
path= QFileDialog::getExistingDirectory (
this,QString::null,
homeDir );
- if(hide_after)
- hide();
+ if (hide_after)
+ hide();
#ifdef Q_OS_WIN
if ( ONMainWindow::getPortable() &&
ONMainWindow::U3DevicePath().length() >0 )
@@ -1524,16 +1697,16 @@ void ONMainWindow::slotAboutQt()
void ONMainWindow::slotSupport()
{
QFile file(supportMenuFile);
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- return;
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+ return;
- QTextStream in(&file);
- QString sup;
- while (!in.atEnd())
- {
- sup+=in.readLine();
- }
- QMessageBox::information (this,tr ( "Support" ),sup);
+ QTextStream in(&file);
+ QString sup;
+ while (!in.atEnd())
+ {
+ sup+=in.readLine();
+ }
+ QMessageBox::information (this,tr ( "Support" ),sup);
}
void ONMainWindow::slotAbout()
@@ -1967,7 +2140,7 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus )
if ( !useLdap )
{
- if ( passForm->isVisible() )
+ if ( passForm->isVisible() && !brokerMode)
{
if ( passForm->isEnabled() )
{
@@ -2025,11 +2198,11 @@ void ONMainWindow::slotCheckAgentProcess()
cardStarted=false;
if ( nxproxy )
if ( nxproxy->state() ==QProcess::Running )
- {
- x2goDebug<<"Suspending session\n";
- slotSuspendSessFromSt();
+ {
+ x2goDebug<<"Suspending session\n";
+ slotSuspendSessFromSt();
// nxproxy->terminate();
- }
+ }
}
x2goDebug<<"gpg-agent finished\n";
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index 25ca9a1..731937a 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -1,9 +1,9 @@
-/***************************************************************************
-* Copyright (C) 2005-2012 by Oleksandr Shneyder *
-* oleksandr.shneyder at obviously-nice.de *
+/**************************************************************************
+* Copyright (C) 2005-2012 by Oleksandr Shneyder *
+* oleksandr.shneyder at obviously-nice.de *
* *
* 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 F*
+* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
@@ -1640,12 +1640,19 @@ void ONMainWindow::initPassDlg()
passForm->setFixedSize ( 310,180 );
QPalette pal=passForm->palette();
pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) );
+ pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
passForm->setPalette ( pal );
pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
pal.setColor ( QPalette::Window, QColor ( 255,255,255,255 ) );
pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) );
+
QFont fnt=passForm->font();
if ( miniMode )
#ifdef Q_WS_HILDON
@@ -1713,9 +1720,6 @@ void ONMainWindow::initPassDlg()
- pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
- pal.setColor ( QPalette::Window, QColor ( 255,255,255,255 ) );
- pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) );
cbLayout->setPalette ( pal );
ok->setPalette ( pal );
cancel->setPalette ( pal );
@@ -1833,6 +1837,13 @@ void ONMainWindow::initStatusDlg()
username->addWidget ( sessionStatusDlg );
QPalette pal=sessionStatusDlg->palette();
pal.setBrush ( QPalette::Window, QColor ( 0,0,0,0 ) );
+ pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
+
sessionStatusDlg->setPalette ( pal );
slName=new QLabel ( sessionStatusDlg );
@@ -1847,39 +1858,57 @@ void ONMainWindow::initStatusDlg()
slVal->hide();
slVal->setFixedHeight ( slName->sizeHint().height() );
- sbSusp=new QPushButton ( tr ( "Abort" ),sessionStatusDlg );
- sbTerm=new QPushButton ( tr ( "Terminate" ),sessionStatusDlg );
- sbExp=new QPushButton ( tr ( "Share folder..." ),
- sessionStatusDlg );
+
+ sbApps=new QToolButton (sessionStatusDlg );
+ sbApps->setToolTip(tr ( "Applications..." ));
+ sbApps->setIcon(QPixmap(":/icons/32x32/apps.png"));
+ sbApps->setAutoRaise(true);
+ sbApps->setFocusPolicy(Qt::NoFocus);
+
+ sbExp=new QToolButton (sessionStatusDlg );
+ sbExp->setIcon(QPixmap(":/icons/32x32/open_dir.png"));
+ sbExp->setToolTip (tr ("Share folder..." ));
+ sbExp->setAutoRaise(true);
+ sbExp->setFocusPolicy(Qt::NoFocus);
+
+ sbSusp=new QToolButton (sessionStatusDlg );
+ sbSusp->setIcon(QPixmap(":/icons/32x32/suspend_session.png"));
+ sbSusp->setToolTip(tr ( "Abort" ));
+ sbSusp->setAutoRaise(true);
+ sbSusp->setFocusPolicy(Qt::NoFocus);
+
+
+ sbTerm=new QToolButton (sessionStatusDlg );
+ sbTerm->setIcon(QPixmap(":/icons/32x32/stop_session.png"));
+ sbTerm->setToolTip(tr ( "Terminate" ));
+ sbTerm->setAutoRaise(true);
+ sbTerm->setFocusPolicy(Qt::NoFocus);
+
+
sbAdv=new QCheckBox ( tr ( "Show details" ),sessionStatusDlg );
setWidgetStyle ( sbTerm );
+ setWidgetStyle ( sbApps );
setWidgetStyle ( sbExp );
setWidgetStyle ( sbSusp );
setWidgetStyle ( sbAdv );
sbAdv->setFixedSize ( sbAdv->sizeHint() );
-#ifndef Q_WS_HILDON
- sbSusp->setFixedSize ( sbSusp->sizeHint() );
- sbTerm->setFixedSize ( sbTerm->sizeHint() );
- sbExp->setFixedSize ( sbExp->sizeHint() );
-#else
- QSize sz=sbSusp->sizeHint();
- sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
- sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
- sbSusp->setFixedSize ( sz );
- sz=sbExp->sizeHint();
- sz.setWidth ( ( int ) ( sz.width() ) );
- sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
- sbExp->setFixedSize ( sz );
- sz=sbTerm->sizeHint();
- sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
- sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
- sbTerm->setFixedSize ( sz );
-#endif
+ sbApps->setFixedSize ( 32,32 );
+ sbSusp->setFixedSize ( 32,32 );
+ sbTerm->setFixedSize ( 32,32 );
+ sbExp->setFixedSize ( 32,32 );
+
+ /*
+ sbApps->setFocusPolicy(Qt::NoFocus);
+ sbSusp->setFocusPolicy(Qt::NoFocus);
+ sbTerm->setFocusPolicy(Qt::NoFocus);
+ sbExp->setFocusPolicy(Qt::NoFocus);*/
+
sbAdv->hide();
sbSusp->hide();
sbTerm->hide();
sbExp->hide();
+ sbApps->hide();
pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
@@ -1887,6 +1916,7 @@ void ONMainWindow::initStatusDlg()
pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) );
sbAdv->setPalette ( pal );
+ sbApps->setPalette ( pal );
sbSusp->setPalette ( pal );
sbTerm->setPalette ( pal );
sbExp->setPalette ( pal );
@@ -1909,6 +1939,8 @@ void ONMainWindow::initStatusDlg()
SLOT ( slotShowAdvancedStat() ) );
connect ( sbExp,SIGNAL ( clicked() ),this,
SLOT ( slotExportDirectory() ) );
+ connect ( sbApps,SIGNAL ( clicked() ),this,
+ SLOT ( slotAppDialog()) );
QVBoxLayout* layout=new QVBoxLayout ( sessionStatusDlg );
QHBoxLayout* ll=new QHBoxLayout();
@@ -1923,10 +1955,11 @@ void ONMainWindow::initStatusDlg()
QHBoxLayout* bl=new QHBoxLayout();
bl->addStretch();
+ bl->addWidget ( sbApps );
bl->addWidget ( sbExp );
bl->addWidget ( sbSusp );
bl->addWidget ( sbTerm );
- bl->addStretch();
+// bl->addStretch();
layout->addLayout ( ll );
layout->addStretch();
layout->addWidget ( stInfo );
@@ -1977,6 +2010,13 @@ void ONMainWindow::initSelectSessDlg()
selectSessionDlg->setFixedSize ( 310,180 );
QPalette pal=selectSessionDlg->palette();
pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) );
+ pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
+
selectSessionDlg->setPalette ( pal );
pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
@@ -2486,18 +2526,13 @@ void ONMainWindow::slotGetBrokerSession(const QString& sinfo)
int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----");
QString endStr="-----END DSA PRIVATE KEY-----";
int keyEndPos=sinfo.indexOf(endStr);
- if (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0)
- {
- //throw error
- QMessageBox::critical (
- 0,tr ( "Error" ),
- tr ("Invalid reply from broker") +"<br>"+sinfo);
-
- close();
- return;
- }
- config.server=(lst[1].split("\n"))[0];
- config.key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos);
+ if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0))
+ config.key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos);
+ QString serverLine=(lst[1].split("\n"))[0];
+ QStringList words=serverLine.split(":",QString::SkipEmptyParts);
+ config.server=words[0];
+ if (words.count()>1)
+ config.sshport=words[1];
// x2goDebug<<"server: "<<config.server<<endl<<" key: "<<config.key;
if (sinfo.indexOf("SESSION_INFO")!=-1)
{
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index aa049f7..33a8bc4 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -23,6 +23,8 @@
#include <QTextStream>
#include <QTranslator>
+#include <QToolButton>
+#include <QPainter>
#include "version.h"
#include "x2goclientconfig.h"
@@ -30,6 +32,7 @@
#include "userbutton.h"
#include "exportdialog.h"
#include "printprocess.h"
+#include "appdialog.h"
#include <QDesktopServices>
#include <QApplication>
#include <QScrollBar>
diff --git a/resources.rcc b/resources.rcc
index 0b2996e..4263b23 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -45,6 +45,10 @@
<file>icons/32x32/x2goclient.png</file>
<file>icons/32x32/resolution.png</file>
<file>icons/32x32/contest.png</file>
+ <file>icons/32x32/apps.png</file>
+ <file>icons/32x32/open_dir.png</file>
+ <file>icons/32x32/suspend_session.png</file>
+ <file>icons/32x32/stop_session.png</file>
<file>icons/16x16/audio.png</file>
<file>icons/16x16/file-open.png</file>
<file>icons/16x16/delete.png</file>
@@ -61,6 +65,17 @@
<file>icons/16x16/lxde.png</file>
<file>icons/16x16/preferences.png</file>
<file>icons/16x16/rdp.png</file>
+ <file>icons/22x22/applications-development.png</file>
+ <file>icons/22x22/applications-education.png</file>
+ <file>icons/22x22/applications-games.png</file>
+ <file>icons/22x22/applications-graphics.png</file>
+ <file>icons/22x22/applications-internet.png</file>
+ <file>icons/22x22/applications-multimedia.png</file>
+ <file>icons/22x22/applications-office.png</file>
+ <file>icons/22x22/applications-other.png</file>
+ <file>icons/22x22/applications-system.png</file>
+ <file>icons/22x22/applications-utilities.png</file>
+ <file>icons/22x22/preferences-system.png</file>
<file>txt/packs</file>
<file>txt/encodings</file>
<file>x2goclient_en.qm</file>
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index e4ad225..63be020 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -33,6 +33,19 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
{
editable=mw->sessionEditEnabled();
+
+ QPalette pal=palette();
+ pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+ pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
+
+ setPalette(pal);
+
+
+
QFont fnt=font();
if ( mw->retMiniMode() )
#ifdef Q_WS_HILDON
@@ -57,8 +70,8 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
cmdBox=new QComboBox ( this );
cmdBox->setMouseTracking ( true );
cmdBox->setFrame ( false );
-// cmdBox->setEditable ( true );
QPalette cpal=cmdBox->palette();
+
cpal.setColor ( QPalette::Button,QColor ( 255,255,255 ) );
cpal.setColor ( QPalette::Base,QColor ( 255,255,255 ) );
cpal.setColor ( QPalette::Window,QColor ( 255,255,255 ) );
@@ -316,6 +329,8 @@ void SessionButton::redraw()
toString();
rootless=st->setting()->value ( sid+"/rootless",
false ).toBool();
+ published=st->setting()->value ( sid+"/published",
+ false ).toBool();
cmdBox->clear();
@@ -325,6 +340,7 @@ void SessionButton::redraw()
cmdBox->addItem ( tr ( "RDP connection" ) );
cmdBox->addItem ( tr ( "XDMCP" ) );
cmdBox->addItem ( tr ( "Connection to local desktop" ) );
+ cmdBox->addItem ( tr ( "Published applications" ) );
cmdBox->addItems ( par->transApplicationsNames() );
@@ -362,6 +378,12 @@ void SessionButton::redraw()
cmdBox->setCurrentIndex ( XDMCP );
command=tr ( "XDMCP" );
}
+ else if (published)
+ {
+ cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) );
+ command=tr ("Published applications");
+ cmdBox->setCurrentIndex (PUBLISHED);
+ }
else
{
cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) );
@@ -377,6 +399,7 @@ void SessionButton::redraw()
}
+
cmdIcon->setPixmap ( cmdpix );
cmd->setText ( command );
@@ -591,6 +614,7 @@ void SessionButton::slot_cmd_change ( const QString& command )
cmd->setText ( command );
QPixmap pix;
bool newRootless=rootless;
+ published=false;
QString cmd=command;
if ( command=="KDE" )
{
@@ -645,12 +669,18 @@ void SessionButton::slot_cmd_change ( const QString& command )
cmd="LXDE";
newRootless=false;
}
+ if (command== tr("Published applications"))
+ {
+ published=true;
+ cmd="PUBLISHED";
+ }
bool found=false;
cmd=par->internAppName ( cmd,&found );
if ( found )
newRootless=true;
st.setting()->setValue ( sid+"/command", ( QVariant ) cmd );
st.setting()->setValue ( sid+"/rootless", ( QVariant ) newRootless );
+ st.setting()->setValue ( sid+"/published", ( QVariant ) published );
st.setting()->sync();
}
diff --git a/sessionbutton.h b/sessionbutton.h
index cad3770..a12aaf6 100644
--- a/sessionbutton.h
+++ b/sessionbutton.h
@@ -26,7 +26,7 @@ class SessionButton : public SVGFrame
{
Q_OBJECT
public:
- enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION};
+ enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION};
SessionButton ( ONMainWindow* mw, QWidget* parent,QString id );
~SessionButton();
QString id() {
@@ -60,6 +60,7 @@ private:
QAction* act_createIcon;
QAction* act_remove;
bool rootless;
+ bool published;
bool editable;
private slots:
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 4a9603c..6e12843 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -129,6 +129,7 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw,
sessBox->addItem ( tr ( "Connect to local desktop" ) );
sessBox->addItem ( tr ( "Custom desktop" ) );
sessBox->addItem ( tr ( "Single application" ) );
+ sessBox->addItem ( tr ( "Published applications" ) );
cmdLay->addWidget ( sessBox );
leCmdIp=new QLabel ( tr ( "Command:" ),deskSess );
pbAdvanced=new QPushButton ( tr ( "Advanced options..." ),deskSess );
@@ -255,6 +256,7 @@ void SessionWidget::slot_changeCmd ( int var )
{
cmd->hide();
cmdCombo->setVisible ( true );
+ cmdCombo->setEnabled(true);
cmdCombo->lineEdit()->selectAll();
cmdCombo->lineEdit()->setFocus();
}
@@ -326,8 +328,8 @@ void SessionWidget::readConfig()
sessionId+"/autologin",
( QVariant ) false ).toBool());
cbKrbLogin->setChecked(st.setting()->value (
- sessionId+"/krblogin",
- ( QVariant ) false ).toBool());
+ sessionId+"/krblogin",
+ ( QVariant ) false ).toBool());
sshPort->setValue (
st.setting()->value (
sessionId+"/sshport",
@@ -338,6 +340,8 @@ void SessionWidget::readConfig()
sessionId+"/applications" ).toStringList();
bool rootless=st.setting()->value (
sessionId+"/rootless",false ).toBool();
+ bool published=st.setting()->value (
+ sessionId+"/published",false ).toBool();
QString
command=st.setting()->value (
@@ -357,7 +361,13 @@ void SessionWidget::readConfig()
if ( cmdCombo->findText ( app ) ==-1 )
cmdCombo->addItem ( app );
}
- if ( rootless )
+ if ( published )
+ {
+ sessBox->setCurrentIndex( PUBLISHED );
+ cmdCombo->setDisabled(true);
+ slot_changeCmd(PUBLISHED);
+ }
+ else if ( rootless )
{
sessBox->setCurrentIndex ( APPLICATION );
QString app=mainWindow->transAppName ( command );
@@ -425,7 +435,7 @@ void SessionWidget::setDefaults()
cbAutoLogin->setChecked(false);
cbKrbLogin->setChecked(false);
cmdCombo->lineEdit()->setText (
-
+
tr ( "Path to executable" ) );
cmdCombo->lineEdit()->selectAll();
slot_changeCmd ( 0 );
@@ -458,6 +468,7 @@ void SessionWidget::saveSettings()
st.setting()->setValue(sessionId+"/krblogin",( QVariant ) cbKrbLogin->isChecked());
QString command;
bool rootless=false;
+ bool published=false;
if ( sessBox->currentIndex() < OTHER )
@@ -499,7 +510,11 @@ void SessionWidget::saveSettings()
rootless=true;
command=mainWindow->internAppName ( cmdCombo->lineEdit()->text() );
}
+ if ( sessBox->currentIndex() == PUBLISHED)
+ published=true;
+
st.setting()->setValue ( sessionId+"/rootless", ( QVariant ) rootless );
+ st.setting()->setValue ( sessionId+"/published", ( QVariant ) published );
st.setting()->setValue ( sessionId+"/applications",
( QVariant ) appList );
st.setting()->setValue ( sessionId+"/command",
diff --git a/sessionwidget.h b/sessionwidget.h
index 27767d2..5dd0bd4 100644
--- a/sessionwidget.h
+++ b/sessionwidget.h
@@ -25,43 +25,43 @@ class QLabel;
class QCheckBox;
class SessionWidget : public ConfigWidget
{
- Q_OBJECT
- public:
- SessionWidget ( QString id, ONMainWindow * mv,
- QWidget * parent = 0, Qt::WindowFlags f = 0 );
- ~SessionWidget();
- void setDefaults();
- void saveSettings();
- QString sessionName();
- private slots:
- void slot_getIcon();
- void slot_getKey();
- void slot_changeCmd ( int var );
- void slot_rdpOptions();
+ Q_OBJECT
+public:
+ SessionWidget ( QString id, ONMainWindow * mv,
+ QWidget * parent = 0, Qt::WindowFlags f = 0 );
+ ~SessionWidget();
+ void setDefaults();
+ void saveSettings();
+ QString sessionName();
+private slots:
+ void slot_getIcon();
+ void slot_getKey();
+ void slot_changeCmd ( int var );
+ void slot_rdpOptions();
- private:
- enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION};
- QLineEdit* sessName;
- QLineEdit* uname;
- QLineEdit* server;
- QSpinBox* sshPort;
- QLineEdit* key;
- QCheckBox* cbAutoLogin;
- QCheckBox* cbKrbLogin;
- QString sessIcon;
- QPushButton* icon;
- QLineEdit* cmd;
- QComboBox* cmdCombo;
- QComboBox* sessBox;
- QLabel* leCmdIp;
- QPushButton* pbAdvanced;
- QString rdpOptions;
- QString rdpServer;
- QString xdmcpServer;
- private:
- void readConfig();
- signals:
- void nameChanged ( const QString & );
+private:
+ enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED};
+ QLineEdit* sessName;
+ QLineEdit* uname;
+ QLineEdit* server;
+ QSpinBox* sshPort;
+ QLineEdit* key;
+ QCheckBox* cbAutoLogin;
+ QCheckBox* cbKrbLogin;
+ QString sessIcon;
+ QPushButton* icon;
+ QLineEdit* cmd;
+ QComboBox* cmdCombo;
+ QComboBox* sessBox;
+ QLabel* leCmdIp;
+ QPushButton* pbAdvanced;
+ QString rdpOptions;
+ QString rdpServer;
+ QString xdmcpServer;
+private:
+ void readConfig();
+signals:
+ void nameChanged ( const QString & );
};
#endif
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 9c6626a..1f7b724 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -35,6 +35,12 @@
#endif
#include <math.h>
+#ifndef Q_OS_WIN
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#endif
+
+
#include "onmainwindow.h"
#undef DEBUG
@@ -212,6 +218,16 @@ void SshMasterConnection::run()
return;
}
+
+#ifndef Q_OS_WIN
+ const int y=1;
+#else
+ const char y=1;
+#endif
+ socket_t session_sock=ssh_get_fd(my_ssh_session);
+ setsockopt(session_sock, IPPROTO_TCP, TCP_NODELAY,&y, sizeof(int));
+
+
if ( reverseTunnel )
{
if ( channel_forward_listen ( my_ssh_session, NULL, reverseTunnelRemotePort, NULL ) !=SSH_OK )
@@ -591,6 +607,13 @@ void SshMasterConnection::channelLoop()
x2goDebug<<"new forward connection"<<endl;
#endif
int sock=socket ( AF_INET, SOCK_STREAM,0 );
+#ifndef Q_OS_WIN
+ const int y=1;
+#else
+ const char y=1;
+#endif
+ setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,&y, sizeof(int));
+
struct sockaddr_in address;
address.sin_family=AF_INET;
address.sin_port=htons ( reverseTunnelLocalPort );
diff --git a/userbutton.cpp b/userbutton.cpp
index 21787ca..270ea93 100644
--- a/userbutton.cpp
+++ b/userbutton.cpp
@@ -26,44 +26,49 @@
UserButton::UserButton ( ONMainWindow* wnd, QWidget *par, QString name,
QString fullName, QPixmap& foto, QPalette& bgpal,
int width,int height )
- : QPushButton ( par )
+ : QPushButton ( par )
{
- user=name;
- fname=fullName;
- image=foto;
- setFocusPolicy ( Qt::NoFocus );
- setAutoFillBackground ( true );
- setFlat ( true );
- setPalette ( bgpal );
+ user=name;
+ fname=fullName;
+ image=foto;
+ setFocusPolicy ( Qt::NoFocus );
+ setAutoFillBackground ( true );
+ setFlat ( true );
+ bgpal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+ bgpal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+ bgpal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+ bgpal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
- bool miniMode=wnd->retMiniMode();
- if ( width==0 || height==0 )
- {
- if ( !miniMode )
- {
- setFixedSize ( 340,100 );
- }
- else
- setFixedSize ( 250,100 );
- }
- else
- {
- setFixedSize ( width,height );
- }
- QLabel* f=new QLabel ( this );
- QString text=name+"\n("+fullName+")";
- QLabel* n=new QLabel ( text,this );
- if ( !miniMode )
- n->move ( 110,25 );
- else
- n->move ( 90,25 );
- f->setPixmap ( foto );
- f->setMaximumSize ( 80,80 );
- if ( !miniMode )
- f->move ( 10,10 );
- else
- f->move ( 5,10 );
- connect ( this,SIGNAL ( clicked() ),this,SLOT ( slotClicked() ) );
+ setPalette ( bgpal );
+
+ bool miniMode=wnd->retMiniMode();
+ if ( width==0 || height==0 )
+ {
+ if ( !miniMode )
+ {
+ setFixedSize ( 340,100 );
+ }
+ else
+ setFixedSize ( 250,100 );
+ }
+ else
+ {
+ setFixedSize ( width,height );
+ }
+ QLabel* f=new QLabel ( this );
+ QString text=name+"\n("+fullName+")";
+ QLabel* n=new QLabel ( text,this );
+ if ( !miniMode )
+ n->move ( 110,25 );
+ else
+ n->move ( 90,25 );
+ f->setPixmap ( foto );
+ f->setMaximumSize ( 80,80 );
+ if ( !miniMode )
+ f->move ( 10,10 );
+ else
+ f->move ( 5,10 );
+ connect ( this,SIGNAL ( clicked() ),this,SLOT ( slotClicked() ) );
}
UserButton::~UserButton()
@@ -71,5 +76,5 @@ UserButton::~UserButton()
void UserButton::slotClicked()
{
- emit userSelected ( this );
+ emit userSelected ( this );
}
diff --git a/version.h b/version.h
index 60acdf9..bae887b 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.1.1"
+#define VERSION "3.99.2.0"
diff --git a/x2goclient.pro b/x2goclient.pro
index 16c5f06..8e5ea80 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -10,15 +10,23 @@ 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 contest.ui
+FORMS += cupsprintsettingsdialog.ui \
+ cupsprintwidget.ui \
+ printdialog.ui \
+ printercmddialog.ui \
+ printwidget.ui \
+ xsettingsui.ui \
+ brokerpassdialog.ui \
+ contest.ui \
+ appdialog.ui
TRANSLATIONS += x2goclient_en.ts \
- x2goclient_de.ts \
- x2goclient_ru.ts \
- x2goclient_nb_no.ts \
- x2goclient_sv.ts \
- x2goclient_fr.ts \
- x2goclient_zh_tw.ts
+ x2goclient_de.ts \
+ x2goclient_ru.ts \
+ x2goclient_nb_no.ts \
+ x2goclient_sv.ts \
+ x2goclient_fr.ts \
+ x2goclient_zh_tw.ts
HEADERS += configdialog.h \
editconnectiondialog.h \
@@ -54,7 +62,8 @@ HEADERS += configdialog.h \
x2gosettings.h \
brokerpassdlg.h \
contest.h \
- xsettingswidget.h
+ xsettingswidget.h \
+ appdialog.h
SOURCES += sharewidget.cpp \
settingswidget.cpp\
@@ -91,7 +100,8 @@ SOURCES += sharewidget.cpp \
x2gosettings.cpp \
brokerpassdlg.cpp \
contest.cpp \
- xsettingswidget.cpp
+ xsettingswidget.cpp \
+ appdialog.cpp
LIBS += -lssh
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index 157a4f2..4fa81da 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -2,6 +2,84 @@
<!DOCTYPE TS>
<TS version="2.0" language="de">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation type="unfinished">Konfiguration</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
@@ -1019,41 +1097,41 @@ sound system connections through firewalls</source>
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation>de</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation>pc105/de</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
<translation>Support ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation>Sitzung:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation>&Beenden</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
@@ -1062,7 +1140,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">&Neue Sitzung ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation>Strg+N</translation>
</message>
@@ -1071,7 +1149,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">Sitzungsverwaltung...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation>Strg+E</translation>
</message>
@@ -1080,7 +1158,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">LDAP &Konfiguration ...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation>Wergzeugleiste wieder anzeigen</translation>
</message>
@@ -1089,176 +1167,182 @@ sound system connections through firewalls</source>
<translation type="obsolete">Ãber X2GoClient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation>Ãber QT</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation>Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation>Strg +Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation>&Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation>&Einstellungen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
<translation>Tastaturlayout:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation>Anwendungen...</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
<translation>Ungültige Antwort vom Session-Broker</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation> on </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation>Benutzername:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation>Wähle Sitzung:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation>Fortfahren</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translation>Anhalten</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translation>Beenden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation>Neu</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation>Display</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation>Server</translation>
</message>
@@ -1267,20 +1351,20 @@ sound system connections through firewalls</source>
<translation type="obsolete">Startzeit</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation>Client IP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation>aktiv</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation>angehalten</translation>
</message>
@@ -1293,46 +1377,46 @@ sound system connections through firewalls</source>
<translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>SSL Tunnel kann nicht erzeugt werden:
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation>verbinde</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation>starte</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation>aktiviere</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation>Zeitüberschreitung</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation>Abbruch</translation>
</message>
@@ -1341,7 +1425,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="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation>Abbruch</translation>
</message>
@@ -1350,76 +1434,76 @@ sound system connections through firewalls</source>
<translation type="obsolete">Zeige Details</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
<translation> (kann Datei nicht öffnen)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
<translation> (Datei existiert nicht)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
<translation> (Verzeichnis existiert nicht)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translation>unerwarteter Wert "--link"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation>unerwarteter Wert "--sound"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation>unerwarteter Wert "--geometry"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation>unerwarteter Wert "--set-kbd"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation>unerwarteter Wert "--ldap"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation>unerwarteter Wert "--pack"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation>unerwarteter Wert: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation>Liste aller Packmethoden:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
<translation>Support</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
</message>
@@ -1432,15 +1516,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="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation><b>Verbindung fehlgeschlagen</b>
@@ -1451,22 +1535,23 @@ sound system connections through firewalls</source>
<translation type="obsolete">es konnte kein Server gefunden werden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation>Sitzungs ID</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation>anhalten</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation>beende</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
@@ -1519,17 +1604,17 @@ sound system connections through firewalls</source>
<translation type="obsolete"><b>X2GoClient 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 X2GoServers 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="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translation><b>Falsches Passwort!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation>unerwarteter Wert "--ldap1"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation>unerwarteter Wert "--ldap2"</translation>
</message>
@@ -1558,12 +1643,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="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation>Datei konnte nicht erzeugt werden: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation>Es wurde keine gültige Karte gefunden</translation>
</message>
@@ -1572,13 +1657,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="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translation>&Konfiguration ...</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translation>Einstellungen</translation>
</message>
@@ -1587,17 +1672,16 @@ 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="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
<source>Can't connect to X-Server</source>
- <translation>Verbindung zu X-Server konnte nicht hergestellt werden</translation>
+ <translation type="obsolete">Verbindung zu X-Server konnte nicht hergestellt werden</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
- <translation>Verbindung zu X-Server konnte nicht hergestellt werden
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
+ <translation type="unfinished">Verbindung zu X-Server konnte nicht hergestellt werden
Ãberprüfen Sie Ihre Einstellungen</translation>
</message>
<message>
@@ -1605,40 +1689,39 @@ Please check your settings</source>
<translation type="obsolete">X-Server konnte nicht gestartet werden</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
<source>Can't start X Server
Please check your settings</source>
- <translation>X-Server konnte nicht gestartet werden
+ <translation type="obsolete">X-Server konnte nicht gestartet werden
Ãberprüfen Sie Ihre Einstellungen</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation>24 oder 32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<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="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation>Ja</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation>Nein</translation>
</message>
@@ -1655,42 +1738,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 X2GoServers 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="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation>Befehl</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation>Desktopumgebung</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation>Anwendung</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translation></translation>
</message>
@@ -1699,98 +1782,99 @@ Please check your settings</source>
<translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation>Befehl konnte nicht ausgeführt werden:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation>Webbrowser</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation>E-Mail-Programm</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation>&Neue Sitzung ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translation>Sitzungsverwaltung...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation>Zeige Wergzeugleiste</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation>Ãber X2GoClient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation>LDAP enthält keinen X2GoServer </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<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="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>Falsches Passwort!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation>es konnte kein Server gefunden werden</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<oldsource>Active connection</oldsource>
<translation>Nicht verbunden</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation>Startzeit</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation>Ordner kann nicht erzeugt werden:</translation>
</message>
@@ -1833,113 +1917,174 @@ Public key hash: </source>
<translation>Anmeldung fehlgeschlagen</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
<translation>Server nicht verfügbar</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation>Datei kann nicht geschrieben werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation>SSL Tunnel kann nicht erzeugt werden:
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<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="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation>Ordner freigeben...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation>Zeige Details</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation><b>X2GoClient V. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<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="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
+Please check your settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<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="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation>&Desktopsymbol erzeugen...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
<translation>&Kennwort für Session-Broker setzen...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
<translation>&Verbindungstest...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
<translation>Operation fehlgeschlagen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
<translation>Das Kennwort wurde geändert</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
<translation>Falsches Kennwort!</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
<translation><b>Authentifizierung</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation type="unfinished">Konfiguration</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<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 Maustaste: verstecken/wiederherstellen - rechte Maustaste: Kontextmenü</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation>Desktopsymbol erzeugen</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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>
@@ -1948,44 +2093,44 @@ Use x2goclient hidden mode?</source>
Wollen Sie den versteckten Modus nutzen?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation>Neue Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
<translation>Keine X2Go-Sitzungen gefunden</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation>RDP Verbindung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation>Fenster abkoppeln</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation>Fenster einbetten</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation>Beendet</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<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>
@@ -1995,7 +2140,7 @@ 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 X2GoServers 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="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -2004,18 +2149,18 @@ Please check your installation</source>
Bitte überprüfen Sie Ihre Installation</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation>X2Go-Sitzung</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation>Symbole verstecken</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<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>
@@ -2024,7 +2169,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="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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>
@@ -2033,65 +2178,65 @@ Sie können SSHD über folgenden Befehl installieren:
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation>Zugriff auf lokalen Desktop</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation>Hinweis</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation>Desktopauswahl:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation>Nur betrachten</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation>Benutzer</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation>Kein freigegebener Desktop gefunden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation>Vollzugriff</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation>Nur eigene Desktops</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation>Neu verbinden</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation>Verbinden mit Broker</translation>
</message>
@@ -2100,12 +2245,12 @@ Sie können SSHD über folgenden Befehl installieren:
<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="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<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="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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 X2GoServers 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>
@@ -2120,7 +2265,7 @@ Sie können SSHD über folgenden Befehl installieren:
<translation>ISO8859-1</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation>wrong value for argument"speed"</translation>
</message>
@@ -2364,30 +2509,37 @@ Beispiel:
<translation>KDE</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="412"/>
+ <location filename="sessionbutton.cpp" line="680"/>
<source>fullscreen</source>
<translation>Vollbild</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
- <location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
<translation>Anzeige </translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation>aktiviert</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation>deaktiviert</translation>
</message>
@@ -2396,8 +2548,8 @@ Beispiel:
<translation type="obsolete">/usr/bin/startkde</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation>Fenster</translation>
</message>
@@ -2447,23 +2599,23 @@ Beispiel:
<translation>angehalten</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation>RDP Verbindung</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation>Zugriff auf lokalen Desktop</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
@@ -2582,7 +2734,7 @@ Beispiel:
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation>Verbindung mit Windows Terminalserver herstellen</translation>
</message>
@@ -2597,57 +2749,62 @@ Beispiel:
<translation>Anwendung</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
<source>Command:</source>
<translation>Befehl:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation>Erweiterte Einstellungen...</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation>Pfad zum Programm</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation>Ãffne Bild</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation>Bilder</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation>Ãffne Schlüssel</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation>Alle Dateien</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation>Server:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation>rdesktop Kommandozeilenoptionen:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation>Neue Sitzung</translation>
</message>
@@ -2657,8 +2814,8 @@ Beispiel:
<translation>Zugriff auf lokalen Desktop</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation>XDMCP Server:</translation>
</message>
@@ -2668,12 +2825,12 @@ Beispiel:
<translation>XDMCP</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation>x2goclient befindet sich im portablen Ausführungsmodus. Wenn Sie einen Pfad ausserhalb des USB Geräts wählen, können sie auf die Daten nicht von überall aus zugreifen.</translation>
</message>
@@ -2900,77 +3057,77 @@ sound system connections through firewalls</source>
<translation>Kann libssh nicht initialisieren</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
<translation>Kann SSH-Sitzung nicht erstellen</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
<translation>Verbindungsaufbau nicht möglich </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
<translation>Anmeldung fehlgeschlagen</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
<translation>channel_forward_listen schlug fehl</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
<translation>Kann Datei nicht öffnen </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
<translation>Kann entfernte Datei nicht öffnen</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
<translation>Kann entfernte Datei nicht schreiben </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
<translation>Kann Verbindung nicht herstellen zu </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
<translation>channel_open_forward schlug fehl</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
<translation>channel_open_session schlug fehl</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
<translation>channel_request_exec schlug fehl</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
<translation>Fehler beim Schreiben auf Socket</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
<translation>Channel Lesefehler</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
<translation>Channel Schreibfehler</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
<translation>Lesefehler TCP-Socket</translation>
</message>
diff --git a/x2goclient_en.ts b/x2goclient_en.ts
index 1dfa80c..f7265b3 100644
--- a/x2goclient_en.ts
+++ b/x2goclient_en.ts
@@ -2,6 +2,84 @@
<!DOCTYPE TS>
<TS version="2.0" language="en_US">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
@@ -645,360 +723,416 @@
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<source>Are you sure you want to delete this session?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation type="unfinished"></translation>
</message>
@@ -1037,15 +1171,15 @@ Public key hash: </source>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation type="unfinished"></translation>
</message>
@@ -1055,374 +1189,371 @@ Public key hash: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<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="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<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="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<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="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<source>This card is unknown by X2Go system</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
- <source>Can't connect to X-Server</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
Please check your settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
- <source>Can't start X Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -1430,12 +1561,12 @@ Please check your installation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
@@ -1463,131 +1594,136 @@ Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<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="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<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="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
<translation type="unfinished"></translation>
</message>
@@ -1846,57 +1982,64 @@ Example:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
- <source>fullscreen</source>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
+ <location filename="sessionbutton.cpp" line="395"/>
<location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="680"/>
+ <source>fullscreen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -1999,7 +2142,7 @@ Example:
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation type="unfinished"></translation>
</message>
@@ -2024,73 +2167,78 @@ Example:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
- <source>Command:</source>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
+ <source>Command:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation type="unfinished"></translation>
</message>
@@ -2316,77 +2464,77 @@ sound system connections through firewalls</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
<translation type="unfinished"></translation>
</message>
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index 78387f4..58fd675 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -2,6 +2,84 @@
<!DOCTYPE TS>
<TS version="2.0" language="fr">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
@@ -645,478 +723,535 @@
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<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="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<source>Are you sure you want to delete this session?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<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="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation type="unfinished"></translation>
</message>
@@ -1149,8 +1284,8 @@ Public key hash: </source>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation type="unfinished"></translation>
</message>
@@ -1166,257 +1301,253 @@ Public key hash: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<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="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<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="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<source>This card is unknown by X2Go system</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
- <source>Can't connect to X-Server</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
Please check your settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
- <source>Can't start X Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -1424,12 +1555,12 @@ Please check your installation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
@@ -1447,133 +1578,138 @@ Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<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="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<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="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation type="unfinished"></translation>
</message>
@@ -1588,7 +1724,7 @@ you can install sshd with
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation type="unfinished"></translation>
</message>
@@ -1847,57 +1983,64 @@ lpr -P hp_laserjet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
- <source>fullscreen</source>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
+ <location filename="sessionbutton.cpp" line="395"/>
<location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="680"/>
+ <source>fullscreen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -2000,7 +2143,7 @@ lpr -P hp_laserjet</source>
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation type="unfinished"></translation>
</message>
@@ -2025,73 +2168,78 @@ lpr -P hp_laserjet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
- <source>Command:</source>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
+ <source>Command:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation type="unfinished"></translation>
</message>
@@ -2317,77 +2465,77 @@ sound system connections through firewalls</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
<translation type="unfinished"></translation>
</message>
diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts
index d14dbcf..3355193 100644
--- a/x2goclient_nb_no.ts
+++ b/x2goclient_nb_no.ts
@@ -2,6 +2,84 @@
<!DOCTYPE TS>
<TS version="2.0" language="nb_NO">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation type="unfinished">Innstillinger</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
@@ -655,42 +733,42 @@
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation>no</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation>pc105/de</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
<translatorcomment>Need to double-check this one</translatorcomment>
<translation>Støtte ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation>Sesjon:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation>&Avslutt</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation>Avslutt</translation>
</message>
@@ -699,7 +777,7 @@
<translation type="obsolete">&Neue Sitzung ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
@@ -708,7 +786,7 @@
<translation type="obsolete">Sitzungsverwaltung...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
@@ -717,7 +795,7 @@
<translation type="obsolete">LDAP &Konfiguration ...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation>Gjenopprett verktøylinjen</translation>
</message>
@@ -726,179 +804,185 @@
<translation type="obsolete">Ãber X2GO Client</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation>Om QT</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation>Sesjon</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation>&Sesjon</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation>&Innstillinger</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation>&Hjelp</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation>Passord:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
<translation>Tastatur utseende:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
<translatorcomment>Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context.</translatorcomment>
<translation>Ugyldig svar fra megleren</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation> på </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation>Brukernavn:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation>Velg sesjon:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation>Gjenoppta</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translatorcomment>I disagree with the word 'Suspend' here, if it was suspending then the session would be paused. As this is not the case, it's more like disconnect (and the counterpart: reconnect). I used the translation fro 'Disconnect' here, and will research the possibility of changing the Suspend word to Disconnect also in the english translation.</translatorcomment>
<translation>Koble fra</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment>
<translation>Avslutte</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation>Skjerm</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation>Server</translation>
</message>
@@ -907,20 +991,20 @@
<translation type="obsolete">Startzeit</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation>Klient IP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation>aktiv</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation>Frakoblet</translation>
</message>
@@ -933,46 +1017,46 @@
<translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>Klarer ikke å opprette SSL tunnel:
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation>kobler til</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation>starter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation>gjenopptar</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation>Tilkoblingen tidsavbrutt, avbryter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation>Avbryter</translation>
</message>
@@ -981,7 +1065,7 @@
<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="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation>Avbryt</translation>
</message>
@@ -990,78 +1074,78 @@
<translation type="obsolete">Zeige Details</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
<translation> (kan ikke åpne filen)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
<translation> (filen finnes ikke)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
<translation> (mappen finnes ikke)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translatorcomment>Chose to use 'parameteren' here, the direct translation is 'argument', but didn't fit in my opinion. The cmdline arguments, will they be translated as well?</translatorcomment>
<translation>ugyldig verdi for parameteren "--link"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation>ugyldig verdi for parameteren "--sound"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation>ugyldig verdi for parameteren "--geometry"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation>ugyldig verdi for parameteren "--set-kbd"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation>ugyldig verdi for parameteren "--ldap"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation>ugyldig verdi for parameteren "--pack"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation>ugyldig parameter: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation>Tilgjengelige pakkemetoder:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
<translatorcomment>Will have to revisit this one, not sure if it fits</translatorcomment>
<translation>Støtte</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation>Vennligst sjekk LDAP innstillingene</translation>
</message>
@@ -1074,15 +1158,15 @@
<translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation><b>Tilkoblingen feilet</b>
@@ -1093,22 +1177,23 @@
<translation type="obsolete">es konnte kein Server gefunden werden</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation>Sesjons ID</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation>Kobler fra</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation>Avslutter</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
@@ -1163,18 +1248,18 @@
<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="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translatorcomment>Should we actually tell that it's the password that's wrong? Isn't that considered bad practice in regards to security? I propose to use "Wrong Username or Password!" instead.</translatorcomment>
<translation><b>Feil passord!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation>ugyldig verdi for parameteren "--ldap1"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation>ugyldig verdi for parameteren "--ldap2"</translation>
</message>
@@ -1203,12 +1288,12 @@
<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="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation>Klarer ikke å opprette filen: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation>Ingen gyldige kort ble funnet</translation>
</message>
@@ -1217,14 +1302,14 @@
<translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translatorcomment>Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions</translatorcomment>
<translation>&Innstillinger</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translatorcomment>Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first</translatorcomment>
<translation>Alternativer</translation>
@@ -1234,17 +1319,16 @@
<translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
<source>Can't connect to X-Server</source>
- <translation>Klarte ikke å koble til X-Serveren</translation>
+ <translation type="obsolete">Klarte ikke å koble til X-Serveren</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
- <translation>Klarte ikke å koble til X-Serveren
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
+ <translation type="unfinished">Klarte ikke å koble til X-Serveren
Vennligst sjekk innstillingene dine</translation>
</message>
<message>
@@ -1252,40 +1336,39 @@ Vennligst sjekk innstillingene dine</translation>
<translation type="obsolete">X-Server konnte nicht gestartet werden</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
<source>Can't start X Server
Please check your settings</source>
- <translation>Klarte ikke å starte X-Serveren
+ <translation type="obsolete">Klarte ikke å starte X-Serveren
Vennligst sjekk instillingene dine</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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>Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene <b>vil du miste hele sesjonen</b>. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation>24 eller 32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
<translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. <br>Gjenoppta denne sesjonen uansett?</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation>Ja</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation>Nei</translation>
</message>
@@ -1302,42 +1385,42 @@ Vennligst sjekk instillingene dine</translation>
<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="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation>OpenOffice.org</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation>Terminal</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation>Kommando</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation>Skrivebord</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation>enkel applikasjon</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translatorcomment>hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian</translatorcomment>
<translation>skygge sesjonen</translation>
@@ -1347,98 +1430,99 @@ Vennligst sjekk instillingene dine</translation>
<translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation>Klarte ikke å utføre:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation>X2Go klient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation>Nettleser</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation>Epost program</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation>&Ny sesjon ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translation>Sesjonshåndtering...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation>Vis verktøylinje</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation>Om X2GO klient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation>Vennligst sjekk LDAP innstillingene</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation>Inge X2Go server ble funnet i LDAP </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<source>Are you sure you want to delete this session?</source>
<translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>Feil passord!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation>Ingen tilgjengelig server</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<oldsource>Active connection</oldsource>
<translation>Ikke tilkoblet</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation>Opprettelsestidspunkt</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation>Klarer ikke å opprette katalogen:</translation>
</message>
@@ -1483,117 +1567,178 @@ Offentlig nøkkel: </translation>
<translation>PÃ¥logging feilet</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
<translation>Serveren er ikke tilgjengelig</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation>Klarer ikke å skrive til filen:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation>Klarte ikke å opprette SSL tunnel:
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
<translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment>
<translation><b>Sesjons ID:<br>Server:<br>Brukernavn:<br>Skjerm:<br>Opprettet:<br>Status:</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation>Del mappe...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation>Vis detailjer</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation><b>X2Go klient v. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<source>This card is unknown by X2Go system</source>
<translatorcomment>Need to double-check if the translation of "card" is suitable here</translatorcomment>
<translation>Dette kortet er ukjent for X2Go systemet</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
+Please check your settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel
Vennligst oppdater til en nyere x2goserver pakke</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation>&Opprett sesjonsikon på skrivebordet...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
<translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment>
<translation>&Sett megler passord...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
<translation>&Tilkoblings-test...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
<translation>Handlingen feilet</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
<translation>Passordet er endret</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
<translation>Feil passord!</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
<translation><b>Autentisering</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation>Gjenopprett</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation type="unfinished">Innstillinger</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<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>
<translatorcomment>According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny"</translatorcomment>
<translation>Venstre museknapp for å skjule/gjenopprette - Høyre museknapp viser sprettoppmeny</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation>Opprett sesjonsikon på skrivebordet</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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>
@@ -1602,45 +1747,45 @@ Use x2goclient hidden mode?</source>
Ãnsker du Ã¥ aktivere skjult modus for x2goklient?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation>Ny sesjon</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
<translation>X2Go sesjoner ble ikke funnet</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation>RDP tilkobling</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment>
<translation>X2Go kobling til sesjon </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation>Løsne X2Go vindu</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation>Feste X2Go vindu</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation>Ferdig</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation>Er du sikker på at du vil avslutte denne sesjonen?
@@ -1651,7 +1796,7 @@ Ulagrede data vil gå tapt</translation>
<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="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -1660,18 +1805,18 @@ Please check your installation</source>
Vennligst sjekk din installasjon</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation>X2Go sesjon</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation>Minimer verktøylinje</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation><br><b> Trykk her <br> for å gjenopprette <br> verktøylinjen </b><br></translation>
</message>
@@ -1680,7 +1825,7 @@ Vennligst sjekk din installasjon</translation>
<translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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>
@@ -1689,65 +1834,65 @@ Du kan installere sshd med:
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation>Tilkobling til lokalt skrivebord</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation>Informasjon</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation>Velg skrivebord:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation>Kun vis</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation>Bruker</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation>Ingen tilgjengelige skrivebord ble funnet</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation>Full tilgang</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation>Kun mine skrivebord</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation>Gjenoppkoble</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation>Koble til megleren</translation>
</message>
@@ -1756,12 +1901,12 @@ Du kan installere sshd med:
<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="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
<translation><br>x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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>
@@ -1776,7 +1921,7 @@ Du kan installere sshd med:
<translation>ISO8859-1</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation>wrong value for argument"speed"</translation>
</message>
@@ -2049,57 +2194,64 @@ Eksempel:
<translation>KDE</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation>RDP tilkobling</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation>Tilkobling til lokalt skrivebord</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="412"/>
+ <location filename="sessionbutton.cpp" line="680"/>
<source>fullscreen</source>
<translation>fullskjerm</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
- <location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
<translation>Skjerm </translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation>vindu</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation>Aktivert</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation>Deaktivert</translation>
</message>
@@ -2202,7 +2354,7 @@ Eksempel:
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation>Koble til Windows terminal server</translation>
</message>
@@ -2228,73 +2380,78 @@ Eksempel:
<translation>Enkel applikasjon</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
<source>Command:</source>
<translation>Kommando:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation>Avanserte alternativer...</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation>Sti til programfil</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation>Ã
pne bilde</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation>Bilder</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation>Ã
pne nøkkelfil</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation>Alle filer</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation>Server:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation>XDMCP server:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation>rdesktop kommandolinjevalg:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation>Ny sesjon</translation>
</message>
@@ -2524,79 +2681,79 @@ lydsystem forbindelser gjennom brannmurer</translation>
<translation>Klarer ikke å initiere libssh</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
<translation>Klarer ikke å opprette ssh sesjon</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
<translation>Klarer ikke å koble til </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
<translation>Autentisering feilet</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
<translatorcomment>I'm not sure if this is a static variable which shouldn't be translated or not, but I left it as I believe it's a variable.</translatorcomment>
<translation>channel_forward_listen feilet</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
<translation>Kan ikke åpne filen </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
<translation>Klarer ikke å opprette fil over nettverket </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
<translation>Klarer ikke å skrive til filen over nettverket </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
<translation>Klarer ikke å koble til </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
<translation>channel_open_forward feilet</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
<translation>channel_open_session feilet</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
<translation>channel_request_exec feilet</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
<translatorcomment>Really not any great words to best translate socket into...</translatorcomment>
<translation>feil ved skriving til sokkelen</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
<translation>feil under lesing av kanalen</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
<translation>channel_write feilet</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
<translation>feil ved lesing av tcp sokkelen</translation>
</message>
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index ba0ed9b..892ba70 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -2,31 +2,109 @@
<!DOCTYPE TS>
<TS version="2.0" language="ru">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation>УдаленнÑе пÑиложениÑ</translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation>ÐоиÑк:</translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation>&ÐÑÑк</translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation>&ÐакÑÑÑÑ</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation>ÐÑлÑÑимедиа</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation>РазÑабоÑка</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation>ÐбÑÑение</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation>ÐгÑÑ</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation>ÐÑаÑика</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation>СеÑÑ</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation>ÐÑиÑ</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation>УÑÑановки</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation>СиÑÑема</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation>УÑилиÑÑ</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation>ÐÑÑгие</translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">Ðиалог</translation>
+ <translation>Ðиалог</translation>
</message>
<message>
<location filename="brokerpassdialog.ui" line="22"/>
<source>Old password:</source>
- <translation type="unfinished"></translation>
+ <translation>СÑаÑÑй паÑолÑ:</translation>
</message>
<message>
<location filename="brokerpassdialog.ui" line="36"/>
<source>New password:</source>
- <translation type="unfinished"></translation>
+ <translation>ÐовÑй паÑолÑ:</translation>
</message>
<message>
<location filename="brokerpassdialog.ui" line="50"/>
<source>Confirm password:</source>
- <translation type="unfinished"></translation>
+ <translation>ÐодÑвеÑдиÑÑ Ð¿Ð°ÑолÑ:</translation>
</message>
<message>
<location filename="brokerpassdialog.ui" line="79"/>
<source>TextLabel</source>
- <translation type="unfinished"></translation>
+ <translation>меÑка</translation>
</message>
</context>
<context>
@@ -34,7 +112,7 @@
<message>
<location filename="brokerpassdlg.cpp" line="41"/>
<source>Passwords do not match</source>
- <translation type="unfinished"></translation>
+ <translation>ÐаÑоли не ÑовпадаÑÑ</translation>
</message>
</context>
<context>
@@ -128,50 +206,50 @@
<message>
<location filename="contest.ui" line="14"/>
<source>Connectivity test</source>
- <translation type="unfinished"></translation>
+ <translation>ТеÑÑ ÑоединениÑ</translation>
</message>
<message>
<location filename="contest.ui" line="24"/>
<source>HTTPS connection:</source>
- <translation type="unfinished"></translation>
+ <translation>HTTPS Ñоединение:</translation>
</message>
<message>
<location filename="contest.ui" line="31"/>
<source>SSH connection:</source>
- <translation type="unfinished"></translation>
+ <translation>SSH Ñоединение:</translation>
</message>
<message>
<location filename="contest.ui" line="38"/>
<source>Connection speed:</source>
- <translation type="unfinished"></translation>
+ <translation>СкоÑоÑÑÑ ÑоединениÑ:</translation>
</message>
<message>
<location filename="contest.ui" line="123"/>
<location filename="contest.ui" line="167"/>
<source>Failed</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑибка</translation>
</message>
<message>
<location filename="contest.ui" line="211"/>
<source>0 Kb/s</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="contest.cpp" line="108"/>
<location filename="contest.cpp" line="115"/>
<source>OK</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="contest.cpp" line="150"/>
<source>Socket operation timed out</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="contest.cpp" line="162"/>
<location filename="contest.cpp" line="168"/>
<source>Failed: </source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑибка:</translation>
</message>
</context>
<context>
@@ -944,7 +1022,7 @@ sound system connections through firewalls</source>
<message>
<location filename="httpbrokerclient.cpp" line="329"/>
<source>Login failed!<br>Please try again</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑибка авÑоÑизаÑии<br>ÐовÑоÑиÑе попÑÑкÑ</translation>
</message>
<message>
<location filename="httpbrokerclient.cpp" line="454"/>
@@ -1051,41 +1129,41 @@ sound system connections through firewalls</source>
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation>ru</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation>pc105/ru</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
- <translation type="unfinished"></translation>
+ <translation>ÐоддеÑжка ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation>СеÑÑиÑ:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation>&ÐÑÑ
од</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation>ÐÑÑ
од</translation>
</message>
@@ -1094,7 +1172,7 @@ sound system connections through firewalls</source>
<translation type="obsolete">&ÐÐ¾Ð²Ð°Ñ ÑеÑÑÐ¸Ñ ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
@@ -1103,17 +1181,17 @@ sound system connections through firewalls</source>
<translation type="obsolete">УпÑавление ÑеÑÑиÑми...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translation>&УÑÑановки ...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation>ÐоÑÑÑановиÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑменÑов</translation>
</message>
@@ -1122,121 +1200,127 @@ sound system connections through firewalls</source>
<translation type="obsolete">РпÑогÑамме "X2GO Client"</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation>Ð Qt</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation>СеÑÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation>&СеÑÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation>&ÐпÑии</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation>&ÐомоÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation>ÐолÑзоваÑелÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation>ÐаÑолÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
- <translation type="unfinished">РаÑкладка ÐлавиаÑÑÑÑ:</translation>
+ <translation>РаÑкладка ÐлавиаÑÑÑÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation>ÐÐ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation>ÐÑмена</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation>ÐÑиложениÑ...</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="onmainwindow.cpp" line="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <translation>ÐевеÑнÑй оÑÐ²ÐµÑ Ð±ÑокеÑа</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation>ÐÑибка</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation>ÐÑовеÑÑе наÑÑÑойки LDAP</translation>
</message>
@@ -1249,32 +1333,32 @@ sound system connections through firewalls</source>
<translation type="obsolete">УдалиÑÑ ÑеÑÑиÑ?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation> на </translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation><b>ÐÑибка ÑоединениÑ</b><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translation><b>ÐевеÑнÑй паÑолÑ!</b><br><br></translation>
</message>
@@ -1283,51 +1367,51 @@ sound system connections through firewalls</source>
<translation type="obsolete">Ðе доÑÑÑпен ни один ÑеÑвеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation>СеÑÑиÑ:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation>ÐоÑÑÑановиÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translation>ÐÑеÑваÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translation>ÐавеÑÑиÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation>ÐоваÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation>ÐиÑплей</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation>СÑаÑÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation>СеÑвеÑ</translation>
</message>
@@ -1336,57 +1420,57 @@ sound system connections through firewalls</source>
<translation type="obsolete">ÐÑÐµÐ¼Ñ ÑозданиÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation>IP клиенÑа</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation>ID ÑеÑÑии</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation>акÑивна</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation>пÑеÑвана</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation>ÐÑедÑпÑеждение</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation>24 или 32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<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="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation>Ðа</translation>
</message>
@@ -1394,33 +1478,34 @@ sound system connections through firewalls</source>
<location filename="onmainwindow_part2.cpp" line="79"/>
<source>Host key for server changed.
It is now: </source>
- <translation type="unfinished"></translation>
+ <translation>ÐлÑÑ Ð½Ð° ÑеÑвеÑе изменен:</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="80"/>
<source>For security reasons, connection will be stopped</source>
- <translation type="unfinished"></translation>
+ <translation>Ðз ÑообÑажений безопаÑноÑÑи Ñоединение бÑÐ´ÐµÑ ÑазоÑвано</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="91"/>
<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>
+ <translation>ÐлÑÑ Ð´Ð»Ñ ÑÑого ÑеÑвеÑа не найден, но дÑÑгой ваÑÐ¸Ð°Ð½Ñ ÐºÐ»ÑÑа ÑÑÑеÑÑвÑеÑ. ÐлоÑмÑÑленик мог измениÑÑ ÐºÐ»ÑÑ ÑеÑвеÑа по ÑмолÑаниÑ, ÑÑо Ð±Ñ Ð²Ð²ÐµÑÑи Ð²Ð°Ñ ÐºÐ»Ð¸ÐµÐ½Ñ Ð² заблÑждение, ÑÑо ÑÑÐ¾Ñ ÐºÐ»ÑÑ Ð½Ðµ ÑÑÑеÑÑвÑеÑ</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="113"/>
<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>
+ <translation>Ðе Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹Ñи Ñайл Ñ ÐºÐ»ÑÑами. ÐÑли Ð²Ñ Ð¿ÑимеÑе ÑÑÐ¾Ñ ÐºÐ»ÑÑ, Ñайл бÑÐ´ÐµÑ Ñоздан авÑомаÑиÑеÑки</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="118"/>
<source>The server is unknown. Do you trust the host key?
Public key hash: </source>
- <translation type="unfinished"></translation>
+ <translation>СеÑÐ²ÐµÑ Ð½Ðµ извеÑÑен. ÐовеÑÑеÑе ли Ð²Ñ ÑÑÐ¾Ð¼Ñ ÐºÐ»ÑÑÑ?
+Public key hash: </translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation>ÐеÑ</translation>
</message>
@@ -1428,28 +1513,28 @@ Public key hash: </source>
<location filename="onmainwindow_part2.cpp" line="122"/>
<location filename="onmainwindow_part2.cpp" line="130"/>
<source>Host key verification failed</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑибка пÑовеÑки клÑÑа</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="146"/>
<source>Authentication failed</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑибка авÑоÑизаÑии</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
- <translation type="unfinished"></translation>
+ <translation>СеÑÐ²ÐµÑ Ð½Ðµ доÑÑÑпен</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation>пÑеÑÑваеÑÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation>завеÑÑаеÑÑÑ</translation>
</message>
@@ -1462,38 +1547,38 @@ Public key hash: </source>
<translation type="obsolete">Ðевозможно запиÑаÑÑ Ñайл:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ SSL ÑÑнелÑ:
</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation>Ñоединение</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation>запÑÑк</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation>воÑÑÑановление</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation>ТаймаÑÑ ÑоединениÑ, оÑмена</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation>оÑмена</translation>
</message>
@@ -1502,7 +1587,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="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation>ÐÑмена</translation>
</message>
@@ -1515,7 +1600,8 @@ Public key hash: </source>
<translation type="obsolete">ÐоказаÑÑ Ð´ÐµÑали</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
@@ -1523,87 +1609,87 @@ Public key hash: </source>
</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
- <translation type="unfinished"></translation>
+ <translation> (невозможно оÑкÑÑÑÑ Ñайл)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
- <translation type="unfinished"></translation>
+ <translation> (Ñайл не ÑÑÑеÑÑвÑеÑ)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
- <translation type="unfinished"></translation>
+ <translation> (каÑалог не ÑÑÑеÑÑвÑеÑ)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation>wrong parameter: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translation>ÐпÑии</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation>Available pack methodes:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
- <translation type="unfinished"></translation>
+ <translation>ÐоддеÑжка</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
@@ -1634,7 +1720,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="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation>ФоÑÐ¼Ð°Ñ ÐºÐ°ÑÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑен</translation>
</message>
@@ -1643,21 +1729,20 @@ Public key hash: </source>
<translation type="obsolete">ÐÑа каÑÑа не ÑконÑигÑÑиÑована Ð´Ð»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ X2Go</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation>Ðевозможно ÑоздаÑÑ Ñайл: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
<source>Can't connect to X-Server</source>
- <translation>Ðевозможно пÑиÑоединиÑÑÑÑ Ðº X-ÑеÑвеÑÑ</translation>
+ <translation type="obsolete">Ðевозможно пÑиÑоединиÑÑÑÑ Ðº X-ÑеÑвеÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
<translation>Ðевозможно пÑиÑоединиÑÑÑÑ Ðº X-ÑеÑвеÑÑ
ÐÑовеÑÑÑе наÑÑÑойки</translation>
</message>
@@ -1666,10 +1751,9 @@ Please check your settings</source>
<translation type="obsolete">Ðевозможно запÑÑÑиÑÑ X-СеÑвеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
<source>Can't start X Server
Please check your settings</source>
- <translation>Ðевозможно запÑÑÑиÑÑ X-СеÑвеÑ
+ <translation type="obsolete">Ðевозможно запÑÑÑиÑÑ X-СеÑвеÑ
ÐÑовеÑÑÑе наÑÑÑойки</translation>
</message>
<message>
@@ -1685,42 +1769,42 @@ Please check your settings</source>
<translation type="obsolete">ÐоÑÑовÑй клиенÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation>ТеÑминал</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation>неизвеÑÑно</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation>Ðоманда</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation>ÐконнÑй менеджеÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation>пÑиложение</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translation>ÑÐµÐ½ÐµÐ²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
@@ -1729,201 +1813,264 @@ Please check your settings</source>
<translation type="obsolete"><br>ÐÑибка наÑÑÑоек "sudo"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation>Ðевозможно вÑполниÑÑ: </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation>Ðеб-бÑоÑзеÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation>ÐоÑÑовÑй клиенÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation>&ÐÐ¾Ð²Ð°Ñ ÑеÑÑÐ¸Ñ ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translation>УпÑавление ÑеÑÑиÑми...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation>ÐÐ°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑменÑов</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation>РпÑогÑамме "X2GO Client"</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation>ÐÑовеÑÑÑе наÑÑÑойки LDAP</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation>СеÑÐ²ÐµÑ X2Go не найден в LDAP </translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<source>Are you sure you want to delete this session?</source>
<translation>УдалиÑÑ ÑеÑÑиÑ?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>ÐевеÑнÑй паÑолÑ!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation>Ðе доÑÑÑпен ни один ÑеÑвеÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<oldsource>Active connection</oldsource>
<translation>Соединение не ÑÑÑановлено</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation>ÐÑÐµÐ¼Ñ ÑозданиÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation>Ðевозможно ÑоздаÑÑ ÐºÐ°Ñалог:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation>Ðевозможно запиÑаÑÑ Ñайл:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation>ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ SSL ÑÑнелÑ:
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<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="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation>ÐкÑпоÑÑ ÐºÐ°Ñалога...</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation>ÐоказаÑÑ Ð´ÐµÑали</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation><b>X2Go Client V. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<source>This card is unknown by X2Go system</source>
<translation>ÐÑа каÑÑа не ÑконÑигÑÑиÑована Ð´Ð»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ X2Go</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
+Please check your settings</source>
+ <translation>Ðевозможно запÑÑÑиÑÑ X-СеÑвеÑ
+ÐÑовеÑÑÑе наÑÑÑойки</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<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="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation>&СоздаÑÑ ÑÑлÑк ÑеÑÑии на ÑабоÑем ÑÑоле...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
- <translation type="unfinished"></translation>
+ <translation>&УÑÑановиÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð½Ð° бÑокеÑе...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
- <translation type="unfinished"></translation>
+ <translation>&ТеÑÑ ÑоединениÑ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑибка</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
- <translation type="unfinished"></translation>
+ <translation>ÐаÑÐ¾Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
- <translation type="unfinished"></translation>
+ <translation>ÐевеÑнÑй паÑолÑ!</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>ÐвÑоÑизаÑиÑ</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation>ÐоÑÑÑановиÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation>ÐÑлÑÑимедиа</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation>РазÑабоÑка</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation>ÐбÑÑение</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation>ÐгÑÑ</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation>ÐÑаÑика</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation>СеÑÑ</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation>ÐÑиÑ</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation>УÑÑановки</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation>СиÑÑема</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation>УÑилиÑÑ</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation>ÐÑÑгие</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<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="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation>СоздаÑÑ ÑÑлÑк ÑеÑÑии на ÑабоÑем ÑÑоле</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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>
@@ -1932,44 +2079,44 @@ Use x2goclient hidden mode?</source>
ÐкÑивиÑоваÑÑ ÑкÑÑÑÑй Ñежим?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation>ÐÐ¾Ð²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
- <translation type="unfinished"></translation>
+ <translation>СеÑÑÐ¸Ñ X2Go не найдена</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation>RDP Ñоединение</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translation></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation>ÐÑÑоединиÑÑ Ð¾ÐºÐ½Ð¾</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation>ÐÑиÑоединиÑÑ Ð¾ÐºÐ½Ð¾</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation>завеÑÑена</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation>ÐÑ ÑвеÑенÑ, ÑÑо Ñ
оÑиÑе ÑдалиÑÑ ÑÑÑ ÑеÑÑиÑ?
@@ -1980,7 +2127,7 @@ 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="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -1989,18 +2136,18 @@ Please check your installation</source>
ÐеÑеÑÑÑановиÑе X2Go Client</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation>СеÑÑÐ¸Ñ X2Go</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation>СвеÑнÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation><br><b> ЩелкниÑе по ÑÑой иконке <br> ÑÑÐ¾Ð±Ñ Ð²Ð¾ÑÑÑановиÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑменÑов </b><br></translation>
</message>
@@ -2009,7 +2156,7 @@ Please check your installation</source>
<translation type="obsolete">Ðевозможно оÑкÑÑÑÑ Ñайл:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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>
@@ -2018,65 +2165,65 @@ you can install sshd with
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation>Соединение Ñ Ð»Ð¾ÐºÐ°Ð»ÑнÑм деÑкÑопом</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation>ÐнÑоÑмаÑиÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation>ФилÑÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation>ÐÑбÑаÑÑ Ð´ÐµÑкÑоп:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation>ТолÑко ÑмоÑÑеÑÑ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation>ÐолÑзоваÑелÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation>ÐоÑÑÑпнÑй деÑкÑоп не найден</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation>ÐолнÑй доÑÑÑп</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation>ТолÑко мои деÑкÑопÑ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation>ÐовÑоÑиÑÑ Ñоединение</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation>Соединение Ñ Ð±ÑокеÑом</translation>
</message>
@@ -2085,12 +2232,12 @@ you can install sshd with
<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="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<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="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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>
@@ -2105,7 +2252,7 @@ you can install sshd with
<translation>KOI8-R</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation>wrong value for argument"speed"</translation>
</message>
@@ -2344,36 +2491,43 @@ Example:
<translation>ÐÐ¾Ð²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
+ <translation>УдаленнÑе пÑиложениÑ</translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="412"/>
+ <location filename="sessionbutton.cpp" line="680"/>
<source>fullscreen</source>
<translation>ÐолноÑкÑÐ°Ð½Ð½Ð°Ñ ÑеÑÑиÑ</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
- <location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
- <translation type="unfinished"></translation>
+ <translation>ÐиÑплей</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation>акÑивиÑован</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation>деакÑивиÑован</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation>окно</translation>
</message>
@@ -2415,12 +2569,12 @@ Example:
<message>
<location filename="sessionbutton.cpp" line="277"/>
<source>running</source>
- <translation type="unfinished">акÑивна</translation>
+ <translation>акÑивна</translation>
</message>
<message>
<location filename="sessionbutton.cpp" line="281"/>
<source>suspended</source>
- <translation type="unfinished">пÑеÑвана</translation>
+ <translation>пÑеÑвана</translation>
</message>
<message>
<location filename="sessionbutton.cpp" line="314"/>
@@ -2428,23 +2582,23 @@ Example:
<translation>KDE</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation>RDP Ñоединение</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation>Соединение Ñ Ð»Ð¾ÐºÐ°Ð»ÑнÑм деÑкÑопом</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
@@ -2549,7 +2703,7 @@ Example:
<message>
<location filename="sessionwidget.cpp" line="108"/>
<source>Kerberos 5 (GSSAPI) authentication</source>
- <translation type="unfinished"></translation>
+ <translation>ÐвÑоÑизаÑÐ¸Ñ Kerberos 5 (GSSAPI)</translation>
</message>
<message>
<location filename="sessionwidget.cpp" line="113"/>
@@ -2563,7 +2717,7 @@ Example:
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation>Соединение Ñ ÑеÑминалÑнÑм ÑеÑвеÑом Windows</translation>
</message>
@@ -2578,57 +2732,62 @@ Example:
<translation>ÐÑиложение</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
+ <translation>УдаленнÑе пÑиложениÑ</translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
<source>Command:</source>
<translation>Ðоманда:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation>ÐÑодвинÑÑÑе ÑÑÑановки...</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation>ÐÑÑÑ Ðº иÑполнÑÐµÐ¼Ð¾Ð¼Ñ ÑайлÑ</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation>ÐÑкÑÑÑÑ Ð¸Ð·Ð¾Ð±Ñажение</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation>ÐзобÑажениÑ</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation>ÐÑкÑÑÑÑ Ñайл Ñ ÐºÐ»ÑÑом</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation>ÐÑе ÑайлÑ</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation>СеÑвеÑ:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation>ÐпÑии командной ÑÑÑоки rdesktop:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation>ÐÐ¾Ð²Ð°Ñ ÑеÑÑиÑ</translation>
</message>
@@ -2638,8 +2797,8 @@ Example:
<translation>Соединение Ñ Ð»Ð¾ÐºÐ°Ð»ÑнÑм деÑкÑопом</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation>СеÑÐ²ÐµÑ XDMCP:</translation>
</message>
@@ -2649,12 +2808,12 @@ Example:
<translation>XDMCP</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation>ÐÑибка</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation>x2goclient запÑÑен в "пеÑеноÑимом" Ñежиме. ÐожалÑйÑÑа вÑбеÑиÑе пÑÑÑ Ð½Ð°Ñ
одÑÑийÑÑ Ð² пÑеделаÑ
иÑполÑзÑемого ноÑиÑÐµÐ»Ñ Ð´Ð»Ñ Ñого, ÑÑо Ð±Ñ Ð²Ñегда имеÑÑ Ð´Ð¾ÑÑÑп к ÐаÑим даннÑм</translation>
</message>
@@ -2697,7 +2856,7 @@ Example:
<message>
<location filename="settingswidget.cpp" line="63"/>
<source>Use whole display</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑполÑзоваÑÑ Ð²ÐµÑÑ Ð´Ð¸Ñплей</translation>
</message>
<message>
<location filename="settingswidget.cpp" line="71"/>
@@ -2707,7 +2866,7 @@ Example:
<message>
<location filename="settingswidget.cpp" line="76"/>
<source>Xinerama extension (support for two or more physical displays)</source>
- <translation type="unfinished"></translation>
+ <translation>Xinerama (поддеÑжка двÑÑ
и более ÑизиÑеÑкиÑ
диÑплеев)</translation>
</message>
<message>
<location filename="settingswidget.cpp" line="92"/>
@@ -2722,12 +2881,12 @@ Example:
<message>
<location filename="settingswidget.cpp" line="102"/>
<source>&Display:</source>
- <translation type="unfinished"></translation>
+ <translation>&ÐиÑплей:</translation>
</message>
<message>
<location filename="settingswidget.cpp" line="104"/>
<source>&Identify all displays</source>
- <translation type="unfinished"></translation>
+ <translation>&ÐденÑиÑиÑиÑоваÑÑ Ð´Ð¸Ñплеи</translation>
</message>
<message>
<location filename="settingswidget.cpp" line="142"/>
@@ -2878,82 +3037,82 @@ sound system connections through firewalls</source>
<message>
<location filename="sshmasterconnection.cpp" line="124"/>
<source>Can not initialize libssh</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
@@ -2961,12 +3120,12 @@ sound system connections through firewalls</source>
<message>
<location filename="sshprocess.cpp" line="97"/>
<source>Error creating socket</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="sshprocess.cpp" line="115"/>
<source>Error binding </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
@@ -2974,12 +3133,12 @@ sound system connections through firewalls</source>
<message>
<location filename="xsettingswidget.cpp" line="50"/>
<source>Open File</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑкÑÑÑÑ Ð¤Ð°Ð¹Ð»</translation>
</message>
<message>
<location filename="xsettingswidget.cpp" line="52"/>
<source>Executable (*.exe)</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑполнÑемÑй Ñайл (*.exe)</translation>
</message>
</context>
<context>
@@ -2987,62 +3146,62 @@ sound system connections through firewalls</source>
<message>
<location filename="xsettingsui.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished">ФоÑма</translation>
+ <translation>ФоÑма</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>
+ <translation>ÐеÑезапÑÑÑиÑе пÑогÑаммÑ, ÑÑо Ð±Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑÑÑпили в ÑилÑ</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="50"/>
<source>use integrated X-Server</source>
- <translation type="unfinished"></translation>
+ <translation>иÑполÑзоваÑÑ Ð²ÑÑÑоеннÑй X-Server</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="60"/>
<source>use custom X-Server</source>
- <translation type="unfinished"></translation>
+ <translation>иÑполÑзоваÑÑ Ð´ÑÑгой X-Server</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="70"/>
<source>custom X-Server</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑÑгой X-СеÑвеÑ</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="78"/>
<source>executable:</source>
- <translation type="unfinished"></translation>
+ <translation>ÐÑполнÑемÑй Ñайл:</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="101"/>
<source>start X-Server on X2Go client start</source>
- <translation type="unfinished"></translation>
+ <translation>запÑÑкаÑÑ X-Server пÑи запÑÑке X2Go client</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="113"/>
<source>command line options:</source>
- <translation type="unfinished"></translation>
+ <translation>аÑгÑменÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑоки:</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="125"/>
<source>X-Server command line options</source>
- <translation type="unfinished"></translation>
+ <translation>ÐпÑии командной ÑÑÑоки X-Server</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="131"/>
<source>window mode:</source>
- <translation type="unfinished"></translation>
+ <translation>оконнÑй Ñежим:</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="141"/>
<source>fullscreen mode:</source>
- <translation type="unfinished"></translation>
+ <translation>полноÑкÑаннÑй Ñежим:</translation>
</message>
<message>
<location filename="xsettingsui.ui" line="151"/>
<source>single application:</source>
- <translation type="unfinished"></translation>
+ <translation>пÑиложение:</translation>
</message>
</context>
<context>
diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts
index 32025c8..6532b01 100644
--- a/x2goclient_sv.ts
+++ b/x2goclient_sv.ts
@@ -2,6 +2,84 @@
<!DOCTYPE TS>
<TS version="2.0" language="sv_SE">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation type="unfinished">Inställningar</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
@@ -651,313 +729,369 @@
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation>se</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation>pc105/se</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation>X2Go-klient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation>ansluter</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation>Webbläsare</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation>E-postklient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation>OpenOffice.org</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation>Terminal</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translation>&Inställningar...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
<translation>Hjälp ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation>Om X2Go-klient</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation>Dela mapp ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translation>Vila</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translation>Avsluta</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation>Ã
teranslut</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation>Koppla lös X2Go-fönster</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation>Minimera verktygsrad</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation>Session:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation>&Avsluta</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation>Avsluta</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation>&Ny session...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translatorcomment>Added Alt shortcut, same letter as Ctrl shortcut (like &New session...)</translatorcomment>
<translation>S&essionshantering...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation>S&kapa sessionsgenväg på Skrivbordet...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
<translation>&Ange agentlösenord...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
<translation>&Testa anslutning...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation>Visa verktygsrad</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation>Om Qt</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation>&Session</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation>&Alternativ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation>&Hjälp</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation>Användare:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
<translation>Operation misslyckades</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
<translation>Lösenord ändrat</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
<translation>Fel lösenord!</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation>Ansluter till agent</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
<translation><b>Autentisering</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation>Ã
terställ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<translation>Ej ansluten</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation type="unfinished">Inställningar</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
<translation>Vänster musknapp för att dölja/återställa - Höger musknapp för att visa snabbmeny</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation>Kontrollera LDAP-inställningar</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation>ingen X2Go-server hittades i LDAP</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation>Skapa sessionsgenväg på Skrivbordet</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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>
@@ -966,48 +1100,48 @@ Use x2goclient hidden mode?</source>
Använd dolt läge?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation>Ny session</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translation>Länk till X2Go-session</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
<translation>X2Go-sessioner hittades inte</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<source>Are you sure you want to delete this session?</source>
<translation>Ãr du säker pÃ¥ att du vill radera denna session?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation>KDE</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation>RDP-anslutning</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation>Anslutning till lokalt Skrivbord</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation> på </translation>
</message>
@@ -1048,15 +1182,15 @@ Publik nyckel: </translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation>Ja</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation>Nej</translation>
</message>
@@ -1066,232 +1200,234 @@ Publik nyckel: </translation>
<translation>Autentisering misslyckades</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation><b>Anslutning misslyckades</b>
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>Fel lösenord!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation>okänt</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation>Ingen server tillgänglig</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
<translation>Server ej tillgänglig</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation>Välj session:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation>aktiv</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation>vilande</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation>Skrivbord</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation>Applikation</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translation>Skuggsession</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation>Information</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation>Inget tillgängligt Skrivbord hittades</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation>Välj Skrivbord:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation>Varning</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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>Ditt nuvarande färgdjup matchar inte X2Go-sessionens färgdjup. Det kan orsaka problem vid återanslutning av sessionen och i de flesta fall <b>förlorar du sessionen</b> och måste starta en ny! Det är starkt rekommenderat att du ändrar färdgjup till </translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation>24 eller 32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
<translation> bitar och startar om X-servern innan du Ã¥teransluter till denna X2Go-session.<br>Ã
teranslut session ändå?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation>försätter i vila</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation>avslutar</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translation><b>Fel lösenord!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation>Kunde inte skapa mapp:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation>Kunde ej skriva till fil:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation>Koppla X2Go-fönster</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation>Kunde ej skapa SSL-tunnel:
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>Kunde ej skapa SSL-tunnel:
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation>avslutad</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation>startar</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation>Ã¥teransluter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation>Anslutning passerade tidsgränsen, avbryter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation>avbryter</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation>Ãr du säker pÃ¥ att du vill avsluta sessionen?
Data som ej sparats kommer att förloras</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation>Session</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation>Display</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation>Skapad</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
@@ -1300,148 +1436,152 @@ Data som ej sparats kommer att förloras</translation>
</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
<translation> (kan inte öppna fil)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
<translation> (filen finns inte)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
<translation> (mapp finns inte)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translation>fel värde för "--link"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation>fel värde för "--sound"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation>fel värde för "--geometry"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation>fel värde för "--set-kbd"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation>fel värde för "--ldap"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation>fel värde för "--ldap1"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation>fel värde för "--ldap2"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation>fel värde för "--pack"</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation>felaktig parameter:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translation>Alternativ</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation>Tillgängliga kompressionsmetoder:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation></b><br> (© 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
<translation><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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>Klient för X2Go. Denna klient kan ansluta till X2Go-servrar och starta/stoppa/återansluta/avsluta (aktiva) sessioner. X2Go-klienten kan spara anslutningsinställningar samt använda LDAP för autentisering. Klienten kan även användas som inloggningsskärm (ersättning för exempelvis xdm). Besök <a href="http://www.x2go.org">www.x2go.org</a> för vidare information.</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation><b>X2Go-klient V. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation>Kontrollera LDAP-inställningar</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation>Inget giltigt kort hittades</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<source>This card is unknown by X2Go system</source>
<translation>Kortet är okänt</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation>Kunde ej skapa filen: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
+Please check your settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Can't connect to X-Server</source>
- <translation>Kan ej ansluta till X-server</translation>
+ <translation type="obsolete">Kan ej ansluta till X-server</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
- <translation>Kan ej ansluta till X-server
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
+ <translation type="unfinished">Kan ej ansluta till X-server
Kontrollera dina inställningar</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
<source>Can't start X Server
Please check your settings</source>
- <translation>Kan ej starta X-server
+ <translation type="obsolete">Kan ej starta X-server
Kontrollera dina inställningar</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -1450,12 +1590,12 @@ Please check your installation</source>
Kontrollera installation</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation>Kunde ej exekvera: </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation>Servern stöder ej filsystemsexport via SSH-tunnel
@@ -1486,115 +1626,120 @@ Uppdatera till en nyare version av x2goserver</translation>
<translation>ISO8859-1</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation>X2Go-session</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation>fel värde för "speed"</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation>Lösenord:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
<translatorcomment>Swenglish, but commonly used.</translatorcomment>
<translation>Tangentbordslayout:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
<translation><b>Sessions-ID:<br>Server:<br>Användare:<br>Display:<br>Skapad:<br>Status:</b></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation>Visa detaljer</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation>Ã
teranslut</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation>Fullständig åtkomst</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation>Endast visa</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation>Kommando</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation>Server</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation>Klient-IP</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation>Sessions-ID</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation>Användare</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation>Bara mina Skrivbord</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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>
@@ -1603,17 +1748,17 @@ du kan installera sshd med (Debian/Ubuntu)
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation>Ã
terställ verktygsrad</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation><br><b> Klicka denna knapp <br> för att återställa verktygsrad </b><br></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
<translation>Ogiltigt svar från agent</translation>
</message>
@@ -1877,57 +2022,64 @@ Example:
<translation>KDE</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation>RDP-anslutning</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation>XDMCP</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation>Anslutning till lokalt Skrivbord</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="412"/>
+ <location filename="sessionbutton.cpp" line="680"/>
<source>fullscreen</source>
<translation>fullskärm</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
- <location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
<translation>Display </translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation>fönster</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation>PÃ¥</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation>Av</translation>
</message>
@@ -2031,7 +2183,7 @@ Example:
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation>Anslut till Windows Terminal Server (RDP)</translation>
</message>
@@ -2056,73 +2208,78 @@ Example:
<translation>Applikation</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
<source>Command:</source>
<translation>Kommando:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation>Avancerade alternativ...</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation>Sökväg till exekverbar fil</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation>Ãppna bild</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation>Bilder</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation>Ãppna nyckelfil</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation>Alla filer</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation>X2Go-klienten körs i portabelt läge. Du bör använda en sökväg till en USB-enhet för att möjliggöra flyttbara inställningar</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation>Server:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation>XDMCP-server:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation>rdesktop kommandoradsalternativ:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation>Ny session</translation>
</message>
@@ -2350,77 +2507,77 @@ ljudström genom brandväggar</translation>
<translation>Kan ej initialisera libssh</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
<translation>Kan ej skapa SSH-session</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
<translation>Kan inte ansluta till </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
<translation>Autentisering misslyckades</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
<translation>channel_forward_listen misslyckades</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
<translation>Kan inte öppna fil </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
<translation>Kan inte skapa fjärrfil </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
<translation>Kan inte skriva till fjärrfil </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
<translation>kan inte ansluta till </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
<translation>channel_open_forward misslyckades</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
<translation>channel_open_session misslyckades</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
<translation>channel_request_exec misslyckades</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
<translation>ett fel uppstod vid skrivning till socket</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
<translation>ett fel uppstod när kanal skulle läsas</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
<translation>channel_write misslyckades</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
<translation>ett fel uppstod när tcp socket skulle läsas</translation>
</message>
diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts
index 9525470..5cc86b0 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_zh_tw.ts
@@ -2,6 +2,84 @@
<!DOCTYPE TS>
<TS version="2.0" language="zh_TW">
<context>
+ <name>AppDialog</name>
+ <message>
+ <location filename="appdialog.ui" line="14"/>
+ <source>Published Applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="60"/>
+ <source>Search:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="76"/>
+ <source>&Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.ui" line="96"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="105"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="110"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="115"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="120"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="125"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="130"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="135"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="140"/>
+ <source>Settings</source>
+ <translation type="unfinished">è¨å®</translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="145"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="150"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="appdialog.cpp" line="155"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BrokerPassDialogUi</name>
<message>
<location filename="brokerpassdialog.ui" line="14"/>
@@ -645,312 +723,368 @@
<context>
<name>ONMainWindow</name>
<message>
- <location filename="onmainwindow.cpp" line="84"/>
- <location filename="onmainwindow_part3.cpp" line="312"/>
+ <location filename="onmainwindow.cpp" line="87"/>
+ <location filename="onmainwindow_part3.cpp" line="482"/>
<source>us</source>
<translation>us</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="85"/>
+ <location filename="onmainwindow.cpp" line="88"/>
<source>pc105/us</source>
<translation>pc105/us</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="130"/>
+ <location filename="onmainwindow.cpp" line="136"/>
<source>X2Go client</source>
<translation>X2Goç¨æ¶ç«¯</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="147"/>
+ <location filename="onmainwindow.cpp" line="153"/>
<location filename="onmainwindow_part2.cpp" line="189"/>
- <location filename="onmainwindow_part2.cpp" line="2178"/>
+ <location filename="onmainwindow_part2.cpp" line="2208"/>
<source>connecting</source>
<translation>æ£å¨é£ç·</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="154"/>
+ <location filename="onmainwindow.cpp" line="160"/>
<source>Internet browser</source>
<translation>網é ç覽å¨</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="155"/>
+ <location filename="onmainwindow.cpp" line="161"/>
<source>Email client</source>
<translation>é»åéµä»¶è»é«</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="156"/>
+ <location filename="onmainwindow.cpp" line="162"/>
<source>OpenOffice.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="157"/>
+ <location filename="onmainwindow.cpp" line="163"/>
<source>Terminal</source>
<translation>çµç«¯æ©</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="329"/>
+ <location filename="onmainwindow.cpp" line="335"/>
<source>&Settings ...</source>
<translation>è¨å®(&S) ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="333"/>
+ <location filename="onmainwindow.cpp" line="339"/>
<source>Support ...</source>
<translation>æ¯æ´ ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="340"/>
- <location filename="onmainwindow_part3.cpp" line="1542"/>
+ <location filename="onmainwindow.cpp" line="346"/>
+ <location filename="onmainwindow_part3.cpp" line="1715"/>
<source>About X2GO client</source>
<translation>éæ¼X2GOç¨æ¶ç«¯</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="485"/>
- <location filename="onmainwindow.cpp" line="944"/>
- <location filename="onmainwindow_part4.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="549"/>
+ <location filename="onmainwindow.cpp" line="1035"/>
+ <location filename="onmainwindow_part4.cpp" line="1852"/>
<source>Share folder...</source>
<translation>å
±äº«è³æ夾...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="488"/>
- <location filename="onmainwindow.cpp" line="945"/>
- <location filename="onmainwindow_part2.cpp" line="2230"/>
- <location filename="onmainwindow_part4.cpp" line="1995"/>
+ <location filename="onmainwindow.cpp" line="552"/>
+ <location filename="onmainwindow.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="2260"/>
+ <location filename="onmainwindow_part4.cpp" line="2016"/>
<source>Suspend</source>
<translation>æ«å</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="491"/>
- <location filename="onmainwindow.cpp" line="946"/>
- <location filename="onmainwindow_part4.cpp" line="1843"/>
- <location filename="onmainwindow_part4.cpp" line="1997"/>
+ <location filename="onmainwindow.cpp" line="555"/>
+ <location filename="onmainwindow.cpp" line="1037"/>
+ <location filename="onmainwindow_part4.cpp" line="1855"/>
+ <location filename="onmainwindow_part4.cpp" line="2018"/>
<source>Terminate</source>
<translation>çµæ¢</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="493"/>
+ <location filename="onmainwindow.cpp" line="557"/>
<source>Reconnect</source>
<translation>éæ°é£ç·</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="497"/>
- <location filename="onmainwindow_part4.cpp" line="1288"/>
+ <location filename="onmainwindow.cpp" line="561"/>
+ <location filename="onmainwindow_part4.cpp" line="1296"/>
<source>Detach X2Go window</source>
<translation>è«é¢X2Goè¦çª</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="500"/>
- <location filename="onmainwindow_part4.cpp" line="2298"/>
+ <location filename="onmainwindow.cpp" line="564"/>
+ <location filename="onmainwindow_part4.cpp" line="2319"/>
<source>Minimize toolbar</source>
<translation>å°å·¥å
·åæå°å</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="610"/>
- <location filename="onmainwindow.cpp" line="1820"/>
- <location filename="onmainwindow_part3.cpp" line="1642"/>
+ <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="1960"/>
+ <location filename="onmainwindow_part3.cpp" line="1815"/>
<source>Session:</source>
<translation>å·¥ä½é段:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="662"/>
+ <location filename="onmainwindow.cpp" line="726"/>
<source>&Quit</source>
<translation>é¢é(&Q)</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="663"/>
+ <location filename="onmainwindow.cpp" line="727"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="664"/>
- <location filename="onmainwindow.cpp" line="958"/>
+ <location filename="onmainwindow.cpp" line="728"/>
+ <location filename="onmainwindow.cpp" line="1051"/>
<source>Quit</source>
<translation>é¢é</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="667"/>
+ <location filename="onmainwindow.cpp" line="731"/>
<source>&New session ...</source>
<translation>æ°å¢å·¥ä½é段(&N) ...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="668"/>
+ <location filename="onmainwindow.cpp" line="732"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="673"/>
+ <location filename="onmainwindow.cpp" line="737"/>
<source>Session management...</source>
<translation>å·¥ä½é段管çå¡...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="674"/>
+ <location filename="onmainwindow.cpp" line="738"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="684"/>
+ <location filename="onmainwindow.cpp" line="748"/>
<source>&Create session icon on desktop...</source>
<translation>å¨æ¡é¢ä¸å»ºç«å·¥ä½é段å示(&C)...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="693"/>
+ <location filename="onmainwindow.cpp" line="757"/>
<source>&Set broker password...</source>
<translation>è¨å®ä»£ç伺æå¨å¯ç¢¼(&S)...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="704"/>
+ <location filename="onmainwindow.cpp" line="768"/>
<source>&Connectivity test...</source>
<translation>é£ç·è½å測試(&C)...</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="711"/>
- <location filename="onmainwindow.cpp" line="732"/>
+ <location filename="onmainwindow.cpp" line="775"/>
+ <location filename="onmainwindow.cpp" line="796"/>
<source>Show toolbar</source>
<translation>顯示工å
·å</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="717"/>
+ <location filename="onmainwindow.cpp" line="781"/>
<source>About Qt</source>
<translation>éæ¼Qt</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="734"/>
+ <location filename="onmainwindow.cpp" line="798"/>
<source>Ctrl+Q</source>
<comment>exit</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="740"/>
+ <location filename="onmainwindow.cpp" line="804"/>
<source>&Session</source>
<translation>å·¥ä½é段(&S)</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="741"/>
+ <location filename="onmainwindow.cpp" line="805"/>
<source>&Options</source>
<translation>é¸é
(&O)</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="760"/>
+ <location filename="onmainwindow.cpp" line="824"/>
<source>&Help</source>
<translation>幫å©(&H)</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="799"/>
- <location filename="onmainwindow.cpp" line="1813"/>
- <location filename="onmainwindow_part3.cpp" line="1635"/>
- <location filename="onmainwindow_part4.cpp" line="1656"/>
+ <location filename="onmainwindow.cpp" line="863"/>
+ <location filename="onmainwindow.cpp" line="1953"/>
+ <location filename="onmainwindow_part3.cpp" line="1808"/>
+ <location filename="onmainwindow_part4.cpp" line="1664"/>
<source>Login:</source>
<translation>ç»å
¥:</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
- <location filename="onmainwindow.cpp" line="848"/>
- <location filename="onmainwindow.cpp" line="1495"/>
- <location filename="onmainwindow.cpp" line="1524"/>
- <location filename="onmainwindow.cpp" line="1532"/>
- <location filename="onmainwindow.cpp" line="1678"/>
- <location filename="onmainwindow.cpp" line="1705"/>
- <location filename="onmainwindow.cpp" line="1708"/>
- <location filename="onmainwindow.cpp" line="1955"/>
- <location filename="onmainwindow.cpp" line="2178"/>
- <location filename="onmainwindow.cpp" line="2192"/>
- <location filename="onmainwindow.cpp" line="2205"/>
- <location filename="onmainwindow.cpp" line="2239"/>
- <location filename="onmainwindow.cpp" line="2284"/>
- <location filename="onmainwindow_part2.cpp" line="305"/>
- <location filename="onmainwindow_part2.cpp" line="481"/>
- <location filename="onmainwindow_part2.cpp" line="490"/>
- <location filename="onmainwindow_part2.cpp" line="789"/>
- <location filename="onmainwindow_part2.cpp" line="1240"/>
- <location filename="onmainwindow_part2.cpp" line="1301"/>
- <location filename="onmainwindow_part2.cpp" line="1352"/>
- <location filename="onmainwindow_part2.cpp" line="1385"/>
- <location filename="onmainwindow_part2.cpp" line="1429"/>
- <location filename="onmainwindow_part2.cpp" line="1830"/>
- <location filename="onmainwindow_part2.cpp" line="1856"/>
- <location filename="onmainwindow_part2.cpp" line="1988"/>
- <location filename="onmainwindow_part3.cpp" line="202"/>
- <location filename="onmainwindow_part3.cpp" line="773"/>
- <location filename="onmainwindow_part3.cpp" line="854"/>
- <location filename="onmainwindow_part3.cpp" line="1098"/>
- <location filename="onmainwindow_part3.cpp" line="1226"/>
- <location filename="onmainwindow_part3.cpp" line="1279"/>
- <location filename="onmainwindow_part3.cpp" line="1585"/>
- <location filename="onmainwindow_part3.cpp" line="1587"/>
- <location filename="onmainwindow_part3.cpp" line="1817"/>
- <location filename="onmainwindow_part3.cpp" line="1865"/>
- <location filename="onmainwindow_part3.cpp" line="1893"/>
- <location filename="onmainwindow_part3.cpp" line="2263"/>
- <location filename="onmainwindow_part3.cpp" line="2278"/>
- <location filename="onmainwindow_part3.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="884"/>
+ <location filename="onmainwindow.cpp" line="912"/>
+ <location filename="onmainwindow.cpp" line="1635"/>
+ <location filename="onmainwindow.cpp" line="1664"/>
+ <location filename="onmainwindow.cpp" line="1672"/>
+ <location filename="onmainwindow.cpp" line="1818"/>
+ <location filename="onmainwindow.cpp" line="1845"/>
+ <location filename="onmainwindow.cpp" line="1848"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
+ <location filename="onmainwindow.cpp" line="2318"/>
+ <location filename="onmainwindow.cpp" line="2332"/>
+ <location filename="onmainwindow.cpp" line="2345"/>
+ <location filename="onmainwindow.cpp" line="2379"/>
+ <location filename="onmainwindow.cpp" line="2424"/>
+ <location filename="onmainwindow_part2.cpp" line="307"/>
+ <location filename="onmainwindow_part2.cpp" line="484"/>
+ <location filename="onmainwindow_part2.cpp" line="493"/>
+ <location filename="onmainwindow_part2.cpp" line="802"/>
+ <location filename="onmainwindow_part2.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1324"/>
+ <location filename="onmainwindow_part2.cpp" line="1375"/>
+ <location filename="onmainwindow_part2.cpp" line="1408"/>
+ <location filename="onmainwindow_part2.cpp" line="1452"/>
+ <location filename="onmainwindow_part2.cpp" line="1855"/>
+ <location filename="onmainwindow_part2.cpp" line="1881"/>
+ <location filename="onmainwindow_part2.cpp" line="2018"/>
+ <location filename="onmainwindow_part3.cpp" line="228"/>
+ <location filename="onmainwindow_part3.cpp" line="264"/>
+ <location filename="onmainwindow_part3.cpp" line="946"/>
+ <location filename="onmainwindow_part3.cpp" line="1027"/>
+ <location filename="onmainwindow_part3.cpp" line="1271"/>
+ <location filename="onmainwindow_part3.cpp" line="1399"/>
+ <location filename="onmainwindow_part3.cpp" line="1452"/>
+ <location filename="onmainwindow_part3.cpp" line="1758"/>
+ <location filename="onmainwindow_part3.cpp" line="1760"/>
+ <location filename="onmainwindow_part3.cpp" line="1990"/>
+ <location filename="onmainwindow_part3.cpp" line="2038"/>
+ <location filename="onmainwindow_part3.cpp" line="2066"/>
+ <location filename="onmainwindow_part3.cpp" line="2402"/>
+ <location filename="onmainwindow_part3.cpp" line="2417"/>
+ <location filename="onmainwindow_part3.cpp" line="2471"/>
<location filename="onmainwindow_part4.cpp" line="29"/>
<location filename="onmainwindow_part4.cpp" line="54"/>
- <location filename="onmainwindow_part4.cpp" line="2214"/>
- <location filename="onmainwindow_part4.cpp" line="2485"/>
+ <location filename="onmainwindow_part4.cpp" line="2235"/>
+ <location filename="onmainwindow_part4.cpp" line="2506"/>
<source>Error</source>
<translation>é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="820"/>
+ <location filename="onmainwindow.cpp" line="884"/>
<source>Operation failed</source>
<translation>æ´æ¹å¯ç¢¼å¤±æ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="824"/>
+ <location filename="onmainwindow.cpp" line="888"/>
<source>Password changed</source>
<translation>å¯ç¢¼å·²æ´æ¹æå</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="848"/>
+ <location filename="onmainwindow.cpp" line="912"/>
<source>Wrong password!</source>
<translation>輸å
¥äºé¯èª¤çå¯ç¢¼!</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="852"/>
- <location filename="onmainwindow.cpp" line="2393"/>
- <location filename="onmainwindow_part4.cpp" line="2468"/>
+ <location filename="onmainwindow.cpp" line="916"/>
+ <location filename="onmainwindow.cpp" line="2533"/>
+ <location filename="onmainwindow_part4.cpp" line="2489"/>
<source>Connecting to broker</source>
<translation>é£ç·è³é£ç·ä»£ç伺æå¨</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="897"/>
+ <location filename="onmainwindow.cpp" line="961"/>
<source><b>Authentication</b></source>
<translation><b>身份é©è</b></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="938"/>
+ <location filename="onmainwindow.cpp" line="1001"/>
<source>Restore</source>
<translation>éå</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="941"/>
- <location filename="onmainwindow_part2.cpp" line="2091"/>
+ <location filename="onmainwindow.cpp" line="1003"/>
+ <location filename="onmainwindow_part2.cpp" line="2121"/>
<source>Not connected</source>
<translation>å°æªé£ç·</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="969"/>
+ <location filename="onmainwindow.cpp" line="1005"/>
+ <source>Multimedia</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1007"/>
+ <source>Development</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1009"/>
+ <source>Education</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1011"/>
+ <source>Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1013"/>
+ <source>Graphics</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1015"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1017"/>
+ <source>Office</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1019"/>
+ <source>Settings</source>
+ <translation type="unfinished">è¨å®</translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1021"/>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1023"/>
+ <source>Utility</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1025"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow.cpp" line="1062"/>
<source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
<translation>ææ»é¼ å·¦éµä»¥é±èæéåè¦çª, å³éµé¡¯ç¤ºé¸å®</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1496"/>
- <location filename="onmainwindow.cpp" line="1679"/>
- <location filename="onmainwindow.cpp" line="1709"/>
+ <location filename="onmainwindow.cpp" line="1636"/>
+ <location filename="onmainwindow.cpp" line="1819"/>
+ <location filename="onmainwindow.cpp" line="1849"/>
<source>Please check LDAP settings</source>
<translation>è«ç¢ºèªLDAPçè¨å®</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1531"/>
+ <location filename="onmainwindow.cpp" line="1671"/>
<source>no X2Go server found in LDAP </source>
<translation>å¨LDAPç°å¢ä¸æ²ææ¾å°X2Go伺æå¨</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1843"/>
+ <location filename="onmainwindow.cpp" line="1983"/>
<source>Create session icon on desktop</source>
<translation>å¨æ¡é¢ä¸å»ºç«å·¥ä½é段å示</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1844"/>
+ <location filename="onmainwindow.cpp" line="1984"/>
<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>
@@ -959,48 +1093,48 @@ Use x2goclient hidden mode?</source>
æ¯å¦è¦ä½¿ç¨X2Goç¨æ¶ç«¯çé±è模å¼?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1855"/>
+ <location filename="onmainwindow.cpp" line="1995"/>
<source>New Session</source>
<translation>æ°çå·¥ä½é段</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1905"/>
+ <location filename="onmainwindow.cpp" line="2045"/>
<source>X2Go Link to session </source>
<translation>X2Goå·¥ä½é段çé£çµ</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="1955"/>
+ <location filename="onmainwindow.cpp" line="2095"/>
<source>X2Go sessions not found</source>
<translation>ç¡æ³æ¾å°X2Goçå·¥ä½</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2103"/>
+ <location filename="onmainwindow.cpp" line="2243"/>
<source>Are you sure you want to delete this session?</source>
<translation>æ¨ç¢ºå®è¦åªé¤æ¤å·¥ä½é段å?</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2411"/>
- <location filename="onmainwindow_part3.cpp" line="68"/>
+ <location filename="onmainwindow.cpp" line="2551"/>
+ <location filename="onmainwindow_part3.cpp" line="80"/>
<source>KDE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2473"/>
+ <location filename="onmainwindow.cpp" line="2613"/>
<source>RDP connection</source>
<translation>RDPé£ç·</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2477"/>
+ <location filename="onmainwindow.cpp" line="2617"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2481"/>
+ <location filename="onmainwindow.cpp" line="2621"/>
<source>Connection to local desktop</source>
<translation>é£ç·è³æ¬å°æ¡é¢</translation>
</message>
<message>
- <location filename="onmainwindow.cpp" line="2485"/>
+ <location filename="onmainwindow.cpp" line="2625"/>
<source> on </source>
<translation> æ¼ </translation>
</message>
@@ -1041,15 +1175,15 @@ Public key hash: </source>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1174"/>
- <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1197"/>
+ <location filename="onmainwindow_part2.cpp" line="1217"/>
<source>Yes</source>
<translation>æ¯</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="122"/>
- <location filename="onmainwindow_part2.cpp" line="1175"/>
- <location filename="onmainwindow_part2.cpp" line="1195"/>
+ <location filename="onmainwindow_part2.cpp" line="1198"/>
+ <location filename="onmainwindow_part2.cpp" line="1218"/>
<source>No</source>
<translation>å¦</translation>
</message>
@@ -1059,230 +1193,232 @@ Public key hash: </source>
<translation>èªè失æ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="298"/>
- <location filename="onmainwindow_part2.cpp" line="1294"/>
- <location filename="onmainwindow_part2.cpp" line="1378"/>
- <location filename="onmainwindow_part2.cpp" line="1411"/>
- <location filename="onmainwindow_part3.cpp" line="766"/>
- <location filename="onmainwindow_part3.cpp" line="847"/>
- <location filename="onmainwindow_part3.cpp" line="1219"/>
- <location filename="onmainwindow_part3.cpp" line="1272"/>
- <location filename="onmainwindow_part3.cpp" line="2256"/>
+ <location filename="onmainwindow_part2.cpp" line="300"/>
+ <location filename="onmainwindow_part2.cpp" line="1317"/>
+ <location filename="onmainwindow_part2.cpp" line="1401"/>
+ <location filename="onmainwindow_part2.cpp" line="1434"/>
+ <location filename="onmainwindow_part3.cpp" line="939"/>
+ <location filename="onmainwindow_part3.cpp" line="1020"/>
+ <location filename="onmainwindow_part3.cpp" line="1392"/>
+ <location filename="onmainwindow_part3.cpp" line="1445"/>
+ <location filename="onmainwindow_part3.cpp" line="2395"/>
<source><b>Connection failed</b>
</source>
<translation><b>é£ç·å¤±æ</b>
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="301"/>
- <location filename="onmainwindow_part2.cpp" line="1297"/>
- <location filename="onmainwindow_part2.cpp" line="1381"/>
- <location filename="onmainwindow_part3.cpp" line="199"/>
- <location filename="onmainwindow_part3.cpp" line="769"/>
- <location filename="onmainwindow_part3.cpp" line="850"/>
- <location filename="onmainwindow_part3.cpp" line="1222"/>
- <location filename="onmainwindow_part3.cpp" line="1275"/>
- <location filename="onmainwindow_part3.cpp" line="2259"/>
+ <location filename="onmainwindow_part2.cpp" line="303"/>
+ <location filename="onmainwindow_part2.cpp" line="1320"/>
+ <location filename="onmainwindow_part2.cpp" line="1404"/>
+ <location filename="onmainwindow_part3.cpp" line="225"/>
+ <location filename="onmainwindow_part3.cpp" line="261"/>
+ <location filename="onmainwindow_part3.cpp" line="942"/>
+ <location filename="onmainwindow_part3.cpp" line="1023"/>
+ <location filename="onmainwindow_part3.cpp" line="1395"/>
+ <location filename="onmainwindow_part3.cpp" line="1448"/>
+ <location filename="onmainwindow_part3.cpp" line="2398"/>
<source><b>Wrong password!</b><br><br></source>
<translation><b>ä¸æ£ç¢ºçå¯ç¢¼!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="417"/>
+ <location filename="onmainwindow_part2.cpp" line="419"/>
<source>unknown</source>
<translation>æªç¥</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="482"/>
+ <location filename="onmainwindow_part2.cpp" line="485"/>
<source>No server availabel</source>
<translation>伺æå¨ä¸åå¨l</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="491"/>
- <location filename="onmainwindow_part2.cpp" line="790"/>
- <location filename="onmainwindow_part2.cpp" line="1241"/>
- <location filename="onmainwindow_part2.cpp" line="1353"/>
+ <location filename="onmainwindow_part2.cpp" line="494"/>
+ <location filename="onmainwindow_part2.cpp" line="803"/>
+ <location filename="onmainwindow_part2.cpp" line="1264"/>
+ <location filename="onmainwindow_part2.cpp" line="1376"/>
<source>Server not availabel</source>
<translation>伺æå¨ä¸åå¨|</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1010"/>
- <location filename="onmainwindow_part4.cpp" line="1986"/>
+ <location filename="onmainwindow_part2.cpp" line="1033"/>
+ <location filename="onmainwindow_part4.cpp" line="2007"/>
<source>Select session:</source>
<translation>è«é¸æå·¥ä½é段:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1026"/>
- <location filename="onmainwindow_part2.cpp" line="1120"/>
- <location filename="onmainwindow_part2.cpp" line="2194"/>
+ <location filename="onmainwindow_part2.cpp" line="1049"/>
+ <location filename="onmainwindow_part2.cpp" line="1143"/>
+ <location filename="onmainwindow_part2.cpp" line="2224"/>
<source>running</source>
<translation>æ£å¨å·è¡ä¸</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1028"/>
- <location filename="onmainwindow_part2.cpp" line="1313"/>
+ <location filename="onmainwindow_part2.cpp" line="1051"/>
+ <location filename="onmainwindow_part2.cpp" line="1336"/>
<source>suspended</source>
<translation>å·²æ«å</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1034"/>
+ <location filename="onmainwindow_part2.cpp" line="1057"/>
<source>Desktop</source>
<translation>æ¡é¢</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1036"/>
+ <location filename="onmainwindow_part2.cpp" line="1059"/>
<source>single application</source>
<translation>å®ä¸çæç¨ç¨å¼</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1038"/>
+ <location filename="onmainwindow_part2.cpp" line="1061"/>
<source>shadow session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1071"/>
+ <location filename="onmainwindow_part2.cpp" line="1094"/>
<source>Information</source>
<translation>è³è¨</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1072"/>
+ <location filename="onmainwindow_part2.cpp" line="1095"/>
<source>No accessible desktop found</source>
<translation>ç®åæ²ææ¾å°å¯è¨ªåçå·¥ä½æ¡é¢</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1085"/>
- <location filename="onmainwindow_part4.cpp" line="2399"/>
+ <location filename="onmainwindow_part2.cpp" line="1108"/>
+ <location filename="onmainwindow_part4.cpp" line="2420"/>
<source>Filter</source>
<translation>篩é¸å¨</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1092"/>
+ <location filename="onmainwindow_part2.cpp" line="1115"/>
<source>Select desktop:</source>
<translation>è«é¸æå·¥ä½æ¡é¢:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1161"/>
- <location filename="onmainwindow_part2.cpp" line="1181"/>
- <location filename="onmainwindow_part2.cpp" line="2017"/>
- <location filename="onmainwindow_part2.cpp" line="2406"/>
+ <location filename="onmainwindow_part2.cpp" line="1184"/>
+ <location filename="onmainwindow_part2.cpp" line="1204"/>
+ <location filename="onmainwindow_part2.cpp" line="2047"/>
+ <location filename="onmainwindow_part2.cpp" line="2436"/>
<source>Warning</source>
<translation>è¦å</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1162"/>
- <location filename="onmainwindow_part2.cpp" line="1182"/>
+ <location filename="onmainwindow_part2.cpp" line="1185"/>
+ <location filename="onmainwindow_part2.cpp" line="1205"/>
<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>æ¨ç®å使ç¨èx2goå·¥ä½é段ä¸åçè²å½©è¨å®ãå¯è½æé æé£ç·çä¸ç©©å®ï¼ä¸¦ä¸å¾å¯è½æåªå¤±ç®åçå·¥ä½é段ãå¼·ç建è°å
å°ç®å使ç¨çè²å½©è¨å®è¨çº</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1170"/>
+ <location filename="onmainwindow_part2.cpp" line="1193"/>
<source>24 or 32</source>
<translation>24æ32</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1171"/>
- <location filename="onmainwindow_part2.cpp" line="1191"/>
+ <location filename="onmainwindow_part2.cpp" line="1194"/>
+ <location filename="onmainwindow_part2.cpp" line="1214"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
<translation>ä½å
並ä¸éæ°ååX-serverï¼ä¹å¾åéæ°é£æ¥éä¸åå·¥ä½é段ã<br>è«åæ¨ç¡è«å¦ä½é½è¦æ¢å¾©æ¤å·¥ä½é段çé£ç·å?</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1258"/>
+ <location filename="onmainwindow_part2.cpp" line="1281"/>
<source>suspending</source>
<translation>æ£å¨æ«åå·¥ä½ä¸</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1280"/>
+ <location filename="onmainwindow_part2.cpp" line="1303"/>
<source>terminating</source>
<translation>æ£å¨ä¸æ¢å·¥ä½ä¸</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1414"/>
+ <location filename="onmainwindow_part2.cpp" line="1437"/>
<source><b>Wrong Password!</b><br><br></source>
<translation><b>ä¸æ£ç¢ºçå¯ç¢¼!</b><br><br></translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1828"/>
- <location filename="onmainwindow_part3.cpp" line="1096"/>
+ <location filename="onmainwindow_part2.cpp" line="1853"/>
+ <location filename="onmainwindow_part3.cpp" line="1269"/>
<source>Unable to create folder:</source>
<translation>ç¡æ³åµå»ºè³æ夾:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1854"/>
+ <location filename="onmainwindow_part2.cpp" line="1879"/>
<source>Unable to write file:</source>
<translation>æªæ¡ç¡æ³å¯«å
¥:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1960"/>
- <location filename="onmainwindow_part4.cpp" line="1263"/>
+ <location filename="onmainwindow_part2.cpp" line="1990"/>
+ <location filename="onmainwindow_part4.cpp" line="1271"/>
<source>Attach X2Go window</source>
<translation>é£æ¥X2Goè¦çª</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="1986"/>
- <location filename="onmainwindow_part3.cpp" line="2330"/>
+ <location filename="onmainwindow_part2.cpp" line="2016"/>
+ <location filename="onmainwindow_part3.cpp" line="2469"/>
<source>Unable to create SSL tunnel:
</source>
<translation>ç¡æ³å»ºç«SSLéé:</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2015"/>
+ <location filename="onmainwindow_part2.cpp" line="2045"/>
<source>Unable to create SSL Tunnel:
</source>
<translation>ç¡æ³å»ºç«SSLéé:
</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2163"/>
+ <location filename="onmainwindow_part2.cpp" line="2193"/>
<source>Finished</source>
<translation>å·²å®æ</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2186"/>
+ <location filename="onmainwindow_part2.cpp" line="2216"/>
<source>starting</source>
<translation>æ£å¨éå§</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2188"/>
+ <location filename="onmainwindow_part2.cpp" line="2218"/>
<source>resuming</source>
<translation>æ£å¨éå</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2250"/>
- <location filename="onmainwindow_part2.cpp" line="2518"/>
- <location filename="onmainwindow_part2.cpp" line="2536"/>
+ <location filename="onmainwindow_part2.cpp" line="2280"/>
+ <location filename="onmainwindow_part2.cpp" line="2552"/>
+ <location filename="onmainwindow_part2.cpp" line="2570"/>
<source>Connection timeout, aborting</source>
<translation>é£ç·è¶
æï¼ä¸æ¢ä¸</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2251"/>
+ <location filename="onmainwindow_part2.cpp" line="2281"/>
<source>aborting</source>
<translation>ä¸æ¢ä¸</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2407"/>
+ <location filename="onmainwindow_part2.cpp" line="2437"/>
<source>Are you sure you want to terminate this session?
Unsaved documents will be lost</source>
<translation>æ¨ç¢ºå®è¦çµæ¢ç®åçå·¥ä½é段å? æææªåæªçè³æé½å°æéºå¤±</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2486"/>
+ <location filename="onmainwindow_part2.cpp" line="2520"/>
<source>Session</source>
<translation>å·¥ä½é段</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2488"/>
- <location filename="onmainwindow_part4.cpp" line="2067"/>
- <location filename="onmainwindow_part4.cpp" line="2089"/>
+ <location filename="onmainwindow_part2.cpp" line="2522"/>
+ <location filename="onmainwindow_part4.cpp" line="2088"/>
+ <location filename="onmainwindow_part4.cpp" line="2110"/>
<source>Display</source>
<translation>顯示</translation>
</message>
<message>
- <location filename="onmainwindow_part2.cpp" line="2490"/>
- <location filename="onmainwindow_part4.cpp" line="2078"/>
+ <location filename="onmainwindow_part2.cpp" line="2524"/>
+ <location filename="onmainwindow_part4.cpp" line="2099"/>
<source>Creation time</source>
<translation>åµå»ºæé</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="196"/>
+ <location filename="onmainwindow_part3.cpp" line="222"/>
+ <location filename="onmainwindow_part3.cpp" line="258"/>
<source><b>Connection failed</b>
:
</source>
@@ -1291,148 +1427,152 @@ Unsaved documents will be lost</source>
</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="409"/>
+ <location filename="onmainwindow_part3.cpp" line="579"/>
<source> (can't open file)</source>
<translation> (ç¡æ³éåæªæ¡)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="420"/>
- <location filename="onmainwindow_part3.cpp" line="430"/>
- <location filename="onmainwindow_part3.cpp" line="440"/>
+ <location filename="onmainwindow_part3.cpp" line="590"/>
+ <location filename="onmainwindow_part3.cpp" line="600"/>
+ <location filename="onmainwindow_part3.cpp" line="610"/>
<source> (file not exists)</source>
<translation> (æªæ¡ä¸åå¨)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="464"/>
+ <location filename="onmainwindow_part3.cpp" line="634"/>
<source> (directory not exists)</source>
<translation> (ç®éä¸åå¨)</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="492"/>
+ <location filename="onmainwindow_part3.cpp" line="662"/>
<source>wrong value for argument"--link"</source>
<translation>"--link"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="510"/>
+ <location filename="onmainwindow_part3.cpp" line="680"/>
<source>wrong value for argument"--sound"</source>
<translation>"--sound"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="527"/>
- <location filename="onmainwindow_part3.cpp" line="538"/>
+ <location filename="onmainwindow_part3.cpp" line="697"/>
+ <location filename="onmainwindow_part3.cpp" line="708"/>
<source>wrong value for argument"--geometry"</source>
<translation>"--geometry"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="556"/>
+ <location filename="onmainwindow_part3.cpp" line="726"/>
<source>wrong value for argument"--set-kbd"</source>
<translation>"--set-kbd"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="573"/>
+ <location filename="onmainwindow_part3.cpp" line="743"/>
<source>wrong value for argument"--ldap"</source>
<translation>"--ldap"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="595"/>
+ <location filename="onmainwindow_part3.cpp" line="765"/>
<source>wrong value for argument"--ldap1"</source>
<translation>"--ldap1"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="614"/>
+ <location filename="onmainwindow_part3.cpp" line="784"/>
<source>wrong value for argument"--ldap2"</source>
<translation>"--ldap2"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="668"/>
+ <location filename="onmainwindow_part3.cpp" line="838"/>
<source>wrong value for argument"--pack"</source>
<translation>"--pack"åæ¸çå¼é¯èª¤</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="676"/>
- <location filename="onmainwindow_part3.cpp" line="679"/>
+ <location filename="onmainwindow_part3.cpp" line="846"/>
+ <location filename="onmainwindow_part3.cpp" line="849"/>
<source>wrong parameter: </source>
<translation>é¯èª¤çåæ¸:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="724"/>
- <location filename="onmainwindow_part3.cpp" line="750"/>
+ <location filename="onmainwindow_part3.cpp" line="897"/>
+ <location filename="onmainwindow_part3.cpp" line="923"/>
<source>Options</source>
<translation>é¸é
</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="729"/>
+ <location filename="onmainwindow_part3.cpp" line="902"/>
<source>Available pack methodes:</source>
<translation>å¯ç¨çå
è£æ¹æ³:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1517"/>
+ <location filename="onmainwindow_part3.cpp" line="1690"/>
<source>Support</source>
<translation>æ¯æ´</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1522"/>
+ <location filename="onmainwindow_part3.cpp" line="1695"/>
<source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1526"/>
+ <location filename="onmainwindow_part3.cpp" line="1699"/>
<source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
<translation><br>x2goplugin modeæ¯ç± <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>æä¾è´å©<br></translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1530"/>
+ <location filename="onmainwindow_part3.cpp" line="1703"/>
<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="1543"/>
+ <location filename="onmainwindow_part3.cpp" line="1716"/>
<source><b>X2Go client V. </source>
<translation><b>X2Go 客æ¶ç«¯ V. </translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1588"/>
+ <location filename="onmainwindow_part3.cpp" line="1761"/>
<source>Please check LDAP Settings</source>
<translation>è«æª¢æ¥LDAPçè¨å®</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1818"/>
+ <location filename="onmainwindow_part3.cpp" line="1991"/>
<source>No valid card found</source>
<translation>æ²æç¼ç¾åæ³çå¡ç</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1866"/>
+ <location filename="onmainwindow_part3.cpp" line="2039"/>
<source>This card is unknown by X2Go system</source>
<translation>X2Go系統ç¡æ³è¾¨èæ¤å¼µå¡ç</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="1894"/>
+ <location filename="onmainwindow_part3.cpp" line="2067"/>
<source>Unable to create file: </source>
<translation>æªæ¡ç¡æ³åµå»º:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2059"/>
- <location filename="onmainwindow_part3.cpp" line="2084"/>
+ <location filename="onmainwindow_part3.cpp" line="2232"/>
+ <source>Can't start X server
+Please check your settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Can't connect to X-Server</source>
- <translation>ç¡æ³é£æ¥è³X伺æå¨</translation>
+ <translation type="obsolete">ç¡æ³é£æ¥è³X伺æå¨</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2060"/>
- <location filename="onmainwindow_part3.cpp" line="2085"/>
- <source>Can't connect to X-Server
+ <location filename="onmainwindow_part3.cpp" line="2231"/>
+ <source>Can't connect to X server
Please check your settings</source>
- <translation>ç¡æ³é£æ¥è³X伺æå¨
+ <oldsource>Can't connect to X-Server
+Please check your settings</oldsource>
+ <translation type="unfinished">ç¡æ³é£æ¥è³X伺æå¨
è«æª¢æ¥æ¨çè¨å®å¼</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2093"/>
<source>Can't start X Server
Please check your settings</source>
- <translation>ç¡æ³ååX伺æå¨
+ <translation type="obsolete">ç¡æ³ååX伺æå¨
è«æª¢æ¥æ¨çè¨å®å¼</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2107"/>
+ <location filename="onmainwindow_part3.cpp" line="2246"/>
<location filename="onmainwindow_part4.cpp" line="422"/>
<location filename="onmainwindow_part4.cpp" line="450"/>
<source>Can't start X Server
@@ -1441,12 +1581,12 @@ Please check your installation</source>
è«æª¢æ¥X伺æå¨å®æ¯å¦æå®è£æ£ç¢º</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2279"/>
+ <location filename="onmainwindow_part3.cpp" line="2418"/>
<source>Unable to execute: </source>
<translation>ç¡æ³å·è¡:</translation>
</message>
<message>
- <location filename="onmainwindow_part3.cpp" line="2295"/>
+ <location filename="onmainwindow_part3.cpp" line="2434"/>
<source>Remote server does not support file system export through SSH Tunnel
Please update to a newer x2goserver package</source>
<translation>é 端伺æå¨ç¡æ³æ¯æ´SSHééåå¼çå
±ç¨æªæ¡ç³»çµ±ï¼è«åç´è³è¼æ°çX2Go伺æå¨æ¿æ¬</translation>
@@ -1476,114 +1616,119 @@ Please update to a newer x2goserver package</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1352"/>
+ <location filename="onmainwindow_part4.cpp" line="1360"/>
<source>X2Go Session</source>
<translation>X2Goå·¥ä½é段</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1534"/>
+ <location filename="onmainwindow_part4.cpp" line="1542"/>
<source>wrong value for argument"speed"</source>
<translation>é¯èª¤ç"speed"åæ¸å¼</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1657"/>
+ <location filename="onmainwindow_part4.cpp" line="1665"/>
<source>Password:</source>
<translation>å¯ç¢¼:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1658"/>
+ <location filename="onmainwindow_part4.cpp" line="1666"/>
<source>Keyboard layout:</source>
<translation>éç¤ä½å±:</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1699"/>
+ <location filename="onmainwindow_part4.cpp" line="1707"/>
<source>Ok</source>
<translation>確å®</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1701"/>
- <location filename="onmainwindow_part4.cpp" line="1990"/>
- <location filename="onmainwindow_part4.cpp" line="1992"/>
+ <location filename="onmainwindow_part4.cpp" line="1709"/>
+ <location filename="onmainwindow_part4.cpp" line="2011"/>
+ <location filename="onmainwindow_part4.cpp" line="2013"/>
<source>Cancel</source>
<translation>åæ¶</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1834"/>
+ <location filename="onmainwindow_part4.cpp" line="1842"/>
<source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
<translation><b>å·¥ä½é段èå¥ç¢¼:<br>伺æå¨:<br>使ç¨è
å稱:<br>顯示:<br>åµå»ºæé:<br>çæ
:</b></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1842"/>
+ <location filename="onmainwindow_part4.cpp" line="1850"/>
+ <source>Applications...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="onmainwindow_part4.cpp" line="1854"/>
<source>Abort</source>
<translation>éåº</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1846"/>
+ <location filename="onmainwindow_part4.cpp" line="1856"/>
<source>Show details</source>
<translation>顯示細ç¯</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="1988"/>
+ <location filename="onmainwindow_part4.cpp" line="2009"/>
<source>Resume</source>
<translation>æ¢å¾©</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2000"/>
+ <location filename="onmainwindow_part4.cpp" line="2021"/>
<source>New</source>
<translation>æ°å¢</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2003"/>
+ <location filename="onmainwindow_part4.cpp" line="2024"/>
<source>Full access</source>
<translation>å®å
¨åå</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2006"/>
+ <location filename="onmainwindow_part4.cpp" line="2027"/>
<source>View only</source>
<translation>å
æ¥ç</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2069"/>
+ <location filename="onmainwindow_part4.cpp" line="2090"/>
<source>Status</source>
<translation>çæ
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2071"/>
+ <location filename="onmainwindow_part4.cpp" line="2092"/>
<source>Command</source>
<translation>æ令</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2073"/>
+ <location filename="onmainwindow_part4.cpp" line="2094"/>
<source>Type</source>
<translation>åæ
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2075"/>
+ <location filename="onmainwindow_part4.cpp" line="2096"/>
<source>Server</source>
<translation>伺æå¨</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2080"/>
+ <location filename="onmainwindow_part4.cpp" line="2101"/>
<source>Client IP</source>
<translation>客æ¶ç«¯IP</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2082"/>
+ <location filename="onmainwindow_part4.cpp" line="2103"/>
<source>Session ID</source>
<translation>å·¥ä½é段èå¥ç¢¼</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2086"/>
+ <location filename="onmainwindow_part4.cpp" line="2107"/>
<source>User</source>
<translation>使ç¨è
</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2117"/>
+ <location filename="onmainwindow_part4.cpp" line="2138"/>
<source>Only my desktops</source>
<translation>åªé¸ææçæ¡é¢</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2215"/>
+ <location filename="onmainwindow_part4.cpp" line="2236"/>
<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>
@@ -1592,17 +1737,17 @@ you can install sshd with
<b>sudo apt-get install openssh-server</b></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2286"/>
+ <location filename="onmainwindow_part4.cpp" line="2307"/>
<source>Restore toolbar</source>
<translation>éåå·¥å
·å</translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2331"/>
+ <location filename="onmainwindow_part4.cpp" line="2352"/>
<source><br><b> Click this button <br> to restore toolbar </b><br></source>
<translation><br><b> ææ¤æé <br> éåå·¥å
·å </b><br></translation>
</message>
<message>
- <location filename="onmainwindow_part4.cpp" line="2486"/>
+ <location filename="onmainwindow_part4.cpp" line="2507"/>
<source>Invalid reply from broker</source>
<translation>代ç伺æå¨çåæä¸åæ³</translation>
</message>
@@ -1866,57 +2011,64 @@ Example:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="325"/>
- <location filename="sessionbutton.cpp" line="357"/>
- <location filename="sessionbutton.cpp" line="616"/>
+ <location filename="sessionbutton.cpp" line="327"/>
+ <location filename="sessionbutton.cpp" line="360"/>
+ <location filename="sessionbutton.cpp" line="627"/>
<source>RDP connection</source>
<translation>RDPé£ç·</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="326"/>
- <location filename="sessionbutton.cpp" line="363"/>
- <location filename="sessionbutton.cpp" line="622"/>
+ <location filename="sessionbutton.cpp" line="328"/>
+ <location filename="sessionbutton.cpp" line="366"/>
+ <location filename="sessionbutton.cpp" line="633"/>
<source>XDMCP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="327"/>
- <location filename="sessionbutton.cpp" line="351"/>
- <location filename="sessionbutton.cpp" line="610"/>
+ <location filename="sessionbutton.cpp" line="329"/>
+ <location filename="sessionbutton.cpp" line="354"/>
+ <location filename="sessionbutton.cpp" line="621"/>
<source>Connection to local desktop</source>
<translation>é£ç·è³æ¬å°æ¡é¢</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="385"/>
- <location filename="sessionbutton.cpp" line="402"/>
- <location filename="sessionbutton.cpp" line="663"/>
+ <location filename="sessionbutton.cpp" line="330"/>
+ <location filename="sessionbutton.cpp" line="371"/>
+ <location filename="sessionbutton.cpp" line="659"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionbutton.cpp" line="395"/>
+ <location filename="sessionbutton.cpp" line="412"/>
+ <location filename="sessionbutton.cpp" line="680"/>
<source>fullscreen</source>
<translation>å
¨è¢å¹</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="389"/>
- <location filename="sessionbutton.cpp" line="412"/>
- <location filename="sessionbutton.cpp" line="416"/>
- <location filename="sessionbutton.cpp" line="669"/>
- <location filename="sessionbutton.cpp" line="672"/>
+ <location filename="sessionbutton.cpp" line="399"/>
+ <location filename="sessionbutton.cpp" line="422"/>
+ <location filename="sessionbutton.cpp" line="426"/>
+ <location filename="sessionbutton.cpp" line="686"/>
+ <location filename="sessionbutton.cpp" line="689"/>
<source>Display </source>
<translation>顯示</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="397"/>
- <location filename="sessionbutton.cpp" line="437"/>
+ <location filename="sessionbutton.cpp" line="407"/>
+ <location filename="sessionbutton.cpp" line="447"/>
<source>window</source>
<translation>è¦çª</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="445"/>
- <location filename="sessionbutton.cpp" line="575"/>
+ <location filename="sessionbutton.cpp" line="455"/>
+ <location filename="sessionbutton.cpp" line="585"/>
<source>Enabled</source>
<translation>åç¨</translation>
</message>
<message>
- <location filename="sessionbutton.cpp" line="447"/>
- <location filename="sessionbutton.cpp" line="577"/>
+ <location filename="sessionbutton.cpp" line="457"/>
+ <location filename="sessionbutton.cpp" line="587"/>
<source>Disabled</source>
<translation>åç¨</translation>
</message>
@@ -2019,7 +2171,7 @@ Example:
</message>
<message>
<location filename="sessionwidget.cpp" line="127"/>
- <location filename="sessionwidget.cpp" line="296"/>
+ <location filename="sessionwidget.cpp" line="298"/>
<source>Connect to Windows terminal server</source>
<translation>é£ç·è³å¾®è»çµç«¯ä¼ºæå¨</translation>
</message>
@@ -2044,73 +2196,78 @@ Example:
<translation>å®ä¸æç¨ç¨å¼</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="133"/>
- <location filename="sessionwidget.cpp" line="252"/>
+ <location filename="sessionwidget.cpp" line="132"/>
+ <source>Published applications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="253"/>
<source>Command:</source>
<translation>æ令:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="134"/>
+ <location filename="sessionwidget.cpp" line="135"/>
<source>Advanced options...</source>
<translation>é²éè¨å®...</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="145"/>
- <location filename="sessionwidget.cpp" line="429"/>
- <location filename="sessionwidget.cpp" line="492"/>
+ <location filename="sessionwidget.cpp" line="146"/>
+ <location filename="sessionwidget.cpp" line="439"/>
+ <location filename="sessionwidget.cpp" line="503"/>
<source>Path to executable</source>
<translation>å·è¡è·¯å¾</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="196"/>
+ <location filename="sessionwidget.cpp" line="197"/>
<source>Open picture</source>
<translation>éååç</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="198"/>
+ <location filename="sessionwidget.cpp" line="199"/>
<source>Pictures</source>
<translation>åç</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="219"/>
+ <location filename="sessionwidget.cpp" line="220"/>
<source>Open key file</source>
<translation>éåå¯é°æªæ¡</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="221"/>
+ <location filename="sessionwidget.cpp" line="222"/>
<source>All files</source>
<translation>æææªæ¡</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="231"/>
+ <location filename="sessionwidget.cpp" line="232"/>
<source>Error</source>
<translation>é¯èª¤</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="232"/>
+ <location filename="sessionwidget.cpp" line="233"/>
<source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
<translation>X2Goç¨æ¶ç«¯ç®åçºå¯æå¼æ¨¡å¼ï¼æ¨æ該è¦ä½¿ç¨æ¨çUSBè£ç½®çè·¯å¾ä¾ååæ¨çè³æ</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="273"/>
- <location filename="sessionwidget.cpp" line="391"/>
+ <location filename="sessionwidget.cpp" line="275"/>
+ <location filename="sessionwidget.cpp" line="401"/>
<source>Server:</source>
<translation>伺æå¨:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="279"/>
- <location filename="sessionwidget.cpp" line="399"/>
+ <location filename="sessionwidget.cpp" line="281"/>
+ <location filename="sessionwidget.cpp" line="409"/>
<source>XDMCP server:</source>
<translation>XDMCP 伺æå¨:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="297"/>
+ <location filename="sessionwidget.cpp" line="299"/>
<source>rdesktop command line options:</source>
<translation>rdesktop æ令é¸é
:</translation>
</message>
<message>
- <location filename="sessionwidget.cpp" line="310"/>
- <location filename="sessionwidget.cpp" line="411"/>
+ <location filename="sessionwidget.cpp" line="312"/>
+ <location filename="sessionwidget.cpp" line="421"/>
<source>New session</source>
<translation>æ°çå·¥ä½é段</translation>
</message>
@@ -2337,77 +2494,77 @@ sound system connections through firewalls</source>
<translation>libsshç¡æ³åå§å</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="144"/>
+ <location filename="sshmasterconnection.cpp" line="145"/>
<source>Can not create ssh session</source>
<translation>ç¡æ³å»ºç«SSHå·¥ä½é段</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="159"/>
+ <location filename="sshmasterconnection.cpp" line="163"/>
<source>Can not connect to </source>
<translation>ç¡æ³é£ç·è³ </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="200"/>
+ <location filename="sshmasterconnection.cpp" line="204"/>
<source>Authentication failed</source>
<translation>é©è失æ</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="216"/>
+ <location filename="sshmasterconnection.cpp" line="220"/>
<source>channel_forward_listen failed</source>
<translation>channel_forward_listen失æ</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="530"/>
+ <location filename="sshmasterconnection.cpp" line="534"/>
<source>Can not open file </source>
<translation>ç¡æ³éåæªæ¡</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="542"/>
+ <location filename="sshmasterconnection.cpp" line="546"/>
<source>Can not create remote file </source>
<translation>ç¡æ³åµå»ºé 端æªæ¡</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="555"/>
+ <location filename="sshmasterconnection.cpp" line="559"/>
<source>Can not write to remote file </source>
<translation>ç¡æ³å¯«å
¥è³æè³é 端æªæ¡</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="605"/>
+ <location filename="sshmasterconnection.cpp" line="609"/>
<source>can not connect to </source>
<translation>ç¡æ³é£ç·è³ </translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="714"/>
+ <location filename="sshmasterconnection.cpp" line="718"/>
<source>channel_open_forward failed</source>
<translation>channel_open_forward失æ</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="733"/>
+ <location filename="sshmasterconnection.cpp" line="737"/>
<source>channel_open_session failed</source>
<translation>channel_open_session失æ</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="740"/>
+ <location filename="sshmasterconnection.cpp" line="744"/>
<source>channel_request_exec failed</source>
<translation>channel_request_exec失æ</translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="805"/>
+ <location filename="sshmasterconnection.cpp" line="809"/>
<source>error writing to socket</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="823"/>
+ <location filename="sshmasterconnection.cpp" line="827"/>
<source>error reading channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="853"/>
+ <location filename="sshmasterconnection.cpp" line="857"/>
<source>channel_write failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="sshmasterconnection.cpp" line="865"/>
+ <location filename="sshmasterconnection.cpp" line="869"/>
<source>error reading tcp socket</source>
<translation type="unfinished"></translation>
</message>
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 73ed229..ef7a9ea 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
1 TYPELIB "x2goplugin.rc"
1 VERSIONINFO
- FILEVERSION 3,99,1,1
- PRODUCTVERSION 3,99,1,1
+ FILEVERSION 3,99,2,0
+ PRODUCTVERSION 3,99,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
VALUE "FileExtents", "x2go\0"
VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
- VALUE "FileVersion", "3, 99, 1 ,1\0"
+ VALUE "FileVersion", "3, 99, 2 ,0\0"
VALUE "InternalName", "x2goplugin\0"
VALUE "LegalCopyright", "Copyright © 2010-2012 Obviously Nice\0"
VALUE "MIMEType", "application/x2go\0"
VALUE "OriginalFilename", "npx2goplugin.dll\0"
- VALUE "ProductName", "X2GoClient Plug-in 3.99.1.1\0"
- VALUE "ProductVersion", "3, 99, 1, 1\0"
+ VALUE "ProductName", "X2GoClient Plug-in 3.99.2.0\0"
+ VALUE "ProductVersion", "3, 99, 2, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/x2gosettings.cpp b/x2gosettings.cpp
index 57fbc4a..79077fb 100644
--- a/x2gosettings.cpp
+++ b/x2gosettings.cpp
@@ -30,6 +30,12 @@ X2goSettings::X2goSettings(QString fileContent, QSettings::Format format)
X2goSettings::X2goSettings ( QString group )
{
cfgFile=0l;
+ if (group=="sessions" && ONMainWindow::getSessionConf().length()>0)
+ {
+ set=new QSettings ( ONMainWindow::getSessionConf(),
+ QSettings::IniFormat );
+ return;
+ }
#ifndef Q_OS_WIN
set=new QSettings ( ONMainWindow::getHomeDirectory() +
"/.x2goclient/"+group,
@@ -39,17 +45,12 @@ X2goSettings::X2goSettings ( QString group )
{
set=new QSettings ( "Obviously Nice","x2goclient" );
set->beginGroup ( group );
-// x2goDebug<<"settings in reg";
}
else
{
set=new QSettings ( ONMainWindow::getHomeDirectory() +
"/.x2goclient/"+group,
QSettings::IniFormat );
-// x2goDebug<<"settings in ini:"<<
- ONMainWindow::getHomeDirectory() +
- "/.x2goclient/"+group;
-
}
#endif
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