diff -Nru x2goclient-3.99.1.1/appdialog.cpp x2goclient-3.99.2.0/appdialog.cpp --- x2goclient-3.99.1.1/appdialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-3.99.2.0/appdialog.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -0,0 +1,198 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* oleksandr.shneyder@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 -Nru x2goclient-3.99.1.1/appdialog.h x2goclient-3.99.2.0/appdialog.h --- x2goclient-3.99.1.1/appdialog.h 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-3.99.2.0/appdialog.h 2012-04-04 11:35:55.000000000 +0000 @@ -0,0 +1,57 @@ +/*************************************************************************** + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder@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. * + ***************************************************************************/ +#ifndef APPDIALOG_H +#define APPDIALOG_H + +#include +#include "ui_appdialog.h" + +class QTreeWidgetItem; +class ONMainWindow; + +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 // APPDIALOG_H diff -Nru x2goclient-3.99.1.1/appdialog.ui x2goclient-3.99.2.0/appdialog.ui --- x2goclient-3.99.1.1/appdialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-3.99.2.0/appdialog.ui 2012-04-04 11:35:55.000000000 +0000 @@ -0,0 +1,193 @@ + + + AppDialog + + + + 0 + 0 + 510 + 400 + + + + Published Applications + + + + + + + + + 22 + 22 + + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + 1 + + + + + + + + + + Search: + + + + + + + + + + + + + + + + &Start + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &Close + + + + + + + + + + + closeButton + clicked() + AppDialog + reject() + + + 475 + 372 + + + 468 + 286 + + + + + treeWidget + itemSelectionChanged() + AppDialog + slotSelectedChanged() + + + 180 + 121 + + + 468 + 144 + + + + + startButton + clicked() + AppDialog + slotStartSelected() + + + 462 + 18 + + + 453 + 78 + + + + + treeWidget + itemDoubleClicked(QTreeWidgetItem*,int) + AppDialog + slotDoubleClicked(QTreeWidgetItem*) + + + 266 + 226 + + + 459 + 200 + + + + + lineEdit + textChanged(QString) + AppDialog + slotSearchChanged(QString) + + + 167 + 378 + + + 444 + 314 + + + + + + slotSelectedChanged() + slotStartSelected() + slotDoubleClicked(QTreeWidgetItem*) + slotSearchChanged(QString) + + diff -Nru x2goclient-3.99.1.1/debian/bzr-builder.manifest x2goclient-3.99.2.0/debian/bzr-builder.manifest --- x2goclient-3.99.1.1/debian/bzr-builder.manifest 2012-03-08 06:14:47.000000000 +0000 +++ x2goclient-3.99.2.0/debian/bzr-builder.manifest 2012-04-04 11:35:56.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~194 -lp:~x2go/x2go/x2goclient_build-main revid:git-v1:188aa3277110f48cdc58754b69a7b1c9a9e63cdc +# bzr-builder format 0.3 deb-version {debupstream}-0~209 +lp:~x2go/x2go/x2goclient_build-main revid:git-v1:7b871ac84fc2877af240ec5a4a6172d1eaec61b3 diff -Nru x2goclient-3.99.1.1/debian/changelog x2goclient-3.99.2.0/debian/changelog --- x2goclient-3.99.1.1/debian/changelog 2012-03-08 06:14:47.000000000 +0000 +++ x2goclient-3.99.2.0/debian/changelog 2012-04-04 11:35:56.000000000 +0000 @@ -1,8 +1,30 @@ -x2goclient (3.99.1.1-0~194~natty1) natty; urgency=low +x2goclient (3.99.2.0-0~209~natty1) unstable; urgency=low * Auto build. - -- x2go Thu, 08 Mar 2012 06:14:47 +0000 + -- x2go Wed, 04 Apr 2012 11:35:56 +0000 + +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=": 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 Wed, 04 Apr 2012 11:52:07 +0200 x2goclient (3.99.1.1-0~x2go1) unstable; urgency=low diff -Nru x2goclient-3.99.1.1/desktop/x2goclient.desktop x2goclient-3.99.2.0/desktop/x2goclient.desktop --- x2goclient-3.99.1.1/desktop/x2goclient.desktop 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/desktop/x2goclient.desktop 2012-04-04 11:35:55.000000000 +0000 @@ -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 Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/128x128/x2go.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/128x128/x2go.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-development.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-development.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-education.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-education.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-games.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-games.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-graphics.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-graphics.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-internet.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-internet.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-multimedia.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-multimedia.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-office.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-office.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-other.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-other.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-system.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-system.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/applications-utilities.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/applications-utilities.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/22x22/preferences-system.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/22x22/preferences-system.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/32x32/apps.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/32x32/apps.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/32x32/open_dir.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/32x32/open_dir.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/32x32/stop_session.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/32x32/stop_session.png differ Binary files /tmp/FzAiE95Tcg/x2goclient-3.99.1.1/icons/32x32/suspend_session.png and /tmp/YSl4G1jKV6/x2goclient-3.99.2.0/icons/32x32/suspend_session.png differ diff -Nru x2goclient-3.99.1.1/onmainwindow.cpp x2goclient-3.99.2.0/onmainwindow.cpp --- x2goclient-3.99.1.1/onmainwindow.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/onmainwindow.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -37,6 +37,8 @@ bool ONMainWindow::portable=false; QString ONMainWindow::homeDir; +QString ONMainWindow::sessionCfg; + #ifdef Q_OS_WIN QString ONMainWindow::u3Device; @@ -99,6 +101,9 @@ lastSession=0l; changeBrokerPass=false; + appSeparator=0; + + #ifdef Q_OS_WIN clientSshPort="7022"; pulsePort=4713; @@ -164,16 +169,6 @@ widgetExtraStyle =new QPlastiqueStyle(); #endif - QDesktopWidget wd; -// x2goDebug<<"Desktop geometry:"<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 @@ trayIconActiveConnectionMenu->setTitle(lastUser->username()); } else + { trayIconActiveConnectionMenu->setEnabled(false); + } trayIconMenu->addSeparator(); trayIconMenu->addAction(tr("Quit"),this, SLOT(trayQuit())); @@ -1030,10 +1065,76 @@ 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 :"<data().toString()<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 @@ { 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 -Nru x2goclient-3.99.1.1/onmainwindow.h x2goclient-3.99.2.0/onmainwindow.h --- x2goclient-3.99.1.1/onmainwindow.h 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/onmainwindow.h 2012-04-04 11:35:55.000000000 +0000 @@ -1,7 +1,7 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder@obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder@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 @@ 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 @@ QString grPort; QString sndPort; QString fsPort; + bool published; int colorDepth; bool fullscreen; enum {DESKTOP,ROOTLESS,SHADOW} sessionType; @@ -417,6 +435,16 @@ { return !noSessionEdit; } + const QList& getApplications() + { + return applications; + } + static QString getSessionConf() + { + return sessionCfg; + } + + void runApplication(QString exec); SshMasterConnection* findServerSshConnection(QString host); @@ -514,9 +542,9 @@ static QString homeDir; int retSessions; QList x2goServers; + QList applications; QPushButton* bSusp; - QPushButton* sbExp; QPushButton* bTerm; QPushButton* bNew; QPushButton* bShadow; @@ -556,8 +584,10 @@ 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 @@ QAction *act_embedToolBar; QAction *act_changeBrokerPass; QAction *act_testCon; + QList topActions; QToolBar *stb; @@ -618,6 +649,7 @@ QString nick; QString nfsPort; QString mntPort; + static QString sessionCfg; QProcess* ssh; QProcess* soundServer; QProcess* scDaemon; @@ -746,6 +778,10 @@ QSystemTrayIcon *trayIcon; QMenu *trayIconMenu; QMenu *trayIconActiveConnectionMenu; + + QAction* appSeparator; + QMenu* appMenu[Application::OTHER+1]; + bool trayEnabled; bool trayMinToTray; bool trayNoclose; @@ -799,6 +835,10 @@ 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 @@ 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 @@ void slotChangeKbdLayout(const QString& layout); void slotSyncX(); void slotShutdownThinClient(); + void slotReadApplications(bool result, QString output, SshProcess* proc ); public slots: void slotConfig(); diff -Nru x2goclient-3.99.1.1/onmainwindow_part2.cpp x2goclient-3.99.2.0/onmainwindow_part2.cpp --- x2goclient-3.99.1.1/onmainwindow_part2.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/onmainwindow_part2.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -20,6 +20,7 @@ #include "onmainwindow_privat.h" + void ONMainWindow::slotSshConnectionOk() { x2goDebug<<"ssh connection ok"<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 @@ int speed; bool usekbd; bool rootless=false; + resumingSession.published=false; bool setDPI=defaultSetDPI; uint dpi=defaultDPI; QString layout; @@ -454,7 +459,7 @@ QString xdmcpServer; runRemoteCommand=true; QString host=QString::null; - + removeAppsFromTray(); if ( useLdap ) { pack=defaultPack; @@ -546,6 +551,8 @@ 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 @@ 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::resumeSession ( const x2goSession& s ) { newSession=false; - + applications.clear(); + removeAppsFromTray(); QString passwd=getCurrentPass(); QString user=getCurrentUname(); QString host=s.server; @@ -772,6 +785,7 @@ bool usekbd; QString layout; QString type; + removeAppsFromTray(); if ( useLdap ) { @@ -954,6 +968,15 @@ 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 @@ x2goDebug<<"new fs_port: "<start ( 2000 ); } } - sbSusp->setText ( tr ( "Suspend" ) ); + sbSusp->setToolTip ( tr ( "Suspend" ) ); if ( newSession ) { runCommand(); @@ -2483,6 +2508,10 @@ slVal->setFixedSize ( slVal->sizeHint() ); sessionStatusDlg->show(); + if (resumingSession.published) + sbApps->show(); + else + sbApps->hide(); } else { diff -Nru x2goclient-3.99.1.1/onmainwindow_part3.cpp x2goclient-3.99.2.0/onmainwindow_part3.cpp --- x2goclient-3.99.1.1/onmainwindow_part3.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/onmainwindow_part3.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -20,7 +20,6 @@ #include "onmainwindow_privat.h" - x2goSession ONMainWindow::getNewSessionFromString ( const QString& string ) { QStringList lst=string.split ( '|' ); @@ -37,6 +36,12 @@ } +void ONMainWindow::slotAppDialog() +{ + AppDialog dlg(this); + dlg.exec(); +} + void ONMainWindow::runCommand() { QString passwd=getCurrentPass(); @@ -49,13 +54,14 @@ 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 @@ 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 @@ } if ( rootless ) sessionType="R"; + if ( resumingSession.published ) + { + sessionType="P"; + command="PUBLISHED"; + } if ( command=="KDE" ) { @@ -186,6 +199,16 @@ #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 @@ 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("",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")!=-1) + { + bool isSvg=false; + line=lines[++i]; + QByteArray pic; + while (line.indexOf("")==-1) + { + pic+=QByteArray::fromBase64(line.toAscii()); + line=lines[++i]; + if (QString(QByteArray::fromBase64(line.toAscii())).indexOf("",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 @@ 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 @@ } 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 @@ 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 @@ if ( setting=="--kbd-layout" ) { defaultLayout=value.split(",",QString::SkipEmptyParts); - if(defaultLayout.size()==0) - defaultLayout<\t\t set default pack method, default " "'16m-jpeg-9'\n" "--kbd-layout=\t\t set default keyboard layout or layouts\n" - "comma separated\n" + "\t\t\t\t comma separated\n" "--kbd-type=\t\t set default keyboard type\n" - "--home=\t\t set users home directory\n" - "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" ; + "--home=\t\t\t set users home directory\n" + "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" + "--session-conf=\t\t\t path to alternative session config\n"; qCritical ( "%s",helpMsg.toLocal8Bit().data() ); QMessageBox::information ( this,tr ( "Options" ),helpMsg ); } @@ -829,22 +1002,22 @@ 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;jConnection failed\n" ) +output; @@ -942,10 +1115,10 @@ 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 @@ 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::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 @@ if ( !useLdap ) { - if ( passForm->isVisible() ) + if ( passForm->isVisible() && !brokerMode) { if ( passForm->isEnabled() ) { @@ -2025,11 +2198,11 @@ 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 -Nru x2goclient-3.99.1.1/onmainwindow_part4.cpp x2goclient-3.99.2.0/onmainwindow_part4.cpp --- x2goclient-3.99.1.1/onmainwindow_part4.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/onmainwindow_part4.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -1,9 +1,9 @@ -/*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder@obviously-nice.de * +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* oleksandr.shneyder@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 @@ 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 @@ - 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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: "< #include +#include +#include #include "version.h" #include "x2goclientconfig.h" @@ -30,6 +32,7 @@ #include "userbutton.h" #include "exportdialog.h" #include "printprocess.h" +#include "appdialog.h" #include #include #include diff -Nru x2goclient-3.99.1.1/resources.rcc x2goclient-3.99.2.0/resources.rcc --- x2goclient-3.99.1.1/resources.rcc 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/resources.rcc 2012-04-04 11:35:55.000000000 +0000 @@ -45,6 +45,10 @@ icons/32x32/x2goclient.png icons/32x32/resolution.png icons/32x32/contest.png + icons/32x32/apps.png + icons/32x32/open_dir.png + icons/32x32/suspend_session.png + icons/32x32/stop_session.png icons/16x16/audio.png icons/16x16/file-open.png icons/16x16/delete.png @@ -61,6 +65,17 @@ icons/16x16/lxde.png icons/16x16/preferences.png icons/16x16/rdp.png + icons/22x22/applications-development.png + icons/22x22/applications-education.png + icons/22x22/applications-games.png + icons/22x22/applications-graphics.png + icons/22x22/applications-internet.png + icons/22x22/applications-multimedia.png + icons/22x22/applications-office.png + icons/22x22/applications-other.png + icons/22x22/applications-system.png + icons/22x22/applications-utilities.png + icons/22x22/preferences-system.png txt/packs txt/encodings x2goclient_en.qm diff -Nru x2goclient-3.99.1.1/sessionbutton.cpp x2goclient-3.99.2.0/sessionbutton.cpp --- x2goclient-3.99.1.1/sessionbutton.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/sessionbutton.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -33,6 +33,19 @@ { 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 @@ 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 @@ toString(); rootless=st->setting()->value ( sid+"/rootless", false ).toBool(); + published=st->setting()->value ( sid+"/published", + false ).toBool(); cmdBox->clear(); @@ -325,6 +340,7 @@ 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 @@ 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 @@ } + cmdIcon->setPixmap ( cmdpix ); cmd->setText ( command ); @@ -591,6 +614,7 @@ cmd->setText ( command ); QPixmap pix; bool newRootless=rootless; + published=false; QString cmd=command; if ( command=="KDE" ) { @@ -645,12 +669,18 @@ 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 -Nru x2goclient-3.99.1.1/sessionbutton.h x2goclient-3.99.2.0/sessionbutton.h --- x2goclient-3.99.1.1/sessionbutton.h 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/sessionbutton.h 2012-04-04 11:35:55.000000000 +0000 @@ -26,7 +26,7 @@ { 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 @@ QAction* act_createIcon; QAction* act_remove; bool rootless; + bool published; bool editable; private slots: diff -Nru x2goclient-3.99.1.1/sessionwidget.cpp x2goclient-3.99.2.0/sessionwidget.cpp --- x2goclient-3.99.1.1/sessionwidget.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/sessionwidget.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -129,6 +129,7 @@ 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 @@ { cmd->hide(); cmdCombo->setVisible ( true ); + cmdCombo->setEnabled(true); cmdCombo->lineEdit()->selectAll(); cmdCombo->lineEdit()->setFocus(); } @@ -326,8 +328,8 @@ 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 @@ 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 @@ 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 @@ cbAutoLogin->setChecked(false); cbKrbLogin->setChecked(false); cmdCombo->lineEdit()->setText ( - + tr ( "Path to executable" ) ); cmdCombo->lineEdit()->selectAll(); slot_changeCmd ( 0 ); @@ -458,6 +468,7 @@ st.setting()->setValue(sessionId+"/krblogin",( QVariant ) cbKrbLogin->isChecked()); QString command; bool rootless=false; + bool published=false; if ( sessBox->currentIndex() < OTHER ) @@ -499,7 +510,11 @@ 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 -Nru x2goclient-3.99.1.1/sessionwidget.h x2goclient-3.99.2.0/sessionwidget.h --- x2goclient-3.99.1.1/sessionwidget.h 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/sessionwidget.h 2012-04-04 11:35:55.000000000 +0000 @@ -25,43 +25,43 @@ 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 -Nru x2goclient-3.99.1.1/sshmasterconnection.cpp x2goclient-3.99.2.0/sshmasterconnection.cpp --- x2goclient-3.99.1.1/sshmasterconnection.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/sshmasterconnection.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -35,6 +35,12 @@ #endif #include +#ifndef Q_OS_WIN +#include +#include +#endif + + #include "onmainwindow.h" #undef DEBUG @@ -212,6 +218,16 @@ 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 @@ x2goDebug<<"new forward connection"<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 @@ void UserButton::slotClicked() { - emit userSelected ( this ); + emit userSelected ( this ); } diff -Nru x2goclient-3.99.1.1/VERSION x2goclient-3.99.2.0/VERSION --- x2goclient-3.99.1.1/VERSION 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/VERSION 2012-04-04 11:35:55.000000000 +0000 @@ -1 +1 @@ -3.99.1.1 +3.99.2.0 diff -Nru x2goclient-3.99.1.1/version.h x2goclient-3.99.2.0/version.h --- x2goclient-3.99.1.1/version.h 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/version.h 2012-04-04 11:35:55.000000000 +0000 @@ -1 +1 @@ -#define VERSION "3.99.1.1" +#define VERSION "3.99.2.0" diff -Nru x2goclient-3.99.1.1/x2goclient_de.ts x2goclient-3.99.2.0/x2goclient_de.ts --- x2goclient-3.99.1.1/x2goclient_de.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_de.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,6 +2,84 @@ + AppDialog + + + Published Applications + + + + + Search: + + + + + &Start + + + + + &Close + + + + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + Konfiguration + + + + System + + + + + Utility + + + + + Other + + + + BrokerPassDialogUi @@ -1019,41 +1097,41 @@ ONMainWindow - - + + us de - + pc105/us pc105/de - + Support ... Support ... - - - + + + Session: Sitzung: - + &Quit &Beenden - + Ctrl+Q Strg+Q - - + + Quit Beenden @@ -1062,7 +1140,7 @@ &Neue Sitzung ... - + Ctrl+N Strg+N @@ -1071,7 +1149,7 @@ Sitzungsverwaltung... - + Ctrl+E Strg+E @@ -1080,7 +1158,7 @@ LDAP &Konfiguration ... - + Restore toolbar Wergzeugleiste wieder anzeigen @@ -1089,176 +1167,182 @@ Über X2GoClient - + About Qt Über QT - + Session Sitzung - + Ctrl+Q exit Strg +Q - + &Session &Sitzung - + &Options &Einstellungen - + &Help &Hilfe - + Password: Password: - + Keyboard layout: Tastaturlayout: - + Ok Ok - - - + + + Cancel Abbrechen - + + Applications... + Anwendungen... + + + Invalid reply from broker Ungültige Antwort vom Session-Broker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error Fehler - - + + KDE KDE - + on on - - - - + + + + Login: Benutzername: - - + + Select session: Wähle Sitzung: - + Resume Fortfahren - - - - + + + + Suspend Anhalten - - - - + + + + Terminate Beenden - + New Neu - - - + + + Display Display - + Status Status - + Server Server @@ -1267,20 +1351,20 @@ Startzeit - + Client IP Client IP - - - + + + running aktiv - - + + suspended angehalten @@ -1293,46 +1377,46 @@ Datei kann nicht geschrieben werden: - + Unable to create SSL Tunnel: SSL Tunnel kann nicht erzeugt werden: - - - - + + + + Warning Warnung - + - + connecting verbinde - + starting starte - + resuming aktiviere - - - + + + Connection timeout, aborting Zeitüberschreitung - + aborting Abbruch @@ -1341,7 +1425,7 @@ <b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b> - + Abort Abbruch @@ -1350,76 +1434,76 @@ Zeige Details - + (can't open file) (kann Datei nicht öffnen) - - - + + + (file not exists) (Datei existiert nicht) - + (directory not exists) (Verzeichnis existiert nicht) - + wrong value for argument"--link" unerwarteter Wert "--link" - + wrong value for argument"--sound" unerwarteter Wert "--sound" - - + + wrong value for argument"--geometry" unerwarteter Wert "--geometry" - + wrong value for argument"--set-kbd" unerwarteter Wert "--set-kbd" - + wrong value for argument"--ldap" unerwarteter Wert "--ldap" - + wrong value for argument"--pack" unerwarteter Wert "--pack" - - + + wrong parameter: unerwarteter Wert: - + Available pack methodes: Liste aller Packmethoden: - + Support Support - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + Please check LDAP Settings Bitte überprüfen Sie die LDAP Einstellungen @@ -1432,15 +1516,15 @@ Sind Sie sicher, dass Sie die Sitzung löschen wollen? - - - - - - - - - + + + + + + + + + <b>Connection failed</b> <b>Verbindung fehlgeschlagen</b> @@ -1451,22 +1535,23 @@ es konnte kein Server gefunden werden - + Session ID Sitzungs ID - + suspending anhalten - + terminating beende - + + <b>Connection failed</b> : @@ -1519,17 +1604,17 @@ <b>X2GoClient V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten Sie auf x2go.org. - + <b>Wrong Password!</b><br><br> <b>Falsches Passwort!</b><br><br> - + wrong value for argument"--ldap1" unerwarteter Wert "--ldap1" - + wrong value for argument"--ldap2" unerwarteter Wert "--ldap2" @@ -1558,12 +1643,12 @@ 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' - + Unable to create file: Datei konnte nicht erzeugt werden: - + No valid card found Es wurde keine gültige Karte gefunden @@ -1572,13 +1657,13 @@ Diese Karte ist dem X2Go-System unbekannt - + &Settings ... &Konfiguration ... - - + + Options Einstellungen @@ -1587,17 +1672,16 @@ RSA Schlüssel konnte nicht gelesen werden: - - Can't connect to X-Server - Verbindung zu X-Server konnte nicht hergestellt werden + Verbindung zu X-Server konnte nicht hergestellt werden - - - Can't connect to X-Server + + Can't connect to X server Please check your settings - Verbindung zu X-Server konnte nicht hergestellt werden + Can't connect to X-Server +Please check your settings + Verbindung zu X-Server konnte nicht hergestellt werden Überprüfen Sie Ihre Einstellungen @@ -1605,40 +1689,39 @@ X-Server konnte nicht gestartet werden - Can't start X Server Please check your settings - X-Server konnte nicht gestartet werden + X-Server konnte nicht gestartet werden Überprüfen Sie Ihre Einstellungen - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem <b>Verlust der ganzen Sitzung</b>. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf - + 24 or 32 24 oder 32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? bit zu ändern und den verwendeten X-server neu zu starten, bevor Sie sich mit der Sitzung verbinden. Trotzdem versuchen die Sitzung fortzuführen? - - + + Yes Ja - - + + No Nein @@ -1655,42 +1738,42 @@ </b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. - + OpenOffice.org - + Terminal - + unknown unbekannt - + Command Befehl - + Type Typ - + Desktop Desktopumgebung - + single application Anwendung - + shadow session @@ -1699,98 +1782,99 @@ <br>Fehler in der Sudo Konfiguration - + Unable to execute: Befehl konnte nicht ausgeführt werden: - + X2Go client - + Internet browser Webbrowser - + Email client E-Mail-Programm - + &New session ... &Neue Sitzung ... - + Session management... Sitzungsverwaltung... - - + + Show toolbar Zeige Wergzeugleiste - - + + About X2GO client Über X2GoClient - - - + + + Please check LDAP settings Bitte überprüfen Sie die LDAP Einstellungen - + no X2Go server found in LDAP LDAP enthält keinen X2GoServer - + Are you sure you want to delete this session? Sind Sie sicher, dass Sie die Sitzung löschen wollen? - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> <b>Falsches Passwort!</b><br><br> - + No server availabel es konnte kein Server gefunden werden - - + + Not connected Active connection Nicht verbunden - - + + Creation time Startzeit - - + + Unable to create folder: Ordner kann nicht erzeugt werden: @@ -1833,113 +1917,174 @@ Anmeldung fehlgeschlagen - - - - + + + + Server not availabel Server nicht verfügbar - + Unable to write file: Datei kann nicht geschrieben werden: - - + + Unable to create SSL tunnel: SSL Tunnel kann nicht erzeugt werden: - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> <b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b> - - - + + + Share folder... Ordner freigeben... - + Show details Zeige Details - + <b>X2Go client V. <b>X2GoClient V. - + This card is unknown by X2Go system Diese Karte ist dem X2Go-System unbekannt - + + Can't start X server +Please check your settings + + + + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel Bitte installieren sie eine neuere Version von x2goserver - + &Create session icon on desktop... &Desktopsymbol erzeugen... - + &Set broker password... &Kennwort für Session-Broker setzen... - + &Connectivity test... &Verbindungstest... - + Operation failed Operation fehlgeschlagen - + Password changed Das Kennwort wurde geändert - + Wrong password! Falsches Kennwort! - + <b>Authentication</b> <b>Authentifizierung</b> - + Restore Wiederherstellen - + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + Konfiguration + + + + System + + + + + Utility + + + + + Other + + + + Left mouse button to hide/restore - Right mouse button to display context menu Left click to open the X2GoClient window or right click to get the context menu. Linke Maustaste: verstecken/wiederherstellen - rechte Maustaste: Kontextmenü - + Create session icon on desktop Desktopsymbol erzeugen - + 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? @@ -1948,44 +2093,44 @@ Wollen Sie den versteckten Modus nutzen? - + New Session Neue Sitzung - + X2Go sessions not found Keine X2Go-Sitzungen gefunden - + RDP connection RDP Verbindung - + X2Go Link to session - - + + Detach X2Go window Fenster abkoppeln - - + + Attach X2Go window Fenster einbetten - + Finished Beendet - + Are you sure you want to terminate this session? Unsaved documents will be lost Die Sitzung wird beendet. Sind Sie sicher?<br>Ungespeicherte Dokumente gehen verloren @@ -1995,7 +2140,7 @@ </b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. - + Can't start X Server @@ -2004,18 +2149,18 @@ Bitte überprüfen Sie Ihre Installation - + X2Go Session X2Go-Sitzung - - + + Minimize toolbar Symbole verstecken - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> <br><b>&nbsp;&nbsp;&nbsp;zum Wiederherstellen&nbsp;&nbsp;&nbsp;<br> &nbsp;&nbsp;&nbsp;der Werkzeugleiste&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;hier klicken&nbsp;&nbsp;&nbsp;</b><br> @@ -2024,7 +2169,7 @@ Konfigurationsdatei lässt sich nicht öffnen: - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> @@ -2033,65 +2178,65 @@ <b>sudo apt-get install openssh-server</b> - + Connection to local desktop Zugriff auf lokalen Desktop - + Information Hinweis - - + + Filter Filter - + Select desktop: Desktopauswahl: - + View only Nur betrachten - + User Benutzer - + XDMCP XDMCP - + No accessible desktop found Kein freigegebener Desktop gefunden - + Full access Vollzugriff - + Only my desktops Nur eigene Desktops - + Reconnect Neu verbinden - - - + + + Connecting to broker Verbinden mit Broker @@ -2100,12 +2245,12 @@ </b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> <br>x2goplugin Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. <br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. @@ -2120,7 +2265,7 @@ ISO8859-1 - + wrong value for argument"speed" wrong value for argument"speed" @@ -2364,30 +2509,37 @@ KDE - - - + + + + Published applications + + + + + + fullscreen Vollbild - - - - - + + + + + Display Anzeige - - + + Enabled aktiviert - - + + Disabled deaktiviert @@ -2396,8 +2548,8 @@ /usr/bin/startkde - - + + window Fenster @@ -2447,23 +2599,23 @@ angehalten - - - + + + RDP connection RDP Verbindung - - - + + + Connection to local desktop Zugriff auf lokalen Desktop - - - + + + XDMCP XDMCP @@ -2582,7 +2734,7 @@ - + Connect to Windows terminal server Verbindung mit Windows Terminalserver herstellen @@ -2597,57 +2749,62 @@ Anwendung - - + + Published applications + + + + + Command: Befehl: - + Advanced options... Erweiterte Einstellungen... - - - + + + Path to executable Pfad zum Programm - + Open picture Öffne Bild - + Pictures Bilder - + Open key file Öffne Schlüssel - + All files Alle Dateien - - + + Server: Server: - + rdesktop command line options: rdesktop Kommandozeilenoptionen: - - + + New session Neue Sitzung @@ -2657,8 +2814,8 @@ Zugriff auf lokalen Desktop - - + + XDMCP server: XDMCP Server: @@ -2668,12 +2825,12 @@ XDMCP - + Error Fehler - + 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 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. @@ -2900,77 +3057,77 @@ Kann libssh nicht initialisieren - + Can not create ssh session Kann SSH-Sitzung nicht erstellen - + Can not connect to Verbindungsaufbau nicht möglich - + Authentication failed Anmeldung fehlgeschlagen - + channel_forward_listen failed channel_forward_listen schlug fehl - + Can not open file Kann Datei nicht öffnen - + Can not create remote file Kann entfernte Datei nicht öffnen - + Can not write to remote file Kann entfernte Datei nicht schreiben - + can not connect to Kann Verbindung nicht herstellen zu - + channel_open_forward failed channel_open_forward schlug fehl - + channel_open_session failed channel_open_session schlug fehl - + channel_request_exec failed channel_request_exec schlug fehl - + error writing to socket Fehler beim Schreiben auf Socket - + error reading channel Channel Lesefehler - + channel_write failed Channel Schreibfehler - + error reading tcp socket Lesefehler TCP-Socket diff -Nru x2goclient-3.99.1.1/x2goclient_en.ts x2goclient-3.99.2.0/x2goclient_en.ts --- x2goclient-3.99.1.1/x2goclient_en.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_en.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,6 +2,84 @@ + AppDialog + + + Published Applications + + + + + Search: + + + + + &Start + + + + + &Close + + + + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + + + + + System + + + + + Utility + + + + + Other + + + + BrokerPassDialogUi @@ -645,360 +723,416 @@ ONMainWindow - - + + us - + pc105/us - + X2Go client - + - + connecting - + Internet browser - + Email client - + OpenOffice.org - + Terminal - + &Settings ... - + Support ... - - + + About X2GO client - - - + + + Share folder... - - - - + + + + Suspend - - - - + + + + Terminate - + Reconnect - - + + Detach X2Go window - - + + Minimize toolbar - - - + + + Session: - + &Quit - + Ctrl+Q - - + + Quit - + &New session ... - + Ctrl+N - + Session management... - + Ctrl+E - + &Create session icon on desktop... - + &Set broker password... - + &Connectivity test... - - + + Show toolbar - + About Qt - + Ctrl+Q exit - + &Session - + &Options - + &Help - - - - + + + + Login: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error - + Operation failed - + Password changed - + Wrong password! - - - + + + Connecting to broker - + <b>Authentication</b> - + Restore - - + + Not connected - + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + + + + + System + + + + + Utility + + + + + Other + + + + Left mouse button to hide/restore - Right mouse button to display context menu - - - + + + Please check LDAP settings - + no X2Go server found in LDAP - + Create session icon on desktop - + 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? - + New Session - + X2Go Link to session - + X2Go sessions not found - + Are you sure you want to delete this session? - - + + KDE - + RDP connection - + XDMCP - + Connection to local desktop - + on @@ -1037,15 +1171,15 @@ - - + + Yes - - + + No @@ -1055,374 +1189,371 @@ - - - - - - - - - + + + + + + + + + <b>Connection failed</b> - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> - + unknown - + No server availabel - - - - + + + + Server not availabel - - + + Select session: - - - + + + running - - + + suspended - + Desktop - + single application - + shadow session - + Information - + No accessible desktop found - - + + Filter - + Select desktop: - - - - + + + + Warning - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to - + 24 or 32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? - + suspending - + terminating - + <b>Wrong Password!</b><br><br> - - + + Unable to create folder: - + Unable to write file: - - + + Attach X2Go window - - + + Unable to create SSL tunnel: - + Unable to create SSL Tunnel: - + Finished - + starting - + resuming - - - + + + Connection timeout, aborting - + aborting - + Are you sure you want to terminate this session? Unsaved documents will be lost - + Session - - - + + + Display - - + + Creation time - + + <b>Connection failed</b> : - + (can't open file) - - - + + + (file not exists) - + (directory not exists) - + wrong value for argument"--link" - + wrong value for argument"--sound" - - + + wrong value for argument"--geometry" - + wrong value for argument"--set-kbd" - + wrong value for argument"--ldap" - + wrong value for argument"--ldap1" - + wrong value for argument"--ldap2" - + wrong value for argument"--pack" - - + + wrong parameter: - - + + Options - + Available pack methodes: - + Support - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. - + <b>X2Go client V. - + Please check LDAP Settings - + No valid card found - + This card is unknown by X2Go system - + Unable to create file: - - - Can't connect to X-Server - - - - - - Can't connect to X-Server + + Can't start X server Please check your settings - - Can't start X Server + + Can't connect to X server Please check your settings + Can't connect to X-Server +Please check your settings - + Can't start X Server @@ -1430,12 +1561,12 @@ - + Unable to execute: - + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package @@ -1463,131 +1594,136 @@ - + X2Go Session - + wrong value for argument"speed" - + Password: - + Keyboard layout: - + Ok - - - + + + Cancel - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> - + + Applications... + + + + Abort - + Show details - + Resume - + New - + Full access - + View only - + Status - + Command - + Type - + Server - + Client IP - + Session ID - + User - + Only my desktops - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> - + Restore toolbar - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> - + Invalid reply from broker @@ -1846,57 +1982,64 @@ - - - + + + RDP connection - - - + + + XDMCP - - - + + + Connection to local desktop - - - - fullscreen + + + + Published applications - + - - - + + fullscreen + + + + + + + + Display - - + + window - - + + Enabled - - + + Disabled @@ -1999,7 +2142,7 @@ - + Connect to Windows terminal server @@ -2024,73 +2167,78 @@ - - - Command: + + Published applications + + Command: + + + + Advanced options... - - - + + + Path to executable - + Open picture - + Pictures - + Open key file - + All files - + Error - + 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 - - + + Server: - - + + XDMCP server: - + rdesktop command line options: - - + + New session @@ -2316,77 +2464,77 @@ - + Can not create ssh session - + Can not connect to - + Authentication failed - + channel_forward_listen failed - + Can not open file - + Can not create remote file - + Can not write to remote file - + can not connect to - + channel_open_forward failed - + channel_open_session failed - + channel_request_exec failed - + error writing to socket - + error reading channel - + channel_write failed - + error reading tcp socket diff -Nru x2goclient-3.99.1.1/x2goclient_fr.ts x2goclient-3.99.2.0/x2goclient_fr.ts --- x2goclient-3.99.1.1/x2goclient_fr.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_fr.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,6 +2,84 @@ + AppDialog + + + Published Applications + + + + + Search: + + + + + &Start + + + + + &Close + + + + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + + + + + System + + + + + Utility + + + + + Other + + + + BrokerPassDialogUi @@ -645,478 +723,535 @@ ONMainWindow - - + + us - + pc105/us - + X2Go client - + - + connecting - + Internet browser - + Email client - + OpenOffice.org - + Terminal - + &Settings ... - + Support ... - - + + About X2GO client - - - + + + Share folder... - - - - + + + + Suspend - - - - + + + + Terminate - + Reconnect - - + + Detach X2Go window - - + + Minimize toolbar - - - + + + Session: - + &Quit - + Ctrl+Q - - + + Quit - + &New session ... - + Ctrl+N - + Session management... - + Ctrl+E - + &Create session icon on desktop... - + &Set broker password... - + &Connectivity test... - - + + Show toolbar - + About Qt - + Ctrl+Q exit - + &Session - + &Options - + &Help - - - - + + + + Login: - + Operation failed - + Password changed - + Wrong password! - + <b>Authentication</b> - + Restore - - + + Not connected - + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + + + + + System + + + + + Utility + + + + + Other + + + + Left mouse button to hide/restore - Right mouse button to display context menu Left click to open the X2GoClient window or right click to get the context menu. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error - - - + + + Please check LDAP settings - + no X2Go server found in LDAP - + Create session icon on desktop - + 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? - + New Session - + X2Go Link to session - + X2Go sessions not found - + Are you sure you want to delete this session? - - + + KDE - + RDP connection - + XDMCP - + Connection to local desktop - + on - - - - - - - - - + + + + + + + + + <b>Connection failed</b> - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> - + unknown - + No server availabel - - + + Select session: - - - + + + running - - + + suspended - + Desktop - + single application - + shadow session - + Information - + No accessible desktop found - - + + Filter - + Select desktop: - - - - + + + + Warning - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to - + 24 or 32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? - - + + Yes @@ -1149,8 +1284,8 @@ - - + + No @@ -1166,257 +1301,253 @@ - - - - + + + + Server not availabel - + suspending - + terminating - + <b>Wrong Password!</b><br><br> - - + + Unable to create folder: - + Unable to write file: - - + + Attach X2Go window - - + + Unable to create SSL tunnel: - + Unable to create SSL Tunnel: - + Finished - + starting - + resuming - - - + + + Connection timeout, aborting - + aborting - + Are you sure you want to terminate this session? Unsaved documents will be lost - + Session - - - + + + Display - - + + Creation time - + + <b>Connection failed</b> : - + (can't open file) - - - + + + (file not exists) - + (directory not exists) - + wrong value for argument"--link" - + wrong value for argument"--sound" - - + + wrong value for argument"--geometry" - + wrong value for argument"--set-kbd" - + wrong value for argument"--ldap" - + wrong value for argument"--ldap1" - + wrong value for argument"--ldap2" - + wrong value for argument"--pack" - - + + wrong parameter: - - + + Options - + Available pack methodes: - + Support - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. - + <b>X2Go client V. - + Please check LDAP Settings - + No valid card found - + This card is unknown by X2Go system - + Unable to create file: - - - Can't connect to X-Server - - - - - - Can't connect to X-Server + + Can't start X server Please check your settings - - Can't start X Server + + Can't connect to X server Please check your settings + Can't connect to X-Server +Please check your settings - + Can't start X Server @@ -1424,12 +1555,12 @@ - + Unable to execute: - + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package @@ -1447,133 +1578,138 @@ - + X2Go Session - + Password: - + Keyboard layout: - + Ok - - - + + + Cancel - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> - + + Applications... + + + + Abort - + Show details - + Resume - + New - + Full access - + View only - + Status - + Command - + Type - + Server - + Client IP - + Session ID - + User - + Only my desktops - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> - + Restore toolbar - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> - + Invalid reply from broker - - - + + + Connecting to broker @@ -1588,7 +1724,7 @@ - + wrong value for argument"speed" @@ -1847,57 +1983,64 @@ - - - + + + RDP connection - - - + + + XDMCP - - - + + + Connection to local desktop - - - - fullscreen + + + + Published applications - + - - - + + fullscreen + + + + + + + + Display - - + + window - - + + Enabled - - + + Disabled @@ -2000,7 +2143,7 @@ - + Connect to Windows terminal server @@ -2025,73 +2168,78 @@ - - - Command: + + Published applications + + Command: + + + + Advanced options... - - - + + + Path to executable - + Open picture - + Pictures - + Open key file - + All files - - + + Server: - - + + XDMCP server: - + rdesktop command line options: - - + + New session - + Error - + 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 @@ -2317,77 +2465,77 @@ - + Can not create ssh session - + Can not connect to - + Authentication failed - + channel_forward_listen failed - + Can not open file - + Can not create remote file - + Can not write to remote file - + can not connect to - + channel_open_forward failed - + channel_open_session failed - + channel_request_exec failed - + error writing to socket - + error reading channel - + channel_write failed - + error reading tcp socket diff -Nru x2goclient-3.99.1.1/x2goclient_nb_no.ts x2goclient-3.99.2.0/x2goclient_nb_no.ts --- x2goclient-3.99.1.1/x2goclient_nb_no.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_nb_no.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,6 +2,84 @@ + AppDialog + + + Published Applications + + + + + Search: + + + + + &Start + + + + + &Close + + + + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + Innstillinger + + + + System + + + + + Utility + + + + + Other + + + + BrokerPassDialogUi @@ -655,42 +733,42 @@ ONMainWindow - - + + us no - + pc105/us pc105/de - + Support ... Need to double-check this one Støtte ... - - - + + + Session: Sesjon: - + &Quit &Avslutt - + Ctrl+Q Ctrl+Q - - + + Quit Avslutt @@ -699,7 +777,7 @@ &Neue Sitzung ... - + Ctrl+N Ctrl+N @@ -708,7 +786,7 @@ Sitzungsverwaltung... - + Ctrl+E Ctrl+E @@ -717,7 +795,7 @@ LDAP &Konfiguration ... - + Restore toolbar Gjenopprett verktøylinjen @@ -726,179 +804,185 @@ Über X2GO Client - + About Qt Om QT - + Session Sesjon - + Ctrl+Q exit Ctrl+Q - + &Session &Sesjon - + &Options &Innstillinger - + &Help &Hjelp - + Password: Passord: - + Keyboard layout: Tastatur utseende: - + Ok Ok - - - + + + Cancel Avbryt - + + Applications... + + + + Invalid reply from broker Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context. Ugyldig svar fra megleren - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error Feil - - + + KDE KDE - + on på - - - - + + + + Login: Brukernavn: - - + + Select session: Velg sesjon: - + Resume Gjenoppta - - - - + + + + Suspend 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. Koble fra - - - - + + + + Terminate Need to revisit this word to see if the chosen one is *strong* enough Avslutte - + New Ny - - - + + + Display Skjerm - + Status Status - + Server Server @@ -907,20 +991,20 @@ Startzeit - + Client IP Klient IP - - - + + + running aktiv - - + + suspended Frakoblet @@ -933,46 +1017,46 @@ Datei kann nicht geschrieben werden: - + Unable to create SSL Tunnel: Klarer ikke å opprette SSL tunnel: - - - - + + + + Warning Advarsel - + - + connecting kobler til - + starting starter - + resuming gjenopptar - - - + + + Connection timeout, aborting Tilkoblingen tidsavbrutt, avbryter - + aborting Avbryter @@ -981,7 +1065,7 @@ <b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b> - + Abort Avbryt @@ -990,78 +1074,78 @@ Zeige Details - + (can't open file) (kan ikke åpne filen) - - - + + + (file not exists) (filen finnes ikke) - + (directory not exists) (mappen finnes ikke) - + wrong value for argument"--link" 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? ugyldig verdi for parameteren "--link" - + wrong value for argument"--sound" ugyldig verdi for parameteren "--sound" - - + + wrong value for argument"--geometry" ugyldig verdi for parameteren "--geometry" - + wrong value for argument"--set-kbd" ugyldig verdi for parameteren "--set-kbd" - + wrong value for argument"--ldap" ugyldig verdi for parameteren "--ldap" - + wrong value for argument"--pack" ugyldig verdi for parameteren "--pack" - - + + wrong parameter: ugyldig parameter: - + Available pack methodes: Tilgjengelige pakkemetoder: - + Support Will have to revisit this one, not sure if it fits Støtte - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + Please check LDAP Settings Vennligst sjekk LDAP innstillingene @@ -1074,15 +1158,15 @@ Sind Sie sicher, dass Sie die Sitzung löschen wollen? - - - - - - - - - + + + + + + + + + <b>Connection failed</b> <b>Tilkoblingen feilet</b> @@ -1093,22 +1177,23 @@ es konnte kein Server gefunden werden - + Session ID Sesjons ID - + suspending Kobler fra - + terminating Avslutter - + + <b>Connection failed</b> : @@ -1163,18 +1248,18 @@ <b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. - + <b>Wrong Password!</b><br><br> 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. <b>Feil passord!</b><br><br> - + wrong value for argument"--ldap1" ugyldig verdi for parameteren "--ldap1" - + wrong value for argument"--ldap2" ugyldig verdi for parameteren "--ldap2" @@ -1203,12 +1288,12 @@ 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' - + Unable to create file: Klarer ikke å opprette filen: - + No valid card found Ingen gyldige kort ble funnet @@ -1217,14 +1302,14 @@ Diese Karte ist dem X2Go System unbekannt - + &Settings ... Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions &Innstillinger - - + + Options Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first Alternativer @@ -1234,17 +1319,16 @@ RSA Schlüssel konnte nicht gelesen werden: - - Can't connect to X-Server - Klarte ikke å koble til X-Serveren + Klarte ikke å koble til X-Serveren - - - Can't connect to X-Server + + Can't connect to X server Please check your settings - Klarte ikke å koble til X-Serveren + Can't connect to X-Server +Please check your settings + Klarte ikke å koble til X-Serveren Vennligst sjekk innstillingene dine @@ -1252,40 +1336,39 @@ X-Server konnte nicht gestartet werden - Can't start X Server Please check your settings - Klarte ikke å starte X-Serveren + Klarte ikke å starte X-Serveren Vennligst sjekk instillingene dine - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene <b>vil du miste hele sesjonen</b>. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til - + 24 or 32 24 eller 32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. <br>Gjenoppta denne sesjonen uansett? - - + + Yes Ja - - + + No Nei @@ -1302,42 +1385,42 @@ </b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. - + OpenOffice.org OpenOffice.org - + Terminal Terminal - + unknown ukjent - + Command Kommando - + Type Type - + Desktop Skrivebord - + single application enkel applikasjon - + shadow session hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian skygge sesjonen @@ -1347,98 +1430,99 @@ <br>Fehler in der Sudo Konfiguration - + Unable to execute: Klarte ikke å utføre: - + X2Go client X2Go klient - + Internet browser Nettleser - + Email client Epost program - + &New session ... &Ny sesjon ... - + Session management... Sesjonshåndtering... - - + + Show toolbar Vis verktøylinje - - + + About X2GO client Om X2GO klient - - - + + + Please check LDAP settings Vennligst sjekk LDAP innstillingene - + no X2Go server found in LDAP Inge X2Go server ble funnet i LDAP - + Are you sure you want to delete this session? Er du sikker på at du ønsker å fjerne denne sesjonen? - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> <b>Feil passord!</b><br><br> - + No server availabel Ingen tilgjengelig server - - + + Not connected Active connection Ikke tilkoblet - - + + Creation time Opprettelsestidspunkt - - + + Unable to create folder: Klarer ikke å opprette katalogen: @@ -1483,117 +1567,178 @@ Pålogging feilet - - - - + + + + Server not availabel Serveren er ikke tilgjengelig - + Unable to write file: Klarer ikke å skrive til filen: - - + + Unable to create SSL tunnel: Klarte ikke å opprette SSL tunnel: - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> Uncertain if the translation for "Creation time" is the most fitting one. <b>Sesjons ID:<br>Server:<br>Brukernavn:<br>Skjerm:<br>Opprettet:<br>Status:</b> - - - + + + Share folder... Del mappe... - + Show details Vis detailjer - + <b>X2Go client V. <b>X2Go klient v. - + This card is unknown by X2Go system Need to double-check if the translation of "card" is suitable here Dette kortet er ukjent for X2Go systemet - + + Can't start X server +Please check your settings + + + + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package Serveren støtter ikke eksport av filsystemet over en SSH Tunnel Vennligst oppdater til en nyere x2goserver pakke - + &Create session icon on desktop... &Opprett sesjonsikon på skrivebordet... - + &Set broker password... Still uncertain what to best use as a translation for "broker" &Sett megler passord... - + &Connectivity test... &Tilkoblings-test... - + Operation failed Handlingen feilet - + Password changed Passordet er endret - + Wrong password! Feil passord! - + <b>Authentication</b> <b>Autentisering</b> - + Restore Gjenopprett - + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + Innstillinger + + + + System + + + + + Utility + + + + + Other + + + + Left mouse button to hide/restore - Right mouse button to display context menu Left click to open the X2GoClient window or right click to get the context menu. According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny" Venstre museknapp for å skjule/gjenopprette - Høyre museknapp viser sprettoppmeny - + Create session icon on desktop Opprett sesjonsikon på skrivebordet - + 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? @@ -1602,45 +1747,45 @@ Ønsker du å aktivere skjult modus for x2goklient? - + New Session Ny sesjon - + X2Go sessions not found X2Go sesjoner ble ikke funnet - + RDP connection RDP tilkobling - + X2Go Link to session Uncertain of the context here, need to doublecheck this. X2Go kobling til sesjon - - + + Detach X2Go window Løsne X2Go vindu - - + + Attach X2Go window Feste X2Go vindu - + Finished Ferdig - + Are you sure you want to terminate this session? Unsaved documents will be lost Er du sikker på at du vil avslutte denne sesjonen? @@ -1651,7 +1796,7 @@ </b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. - + Can't start X Server @@ -1660,18 +1805,18 @@ Vennligst sjekk din installasjon - + X2Go Session X2Go sesjon - - + + Minimize toolbar Minimer verktøylinje - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> <br><b>&nbsp;&nbsp;&nbsp;Trykk her&nbsp;&nbsp;&nbsp;<br> &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp;</b><br> @@ -1680,7 +1825,7 @@ Konfigurationsdatei lässt sich nicht öffnen: - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> @@ -1689,65 +1834,65 @@ <b>sudo apt-get install openssh-server</b> - + Connection to local desktop Tilkobling til lokalt skrivebord - + Information Informasjon - - + + Filter Filter - + Select desktop: Velg skrivebord: - + View only Kun vis - + User Bruker - + XDMCP XDMCP - + No accessible desktop found Ingen tilgjengelige skrivebord ble funnet - + Full access Full tilgang - + Only my desktops Kun mine skrivebord - + Reconnect Gjenoppkoble - - - + + + Connecting to broker Koble til megleren @@ -1756,12 +1901,12 @@ </b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> <br>x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. <br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. @@ -1776,7 +1921,7 @@ ISO8859-1 - + wrong value for argument"speed" wrong value for argument"speed" @@ -2049,57 +2194,64 @@ KDE - - - + + + RDP connection RDP tilkobling - - - + + + XDMCP XDMCP - - - + + + Connection to local desktop Tilkobling til lokalt skrivebord - - - + + + + Published applications + + + + + + fullscreen fullskjerm - - - - - + + + + + Display Skjerm - - + + window vindu - - + + Enabled Aktivert - - + + Disabled Deaktivert @@ -2202,7 +2354,7 @@ - + Connect to Windows terminal server Koble til Windows terminal server @@ -2228,73 +2380,78 @@ Enkel applikasjon - - + + Published applications + + + + + Command: Kommando: - + Advanced options... Avanserte alternativer... - - - + + + Path to executable Sti til programfil - + Open picture Åpne bilde - + Pictures Bilder - + Open key file Åpne nøkkelfil - + All files Alle filer - + Error Feil - + 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 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 - - + + Server: Server: - - + + XDMCP server: XDMCP server: - + rdesktop command line options: rdesktop kommandolinjevalg: - - + + New session Ny sesjon @@ -2524,79 +2681,79 @@ Klarer ikke å initiere libssh - + Can not create ssh session Klarer ikke å opprette ssh sesjon - + Can not connect to Klarer ikke å koble til - + Authentication failed Autentisering feilet - + channel_forward_listen failed 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. channel_forward_listen feilet - + Can not open file Kan ikke åpne filen - + Can not create remote file Klarer ikke å opprette fil over nettverket - + Can not write to remote file Klarer ikke å skrive til filen over nettverket - + can not connect to Klarer ikke å koble til - + channel_open_forward failed channel_open_forward feilet - + channel_open_session failed channel_open_session feilet - + channel_request_exec failed channel_request_exec feilet - + error writing to socket Really not any great words to best translate socket into... feil ved skriving til sokkelen - + error reading channel feil under lesing av kanalen - + channel_write failed channel_write feilet - + error reading tcp socket feil ved lesing av tcp sokkelen diff -Nru x2goclient-3.99.1.1/x2goclient.pro x2goclient-3.99.2.0/x2goclient.pro --- x2goclient-3.99.1.1/x2goclient.pro 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient.pro 2012-04-04 11:35:55.000000000 +0000 @@ -10,15 +10,23 @@ 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 @@ x2gosettings.h \ brokerpassdlg.h \ contest.h \ - xsettingswidget.h + xsettingswidget.h \ + appdialog.h SOURCES += sharewidget.cpp \ settingswidget.cpp\ @@ -91,7 +100,8 @@ x2gosettings.cpp \ brokerpassdlg.cpp \ contest.cpp \ - xsettingswidget.cpp + xsettingswidget.cpp \ + appdialog.cpp LIBS += -lssh diff -Nru x2goclient-3.99.1.1/x2goclient_ru.ts x2goclient-3.99.2.0/x2goclient_ru.ts --- x2goclient-3.99.1.1/x2goclient_ru.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_ru.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,31 +2,109 @@ + AppDialog + + + Published Applications + Удаленные приложения + + + + Search: + Поиск: + + + + &Start + &Пуск + + + + &Close + &Закрыть + + + + Multimedia + Мультимедиа + + + + Development + Разработка + + + + Education + Обучение + + + + Game + Игры + + + + Graphics + Графика + + + + Network + Сеть + + + + Office + Офис + + + + Settings + Установки + + + + System + Система + + + + Utility + Утилиты + + + + Other + Другие + + + BrokerPassDialogUi Dialog - Диалог + Диалог Old password: - + Старый пароль: New password: - + Новый пароль: Confirm password: - + Подтвердить пароль: TextLabel - + метка @@ -34,7 +112,7 @@ Passwords do not match - + Пароли не совпадают @@ -128,50 +206,50 @@ Connectivity test - + Тест соединения HTTPS connection: - + HTTPS соединение: SSH connection: - + SSH соединение: Connection speed: - + Скорость соединения: Failed - + Ошибка 0 Kb/s - + OK - + Socket operation timed out - + Failed: - + Ошибка: @@ -944,7 +1022,7 @@ Login failed!<br>Please try again - + Ошибка авторизации<br>Повторите попытку @@ -1051,41 +1129,41 @@ ONMainWindow - - + + us ru - + pc105/us pc105/ru - + Support ... - + Поддержка ... - - - + + + Session: Сессия: - + &Quit &Выход - + Ctrl+Q Ctrl+Q - - + + Quit Выход @@ -1094,7 +1172,7 @@ &Новая сессия ... - + Ctrl+N Ctrl+N @@ -1103,17 +1181,17 @@ Управление сессиями... - + Ctrl+E Ctrl+E - + &Settings ... &Установки ... - + Restore toolbar Восстановить панель инструментов @@ -1122,121 +1200,127 @@ О программе "X2GO Client" - + About Qt О Qt - + Session Сессия - + Ctrl+Q exit Ctrl+Q - + &Session &Сессия - + &Options &Опции - + &Help &Помощь - - - - + + + + Login: Пользователь: - + Password: Пароль: - + Keyboard layout: - Раскладка Клавиатуры: + Раскладка Клавиатуры: - + Ok ОК - - - + + + Cancel Отмена - + + Applications... + Приложения... + + + Invalid reply from broker - + Неверный ответ брокера - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error Ошибка - + Please check LDAP Settings Проверте настройки LDAP @@ -1249,32 +1333,32 @@ Удалить сессию? - - + + KDE KDE - + on на - - - - - - - - - + + + + + + + + + <b>Connection failed</b> <b>Ошибка соединения</b><br> - + <b>Wrong Password!</b><br><br> <b>Неверный пароль!</b><br><br> @@ -1283,51 +1367,51 @@ Не доступен ни один сервер - - + + Select session: Сессия: - + Resume Восстановить - - - - + + + + Suspend Прервать - - - - + + + + Terminate Завершить - + New Новая - - - + + + Display Дисплей - + Status Статус - + Server Сервер @@ -1336,57 +1420,57 @@ Время создания - + Client IP IP клиента - + Session ID ID сессии - - - + + + running активна - - + + suspended прервана - - - - + + + + Warning Предупреждение - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to Глубина цвета вашего дисплея не соответствует глубине цвета данной сессии. Это может помешать восстановлению сессии и в большинстве случаев<b>сессия будет утеряна</b> Рекомендуется изменить глубину цвета вашего дисплея на(sp) - + 24 or 32 24 или 32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? бит и перезапустить X-сервер до восстановления сессии.<br>Попробовать восстановить сессию не смотря на данное предупреждение? - - + + Yes Да @@ -1394,33 +1478,34 @@ Host key for server changed. It is now: - + Ключ на сервере изменен: For security reasons, connection will be stopped - + Из соображений безопасности соединение будет разорвано 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 - + Ключ для этого сервера не найден, но другой вариант ключа существует. Злоумышленик мог изменить ключ сервера по умолчания, что бы ввести ваш клиент в заблуждение, что этот ключ не существует Could not find known host file.If you accept the host key here, the file will be automatically created - + Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически The server is unknown. Do you trust the host key? Public key hash: - + Сервер не известен. Доверяете ли вы этому ключу? +Public key hash: - - + + No Нет @@ -1428,28 +1513,28 @@ Host key verification failed - + Ошибка проверки ключа Authentication failed - + Ошибка авторизации - - - - + + + + Server not availabel - + Сервер не доступен - + suspending прерывается - + terminating завершается @@ -1462,38 +1547,38 @@ Невозможно записать файл: - + Unable to create SSL Tunnel: Ошибка создания SSL тунеля: - + - + connecting соединение - + starting запуск - + resuming восстановление - - - + + + Connection timeout, aborting Таймаут соединения, отмена - + aborting отмена @@ -1502,7 +1587,7 @@ <b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b> - + Abort Отмена @@ -1515,7 +1600,8 @@ Показать детали - + + <b>Connection failed</b> : @@ -1523,87 +1609,87 @@ - + (can't open file) - + (невозможно открыть файл) - - - + + + (file not exists) - + (файл не существует) - + (directory not exists) - + (каталог не существует) - + wrong value for argument"--link" - + wrong value for argument"--sound" - - + + wrong value for argument"--geometry" - + wrong value for argument"--set-kbd" - + wrong value for argument"--ldap" - + wrong value for argument"--ldap1" - + wrong value for argument"--ldap2" - + wrong value for argument"--pack" - - + + wrong parameter: wrong parameter: - - + + Options Опции - + Available pack methodes: Available pack methodes: - + Support - + Поддержка - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> @@ -1634,7 +1720,7 @@ </b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации. - + No valid card found Формат карты неизвестен @@ -1643,21 +1729,20 @@ Эта карта не сконфигурирована для использования с X2Go - + Unable to create file: Невозможно создать файл: - - Can't connect to X-Server - Невозможно присоединиться к X-серверу + Невозможно присоединиться к X-серверу - - - Can't connect to X-Server + + Can't connect to X server Please check your settings + Can't connect to X-Server +Please check your settings Невозможно присоединиться к X-серверу Проверьте настройки @@ -1666,10 +1751,9 @@ Невозможно запустить X-Сервер - Can't start X Server Please check your settings - Невозможно запустить X-Сервер + Невозможно запустить X-Сервер Проверьте настройки @@ -1685,42 +1769,42 @@ Почтовый клиент - + OpenOffice.org - + Terminal Терминал - + unknown неизвестно - + Command Команда - + Type Тип - + Desktop Оконный менеджер - + single application приложение - + shadow session теневая сессия @@ -1729,201 +1813,264 @@ <br>Ошибка настроек "sudo" - + Unable to execute: Невозможно выполнить: - + X2Go client - + Internet browser Веб-броузер - + Email client Почтовый клиент - + &New session ... &Новая сессия ... - + Session management... Управление сессиями... - - + + Show toolbar Панель инструментов - - + + About X2GO client О программе "X2GO Client" - - - + + + Please check LDAP settings Проверьте настройки LDAP - + no X2Go server found in LDAP Сервер X2Go не найден в LDAP - + Are you sure you want to delete this session? Удалить сессию? - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> <b>Неверный пароль!</b><br><br> - + No server availabel Не доступен ни один сервер - - + + Not connected Active connection Соединение не установлено - - + + Creation time Время создания - - + + Unable to create folder: Невозможно создать каталог: - + Unable to write file: Невозможно записать файл: - - + + Unable to create SSL tunnel: Ошибка создания SSL тунеля: - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> <b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b> - - - + + + Share folder... Экспорт каталога... - + Show details Показать детали - + <b>X2Go client V. <b>X2Go Client V. - + This card is unknown by X2Go system Эта карта не сконфигурирована для использования с X2Go - + + Can't start X server +Please check your settings + Невозможно запустить X-Сервер +Проверьте настройки + + + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package Удаленный сервер не поддерживает экспорт файловой системы через SSH туннель Пожалуйста обновите пакет x2goserver - + &Create session icon on desktop... &Создать ярлык сессии на рабочем столе... - + &Set broker password... - + &Установить пароль на брокере... - + &Connectivity test... - + &Тест соединения... - + Operation failed - + Ошибка - + Password changed - + Пароль изменен - + Wrong password! - + Неверный пароль! - + <b>Authentication</b> - + <b>Авторизация</b> - + Restore Восстановить - + + Multimedia + Мультимедиа + + + + Development + Разработка + + + + Education + Обучение + + + + Game + Игры + + + + Graphics + Графика + + + + Network + Сеть + + + + Office + Офис + + + + Settings + Установки + + + + System + Система + + + + Utility + Утилиты + + + + Other + Другие + + + Left mouse button to hide/restore - Right mouse button to display context menu Left click to open the X2GoClient window or right click to get the context menu. Щелчок левой кнопкой: спрятать/восстановить - правой: отобразить контекстное меню - + Create session icon on desktop Создать ярлык сессии на рабочем столе - + 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? @@ -1932,44 +2079,44 @@ Активировать скрытый режим? - + New Session Новая сессия - + X2Go sessions not found - + Сессия X2Go не найдена - + RDP connection RDP соединение - + X2Go Link to session - - + + Detach X2Go window Отсоединить окно - - + + Attach X2Go window Присоединить окно - + Finished завершена - + Are you sure you want to terminate this session? Unsaved documents will be lost Вы уверены, что хотите удалить эту сессию? @@ -1980,7 +2127,7 @@ </b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации. - + Can't start X Server @@ -1989,18 +2136,18 @@ Переустановите X2Go Client - + X2Go Session Сессия X2Go - - + + Minimize toolbar Свернуть панель - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> <br><b>&nbsp;&nbsp;&nbsp;Щелкните по этой иконке&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;чтобы восстановить панель инструментов&nbsp;&nbsp;&nbsp;</b><br> @@ -2009,7 +2156,7 @@ Невозможно открыть файл: - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> @@ -2018,65 +2165,65 @@ <b>sudo apt-get install openssh-server</b> - + Connection to local desktop Соединение с локальным десктопом - + Information Информация - - + + Filter Фильтр - + Select desktop: Выбрать десктоп: - + View only Только смотреть - + User Пользователь - + XDMCP XDMCP - + No accessible desktop found Доступный десктоп не найден - + Full access Полный доступ - + Only my desktops Только мои десктопы - + Reconnect Повторить соединение - - - + + + Connecting to broker Соединение с брокером @@ -2085,12 +2232,12 @@ </b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> <br>x2goplugin был разработан при поддержке <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. <br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации. @@ -2105,7 +2252,7 @@ KOI8-R - + wrong value for argument"speed" wrong value for argument"speed" @@ -2344,36 +2491,43 @@ Новая сессия - - - + + + + Published applications + Удаленные приложения + + + + + fullscreen Полноэкранная сессия - - - - - + + + + + Display - + Дисплей - - + + Enabled активирован - - + + Disabled деактивирован - - + + window окно @@ -2415,12 +2569,12 @@ running - активна + активна suspended - прервана + прервана @@ -2428,23 +2582,23 @@ KDE - - - + + + RDP connection RDP соединение - - - + + + Connection to local desktop Соединение с локальным десктопом - - - + + + XDMCP XDMCP @@ -2549,7 +2703,7 @@ Kerberos 5 (GSSAPI) authentication - + Авторизация Kerberos 5 (GSSAPI) @@ -2563,7 +2717,7 @@ - + Connect to Windows terminal server Соединение с терминальным сервером Windows @@ -2578,57 +2732,62 @@ Приложение - - + + Published applications + Удаленные приложения + + + + Command: Команда: - + Advanced options... Продвинутые установки... - - - + + + Path to executable Путь к исполняемому файлу - + Open picture Открыть изображение - + Pictures Изображения - + Open key file Открыть файл с ключом - + All files Все файлы - - + + Server: Сервер: - + rdesktop command line options: Опции командной строки rdesktop: - - + + New session Новая сессия @@ -2638,8 +2797,8 @@ Соединение с локальным десктопом - - + + XDMCP server: Сервер XDMCP: @@ -2649,12 +2808,12 @@ XDMCP - + Error Ошибка - + 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 x2goclient запущен в "переносимом" режиме. Пожалуйста выберите путь находящийся в пределах используемого носителя для того, что бы всегда иметь доступ к Вашим данным @@ -2697,7 +2856,7 @@ Use whole display - + Использовать весь дисплей @@ -2707,7 +2866,7 @@ Xinerama extension (support for two or more physical displays) - + Xinerama (поддержка двух и более физических дисплеев) @@ -2722,12 +2881,12 @@ &Display: - + &Дисплей: &Identify all displays - + &Идентифицировать дисплеи @@ -2878,82 +3037,82 @@ Can not initialize libssh - + - + Can not create ssh session - + - + Can not connect to - + - + Authentication failed - + - + channel_forward_listen failed - + - + Can not open file - + - + Can not create remote file - + - + Can not write to remote file - + - + can not connect to - + - + channel_open_forward failed - + - + channel_open_session failed - + - + channel_request_exec failed - + - + error writing to socket - + - + error reading channel - + - + channel_write failed - + - + error reading tcp socket - + @@ -2961,12 +3120,12 @@ Error creating socket - + Error binding - + @@ -2974,12 +3133,12 @@ Open File - + Открыть Файл Executable (*.exe) - + Исполняемый файл (*.exe) @@ -2987,62 +3146,62 @@ Form - Форма + Форма You must restart the X2Go Client for the changes to take effect - + Перезапустите программу, что бы изменения вступили в силу use integrated X-Server - + использовать встроенный X-Server use custom X-Server - + использовать другой X-Server custom X-Server - + Другой X-Сервер executable: - + Исполняемый файл: start X-Server on X2Go client start - + запускать X-Server при запуске X2Go client command line options: - + аргументы командной строки: X-Server command line options - + Опции командной строки X-Server window mode: - + оконный режим: fullscreen mode: - + полноэкранный режим: single application: - + приложение: diff -Nru x2goclient-3.99.1.1/x2goclient_sv.ts x2goclient-3.99.2.0/x2goclient_sv.ts --- x2goclient-3.99.1.1/x2goclient_sv.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_sv.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,6 +2,84 @@ + AppDialog + + + Published Applications + + + + + Search: + + + + + &Start + + + + + &Close + + + + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + Inställningar + + + + System + + + + + Utility + + + + + Other + + + + BrokerPassDialogUi @@ -651,313 +729,369 @@ ONMainWindow - - + + us se - + pc105/us pc105/se - + X2Go client X2Go-klient - + - + connecting ansluter - + Internet browser Webbläsare - + Email client E-postklient - + OpenOffice.org OpenOffice.org - + Terminal Terminal - + &Settings ... &Inställningar... - + Support ... Hjälp ... - - + + About X2GO client Om X2Go-klient - - - + + + Share folder... Dela mapp ... - - - - + + + + Suspend Vila - - - - + + + + Terminate Avsluta - + Reconnect Återanslut - - + + Detach X2Go window Koppla lös X2Go-fönster - - + + Minimize toolbar Minimera verktygsrad - - - + + + Session: Session: - + &Quit &Avsluta - + Ctrl+Q Ctrl+Q - - + + Quit Avsluta - + &New session ... &Ny session... - + Ctrl+N Ctrl+N - + Session management... Added Alt shortcut, same letter as Ctrl shortcut (like &New session...) S&essionshantering... - + Ctrl+E Ctrl+E - + &Create session icon on desktop... S&kapa sessionsgenväg på Skrivbordet... - + &Set broker password... &Ange agentlösenord... - + &Connectivity test... &Testa anslutning... - - + + Show toolbar Visa verktygsrad - + About Qt Om Qt - + Ctrl+Q exit Ctrl+Q - + &Session &Session - + &Options &Alternativ - + &Help &Hjälp - - - - + + + + Login: Användare: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error Fel - + Operation failed Operation misslyckades - + Password changed Lösenord ändrat - + Wrong password! Fel lösenord! - - - + + + Connecting to broker Ansluter till agent - + <b>Authentication</b> <b>Autentisering</b> - + Restore Återställ - - + + Not connected Ej ansluten - + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + Inställningar + + + + System + + + + + Utility + + + + + Other + + + + Left mouse button to hide/restore - Right mouse button to display context menu Vänster musknapp för att dölja/återställa - Höger musknapp för att visa snabbmeny - - - + + + Please check LDAP settings Kontrollera LDAP-inställningar - + no X2Go server found in LDAP ingen X2Go-server hittades i LDAP - + Create session icon on desktop Skapa sessionsgenväg på Skrivbordet - + 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? @@ -966,48 +1100,48 @@ Använd dolt läge? - + New Session Ny session - + X2Go Link to session Länk till X2Go-session - + X2Go sessions not found X2Go-sessioner hittades inte - + Are you sure you want to delete this session? Är du säker på att du vill radera denna session? - - + + KDE KDE - + RDP connection RDP-anslutning - + XDMCP XDMCP - + Connection to local desktop Anslutning till lokalt Skrivbord - + on på @@ -1048,15 +1182,15 @@ - - + + Yes Ja - - + + No Nej @@ -1066,232 +1200,234 @@ Autentisering misslyckades - - - - - - - - - + + + + + + + + + <b>Connection failed</b> <b>Anslutning misslyckades</b> - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> <b>Fel lösenord!</b><br><br> - + unknown okänt - + No server availabel Ingen server tillgänglig - - - - + + + + Server not availabel Server ej tillgänglig - - + + Select session: Välj session: - - - + + + running aktiv - - + + suspended vilande - + Desktop Skrivbord - + single application Applikation - + shadow session Skuggsession - + Information Information - + No accessible desktop found Inget tillgängligt Skrivbord hittades - - + + Filter Filter - + Select desktop: Välj Skrivbord: - - - - + + + + Warning Varning - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to Ditt nuvarande färgdjup matchar inte X2Go-sessionens färgdjup. Det kan orsaka problem vid återanslutning av sessionen och i de flesta fall <b>förlorar du sessionen</b> och måste starta en ny! Det är starkt rekommenderat att du ändrar färdgjup till - + 24 or 32 24 eller 32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? bitar och startar om X-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå? - + suspending försätter i vila - + terminating avslutar - + <b>Wrong Password!</b><br><br> <b>Fel lösenord!</b><br><br> - - + + Unable to create folder: Kunde inte skapa mapp: - + Unable to write file: Kunde ej skriva till fil: - - + + Attach X2Go window Koppla X2Go-fönster - - + + Unable to create SSL tunnel: Kunde ej skapa SSL-tunnel: - + Unable to create SSL Tunnel: Kunde ej skapa SSL-tunnel: - + Finished avslutad - + starting startar - + resuming återansluter - - - + + + Connection timeout, aborting Anslutning passerade tidsgränsen, avbryter - + aborting avbryter - + Are you sure you want to terminate this session? Unsaved documents will be lost Är du säker på att du vill avsluta sessionen? Data som ej sparats kommer att förloras - + Session Session - - - + + + Display Display - - + + Creation time Skapad - + + <b>Connection failed</b> : @@ -1300,148 +1436,152 @@ - + (can't open file) (kan inte öppna fil) - - - + + + (file not exists) (filen finns inte) - + (directory not exists) (mapp finns inte) - + wrong value for argument"--link" fel värde för "--link" - + wrong value for argument"--sound" fel värde för "--sound" - - + + wrong value for argument"--geometry" fel värde för "--geometry" - + wrong value for argument"--set-kbd" fel värde för "--set-kbd" - + wrong value for argument"--ldap" fel värde för "--ldap" - + wrong value for argument"--ldap1" fel värde för "--ldap1" - + wrong value for argument"--ldap2" fel värde för "--ldap2" - + wrong value for argument"--pack" fel värde för "--pack" - - + + wrong parameter: felaktig parameter: - - + + Options Alternativ - + Available pack methodes: Tillgängliga kompressionsmetoder: - + Support Hjälp - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> </b><br> (&copy; 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. <br>Klient för X2Go. Denna klient kan ansluta till X2Go-servrar och starta/stoppa/återansluta/avsluta (aktiva) sessioner. X2Go-klienten kan spara anslutningsinställningar samt använda LDAP för autentisering. Klienten kan även användas som inloggningsskärm (ersättning för exempelvis xdm). Besök <a href="http://www.x2go.org">www.x2go.org</a> för vidare information. - + <b>X2Go client V. <b>X2Go-klient V. - + Please check LDAP Settings Kontrollera LDAP-inställningar - + No valid card found Inget giltigt kort hittades - + This card is unknown by X2Go system Kortet är okänt - + Unable to create file: Kunde ej skapa filen: - - + + Can't start X server +Please check your settings + + + Can't connect to X-Server - Kan ej ansluta till X-server + Kan ej ansluta till X-server - - - Can't connect to X-Server + + Can't connect to X server Please check your settings - Kan ej ansluta till X-server + Can't connect to X-Server +Please check your settings + Kan ej ansluta till X-server Kontrollera dina inställningar - Can't start X Server Please check your settings - Kan ej starta X-server + Kan ej starta X-server Kontrollera dina inställningar - + Can't start X Server @@ -1450,12 +1590,12 @@ Kontrollera installation - + Unable to execute: Kunde ej exekvera: - + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package Servern stöder ej filsystemsexport via SSH-tunnel @@ -1486,115 +1626,120 @@ ISO8859-1 - + X2Go Session X2Go-session - + wrong value for argument"speed" fel värde för "speed" - + Password: Lösenord: - + Keyboard layout: Swenglish, but commonly used. Tangentbordslayout: - + Ok OK - - - + + + Cancel Avbryt - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> <b>Sessions-ID:<br>Server:<br>Användare:<br>Display:<br>Skapad:<br>Status:</b> - + + Applications... + + + + Abort Avbryt - + Show details Visa detaljer - + Resume Återanslut - + New Ny - + Full access Fullständig åtkomst - + View only Endast visa - + Status Status - + Command Kommando - + Type Typ - + Server Server - + Client IP Klient-IP - + Session ID Sessions-ID - + User Användare - + Only my desktops Bara mina Skrivbord - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> @@ -1603,17 +1748,17 @@ <b>sudo apt-get install openssh-server</b> - + Restore toolbar Återställ verktygsrad - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> <br><b>&nbsp;&nbsp;&nbsp;Klicka denna knapp&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;för att återställa verktygsrad&nbsp;&nbsp;&nbsp;</b><br> - + Invalid reply from broker Ogiltigt svar från agent @@ -1877,57 +2022,64 @@ KDE - - - + + + RDP connection RDP-anslutning - - - + + + XDMCP XDMCP - - - + + + Connection to local desktop Anslutning till lokalt Skrivbord - - - + + + + Published applications + + + + + + fullscreen fullskärm - - - - - + + + + + Display Display - - + + window fönster - - + + Enabled På - - + + Disabled Av @@ -2031,7 +2183,7 @@ - + Connect to Windows terminal server Anslut till Windows Terminal Server (RDP) @@ -2056,73 +2208,78 @@ Applikation - - + + Published applications + + + + + Command: Kommando: - + Advanced options... Avancerade alternativ... - - - + + + Path to executable Sökväg till exekverbar fil - + Open picture Öppna bild - + Pictures Bilder - + Open key file Öppna nyckelfil - + All files Alla filer - + Error Fel - + 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 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 - - + + Server: Server: - - + + XDMCP server: XDMCP-server: - + rdesktop command line options: rdesktop kommandoradsalternativ: - - + + New session Ny session @@ -2350,77 +2507,77 @@ Kan ej initialisera libssh - + Can not create ssh session Kan ej skapa SSH-session - + Can not connect to Kan inte ansluta till - + Authentication failed Autentisering misslyckades - + channel_forward_listen failed channel_forward_listen misslyckades - + Can not open file Kan inte öppna fil - + Can not create remote file Kan inte skapa fjärrfil - + Can not write to remote file Kan inte skriva till fjärrfil - + can not connect to kan inte ansluta till - + channel_open_forward failed channel_open_forward misslyckades - + channel_open_session failed channel_open_session misslyckades - + channel_request_exec failed channel_request_exec misslyckades - + error writing to socket ett fel uppstod vid skrivning till socket - + error reading channel ett fel uppstod när kanal skulle läsas - + channel_write failed channel_write misslyckades - + error reading tcp socket ett fel uppstod när tcp socket skulle läsas diff -Nru x2goclient-3.99.1.1/x2goclient_zh_tw.ts x2goclient-3.99.2.0/x2goclient_zh_tw.ts --- x2goclient-3.99.1.1/x2goclient_zh_tw.ts 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goclient_zh_tw.ts 2012-04-04 11:35:55.000000000 +0000 @@ -2,6 +2,84 @@ + AppDialog + + + Published Applications + + + + + Search: + + + + + &Start + + + + + &Close + + + + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + 設定 + + + + System + + + + + Utility + + + + + Other + + + + BrokerPassDialogUi @@ -645,312 +723,368 @@ ONMainWindow - - + + us us - + pc105/us pc105/us - + X2Go client X2Go用戶端 - + - + connecting 正在連線 - + Internet browser 網頁瀏覽器 - + Email client 電子郵件軟體 - + OpenOffice.org - + Terminal 終端機 - + &Settings ... 設定(&S) ... - + Support ... 支援 ... - - + + About X2GO client 關於X2GO用戶端 - - - + + + Share folder... 共享資料夾... - - - - + + + + Suspend 暫停 - - - - + + + + Terminate 終止 - + Reconnect 重新連線 - - + + Detach X2Go window 脫離X2Go視窗 - - + + Minimize toolbar 將工具列最小化 - - - + + + Session: 工作階段: - + &Quit 離開(&Q) - + Ctrl+Q - - + + Quit 離開 - + &New session ... 新增工作階段(&N) ... - + Ctrl+N - + Session management... 工作階段管理員... - + Ctrl+E - + &Create session icon on desktop... 在桌面上建立工作階段圖示(&C)... - + &Set broker password... 設定代理伺服器密碼(&S)... - + &Connectivity test... 連線能力測試(&C)... - - + + Show toolbar 顯示工具列 - + About Qt 關於Qt - + Ctrl+Q exit - + &Session 工作階段(&S) - + &Options 選項(&O) - + &Help 幫助(&H) - - - - + + + + Login: 登入: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + Error 錯誤 - + Operation failed 更改密碼失敗 - + Password changed 密碼已更改成功 - + Wrong password! 輸入了錯誤的密碼! - - - + + + Connecting to broker 連線至連線代理伺服器 - + <b>Authentication</b> <b>身份驗證</b> - + Restore 還原 - - + + Not connected 尚未連線 - + + Multimedia + + + + + Development + + + + + Education + + + + + Game + + + + + Graphics + + + + + Network + + + + + Office + + + + + Settings + 設定 + + + + System + + + + + Utility + + + + + Other + + + + Left mouse button to hide/restore - Right mouse button to display context menu 按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單 - - - + + + Please check LDAP settings 請確認LDAP的設定 - + no X2Go server found in LDAP 在LDAP環境中沒有找到X2Go伺服器 - + Create session icon on desktop 在桌面上建立工作階段圖示 - + 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? @@ -959,48 +1093,48 @@ 是否要使用X2Go用戶端的隱藏模式? - + New Session 新的工作階段 - + X2Go Link to session X2Go工作階段的連結 - + X2Go sessions not found 無法找到X2Go的工作 - + Are you sure you want to delete this session? 您確定要刪除此工作階段嗎? - - + + KDE - + RDP connection RDP連線 - + XDMCP - + Connection to local desktop 連線至本地桌面 - + on 於 @@ -1041,15 +1175,15 @@ - - + + Yes 是 - - + + No 否 @@ -1059,230 +1193,232 @@ 認證失敗 - - - - - - - - - + + + + + + + + + <b>Connection failed</b> <b>連線失敗</b> - - - - - - - - - + + + + + + + + + + <b>Wrong password!</b><br><br> <b>不正確的密碼!</b><br><br> - + unknown 未知 - + No server availabel 伺服器不存在l - - - - + + + + Server not availabel 伺服器不存在| - - + + Select session: 請選擇工作階段: - - - + + + running 正在執行中 - - + + suspended 已暫停 - + Desktop 桌面 - + single application 單一的應用程式 - + shadow session - + Information 資訊 - + No accessible desktop found 目前沒有找到可訪問的工作桌面 - - + + Filter 篩選器 - + Select desktop: 請選擇工作桌面: - - - - + + + + Warning 警告 - - + + Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to 您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為 - + 24 or 32 24或32 - - + + bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway? 位元並且重新啟動X-server，之後再重新連接這一個工作階段。<br>請問您無論如何都要恢復此工作階段的連線嗎? - + suspending 正在暫停工作中 - + terminating 正在中止工作中 - + <b>Wrong Password!</b><br><br> <b>不正確的密碼!</b><br><br> - - + + Unable to create folder: 無法創建資料夾: - + Unable to write file: 檔案無法寫入: - - + + Attach X2Go window 連接X2Go視窗 - - + + Unable to create SSL tunnel: 無法建立SSL通道: - + Unable to create SSL Tunnel: 無法建立SSL通道: - + Finished 已完成 - + starting 正在開始 - + resuming 正在還原 - - - + + + Connection timeout, aborting 連線超時，中止中 - + aborting 中止中 - + Are you sure you want to terminate this session? Unsaved documents will be lost 您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失 - + Session 工作階段 - - - + + + Display 顯示 - - + + Creation time 創建時間 - + + <b>Connection failed</b> : @@ -1291,148 +1427,152 @@ - + (can't open file) (無法開啟檔案) - - - + + + (file not exists) (檔案不存在) - + (directory not exists) (目錄不存在) - + wrong value for argument"--link" "--link"參數的值錯誤 - + wrong value for argument"--sound" "--sound"參數的值錯誤 - - + + wrong value for argument"--geometry" "--geometry"參數的值錯誤 - + wrong value for argument"--set-kbd" "--set-kbd"參數的值錯誤 - + wrong value for argument"--ldap" "--ldap"參數的值錯誤 - + wrong value for argument"--ldap1" "--ldap1"參數的值錯誤 - + wrong value for argument"--ldap2" "--ldap2"參數的值錯誤 - + wrong value for argument"--pack" "--pack"參數的值錯誤 - - + + wrong parameter: 錯誤的參數: - - + + Options 選項 - + Available pack methodes: 可用的包裝方法: - + Support 支援 - + </b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br> - + <br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br> <br>x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助<br> - + <br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information. - + <b>X2Go client V. <b>X2Go 客戶端 V. - + Please check LDAP Settings 請檢查LDAP的設定 - + No valid card found 沒有發現合法的卡片 - + This card is unknown by X2Go system X2Go系統無法辨識此張卡片 - + Unable to create file: 檔案無法創建: - - + + Can't start X server +Please check your settings + + + Can't connect to X-Server - 無法連接至X伺服器 + 無法連接至X伺服器 - - - Can't connect to X-Server + + Can't connect to X server Please check your settings - 無法連接至X伺服器 + Can't connect to X-Server +Please check your settings + 無法連接至X伺服器 請檢查您的設定值 - Can't start X Server Please check your settings - 無法啟動X伺服器 + 無法啟動X伺服器 請檢查您的設定值 - + Can't start X Server @@ -1441,12 +1581,12 @@ 請檢查X伺服器安是否有安裝正確 - + Unable to execute: 無法執行: - + Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package 遠端伺服器無法支援SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本 @@ -1476,114 +1616,119 @@ - + X2Go Session X2Go工作階段 - + wrong value for argument"speed" 錯誤的"speed"參數值 - + Password: 密碼: - + Keyboard layout: 鑑盤佈局: - + Ok 確定 - - - + + + Cancel 取消 - + <b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b> <b>工作階段識別碼:<br>伺服器:<br>使用者名稱:<br>顯示:<br>創建時間:<br>狀態:</b> - + + Applications... + + + + Abort 退出 - + Show details 顯示細節 - + Resume 恢復 - + New 新增 - + Full access 完全存取 - + View only 僅查看 - + Status 狀態 - + Command 指令 - + Type 型態 - + Server 伺服器 - + Client IP 客戶端IP - + Session ID 工作階段識別碼 - + User 使用者 - + Only my desktops 只選擇我的桌面 - + sshd not started, you'll need sshd for printing and file sharing you can install sshd with <b>sudo apt-get install openssh-server</b> @@ -1592,17 +1737,17 @@ <b>sudo apt-get install openssh-server</b> - + Restore toolbar 還原工具列 - + <br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br> <br><b>&nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp;</b><br> - + Invalid reply from broker 代理伺服器的回應不合法 @@ -1866,57 +2011,64 @@ - - - + + + RDP connection RDP連線 - - - + + + XDMCP - - - + + + Connection to local desktop 連線至本地桌面 - - - + + + + Published applications + + + + + + fullscreen 全螢幕 - - - - - + + + + + Display 顯示 - - + + window 視窗 - - + + Enabled 啟用 - - + + Disabled 停用 @@ -2019,7 +2171,7 @@ - + Connect to Windows terminal server 連線至微軟終端伺服器 @@ -2044,73 +2196,78 @@ 單一應用程式 - - + + Published applications + + + + + Command: 指令: - + Advanced options... 進階設定... - - - + + + Path to executable 執行路徑 - + Open picture 開啟圖片 - + Pictures 圖片 - + Open key file 開啟密鑰檔案 - + All files 所有檔案 - + Error 錯誤 - + 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 X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料 - - + + Server: 伺服器: - - + + XDMCP server: XDMCP 伺服器: - + rdesktop command line options: rdesktop 指令選項: - - + + New session 新的工作階段 @@ -2337,77 +2494,77 @@ libssh無法初始化 - + Can not create ssh session 無法建立SSH工作階段 - + Can not connect to 無法連線至 - + Authentication failed 驗證失敗 - + channel_forward_listen failed channel_forward_listen失敗 - + Can not open file 無法開啟檔案 - + Can not create remote file 無法創建遠端檔案 - + Can not write to remote file 無法寫入資料至遠端檔案 - + can not connect to 無法連線至 - + channel_open_forward failed channel_open_forward失敗 - + channel_open_session failed channel_open_session失敗 - + channel_request_exec failed channel_request_exec失敗 - + error writing to socket - + error reading channel - + channel_write failed - + error reading tcp socket diff -Nru x2goclient-3.99.1.1/x2goplugin.rc x2goclient-3.99.2.0/x2goplugin.rc --- x2goclient-3.99.1.1/x2goplugin.rc 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2goplugin.rc 2012-04-04 11:35:55.000000000 +0000 @@ -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 @@ 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 -Nru x2goclient-3.99.1.1/x2gosettings.cpp x2goclient-3.99.2.0/x2gosettings.cpp --- x2goclient-3.99.1.1/x2gosettings.cpp 2012-03-08 06:14:45.000000000 +0000 +++ x2goclient-3.99.2.0/x2gosettings.cpp 2012-04-04 11:35:55.000000000 +0000 @@ -30,6 +30,12 @@ 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 @@ { 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