x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2golxdebindings.git - master (branch) updated: 1.0.1.1-6-g664dd31
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 664dd319b029f4f781e341a002f10f84e7677f0d (commit) from 0e922cbcfe214e5bba3a272fbf95884c6a410baf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 664dd319b029f4f781e341a002f10f84e7677f0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 14:54:00 2012 +0100 release 1.0.1.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 200c08a..17fb343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x2golxdebindings (1.0.1.2-0~x2go1) UNRELEASED; urgency=low +x2golxdebindings (1.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.2): - Continue development... - Add x2gofeature support (feature provided: X2GO_LXDEBINDINGS). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:10:21 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:53:41 +0100 x2golxdebindings (1.0.1.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2golxdebindings.git (LXDE bindings for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.1-5-g0e922cb
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 0e922cbcfe214e5bba3a272fbf95884c6a410baf (commit) from 3b90061afd411baf6dc570de15b3338147182dae (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0e922cbcfe214e5bba3a272fbf95884c6a410baf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 14:53:34 2012 +0100 typofix in changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 44aaf09..200c08a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ x2golxdebindings (1.0.1.2-0~x2go1) UNRELEASED; urgency=low - * New upstream version (1.0.1.2: + * New upstream version (1.0.1.2): - Continue development... - Add x2gofeature support (feature provided: X2GO_LXDEBINDINGS). hooks/post-receive -- x2golxdebindings.git (LXDE bindings for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

x2goclient.git - build-main (branch) updated: 3.99.1.0
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, build-main has been updated via 5f90e9ae43cecf2e82ec10ae93e64a854383f763 (commit) from d090188694f638a539eddb06e7eb63731cb0e48e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d81863d..db8002c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.99.1.0): @@ -43,7 +43,7 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low - Get new ports from x2goresume-session if reserved ports are busy - Fix segmentation fault by failed SSH connection to X2Go server - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:07:55 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:49:49 +0100 x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.0.6-33-g5f90e9a
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 5f90e9ae43cecf2e82ec10ae93e64a854383f763 (commit) from d090188694f638a539eddb06e7eb63731cb0e48e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5f90e9ae43cecf2e82ec10ae93e64a854383f763 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 14:50:00 2012 +0100 release 3.99.1.0 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d81863d..db8002c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.99.1.0): @@ -43,7 +43,7 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low - Get new ports from x2goresume-session if reserved ports are busy - Fix segmentation fault by failed SSH connection to X2Go server - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:07:55 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:49:49 +0100 x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 3.99.1.0
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, build-main has been updated via d090188694f638a539eddb06e7eb63731cb0e48e (commit) via 2220856b8ecf31845ad87ada52a6b15a814d80d6 (commit) via b1010d564d2f52681513cb10006f9f217e2aa022 (commit) via 1026290ddc0e678bb392fefdbb4932d355a8f103 (commit) via a818c32442a5016f077149c6969653a425520e74 (commit) via 0d08da9c4dc1633fb8e08f988a9795d5bf2de7e0 (commit) via d8722816cd9866fa50d57e5d4ec6c84925782e64 (commit) via 28aa94929bc25f943f051a6f4f605350a5776201 (commit) via f015339ec2a2dc81dc5b0f5149fb2b747b7116cb (commit) via 523d81c193cb7b7b666f65237caa58f6260785b7 (commit) via 9787ec7a53668f6763afedd956df9ab757b92a9e (commit) via 601d0e0da661e28907454c674a7ff2d8aba4768d (commit) via 970cb34e3ee63d23c3778a273f2a1fbf7e6b9c92 (commit) via 4f4f03c0ffd292cfeba07ae27595b4a986daf47d (commit) via e1b8777e8fa05e3b9c876a53447be5e9a8c46bcf (commit) via d0919e8ce551d1e168612a02ad89c3cc3064d448 (commit) via c3ee597db7570594cdd39b03b74489aa73cfece1 (commit) via fd6b29d2a605f0ad6942b13b6f400067b681a846 (commit) via f6bd9af222fe65924c721de688c5efbb6f728db9 (commit) via 2e5ee710ffbcb0b03d95c9838d0ffa60d06ecaa1 (commit) via 373da1c16fb5cad8b9f4e77db2085b96f43270ad (commit) via 805d43099179261f2cdfce7b6554e4f254fd21a9 (commit) via f452167a04ac8ac5a9e24b19c6ddc6ddf58382fc (commit) via 559ea316782420e2ffa9e7bd1585b06c5867fe50 (commit) via 679e516f303c22bf431170e60ee2951ef66e9c6b (commit) via 8e2e6e98aa3fb772a4a2543b033ea40c98bea2f6 (commit) via 215a52f446e11be2014f004e0e2eba64bb05e458 (commit) via dc8f38983f616d615d5112af43c871f5d17122bf (commit) via e7a713613d6e1dd851ea0f5bb0858db11a39d55f (commit) via fd729ebae42d707e7ee10f0456cf88360009d87a (commit) via 3f4eab56698f439deda4cce7629aef9558a5e9ac (commit) via 817c331b9f53936c2e09c81d30ac07e68a74d208 (commit) from 0f17d81f3502f98ea5d3bd61ff19a6dd8d0e7a66 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile | 4 +- Makefile.man2html | 2 +- VERSION | 2 +- debian/changelog | 47 + desktop/x2goclient.desktop | 2 +- httpbrokerclient.cpp | 2 +- man/man1/x2goclient.1 | 2 +- onmainwindow.cpp | 1 + onmainwindow_part2.cpp | 23 +- qt_de.qm | Bin 157137 -> 324383 bytes qt_fr.qm | Bin 148544 -> 250220 bytes qt_ru.qm | Bin 60815 -> 273707 bytes qt_sv.qm | Bin 0 -> 65848 bytes qt_zh_tw.qm | Bin 0 -> 117253 bytes resources.rcc | 7 +- sshmasterconnection.cpp | 11 +- sshprocess.h | 1 + version.h | 2 +- x2goclient.pro | 3 + x2goclient_de.qm | Bin 44873 -> 0 bytes x2goclient_de.ts | 1072 ++++++++------- x2goclient_fr.ts => x2goclient_en.ts | 1143 +++++++++-------- x2goclient_fr.qm | 1 - x2goclient_fr.ts | 880 +++++++------ x2goclient_zh_tw.ts => x2goclient_nb_no.ts | 2020 +++++++++++++++------------- x2goclient_ru.qm | Bin 43127 -> 0 bytes x2goclient_ru.ts | 878 +++++++------ x2goclient_zh_tw.ts => x2goclient_sv.ts | 1122 ++++++++-------- x2goclient_zh_tw.qm | Bin 35103 -> 0 bytes x2goclient_zh_tw.ts | 209 ++-- x2goplugin.rc | 10 +- 31 files changed, 4047 insertions(+), 3397 deletions(-) create mode 100644 qt_sv.qm create mode 100644 qt_zh_tw.qm delete mode 100644 x2goclient_de.qm copy x2goclient_fr.ts => x2goclient_en.ts (73%) delete mode 100644 x2goclient_fr.qm copy x2goclient_zh_tw.ts => x2goclient_nb_no.ts (56%) delete mode 100644 x2goclient_ru.qm copy x2goclient_zh_tw.ts => x2goclient_sv.ts (67%) delete mode 100644 x2goclient_zh_tw.qm The diff of changes is: diff --git a/Makefile b/Makefile index 57ca900..5831516 100755 --- a/Makefile +++ b/Makefile @@ -28,15 +28,17 @@ all: build build: build_client build_plugin build_man build_client: + lrelease-qt4 x2goclient.pro mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: + lrelease-qt4 x2goclient.pro mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) build_man: - make -f Makefile.man2html build + ${MAKE} -f Makefile.man2html build clean: clean_client clean_plugin clean_man find . -type f -name '*.o' -exec rm -vf {} + diff --git a/Makefile.man2html b/Makefile.man2html index 97af6fe..abe7a32 100644 --- a/Makefile.man2html +++ b/Makefile.man2html @@ -14,7 +14,7 @@ build: build_man2html build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/VERSION b/VERSION index 3504bc8..57055b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.0.6 +3.99.1.0 diff --git a/debian/changelog b/debian/changelog index 15c6e43..d81863d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.99.1.0): + - Update German translation file (thanks to Stefan Baur). + - Build .qm translation files on the fly during build. + - Fix for zh_TW translation: add qt_zh_TW.qm file from Qt4.8. + - Add language property to the French translation file. + - Update qt_<LANG>.qm files from Qt4.8 (as in current Debian sid). + - Rename x2goclient_nb.ts to x2goclient_nb_no.ts. + - Update all translation files (lupdate), translate unfinished translation + tags in x2goclient_de.ts. + - Provide empty translation file x2goclient_en.ts. + - Fix misspelled word ,,Authentification'' -> ,,Authentication''. + - Fix misspelled word ,,recieved'' -> ,,received''. + - Update date and release version in man page. + + [ Mihai Moldovan ] + * New upstream version (3.99.1.0): + - Mac OS patch: Raise the stack space to 2MB for secondary threads. It + previously used the 512KB system default. + + [ Daniel Lindgren ] + * New upstream version (3.99.1.0): + - Add Swedish translation file. + - Fine-tune Swedish translation file. + + [ Terje Andersen ] + * New upstream version (3.99.1.0): + - Add Norwegian (Bokmal) translation. Qt4 lacks Norwegian/Bokmal + support, so some of the widgets may stay in English. + - Fine-tune/fix Norwegian (Bokmal) translation. + + [ Jan Engelhardt ] + * New upstream version (3.99.1.0): + - Use /cgi-bin/man/ path in web'ified man pages. + - Use ,,${MAKE}'' instead of ,,make'' in Makefile. + - Include <netinet/in.h> in sshprocess.h to fix missing + struct sockaddr_in. + + [ Oleksandr Shneyder ] + * New upstream version (3.99.1.0): + - Get new ports from x2goresume-session if reserved ports are busy + - Fix segmentation fault by failed SSH connection to X2Go server + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:07:55 +0100 + x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 477577b..ba3e4ac 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.0.6 +Version=3.99.1.0 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index ed05fd8..8402e0c 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -314,7 +314,7 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) { //x2goDebug<<"cmd request answer: "<<answer; - x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"recieved:"<<httpSessionAnswer.size()<<endl; + x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"received:"<<httpSessionAnswer.size()<<endl; emit connectionTime(requestTime.elapsed(),httpSessionAnswer.size()); return; } diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index f4c98c8..bedddfb 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "July 2011" "Version 3.99.0.x" "X2Go Client (Qt4)" +.TH x2goclient 1 "Feb 2012" "Version 3.99.1.x" "X2Go Client (Qt4)" .SH NAME x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS diff --git a/onmainwindow.cpp b/onmainwindow.cpp index f583283..a543ce1 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2601,6 +2601,7 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession { if ( sshConnection ) { + sshConnection->wait(); delete sshConnection; sshConnection=0l; } diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index 6201f5b..7d1a206 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -143,7 +143,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) sshConnection=0l; } - QMessageBox::critical ( 0l,tr ( "Authentification failed" ),error, + QMessageBox::critical ( 0l,tr ( "Authentication failed" ),error, QMessageBox::Ok, QMessageBox::NoButton ); // currentKey=QString::null; @@ -1553,7 +1553,28 @@ void ONMainWindow::slotRetResumeSess ( bool result, } } else + { host=resumingSession.server; + QStringList outputLines=output.split("\n",QString::SkipEmptyParts); + foreach(QString line,outputLines) + { + if (line.indexOf("gr_port=")!=-1) + { + resumingSession.grPort=line.replace("gr_port=",""); + x2goDebug<<"new gr_port: "<<resumingSession.grPort<<endl; + } + if (line.indexOf("sound_port=")!=-1) + { + resumingSession.sndPort=line.replace("sound_port=",""); + x2goDebug<<"new sound_port: "<<resumingSession.sndPort<<endl; + } + if (line.indexOf("fs_port=")!=-1) + { + resumingSession.fsPort=line.replace("fs_port=",""); + x2goDebug<<"new fs_port: "<<resumingSession.fsPort<<endl; + } + } + } if ( !useLdap ) { if ( !embedMode ) diff --git a/qt_de.qm b/qt_de.qm index 6b76d7b..f1cb034 100644 Binary files a/qt_de.qm and b/qt_de.qm differ diff --git a/qt_fr.qm b/qt_fr.qm index 5553086..a81ddc7 100644 Binary files a/qt_fr.qm and b/qt_fr.qm differ diff --git a/qt_ru.qm b/qt_ru.qm index 63b7b8b..1ee686f 100644 Binary files a/qt_ru.qm and b/qt_ru.qm differ diff --git a/qt_sv.qm b/qt_sv.qm new file mode 100644 index 0000000..f3556bc Binary files /dev/null and b/qt_sv.qm differ diff --git a/qt_zh_tw.qm b/qt_zh_tw.qm new file mode 100644 index 0000000..a9a25b2 Binary files /dev/null and b/qt_zh_tw.qm differ diff --git a/resources.rcc b/resources.rcc index 795cc0f..e3b6a5e 100644 --- a/resources.rcc +++ b/resources.rcc @@ -62,12 +62,17 @@ <file>icons/16x16/rdp.png</file> <file>txt/packs</file> <file>txt/encodings</file> + <file>x2goclient_en.qm</file> <file>x2goclient_de.qm</file> - <file>x2goclient_ru.qm</file> <file>x2goclient_fr.qm</file> + <file>x2goclient_nb_no.qm</file> + <file>x2goclient_sv.qm</file> + <file>x2goclient_ru.qm</file> <file>x2goclient_zh_tw.qm</file> <file>qt_de.qm</file> <file>qt_ru.qm</file> <file>qt_fr.qm</file> + <file>qt_sv.qm</file> + <file>qt_zh_tw.qm</file> </qresource> </RCC> diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index c922af2..2626346 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -46,6 +46,11 @@ static bool isLibSshInited=false; SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key,bool autologin, bool krblogin, QObject* parent ) : QThread ( parent ) { +#if defined ( Q_OS_DARWIN ) + // Mac OS X provides only 512KB stack space for secondary threads. + // As we put a 512KB buffer on the stack later on, we need a bigger stack space. + setStackSize (sizeof (char) * 1024 * 1024 * 2); +#endif this->host=host; this->port=port; this->user=user; @@ -62,7 +67,7 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn else x2goDebug<<"starting ssh connection without kerberos authentication"<<endl; #endif -kerberos=false; + kerberos=false; } SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user, @@ -70,7 +75,9 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn int remotePort, QString localHost, int localPort, SshProcess* creator, QObject* parent, ONMainWindow* mwd ) : QThread ( parent ) { - +#if defined ( Q_OS_DARWIN ) + setStackSize (sizeof (char) * 1024 * 1024 * 2); +#endif this->host=host; this->port=port; this->user=user; diff --git a/sshprocess.h b/sshprocess.h index 567bff9..9d7a2b1 100644 --- a/sshprocess.h +++ b/sshprocess.h @@ -22,6 +22,7 @@ #ifndef SSHPROCESS_H #define SSHPROCESS_H +#include <netinet/in.h> #include <libssh/libssh.h> #include <QObject> diff --git a/version.h b/version.h index 77743ab..00471b6 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.0.6" +#define VERSION "3.99.1.0" diff --git a/x2goclient.pro b/x2goclient.pro index 8c71ee3..5c96688 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -12,8 +12,11 @@ CONFIG += $$(X2GO_LINUX_STATIC) FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui contest.ui +TRANSLATIONS += x2goclient_en.ts TRANSLATIONS += x2goclient_de.ts TRANSLATIONS += x2goclient_ru.ts +TRANSLATIONS += x2goclient_nb_no.ts +TRANSLATIONS += x2goclient_sv.ts TRANSLATIONS += x2goclient_fr.ts TRANSLATIONS += x2goclient_zh_tw.ts HEADERS += configdialog.h \ diff --git a/x2goclient_de.qm b/x2goclient_de.qm deleted file mode 100644 index 03d7acc..0000000 Binary files a/x2goclient_de.qm and /dev/null differ diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 37176b3..09baf25 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -6,27 +6,27 @@ <message> <location filename="brokerpassdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished">Dialog</translation> + <translation>Dialog</translation> </message> <message> <location filename="brokerpassdialog.ui" line="22"/> <source>Old password:</source> - <translation type="unfinished"></translation> + <translation>Altes Kennwort:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="36"/> <source>New password:</source> - <translation type="unfinished"></translation> + <translation>Neues Kennwort:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="50"/> <source>Confirm password:</source> - <translation type="unfinished"></translation> + <translation>Kennwort wiederholen:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="79"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translation>TextLabel</translation> </message> </context> <context> @@ -34,7 +34,7 @@ <message> <location filename="brokerpassdlg.cpp" line="41"/> <source>Passwords do not match</source> - <translation type="unfinished"></translation> + <translation>Kennwörter stimmen nicht überein</translation> </message> </context> <context> @@ -124,6 +124,57 @@ </message> </context> <context> + <name>ConTest</name> + <message> + <location filename="contest.ui" line="14"/> + <source>Connectivity test</source> + <translation>Verbindungstest</translation> + </message> + <message> + <location filename="contest.ui" line="24"/> + <source>HTTPS connection:</source> + <translation>HTTPS-Verbindung:</translation> + </message> + <message> + <location filename="contest.ui" line="31"/> + <source>SSH connection:</source> + <translation>SSH-Verbindung:</translation> + </message> + <message> + <location filename="contest.ui" line="38"/> + <source>Connection speed:</source> + <translation>Verbindungsgeschwindigkeit:</translation> + </message> + <message> + <location filename="contest.ui" line="123"/> + <location filename="contest.ui" line="167"/> + <source>Failed</source> + <translation>Fehlgeschlagen</translation> + </message> + <message> + <location filename="contest.ui" line="211"/> + <source>0 Kb/s</source> + <translation>0 Kb/s</translation> + </message> + <message> + <location filename="contest.cpp" line="108"/> + <location filename="contest.cpp" line="115"/> + <source>OK</source> + <translation>Ok</translation> + </message> + <message> + <location filename="contest.cpp" line="150"/> + <source>Socket operation timed out</source> + <translation>Zeitüberschreibung bei Socket-Operation</translation> + </message> + <message> + <location filename="contest.cpp" line="162"/> + <location filename="contest.cpp" line="168"/> + <source>Failed: </source> + <translation>Fehlgeschlagen: </translation> + </message> +</context> +<context> <name>ConfigDialog</name> <message> <location filename="configdialog.cpp" line="87"/> @@ -240,7 +291,7 @@ </message> <message> <source>Clientside SSH Port For File System Export Usage:</source> - <translation type="obsolete">SSH Port für die Dateisystemfreigabe auf Clientseite:</translation> + <translation type="obsolete">SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation> </message> <message> <source>LDAP settings</source> @@ -280,7 +331,7 @@ <message> <location filename="configdialog.cpp" line="250"/> <source>Clientside SSH port for file system export usage:</source> - <translation>SSH Port für die Dateisystemfreigabe auf Clientseite:</translation> + <translation>SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation> </message> <message> <location filename="configdialog.cpp" line="50"/> @@ -501,7 +552,7 @@ </message> <message> <source>Use RSA/DSA key for ssh connection:</source> - <translation type="obsolete">RSA/DSA Schlüssel verwenden (ssh):</translation> + <translation type="obsolete">RSA-/DSA-Schlüssel verwenden (ssh):</translation> </message> <message> <source>&Desktop Session</source> @@ -641,7 +692,7 @@ </message> <message> <source>SSH Port:</source> - <translation type="obsolete">SSH Port:</translation> + <translation type="obsolete">SSH-Port:</translation> </message> <message> <source>Path to executable</source> @@ -666,7 +717,7 @@ </message> <message> <source>SSH port:</source> - <translation type="obsolete">SSH Port:</translation> + <translation type="obsolete">SSH-Port:</translation> </message> <message> <source>&Session type</source> @@ -727,7 +778,7 @@ <message> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation type="obsolete">Benutze Port Weiterleitung über Tunnel + <translation type="obsolete">Benutze Port-Weiterleitung über Tunnel um Audiosignale über Firewalls zu verbinden</translation> </message> <message> @@ -740,7 +791,7 @@ sound system connections through firewalls</source> </message> <message> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation type="obsolete">Benutze SSH Port Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> + <translation type="obsolete">Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> </message> <message> <source>New session</source> @@ -842,125 +893,125 @@ sound system connections through firewalls</source> <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="164"/> + <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> <translation>de</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> + <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="294"/> <location filename="httpbrokerclient.cpp" line="308"/> - <location filename="httpbrokerclient.cpp" line="345"/> + <location filename="httpbrokerclient.cpp" line="328"/> + <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="309"/> + <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> - <translation type="unfinished"></translation> + <translation>Anmeldung fehlgeschlagen! Bitte noch einmal versuchen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="433"/> + <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> <translation> Server benutzt ein ungültiges Zertifikat. </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="436"/> + <location filename="httpbrokerclient.cpp" line="457"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> <translation>Sie sollten keine Ausnahme setzen, wenn Sie sich in einem Netzwerk befinden, dem sich nicht vertrauen oder wenn Sie für diese Verbindung bereits eine Ausnahme akzeptiert haben.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="441"/> + <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> <translation>Sichere Verbindung fehlgeschlagen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="446"/> + <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> <translation>Issued to: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="447"/> - <location filename="httpbrokerclient.cpp" line="459"/> + <location filename="httpbrokerclient.cpp" line="468"/> + <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> <translation>Common Name(CN) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="450"/> - <location filename="httpbrokerclient.cpp" line="462"/> + <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> <translation>Organization(O) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="453"/> - <location filename="httpbrokerclient.cpp" line="465"/> + <location filename="httpbrokerclient.cpp" line="474"/> + <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> <translation>Organizational Unit(OU) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="456"/> + <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> <translation>Serial Number </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="458"/> + <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> <translation>Issued by: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="469"/> + <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> <translation>Validity: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="470"/> + <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> <translation>Issued on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> <translation>expires on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="472"/> + <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> <translation>Fingerprints: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="473"/> + <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> <translation>SHA1 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="475"/> + <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> <translation>MD5 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="481"/> + <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> <translation>X2Go Client beenden</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="483"/> + <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> <translation>Ausnahme hinzufügen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="346"/> + <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> <translation>Die aktuelle Sitzung wurde unterbrochen. Um erneut Zugriff auf ihre Sitzung zu erhalten, kehren Sie zur Startseite zurück oder aktualisieren Sie die aktuelle Seite über den Browserbefehl "Aktuelle Seite neu laden".</translation> </message> @@ -968,41 +1019,41 @@ sound system connections through firewalls</source> <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="80"/> - <location filename="onmainwindow_part3.cpp" line="307"/> + <location filename="onmainwindow.cpp" line="84"/> + <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> <translation>de</translation> </message> <message> - <location filename="onmainwindow.cpp" line="81"/> + <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> <message> - <location filename="onmainwindow.cpp" line="329"/> + <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> - <translation type="unfinished"></translation> + <translation>Support ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="601"/> - <location filename="onmainwindow.cpp" line="1782"/> - <location filename="onmainwindow_part3.cpp" line="1636"/> + <location filename="onmainwindow.cpp" line="610"/> + <location filename="onmainwindow.cpp" line="1820"/> + <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> <translation>Sitzung:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="653"/> + <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="onmainwindow.cpp" line="654"/> + <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> <translation>Strg+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="655"/> - <location filename="onmainwindow.cpp" line="940"/> + <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> <translation>Beenden</translation> </message> @@ -1011,7 +1062,7 @@ sound system connections through firewalls</source> <translation type="obsolete">&Neue Sitzung ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="659"/> + <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> <translation>Strg+N</translation> </message> @@ -1020,7 +1071,7 @@ sound system connections through firewalls</source> <translation type="obsolete">Sitzungsverwaltung...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="665"/> + <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> <translation>Strg+E</translation> </message> @@ -1029,185 +1080,185 @@ sound system connections through firewalls</source> <translation type="obsolete">LDAP &Konfiguration ...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2052"/> + <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> <translation>Wergzeugleiste wieder anzeigen</translation> </message> <message> <source>About X2GO Client</source> - <translation type="obsolete">Über X2GO Client</translation> + <translation type="obsolete">Über X2GoClient</translation> </message> <message> - <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> <translation>Über QT</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2456"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> <translation>Sitzung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="715"/> + <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> <translation>Strg +Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="721"/> + <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> <translation>&Sitzung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="722"/> + <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> <translation>&Einstellungen</translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1423"/> + <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> <translation>Password:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1424"/> + <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> - <translation type="unfinished">Tastaturlayout:</translation> + <translation>Tastaturlayout:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1465"/> + <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1467"/> - <location filename="onmainwindow_part4.cpp" line="1756"/> - <location filename="onmainwindow_part4.cpp" line="1758"/> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2252"/> + <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="807"/> - <location filename="onmainwindow.cpp" line="830"/> - <location filename="onmainwindow.cpp" line="1471"/> - <location filename="onmainwindow.cpp" line="1499"/> - <location filename="onmainwindow.cpp" line="1507"/> - <location filename="onmainwindow.cpp" line="1640"/> - <location filename="onmainwindow.cpp" line="1667"/> - <location filename="onmainwindow.cpp" line="1670"/> - <location filename="onmainwindow.cpp" line="1917"/> - <location filename="onmainwindow.cpp" line="2140"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2167"/> - <location filename="onmainwindow.cpp" line="2201"/> - <location filename="onmainwindow.cpp" line="2246"/> - <location filename="onmainwindow_part2.cpp" line="297"/> - <location filename="onmainwindow_part2.cpp" line="473"/> - <location filename="onmainwindow_part2.cpp" line="482"/> - <location filename="onmainwindow_part2.cpp" line="781"/> - <location filename="onmainwindow_part2.cpp" line="1232"/> - <location filename="onmainwindow_part2.cpp" line="1293"/> - <location filename="onmainwindow_part2.cpp" line="1344"/> - <location filename="onmainwindow_part2.cpp" line="1377"/> - <location filename="onmainwindow_part2.cpp" line="1421"/> - <location filename="onmainwindow_part2.cpp" line="1801"/> - <location filename="onmainwindow_part2.cpp" line="1827"/> - <location filename="onmainwindow_part2.cpp" line="1958"/> + <translation>Ungültige Antwort vom Session-Broker</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="820"/> + <location filename="onmainwindow.cpp" line="848"/> + <location filename="onmainwindow.cpp" line="1495"/> + <location filename="onmainwindow.cpp" line="1524"/> + <location filename="onmainwindow.cpp" line="1532"/> + <location filename="onmainwindow.cpp" line="1678"/> + <location filename="onmainwindow.cpp" line="1705"/> + <location filename="onmainwindow.cpp" line="1708"/> + <location filename="onmainwindow.cpp" line="1955"/> + <location filename="onmainwindow.cpp" line="2178"/> + <location filename="onmainwindow.cpp" line="2192"/> + <location filename="onmainwindow.cpp" line="2205"/> + <location filename="onmainwindow.cpp" line="2239"/> + <location filename="onmainwindow.cpp" line="2284"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> + <location filename="onmainwindow_part2.cpp" line="1830"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> - <location filename="onmainwindow_part3.cpp" line="768"/> - <location filename="onmainwindow_part3.cpp" line="848"/> - <location filename="onmainwindow_part3.cpp" line="1092"/> - <location filename="onmainwindow_part3.cpp" line="1220"/> - <location filename="onmainwindow_part3.cpp" line="1273"/> - <location filename="onmainwindow_part3.cpp" line="1579"/> - <location filename="onmainwindow_part3.cpp" line="1581"/> - <location filename="onmainwindow_part3.cpp" line="1811"/> - <location filename="onmainwindow_part3.cpp" line="1859"/> - <location filename="onmainwindow_part3.cpp" line="1887"/> - <location filename="onmainwindow_part3.cpp" line="2257"/> - <location filename="onmainwindow_part3.cpp" line="2272"/> - <location filename="onmainwindow_part3.cpp" line="2326"/> + <location filename="onmainwindow_part3.cpp" line="773"/> + <location filename="onmainwindow_part3.cpp" line="854"/> + <location filename="onmainwindow_part3.cpp" line="1098"/> + <location filename="onmainwindow_part3.cpp" line="1226"/> + <location filename="onmainwindow_part3.cpp" line="1279"/> + <location filename="onmainwindow_part3.cpp" line="1585"/> + <location filename="onmainwindow_part3.cpp" line="1587"/> + <location filename="onmainwindow_part3.cpp" line="1817"/> + <location filename="onmainwindow_part3.cpp" line="1865"/> + <location filename="onmainwindow_part3.cpp" line="1893"/> + <location filename="onmainwindow_part3.cpp" line="2263"/> + <location filename="onmainwindow_part3.cpp" line="2278"/> + <location filename="onmainwindow_part3.cpp" line="2332"/> <location filename="onmainwindow_part4.cpp" line="29"/> <location filename="onmainwindow_part4.cpp" line="54"/> - <location filename="onmainwindow_part4.cpp" line="1980"/> - <location filename="onmainwindow_part4.cpp" line="2251"/> + <location filename="onmainwindow_part4.cpp" line="2214"/> + <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2372"/> + <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2443"/> + <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> <translation> on </translation> </message> <message> - <location filename="onmainwindow.cpp" line="776"/> - <location filename="onmainwindow.cpp" line="1775"/> - <location filename="onmainwindow_part3.cpp" line="1629"/> - <location filename="onmainwindow_part4.cpp" line="1422"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> <translation>Benutzername:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1002"/> - <location filename="onmainwindow_part4.cpp" line="1752"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> <translation>Wähle Sitzung:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1754"/> + <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> <translation>Fortfahren</translation> </message> <message> - <location filename="onmainwindow.cpp" line="479"/> - <location filename="onmainwindow.cpp" line="927"/> - <location filename="onmainwindow_part2.cpp" line="2200"/> - <location filename="onmainwindow_part4.cpp" line="1761"/> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> <translation>Anhalten</translation> </message> <message> - <location filename="onmainwindow.cpp" line="482"/> - <location filename="onmainwindow.cpp" line="928"/> - <location filename="onmainwindow_part4.cpp" line="1609"/> - <location filename="onmainwindow_part4.cpp" line="1763"/> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> <translation>Beenden</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1766"/> + <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2458"/> - <location filename="onmainwindow_part4.cpp" line="1833"/> - <location filename="onmainwindow_part4.cpp" line="1855"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> <translation>Display</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1835"/> + <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1841"/> + <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> <translation>Server</translation> </message> @@ -1216,20 +1267,20 @@ sound system connections through firewalls</source> <translation type="obsolete">Startzeit</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> + <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> <translation>Client IP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1018"/> - <location filename="onmainwindow_part2.cpp" line="1112"/> - <location filename="onmainwindow_part2.cpp" line="2164"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> <translation>aktiv</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1020"/> - <location filename="onmainwindow_part2.cpp" line="1305"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> <translation>angehalten</translation> </message> @@ -1242,46 +1293,46 @@ sound system connections through firewalls</source> <translation type="obsolete">Datei kann nicht geschrieben werden:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1985"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> <translation>SSL Tunnel kann nicht erzeugt werden: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1153"/> - <location filename="onmainwindow_part2.cpp" line="1173"/> - <location filename="onmainwindow_part2.cpp" line="1987"/> - <location filename="onmainwindow_part2.cpp" line="2376"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="143"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2148"/> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> <translation>verbinde</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2156"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> <translation>starte</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2158"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> <translation>aktiviere</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2220"/> - <location filename="onmainwindow_part2.cpp" line="2488"/> - <location filename="onmainwindow_part2.cpp" line="2506"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> <translation>Zeitüberschreitung</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2221"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> <translation>Abbruch</translation> </message> @@ -1290,7 +1341,7 @@ sound system connections through firewalls</source> <translation type="obsolete">Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1608"/> + <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> <translation>Abbruch</translation> </message> @@ -1299,97 +1350,97 @@ sound system connections through firewalls</source> <translation type="obsolete">Zeige Details</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="404"/> + <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> - <translation type="unfinished"></translation> + <translation> (kann Datei nicht öffnen)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="415"/> - <location filename="onmainwindow_part3.cpp" line="425"/> - <location filename="onmainwindow_part3.cpp" line="435"/> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> - <translation type="unfinished"></translation> + <translation> (Datei existiert nicht)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="459"/> + <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> - <translation type="unfinished"></translation> + <translation> (Verzeichnis existiert nicht)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="487"/> + <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> <translation>unerwarteter Wert "--link"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="505"/> + <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> <translation>unerwarteter Wert "--sound"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="522"/> - <location filename="onmainwindow_part3.cpp" line="533"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> <translation>unerwarteter Wert "--geometry"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="551"/> + <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> <translation>unerwarteter Wert "--set-kbd"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="568"/> + <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> <translation>unerwarteter Wert "--ldap"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="663"/> + <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> <translation>unerwarteter Wert "--pack"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="671"/> - <location filename="onmainwindow_part3.cpp" line="674"/> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> <translation>unerwarteter Wert: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> <translation>Liste aller Packmethoden:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1511"/> + <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> - <translation type="unfinished"></translation> + <translation>Support</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1516"/> + <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1582"/> + <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation> </message> <message> <source>no X2Go Server found in LDAP </source> - <translation type="obsolete">LDAP enthält keinen X2Go Server </translation> + <translation type="obsolete">LDAP enthält keinen X2GoServer </translation> </message> <message> <source>Are you sure you want to delete this Session?</source> <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="290"/> - <location filename="onmainwindow_part2.cpp" line="1286"/> - <location filename="onmainwindow_part2.cpp" line="1370"/> - <location filename="onmainwindow_part2.cpp" line="1403"/> - <location filename="onmainwindow_part3.cpp" line="761"/> - <location filename="onmainwindow_part3.cpp" line="841"/> - <location filename="onmainwindow_part3.cpp" line="1213"/> - <location filename="onmainwindow_part3.cpp" line="1266"/> - <location filename="onmainwindow_part3.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> + <location filename="onmainwindow_part3.cpp" line="766"/> + <location filename="onmainwindow_part3.cpp" line="847"/> + <location filename="onmainwindow_part3.cpp" line="1219"/> + <location filename="onmainwindow_part3.cpp" line="1272"/> + <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> <translation>Verbindung fehlgeschlagen @@ -1400,17 +1451,17 @@ sound system connections through firewalls</source> <translation type="obsolete">es konnte kein Server gefunden werden</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1848"/> + <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> <translation>Sitzungs ID</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1250"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> <translation>anhalten</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1272"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> <translation>beende</translation> </message> @@ -1465,20 +1516,20 @@ sound system connections through firewalls</source> </message> <message> <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="obsolete">X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> + <translation type="obsolete">X2GoClient V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten Sie auf x2go.org.</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> <translation>Falsches Passwort! </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="590"/> + <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> <translation>unerwarteter Wert "--ldap1"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="609"/> + <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> <translation>unerwarteter Wert "--ldap2"</translation> </message> @@ -1507,27 +1558,27 @@ sound system connections through firewalls</source> <translation type="obsolete">Usage: x2goclient [Options] Options: --help Print this message --help-pack Print availabel pack methods --no-menu Hide menu bar --maximize Start maximized --add-to-known-hosts Add RSA key fingerprint to .ssh/known_hosts if authenticity of server can't be established --ldap=<host:port:dn> Start with LDAP Support. Example: --ldap=ldapserver:389:o=organization,c=de --ldap1=<host:port> LDAP Failover Server #1 --ldap2=<host:port> LDAP Failover Server #2 --command=<cmd> Set default command, default value 'KDE' --sound=<0|1> Enable sound, default value '1' --geomerty=<W>x<H>|fullscreen Set default geometry, default value '800x600' --link=<modem|isdn|adsl|wan |lan> Set default link type, default 'lan' --pack=<packmethod> Set default pack method, default '16m-jpeg-9' --kbd-layout=<layout> Set default keyboard layout, default 'us' --kbd-type=<typed> Set default keyboard type, default 'pc105/us' --set-kbd=<0|1> Overwrite current keyboard settings, default '0'</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1888"/> + <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> <translation>Datei konnte nicht erzeugt werden: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1812"/> + <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> <translation>Es wurde keine gültige Karte gefunden</translation> </message> <message> <source>This card is unknown by X2Go System</source> - <translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation> + <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="325"/> + <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> <translation>&Konfiguration ...</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="719"/> - <location filename="onmainwindow_part3.cpp" line="745"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> <translation>Einstellungen</translation> </message> @@ -1536,14 +1587,14 @@ sound system connections through firewalls</source> <translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2053"/> - <location filename="onmainwindow_part3.cpp" line="2078"/> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> <translation>Verbindung zu X-Server konnte nicht hergestellt werden</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2054"/> - <location filename="onmainwindow_part3.cpp" line="2079"/> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> <translation>Verbindung zu X-Server konnte nicht hergestellt werden @@ -1554,92 +1605,92 @@ Please check your settings</source> <translation type="obsolete">X-Server konnte nicht gestartet werden</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2087"/> + <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> <translation>X-Server konnte nicht gestartet werden Überprüfen Sie Ihre Einstellungen</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1154"/> - <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> <translation>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem Verlust der ganzen Sitzung. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> <translation>24 oder 32</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1163"/> - <location filename="onmainwindow_part2.cpp" line="1183"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> <translation> bit zu ändern und den verwendeten X-server neu zu starten, bevor Sie sich mit der Sitzung verbinden. Trotzdem versuchen die Sitzung fortzuführen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1167"/> - <location filename="onmainwindow_part2.cpp" line="1187"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> <translation>Nein</translation> </message> <message> <source>X2Go Client V. </source> - <translation type="obsolete">X2Go Client V. </translation> + <translation type="obsolete">X2GoClient V. </translation> </message> <message> <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> + <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> + <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="153"/> + <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="409"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1837"/> + <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> <translation>Befehl</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1839"/> + <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> <translation>Desktopumgebung</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> <translation>Anwendung</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1030"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> <translation></translation> </message> @@ -1648,98 +1699,98 @@ Please check your settings</source> <translation type="obsolete"> Fehler in der Sudo Konfiguration</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2273"/> + <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> <translation>Befehl konnte nicht ausgeführt werden:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="126"/> + <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="150"/> + <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> <translation>Webbrowser</translation> </message> <message> - <location filename="onmainwindow.cpp" line="151"/> + <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> <translation>E-Mail-Programm</translation> </message> <message> - <location filename="onmainwindow.cpp" line="658"/> + <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> <translation>&Neue Sitzung ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> <translation>Sitzungsverwaltung...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="692"/> - <location filename="onmainwindow.cpp" line="713"/> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> <translation>Zeige Wergzeugleiste</translation> </message> <message> - <location filename="onmainwindow.cpp" line="336"/> - <location filename="onmainwindow_part3.cpp" line="1536"/> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> - <translation>Über X2GO Client</translation> + <translation>Über X2GoClient</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1472"/> - <location filename="onmainwindow.cpp" line="1641"/> - <location filename="onmainwindow.cpp" line="1671"/> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1506"/> + <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> - <translation>LDAP enthält keinen X2Go Server </translation> + <translation>LDAP enthält keinen X2GoServer </translation> </message> <message> - <location filename="onmainwindow.cpp" line="2065"/> + <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> <translation>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="764"/> - <location filename="onmainwindow_part3.cpp" line="844"/> - <location filename="onmainwindow_part3.cpp" line="1216"/> - <location filename="onmainwindow_part3.cpp" line="1269"/> - <location filename="onmainwindow_part3.cpp" line="2253"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> <source>Wrong password! </source> <translation>Falsches Passwort! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="474"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> <translation>es konnte kein Server gefunden werden</translation> </message> <message> - <location filename="onmainwindow.cpp" line="923"/> - <location filename="onmainwindow_part2.cpp" line="2061"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <oldsource>Active connection</oldsource> <translation>Nicht verbunden</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> <translation>Startzeit</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1799"/> - <location filename="onmainwindow_part3.cpp" line="1090"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> <translation>Ordner kann nicht erzeugt werden:</translation> </message> @@ -1747,199 +1798,204 @@ Please check your settings</source> <location filename="onmainwindow_part2.cpp" line="79"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>Host-Key des Servers hat sich geändert. Er lautet jetzt: </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="80"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Aus Sicherheitsgründen wird der Verbindungsaufbau abgebrochen</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation type="unfinished"></translation> + <translation>Der Host-Key des Servers konnte nicht gefunden werden aber ein anderer Schlüsseltyp existiert. Ein Angreifer kann den Schlüssel verändert haben, um dem Client vorzutäuschen, dass der Schlüssel nicht existiert</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation type="unfinished"></translation> + <translation>Die ,,Known Host''-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Der Server ist unbekannt. Vertrauen Sie diesem Host-Key? Öffentlicher Schlüssel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> - <translation type="unfinished">Host key verification failed</translation> + <translation>Die Überprüfung des Host-Keys schlug fehl</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> - <translation type="unfinished"></translation> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> + <translation>Anmeldung fehlgeschlagen</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="483"/> - <location filename="onmainwindow_part2.cpp" line="782"/> - <location filename="onmainwindow_part2.cpp" line="1233"/> - <location filename="onmainwindow_part2.cpp" line="1345"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> - <translation type="unfinished"></translation> + <translation>Server nicht verfügbar</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1825"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> <translation>Datei kann nicht geschrieben werden:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1956"/> - <location filename="onmainwindow_part3.cpp" line="2324"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> <translation>SSL Tunnel kann nicht erzeugt werden: </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1600"/> + <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> <translation>Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="476"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow_part4.cpp" line="1610"/> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> <translation>Ordner freigeben...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1612"/> + <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> <translation>Zeige Details</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1537"/> + <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> - <translation>X2Go Client V. </translation> + <translation>X2GoClient V. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1860"/> + <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> - <translation>Diese Karte ist dem X2Go System unbekannt</translation> + <translation>Diese Karte ist dem X2Go-System unbekannt</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2289"/> + <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> <translation>Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel Bitte installieren sie eine neuere Version von x2goserver</translation> </message> <message> - <location filename="onmainwindow.cpp" line="675"/> + <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> <translation>&Desktopsymbol erzeugen...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> + <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> - <translation type="unfinished"></translation> + <translation>&Kennwort für Session-Broker setzen...</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation>&Verbindungstest...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> + <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> - <translation type="unfinished"></translation> + <translation>Operation fehlgeschlagen</translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> - <translation type="unfinished"></translation> + <translation>Das Kennwort wurde geändert</translation> </message> <message> - <location filename="onmainwindow.cpp" line="830"/> + <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> - <translation type="unfinished"></translation> + <translation>Falsches Kennwort!</translation> </message> <message> - <location filename="onmainwindow.cpp" line="879"/> + <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> - <translation type="unfinished"></translation> + <translation>Authentifizierung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> + <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> - <translation>Wiederhestellen</translation> + <translation>Wiederherstellen</translation> </message> <message> - <location filename="onmainwindow.cpp" line="951"/> + <location filename="onmainwindow.cpp" line="969"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> - <translation>Linke Mousetaste: verstecken/wiederherstellen - rechte Mousetaste: Kontextmenü</translation> + <translation>Linke Maustaste: verstecken/wiederherstellen - rechte Maustaste: Kontextmenü</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1805"/> + <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> <translation>Desktopsymbol erzeugen</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1806"/> + <location filename="onmainwindow.cpp" line="1844"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> - <translation>Der Aufruf über Desktopsymbole kann erfolgen, ohne das x2goclient sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Loginvorgang über einen GPG Schlüssel oder eine GPG Smartcard konfiguriert haben. + <translation>Der Aufruf über Desktopsymbole kann erfolgen, ohne dass der X2GoClient sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Loginvorgang über einen GPG-Schlüssel oder eine GPG-Smartcard konfiguriert haben. -Wollen SIe den versteckten Modus nutzen?</translation> +Wollen Sie den versteckten Modus nutzen?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1817"/> + <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1917"/> + <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> - <translation type="unfinished"></translation> + <translation>Keine X2Go-Sitzungen gefunden</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2431"/> + <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> <translation>RDP Verbindung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1867"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow_part4.cpp" line="1054"/> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> <translation>Fenster abkoppeln</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1930"/> - <location filename="onmainwindow_part4.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> <translation>Fenster einbetten</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2133"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> <translation>Beendet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2377"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation>Die Sitzung wird beendet. Sind Sie sicher? Ungespeicherte Dokumente gehen verloren</translation> </message> <message> <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> + <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2101"/> + <location filename="onmainwindow_part3.cpp" line="2107"/> <location filename="onmainwindow_part4.cpp" line="422"/> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server @@ -1948,18 +2004,18 @@ Please check your installation</source> Bitte überprüfen Sie Ihre Installation</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1118"/> + <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> - <translation>X2Go Sitzung</translation> + <translation>X2Go-Sitzung</translation> </message> <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow_part4.cpp" line="2064"/> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> <translation>Symbole verstecken</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2097"/> + <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;zum Wiederherstellen&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;der Werkzeugleiste&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;hier klicken&nbsp;&nbsp;&nbsp; </translation> </message> @@ -1968,7 +2024,7 @@ Bitte überprüfen Sie Ihre Installation</translation> <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1981"/> + <location filename="onmainwindow_part4.cpp" line="2215"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> @@ -1977,65 +2033,65 @@ Sie können SSHD über folgenden Befehl installieren: sudo apt-get install openssh-server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2439"/> + <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1063"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> <translation>Hinweis</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1077"/> - <location filename="onmainwindow_part4.cpp" line="2165"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1084"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> <translation>Desktopauswahl:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1772"/> + <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> <translation>Nur betrachten</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1852"/> + <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> <translation>Benutzer</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2435"/> + <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1064"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> <translation>Kein freigegebener Desktop gefunden</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1769"/> + <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> <translation>Vollzugriff</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1883"/> + <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> <translation>Nur eigene Desktops</translation> </message> <message> - <location filename="onmainwindow.cpp" line="484"/> + <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> <translation>Neu verbinden</translation> </message> <message> - <location filename="onmainwindow.cpp" line="834"/> - <location filename="onmainwindow.cpp" line="2354"/> - <location filename="onmainwindow_part4.cpp" line="2234"/> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> <source>Connecting to broker</source> <translation>Verbinden mit Broker</translation> </message> @@ -2044,14 +2100,14 @@ Sie können SSHD über folgenden Befehl installieren: <translation type="obsolete"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1520"/> + <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1524"/> + <location filename="onmainwindow_part3.cpp" line="1530"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation> Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> + <translation> Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="141"/> @@ -2064,13 +2120,13 @@ Sie können SSHD über folgenden Befehl installieren: <translation>ISO8859-1</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1300"/> + <location filename="onmainwindow_part4.cpp" line="1534"/> <source>wrong value for argument"speed"</source> <translation>wrong value for argument"speed"</translation> </message> <message> <source>application/x2go:x2go:Configuration File for X2Go Session</source> - <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation> + <translation type="obsolete">application/x2go:x2go:Konfigurationsdatei für eine X2Go-Sitzung</translation> </message> </context> <context> @@ -2093,7 +2149,7 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="printdialog.ui" line="16"/> <source>Print - X2Go client</source> - <translation>Drucken - X2Go Client</translation> + <translation>Drucken - X2GoClient</translation> </message> </context> <context> @@ -2298,31 +2354,40 @@ Beispiel: <translation type="obsolete">Aktiviere Audiounterstützung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="270"/> + <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="312"/> + <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="sessionbutton.cpp" line="383"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="635"/> + <location filename="sessionbutton.cpp" line="385"/> + <location filename="sessionbutton.cpp" line="402"/> + <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> <translation>Vollbild</translation> </message> <message> - <location filename="sessionbutton.cpp" line="417"/> - <location filename="sessionbutton.cpp" line="547"/> + <location filename="sessionbutton.cpp" line="389"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="416"/> + <location filename="sessionbutton.cpp" line="669"/> + <location filename="sessionbutton.cpp" line="672"/> + <source>Display </source> + <translation>Anzeige </translation> + </message> + <message> + <location filename="sessionbutton.cpp" line="445"/> + <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> <translation>aktiviert</translation> </message> <message> - <location filename="sessionbutton.cpp" line="419"/> - <location filename="sessionbutton.cpp" line="549"/> + <location filename="sessionbutton.cpp" line="447"/> + <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> <translation>deaktiviert</translation> </message> @@ -2331,74 +2396,74 @@ Beispiel: <translation type="obsolete">/usr/bin/startkde</translation> </message> <message> - <location filename="sessionbutton.cpp" line="390"/> - <location filename="sessionbutton.cpp" line="409"/> + <location filename="sessionbutton.cpp" line="397"/> + <location filename="sessionbutton.cpp" line="437"/> <source>window</source> <translation>Fenster</translation> </message> <message> - <location filename="sessionbutton.cpp" line="114"/> + <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> <translation>Sitzungseinstellungen...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="118"/> + <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> <translation>Desktopsymbol erzeugen...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="123"/> + <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> <translation>Sitzung entfernen</translation> </message> <message> - <location filename="sessionbutton.cpp" line="136"/> + <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> <translation>Optionen</translation> </message> <message> - <location filename="sessionbutton.cpp" line="137"/> + <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> <translation>Typ</translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> + <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> <translation>Auflösung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="140"/> + <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> <translation>Sound</translation> </message> <message> - <location filename="sessionbutton.cpp" line="275"/> + <location filename="sessionbutton.cpp" line="277"/> <source>running</source> - <translation type="unfinished">aktiv</translation> + <translation>aktiv</translation> </message> <message> - <location filename="sessionbutton.cpp" line="279"/> + <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> - <translation type="unfinished">angehalten</translation> + <translation>angehalten</translation> </message> <message> - <location filename="sessionbutton.cpp" line="323"/> - <location filename="sessionbutton.cpp" line="355"/> - <location filename="sessionbutton.cpp" line="588"/> + <location filename="sessionbutton.cpp" line="325"/> + <location filename="sessionbutton.cpp" line="357"/> + <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> <translation>RDP Verbindung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="325"/> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="582"/> + <location filename="sessionbutton.cpp" line="327"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="sessionbutton.cpp" line="324"/> - <location filename="sessionbutton.cpp" line="361"/> - <location filename="sessionbutton.cpp" line="594"/> + <location filename="sessionbutton.cpp" line="326"/> + <location filename="sessionbutton.cpp" line="363"/> + <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> @@ -2488,12 +2553,12 @@ Beispiel: <message> <location filename="sessionwidget.cpp" line="89"/> <source>SSH port:</source> - <translation>SSH Port:</translation> + <translation>SSH-Port:</translation> </message> <message> <location filename="sessionwidget.cpp" line="101"/> <source>Use RSA/DSA key for ssh connection:</source> - <translation>RSA/DSA Schlüssel verwenden (ssh):</translation> + <translation>RSA-/DSA-Schlüssel verwenden (ssh):</translation> </message> <message> <location filename="sessionwidget.cpp" line="107"/> @@ -2501,109 +2566,114 @@ Beispiel: <translation>Anmeldung über voreingestellten SSH-Schlüssel oder ssh-agent</translation> </message> <message> - <location filename="sessionwidget.cpp" line="111"/> + <location filename="sessionwidget.cpp" line="108"/> + <source>Kerberos 5 (GSSAPI) authentication</source> + <translation>Kerberos5 (GSSAPI) Authentifizierung</translation> + </message> + <message> + <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> <translation>&Sitzungsart</translation> </message> <message> - <location filename="sessionwidget.cpp" line="116"/> + <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> <translation>Sitzungsart:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="125"/> - <location filename="sessionwidget.cpp" line="292"/> + <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> <translation>Verbindung mit Windows Terminalserver herstellen</translation> </message> <message> - <location filename="sessionwidget.cpp" line="128"/> + <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> <translation>Andere Desktopumgebung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="129"/> + <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> <translation>Anwendung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> - <location filename="sessionwidget.cpp" line="248"/> + <location filename="sessionwidget.cpp" line="133"/> + <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> <translation>Befehl:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="132"/> + <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> <translation>Erweiterte Einstellungen...</translation> </message> <message> - <location filename="sessionwidget.cpp" line="143"/> - <location filename="sessionwidget.cpp" line="420"/> - <location filename="sessionwidget.cpp" line="482"/> + <location filename="sessionwidget.cpp" line="145"/> + <location filename="sessionwidget.cpp" line="429"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> <translation>Pfad zum Programm</translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> <translation>Öffne Bild</translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> <translation>Bilder</translation> </message> <message> - <location filename="sessionwidget.cpp" line="215"/> + <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> <translation>Öffne Schlüssel</translation> </message> <message> - <location filename="sessionwidget.cpp" line="217"/> + <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="sessionwidget.cpp" line="269"/> - <location filename="sessionwidget.cpp" line="384"/> + <location filename="sessionwidget.cpp" line="273"/> + <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> <translation>Server:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="293"/> + <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> <translation>rdesktop Kommandozeilenoptionen:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="306"/> - <location filename="sessionwidget.cpp" line="404"/> + <location filename="sessionwidget.cpp" line="310"/> + <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="sessionwidget.cpp" line="275"/> - <location filename="sessionwidget.cpp" line="392"/> + <location filename="sessionwidget.cpp" line="279"/> + <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> <translation>XDMCP Server:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> + <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="sessionwidget.cpp" line="227"/> + <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="sessionwidget.cpp" line="228"/> + <location filename="sessionwidget.cpp" line="232"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation>x2goclient befindet sich im portablen Ausführungsmodus. Wenn Sie einen Pfad ausserhalb des USB Geräts wählen, können sie auf die Daten nicht von überall aus zugreifen.</translation> </message> @@ -2611,112 +2681,132 @@ Beispiel: <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="33"/> - <location filename="settingswidget.cpp" line="37"/> + <location filename="settingswidget.cpp" line="40"/> + <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> <translation>&Display</translation> </message> <message> - <location filename="settingswidget.cpp" line="34"/> - <location filename="settingswidget.cpp" line="38"/> + <location filename="settingswidget.cpp" line="41"/> + <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> <translation>&Tastatur</translation> </message> <message> - <location filename="settingswidget.cpp" line="35"/> - <location filename="settingswidget.cpp" line="39"/> + <location filename="settingswidget.cpp" line="42"/> + <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> <translation>Audio</translation> </message> <message> - <location filename="settingswidget.cpp" line="50"/> + <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> <translation>Vollbild</translation> </message> <message> - <location filename="settingswidget.cpp" line="52"/> + <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> <translation>Eigener</translation> </message> <message> - <location filename="settingswidget.cpp" line="54"/> + <location filename="settingswidget.cpp" line="61"/> <source>Window</source> <translation>Fenster</translation> </message> <message> - <location filename="settingswidget.cpp" line="61"/> + <location filename="settingswidget.cpp" line="63"/> + <source>Use whole display</source> + <translation>Ganzen Bildschirm verwenden</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> - <translation>DPI Auflösung festlegen</translation> + <translation>Auflösung festlegen (DPI)</translation> </message> <message> - <location filename="settingswidget.cpp" line="79"/> + <location filename="settingswidget.cpp" line="76"/> + <source>Xinerama extension (support for two or more physical displays)</source> + <translation>Xinerama-Erweiterung (unterstützt zwei oder mehr Bildschirme)</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> <translation>Breite:</translation> </message> <message> - <location filename="settingswidget.cpp" line="82"/> + <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> <translation>Höhe:</translation> </message> <message> - <location filename="settingswidget.cpp" line="101"/> + <location filename="settingswidget.cpp" line="102"/> + <source>&Display:</source> + <translation>&Bildschirm:</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="104"/> + <source>&Identify all displays</source> + <translation>&Alle Bildschirme identifizieren</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> <translation>Tastaturlayout behalten</translation> </message> <message> - <location filename="settingswidget.cpp" line="111"/> + <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> <translation>Tastaturlayout:</translation> </message> <message> - <location filename="settingswidget.cpp" line="113"/> + <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> <translation>Tastatur:</translation> </message> <message> - <location filename="settingswidget.cpp" line="124"/> + <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> <translation>Audiounterstützung aktivieren</translation> </message> <message> - <location filename="settingswidget.cpp" line="133"/> + <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> <translation>Starte Sound Server</translation> </message> <message> - <location filename="settingswidget.cpp" line="135"/> + <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> <translation>Benutze existierenden Sound Server</translation> </message> <message> - <location filename="settingswidget.cpp" line="137"/> + <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation>Benutze Port Weiterleitung über Tunnel + <translation>Benutze Port-Weiterleitung über Tunnel um Audiosignale über Firewalls zu verbinden</translation> </message> <message> - <location filename="settingswidget.cpp" line="139"/> + <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> <translation>Benutze standard Audio Port</translation> </message> <message> - <location filename="settingswidget.cpp" line="146"/> + <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> <translation>Audio Port:</translation> </message> <message> - <location filename="settingswidget.cpp" line="173"/> + <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> <translation>Clientseitige Druckunterstützung</translation> </message> <message> - <location filename="settingswidget.cpp" line="440"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation>de</translation> </message> <message> - <location filename="settingswidget.cpp" line="441"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> @@ -2757,7 +2847,7 @@ sound system connections through firewalls</source> <message> <location filename="sharewidget.cpp" line="95"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>Benutze SSH Port Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> + <translation>Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> </message> <message> <location filename="sharewidget.cpp" line="158"/> @@ -2805,97 +2895,97 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="100"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> - <translation type="unfinished"></translation> + <translation>Kann libssh nicht initialisieren</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="120"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> - <translation type="unfinished"></translation> + <translation>Kann SSH-Sitzung nicht erstellen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="135"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> - <translation type="unfinished"></translation> + <translation>Verbindungsaufbau nicht möglich </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="171"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>Anmeldung fehlgeschlagen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> - <translation type="unfinished"></translation> + <translation>channel_forward_listen schlug fehl</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="498"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> - <translation type="unfinished"></translation> + <translation>Kann Datei nicht öffnen </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="510"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> - <translation type="unfinished"></translation> + <translation>Kann entfernte Datei nicht öffnen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="523"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> - <translation type="unfinished"></translation> + <translation>Kann entfernte Datei nicht schreiben </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="573"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> - <translation type="unfinished"></translation> + <translation>Kann Verbindung nicht herstellen zu </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="682"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> - <translation type="unfinished"></translation> + <translation>channel_open_forward schlug fehl</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> - <translation type="unfinished"></translation> + <translation>channel_open_session schlug fehl</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="708"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> - <translation type="unfinished"></translation> + <translation>channel_request_exec schlug fehl</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="773"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> - <translation type="unfinished"></translation> + <translation>Fehler beim Schreiben auf Socket</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="791"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> - <translation type="unfinished"></translation> + <translation>Channel Lesefehler</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="821"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> - <translation type="unfinished"></translation> + <translation>Channel Schreibfehler</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="833"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> - <translation type="unfinished"></translation> + <translation>Lesefehler TCP-Socket</translation> </message> </context> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> - <translation type="unfinished"></translation> + <translation>Socket-Fehler beim Erstellen</translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> - <translation type="unfinished"></translation> + <translation>Socket-Bind-Fehler</translation> </message> </context> <context> @@ -2903,12 +2993,12 @@ sound system connections through firewalls</source> <message> <location filename="xsettingswidget.cpp" line="50"/> <source>Open File</source> - <translation type="unfinished"></translation> + <translation>Datei öffnen</translation> </message> <message> <location filename="xsettingswidget.cpp" line="52"/> <source>Executable (*.exe)</source> - <translation type="unfinished"></translation> + <translation>Ausführbare Datei (*.exe)</translation> </message> </context> <context> @@ -2916,62 +3006,62 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="14"/> <source>Form</source> - <translation type="unfinished">Form</translation> + <translation>Formular</translation> </message> <message> <location filename="xsettingsui.ui" line="27"/> <source>You must restart the X2Go Client for the changes to take effect</source> - <translation type="unfinished"></translation> + <translation>Sie müssen X2GoClient neu starten, um die Änderungen zu aktivieren</translation> </message> <message> <location filename="xsettingsui.ui" line="50"/> <source>use integrated X-Server</source> - <translation type="unfinished"></translation> + <translation>integrierten X-Server verwenden</translation> </message> <message> <location filename="xsettingsui.ui" line="60"/> <source>use custom X-Server</source> - <translation type="unfinished"></translation> + <translation>benutzerdefinierten X-Server verwenden</translation> </message> <message> <location filename="xsettingsui.ui" line="70"/> <source>custom X-Server</source> - <translation type="unfinished"></translation> + <translation>benutzerdefinierter X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="78"/> <source>executable:</source> - <translation type="unfinished"></translation> + <translation>Ausführbare Datei:</translation> </message> <message> <location filename="xsettingsui.ui" line="101"/> <source>start X-Server on X2Go client start</source> - <translation type="unfinished"></translation> + <translation>X-Server auf X2GoClient starten</translation> </message> <message> <location filename="xsettingsui.ui" line="113"/> <source>command line options:</source> - <translation type="unfinished"></translation> + <translation>Kommandozeilenoptionen:</translation> </message> <message> <location filename="xsettingsui.ui" line="125"/> <source>X-Server command line options</source> - <translation type="unfinished"></translation> + <translation>Kommandozeilenoptionen des X-Servers</translation> </message> <message> <location filename="xsettingsui.ui" line="131"/> <source>window mode:</source> - <translation type="unfinished"></translation> + <translation>Fenstermodus:</translation> </message> <message> <location filename="xsettingsui.ui" line="141"/> <source>fullscreen mode:</source> - <translation type="unfinished"></translation> + <translation>Vollbildmodus:</translation> </message> <message> <location filename="xsettingsui.ui" line="151"/> <source>single application:</source> - <translation type="unfinished"></translation> + <translation>Einzelanwendung:</translation> </message> </context> <context> @@ -3002,7 +3092,7 @@ sound system connections through firewalls</source> </message> <message> <source>Host key verification failed</source> - <translation type="obsolete">Host key verification failed</translation> + <translation type="obsolete">Host-Key Überprüfung fehlgeschlagen</translation> </message> </context> </TS> diff --git a/x2goclient_fr.ts b/x2goclient_en.ts similarity index 73% copy from x2goclient_fr.ts copy to x2goclient_en.ts index 1cd6797..ff3ab11 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_en.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.0" language="en_US"> <context> <name>BrokerPassDialogUi</name> <message> @@ -40,31 +40,6 @@ <context> <name>CUPSPrintWidget</name> <message> - <location filename="cupsprintwidget.cpp" line="65"/> - <source>Idle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="68"/> - <source>Printing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="71"/> - <source>Stopped</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="81"/> - <source>Yes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="81"/> - <source>No</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="cupsprintwidget.ui" line="19"/> <source>Form</source> <translation type="unfinished"></translation> @@ -104,6 +79,31 @@ <source>Comment:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="cupsprintwidget.cpp" line="65"/> + <source>Idle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="68"/> + <source>Printing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="71"/> + <source>Stopped</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="81"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="81"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CUPSPrinterSettingsDialog</name> @@ -124,6 +124,57 @@ </message> </context> <context> + <name>ConTest</name> + <message> + <location filename="contest.ui" line="14"/> + <source>Connectivity test</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="24"/> + <source>HTTPS connection:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="31"/> + <source>SSH connection:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="38"/> + <source>Connection speed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="123"/> + <location filename="contest.ui" line="167"/> + <source>Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="211"/> + <source>0 Kb/s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="108"/> + <location filename="contest.cpp" line="115"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="150"/> + <source>Socket operation timed out</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="162"/> + <location filename="contest.cpp" line="168"/> + <source>Failed: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ConfigDialog</name> <message> <location filename="configdialog.cpp" line="50"/> @@ -472,121 +523,121 @@ <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="164"/> + <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> + <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="294"/> <location filename="httpbrokerclient.cpp" line="308"/> - <location filename="httpbrokerclient.cpp" line="345"/> + <location filename="httpbrokerclient.cpp" line="328"/> + <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="309"/> + <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="346"/> + <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="433"/> + <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="436"/> + <location filename="httpbrokerclient.cpp" line="457"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="441"/> + <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="446"/> + <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="447"/> - <location filename="httpbrokerclient.cpp" line="459"/> + <location filename="httpbrokerclient.cpp" line="468"/> + <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="450"/> - <location filename="httpbrokerclient.cpp" line="462"/> + <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="453"/> - <location filename="httpbrokerclient.cpp" line="465"/> + <location filename="httpbrokerclient.cpp" line="474"/> + <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="456"/> + <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="458"/> + <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="469"/> + <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="470"/> + <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="472"/> + <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="473"/> + <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="475"/> + <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="481"/> + <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="483"/> + <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> <translation type="unfinished"></translation> </message> @@ -594,622 +645,633 @@ <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="80"/> - <location filename="onmainwindow_part3.cpp" line="307"/> + <location filename="onmainwindow.cpp" line="84"/> + <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="81"/> + <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="126"/> + <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="143"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2148"/> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="150"/> + <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="151"/> + <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="153"/> + <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="325"/> + <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="329"/> + <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="336"/> - <location filename="onmainwindow_part3.cpp" line="1536"/> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="476"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow_part4.cpp" line="1610"/> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="479"/> - <location filename="onmainwindow.cpp" line="927"/> - <location filename="onmainwindow_part2.cpp" line="2200"/> - <location filename="onmainwindow_part4.cpp" line="1761"/> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="482"/> - <location filename="onmainwindow.cpp" line="928"/> - <location filename="onmainwindow_part4.cpp" line="1609"/> - <location filename="onmainwindow_part4.cpp" line="1763"/> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="484"/> + <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow_part4.cpp" line="1054"/> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow_part4.cpp" line="2064"/> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="601"/> - <location filename="onmainwindow.cpp" line="1782"/> - <location filename="onmainwindow_part3.cpp" line="1636"/> + <location filename="onmainwindow.cpp" line="610"/> + <location filename="onmainwindow.cpp" line="1820"/> + <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="653"/> + <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="654"/> + <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="655"/> - <location filename="onmainwindow.cpp" line="940"/> + <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="658"/> + <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="659"/> + <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="665"/> + <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="675"/> + <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> + <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="692"/> - <location filename="onmainwindow.cpp" line="713"/> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="715"/> + <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="721"/> + <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="722"/> + <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="776"/> - <location filename="onmainwindow.cpp" line="1775"/> - <location filename="onmainwindow_part3.cpp" line="1629"/> - <location filename="onmainwindow_part4.cpp" line="1422"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> + <location filename="onmainwindow.cpp" line="820"/> + <location filename="onmainwindow.cpp" line="848"/> + <location filename="onmainwindow.cpp" line="1495"/> + <location filename="onmainwindow.cpp" line="1524"/> + <location filename="onmainwindow.cpp" line="1532"/> + <location filename="onmainwindow.cpp" line="1678"/> + <location filename="onmainwindow.cpp" line="1705"/> + <location filename="onmainwindow.cpp" line="1708"/> + <location filename="onmainwindow.cpp" line="1955"/> + <location filename="onmainwindow.cpp" line="2178"/> + <location filename="onmainwindow.cpp" line="2192"/> + <location filename="onmainwindow.cpp" line="2205"/> + <location filename="onmainwindow.cpp" line="2239"/> + <location filename="onmainwindow.cpp" line="2284"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> + <location filename="onmainwindow_part2.cpp" line="1830"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> + <location filename="onmainwindow_part3.cpp" line="202"/> + <location filename="onmainwindow_part3.cpp" line="773"/> + <location filename="onmainwindow_part3.cpp" line="854"/> + <location filename="onmainwindow_part3.cpp" line="1098"/> + <location filename="onmainwindow_part3.cpp" line="1226"/> + <location filename="onmainwindow_part3.cpp" line="1279"/> + <location filename="onmainwindow_part3.cpp" line="1585"/> + <location filename="onmainwindow_part3.cpp" line="1587"/> + <location filename="onmainwindow_part3.cpp" line="1817"/> + <location filename="onmainwindow_part3.cpp" line="1865"/> + <location filename="onmainwindow_part3.cpp" line="1893"/> + <location filename="onmainwindow_part3.cpp" line="2263"/> + <location filename="onmainwindow_part3.cpp" line="2278"/> + <location filename="onmainwindow_part3.cpp" line="2332"/> + <location filename="onmainwindow_part4.cpp" line="29"/> + <location filename="onmainwindow_part4.cpp" line="54"/> + <location filename="onmainwindow_part4.cpp" line="2214"/> + <location filename="onmainwindow_part4.cpp" line="2485"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="830"/> + <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="879"/> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> + <source>Connecting to broker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> + <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="923"/> - <location filename="onmainwindow_part2.cpp" line="2061"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="951"/> + <location filename="onmainwindow.cpp" line="969"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> - <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="807"/> - <location filename="onmainwindow.cpp" line="830"/> - <location filename="onmainwindow.cpp" line="1471"/> - <location filename="onmainwindow.cpp" line="1499"/> - <location filename="onmainwindow.cpp" line="1507"/> - <location filename="onmainwindow.cpp" line="1640"/> - <location filename="onmainwindow.cpp" line="1667"/> - <location filename="onmainwindow.cpp" line="1670"/> - <location filename="onmainwindow.cpp" line="1917"/> - <location filename="onmainwindow.cpp" line="2140"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2167"/> - <location filename="onmainwindow.cpp" line="2201"/> - <location filename="onmainwindow.cpp" line="2246"/> - <location filename="onmainwindow_part2.cpp" line="297"/> - <location filename="onmainwindow_part2.cpp" line="473"/> - <location filename="onmainwindow_part2.cpp" line="482"/> - <location filename="onmainwindow_part2.cpp" line="781"/> - <location filename="onmainwindow_part2.cpp" line="1232"/> - <location filename="onmainwindow_part2.cpp" line="1293"/> - <location filename="onmainwindow_part2.cpp" line="1344"/> - <location filename="onmainwindow_part2.cpp" line="1377"/> - <location filename="onmainwindow_part2.cpp" line="1421"/> - <location filename="onmainwindow_part2.cpp" line="1801"/> - <location filename="onmainwindow_part2.cpp" line="1827"/> - <location filename="onmainwindow_part2.cpp" line="1958"/> - <location filename="onmainwindow_part3.cpp" line="202"/> - <location filename="onmainwindow_part3.cpp" line="768"/> - <location filename="onmainwindow_part3.cpp" line="848"/> - <location filename="onmainwindow_part3.cpp" line="1092"/> - <location filename="onmainwindow_part3.cpp" line="1220"/> - <location filename="onmainwindow_part3.cpp" line="1273"/> - <location filename="onmainwindow_part3.cpp" line="1579"/> - <location filename="onmainwindow_part3.cpp" line="1581"/> - <location filename="onmainwindow_part3.cpp" line="1811"/> - <location filename="onmainwindow_part3.cpp" line="1859"/> - <location filename="onmainwindow_part3.cpp" line="1887"/> - <location filename="onmainwindow_part3.cpp" line="2257"/> - <location filename="onmainwindow_part3.cpp" line="2272"/> - <location filename="onmainwindow_part3.cpp" line="2326"/> - <location filename="onmainwindow_part4.cpp" line="29"/> - <location filename="onmainwindow_part4.cpp" line="54"/> - <location filename="onmainwindow_part4.cpp" line="1980"/> - <location filename="onmainwindow_part4.cpp" line="2251"/> - <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1472"/> - <location filename="onmainwindow.cpp" line="1641"/> - <location filename="onmainwindow.cpp" line="1671"/> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1506"/> + <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1805"/> + <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1806"/> + <location filename="onmainwindow.cpp" line="1844"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1817"/> + <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1867"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1917"/> + <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2065"/> + <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2372"/> + <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2431"/> + <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2435"/> + <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2439"/> + <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2443"/> + <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="290"/> - <location filename="onmainwindow_part2.cpp" line="1286"/> - <location filename="onmainwindow_part2.cpp" line="1370"/> - <location filename="onmainwindow_part2.cpp" line="1403"/> - <location filename="onmainwindow_part3.cpp" line="761"/> - <location filename="onmainwindow_part3.cpp" line="841"/> - <location filename="onmainwindow_part3.cpp" line="1213"/> - <location filename="onmainwindow_part3.cpp" line="1266"/> - <location filename="onmainwindow_part3.cpp" line="2250"/> - <source>Connection failed -</source> + <location filename="onmainwindow_part2.cpp" line="79"/> + <source>Host key for server changed. +It is now: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> - <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="764"/> - <location filename="onmainwindow_part3.cpp" line="844"/> - <location filename="onmainwindow_part3.cpp" line="1216"/> - <location filename="onmainwindow_part3.cpp" line="1269"/> - <location filename="onmainwindow_part3.cpp" line="2253"/> - <source>Wrong password! </source> + <location filename="onmainwindow_part2.cpp" line="80"/> + <source>For security reasons, connection will be stopped</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="409"/> - <source>unknown</source> + <location filename="onmainwindow_part2.cpp" line="91"/> + <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="474"/> - <source>No server availabel</source> + <location filename="onmainwindow_part2.cpp" line="113"/> + <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1002"/> - <location filename="onmainwindow_part4.cpp" line="1752"/> - <source>Select session:</source> + <location filename="onmainwindow_part2.cpp" line="118"/> + <source>The server is unknown. Do you trust the host key? +Public key hash: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1018"/> - <location filename="onmainwindow_part2.cpp" line="1112"/> - <location filename="onmainwindow_part2.cpp" line="2164"/> - <source>running</source> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> + <source>Host key verification failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1020"/> - <location filename="onmainwindow_part2.cpp" line="1305"/> - <source>suspended</source> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> + <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1026"/> - <source>Desktop</source> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> + <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1028"/> - <source>single application</source> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1030"/> - <source>shadow session</source> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> + <location filename="onmainwindow_part3.cpp" line="766"/> + <location filename="onmainwindow_part3.cpp" line="847"/> + <location filename="onmainwindow_part3.cpp" line="1219"/> + <location filename="onmainwindow_part3.cpp" line="1272"/> + <location filename="onmainwindow_part3.cpp" line="2256"/> + <source>Connection failed +</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1063"/> - <source>Information</source> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> + <location filename="onmainwindow_part3.cpp" line="199"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> + <source>Wrong password! </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1064"/> - <source>No accessible desktop found</source> + <location filename="onmainwindow_part2.cpp" line="417"/> + <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1077"/> - <location filename="onmainwindow_part4.cpp" line="2165"/> - <source>Filter</source> + <location filename="onmainwindow_part2.cpp" line="482"/> + <source>No server availabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1084"/> - <source>Select desktop:</source> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> + <source>Server not availabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1153"/> - <location filename="onmainwindow_part2.cpp" line="1173"/> - <location filename="onmainwindow_part2.cpp" line="1987"/> - <location filename="onmainwindow_part2.cpp" line="2376"/> - <source>Warning</source> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> + <source>Select session:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1154"/> - <location filename="onmainwindow_part2.cpp" line="1174"/> - <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> + <source>running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1162"/> - <source>24 or 32</source> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> + <source>suspended</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1163"/> - <location filename="onmainwindow_part2.cpp" line="1183"/> - <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> + <location filename="onmainwindow_part2.cpp" line="1034"/> + <source>Desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> - <source>Yes</source> + <location filename="onmainwindow_part2.cpp" line="1036"/> + <source>single application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="79"/> - <source>Host key for server changed. -It is now: </source> + <location filename="onmainwindow_part2.cpp" line="1038"/> + <source>shadow session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="80"/> - <source>For security reasons, connection will be stopped</source> + <location filename="onmainwindow_part2.cpp" line="1071"/> + <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> - <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> + <location filename="onmainwindow_part2.cpp" line="1072"/> + <source>No accessible desktop found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> - <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> + <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> - <source>The server is unknown. Do you trust the host key? -Public key hash: </source> + <location filename="onmainwindow_part2.cpp" line="1092"/> + <source>Select desktop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1167"/> - <location filename="onmainwindow_part2.cpp" line="1187"/> - <source>No</source> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> + <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> - <source>Host key verification failed</source> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> + <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> + <location filename="onmainwindow_part2.cpp" line="1170"/> + <source>24 or 32</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="483"/> - <location filename="onmainwindow_part2.cpp" line="782"/> - <location filename="onmainwindow_part2.cpp" line="1233"/> - <location filename="onmainwindow_part2.cpp" line="1345"/> - <source>Server not availabel</source> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> + <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1250"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1272"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1799"/> - <location filename="onmainwindow_part3.cpp" line="1090"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1825"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1930"/> - <location filename="onmainwindow_part4.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1956"/> - <location filename="onmainwindow_part3.cpp" line="2324"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1985"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2133"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2156"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2158"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2220"/> - <location filename="onmainwindow_part2.cpp" line="2488"/> - <location filename="onmainwindow_part2.cpp" line="2506"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2221"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2377"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2456"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2458"/> - <location filename="onmainwindow_part4.cpp" line="1833"/> - <location filename="onmainwindow_part4.cpp" line="1855"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> <translation type="unfinished"></translation> </message> @@ -1221,146 +1283,146 @@ Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="404"/> + <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="415"/> - <location filename="onmainwindow_part3.cpp" line="425"/> - <location filename="onmainwindow_part3.cpp" line="435"/> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="459"/> + <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="487"/> + <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="505"/> + <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="522"/> - <location filename="onmainwindow_part3.cpp" line="533"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="551"/> + <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="568"/> + <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="590"/> + <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="609"/> + <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="663"/> + <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="671"/> - <location filename="onmainwindow_part3.cpp" line="674"/> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="719"/> - <location filename="onmainwindow_part3.cpp" line="745"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1511"/> + <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1516"/> + <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1520"/> + <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1524"/> + <location filename="onmainwindow_part3.cpp" line="1530"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1537"/> + <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1582"/> + <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1812"/> + <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1860"/> + <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1888"/> + <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2053"/> - <location filename="onmainwindow_part3.cpp" line="2078"/> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2054"/> - <location filename="onmainwindow_part3.cpp" line="2079"/> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2087"/> + <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2101"/> + <location filename="onmainwindow_part3.cpp" line="2107"/> <location filename="onmainwindow_part4.cpp" line="422"/> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server @@ -1368,12 +1430,12 @@ Please check your installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2273"/> + <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2289"/> + <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> <translation type="unfinished"></translation> @@ -1391,155 +1453,153 @@ Please update to a newer x2goserver package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1118"/> + <location filename="onmainwindow_part4.cpp" line="141"/> + <source>WINDOWS-1252</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="153"/> + <source>ISO8859-1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1423"/> + <location filename="onmainwindow_part4.cpp" line="1534"/> + <source>wrong value for argument"speed"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1424"/> + <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1465"/> + <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1467"/> - <location filename="onmainwindow_part4.cpp" line="1756"/> - <location filename="onmainwindow_part4.cpp" line="1758"/> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1600"/> + <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1608"/> + <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1612"/> + <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1754"/> + <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1766"/> + <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1769"/> + <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1772"/> + <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1835"/> + <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1837"/> + <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1839"/> + <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1841"/> + <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> + <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1848"/> + <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1852"/> + <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1883"/> + <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1981"/> + <location filename="onmainwindow_part4.cpp" line="2215"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2052"/> + <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2097"/> + <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2252"/> + <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="onmainwindow.cpp" line="834"/> - <location filename="onmainwindow.cpp" line="2354"/> - <location filename="onmainwindow_part4.cpp" line="2234"/> - <source>Connecting to broker</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow_part4.cpp" line="141"/> - <source>WINDOWS-1252</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow_part4.cpp" line="153"/> - <source>ISO8859-1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow_part4.cpp" line="1300"/> - <source>wrong value for argument"speed"</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PrintDialog</name> <message> + <location filename="printdialog.ui" line="16"/> + <source>Print - X2Go client</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="printdialog.cpp" line="25"/> <source>Print</source> <translation type="unfinished"></translation> @@ -1554,11 +1614,6 @@ you can install sshd with <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="printdialog.ui" line="16"/> - <source>Print - X2Go client</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PrintProcess</name> @@ -1589,11 +1644,6 @@ you can install sshd with <context> <name>PrintWidget</name> <message> - <location filename="printwidget.cpp" line="53"/> - <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="printwidget.ui" line="13"/> <source>Form</source> <translation type="unfinished"></translation> @@ -1659,21 +1709,14 @@ you can install sshd with <source>Show this dialog before start printing</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>PrinterCmdDialog</name> <message> - <location filename="printercmddialog.cpp" line="37"/> - <source>Please enter your customized or individual printing command. -Example: -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="printercmddialog.cpp" line="45"/> - <source><Path to gsprint.exe> -query -color</source> + <location filename="printwidget.cpp" line="53"/> + <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>PrinterCmdDialog</name> <message> <location filename="printercmddialog.ui" line="13"/> <source>Printer command</source> @@ -1732,107 +1775,128 @@ lpr -P hp_laserjet</source> <source>Specify path as program parameter</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="printercmddialog.cpp" line="37"/> + <source>Please enter your customized or individual printing command. +Example: +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="printercmddialog.cpp" line="45"/> + <source><Path to gsprint.exe> -query -color</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SessionButton</name> <message> - <location filename="sessionbutton.cpp" line="114"/> + <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="118"/> + <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="123"/> + <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="136"/> + <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="137"/> + <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> + <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="140"/> + <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="270"/> + <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="275"/> + <location filename="sessionbutton.cpp" line="277"/> <source>running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="279"/> + <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="312"/> + <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="323"/> - <location filename="sessionbutton.cpp" line="355"/> - <location filename="sessionbutton.cpp" line="588"/> + <location filename="sessionbutton.cpp" line="325"/> + <location filename="sessionbutton.cpp" line="357"/> + <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="324"/> - <location filename="sessionbutton.cpp" line="361"/> - <location filename="sessionbutton.cpp" line="594"/> + <location filename="sessionbutton.cpp" line="326"/> + <location filename="sessionbutton.cpp" line="363"/> + <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="325"/> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="582"/> + <location filename="sessionbutton.cpp" line="327"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="383"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="635"/> + <location filename="sessionbutton.cpp" line="385"/> + <location filename="sessionbutton.cpp" line="402"/> + <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="390"/> - <location filename="sessionbutton.cpp" line="409"/> + <location filename="sessionbutton.cpp" line="389"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="416"/> + <location filename="sessionbutton.cpp" line="669"/> + <location filename="sessionbutton.cpp" line="672"/> + <source>Display </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sessionbutton.cpp" line="397"/> + <location filename="sessionbutton.cpp" line="437"/> <source>window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="417"/> - <location filename="sessionbutton.cpp" line="547"/> + <location filename="sessionbutton.cpp" line="445"/> + <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="419"/> - <location filename="sessionbutton.cpp" line="549"/> + <location filename="sessionbutton.cpp" line="447"/> + <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -1919,221 +1983,246 @@ lpr -P hp_laserjet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="111"/> + <location filename="sessionwidget.cpp" line="108"/> + <source>Kerberos 5 (GSSAPI) authentication</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="116"/> + <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="125"/> - <location filename="sessionwidget.cpp" line="292"/> + <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> + <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="128"/> + <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="129"/> + <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> - <location filename="sessionwidget.cpp" line="248"/> + <location filename="sessionwidget.cpp" line="133"/> + <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="132"/> + <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="143"/> - <location filename="sessionwidget.cpp" line="420"/> - <location filename="sessionwidget.cpp" line="482"/> + <location filename="sessionwidget.cpp" line="145"/> + <location filename="sessionwidget.cpp" line="429"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="215"/> + <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="217"/> + <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="269"/> - <location filename="sessionwidget.cpp" line="384"/> - <source>Server:</source> + <location filename="sessionwidget.cpp" line="231"/> + <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="275"/> - <location filename="sessionwidget.cpp" line="392"/> - <source>XDMCP server:</source> + <location filename="sessionwidget.cpp" line="232"/> + <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="293"/> - <source>rdesktop command line options:</source> + <location filename="sessionwidget.cpp" line="273"/> + <location filename="sessionwidget.cpp" line="391"/> + <source>Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="306"/> - <location filename="sessionwidget.cpp" line="404"/> - <source>New session</source> + <location filename="sessionwidget.cpp" line="279"/> + <location filename="sessionwidget.cpp" line="399"/> + <source>XDMCP server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="227"/> - <source>Error</source> + <location filename="sessionwidget.cpp" line="297"/> + <source>rdesktop command line options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="228"/> - <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> + <location filename="sessionwidget.cpp" line="310"/> + <location filename="sessionwidget.cpp" line="411"/> + <source>New session</source> <translation type="unfinished"></translation> </message> </context> <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="33"/> - <location filename="settingswidget.cpp" line="37"/> + <location filename="settingswidget.cpp" line="40"/> + <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="34"/> - <location filename="settingswidget.cpp" line="38"/> + <location filename="settingswidget.cpp" line="41"/> + <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="35"/> - <location filename="settingswidget.cpp" line="39"/> + <location filename="settingswidget.cpp" line="42"/> + <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="50"/> + <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="52"/> + <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="54"/> + <location filename="settingswidget.cpp" line="61"/> <source>Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="61"/> + <location filename="settingswidget.cpp" line="63"/> + <source>Use whole display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="79"/> + <location filename="settingswidget.cpp" line="76"/> + <source>Xinerama extension (support for two or more physical displays)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="82"/> + <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="101"/> + <location filename="settingswidget.cpp" line="102"/> + <source>&Display:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="104"/> + <source>&Identify all displays</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="111"/> + <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="113"/> + <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="124"/> + <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="133"/> + <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="135"/> + <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="137"/> + <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="139"/> + <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="146"/> + <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="173"/> + <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="440"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="441"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> @@ -2172,40 +2261,28 @@ sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="95"/> - <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="sharewidget.cpp" line="158"/> - <source>Select folder</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="sharewidget.cpp" line="76"/> <source>Filename encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="229"/> - <location filename="sharewidget.cpp" line="280"/> - <source>WINDOWS-1252</source> + <location filename="sharewidget.cpp" line="82"/> + <source>local:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="239"/> - <location filename="sharewidget.cpp" line="286"/> - <source>ISO8859-1</source> + <location filename="sharewidget.cpp" line="83"/> + <source>remote:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="82"/> - <source>local:</source> + <location filename="sharewidget.cpp" line="95"/> + <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="83"/> - <source>remote:</source> + <location filename="sharewidget.cpp" line="158"/> + <source>Select folder</source> <translation type="unfinished"></translation> </message> <message> @@ -2218,86 +2295,98 @@ sound system connections through firewalls</source> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="sharewidget.cpp" line="229"/> + <location filename="sharewidget.cpp" line="280"/> + <source>WINDOWS-1252</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharewidget.cpp" line="239"/> + <location filename="sharewidget.cpp" line="286"/> + <source>ISO8859-1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="100"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="120"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="135"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="171"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="498"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="510"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="523"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="573"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="682"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="708"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="773"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="791"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="821"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="833"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> <translation type="unfinished"></translation> </message> @@ -2305,12 +2394,12 @@ sound system connections through firewalls</source> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> <translation type="unfinished"></translation> </message> diff --git a/x2goclient_fr.qm b/x2goclient_fr.qm deleted file mode 100644 index be651ee..0000000 --- a/x2goclient_fr.qm +++ /dev/null @@ -1 +0,0 @@ -<�d��!�`�� \ No newline at end of file diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 1cd6797..02cf546 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.0" language="fr"> <context> <name>BrokerPassDialogUi</name> <message> @@ -124,6 +124,57 @@ </message> </context> <context> + <name>ConTest</name> + <message> + <location filename="contest.ui" line="14"/> + <source>Connectivity test</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="24"/> + <source>HTTPS connection:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="31"/> + <source>SSH connection:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="38"/> + <source>Connection speed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="123"/> + <location filename="contest.ui" line="167"/> + <source>Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="211"/> + <source>0 Kb/s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="108"/> + <location filename="contest.cpp" line="115"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="150"/> + <source>Socket operation timed out</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="162"/> + <location filename="contest.cpp" line="168"/> + <source>Failed: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ConfigDialog</name> <message> <location filename="configdialog.cpp" line="50"/> @@ -472,121 +523,121 @@ <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="164"/> + <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> + <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="294"/> <location filename="httpbrokerclient.cpp" line="308"/> - <location filename="httpbrokerclient.cpp" line="345"/> + <location filename="httpbrokerclient.cpp" line="328"/> + <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="309"/> + <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="346"/> + <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="433"/> + <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="436"/> + <location filename="httpbrokerclient.cpp" line="457"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="441"/> + <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="446"/> + <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="447"/> - <location filename="httpbrokerclient.cpp" line="459"/> + <location filename="httpbrokerclient.cpp" line="468"/> + <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="450"/> - <location filename="httpbrokerclient.cpp" line="462"/> + <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="453"/> - <location filename="httpbrokerclient.cpp" line="465"/> + <location filename="httpbrokerclient.cpp" line="474"/> + <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="456"/> + <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="458"/> + <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="469"/> + <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="470"/> + <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="472"/> + <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="473"/> + <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="475"/> + <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="481"/> + <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="483"/> + <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> <translation type="unfinished"></translation> </message> @@ -594,473 +645,478 @@ <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="80"/> - <location filename="onmainwindow_part3.cpp" line="307"/> + <location filename="onmainwindow.cpp" line="84"/> + <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="81"/> + <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="126"/> + <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="143"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2148"/> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="150"/> + <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="151"/> + <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="153"/> + <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="325"/> + <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="329"/> + <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="336"/> - <location filename="onmainwindow_part3.cpp" line="1536"/> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="476"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow_part4.cpp" line="1610"/> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="479"/> - <location filename="onmainwindow.cpp" line="927"/> - <location filename="onmainwindow_part2.cpp" line="2200"/> - <location filename="onmainwindow_part4.cpp" line="1761"/> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="482"/> - <location filename="onmainwindow.cpp" line="928"/> - <location filename="onmainwindow_part4.cpp" line="1609"/> - <location filename="onmainwindow_part4.cpp" line="1763"/> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="484"/> + <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow_part4.cpp" line="1054"/> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow_part4.cpp" line="2064"/> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="601"/> - <location filename="onmainwindow.cpp" line="1782"/> - <location filename="onmainwindow_part3.cpp" line="1636"/> + <location filename="onmainwindow.cpp" line="610"/> + <location filename="onmainwindow.cpp" line="1820"/> + <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="653"/> + <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="654"/> + <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="655"/> - <location filename="onmainwindow.cpp" line="940"/> + <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="658"/> + <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="659"/> + <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="665"/> + <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="675"/> + <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> + <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="692"/> - <location filename="onmainwindow.cpp" line="713"/> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="715"/> + <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="721"/> + <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="722"/> + <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="776"/> - <location filename="onmainwindow.cpp" line="1775"/> - <location filename="onmainwindow_part3.cpp" line="1629"/> - <location filename="onmainwindow_part4.cpp" line="1422"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> + <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="830"/> + <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="879"/> + <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> + <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="923"/> - <location filename="onmainwindow_part2.cpp" line="2061"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="951"/> + <location filename="onmainwindow.cpp" line="969"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> - <location filename="onmainwindow.cpp" line="830"/> - <location filename="onmainwindow.cpp" line="1471"/> - <location filename="onmainwindow.cpp" line="1499"/> - <location filename="onmainwindow.cpp" line="1507"/> - <location filename="onmainwindow.cpp" line="1640"/> - <location filename="onmainwindow.cpp" line="1667"/> - <location filename="onmainwindow.cpp" line="1670"/> - <location filename="onmainwindow.cpp" line="1917"/> - <location filename="onmainwindow.cpp" line="2140"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2167"/> - <location filename="onmainwindow.cpp" line="2201"/> - <location filename="onmainwindow.cpp" line="2246"/> - <location filename="onmainwindow_part2.cpp" line="297"/> - <location filename="onmainwindow_part2.cpp" line="473"/> - <location filename="onmainwindow_part2.cpp" line="482"/> - <location filename="onmainwindow_part2.cpp" line="781"/> - <location filename="onmainwindow_part2.cpp" line="1232"/> - <location filename="onmainwindow_part2.cpp" line="1293"/> - <location filename="onmainwindow_part2.cpp" line="1344"/> - <location filename="onmainwindow_part2.cpp" line="1377"/> - <location filename="onmainwindow_part2.cpp" line="1421"/> - <location filename="onmainwindow_part2.cpp" line="1801"/> - <location filename="onmainwindow_part2.cpp" line="1827"/> - <location filename="onmainwindow_part2.cpp" line="1958"/> + <location filename="onmainwindow.cpp" line="820"/> + <location filename="onmainwindow.cpp" line="848"/> + <location filename="onmainwindow.cpp" line="1495"/> + <location filename="onmainwindow.cpp" line="1524"/> + <location filename="onmainwindow.cpp" line="1532"/> + <location filename="onmainwindow.cpp" line="1678"/> + <location filename="onmainwindow.cpp" line="1705"/> + <location filename="onmainwindow.cpp" line="1708"/> + <location filename="onmainwindow.cpp" line="1955"/> + <location filename="onmainwindow.cpp" line="2178"/> + <location filename="onmainwindow.cpp" line="2192"/> + <location filename="onmainwindow.cpp" line="2205"/> + <location filename="onmainwindow.cpp" line="2239"/> + <location filename="onmainwindow.cpp" line="2284"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> + <location filename="onmainwindow_part2.cpp" line="1830"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> - <location filename="onmainwindow_part3.cpp" line="768"/> - <location filename="onmainwindow_part3.cpp" line="848"/> - <location filename="onmainwindow_part3.cpp" line="1092"/> - <location filename="onmainwindow_part3.cpp" line="1220"/> - <location filename="onmainwindow_part3.cpp" line="1273"/> - <location filename="onmainwindow_part3.cpp" line="1579"/> - <location filename="onmainwindow_part3.cpp" line="1581"/> - <location filename="onmainwindow_part3.cpp" line="1811"/> - <location filename="onmainwindow_part3.cpp" line="1859"/> - <location filename="onmainwindow_part3.cpp" line="1887"/> - <location filename="onmainwindow_part3.cpp" line="2257"/> - <location filename="onmainwindow_part3.cpp" line="2272"/> - <location filename="onmainwindow_part3.cpp" line="2326"/> + <location filename="onmainwindow_part3.cpp" line="773"/> + <location filename="onmainwindow_part3.cpp" line="854"/> + <location filename="onmainwindow_part3.cpp" line="1098"/> + <location filename="onmainwindow_part3.cpp" line="1226"/> + <location filename="onmainwindow_part3.cpp" line="1279"/> + <location filename="onmainwindow_part3.cpp" line="1585"/> + <location filename="onmainwindow_part3.cpp" line="1587"/> + <location filename="onmainwindow_part3.cpp" line="1817"/> + <location filename="onmainwindow_part3.cpp" line="1865"/> + <location filename="onmainwindow_part3.cpp" line="1893"/> + <location filename="onmainwindow_part3.cpp" line="2263"/> + <location filename="onmainwindow_part3.cpp" line="2278"/> + <location filename="onmainwindow_part3.cpp" line="2332"/> <location filename="onmainwindow_part4.cpp" line="29"/> <location filename="onmainwindow_part4.cpp" line="54"/> - <location filename="onmainwindow_part4.cpp" line="1980"/> - <location filename="onmainwindow_part4.cpp" line="2251"/> + <location filename="onmainwindow_part4.cpp" line="2214"/> + <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1472"/> - <location filename="onmainwindow.cpp" line="1641"/> - <location filename="onmainwindow.cpp" line="1671"/> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1506"/> + <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1805"/> + <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1806"/> + <location filename="onmainwindow.cpp" line="1844"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1817"/> + <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1867"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1917"/> + <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2065"/> + <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2372"/> + <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2431"/> + <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2435"/> + <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2439"/> + <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2443"/> + <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="290"/> - <location filename="onmainwindow_part2.cpp" line="1286"/> - <location filename="onmainwindow_part2.cpp" line="1370"/> - <location filename="onmainwindow_part2.cpp" line="1403"/> - <location filename="onmainwindow_part3.cpp" line="761"/> - <location filename="onmainwindow_part3.cpp" line="841"/> - <location filename="onmainwindow_part3.cpp" line="1213"/> - <location filename="onmainwindow_part3.cpp" line="1266"/> - <location filename="onmainwindow_part3.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> + <location filename="onmainwindow_part3.cpp" line="766"/> + <location filename="onmainwindow_part3.cpp" line="847"/> + <location filename="onmainwindow_part3.cpp" line="1219"/> + <location filename="onmainwindow_part3.cpp" line="1272"/> + <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="764"/> - <location filename="onmainwindow_part3.cpp" line="844"/> - <location filename="onmainwindow_part3.cpp" line="1216"/> - <location filename="onmainwindow_part3.cpp" line="1269"/> - <location filename="onmainwindow_part3.cpp" line="2253"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> <source>Wrong password! </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="409"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="474"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1002"/> - <location filename="onmainwindow_part4.cpp" line="1752"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1018"/> - <location filename="onmainwindow_part2.cpp" line="1112"/> - <location filename="onmainwindow_part2.cpp" line="2164"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1020"/> - <location filename="onmainwindow_part2.cpp" line="1305"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1030"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1063"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1064"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1077"/> - <location filename="onmainwindow_part4.cpp" line="2165"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1084"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1153"/> - <location filename="onmainwindow_part2.cpp" line="1173"/> - <location filename="onmainwindow_part2.cpp" line="1987"/> - <location filename="onmainwindow_part2.cpp" line="2376"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1154"/> - <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1163"/> - <location filename="onmainwindow_part2.cpp" line="1183"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> <translation type="unfinished"></translation> </message> @@ -1076,140 +1132,140 @@ It is now: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1167"/> - <location filename="onmainwindow_part2.cpp" line="1187"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="483"/> - <location filename="onmainwindow_part2.cpp" line="782"/> - <location filename="onmainwindow_part2.cpp" line="1233"/> - <location filename="onmainwindow_part2.cpp" line="1345"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1250"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1272"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1799"/> - <location filename="onmainwindow_part3.cpp" line="1090"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1825"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1930"/> - <location filename="onmainwindow_part4.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1956"/> - <location filename="onmainwindow_part3.cpp" line="2324"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1985"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2133"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2156"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2158"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2220"/> - <location filename="onmainwindow_part2.cpp" line="2488"/> - <location filename="onmainwindow_part2.cpp" line="2506"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2221"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2377"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2456"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2458"/> - <location filename="onmainwindow_part4.cpp" line="1833"/> - <location filename="onmainwindow_part4.cpp" line="1855"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> <translation type="unfinished"></translation> </message> @@ -1221,146 +1277,146 @@ Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="404"/> + <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="415"/> - <location filename="onmainwindow_part3.cpp" line="425"/> - <location filename="onmainwindow_part3.cpp" line="435"/> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="459"/> + <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="487"/> + <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="505"/> + <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="522"/> - <location filename="onmainwindow_part3.cpp" line="533"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="551"/> + <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="568"/> + <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="590"/> + <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="609"/> + <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="663"/> + <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="671"/> - <location filename="onmainwindow_part3.cpp" line="674"/> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="719"/> - <location filename="onmainwindow_part3.cpp" line="745"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1511"/> + <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1516"/> + <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1520"/> + <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1524"/> + <location filename="onmainwindow_part3.cpp" line="1530"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1537"/> + <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1582"/> + <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1812"/> + <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1860"/> + <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1888"/> + <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2053"/> - <location filename="onmainwindow_part3.cpp" line="2078"/> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2054"/> - <location filename="onmainwindow_part3.cpp" line="2079"/> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2087"/> + <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2101"/> + <location filename="onmainwindow_part3.cpp" line="2107"/> <location filename="onmainwindow_part4.cpp" line="422"/> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server @@ -1368,12 +1424,12 @@ Please check your installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2273"/> + <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2289"/> + <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> <translation type="unfinished"></translation> @@ -1391,133 +1447,133 @@ Please update to a newer x2goserver package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1118"/> + <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1423"/> + <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1424"/> + <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1465"/> + <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1467"/> - <location filename="onmainwindow_part4.cpp" line="1756"/> - <location filename="onmainwindow_part4.cpp" line="1758"/> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1600"/> + <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1608"/> + <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1612"/> + <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1754"/> + <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1766"/> + <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1769"/> + <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1772"/> + <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1835"/> + <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1837"/> + <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1839"/> + <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1841"/> + <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> + <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1848"/> + <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1852"/> + <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1883"/> + <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1981"/> + <location filename="onmainwindow_part4.cpp" line="2215"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2052"/> + <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2097"/> + <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2252"/> + <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="834"/> - <location filename="onmainwindow.cpp" line="2354"/> - <location filename="onmainwindow_part4.cpp" line="2234"/> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> <source>Connecting to broker</source> <translation type="unfinished"></translation> </message> @@ -1532,7 +1588,7 @@ you can install sshd with <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1300"/> + <location filename="onmainwindow_part4.cpp" line="1534"/> <source>wrong value for argument"speed"</source> <translation type="unfinished"></translation> </message> @@ -1736,103 +1792,112 @@ lpr -P hp_laserjet</source> <context> <name>SessionButton</name> <message> - <location filename="sessionbutton.cpp" line="114"/> + <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="118"/> + <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="123"/> + <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="136"/> + <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="137"/> + <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> + <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="140"/> + <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="270"/> + <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="275"/> + <location filename="sessionbutton.cpp" line="277"/> <source>running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="279"/> + <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="312"/> + <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="323"/> - <location filename="sessionbutton.cpp" line="355"/> - <location filename="sessionbutton.cpp" line="588"/> + <location filename="sessionbutton.cpp" line="325"/> + <location filename="sessionbutton.cpp" line="357"/> + <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="324"/> - <location filename="sessionbutton.cpp" line="361"/> - <location filename="sessionbutton.cpp" line="594"/> + <location filename="sessionbutton.cpp" line="326"/> + <location filename="sessionbutton.cpp" line="363"/> + <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="325"/> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="582"/> + <location filename="sessionbutton.cpp" line="327"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="383"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="635"/> + <location filename="sessionbutton.cpp" line="385"/> + <location filename="sessionbutton.cpp" line="402"/> + <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="390"/> - <location filename="sessionbutton.cpp" line="409"/> + <location filename="sessionbutton.cpp" line="389"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="416"/> + <location filename="sessionbutton.cpp" line="669"/> + <location filename="sessionbutton.cpp" line="672"/> + <source>Display </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sessionbutton.cpp" line="397"/> + <location filename="sessionbutton.cpp" line="437"/> <source>window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="417"/> - <location filename="sessionbutton.cpp" line="547"/> + <location filename="sessionbutton.cpp" line="445"/> + <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="419"/> - <location filename="sessionbutton.cpp" line="549"/> + <location filename="sessionbutton.cpp" line="447"/> + <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -1919,109 +1984,114 @@ lpr -P hp_laserjet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="111"/> + <location filename="sessionwidget.cpp" line="108"/> + <source>Kerberos 5 (GSSAPI) authentication</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="116"/> + <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="125"/> - <location filename="sessionwidget.cpp" line="292"/> + <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> + <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="128"/> + <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="129"/> + <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> - <location filename="sessionwidget.cpp" line="248"/> + <location filename="sessionwidget.cpp" line="133"/> + <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="132"/> + <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="143"/> - <location filename="sessionwidget.cpp" line="420"/> - <location filename="sessionwidget.cpp" line="482"/> + <location filename="sessionwidget.cpp" line="145"/> + <location filename="sessionwidget.cpp" line="429"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="215"/> + <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="217"/> + <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="269"/> - <location filename="sessionwidget.cpp" line="384"/> + <location filename="sessionwidget.cpp" line="273"/> + <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="275"/> - <location filename="sessionwidget.cpp" line="392"/> + <location filename="sessionwidget.cpp" line="279"/> + <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="293"/> + <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="306"/> - <location filename="sessionwidget.cpp" line="404"/> + <location filename="sessionwidget.cpp" line="310"/> + <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="227"/> + <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="228"/> + <location filename="sessionwidget.cpp" line="232"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> @@ -2029,111 +2099,131 @@ lpr -P hp_laserjet</source> <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="33"/> - <location filename="settingswidget.cpp" line="37"/> + <location filename="settingswidget.cpp" line="40"/> + <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="34"/> - <location filename="settingswidget.cpp" line="38"/> + <location filename="settingswidget.cpp" line="41"/> + <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="35"/> - <location filename="settingswidget.cpp" line="39"/> + <location filename="settingswidget.cpp" line="42"/> + <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="50"/> + <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="52"/> + <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="54"/> + <location filename="settingswidget.cpp" line="61"/> <source>Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="61"/> + <location filename="settingswidget.cpp" line="63"/> + <source>Use whole display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="79"/> + <location filename="settingswidget.cpp" line="76"/> + <source>Xinerama extension (support for two or more physical displays)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="82"/> + <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="101"/> + <location filename="settingswidget.cpp" line="102"/> + <source>&Display:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="104"/> + <source>&Identify all displays</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="111"/> + <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="113"/> + <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="124"/> + <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="133"/> + <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="135"/> + <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="137"/> + <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="139"/> + <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="146"/> + <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="173"/> + <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="440"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="441"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> @@ -2222,82 +2312,82 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="100"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="120"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="135"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="171"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="498"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="510"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="523"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="573"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="682"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="708"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="773"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="791"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="821"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="833"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> <translation type="unfinished"></translation> </message> @@ -2305,12 +2395,12 @@ sound system connections through firewalls</source> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> <translation type="unfinished"></translation> </message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_nb_no.ts similarity index 56% copy from x2goclient_zh_tw.ts copy to x2goclient_nb_no.ts index d5669c1..f541e95 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_nb_no.ts @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="zh_TW"> +<TS version="2.0" language="nb_NO"> <context> <name>BrokerPassDialogUi</name> <message> <location filename="brokerpassdialog.ui" line="14"/> <source>Dialog</source> - <translation>對話框</translation> + <translation>Dialog</translation> </message> <message> <location filename="brokerpassdialog.ui" line="22"/> <source>Old password:</source> - <translation>舊密碼:</translation> + <translation>Gammelt passord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="36"/> <source>New password:</source> - <translation>新密碼:</translation> + <translation>Nytt passord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="50"/> <source>Confirm password:</source> - <translation>請再輸入一遍新密碼:</translation> + <translation>Bekreft passordet:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="79"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translatorcomment>hm... Am I supposed to translate this?</translatorcomment> + <translation>TestLabel</translation> </message> </context> <context> @@ -34,75 +35,75 @@ <message> <location filename="brokerpassdlg.cpp" line="41"/> <source>Passwords do not match</source> - <translation>密碼不相符</translation> + <translation>Passordene stemmer ikke</translation> </message> </context> <context> <name>CUPSPrintWidget</name> <message> + <location filename="cupsprintwidget.cpp" line="65"/> + <source>Idle</source> + <translation>Inaktiv</translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="68"/> + <source>Printing</source> + <translation>Skriver</translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="71"/> + <source>Stopped</source> + <translation>Stoppet</translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="81"/> + <source>Yes</source> + <translation>Ja</translation> + </message> + <message> + <location filename="cupsprintwidget.cpp" line="81"/> + <source>No</source> + <translation>Nei</translation> + </message> + <message> <location filename="cupsprintwidget.ui" line="19"/> <source>Form</source> - <translation>表單</translation> + <translation>Form</translation> </message> <message> <location filename="cupsprintwidget.ui" line="25"/> <source>Name:</source> - <translation>姓名:</translation> + <translation>Navn:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="42"/> <source>Properties</source> - <translation>屬性</translation> + <translation>Egenskaper</translation> </message> <message> <location filename="cupsprintwidget.ui" line="49"/> <source>State:</source> - <translation>狀態:</translation> + <translation>Status:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="63"/> <source>Accepting jobs:</source> - <translation>接收的工作:</translation> + <translation>Aksepterer jobber:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="77"/> <source>Type:</source> - <translation>類別:</translation> + <translation>Type:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="91"/> <source>Location:</source> - <translation>位置:</translation> + <translation>Plassering:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="105"/> <source>Comment:</source> - <translation>註解:</translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="65"/> - <source>Idle</source> - <translation>閒置</translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="68"/> - <source>Printing</source> - <translation>正在列印</translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="71"/> - <source>Stopped</source> - <translation>已停止</translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="81"/> - <source>Yes</source> - <translation>是</translation> - </message> - <message> - <location filename="cupsprintwidget.cpp" line="81"/> - <source>No</source> - <translation>否</translation> + <translation>Kommentar:</translation> </message> </context> <context> @@ -110,17 +111,17 @@ <message> <location filename="cupsprintersettingsdialog.cpp" line="104"/> <source>No option selected</source> - <translation type="unfinished">尚未選取任何選項</translation> + <translation>Ingen alternativer valgt</translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="265"/> <source>This value is in conflict with other option</source> - <translation>此設定值與其它選項衝突</translation> + <translation>Dette alternativet er i konflikt med et annet alternativ</translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="275"/> <source>Options conflict</source> - <translation>選項衝突</translation> + <translation>Alternativskonflikt</translation> </message> </context> <context> @@ -128,28 +129,29 @@ <message> <location filename="contest.ui" line="14"/> <source>Connectivity test</source> - <translation>連線測式</translation> + <translation>Tilkoblings-test</translation> </message> <message> <location filename="contest.ui" line="24"/> <source>HTTPS connection:</source> - <translation>加密HTTP連線:</translation> + <translation>HTTPS tilkobling</translation> </message> <message> <location filename="contest.ui" line="31"/> <source>SSH connection:</source> - <translation>SSH連線:</translation> + <translation>SSH tilkobling</translation> </message> <message> <location filename="contest.ui" line="38"/> <source>Connection speed:</source> - <translation>連線速度:</translation> + <translatorcomment>Due to the limited space in the UI dialog, I couldn't choose the "correct" word for speed here, so I had to choose a shorter one which isn't the best translation, but it will do.</translatorcomment> + <translation>Sambandsfart:</translation> </message> <message> <location filename="contest.ui" line="123"/> <location filename="contest.ui" line="167"/> <source>Failed</source> - <translation>失敗</translation> + <translation>Feilet</translation> </message> <message> <location filename="contest.ui" line="211"/> @@ -160,18 +162,19 @@ <location filename="contest.cpp" line="108"/> <location filename="contest.cpp" line="115"/> <source>OK</source> - <translation>確定</translation> + <translation>OK</translation> </message> <message> <location filename="contest.cpp" line="150"/> <source>Socket operation timed out</source> - <translation>網路操作逾時</translation> + <translatorcomment>Grr..! really hard to get this correctly translated, should rather keep the english words here, as we don't have any good ones for these in technical terms</translatorcomment> + <translation>Sokkel handlingen ble tidsavbrutt</translation> </message> <message> <location filename="contest.cpp" line="162"/> <location filename="contest.cpp" line="168"/> <source>Failed: </source> - <translation>失敗:</translation> + <translation>Feilet: </translation> </message> </context> <context> @@ -179,157 +182,158 @@ <message> <location filename="configdialog.cpp" line="50"/> <source>General</source> - <translation>一般設定</translation> + <translation>Genrelt</translation> </message> <message> <location filename="configdialog.cpp" line="59"/> <source>Display icon in system tray</source> - <translation>在系統狀態列中顯示圖示</translation> + <translation>Vis ikon i systemkurven</translation> </message> <message> <location filename="configdialog.cpp" line="66"/> <source>Hide to system tray when minimized</source> - <translation>最小化時縮至系統狀態列</translation> + <translation>Skjul til systemkurven ved minimering</translation> </message> <message> <location filename="configdialog.cpp" line="67"/> <source>Hide to system tray when closed</source> - <translation>關閉時隱藏至系統狀態列</translation> + <translation>Skjul til systemkurven ved lukking</translation> </message> <message> <location filename="configdialog.cpp" line="68"/> <source>Hide to system tray after connection is established</source> - <translation>連線建立後隱藏至系統狀態列</translation> + <translation>Skjul til systemkurven etter tilkoblingen er opprettet</translation> </message> <message> <location filename="configdialog.cpp" line="69"/> <source>Restore from system tray after session is disconnected</source> - <translation>當工作階段斷線後從系統狀態列中還原</translation> + <translation>Gjenopprett fra systemkurven etter sesjonen blir frakoblet</translation> </message> <message> <location filename="configdialog.cpp" line="87"/> <source>Use LDAP</source> - <translation>使用LDAP</translation> + <translation>Benytt LDAP</translation> </message> <message> <location filename="configdialog.cpp" line="111"/> <source>Server URL:</source> - <translation type="unfinished">伺服器網址:</translation> + <translation>Server URL:</translation> </message> <message> <location filename="configdialog.cpp" line="112"/> <source>BaseDN:</source> - <translation type="unfinished"></translation> + <translatorcomment>According to what I could gather these parts of the certificate shouldn't be translated</translatorcomment> + <translation>BaseDN:</translation> </message> <message> <location filename="configdialog.cpp" line="114"/> <source>Failover server 1 URL:</source> - <translation>備援伺服器網1 網址:</translation> + <translation>URL til reserveserver 1:</translation> </message> <message> <location filename="configdialog.cpp" line="116"/> <source>Failover server 2 URL:</source> - <translation>備援伺服器網2 網址:</translation> + <translation>URL til reserveserver 2:</translation> </message> <message> <location filename="configdialog.cpp" line="198"/> <location filename="configdialog.cpp" line="340"/> <source>X-Server settings</source> - <translation>X伺服器設定</translation> + <translation>X-Server innstillinger</translation> </message> <message> <location filename="configdialog.cpp" line="207"/> <source>X11 application:</source> - <translation>X11應用程式:</translation> + <translation>X11 applikasjon:</translation> </message> <message> <location filename="configdialog.cpp" line="218"/> <source>X11 version:</source> - <translation>X11版本:</translation> + <translation>X11 versjon:</translation> </message> <message> <location filename="configdialog.cpp" line="233"/> <source>Find X11 application</source> - <translation>尋找X11應用程式</translation> + <translation>Finn X11 applikasjon</translation> </message> <message> <location filename="configdialog.cpp" line="250"/> <source>Clientside SSH port for file system export usage:</source> - <translation>檔案系統匯出時用戶端所使用的SSH連接埠:</translation> + <translation>Klientside SSH port for bruk av filsystem eksport:</translation> </message> <message> <location filename="configdialog.cpp" line="260"/> <source>Start session embedded inside website</source> - <translation>將工作階段嵌入至網站內</translation> + <translation>Start sesjonen innebygd i websiden</translation> </message> <message> <location filename="configdialog.cpp" line="264"/> <location filename="configdialog.cpp" line="567"/> <location filename="configdialog.cpp" line="579"/> <source>Advanced options</source> - <translation>進階選項</translation> + <translation>Avanserte alternativer</translation> </message> <message> <location filename="configdialog.cpp" line="291"/> <source>Defaults</source> - <translation>預設</translation> + <translation>Standardoppsett</translation> </message> <message> <location filename="configdialog.cpp" line="292"/> <source>&OK</source> - <translation>確定(&O)</translation> + <translation>&OK</translation> </message> <message> <location filename="configdialog.cpp" line="293"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="configdialog.cpp" line="316"/> <source>Settings</source> - <translation>設定</translation> + <translation>Innstillinger</translation> </message> <message> <location filename="configdialog.cpp" line="336"/> <source>Printing</source> - <translation>列印功能</translation> + <translation>Utksrift</translation> </message> <message> <location filename="configdialog.cpp" line="503"/> <location filename="configdialog.cpp" line="521"/> <location filename="configdialog.cpp" line="540"/> <source>Warning</source> - <translation>警告</translation> + <translation>Advarsel</translation> </message> <message> <location filename="configdialog.cpp" line="504"/> <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source> - <translation>X2Go用戶端無法找到合適的X11應用程式，請安裝Apple X11或是選擇應用程式的路徑</translation> + <translation>x2goclient kan ikke finne en passende X11 applikasjon. Vennligst installer Apple X11, eller oppgi stien til applikasjonen</translation> </message> <message> <location filename="configdialog.cpp" line="522"/> <source>Your are using X11 (Apple X-Window Server) version </source> - <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation> + <translation>Du benytter X11 (Apple X-Window Server) versjon </translation> </message> <message> <location filename="configdialog.cpp" line="524"/> <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz)</source> - <translation>. 此版本在24位元色彩模式時會有問題，請升級您的X11環境 (http://trac.macosforge.org/projects/xquartz)</translation> + <translation>. Denne versjonen forårsaker problemer med X-applikasjoner i 24biters fargemodus. Du burde oppdatere ditt X11 oppsett (http://trac.macosforge.org/projects/xquartz)</translation> </message> <message> <location filename="configdialog.cpp" line="541"/> <source>No suitable X11 application found in selected path</source> - <translation>在您選擇的路徑中沒有合適的X11應用程式</translation> + <translation>Ingen passende X11 applikasjon ble funnet i valgt sti</translation> </message> <message> <location filename="configdialog.cpp" line="577"/> <source>&Connection</source> - <translation>連線(&C)</translation> + <translation>&Tilkobling</translation> </message> <message> <location filename="configdialog.cpp" line="578"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation>&Innstillinger</translation> </message> </context> <context> @@ -337,32 +341,32 @@ <message> <location filename="connectionwidget.cpp" line="33"/> <source>&Connection speed</source> - <translation>連線速度(&C)</translation> + <translation>&Sambandsfart</translation> </message> <message> <location filename="connectionwidget.cpp" line="38"/> <source>Connection speed:</source> - <translation>連線速度:</translation> + <translation>Sambandsfart:</translation> </message> <message> <location filename="connectionwidget.cpp" line="68"/> <source>C&ompression</source> - <translation>壓縮(&o)</translation> + <translation>&Komprimering</translation> </message> <message> <location filename="connectionwidget.cpp" line="85"/> <source>Method:</source> - <translation>方式:</translation> + <translation>Metode:</translation> </message> <message> <location filename="connectionwidget.cpp" line="87"/> <source>Compression method:</source> - <translation>壓縮方式:</translation> + <translation>Komprimeringsmetode:</translation> </message> <message> <location filename="connectionwidget.cpp" line="89"/> <source>Image quality:</source> - <translation>影像品質:</translation> + <translation>Bildekvalitet:</translation> </message> </context> <context> @@ -370,72 +374,72 @@ <message> <location filename="cupsprintsettingsdialog.ui" line="19"/> <source>Dialog</source> - <translation>對話框</translation> + <translation>Dialog</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="35"/> <source>General</source> - <translation>一般設定</translation> + <translation>Generelt</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="45"/> <source>Page size:</source> - <translation>頁面尺寸:</translation> + <translation>Arkstørrelse:</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="62"/> <source>Paper type:</source> - <translation>紙張類型:</translation> + <translation>Papirtype:</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="72"/> <source>Paper source:</source> - <translation>紙張來源:</translation> + <translation>Papirkilde:</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="99"/> <source>Duplex Printing</source> - <translation>雙面列印</translation> + <translation>Tosidig utskrift</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="105"/> <source>None</source> - <translation>無</translation> + <translation>Ingen</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="112"/> <source>Long side</source> - <translation>長邊翻轉</translation> + <translation>Langsiden</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="119"/> <source>Short side</source> - <translation>短邊翻轉</translation> + <translation>Kortsiden</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="143"/> <source>Driver settings</source> - <translation>驅動程式設定</translation> + <translation>Driver innstillinger</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="175"/> <source>Option</source> - <translation>選項</translation> + <translation>Alternativ</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="180"/> <source>Value</source> - <translation>數值</translation> + <translation>Verdi</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="186"/> <source>No option selected</source> - <translation>目前沒有選取任何選項</translation> + <translation>Ingen alternativer er valgt</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="205"/> <source>text</source> - <translation>文字</translation> + <translation>tekst</translation> </message> </context> <context> @@ -443,42 +447,42 @@ <message> <location filename="editconnectiondialog.cpp" line="52"/> <source>&Session</source> - <translation>工作階段(&S)</translation> + <translation>&Sesjon</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="53"/> <source>&Connection</source> - <translation>連線(&C)</translation> + <translation>Tilk&obling</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="54"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation>&Innstillinger</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="55"/> <source>&Shared folders</source> - <translation>共享資料夾(&S)</translation> + <translation>&Delte mapper</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="57"/> <source>&OK</source> - <translation>確定(&O)</translation> + <translation>&OK</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="58"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="59"/> <source>Defaults</source> - <translation>預設值</translation> + <translation>Standardoppsett</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="109"/> <source>Session preferences - </source> - <translation>工作階段偏好設定 - </translation> + <translation>Sesjonsinnstillinger - </translation> </message> </context> <context> @@ -486,38 +490,38 @@ <message> <location filename="exportdialog.cpp" line="38"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="exportdialog.cpp" line="44"/> <source>&share</source> - <translation>分享(&s)</translation> + <translation>d&el</translation> </message> <message> <location filename="exportdialog.cpp" line="45"/> <source>&Preferences ...</source> - <translation>偏好設定(&P) ...</translation> + <translation>&Innstillinger ...</translation> </message> <message> <location filename="exportdialog.cpp" line="46"/> <source>&Custom folder ...</source> - <translation>自訂資料夾(&C) ...</translation> + <translation>&Egentilpasset mappe ...</translation> </message> <message> <location filename="exportdialog.cpp" line="56"/> <source>Delete</source> <comment>Delete</comment> - <translation>刪除</translation> + <translation>Slett</translation> </message> <message> <location filename="exportdialog.cpp" line="73"/> <source>share folders</source> - <translation>共享資料夾</translation> + <translation>delte mapper</translation> </message> <message> <location filename="exportdialog.cpp" line="139"/> <source>Select folder</source> - <translation>選擇資料夾</translation> + <translation>Valgt mappe</translation> </message> </context> <context> @@ -525,121 +529,127 @@ <message> <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> - <translation>us</translation> + <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment> + <translation>no</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment> + <translation>pc105/no</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="308"/> <location filename="httpbrokerclient.cpp" line="328"/> <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Feil</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> - <translation>登入失敗! 請再試一次</translation> - </message> - <message> - <location filename="httpbrokerclient.cpp" line="366"/> - <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> - <translation>您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation> + <translation>Innlogging feilet! Vennligst forsøk igjen</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> - <translation> 伺服使器使用了不合法的安全憑證 </translation> + <translation> Servereren benytter et ugyldig sikkerhetssertifikat. </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="457"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> - <translation type="unfinished"></translation> + <translation>Du burde ikke legge til et unntak om du benytter en internett forbindelse som du ikke stoler 100% på, eller om du ikke er vant med å se advarsler for denne serveren.</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> - <translation type="unfinished"></translation> + <translation>Sikker tilkobling feilet</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> - <translation type="unfinished"></translation> + <translation>Utstedet til: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="468"/> <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> - <translation type="unfinished"></translation> + <translation>Navn (CN) </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="471"/> <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> - <translation type="unfinished"></translation> + <translation>Organisation (O) </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="474"/> <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> - <translation type="unfinished"></translation> + <translation>Organisasjonsenhet (OU) </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> - <translation type="unfinished"></translation> + <translation>Serienummer </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> - <translation type="unfinished"></translation> + <translation>Utstedet av: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> - <translation type="unfinished"></translation> + <translation>Gyldighet: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> - <translation type="unfinished"></translation> + <translation>Utstedet den </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> - <translation type="unfinished"></translation> + <translation>Utløper den </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> - <translation type="unfinished"></translation> + <translation>Fingeravtrykk: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> - <translation type="unfinished"></translation> + <translation>SHA1 </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> - <translation type="unfinished"></translation> + <translation>MD5 </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> - <translation type="unfinished"></translation> + <translation>Avlsutt X2Go Klienten</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> - <translation type="unfinished"></translation> + <translation>Legg til unntak</translation> + </message> + <message> + <location filename="httpbrokerclient.cpp" line="366"/> + <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> + <translation>Sesjonen din ble koblet ned. For å få tilgang til den kjørende sesjonen din, vennligst returner til innloggingssiden, eller benytt "oppdater" funksjonen i nettleseren din.</translation> </message> </context> <context> @@ -648,198 +658,131 @@ <location filename="onmainwindow.cpp" line="84"/> <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> - <translation>us</translation> + <translation>no</translation> </message> <message> <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> - <translation>pc105/us</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="130"/> - <source>X2Go client</source> - <translation>X2Go用戶端</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="147"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2152"/> - <source>connecting</source> - <translation>正在連線</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="154"/> - <source>Internet browser</source> - <translation>網頁瀏覽器</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="155"/> - <source>Email client</source> - <translation>電子郵件軟體</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="156"/> - <source>OpenOffice.org</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="157"/> - <source>Terminal</source> - <translation>終端機</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="329"/> - <source>&Settings ...</source> - <translation>設定(&S) ...</translation> + <translation>pc105/de</translation> </message> <message> <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> - <translation>支援 ...</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="340"/> - <location filename="onmainwindow_part3.cpp" line="1542"/> - <source>About X2GO client</source> - <translation>關於X2GO用戶端</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="485"/> - <location filename="onmainwindow.cpp" line="944"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> - <source>Share folder...</source> - <translation>共享資料夾...</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow.cpp" line="945"/> - <location filename="onmainwindow_part2.cpp" line="2204"/> - <location filename="onmainwindow_part4.cpp" line="1995"/> - <source>Suspend</source> - <translation>暫停</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow.cpp" line="946"/> - <location filename="onmainwindow_part4.cpp" line="1843"/> - <location filename="onmainwindow_part4.cpp" line="1997"/> - <source>Terminate</source> - <translation>終止</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="493"/> - <source>Reconnect</source> - <translation>重新連線</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="497"/> - <location filename="onmainwindow_part4.cpp" line="1288"/> - <source>Detach X2Go window</source> - <translation>脫離X2Go視窗</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="500"/> - <location filename="onmainwindow_part4.cpp" line="2298"/> - <source>Minimize toolbar</source> - <translation>將工具列最小化</translation> + <translatorcomment>Need to double-check this one</translatorcomment> + <translation>Støtte ...</translation> </message> <message> <location filename="onmainwindow.cpp" line="610"/> <location filename="onmainwindow.cpp" line="1820"/> <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> - <translation>工作階段:</translation> + <translation>Sesjon:</translation> </message> <message> <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> - <translation>離開(&Q)</translation> + <translation>&Avslutt</translation> </message> <message> <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> - <translation type="unfinished"></translation> + <translation>Ctrl+Q</translation> </message> <message> <location filename="onmainwindow.cpp" line="664"/> <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> - <translation>離開</translation> + <translation>Avslutt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="667"/> - <source>&New session ...</source> - <translation>新增工作階段(&N) ...</translation> + <source>&New Session ...</source> + <translation type="obsolete">&Neue Sitzung ...</translation> </message> <message> <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> - <translation type="unfinished"></translation> + <translation>Ctrl+N</translation> </message> <message> - <location filename="onmainwindow.cpp" line="673"/> - <source>Session management...</source> - <translation>工作階段管理員...</translation> + <source>Session Management...</source> + <translation type="obsolete">Sitzungsverwaltung...</translation> </message> <message> <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> - <translation type="unfinished"></translation> + <translation>Ctrl+E</translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> - <source>&Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示(&C)...</translation> + <source>LDAP &Settings ...</source> + <translation type="obsolete">LDAP &Konfiguration ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="693"/> - <source>&Set broker password...</source> - <translation>設定代理伺服器密碼(&S)...</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="704"/> - <source>&Connectivity test...</source> - <translation>連線能力測試(&C)...</translation> + <location filename="onmainwindow_part4.cpp" line="2286"/> + <source>Restore toolbar</source> + <translation>Gjenopprett verktøylinjen</translation> </message> <message> - <location filename="onmainwindow.cpp" line="711"/> - <location filename="onmainwindow.cpp" line="732"/> - <source>Show toolbar</source> - <translation>顯示工具列</translation> + <source>About X2GO Client</source> + <translation type="obsolete">Über X2GO Client</translation> </message> <message> <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> - <translation>關於Qt</translation> + <translation>Om QT</translation> + </message> + <message> + <location filename="onmainwindow_part2.cpp" line="2486"/> + <source>Session</source> + <translation>Sesjon</translation> </message> <message> <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> - <translation type="unfinished"></translation> + <translation>Ctrl+Q</translation> </message> <message> <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> - <translation>工作階段(&S)</translation> + <translation>&Sesjon</translation> </message> <message> <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> - <translation>選項(&O)</translation> + <translation>&Innstillinger</translation> </message> <message> <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> - <translation>幫助(&H)</translation> + <translation>&Hjelp</translation> </message> <message> - <location filename="onmainwindow.cpp" line="799"/> - <location filename="onmainwindow.cpp" line="1813"/> - <location filename="onmainwindow_part3.cpp" line="1635"/> - <location filename="onmainwindow_part4.cpp" line="1656"/> - <source>Login:</source> - <translation>登入:</translation> + <location filename="onmainwindow_part4.cpp" line="1657"/> + <source>Password:</source> + <translation>Passord:</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="1658"/> + <source>Keyboard layout:</source> + <translation>Tastatur utseende:</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="1699"/> + <source>Ok</source> + <translation>Ok</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> + <source>Cancel</source> + <translation>Avbryt</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="2486"/> + <source>Invalid reply from broker</source> + <translatorcomment>Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context.</translatorcomment> + <translation>Ugyldig svar fra megleren</translation> </message> <message> <location filename="onmainwindow.cpp" line="820"/> @@ -856,18 +799,18 @@ <location filename="onmainwindow.cpp" line="2205"/> <location filename="onmainwindow.cpp" line="2239"/> <location filename="onmainwindow.cpp" line="2284"/> - <location filename="onmainwindow_part2.cpp" line="300"/> - <location filename="onmainwindow_part2.cpp" line="476"/> - <location filename="onmainwindow_part2.cpp" line="485"/> - <location filename="onmainwindow_part2.cpp" line="784"/> - <location filename="onmainwindow_part2.cpp" line="1235"/> - <location filename="onmainwindow_part2.cpp" line="1296"/> - <location filename="onmainwindow_part2.cpp" line="1347"/> - <location filename="onmainwindow_part2.cpp" line="1380"/> - <location filename="onmainwindow_part2.cpp" line="1424"/> - <location filename="onmainwindow_part2.cpp" line="1804"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> <location filename="onmainwindow_part2.cpp" line="1830"/> - <location filename="onmainwindow_part2.cpp" line="1962"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> <location filename="onmainwindow_part3.cpp" line="773"/> <location filename="onmainwindow_part3.cpp" line="854"/> @@ -887,182 +830,254 @@ <location filename="onmainwindow_part4.cpp" line="2214"/> <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Feil</translation> </message> <message> - <location filename="onmainwindow.cpp" line="820"/> - <source>Operation failed</source> - <translation>更改密碼失敗</translation> + <location filename="onmainwindow.cpp" line="2411"/> + <location filename="onmainwindow_part3.cpp" line="68"/> + <source>KDE</source> + <translation>KDE</translation> </message> <message> - <location filename="onmainwindow.cpp" line="824"/> - <source>Password changed</source> - <translation>密碼已更改成功</translation> + <location filename="onmainwindow.cpp" line="2485"/> + <source> on </source> + <translation> på </translation> </message> <message> - <location filename="onmainwindow.cpp" line="848"/> - <source>Wrong password!</source> - <translation>輸入了錯誤的密碼!</translation> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> + <source>Login:</source> + <translation>Brukernavn:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="852"/> - <location filename="onmainwindow.cpp" line="2393"/> - <location filename="onmainwindow_part4.cpp" line="2468"/> - <source>Connecting to broker</source> - <translation>連線至連線代理伺服器</translation> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> + <source>Select session:</source> + <translation>Velg sesjon:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="897"/> - <source>Authentication</source> - <translation>身份驗證</translation> + <location filename="onmainwindow_part4.cpp" line="1988"/> + <source>Resume</source> + <translation>Gjenoppta</translation> </message> <message> - <location filename="onmainwindow.cpp" line="938"/> - <source>Restore</source> - <translation>還原</translation> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> + <source>Suspend</source> + <translatorcomment>I disagree with the word 'Suspend' here, if it was suspending then the session would be paused. As this is not the case, it's more like disconnect (and the counterpart: reconnect). I used the translation fro 'Disconnect' here, and will research the possibility of changing the Suspend word to Disconnect also in the english translation.</translatorcomment> + <translation>Koble fra</translation> </message> <message> - <location filename="onmainwindow.cpp" line="941"/> - <location filename="onmainwindow_part2.cpp" line="2065"/> - <source>Not connected</source> - <translation>尚未連線</translation> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> + <source>Terminate</source> + <translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment> + <translation>Avslutte</translation> </message> <message> - <location filename="onmainwindow.cpp" line="969"/> - <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> - <translation>按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation> + <location filename="onmainwindow_part4.cpp" line="2000"/> + <source>New</source> + <translation>Ny</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1496"/> - <location filename="onmainwindow.cpp" line="1679"/> - <location filename="onmainwindow.cpp" line="1709"/> - <source>Please check LDAP settings</source> - <translation>請確認LDAP的設定</translation> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> + <source>Display</source> + <translation>Skjerm</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1531"/> - <source>no X2Go server found in LDAP </source> - <translation>在LDAP環境中沒有找到X2Go伺服器</translation> + <location filename="onmainwindow_part4.cpp" line="2069"/> + <source>Status</source> + <translation>Status</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1843"/> - <source>Create session icon on desktop</source> - <translation>在桌面上建立工作階段圖示</translation> + <location filename="onmainwindow_part4.cpp" line="2075"/> + <source>Server</source> + <translation>Server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1844"/> - <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. - -Use x2goclient hidden mode?</source> - <translation>桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式，您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。 - -是否要使用X2Go用戶端的隱藏模式?</translation> + <source>Creation Time</source> + <translation type="obsolete">Startzeit</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1855"/> - <source>New Session</source> - <translation>新的工作階段</translation> + <location filename="onmainwindow_part4.cpp" line="2080"/> + <source>Client IP</source> + <translation>Klient IP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1905"/> - <source>X2Go Link to session </source> - <translation>X2Go工作階段的連結</translation> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> + <source>running</source> + <translation>aktiv</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1955"/> - <source>X2Go sessions not found</source> - <translation>無法找到X2Go的工作</translation> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> + <source>suspended</source> + <translation>Frakoblet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2103"/> - <source>Are you sure you want to delete this session?</source> - <translation>您確定要刪除此工作階段嗎?</translation> + <source>Unable to create Folder:</source> + <translation type="obsolete">Ordner kann nicht erzeugt werden:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2411"/> - <location filename="onmainwindow_part3.cpp" line="68"/> - <source>KDE</source> - <translation type="unfinished"></translation> + <source>Unable to write File:</source> + <translation type="obsolete">Datei kann nicht geschrieben werden:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2473"/> - <source>RDP connection</source> - <translation>RDP連線</translation> + <location filename="onmainwindow_part2.cpp" line="2015"/> + <source>Unable to create SSL Tunnel: +</source> + <translation>Klarer ikke å opprette SSL tunnel: +</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2477"/> - <source>XDMCP</source> - <translation type="unfinished"></translation> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> + <source>Warning</source> + <translation>Advarsel</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2481"/> - <source>Connection to local desktop</source> - <translation>連線至本地桌面</translation> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> + <source>connecting</source> + <translation>kobler til</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2485"/> - <source> on </source> - <translation> 於 </translation> + <location filename="onmainwindow_part2.cpp" line="2186"/> + <source>starting</source> + <translation>starter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="79"/> - <source>Host key for server changed. -It is now: </source> - <translation>主機的SSH密鑰已經更換。 -現在的密鑰為: </translation> + <location filename="onmainwindow_part2.cpp" line="2188"/> + <source>resuming</source> + <translation>gjenopptar</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="80"/> - <source>For security reasons, connection will be stopped</source> - <translation>由於安全性的考量，目前的連線已被中止</translation> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> + <source>Connection timeout, aborting</source> + <translation>Tilkoblingen tidsavbrutt, avbryter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> - <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation>目前沒有找到伺服器上的主機密鑰，不過有其它類型的密鑰存在。惡意的攻擊者可能會利用改變預設的伺服器密鑰來讓您的用戶端認為原本的密鑰並不存在</translation> + <location filename="onmainwindow_part2.cpp" line="2251"/> + <source>aborting</source> + <translation>Avbryter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> - <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation> + <source>Session ID: Server: Username: Display: Creation Time: Status:</source> + <translation type="obsolete">Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> - <source>The server is unknown. Do you trust the host key? -Public key hash: </source> - <translation>此為未知的伺服器，您要選擇信任此主機密鑰嗎? -此公開密鑰的雜湊值為:</translation> + <location filename="onmainwindow_part4.cpp" line="1842"/> + <source>Abort</source> + <translation>Avbryt</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> - <source>Host key verification failed</source> - <translation>主機密鑰驗證任失敗</translation> + <source>Show Details</source> + <translation type="obsolete">Zeige Details</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1169"/> - <location filename="onmainwindow_part2.cpp" line="1189"/> - <source>Yes</source> - <translation>是</translation> + <location filename="onmainwindow_part3.cpp" line="409"/> + <source> (can't open file)</source> + <translation> (kan ikke åpne filen)</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1170"/> - <location filename="onmainwindow_part2.cpp" line="1190"/> - <source>No</source> - <translation>否</translation> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> + <source> (file not exists)</source> + <translation> (filen finnes ikke)</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="464"/> + <source> (directory not exists)</source> + <translation> (mappen finnes ikke)</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> - <translation>認證失敗</translation> + <location filename="onmainwindow_part3.cpp" line="492"/> + <source>wrong value for argument"--link"</source> + <translatorcomment>Chose to use 'parameteren' here, the direct translation is 'argument', but didn't fit in my opinion. The cmdline arguments, will they be translated as well?</translatorcomment> + <translation>ugyldig verdi for parameteren "--link"</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="510"/> + <source>wrong value for argument"--sound"</source> + <translation>ugyldig verdi for parameteren "--sound"</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> + <source>wrong value for argument"--geometry"</source> + <translation>ugyldig verdi for parameteren "--geometry"</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="556"/> + <source>wrong value for argument"--set-kbd"</source> + <translation>ugyldig verdi for parameteren "--set-kbd"</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="573"/> + <source>wrong value for argument"--ldap"</source> + <translation>ugyldig verdi for parameteren "--ldap"</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="668"/> + <source>wrong value for argument"--pack"</source> + <translation>ugyldig verdi for parameteren "--pack"</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> + <source>wrong parameter: </source> + <translation>ugyldig parameter: </translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="729"/> + <source>Available pack methodes:</source> + <translation>Tilgjengelige pakkemetoder:</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="1517"/> + <source>Support</source> + <translatorcomment>Will have to revisit this one, not sure if it fits</translatorcomment> + <translation>Støtte</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="1522"/> + <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="1588"/> + <source>Please check LDAP Settings</source> + <translation>Vennligst sjekk LDAP innstillingene</translation> + </message> + <message> + <source>no X2Go Server found in LDAP </source> + <translation type="obsolete">LDAP enthält keinen X2Go Server </translation> + </message> + <message> + <source>Are you sure you want to delete this Session?</source> + <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> + </message> + <message> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> <location filename="onmainwindow_part3.cpp" line="766"/> <location filename="onmainwindow_part3.cpp" line="847"/> <location filename="onmainwindow_part3.cpp" line="1219"/> @@ -1070,541 +1085,704 @@ Public key hash: </source> <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> - <translation>連線失敗 + <translation>Tilkoblingen feilet </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="296"/> - <location filename="onmainwindow_part2.cpp" line="1292"/> - <location filename="onmainwindow_part2.cpp" line="1376"/> - <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="769"/> - <location filename="onmainwindow_part3.cpp" line="850"/> - <location filename="onmainwindow_part3.cpp" line="1222"/> - <location filename="onmainwindow_part3.cpp" line="1275"/> - <location filename="onmainwindow_part3.cpp" line="2259"/> - <source>Wrong password! </source> - <translation>不正確的密碼! </translation> + <source>No Server availabel</source> + <translation type="obsolete">es konnte kein Server gefunden werden</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="412"/> - <source>unknown</source> - <translation>未知</translation> + <location filename="onmainwindow_part4.cpp" line="2082"/> + <source>Session ID</source> + <translation>Sesjons ID</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="477"/> - <source>No server availabel</source> - <translation>伺服器不存在l</translation> + <location filename="onmainwindow_part2.cpp" line="1258"/> + <source>suspending</source> + <translation>Kobler fra</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="486"/> - <location filename="onmainwindow_part2.cpp" line="785"/> - <location filename="onmainwindow_part2.cpp" line="1236"/> - <location filename="onmainwindow_part2.cpp" line="1348"/> - <source>Server not availabel</source> - <translation>伺服器不存在|</translation> + <location filename="onmainwindow_part2.cpp" line="1280"/> + <source>terminating</source> + <translation>Avslutter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1005"/> - <location filename="onmainwindow_part4.cpp" line="1986"/> - <source>Select session:</source> - <translation>請選擇工作階段:</translation> + <location filename="onmainwindow_part3.cpp" line="196"/> + <source>Connection failed +: +</source> + <translation>Tilkoblingen feilet +: +</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1021"/> - <location filename="onmainwindow_part2.cpp" line="1115"/> - <location filename="onmainwindow_part2.cpp" line="2168"/> - <source>running</source> - <translation>正在執行中</translation> + <source>Share Folder...</source> + <translation type="obsolete">Ordner freigeben...</translation> + </message> + <message> + <source>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 + --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' +</source> + <translation type="obsolete">Usage: x2goclient [Options] Options: --help Print this message --help-pack Print availabel pack methods --no-menu Hide menu bar --maximize Start maximized --add-to-known-hosts Add RSA key fingerprint to .ssh/known_hosts if authenticity of server can't be established --ldap=<host:port:dn> Start with LDAP Support. Example: --ldap=ldapserver:389:o=organization,c=de --command=<cmd> Set default command, default value 'KDE' --sound=<0|1> Enable sound, default value '1' --geomerty=<W>x<H>|fullscreen Set default geometry, default value '800x600' --link=<modem|isdn|adsl |wan|lan> Set default link type, default 'lan' --pack=<packmethod> Set default pack method, default '16m-jpeg-9' --kbd-layout=<layout> Set default keyboard layout, default 'us' --kbd-type=<typed> Set default keyboard type, default 'pc105/us' --set-kbd=<0|1> Overwrite current keyboard settings, default '0'</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1023"/> - <location filename="onmainwindow_part2.cpp" line="1308"/> - <source>suspended</source> - <translation>已暫停</translation> + <location filename="onmainwindow_part4.cpp" line="28"/> + <source>Unable to read : +</source> + <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment> + <translation>Klarer ikke å lese: +</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1029"/> - <source>Desktop</source> - <translation>桌面</translation> + <location filename="onmainwindow_part4.cpp" line="53"/> + <source>Unable to write : +</source> + <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment> + <translation>Klarer ikke å skrive: +</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1031"/> - <source>single application</source> - <translation>單一的應用程式</translation> + <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> + <translation type="obsolete">X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1033"/> - <source>shadow session</source> - <translation type="unfinished"></translation> + <location filename="onmainwindow_part2.cpp" line="1414"/> + <source>Wrong Password! </source> + <translatorcomment>Should we actually tell that it's the password that's wrong? Isn't that considered bad practice in regards to security? I propose to use "Wrong Username or Password!" instead.</translatorcomment> + <translation>Feil passord! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1066"/> - <source>Information</source> - <translation>資訊</translation> + <location filename="onmainwindow_part3.cpp" line="595"/> + <source>wrong value for argument"--ldap1"</source> + <translation>ugyldig verdi for parameteren "--ldap1"</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1067"/> - <source>No accessible desktop found</source> - <translation>目前沒有找到可訪問的工作桌面</translation> + <location filename="onmainwindow_part3.cpp" line="614"/> + <source>wrong value for argument"--ldap2"</source> + <translation>ugyldig verdi for parameteren "--ldap2"</translation> + </message> + <message> + <source>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' +</source> + <translation type="obsolete">Usage: x2goclient [Options] Options: --help Print this message --help-pack Print availabel pack methods --no-menu Hide menu bar --maximize Start maximized --add-to-known-hosts Add RSA key fingerprint to .ssh/known_hosts if authenticity of server can't be established --ldap=<host:port:dn> Start with LDAP Support. Example: --ldap=ldapserver:389:o=organization,c=de --ldap1=<host:port> LDAP Failover Server #1 --ldap2=<host:port> LDAP Failover Server #2 --command=<cmd> Set default command, default value 'KDE' --sound=<0|1> Enable sound, default value '1' --geomerty=<W>x<H>|fullscreen Set default geometry, default value '800x600' --link=<modem|isdn|adsl|wan |lan> Set default link type, default 'lan' --pack=<packmethod> Set default pack method, default '16m-jpeg-9' --kbd-layout=<layout> Set default keyboard layout, default 'us' --kbd-type=<typed> Set default keyboard type, default 'pc105/us' --set-kbd=<0|1> Overwrite current keyboard settings, default '0'</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1080"/> - <location filename="onmainwindow_part4.cpp" line="2399"/> - <source>Filter</source> - <translation>篩選器</translation> + <location filename="onmainwindow_part3.cpp" line="1894"/> + <source>Unable to create file: </source> + <translation>Klarer ikke å opprette filen: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1087"/> - <source>Select desktop:</source> - <translation>請選擇工作桌面:</translation> + <location filename="onmainwindow_part3.cpp" line="1818"/> + <source>No valid card found</source> + <translation>Ingen gyldige kort ble funnet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1156"/> - <location filename="onmainwindow_part2.cpp" line="1176"/> - <location filename="onmainwindow_part2.cpp" line="1991"/> - <location filename="onmainwindow_part2.cpp" line="2380"/> - <source>Warning</source> - <translation>警告</translation> + <source>This card is unknown by X2Go System</source> + <translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="329"/> + <source>&Settings ...</source> + <translatorcomment>Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions</translatorcomment> + <translation>&Innstillinger</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1157"/> - <location filename="onmainwindow_part2.cpp" line="1177"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> + <source>Options</source> + <translatorcomment>Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first</translatorcomment> + <translation>Alternativer</translation> + </message> + <message> + <source>Can't read host rsa key:</source> + <translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> + <source>Can't connect to X-Server</source> + <translation>Klarte ikke å koble til X-Serveren</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> + <source>Can't connect to X-Server +Please check your settings</source> + <translation>Klarte ikke å koble til X-Serveren +Vennligst sjekk innstillingene dine</translation> + </message> + <message> + <source>Can't start X-Server</source> + <translation type="obsolete">X-Server konnte nicht gestartet werden</translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="2093"/> + <source>Can't start X Server +Please check your settings</source> + <translation>Klarte ikke å starte X-Serveren +Vennligst sjekk instillingene dine</translation> + </message> + <message> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> - <translation>您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為</translation> + <translation>Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene vil du miste hele sesjonen. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1165"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> - <translation>24或32</translation> + <translation>24 eller 32</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。 請問您無論如何都要恢復此工作階段的連線嗎?</translation> - </message> - <message> - <location filename="onmainwindow_part2.cpp" line="1253"/> - <source>suspending</source> - <translation>正在暫停工作中</translation> + <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. Gjenoppta denne sesjonen uansett?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1275"/> - <source>terminating</source> - <translation>正在中止工作中</translation> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> + <source>Yes</source> + <translation>Ja</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1409"/> - <source>Wrong Password! </source> - <translation>不正確的密碼! </translation> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> + <source>No</source> + <translation>Nei</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1802"/> - <location filename="onmainwindow_part3.cpp" line="1096"/> - <source>Unable to create folder:</source> - <translation>無法創建資料夾:</translation> + <source>X2Go Client V. </source> + <translation type="obsolete">X2Go Client V. </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1828"/> - <source>Unable to write file:</source> - <translation>檔案無法寫入:</translation> + <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> + <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1934"/> - <location filename="onmainwindow_part4.cpp" line="1263"/> - <source>Attach X2Go window</source> - <translation>連接X2Go視窗</translation> + <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> + <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1960"/> - <location filename="onmainwindow_part3.cpp" line="2330"/> - <source>Unable to create SSL tunnel: -</source> - <translation>無法建立SSL通道:</translation> + <location filename="onmainwindow.cpp" line="156"/> + <source>OpenOffice.org</source> + <translation>OpenOffice.org</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1989"/> - <source>Unable to create SSL Tunnel: -</source> - <translation>無法建立SSL通道: -</translation> + <location filename="onmainwindow.cpp" line="157"/> + <source>Terminal</source> + <translation>Terminal</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2137"/> - <source>Finished</source> - <translation>已完成</translation> + <location filename="onmainwindow_part2.cpp" line="417"/> + <source>unknown</source> + <translation>ukjent</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2160"/> - <source>starting</source> - <translation>正在開始</translation> + <location filename="onmainwindow_part4.cpp" line="2071"/> + <source>Command</source> + <translation>Kommando</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2162"/> - <source>resuming</source> - <translation>正在還原</translation> + <location filename="onmainwindow_part4.cpp" line="2073"/> + <source>Type</source> + <translation>Type</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2224"/> - <location filename="onmainwindow_part2.cpp" line="2492"/> - <location filename="onmainwindow_part2.cpp" line="2510"/> - <source>Connection timeout, aborting</source> - <translation>連線超時，中止中</translation> + <location filename="onmainwindow_part2.cpp" line="1034"/> + <source>Desktop</source> + <translation>Skrivebord</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2225"/> - <source>aborting</source> - <translation>中止中</translation> + <location filename="onmainwindow_part2.cpp" line="1036"/> + <source>single application</source> + <translation>enkel applikasjon</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2381"/> - <source>Are you sure you want to terminate this session? -Unsaved documents will be lost</source> - <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation> + <location filename="onmainwindow_part2.cpp" line="1038"/> + <source>shadow session</source> + <translatorcomment>hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian</translatorcomment> + <translation>skygge sesjonen</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <source>Session</source> - <translation>工作階段</translation> + <source> Sudo configuration error</source> + <translation type="obsolete"> Fehler in der Sudo Konfiguration</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2462"/> - <location filename="onmainwindow_part4.cpp" line="2067"/> - <location filename="onmainwindow_part4.cpp" line="2089"/> - <source>Display</source> - <translation>顯示</translation> + <location filename="onmainwindow_part3.cpp" line="2279"/> + <source>Unable to execute: </source> + <translation>Klarte ikke å utføre:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2464"/> - <location filename="onmainwindow_part4.cpp" line="2078"/> - <source>Creation time</source> - <translation>創建時間</translation> + <location filename="onmainwindow.cpp" line="130"/> + <source>X2Go client</source> + <translation>X2Go klient</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="196"/> - <source>Connection failed -: -</source> - <translation>連線失敗 -: -</translation> + <location filename="onmainwindow.cpp" line="154"/> + <source>Internet browser</source> + <translation>Nettleser</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="409"/> - <source> (can't open file)</source> - <translation> (無法開啟檔案)</translation> + <location filename="onmainwindow.cpp" line="155"/> + <source>Email client</source> + <translation>Epost program</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="420"/> - <location filename="onmainwindow_part3.cpp" line="430"/> - <location filename="onmainwindow_part3.cpp" line="440"/> - <source> (file not exists)</source> - <translation> (檔案不存在)</translation> + <location filename="onmainwindow.cpp" line="667"/> + <source>&New session ...</source> + <translation>&Ny sesjon ...</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="464"/> - <source> (directory not exists)</source> - <translation> (目錄不存在)</translation> + <location filename="onmainwindow.cpp" line="673"/> + <source>Session management...</source> + <translation>Sesjonshåndtering...</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="492"/> - <source>wrong value for argument"--link"</source> - <translation>"--link"參數的值錯誤</translation> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> + <source>Show toolbar</source> + <translation>Vis verktøylinje</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="510"/> - <source>wrong value for argument"--sound"</source> - <translation>"--sound"參數的值錯誤</translation> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> + <source>About X2GO client</source> + <translation>Om X2GO klient</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="527"/> - <location filename="onmainwindow_part3.cpp" line="538"/> - <source>wrong value for argument"--geometry"</source> - <translation>"--geometry"參數的值錯誤</translation> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> + <source>Please check LDAP settings</source> + <translation>Vennligst sjekk LDAP innstillingene</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="556"/> - <source>wrong value for argument"--set-kbd"</source> - <translation>"--set-kbd"參數的值錯誤</translation> + <location filename="onmainwindow.cpp" line="1531"/> + <source>no X2Go server found in LDAP </source> + <translation>Inge X2Go server ble funnet i LDAP </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="573"/> - <source>wrong value for argument"--ldap"</source> - <translation>"--ldap"參數的值錯誤</translation> + <location filename="onmainwindow.cpp" line="2103"/> + <source>Are you sure you want to delete this session?</source> + <translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="595"/> - <source>wrong value for argument"--ldap1"</source> - <translation>"--ldap1"參數的值錯誤</translation> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> + <location filename="onmainwindow_part3.cpp" line="199"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> + <source>Wrong password! </source> + <translation>Feil passord! </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="614"/> - <source>wrong value for argument"--ldap2"</source> - <translation>"--ldap2"參數的值錯誤</translation> + <location filename="onmainwindow_part2.cpp" line="482"/> + <source>No server availabel</source> + <translation>Ingen tilgjengelig server</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="668"/> - <source>wrong value for argument"--pack"</source> - <translation>"--pack"參數的值錯誤</translation> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> + <source>Not connected</source> + <oldsource>Active connection</oldsource> + <translation>Ikke tilkoblet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="676"/> - <location filename="onmainwindow_part3.cpp" line="679"/> - <source>wrong parameter: </source> - <translation>錯誤的參數:</translation> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> + <source>Creation time</source> + <translation>Opprettelsestidspunkt</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> - <location filename="onmainwindow_part3.cpp" line="750"/> - <source>Options</source> - <translation>選項</translation> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> + <source>Unable to create folder:</source> + <translation>Klarer ikke å opprette katalogen:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="729"/> - <source>Available pack methodes:</source> - <translation>可用的包裝方法:</translation> + <location filename="onmainwindow_part2.cpp" line="79"/> + <source>Host key for server changed. +It is now: </source> + <translation>Vertsnøkkel for serveren har endret seg. +Den er nå: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1517"/> - <source>Support</source> - <translation>支援</translation> + <location filename="onmainwindow_part2.cpp" line="80"/> + <source>For security reasons, connection will be stopped</source> + <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation type="unfinished"></translation> + <location filename="onmainwindow_part2.cpp" line="91"/> + <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> + <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1526"/> - <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> - <translation> x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助 </translation> + <location filename="onmainwindow_part2.cpp" line="113"/> + <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> + <translation>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1530"/> - <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="unfinished"></translation> + <location filename="onmainwindow_part2.cpp" line="118"/> + <source>The server is unknown. Do you trust the host key? +Public key hash: </source> + <translation>Serveren er ukjent. Stoler du på vertsnøkkelen? +Offentlig nøkkel: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1543"/> - <source>X2Go client V. </source> - <translation>X2Go 客戶端 V. </translation> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> + <source>Host key verification failed</source> + <translation>Verifiseringen av vertsnøkkelen feilet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1588"/> - <source>Please check LDAP Settings</source> - <translation>請檢查LDAP的設定</translation> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> + <translation>Pålogging feilet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1818"/> - <source>No valid card found</source> - <translation>沒有發現合法的卡片</translation> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> + <source>Server not availabel</source> + <translation>Serveren er ikke tilgjengelig</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1866"/> - <source>This card is unknown by X2Go system</source> - <translation>X2Go系統無法辨識此張卡片</translation> + <location filename="onmainwindow_part2.cpp" line="1854"/> + <source>Unable to write file:</source> + <translation>Klarer ikke å skrive til filen:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1894"/> - <source>Unable to create file: </source> - <translation>檔案無法創建:</translation> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> + <source>Unable to create SSL tunnel: +</source> + <translation>Klarte ikke å opprette SSL tunnel: +</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2059"/> - <location filename="onmainwindow_part3.cpp" line="2084"/> - <source>Can't connect to X-Server</source> - <translation>無法連接至X伺服器</translation> + <location filename="onmainwindow_part4.cpp" line="1834"/> + <source>Session ID: Server: Username: Display: Creation time: Status:</source> + <translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment> + <translation>Sesjons ID: Server: Brukernavn: Skjerm: Opprettet: Status:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2060"/> - <location filename="onmainwindow_part3.cpp" line="2085"/> - <source>Can't connect to X-Server -Please check your settings</source> - <translation>無法連接至X伺服器 -請檢查您的設定值</translation> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> + <source>Share folder...</source> + <translation>Del mappe...</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2093"/> - <source>Can't start X Server -Please check your settings</source> - <translation>無法啟動X伺服器 -請檢查您的設定值</translation> + <location filename="onmainwindow_part4.cpp" line="1846"/> + <source>Show details</source> + <translation>Vis detailjer</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2107"/> - <location filename="onmainwindow_part4.cpp" line="422"/> - <location filename="onmainwindow_part4.cpp" line="450"/> - <source>Can't start X Server -Please check your installation</source> - <translation>無法啟動X伺服器 -請檢查X伺服器安是否有安裝正確</translation> + <location filename="onmainwindow_part3.cpp" line="1543"/> + <source>X2Go client V. </source> + <translation>X2Go klient v. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2279"/> - <source>Unable to execute: </source> - <translation>無法執行:</translation> + <location filename="onmainwindow_part3.cpp" line="1866"/> + <source>This card is unknown by X2Go system</source> + <translatorcomment>Need to double-check if the translation of "card" is suitable here</translatorcomment> + <translation>Dette kortet er ukjent for X2Go systemet</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> - <translation>遠端伺服器無法支援SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本</translation> + <translation>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel +Vennligst oppdater til en nyere x2goserver pakke</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="28"/> - <source>Unable to read : -</source> - <translation>無法讀取: -</translation> + <location filename="onmainwindow.cpp" line="684"/> + <source>&Create session icon on desktop...</source> + <translation>&Opprett sesjonsikon på skrivebordet...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="53"/> - <source>Unable to write : -</source> - <translation>無法寫入: -</translation> + <location filename="onmainwindow.cpp" line="693"/> + <source>&Set broker password...</source> + <translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment> + <translation>&Sett megler passord...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="141"/> - <source>WINDOWS-1252</source> - <translation type="unfinished"></translation> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation>&Tilkoblings-test...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="153"/> - <source>ISO8859-1</source> - <translation type="unfinished"></translation> + <location filename="onmainwindow.cpp" line="820"/> + <source>Operation failed</source> + <translation>Handlingen feilet</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1352"/> - <source>X2Go Session</source> - <translation>X2Go工作階段</translation> + <location filename="onmainwindow.cpp" line="824"/> + <source>Password changed</source> + <translation>Passordet er endret</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1534"/> - <source>wrong value for argument"speed"</source> - <translation>錯誤的"speed"參數值</translation> + <location filename="onmainwindow.cpp" line="848"/> + <source>Wrong password!</source> + <translation>Feil passord!</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1657"/> - <source>Password:</source> - <translation>密碼:</translation> + <location filename="onmainwindow.cpp" line="897"/> + <source>Authentication</source> + <translation>Autentisering</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1658"/> - <source>Keyboard layout:</source> - <translation>鑑盤佈局:</translation> + <location filename="onmainwindow.cpp" line="938"/> + <source>Restore</source> + <translation>Gjenopprett</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1699"/> - <source>Ok</source> - <translation>確定</translation> + <location filename="onmainwindow.cpp" line="969"/> + <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> + <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> + <translatorcomment>According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny"</translatorcomment> + <translation>Venstre museknapp for å skjule/gjenopprette - Høyre museknapp viser sprettoppmeny</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1701"/> - <location filename="onmainwindow_part4.cpp" line="1990"/> - <location filename="onmainwindow_part4.cpp" line="1992"/> - <source>Cancel</source> - <translation>取消</translation> + <location filename="onmainwindow.cpp" line="1843"/> + <source>Create session icon on desktop</source> + <translation>Opprett sesjonsikon på skrivebordet</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1834"/> - <source>Session ID: Server: Username: Display: Creation time: Status:</source> - <translation>工作階段識別碼: 伺服器: 使用者名稱: 顯示: 創建時間: 狀態:</translation> + <location filename="onmainwindow.cpp" line="1844"/> + <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. + +Use x2goclient hidden mode?</source> + <translation>Skrivebordsikoner kan konfigureres til å ikke vise x2goklient (skjult modus). Om du ønsker å benytte denne muligheten må du konfigurere pålogging ved bruk av en GPG-nøkkel, eller et GPG basert smartkort. + +Ønsker du å aktivere skjult modus for x2goklient?</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1842"/> - <source>Abort</source> - <translation>退出</translation> + <location filename="onmainwindow.cpp" line="1855"/> + <source>New Session</source> + <translation>Ny sesjon</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> - <source>Show details</source> - <translation>顯示細節</translation> + <location filename="onmainwindow.cpp" line="1955"/> + <source>X2Go sessions not found</source> + <translation>X2Go sesjoner ble ikke funnet</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1988"/> - <source>Resume</source> - <translation>恢復</translation> + <location filename="onmainwindow.cpp" line="2473"/> + <source>RDP connection</source> + <translation>RDP tilkobling</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2000"/> - <source>New</source> - <translation>新增</translation> + <location filename="onmainwindow.cpp" line="1905"/> + <source>X2Go Link to session </source> + <translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment> + <translation>X2Go kobling til sesjon </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2003"/> - <source>Full access</source> - <translation>完全存取</translation> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> + <source>Detach X2Go window</source> + <translation>Løsne X2Go vindu</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2006"/> - <source>View only</source> - <translation>僅查看</translation> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> + <source>Attach X2Go window</source> + <translation>Feste X2Go vindu</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2069"/> - <source>Status</source> - <translation>狀態</translation> + <location filename="onmainwindow_part2.cpp" line="2163"/> + <source>Finished</source> + <translation>Ferdig</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2071"/> - <source>Command</source> - <translation>指令</translation> + <location filename="onmainwindow_part2.cpp" line="2407"/> + <source>Are you sure you want to terminate this session? +Unsaved documents will be lost</source> + <translation>Er du sikker på at du vil avslutte denne sesjonen? +Ulagrede data vil gå tapt</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2073"/> - <source>Type</source> - <translation>型態</translation> + <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> + <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2075"/> - <source>Server</source> - <translation>伺服器</translation> + <location filename="onmainwindow_part3.cpp" line="2107"/> + <location filename="onmainwindow_part4.cpp" line="422"/> + <location filename="onmainwindow_part4.cpp" line="450"/> + <source>Can't start X Server +Please check your installation</source> + <translation>Klarer ikke å starte X Serveren +Vennligst sjekk din installasjon</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2080"/> - <source>Client IP</source> - <translation>客戶端IP</translation> + <location filename="onmainwindow_part4.cpp" line="1352"/> + <source>X2Go Session</source> + <translation>X2Go sesjon</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2082"/> - <source>Session ID</source> - <translation>工作階段識別碼</translation> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> + <source>Minimize toolbar</source> + <translation>Minimer verktøylinje</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2086"/> - <source>User</source> - <translation>使用者</translation> + <location filename="onmainwindow_part4.cpp" line="2331"/> + <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> + <translation> &nbsp;&nbsp;&nbsp;Trykk her&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp; </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2117"/> - <source>Only my desktops</source> - <translation>只選擇我的桌面</translation> + <source>Can't open config file: </source> + <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2215"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> - <translation>SSH伺服器沒有執行起來，遠端列印與檔案共享功能需要先安裝SSH伺服器 -您可以使用下列指令來安裝SSH伺服器: + <translation>sshd er ikke startet og du trenger denne for skriver- og fildeling. +Du kan installere sshd med: sudo apt-get install openssh-server</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2286"/> - <source>Restore toolbar</source> - <translation>還原工具列</translation> + <location filename="onmainwindow.cpp" line="2481"/> + <source>Connection to local desktop</source> + <translation>Tilkobling til lokalt skrivebord</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2331"/> - <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> - <translation> &nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp; </translation> + <location filename="onmainwindow_part2.cpp" line="1071"/> + <source>Information</source> + <translation>Informasjon</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2486"/> - <source>Invalid reply from broker</source> - <translation>代理伺服器的回應不合法</translation> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> + <source>Filter</source> + <translation>Filter</translation> + </message> + <message> + <location filename="onmainwindow_part2.cpp" line="1092"/> + <source>Select desktop:</source> + <translation>Velg skrivebord:</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="2006"/> + <source>View only</source> + <translation>Kun vis</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="2086"/> + <source>User</source> + <translation>Bruker</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="2477"/> + <source>XDMCP</source> + <translation>XDMCP</translation> + </message> + <message> + <location filename="onmainwindow_part2.cpp" line="1072"/> + <source>No accessible desktop found</source> + <translation>Ingen tilgjengelige skrivebord ble funnet</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="2003"/> + <source>Full access</source> + <translation>Full tilgang</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="2117"/> + <source>Only my desktops</source> + <translation>Kun mine skrivebord</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="493"/> + <source>Reconnect</source> + <translation>Gjenoppkoble</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> + <source>Connecting to broker</source> + <translation>Koble til megleren</translation> + </message> + <message> + <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation type="obsolete"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="1526"/> + <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> + <translation> x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> + </message> + <message> + <location filename="onmainwindow_part3.cpp" line="1530"/> + <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> + <translation> Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="141"/> + <source>WINDOWS-1252</source> + <translation>WINDOWS-1252</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="153"/> + <source>ISO8859-1</source> + <translation>ISO8859-1</translation> + </message> + <message> + <location filename="onmainwindow_part4.cpp" line="1534"/> + <source>wrong value for argument"speed"</source> + <translation>wrong value for argument"speed"</translation> + </message> + <message> + <source>application/x2go:x2go:Configuration File for X2Go Session</source> + <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation> </message> </context> <context> @@ -1612,22 +1790,24 @@ you can install sshd with <message> <location filename="printdialog.ui" line="16"/> <source>Print - X2Go client</source> - <translation>列印 - X2Go用戶端</translation> + <translation>Utskrift - X2Go klient</translation> </message> <message> <location filename="printdialog.cpp" line="25"/> <source>Print</source> - <translation>列印</translation> + <translatorcomment>note to myself: Need to doublecheck the context of this word, other places 'utskrift' is a better translation, but I'm guessing this the actual print-button text.</translatorcomment> + <translation>Skriv ut</translation> </message> <message> <location filename="printdialog.cpp" line="54"/> <source>You've deactivated the x2go client printing dialog.</source> - <translation>您已經停用X2Go用戶端的列印對話框</translation> + <translation>Du har deaktivert X2Go klientens utskriftsdialog.</translation> </message> <message> <location filename="printdialog.cpp" line="56"/> <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source> - <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation> + <translatorcomment>Hm... This indicates that I might have overlooked the usage of the word 'settings' somewhere - will have to look how this will look.</translatorcomment> + <translation>Du kan reaktivere denne dialogen ved å benytte x2goclient innstillingene (Meny -> Innstillinger -> Innstillinger)</translation> </message> </context> <context> @@ -1635,25 +1815,26 @@ you can install sshd with <message> <location filename="printprocess.cpp" line="155"/> <source>Save File</source> - <translation>儲存檔案</translation> + <translation>Lagre fil</translation> </message> <message> <location filename="printprocess.cpp" line="157"/> <source>PDF Document (*.pdf)</source> - <translation>PDF文件 (*.pdf)</translation> + <translation>PDF Dokuemtn (*.pdf)</translation> </message> <message> <location filename="printprocess.cpp" line="251"/> <location filename="printprocess.cpp" line="274"/> <source>Failed to execute command: </source> - <translation>執行命令失敗:</translation> + <translation>Klarte ikke å utføre kommandoen: +</translation> </message> <message> <location filename="printprocess.cpp" line="266"/> <location filename="printprocess.cpp" line="273"/> <source>Printing error</source> - <translation>列印錯誤</translation> + <translation>Utskriftsfeil</translation> </message> </context> <context> @@ -1661,73 +1842,74 @@ you can install sshd with <message> <location filename="printwidget.ui" line="13"/> <source>Form</source> - <translation>表單</translation> + <translation>Skjema</translation> </message> <message> <location filename="printwidget.ui" line="23"/> <source>Print</source> - <translation>列印</translation> + <translation>Utskrift</translation> </message> <message> <location filename="printwidget.ui" line="33"/> <source>View as PDF</source> - <translation>以PDF格式查看</translation> + <translation>Vis som PDF</translation> </message> <message> <location filename="printwidget.ui" line="63"/> <source>Print settings</source> - <translation>列印設定</translation> + <translation>Utskriftsinnstillinger</translation> </message> <message> <location filename="printwidget.ui" line="69"/> <source>Printer:</source> - <translation>印表機:</translation> + <translation>Skriver:</translation> </message> <message> <location filename="printwidget.ui" line="79"/> <source>Print using default Windows PDF Viewer (Viewer application needs to be installed)</source> - <translation>以預設的Windows PDF閱讀器列印(必需要安裝閱讀器)</translation> + <translation>Skriv ut via standard Windows PDF leser +(lese programmet må være installert)</translation> </message> <message> <location filename="printwidget.ui" line="94"/> <source>Printer command:</source> - <translation>印表機指令:</translation> + <translation>Utskriftskommando:</translation> </message> <message> <location filename="printwidget.ui" line="116"/> <source>...</source> - <translation></translation> + <translation>...</translation> </message> <message> <location filename="printwidget.ui" line="147"/> <source>Viewer settings</source> - <translation>閱讀器設定</translation> + <translation>Instillinger for PDF leser</translation> </message> <message> <location filename="printwidget.ui" line="153"/> <source>Open in viewer application</source> - <translation>在閱讀器程式裡開啟</translation> + <translation>Åpne i leseprogrammet</translation> </message> <message> <location filename="printwidget.ui" line="165"/> <source>Command:</source> - <translation>指令:</translation> + <translation>Kommando:</translation> </message> <message> <location filename="printwidget.ui" line="177"/> <source>Save to disk</source> - <translation>儲存到磁碟裡</translation> + <translation>Lagre til disk</translation> </message> <message> <location filename="printwidget.ui" line="207"/> <source>Show this dialog before start printing</source> - <translation>開始列印前先顯示此對話框</translation> + <translation>Vis denne dialogen før start av utskrift</translation> </message> <message> <location filename="printwidget.cpp" line="53"/> <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> - <translation>請設定您的客戶端列印設定 您會需要一個外部的程式來進行列印工作，您可以使用 <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… 以及 <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… <a href="http://www.x2go.org/index.php?id=49">這個網址</a>.</translation> + <translation>Vennligst sett opp innstillingene for utskrift på klientsiden. Om du ønsker å skrive ut den opprettede filen så trengs en ekstern applikasjon. Typisk kan du benytte<a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… og <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… kan finne ytterlig informasjon <a href="http://www.x2go.org/index.php?id=49">her</a>.</translation> </message> </context> <context> @@ -1735,12 +1917,12 @@ you can install sshd with <message> <location filename="printercmddialog.ui" line="13"/> <source>Printer command</source> - <translation>印表機指令</translation> + <translation>Utskriftskommando</translation> </message> <message> <location filename="printercmddialog.ui" line="19"/> <source>Command</source> - <translation>指令</translation> + <translation>Kommando</translation> </message> <message> <location filename="printercmddialog.ui" line="25"/> @@ -1748,64 +1930,65 @@ you can install sshd with Examples: kprinter lpr -P hp_laserjet</source> - <translation>請輸入您自定的列印指令。 -例如: + <translation>Vennligst skriv inn din egen, eller individuelle utskriftskommando. +Eksempler: kprinter lpr -P hp_laserjet</translation> </message> <message> <location filename="printercmddialog.ui" line="44"/> <source>Output format</source> - <translation>輸出格式</translation> + <translation>Utformat</translation> </message> <message> <location filename="printercmddialog.ui" line="50"/> <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source> - <translation>請選擇您要輸出的檔案格式 (如果您是使用CUPS列印服務，您可能是使用PDF)</translation> + <translation>Vennligst velg filformat for utskrift (relatert til ditt uskriftsoppsett - om du benytter CUPS kan du bruke PDF)</translation> </message> <message> <location filename="printercmddialog.ui" line="66"/> <source>PDF</source> - <translation></translation> + <translation>PDF</translation> </message> <message> <location filename="printercmddialog.ui" line="73"/> <source>PS</source> - <translation></translation> + <translation>PS</translation> </message> <message> <location filename="printercmddialog.ui" line="86"/> <source>Data structure</source> - <translation>數據結構</translation> + <translation>Datastruktur</translation> </message> <message> <location filename="printercmddialog.ui" line="92"/> <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source> - <translation>請選擇列印資料的輸入方式:</translation> + <translation>Vennligst velg metoden for inndatafil for utskrift (noen kommandoer aksepterer utskriftsfiler som programparametere, noen forventer data på standard inn):</translation> </message> <message> <location filename="printercmddialog.ui" line="108"/> <source>standard input (STDIN)</source> - <translation>標準輸入 (STDIN)</translation> + <translation>Standard inn (STDIN)</translation> </message> <message> <location filename="printercmddialog.ui" line="115"/> <source>Specify path as program parameter</source> - <translation>指定一個路徑做為程式的參數</translation> + <translation>Spesifiser stien som programparameter</translation> </message> <message> <location filename="printercmddialog.cpp" line="37"/> <source>Please enter your customized or individual printing command. Example: </source> - <translation>請輸入您自定的列印指令 -範例: + <translation>Vennligst skriv inn din egen, eller individuelle utskriftskommando. +Eksempel: </translation> </message> <message> <location filename="printercmddialog.cpp" line="45"/> <source><Path to gsprint.exe> -query -color</source> - <translation><Path to gsprint.exe> -query -color</translation> + <translatorcomment>Need to doublecheck this one</translatorcomment> + <translation><Sti til gsprint.exe> -query -color</translation> </message> </context> <context> @@ -1813,85 +1996,85 @@ Example: <message> <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> - <translation>工作階段偏好設定...</translation> + <translation>Sesjonsinnstillinger...</translation> </message> <message> <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示</translation> + <translation>Opprett sesjonsikon på skrivebordet...</translation> </message> <message> <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> - <translation>刪除工作階段</translation> + <translation>Slett sesjon</translation> </message> <message> <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> - <translation>工作階段動作</translation> + <translation>Sesjonshandlinger</translation> </message> <message> <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> - <translation>選擇類型</translation> + <translation>Velg type</translation> </message> <message> <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> - <translation>選擇解析度</translation> + <translation>Velg oppløsning</translation> </message> <message> <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> - <translation>切換聲音支援</translation> + <translation>Slå av/på lydstøtte</translation> </message> <message> <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> - <translation>新工作階段</translation> + <translation>Ny sesjon</translation> </message> <message> <location filename="sessionbutton.cpp" line="277"/> <source>running</source> - <translation>執行中</translation> + <translation>aktiv</translation> </message> <message> <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> - <translation>已暫停</translation> + <translation>frakoblet</translation> </message> <message> <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> - <translation type="unfinished"></translation> + <translation>KDE</translation> </message> <message> <location filename="sessionbutton.cpp" line="325"/> <location filename="sessionbutton.cpp" line="357"/> <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> - <translation>RDP連線</translation> + <translation>RDP tilkobling</translation> </message> <message> <location filename="sessionbutton.cpp" line="326"/> <location filename="sessionbutton.cpp" line="363"/> <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation>XDMCP</translation> </message> <message> <location filename="sessionbutton.cpp" line="327"/> <location filename="sessionbutton.cpp" line="351"/> <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> - <translation>連線至本地桌面</translation> + <translation>Tilkobling til lokalt skrivebord</translation> </message> <message> <location filename="sessionbutton.cpp" line="385"/> <location filename="sessionbutton.cpp" line="402"/> <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> - <translation>全螢幕</translation> + <translation>fullskjerm</translation> </message> <message> <location filename="sessionbutton.cpp" line="389"/> @@ -1900,25 +2083,25 @@ Example: <location filename="sessionbutton.cpp" line="669"/> <location filename="sessionbutton.cpp" line="672"/> <source>Display </source> - <translation>顯示</translation> + <translation>Skjerm </translation> </message> <message> <location filename="sessionbutton.cpp" line="397"/> <location filename="sessionbutton.cpp" line="437"/> <source>window</source> - <translation>視窗</translation> + <translation>vindu</translation> </message> <message> <location filename="sessionbutton.cpp" line="445"/> <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> - <translation>啟用</translation> + <translation>Aktivert</translation> </message> <message> <location filename="sessionbutton.cpp" line="447"/> <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> - <translation>停用</translation> + <translation>Deaktivert</translation> </message> </context> <context> @@ -1926,38 +2109,38 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="35"/> <source>E&xit</source> - <translation>離開(&x)</translation> + <translation>&Avslutt</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="41"/> <source>&New session</source> - <translation>建立新的工作階段(&N)</translation> + <translation>&Ny sesjon</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="42"/> <source>&Session preferences</source> - <translation>工作階段偏好設定(&S)</translation> + <translation>&Sesjonsinnstillinger</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="43"/> <source>&Delete session</source> - <translation>刪除工作階段(&D)</translation> + <translation>S&lett sesjon</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="47"/> <source>&Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示(&C)...</translation> + <translation>&Opprett sesjonsikon på skrivebordet...</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="81"/> <source>Delete</source> <comment>Delete</comment> - <translation>刪除</translation> + <translation>Slett</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="109"/> <source>Session management</source> - <translation>管理工作階段</translation> + <translation>Sesjonshåndtering</translation> </message> </context> <context> @@ -1965,154 +2148,155 @@ Example: <message> <location filename="sessionwidget.cpp" line="52"/> <source>Session name:</source> - <translation>工作階段名稱:</translation> + <translation>Sesjonsnavn:</translation> </message> <message> <location filename="sessionwidget.cpp" line="57"/> <source><< change icon</source> - <translation><< 更換圖示</translation> + <translation><< endre ikon</translation> </message> <message> <location filename="sessionwidget.cpp" line="60"/> <source>&Server</source> - <translation>伺服器(&S)</translation> + <translation>&Server</translation> </message> <message> <location filename="sessionwidget.cpp" line="87"/> <source>Host:</source> - <translation>主機:</translation> + <translation>Vert:</translation> </message> <message> <location filename="sessionwidget.cpp" line="88"/> <source>Login:</source> - <translation>登入帳號:</translation> + <translation>Brukernavn:</translation> </message> <message> <location filename="sessionwidget.cpp" line="89"/> <source>SSH port:</source> - <translation>SSH連接埠:</translation> + <translation>SSH port:</translation> </message> <message> <location filename="sessionwidget.cpp" line="101"/> <source>Use RSA/DSA key for ssh connection:</source> - <translation>使用RSA/DSA密鑰於SSH連線:</translation> + <translation>Bruk RSA/DSA nøkkel for SSH tilkobling:</translation> </message> <message> <location filename="sessionwidget.cpp" line="107"/> <source>Try auto login (ssh-agent or default ssh key)</source> - <translation>嘗試自動登入 (ssh代理或預設SSH密鑰)</translation> + <translation>Forsøk automatisk pålogging (SSH agent, eller standard SSH nøkkel)</translation> </message> <message> <location filename="sessionwidget.cpp" line="108"/> <source>Kerberos 5 (GSSAPI) authentication</source> - <translation>Kerberos 5 (GSSAPI) 認證</translation> + <translation>Kerberos 5 (GSSAPI) autentisering</translation> </message> <message> <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> - <translation>工作階段類型(&S)</translation> + <translation>&Sesjontype</translation> </message> <message> <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> - <translation>工作階段類型:</translation> + <translation>Sesjontype:</translation> </message> <message> <location filename="sessionwidget.cpp" line="127"/> <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> - <translation>連線至微軟終端伺服器</translation> + <translation>Koble til Windows terminal server</translation> </message> <message> <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation>XDMCP</translation> </message> <message> <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> - <translation>連線至本地桌面</translation> + <translation>Koble til lokalt skrivebord</translation> </message> <message> <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> - <translation>自訂桌面類型</translation> + <translatorcomment>The normal "brukertilpasset" doesn't fit here</translatorcomment> + <translation>Selvvalgt skrivebord</translation> </message> <message> <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> - <translation>單一應用程式</translation> + <translation>Enkel applikasjon</translation> </message> <message> <location filename="sessionwidget.cpp" line="133"/> <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> - <translation>指令:</translation> + <translation>Kommando:</translation> </message> <message> <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> - <translation>進階設定...</translation> + <translation>Avanserte alternativer...</translation> </message> <message> <location filename="sessionwidget.cpp" line="145"/> <location filename="sessionwidget.cpp" line="429"/> <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> - <translation>執行路徑</translation> + <translation>Sti til programfil</translation> </message> <message> <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> - <translation>開啟圖片</translation> + <translation>Åpne bilde</translation> </message> <message> <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> - <translation>圖片</translation> + <translation>Bilder</translation> </message> <message> <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> - <translation>開啟密鑰檔案</translation> + <translation>Åpne nøkkelfil</translation> </message> <message> <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> - <translation>所有檔案</translation> + <translation>Alle filer</translation> </message> <message> <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Feil</translation> </message> <message> <location filename="sessionwidget.cpp" line="232"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> - <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation> + <translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation> </message> <message> <location filename="sessionwidget.cpp" line="273"/> <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> - <translation>伺服器:</translation> + <translation>Server:</translation> </message> <message> <location filename="sessionwidget.cpp" line="279"/> <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> - <translation>XDMCP 伺服器:</translation> + <translation>XDMCP server:</translation> </message> <message> <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> - <translation>rdesktop 指令選項:</translation> + <translation>rdesktop kommandolinjevalg:</translation> </message> <message> <location filename="sessionwidget.cpp" line="310"/> <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> - <translation>新的工作階段</translation> + <translation>Ny sesjon</translation> </message> </context> <context> @@ -2121,131 +2305,132 @@ Example: <location filename="settingswidget.cpp" line="40"/> <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> - <translation>顯示(&D)</translation> + <translation>&Skjerm</translation> </message> <message> <location filename="settingswidget.cpp" line="41"/> <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> - <translation>鍵盤(&K)</translation> + <translation>&Tastatur</translation> </message> <message> <location filename="settingswidget.cpp" line="42"/> <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> - <translation>聲音</translation> + <translation>Lyd</translation> </message> <message> <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> - <translation>全螢幕</translation> + <translation>Fullskjerm</translation> </message> <message> <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> - <translation>自定</translation> + <translation>Tilpasset</translation> </message> <message> <location filename="settingswidget.cpp" line="61"/> <source>Window</source> - <translation>視窗</translation> + <translation>Vindu</translation> </message> <message> <location filename="settingswidget.cpp" line="63"/> <source>Use whole display</source> - <translation>使用整個顯示器</translation> + <translation>Bruk hele skjermen</translation> </message> <message> <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> - <translation>設定顯示DPI</translation> + <translation>Sett skjermens DPI</translation> </message> <message> <location filename="settingswidget.cpp" line="76"/> <source>Xinerama extension (support for two or more physical displays)</source> - <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation> + <translation>Xinerama utvidelse (støtte for to, eller flere fysiske skjermer)</translation> </message> <message> <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> - <translation>寬度:</translation> + <translation>Bredde:</translation> </message> <message> <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> - <translation>高度:</translation> + <translation>Høyde:</translation> </message> <message> <location filename="settingswidget.cpp" line="102"/> <source>&Display:</source> - <translation>顯示器(&D):</translation> + <translation>&Skjerm:</translation> </message> <message> <location filename="settingswidget.cpp" line="104"/> <source>&Identify all displays</source> - <translation>辨認所有顯示器(&I)</translation> + <translation>&Identifiser alle skjermer</translation> </message> <message> <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> - <translation>保持目前的鍵盤設定</translation> + <translation>Behold gjeldende tastaturoppsett</translation> </message> <message> <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> - <translation>鍵盤佈局:</translation> + <translation>Tastatur utseende:</translation> </message> <message> <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> - <translation>鍵盤型號:</translation> + <translation>Tastatur modell:</translation> </message> <message> <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> - <translation>啟用音效支援</translation> + <translation>Aktiver lydstøtte</translation> </message> <message> <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> - <translation>開啟聲音背景程式</translation> + <translatorcomment>The translated word for daemon is not easy to understand in this context, I choose to use 'tjener' since I never use this as a translation for 'server'</translatorcomment> + <translation>Start lydtjeneren</translation> </message> <message> <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> - <translation>使用目前的音效背景程式</translation> + <translation>Benytt kjørende lydtjener</translation> </message> <message> <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation>使用SSH連接埠轉送來建立 -可通過防火牆的聲音通道</translation> + <translation>Benytt SSH port videresendring for å tunnelere +lydsystem forbindelser gjennom brannmurer</translation> </message> <message> <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> - <translation>使用預設的聲音連接埠</translation> + <translation>Benytt standard lyd port</translation> </message> <message> <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> - <translation>聲音連接埠:</translation> + <translation>Lyd port:</translation> </message> <message> <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> - <translation>用戶端列印支援</translation> + <translation>Klientside utskrifts støtte</translation> </message> <message> - <location filename="settingswidget.cpp" line="557"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> - <translation>us</translation> + <translation>no</translation> </message> <message> - <location filename="settingswidget.cpp" line="558"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translation>pc105/no</translation> </message> </context> <context> @@ -2253,176 +2438,180 @@ sound system connections through firewalls</source> <message> <location filename="sharewidget.cpp" line="37"/> <source>&Folders</source> - <translation>資料夾(&F)</translation> + <translation>&Mapper</translation> </message> <message> <location filename="sharewidget.cpp" line="47"/> <source>Path</source> - <translation>路徑</translation> + <translation>Sti</translation> </message> <message> <location filename="sharewidget.cpp" line="49"/> <location filename="sharewidget.cpp" line="131"/> <source>Automount</source> - <translation>自動掛載</translation> + <translation>Automonter</translation> </message> <message> <location filename="sharewidget.cpp" line="58"/> <source>Add</source> - <translation>新增</translation> + <translation>Legg til</translation> </message> <message> <location filename="sharewidget.cpp" line="59"/> <source>Delete</source> - <translation>刪除</translation> + <translation>Slett</translation> </message> <message> <location filename="sharewidget.cpp" line="69"/> <source>Path:</source> - <translation>路徑:</translation> + <translation>Sti:</translation> </message> <message> <location filename="sharewidget.cpp" line="76"/> <source>Filename encoding</source> - <translation>檔案編碼方式</translation> + <translation>Tegnkoding av filnavn</translation> </message> <message> <location filename="sharewidget.cpp" line="82"/> <source>local:</source> - <translation>本地端:</translation> + <translation>lokal:</translation> </message> <message> <location filename="sharewidget.cpp" line="83"/> <source>remote:</source> - <translation>遠端:</translation> + <translatorcomment>ouch! This word is really hard to get right in Norwegian in these contextes...</translatorcomment> + <translation>fjerntliggende:</translation> </message> <message> <location filename="sharewidget.cpp" line="95"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation> + <translation>Benytt SSH port videresendring for å tunnelere lydsystem forbindelser gjennom brannmurer</translation> </message> <message> <location filename="sharewidget.cpp" line="158"/> <source>Select folder</source> - <translation>選擇資料夾</translation> + <translation>Velg mappe</translation> </message> <message> <location filename="sharewidget.cpp" line="169"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Feil</translation> </message> <message> <location filename="sharewidget.cpp" line="170"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> - <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation> + <translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation> </message> <message> <location filename="sharewidget.cpp" line="229"/> <location filename="sharewidget.cpp" line="280"/> <source>WINDOWS-1252</source> - <translation type="unfinished"></translation> + <translation>WINDOWS-1252</translation> </message> <message> <location filename="sharewidget.cpp" line="239"/> <location filename="sharewidget.cpp" line="286"/> <source>ISO8859-1</source> - <translation type="unfinished"></translation> + <translation>ISO8859-1</translation> </message> </context> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="111"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> - <translation>libssh無法初始化</translation> + <translatorcomment>I need to revisit the word 'initiere', a better word could be 'klargjøre'</translatorcomment> + <translation>Klarer ikke å initiere libssh</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="131"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> - <translation>無法建立SSH工作階段</translation> + <translation>Klarer ikke å opprette ssh sesjon</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="146"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> - <translation>無法連線至 </translation> + <translation>Klarer ikke å koble til </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> - <translation>驗證失敗</translation> + <translation>Autentisering feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="203"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> - <translation>channel_forward_listen失敗</translation> + <translatorcomment>I'm not sure if this is a static variable which shouldn't be translated or not, but I left it as I believe it's a variable.</translatorcomment> + <translation>channel_forward_listen feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="517"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> - <translation>無法開啟檔案</translation> + <translation>Kan ikke åpne filen </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="529"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> - <translation>無法創建遠端檔案</translation> + <translation>Klarer ikke å opprette fil over nettverket </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="542"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> - <translation>無法寫入資料至遠端檔案</translation> + <translation>Klarer ikke å skrive til filen over nettverket </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="592"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> - <translation>無法連線至 </translation> + <translation>Klarer ikke å koble til </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> - <translation>channel_open_forward失敗</translation> + <translation>channel_open_forward feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="720"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> - <translation>channel_open_session失敗</translation> + <translation>channel_open_session feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="727"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> - <translation>channel_request_exec失敗</translation> + <translation>channel_request_exec feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="792"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> - <translation type="unfinished"></translation> + <translatorcomment>Really not any great words to best translate socket into...</translatorcomment> + <translation>feil ved skriving til sokkelen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="810"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> - <translation type="unfinished"></translation> + <translation>feil under lesing av kanalen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="840"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> - <translation type="unfinished"></translation> + <translation>channel_write feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="852"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> - <translation type="unfinished"></translation> + <translation>feil ved lesing av tcp sokkelen</translation> </message> </context> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> - <translation type="unfinished"></translation> + <translation>feil under opprettelse av sokkelen</translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> - <translation type="unfinished"></translation> + <translation>Feil ved binding </translation> </message> </context> <context> @@ -2430,12 +2619,12 @@ sound system connections through firewalls</source> <message> <location filename="xsettingswidget.cpp" line="50"/> <source>Open File</source> - <translation>開啟檔案</translation> + <translation>Åpne fil</translation> </message> <message> <location filename="xsettingswidget.cpp" line="52"/> <source>Executable (*.exe)</source> - <translation>執行檔 (*.exe)</translation> + <translation>Programfil (*.exe)</translation> </message> </context> <context> @@ -2443,62 +2632,65 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="14"/> <source>Form</source> - <translation>表單</translation> + <translation>Skjema</translation> </message> <message> <location filename="xsettingsui.ui" line="27"/> - <source>You must restart the X2go Client for the changes to take effect</source> - <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation> + <source>You must restart the X2Go Client for the changes to take effect</source> + <translation>Du må restarte X2Go klienten for at endringene skal tre i kraft</translation> </message> <message> <location filename="xsettingsui.ui" line="50"/> <source>use integrated X-Server</source> - <translation>使用內建的X伺服器</translation> + <translation>Benytt integrert X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="60"/> <source>use custom X-Server</source> - <translation>使用自定的X伺服器</translation> + <translation>Benytt egentilpasset X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="70"/> <source>custom X-Server</source> - <translation>自定X伺服器</translation> + <translation>egentilpasset X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="78"/> <source>executable:</source> - <translation>執行路徑:</translation> + <translation>programfil:</translation> </message> <message> <location filename="xsettingsui.ui" line="101"/> <source>start X-Server on X2Go client start</source> - <translation>當X2Go用戶端啟動時啟動X伺服器</translation> + <translation>start X-Serveren når X2Go klienten startes</translation> </message> <message> <location filename="xsettingsui.ui" line="113"/> <source>command line options:</source> - <translation>指令列選項:</translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>kommandolinjevalg</translation> </message> <message> <location filename="xsettingsui.ui" line="125"/> <source>X-Server command line options</source> - <translation>X伺服器指令列選項</translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>X-Server kommandolinjevalg</translation> </message> <message> <location filename="xsettingsui.ui" line="131"/> <source>window mode:</source> - <translation>視窗模式:</translation> + <translation>Vindus-modus:</translation> </message> <message> <location filename="xsettingsui.ui" line="141"/> <source>fullscreen mode:</source> - <translation>全螢幕模式:</translation> + <translation>fullskjerm-modus:</translation> </message> <message> <location filename="xsettingsui.ui" line="151"/> <source>single application:</source> - <translation>單一應用程式:</translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>enkeltapplikasjon:</translation> </message> </context> </TS> diff --git a/x2goclient_ru.qm b/x2goclient_ru.qm deleted file mode 100644 index 1dd3769..0000000 Binary files a/x2goclient_ru.qm and /dev/null differ diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index b49003a..3bc79f4 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -124,6 +124,57 @@ </message> </context> <context> + <name>ConTest</name> + <message> + <location filename="contest.ui" line="14"/> + <source>Connectivity test</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="24"/> + <source>HTTPS connection:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="31"/> + <source>SSH connection:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="38"/> + <source>Connection speed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="123"/> + <location filename="contest.ui" line="167"/> + <source>Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.ui" line="211"/> + <source>0 Kb/s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="108"/> + <location filename="contest.cpp" line="115"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="150"/> + <source>Socket operation timed out</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="contest.cpp" line="162"/> + <location filename="contest.cpp" line="168"/> + <source>Failed: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ConfigDialog</name> <message> <location filename="configdialog.cpp" line="87"/> @@ -874,125 +925,125 @@ sound system connections through firewalls</source> <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="164"/> + <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> <translation>ru</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> + <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> <translation>pc105/ru</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="294"/> <location filename="httpbrokerclient.cpp" line="308"/> - <location filename="httpbrokerclient.cpp" line="345"/> + <location filename="httpbrokerclient.cpp" line="328"/> + <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="309"/> + <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="433"/> + <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> <translation> Сервер использует недостоверный SSL сертификат. </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="436"/> + <location filename="httpbrokerclient.cpp" line="457"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> <translation>Вам не следует добавлять исключение если вы используете интернет соединение в котором вы не полностью уверены или если вы не должны были бы получить подобное предупрежедение при соединении с этим сервером</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="441"/> + <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> <translation>Безопасное соединение невозможно</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="446"/> + <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> <translation>Issued to: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="447"/> - <location filename="httpbrokerclient.cpp" line="459"/> + <location filename="httpbrokerclient.cpp" line="468"/> + <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> <translation>Common Name(CN) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="450"/> - <location filename="httpbrokerclient.cpp" line="462"/> + <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> <translation>Organization(O) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="453"/> - <location filename="httpbrokerclient.cpp" line="465"/> + <location filename="httpbrokerclient.cpp" line="474"/> + <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> <translation>Organizational Unit(OU) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="456"/> + <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> <translation>Serial Number </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="458"/> + <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> <translation>Issued by: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="469"/> + <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> <translation>Validity: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="470"/> + <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> <translation>Issued on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> <translation>expires on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="472"/> + <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> <translation>Fingerprints: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="473"/> + <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> <translation>SHA1 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="475"/> + <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> <translation>MD5 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="481"/> + <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> <translation>Выход</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="483"/> + <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> <translation>Добавить исключение</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="346"/> + <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> <translation>Ваша сессия больше не действительна. Чтобы продолжить соединение, вернитесь на страницу регистрации или используйте функцию обновления страницы броузера.</translation> </message> @@ -1000,41 +1051,41 @@ sound system connections through firewalls</source> <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="80"/> - <location filename="onmainwindow_part3.cpp" line="307"/> + <location filename="onmainwindow.cpp" line="84"/> + <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> <translation>ru</translation> </message> <message> - <location filename="onmainwindow.cpp" line="81"/> + <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> <translation>pc105/ru</translation> </message> <message> - <location filename="onmainwindow.cpp" line="329"/> + <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="601"/> - <location filename="onmainwindow.cpp" line="1782"/> - <location filename="onmainwindow_part3.cpp" line="1636"/> + <location filename="onmainwindow.cpp" line="610"/> + <location filename="onmainwindow.cpp" line="1820"/> + <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> <translation>Сессия:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="653"/> + <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="onmainwindow.cpp" line="654"/> + <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="655"/> - <location filename="onmainwindow.cpp" line="940"/> + <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> <translation>Выход</translation> </message> @@ -1043,7 +1094,7 @@ sound system connections through firewalls</source> <translation type="obsolete">&Новая сессия ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="659"/> + <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> @@ -1052,17 +1103,17 @@ sound system connections through firewalls</source> <translation type="obsolete">Управление сессиями...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="665"/> + <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="onmainwindow.cpp" line="325"/> + <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> <translation>&Установки ...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2052"/> + <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> <translation>Восстановить панель инструментов</translation> </message> @@ -1071,121 +1122,121 @@ sound system connections through firewalls</source> <translation type="obsolete">О программе "X2GO Client"</translation> </message> <message> - <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> <translation>О Qt</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2456"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> <translation>Сессия</translation> </message> <message> - <location filename="onmainwindow.cpp" line="715"/> + <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="721"/> + <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> <translation>&Сессия</translation> </message> <message> - <location filename="onmainwindow.cpp" line="722"/> + <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> <translation>&Опции</translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="onmainwindow.cpp" line="776"/> - <location filename="onmainwindow.cpp" line="1775"/> - <location filename="onmainwindow_part3.cpp" line="1629"/> - <location filename="onmainwindow_part4.cpp" line="1422"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> <translation>Пользователь:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1423"/> + <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> <translation>Пароль:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1424"/> + <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> <translation type="unfinished">Раскладка Клавиатуры:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1465"/> + <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> <translation>ОК</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1467"/> - <location filename="onmainwindow_part4.cpp" line="1756"/> - <location filename="onmainwindow_part4.cpp" line="1758"/> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2252"/> + <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> - <location filename="onmainwindow.cpp" line="830"/> - <location filename="onmainwindow.cpp" line="1471"/> - <location filename="onmainwindow.cpp" line="1499"/> - <location filename="onmainwindow.cpp" line="1507"/> - <location filename="onmainwindow.cpp" line="1640"/> - <location filename="onmainwindow.cpp" line="1667"/> - <location filename="onmainwindow.cpp" line="1670"/> - <location filename="onmainwindow.cpp" line="1917"/> - <location filename="onmainwindow.cpp" line="2140"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2167"/> - <location filename="onmainwindow.cpp" line="2201"/> - <location filename="onmainwindow.cpp" line="2246"/> - <location filename="onmainwindow_part2.cpp" line="297"/> - <location filename="onmainwindow_part2.cpp" line="473"/> - <location filename="onmainwindow_part2.cpp" line="482"/> - <location filename="onmainwindow_part2.cpp" line="781"/> - <location filename="onmainwindow_part2.cpp" line="1232"/> - <location filename="onmainwindow_part2.cpp" line="1293"/> - <location filename="onmainwindow_part2.cpp" line="1344"/> - <location filename="onmainwindow_part2.cpp" line="1377"/> - <location filename="onmainwindow_part2.cpp" line="1421"/> - <location filename="onmainwindow_part2.cpp" line="1801"/> - <location filename="onmainwindow_part2.cpp" line="1827"/> - <location filename="onmainwindow_part2.cpp" line="1958"/> + <location filename="onmainwindow.cpp" line="820"/> + <location filename="onmainwindow.cpp" line="848"/> + <location filename="onmainwindow.cpp" line="1495"/> + <location filename="onmainwindow.cpp" line="1524"/> + <location filename="onmainwindow.cpp" line="1532"/> + <location filename="onmainwindow.cpp" line="1678"/> + <location filename="onmainwindow.cpp" line="1705"/> + <location filename="onmainwindow.cpp" line="1708"/> + <location filename="onmainwindow.cpp" line="1955"/> + <location filename="onmainwindow.cpp" line="2178"/> + <location filename="onmainwindow.cpp" line="2192"/> + <location filename="onmainwindow.cpp" line="2205"/> + <location filename="onmainwindow.cpp" line="2239"/> + <location filename="onmainwindow.cpp" line="2284"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> + <location filename="onmainwindow_part2.cpp" line="1830"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> - <location filename="onmainwindow_part3.cpp" line="768"/> - <location filename="onmainwindow_part3.cpp" line="848"/> - <location filename="onmainwindow_part3.cpp" line="1092"/> - <location filename="onmainwindow_part3.cpp" line="1220"/> - <location filename="onmainwindow_part3.cpp" line="1273"/> - <location filename="onmainwindow_part3.cpp" line="1579"/> - <location filename="onmainwindow_part3.cpp" line="1581"/> - <location filename="onmainwindow_part3.cpp" line="1811"/> - <location filename="onmainwindow_part3.cpp" line="1859"/> - <location filename="onmainwindow_part3.cpp" line="1887"/> - <location filename="onmainwindow_part3.cpp" line="2257"/> - <location filename="onmainwindow_part3.cpp" line="2272"/> - <location filename="onmainwindow_part3.cpp" line="2326"/> + <location filename="onmainwindow_part3.cpp" line="773"/> + <location filename="onmainwindow_part3.cpp" line="854"/> + <location filename="onmainwindow_part3.cpp" line="1098"/> + <location filename="onmainwindow_part3.cpp" line="1226"/> + <location filename="onmainwindow_part3.cpp" line="1279"/> + <location filename="onmainwindow_part3.cpp" line="1585"/> + <location filename="onmainwindow_part3.cpp" line="1587"/> + <location filename="onmainwindow_part3.cpp" line="1817"/> + <location filename="onmainwindow_part3.cpp" line="1865"/> + <location filename="onmainwindow_part3.cpp" line="1893"/> + <location filename="onmainwindow_part3.cpp" line="2263"/> + <location filename="onmainwindow_part3.cpp" line="2278"/> + <location filename="onmainwindow_part3.cpp" line="2332"/> <location filename="onmainwindow_part4.cpp" line="29"/> <location filename="onmainwindow_part4.cpp" line="54"/> - <location filename="onmainwindow_part4.cpp" line="1980"/> - <location filename="onmainwindow_part4.cpp" line="2251"/> + <location filename="onmainwindow_part4.cpp" line="2214"/> + <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1582"/> + <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> <translation>Проверте настройки LDAP</translation> </message> @@ -1198,32 +1249,32 @@ sound system connections through firewalls</source> <translation type="obsolete">Удалить сессию?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2372"/> + <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2443"/> + <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> <translation> на </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="290"/> - <location filename="onmainwindow_part2.cpp" line="1286"/> - <location filename="onmainwindow_part2.cpp" line="1370"/> - <location filename="onmainwindow_part2.cpp" line="1403"/> - <location filename="onmainwindow_part3.cpp" line="761"/> - <location filename="onmainwindow_part3.cpp" line="841"/> - <location filename="onmainwindow_part3.cpp" line="1213"/> - <location filename="onmainwindow_part3.cpp" line="1266"/> - <location filename="onmainwindow_part3.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> + <location filename="onmainwindow_part3.cpp" line="766"/> + <location filename="onmainwindow_part3.cpp" line="847"/> + <location filename="onmainwindow_part3.cpp" line="1219"/> + <location filename="onmainwindow_part3.cpp" line="1272"/> + <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> <translation>Ошибка соединения </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> <translation>Неверный пароль! </translation> </message> @@ -1232,51 +1283,51 @@ sound system connections through firewalls</source> <translation type="obsolete">Не доступен ни один сервер</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1002"/> - <location filename="onmainwindow_part4.cpp" line="1752"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> <translation>Сессия:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1754"/> + <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> <translation>Восстановить</translation> </message> <message> - <location filename="onmainwindow.cpp" line="479"/> - <location filename="onmainwindow.cpp" line="927"/> - <location filename="onmainwindow_part2.cpp" line="2200"/> - <location filename="onmainwindow_part4.cpp" line="1761"/> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> <translation>Прервать</translation> </message> <message> - <location filename="onmainwindow.cpp" line="482"/> - <location filename="onmainwindow.cpp" line="928"/> - <location filename="onmainwindow_part4.cpp" line="1609"/> - <location filename="onmainwindow_part4.cpp" line="1763"/> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> <translation>Завершить</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1766"/> + <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> <translation>Новая</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2458"/> - <location filename="onmainwindow_part4.cpp" line="1833"/> - <location filename="onmainwindow_part4.cpp" line="1855"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> <translation>Дисплей</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1835"/> + <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1841"/> + <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> <translation>Сервер</translation> </message> @@ -1285,57 +1336,57 @@ sound system connections through firewalls</source> <translation type="obsolete">Время создания</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> + <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> <translation>IP клиента</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1848"/> + <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> <translation>ID сессии</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1018"/> - <location filename="onmainwindow_part2.cpp" line="1112"/> - <location filename="onmainwindow_part2.cpp" line="2164"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> <translation>активна</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1020"/> - <location filename="onmainwindow_part2.cpp" line="1305"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> <translation>прервана</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1153"/> - <location filename="onmainwindow_part2.cpp" line="1173"/> - <location filename="onmainwindow_part2.cpp" line="1987"/> - <location filename="onmainwindow_part2.cpp" line="2376"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1154"/> - <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> <translation>Глубина цвета вашего дисплея не соответствует глубине цвета данной сессии. Это может помешать восстановлению сессии и в большинстве случаевсессия будет утеряна Рекомендуется изменить глубину цвета вашего дисплея на(sp)</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> <translation>24 или 32</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1163"/> - <location filename="onmainwindow_part2.cpp" line="1183"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> <translation> бит и перезапустить X-сервер до восстановления сессии. Попробовать восстановить сессию не смотря на данное предупреждение?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> <translation>Да</translation> </message> @@ -1351,54 +1402,54 @@ It is now: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1167"/> - <location filename="onmainwindow_part2.cpp" line="1187"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> <translation>Нет</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="483"/> - <location filename="onmainwindow_part2.cpp" line="782"/> - <location filename="onmainwindow_part2.cpp" line="1233"/> - <location filename="onmainwindow_part2.cpp" line="1345"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1250"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> <translation>прерывается</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1272"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> <translation>завершается</translation> </message> @@ -1411,38 +1462,38 @@ Public key hash: </source> <translation type="obsolete">Невозможно записать файл:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1985"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> <translation>Ошибка создания SSL тунеля: </translation> </message> <message> - <location filename="onmainwindow.cpp" line="143"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2148"/> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> <translation>соединение</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2156"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> <translation>запуск</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2158"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> <translation>восстановление</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2220"/> - <location filename="onmainwindow_part2.cpp" line="2488"/> - <location filename="onmainwindow_part2.cpp" line="2506"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> <translation>Таймаут соединения, отмена</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2221"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> <translation>отмена</translation> </message> @@ -1451,7 +1502,7 @@ Public key hash: </source> <translation type="obsolete">ID сессии: Сервер: Пользователь: Дисплей: Время создания: Статус:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1608"/> + <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> <translation>Отмена</translation> </message> @@ -1472,87 +1523,87 @@ Public key hash: </source> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="404"/> + <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="415"/> - <location filename="onmainwindow_part3.cpp" line="425"/> - <location filename="onmainwindow_part3.cpp" line="435"/> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="459"/> + <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="487"/> + <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="505"/> + <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="522"/> - <location filename="onmainwindow_part3.cpp" line="533"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="551"/> + <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="568"/> + <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="590"/> + <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="609"/> + <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="663"/> + <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> <translation></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="671"/> - <location filename="onmainwindow_part3.cpp" line="674"/> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> <translation>wrong parameter: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="719"/> - <location filename="onmainwindow_part3.cpp" line="745"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> <translation>Опции</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> <translation>Available pack methodes:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1511"/> + <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1516"/> + <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> @@ -1583,7 +1634,7 @@ Public key hash: </source> <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации.</transl ation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1812"/> + <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> <translation>Формат карты неизвестен</translation> </message> @@ -1592,19 +1643,19 @@ Public key hash: </source> <translation type="obsolete">Эта карта не сконфигурирована для использования с X2Go</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1888"/> + <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> <translation>Невозможно создать файл: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2053"/> - <location filename="onmainwindow_part3.cpp" line="2078"/> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> <translation>Невозможно присоединиться к X-серверу</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2054"/> - <location filename="onmainwindow_part3.cpp" line="2079"/> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> <translation>Невозможно присоединиться к X-серверу @@ -1615,7 +1666,7 @@ Please check your settings</source> <translation type="obsolete">Невозможно запустить X-Сервер</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2087"/> + <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> <translation>Невозможно запустить X-Сервер @@ -1634,42 +1685,42 @@ Please check your settings</source> <translation type="obsolete">Почтовый клиент</translation> </message> <message> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="153"/> + <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> <translation>Терминал</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="409"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1837"/> + <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> <translation>Команда</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1839"/> + <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> <translation>Оконный менеджер</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> <translation>приложение</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1030"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> <translation>теневая сессия</translation> </message> @@ -1678,196 +1729,201 @@ Please check your settings</source> <translation type="obsolete"> Ошибка настроек "sudo"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2273"/> + <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> <translation>Невозможно выполнить: </translation> </message> <message> - <location filename="onmainwindow.cpp" line="126"/> + <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="150"/> + <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> <translation>Веб-броузер</translation> </message> <message> - <location filename="onmainwindow.cpp" line="151"/> + <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> <translation>Почтовый клиент</translation> </message> <message> - <location filename="onmainwindow.cpp" line="658"/> + <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> <translation>&Новая сессия ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> <translation>Управление сессиями...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="692"/> - <location filename="onmainwindow.cpp" line="713"/> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> <translation>Панель инструментов</translation> </message> <message> - <location filename="onmainwindow.cpp" line="336"/> - <location filename="onmainwindow_part3.cpp" line="1536"/> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> <translation>О программе "X2GO Client"</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1472"/> - <location filename="onmainwindow.cpp" line="1641"/> - <location filename="onmainwindow.cpp" line="1671"/> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> <translation>Проверьте настройки LDAP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1506"/> + <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> <translation>Сервер X2Go не найден в LDAP </translation> </message> <message> - <location filename="onmainwindow.cpp" line="2065"/> + <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> <translation>Удалить сессию?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="764"/> - <location filename="onmainwindow_part3.cpp" line="844"/> - <location filename="onmainwindow_part3.cpp" line="1216"/> - <location filename="onmainwindow_part3.cpp" line="1269"/> - <location filename="onmainwindow_part3.cpp" line="2253"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> <source>Wrong password! </source> <translation>Неверный пароль! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="474"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> <translation>Не доступен ни один сервер</translation> </message> <message> - <location filename="onmainwindow.cpp" line="923"/> - <location filename="onmainwindow_part2.cpp" line="2061"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <oldsource>Active connection</oldsource> <translation>Соединение не установлено</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> <translation>Время создания</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1799"/> - <location filename="onmainwindow_part3.cpp" line="1090"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> <translation>Невозможно создать каталог:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1825"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> <translation>Невозможно записать файл:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1956"/> - <location filename="onmainwindow_part3.cpp" line="2324"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> <translation>Ошибка создания SSL тунеля: </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1600"/> + <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> <translation>ID сессии: Сервер: Пользователь: Дисплей: Время создания: Статус:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="476"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow_part4.cpp" line="1610"/> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> <translation>Экспорт каталога...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1612"/> + <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> <translation>Показать детали</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1537"/> + <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> <translation>X2Go Client V. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1860"/> + <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> <translation>Эта карта не сконфигурирована для использования с X2Go</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2289"/> + <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> <translation>Удаленный сервер не поддерживает экспорт файловой системы через SSH туннель Пожалуйста обновите пакет x2goserver</translation> </message> <message> - <location filename="onmainwindow.cpp" line="675"/> + <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> <translation>&Создать ярлык сессии на рабочем столе...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> + <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="830"/> + <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="879"/> + <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> + <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> <translation>Восстановить</translation> </message> <message> - <location filename="onmainwindow.cpp" line="951"/> + <location filename="onmainwindow.cpp" line="969"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> <translation>Щелчок левой кнопкой: спрятать/восстановить - правой: отобразить контекстное меню</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1805"/> + <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> <translation>Создать ярлык сессии на рабочем столе</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1806"/> + <location filename="onmainwindow.cpp" line="1844"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> @@ -1876,44 +1932,44 @@ Use x2goclient hidden mode?</source> Активировать скрытый режим?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1817"/> + <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> <translation>Новая сессия</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1917"/> + <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2431"/> + <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> <translation>RDP соединение</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1867"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow_part4.cpp" line="1054"/> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> <translation>Отсоединить окно</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1930"/> - <location filename="onmainwindow_part4.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> <translation>Присоединить окно</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2133"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> <translation>завершена</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2377"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation>Вы уверены, что хотите удалить эту сессию? @@ -1924,7 +1980,7 @@ Unsaved documents will be lost</source> <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более деталь� �ой информации. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2101"/> + <location filename="onmainwindow_part3.cpp" line="2107"/> <location filename="onmainwindow_part4.cpp" line="422"/> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server @@ -1933,18 +1989,18 @@ Please check your installation</source> Переустановите X2Go Client</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1118"/> + <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> <translation>Сессия X2Go</translation> </message> <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow_part4.cpp" line="2064"/> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> <translation>Свернуть панель</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2097"/> + <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation> &nbsp;&nbsp;&nbsp;Щелкните по этой иконке&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;чтобы восстановить панель инструментов&nbsp;&nbsp;&nbsp; </translation> </message> @@ -1953,7 +2009,7 @@ Please check your installation</source> <translation type="obsolete">Невозможно открыть файл:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1981"/> + <location filename="onmainwindow_part4.cpp" line="2215"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> @@ -1962,65 +2018,65 @@ you can install sshd with sudo apt-get install openssh-server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2439"/> + <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> <translation>Соединение с локальным десктопом</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1063"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> <translation>Информация</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1077"/> - <location filename="onmainwindow_part4.cpp" line="2165"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1084"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> <translation>Выбрать десктоп:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1772"/> + <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> <translation>Только смотреть</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1852"/> + <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> <translation>Пользователь</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2435"/> + <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1064"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> <translation>Доступный десктоп не найден</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1769"/> + <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> <translation>Полный доступ</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1883"/> + <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> <translation>Только мои десктопы</translation> </message> <message> - <location filename="onmainwindow.cpp" line="484"/> + <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> <translation>Повторить соединение</translation> </message> <message> - <location filename="onmainwindow.cpp" line="834"/> - <location filename="onmainwindow.cpp" line="2354"/> - <location filename="onmainwindow_part4.cpp" line="2234"/> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> <source>Connecting to broker</source> <translation>Соединение с брокером</translation> </message> @@ -2029,12 +2085,12 @@ you can install sshd with <translation type="obsolete"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1520"/> + <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation> x2goplugin был разработан при поддержке <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1524"/> + <location filename="onmainwindow_part3.cpp" line="1530"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> <translation> Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации.</translation> </message> @@ -2049,7 +2105,7 @@ you can install sshd with <translation>KOI8-R</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1300"/> + <location filename="onmainwindow_part4.cpp" line="1534"/> <source>wrong value for argument"speed"</source> <translation>wrong value for argument"speed"</translation> </message> @@ -2283,103 +2339,112 @@ Example: <translation type="obsolete">Активировать звук</translation> </message> <message> - <location filename="sessionbutton.cpp" line="270"/> + <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> <translation>Новая сессия</translation> </message> <message> - <location filename="sessionbutton.cpp" line="383"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="635"/> + <location filename="sessionbutton.cpp" line="385"/> + <location filename="sessionbutton.cpp" line="402"/> + <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> <translation>Полноэкранная сессия</translation> </message> <message> - <location filename="sessionbutton.cpp" line="417"/> - <location filename="sessionbutton.cpp" line="547"/> + <location filename="sessionbutton.cpp" line="389"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="416"/> + <location filename="sessionbutton.cpp" line="669"/> + <location filename="sessionbutton.cpp" line="672"/> + <source>Display </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sessionbutton.cpp" line="445"/> + <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> <translation>активирован</translation> </message> <message> - <location filename="sessionbutton.cpp" line="419"/> - <location filename="sessionbutton.cpp" line="549"/> + <location filename="sessionbutton.cpp" line="447"/> + <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> <translation>деактивирован</translation> </message> <message> - <location filename="sessionbutton.cpp" line="390"/> - <location filename="sessionbutton.cpp" line="409"/> + <location filename="sessionbutton.cpp" line="397"/> + <location filename="sessionbutton.cpp" line="437"/> <source>window</source> <translation>окно</translation> </message> <message> - <location filename="sessionbutton.cpp" line="114"/> + <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> <translation>Установки сессии...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="118"/> + <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> <translation>Создать ярлык сессии на рабочем столе...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="123"/> + <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> <translation>Удалить сессию</translation> </message> <message> - <location filename="sessionbutton.cpp" line="136"/> + <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> <translation>Опции</translation> </message> <message> - <location filename="sessionbutton.cpp" line="137"/> + <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> <translation>Тип сессии</translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> + <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> <translation>Выбрать разрешение</translation> </message> <message> - <location filename="sessionbutton.cpp" line="140"/> + <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> <translation>Звук</translation> </message> <message> - <location filename="sessionbutton.cpp" line="275"/> + <location filename="sessionbutton.cpp" line="277"/> <source>running</source> <translation type="unfinished">активна</translation> </message> <message> - <location filename="sessionbutton.cpp" line="279"/> + <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> <translation type="unfinished">прервана</translation> </message> <message> - <location filename="sessionbutton.cpp" line="312"/> + <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="sessionbutton.cpp" line="323"/> - <location filename="sessionbutton.cpp" line="355"/> - <location filename="sessionbutton.cpp" line="588"/> + <location filename="sessionbutton.cpp" line="325"/> + <location filename="sessionbutton.cpp" line="357"/> + <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> <translation>RDP соединение</translation> </message> <message> - <location filename="sessionbutton.cpp" line="325"/> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="582"/> + <location filename="sessionbutton.cpp" line="327"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> <translation>Соединение с локальным десктопом</translation> </message> <message> - <location filename="sessionbutton.cpp" line="324"/> - <location filename="sessionbutton.cpp" line="361"/> - <location filename="sessionbutton.cpp" line="594"/> + <location filename="sessionbutton.cpp" line="326"/> + <location filename="sessionbutton.cpp" line="363"/> + <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> @@ -2482,109 +2547,114 @@ Example: <translation>Автоматическое соединение с SSH ключом по умолчанию или программой ssh-agent</translation> </message> <message> - <location filename="sessionwidget.cpp" line="111"/> + <location filename="sessionwidget.cpp" line="108"/> + <source>Kerberos 5 (GSSAPI) authentication</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> <translation>&Тип сессии</translation> </message> <message> - <location filename="sessionwidget.cpp" line="116"/> + <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> <translation>Тип сессии:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="125"/> - <location filename="sessionwidget.cpp" line="292"/> + <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> <translation>Соединение с терминальным сервером Windows</translation> </message> <message> - <location filename="sessionwidget.cpp" line="128"/> + <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> <translation>Другой оконный менеджер</translation> </message> <message> - <location filename="sessionwidget.cpp" line="129"/> + <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> <translation>Приложение</translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> - <location filename="sessionwidget.cpp" line="248"/> + <location filename="sessionwidget.cpp" line="133"/> + <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> <translation>Команда:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="132"/> + <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> <translation>Продвинутые установки...</translation> </message> <message> - <location filename="sessionwidget.cpp" line="143"/> - <location filename="sessionwidget.cpp" line="420"/> - <location filename="sessionwidget.cpp" line="482"/> + <location filename="sessionwidget.cpp" line="145"/> + <location filename="sessionwidget.cpp" line="429"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> <translation>Путь к исполняемому файлу</translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> <translation>Открыть изображение</translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> <translation>Изображения</translation> </message> <message> - <location filename="sessionwidget.cpp" line="215"/> + <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> <translation>Открыть файл с ключом</translation> </message> <message> - <location filename="sessionwidget.cpp" line="217"/> + <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="sessionwidget.cpp" line="269"/> - <location filename="sessionwidget.cpp" line="384"/> + <location filename="sessionwidget.cpp" line="273"/> + <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> <translation>Сервер:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="293"/> + <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> <translation>Опции командной строки rdesktop:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="306"/> - <location filename="sessionwidget.cpp" line="404"/> + <location filename="sessionwidget.cpp" line="310"/> + <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> <translation>Новая сессия</translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> <translation>Соединение с локальным десктопом</translation> </message> <message> - <location filename="sessionwidget.cpp" line="275"/> - <location filename="sessionwidget.cpp" line="392"/> + <location filename="sessionwidget.cpp" line="279"/> + <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> <translation>Сервер XDMCP:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> + <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="sessionwidget.cpp" line="227"/> + <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="sessionwidget.cpp" line="228"/> + <location filename="sessionwidget.cpp" line="232"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation>x2goclient запущен в "переносимом" режиме. Пожалуйста выберите путь находящийся в пределах используемого носителя для того, что бы всегда иметь доступ к Вашим данным</translation> </message> @@ -2592,112 +2662,132 @@ Example: <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="33"/> - <location filename="settingswidget.cpp" line="37"/> + <location filename="settingswidget.cpp" line="40"/> + <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> <translation>&Дисплей</translation> </message> <message> - <location filename="settingswidget.cpp" line="34"/> - <location filename="settingswidget.cpp" line="38"/> + <location filename="settingswidget.cpp" line="41"/> + <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> <translation>&Клавиатура</translation> </message> <message> - <location filename="settingswidget.cpp" line="35"/> - <location filename="settingswidget.cpp" line="39"/> + <location filename="settingswidget.cpp" line="42"/> + <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> <translation>Звук</translation> </message> <message> - <location filename="settingswidget.cpp" line="50"/> + <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> <translation>Полноэкранный режим</translation> </message> <message> - <location filename="settingswidget.cpp" line="52"/> + <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> <translation>Другой</translation> </message> <message> - <location filename="settingswidget.cpp" line="54"/> + <location filename="settingswidget.cpp" line="61"/> <source>Window</source> <translation>Окно</translation> </message> <message> - <location filename="settingswidget.cpp" line="61"/> + <location filename="settingswidget.cpp" line="63"/> + <source>Use whole display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> <translation>Установить DPI</translation> </message> <message> - <location filename="settingswidget.cpp" line="79"/> + <location filename="settingswidget.cpp" line="76"/> + <source>Xinerama extension (support for two or more physical displays)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> <translation>Ширина:</translation> </message> <message> - <location filename="settingswidget.cpp" line="82"/> + <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> <translation>Высота:</translation> </message> <message> - <location filename="settingswidget.cpp" line="101"/> + <location filename="settingswidget.cpp" line="102"/> + <source>&Display:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="104"/> + <source>&Identify all displays</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> <translation>Использовать текущие установки</translation> </message> <message> - <location filename="settingswidget.cpp" line="111"/> + <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> <translation>Раскладка Клавиатуры:</translation> </message> <message> - <location filename="settingswidget.cpp" line="113"/> + <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> <translation>Модель клавиатуры:</translation> </message> <message> - <location filename="settingswidget.cpp" line="124"/> + <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> <translation>Активировать звук</translation> </message> <message> - <location filename="settingswidget.cpp" line="133"/> + <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> <translation>Запускать звуковой сервер</translation> </message> <message> - <location filename="settingswidget.cpp" line="135"/> + <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> <translation>Использовать запущенный звуковой сервер</translation> </message> <message> - <location filename="settingswidget.cpp" line="137"/> + <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> <translation>Использовать SSH туннель для звуковой системы</translation> </message> <message> - <location filename="settingswidget.cpp" line="139"/> + <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> <translation>Использовать порт по умолчанию</translation> </message> <message> - <location filename="settingswidget.cpp" line="146"/> + <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> <translation>Порт:</translation> </message> <message> - <location filename="settingswidget.cpp" line="173"/> + <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> <translation>Печать на стороне клиента</translation> </message> <message> - <location filename="settingswidget.cpp" line="440"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation>ru</translation> </message> <message> - <location filename="settingswidget.cpp" line="441"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation>pc105/ru</translation> </message> @@ -2786,82 +2876,82 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="100"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="120"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="135"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="171"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="498"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="510"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="523"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="573"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="682"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="708"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="773"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="791"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="821"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="833"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> <translation type="unfinished"></translation> </message> @@ -2869,12 +2959,12 @@ sound system connections through firewalls</source> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> <translation type="unfinished"></translation> </message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_sv.ts similarity index 67% copy from x2goclient_zh_tw.ts copy to x2goclient_sv.ts index d5669c1..94fcf10 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_sv.ts @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="zh_TW"> +<TS version="2.0" language="sv_SE"> <context> <name>BrokerPassDialogUi</name> <message> <location filename="brokerpassdialog.ui" line="14"/> <source>Dialog</source> - <translation>對話框</translation> + <translation>Dialog</translation> </message> <message> <location filename="brokerpassdialog.ui" line="22"/> <source>Old password:</source> - <translation>舊密碼:</translation> + <translation>Gammalt lösenord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="36"/> <source>New password:</source> - <translation>新密碼:</translation> + <translation>Nytt lösenord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="50"/> <source>Confirm password:</source> - <translation>請再輸入一遍新密碼:</translation> + <translation>Bekräfta lösenord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="79"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translation>TextLabel</translation> </message> </context> <context> @@ -34,7 +34,7 @@ <message> <location filename="brokerpassdlg.cpp" line="41"/> <source>Passwords do not match</source> - <translation>密碼不相符</translation> + <translation>Lösenorden matchar inte</translation> </message> </context> <context> @@ -42,67 +42,67 @@ <message> <location filename="cupsprintwidget.ui" line="19"/> <source>Form</source> - <translation>表單</translation> + <translation>Formulär</translation> </message> <message> <location filename="cupsprintwidget.ui" line="25"/> <source>Name:</source> - <translation>姓名:</translation> + <translation>Namn:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="42"/> <source>Properties</source> - <translation>屬性</translation> + <translation>Inställningar</translation> </message> <message> <location filename="cupsprintwidget.ui" line="49"/> <source>State:</source> - <translation>狀態:</translation> + <translation>Status:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="63"/> <source>Accepting jobs:</source> - <translation>接收的工作:</translation> + <translation>Mottar jobb:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="77"/> <source>Type:</source> - <translation>類別:</translation> + <translation>Typ:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="91"/> <source>Location:</source> - <translation>位置:</translation> + <translation>Placering:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="105"/> <source>Comment:</source> - <translation>註解:</translation> + <translation>Kommentar:</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="65"/> <source>Idle</source> - <translation>閒置</translation> + <translation>Vilande</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="68"/> <source>Printing</source> - <translation>正在列印</translation> + <translation>Skriver ut</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="71"/> <source>Stopped</source> - <translation>已停止</translation> + <translation>Stoppad</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="81"/> <source>Yes</source> - <translation>是</translation> + <translation>Ja</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="81"/> <source>No</source> - <translation>否</translation> + <translation>Nej</translation> </message> </context> <context> @@ -110,17 +110,17 @@ <message> <location filename="cupsprintersettingsdialog.cpp" line="104"/> <source>No option selected</source> - <translation type="unfinished">尚未選取任何選項</translation> + <translation>Inget valt</translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="265"/> <source>This value is in conflict with other option</source> - <translation>此設定值與其它選項衝突</translation> + <translation>Detta värde är i konflikt med ett annat värde</translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="275"/> <source>Options conflict</source> - <translation>選項衝突</translation> + <translation>Värdekonflikt</translation> </message> </context> <context> @@ -128,50 +128,51 @@ <message> <location filename="contest.ui" line="14"/> <source>Connectivity test</source> - <translation>連線測式</translation> + <translation>Anslutningstest</translation> </message> <message> <location filename="contest.ui" line="24"/> <source>HTTPS connection:</source> - <translation>加密HTTP連線:</translation> + <translation>HTTPS-anslutning:</translation> </message> <message> <location filename="contest.ui" line="31"/> <source>SSH connection:</source> - <translation>SSH連線:</translation> + <translation>SSH-anslutning:</translation> </message> <message> <location filename="contest.ui" line="38"/> <source>Connection speed:</source> - <translation>連線速度:</translation> + <translation>Anslutningshastighet:</translation> </message> <message> <location filename="contest.ui" line="123"/> <location filename="contest.ui" line="167"/> <source>Failed</source> - <translation>失敗</translation> + <translation>Misslyckades</translation> </message> <message> <location filename="contest.ui" line="211"/> <source>0 Kb/s</source> - <translation>0 Kb/s</translation> + <translation>0 kB/s</translation> </message> <message> <location filename="contest.cpp" line="108"/> <location filename="contest.cpp" line="115"/> <source>OK</source> - <translation>確定</translation> + <translation>OK</translation> </message> <message> <location filename="contest.cpp" line="150"/> <source>Socket operation timed out</source> - <translation>網路操作逾時</translation> + <translatorcomment>Hittade ingen bra översättning för socket</translatorcomment> + <translation>Socketoperation överskred tidsgräns</translation> </message> <message> <location filename="contest.cpp" line="162"/> <location filename="contest.cpp" line="168"/> <source>Failed: </source> - <translation>失敗:</translation> + <translation>Misslyckades: </translation> </message> </context> <context> @@ -179,157 +180,157 @@ <message> <location filename="configdialog.cpp" line="50"/> <source>General</source> - <translation>一般設定</translation> + <translation>Allmänna</translation> </message> <message> <location filename="configdialog.cpp" line="59"/> <source>Display icon in system tray</source> - <translation>在系統狀態列中顯示圖示</translation> + <translation>Visa ikon i systemfältet</translation> </message> <message> <location filename="configdialog.cpp" line="66"/> <source>Hide to system tray when minimized</source> - <translation>最小化時縮至系統狀態列</translation> + <translation>Dölj i systemfältet när minimerad</translation> </message> <message> <location filename="configdialog.cpp" line="67"/> <source>Hide to system tray when closed</source> - <translation>關閉時隱藏至系統狀態列</translation> + <translation>Dölj i systemfältet när stängd</translation> </message> <message> <location filename="configdialog.cpp" line="68"/> <source>Hide to system tray after connection is established</source> - <translation>連線建立後隱藏至系統狀態列</translation> + <translation>Dölj i systemfältet när anslutning har upprättats</translation> </message> <message> <location filename="configdialog.cpp" line="69"/> <source>Restore from system tray after session is disconnected</source> - <translation>當工作階段斷線後從系統狀態列中還原</translation> + <translation>Återställ från systemfältet när session kopplats från</translation> </message> <message> <location filename="configdialog.cpp" line="87"/> <source>Use LDAP</source> - <translation>使用LDAP</translation> + <translation>Använd LDAP</translation> </message> <message> <location filename="configdialog.cpp" line="111"/> <source>Server URL:</source> - <translation type="unfinished">伺服器網址:</translation> + <translation>Server URL:</translation> </message> <message> <location filename="configdialog.cpp" line="112"/> <source>BaseDN:</source> - <translation type="unfinished"></translation> + <translation>Bas DN:</translation> </message> <message> <location filename="configdialog.cpp" line="114"/> <source>Failover server 1 URL:</source> - <translation>備援伺服器網1 網址:</translation> + <translation>Redundant server 1 URL:</translation> </message> <message> <location filename="configdialog.cpp" line="116"/> <source>Failover server 2 URL:</source> - <translation>備援伺服器網2 網址:</translation> + <translation>Redundant server 2 URL:</translation> </message> <message> <location filename="configdialog.cpp" line="198"/> <location filename="configdialog.cpp" line="340"/> <source>X-Server settings</source> - <translation>X伺服器設定</translation> + <translation>X-server inställningar</translation> </message> <message> <location filename="configdialog.cpp" line="207"/> <source>X11 application:</source> - <translation>X11應用程式:</translation> + <translation>X11-applikation:</translation> </message> <message> <location filename="configdialog.cpp" line="218"/> <source>X11 version:</source> - <translation>X11版本:</translation> + <translation>X11-version:</translation> </message> <message> <location filename="configdialog.cpp" line="233"/> <source>Find X11 application</source> - <translation>尋找X11應用程式</translation> + <translation>Hitta X11-applikation</translation> </message> <message> <location filename="configdialog.cpp" line="250"/> <source>Clientside SSH port for file system export usage:</source> - <translation>檔案系統匯出時用戶端所使用的SSH連接埠:</translation> + <translation>SSH-port på klienten för export av filsystem:</translation> </message> <message> <location filename="configdialog.cpp" line="260"/> <source>Start session embedded inside website</source> - <translation>將工作階段嵌入至網站內</translation> + <translation>Starta session inuti webbplats</translation> </message> <message> <location filename="configdialog.cpp" line="264"/> <location filename="configdialog.cpp" line="567"/> <location filename="configdialog.cpp" line="579"/> <source>Advanced options</source> - <translation>進階選項</translation> + <translation>Avancerade alternativ</translation> </message> <message> <location filename="configdialog.cpp" line="291"/> <source>Defaults</source> - <translation>預設</translation> + <translation>Standardinställningar</translation> </message> <message> <location filename="configdialog.cpp" line="292"/> <source>&OK</source> - <translation>確定(&O)</translation> + <translation>&OK</translation> </message> <message> <location filename="configdialog.cpp" line="293"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="configdialog.cpp" line="316"/> <source>Settings</source> - <translation>設定</translation> + <translation>Inställningar</translation> </message> <message> <location filename="configdialog.cpp" line="336"/> <source>Printing</source> - <translation>列印功能</translation> + <translation>Utskrifter</translation> </message> <message> <location filename="configdialog.cpp" line="503"/> <location filename="configdialog.cpp" line="521"/> <location filename="configdialog.cpp" line="540"/> <source>Warning</source> - <translation>警告</translation> + <translation>Varning</translation> </message> <message> <location filename="configdialog.cpp" line="504"/> <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source> - <translation>X2Go用戶端無法找到合適的X11應用程式，請安裝Apple X11或是選擇應用程式的路徑</translation> + <translation>x2goclient kunde inte hitta någon X11-applikation. Installera Apple X11 eller ange sökväg till applikationen</translation> </message> <message> <location filename="configdialog.cpp" line="522"/> <source>Your are using X11 (Apple X-Window Server) version </source> - <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation> + <translation>Du använder X11 (Apple X-Windows Server) version </translation> </message> <message> <location filename="configdialog.cpp" line="524"/> <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz)</source> - <translation>. 此版本在24位元色彩模式時會有問題，請升級您的X11環境 (http://trac.macosforge.org/projects/xquartz)</translation> + <translation>Denna version orsakar problem med X11-applikation i 24-bitars färgdjup. Du bör uppdatera din X11-miljö (http://trac.macosforge.org/projects/xquartz)</translation> </message> <message> <location filename="configdialog.cpp" line="541"/> <source>No suitable X11 application found in selected path</source> - <translation>在您選擇的路徑中沒有合適的X11應用程式</translation> + <translation>Ingen X11-applikation hittades i angiven sökväg</translation> </message> <message> <location filename="configdialog.cpp" line="577"/> <source>&Connection</source> - <translation>連線(&C)</translation> + <translation>&Anslutning</translation> </message> <message> <location filename="configdialog.cpp" line="578"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation>&Inställningar</translation> </message> </context> <context> @@ -337,32 +338,32 @@ <message> <location filename="connectionwidget.cpp" line="33"/> <source>&Connection speed</source> - <translation>連線速度(&C)</translation> + <translation>&Anslutningshastighet</translation> </message> <message> <location filename="connectionwidget.cpp" line="38"/> <source>Connection speed:</source> - <translation>連線速度:</translation> + <translation>Anslutningshastighet:</translation> </message> <message> <location filename="connectionwidget.cpp" line="68"/> <source>C&ompression</source> - <translation>壓縮(&o)</translation> + <translation>K&omprimering</translation> </message> <message> <location filename="connectionwidget.cpp" line="85"/> <source>Method:</source> - <translation>方式:</translation> + <translation>Metod:</translation> </message> <message> <location filename="connectionwidget.cpp" line="87"/> <source>Compression method:</source> - <translation>壓縮方式:</translation> + <translation>Komprimeringsmetod:</translation> </message> <message> <location filename="connectionwidget.cpp" line="89"/> <source>Image quality:</source> - <translation>影像品質:</translation> + <translation>Bildkvalitet:</translation> </message> </context> <context> @@ -370,72 +371,72 @@ <message> <location filename="cupsprintsettingsdialog.ui" line="19"/> <source>Dialog</source> - <translation>對話框</translation> + <translation>Dialog</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="35"/> <source>General</source> - <translation>一般設定</translation> + <translation>Allmänt</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="45"/> <source>Page size:</source> - <translation>頁面尺寸:</translation> + <translation>Sidstorlek:</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="62"/> <source>Paper type:</source> - <translation>紙張類型:</translation> + <translation>Papperstyp:</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="72"/> <source>Paper source:</source> - <translation>紙張來源:</translation> + <translation>Papperskälla:</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="99"/> <source>Duplex Printing</source> - <translation>雙面列印</translation> + <translation>Dubbelsidig utskrift</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="105"/> <source>None</source> - <translation>無</translation> + <translation>Ingen</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="112"/> <source>Long side</source> - <translation>長邊翻轉</translation> + <translation>Långsida</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="119"/> <source>Short side</source> - <translation>短邊翻轉</translation> + <translation>Kortsida</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="143"/> <source>Driver settings</source> - <translation>驅動程式設定</translation> + <translation>Drivrutinsinställningar</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="175"/> <source>Option</source> - <translation>選項</translation> + <translation>Alternativ</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="180"/> <source>Value</source> - <translation>數值</translation> + <translation>Värde</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="186"/> <source>No option selected</source> - <translation>目前沒有選取任何選項</translation> + <translation>Inget alternativ valt</translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="205"/> <source>text</source> - <translation>文字</translation> + <translation>text</translation> </message> </context> <context> @@ -443,42 +444,42 @@ <message> <location filename="editconnectiondialog.cpp" line="52"/> <source>&Session</source> - <translation>工作階段(&S)</translation> + <translation>&Session</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="53"/> <source>&Connection</source> - <translation>連線(&C)</translation> + <translation>&Anslutning</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="54"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation>&Inställningar</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="55"/> <source>&Shared folders</source> - <translation>共享資料夾(&S)</translation> + <translation>&Delade mappar</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="57"/> <source>&OK</source> - <translation>確定(&O)</translation> + <translation>&OK</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="58"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="59"/> <source>Defaults</source> - <translation>預設值</translation> + <translation>Standardinställningar</translation> </message> <message> <location filename="editconnectiondialog.cpp" line="109"/> <source>Session preferences - </source> - <translation>工作階段偏好設定 - </translation> + <translation>Sessionspreferenser - </translation> </message> </context> <context> @@ -486,38 +487,39 @@ <message> <location filename="exportdialog.cpp" line="38"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="exportdialog.cpp" line="44"/> <source>&share</source> - <translation>分享(&s)</translation> + <translation>&Dela</translation> </message> <message> <location filename="exportdialog.cpp" line="45"/> <source>&Preferences ...</source> - <translation>偏好設定(&P) ...</translation> + <translatorcomment>Kanske skulle "Egna inställningar" vara bättre.</translatorcomment> + <translation>&Preferenser...</translation> </message> <message> <location filename="exportdialog.cpp" line="46"/> <source>&Custom folder ...</source> - <translation>自訂資料夾(&C) ...</translation> + <translation>&Anpassad mapp...</translation> </message> <message> <location filename="exportdialog.cpp" line="56"/> <source>Delete</source> <comment>Delete</comment> - <translation>刪除</translation> + <translation>Radera</translation> </message> <message> <location filename="exportdialog.cpp" line="73"/> <source>share folders</source> - <translation>共享資料夾</translation> + <translation>dela mappar</translation> </message> <message> <location filename="exportdialog.cpp" line="139"/> <source>Select folder</source> - <translation>選擇資料夾</translation> + <translation>Välj mapp</translation> </message> </context> <context> @@ -525,121 +527,126 @@ <message> <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> - <translation>us</translation> + <translatorcomment>Språkkod för svenska i X.org</translatorcomment> + <translation>se</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translatorcomment>Svenskt tangentbord</translatorcomment> + <translation>pc105/se</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="308"/> <location filename="httpbrokerclient.cpp" line="328"/> <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Fel</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> - <translation>登入失敗! 請再試一次</translation> + <translation>Inloggning misslyckades! Var god försök igen</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> - <translation>您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation> + <translation>Din session har kopplats från. För att återansluta sessionen, återgå till inloggningssidan eller ladda om sidan i webbläsaren.</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> - <translation> 伺服使器使用了不合法的安全憑證 </translation> + <translation> Servern använder ett ogiltigt certifikat. </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="457"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> - <translation type="unfinished"></translation> + <translation>Du bör ej lägga till ett undantag om du inte använder en betrodd uppkoppling eller om du inte brukar få en varning för denna server.</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> - <translation type="unfinished"></translation> + <translation>Säker anslutning misslyckades</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> - <translation type="unfinished"></translation> + <translation>Utgivet till: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="468"/> <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> - <translation type="unfinished"></translation> + <translation>Common Name(CN) </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="471"/> <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> - <translation type="unfinished"></translation> + <translation>Organization(O) </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="474"/> <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> - <translation type="unfinished"></translation> + <translation>Organizational Unit(OU) </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> - <translation type="unfinished"></translation> + <translation>Serienummer </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> - <translation type="unfinished"></translation> + <translation>Utgivare:</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> - <translation type="unfinished"></translation> + <translation>Giltighetstid: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> - <translation type="unfinished"></translation> + <translation>Utgivningsdatum </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> - <translation type="unfinished"></translation> + <translation>giltigt till </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> - <translation type="unfinished"></translation> + <translation>Fingeravtryck: +</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> - <translation type="unfinished"></translation> + <translation>SHA1 </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> - <translation type="unfinished"></translation> + <translation>MD5 </translation> </message> <message> <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> - <translation type="unfinished"></translation> + <translation>Avsluta X2Go-klienten</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> - <translation type="unfinished"></translation> + <translation>Lägg till undantag</translation> </message> </context> <context> @@ -648,75 +655,75 @@ <location filename="onmainwindow.cpp" line="84"/> <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> - <translation>us</translation> + <translation>se</translation> </message> <message> <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translation>pc105/se</translation> </message> <message> <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> - <translation>X2Go用戶端</translation> + <translation>X2Go-klient</translation> </message> <message> <location filename="onmainwindow.cpp" line="147"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2152"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> - <translation>正在連線</translation> + <translation>ansluter</translation> </message> <message> <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> - <translation>網頁瀏覽器</translation> + <translation>Webbläsare</translation> </message> <message> <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> - <translation>電子郵件軟體</translation> + <translation>E-postklient</translation> </message> <message> <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> - <translation type="unfinished"></translation> + <translation>OpenOffice.org</translation> </message> <message> <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> - <translation>終端機</translation> + <translation>Terminal</translation> </message> <message> <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> - <translation>設定(&S) ...</translation> + <translation>&Inställningar...</translation> </message> <message> <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> - <translation>支援 ...</translation> + <translation>Hjälp ...</translation> </message> <message> <location filename="onmainwindow.cpp" line="340"/> <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> - <translation>關於X2GO用戶端</translation> + <translation>Om X2Go-klient</translation> </message> <message> <location filename="onmainwindow.cpp" line="485"/> <location filename="onmainwindow.cpp" line="944"/> <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> - <translation>共享資料夾...</translation> + <translation>Dela mapp ...</translation> </message> <message> <location filename="onmainwindow.cpp" line="488"/> <location filename="onmainwindow.cpp" line="945"/> - <location filename="onmainwindow_part2.cpp" line="2204"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> - <translation>暫停</translation> + <translation>Vila</translation> </message> <message> <location filename="onmainwindow.cpp" line="491"/> @@ -724,114 +731,114 @@ <location filename="onmainwindow_part4.cpp" line="1843"/> <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> - <translation>終止</translation> + <translation>Avsluta</translation> </message> <message> <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> - <translation>重新連線</translation> + <translation>Återanslut</translation> </message> <message> <location filename="onmainwindow.cpp" line="497"/> <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> - <translation>脫離X2Go視窗</translation> + <translation>Koppla lös X2Go-fönster</translation> </message> <message> <location filename="onmainwindow.cpp" line="500"/> <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> - <translation>將工具列最小化</translation> + <translation>Minimera verktygsrad</translation> </message> <message> <location filename="onmainwindow.cpp" line="610"/> <location filename="onmainwindow.cpp" line="1820"/> <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> - <translation>工作階段:</translation> + <translation>Session:</translation> </message> <message> <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> - <translation>離開(&Q)</translation> + <translation>&Avsluta</translation> </message> <message> <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> - <translation type="unfinished"></translation> + <translation>Ctrl+Q</translation> </message> <message> <location filename="onmainwindow.cpp" line="664"/> <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> - <translation>離開</translation> + <translation>Avsluta</translation> </message> <message> <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> - <translation>新增工作階段(&N) ...</translation> + <translation>&Ny session...</translation> </message> <message> <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> - <translation type="unfinished"></translation> + <translation>Ctrl+N</translation> </message> <message> <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> - <translation>工作階段管理員...</translation> + <translation>S&essionshantering...</translation> </message> <message> <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> - <translation type="unfinished"></translation> + <translation>Ctrl+E</translation> </message> <message> <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示(&C)...</translation> + <translation>S&kapa sessionsgenväg på Skrivbordet...</translation> </message> <message> <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> - <translation>設定代理伺服器密碼(&S)...</translation> + <translation>&Ange agentlösenord...</translation> </message> <message> <location filename="onmainwindow.cpp" line="704"/> <source>&Connectivity test...</source> - <translation>連線能力測試(&C)...</translation> + <translation>&Testa anslutning...</translation> </message> <message> <location filename="onmainwindow.cpp" line="711"/> <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> - <translation>顯示工具列</translation> + <translation>Visa verktygsrad</translation> </message> <message> <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> - <translation>關於Qt</translation> + <translation>Om Qt</translation> </message> <message> <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> - <translation type="unfinished"></translation> + <translation>Ctrl+Q</translation> </message> <message> <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> - <translation>工作階段(&S)</translation> + <translation>&Session</translation> </message> <message> <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> - <translation>選項(&O)</translation> + <translation>&Alternativ</translation> </message> <message> <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> - <translation>幫助(&H)</translation> + <translation>&Hjälp</translation> </message> <message> <location filename="onmainwindow.cpp" line="799"/> @@ -839,7 +846,7 @@ <location filename="onmainwindow_part3.cpp" line="1635"/> <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> - <translation>登入:</translation> + <translation>Användare:</translation> </message> <message> <location filename="onmainwindow.cpp" line="820"/> @@ -856,18 +863,18 @@ <location filename="onmainwindow.cpp" line="2205"/> <location filename="onmainwindow.cpp" line="2239"/> <location filename="onmainwindow.cpp" line="2284"/> - <location filename="onmainwindow_part2.cpp" line="300"/> - <location filename="onmainwindow_part2.cpp" line="476"/> - <location filename="onmainwindow_part2.cpp" line="485"/> - <location filename="onmainwindow_part2.cpp" line="784"/> - <location filename="onmainwindow_part2.cpp" line="1235"/> - <location filename="onmainwindow_part2.cpp" line="1296"/> - <location filename="onmainwindow_part2.cpp" line="1347"/> - <location filename="onmainwindow_part2.cpp" line="1380"/> - <location filename="onmainwindow_part2.cpp" line="1424"/> - <location filename="onmainwindow_part2.cpp" line="1804"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> <location filename="onmainwindow_part2.cpp" line="1830"/> - <location filename="onmainwindow_part2.cpp" line="1962"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> <location filename="onmainwindow_part3.cpp" line="773"/> <location filename="onmainwindow_part3.cpp" line="854"/> @@ -887,182 +894,182 @@ <location filename="onmainwindow_part4.cpp" line="2214"/> <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Fel</translation> </message> <message> <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> - <translation>更改密碼失敗</translation> + <translation>Operation misslyckades</translation> </message> <message> <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> - <translation>密碼已更改成功</translation> + <translation>Lösenord ändrat</translation> </message> <message> <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> - <translation>輸入了錯誤的密碼!</translation> + <translation>Fel lösenord!</translation> </message> <message> <location filename="onmainwindow.cpp" line="852"/> <location filename="onmainwindow.cpp" line="2393"/> <location filename="onmainwindow_part4.cpp" line="2468"/> <source>Connecting to broker</source> - <translation>連線至連線代理伺服器</translation> + <translation>Ansluter till agent</translation> </message> <message> <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> - <translation>身份驗證</translation> + <translation>Autentisering</translation> </message> <message> <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> - <translation>還原</translation> + <translation>Återställ</translation> </message> <message> <location filename="onmainwindow.cpp" line="941"/> - <location filename="onmainwindow_part2.cpp" line="2065"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> - <translation>尚未連線</translation> + <translation>Ej ansluten</translation> </message> <message> <location filename="onmainwindow.cpp" line="969"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> - <translation>按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation> + <translation>Vänster musknapp för att dölja/återställa - Höger musknapp för att visa snabbmeny</translation> </message> <message> <location filename="onmainwindow.cpp" line="1496"/> <location filename="onmainwindow.cpp" line="1679"/> <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> - <translation>請確認LDAP的設定</translation> + <translation>Kontrollera LDAP-inställningar</translation> </message> <message> <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> - <translation>在LDAP環境中沒有找到X2Go伺服器</translation> + <translation>ingen X2Go-server hittades i LDAP</translation> </message> <message> <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> - <translation>在桌面上建立工作階段圖示</translation> + <translation>Skapa sessionsgenväg på Skrivbordet</translation> </message> <message> <location filename="onmainwindow.cpp" line="1844"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> - <translation>桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式，您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。 + <translation>Skrivbordsgenvägar kan konfigureras att inte visa X2Go-klienten (dolt läge). Om du vill aktivera den funktionen måste du använda inloggning med GPG-nyckel, GPG-smartkort eller SSH-nyckel. -是否要使用X2Go用戶端的隱藏模式?</translation> +Använd dolt läge?</translation> </message> <message> <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> - <translation>新的工作階段</translation> + <translation>Ny session</translation> </message> <message> <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> - <translation>X2Go工作階段的連結</translation> + <translation>X2Go Länk till session</translation> </message> <message> <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> - <translation>無法找到X2Go的工作</translation> + <translation>X2Go-sessioner hittades inte</translation> </message> <message> <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> - <translation>您確定要刪除此工作階段嗎?</translation> + <translation>Är du säker på att du vill radera denna session?</translation> </message> <message> <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> - <translation type="unfinished"></translation> + <translation>KDE</translation> </message> <message> <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> - <translation>RDP連線</translation> + <translation>RDP-anslutning</translation> </message> <message> <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation>XDMCP</translation> </message> <message> <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> - <translation>連線至本地桌面</translation> + <translation>Anslutning till lokalt Skrivbord</translation> </message> <message> <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> - <translation> 於 </translation> + <translation> på </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="79"/> <source>Host key for server changed. It is now: </source> - <translation>主機的SSH密鑰已經更換。 -現在的密鑰為: </translation> + <translation>Nyckel för server har ändrats. +Den är nu: </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="80"/> <source>For security reasons, connection will be stopped</source> - <translation>由於安全性的考量，目前的連線已被中止</translation> + <translation>Anslutningen avbryts av säkerhetsskäl</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation>目前沒有找到伺服器上的主機密鑰，不過有其它類型的密鑰存在。惡意的攻擊者可能會利用改變預設的伺服器密鑰來讓您的用戶端認為原本的密鑰並不存在</translation> + <translation>Servern svarade inte med förväntad nyckeltyp. Det kan innebära att servern är komprommeterad</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation> + <translation>Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation>此為未知的伺服器，您要選擇信任此主機密鑰嗎? -此公開密鑰的雜湊值為:</translation> + <translation>Okänd server. Litar du på denna nyckel? +Publik nyckel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> - <translation>主機密鑰驗證任失敗</translation> + <translation>Verifiering av serverns nyckel misslyckades</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1169"/> - <location filename="onmainwindow_part2.cpp" line="1189"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> - <translation>是</translation> + <translation>Ja</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1170"/> - <location filename="onmainwindow_part2.cpp" line="1190"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> - <translation>否</translation> + <translation>Nej</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> - <translation>認證失敗</translation> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> + <translation>Autentisering misslyckades</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> <location filename="onmainwindow_part3.cpp" line="766"/> <location filename="onmainwindow_part3.cpp" line="847"/> <location filename="onmainwindow_part3.cpp" line="1219"/> @@ -1070,13 +1077,13 @@ Public key hash: </source> <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> - <translation>連線失敗 + <translation>Anslutning misslyckades </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="296"/> - <location filename="onmainwindow_part2.cpp" line="1292"/> - <location filename="onmainwindow_part2.cpp" line="1376"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> <location filename="onmainwindow_part3.cpp" line="769"/> <location filename="onmainwindow_part3.cpp" line="850"/> @@ -1084,352 +1091,354 @@ Public key hash: </source> <location filename="onmainwindow_part3.cpp" line="1275"/> <location filename="onmainwindow_part3.cpp" line="2259"/> <source>Wrong password! </source> - <translation>不正確的密碼! </translation> + <translation>Fel lösenord! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="412"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> - <translation>未知</translation> + <translation>okänd</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="477"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> - <translation>伺服器不存在l</translation> + <translation>Ingen server tillgänglig</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="486"/> - <location filename="onmainwindow_part2.cpp" line="785"/> - <location filename="onmainwindow_part2.cpp" line="1236"/> - <location filename="onmainwindow_part2.cpp" line="1348"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> - <translation>伺服器不存在|</translation> + <translation>Server ej tillgänglig</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1005"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> - <translation>請選擇工作階段:</translation> + <translation>Välj session:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1021"/> - <location filename="onmainwindow_part2.cpp" line="1115"/> - <location filename="onmainwindow_part2.cpp" line="2168"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> - <translation>正在執行中</translation> + <translation>aktiv</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1023"/> - <location filename="onmainwindow_part2.cpp" line="1308"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> - <translation>已暫停</translation> + <translation>vilande</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> - <translation>桌面</translation> + <translation>Skrivbord</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1031"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> - <translation>單一的應用程式</translation> + <translation>Applikation</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1033"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> - <translation type="unfinished"></translation> + <translation>Skuggsession</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1066"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> - <translation>資訊</translation> + <translation>Information</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1067"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> - <translation>目前沒有找到可訪問的工作桌面</translation> + <translation>Inget tillgängligt Skrivbord hittades</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1080"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> - <translation>篩選器</translation> + <translation>Filter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1087"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> - <translation>請選擇工作桌面:</translation> + <translation>Välj Skrivbord:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1156"/> - <location filename="onmainwindow_part2.cpp" line="1176"/> - <location filename="onmainwindow_part2.cpp" line="1991"/> - <location filename="onmainwindow_part2.cpp" line="2380"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> - <translation>警告</translation> + <translation>Varning</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1157"/> - <location filename="onmainwindow_part2.cpp" line="1177"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> - <translation>您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為</translation> + <translation>Ditt nuvarande färgdjup matchar inte X2Go-sessionens färgdjup. Det kan orsaka problem vid återanslutning av sessionen och i de flesta fall förlorar du sessionen och måste starta en ny! Det är starkt rekommenderat att du ändrar färdgjup till </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1165"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> - <translation>24或32</translation> + <translation>24- eller 32-</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。 請問您無論如何都要恢復此工作階段的連線嗎?</translation> + <translation>bitar och startar om X-servern innan du återansluter till denna X2Go-session. Återanslut session ändå?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1253"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> - <translation>正在暫停工作中</translation> + <translation>försätter i vila</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1275"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> - <translation>正在中止工作中</translation> + <translation>avslutar</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1409"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> - <translation>不正確的密碼! </translation> + <translation>Fel lösenord! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1802"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> - <translation>無法創建資料夾:</translation> + <translation>Kunde inte skapa mapp:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> - <translation>檔案無法寫入:</translation> + <translation>Kunde ej skriva till fil:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1934"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> - <translation>連接X2Go視窗</translation> + <translation>Koppla X2Go-fönster</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> - <translation>無法建立SSL通道:</translation> + <translation>Kunde ej skapa SSL-tunnel: +</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1989"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> - <translation>無法建立SSL通道: + <translation>Kunde ej skapa SSL-tunnel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2137"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> - <translation>已完成</translation> + <translation>avslutad</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2160"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> - <translation>正在開始</translation> + <translation>startar</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2162"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> - <translation>正在還原</translation> + <translation>återansluter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2224"/> - <location filename="onmainwindow_part2.cpp" line="2492"/> - <location filename="onmainwindow_part2.cpp" line="2510"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> - <translation>連線超時，中止中</translation> + <translation>Anslutning passerade tidsgränsen, avbryter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2225"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> - <translation>中止中</translation> + <translation>avbryter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2381"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> - <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation> + <translation>Är du säker på att du vill avsluta sessionen? +Data som ej sparats kommer att förloras</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> - <translation>工作階段</translation> + <translation>Session</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2462"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> <location filename="onmainwindow_part4.cpp" line="2067"/> <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> - <translation>顯示</translation> + <translation>Display</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2464"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> - <translation>創建時間</translation> + <translation>Skapad</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="196"/> <source>Connection failed : </source> - <translation>連線失敗 + <translation>Anslutning misslyckades : </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> - <translation> (無法開啟檔案)</translation> + <translation> (kan inte öppna fil)</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="420"/> <location filename="onmainwindow_part3.cpp" line="430"/> <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> - <translation> (檔案不存在)</translation> + <translation> (filen finns inte)</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> - <translation> (目錄不存在)</translation> + <translation> (mapp finns inte)</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> - <translation>"--link"參數的值錯誤</translation> + <translation>fel värde för "--link"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> - <translation>"--sound"參數的值錯誤</translation> + <translation>fel värde för "--sound"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="527"/> <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> - <translation>"--geometry"參數的值錯誤</translation> + <translation>fel värde för "--geometry"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> - <translation>"--set-kbd"參數的值錯誤</translation> + <translation>fel värde för "--set-kbd"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> - <translation>"--ldap"參數的值錯誤</translation> + <translation>fel värde för "--ldap"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> - <translation>"--ldap1"參數的值錯誤</translation> + <translation>fel värde för "--ldap1"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> - <translation>"--ldap2"參數的值錯誤</translation> + <translation>fel värde för "--ldap2"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> - <translation>"--pack"參數的值錯誤</translation> + <translation>fel värde för "--pack"</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="676"/> <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> - <translation>錯誤的參數:</translation> + <translation>felaktig parameter:</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="724"/> <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> - <translation>選項</translation> + <translation>Alternativ</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> - <translation>可用的包裝方法:</translation> + <translation>Tillgängliga kompressionsmetoder:</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> - <translation>支援</translation> + <translation>Hjälp</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation type="unfinished"></translation> + <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> - <translation> x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助 </translation> + <translation> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1530"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="unfinished"></translation> + <translation> Klient för X2Go. Denna klient kan ansluta till X2Go-servrar och starta/stoppa/återansluta/avsluta (aktiva) sessioner. X2Go-klienten kan spara anslutningsinställningar samt använda LDAP för autentisering. Klienten kan även användas som inloggningsskärm (ersättning för exempelvis xdm). Besök <a href="http://www.x2go.org">www.x2go.org</a> för vidare information.</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> - <translation>X2Go 客戶端 V. </translation> + <translation>X2Go-klient V. </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> - <translation>請檢查LDAP的設定</translation> + <translation>Kontrollera LDAP-inställningar</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> - <translation>沒有發現合法的卡片</translation> + <translation>Inget giltigt kort hittades</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> - <translation>X2Go系統無法辨識此張卡片</translation> + <translation>Kortet är okänt</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> - <translation>檔案無法創建:</translation> + <translation>Kunde ej skapa filen: </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2059"/> <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> - <translation>無法連接至X伺服器</translation> + <translation>Kan ej ansluta till X-server</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2060"/> <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> - <translation>無法連接至X伺服器 -請檢查您的設定值</translation> + <translation>Kan ej ansluta till X-server +Kontrollera dina inställningar</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> - <translation>無法啟動X伺服器 -請檢查您的設定值</translation> + <translation>Kan ej starta X-server +Kontrollera dina inställningar</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2107"/> @@ -1437,174 +1446,176 @@ Please check your settings</source> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server Please check your installation</source> - <translation>無法啟動X伺服器 -請檢查X伺服器安是否有安裝正確</translation> + <translation>Kan ej starta X-server +Kontrollera installation</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> - <translation>無法執行:</translation> + <translation>Kunde ej exekvera: </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> - <translation>遠端伺服器無法支援SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本</translation> + <translation>Servern stöder ej filsystemsexport via SSH-tunnel +Uppdatera till en nyare version av x2goserver</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="28"/> <source>Unable to read : </source> - <translation>無法讀取: + <translation>Kunde ej läsa : </translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="53"/> <source>Unable to write : </source> - <translation>無法寫入: + <translation>Kunde ej skriva till : </translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="141"/> <source>WINDOWS-1252</source> - <translation type="unfinished"></translation> + <translation>WINDOWS-1252</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="153"/> <source>ISO8859-1</source> - <translation type="unfinished"></translation> + <translation>ISO8859-1</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> - <translation>X2Go工作階段</translation> + <translation>X2Go-session</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1534"/> <source>wrong value for argument"speed"</source> - <translation>錯誤的"speed"參數值</translation> + <translation>fel värde för "speed"</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> - <translation>密碼:</translation> + <translation>Lösenord:</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> - <translation>鑑盤佈局:</translation> + <translatorcomment>Verkar vara vanligt förekommande "svengelskt" ord</translatorcomment> + <translation>Tangentbordslayout:</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> - <translation>確定</translation> + <translation>OK</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1701"/> <location filename="onmainwindow_part4.cpp" line="1990"/> <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> - <translation>取消</translation> + <translation>Avbryt</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> - <translation>工作階段識別碼: 伺服器: 使用者名稱: 顯示: 創建時間: 狀態:</translation> + <translation>Sessions-ID: Server: Användare: Display: Skapad: Status:</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> - <translation>退出</translation> + <translation>Avbryt</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> - <translation>顯示細節</translation> + <translation>Visa detaljer</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> - <translation>恢復</translation> + <translation>Återanslut</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> - <translation>新增</translation> + <translation>Ny</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> - <translation>完全存取</translation> + <translation>Fullständig åtkomst</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> - <translation>僅查看</translation> + <translation>Endast visa</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> - <translation>狀態</translation> + <translation>Status</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> - <translation>指令</translation> + <translation>Kommando</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> - <translation>型態</translation> + <translation>Typ</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> - <translation>伺服器</translation> + <translation>Server</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> - <translation>客戶端IP</translation> + <translation>Klient-IP</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> - <translation>工作階段識別碼</translation> + <translation>Sessions-ID</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> - <translation>使用者</translation> + <translation>Användare</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> - <translation>只選擇我的桌面</translation> + <translation>Bara mina Skrivbord</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2215"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> - <translation>SSH伺服器沒有執行起來，遠端列印與檔案共享功能需要先安裝SSH伺服器 -您可以使用下列指令來安裝SSH伺服器: + <translation>sshd ej startad, du behöver sshd för utskrifter och fildelning +du kan installera sshd med (Debian/Ubuntu) sudo apt-get install openssh-server</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> - <translation>還原工具列</translation> + <translation>Återställ verktygsrad</translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> - <translation> &nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp; </translation> + <translation> &nbsp;&nbsp;&nbsp;Klicka denna knapp&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;för att återställa verktygsrad&nbsp;&nbsp;&nbsp; </translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> - <translation>代理伺服器的回應不合法</translation> + <translation>Ogiltigt svar från agent</translation> </message> </context> <context> @@ -1612,22 +1623,22 @@ you can install sshd with <message> <location filename="printdialog.ui" line="16"/> <source>Print - X2Go client</source> - <translation>列印 - X2Go用戶端</translation> + <translation>Utskrift - X2Go-klient</translation> </message> <message> <location filename="printdialog.cpp" line="25"/> <source>Print</source> - <translation>列印</translation> + <translation>Utskrift</translation> </message> <message> <location filename="printdialog.cpp" line="54"/> <source>You've deactivated the x2go client printing dialog.</source> - <translation>您已經停用X2Go用戶端的列印對話框</translation> + <translation>Du har inaktiverat utskriftsdialogen i X2Go.</translation> </message> <message> <location filename="printdialog.cpp" line="56"/> <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source> - <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation> + <translation>Du kan återaktivera denna dialog via X2Go-klientens inställningar (Meny -> Alternativ -> Inställningar)</translation> </message> </context> <context> @@ -1635,25 +1646,26 @@ you can install sshd with <message> <location filename="printprocess.cpp" line="155"/> <source>Save File</source> - <translation>儲存檔案</translation> + <translation>Spara fil</translation> </message> <message> <location filename="printprocess.cpp" line="157"/> <source>PDF Document (*.pdf)</source> - <translation>PDF文件 (*.pdf)</translation> + <translation>PDF-dokument (*.pdf)</translation> </message> <message> <location filename="printprocess.cpp" line="251"/> <location filename="printprocess.cpp" line="274"/> <source>Failed to execute command: </source> - <translation>執行命令失敗:</translation> + <translation>Kunde ej exekverka kommando: +</translation> </message> <message> <location filename="printprocess.cpp" line="266"/> <location filename="printprocess.cpp" line="273"/> <source>Printing error</source> - <translation>列印錯誤</translation> + <translation>Utskriftsfel</translation> </message> </context> <context> @@ -1661,73 +1673,74 @@ you can install sshd with <message> <location filename="printwidget.ui" line="13"/> <source>Form</source> - <translation>表單</translation> + <translation>Formulär</translation> </message> <message> <location filename="printwidget.ui" line="23"/> <source>Print</source> - <translation>列印</translation> + <translation>Skriv ut</translation> </message> <message> <location filename="printwidget.ui" line="33"/> <source>View as PDF</source> - <translation>以PDF格式查看</translation> + <translation>Visa som PDF</translation> </message> <message> <location filename="printwidget.ui" line="63"/> <source>Print settings</source> - <translation>列印設定</translation> + <translation>Utskriftsinställningar</translation> </message> <message> <location filename="printwidget.ui" line="69"/> <source>Printer:</source> - <translation>印表機:</translation> + <translation>Skrivare:</translation> </message> <message> <location filename="printwidget.ui" line="79"/> <source>Print using default Windows PDF Viewer (Viewer application needs to be installed)</source> - <translation>以預設的Windows PDF閱讀器列印(必需要安裝閱讀器)</translation> + <translation>Skriv ut via Windows standard PDF-visare +(PDF-visare måste installeras)</translation> </message> <message> <location filename="printwidget.ui" line="94"/> <source>Printer command:</source> - <translation>印表機指令:</translation> + <translation>Utskriftskommando:</translation> </message> <message> <location filename="printwidget.ui" line="116"/> <source>...</source> - <translation></translation> + <translation>...</translation> </message> <message> <location filename="printwidget.ui" line="147"/> <source>Viewer settings</source> - <translation>閱讀器設定</translation> + <translation>Inställningar för visning</translation> </message> <message> <location filename="printwidget.ui" line="153"/> <source>Open in viewer application</source> - <translation>在閱讀器程式裡開啟</translation> + <translation>Öppna i applikation</translation> </message> <message> <location filename="printwidget.ui" line="165"/> <source>Command:</source> - <translation>指令:</translation> + <translation>Kommando:</translation> </message> <message> <location filename="printwidget.ui" line="177"/> <source>Save to disk</source> - <translation>儲存到磁碟裡</translation> + <translation>Spara till disk</translation> </message> <message> <location filename="printwidget.ui" line="207"/> <source>Show this dialog before start printing</source> - <translation>開始列印前先顯示此對話框</translation> + <translation>Visa denna dialog innan utskrift</translation> </message> <message> <location filename="printwidget.cpp" line="53"/> <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> - <translation>請設定您的客戶端列印設定 您會需要一個外部的程式來進行列印工作，您可以使用 <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… 以及 <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… <a href="http://www.x2go.org/index.php?id=49">這個網址</a>.</translation> + <translation>Konfigurera utskriftsinställningar för klienten. Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… och<a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation> </message> </context> <context> @@ -1735,12 +1748,12 @@ you can install sshd with <message> <location filename="printercmddialog.ui" line="13"/> <source>Printer command</source> - <translation>印表機指令</translation> + <translation>Utskriftskommando</translation> </message> <message> <location filename="printercmddialog.ui" line="19"/> <source>Command</source> - <translation>指令</translation> + <translation>Kommando</translation> </message> <message> <location filename="printercmddialog.ui" line="25"/> @@ -1748,64 +1761,62 @@ you can install sshd with Examples: kprinter lpr -P hp_laserjet</source> - <translation>請輸入您自定的列印指令。 -例如: + <translation>Ange anpassat utskriftskommando, exempel: kprinter lpr -P hp_laserjet</translation> </message> <message> <location filename="printercmddialog.ui" line="44"/> <source>Output format</source> - <translation>輸出格式</translation> + <translation>Utskriftsformat</translation> </message> <message> <location filename="printercmddialog.ui" line="50"/> <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source> - <translation>請選擇您要輸出的檔案格式 (如果您是使用CUPS列印服務，您可能是使用PDF)</translation> + <translation>Välj filformat för utskrift (om du använder CUPS så kan du använda PDF)</translation> </message> <message> <location filename="printercmddialog.ui" line="66"/> <source>PDF</source> - <translation></translation> + <translation>PDF</translation> </message> <message> <location filename="printercmddialog.ui" line="73"/> <source>PS</source> - <translation></translation> + <translation>PS</translation> </message> <message> <location filename="printercmddialog.ui" line="86"/> <source>Data structure</source> - <translation>數據結構</translation> + <translation>Datastruktur</translation> </message> <message> <location filename="printercmddialog.ui" line="92"/> <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source> - <translation>請選擇列印資料的輸入方式:</translation> + <translation>Välj metod för utskrift av fil (vissa kommandon har egna parametrar för utskrift, andra väntar på indata):</translation> </message> <message> <location filename="printercmddialog.ui" line="108"/> <source>standard input (STDIN)</source> - <translation>標準輸入 (STDIN)</translation> + <translation>Indata (STDIN)</translation> </message> <message> <location filename="printercmddialog.ui" line="115"/> <source>Specify path as program parameter</source> - <translation>指定一個路徑做為程式的參數</translation> + <translation>Ange sökväg som programparameter</translation> </message> <message> <location filename="printercmddialog.cpp" line="37"/> <source>Please enter your customized or individual printing command. Example: </source> - <translation>請輸入您自定的列印指令 -範例: + <translation>Ange anpassat utskriftskommando, exempel: </translation> </message> <message> <location filename="printercmddialog.cpp" line="45"/> <source><Path to gsprint.exe> -query -color</source> - <translation><Path to gsprint.exe> -query -color</translation> + <translation><Sökväg till gsprint.exe> -query -color</translation> </message> </context> <context> @@ -1813,85 +1824,85 @@ Example: <message> <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> - <translation>工作階段偏好設定...</translation> + <translation>Sessionspreferenser...</translation> </message> <message> <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示</translation> + <translation>Skapa sessionsgenväg på Skrivbordet...</translation> </message> <message> <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> - <translation>刪除工作階段</translation> + <translation>Radera session</translation> </message> <message> <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> - <translation>工作階段動作</translation> + <translation>Sessionshantering</translation> </message> <message> <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> - <translation>選擇類型</translation> + <translation>Välj typ</translation> </message> <message> <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> - <translation>選擇解析度</translation> + <translation>Välj upplösning</translation> </message> <message> <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> - <translation>切換聲音支援</translation> + <translation>Växla ljudstöd</translation> </message> <message> <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> - <translation>新工作階段</translation> + <translation>Ny session</translation> </message> <message> <location filename="sessionbutton.cpp" line="277"/> <source>running</source> - <translation>執行中</translation> + <translation>aktiv</translation> </message> <message> <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> - <translation>已暫停</translation> + <translation>vilande</translation> </message> <message> <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> - <translation type="unfinished"></translation> + <translation>KDE</translation> </message> <message> <location filename="sessionbutton.cpp" line="325"/> <location filename="sessionbutton.cpp" line="357"/> <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> - <translation>RDP連線</translation> + <translation>RDP-anslutning</translation> </message> <message> <location filename="sessionbutton.cpp" line="326"/> <location filename="sessionbutton.cpp" line="363"/> <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation>XDMCP</translation> </message> <message> <location filename="sessionbutton.cpp" line="327"/> <location filename="sessionbutton.cpp" line="351"/> <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> - <translation>連線至本地桌面</translation> + <translation>Anslutning till lokalt Skrivbord</translation> </message> <message> <location filename="sessionbutton.cpp" line="385"/> <location filename="sessionbutton.cpp" line="402"/> <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> - <translation>全螢幕</translation> + <translation>fullskärm</translation> </message> <message> <location filename="sessionbutton.cpp" line="389"/> @@ -1900,25 +1911,25 @@ Example: <location filename="sessionbutton.cpp" line="669"/> <location filename="sessionbutton.cpp" line="672"/> <source>Display </source> - <translation>顯示</translation> + <translation>Display </translation> </message> <message> <location filename="sessionbutton.cpp" line="397"/> <location filename="sessionbutton.cpp" line="437"/> <source>window</source> - <translation>視窗</translation> + <translation>fönster</translation> </message> <message> <location filename="sessionbutton.cpp" line="445"/> <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> - <translation>啟用</translation> + <translation>På</translation> </message> <message> <location filename="sessionbutton.cpp" line="447"/> <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> - <translation>停用</translation> + <translation>Av</translation> </message> </context> <context> @@ -1926,38 +1937,38 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="35"/> <source>E&xit</source> - <translation>離開(&x)</translation> + <translation>&Avsluta</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="41"/> <source>&New session</source> - <translation>建立新的工作階段(&N)</translation> + <translation>&Ny session</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="42"/> <source>&Session preferences</source> - <translation>工作階段偏好設定(&S)</translation> + <translation>&Sessionspreferenser</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="43"/> <source>&Delete session</source> - <translation>刪除工作階段(&D)</translation> + <translation>&Radera session</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="47"/> <source>&Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示(&C)...</translation> + <translation>S&kapa sessionsgenväg på Skrivbordet...</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="81"/> <source>Delete</source> <comment>Delete</comment> - <translation>刪除</translation> + <translation>Radera</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="109"/> <source>Session management</source> - <translation>管理工作階段</translation> + <translation>Sessionshantering</translation> </message> </context> <context> @@ -1965,154 +1976,154 @@ Example: <message> <location filename="sessionwidget.cpp" line="52"/> <source>Session name:</source> - <translation>工作階段名稱:</translation> + <translation>Sessionsnamn:</translation> </message> <message> <location filename="sessionwidget.cpp" line="57"/> <source><< change icon</source> - <translation><< 更換圖示</translation> + <translation><< ändra ikon</translation> </message> <message> <location filename="sessionwidget.cpp" line="60"/> <source>&Server</source> - <translation>伺服器(&S)</translation> + <translation>&Server</translation> </message> <message> <location filename="sessionwidget.cpp" line="87"/> <source>Host:</source> - <translation>主機:</translation> + <translation>Servernamn:</translation> </message> <message> <location filename="sessionwidget.cpp" line="88"/> <source>Login:</source> - <translation>登入帳號:</translation> + <translation>Användare:</translation> </message> <message> <location filename="sessionwidget.cpp" line="89"/> <source>SSH port:</source> - <translation>SSH連接埠:</translation> + <translation>SSH-port:</translation> </message> <message> <location filename="sessionwidget.cpp" line="101"/> <source>Use RSA/DSA key for ssh connection:</source> - <translation>使用RSA/DSA密鑰於SSH連線:</translation> + <translation>Använd denna RSA/DSA-nyckel för SSH-anslutning:</translation> </message> <message> <location filename="sessionwidget.cpp" line="107"/> <source>Try auto login (ssh-agent or default ssh key)</source> - <translation>嘗試自動登入 (ssh代理或預設SSH密鑰)</translation> + <translation>Prova automatisk inloggning (ssh-agent eller standard SSH-nyckel)</translation> </message> <message> <location filename="sessionwidget.cpp" line="108"/> <source>Kerberos 5 (GSSAPI) authentication</source> - <translation>Kerberos 5 (GSSAPI) 認證</translation> + <translation>Kerberos 5 (GSSAPI)-autentisering</translation> </message> <message> <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> - <translation>工作階段類型(&S)</translation> + <translation>&Sessionstyp</translation> </message> <message> <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> - <translation>工作階段類型:</translation> + <translation>Sessionstyp:</translation> </message> <message> <location filename="sessionwidget.cpp" line="127"/> <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> - <translation>連線至微軟終端伺服器</translation> + <translation>Anslut till Windows Terminal Server (RDP)</translation> </message> <message> <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation>XDMCP</translation> </message> <message> <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> - <translation>連線至本地桌面</translation> + <translation>Anslut till lokalt Skrivbord</translation> </message> <message> <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> - <translation>自訂桌面類型</translation> + <translation>Anpassat Skrivbord</translation> </message> <message> <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> - <translation>單一應用程式</translation> + <translation>Applikation</translation> </message> <message> <location filename="sessionwidget.cpp" line="133"/> <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> - <translation>指令:</translation> + <translation>Kommando:</translation> </message> <message> <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> - <translation>進階設定...</translation> + <translation>Avancerade alternativ...</translation> </message> <message> <location filename="sessionwidget.cpp" line="145"/> <location filename="sessionwidget.cpp" line="429"/> <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> - <translation>執行路徑</translation> + <translation>Sökväg till exekverbar fil</translation> </message> <message> <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> - <translation>開啟圖片</translation> + <translation>Öppna bild</translation> </message> <message> <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> - <translation>圖片</translation> + <translation>Bilder</translation> </message> <message> <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> - <translation>開啟密鑰檔案</translation> + <translation>Öppna nyckelfil</translation> </message> <message> <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> - <translation>所有檔案</translation> + <translation>Alla filer</translation> </message> <message> <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Fel</translation> </message> <message> <location filename="sessionwidget.cpp" line="232"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> - <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation> + <translation>X2Go-klienten körs i portabelt läge. Du bör använda en sökväg till en USB-enhet för att möjliggöra flyttbara inställningar</translation> </message> <message> <location filename="sessionwidget.cpp" line="273"/> <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> - <translation>伺服器:</translation> + <translation>Server:</translation> </message> <message> <location filename="sessionwidget.cpp" line="279"/> <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> - <translation>XDMCP 伺服器:</translation> + <translation>XDMCP-server:</translation> </message> <message> <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> - <translation>rdesktop 指令選項:</translation> + <translation>rdesktop kommandoradsalternativ:</translation> </message> <message> <location filename="sessionwidget.cpp" line="310"/> <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> - <translation>新的工作階段</translation> + <translation>Ny session</translation> </message> </context> <context> @@ -2121,131 +2132,132 @@ Example: <location filename="settingswidget.cpp" line="40"/> <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> - <translation>顯示(&D)</translation> + <translation>&Skärm</translation> </message> <message> <location filename="settingswidget.cpp" line="41"/> <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> - <translation>鍵盤(&K)</translation> + <translation>&Tangentbord</translation> </message> <message> <location filename="settingswidget.cpp" line="42"/> <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> - <translation>聲音</translation> + <translation>Ljud</translation> </message> <message> <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> - <translation>全螢幕</translation> + <translation>Fullskärm</translation> </message> <message> <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> - <translation>自定</translation> + <translation>Anpassad</translation> </message> <message> <location filename="settingswidget.cpp" line="61"/> <source>Window</source> - <translation>視窗</translation> + <translation>Fönster</translation> </message> <message> <location filename="settingswidget.cpp" line="63"/> <source>Use whole display</source> - <translation>使用整個顯示器</translation> + <translation>Använd hela skärmen</translation> </message> <message> <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> - <translation>設定顯示DPI</translation> + <translation>Ange skärmupplösning (DPI)</translation> </message> <message> <location filename="settingswidget.cpp" line="76"/> <source>Xinerama extension (support for two or more physical displays)</source> - <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation> + <translation>Xinerama (stöd för två eller fler skärmar)</translation> </message> <message> <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> - <translation>寬度:</translation> + <translation>Bredd:</translation> </message> <message> <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> - <translation>高度:</translation> + <translation>Höjd:</translation> </message> <message> <location filename="settingswidget.cpp" line="102"/> <source>&Display:</source> - <translation>顯示器(&D):</translation> + <translation>&Skärm:</translation> </message> <message> <location filename="settingswidget.cpp" line="104"/> <source>&Identify all displays</source> - <translation>辨認所有顯示器(&I)</translation> + <translation>&Identifiera alla skärmar</translation> </message> <message> <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> - <translation>保持目前的鍵盤設定</translation> + <translation>Behåll aktuella tangentbordsinställningar</translation> </message> <message> <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> - <translation>鍵盤佈局:</translation> + <translation>Tangentbordslayout:</translation> </message> <message> <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> - <translation>鍵盤型號:</translation> + <translation>Tangentbordsmodell:</translation> </message> <message> <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> - <translation>啟用音效支援</translation> + <translation>Aktivera ljudstöd</translation> </message> <message> <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> - <translation>開啟聲音背景程式</translation> + <translation>Starta ljudserver</translation> </message> <message> <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> - <translation>使用目前的音效背景程式</translation> + <translation>Använd aktiv ljudserver</translation> </message> <message> <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation>使用SSH連接埠轉送來建立 -可通過防火牆的聲音通道</translation> + <translatorcomment>Hittade ingen bra översättning för "port forwarding"</translatorcomment> + <translation>Använd SSH port forwarding för att tunnla +ljudström genom brandväggar</translation> </message> <message> <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> - <translation>使用預設的聲音連接埠</translation> + <translation>Använd standardport för ljud</translation> </message> <message> <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> - <translation>聲音連接埠:</translation> + <translation>Ljudport:</translation> </message> <message> <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> - <translation>用戶端列印支援</translation> + <translation>Stöd för utskrifter via klienten</translation> </message> <message> - <location filename="settingswidget.cpp" line="557"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> - <translation>us</translation> + <translation>se</translation> </message> <message> - <location filename="settingswidget.cpp" line="558"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translation>pc105/se</translation> </message> </context> <context> @@ -2253,176 +2265,176 @@ sound system connections through firewalls</source> <message> <location filename="sharewidget.cpp" line="37"/> <source>&Folders</source> - <translation>資料夾(&F)</translation> + <translation>&Mappar</translation> </message> <message> <location filename="sharewidget.cpp" line="47"/> <source>Path</source> - <translation>路徑</translation> + <translation>Sökväg</translation> </message> <message> <location filename="sharewidget.cpp" line="49"/> <location filename="sharewidget.cpp" line="131"/> <source>Automount</source> - <translation>自動掛載</translation> + <translation>Montera automatiskt</translation> </message> <message> <location filename="sharewidget.cpp" line="58"/> <source>Add</source> - <translation>新增</translation> + <translation>Lägg till</translation> </message> <message> <location filename="sharewidget.cpp" line="59"/> <source>Delete</source> - <translation>刪除</translation> + <translation>Radera</translation> </message> <message> <location filename="sharewidget.cpp" line="69"/> <source>Path:</source> - <translation>路徑:</translation> + <translation>Sökväg:</translation> </message> <message> <location filename="sharewidget.cpp" line="76"/> <source>Filename encoding</source> - <translation>檔案編碼方式</translation> + <translation>Kodtabell för filnamn</translation> </message> <message> <location filename="sharewidget.cpp" line="82"/> <source>local:</source> - <translation>本地端:</translation> + <translation>lokal:</translation> </message> <message> <location filename="sharewidget.cpp" line="83"/> <source>remote:</source> - <translation>遠端:</translation> + <translation>fjärr:</translation> </message> <message> <location filename="sharewidget.cpp" line="95"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation> + <translation>Använd SSH port forwarding för att tunnla filsystemsanslutningar genom brandväggar</translation> </message> <message> <location filename="sharewidget.cpp" line="158"/> <source>Select folder</source> - <translation>選擇資料夾</translation> + <translation>Välj mapp</translation> </message> <message> <location filename="sharewidget.cpp" line="169"/> <source>Error</source> - <translation>錯誤</translation> + <translation>Fel</translation> </message> <message> <location filename="sharewidget.cpp" line="170"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> - <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation> + <translation>X2Go-klienten körs i portabelt läge. Du bör använda en sökväg till en USB-enhet för att möjliggöra flyttbara inställningar</translation> </message> <message> <location filename="sharewidget.cpp" line="229"/> <location filename="sharewidget.cpp" line="280"/> <source>WINDOWS-1252</source> - <translation type="unfinished"></translation> + <translation>WINDOWS-1252</translation> </message> <message> <location filename="sharewidget.cpp" line="239"/> <location filename="sharewidget.cpp" line="286"/> <source>ISO8859-1</source> - <translation type="unfinished"></translation> + <translation>ISO8859-1</translation> </message> </context> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="111"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> - <translation>libssh無法初始化</translation> + <translation>Kan ej initialisera libssh</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="131"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> - <translation>無法建立SSH工作階段</translation> + <translation>Kan ej skapa SSH-session</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="146"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> - <translation>無法連線至 </translation> + <translation>Kan inte ansluta till </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> - <translation>驗證失敗</translation> + <translation>Autentisering misslyckades</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="203"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> - <translation>channel_forward_listen失敗</translation> + <translation>channel_forward_listen misslyckades</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="517"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> - <translation>無法開啟檔案</translation> + <translation>Kan inte öppna fil </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="529"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> - <translation>無法創建遠端檔案</translation> + <translation>Kan inte skapa fjärrfil </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="542"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> - <translation>無法寫入資料至遠端檔案</translation> + <translation>Kan inte skriva till fjärrfil </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="592"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> - <translation>無法連線至 </translation> + <translation>kan inte ansluta till </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> - <translation>channel_open_forward失敗</translation> + <translation>channel_open_forward misslyckades</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="720"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> - <translation>channel_open_session失敗</translation> + <translation>channel_open_session misslyckades</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="727"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> - <translation>channel_request_exec失敗</translation> + <translation>channel_request_exec misslyckades</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="792"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> - <translation type="unfinished"></translation> + <translation>ett fel uppstod vid skrivning till socket</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="810"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> - <translation type="unfinished"></translation> + <translation>ett fel uppstod när kanal skulle läsas</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="840"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> - <translation type="unfinished"></translation> + <translation>channel_write misslyckades</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="852"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> - <translation type="unfinished"></translation> + <translation>ett fel uppstod när tcp socket skulle läsas</translation> </message> </context> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> - <translation type="unfinished"></translation> + <translation>Ett fel uppstod när socket skulle skapas</translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> - <translation type="unfinished"></translation> + <translation>Ett fel uppstod vid anslutning till socket </translation> </message> </context> <context> @@ -2430,12 +2442,12 @@ sound system connections through firewalls</source> <message> <location filename="xsettingswidget.cpp" line="50"/> <source>Open File</source> - <translation>開啟檔案</translation> + <translation>Öppna fil</translation> </message> <message> <location filename="xsettingswidget.cpp" line="52"/> <source>Executable (*.exe)</source> - <translation>執行檔 (*.exe)</translation> + <translation>Exekverbar (*.exe)</translation> </message> </context> <context> @@ -2443,62 +2455,62 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="14"/> <source>Form</source> - <translation>表單</translation> + <translation>Formulär</translation> </message> <message> <location filename="xsettingsui.ui" line="27"/> - <source>You must restart the X2go Client for the changes to take effect</source> - <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation> + <source>You must restart the X2Go Client for the changes to take effect</source> + <translation>Du måste starta om X2Go-klienten för att ändringar ska aktiveras</translation> </message> <message> <location filename="xsettingsui.ui" line="50"/> <source>use integrated X-Server</source> - <translation>使用內建的X伺服器</translation> + <translation>Använd integrerad X-server</translation> </message> <message> <location filename="xsettingsui.ui" line="60"/> <source>use custom X-Server</source> - <translation>使用自定的X伺服器</translation> + <translation>Använd anpassad X-server</translation> </message> <message> <location filename="xsettingsui.ui" line="70"/> <source>custom X-Server</source> - <translation>自定X伺服器</translation> + <translation>Anpassad X-server</translation> </message> <message> <location filename="xsettingsui.ui" line="78"/> <source>executable:</source> - <translation>執行路徑:</translation> + <translation>Binär:</translation> </message> <message> <location filename="xsettingsui.ui" line="101"/> <source>start X-Server on X2Go client start</source> - <translation>當X2Go用戶端啟動時啟動X伺服器</translation> + <translation>Starta X-server när X2Go-klienten startas</translation> </message> <message> <location filename="xsettingsui.ui" line="113"/> <source>command line options:</source> - <translation>指令列選項:</translation> + <translation>Kommandoradsalternativ:</translation> </message> <message> <location filename="xsettingsui.ui" line="125"/> <source>X-Server command line options</source> - <translation>X伺服器指令列選項</translation> + <translation>Kommandoradsalternativ för X-server</translation> </message> <message> <location filename="xsettingsui.ui" line="131"/> <source>window mode:</source> - <translation>視窗模式:</translation> + <translation>Fönsterläge:</translation> </message> <message> <location filename="xsettingsui.ui" line="141"/> <source>fullscreen mode:</source> - <translation>全螢幕模式:</translation> + <translation>Fullskärmsläge:</translation> </message> <message> <location filename="xsettingsui.ui" line="151"/> <source>single application:</source> - <translation>單一應用程式:</translation> + <translation>Applikation:</translation> </message> </context> </TS> diff --git a/x2goclient_zh_tw.qm b/x2goclient_zh_tw.qm deleted file mode 100644 index 89a9d60..0000000 Binary files a/x2goclient_zh_tw.qm and /dev/null differ diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index d5669c1..142418c 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -662,8 +662,8 @@ </message> <message> <location filename="onmainwindow.cpp" line="147"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2152"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> <translation>正在連線</translation> </message> @@ -713,7 +713,7 @@ <message> <location filename="onmainwindow.cpp" line="488"/> <location filename="onmainwindow.cpp" line="945"/> - <location filename="onmainwindow_part2.cpp" line="2204"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> <translation>暫停</translation> @@ -856,18 +856,18 @@ <location filename="onmainwindow.cpp" line="2205"/> <location filename="onmainwindow.cpp" line="2239"/> <location filename="onmainwindow.cpp" line="2284"/> - <location filename="onmainwindow_part2.cpp" line="300"/> - <location filename="onmainwindow_part2.cpp" line="476"/> - <location filename="onmainwindow_part2.cpp" line="485"/> - <location filename="onmainwindow_part2.cpp" line="784"/> - <location filename="onmainwindow_part2.cpp" line="1235"/> - <location filename="onmainwindow_part2.cpp" line="1296"/> - <location filename="onmainwindow_part2.cpp" line="1347"/> - <location filename="onmainwindow_part2.cpp" line="1380"/> - <location filename="onmainwindow_part2.cpp" line="1424"/> - <location filename="onmainwindow_part2.cpp" line="1804"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> <location filename="onmainwindow_part2.cpp" line="1830"/> - <location filename="onmainwindow_part2.cpp" line="1962"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> <location filename="onmainwindow_part3.cpp" line="773"/> <location filename="onmainwindow_part3.cpp" line="854"/> @@ -923,7 +923,7 @@ </message> <message> <location filename="onmainwindow.cpp" line="941"/> - <location filename="onmainwindow_part2.cpp" line="2065"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <translation>尚未連線</translation> </message> @@ -1017,52 +1017,52 @@ It is now: </source> <translation>由於安全性的考量，目前的連線已被中止</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> <translation>目前沒有找到伺服器上的主機密鑰，不過有其它類型的密鑰存在。惡意的攻擊者可能會利用改變預設的伺服器密鑰來讓您的用戶端認為原本的密鑰並不存在</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> <translation>此為未知的伺服器，您要選擇信任此主機密鑰嗎? 此公開密鑰的雜湊值為:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> <translation>主機密鑰驗證任失敗</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1169"/> - <location filename="onmainwindow_part2.cpp" line="1189"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> <translation>是</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1170"/> - <location filename="onmainwindow_part2.cpp" line="1190"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> <translation>否</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> - <source>Authentification failed</source> + <location filename="onmainwindow_part2.cpp" line="146"/> + <source>Authentication failed</source> <translation>認證失敗</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> <location filename="onmainwindow_part3.cpp" line="766"/> <location filename="onmainwindow_part3.cpp" line="847"/> <location filename="onmainwindow_part3.cpp" line="1219"/> @@ -1074,9 +1074,9 @@ Public key hash: </source> </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="296"/> - <location filename="onmainwindow_part2.cpp" line="1292"/> - <location filename="onmainwindow_part2.cpp" line="1376"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> <location filename="onmainwindow_part3.cpp" line="769"/> <location filename="onmainwindow_part3.cpp" line="850"/> @@ -1087,196 +1087,196 @@ Public key hash: </source> <translation>不正確的密碼! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="412"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="477"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> <translation>伺服器不存在l</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="486"/> - <location filename="onmainwindow_part2.cpp" line="785"/> - <location filename="onmainwindow_part2.cpp" line="1236"/> - <location filename="onmainwindow_part2.cpp" line="1348"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> <translation>伺服器不存在|</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1005"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> <translation>請選擇工作階段:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1021"/> - <location filename="onmainwindow_part2.cpp" line="1115"/> - <location filename="onmainwindow_part2.cpp" line="2168"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> <translation>正在執行中</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1023"/> - <location filename="onmainwindow_part2.cpp" line="1308"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> <translation>已暫停</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> <translation>桌面</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1031"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> <translation>單一的應用程式</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1033"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1066"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> <translation>資訊</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1067"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> <translation>目前沒有找到可訪問的工作桌面</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1080"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> <translation>篩選器</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1087"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> <translation>請選擇工作桌面:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1156"/> - <location filename="onmainwindow_part2.cpp" line="1176"/> - <location filename="onmainwindow_part2.cpp" line="1991"/> - <location filename="onmainwindow_part2.cpp" line="2380"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1157"/> - <location filename="onmainwindow_part2.cpp" line="1177"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> <translation>您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1165"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> <translation>24或32</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。 請問您無論如何都要恢復此工作階段的連線嗎?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1253"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> <translation>正在暫停工作中</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1275"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> <translation>正在中止工作中</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1409"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> <translation>不正確的密碼! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1802"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> <translation>無法創建資料夾:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> <translation>檔案無法寫入:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1934"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> <translation>連接X2Go視窗</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> <translation>無法建立SSL通道:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1989"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> <translation>無法建立SSL通道: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2137"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> <translation>已完成</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2160"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> <translation>正在開始</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2162"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> <translation>正在還原</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2224"/> - <location filename="onmainwindow_part2.cpp" line="2492"/> - <location filename="onmainwindow_part2.cpp" line="2510"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> <translation>連線超時，中止中</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2225"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> <translation>中止中</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2381"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> <translation>工作階段</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2462"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> <location filename="onmainwindow_part4.cpp" line="2067"/> <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> <translation>顯示</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2464"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> <translation>創建時間</translation> @@ -2238,12 +2238,12 @@ sound system connections through firewalls</source> <translation>用戶端列印支援</translation> </message> <message> - <location filename="settingswidget.cpp" line="557"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation>us</translation> </message> <message> - <location filename="settingswidget.cpp" line="558"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation>pc105/us</translation> </message> @@ -2332,82 +2332,82 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="111"/> + <location filename="sshmasterconnection.cpp" line="124"/> <source>Can not initialize libssh</source> <translation>libssh無法初始化</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="131"/> + <location filename="sshmasterconnection.cpp" line="144"/> <source>Can not create ssh session</source> <translation>無法建立SSH工作階段</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="146"/> + <location filename="sshmasterconnection.cpp" line="159"/> <source>Can not connect to </source> <translation>無法連線至 </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="200"/> <source>Authentication failed</source> <translation>驗證失敗</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="203"/> + <location filename="sshmasterconnection.cpp" line="216"/> <source>channel_forward_listen failed</source> <translation>channel_forward_listen失敗</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="517"/> + <location filename="sshmasterconnection.cpp" line="530"/> <source>Can not open file </source> <translation>無法開啟檔案</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="529"/> + <location filename="sshmasterconnection.cpp" line="542"/> <source>Can not create remote file </source> <translation>無法創建遠端檔案</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="542"/> + <location filename="sshmasterconnection.cpp" line="555"/> <source>Can not write to remote file </source> <translation>無法寫入資料至遠端檔案</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="592"/> + <location filename="sshmasterconnection.cpp" line="605"/> <source>can not connect to </source> <translation>無法連線至 </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="714"/> <source>channel_open_forward failed</source> <translation>channel_open_forward失敗</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="720"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_open_session failed</source> <translation>channel_open_session失敗</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="727"/> + <location filename="sshmasterconnection.cpp" line="740"/> <source>channel_request_exec failed</source> <translation>channel_request_exec失敗</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="792"/> + <location filename="sshmasterconnection.cpp" line="805"/> <source>error writing to socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="810"/> + <location filename="sshmasterconnection.cpp" line="823"/> <source>error reading channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="840"/> + <location filename="sshmasterconnection.cpp" line="853"/> <source>channel_write failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="852"/> + <location filename="sshmasterconnection.cpp" line="865"/> <source>error reading tcp socket</source> <translation type="unfinished"></translation> </message> @@ -2415,12 +2415,12 @@ sound system connections through firewalls</source> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> <translation type="unfinished"></translation> </message> @@ -2447,8 +2447,9 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="27"/> - <source>You must restart the X2go Client for the changes to take effect</source> - <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation> + <source>You must restart the X2Go Client for the changes to take effect</source> + <oldsource>You must restart the X2go Client for the changes to take effect</oldsource> + <translation type="unfinished">您必需重新啟動X2go用戶端以讓設定變更生效</translation> </message> <message> <location filename="xsettingsui.ui" line="50"/> diff --git a/x2goplugin.rc b/x2goplugin.rc index 1578a92..dde2abb 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,0,6 - PRODUCTVERSION 3,99,0,6 + FILEVERSION 3,99,1,0 + PRODUCTVERSION 3,99,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 0 ,6\0" + VALUE "FileVersion", "3, 99, 1 ,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.0.6\0" - VALUE "ProductVersion", "3, 99, 0, 6\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.1.0\0" + VALUE "ProductVersion", "3, 99, 1, 0\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.0.6-32-gd090188
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via d090188694f638a539eddb06e7eb63731cb0e48e (commit) from 2220856b8ecf31845ad87ada52a6b15a814d80d6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d090188694f638a539eddb06e7eb63731cb0e48e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 14:47:12 2012 +0100 Update date and release version in man page. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + man/man1/x2goclient.1 | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9483384..d81863d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low - Provide empty translation file x2goclient_en.ts. - Fix misspelled word ,,Authentification'' -> ,,Authentication''. - Fix misspelled word ,,recieved'' -> ,,received''. + - Update date and release version in man page. [ Mihai Moldovan ] * New upstream version (3.99.1.0): diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index f4c98c8..bedddfb 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "July 2011" "Version 3.99.0.x" "X2Go Client (Qt4)" +.TH x2goclient 1 "Feb 2012" "Version 3.99.1.x" "X2Go Client (Qt4)" .SH NAME x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

nx-libs.git - build-main (branch) updated: redist-client/3.5.0.11
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, build-main has been updated via 50690ea177ee39011a235bac6887a213f27e7f54 (commit) via fde6a88a81ebdeb151a39e05977279d060f16884 (commit) via ec47c22c264bd2f1d2ce6e434b503a701dc129f7 (commit) via 7a6cf42d4b47b9f33372470a35f2dfbfc95cfabe (commit) via e63819e64530f1b786e512e5f4e433ad845979b7 (commit) via 78fba02719b629d4cbc804d27a579773777741d3 (commit) via c26e4bd825826462fc73242f94369555ae0f44fe (commit) via b99168fc3f8b45a38d6efb370463ad71695cb3f9 (commit) via 07f9dfa05ab83e094e823b4af8478b25addd0fa5 (commit) via 548d50ba59444a399ed525aa49c040394d25801e (commit) via 3deee8f94983ea6c072663c1197d311fc1ddaf6c (commit) via 9282c00e2aaa02404809fe317308ccbb4da3b0e8 (commit) via 6a96ae450fb469bec1f23ebe727f6f318bfe80db (commit) via 8d6d0a921889498601cef9176202a456af881a9e (commit) via 01e97f0f829b90411a15c70b082a7823a26ae61f (commit) via c621c22f820ec22fe7daabf37b7b577a41a3298f (commit) via 4d6e1c4fbe549a77caa5ba0fc60e1bf668bf4a4b (commit) via ba589d1fd264f3ad3fbe8767bf215c0399a162cf (commit) via b4b4e209bf1d379adcff26e28305af076f8963d4 (commit) via 280d8751c36b6585c068a25cc180e7baa6df2019 (commit) via 165206eb288d43d68530652c31fdc26cf0bbab28 (commit) via 448a1db30bd68025dea51ea98a52a16658f6f03c (commit) via b087877b25af2c3ed9cd405fd1c867c8817223e9 (commit) via 4feedb2141805cd86c5f64aef206c40362dcc754 (commit) via 278f94136e49234e0904da9665b571c9a44fb696 (commit) via 4473c3ab9c4ea4ece35fcc1da1608179404d9fba (commit) via ec72377982314efccbc8597a65ec364b8b75d251 (commit) via 4eae840bd56bda22b7bf6c9a55f1118ed62461e4 (commit) via 54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (commit) via 7f7cb5d874a857ab59bef7427734d8edfcca85bd (commit) via eb5ef91b6b940eb001d8acb95f6413560570c1a7 (commit) via 00b266b82503e8155e7195180f287df0392fb770 (commit) via f4ef2967b1495e5d9577a94610ee0be3e89ab870 (commit) via a751baaab83cc58245632e8fdb406e0b059810da (commit) from 419d505c907972b7823263a843e0de0a57b25b18 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 47 + debian/control | 3 +- debian/libnx-x11.install | 1 - debian/libnx-x11.links | 4 + .../patches/001_add-main-makefile.full+lite.patch | 71 +- ...omp_makefile-uninstall+autoconf.full+lite.patch | 74 + .../012_nxcomp_makefile-uninstall.full+lite.patch | 63 - ...xcompext_makefile-uninstall+autoconf.full.patch | 66 + .../013_nxcompext_makefile-uninstall.full.patch | 53 - ...compshad_makefile-uninstall+autoconf.full.patch | 70 + .../014_nxcompshad_makefile-uninstall.full.patch | 61 - .../patches/030_nx-X11_configure-args.full.patch | 51 + debian/patches/031_nx-X11_parallel-make.full.patch | 294 +++ debian/patches/032_no-x11r6.full.patch | 24 + .../patches/301_nx-X11_use-shared-libs.full.patch | 106 + ...nxcompext+nxcompshad_unique-libnames.full.patch | 2384 ++++++++++++++++++++ debian/patches/series | 16 +- debian/post-build-nx.sh | 4 + debian/rules | 2 +- 19 files changed, 3168 insertions(+), 226 deletions(-) create mode 100644 debian/libnx-x11.links create mode 100644 debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch delete mode 100644 debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch create mode 100644 debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/013_nxcompext_makefile-uninstall.full.patch create mode 100644 debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/014_nxcompshad_makefile-uninstall.full.patch create mode 100644 debian/patches/030_nx-X11_configure-args.full.patch create mode 100644 debian/patches/031_nx-X11_parallel-make.full.patch create mode 100644 debian/patches/032_no-x11r6.full.patch create mode 100644 debian/patches/301_nx-X11_use-shared-libs.full.patch create mode 100644 debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9b1a540..742e1b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +nx-libs (2:3.5.0.11-0) unstable; urgency=low + + [ Mike Gabriel ] + * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, + make build stanza work for nx-libs-full and nx-libs-lite. + * Do not install libXinerama directly into /usr/lib/nx. Recommended method is + installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of + the Xinerama extension. + * Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for + macros. + * Enable parallel build for Debian package. + * Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already + existing Makefile patches (012_nxcomp..., 013_nxcompext_..., + 014_nxcompshad_...). + * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script + currently requires ,,full'' or ,,full+lite'' in the file name. + * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). + * Update patch: 001_add-main-makefile.full+lite.patch, fix missing + $(CONFIGURE) variable. + * Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... + Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas. + Inspired by Jan Engelhardt's so-version.diff patch. However, the version + name change requested in that patch has been rejected for + NX (redistributed). + * Apply patches for the Debian package as the last patches in the series. + * Fix faulty patch name suffix (has to be .patch, not .diff). + * Fix Xinerama support in Debian package libnx-x11 when NX gets built with + patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Still on + the todo list: fix the nx-X11 installation via Makefile. + * Fine-tune symlinking of libXinerama. + + [ Jan Engelhardt ] + * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of + configure args. + * Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args. + * Add patch: 031_nx-X11_parallel-make.diff, enable parallel make. + * Add patch: 301_nx-X11_use-shared-libs.full.diff, use shared libraries from + distribution rather then libs included in source tree. + * Add patch: 032_nx-X11_no-x11r6-project-root. We must not overlap with any + existing files, therefore, both /usr/X11R6 and /usr are excluded + possibilities for ProjectRoot. Use %_libexecdir/somename, since that is + still allowed by FHS. + * Add patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch, use + unique library names for nx-X11 based X11 libraries. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:41:07 +0100 + nx-libs (2:3.5.0.10-0) unstable; urgency=low * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against diff --git a/debian/control b/debian/control index 195bcac..b23ecc2 100644 --- a/debian/control +++ b/debian/control @@ -60,6 +60,7 @@ Package: libnx-mesa-extras-dev Section: libdevel Architecture: any Depends: + libnx-x11-dev (>= ${source:Version}), libnx-x11-dev (<< ${source:Version}.1~), ${misc:Depends} Description: Library headers for nx-X11 (extra headers) NX is a software suite which implements very efficient @@ -145,7 +146,6 @@ Description: NX xauth Package: libxcomp3 Architecture: any Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, ${misc:Depends} Breaks: nxcomp (<=3.5.1) @@ -161,7 +161,6 @@ Package: libxcomp-dev Section: libdevel Architecture: any Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), libxcomp3 (= ${binary:Version}), ${misc:Depends} Breaks: nxcomp-dev (<=3.5.1) diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index cfe4cff..7838d08 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,3 +1,2 @@ nx-X11/.build-exports/lib/* usr/lib/nx/X11 -nx-X11/lib/Xinerama/libXinerama.so* usr/lib/nx/X11/Xinerama nx-X11/programs/Xserver/Xext/SecurityPolicy usr/share/nx diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links new file mode 100644 index 0000000..82c245f --- /dev/null +++ b/debian/libnx-x11.links @@ -0,0 +1,4 @@ +usr/lib/libX11.so.6 usr/lib/nx/X11/Xinerama/libNX_X11.so.6 +usr/lib/libXext.so.6 usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 +usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so +usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 533ce7e..3c236b9 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,47 +5,40 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,43 @@ +@@ -0,0 +1,36 @@ +#!/usr/bin/make -f + -+all: build -+ -+build: build-arch build-indep -+ -+clean: -+ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true -+ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true -+ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true -+ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true -+ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true -+ ++CONFIGURE=./configure + -+distclean: -+ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true -+ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true -+ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true -+ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true -+ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true ++%: ++ ${MAKE} -C nxcomp $@ ++ ${MAKE} -C nxproxy $@ ++ if test -d nx-X11; then \ ++ ${MAKE} -C nxcompext $@; \ ++ ${MAKE} -C nxcompshad; \ ++ ${MAKE} -C nx-X11 $@; \ ++ fi + -+build-arch: -+ test -d nxcomp && cd nxcomp && autoconf -+ test -d nxcompext && cd nxcompext && autoconf -+ test -d nxcompshad && cd nxcompshad && autoconf -+ test -d nx-X11 && cd nx-X11 && make World -+ test -d nxproxy && cd nxproxy && autoconf && ./configure && make -+ -+build-indep: -+ -+install: -+ test -d nxcomp && cd nxcomp && make install -+ test -d nxcompext && cd nxcompext && make install -+ test -d nxcompshad && cd nxcompshad && make install -+ test -d nx-X11 && cd nx-X11 && make install -+ test -d nxproxy && cd nxproxy && make install ++all: build + -+uninstall: -+ test -d nxcomp && cd nxcomp && make uninstall -+ test -d nxcompext && cd nxcompext && make uninstall -+ test -d nxcompshad && cd nxcompshad && make uninstall -+ test -d nx-X11 && cd nx-X11 && make uninstall -+ test -d nxproxy && cd nxproxy && make uninstall ++test: ++ echo "No testing for NX (redistributed)" ++ ++build-lite: ++ cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} ++ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} ++ ++build-full: ++# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... ++ cd nxcomp && autoconf ++ cd nxcompext && autoconf ++ cd nxcompshad && autoconf ++ cd nx-X11 && ${MAKE} World ++ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} ++ ++build: ++ if ! test -d nx-X11; then \ ++ ${MAKE} build-lite; \ ++ else \ ++ ${MAKE} build-full; \ ++ fi diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch new file mode 100644 index 0000000..9b9da7e --- /dev/null +++ b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch @@ -0,0 +1,74 @@ +Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs + Provide install and uninstall functionality in nxcomp/Makefile. + . + Honor autoconf's libdir (and includedir, while at it). This is a + must-have for multiarch platforms like x86_64 et al where multiple + forms of libraries can be installed at the same time. +Forwarded: pending... +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- a/nxcomp/Makefile.in ++++ b/nxcomp/Makefile.in +@@ -64,10 +64,15 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + + # + # This should be autodetected. +@@ -264,12 +269,44 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)${libdir}/nx ++ ./mkinstalldirs $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3 ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ diff --git a/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch deleted file mode 100644 index 36f1555..0000000 --- a/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Add install and uninstall stanzas to nxcomp/Makefile - Provide install and uninstall functionality in nxcomp/Makefile. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- nx-libs.orig/nxcomp/Makefile.in 2011-12-05 09:16:34.000000000 +0100 -+++ nx-libs/nxcomp/Makefile.in 2011-12-05 09:19:28.000000000 +0100 -@@ -68,6 +68,9 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -264,12 +267,44 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx -+ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) MD5.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3 -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.a -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXalert.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NX.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXmitshm.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXpack.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXproto.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXrender.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXvars.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/MD5.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch new file mode 100644 index 0000000..f6c522a --- /dev/null +++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch @@ -0,0 +1,66 @@ +Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs. + Provide install and uninstall functionality in nxcompext/Makefile. + . + Honor autoconf's libdir (and includedir, while at it). This is a + must-have for multiarch platforms like x86_64 et al where multiple + forms of libraries can be installed at the same time. +Forwarded: pending... +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -56,11 +56,15 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +- ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + # + # This should be autodetected. + # +@@ -147,12 +151,35 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)${libdir}/nx ++ ./mkinstalldirs $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) libXcompext.so.3 $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.3 ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall.full.patch b/debian/patches/013_nxcompext_makefile-uninstall.full.patch deleted file mode 100644 index 97e4f03..0000000 --- a/debian/patches/013_nxcompext_makefile-uninstall.full.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompext/Makefile - Provide install and uninstall functionality in nxcompext/Makefile. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- nx-libs.orig/nxcompext/Makefile.in 2011-12-05 09:20:15.000000000 +0100 -+++ nx-libs/nxcompext/Makefile.in 2011-12-05 09:24:37.000000000 +0100 -@@ -60,7 +60,9 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -- -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - # - # This should be autodetected. - # -@@ -147,12 +149,33 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx -+ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlibint.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch new file mode 100644 index 0000000..0577635 --- /dev/null +++ b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch @@ -0,0 +1,70 @@ +Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs + Provide install and uninstall functionality in nxcompshad/Makefile. + . + Honor autoconf's libdir (and includedir, while at it). This is a + must-have for multiarch platforms like x86_64 et al where multiple + forms of libraries can be installed at the same time. +Forwarded: pending... +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -74,10 +74,17 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ ++INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f ++RM_DIR = rmdir -p --ignore-fail-on-non-empty + + # + # This should be autodetected. +@@ -178,12 +185,38 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ $(INSTALL_DIR) $(DESTDIR)${libdir}/nx ++ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3 ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a ++ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done ++ $(RM_DIR) $(DESTDIR)${libdir}/nx/ ++ $(RM_DIR) $(DESTDIR)${includedir}/nx/ ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ + $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch deleted file mode 100644 index 1a78885..0000000 --- a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompshad/Makefile - Provide install and uninstall functionality in nxcompshad/Makefile. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -76,8 +76,13 @@ - VPATH = @srcdir@ - - INSTALL = @INSTALL@ -+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f -+RM_DIR = rmdir -p --ignore-fail-on-non-empty - - # - # This should be autodetected. -@@ -178,12 +183,38 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) *.a $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) *.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3 -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a -+ for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done -+ $(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/ -+ $(RM_DIR) $(DESTDIR)$(prefix)/include/nx/ -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch new file mode 100644 index 0000000..8304ca7 --- /dev/null +++ b/debian/patches/030_nx-X11_configure-args.full.patch @@ -0,0 +1,51 @@ +Description: Allow to pass in configure args. + Allow to pass in configure args. +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- + nx-X11/lib/X11/Imakefile | 6 ++++-- + nx-X11/programs/Xserver/Imakefile | 4 +++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +Index: nx-X11/lib/X11/Imakefile +=================================================================== +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h + + includes:: ks_tables.h + ++CONFIGURE=./configure ++ + #if NXLibraries + + $(NX_XCOMPCONFIGTARGET): + cd ../../../nxcomp && \ +- ./configure ++ ${CONFIGURE} + + $(NX_XCOMPEXTCONFIGTARGET): + cd ../../../nxcompext && \ +- ./configure ++ ${CONFIGURE} + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps + NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) + NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status + ++CONFIGURE=./configure ++ + $(NX_XSHADOWCONFIGTARGET): + cd $(NX_XSHADOWLIBDIR) && \ +- ./configure ++ ${CONFIGURE} + + #ifdef SunArchitecture + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch new file mode 100644 index 0000000..9f754d7 --- /dev/null +++ b/debian/patches/031_nx-X11_parallel-make.full.patch @@ -0,0 +1,294 @@ +Description: Enable parallel make + Restore ability to build things in parallel. + (${MAKE} must always appear in the rule directly, and not be + hidden through expansions of other variables to get this to work.) +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-01-26 22:29:13.993994227 +0100 + +--- + nx-X11/Makefile | 64 +++++++++++++++++----------------- + nx-X11/config/imake/Makefile.ini | 1 + nx-X11/extras/Mesa/Makefile | 2 - + nx-X11/extras/Xpm/Makefile.noX | 1 + nx-X11/extras/drm/linux-core/Makefile | 4 +- + nx-X11/extras/drm/linux/Makefile | 4 +- + nx-X11/extras/ttf2pt1/Makefile | 4 +- + nx-X11/lib/X11/Imakefile | 12 ++---- + nx-X11/lib/X11/Imakefile.NX.original | 12 ++---- + nx-X11/programs/Xserver/Imakefile | 4 +- + 10 files changed, 60 insertions(+), 69 deletions(-) + +--- a/nx-X11/Makefile ++++ b/nx-X11/Makefile +@@ -32,8 +32,8 @@ + VERSPROG = $(CONFIGSRC)/util/printver.exe + + all: +- @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial +- @$(MAKE_CMD) $@ ++ @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial ++ @${MAKE} ${MAKE_OPTS} $@ + + all-initial: + @echo Please use make World, or on NT use nmake World.Win32. +@@ -57,8 +57,8 @@ + @date + @echo "" + @if [ -f xmakefile ]; then \ +- $(MAKE_CMD) -k distclean || \ +- $(MAKE_CMD) -k clean || \ ++ ${MAKE} ${MAKE_OPTS} -k distclean || \ ++ ${MAKE} ${MAKE_OPTS} -k clean || \ + $(RM) xmakefile; \ + fi + @if [ ! -f $(IRULESRC)/host.def ]; then \ +@@ -84,14 +84,14 @@ + # fi + cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean + $(MAKE) $(MFLAGS) Makefile.boot +- $(MAKE_CMD) $(MFLAGS) version.def ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def + $(MAKE) $(MFLAGS) Makefile.boot +- $(MAKE_CMD) $(MFLAGS) VerifyOS +- $(MAKE_CMD) $(MFLAGS) Makefiles +- $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean +- $(MAKE_CMD) $(MFLAGS) includes +- $(MAKE_CMD) $(MFLAGS) depend +- $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World + @echo "" + @date + @echo "" +@@ -153,15 +153,15 @@ + -if exist xmakefile.bak del xmakefile.bak + -if exist xmakefile ren xmakefile xmakefile.bak + $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) +- $(MAKE_CMD) $(MFLAGS) VerifyOS +- $(MAKE_CMD) $(MFLAGS) Makefiles +- $(MAKE_CMD) $(MFLAGS) clean ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) clean + cd $(CONFIGSRC)\util + $(MAKE) mkdirhier.exe + cd ..\.. +- $(MAKE_CMD) $(MFLAGS) includes +- $(MAKE_CMD) $(MFLAGS) depend +- $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS) ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WIN32WORLDOPTS) + @echo : + @echo : + @echo Full build of $(RELEASE) complete. +@@ -197,33 +197,33 @@ + # a copy of every rule that might be invoked at top level + + clean: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + dangerous_strip_clean: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + distclean: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def + depend: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + Everything: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + external.ln: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + includes: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install.sdk: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install.ln: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install.man: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + Makefiles: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + man_keywords: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + tags: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + VerifyOS: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ +--- a/nx-X11/config/imake/Makefile.ini ++++ b/nx-X11/config/imake/Makefile.ini +@@ -21,7 +21,6 @@ + SHELL = /bin/sh + RM = rm -f + MV = mv +-MAKE = make + RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ + tags TAGS make.log + NPROC = 1 +--- a/nx-X11/extras/Mesa/Makefile ++++ b/nx-X11/extras/Mesa/Makefile +@@ -12,7 +12,7 @@ + + + doxygen: +- (cd doxygen ; make) ; \ ++ (cd doxygen ; ${MAKE}) ; \ + + clean: + @for dir in $(SUBDIRS) ; do \ +--- a/nx-X11/extras/Xpm/Makefile.noX ++++ b/nx-X11/extras/Xpm/Makefile.noX +@@ -32,7 +32,6 @@ + + SUBDIRS= lib sxpm cxpm + +-MAKE=make + MFLAGS=-f Makefile.noX + INSTALL= install -c + CURRENT_DIR=. +--- a/nx-X11/extras/drm/linux-core/Makefile ++++ b/nx-X11/extras/drm/linux-core/Makefile +@@ -176,7 +176,7 @@ + all: modules + + modules: includes +- make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules ++ ${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules + + ifeq ($(HEADERFROMBOOT),1) + +@@ -246,7 +246,7 @@ + rm -rf $(CLEANFILES) + + $(MODULE_LIST):: +- make DRM_MODULES=$@ modules ++ ${MAKE} DRM_MODULES=$@ modules + + # Build test utilities + +--- a/nx-X11/extras/drm/linux/Makefile ++++ b/nx-X11/extras/drm/linux/Makefile +@@ -184,7 +184,7 @@ + all: modules + + modules: includes +- make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules ++ ${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules + + ifeq ($(HEADERFROMBOOT),1) + +@@ -254,7 +254,7 @@ + rm -rf $(CLEANFILES) + + $(MODULE_LIST):: +- make DRM_MODULES=$@ modules ++ ${MAKE} DRM_MODULES=$@ modules + + # Build test utilities + +--- a/nx-X11/extras/ttf2pt1/Makefile ++++ b/nx-X11/extras/ttf2pt1/Makefile +@@ -158,8 +158,8 @@ + + clean: + rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core +- ( cd other && make clean; ) +- ( cd app/netscape && make clean; ) ++ ( cd other && ${MAKE} clean; ) ++ ( cd app/netscape && ${MAKE} clean; ) + + veryclean: clean + rm -f $(DOCS) $(MANS) +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -1161,21 +1161,17 @@ + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- gmake ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- gmake ++ ${MAKE} -C ../../../nxcompext + + #else + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- make ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- make ++ ${MAKE} -C ../../../nxcompext + + #endif + +--- a/nx-X11/lib/X11/Imakefile.NX.original ++++ b/nx-X11/lib/X11/Imakefile.NX.original +@@ -1159,21 +1159,17 @@ + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- gmake ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- gmake ++ ${MAKE} -C ../../../nxcompext + + #else + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- make ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- make ++ ${MAKE} -C ../../../nxcompext + + #endif + +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1045,11 +1045,11 @@ + #ifdef SunArchitecture + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) + cd $(NX_XSHADOWLIBDIR) && \ +- gmake ++ ${MAKE} + #else + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) + cd $(NX_XSHADOWLIBDIR) && \ +- rm -f *.o && make ++ rm -f *.o && ${MAKE} + #endif + + ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/debian/patches/032_no-x11r6.full.patch b/debian/patches/032_no-x11r6.full.patch new file mode 100644 index 0000000..97ce88c --- /dev/null +++ b/debian/patches/032_no-x11r6.full.patch @@ -0,0 +1,24 @@ +Description: No X11R6 Project Root + We must not overlap with any existing files, therefore, both + /usr/X11R6 and /usr are excluded possibilities for ProjectRoot. + Use %_libexecdir/somename, since that is still allowed by FHS. +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-01-27 01:35:49.164415307 +0100 +--- + nx-X11/config/cf/site.def | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nx-X11/config/cf/site.def +=================================================================== +--- a/nx-X11/config/cf/site.def ++++ b/nx-X11/config/cf/site.def +@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/X11R6 ++#define ProjectRoot /usr/lib/NX3 + #endif + + /* diff --git a/debian/patches/301_nx-X11_use-shared-libs.full.patch b/debian/patches/301_nx-X11_use-shared-libs.full.patch new file mode 100644 index 0000000..2001474 --- /dev/null +++ b/debian/patches/301_nx-X11_use-shared-libs.full.patch @@ -0,0 +1,106 @@ +Description: Use shared libraries + Many distributions have a policy to reduce code duplications. + One means to avoid such duplications is to use shared libraries + instead of using libs that are ofter shipped for convenience. + . + Fedora: + http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries + . + Debian (Section 10.7.4 of Debian policy): + http://www.debian.org/doc/debian-policy/ch-files.html +Forwarded: pending... +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- + nx-X11/config/cf/host.def | 11 ++++++----- + nx-X11/programs/Xserver/Imakefile | 6 +++--- + nx-X11/programs/nxauth/Imakefile | 2 +- + 3 files changed, 10 insertions(+), 9 deletions(-) + +Index: nx-X11/config/cf/host.def +=================================================================== +--- a/nx-X11/config/cf/host.def ++++ b/nx-X11/config/cf/host.def +@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildRenderLibrary YES + #define SharedLibFreetype2 YES + #define NormalLibFreetype2 YES +-#define FontLibSharedFreeType NO ++#define FontLibSharedFreeType YES + #endif + + /* +@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + * + #define XserverStaticFontLib NO + */ ++#define XserverStaticFontLib YES + + /* + * To enable binary compatibility with previous versions of the font +@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildXKB YES + #define BuildXKBlib YES + +-#define SharedLibXau NO ++#define SharedLibXau YES + + /* + * If you are running NetBSD 0.9C or later, and have the aperture driver +@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildXterm YES + */ + +-#define SharedLibXau NO ++#define SharedLibXau YES + +-#define SharedLibXdmcp NO ++#define SharedLibXdmcp YES + + #define BuildXaw7 YES + +@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildFontServer NO + #define BuildFreeType NO + #define BuildXTrueType NO +-#define FontLibSharedFreeType NO ++#define FontLibSharedFreeType YES + #endif + + #if !defined(NXZaurusXServer) && defined(NXiPAQXServer) +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS + #if defined(SunArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp + #elif defined(cygwinArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ + -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ +- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst ++ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp + #else + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp + #endif + + #endif +Index: nx-X11/programs/nxauth/Imakefile +=================================================================== +--- a/nx-X11/programs/nxauth/Imakefile ++++ b/nx-X11/programs/nxauth/Imakefile +@@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakef + + INCLUDES=-I../../lib + DEPLIBS = $(DEPXAUTHLIB) +- LOCAL_LIBRARIES = ../../exports/lib/libXau.a ++ LOCAL_LIBRARIES = $(XAUTHLIB) + SRCS = xauth.c gethost.c process.c parsedpy.c + OBJS = xauth.o gethost.o process.o parsedpy.o + CONN_DEFINES = $(CONNECTION_FLAGS) diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch new file mode 100644 index 0000000..5ca8f5f --- /dev/null +++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch @@ -0,0 +1,2384 @@ +Description: Unique Library Names Patch + Patch from the RPM folks... + . + We really want to make use of rpm's automatic dependency finding. + Binaries are scanned for DT_NEEDED entries, the latter of which are + then used for populating the "Requires"-type deps. The "nxagent" + binary for example would require libX11.so.6. That incurs problems: + . + 1. A package manager told to install nxagent could select xorg-x11 + rather than nx-libs, even though nxagent depends on the NX version. + . + 2. A package manager told to install $some_program could select nx-libs + rather than xorg-x11 (since both provide libX11.so.6), but, since + the NX library is in an obscure directory, running $some_program + would fail as libX11.so.6 is not found. + . + To solve this, give the NX libraries unique names different from the + Xorg ones. +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-15 +--- + nx-X11/config/cf/Imake.rules | 12 - + nx-X11/config/cf/Motif.tmpl | 4 + nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- + nx-X11/config/cf/bsdLib.rules | 6 + nx-X11/config/cf/bsdLib.tmpl | 2 + nx-X11/config/cf/bsdiLib.tmpl | 2 + nx-X11/config/cf/convex.cf | 6 + nx-X11/config/cf/cygwin.tmpl | 2 + nx-X11/config/cf/darwinLib.tmpl | 2 + nx-X11/config/cf/gnuLib.tmpl | 2 + nx-X11/config/cf/ibmLib.rules | 12 - + nx-X11/config/cf/ibmLib.tmpl | 2 + nx-X11/config/cf/lnxLib.rules | 16 - + nx-X11/config/cf/lnxLib.tmpl | 4 + nx-X11/config/cf/mingw.tmpl | 2 + nx-X11/config/cf/nto.rules | 2 + nx-X11/config/cf/os2Lib.tmpl | 58 ++-- + nx-X11/config/cf/sco5.cf | 2 + nx-X11/config/cf/sv3Lib.tmpl | 24 +- + nx-X11/config/cf/sv4Lib.tmpl | 2 + nx-X11/config/cf/usl.cf | 2 + nx-X11/extras/Mesa/src/mesa/main/Imakefile | 2 + nx-X11/extras/Xpm/lib/Imakefile | 2 + nx-X11/extras/drm/libdrm.pc.in | 2 + nx-X11/extras/fontconfig/fontconfig.pc.in | 2 + nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile | 2 + nx-X11/lib/FS/Imakefile | 2 + nx-X11/lib/GLw/Imakefile | 2 + nx-X11/lib/ICE/Imakefile | 2 + nx-X11/lib/SM/Imakefile | 2 + nx-X11/lib/X11/Imakefile | 2 + nx-X11/lib/X11/Imakefile.NX.original | 2 + nx-X11/lib/X11/Imakefile.X.original | 2 + nx-X11/lib/XRes/Imakefile | 2 + nx-X11/lib/XTrap/Imakefile | 2 + nx-X11/lib/Xau/Imakefile | 2 + nx-X11/lib/Xaw/Imakefile | 2 + nx-X11/lib/Xaw6/Imakefile | 2 + nx-X11/lib/Xaw7/Imakefile | 2 + nx-X11/lib/Xcomposite/Imakefile | 2 + nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 + nx-X11/lib/Xcursor/Imakefile | 2 + nx-X11/lib/Xcursor/xcursor.pc.in | 2 + nx-X11/lib/Xdamage/Imakefile | 2 + nx-X11/lib/Xdamage/xdamage.pc.in | 2 + nx-X11/lib/Xdmcp/Imakefile | 2 + nx-X11/lib/Xevie/Imakefile | 2 + nx-X11/lib/Xevie/xevie.pc.in | 2 + nx-X11/lib/Xext/Imakefile | 2 + nx-X11/lib/Xfixes/Imakefile | 2 + nx-X11/lib/Xfixes/xfixes.pc.in | 2 + nx-X11/lib/Xfontcache/Imakefile | 2 + nx-X11/lib/Xft/Imakefile | 2 + nx-X11/lib/Xft/xft.pc.in | 2 + nx-X11/lib/Xft1/Imakefile | 2 + nx-X11/lib/Xi/Imakefile | 2 + nx-X11/lib/Xinerama/Imakefile | 2 + nx-X11/lib/Xmu/Imakefile | 2 + nx-X11/lib/Xmuu/Imakefile | 2 + nx-X11/lib/Xp/Imakefile | 2 + nx-X11/lib/Xpm/Imakefile | 2 + nx-X11/lib/Xpm/Imakefile.NX.original | 2 + nx-X11/lib/Xpm/Imakefile.X.original | 2 + nx-X11/lib/XprintAppUtil/Imakefile | 2 + nx-X11/lib/XprintUtil/Imakefile | 2 + nx-X11/lib/Xrandr/Imakefile | 2 + nx-X11/lib/Xrender/Imakefile | 2 + nx-X11/lib/Xrender/xrender.pc.in | 2 + nx-X11/lib/Xss/Imakefile | 2 + nx-X11/lib/Xt/Imakefile | 2 + nx-X11/lib/Xt/Imakefile.NX.original | 2 + nx-X11/lib/Xt/Imakefile.X.original | 2 + nx-X11/lib/Xtst/Imakefile | 2 + nx-X11/lib/Xv/Imakefile | 2 + nx-X11/lib/XvMC/Imakefile | 2 + nx-X11/lib/XvMC/hw/i810/Imakefile | 2 + nx-X11/lib/XvMC/hw/via/unichrome/Imakefile | 2 + nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile | 2 + nx-X11/lib/XvMC/wrapper/Imakefile | 2 + nx-X11/lib/Xxf86dga/Imakefile | 2 + nx-X11/lib/Xxf86misc/Imakefile | 2 + nx-X11/lib/Xxf86rush/Imakefile | 2 + nx-X11/lib/Xxf86vm/Imakefile | 2 + nx-X11/lib/apple/Imakefile | 2 + nx-X11/lib/dmx/Imakefile | 2 + nx-X11/lib/dps/Imakefile | 2 + nx-X11/lib/dpstk/Imakefile | 2 + nx-X11/lib/expat/Imakefile | 2 + nx-X11/lib/font/Imakefile | 2 + nx-X11/lib/fontconfig/Imakefile | 2 + nx-X11/lib/fontenc/Imakefile | 2 + nx-X11/lib/freetype2/Imakefile | 2 + nx-X11/lib/oldX/Imakefile | 2 + nx-X11/lib/psres/Imakefile | 2 + nx-X11/lib/regex/Imakefile | 2 + nx-X11/lib/windows/Imakefile | 2 + nx-X11/lib/xkbfile/Imakefile | 2 + nx-X11/lib/xkbui/Imakefile | 2 + nx-X11/lib/zlib/Imakefile | 2 + nx-X11/programs/Xserver/Imakefile | 18 - + nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile | 2 + nxcompext/Makefile.in | 4 + nxcompshad/Makefile.in | 4 + 103 files changed, 294 insertions(+), 294 deletions(-) + +Index: nx-libs_3.5.0.9/nx-X11/config/cf/Imake.rules +=================================================================== +--- a/nx-X11/config/cf/Imake.rules ++++ b/nx-X11/config/cf/Imake.rules +@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsou + */ + #ifndef ProjectUnsharedFontLibReferences + #define ProjectUnsharedFontLibReferences() @@\ +-DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ +-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\ ++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + #endif + + /* +@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBS + #ifndef SharedFontLibReferences + #define SharedFontLibReferences() @@\ + SOFONTREV = SharedFontRev @@\ +-DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ ++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + #endif + + /* +Index: nx-libs_3.5.0.9/nx-X11/config/cf/Motif.tmpl +=================================================================== +--- a/nx-X11/config/cf/Motif.tmpl ++++ b/nx-X11/config/cf/Motif.tmpl +@@ -465,9 +465,9 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC) + #endif + + #if SharedLibXm +-SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) ++SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) + #else +-ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir) ++ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir) + #endif + + #if SharedLibMrm +Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl +=================================================================== +--- a/nx-X11/config/cf/X11.tmpl ++++ b/nx-X11/config/cf/X11.tmpl +@@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines + #ifndef SharedX11Rev + #define SharedX11Rev 6.2 + #endif +-SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) ++SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) + #else +-ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) + #endif + /* Common alternate spellings */ + DEPXLIBONLY = $(DEPXONLYLIB) +@@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,X11,$ + #ifndef SharedXextRev + #define SharedXextRev 6.4 + #endif +-SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) ++SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) + #else +-ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) + #endif + LINTEXTENSIONLIB = $(LINTEXTENSION) + DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) +@@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) + #ifndef SharedXssRev + #define SharedXssRev 1.0 + #endif +-SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) ++SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) + #else +-ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) + #endif + + XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc +@@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,Xss,$(X + #ifndef SharedXxf86miscRev + #define SharedXxf86miscRev 1.1 + #endif +-SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) ++SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) + #else +-ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) + #endif + + XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm +@@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,X + #ifndef SharedXxf86vmRev + #define SharedXxf86vmRev 1.0 + #endif +-SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) ++SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) + #else +-ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) + #endif + + XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga +@@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,Xxf + #ifndef SharedXxf86dgaRev + #define SharedXxf86dgaRev 1.0 + #endif +-SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) ++SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) + #else +-ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) + #endif + + #if BuildDmxLibrary +@@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,Xx + #ifndef SharedXxf86rushRev + #define SharedXxf86rushRev 1.0 + #endif +-SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) ++SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) + #else +-ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) + #endif + + +@@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,X + #ifndef SharedXvRev + #define SharedXvRev 1.0 + #endif +-SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) ++SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) + #else +-ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) + #endif + + +@@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVL + #ifndef SharedXvMCRev + #define SharedXvMCRev 1.0 + #endif +-SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) ++SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) + #else +-ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) + #endif + + XINERAMALIBSRC = $(LIBSRC)/Xinerama +@@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$ + #ifndef SharedXineramaRev + #define SharedXineramaRev 1.0 + #endif +-SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) ++SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) + #else +-ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) + #endif + + XRESLIBSRC = $(LIBSRC)/XRes +@@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,Xi + #ifndef SharedXResRev + #define SharedXResRev 1.0 + #endif +-SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) ++SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) + #else +-ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) + #endif + + DMXLIBSRC = $(LIBSRC)/dmx +@@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,XRes,$ + #ifndef SharedDmxRev + #define SharedDmxRev 1.0 + #endif +-SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) ++SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) + #else +-ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) + #endif + + DPSLIBSRC = $(LIBSRC)/dps +@@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,dmx,$(D + #ifndef SharedDpsRev + #define SharedDpsRev 1.0 + #endif +-SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) ++SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) + #else +-ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) + #endif + + DPSTKLIBSRC = $(LIBSRC)/dpstk +@@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,dps,$(D + #ifndef SharedDpsTkRev + #define SharedDpsTkRev 1.0 + #endif +-SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) ++SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) + #else +-ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) + #endif + + PSRESLIBSRC = $(LIBSRC)/psres +@@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,dpstk + #ifndef SharedPSResRev + #define SharedPSResRev 1.0 + #endif +-SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) ++SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) + #else +-ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) + #endif + + GLULIBSRC = $(LIBSRC)/GLU +@@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,psres + #ifndef SharedGluRev + #define SharedGluRev 1.3 + #endif +-SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) ++SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) + #else +-ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) + #endif + + GLXLIBSRC = $(LIBSRC)/GL +@@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,GLU,$(G + #ifndef SharedGlxRev + #define SharedGlxRev 1.2 + #endif +-SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) ++SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) + #else +-ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) + #endif + GLWIDGETSRC = $(LIBSRC)/GLw + #if SharedLibGLw + #ifndef SharedGLwRev + #define SharedGLwRev 1.0 /* used to name the shared library */ + #endif +-SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) ++SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) + #else +-ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) + #endif + + XRENDERLIBSRC = $(LIBSRC)/Xrender +@@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,GLw,$(G + #ifndef SharedXrenderRev + #define SharedXrenderRev 1.2.2 + #endif +-SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) ++SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) + #else +-ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) + #endif + + XRANDRLIBSRC = $(LIBSRC)/Xrandr +@@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,Xre + #ifndef SharedXrandrRev + #define SharedXrandrRev 2.0 + #endif +-SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) ++SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) + #else +-ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) + #endif + + XFIXESLIBSRC = $(LIBSRC)/Xfixes +@@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,Xran + #ifndef SharedXfixesRev + #define SharedXfixesRev 3.0 + #endif +-SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) ++SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) + #else +-ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) + #endif + + XDAMAGELIBSRC = $(LIBSRC)/Xdamage +@@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,Xfix + #ifndef SharedXdamageRev + #define SharedXdamageRev 1.0 + #endif +-SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) ++SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) + #else +-ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) + #endif + + XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite +@@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite + #ifndef SharedXcompositeRev + #define SharedXcompositeRev 1.0 + #endif +-SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) ++SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) + #else +-ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) + #endif + + XEVIELIBSRC = $(LIBSRC)/Xevie +@@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie + #ifndef SharedXevieRev + #define SharedXevieRev 1.0 + #endif +-SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) ++SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) + #else +-ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) + #endif + + XCURSORLIBSRC = $(LIBSRC)/Xcursor +@@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,Xevie + #ifndef SharedXcursorRev + #define SharedXcursorRev 1.0.2 + #endif +-SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) ++SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) + #else +-ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) + #endif + + APPLEWMLIBSRC = $(LIBSRC)/apple +@@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,Xcu + #ifndef SharedAppleWMRev + #define SharedAppleWMRev 1.0 + #endif +-SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) ++SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) + #else +-ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) + #endif + + WINDOWSWMLIBSRC = $(LIBSRC)/windows +@@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,App + #ifndef SharedWindowsWMRev + #define SharedWindowsWMRev 1.0 + #endif +-SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) ++SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) + #else +-ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) + #endif + + # ifndef SharedLibXfontcache +@@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,W + #ifndef SharedXfontcacheRev + #define SharedXfontcacheRev 1.2 + #endif +-SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) ++SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) + #else +-ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXau +@@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE, + #ifndef SharedXauRev + #define SharedXauRev 6.0 + #endif +-SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) ++SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) + #else + #if !UseInstalledXauLib +-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir) + #else +-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) ++ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) + #endif + #endif + +@@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$ + #ifndef SharedXdmcpRev + #define SharedXdmcpRev 6.0 + #endif +-SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) ++SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) + #else + #if !UseInstalledXdmcpLib +-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) + #else +-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) ++ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) + #endif + #endif + +@@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp + #ifndef SharedXmuRev + #define SharedXmuRev 6.2 + #endif +-SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) ++SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) + #else +-ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXmuu +@@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(X + #ifndef SharedXmuuRev + #define SharedXmuuRev 1.0 + #endif +-SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) ++SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) + #else +-ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) + #endif + + #ifndef SharedOldX +@@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$ + #ifndef SharedOldXRev + #define SharedOldXRev 6.0 + #endif +-SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) ++SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) + #else +-ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXp +@@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,oldX,$ + #ifndef SharedXpRev + #define SharedXpRev 6.2 + #endif +-SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) ++SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) + #else +-ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXt +@@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,Xp,$(XPL + #ifndef SharedXtRev + #define SharedXtRev 6.0 + #endif +-SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) ++SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) + #else +-ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) + #endif + DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) + XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) +@@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,X + #ifndef SharedXaRev + #define SharedXaRev 1.0 + #endif +-SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) ++SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev) + #else +-UnsharedLibReferences(XA,Xa,$(XALIBSRC)) ++UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) + #endif + + #ifndef BuildXaw +@@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC)) + #ifndef SharedXawRev + #define SharedXawRev 8.0 + #endif +-SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) ++SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) + #else +-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) + #endif + #endif + +@@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A + #ifndef SharedXaw7Rev + #define SharedXaw7Rev 7.0 + #endif +-SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) ++SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) + #if !BuildXaw +-SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) ++SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) + #endif + #else +-ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) + #if !BuildXaw +-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) + #endif + #endif + #endif +@@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A + #ifndef SharedXaw6Rev + #define SharedXaw6Rev 6.1 + #endif +-SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) ++SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) + #if !BuildXaw && !BuildXaw7 +-SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) ++SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) + #endif + #else +-ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) + #if !BuildXaw && !BuildXaw7 +-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) + #endif + #endif + #endif +@@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A + #ifndef SharedXiRev + #define SharedXiRev 6.0 + #endif +-SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) ++SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) + #else +-ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXtst +@@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,Xi,$(XIL + #ifndef SharedXtstRev + #define SharedXtstRev 6.1 + #endif +-SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) ++SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) + #else +-ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) + #endif + +-ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) ++ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) + + #ifndef SharedLibICE + #define SharedLibICE HasSharedLibraries +@@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$ + #ifndef SharedICERev + #define SharedICERev 6.4 + #endif +-SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) ++SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev) + #else +-ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) ++ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) + #endif + + #ifndef SharedLibSM +@@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,ICE,$(I + #ifndef SharedSMRev + #define SharedSMRev 6.0 + #endif +-SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) ++SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev) + #else +-ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXkey +@@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,SM,$(SMS + #ifndef SharedXkeyRev + #define SharedXkeyRev 6.0 + #endif +-SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) ++SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) + #else +-ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) + #endif + + #ifndef SharedLibFS +@@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,Xkey,$ + #ifndef SharedFSRev + #define SharedFSRev 6.0 + #endif +-SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) ++SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev) + #else +-ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibFont +@@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,FS,$(FSL + #define SharedFontRev 1.5 + #endif + SharedFontLibReferences() +-XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) ++XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) + #else + ProjectUnsharedFontLibReferences() +-XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) ++XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir) + #endif + + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs +-ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) + +@@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,fn + #ifndef SharedFontEncRev + #define SharedFontEncRev 1.0 + #endif +-SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) ++SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) + #else +-ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXpm +@@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,fo + #ifndef SharedXpmRev + #define SharedXpmRev 4.11 + #endif +-SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) ++SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) + #else +-ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) + #endif + + #if UseFreetype2 +@@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(X + #define SharedFreetype2Rev 9.0 + #endif + #endif +-SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) ++SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) + #else +-ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir) + #endif + + #ifdef UseInstalled +@@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR) + #define SharedExpatRev 4.0 + #endif + #endif +-SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) ++SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) + #else +-ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir) + #endif + + #if UseExpat +@@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT + #ifndef SharedXft1Rev + #define SharedXft1Rev 1.1 + #endif +-SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) ++SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) + #else +-ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) + #endif + + #ifndef Xft1ClientDepLibs +@@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,Xft,$( + #ifndef SharedXftRev + #define SharedXftRev 2.1.2 + #endif +-SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) ++SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) + #else +-ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) + #endif + + #ifndef XftClientDepLibs +@@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,Xft,$(X + #ifndef SharedFontconfigRev + #define SharedFontconfigRev 1.0.4 + #endif +-SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) ++SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) + #else +-ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) + #endif + + #ifdef UseInstalled +@@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRunt + # ifndef SharedxkbfileRev + # define SharedxkbfileRev 1.0 + # endif +-SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) ++SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) + #else +-ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) + #endif + + #if BuildXKBlib +@@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,xkb + # ifndef SharedxkbuiRev + # define SharedxkbuiRev 1.0 + # endif +-SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) ++SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) + #else +-ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) + #endif + + #ifndef XkbuiLibs +@@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs + #ifndef SharedXTrapRev + #define SharedXTrapRev 6.4 + #endif +-SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) ++SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) + #else +-ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir) + #endif + + #ifndef NeedDefaultDepLibs +Index: nx-X11/config/cf/bsdLib.rules +=================================================================== +--- a/nx-X11/config/cf/bsdLib.rules ++++ b/nx-X11/config/cf/bsdLib.rules +@@ -134,9 +134,9 @@ LintLibReferences(varname,libname,libsou + #ifndef SharedFontLibReferences + #define SharedFontLibReferences() @@\ + SOFONTREV = SharedFontRev @@\ +-DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ ++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + #endif + + /* +Index: nx-X11/config/cf/bsdLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/bsdLib.tmpl ++++ b/nx-X11/config/cf/bsdLib.tmpl +@@ -38,7 +38,7 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/bsdiLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/bsdiLib.tmpl ++++ b/nx-X11/config/cf/bsdiLib.tmpl +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/config/cf/bsdiLib.tmp + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/convex.cf +=================================================================== +--- a/nx-X11/config/cf/convex.cf ++++ b/nx-X11/config/cf/convex.cf +@@ -90,9 +90,9 @@ DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$ + LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln) + + XMLIBSRC = $(LIBSRC)/Xm +- DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a) +- XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB)) +- LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln) ++ DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libNX_Xm.a) ++ XMLIB = LoaderLibPrefix _Use(-lNX_Xm,$(DEPXMLIB)) ++ LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lNX_Xm.ln) + + UILLIBSRC = $(LIBSRC)/uil + DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a) +Index: nx-X11/config/cf/cygwin.tmpl +=================================================================== +--- a/nx-X11/config/cf/cygwin.tmpl ++++ b/nx-X11/config/cf/cygwin.tmpl +@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl + + #ifndef FixupLibReferences + # define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/darwinLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/darwinLib.tmpl ++++ b/nx-X11/config/cf/darwinLib.tmpl +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/config/cf/darwinLib.t + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/gnuLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/gnuLib.tmpl ++++ b/nx-X11/config/cf/gnuLib.tmpl +@@ -6,7 +6,7 @@ XCOMM + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/ibmLib.rules +=================================================================== +--- a/nx-X11/config/cf/ibmLib.rules ++++ b/nx-X11/config/cf/ibmLib.rules +@@ -127,23 +127,23 @@ LintLibReferences(varname,libname,libsou + # ifndef SharedFontLibReferences + # define SharedFontLibReferences() @@\ + DEPFONTLIB = /**/ @@\ +-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(FONTLIBSRC)/libNX_Xfont.a) @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + # endif + # else + # ifndef SharedFontLibReferences + # define SharedFontLibReferences() @@\ + DEPFONTLIB = /**/ @@\ +-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libNX_Xfont.a)) @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + # endif + # endif + # else /* OSMajorVersion < 5 */ + # ifndef SharedFontLibReferences + # define SharedFontLibReferences() @@\ + DEPFONTLIB = /**/ @@\ +-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDI)/libNX_Xfont.so)) @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + # endif + + # endif +Index: nx-X11/config/cf/ibmLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/ibmLib.tmpl ++++ b/nx-X11/config/cf/ibmLib.tmpl +@@ -81,7 +81,7 @@ XCOMM $XFree86: xc/config/cf/ibmLib.tmpl + /* we want this to be defined only when building X */ + # ifndef FixupLibReferences + # define FixupLibReferences() @@\ +-DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a) ++DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt.a) + # endif + #endif + +Index: nx-X11/config/cf/lnxLib.rules +=================================================================== +--- a/nx-X11/config/cf/lnxLib.rules ++++ b/nx-X11/config/cf/lnxLib.rules +@@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc + XCOMM libX11.so (X11, SM, ICE) + JUMP_ROOT_X11 = $(XLIBSRC) + JUMP_IS_HOST_X11 = YES +-JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa ++JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa + JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) + JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared + JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) +@@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.v + JUMP_ADDRESS_X11 = 0x60200000 + JUMP_JUMPTABLESIZE_X11 = 0x4000 + JUMP_GOTSIZE_X11 = 4096 +-JUMP_STUBNAMES_X11 = libX11 libSM libICE ++JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE + JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) +-JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ ++JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ + JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) + + XCOMM libSM (part of libX11.so) +@@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000 + JUMP_GOTSIZE_Xt = 4096 + JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp + JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) +-JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~ +-JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \ +- $(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) ++JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~ ++JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \ ++ $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc) + + XCOMM libXmu (part of libXt.so) + JUMP_ROOT_Xmu = $(XMUSRC) +@@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000 + JUMP_GOTSIZE_Xaw = 4096 + JUMP_STUBNAMES_Xaw = libXaw + JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) +-JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ +- $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ ++JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \ ++ $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \ + $(JUMP_LDLIBS_libc) + + # endif /* !UseInstalled */ +Index: nx-X11/config/cf/lnxLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/lnxLib.tmpl ++++ b/nx-X11/config/cf/lnxLib.tmpl +@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +@@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLI + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIB = -lXmu $(XLIB) ++XMULIB = -lNX_Xmu $(XLIB) + #endif + + #endif /* UseElfFormat */ +Index: nx-X11/config/cf/mingw.tmpl +=================================================================== +--- a/nx-X11/config/cf/mingw.tmpl ++++ b/nx-X11/config/cf/mingw.tmpl +@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl + + #ifndef FixupLibReferences + # define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/nto.rules +=================================================================== +--- a/nx-X11/config/cf/nto.rules ++++ b/nx-X11/config/cf/nto.rules +@@ -104,7 +104,7 @@ ComplexHostProgramTarget(program) + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/os2Lib.tmpl +=================================================================== +--- a/nx-X11/config/cf/os2Lib.tmpl ++++ b/nx-X11/config/cf/os2Lib.tmpl +@@ -107,35 +107,35 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl + #endif + + #if LinkStatically +-#define SDlibX11 -lX11_s +-#define SDlibXExt -lXExt_s +-#define SDlibXmu -lXmu_s +-#define SDlibXt -lXt_s +-#define SDlibXaw -lXaw_s +-#define SDlibXaw7 -lXaw_s +-#define SDlibXaw6 -lXaw_s +-#define SDlibXi -lXi_s +-#define SDlibXtst -lXtst_s +-#define SDlibXp -lXp_s +-#define SDlibXv -lXv_s +-#define SDlibGL -lGL_s +-#define SDlibDPS -lDPS_s +-#define SDlibDPSTK -lDPSTK_s ++#define SDlibX11 -lNX_X11_s ++#define SDlibXExt -lNX_XExt_s ++#define SDlibXmu -lNX_Xmu_s ++#define SDlibXt -lNX_Xt_s ++#define SDlibXaw -lNX_Xaw_s ++#define SDlibXaw7 -lNX_Xaw_s ++#define SDlibXaw6 -lNX_Xaw_s ++#define SDlibXi -lNX_Xi_s ++#define SDlibXtst -lNX_Xtst_s ++#define SDlibXp -lNX_Xp_s ++#define SDlibXv -lNX_Xv_s ++#define SDlibGL -lNX_GL_s ++#define SDlibDPS -lNX_DPS_s ++#define SDlibDPSTK -lNX_DPSTK_s + #else +-#define SDlibX11 -lX11 +-#define SDlibXExt -lXExt +-#define SDlibXmu -lXmu +-#define SDlibXt -lXt +-#define SDlibXaw -lXaw +-#define SDlibXaw7 -lXaw +-#define SDlibXaw6 -lXaw +-#define SDlibXi -lXi +-#define SDlibXtst -lXtst +-#define SDlibXp -lXp +-#define SDlibXv -lXv +-#define SDlibGL -lGL +-#define SDlibDPS -lDPS +-#define SDlibDPSTK -lDPSTK ++#define SDlibX11 -lNX_X11 ++#define SDlibXExt -lNX_XExt ++#define SDlibXmu -lNX_Xmu ++#define SDlibXt -lNX_Xt ++#define SDlibXaw -lNX_Xaw ++#define SDlibXaw7 -lNX_Xaw ++#define SDlibXaw6 -lNX_Xaw ++#define SDlibXi -lNX_Xi ++#define SDlibXtst -lNX_Xtst ++#define SDlibXp -lNX_Xp ++#define SDlibXv -lNX_Xv ++#define SDlibGL -lNX_GL ++#define SDlibDPS -lNX_DPS ++#define SDlibDPSTK -lNX_DPSTK + #endif + + /* +@@ -159,7 +159,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl + #endif + #if SharedOldX + DEPOLDXLIB = +- OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) ++ OLDXLIB = _Use(-lNX_oldX,-L$(OLDXLIBSRC) -lNX_oldX) + #endif + #if SharedLibXt + DEPXTOOLLIB = +Index: nx-X11/config/cf/sco5.cf +=================================================================== +--- a/nx-X11/config/cf/sco5.cf ++++ b/nx-X11/config/cf/sco5.cf +@@ -318,7 +318,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1 + */ + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/sv3Lib.tmpl +=================================================================== +--- a/nx-X11/config/cf/sv3Lib.tmpl ++++ b/nx-X11/config/cf/sv3Lib.tmpl +@@ -40,31 +40,31 @@ XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl + * are using shared libraries, we really do not need to depend on anything + */ + #if SharedLibXext +- DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a) +- EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB)) ++ DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libNX_Xext_s.a) ++ EXTENSIONLIB = LoaderLibPrefix _Use(-lNX_Xext_s, $(DEPEXTENSIONLIB)) + #endif + #if SharedLibX +- DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a) +- XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a) ++ DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libNX_X11_s.a) ++ XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lNX_X11_s,$(XLIBSRC)/libNX_X11_s.a) + #endif + #if SharedLibXmu +- DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a) +- XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB)) ++ DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libNX_Xmu_s.a) ++ XMULIB = LoaderLibPrefix _Use(-lNX_Xmu_s,$(DEPXMULIB)) + #endif + #if SharedOldLibX + DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a) + OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB)) + #endif + #if SharedLibXt +- DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a) +- XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB)) ++ DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt_s.a) ++ XTOOLLIB = LoaderLibPrefix _Use(-lNX_Xt_s,$(DEPXTOOLLIB)) + #endif + #if SharedLibXaw +- DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a) +- XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB)) ++ DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libNX_Xaw_s.a) ++ XAWLIB = LoaderLibPrefix _Use(-lNX_Xaw_s,$(DEPXAWLIB)) + #endif + #if SharedLibXinput +- DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a) +- XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB)) ++ DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libNX_Xi_s.a) ++ XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB)) + #endif + +Index: nx-X11/config/cf/sv4Lib.tmpl +=================================================================== +--- a/nx-X11/config/cf/sv4Lib.tmpl ++++ b/nx-X11/config/cf/sv4Lib.tmpl +@@ -7,7 +7,7 @@ XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/1 + XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $ + + /* SVR4 shared libraries are deficient in link semantics */ +-XMULIBONLY = -lXmu ++XMULIBONLY = -lNX_Xmu + #ifndef FixupLibReferences + # define FixupLibReferences() @@\ + XMULIB = $(XMULIBONLY) -z nodefs +Index: nx-X11/config/cf/usl.cf +=================================================================== +--- a/nx-X11/config/cf/usl.cf ++++ b/nx-X11/config/cf/usl.cf +@@ -262,7 +262,7 @@ XCOMM operating system: OSName (OSMajorV + */ + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/extras/Mesa/src/mesa/main/Imakefile +=================================================================== +--- a/nx-X11/extras/Mesa/src/mesa/main/Imakefile ++++ b/nx-X11/extras/Mesa/src/mesa/main/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib YES + #define DoDebugLib NO + #define DoProfileLib NO +-#define LibName MESAGL ++#define LibName NX_MESAGL + #define SoRev SOX11REV + #define LibHeaders NO + +Index: nx-X11/extras/Xpm/lib/Imakefile +=================================================================== +--- a/nx-X11/extras/Xpm/lib/Imakefile ++++ b/nx-X11/extras/Xpm/lib/Imakefile +@@ -125,7 +125,7 @@ OS_NAME_DEFINES = OsNameDefines + STD_DEFINES = LibraryDefines + CDEBUGFLAGS = LibraryCDebugFlags + #else +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMLIBREV + #define IncSubdir X11 + /* we have to cheat on Library.tmpl to get what we want... */ +Index: nx-X11/extras/drm/libdrm.pc.in +=================================================================== +--- a/nx-X11/extras/drm/libdrm.pc.in ++++ b/nx-X11/extras/drm/libdrm.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: libdrm + Description: Userspace interface to kernel DRM services + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ldrm ++Libs: -L${libdir} -lNX_drm + Cflags: -I${includedir} -I${includedir}/drm +Index: nx-X11/extras/fontconfig/fontconfig.pc.in +=================================================================== +--- a/nx-X11/extras/fontconfig/fontconfig.pc.in ++++ b/nx-X11/extras/fontconfig/fontconfig.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: Fontconfig + Description: Font configuration and customization library + Version: @VERSION@ +-Libs: -L${libdir} -lfontconfig ++Libs: -L${libdir} -lNX_fontconfig + Cflags: -I${includedir} +Index: nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile +=================================================================== +--- a/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile ++++ b/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile +@@ -36,7 +36,7 @@ XCOMM + #define DoDebugLib DebugLibGlu + #define DoProfileLib ProfileLibGlu + #define IHaveSubdirs +-#define LibName GLU ++#define LibName NX_GLU + #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + #define SoRev SOGLUREV + +Index: nx-X11/lib/FS/Imakefile +=================================================================== +--- a/nx-X11/lib/FS/Imakefile ++++ b/nx-X11/lib/FS/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/FS/Imakefile,v 3. + #define DoExtraLib SharedLibFS + #define DoDebugLib DebugLibFS + #define DoProfileLib ProfileLibFS +-#define LibName FS ++#define LibName NX_FS + #define SoRev SOFSREV + #define IncSubdir X11 + #define IncSubSubdir fonts +Index: nx-X11/lib/GLw/Imakefile +=================================================================== +--- a/nx-X11/lib/GLw/Imakefile ++++ b/nx-X11/lib/GLw/Imakefile +@@ -46,7 +46,7 @@ XCOMM MOTIF_LDFLAGS = -L/usr/local/lib + #define DoProfileLib ProfileLibGLw + + #define HasSharedData NO +-#define LibName GLw ++#define LibName NX_GLw + #define SoRev SOGLWREV + #define IncSubdir GL + +Index: nx-X11/lib/ICE/Imakefile +=================================================================== +--- a/nx-X11/lib/ICE/Imakefile ++++ b/nx-X11/lib/ICE/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3 + #define DoExtraLib SharedLibICE + #define DoDebugLib DebugLibICE + #define DoProfileLib ProfileLibICE +-#define LibName ICE ++#define LibName NX_ICE + #define SoRev SOICEREV + #define IncSubdir X11 + #define IncSubSubdir ICE +Index: nx-X11/lib/SM/Imakefile +=================================================================== +--- a/nx-X11/lib/SM/Imakefile ++++ b/nx-X11/lib/SM/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/SM/Imakefile,v 1. + #define DoExtraLib SharedLibSM + #define DoDebugLib DebugLibSM + #define DoProfileLib ProfileLibSM +-#define LibName SM ++#define LibName NX_SM + #define SoRev SOSMREV + #define IncSubdir X11 + #define IncSubSubdir SM +Index: nx-X11/lib/X11/Imakefile +=================================================================== +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTL + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName NX_X11 + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +Index: nx-X11/lib/X11/Imakefile.NX.original +=================================================================== +--- a/nx-X11/lib/X11/Imakefile.NX.original ++++ b/nx-X11/lib/X11/Imakefile.NX.original +@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTL + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName NX_X11 + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +Index: nx-X11/lib/X11/Imakefile.X.original +=================================================================== +--- a/nx-X11/lib/X11/Imakefile.X.original ++++ b/nx-X11/lib/X11/Imakefile.X.original +@@ -28,7 +28,7 @@ BuildIncludes($(HEADERS),IncSubdir,..) + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName NX_X11 + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +Index: nx-X11/lib/XRes/Imakefile +=================================================================== +--- a/nx-X11/lib/XRes/Imakefile ++++ b/nx-X11/lib/XRes/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v + #define DoSharedLib SharedLibXRes + #define DoDebugLib DebugLibXRes + #define DoProfileLib ProfileLibXRes +-#define LibName XRes ++#define LibName NX_XRes + #define SoRev SOXRESREV + #define LibHeaders NO + +Index: nx-X11/lib/XTrap/Imakefile +=================================================================== +--- a/nx-X11/lib/XTrap/Imakefile ++++ b/nx-X11/lib/XTrap/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86$ + #define DoSharedLib SharedLibXTrap + #define DoDebugLib DebugLibXTrap + #define DoProfileLib ProfileLibXTrap +-#define LibName XTrap ++#define LibName NX_XTrap + #define SoRev SOXTRAPREV + #define LibHeaders NO + +Index: nx-X11/lib/Xau/Imakefile +=================================================================== +--- a/nx-X11/lib/Xau/Imakefile ++++ b/nx-X11/lib/Xau/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3 + #define DoExtraLib SharedLibXau + #define DoDebugLib DebugLibXau + #define DoProfileLib ProfileLibXau +-#define LibName Xau ++#define LibName NX_Xau + #define SoRev SOXAUTHREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xaw/Imakefile +=================================================================== +--- a/nx-X11/lib/Xaw/Imakefile ++++ b/nx-X11/lib/Xaw/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1 + #define DoDebugLib DebugLibXaw + #define DoProfileLib ProfileLibXaw + #define HasSharedData YES +-#define LibName Xaw ++#define LibName NX_Xaw + #define SoRev SOXAWREV + #define IncSubdir X11 + #define IncSubSubdir Xaw +Index: nx-X11/lib/Xaw6/Imakefile +=================================================================== +--- a/nx-X11/lib/Xaw6/Imakefile ++++ b/nx-X11/lib/Xaw6/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xaw6/Imakefile,v + #define DoDebugLib DebugLibXaw6 + #define DoProfileLib ProfileLibXaw6 + #define HasSharedData YES +-#define LibName Xaw ++#define LibName NX_Xaw + #define SoRev SOXAW6REV + #define LibHeaders NO + #define NoSoSymlink +Index: nx-X11/lib/Xaw7/Imakefile +=================================================================== +--- a/nx-X11/lib/Xaw7/Imakefile ++++ b/nx-X11/lib/Xaw7/Imakefile +@@ -5,7 +5,7 @@ XCOMM $Xorg$ + #define DoDebugLib DebugLibXaw7 + #define DoProfileLib ProfileLibXaw7 + #define HasSharedData YES +-#define LibName Xaw ++#define LibName NX_Xaw + #define SoRev SOXAW7REV + + #if BuildXaw +Index: nx-X11/lib/Xcomposite/Imakefile +=================================================================== +--- a/nx-X11/lib/Xcomposite/Imakefile ++++ b/nx-X11/lib/Xcomposite/Imakefile +@@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0 + #define DoDebugLib DebugLibXcomposite + #define DoProfileLib ProfileLibXcomposite + +-#define LibName Xcomposite ++#define LibName NX_Xcomposite + #define SoRev SOXCOMPOSITEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xcomposite/xcomposite.pc.in +=================================================================== +--- a/nx-X11/lib/Xcomposite/xcomposite.pc.in ++++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in +@@ -7,4 +7,4 @@ Name: Xcomposite + Description: X Composite Library + Version: @VERSION@ + Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ +-Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ ++Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ +Index: nx-X11/lib/Xcursor/Imakefile +=================================================================== +--- a/nx-X11/lib/Xcursor/Imakefile ++++ b/nx-X11/lib/Xcursor/Imakefile +@@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2 + #define DoDebugLib DebugLibXcursor + #define DoProfileLib ProfileLibXcursor + +-#define LibName Xcursor ++#define LibName NX_Xcursor + #define SoRev SOXCURSORREV + #define IncSubdir X11 + #define IncSubSubdir Xcursor +Index: nx-X11/lib/Xcursor/xcursor.pc.in +=================================================================== +--- a/nx-X11/lib/Xcursor/xcursor.pc.in ++++ b/nx-X11/lib/Xcursor/xcursor.pc.in +@@ -12,4 +12,4 @@ Description: X Cursor Library + Version: @VERSION@ + Requires: xrender + Cflags: -I${includedir} ${xrendercflags} ${xcflags} +-Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} ++Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} +Index: nx-X11/lib/Xdamage/Imakefile +=================================================================== +--- a/nx-X11/lib/Xdamage/Imakefile ++++ b/nx-X11/lib/Xdamage/Imakefile +@@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1 + #define DoDebugLib DebugLibXdamage + #define DoProfileLib ProfileLibXdamage + +-#define LibName Xdamage ++#define LibName NX_Xdamage + #define SoRev SOXDAMAGEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xdamage/xdamage.pc.in +=================================================================== +--- a/nx-X11/lib/Xdamage/xdamage.pc.in ++++ b/nx-X11/lib/Xdamage/xdamage.pc.in +@@ -7,4 +7,4 @@ Name: Xdamage + Description: X Damage Library + Version: @VERSION@ + Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ +-Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ ++Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ +Index: nx-X11/lib/Xdmcp/Imakefile +=================================================================== +--- a/nx-X11/lib/Xdmcp/Imakefile ++++ b/nx-X11/lib/Xdmcp/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v + #define DoExtraLib SharedLibXdmcp + #define DoDebugLib DebugLibXdmcp + #define DoProfileLib ProfileLibXdmcp +-#define LibName Xdmcp ++#define LibName NX_Xdmcp + #define SoRev SOXDMCPREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xevie/Imakefile +=================================================================== +--- a/nx-X11/lib/Xevie/Imakefile ++++ b/nx-X11/lib/Xevie/Imakefile +@@ -14,7 +14,7 @@ SOXEVIEREV=1.0.0 + #define DoDebugLib DebugLibXevie + #define DoProfileLib ProfileLibXevie + +-#define LibName Xevie ++#define LibName NX_Xevie + #define SoRev SOXEVIEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xevie/xevie.pc.in +=================================================================== +--- a/nx-X11/lib/Xevie/xevie.pc.in ++++ b/nx-X11/lib/Xevie/xevie.pc.in +@@ -9,4 +9,4 @@ Name: Xevie + Description: X Event Interceptor Library + Version: @VERSION@ + Cflags: -I${includedir} ${xcflags} +-Libs: -L${libdir} -lXevie ${xlibs} ++Libs: -L${libdir} -lNX_Xevie ${xlibs} +Index: nx-X11/lib/Xext/Imakefile +=================================================================== +--- a/nx-X11/lib/Xext/Imakefile ++++ b/nx-X11/lib/Xext/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v + #define DoExtraLib SharedLibXext + #define DoDebugLib DebugLibXext + #define DoProfileLib ProfileLibXext +-#define LibName Xext ++#define LibName NX_Xext + #define SoRev SOXEXTREV + #define LibHeaders NO + +Index: nx-X11/lib/Xfixes/Imakefile +=================================================================== +--- a/nx-X11/lib/Xfixes/Imakefile ++++ b/nx-X11/lib/Xfixes/Imakefile +@@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0 + #define DoDebugLib DebugLibXfixes + #define DoProfileLib ProfileLibXfixes + +-#define LibName Xfixes ++#define LibName NX_Xfixes + #define SoRev SOXFIXESREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xfixes/xfixes.pc.in +=================================================================== +--- a/nx-X11/lib/Xfixes/xfixes.pc.in ++++ b/nx-X11/lib/Xfixes/xfixes.pc.in +@@ -7,4 +7,4 @@ Name: Xfixes + Description: X Fixes Library + Version: @VERSION@ + Cflags: -I${includedir} @X_CFLAGS@ +-Libs: -L${libdir} -lXfixes @X_LIBS@ ++Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ +Index: nx-X11/lib/Xfontcache/Imakefile +=================================================================== +--- a/nx-X11/lib/Xfontcache/Imakefile ++++ b/nx-X11/lib/Xfontcache/Imakefile +@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/lib/Xfontcache/Imakef + #define DoExtraLib SharedLibXfontcache + #define DoDebugLib DebugLibXfontcache + #define DoProfileLib ProfileLibXfontcache +-#define LibName Xfontcache ++#define LibName NX_Xfontcache + #define SoRev SOXFONTCACHEREV + #define LibHeaders NO + +Index: nx-X11/lib/Xft/Imakefile +=================================================================== +--- a/nx-X11/lib/Xft/Imakefile ++++ b/nx-X11/lib/Xft/Imakefile +@@ -8,7 +8,7 @@ XCOMM $XdotOrg: xc/lib/Xft/Imakefile,v 1 + #define DoProfileLib ProfileLibXft + + #define HasSharedData YES +-#define LibName Xft ++#define LibName NX_Xft + #define SoRev SOXFTREV + #define IncSubdir X11 + #define IncSubSubdir Xft +Index: nx-X11/lib/Xft/xft.pc.in +=================================================================== +--- a/nx-X11/lib/Xft/xft.pc.in ++++ b/nx-X11/lib/Xft/xft.pc.in +@@ -9,4 +9,4 @@ Version: @VERSION@ + Requires: xrender, fontconfig, freetype2 + Requires.private: xrender, fontconfig, freetype2 + Cflags: -I${includedir} +-Libs: -L${libdir} -lXft ++Libs: -L${libdir} -lNX_Xft +Index: nx-X11/lib/Xft1/Imakefile +=================================================================== +--- a/nx-X11/lib/Xft1/Imakefile ++++ b/nx-X11/lib/Xft1/Imakefile +@@ -70,7 +70,7 @@ LDPRELIBS=LdPreLibs + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData YES +-#define LibName Xft ++#define LibName NX_Xft + #define SoRev SOXFT1REV + #define LibHeaders NO + #define NoSoSymlink +Index: nx-X11/lib/Xi/Imakefile +=================================================================== +--- a/nx-X11/lib/Xi/Imakefile ++++ b/nx-X11/lib/Xi/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1. + #define DoExtraLib SharedLibXi + #define DoDebugLib DebugLibXi + #define DoProfileLib ProfileLibXi +-#define LibName Xi ++#define LibName NX_Xi + #define SoRev SOXINPUTREV + #define LibHeaders NO + +Index: nx-X11/lib/Xinerama/Imakefile +=================================================================== +--- a/nx-X11/lib/Xinerama/Imakefile ++++ b/nx-X11/lib/Xinerama/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefil + #define DoSharedLib SharedLibXinerama + #define DoDebugLib DebugLibXinerama + #define DoProfileLib ProfileLibXinerama +-#define LibName Xinerama ++#define LibName NX_Xinerama + #define SoRev SOXINERAMAREV + #define LibHeaders NO + +Index: nx-X11/lib/Xmu/Imakefile +=================================================================== +--- a/nx-X11/lib/Xmu/Imakefile ++++ b/nx-X11/lib/Xmu/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1 + #define DoDebugLib DebugLibXmu + #define DoProfileLib ProfileLibXmu + #define HasSharedData YES +-#define LibName Xmu ++#define LibName NX_Xmu + #define SoRev SOXMUREV + #define IncSubdir X11 + #define IncSubSubdir Xmu +Index: nx-X11/lib/Xmuu/Imakefile +=================================================================== +--- a/nx-X11/lib/Xmuu/Imakefile ++++ b/nx-X11/lib/Xmuu/Imakefile +@@ -11,7 +11,7 @@ XCOMM other than Xlib and the system C l + #define DoExtraLib SharedLibXmuu + #define DoDebugLib DebugLibXmuu + #define DoProfileLib ProfileLibXmuu +-#define LibName Xmuu ++#define LibName NX_Xmuu + #define SoRev SOXMUUREV + #define LibHeaders NO + +Index: nx-X11/lib/Xp/Imakefile +=================================================================== +--- a/nx-X11/lib/Xp/Imakefile ++++ b/nx-X11/lib/Xp/Imakefile +@@ -44,7 +44,7 @@ XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1. + #define DoExtraLib SharedLibXp + #define DoDebugLib DebugLibXp + #define DoProfileLib ProfileLibXp +-#define LibName Xp ++#define LibName NX_Xp + #define SoRev SOXPREV + #define LibHeaders NO + +Index: nx-X11/lib/Xpm/Imakefile +=================================================================== +--- a/nx-X11/lib/Xpm/Imakefile ++++ b/nx-X11/lib/Xpm/Imakefile +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 + #define DoDebugLib DebugLibXpm + #define DoProfileLib ProfileLibXpm + #define HasSharedData NO +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xpm/Imakefile.NX.original +=================================================================== +--- a/nx-X11/lib/Xpm/Imakefile.NX.original ++++ b/nx-X11/lib/Xpm/Imakefile.NX.original +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 + #define DoDebugLib DebugLibXpm + #define DoProfileLib ProfileLibXpm + #define HasSharedData NO +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xpm/Imakefile.X.original +=================================================================== +--- a/nx-X11/lib/Xpm/Imakefile.X.original ++++ b/nx-X11/lib/Xpm/Imakefile.X.original +@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 + #define DoDebugLib DebugLibXpm + #define DoProfileLib ProfileLibXpm + #define HasSharedData NO +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMREV + #define IncSubdir X11 + +Index: nx-X11/lib/XprintAppUtil/Imakefile +=================================================================== +--- a/nx-X11/lib/XprintAppUtil/Imakefile ++++ b/nx-X11/lib/XprintAppUtil/Imakefile +@@ -5,7 +5,7 @@ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName XprintAppUtil ++#define LibName NX_XprintAppUtil + #define SoRev SOZLIBREV + #define IncSubdir X11 + #define IncSubSubdir XprintAppUtil +Index: nx-X11/lib/XprintUtil/Imakefile +=================================================================== +--- a/nx-X11/lib/XprintUtil/Imakefile ++++ b/nx-X11/lib/XprintUtil/Imakefile +@@ -5,7 +5,7 @@ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName XprintUtil ++#define LibName NX_XprintUtil + #define SoRev SOZLIBREV + #define IncSubdir X11 + #define IncSubSubdir XprintUtil +Index: nx-X11/lib/Xrandr/Imakefile +=================================================================== +--- a/nx-X11/lib/Xrandr/Imakefile ++++ b/nx-X11/lib/Xrandr/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile, + #define DoSharedLib SharedLibXrandr + #define DoDebugLib DebugLibXrandr + #define DoProfileLib ProfileLibXrandr +-#define LibName Xrandr ++#define LibName NX_Xrandr + #define SoRev SOXRANDRREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xrender/Imakefile +=================================================================== +--- a/nx-X11/lib/Xrender/Imakefile ++++ b/nx-X11/lib/Xrender/Imakefile +@@ -74,7 +74,7 @@ clean:: + #define DoSharedLib SharedLibXrender + #define DoDebugLib DebugLibXrender + #define DoProfileLib ProfileLibXrender +-#define LibName Xrender ++#define LibName NX_Xrender + #define SoRev SOXRENDERREV + + #ifdef XBuildIncDir +Index: nx-X11/lib/Xrender/xrender.pc.in +=================================================================== +--- a/nx-X11/lib/Xrender/xrender.pc.in ++++ b/nx-X11/lib/Xrender/xrender.pc.in +@@ -8,4 +8,4 @@ Description: X Render Library + Version: @VERSION@ + Requires: @X_REQUIRES@ + Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ +-Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ ++Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ +Index: nx-X11/lib/Xss/Imakefile +=================================================================== +--- a/nx-X11/lib/Xss/Imakefile ++++ b/nx-X11/lib/Xss/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3 + #define DoExtraLib SharedLibXss + #define DoDebugLib DebugLibXss + #define DoProfileLib ProfileLibXss +-#define LibName Xss ++#define LibName NX_Xss + #define SoRev SOXSSREV + #define LibHeaders NO + +Index: nx-X11/lib/Xt/Imakefile +=================================================================== +--- a/nx-X11/lib/Xt/Imakefile ++++ b/nx-X11/lib/Xt/Imakefile +@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET + #define DoDebugLib DebugLibXt + #define DoProfileLib ProfileLibXt + #define HasSharedData YES +-#define LibName Xt ++#define LibName NX_Xt + #define SoRev SOXTREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xt/Imakefile.NX.original +=================================================================== +--- a/nx-X11/lib/Xt/Imakefile.NX.original ++++ b/nx-X11/lib/Xt/Imakefile.NX.original +@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET + #define DoDebugLib DebugLibXt + #define DoProfileLib ProfileLibXt + #define HasSharedData YES +-#define LibName Xt ++#define LibName NX_Xt + #define SoRev SOXTREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xt/Imakefile.X.original +=================================================================== +--- a/nx-X11/lib/Xt/Imakefile.X.original ++++ b/nx-X11/lib/Xt/Imakefile.X.original +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3. + #define DoDebugLib DebugLibXt + #define DoProfileLib ProfileLibXt + #define HasSharedData YES +-#define LibName Xt ++#define LibName NX_Xt + #define SoRev SOXTREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xtst/Imakefile +=================================================================== +--- a/nx-X11/lib/Xtst/Imakefile ++++ b/nx-X11/lib/Xtst/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v + #define DoExtraLib SharedLibXtst + #define DoDebugLib DebugLibXtst + #define DoProfileLib ProfileLibXtst +-#define LibName Xtst ++#define LibName NX_Xtst + #define SoRev SOXTESTREV + #define LibHeaders NO + +Index: nx-X11/lib/Xv/Imakefile +=================================================================== +--- a/nx-X11/lib/Xv/Imakefile ++++ b/nx-X11/lib/Xv/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1. + #define DoSharedLib SharedLibXv + #define DoDebugLib DebugLibXv + #define DoProfileLib ProfileLibXv +-#define LibName Xv ++#define LibName NX_Xv + #define SoRev SOXVREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/Imakefile ++++ b/nx-X11/lib/XvMC/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XvMC/Imakefile,v + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName XvMC ++#define LibName NX_XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/hw/i810/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/hw/i810/Imakefile ++++ b/nx-X11/lib/XvMC/hw/i810/Imakefile +@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imak + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName I810XvMC ++#define LibName NX_I810XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/hw/via/unichrome/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile ++++ b/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName viaXvMC ++#define LibName NX_viaXvMC + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile ++++ b/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName viaXvMCPro ++#define LibName NX_viaXvMCPro + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/wrapper/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/wrapper/Imakefile ++++ b/nx-X11/lib/XvMC/wrapper/Imakefile +@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/wrapper/Imak + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName XvMCW ++#define LibName NX_XvMCW + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86dga/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86dga/Imakefile ++++ b/nx-X11/lib/Xxf86dga/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/Xxf86dga/Imakefil + #define DoExtraLib SharedLibXxf86dga + #define DoDebugLib DebugLibXxf86dga + #define DoProfileLib ProfileLibXxf86dga +-#define LibName Xxf86dga ++#define LibName NX_Xxf86dga + #define SoRev SOXXF86DGAREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86misc/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86misc/Imakefile ++++ b/nx-X11/lib/Xxf86misc/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XdotOrg: xc/lib/Xxf86misc/Imakefi + #define DoExtraLib SharedLibXxf86misc + #define DoDebugLib DebugLibXxf86misc + #define DoProfileLib ProfileLibXxf86misc +-#define LibName Xxf86misc ++#define LibName NX_Xxf86misc + #define SoRev SOXXF86MISCREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86rush/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86rush/Imakefile ++++ b/nx-X11/lib/Xxf86rush/Imakefile +@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/Xxf86rush/Imakefi + #define DoSharedLib SharedLibXxf86rush + #define DoDebugLib DebugLibXxf86rush + #define DoProfileLib ProfileLibXxf86rush +-#define LibName Xxf86rush ++#define LibName NX_Xxf86rush + #define SoRev SOXXF86RUSHREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86vm/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86vm/Imakefile ++++ b/nx-X11/lib/Xxf86vm/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XdotOrg: xc/lib/Xxf86vm/Imakefile + #define DoExtraLib SharedLibXxf86vm + #define DoDebugLib DebugLibXxf86vm + #define DoProfileLib ProfileLibXxf86vm +-#define LibName Xxf86vm ++#define LibName NX_Xxf86vm + #define SoRev SOXXF86VMREV + #define LibHeaders NO + +Index: nx-X11/lib/apple/Imakefile +=================================================================== +--- a/nx-X11/lib/apple/Imakefile ++++ b/nx-X11/lib/apple/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xrandr/Imakefile, + #define DoSharedLib SharedLibAppleWM + #define DoDebugLib DebugLibAppleWM + #define DoProfileLib ProfileLibAppleWM +-#define LibName AppleWM ++#define LibName NX_AppleWM + #define SoRev SOAPPLEWMREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/dmx/Imakefile +=================================================================== +--- a/nx-X11/lib/dmx/Imakefile ++++ b/nx-X11/lib/dmx/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86$ + #define DoDebugLib DebugLibDmx + #define DoProfileLib ProfileLibDmx + +-#define LibName dmx ++#define LibName NX_dmx + #define SoRev SODMXREV + #define LibHeaders NO + +Index: nx-X11/lib/dps/Imakefile +=================================================================== +--- a/nx-X11/lib/dps/Imakefile ++++ b/nx-X11/lib/dps/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/dps/Imakefile,v 1 + #define DoExtraLib SharedLibDps + #define DoDebugLib DebugLibDps + #define DoProfileLib ProfileLibDps +-#define LibName dps ++#define LibName NX_dps + #define SoRev SODPSREV + #define IncSubdir DPS + +Index: nx-X11/lib/dpstk/Imakefile +=================================================================== +--- a/nx-X11/lib/dpstk/Imakefile ++++ b/nx-X11/lib/dpstk/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/dpstk/Imakefile,v + #define DoExtraLib SharedLibDpsTk + #define DoDebugLib DebugLibDpsTk + #define DoProfileLib ProfileLibDpsTk +-#define LibName dpstk ++#define LibName NX_dpstk + #define SoRev SODPSTKREV + #define LibHeaders NO + +Index: nx-X11/lib/expat/Imakefile +=================================================================== +--- a/nx-X11/lib/expat/Imakefile ++++ b/nx-X11/lib/expat/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/expat/Imakefile,v + #define DoDebugLib DebugLibExpat + #define DoProfileLib ProfileLibExpat + #define HasSharedData YES +-#define LibName expat ++#define LibName NX_expat + #define SoRev SOEXPATREV + #ifdef SharedLibtoolExpatRev + #define SharedLibtoolRev SharedLibtoolExpatRev +Index: nx-X11/lib/font/Imakefile +=================================================================== +--- a/nx-X11/lib/font/Imakefile ++++ b/nx-X11/lib/font/Imakefile +@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v + STUBDIRS = stubs + #endif + +-LIBNAME = Xfont ++LIBNAME = NX_Xfont + SOREV = $(SOFONTREV) + + #ifndef SeparateSharedCompile +Index: nx-X11/lib/fontconfig/Imakefile +=================================================================== +--- a/nx-X11/lib/fontconfig/Imakefile ++++ b/nx-X11/lib/fontconfig/Imakefile +@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/lib/fontconfig/Imakef + #define DoDebugLib DebugLibFontconfig + #define DoProfileLib ProfileLibFontconfig + #define HasSharedData YES +-#define LibName fontconfig ++#define LibName NX_fontconfig + #define SoRev SOFONTCONFIGREV + #define LibInstall InstallFontconfigLibrary + #define LibHeaders InstallFontconfigLibrary +Index: nx-X11/lib/fontenc/Imakefile +=================================================================== +--- a/nx-X11/lib/fontenc/Imakefile ++++ b/nx-X11/lib/fontenc/Imakefile +@@ -17,7 +17,7 @@ FONTENCDEFS = -DFONTENC_NO_LIBFONT \ + #define DoSharedLib SharedLibFontEnc + #define DoDebugLib DebugLibFontEnc + #define DoProfileLib ProfileLibFontEnc +-#define LibName fontenc ++#define LibName NX_fontenc + #define SoRev SOFONTENCREV + #define IncSubdir X11 + #define IncSubSubdir fonts +Index: nx-X11/lib/freetype2/Imakefile +=================================================================== +--- a/nx-X11/lib/freetype2/Imakefile ++++ b/nx-X11/lib/freetype2/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/freetype2/Imakefi + #define DoDebugLib DebugLibFreetype2 + #define DoProfileLib ProfileLibFreetype2 + #define HasSharedData YES +-#define LibName freetype ++#define LibName NX_freetype + #define SoRev SOFREETYPE2REV + #ifdef SharedLibtoolFreetype2Rev + #define SharedLibtoolRev SharedLibtoolFreetype2Rev +Index: nx-X11/lib/oldX/Imakefile +=================================================================== +--- a/nx-X11/lib/oldX/Imakefile ++++ b/nx-X11/lib/oldX/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v + #define DoExtraLib SharedOldX + #define DoDebugLib DebugOldX + #define DoProfileLib ProfileOldX +-#define LibName oldX ++#define LibName NX_oldX + #define SoRev SOOLDXREV + #define IncSubdir X11 + +Index: nx-X11/lib/psres/Imakefile +=================================================================== +--- a/nx-X11/lib/psres/Imakefile ++++ b/nx-X11/lib/psres/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/psres/Imakefile,v + #define DoExtraLib SharedLibPSRes + #define DoDebugLib DebugLibPSRes + #define DoProfileLib ProfileLibPSRes +-#define LibName psres ++#define LibName NX_psres + #define SoRev SOPSRESREV + #define LibHeaders NO + +Index: nx-X11/lib/regex/Imakefile +=================================================================== +--- a/nx-X11/lib/regex/Imakefile ++++ b/nx-X11/lib/regex/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86$ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName regex ++#define LibName NX_regex + #define LibHeaders NO + #define LibInstall NO + #define LibInstallBuild YES +Index: nx-X11/lib/windows/Imakefile +=================================================================== +--- a/nx-X11/lib/windows/Imakefile ++++ b/nx-X11/lib/windows/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib SharedLibWindowsWM + #define DoDebugLib DebugLibWindowsWM + #define DoProfileLib ProfileLibWindowsWM +-#define LibName WindowsWM ++#define LibName NX_WindowsWM + #define SoRev SOWINDOWSWMREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/xkbfile/Imakefile +=================================================================== +--- a/nx-X11/lib/xkbfile/Imakefile ++++ b/nx-X11/lib/xkbfile/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile + #define DoDebugLib DebugLibxkbfile + #define DoProfileLib ProfileLibxkbfile + #define HasSharedData NO +-#define LibName xkbfile ++#define LibName NX_xkbfile + #define SoRev SOXKBFILEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/xkbui/Imakefile +=================================================================== +--- a/nx-X11/lib/xkbui/Imakefile ++++ b/nx-X11/lib/xkbui/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/xkbui/Imakefile,v + #define DoDebugLib DebugLibxkbui + #define DoProfileLib ProfileLibxkbui + #define HasSharedData NO +-#define LibName xkbui ++#define LibName NX_xkbui + #define SoRev SOXKBUIREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/zlib/Imakefile +=================================================================== +--- a/nx-X11/lib/zlib/Imakefile ++++ b/nx-X11/lib/zlib/Imakefile +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/zlib/Imakefile,v + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName z ++#define LibName NX_z + #define SoRev SOZLIBREV + + ZLIBDIR = $(TOP)/extras/zlib +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -313,7 +313,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs + FONTBASE = $(FONTLIBSRC)/fontbase.o \ + $(FONTLIBSRC)/LibraryTargetName(fontbase) + #if XserverStaticFontLib +- FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) ++ FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB) + #else + FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) + #endif +@@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o + dix/main.o + #endif + +-XPMLIB = -lXpm ++XPMLIB = -lNX_Xpm + NXAGENT = hw/nxagent/LibraryTargetName(nxagent) + NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) + NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) +@@ -1012,16 +1012,16 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS + + #if defined(SunArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ +- -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp ++ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ ++ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp + #elif defined(cygwinArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ +- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ +- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp ++ -lXcomp -lXcompext -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ ++ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp + #else + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ +- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp ++ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ ++ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp + #endif + + #endif +@@ -1075,7 +1075,7 @@ nxagent_static_nolibs: nxagent + else exit 0; fi + $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ + $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ +- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) ++ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS) + #endif /* NXAgentServer */ + + #if defined(XnonServer) && XnonServer +Index: nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile ++++ b/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile +@@ -7,7 +7,7 @@ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName xf86config ++#define LibName NX_xf86config + + #define UseDBMalloc NO + +Index: nxcompext/Makefile.in +=================================================================== +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp + CCDEFINES = + + LDFLAGS = @LDFLAGS@ -L../nxcomp +-LIBS = @LIBS@ -lz -lX11 -lXcomp ++LIBS = @LIBS@ -lz -lNX_X11 -lXcomp + + # + # Only if THREADS is defined + # +-# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp ++# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp + # + + srcdir = @srcdir@ +Index: nxcompshad/Makefile.in +=================================================================== +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -48,7 +48,7 @@ CCINCLUDES = + CCDEFINES = + + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ -lX11 ++LIBS = @LIBS@ -lNX_X11 + + # + # Only if THREADS is defined. +@@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) + + else + +-EXTRALIBS = -lXtst -lXrandr -lXdamage ++EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage + + all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) + diff --git a/debian/patches/series b/debian/patches/series index 9133bf6..cf194f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,12 +10,11 @@ 009_nxproxy-add-man-page.full+lite.patch 009_nxagent-add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.full.patch -012_nxcomp_makefile-uninstall.full+lite.patch -013_nxcompext_makefile-uninstall.full.patch -014_nxcompshad_makefile-uninstall.full.patch +012_nxcomp_makefile-uninstall+autoconf.full+lite.patch +013_nxcompext_makefile-uninstall+autoconf.full.patch +014_nxcompshad_makefile-uninstall+autoconf.full.patch 015_nxproxy_makefile-uninstall.full+lite.patch 016_nx-x11_install-location.full.patch -016_nx-X11_install-location.debian.patch 017_nx-x11_update-autotools-helper-files.full.patch 018_nx-x11_update-libtool-ltmain-script.full.patch 019_nx-x11_expat-build-against-system-libxmltok.full.patch @@ -23,9 +22,11 @@ 021_add-nxauth-wrapper.full.patch 022_add-nxproxy-wrapper.full+lite.patch 023_add-x2goagent-wrapper.full.patch +030_nx-X11_configure-args.full.patch +031_nx-X11_parallel-make.full.patch +032_no-x11r6.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch -102_xserver-xext_set-securitypolicy-path.debian.patch 103_nxagent_set-X0-config-path.full.patch 105_nxagent_export-remote-keyboard-config.full.patch 106_nxagent_utf8-copy-clipboard.full.patch @@ -38,5 +39,8 @@ 202_nx-x11_enable-xinerama.full.patch 209_x2goagent-add-man-page.full.patch 300_nxagent_set-wm-class.full.patch +301_nx-X11_use-shared-libs.full.patch +600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch - +016_nx-X11_install-location.debian.patch +102_xserver-xext_set-securitypolicy-path.debian.patch diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh index 0724e19..2d1f8d2 100755 --- a/debian/post-build-nx.sh +++ b/debian/post-build-nx.sh @@ -13,11 +13,15 @@ cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do libfile=$(basename $libpath) libdir=$(dirname $libpath) + mkdir -p ${libdir//exports/.build-exports} cp -L $libpath ${libdir//exports/.build-exports} + find $libdir/$libfile.* | while read symlink; do ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) done + + done exit 0 diff --git a/debian/rules b/debian/rules index 116aafb..a5ac09e 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ override_dh_clean: override_dh_auto_build: debian/pre-build-nx.sh - LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt + LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel debian/post-build-nx.sh override_dh_auto_install: hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-34-g50690ea
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 50690ea177ee39011a235bac6887a213f27e7f54 (commit) from fde6a88a81ebdeb151a39e05977279d060f16884 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 50690ea177ee39011a235bac6887a213f27e7f54 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 14:41:26 2012 +0100 release 3.5.0.11 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 185f8e9..742e1b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low +nx-libs (2:3.5.0.11-0) unstable; urgency=low [ Mike Gabriel ] * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, @@ -43,7 +43,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low * Add patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch, use unique library names for nx-X11 based X11 libraries. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:41:07 +0100 nx-libs (2:3.5.0.10-0) unstable; urgency=low hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - master (branch) updated: 3.1.0.0
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 988da7922e3dc848d49c42ad2b6cff8fb2783297 (commit) from 763775ea379d06d28340bf9f9ae55e1242044692 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f4c01dc..84f0a9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.0.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.1.0.0): @@ -49,7 +49,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low upgrade warning refers to README.upgrade-pgsql-database. * x2goserver-fmbindings does not have to depend on ${shlibs:Depends}. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:37:34 +0100 x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 3.0.99.10-43-g988da79
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, build-main has been updated via 988da7922e3dc848d49c42ad2b6cff8fb2783297 (commit) via 763775ea379d06d28340bf9f9ae55e1242044692 (commit) via c7c08d58deb17843064a18749af07124b13a4cf5 (commit) via c9abfa3b2b358c183e06b78e725ebb7d5b5e0750 (commit) via 1974cdcefbe9e30bb78c3e9eff74d863062d1cf7 (commit) via 9c0321a3a7ebe21afba303397cdaec61f44b5fef (commit) via 25339e0d943a7592b1fe776d2ec08be6d9a723e2 (commit) via 183e55caf0729743747154bedb87776dc51fb6b1 (commit) via b1de1ed47501af09628afbdb15fff8130afdfe7a (commit) via 839ab4f783081aecf5667588c791f7ef5986568c (commit) via add1c479ab49cda6325f89ba1cbc45d57f8a1685 (commit) via d1a5d757ef2e45912f2f58162a6e6c39fa482d13 (commit) via 6d06ba1e3e965314e6a8753b11e69aeb45f8b5ad (commit) via 65b0817cef86ea0ee0085d539571bd4e689c6055 (commit) via e298bd19efb2fc0b1e7d1ec256332f8d9871d2fd (commit) via b4684ddfafa899ff10de734b9b0957dcd38909c2 (commit) via 305f7e897420aa9b0e151ffd37b7e1dd62def9e8 (commit) via adabd159ef48fad1bb827c76c17a2604d30ec4b5 (commit) via cefc9b0522ff5a9c5b996263961c94d8b5a56e62 (commit) via cc498e94b2e95ac0c4ef92a01732906065b25e8d (commit) via 3650aefe3e6399040a0fff6ccf5d174ab1d3b65d (commit) via 9da2c4d6265d79db87121bb529901759f3c2af4f (commit) via db9fa7f16780b11876c1b66399be76929feaea03 (commit) via 0253416b5e4b2e90b0a142b9219c3e808def41d8 (commit) via 4f8e5f05cf758b6b7d98cc563da553b05b443cd2 (commit) via b1536548a685d8fc96640a42fdea53e5281a9072 (commit) via 51771f645ffa60d561e156847dbc79cce6b41d4d (commit) via c557ccdfbfac96bfa63e14d522999a20a7b2c57a (commit) via b5a057b8b849d74bae0a1aabc16989ca594a5b6a (commit) via c4a1ea405879b07d351b6c10da02bb891c02c45b (commit) via 53a830ca3b3ecde7acab042323f00c988756c47d (commit) via ce30528b3b0ba6252e6617a835fd0909274a9759 (commit) via 9d58cdf8b93ba5f041bb643d6b28214493cc8353 (commit) via 3a1746539fe58fb31aab0eb6862647d279890edf (commit) via 745b2b21be2df3a91bf8c0870054cbc2138b37e1 (commit) via 53ce826d7ea804ca27c03e382571bdf5f54ed974 (commit) via b9ece48b618177723721afd452e506bfe521adc5 (commit) via 2cffebd0aab22890d25a3f7539068c95087e9a2e (commit) via 8ac7d8934719d90fcd35769836c02c3e3a54f85b (commit) via 9c621a42b9143d9cfa7f481d3b909693fc6564b2 (commit) via 414d6c5d3fc471d5ede367620801d9268bb5c372 (commit) via 63556d25c3a86f187d16b0e44a5beef76a27bc84 (commit) via dc0e5721b977a248c2b1e0b7e26b4549ed996d92 (commit) from 858d1df7444b742015c0a140b1cc0be26945351a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 988da7922e3dc848d49c42ad2b6cff8fb2783297 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 14:37:50 2012 +0100 release 3.1.0.0 ----------------------------------------------------------------------- Summary of changes: Makefile | 6 + Makefile.docupload | 2 +- debian/changelog | 53 +++++++++ debian/control | 29 +++++ debian/po/POTFILES.in | 1 + debian/po/de.po | 48 ++++++++ debian/po/templates.pot | 41 +++++++ debian/templates | 9 ++ ...-extensions.dirs => x2goserver-fmbindings.dirs} | 0 debian/x2goserver-fmbindings.install | 3 + debian/x2goserver-fmbindings.manpages | 1 + ...rver.preinst => x2goserver-fmbindings.postinst} | 26 ++--- ...rinting.postrm => x2goserver-fmbindings.postrm} | 32 +++--- debian/x2goserver.config | 16 +++ debian/x2goserver.docs | 1 + debian/x2goserver.postinst | 3 + x2goserver-compat/Makefile | 2 +- x2goserver-compat/VERSION.x2goserver-compat | 2 +- x2goserver-compat/man/man8/x2gosuspend-agent.8 | 2 +- x2goserver-compat/man/man8/x2gosuspend.8 | 2 +- x2goserver-compat/man/man8/x2goterminate.8 | 2 +- x2goserver-extensions/Makefile | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../bin/x2goserver-run-extensions | 6 +- .../man/man8/x2goserver-run-extensions.8 | 2 +- .../Makefile | 23 +---- .../VERSION.x2goserver-fmbindings | 1 + .../bin/x2gofm | 15 ++-- x2goserver-fmbindings/man/man8/x2gofm.8 | 26 +++++ .../share/applications/x2gofm.desktop | 9 ++ .../share/mime/packages/sshfs-x2go.xml | 21 ++++ .../x2gofeature.d/x2goserver-fmbindings.features | 10 +- x2goserver-printing/Makefile | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-printing/man/man8/x2goprint.8 | 2 +- x2goserver-pyhoca/Makefile | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-pyhoca/bin/x2gosetkeyboard | 10 +- x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver-xsession/Makefile | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/Makefile | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2gocmdexitmessage | 2 +- x2goserver/bin/x2gofeature | 2 +- x2goserver/bin/x2gomountdirs | 54 ++++++---- x2goserver/bin/x2goresume-session | 113 +++++++++++++++---- x2goserver/bin/x2goruncommand | 28 +++--- x2goserver/bin/x2gostartagent | 105 +++++++++--------- x2goserver/bin/x2gosuspend-session | 22 ++-- x2goserver/bin/x2goterminate-session | 22 ++-- x2goserver/bin/x2goumount-session | 53 ++++++---- x2goserver/bin/x2goversion | 4 +- x2goserver/doc/README.upgrade-pgsql-database | 42 +++++++ x2goserver/lib/x2godbwrapper.pm | 56 +++++++--- x2goserver/lib/x2goresume | 5 +- x2goserver/lib/{x2goinsertport => x2gormport} | 3 +- x2goserver/lib/x2gosqlitewrapper.pl | 24 ++++- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 25 +++++ x2goserver/man/man8/x2golistdesktops.8 | 4 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- x2goserver/sbin/x2gocleansessions | 5 +- x2goserver/sbin/x2godbadmin | 4 +- x2goserver/share/x2go/versions/VERSION.x2goserver | 1 - 81 files changed, 741 insertions(+), 297 deletions(-) create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/de.po create mode 100644 debian/po/templates.pot create mode 100644 debian/templates copy debian/{x2goserver-extensions.dirs => x2goserver-fmbindings.dirs} (100%) create mode 100644 debian/x2goserver-fmbindings.install create mode 100644 debian/x2goserver-fmbindings.manpages copy debian/{x2goserver.preinst => x2goserver-fmbindings.postinst} (66%) copy debian/{x2goserver-printing.postrm => x2goserver-fmbindings.postrm} (59%) create mode 100755 debian/x2goserver.config copy {x2goserver-pyhoca => x2goserver-fmbindings}/Makefile (62%) create mode 100644 x2goserver-fmbindings/VERSION.x2goserver-fmbindings copy x2goserver/bin/x2gobasepath => x2goserver-fmbindings/bin/x2gofm (75%) create mode 100644 x2goserver-fmbindings/man/man8/x2gofm.8 create mode 100644 x2goserver-fmbindings/share/applications/x2gofm.desktop create mode 100644 x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml copy x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features => x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features (74%) create mode 100644 x2goserver/doc/README.upgrade-pgsql-database copy x2goserver/lib/{x2goinsertport => x2gormport} (95%) create mode 100644 x2goserver/man/man8/x2gogetservers.8 delete mode 120000 x2goserver/share/x2go/versions/VERSION.x2goserver The diff of changes is: diff --git a/Makefile b/Makefile index 77ae676..da9d5db 100755 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ build_man2html: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ clean: @@ -19,6 +20,7 @@ clean: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ build-arch: @@ -27,6 +29,7 @@ build-arch: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ build-indep: @@ -35,6 +38,7 @@ build-indep: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ install: @@ -43,6 +47,7 @@ install: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ uninstall: @@ -51,4 +56,5 @@ uninstall: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ diff --git a/Makefile.docupload b/Makefile.docupload index 70dfc1c..8c9e770 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -15,7 +15,7 @@ all: doc doc: clean docbuild docupload docbuild: - make -f Makefile build_man2html + ${MAKE} -f Makefile build_man2html docupload: ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_x2goserver}; rm -Rfv ${DOC_PATCH_x2goserver}/*; }" diff --git a/debian/changelog b/debian/changelog index b11ad14..84f0a9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,56 @@ +x2goserver (3.1.0.0-0~x2go1) unstable; urgency=low + + [ Oleksandr Shneyder ] + * New upstream version (3.1.0.0): + - remove ports used by X2Go session from database after session was finished + if postgres backend is used. + - before resuming X2Go session check if reserved ports still available + in other case find new free ports, save them in database and send to + x2goclient + - run netstat -tl --all to find free ports for graphic, sound and sshfs + tunnels in x2gostartagent and x2goresume-session + + [ Milan Knížek ] + * New upstream version (3.1.0.0): + - Fix removal of desktop link on x2goumount-session if local folder of a + Windows client gets unmounted. + - Remove redundant -S option from x2goagent start-up command line. + - Use -f $XAUTHORITY with xauth calls. + + [ Sören Plönnigs ] + * New upstream version (3.1.0.0): + - Only run kdialog/zenity from x2goumount-session if either of them exists + in the system's $PATH. + + [ Jan Engelhardt ] + * New upstream version (3.1.0.0): + - Use /cgi-bin/man/ path in web'ified man pages. + - Use ,,${MAKE}'' instead of ,,make'' in Makefile. + + [ Mike Gabriel ] + * New upstream version (3.1.0.0): + - Provide new package x2goserver-fmbindings. Derived from a package draft + provided by Milan Knížek (Thanks!). + - Do not create desktop icons for rootless (i.e. non-desktop) sessions. + - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority). + - For x2gomountdirs / x2goumount-session allow other TMP paths than + /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp. + - Place quotations where appropriate into shell scripts. + - Fix call to x2goterminate-desktopsharing in x2goruncommand. + - Tolerate user names containing "-" characters (SQLite DB backend). + - Make sure x2gocleansessions close _all_ open file handles after + forking as a daemon. + - Add copyright header for x2gofm script. + - Add man page for x2gogetservers script. + - Add man page for x2gofm wrapper script. + - Update date and release version in man pages. + * Let x2goserver package suggest x2goserver-fmbindings. + * Add package upgrade warning for installation using PostgreSQL. The + upgrade warning refers to README.upgrade-pgsql-database. + * x2goserver-fmbindings does not have to depend on ${shlibs:Depends}. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 14:37:34 +0100 + x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index 0a51bcd..a8578fe 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Suggests: x2goserver-printing (= ${source:Version}), x2goserver-compat (= ${source:Version}), x2goserver-xsession (= ${source:Version}), + x2goserver-fmbindings (= ${source:Version}), x2goserver-pyhoca (= ${source:Version}) Breaks: x2goserver-one, @@ -167,6 +168,33 @@ Description: X2Go server daemon scripts (Xsession runner) startups and many more Xsession related features on X2Go session login automagically. +Package: x2goserver-fmbindings +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), + desktop-file-utils, + xdg-utils +Description: Generic (freedesktop-based) file manager bindings for X2Go + X2Go is a server based computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + x2goserver-fmbindings contains generic MIME type information + for X2Go's local folder sharing. It can be used with all + freedesktop.org compliant desktop shells. + . + However, this package will be superseded by other, more specific + destkop binding components, if installed and being used with the + corresponding desktop shell: + - under LXDE by x2golxdebindings + - under GNOME by x2gognomebindings + - under KDE4 by plasma-widget-x2go + Package: x2goserver-pyhoca Architecture: all Depends: @@ -189,3 +217,4 @@ Description: X2Go server daemon scripts (add-ons for pyhoca client) Functionalities this package adds: - renaming of session window titles - setting detailled X keyboard parameters + diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..cef83a3 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 0000000..11de240 --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,48 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: x2goserver(a)packages.debian.org\n" +"POT-Creation-Date: 2012-02-22 13:45+0100\n" +"PO-Revision-Date: 2012-02-22 13:52+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "X2Go Server / PostgreSQL Upgrade" +msgstr "X2Go Server / PostgreSQL Upgrade" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "You have configured X2Go Server with PostgreSQL as session DB backend and you are upgrading x2goserver from a version minor to 3.1.0.0." +msgstr "Ihr X2Go Server nutzt eine PostgreSQL Datenbank, um X2Go Sitzungsdaten zu verwalten, und Sie aktualisieren gerade das Paket x2goserver von einer Version kleiner als 3.1.0.0." + +#. Type: text +#. Description +#: ../templates:1001 +#| msgid "" +#| "Please follow these PostgreSQL DB upgrade instructions before you " +#| "continue using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-" +#| "pgsql-database" +msgid "Please follow these PostgreSQL DB upgrade instructions before you continue using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz" +msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor sie mit der Weiternutzung Ihres X2Go Servers fortfahren: /usr/share/doc/x2goserver/README.upgrade-pgsl-database.gz" + diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..657ffb4 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,41 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: x2goserver(a)packages.debian.org\n" +"POT-Creation-Date: 2012-02-22 13:45+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "X2Go Server / PostgreSQL Upgrade" +msgstr "" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "" +"You have configured X2Go Server with PostgreSQL as session DB backend and " +"you are upgrading x2goserver from a version minor to 3.1.0.0." +msgstr "" + +#. Type: text +#. Description +#: ../templates:1001 +msgid "" +"Please follow these PostgreSQL DB upgrade instructions before you continue " +"using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-" +"database.gz" +msgstr "" diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..db48433 --- /dev/null +++ b/debian/templates @@ -0,0 +1,9 @@ +Template: x2goserver/postgresql-upgrade-3_1_0_0 +Type: text +_Description: X2Go Server / PostgreSQL Upgrade + You have configured X2Go Server with PostgreSQL as session DB backend and + you are upgrading x2goserver from a version minor to 3.1.0.0. + . + Please follow these PostgreSQL DB upgrade instructions before you continue + using your X2Go Server: + /usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-fmbindings.dirs similarity index 100% copy from debian/x2goserver-extensions.dirs copy to debian/x2goserver-fmbindings.dirs diff --git a/debian/x2goserver-fmbindings.install b/debian/x2goserver-fmbindings.install new file mode 100644 index 0000000..aeb426e --- /dev/null +++ b/debian/x2goserver-fmbindings.install @@ -0,0 +1,3 @@ +x2goserver-fmbindings/VERSION.x2goserver-fmbindings usr/share/x2go/versions/ +x2goserver-fmbindings/share/* usr/share/ +x2goserver-fmbindings/bin/* usr/bin/ diff --git a/debian/x2goserver-fmbindings.manpages b/debian/x2goserver-fmbindings.manpages new file mode 100644 index 0000000..ec148a6 --- /dev/null +++ b/debian/x2goserver-fmbindings.manpages @@ -0,0 +1 @@ +x2goserver-fmbindings/man/man8/* \ No newline at end of file diff --git a/debian/x2goserver.preinst b/debian/x2goserver-fmbindings.postinst similarity index 66% copy from debian/x2goserver.preinst copy to debian/x2goserver-fmbindings.postinst index 117bb2c..cbe42ae 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver-fmbindings.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# preinst script for x2goserver +# postinst script for x2gognomebindings # # see: dh_installdeb(1) @@ -19,20 +19,18 @@ set -e case "$1" in - install|upgrade) - # cleanup old x2goserver installations - rm -Rfv /var/db/x2go/ - if getent group x2gousers >/dev/null; then - echo "The ,,x2gousers'' is no longer used by x2go and can be" - echo "removed as soon as no users are members of this group" - fi - ;; - abort-upgrade) - ;; + configure) + update-desktop-database + update-mime-database /usr/share/mime + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) - echo "preinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 1 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically @@ -41,5 +39,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver-fmbindings.postrm similarity index 59% copy from debian/x2goserver-printing.postrm copy to debian/x2goserver-fmbindings.postrm index 16b0f1e..4c31ba2 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/x2goserver-fmbindings.postrm @@ -1,7 +1,10 @@ -#! /bin/sh -# postrm script for x2goserver-printing +#!/bin/sh +# postrm script for x2gognomebindings # # see: dh_installdeb(1) + +set -e + # summary of how this script can be called: # * <postrm> `remove' # * <postrm> `purge' @@ -10,23 +13,22 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see /usr/share/doc/packaging-manual/ - -set -e +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package case "$1" in - purge) - getent passwd x2goprint >/dev/null && deluser x2goprint - getent group x2goprint >/dev/null && delgroup x2goprint - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + update-desktop-database + update-mime-database /usr/share/mime + ;; + *) echo "postrm called with unknown argument \`$1'" >&2 - exit 0 - ;; + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically @@ -34,4 +36,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/debian/x2goserver.config b/debian/x2goserver.config new file mode 100755 index 0000000..b7012da --- /dev/null +++ b/debian/x2goserver.config @@ -0,0 +1,16 @@ +#!/bin/sh -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +LASTVERSION=$2 + +if dpkg --compare-versions "$LASTVERSION" lt "3.1.0.0" && \ + [ -e /etc/x2go/x2gosql/sql ] && \ + egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then + + db_input critical x2goserver/postgresql-upgrade-3_1_0_0 || true + db_go + +fi + diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs index 6c7d3af..869c67e 100644 --- a/debian/x2goserver.docs +++ b/debian/x2goserver.docs @@ -1 +1,2 @@ x2goserver/.build_man2html/html +x2goserver/doc/* diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 68d83d7..f1582a8 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -5,6 +5,9 @@ set -e +# Source debconf library. +. /usr/share/debconf/confmodule + # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index 576f9ce..6bdc94c 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 026a698..075493a 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.10 \ No newline at end of file +3.1.0.0 \ No newline at end of file diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 index 4eb6564..0256909 100644 --- a/x2goserver-compat/man/man8/x2gosuspend-agent.8 +++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2gosuspend-agent 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (compat)" .SH NAME x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8 index ebb0cac..e7aa661 100644 --- a/x2goserver-compat/man/man8/x2gosuspend.8 +++ b/x2goserver-compat/man/man8/x2gosuspend.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2gosuspend 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (compat)" .SH NAME x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8 index 8e170a0..5af4784 100644 --- a/x2goserver-compat/man/man8/x2goterminate.8 +++ b/x2goserver-compat/man/man8/x2goterminate.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goterminate 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (compat)" .SH NAME x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 02a9525..2fe807c 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 026a698..075493a 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.10 \ No newline at end of file +3.1.0.0 \ No newline at end of file diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 3df2066..c7b671c 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -27,13 +27,13 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_SESSION=$1 -X2GO_MODALITY=$2 +X2GO_SESSION="$1" +X2GO_MODALITY="$2" # scan extensions and execute them find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" - $x2go_extension $X2GO_SESSION &>/dev/null && { + $x2go_extension "$X2GO_SESSION" &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" } || { $X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..." diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index c0fb50b..d63cf6f 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goserver-run-extensions 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-fmbindings/Makefile similarity index 62% copy from x2goserver-pyhoca/Makefile copy to x2goserver-fmbindings/Makefile index aa6a562..bd9aa69 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html @@ -51,20 +51,11 @@ clean_man2html: install: install_scripts install_config install_man install_version install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) -# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords -# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ -# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -75,22 +66,14 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-pyhoca $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca + $(INSTALL_FILE) VERSION.x2goserver-extensions $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done -# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done -# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql -# $(RM_DIR) $(DESTDIR)$(ETCDIR) || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done @@ -98,5 +81,5 @@ uninstall_man: $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings new file mode 100644 index 0000000..f8d7555 --- /dev/null +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -0,0 +1 @@ +3.1.0.0 diff --git a/x2goserver/bin/x2gobasepath b/x2goserver-fmbindings/bin/x2gofm similarity index 75% copy from x2goserver/bin/x2gobasepath copy to x2goserver-fmbindings/bin/x2gofm index 35f18bd..9070055 100755 --- a/x2goserver/bin/x2gobasepath +++ b/x2goserver-fmbindings/bin/x2gofm @@ -17,14 +17,13 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2007-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012 Milan Knížek <knizek.confy(a)gmail.com> +# Copyright (C) 2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> use strict; -use Cwd; -use Cwd q{abs_path}; -use File::Basename; -my $dir = dirname($0); -my $base_path = abs_path("$dir/.."); - -print "$base_path"; +my $fname=shift; +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +close(F); +system( "xdg-open $dir" ); diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8 new file mode 100644 index 0000000..4f49941 --- /dev/null +++ b/x2goserver-fmbindings/man/man8/x2gofm.8 @@ -0,0 +1,26 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gofm 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server" +.SH NAME +x2gofm \- X2Go wrapper for Browsing X2Go Shared Folders +.SH SYNOPSIS +'nh +.fi +.ad l +x2gofm <shared-folder> + +.SH DESCRIPTION +\fBx2gofm\fR is a component of the generic file manager bindings for X2Go's shared folders. +\fBx2gofm\fR uses XDG (namely x2go-open <dir>) to launch the default file browser on all +client-side folders shared via X2Go. +.PP +The default file browser is defined by the freedesktop.org specification of the running desktop +environment. +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver-fmbindings/share/applications/x2gofm.desktop b/x2goserver-fmbindings/share/applications/x2gofm.desktop new file mode 100644 index 0000000..d747b1e --- /dev/null +++ b/x2goserver-fmbindings/share/applications/x2gofm.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=x2gofm +MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go +Exec=x2gofm %f +Type=Application +Terminal=false +NoDisplay=true +Icon=file-manager diff --git a/x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml b/x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml new file mode 100644 index 0000000..f6e7a0d --- /dev/null +++ b/x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/sshfscdrom-x2go"> + <comment>SSHFS CDROM</comment> + <comment xml:lang="de">SSHFS CDROM</comment> + <glob pattern="* (sshfs-cdrom)"/> + <generic-icon name="folder-remote"/> + </mime-type> + <mime-type type="application/sshfsdisk-x2go"> + <comment>SSHFS Disk</comment> + <comment xml:lang="de">SSHFS Freigabe</comment> + <glob pattern="* (sshfs-disk)"/> + <generic-icon name="folder-remote"/> + </mime-type> + <mime-type type="application/sshfsremovable-x2go"> + <comment>SSHFS Removable</comment> + <comment xml:lang="de">SSHFS Gerät</comment> + <glob pattern="* (sshfs-removable)"/> + <generic-icon name="folder-remote"/> + </mime-type> +</mime-info> diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features similarity index 74% copy from x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features copy to x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features index cc20f85..c1d5827 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` @@ -26,10 +26,10 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2Go server core features +# check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_XSESSION") echo "ok"; exit 0;; + "X2GO_FMBINDINGS") echo "ok"; exit 0;; *) exit -1;; esac diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 04f93bf..28ee92a 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 026a698..075493a 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.10 \ No newline at end of file +3.1.0.0 \ No newline at end of file diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8 index 11a5e0a..1786dee 100644 --- a/x2goserver-printing/man/man8/x2goprint.8 +++ b/x2goserver-printing/man/man8/x2goprint.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goprint 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goprint \- Process X2Go Print Job .SH SYNOPSIS diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index aa6a562..8fc06fa 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 026a698..075493a 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.0.99.10 \ No newline at end of file +3.1.0.0 \ No newline at end of file diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard index 26a50f8..481d01a 100755 --- a/x2goserver-pyhoca/bin/x2gosetkeyboard +++ b/x2goserver-pyhoca/bin/x2gosetkeyboard @@ -38,11 +38,11 @@ test -f ${X2GO_CLIENT_KBD_FILE} || exit 0 read_keyboard_file() { # retrieve keyboard settings from keyboard file in X2Go session dir - XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_RULES="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_MODEL="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_LAYOUT="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_VARIANT="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" + XKB_OPTIONS="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)" } diff --git a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 index 77c5055..a87d080 100644 --- a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 +++ b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2Go Server Tool (Extension)" +.TH x2gosetkeyboard 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 741ec99..7a56c87 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -43,7 +43,7 @@ build-arch: build_man2html: # mkdir -p $(MAN2HTML_DEST) # for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done -# for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done +# for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 026a698..075493a 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.0.99.10 \ No newline at end of file +3.1.0.0 \ No newline at end of file diff --git a/x2goserver/Makefile b/x2goserver/Makefile index d934497..c90f1c9 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -44,7 +44,7 @@ build-indep: build_man2html build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_arch clean_man2html diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 026a698..075493a 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.0.99.10 \ No newline at end of file +3.1.0.0 \ No newline at end of file diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index a8e122b..e8002ee 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -28,4 +28,4 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)" # return command output of the command that was issued by x2goruncommand -cat $MESSAGE_FILE +cat "$MESSAGE_FILE" diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index 997418e..f379070 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -30,7 +30,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 # run x2gofeature scripts of X2Go extensions -test -d $X2GO_SHARE_PATH/x2gofeature.d && { +test -d "$X2GO_SHARE_PATH/x2gofeature.d" && { for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do $subscript $@ && exit 0 done diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 0d52a7b..58f3590 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -33,6 +33,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); +my $tmp_dir = $ENV{'TMP'} || '/tmp'; + my $type=shift; my $session=shift; my $user=shift; @@ -98,12 +100,12 @@ close(F); chmod(0600,"$key"); chmod(0600,"$key.ident"); -my $mdir="/tmp/$ENV{'USER'}_media"; +my $mdir="$tmp_dir/$ENV{'USER'}_media"; my $ldir="$ENV{'HOME'}/media"; my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; -my $spooldir="/tmp/spool_$ENV{'USER'}"; +my $spooldir="$tmp_dir/spool_$ENV{'USER'}"; my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox"; -my $mimeboxdir="/tmp/mimebox_$ENV{'USER'}"; +my $mimeboxdir="$tmp_dir/mimebox_$ENV{'USER'}"; if (! -e $mdir) { @@ -264,44 +266,52 @@ for (my $i=0;$i<@dirs;$i++) } if (! $printspool && ! $mimeboxspool && ! $useplasmoid ) { + my $fname="$ENV{'HOME'}/Desktop"; - my $current_desktop = ""; - if ($session =~ m/stDGNOME/) + my $current_desktop = "NONE"; + if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) { $current_desktop="-gnome"; } - elsif ($session =~ m/stDLXDE/) + elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; } + elsif (($session =~ m/_stD.*_dp/) && system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) + { + $current_desktop=""; + } my $p=@dirs[$i]; $p=~s/\/cygdrive\///g; $p=~s/\//_/g; $fname="$fname/$p"; - if ($type eq "dir") - { - $fname="$fname\ (sshfs-disk$current_desktop)"; - syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: client-side folder on harddrive"); - } - else + if ("$current_desktop" ne "NONE") { - if ($fname =~ m/CDROM/) + if ($type eq "dir") { - $fname="$fname\ (sshfs-cdrom$current_desktop)"; - syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: optical disc"); + $fname="$fname\ (sshfs-disk$current_desktop)"; + syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: client-side folder on harddrive"); } else { - $fname="$fname\ (sshfs-removable$current_desktop)"; - syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: removable device"); + if ($fname =~ m/CDROM/) + { + $fname="$fname\ (sshfs-cdrom$current_desktop)"; + syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: optical disc"); + } + else + { + $fname="$fname\ (sshfs-removable$current_desktop)"; + syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: removable device"); + } + $fname=~s/_ramdrive_mnt_//; } - $fname=~s/_ramdrive_mnt_//; + print "fname: $fname\n"; + open(F,">$fname"); + print F "$mntpath\n$session\n\n\0"; + close(F); } - print "fname: $fname\n"; - open(F,">$fname"); - print F "$mntpath\n$session\n\n\0"; - close(F); } } else diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 9023e86..e03751a 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -20,25 +20,25 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -SESSION_NAME=$1 -X2GO_GEOMETRY=$2 -X2GO_LINK=$3 -X2GO_PACK=$4 -X2GO_KBD_LAYOUT=$5 -X2GO_KBD_TYPE=$6 -X2GO_SET_KBD=$7 +SESSION_NAME="$1" +X2GO_GEOMETRY="$2" +X2GO_LINK="$3" +X2GO_PACK="$4" +X2GO_KBD_LAYOUT="$5" +X2GO_KBD_TYPE="$6" +X2GO_SET_KBD="$7" X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` -X2GO_ROOT=${HOME}/.x2go +X2GO_ROOT="${HOME}/.x2go" X2GO_RESIZE=0 X2GO_FULLSCREEN=0 -NX_XINERAMA_CONF=$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf -if [ -e $NX_XINERAMA_CONF ] +NX_XINERAMA_CONF="$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf" +if [ -e "$NX_XINERAMA_CONF" ] then - rm $NX_XINERAMA_CONF + rm "$NX_XINERAMA_CONF" fi $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" @@ -54,7 +54,66 @@ then X2GO_FULLSCREEN=1 fi -SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME} + +SESSIONINFO=`x2golistsessions | grep "${SESSION_NAME}" | sed "s/|/,/g"` + +GR_PORT=`echo "$SESSIONINFO" | awk -F, {'print $9'}` +SOUND_PORT=`echo "$SESSIONINFO" | awk -F, {'print $10'}` +FS_PORT=`echo "$SESSIONINFO" | awk -F, {'print $14'}` +SERVER=`echo "$SESSIONINFO" | awk -F, {'print $4'}` + +$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "old ports: $GR_PORT, $SOUND_PORT, $FS_PORT" + +#Get all used in system ports from netstat output +SYSTEM_PORTS=`netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'` + +#check if saved in DB ports free +if grep -q "|${GR_PORT}|" <<<$SYSTEM_PORTS ; then + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $GR_PORT is already in use" + $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$GR_PORT" + GR_PORT="" +fi +if grep -q "|${SOUND_PORT}|" <<<$SYSTEM_PORTS ; then + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $SOUND_PORT is already in use" + $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$SOUND_PORT" + SOUND_PORT="" +fi +if grep -q "|${FS_PORT}|" <<<$SYSTEM_PORTS ; then + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port "$FS_PORT" is already in use" + $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$FS_PORT" + FS_PORT="" +fi + +SSH_PORT=30000 #First ssh port 30001 + +#Get all used in system ports from X2Go database and netstat output +USED_PORTS=`$X2GO_LIB_PATH/x2gogetports "$HOSTNAME"; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'` + +while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do + OUTPUT="" + while [ "$OUTPUT" != "inserted" ]; do + SSH_PORT=$(($SSH_PORT + 1)) + + #get free port + SSH_PORT=`echo "for(\\$i=$SSH_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_PORTS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` + + #check if port in /etc/services + SERV=`grep $SSH_PORT /etc/services` + if [ "$SERV" == "" ]; then + OUTPUT=`$X2GO_LIB_PATH/x2goinsertport "$HOSTNAME" "$SESSION_NAME" "$SSH_PORT"` + fi + done + if [ "$GR_PORT" == "" ]; then + GR_PORT="$SSH_PORT" + elif [ "$SOUND_PORT" == "" ]; then + SOUND_PORT="$SSH_PORT" + else + FS_PORT="$SSH_PORT" + fi +done + + +SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" OPTIONS=`cat ${SESSION_DIR}/options` GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}` @@ -63,9 +122,11 @@ FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}` LSTR=`echo "$OPTIONS" | awk -F, {'print $2'}` PSTR=`echo "$OPTIONS" | awk -F, {'print $3'}` KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}` +LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}` + -KTSTR=`echo $KTSTR | sed "s/\//\\\\\\\\\//"` -X2GO_KBD_TYPE=`echo $X2GO_KBD_TYPE | sed "s/\//\\\\\\\\\//"` +KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"` +X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"` if [ "$X2GO_SET_KBD" == "0" ] then @@ -77,29 +138,30 @@ NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ -e "s/$KTSTR/kbtype=$X2GO_KBD_TYPE/"\ -e "s/$GSTR/geometry=$X2GO_GEOMETRY/"\ -e "s/$RSTR/resize=$X2GO_RESIZE/"\ + -e "s/$LISTSTR/listen=$GR_PORT/"\ -e "s/$FSTR/fullscreen=$X2GO_FULLSCREEN/"` -X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` +X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` if [ "$X2GO_CLIENT" == "" ] then - X2GO_CLIENT=$HOSTNAME + X2GO_CLIENT="$HOSTNAME" fi -echo "$NEWOPTIONS" >${SESSION_DIR}/options +echo "$NEWOPTIONS" >"${SESSION_DIR}/options" -$X2GO_LIB_PATH/x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null # run x2goserver-extensions for pre-resume -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-resume || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-resume || true kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # resume x2godesktopsharing, if it has been in use before the session got suspended - x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing $SESSION_NAME || true + x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing "$SESSION_NAME" || true # run x2goserver-extensions for post-resume - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-resume || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-resume || true } || { err_msg="ERROR: failed to resume session with ID $SESSION_NAME" @@ -108,10 +170,13 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { # If we reach here it means that the x2goagent process of the session has vanisshed # If this happens than we mark the session as finished... - $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null + $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-resume - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-resume || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-resume || true } +echo "gr_port=$GR_PORT" +echo "sound_port=$SOUND_PORT" +echo "fs_port=$FS_PORT" diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 451ee59..0a664b6 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -36,11 +36,11 @@ export X2GO_AGENT_PID export X2GO_SESSION cmd=`echo $cmd |sed 's/X2GO_SPACE_CHAR/ /g'` -X2GO_ROOT=${HOME}/.x2go -MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput -echo "exec $cmd" >> $MESSAGE_FILE +X2GO_ROOT="${HOME}/.x2go" +MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput" +echo "exec $cmd" >> "$MESSAGE_FILE" -NX_XINERAMA_CONF=$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf +NX_XINERAMA_CONF="$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf" export NX_XINERAMA_CONF # make Kerberos's ticket cache known inside the X2Go session @@ -52,7 +52,7 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -test -n $LD_LIBRARY_PATH && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH=$NX_XINERAMA_LIBS +test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS" export LD_LIBRARY_PATH if [ "$sndsys" == "esd" ]; then @@ -116,14 +116,14 @@ fi EXEC=`which $cmd` -BNAME=`basename $EXEC` +BNAME=`basename "$EXEC"` if [ "$BNAME" == "rdesktop" ] then IMEXIT="true" fi # run x2goserver-extensions for pre-runcommand -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-runcommand || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-runcommand || true sucessful_run=false if [ "$EXEC" != "" ] && [ -x $EXEC ]; then @@ -148,26 +148,26 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then successful_run=true # run x2goserver-extensions for post-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-runcommand || true else $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute" - echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE + echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > "$MESSAGE_FILE" # run x2goserver-extensions for fail-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-runcommand || true fi # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $X2GO_SESSION || true +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2goterminate-desktopsharing "$X2GO_SESSION" || true kill -TERM $X2GO_AGENT_PID -$X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null +$X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION" > /dev/null export HOSTNAME -x2goumount-session $X2GO_SESSION +x2goumount-session "$X2GO_SESSION" # clean up session dir if not in debug mode and if session has been successful if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then - (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)& + (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index a4952bc..679852e 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -27,24 +27,26 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 -X2GO_ROOT=${HOME}/.x2go +X2GO_ROOT="${HOME}/.x2go" REMOTE=localhost -X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` +X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" -X2GO_GEOMETRY=$1; shift -X2GO_LINK=$1; shift -X2GO_PACK=$1; shift -X2GO_TYPE=$1; shift -X2GO_KBD_LAYOUT=$1; shift -X2GO_KBD_TYPE=$1; shift -X2GO_SET_KBD=$1; shift -X2GO_STYPE=$1; shift -X2GO_CMD=$1; shift +X2GO_GEOMETRY="$1"; shift +X2GO_LINK="$1"; shift +X2GO_PACK="$1"; shift +X2GO_TYPE="$1"; shift +X2GO_KBD_LAYOUT="$1"; shift +X2GO_KBD_TYPE="$1"; shift +X2GO_SET_KBD="$1"; shift +X2GO_STYPE="$1"; shift +X2GO_CMD="$1"; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} + if [ "$X2GO_STYPE" == "S" ]; then SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` @@ -58,7 +60,7 @@ if [ "$X2GO_STYPE" == "S" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "shadow session requested: mode $SHADOW_MODE, user: $SHADOW_USER, desktop: $SHADOW_DESKTOP" } || { - SHADREQ_USER=$1; shift + SHADREQ_USER="$1"; shift $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "preparing shadow session request for user $SHADREQ_USER, agent starts for user ${USER}" } @@ -66,18 +68,18 @@ if [ "$X2GO_STYPE" == "S" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''" $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER" - OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER` + OUTPUT=`x2godesktopsharing client "$X2GO_CLIENT" "$X2GO_GEOMETRY" "$X2GO_LINK" "$X2GO_PACK" "$X2GO_TYPE" "$X2GO_KBD_LAYOUT" "$X2GO_KBD_TYPE" "$X2GO_SET_KBD" "$X2GO_STYPE" "$X2GO_CMD" "$USER"` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT" if [ "$OUTPUT" == "DENY" ]; then echo "ACCESS DENIED" 1>&2 $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session" exit -1 fi - X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` - X2GO_PORT=`echo $OUTPUT | awk '{print $1}'` + X2GO_COOKIE=`echo "$OUTPUT" | awk '{print $2}'` + X2GO_PORT=`echo "$OUTPUT" | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" - xauth add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} - xauth add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} + xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" + xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" echo $X2GO_PORT echo $X2GO_COOKIE @@ -91,14 +93,14 @@ if [ "$X2GO_STYPE" == "S" ]; then fi LIMIT=`x2gosessionlimit` -LWORD=`echo $LIMIT | awk '{print $1}'` +LWORD=`echo "$LIMIT" | awk '{print $1}'` if [ "$LWORD" == "LIMIT" ]; then echo $LIMIT 1>&2 exit -1 fi -export NX_CLIENT=$X2GO_LIB_PATH/x2gosuspend-agent +export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` @@ -111,11 +113,14 @@ elif [ "$X2GO_STYPE" == "S" ]; then fi if [ "$X2GO_CLIENT" == "" ]; then - X2GO_CLIENT=$HOSTNAME + X2GO_CLIENT="$HOSTNAME" fi USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` +#Get all used in system ports from X2Go database and netstat output +USED_PORTS=`$X2GO_LIB_PATH/x2gogetports $HOSTNAME ; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'` + while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) @@ -125,45 +130,39 @@ while [ "$OUTPUT" != "inserted" ]; do NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - netstat -ntl 2>/dev/null | grep -q ":${NX_PORT} "; then + grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then OUTPUT="XXX" else - SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"` + SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" if [ "$COLORDEPTH" != "" ]; then - SESSION_NAME="$SESSION_NAME"_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH} + SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` fi - OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession $X2GO_PORT $HOSTNAME $SESSION_NAME` + OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi done -USED_PORTS=`$X2GO_LIB_PATH/x2gogetports $HOSTNAME` - - while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) - #check if port in /etc/services + #get free port SSH_PORT=`echo "for(\\$i=$SSH_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_PORTS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` + #check if port in /etc/services SERV=`grep $SSH_PORT /etc/services` if [ "$SERV" == "" ]; then - CR=`echo "use IO::Socket; \\$sock = new IO::Socket::INET ( LocalAddr => 'localhost',LocalPort => \"$SSH_PORT\",\ - Proto => 'tcp',Listen => 1,Reuse =>1 ) or die ;print \"OK\";close(\\$sock);"|perl 2>/dev/null` - if [ "$CR" == "OK" ]; then - OUTPUT=`$X2GO_LIB_PATH/x2goinsertport $HOSTNAME $SESSION_NAME $SSH_PORT` - fi + OUTPUT=`$X2GO_LIB_PATH/x2goinsertport "$HOSTNAME" "$SESSION_NAME" "$SSH_PORT"` fi done if [ "$GR_PORT" == "" ]; then - GR_PORT=$SSH_PORT + GR_PORT="$SSH_PORT" elif [ "$SOUND_PORT" == "" ]; then - SOUND_PORT=$SSH_PORT + SOUND_PORT="$SSH_PORT" else - FS_PORT=$SSH_PORT + FS_PORT="$SSH_PORT" fi done @@ -178,23 +177,23 @@ if [ "$X2GO_GEOMETRY" == "fullscreen" ]; then fi if [ "$X2GO_STYPE" == "S" ]; then - X2GO_GEOMETRY=`DISPLAY=$SHADOW_DESKTOP xwininfo -root | grep geometry` + X2GO_GEOMETRY=`DISPLAY="$SHADOW_DESKTOP" xwininfo -root | grep geometry` X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/ //g"` X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/-geometry//"` fi -SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME} +SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" -if [ ! -d $X2GO_ROOT ]; then - mkdir $X2GO_ROOT +if [ ! -d "$X2GO_ROOT" ]; then + mkdir "$X2GO_ROOT" fi -if [ ! -d $X2GO_ROOT/ssh ]; then - mkdir $X2GO_ROOT/ssh +if [ ! -d "$X2GO_ROOT/ssh" ]; then + mkdir "$X2GO_ROOT/ssh" fi -if [ ! -d $SESSION_DIR ]; then - mkdir $SESSION_DIR +if [ ! -d "$SESSION_DIR" ]; then + mkdir "$SESSION_DIR" fi X2GO_COOKIE=`mcookie` @@ -205,8 +204,8 @@ PATH="${PATH}:${X2GO_BIN}/" export PATH -xauth add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} -xauth add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE} +xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" +xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" if [ "$X2GO_SET_KBD" == "0" ] @@ -217,7 +216,7 @@ else fi -echo "${X2GO_HOST}:${X2GO_PORT}" >${SESSION_DIR}/options +echo "${X2GO_HOST}:${X2GO_PORT}" >"${SESSION_DIR}/options" NX_AGENT=":${X2GO_PORT}" SAVED_DISPLAY="$DISPLAY" @@ -238,14 +237,14 @@ else fi # run x2goserver-extensions for pre-start -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-start || true SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & fi @@ -255,19 +254,19 @@ test $X2GO_AGENT_RETVAL && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2Go agent session with ID $SESSION_NAME" # run x2goserver-extensions for post-start - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-start || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-start || true } || { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2Go agent session with ID $SESSION_NAME" # run x2goserver-extensions for fail-start - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-start || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-start || true } X2GO_SND_PORT=1024 -$X2GO_LIB_PATH/x2gocreatesession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $FS_PORT $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null echo $X2GO_PORT echo $X2GO_COOKIE diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index b9eeb7f..f823c69 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -21,34 +21,34 @@ # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> if [ $# -eq 1 ]; then - SESSION_NAME=$1 + SESSION_NAME="$1" else - SESSION_NAME=$X2GO_SESSION + SESSION_NAME="$X2GO_SESSION" fi X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` # workaround for knotify, keep silent in case no knotify is running killall -HUP knotify &>/dev/null -$X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2gochangestatus 'S' "$SESSION_NAME" > /dev/null # terminate x2godesktopsharing instance and remember that it was running... -x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing $SESSION_NAME || true +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing "$SESSION_NAME" || true # run x2goserver-extensions for pre-suspend -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-suspend || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-suspend || true kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been suspended successfully" # run x2goserver-extensions for post-suspend - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-suspend || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-suspend || true } || { err_msg="ERROR: failed to suspend session with ID $SESSION_NAME" @@ -57,13 +57,13 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { # If we reach here it means that the x2goagent process of the session has vanisshed # If this happens than we mark the session as finished... - $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null + $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-suspend - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-suspend || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-suspend || true } -export HOSTNAME -x2goumount-session $SESSION_NAME +export HOSTNAME +x2goumount-session "$SESSION_NAME" diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 10df64a..271f714 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -21,31 +21,31 @@ # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> if [ $# -eq 1 ]; then - SESSION_NAME=$1 + SESSION_NAME="$1" else - SESSION_NAME=$X2GO_SESSION + SESSION_NAME="$X2GO_SESSION" fi X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` -$X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null +$X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing $SESSION_NAME || true +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SESSION_NAME" || true # run x2goserver-extensions for pre-terminate -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-terminate || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-terminate || true kill -TERM $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully" + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID "$SESSION_NAME" has been terminated successfully" # run x2goserver-extensions for post-terminate - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-terminate || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-terminate || true } || { err_msg="ERROR: failed to terminate session with ID $SESSION_NAME" @@ -56,14 +56,14 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" # run x2goserver-extensions for fail-terminate - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-terminate || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-terminate || true } export HOSTNAME -x2goumount-session $SESSION_NAME +x2goumount-session "$SESSION_NAME" # if we are not running in log level debug (=7) then clean up session dir if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then - (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)& + (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& fi diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 46befc8..88bc7fc 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -34,6 +34,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2goumount-session has been called with options: @ARGV"); +my $tmp_dir = $ENV{'TMP'} || '/tmp'; + my $session=shift; my $only_path=shift; my $uname=$ENV{'USER'}; @@ -44,9 +46,9 @@ if ($only_path) $only_path=~s/\/ramdrive\/mnt\///; $only_path=~ s/\//_/g; - ### FIXME: handle CDROM and Removable Media mounts here, as well!!! + ### FIXME: handle CDROM and Removable Media mounts here, as well!!! - $only_path="/tmp/$ENV{'USER'}_media/disk/$only_path"; + $only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path"; # ^^^^ syslog('debug',"x2goumount-session unmounting $only_path only"); } @@ -75,7 +77,7 @@ for ($i=0;$i<@outp;$i++) @outp[$i]=~s/ //g; chomp(@outp[$i]); chomp(@outp[$i]); - chomp(@outp[$i]); + chomp(@outp[$i]); my @line=split('\|',"@outp[$i]"); my $path="@line[0]:@line[1]"; if ($only_path) @@ -113,45 +115,54 @@ break: syslog('err', "ERROR: failed to unmount @line[1]"); if ($use_zenity == 0) { - system("kdialog --error \"@line[1]\"&"); + system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&"); } else { - system("zenity --error --text \"@line[1]\"&"); + system("which zenity &>/dev/null && zenity --error --text \"ERROR (X2Go): Failed to unmount @line[1]\"&"); } } } if (! $found) { + + $remote=~s/\/cygdrive\///g; $remote=~s/\//_/g; $remote=(split(":","$remote"))[1]; $remote="$ENV{'HOME'}/Desktop/$remote"; - my $current_desktop = ''; - if ($session =~ m/stDGNOME/) + my $current_desktop = 'NONE'; + if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) { $current_desktop="-gnome"; } - elsif ($session =~ m/stDLXDE/) + elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; } - - if ( -e "$remote\ (sshfs-disk$current_desktop)") + elsif (($session =~ m/_st.*_dp/) && system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) { - syslog('info', "removing desktop icon ,,$remote (sshfs-disk$current_desktop)''"); - unlink("$remote\ (sshfs-disk$current_desktop)"); + $current_desktop=""; } - $remote=~s/%2framdrive%2fmnt%2f//; - if ( -e "$remote\ (sshfs-removable$current_desktop)") - { - syslog('info', "removing desktop icon ,,$remote\ (sshfs-removable$current_desktop)''"); - unlink("$remote\ (sshfs-removable$current_desktop)"); - } - if ( -e "$remote\ (sshfs-cdrom/$current_desktop)") + + if ("$current_desktop" ne "NONE") { - syslog('info', "removing desktop icon ,,$remote\ (sshfs-cdrom$current_desktop)''"); - unlink("$remote\ (sshfs-cdrom$current_desktop)"); + if ( -e "$remote\ (sshfs-disk$current_desktop)") + { + syslog('info', "removing desktop icon ,,$remote (sshfs-disk$current_desktop)''"); + unlink("$remote\ (sshfs-disk$current_desktop)"); + } + $remote=~s/%2framdrive%2fmnt%2f//; + if ( -e "$remote\ (sshfs-removable$current_desktop)") + { + syslog('info', "removing desktop icon ,,$remote\ (sshfs-removable$current_desktop)''"); + unlink("$remote\ (sshfs-removable$current_desktop)"); + } + if ( -e "$remote\ (sshfs-cdrom/$current_desktop)") + { + syslog('info', "removing desktop icon ,,$remote\ (sshfs-cdrom$current_desktop)''"); + unlink("$remote\ (sshfs-cdrom$current_desktop)"); + } } db_deletemount ($session, @line[1]); rmdir (@line[1]); diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index 3720bf0..a1fea45 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -40,8 +40,8 @@ if [ -n "$1" ]; then echo "Version information for X2Go component '$X2GO_COMPONENT' is not available." >&1 fi else - cd ${X2GO_VERSIONS_BASEPATH} - for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do + cd "${X2GO_VERSIONS_BASEPATH}" + for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)" X2GO_COMPONENT_VERSION="$(get_version $compfile)" echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" diff --git a/x2goserver/doc/README.upgrade-pgsql-database b/x2goserver/doc/README.upgrade-pgsql-database new file mode 100644 index 0000000..5e7de9d --- /dev/null +++ b/x2goserver/doc/README.upgrade-pgsql-database @@ -0,0 +1,42 @@ + +####################################### +### +### X2Go DB maintenance after upgrades +### +####################################### + +UPGRADING +========= + +Normally no DB upgrades are necessary on x2goserver package upgrades. However, there are some +exceptions for some specific version of the x2goserver package. + + +Upgrading to x2goserver 3.1.0.0 +------------------------------- + +From: x2goserver (<= 3.0.99.10) +To: x2goserver (>= 3.1.0.0) +Description: The user (access) permissions on table ,,used_ports'' have been changed. + X2Go users in the PostgreSQL database need access to this new column. + . + Alternative 1: recreate all X2Go db users + . + x2godbadmin --rmuser <username> + x2godbadmin --adduser <username> + . + Alternative 2: + . + Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database + . + $ su - postgres + $ psql + psql (<YOUR-PSQL-VERSION) + Type "help" for help. + . + postgres=# \connect x2go_sessions + x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username1>"; + x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username2>"; + ... + + diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index df707df..aec0294 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -86,7 +86,7 @@ if ($backend eq 'postgres') use base 'Exporter'; our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', - 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_createsession', 'db_insertmount', + 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot'); @@ -100,6 +100,8 @@ sub dbsys_rmsessionsroot my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); $sth->execute() or die; + $sth=$dbh->prepare("delete from used_ports where session_id='$sid'"); + $sth->execute() or die; } if($backend eq 'sqlite') { @@ -230,7 +232,7 @@ sub db_deletemount my $path=shift or die "argument \"path\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); $sth->execute(); $sth->finish(); @@ -251,7 +253,7 @@ sub db_insertmount my $res_ok=0; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); $sth->execute(); if (!$sth->err()) @@ -279,7 +281,7 @@ sub db_insertsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); $sth->execute()or die $_; $sth->finish(); @@ -307,7 +309,7 @@ sub db_createsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("update sessions_view set status='R',last_time=now(), cookie='$cookie',agent_pid='$pid',client='$client',gr_port='$gr_port', sound_port='$snd_port',fs_port='$fs_port' where session_id='$sid'"); @@ -333,7 +335,7 @@ sub db_insertport my $sshport=shift or die "argument \"port\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); $sth->execute()or die; $sth->finish(); @@ -346,32 +348,56 @@ sub db_insertport syslog('debug', "db_insertport called, session ID: $sid, server: $server, SSH port: $sshport"); } +sub db_rmport +{ + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sshport=shift or die "argument \"port\" missed"; + if ($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from used_ports where server='$server' and session_id='$sid' and port='$sshport'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); + } + if ($backend eq 'sqlite') + { + `$x2go_lib_path/x2gosqlitewrapper rmport $server $sid $sshport`; + } + syslog('debug', "db_rmport called, session ID: $sid, server: $server, SSH port: $sshport"); +} + sub db_resume { my $client=shift or die "argument \"client\" missed"; - my $sid=shift or die "argument \"session_id\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $gr_port=shift or die "argument \"gr_port\" missed"; + my $sound_port=shift or die "argument \"sound_port\" missed"; + my $fs_port=shift or die "argument \"fs_port\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; - my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='R',client='$client' where session_id = '$sid'"); + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='R',client='$client',gr_port='$gr_port', + sound_port='$sound_port',fs_port='$fs_port' where session_id = '$sid'"); $sth->execute()or die; $sth->finish(); $dbh->disconnect(); } if ($backend eq 'sqlite') { - `$x2go_lib_path/x2gosqlitewrapper resume $client $sid`; + `$x2go_lib_path/x2gosqlitewrapper resume $client $sid $gr_port $sound_port $fs_port`; } - syslog('debug', "db_resume called, session ID: $sid, client: $client"); + syslog('debug', "db_resume called, session ID: $sid, client: $client, gr_port: $gr_port, sound_port: $sound_port, fs_port: $fs_port"); } sub db_changestatus { my $status=shift or die "argument \"status\" missed"; - my $sid=shift or die "argument \"session_id\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); $sth->execute()or die; $sth->finish(); @@ -388,7 +414,7 @@ sub db_getdisplays { my @displays; #ignore $server - my $server=shift or die "argument \"server\" missed"; + my $server=shift or die "argument \"server\" missed"; if ($backend eq 'postgres') { my @strings; @@ -418,7 +444,7 @@ sub db_getports { my @ports; #ignore $server - my $server=shift or die "argument \"server\" missed"; + my $server=shift or die "argument \"server\" missed"; if ($backend eq 'postgres') { my @strings; diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 2e64542..7391cd3 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -33,8 +33,11 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); my $client=shift or die; my $sid=shift or die; +my $gr_port=shift or die; +my $snd_port=shift or die; +my $fs_port=shift or die; -db_resume($client, $sid); +db_resume($client, $sid, $gr_port, $snd_port, $fs_port); # closing syslog closelog; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2gormport similarity index 95% copy from x2goserver/lib/x2goinsertport copy to x2goserver/lib/x2gormport index bc18d96..4ba632d 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2gormport @@ -35,8 +35,7 @@ my $server=shift or die; my $sid=shift or die; my $port=shift or die; -db_insertport($server,$sid,$port); -print "inserted"; +db_rmport($server,$sid,$port); # closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 53041f8..1e3b7e3 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -153,14 +153,28 @@ elsif($cmd eq "insertport") $sth->finish(); } +elsif($cmd eq "rmport") +{ + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sshport=shift or die "argument \"port\" missed"; + my $sth=$dbh->prepare("delete from used_ports where server=? and session_id=? and port=?"); + check_user($sid); + $sth->execute($server, $sid, $sshport) or die; + $sth->finish(); +} + elsif($cmd eq "resume") { my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; + my $gr_port=shift or die "argument \"gr_port\" missed"; + my $sound_port=shift or die "argument \"sound_port\" missed"; + my $fs_port=shift or die "argument \"fs_port\" missed"; check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R', - client=? where session_id = ? and uname=?"); - $sth->execute($client, $sid, $realuser) or die; + client=?,gr_port=?,sound_port=?,fs_port=? where session_id = ? and uname=?"); + $sth->execute($client, $gr_port, $sound_port, $fs_port, $sid, $realuser) or die; $sth->finish(); } @@ -310,8 +324,10 @@ sub check_user my $sid=shift or die "argument \"session_id\" missed"; return if $realuser eq "root"; # session id looks like someuser-51-1304005895_stDgnome-session_dp24 - my ( $user, $rest ) = split('-', $sid, 2); - $user eq $realuser or die "$realuser is not authorized (should be $user)"; + # during DB insertsession it only looks like someuser-51-1304005895 + my $user = "$sid"; + $user =~ s/$realuser-[0-9]{2,}-[0-9]{10,}.*/$realuser/; + $user eq $realuser or die "$realuser is not authorized"; } sub fetchrow_printall_array diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index e2dde5c..52c4346 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" +.TH x2gobasepath 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index baef7e8..a45e8a0 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" +.TH x2gocleansessions 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 18ffdd7..64d51ac 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index 0ec4a07..c027021 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "July 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index be222c0..67937a4 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" +.TH x2gofeature 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 new file mode 100644 index 0000000..ed7270f --- /dev/null +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -0,0 +1,25 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gogetservers 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.SH NAME +x2gogetservers \- Retrieve list of available X2Go servers +.SH SYNOPSIS +'nh +.fi +.ad l +x2gogetservers + +.SH DESCRIPTION +\fBx2gogetservers\fR retrieves a list of available X2Go servers. This command is +only used by \fIx2goclient\fR if it runs in LDAP mode. +.PP +The \fBx2gogetservers\fR is run with X2Go user privileges. + +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index f804b9a..4125c37 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2golistdesktops 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS @@ -23,7 +23,7 @@ is used here. a list of available desktops that may be candidates for X2Go desktop sharing (shadow sessions). .PP The list of desktops will include local desktop sessions (launched via KDM, GDM, etc.) run by the same user, X2Go desktop -sessions run by the same user and desktop sessions of other users (local or remote) that are announced via +sessions run by the same user and desktop sessions of other users (local or remote) that are announced via the \fBx2godesktopsharing\fR utility. .SH RETURN VALUES A list of available X desktops, line-by-line. diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index e8c19ad..176ffd9 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2golistmounts 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index f1c162c..91a76e9 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2golistsessions 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index be21d7d..f68073f 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index 81c8808..69b2fe7 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2gomountdirs 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index b0db3a9..f8efed9 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goresume-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 52d03b4..bf22a9e 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goruncommand 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index ac59d66..4e2443d 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool" +.TH x2gosessionlimit 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index b7ec0c7..8eb8d4f 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goshowblocks 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 4ba06c8..0fd81cd 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2gostartagent 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index 5acfe24..89fe595 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index b619552..054da4e 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goterminate-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index 0af51fe..d48ce13 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool" +.TH x2goumount-session 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index f91997c..56b78d7 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2Go Server Tool (Extension)" +.TH x2goversion 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 963ab32..b3f65db 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -86,9 +86,8 @@ elsif ($pid != 0) } elsif ($pid == 0 ) { - close(STDIN); - close(STDOUT); - close(STDERR); + # close any open file descriptor left open by our parent before the fork + for (glob "/proc/$$/fd/*") { POSIX::close($1) if m{/(\d+)$}; } $SIG{TERM}=\&catch_term; diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 84dfc5d..fc86ca8 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -333,6 +333,9 @@ sub add_user() $sth=$dbh->prepare("GRANT INSERT, UPDATE, DELETE ON sessions, used_ports, mounts TO \"x2gouser_$user\""); $sth->execute(); + $sth=$dbh->prepare("GRANT SELECT ON used_ports TO \"x2gouser_$user\""); + $sth->execute(); + $sth=$dbh->prepare("GRANT SELECT, UPDATE, DELETE ON sessions_view, mounts_view, servers_view, ports_view TO \"x2gouser_$user\""); $sth->execute(); $sth->finish(); @@ -455,7 +458,6 @@ sub create_tables() "); $sth->execute() or die; - $sth=$dbh->prepare(" create or replace RULE insert_port_priv AS ON INSERT TO used_ports where NEW.creator_id <> current_user and current_user <> '$x2goadmin' diff --git a/x2goserver/share/x2go/versions/VERSION.x2goserver b/x2goserver/share/x2go/versions/VERSION.x2goserver deleted file mode 120000 index fc1b443..0000000 --- a/x2goserver/share/x2go/versions/VERSION.x2goserver +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.x2goserver \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits