x2go-commits April 2012

x2go-commits@lists.x2go.org

1 participants
194 discussions

x2goclient.git - master (branch) updated: 3.99.2.0-1-gb026eb6
by git-admin＠x2go.org 04 Apr '12

04 Apr '12

The branch, master has been updated via b026eb6b729095f6907a2a6a00f1c59de2664850 (commit) from 7b871ac84fc2877af240ec5a4a6172d1eaec61b3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b026eb6b729095f6907a2a6a00f1c59de2664850 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 4 11:56:14 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ desktop/x2goclient.desktop | 2 +- version.h | 3 ++- x2goplugin.rc | 10 +++++----- 5 files changed, 15 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 1296fd3..399ee7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.2.0 +3.99.2.1 diff --git a/debian/changelog b/debian/changelog index 49f5464..2467f37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:55:57 +0200 + x2goclient (3.99.2.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 5e806a0..16f2040 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.2.0 +Version=3.99.2.1 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/version.h b/version.h index bae887b..2ca866f 100644 --- a/version.h +++ b/version.h @@ -1 +1,2 @@ -#define VERSION "3.99.2.0" +#define VERSION "3.99.2.1" + diff --git a/x2goplugin.rc b/x2goplugin.rc index ef7a9ea..ea22b6a 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,2,0 - PRODUCTVERSION 3,99,2,0 + FILEVERSION 3,99,2,1 + PRODUCTVERSION 3,99,2,1 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, 2 ,0\0" + VALUE "FileVersion", "3, 99, 2 ,1\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.2.0\0" - VALUE "ProductVersion", "3, 99, 2, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.2.1\0" + VALUE "ProductVersion", "3, 99, 2, 1\0" END END BLOCK "VarFileInfo" 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).

1 0

x2goclient.git - build-main (branch) updated: 3.99.2.0
by git-admin＠x2go.org 04 Apr '12

04 Apr '12

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(a)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(a)obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)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" -/** -@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(a)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(a)obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)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 ( "Connection failed\n:\n" ) +output; + if ( message.indexOf ( "publickey,password" ) !=-1 ) + { + message=tr ( "Wrong password! " ) + + 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 ( "Connection failed\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(a)obviously-nice.de * +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* oleksandr.shneyder(a)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") +" "+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">Sitzungs ID: Server: Login: Display: Startzeit: Status:</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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </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>Connection failed </source> <translation>Verbindung fehlgeschlagen @@ -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>Connection failed : </source> @@ -1519,17 +1604,17 @@ sound system connections through firewalls</source> <translation type="obsolete">X2GoClient V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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>Wrong Password! </source> <translation>Falsches Passwort! </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 you will loose the session 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 Verlust der ganzen Sitzung. 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. 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"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> 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>Wrong password! </source> <translation>Falsches Passwort! </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>Session ID: Server: Username: Display: Creation time: Status:</source> <translation>Sitzungs ID: Server: Login: Display: Startzeit: Status:</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>X2Go client V. </source> <translation>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>Authentication</source> <translation>Authentifizierung</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? Ungespeicherte Dokumente gehen verloren</translation> @@ -1995,7 +2140,7 @@ Unsaved documents will be lost</source> <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;zum Wiederherstellen&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;der Werkzeugleiste&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;hier klicken&nbsp;&nbsp;&nbsp; </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 sudo apt-get install openssh-server</source> @@ -2033,65 +2178,65 @@ Sie können SSHD über folgenden Befehl installieren: sudo apt-get install openssh-server</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"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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> 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>Authentication</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>Connection failed </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>Wrong password! </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 you will loose the session 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. 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>Wrong Password! </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>Connection failed : </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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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>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>Session ID: Server: Username: Display: Creation time: Status:</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 sudo apt-get install openssh-server</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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </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>Authentication</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>Connection failed </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>Wrong password! </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 you will loose the session 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. 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>Wrong Password! </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>Connection failed : </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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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>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>Session ID: Server: Username: Display: Creation time: Status:</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 sudo apt-get install openssh-server</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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </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">Sitzungs ID: Server: Login: Display: Startzeit: Status:</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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </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>Connection failed </source> <translation>Tilkoblingen feilet @@ -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>Connection failed : </source> @@ -1163,18 +1248,18 @@ <translation type="obsolete">X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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>Wrong Password! </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>Feil passord! </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 you will loose the session 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 vil du miste hele sesjonen. 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. Resume this session anyway?</source> <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. 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"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> 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>Wrong password! </source> <translation>Feil passord! </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>Session ID: Server: Username: Display: Creation time: Status:</source> <translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment> <translation>Sesjons ID: Server: Brukernavn: Skjerm: Opprettet: Status:</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>X2Go client V. </source> <translation>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>Authentication</source> <translation>Autentisering</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"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;Trykk her&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp; </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 sudo apt-get install openssh-server</source> @@ -1689,65 +1834,65 @@ Du kan installere sshd med: sudo apt-get install openssh-server</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"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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> 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! Please try again</source> - <translation type="unfinished"></translation> + <translation>Ошибка авторизации Повторите попытку</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>Connection failed </source> <translation>Ошибка соединения </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1414"/> + <location filename="onmainwindow_part2.cpp" line="1437"/> <source>Wrong Password! </source> <translation>Неверный пароль! </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 you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> <translation>Глубина цвета вашего дисплея не соответствует глубине цвета данной сессии. Это может помешать восстановлению сессии и в большинстве случаевсессия будет утеряна Рекомендуется изменить глубину цвета вашего дисплея на(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. Resume this session anyway?</source> <translation> бит и перезапустить X-сервер до восстановления сессии. Попробовать восстановить сессию не смотря на данное предупреждение?</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">ID сессии: Сервер: Пользователь: Дисплей: Время создания: Статус:</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>Connection failed : </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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> @@ -1634,7 +1720,7 @@ Public key hash: </source> <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения 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"> Ошибка настроек "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>Wrong password! </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>Не доступен ни один сервер</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>Session ID: Server: Username: Display: Creation time: Status:</source> <translation>ID сессии: Сервер: Пользователь: Дисплей: Время создания: Статус:</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>X2Go client V. </source> <translation>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>Authentication</source> - <translation type="unfinished"></translation> + <translation>Авторизация</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"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения 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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;Щелкните по этой иконке&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;чтобы восстановить панель инструментов&nbsp;&nbsp;&nbsp; </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 sudo apt-get install openssh-server</source> @@ -2018,65 +2165,65 @@ you can install sshd with sudo apt-get install openssh-server</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"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin был разработан при поддержке <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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> Клиент сетевого окружения 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>Authentication</source> <translation>Autentisering</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>Connection failed </source> <translation>Anslutning misslyckades </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>Wrong password! </source> <translation>Fel lösenord! </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 you will loose the session 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 förlorar du sessionen 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. Resume this session anyway?</source> <translation> bitar och startar om X-servern innan du återansluter till denna X2Go-session. Å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>Wrong Password! </source> <translation>Fel lösenord! </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>Connection failed : </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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (&copy; 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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> 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>X2Go client V. </source> <translation>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>Session ID: Server: Username: Display: Creation time: Status:</source> <translation>Sessions-ID: Server: Användare: Display: Skapad: Status:</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 sudo apt-get install openssh-server</source> @@ -1603,17 +1748,17 @@ du kan installera sshd med (Debian/Ubuntu) sudo apt-get install openssh-server</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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;Klicka denna knapp&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;för att återställa verktygsrad&nbsp;&nbsp;&nbsp; </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>Authentication</source> <translation>身份驗證</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>Connection failed </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>Wrong password! </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_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 you will loose the session 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. Resume this session anyway?</source> <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。 請問您無論如何都要恢復此工作階段的連線嗎?</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>Wrong Password! </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="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>Connection failed : </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> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> + <location filename="onmainwindow_part3.cpp" line="1699"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助 </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> + <location filename="onmainwindow_part3.cpp" line="1703"/> <source> 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>X2Go client V. </source> <translation>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>Session ID: Server: Username: Display: Creation time: Status:</source> <translation>工作階段識別碼: 伺服器: 使用者名稱: 顯示: 創建時間: 狀態:</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 sudo apt-get install openssh-server</source> @@ -1592,17 +1737,17 @@ you can install sshd with sudo apt-get install openssh-server</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> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp; </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).

1 0

x2goclient.git - master (branch) updated: 3.99.1.1-15-g7b871ac
by git-admin＠x2go.org 04 Apr '12

04 Apr '12

The branch, master has been updated via 7b871ac84fc2877af240ec5a4a6172d1eaec61b3 (commit) from e4a9dc4118a99050a9f0a9a1d459c3ebd33ac77f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7b871ac84fc2877af240ec5a4a6172d1eaec61b3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 4 11:52:27 2012 +0200 release 3.99.2.0 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3e5df04..49f5464 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.2.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.99.2.0): @@ -18,7 +18,7 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low of application menu. - Exporting PULSE_CLIENTCONFIG when running published applications. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:02:15 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:52:07 +0200 x2goclient (3.99.1.1-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-1-geddd060
by git-admin＠x2go.org 04 Apr '12

04 Apr '12

The branch, master has been updated via eddd060e73c5011585af52f8fdb74c63f3993e12 (commit) from 3106896d148a55969c98be317595e8911191a163 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eddd060e73c5011585af52f8fdb74c63f3993e12 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 4 11:44:30 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 75fa83a..771df31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 + x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index b8f4d84..164a848 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.0 \ No newline at end of file +3.1.1.1 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index b8f4d84..164a848 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.0 \ No newline at end of file +3.1.1.1 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 78df7c8..646c786 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.0 +3.1.1.1 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index b8f4d84..164a848 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.0 \ No newline at end of file +3.1.1.1 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index b8f4d84..164a848 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.0 \ No newline at end of file +3.1.1.1 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index b8f4d84..164a848 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.0 \ No newline at end of file +3.1.1.1 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index b8f4d84..164a848 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.0 \ No newline at end of file +3.1.1.1 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.0
by git-admin＠x2go.org 04 Apr '12

04 Apr '12

The branch, build-main has been updated via 3106896d148a55969c98be317595e8911191a163 (commit) via 863da3df9fece11be38ec5ce145850913e349873 (commit) via 266606a478e62c680d8124eb5750eb0b2a36960a (commit) via d11ed3f11aa6c1b4264f8b4bcf7eedf7e9d3bada (commit) via e0dec6f1eb0e84ff19b5c59899758d85e6bb7ccc (commit) via 0cc560c98c5fb10d7efebabe2284dc88e8e990f0 (commit) via 2747cda3acda1531fccbd52092e08837866d60ab (commit) via 83df64accdfbae7225d3894b49b6c0cde3124847 (commit) via 239588d6ced18485c821c81ce305d9c8d2a2eb2f (commit) via d285cbef38ba3d3346c7aaf09b1d06ff9e592fbb (commit) via f1c987d5219aabd1253b9f7d20ad2a98cddd313d (commit) via 104db977ff52500d132973cb9481373ba6e367bf (commit) via bdf58be37831c772c5f888e267e807c87d13f3d3 (commit) via e9fc713660e691425c8a6729d0280aa941253c76 (commit) via 8af661ea45669bb7af75ffeb7439ede85e2541eb (commit) via 07cea7ea8e3679238f3d92e16be882716a652196 (commit) via bf935ac7259bec7d23e6ffd3605ceae7de793b1d (commit) via e2dce016a660b225acf1b0376daa3de9c2b09899 (commit) via c89c4c1b3f57a5f8fb1cf476839f48ecc54ab479 (commit) via 76d0c2fb0339c299f8f9dbaa617e82439cd8dbd6 (commit) via 28a8cbe306d40da954e8ec21cbba2b289872b575 (commit) via bf04119f723a9d65cde57ac8af4c464195561075 (commit) via 06145b01f02ff4d027f9b6f9f2e666f4995e447f (commit) via 9e5134f95d8d62a4c09d814a4ce6e8a4d473656f (commit) via d19ebdc221f88654fcf726fd445c0426cb3c7e6b (commit) via 691ff9b139b7ab1b30c5389e87c9d8294a7cb021 (commit) via 0ae4d0ec543241fb93706958fa0d037b9cb8fc0b (commit) via 733794a943e2e47c5a2e557ea5a48759c8a4c95c (commit) via e3dab38f75692668c0a276eab3c09a94655ee320 (commit) via 15a647adc8f64e964fd01a18369c2b5783c53157 (commit) via 26ffae24c0b9a5040781ff84705258a15e017417 (commit) via a9973bc2ca40e0d4e8ff1cacc799844eaf6ea695 (commit) via 840c71310f06661b9d487aefe8d088a2d237c8d1 (commit) via ca589f22db4536a8bff1f9f3b714fcff8caeb9c1 (commit) from 739e7c35df6ace61ff5a16609ab641055938ecae (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: debian/changelog | 38 ++++ debian/control | 2 +- debian/x2goserver-xsession.install | 2 +- debian/x2goserver-xsession.links | 3 + debian/x2goserver.postinst | 5 + debian/x2goserver.postrm | 6 + ...x2goserver-printing.postrm => x2goserver.prerm} | 21 +- x2goserver-compat/VERSION.x2goserver-compat | 2 +- x2goserver-compat/man/man8/x2gosuspend-agent.8 | 2 +- x2goserver-compat/man/man8/x2gosuspend.8 | 2 +- x2goserver-compat/man/man8/x2goterminate.8 | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../bin/x2goserver-run-extensions | 6 +- .../man/man8/x2goserver-run-extensions.8 | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-printing/man/man8/x2goprint.8 | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver-xsession/etc/Xresources | 1 - x2goserver-xsession/etc/Xsession.d | 1 - x2goserver-xsession/etc/Xsession.options | 1 - x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/{x2gofeature => x2gofeaturelist} | 11 +- x2goserver/bin/x2gogetapps | 192 ++++++++++++++++++++ x2goserver/bin/x2goresume-session | 19 ++- x2goserver/bin/x2goruncommand | 13 +- x2goserver/bin/x2gostartagent | 6 +- x2goserver/lib/x2godbwrapper.pm | 27 +++- x2goserver/lib/{x2gochangestatus => x2gogetstatus} | 8 +- x2goserver/lib/x2gosqlitewrapper.pl | 174 ++++++++++++++++-- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 3 +- x2goserver/man/man8/x2gofeaturelist.8 | 30 +++ x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- x2goserver/sbin/x2gocleansessions | 16 +- x2goserver/sbin/x2golistsessions_root | 2 +- x2goserver/share/x2gofeature.d/x2goserver.features | 1 + 57 files changed, 556 insertions(+), 98 deletions(-) create mode 100644 debian/x2goserver-xsession.links copy debian/{x2goserver-printing.postrm => x2goserver.prerm} (68%) delete mode 120000 x2goserver-xsession/etc/Xresources delete mode 120000 x2goserver-xsession/etc/Xsession.d delete mode 120000 x2goserver-xsession/etc/Xsession.options copy x2goserver/bin/{x2gofeature => x2gofeaturelist} (77%) create mode 100755 x2goserver/bin/x2gogetapps copy x2goserver/lib/{x2gochangestatus => x2gogetstatus} (94%) create mode 100644 x2goserver/man/man8/x2gofeaturelist.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 45606d8..75fa83a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,41 @@ +x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.1.1.0): + - Syslog warnings have to be named ,,warning'' not ,,warn''. + - Add usage output to x2goserver-run-extensions. + - Fix syslog output of x2goserver-run-exentions. + - Fix x2goserver extension calls in x2goruncommand. + - Add feature name ,,X2GO_PUBLISHED_APPLICATIONS''. + - Add new command ,,x2gofeaturelist''. This command can be used + by X2Go client applications to retrieve a list of server-side + supported X2Go features. + - Update date and version number in man pages. + - Fix race condition between session.log of x2goagent and + x2gocleansessions. The old situation was: in cases that x2goagent + was not fast enough with appending the new session state to the + session.log file, the x2gocleansessions script marked the session + as suspended during the session resuming process. + - Wait one second for x2goagent to write to session.log before updating + the session state from 'S' to 'R' in the X2Go session database. + - Add X2Go server script x2gogetstatus. + - Add/enable debugging of x2gocleansessions. + - Silence error messages if the agent's session.log file is not accessible + (e.g. on NFSv4+Krb5-mounted homes). + - Improve concurrent database access with session db backend SQLite. + * Remove /etc/x2go/applications on package removal if it is a + symlink, keep it, if it is a directory. Remove /etc/x2go + (if empty after purge) on package purge. + * Bump Debian packaging standards version to 3.9.3. + * Use dh_link to symlink X11 directories into /etc/x2go. + + [ Oleksandr Shneyder ] + * New upstream version (3.1.1.0): + - Support for "published applications". + Sponsored by Stefan Baur (http://www.baur-itcs.de) + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:41:02 +0200 + x2goserver (3.1.0.1-0~x2go1) unstable; urgency=low * New upstream version (3.1.0.1): diff --git a/debian/control b/debian/control index a8578fe..cc3af44 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), man2html-base | man2html -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary diff --git a/debian/x2goserver-xsession.install b/debian/x2goserver-xsession.install index 31531bb..d80b6d5 100644 --- a/debian/x2goserver-xsession.install +++ b/debian/x2goserver-xsession.install @@ -1,3 +1,3 @@ -x2goserver-xsession/etc/* /etc/x2go/ +x2goserver-xsession/etc/Xsession /etc/x2go/ x2goserver-xsession/VERSION.x2goserver-xsession /usr/share/x2go/versions/ x2goserver-xsession/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver-xsession.links b/debian/x2goserver-xsession.links new file mode 100644 index 0000000..937529e --- /dev/null +++ b/debian/x2goserver-xsession.links @@ -0,0 +1,3 @@ +etc/X11/Xresources etc/x2go/Xresources +etc/X11/Xsession.d etc/x2go/Xsession.d +etc/X11/Xsession.options etc/x2go/Xsession.options diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index f1582a8..2837629 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -98,6 +98,11 @@ case "$1" in dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper fi + # create /etc/x2go/applications symlink if not already there (as link or as dir) + if ! test -e /etc/x2go/applications; then + ln -s /usr/share/applications /etc/x2go/applications + fi + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index ec6b579..2d965cc 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -27,6 +27,12 @@ case "$1" in getent passwd x2gouser >/dev/null && deluser x2gouser getent group x2gouser >/dev/null && delgroup x2gouser getent group x2gousers >/dev/null && delgroup x2gousers + + rm -Rf /etc/x2go/applications + rm -Rf /etc/x2go/sql + rm -Rf /etc/x2go/x2go_logout.d + rmdir --ignore-fail-on-non-empty /etc/x2go + ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver.prerm similarity index 68% copy from debian/x2goserver-printing.postrm copy to debian/x2goserver.prerm index 16b0f1e..1ec6436 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/x2goserver.prerm @@ -1,5 +1,5 @@ #! /bin/sh -# postrm script for x2goserver-printing +# prerm script for x2goserver # # see: dh_installdeb(1) # summary of how this script can be called: @@ -17,16 +17,17 @@ set -e case "$1" in - purge) - getent passwd x2goprint >/dev/null && deluser x2goprint - getent group x2goprint >/dev/null && delgroup x2goprint + remove) + # The package is being removed in its own right. + if test -L /etc/x2go/applications; then + rm -f /etc/x2go/applications + fi ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 + deconfigure|upgrade|failed-upgrade) + : ;; + *) echo "$0: didn't understand being called with \`$1'" 1>&2 + exit 1;; esac # dh_installdeb will replace this with shell code automatically @@ -34,4 +35,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index c59e32f..b8f4d84 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.0.1 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 index 0256909..bb91061 100644 --- a/x2goserver-compat/man/man8/x2gosuspend-agent.8 +++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-agent 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (compat)" +.TH x2gosuspend-agent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" .SH NAME x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8 index e7aa661..a0c59ac 100644 --- a/x2goserver-compat/man/man8/x2gosuspend.8 +++ b/x2goserver-compat/man/man8/x2gosuspend.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (compat)" +.TH x2gosuspend 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" .SH NAME x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8 index 5af4784..f91d6b8 100644 --- a/x2goserver-compat/man/man8/x2goterminate.8 +++ b/x2goserver-compat/man/man8/x2goterminate.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (compat)" +.TH x2goterminate 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" .SH NAME x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index c59e32f..b8f4d84 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.0.1 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index c7b671c..70636f6 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -23,6 +23,8 @@ set -e +test -z $2 && { echo "usage: $(basename $0) <X2GO_SESSION_ID> <MODALITY>"; exit -1; } + X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" @@ -34,9 +36,9 @@ X2GO_MODALITY="$2" find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" $x2go_extension "$X2GO_SESSION" &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION has finished sucessfully" } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..." + $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION returned a non-zero exit code, continuing..." } done diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index d63cf6f..9e3d86d 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goserver-run-extensions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index a9e279d..78df7c8 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.0.1 +3.1.1.0 diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8 index 4f49941..576d5e4 100644 --- a/x2goserver-fmbindings/man/man8/x2gofm.8 +++ b/x2goserver-fmbindings/man/man8/x2gofm.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofm 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server" +.TH x2gofm 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server" .SH NAME x2gofm \- X2Go wrapper for Browsing X2Go Shared Folders .SH SYNOPSIS diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index c59e32f..b8f4d84 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.0.1 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8 index 1786dee..c22276a 100644 --- a/x2goserver-printing/man/man8/x2goprint.8 +++ b/x2goserver-printing/man/man8/x2goprint.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goprint 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goprint \- Process X2Go Print Job .SH SYNOPSIS diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index c59e32f..b8f4d84 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.0.1 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 index a87d080..3e9baaf 100644 --- a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 +++ b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (PyHoca)" +.TH x2gosetkeyboard 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index c59e32f..b8f4d84 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.0.1 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-xsession/etc/Xresources b/x2goserver-xsession/etc/Xresources deleted file mode 120000 index 484aa45..0000000 --- a/x2goserver-xsession/etc/Xresources +++ /dev/null @@ -1 +0,0 @@ -/etc/X11/Xresources \ No newline at end of file diff --git a/x2goserver-xsession/etc/Xsession.d b/x2goserver-xsession/etc/Xsession.d deleted file mode 120000 index f64317e..0000000 --- a/x2goserver-xsession/etc/Xsession.d +++ /dev/null @@ -1 +0,0 @@ -/etc/X11/Xsession.d \ No newline at end of file diff --git a/x2goserver-xsession/etc/Xsession.options b/x2goserver-xsession/etc/Xsession.options deleted file mode 120000 index 72929e1..0000000 --- a/x2goserver-xsession/etc/Xsession.options +++ /dev/null @@ -1 +0,0 @@ -/etc/X11/Xsession.options \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index c59e32f..b8f4d84 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.0.1 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeaturelist similarity index 77% copy from x2goserver/bin/x2gofeature copy to x2goserver/bin/x2gofeaturelist index f379070..1258a77 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeaturelist @@ -17,24 +17,17 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -[ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } +# Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_FEATURE=$1 - # run x2gofeature scripts of X2Go extensions test -d "$X2GO_SHARE_PATH/x2gofeature.d" && { for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do - $subscript $@ && exit 0 + cat $subscript | egrep ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1 done } -echo "not available" -exit -1 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps new file mode 100755 index 0000000..f95a1ee --- /dev/null +++ b/x2goserver/bin/x2gogetapps @@ -0,0 +1,192 @@ +#!/usr/bin/perl + +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# +# 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., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; +use Sys::Syslog qw( :standard :macros ); +use MIME::Base64 qw(encode_base64); + +use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use x2gologlevel; + +my @iconext=("png","svg","jpeg","jpg","xpm","bmp"); + +my @icondirs=( +"/usr/share/icons/hicolor/22x22/apps", +"/usr/share/icons/hicolor/24x24/apps", +"/usr/share/icons/hicolor/32x32/apps", +"/usr/share/icons/hicolor/36x36/apps", +"/usr/share/icons/hicolor/48x48/apps", +"/usr/share/icons/hicolor/64x64/apps", +"/usr/share/icons/hicolor/72x72/apps", +"/usr/share/icons/hicolor/96x96/apps", +"/usr/share/icons/hicolor/128x128/apps", +"/usr/share/icons/hicolor/256x256/apps", +"/usr/share/icons/hicolor/scalable/apps", +"/usr/share/pixmaps", +"/usr/share/icons/default.kde/22x22/apps", +"/usr/share/icons/default.kde/24x24/apps", +"/usr/share/icons/default.kde/32x32/apps", +"/usr/share/icons/default.kde/36x36/apps", +"/usr/share/icons/default.kde/48x48/apps", +"/usr/share/icons/default.kde/64x64/apps", +"/usr/share/icons/default.kde/72x72/apps", +"/usr/share/icons/default.kde/96x96/apps", +"/usr/share/icons/default.kde/128x128/apps", +"/usr/share/icons/default.kde/256x256/apps", +"/usr/share/icons/default.kde4/22x22/apps", +"/usr/share/icons/default.kde4/24x24/apps", +"/usr/share/icons/default.kde4/32x32/apps", +"/usr/share/icons/default.kde4/36x36/apps", +"/usr/share/icons/default.kde4/48x48/apps", +"/usr/share/icons/default.kde4/64x64/apps", +"/usr/share/icons/default.kde4/72x72/apps", +"/usr/share/icons/default.kde4/96x96/apps", +"/usr/share/icons/default.kde4/128x128/apps", +"/usr/share/icons/default.kde4/256x256/apps" +); + +sub findicon +{ + my $file=shift; + foreach(@iconext) + { + my $icon=findicon_ext("$file.$_"); + if( $icon ne "" ) + { + return "$icon"; + } + } + return ""; +} + +sub findicon_ext +{ + my $file=shift; + foreach(@icondirs) + { + if( -e "$_/$file" ) + { + return "$_/$file"; + } + } + return ""; +} + +sub printicon +{ + my $file=shift; + if (open(I,"<$file")) + { + my $buf; + print "<icon>\n"; + while (read(I, $buf, 60*57)) + { + print encode_base64($buf); + } + print "</icon>\n"; + close(I); + } + else + { + syslog ('info', "x2gogetapps:printicon - can't open file $file: $!"); + } +} + +sub proc_desktop_file +{ + my $file=shift; + if (open(F,"<$file")) + { + print("<desktop>\n"); + while(!eof(F)) + { + my $line=<F>; + if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Comment/i || $line=~m/^Exec/i) + { + print $line; + } + if( $line =~ m/^Icon/ ) + { + my $icon=$line; + $icon =~ s/Icon=//; + chop($icon); + #$line is absolute path + if($icon =~ m/\//) + { + $icon=$icon; + } + #$line have format ext. + elsif ($line =~ m/\./) + { + $icon=findicon_ext($icon); + } + else + { + $icon=findicon($icon); + } + printicon($icon); + } + } + close (F); + print("</desktop>\n"); + } + else + { + syslog ('info', "x2gogetapps:proc_desktop_file - can't open file $file: $!"); + } +} + +openlog($0,'cons,pid','user'); +setlogmask( LOG_UPTO(x2gologlevel()) ); + +if ( @ARGV ) { + syslog('info', "x2gogetapps has been called with options: @ARGV"); +} else { + syslog('info', "x2gogetapps has been called without options"); +} + +my $file; +my @dirs; +@dirs[0]="/etc/x2go/applications"; +my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); +@dirs[1]="$homedir/.x2go/applications"; +foreach(@dirs) +{ + my $dirname=$_; + if( opendir(DIR, $dirname)) + { + while (defined($file = readdir(DIR))) + { + if($file =~ m/.desktop/) + { + proc_desktop_file("$dirname/$file"); + } + } + closedir(DIR); + } + else + { + syslog ('info', "x2gogetapps - can't opendir $dirname: $!"); + } +} +# closing syslog +closelog; diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index e03751a..50cb638 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -149,14 +149,28 @@ fi echo "$NEWOPTIONS" >"${SESSION_DIR}/options" -$X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null - # run x2goserver-extensions for pre-resume x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-resume || true kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" + # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent + + # we really have to make sure the session database gets this write operation + # this may just be an SQLite issue so... + # FIXME: probably migrate this piece of code to the SQLite db backend... + #while true; do + # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null + # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then + # break; + # else + # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..." + # sleep 1; + # fi + #done + (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) + # resume x2godesktopsharing, if it has been in use before the session got suspended x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing "$SESSION_NAME" || true @@ -180,3 +194,4 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { echo "gr_port=$GR_PORT" echo "sound_port=$SOUND_PORT" echo "fs_port=$FS_PORT" + diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index fd9f82d..2f70633 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -122,8 +122,15 @@ then IMEXIT="true" fi +if [ "$X2GO_SESS_TYPE" == "P" ] +then + IMEXIT="false" + EXEC="/bin/true" + X2GO_SESS_TYPE="R" +fi + # run x2goserver-extensions for pre-runcommand -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-runcommand || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true sucessful_run=false if [ "$EXEC" != "" ] && [ -x $EXEC ]; then @@ -148,14 +155,14 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then successful_run=true # run x2goserver-extensions for post-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" post-runcommand || true else $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute" echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > "$MESSAGE_FILE" # run x2goserver-extensions for fail-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" fail-runcommand || true fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 679852e..739a0c2 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -105,9 +105,13 @@ export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` SESSION_TYPE="D" +NOEXITPARAM="" if [ "$X2GO_STYPE" == "R" ]; then SESSION_TYPE="R" +elif [ "$X2GO_STYPE" == "P" ]; then + SESSION_TYPE="R" + NOEXITPARAM="-norootlessexit" elif [ "$X2GO_STYPE" == "S" ]; then SESSION_TYPE="S" fi @@ -244,7 +248,7 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & fi diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index aec0294..2690544 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -85,7 +85,7 @@ if ($backend eq 'postgres') use base 'Exporter'; -our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', +our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot'); @@ -410,6 +410,31 @@ sub db_changestatus syslog('debug', "db_changestatus called, session ID: $sid, new status: $status"); } +sub db_getstatus +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $status=''; + if ($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select status from sessions_view where session_id = '$sid'"); + $sth->execute($sid) or die; + my @data; + if (@data = $sth->fetchrow_array) + { + $status=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + } + if ($backend eq 'sqlite') + { + $status=`$x2go_lib_path/x2gosqlitewrapper getstatus $sid`; + } + syslog('debug', "db_getstatus called, session ID: $sid, return value: $status"); + return $status; +} + sub db_getdisplays { my @displays; diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gogetstatus similarity index 94% copy from x2goserver/lib/x2gochangestatus copy to x2goserver/lib/x2gogetstatus index ce33520..d2271a4 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gogetstatus @@ -30,11 +30,11 @@ use x2gologlevel; openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); - -my $status=shift or die; +my $status; my $sid=shift or die; -db_changestatus($status, $sid); +$status = db_getstatus($sid); +print "$status"; # closing syslog -closelog; \ No newline at end of file +closelog; diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 1e3b7e3..ba2c02d 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -24,6 +24,36 @@ use strict; use DBI; use POSIX; +#### NOTE: this script is run setgid <group> and it cannot do system() calls. + +#### +#### One consequence of this is... +#### This first part of code that handles syslogging is duplicated from +#### x2gologlevel.pm. This is because we are not able to detect the +#### installation path automatically via the x2gobasepath in this +#### script. +#### + +use Config::Simple; +use Sys::Syslog qw( :standard :macros ); +my $Config = new Config::Simple(syntax=>'ini'); +$Config->read('/etc/x2go/x2goserver.conf' ); +my $strloglevel = $Config->param("log.loglevel"); +my $loglevel = LOG_NOTICE; +if ( $strloglevel eq "emerg" ) { $loglevel = LOG_EMERG; } +elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } +elsif ( $strloglevel eq "crit" ) { $loglevel = LOG_CRIT; } +elsif ( $strloglevel eq "err" ) { $loglevel = LOG_ERR; } +elsif ( $strloglevel eq "warning" ) { $loglevel = LOG_WARNING; } +elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; } +elsif ( $strloglevel eq "info" ) { $loglevel = LOG_INFO; } +elsif ( $strloglevel eq "debug" ) { $loglevel = LOG_DEBUG; } +setlogmask( LOG_UPTO($loglevel) ); + +#### +#### end of duplicated syslogging code +#### + # retrieve home dir of x2gouser my $x2gouser='x2gouser'; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($x2gouser); @@ -33,16 +63,23 @@ my $dbfile="$homedir/x2go_sessions"; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); my $realuser=$uname; -my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_; +my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{sqlite_use_immediate_transaction => 1, AutoCommit => 1, }) or die $_; +$dbh->sqlite_busy_timeout( 2000 ); my $cmd=shift or die "command not specified"; +my $rc=0; if($cmd eq "rmsessionsroot") { checkroot(); my $sid=shift or die "argument \"session_id\" missed"; my $sth=$dbh->prepare("delete from sessions where session_id=?"); - $sth->execute($sid)or die; + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "rmsessionsroot (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die; + } $sth->finish(); } @@ -58,7 +95,11 @@ elsif($cmd eq "listsessionsroot") uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where server=? order by status desc"); - $sth->execute($server) or die; + $sth->execute($server); + if ($sth->err()) { + syslog('error', "listsessionsroot (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } fetchrow_printall_array($sth); } @@ -73,7 +114,12 @@ elsif($cmd eq "listsessionsroot_all") uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions order by status desc"); - $sth->execute()or die; + $sth->execute(); + if ($sth->err()) + { + syslog('error', "listsessionsroot_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } fetchrow_printall_array($sth); } @@ -83,7 +129,12 @@ elsif($cmd eq "getmounts") check_user($sid); my @strings; my $sth=$dbh->prepare("select client, path from mounts where session_id=?"); - $sth->execute($sid)or die; + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "getmounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die; + } fetchrow_printall_array($sth); } @@ -94,6 +145,11 @@ elsif($cmd eq "deletemount") check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=? and path=?"); $sth->execute($sid, $path); + if ($sth->err()) + { + syslog('error', "deletemount (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } $sth->finish(); } @@ -105,9 +161,11 @@ elsif($cmd eq "insertmount") check_user($sid); my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values (?, ?, ?)"); $sth->execute($sid, $path, $client); - if(!$sth->err()) + if(! $sth->err()) { print "ok"; + } else { + syslog('debug', "insertmount (SQLite3 session db backend) failed with exitcode: $sth->err(), this issue will be interpreted as: SSHFS share already mounted"); } $sth->finish(); } @@ -137,7 +195,12 @@ elsif($cmd eq "createsession") check_user($sid); my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie=?,agent_pid=?, client=?,gr_port=?,sound_port=?,fs_port=? where session_id=? and uname=?"); - $sth->execute($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $sid, $realuser)or die; + $sth->execute($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $sid, $realuser); + if ($sth->err()) + { + syslog('error', "createsession (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } $sth->finish(); print "ok"; } @@ -149,7 +212,12 @@ elsif($cmd eq "insertport") my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values (?, ?, ?)"); check_user($sid); - $sth->execute($server, $sid, $sshport) or die; + $sth->execute($server, $sid, $sshport); + if ($sth->err()) + { + syslog('error', "insertport (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } $sth->finish(); } @@ -160,7 +228,11 @@ elsif($cmd eq "rmport") my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("delete from used_ports where server=? and session_id=? and port=?"); check_user($sid); - $sth->execute($server, $sid, $sshport) or die; + $sth->execute($server, $sid, $sshport); + if ($sth->err()) { + syslog('error', "rmport (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } $sth->finish(); } @@ -174,7 +246,12 @@ elsif($cmd eq "resume") check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R', client=?,gr_port=?,sound_port=?,fs_port=? where session_id = ? and uname=?"); - $sth->execute($client, $gr_port, $sound_port, $fs_port, $sid, $realuser) or die; + $sth->execute($client, $gr_port, $sound_port, $fs_port, $sid, $realuser); + if ($sth->err()) + { + syslog('error', "resume (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } $sth->finish(); } @@ -185,16 +262,47 @@ elsif($cmd eq "changestatus") check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'), status=? where session_id = ? and uname=?"); - $sth->execute($status, $sid, $realuser)or die; + $sth->execute($status, $sid, $realuser); + if ($sth->err()) + { + syslog('error', "changestatus (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } $sth->finish(); } +elsif($cmd eq "getstatus") +{ + my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); + my $sth=$dbh->prepare("select status from sessions where session_id = ?"); + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "changestatus (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } + my @data; + my $status; + @data = $sth->fetchrow_array; + { + $status = @data[0]; + } + $sth->finish(); + print $status; +} + elsif($cmd eq "getdisplays") { #ignore $server my @strings; my $sth=$dbh->prepare("select display from sessions"); - $sth->execute()or die; + $sth->execute(); + if ($sth->err()) + { + syslog('error', "getdisplays (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } my @data; my $i=0; while (@data = $sth->fetchrow_array) @@ -212,7 +320,12 @@ elsif($cmd eq "getports") my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select port from used_ports"); - $sth->execute()or die; + $sth->execute(); + if ($sth->err()) + { + syslog('error', "getports (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } my @data; my $i=0; while (@data = $sth->fetchrow_array) @@ -227,7 +340,12 @@ elsif($cmd eq "getservers") { my @strings; my $sth=$dbh->prepare("select server,count(*) from sessions where status != 'F' group by server"); - $sth->execute()or die; + $sth->execute(); + if ($sth->err()) + { + syslog('error', "getservers (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } my @data; my $i=0; while (@data = $sth->fetchrow_array) @@ -245,7 +363,12 @@ elsif($cmd eq "getagent") check_user($sid); my $sth=$dbh->prepare("select agent_pid from sessions where session_id=?"); - $sth->execute($sid)or die; + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "getagent (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } my @data; my $i=0; if(@data = $sth->fetchrow_array) @@ -263,7 +386,12 @@ elsif($cmd eq "getdisplay") check_user($sid); my $sth=$dbh->prepare("select display from sessions where session_id =?"); - $sth->execute($sid)or die; + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "getdisplay (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } my @data; my $i=0; if(@data = $sth->fetchrow_array) @@ -286,7 +414,12 @@ elsif($cmd eq "listsessions") strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and server=? and uname=? and ( session_id not like '%XSHAD%') order by status desc"); - $sth->execute($server, $realuser)or die; + $sth->execute($server, $realuser); + if ($sth->err()) + { + syslog('error', "listsessions (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } fetchrow_printall_array($sth); } @@ -301,7 +434,12 @@ elsif($cmd eq "listsessions_all") strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); - $sth->execute($realuser)or die; + $sth->execute($realuser); + if ($sth->err()) + { + syslog('error', "listsessions_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } fetchrow_printall_array($sth); } else diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index 52c4346..3388820 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gobasepath 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index a45e8a0..0fc587b 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gocleansessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 64d51ac..7752080 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index c027021..314e68b 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index 67937a4..facc29f 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gofeature 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS @@ -24,6 +24,7 @@ If feature <feature_name> is available on the X2Go server, then ,,ok'' is writte Otherwise the expression ,,not available'' is written to stdout. .SH SEE ALSO /usr/share/x2go/x2gofeature.d/*.features +x2gofeaturelist(8) .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project (http://www.x2go.org) diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 new file mode 100644 index 0000000..e3ec8e6 --- /dev/null +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -0,0 +1,30 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gofeaturelist 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.SH NAME +x2gofeaturelist \- Query X2Go Feature List for X2Go Server +.SH SYNOPSIS +'nh +.fi +.ad 1 +x2gofeaturelist + +.SH DESCRIPTION +\fBx2gofeaturelist\fR allows client applications to query a server-side list of X2Go features. +Such a list is very handy when new X2Go clients connect to older X2Go server. The list of features +provides an overview to the client on what functionalities the server support and what not. +.PP +\fBx2gofeaturelist\fR can be run with user privileges. +.SH RETURN VALUES +List of X2Go feature names. +.SH SEE ALSO +/usr/share/x2go/x2gofeature.d/*.features +x2gofeature(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 index ed7270f..a0b03df 100644 --- a/x2goserver/man/man8/x2gogetservers.8 +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetservers 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gogetservers 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gogetservers \- Retrieve list of available X2Go servers .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 4125c37..6dc25cf 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2golistdesktops 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index 176ffd9..d876851 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2golistmounts 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index 91a76e9..c872745 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2golistsessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index f68073f..41e89e6 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index 69b2fe7..b58544a 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gomountdirs 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index f8efed9..6a8c2a1 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goresume-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index bf22a9e..0952072 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goruncommand 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index 4e2443d..5f35c98 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gosessionlimit 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 8eb8d4f..282ebde 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goshowblocks 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 0fd81cd..7c86d2e 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gostartagent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index 89fe595..4646a9c 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index 054da4e..2c72b9c 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goterminate-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index d48ce13..f256d5a 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goumount-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index 56b78d7..a7675a7 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.TH x2goversion 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index b3f65db..6e21482 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -56,12 +56,12 @@ sub check_stat my $sess=shift; my $user=shift; my $log="~$user/.x2go/C-$sess/session.log"; - my $text=`tail -1 $log`; + my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { return 0; } - return 1; + return 1; } sub catch_term @@ -101,15 +101,15 @@ elsif ($pid == 0 ) my @sinfo=split('\\|',"@outp[$i]"); if (@sinfo[4]eq 'F') { - #print "@sinfo[1], is blocked\n"; - #print "(@sinfo[1])Unmounting all shares\n"; + syslog('debug', "@sinfo[1] is blocked"); + syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); - #print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n"; - #print "(@sinfo[1])Unmounting all shares\n"; + syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); + syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } else @@ -119,8 +119,8 @@ elsif ($pid == 0 ) if (!check_stat(@sinfo[1],@sinfo[11])) { system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); - #print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n"; - #print "(@sinfo[1])Unmounting all shares\n"; + syslog("@sinfo[1] is suspended, changing status from @sinfo[4] to S"); + syslog("@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index c1f0567..dddcae3 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -35,7 +35,7 @@ sub check_stat my $sess=shift; my $user=shift; my $log="~$user/.x2go/C-$sess/session.log"; - my $text=`tail -1 $log`; + my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { return 0; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 359f25e..70313d2 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -33,6 +33,7 @@ case "$X2GO_FEATURE" in "X2GO_MOUNTDIRS") echo "ok"; exit 0;; "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;; "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;; + "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; *) exit -1;; esac hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.0.1-34-g3106896
by git-admin＠x2go.org 04 Apr '12

04 Apr '12

The branch, master has been updated via 3106896d148a55969c98be317595e8911191a163 (commit) via 863da3df9fece11be38ec5ce145850913e349873 (commit) from 266606a478e62c680d8124eb5750eb0b2a36960a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3106896d148a55969c98be317595e8911191a163 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 4 11:41:48 2012 +0200 release 3.1.1.0 commit 863da3df9fece11be38ec5ce145850913e349873 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 4 11:40:15 2012 +0200 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2e277d5..75fa83a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.1.1.0): @@ -12,10 +12,10 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low supported X2Go features. - Update date and version number in man pages. - Fix race condition between session.log of x2goagent and - x2gocleansessions. If x2goagent is now fast enough with appending - the new session state to the session.log file, the x2gocleansessions - script will mark the session as suspended during the session - resuming process. + x2gocleansessions. The old situation was: in cases that x2goagent + was not fast enough with appending the new session state to the + session.log file, the x2gocleansessions script marked the session + as suspended during the session resuming process. - Wait one second for x2goagent to write to session.log before updating the session state from 'S' to 'R' in the X2Go session database. - Add X2Go server script x2gogetstatus. @@ -34,7 +34,7 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low - Support for "published applications". Sponsored by Stefan Baur (http://www.baur-itcs.de) - -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Thu, 08 Mar 2012 13:24:10 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:41:02 +0200 x2goserver (3.1.0.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-171-gb1cdf8f
by git-admin＠x2go.org 03 Apr '12

03 Apr '12

The branch, master has been updated via b1cdf8f31e41f5d66b386089d90349cd09a4ff5e (commit) from 5ccc7328d8c4e55a07afb1d10484100c19b400a6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b1cdf8f31e41f5d66b386089d90349cd09a4ff5e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 3 20:17:20 2012 +0200 Allow TCP ports higher than 64000 for SSH and sound server connections. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9b1b494..e152164 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Ship PulseAudio 1.1 with PyHoca-GUI. - Stdout/stderr diversion when frozen with py2exe: stdout will overwrite the last log file, stderr will append to the very same file. + - Allow TCP ports higher than 64000 for SSH and sound server connections. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index fac17b5..b25316f 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -217,7 +217,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+':') self.Host = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+':') - self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000) + self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) @@ -231,10 +231,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000) + self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000) + self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) self.LinkSpeed = wx.Slider(self.tab_Connection, -1, 0, 0, 4) self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-170-g5ccc732
by git-admin＠x2go.org 03 Apr '12

03 Apr '12

The branch, master has been updated via 5ccc7328d8c4e55a07afb1d10484100c19b400a6 (commit) from e6e40b946b276f669dbb250a15db51f21d095b57 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ccc7328d8c4e55a07afb1d10484100c19b400a6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 3 17:52:04 2012 +0200 Stdout/stderr diversion when frozen with py2exe: stdout will overwrite the last log file, stderr will append to the very same file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca-gui | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dc5dd6b..9b1b494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Provide code for Windows packaging (py2exe, NSIS) in PyHoca-GUI's setup.py. - Ship PulseAudio 1.1 with PyHoca-GUI. + - Stdout/stderr diversion when frozen with py2exe: stdout will overwrite + the last log file, stderr will append to the very same file. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca-gui b/pyhoca-gui index 291e4b6..196c26a 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -28,9 +28,14 @@ PROG_PID = os.getpid() if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): class Win32_Logging(object): + softspace = 0 _fname = os.path.join(os.environ['AppData'], PROG_NAME, '%s.log' % PROG_NAME) _file = None + + def __init__(self, filemode='a'): + self._filemode = filemode + def write(self, text, **kwargs): if self._file is None: try: @@ -38,7 +43,7 @@ if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): os.mkdir(os.path.dirname(self._fname)) except: pass - self._file = open(self._fname, 'w+') + self._file = open(self._fname, self._filemode) except: pass else: @@ -49,8 +54,8 @@ if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): if self._file is not None: self._file.flush() - sys.stdout = Win32_Logging() - sys.stderr = Win32_Logging() + sys.stdout = Win32_Logging(filemode='w+') + sys.stderr = Win32_Logging(filemode='a') del Win32_Logging import gevent hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-169-ge6e40b9
by git-admin＠x2go.org 03 Apr '12

03 Apr '12

The branch, master has been updated via e6e40b946b276f669dbb250a15db51f21d095b57 (commit) from 5b8aeb5140ae32e9fc1276fad11e7f1f79930068 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e6e40b946b276f669dbb250a15db51f21d095b57 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 3 17:29:17 2012 +0200 quote fix ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 66d3d46..3c6ce10 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -163,7 +163,7 @@ Section "{program_name} ($REQUIRED)" SectionIn RO ; Set output path to the installation directory. SetOutPath "$INSTDIR" - File /r /x .svn /x .git "${{py2exeOutputDirectory}}"\\*.* + File /r /x .svn /x .git "${{py2exeOutputDirectory}}\\*.*" ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\\{program_name} "Install_Dir" "$INSTDIR" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-168-g5b8aeb5
by git-admin＠x2go.org 03 Apr '12

03 Apr '12

The branch, master has been updated via 5b8aeb5140ae32e9fc1276fad11e7f1f79930068 (commit) from 2b7e06384eefb27b651be2cdb7fc29ce91d60b57 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5b8aeb5140ae32e9fc1276fad11e7f1f79930068 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 3 17:25:38 2012 +0200 fix quotes in NSIS template ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 920a3a1..66d3d46 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -163,7 +163,7 @@ Section "{program_name} ($REQUIRED)" SectionIn RO ; Set output path to the installation directory. SetOutPath "$INSTDIR" - File /r /x .svn /x .git ${{py2exeOutputDirectory}}\\*.* + File /r /x .svn /x .git "${{py2exeOutputDirectory}}"\\*.* ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\\{program_name} "Install_Dir" "$INSTDIR" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2012