x2go-commits May 2012

x2go-commits@lists.x2go.org

1 participants
85 discussions

x2goserver.git - master (branch) updated: 3.1.1.0-17-g1af7be0
by git-admin＠x2go.org 23 May '12

23 May '12

The branch, master has been updated via 1af7be02935673fbe6afe3f4ba75d3ae65f6f62e (commit) from b81c5c9784ac0a999d2183b275e0a52300a90184 (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 1af7be02935673fbe6afe3f4ba75d3ae65f6f62e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 23 08:46:15 2012 +0200 Export NX_ROOT=$HOME/.x2go in x2gostartagent. Makes the keyboard file in X2Go session cache directory. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 967131b..525dcdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Complete UNITY/GNOME support for Ubuntu/Debian. - Use ,,-nolisten tcp'' option when evoking x2goagent from within x2gostartagent. + - Export NX_ROOT=$HOME/.x2go in x2gostartagent. Makes the keyboard file + in X2Go session cache directory. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 29d0302..6531218 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -28,6 +28,8 @@ X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 X2GO_ROOT="${HOME}/.x2go" +export NX_ROOT=$X2GO_ROOT + REMOTE=localhost X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` 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

nx-libs.git - pristine-tar (branch) updated: f5d6dc3e7bd60249b4338522436affe6388be542
by git-admin＠x2go.org 21 May '12

21 May '12

The branch, pristine-tar has been updated via f5d6dc3e7bd60249b4338522436affe6388be542 (commit) from b2844df973671861c76ad37a4b0f6d017df5e1bf (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 f5d6dc3e7bd60249b4338522436affe6388be542 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 22 01:00:18 2012 +0200 pristine-tar data for nxagent-3.5.0-9.tar.gz ----------------------------------------------------------------------- Summary of changes: nxagent-3.5.0-9.tar.gz.delta | Bin 0 -> 8951 bytes nxagent-3.5.0-9.tar.gz.id | 1 + 2 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 nxagent-3.5.0-9.tar.gz.delta create mode 100644 nxagent-3.5.0-9.tar.gz.id The diff of changes is: diff --git a/nxagent-3.5.0-9.tar.gz.delta b/nxagent-3.5.0-9.tar.gz.delta new file mode 100644 index 0000000..b3f5ae0 Binary files /dev/null and b/nxagent-3.5.0-9.tar.gz.delta differ diff --git a/nxagent-3.5.0-9.tar.gz.id b/nxagent-3.5.0-9.tar.gz.id new file mode 100644 index 0000000..aaea626 --- /dev/null +++ b/nxagent-3.5.0-9.tar.gz.id @@ -0,0 +1 @@ +222a4a22214608b7f89691eee1c57873c2631705 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 - nxagent (branch) updated: nxagent/3.5.0-7-1-g222a4a2
by git-admin＠x2go.org 21 May '12

21 May '12

The branch, nxagent has been updated via 222a4a22214608b7f89691eee1c57873c2631705 (commit) from c29053f82cbea5f2704d99c4d5e8afe0329e5cbe (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: nx-X11/programs/Xserver/hw/nxagent/Args.c | 18 +++++++++++++ nx-X11/programs/Xserver/hw/nxagent/CHANGELOG | 19 +++++++++++++ nx-X11/programs/Xserver/hw/nxagent/Client.c | 23 ++++++++++++---- nx-X11/programs/Xserver/hw/nxagent/Client.h | 3 +- nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 17 +++++++++++- nx-X11/programs/Xserver/hw/nxagent/Cursor.h | 3 ++ nx-X11/programs/Xserver/hw/nxagent/Display.c | 31 +++++++++++++++++++--- nx-X11/programs/Xserver/hw/nxagent/Display.h | 2 + nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 33 ++++++++++++++++++++++++ nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 4 ++- nx-X11/programs/Xserver/hw/nxagent/Init.c | 18 +++++++++++++ nx-X11/programs/Xserver/hw/nxagent/Options.c | 4 +++ nx-X11/programs/Xserver/hw/nxagent/Options.h | 12 ++++++++ nx-X11/programs/Xserver/hw/nxagent/Pixels.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 5 +-- nx-X11/programs/Xserver/hw/nxagent/Render.c | 20 +++++++++----- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 3 ++ 17 files changed, 193 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index ecf0a21..ecf04e2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -514,6 +514,22 @@ int ddxProcessArgument(int argc, char *argv[], int i) return 0; } + if (!strcmp(argv[i], "-irlimit")) + { + int limit; + + if (++i < argc && + sscanf(argv[i], "%i", &limit) == 1) + { + nxagentChangeOption(ImageRateLimit, limit); + + + return 2; + } + + return 0; + } + if (!strcmp(argv[i], "-tile")) { int width; @@ -780,6 +796,8 @@ int ddxProcessArgument(int argc, char *argv[], int i) { nxagentChangeOption(DeviceControl, True); + nxagentChangeOption(DeviceControlUserDefined , True); + return 1; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG index 763f066..0a82773 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG +++ b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG @@ -1,5 +1,24 @@ ChangeLog: +nxagent-3.5.0-9 + +- Fixed an issue with cursor position set in XTest extension. + +nxagent-3.5.0-8 + +- Fixed TR01J02646. Performance issues with cairo version 1.12. + +- Fixed TR01J02667. Changes to mouse sensitivity couldn't be forwarded + to NX client host although -noignore was among extra options. + +- Fixed TR05J02705. Agent ignore WarpPointer requests. + +- Fixed TR05J02706. Suspended sessions could not be recovered using + a client form a different version. + +- Fixed TR05J02703. Agent failed because of missing checks on source + drawables in the render code. + nxagent-3.5.0-7 - Fixed TR10I02622. Corrected function searching for icon file. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index 63ed0e1..cba4798 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -124,13 +124,24 @@ void nxagentGuessClientHint(ClientPtr client, Atom property, char *data) if (nxagentClientPriv(client) -> clientHint == UNKNOWN) { - if (property == XA_WM_CLASS && strcmp(data, "nxclient") == 0) + if (property == XA_WM_CLASS) { - #ifdef TEST - fprintf(stderr, "++++++nxagentGuessClientHint: Detected nxclient as [%d].\n", client -> index); - #endif + if (strcmp(data, "nxclient") == 0) + { + #ifdef TEST + fprintf(stderr, "++++++nxagentGuessClientHint: Detected nxclient as [%d].\n", client -> index); + #endif - nxagentClientHint(client) = NXCLIENT_WINDOW; + nxagentClientHint(client) = NXCLIENT_WINDOW; + } + else if (strstr(data, "java")) + { + #ifdef TEST + fprintf(stderr, "++++++nxagentGuessClientHint: Detected java as [%d].\n", client -> index); + #endif + + nxagentClientHint(client) = JAVA_WINDOW; + } } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.h b/nx-X11/programs/Xserver/hw/nxagent/Client.h index a9b06c8..67ec50e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.h @@ -32,7 +32,8 @@ enum ClientHint UNKNOWN = 0, NXCLIENT_WINDOW, NXCLIENT_DIALOG, - NXAGENT_SHADOW + NXAGENT_SHADOW, + JAVA_WINDOW }; typedef struct _PrivClientRec diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index e27415b..9d48aa1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -290,10 +290,25 @@ void nxagentRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, &fg_color, &bg_color); } +Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y, + Bool generateEvent); + Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent) { - return 1; + if (generateEvent != 0) + { + return (*nxagentSetCursorPositionW)(pScreen, x, y, generateEvent); + } + else + { + /* + * Calling miSetCursorPosition with generateEvent == 0 + * causes a crash in miPoiterUpdate(). + */ + + return 1; + } } void nxagentReconnectCursor(pointer p0, XID x1, pointer p2) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h index df7dc44..88dea26 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h @@ -97,6 +97,9 @@ void nxagentRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent); +extern Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y, + Bool generateEvent); + void nxagentDisconnectCursor(pointer p0, XID x1, pointer p2); void nxagentReconnectCursor(pointer p0, XID x1, pointer p2); void nxagentReDisplayCurrentCursor(void); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index c60718d..9031c25 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -746,8 +746,19 @@ static void nxagentDisplayWriteHandler(Display *display, int length) } } +static CARD32 nxagentRateTime = 5000; +static CARD32 nxagentLastTime; +static unsigned int nxagentRate = 0; + +int nxagentGetDataRate(void) +{ + return nxagentRate; +} + static void nxagentDisplayFlushHandler(Display *display, int length) { + CARD32 time; + if (nxagentDisplay != NULL) { #ifdef TEST @@ -765,6 +776,22 @@ static void nxagentDisplayFlushHandler(Display *display, int length) if (nxagentOption(LinkType) != LINK_TYPE_NONE) { nxagentFlush = GetTimeInMillis(); + + time = nxagentFlush; + + time = time - nxagentLastTime; + + if (time < nxagentRateTime) + { + nxagentRate = ((nxagentRate * (nxagentRateTime - time) + + length) * 1000) / nxagentRateTime; + } + else + { + nxagentRate = (length * 1000) / nxagentRateTime; + } + + nxagentLastTime = nxagentFlush; } } } @@ -1482,10 +1509,6 @@ void nxagentSetDefaultVisual(void) int i; - nxagentDefaultVisualIndex = 3; - - return; - if (nxagentUserDefaultClass || nxagentUserDefaultDepth) { nxagentDefaultVisualIndex = UNDEFINED; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.h b/nx-X11/programs/Xserver/hw/nxagent/Display.h index 454150d..1c12d6c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.h @@ -159,6 +159,8 @@ extern int nxagentShadowXConnectionNumber; int nxagentServerOrder(void); +int nxagentGetDataRate(void); + #define nxagentClientOrder(client) \ ((client)->swapped ? !nxagentServerOrder() : nxagentServerOrder()) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 9c16774..f222599 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -112,6 +112,27 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel); unsigned long nxagentGetDrawableColor(DrawablePtr pDrawable); unsigned long nxagentGetRegionColor(DrawablePtr pDrawable, RegionPtr pRegion); +int nxagentSkipImage = 0; + +static int nxagentTooManyImageData(void) +{ + unsigned int r; + unsigned int limit; + + limit = nxagentOption(ImageRateLimit); + + r = nxagentGetDataRate() / 1000; + + #ifdef TEST + if (r > limit) + { + fprintf(stderr, "Warning: Current bit rate is: %u kB/s.\n", r); + } + #endif + + return (r > limit); +} + int nxagentSynchronizeDrawable(DrawablePtr pDrawable, int wait, unsigned int breakMask, WindowPtr owner) { int result; @@ -1304,6 +1325,18 @@ FIXME: All drawables should be set as synchronized and never marked as corrupted while the display is down. */ + + nxagentSkipImage = nxagentTooManyImageData(); + + if (nxagentOption(ImageRateLimit) && nxagentSkipImage) + { + #ifdef TEST + fprintf(stderr, "nxagentSynchronizeDrawable: Skipping due to bit rate limit reached.\n"); + #endif + + return; + } + if (NXDisplayError(nxagentDisplay) == 1) { #ifdef TEST diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 310b572..332816f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -159,6 +159,8 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 }; * for our clients or the X server. */ +extern int nxagentSkipImage; + void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) { /* @@ -357,7 +359,7 @@ void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) nxagentCorruptedBackgrounds > 0 || nxagentCorruptedPixmaps > 0)); - if (synchronize == 1) + if (nxagentSkipImage == 0 && synchronize == 1) { #ifdef TEST fprintf(stderr, "nxagentBlockHandler: Setting a zero timeout with [%d][%d][%d] and " diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index f4fc3c7..a50e8a5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -120,6 +120,8 @@ extern int OsVendorVErrorFFatal; extern void (*OsVendorStartRedirectErrorFProc)(); extern void (*OsVendorEndRedirectErrorFProc)(); +extern void SetVendorRelease(int release); + void OsVendorStartRedirectErrorFFunction(); void OsVendorEndRedirectErrorFFunction(); @@ -206,6 +208,22 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) } /* + * Avoid slowness due to buggy_repeat workaround + * in libcairo versions >= 1.10. + */ + + SetVendorRelease(70000000); + + /* + * Init the time count for image rate. + */ + + if (nxagentOption(ImageRateLimit) != 0) + { + fprintf(stderr, "Info: Image rate limit set to %u kB/s.\n", nxagentOption(ImageRateLimit)); + } + + /* * Unset the LD_LIBRARY_PATH variable in * Popen() before calling execl() in the * child process. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c index 5d78556..ca5be0b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c @@ -85,6 +85,8 @@ void nxagentInitOptions() nxagentOptions.DeviceControl = 0; + nxagentOptions.DeviceControlUserDefined = 0; + nxagentOptions.ResetKeyboardAtResume = 1; nxagentOptions.Reset = 0; @@ -149,6 +151,8 @@ void nxagentInitOptions() nxagentOptions.InhibitXkb = 1; nxagentOptions.CopyBufferSize = COPY_UNLIMITED; + + nxagentOptions.ImageRateLimit = 0; } /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h index 7850a05..40cb179 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h @@ -184,6 +184,12 @@ typedef struct _AgentOptions int DeviceControl; /* + * Explicitly asked config propagation. + */ + + int DeviceControlUserDefined; + + /* * Resuming keyboard device corrects keymap if session * migrates across platforms with different keycode * layout. @@ -369,6 +375,12 @@ typedef struct _AgentOptions int CopyBufferSize; + /* + * Max image data rate to the encoder input. + */ + + int ImageRateLimit; + } AgentOptionsRec; typedef AgentOptionsRec *AgentOptionsPtr; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h index 918d74d..4a02d80 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h @@ -134,7 +134,7 @@ FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE (nxagentOption(DeferLevel) == 1 && \ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && \ (((pSrc) -> pDrawable && nxagentDrawableStatus((pSrc) -> pDrawable) == NotSynchronized) || \ - ((pMask) && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)))) + ((pMask) && (pMask) -> pDrawable && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)))) #define NXAGENT_SHOULD_DEFER_PUTIMAGE(pDrawable) \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 90b8079..3c576c6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -377,11 +377,10 @@ Bool nxagentReconnectSession(void) nxagentResizeDesktopAtStartup = False; /* - * The default is device settings have - * not to be propagated to the X server. + * Propagate device settings if explicitly asked for. */ - nxagentChangeOption(DeviceControl, False); + nxagentChangeOption(DeviceControl, nxagentOption(DeviceControlUserDefined)); /* * We need to zero out every new XID diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 6c74c14..29bffaa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -1095,8 +1095,9 @@ void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pD } } - if (pMask != NULL && pMask -> pDrawable != pSrc -> pDrawable && - pMask -> pDrawable != pDst -> pDrawable) + if (pMask != NULL && pMask -> pDrawable != NULL && + pMask -> pDrawable != pSrc -> pDrawable && + pMask -> pDrawable != pDst -> pDrawable) { nxagentSynchronizeShmPixmap(pMask -> pDrawable, xMask, yMask, width, height); @@ -1259,7 +1260,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * on the real X server. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p].\n", @@ -1749,7 +1751,8 @@ FIXME: Is this useful or just a waste of bandwidth? return; } - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTrapezoids: Going to synchronize the source drawable at [%p].\n", @@ -1843,7 +1846,8 @@ void nxagentTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * operation like nxagentTrapezoids() does. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTriangles: Going to synchronize the source drawable at [%p].\n", @@ -1920,7 +1924,8 @@ void nxagentTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * operation like nxagentTrapezoids() does. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTriStrip: Going to synchronize the source drawable at [%p].\n", @@ -1997,7 +2002,8 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * operation like nxagentTrapezoids() does. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTriFan: Going to synchronize the source drawable at [%p].\n", diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index de688a0..9957a7d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1644,6 +1644,9 @@ N/A pScreen->RealizeCursor = nxagentRealizeCursor; pScreen->UnrealizeCursor = nxagentUnrealizeCursor; pScreen->RecolorCursor = nxagentRecolorCursor; + + nxagentSetCursorPositionW = pScreen->SetCursorPosition; + pScreen->SetCursorPosition = nxagentSetCursorPosition; #define POSITION_OFFSET (pScreen->myNum * (nxagentOption(Width) + \ 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-server/3.5.0.13-4-ge2e7008
by git-admin＠x2go.org 21 May '12

21 May '12

The branch, master has been updated via e2e7008b3e4f7283b135a9fc2821a64386253ee0 (commit) via fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 (commit) via 222a4a22214608b7f89691eee1c57873c2631705 (commit) from fe72988fb668ad97fc4fcb2ee3862613324d9516 (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 e2e7008b3e4f7283b135a9fc2821a64386253ee0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 22 00:57:21 2012 +0200 New upstream release of nxagent (3.5.0-9). * New upstream release of nxagent (3.5.0-9). * Adapt patch series (all hunks succeeded automatically). * Drop patch: 120_nxagent_libcairo-null-source-drawables.full.patch, the issue has been fixed by NoMachine (TR05J02703). commit fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 Merge: fe72988fb668ad97fc4fcb2ee3862613324d9516 222a4a22214608b7f89691eee1c57873c2631705 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 22 00:50:51 2012 +0200 Merge branch 'nxagent' ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +- ...09_nxagent_locale-utf8-compound-text.full.patch | 2 +- ...agent_libcairo-null-source-drawables.full.patch | 193 -------------------- ...00_nxagent_check-binary-x2go-flavour.full.patch | 4 +- ...t_set-x2go-icon-if-x2goagent-flavour.full.patch | 19 +- .../203_nxagent_disable-rootless-exit.full.patch | 10 +- debian/patches/300_nxagent_set-wm-class.full.patch | 2 +- ...gent_unbrand-nxagent-brand-x2goagent.full.patch | 4 +- debian/patches/series | 1 - nx-X11/programs/Xserver/hw/nxagent/Args.c | 18 ++ nx-X11/programs/Xserver/hw/nxagent/CHANGELOG | 19 ++ nx-X11/programs/Xserver/hw/nxagent/Client.c | 23 ++- nx-X11/programs/Xserver/hw/nxagent/Client.h | 3 +- nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 17 ++- nx-X11/programs/Xserver/hw/nxagent/Cursor.h | 3 + nx-X11/programs/Xserver/hw/nxagent/Display.c | 31 +++- nx-X11/programs/Xserver/hw/nxagent/Display.h | 2 + nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 33 ++++ nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Init.c | 18 ++ nx-X11/programs/Xserver/hw/nxagent/Options.c | 4 + nx-X11/programs/Xserver/hw/nxagent/Options.h | 12 ++ nx-X11/programs/Xserver/hw/nxagent/Pixels.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 5 +- nx-X11/programs/Xserver/hw/nxagent/Render.c | 20 ++- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 3 + 26 files changed, 217 insertions(+), 240 deletions(-) delete mode 100644 debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 45bd035..de39c40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ nx-libs (2:3.5.0.14-0) UNRELEASED; urgency=low - * Continue development... + * New upstream release of nxagent (3.5.0-9). + * Adapt patch series (all hunks succeeded automatically). + * Drop patch: 120_nxagent_libcairo-null-source-drawables.full.patch, the issue + has been fixed by NoMachine (TR05J02703). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 11 May 2012 23:57:18 +0200 diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch index 29abd99..7fbdf45 100644 --- a/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch +++ b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch @@ -17,7 +17,7 @@ Last-Update: 2011-12-31 /* * Set here the required log level. */ -@@ -348,6 +351,20 @@ +@@ -366,6 +369,20 @@ */ blackRoot = TRUE; diff --git a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch deleted file mode 100644 index 319f6ed..0000000 --- a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch +++ /dev/null @@ -1,193 +0,0 @@ -Description: Fix nxagent/x2goagent With New LibCairo (>1.12.1) - Quoting two postings of Jim Burnes <jvburnes(a)gmail.com> on x2go-dev ML: - - I don't know what the current patch status is for fixing nxagent with the - new libcairo (1.12.1+ I believe), but eventually I got tired of waiting and - created my own patches for nxagent/x2goagent. - - Most of the fixes were required because the render extension now allows - (and libcairo uses) null source drawables (for gradients etc), null masks - and null mask drawables. - - This change creates a bit of a logic mess in the code. Previous patches - to the code tried to account for all of the possibilities, but fell a - little short. - - Consider this an alpha-quality patch. I've only tested it in KDE while - running GTK applications. All my favorite GTK apps like Firefox, Emacs, - rox-filer and all my other GTK apps that were broken are now working just - fine. (Though I'm getting only the standard GTK look and feel - don't know - if that's caused by anything I've done.) - - Could someone test this under Gnome? - - Also, since I'm not primarily an X software engineer I'd like a specialist - to take a look at it. The fix is a little crude. I just attached to the - x2goagent process and fixed the lines that caused segfaults. (About 10 of - them). - - I also rewrote one of the macros in Pixels.h into a local subroutine in - Render.c. It had a bug in it and complex macro bugs are a PITA to debug in - gdb (or anything else really). The macro is only used in one place and - although the code in the macro is called pretty often, it's very likely - that the compiler would inline it anyway. The rewrite increases - readability by a large factor. - - A better patch could be created by someone that understands nxagent and X - much better. The render extension code receives render ops from X client - programs. The render ops can contain any combination of picture source, - picture destination and picture mask. It's apparently legal to send render - ops with combinations of null picture source drawables, picture masks and - picture mask drawables. A better way to patch this would be to simply - perform a return on all the illegal combinations of null parameters for the - render ops. That way you wouldn't have to keep re-checking the parameter - values. - - So anyway, here it is. I appreciate it if someone out there would test it - and let me know. Also if anyone knows of the X docs which discuss null - picture sources and masks in the render extension I'd be glad to create a - cleaner patch that conforms to the stands. - - - You can reproduce the issue by running any recent copy of x2go/nxagent and - start any program that uses very recent versions of libCairo. Things - started breaking for both ArchLinux and Debian SID users about 3 weeks ago. - - The issues started with versions of libCairo >= libcairo2_1.12.0-2_amd64 - (debian packages of course). These versions of Cairo seem to use null - parameters in render ops a lot. Users of recent GTK environments would - have the startup process just crash. KDE sessions start and run fine until - you start a gtk app. -Forwarded: pending -Author: Jim Burnes <jvburnes(a)gmail.com> -Last-Update: 2012-05-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Render.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c -@@ -995,6 +995,36 @@ - #endif - } - -+ -+int nxagentShouldDeferComposite(PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) -+{ -+ -+int drawableDst; -+int linkDeferred; -+int unSyncedSrcMask; -+ -+ drawableDst = ( nxagentRenderVersionMajor == 0 && -+ nxagentRenderVersionMinor == 8 && -+ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP -+ ); -+ -+ linkDeferred = ( nxagentOption(DeferLevel) >= 2 && -+ nxagentOption(LinkType) < LINK_TYPE_ADSL -+ ); -+ -+ unSyncedSrcMask = ( nxagentOption(DeferLevel) == 1 && -+ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && -+ ( -+ (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) || -+ ((pMask) && pMask -> pDrawable && (nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)) -+ ) -+ ); -+ -+ -+ return drawableDst || linkDeferred || unSyncedSrcMask; -+} -+ -+ - void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, - INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, - INT16 yDst, CARD16 width, CARD16 height) -@@ -1036,8 +1066,8 @@ - } - - #endif -- -- if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) -+ /* if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) */ -+ if (nxagentShouldDeferComposite(pSrc, pMask, pDst)) - { - pDstRegion = nxagentCreateRegion(pDst -> pDrawable, NULL, xDst, yDst, width, height); - -@@ -1095,7 +1125,8 @@ - } - } - -- if (pMask != NULL && pMask -> pDrawable != pSrc -> pDrawable && -+ if ((pMask) && (pMask->pDrawable) && -+ pMask -> pDrawable != pSrc -> pDrawable && - pMask -> pDrawable != pDst -> pDrawable) - { - nxagentSynchronizeShmPixmap(pMask -> pDrawable, xMask, yMask, width, height); -@@ -1259,7 +1290,7 @@ - * on the real X server. - */ - -- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) -+ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) - { - #ifdef TEST - fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p].\n", -@@ -1302,14 +1333,15 @@ - nxagentSynchronizeBox(pSrc -> pDrawable, &glyphBox, NEVER_BREAK); - } - -- if (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP) -+ if (pSrc -> pDrawable && (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP)) - { - nxagentIncreasePixmapUsageCounter((PixmapPtr) pSrc -> pDrawable); - } - } - -- if (pSrc -> pDrawable != pDst -> pDrawable && -- nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized) -+ -+ if (pSrc -> pDrawable && (pSrc -> pDrawable != pDst -> pDrawable && -+ nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized)) - { - #ifdef TEST - fprintf(stderr, "nxagentGlyphs: Synchronizing destination [%s] at [%p].\n", -@@ -1749,7 +1781,9 @@ - return; - } - -- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) -+ /* the following blocks need fixing to ignore null values of pDrawable */ -+ -+ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) - { - #ifdef TEST - fprintf(stderr, "nxagentTrapezoids: Going to synchronize the source drawable at [%p].\n", -@@ -1843,7 +1877,9 @@ - * operation like nxagentTrapezoids() does. - */ - -- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) -+ -+ -+ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) - { - #ifdef TEST - fprintf(stderr, "nxagentTriangles: Going to synchronize the source drawable at [%p].\n", -@@ -1920,7 +1956,8 @@ - * operation like nxagentTrapezoids() does. - */ - -- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) -+ -+ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) - { - #ifdef TEST - fprintf(stderr, "nxagentTriStrip: Going to synchronize the source drawable at [%p].\n", -@@ -1997,7 +2034,8 @@ - * operation like nxagentTrapezoids() does. - */ - -- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) -+ -+ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) - { - #ifdef TEST - fprintf(stderr, "nxagentTriFan: Going to synchronize the source drawable at [%p].\n", diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch index 089b570..635d428 100644 --- a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch +++ b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch @@ -9,7 +9,7 @@ Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Last-Update: 2012-01-11 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c -@@ -178,6 +178,29 @@ +@@ -180,6 +180,29 @@ int nxagentDoFullGeneration = 1; @@ -39,7 +39,7 @@ Last-Update: 2012-01-11 /* * Called at X server's initialization. */ -@@ -194,6 +217,11 @@ +@@ -196,6 +219,11 @@ #endif /* diff --git a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch index ff3861d..48e4c4a 100644 --- a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch +++ b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch @@ -4,9 +4,9 @@ Description: X2Go icon when run with x2goagent flavour Forwarded: not-needed Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Last-Update: 2012-01-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c 2012-01-11 10:09:05.000000000 +0100 -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c 2012-01-11 12:28:11.000000000 +0100 -@@ -77,6 +77,7 @@ is" without express or implied warranty. +--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c +@@ -77,6 +77,7 @@ #include "NXlib.h" #include NXAGENT_ICON_NAME @@ -14,7 +14,7 @@ Last-Update: 2012-01-11 /* * Set here the required log level. -@@ -1918,12 +1919,29 @@ Bool nxagentMakeIcon(Display *display, P +@@ -1941,12 +1942,29 @@ Bool success = False; XlibPixmap IconPixmap; XlibPixmap IconShape; @@ -46,7 +46,7 @@ Last-Update: 2012-01-11 if (icon_fp != NULL) { -@@ -1962,7 +1980,7 @@ Bool nxagentMakeIcon(Display *display, P +@@ -1985,7 +2003,7 @@ { status = XpmCreatePixmapFromData(display, DefaultRootWindow(display), @@ -55,8 +55,8 @@ Last-Update: 2012-01-11 &IconPixmap, &IconShape, NULL); ---- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h 2012-01-11 10:09:05.000000000 +0100 -+++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h 2012-01-11 12:17:21.000000000 +0100 +--- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h @@ -24,6 +24,8 @@ #define NXAGENT_ICON_NAME "nxagent.xpm" @@ -66,8 +66,8 @@ Last-Update: 2012-01-11 #define NXAGENT_PLACEHOLDER_NAME "nxmissing.xpm" #endif /* __Icons_H__ */ ---- a/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm 1970-01-01 01:00:00.000000000 +0100 -+++ b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm 2012-01-11 12:26:24.000000000 +0100 +--- /dev/null ++++ b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm @@ -0,0 +1,148 @@ +/* XPM */ +static char *x2goagentIconData[]={ @@ -217,4 +217,3 @@ Last-Update: 2012-01-11 +"..#cccbne.............................................................................................................menkccc#..", +"...okccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbe...", +"....mhjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccg#....."}; - diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch index 03154bb..fcdecc0 100644 --- a/debian/patches/203_nxagent_disable-rootless-exit.full.patch +++ b/debian/patches/203_nxagent_disable-rootless-exit.full.patch @@ -1,6 +1,6 @@ --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -656,6 +656,12 @@ +@@ -672,6 +672,12 @@ return 1; } @@ -13,7 +13,7 @@ if (!strcmp(argv[i], "-noonce")) { nxagentOnce = False; -@@ -1837,6 +1843,7 @@ +@@ -1855,6 +1861,7 @@ ErrorF("The NX system adds the following arguments:\n"); ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n"); ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n"); @@ -23,7 +23,7 @@ ErrorF("-nocomposite disable the use of the composite extension\n"); --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c -@@ -217,7 +217,7 @@ +@@ -219,7 +219,7 @@ if (nxagentOption(Rootless) && nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 && @@ -44,9 +44,9 @@ nxagentOptions.Y = 0; --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h -@@ -369,6 +369,13 @@ +@@ -381,6 +381,13 @@ - int CopyBufferSize; + int ImageRateLimit; + /* + * True if agent should not exit if there are no diff --git a/debian/patches/300_nxagent_set-wm-class.full.patch b/debian/patches/300_nxagent_set-wm-class.full.patch index 765d6bc..7a67e43 100644 --- a/debian/patches/300_nxagent_set-wm-class.full.patch +++ b/debian/patches/300_nxagent_set-wm-class.full.patch @@ -15,7 +15,7 @@ Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Last-Update: 2012-01-11 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1756,6 +1756,42 @@ +@@ -1759,6 +1759,42 @@ nxagentDefaultWindows[pScreen->myNum]); #endif diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch index 7a5ce54..4b18aa5 100644 --- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch +++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch @@ -230,7 +230,7 @@ Last-Update: 2012-01-11 #ifdef NXAGENT_LOGO_DEBUG --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -1403,22 +1403,10 @@ +@@ -1430,22 +1430,10 @@ g = pV.green_mask; b = pV.blue_mask; @@ -257,7 +257,7 @@ Last-Update: 2012-01-11 #ifdef WATCH -@@ -2673,22 +2661,10 @@ +@@ -2696,22 +2684,10 @@ g = pV.green_mask; b = pV.blue_mask; diff --git a/debian/patches/series b/debian/patches/series index 0e7726a..dc42d85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,7 +35,6 @@ 108_nxagent_wine-close-delay.full.patch 109_nxagent_locale-utf8-compound-text.full.patch 110_nxagent_createpixmap-bounds-check.full.patch -120_nxagent_libcairo-null-source-drawables.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index ecf0a21..ecf04e2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -514,6 +514,22 @@ int ddxProcessArgument(int argc, char *argv[], int i) return 0; } + if (!strcmp(argv[i], "-irlimit")) + { + int limit; + + if (++i < argc && + sscanf(argv[i], "%i", &limit) == 1) + { + nxagentChangeOption(ImageRateLimit, limit); + + + return 2; + } + + return 0; + } + if (!strcmp(argv[i], "-tile")) { int width; @@ -780,6 +796,8 @@ int ddxProcessArgument(int argc, char *argv[], int i) { nxagentChangeOption(DeviceControl, True); + nxagentChangeOption(DeviceControlUserDefined , True); + return 1; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG index 763f066..0a82773 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG +++ b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG @@ -1,5 +1,24 @@ ChangeLog: +nxagent-3.5.0-9 + +- Fixed an issue with cursor position set in XTest extension. + +nxagent-3.5.0-8 + +- Fixed TR01J02646. Performance issues with cairo version 1.12. + +- Fixed TR01J02667. Changes to mouse sensitivity couldn't be forwarded + to NX client host although -noignore was among extra options. + +- Fixed TR05J02705. Agent ignore WarpPointer requests. + +- Fixed TR05J02706. Suspended sessions could not be recovered using + a client form a different version. + +- Fixed TR05J02703. Agent failed because of missing checks on source + drawables in the render code. + nxagent-3.5.0-7 - Fixed TR10I02622. Corrected function searching for icon file. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index 63ed0e1..cba4798 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -124,13 +124,24 @@ void nxagentGuessClientHint(ClientPtr client, Atom property, char *data) if (nxagentClientPriv(client) -> clientHint == UNKNOWN) { - if (property == XA_WM_CLASS && strcmp(data, "nxclient") == 0) + if (property == XA_WM_CLASS) { - #ifdef TEST - fprintf(stderr, "++++++nxagentGuessClientHint: Detected nxclient as [%d].\n", client -> index); - #endif + if (strcmp(data, "nxclient") == 0) + { + #ifdef TEST + fprintf(stderr, "++++++nxagentGuessClientHint: Detected nxclient as [%d].\n", client -> index); + #endif - nxagentClientHint(client) = NXCLIENT_WINDOW; + nxagentClientHint(client) = NXCLIENT_WINDOW; + } + else if (strstr(data, "java")) + { + #ifdef TEST + fprintf(stderr, "++++++nxagentGuessClientHint: Detected java as [%d].\n", client -> index); + #endif + + nxagentClientHint(client) = JAVA_WINDOW; + } } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.h b/nx-X11/programs/Xserver/hw/nxagent/Client.h index a9b06c8..67ec50e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.h @@ -32,7 +32,8 @@ enum ClientHint UNKNOWN = 0, NXCLIENT_WINDOW, NXCLIENT_DIALOG, - NXAGENT_SHADOW + NXAGENT_SHADOW, + JAVA_WINDOW }; typedef struct _PrivClientRec diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index e27415b..9d48aa1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -290,10 +290,25 @@ void nxagentRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, &fg_color, &bg_color); } +Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y, + Bool generateEvent); + Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent) { - return 1; + if (generateEvent != 0) + { + return (*nxagentSetCursorPositionW)(pScreen, x, y, generateEvent); + } + else + { + /* + * Calling miSetCursorPosition with generateEvent == 0 + * causes a crash in miPoiterUpdate(). + */ + + return 1; + } } void nxagentReconnectCursor(pointer p0, XID x1, pointer p2) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h index df7dc44..88dea26 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h @@ -97,6 +97,9 @@ void nxagentRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent); +extern Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y, + Bool generateEvent); + void nxagentDisconnectCursor(pointer p0, XID x1, pointer p2); void nxagentReconnectCursor(pointer p0, XID x1, pointer p2); void nxagentReDisplayCurrentCursor(void); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index c60718d..9031c25 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -746,8 +746,19 @@ static void nxagentDisplayWriteHandler(Display *display, int length) } } +static CARD32 nxagentRateTime = 5000; +static CARD32 nxagentLastTime; +static unsigned int nxagentRate = 0; + +int nxagentGetDataRate(void) +{ + return nxagentRate; +} + static void nxagentDisplayFlushHandler(Display *display, int length) { + CARD32 time; + if (nxagentDisplay != NULL) { #ifdef TEST @@ -765,6 +776,22 @@ static void nxagentDisplayFlushHandler(Display *display, int length) if (nxagentOption(LinkType) != LINK_TYPE_NONE) { nxagentFlush = GetTimeInMillis(); + + time = nxagentFlush; + + time = time - nxagentLastTime; + + if (time < nxagentRateTime) + { + nxagentRate = ((nxagentRate * (nxagentRateTime - time) + + length) * 1000) / nxagentRateTime; + } + else + { + nxagentRate = (length * 1000) / nxagentRateTime; + } + + nxagentLastTime = nxagentFlush; } } } @@ -1482,10 +1509,6 @@ void nxagentSetDefaultVisual(void) int i; - nxagentDefaultVisualIndex = 3; - - return; - if (nxagentUserDefaultClass || nxagentUserDefaultDepth) { nxagentDefaultVisualIndex = UNDEFINED; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.h b/nx-X11/programs/Xserver/hw/nxagent/Display.h index 454150d..1c12d6c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.h @@ -159,6 +159,8 @@ extern int nxagentShadowXConnectionNumber; int nxagentServerOrder(void); +int nxagentGetDataRate(void); + #define nxagentClientOrder(client) \ ((client)->swapped ? !nxagentServerOrder() : nxagentServerOrder()) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 9c16774..f222599 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -112,6 +112,27 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel); unsigned long nxagentGetDrawableColor(DrawablePtr pDrawable); unsigned long nxagentGetRegionColor(DrawablePtr pDrawable, RegionPtr pRegion); +int nxagentSkipImage = 0; + +static int nxagentTooManyImageData(void) +{ + unsigned int r; + unsigned int limit; + + limit = nxagentOption(ImageRateLimit); + + r = nxagentGetDataRate() / 1000; + + #ifdef TEST + if (r > limit) + { + fprintf(stderr, "Warning: Current bit rate is: %u kB/s.\n", r); + } + #endif + + return (r > limit); +} + int nxagentSynchronizeDrawable(DrawablePtr pDrawable, int wait, unsigned int breakMask, WindowPtr owner) { int result; @@ -1304,6 +1325,18 @@ FIXME: All drawables should be set as synchronized and never marked as corrupted while the display is down. */ + + nxagentSkipImage = nxagentTooManyImageData(); + + if (nxagentOption(ImageRateLimit) && nxagentSkipImage) + { + #ifdef TEST + fprintf(stderr, "nxagentSynchronizeDrawable: Skipping due to bit rate limit reached.\n"); + #endif + + return; + } + if (NXDisplayError(nxagentDisplay) == 1) { #ifdef TEST diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 310b572..332816f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -159,6 +159,8 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 }; * for our clients or the X server. */ +extern int nxagentSkipImage; + void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) { /* @@ -357,7 +359,7 @@ void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) nxagentCorruptedBackgrounds > 0 || nxagentCorruptedPixmaps > 0)); - if (synchronize == 1) + if (nxagentSkipImage == 0 && synchronize == 1) { #ifdef TEST fprintf(stderr, "nxagentBlockHandler: Setting a zero timeout with [%d][%d][%d] and " diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index f4fc3c7..a50e8a5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -120,6 +120,8 @@ extern int OsVendorVErrorFFatal; extern void (*OsVendorStartRedirectErrorFProc)(); extern void (*OsVendorEndRedirectErrorFProc)(); +extern void SetVendorRelease(int release); + void OsVendorStartRedirectErrorFFunction(); void OsVendorEndRedirectErrorFFunction(); @@ -206,6 +208,22 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) } /* + * Avoid slowness due to buggy_repeat workaround + * in libcairo versions >= 1.10. + */ + + SetVendorRelease(70000000); + + /* + * Init the time count for image rate. + */ + + if (nxagentOption(ImageRateLimit) != 0) + { + fprintf(stderr, "Info: Image rate limit set to %u kB/s.\n", nxagentOption(ImageRateLimit)); + } + + /* * Unset the LD_LIBRARY_PATH variable in * Popen() before calling execl() in the * child process. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c index 5d78556..ca5be0b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c @@ -85,6 +85,8 @@ void nxagentInitOptions() nxagentOptions.DeviceControl = 0; + nxagentOptions.DeviceControlUserDefined = 0; + nxagentOptions.ResetKeyboardAtResume = 1; nxagentOptions.Reset = 0; @@ -149,6 +151,8 @@ void nxagentInitOptions() nxagentOptions.InhibitXkb = 1; nxagentOptions.CopyBufferSize = COPY_UNLIMITED; + + nxagentOptions.ImageRateLimit = 0; } /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h index 7850a05..40cb179 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h @@ -184,6 +184,12 @@ typedef struct _AgentOptions int DeviceControl; /* + * Explicitly asked config propagation. + */ + + int DeviceControlUserDefined; + + /* * Resuming keyboard device corrects keymap if session * migrates across platforms with different keycode * layout. @@ -369,6 +375,12 @@ typedef struct _AgentOptions int CopyBufferSize; + /* + * Max image data rate to the encoder input. + */ + + int ImageRateLimit; + } AgentOptionsRec; typedef AgentOptionsRec *AgentOptionsPtr; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h index 918d74d..4a02d80 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h @@ -134,7 +134,7 @@ FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE (nxagentOption(DeferLevel) == 1 && \ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && \ (((pSrc) -> pDrawable && nxagentDrawableStatus((pSrc) -> pDrawable) == NotSynchronized) || \ - ((pMask) && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)))) + ((pMask) && (pMask) -> pDrawable && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)))) #define NXAGENT_SHOULD_DEFER_PUTIMAGE(pDrawable) \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 90b8079..3c576c6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -377,11 +377,10 @@ Bool nxagentReconnectSession(void) nxagentResizeDesktopAtStartup = False; /* - * The default is device settings have - * not to be propagated to the X server. + * Propagate device settings if explicitly asked for. */ - nxagentChangeOption(DeviceControl, False); + nxagentChangeOption(DeviceControl, nxagentOption(DeviceControlUserDefined)); /* * We need to zero out every new XID diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 6c74c14..29bffaa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -1095,8 +1095,9 @@ void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pD } } - if (pMask != NULL && pMask -> pDrawable != pSrc -> pDrawable && - pMask -> pDrawable != pDst -> pDrawable) + if (pMask != NULL && pMask -> pDrawable != NULL && + pMask -> pDrawable != pSrc -> pDrawable && + pMask -> pDrawable != pDst -> pDrawable) { nxagentSynchronizeShmPixmap(pMask -> pDrawable, xMask, yMask, width, height); @@ -1259,7 +1260,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * on the real X server. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p].\n", @@ -1749,7 +1751,8 @@ FIXME: Is this useful or just a waste of bandwidth? return; } - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTrapezoids: Going to synchronize the source drawable at [%p].\n", @@ -1843,7 +1846,8 @@ void nxagentTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * operation like nxagentTrapezoids() does. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTriangles: Going to synchronize the source drawable at [%p].\n", @@ -1920,7 +1924,8 @@ void nxagentTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * operation like nxagentTrapezoids() does. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTriStrip: Going to synchronize the source drawable at [%p].\n", @@ -1997,7 +2002,8 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst, * operation like nxagentTrapezoids() does. */ - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL && + nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) { #ifdef TEST fprintf(stderr, "nxagentTriFan: Going to synchronize the source drawable at [%p].\n", diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index de688a0..9957a7d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1644,6 +1644,9 @@ N/A pScreen->RealizeCursor = nxagentRealizeCursor; pScreen->UnrealizeCursor = nxagentUnrealizeCursor; pScreen->RecolorCursor = nxagentRecolorCursor; + + nxagentSetCursorPositionW = pScreen->SetCursorPosition; + pScreen->SetCursorPosition = nxagentSetCursorPosition; #define POSITION_OFFSET (pScreen->myNum * (nxagentOption(Width) + \ 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-248-g6fdcabf
by git-admin＠x2go.org 21 May '12

21 May '12

The branch, master has been updated via 6fdcabf69737e3ef53d8423b4b1f412ac93ec9af (commit) via 47c31b7c33fc0e0a77d36ae983865fbee9720870 (commit) from 12e0b9a0396ffb5651b21e0959dd09373a4ed921 (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 6fdcabf69737e3ef53d8423b4b1f412ac93ec9af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 22 00:17:11 2012 +0200 i18n update (en/de), rebuilt .mo files commit 47c31b7c33fc0e0a77d36ae983865fbee9720870 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 22 00:13:43 2012 +0200 Allow custom commands to be desktop sessions. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 23334 -> 23288 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 21856 -> 21781 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 17738 -> 17738 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 18323 -> 18323 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 22247 -> 21924 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 20767 -> 20538 bytes debian/changelog | 1 + po/PyHoca-GUI.pot | 429 ++++++++++++++--------------- po/bg.po | 429 ++++++++++++++--------------- po/de.po | 448 +++++++++++++++--------------- po/en.po | 446 +++++++++++++++--------------- po/es.po | 435 ++++++++++++++--------------- po/nb_NO.po | 435 ++++++++++++++--------------- po/nl.po | 444 +++++++++++++++--------------- po/sv.po | 443 +++++++++++++++--------------- pyhoca/wxgui/frontend.py | 2 +- pyhoca/wxgui/profilemanager.py | 32 ++- 18 files changed, 1786 insertions(+), 1758 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index 7032acf..b967fb3 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 03a8794..0343de5 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index 2c409ca..af47f36 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index 0c22ab8..1110bd3 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 0baf862..c626e0a 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index 7f7f293..0ea5f8c 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 4d336c9..19a9b7e 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/debian/changelog b/debian/changelog index 87b9095..f2f1b83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -135,6 +135,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - os.path.is<type> require string option, not Unicode. - Add option --about-image. Allow changing the application's name by renaming the ,,pyhoca-gui'' script. + - Allow custom commands to be desktop sessions. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 50fb43b..f7232f2 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\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" @@ -46,23 +46,23 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "" @@ -88,33 +88,28 @@ msgstr "" msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, python-format -msgid "%s - DNS error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, python-format msgid "%s - socket error" msgstr "" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "" @@ -123,12 +118,12 @@ msgstr "" msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, python-format msgid "%s - SSH error" msgstr "" @@ -149,20 +144,20 @@ msgid "" "Connecting you to ,,%s''" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." msgstr "" -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -359,278 +354,282 @@ msgid "RDP options" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -638,21 +637,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "" @@ -685,8 +684,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "" @@ -694,7 +693,7 @@ msgstr "" msgid "Window title" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "" @@ -710,31 +709,31 @@ msgstr "" msgid "Transfer Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "" @@ -762,233 +761,232 @@ msgstr "" msgid "Unshare &all local folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 msgid "Education" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Internet" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Office Applications" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Other Applications" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -msgid "Retrieving Application Menu..." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +msgid "Retrieving Application Menu..." +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 msgid "Suspending sessions and exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, python-format msgid "Disconnecting %s and exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, python-format msgid "%s - server warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, python-format msgid "%s - EOF error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -997,153 +995,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1151,7 +1144,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1159,74 +1152,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" diff --git a/po/bg.po b/po/bg.po index 2b063de..389958a 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" @@ -50,23 +50,23 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "" @@ -92,33 +92,28 @@ msgstr "" msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, python-format -msgid "%s - DNS error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, python-format msgid "%s - socket error" msgstr "" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "" @@ -127,12 +122,12 @@ msgstr "" msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, python-format msgid "%s - SSH error" msgstr "" @@ -153,20 +148,20 @@ msgid "" "Connecting you to ,,%s''" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." msgstr "" -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -363,278 +358,282 @@ msgid "RDP options" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -642,21 +641,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "" @@ -689,8 +688,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "" @@ -698,7 +697,7 @@ msgstr "" msgid "Window title" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "" @@ -714,31 +713,31 @@ msgstr "" msgid "Transfer Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "" @@ -766,233 +765,232 @@ msgstr "" msgid "Unshare &all local folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 msgid "Education" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Internet" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Office Applications" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Other Applications" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -msgid "Retrieving Application Menu..." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +msgid "Retrieving Application Menu..." +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 msgid "Suspending sessions and exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, python-format msgid "Disconnecting %s and exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, python-format msgid "%s - server warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, python-format msgid "%s - EOF error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1001,153 +999,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1155,7 +1148,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1163,74 +1156,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" diff --git a/po/de.po b/po/de.po index b698c6e..c33512b 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" -"PO-Revision-Date: 2012-04-16 17:07+0100\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" +"PO-Revision-Date: 2012-05-22 00:16+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -49,23 +49,23 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Abbrechen" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Benutzer darf keine X2Go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,35 +91,30 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, python-format -msgid "%s - DNS error" -msgstr "%s - DNS-Fehler" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, python-format msgid "%s - socket error" msgstr "%s - Socket-Fehler" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer " "nicht akzeptiert" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - Benutzerverzeichnis nicht vorhanden" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "" "Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." @@ -129,12 +124,12 @@ msgstr "" msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, python-format msgid "%s - SSH error" msgstr "%s - SSH-Fehler" @@ -157,7 +152,7 @@ msgstr "" "PyHoca-GUI\n" "Verbinde mit ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" @@ -166,13 +161,13 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbindungsaufbau zu X2Go Server ,,%s'' läuft" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." msgstr "Verbinden mit X2Go Server..." -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -371,279 +366,285 @@ msgid "RDP options" msgstr "RDP Optionen" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" +"Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless " +"Modus)" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "Menü mit Server-publizierten Anwendungen" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "Privater RSA/DSA Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "Hostname[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "Aktuelle Tastatureinstellungen beibehalten" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "Tastaturlayout" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "Lokaler Pfad" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "Verbindungsart" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "manuell" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "Sitzung" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -654,21 +655,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -701,8 +702,8 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Beenden" @@ -710,7 +711,7 @@ msgstr "&Beenden" msgid "Window title" msgstr "Fenstertitel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Sitzung fortsetzen" @@ -726,31 +727,31 @@ msgstr "Sitzung übernehmen" msgid "Transfer Session (not possible)" msgstr "Sitzung übernehmen (nicht möglich)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "Sitzung anhalten (und Verbindung trenen / Anwendung beenden)" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" msgstr "Sitzungen anhalten (und Verbindung trennen)" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Sitzung anhalten" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "Sitzung beenden (und Verbindung trennen / Anwendung beenden)" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" msgstr "Sitzung beenden (und Verbindung trennen)" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Sitzung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "Menübaum aktualisieren" @@ -778,239 +779,236 @@ msgstr "Aushängen:" msgid "Unshare &all local folders" msgstr "Alle aushängen" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "Multimedia" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "Entwicklung" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 msgid "Education" msgstr "Bildung" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "Spiele" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "Grafik" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Internet" msgstr "Internet" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Office Applications" msgstr "Büroanwendungen" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "System" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "Werkzeuge" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Other Applications" msgstr "Weitere Anwendungen" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "wird geladen" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" -"Bei einer langsamen Verbindung, kann die Ladezeit des Anwendungsmenüs einige " -"Zeit dauern." - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -msgid "Retrieving Application Menu..." -msgstr "Hole Anwendungsmenü..." - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "Mit %s verbinden" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "Verbindung wird aufgebaut..." -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "&Neue Desktopsitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +msgid "Retrieving Application Menu..." +msgstr "Hole Anwendungsmenü..." + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "Hole Anwendungsmenü" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "&Neue Sitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "Einzelne Anwendung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Manage Application Menu" msgstr "Anwendungsmenü verwalten" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "angehalten" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "Alle Sitzungen beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "Freigegebene Ordner" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 msgid "Suspend Session and E&xit application" msgstr "Sitzung anhalten und Anwendung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 msgid "Disconnect and E&xit application" msgstr "Verbindung Trennen und Anwendung schließen" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "Serververbindung aufbauen" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Über %s ..." -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 msgid "Suspending sessions and exiting application..." msgstr "Sitzungen werden angehalten und Programm beendet..." -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, python-format msgid "Disconnecting %s and exiting application..." msgstr "Trenne %s und schließe Anwendung..." -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." msgstr "Programm wird beendet..." -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, python-format msgid "%s - server warning" msgstr "%s - Serverwarnung" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "Der X2Go-Server publiziert kein Anwendungsmenü." -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " "Benutzer nicht akzeptiert" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, python-format msgid "%s - EOF error" msgstr "%s - EOF-Fehler" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " "versuchen..." -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 msgid "Unknown session profile, configure before using it..." msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..." -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "%s - Sitzungsfunktion eingeschränkt" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "Das Ausführen des Befehls ,,%s'' ist fehlgeschlagen." + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "Beende X2Go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "X2Go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1023,17 +1021,17 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1042,22 +1040,22 @@ msgstr "" "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " "Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "Der Start der Sitzung ist fehlgeschlagen." -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar." -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1066,12 +1064,7 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "%s - Sitzungsfunktion eingeschränkt" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1080,7 +1073,7 @@ msgstr "" "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " "wurde vom X2Go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1089,37 +1082,37 @@ msgstr "" "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " "verfügbar." -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Das X2Go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1128,12 +1121,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "%s - client-side printing not available" msgstr "%s - Client-seitiges Drucken nicht verfügbar" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1143,12 +1136,12 @@ msgstr "" "Server verweigert die Verbindung.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box nicht verfügbar" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1157,12 +1150,12 @@ msgstr "" "Der Server unterstützt die X2Go MIME box nicht.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - keine Freigabe Client-seitiger Ordner" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1172,12 +1165,12 @@ msgstr "" "Server verweigert die Verbindung.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1187,12 +1180,12 @@ msgstr "" "werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1203,7 +1196,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1214,12 +1207,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1228,7 +1221,7 @@ msgstr "" "Neue X2Go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" @@ -1237,12 +1230,12 @@ msgstr "" "Ein anderes X2Go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1251,7 +1244,7 @@ msgstr "" "X2Go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1260,12 +1253,12 @@ msgstr "" "Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" @@ -1274,12 +1267,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1288,12 +1281,12 @@ msgstr "" "X2Go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1438,6 +1431,19 @@ msgstr "Sitzungsfenster umbenennen in" msgid "OK" msgstr "Ok" +#~ msgid "%s - DNS error" +#~ msgstr "%s - DNS-Fehler" + +#~ msgid "still loading" +#~ msgstr "wird geladen" + +#~ msgid "" +#~ "On slow connections, the loading of the application menu can take a " +#~ "couple of seconds." +#~ msgstr "" +#~ "Bei einer langsamen Verbindung, kann die Ladezeit des Anwendungsmenüs " +#~ "einige Zeit dauern." + #~ msgid "Disconnect and E&xit" #~ msgstr "Verbindung trennen und &beenden" diff --git a/po/en.po b/po/en.po index 0114596..663b692 100644 --- a/po/en.po +++ b/po/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" -"PO-Revision-Date: 2012-04-16 17:04+0100\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" +"PO-Revision-Date: 2012-05-22 00:15+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -49,23 +49,23 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Cancel" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "User is not allowed to start X2Go sessions!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -91,34 +91,29 @@ msgstr "%s - SSH proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, python-format -msgid "%s - DNS error" -msgstr "%s - DNS error" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, python-format msgid "%s - socket error" msgstr "%s - socket error" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "The remote server's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - missing home directory" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "The remote user's home directory does not exist." @@ -127,12 +122,12 @@ msgstr "The remote user's home directory does not exist." msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - auth error" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, python-format msgid "%s - SSH error" msgstr "%s - SSH error" @@ -155,7 +150,7 @@ msgstr "" "PyHoca-GUI\n" "Connecting you to ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" @@ -164,7 +159,7 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Currently connecting you to remote X2Go server ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." @@ -172,7 +167,7 @@ msgstr "" "PyHoca-GUI\n" "Connecting you to X2Go..." -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -371,278 +366,282 @@ msgid "RDP options" msgstr "RDP options" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "ntegrate remote application(s) into local desktop (rootless mode)" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "Menu of published applications" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "RSA/DSA private key" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "Keep current keyboard settings" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "Keyboard layout" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "Local Path" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "Connect Method" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "automatically" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "manually" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -653,21 +652,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -700,8 +699,8 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "E&xit" @@ -709,7 +708,7 @@ msgstr "E&xit" msgid "Window title" msgstr "Window title" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Resume Session" @@ -725,31 +724,31 @@ msgstr "Transfer Session" msgid "Transfer Session (not possible)" msgstr "Transfer Session (not possible)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Session (and disconnect/exit)" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" msgstr "Suspend Session (and disconnect)" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Suspend Session" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "Terminate Session (and disconnect/exit)" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" msgstr "Terminate Session (and disconnect)" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Terminate Session" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "Refresh menu tree" @@ -777,236 +776,233 @@ msgstr "Unshare:" msgid "Unshare &all local folders" msgstr "Unshare &all local folders" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "Multimedia" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "Development" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 msgid "Education" msgstr "Education" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "Games" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "Graphics" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Internet" msgstr "Internet" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Office Applications" msgstr "Office Applications" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "System" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "Utilities" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Other Applications" msgstr "Other Applications" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "still loading" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -msgid "Retrieving Application Menu..." -msgstr "Retrieving Application Menu..." - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "Connect %s" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "Currently connecting..." -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "Start &new Desktop Session" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +msgid "Retrieving Application Menu..." +msgstr "Retrieving Application Menu..." + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "Retrieve Application Menu" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Start &new Session" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "Launch Single Application" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Manage Application Menu" msgstr "Manage Application Menu" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "Running" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "&Clean all sessions" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "Shared &folders" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 msgid "Suspend Session and E&xit application" msgstr "Suspend Session and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 msgid "Disconnect and E&xit application" msgstr "Disconnect and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "Connect Server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 msgid "Suspending sessions and exiting application..." msgstr "Suspending sessions and exiting application..." -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, python-format msgid "Disconnecting %s and exiting application..." msgstr "Disconnecting %s and exiting application..." -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." msgstr "Exiting Application..." -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, python-format msgid "%s - server warning" msgstr "%s - server warning" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "The X2Go Server does not publish an application menu." -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "The SSH proxy's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, python-format msgid "%s - EOF error" msgstr "%s - EOF error" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authentication protocol communication incomplete! Try again..." -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "An unknown error occurred during authentication!" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 msgid "Unknown session profile, configure before using it..." msgstr "Unknown session profile, configure before using it..." -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "%s - session warning" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "Execution of command ,,%s'' failed." + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "Cleaning X2Go sessions..." -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "X2Go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - share local folder with sessions of this profile" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1019,17 +1015,17 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1038,22 +1034,22 @@ msgstr "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "The session startup failed." -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "The command ,,%s'' is not available on X2Go server." -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1062,12 +1058,7 @@ msgstr "" "The command ,,%s'' is not available on X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "%s - session warning" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1076,7 +1067,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1085,36 +1076,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "The X2Go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "The X2Go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1123,12 +1114,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "%s - client-side printing not available" msgstr "%s - client-side printing not available" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1137,12 +1128,12 @@ msgstr "" "The server denies client-side printing from within this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box not available" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1151,12 +1142,12 @@ msgstr "" "The server does not support the X2Go MIME box.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - client-side folders not sharable" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1165,12 +1156,12 @@ msgstr "" "The server denies client-side folder sharing with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "%s - client resources not sharable" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1179,12 +1170,12 @@ msgstr "" "Client-side folders and printers cannot be shared with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1195,7 +1186,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1206,12 +1197,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1220,7 +1211,7 @@ msgstr "" "New X2Go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" @@ -1229,12 +1220,12 @@ msgstr "" "Another client started X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1243,7 +1234,7 @@ msgstr "" "Resuming X2Go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1252,12 +1243,12 @@ msgstr "" "Another client resumed X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" @@ -1266,12 +1257,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1280,12 +1271,12 @@ msgstr "" "X2Go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1429,6 +1420,19 @@ msgstr "Change session title to" msgid "OK" msgstr "OK" +#~ msgid "%s - DNS error" +#~ msgstr "%s - DNS error" + +#~ msgid "still loading" +#~ msgstr "still loading" + +#~ msgid "" +#~ "On slow connections, the loading of the application menu can take a " +#~ "couple of seconds." +#~ msgstr "" +#~ "On slow connections, the loading of the application menu can take a " +#~ "couple of seconds." + #~ msgid "Disconnect and E&xit" #~ msgstr "Disconnect and E&xit" diff --git a/po/es.po b/po/es.po index f3c424f..cd97758 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" @@ -52,23 +52,23 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Cancelar" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - conectado" @@ -94,35 +94,30 @@ msgstr "%s - proxy ssh" msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, fuzzy, python-format -msgid "%s - DNS error" -msgstr "%s - error en la clave" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, fuzzy, python-format msgid "%s - socket error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "La clave del servidor remoto no es válida o no ha sido aceptada por el " "usuario" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - carpeta home desconocida" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "La carpeta home del usuario no existe en el servidor" @@ -131,12 +126,12 @@ msgstr "La carpeta home del usuario no existe en el servidor" msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - error en la autenticación" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, fuzzy, python-format msgid "%s - SSH error" msgstr "%s - error en la clave" @@ -160,7 +155,7 @@ msgstr "" "PyHoca-GUI\n" "Conectándote a ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" @@ -169,7 +164,7 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Conectándote a tu servidor X2Go \"%s''" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." @@ -177,7 +172,7 @@ msgstr "" "PyHoca-GUI\n" "Conectándote a X2Go..." -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -385,281 +380,285 @@ msgid "RDP options" msgstr "Opciones RDP" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "Clave privada RSA/DSA" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "Host[:Puerto]" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "Mantener configuración actual del teclado" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "Máscara de teclado" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "Ruta Local" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "Método de Conexión" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "Usar tipo de archivo MIME para la importación local" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "manualmente" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 #, fuzzy msgid "Profile" msgstr "Perfil " -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " "otra vez." -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -670,21 +669,21 @@ msgstr "" "al proxy SSH local.\n" "Por favor, cambia los parámetros del proxy SSH en base a esta información." -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -718,8 +717,8 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "S&alir" @@ -728,7 +727,7 @@ msgstr "S&alir" msgid "Window title" msgstr "Título de Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Retomar Sesión" @@ -744,35 +743,35 @@ msgstr "Transferir Sesión" msgid "Transfer Session (not possible)" msgstr "Transferir Sesión (no disponible)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 #, fuzzy msgid "Suspend Session (and disconnect/exit)" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 #, fuzzy msgid "Suspend Session (and disconnect)" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 #, fuzzy msgid "Terminate Session (and disconnect/exit)" msgstr "Finalizar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 #, fuzzy msgid "Terminate Session (and disconnect)" msgstr "Finalizar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Finalizar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "" @@ -802,251 +801,250 @@ msgstr "No compartido:" msgid "Unshare &all local folders" msgstr "Dejar de compartir tod&as las carpetas locales" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 #, fuzzy msgid "Education" msgstr "Acción" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 #, fuzzy msgid "Internet" msgstr "Navegador web" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 #, fuzzy msgid "Office Applications" msgstr "Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 #, fuzzy msgid "Other Applications" msgstr "Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -#, fuzzy -msgid "Retrieving Application Menu..." -msgstr "Aplicación" - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, fuzzy, python-format msgid "Connect %s" msgstr "Conexión" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 #, fuzzy msgid "Start &new Desktop Session" msgstr "Iniciar &nueva Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +#, fuzzy +msgid "Retrieving Application Menu..." +msgstr "Aplicación" + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 #, fuzzy msgid "Retrieve Application Menu" msgstr "Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 #, fuzzy msgid "Launch Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 #, fuzzy msgid "Manage Application Menu" msgstr "Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "Activa" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "Suspendida" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "&Limpiar el registro de sesiones" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "Compartir &carpetas" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 #, fuzzy msgid "Suspend Session and E&xit application" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 #, fuzzy msgid "Disconnect and E&xit application" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "Conectar con el Servidor" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Acerca de %s ..." -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 #, fuzzy msgid "Suspending sessions and exiting application..." msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, fuzzy, python-format msgid "Disconnecting %s and exiting application..." msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 #, fuzzy msgid "Exiting application..." msgstr "Aplicación" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, fuzzy, python-format msgid "%s - server warning" msgstr "%s - advertencia durante la sesión" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, fuzzy, python-format msgid "%s - EOF error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 #, fuzzy msgid "Unknown session profile, configure before using it..." msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "%s - advertencia durante la sesión" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "Limpiando sesiones X2Go..." -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2Go." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Eliminar el Perfil de Sesión \"%s''?" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - compartir carpetas locales con las sesiones de este perfil" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1059,17 +1057,17 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1078,22 +1076,22 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "El inicio de sesión ha fallado" -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "El comando \"%s'' no está presente en el servidor X2Go." -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1102,12 +1100,7 @@ msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "%s - advertencia durante la sesión" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1116,7 +1109,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2Go." -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1125,37 +1118,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2Go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "El sistema X2Go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1164,60 +1157,60 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, fuzzy, python-format msgid "%s - client-side printing not available" msgstr "- el sistema de impresión no está disponible -" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1228,7 +1221,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1239,12 +1232,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1253,7 +1246,7 @@ msgstr "" "Iniciando nueva sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" @@ -1262,12 +1255,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1276,7 +1269,7 @@ msgstr "" "Retornando sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1285,12 +1278,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" @@ -1299,12 +1292,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1313,12 +1306,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1461,6 +1454,10 @@ msgstr "Nuevo Perfil de Sesión" msgid "OK" msgstr "" +#, fuzzy +#~ msgid "%s - DNS error" +#~ msgstr "%s - error en la clave" + #~ msgid "%s - connect error" #~ msgstr "%s - error en la conexión" diff --git a/po/nb_NO.po b/po/nb_NO.po index a09c3df..4acd660 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" "PO-Revision-Date: 2012-02-19 23:16+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" @@ -49,23 +49,23 @@ msgstr "Sesjons innlogging" msgid "SSH proxy server login" msgstr "logg inn via en SSH mellomtjener" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - tilkoblingsfeil" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Bruker kontoen har ikke tillatelse til å starte X2Go sesjoner!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - koble til" @@ -91,35 +91,30 @@ msgstr "%s - ssh mellomtjener" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentiseringenen til SSH mellomtjeneren feilet!" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, fuzzy, python-format -msgid "%s - DNS error" -msgstr "%s - nøkkel feil" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, fuzzy, python-format msgid "%s - socket error" msgstr "%s - nøkkel feil" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - verts nøkkel feil" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert " "av brukeren" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - mangler hjemmekatalog" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke." @@ -128,12 +123,12 @@ msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke." msgid "%s - key error" msgstr "%s - nøkkel feil" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringens feil" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, fuzzy, python-format msgid "%s - SSH error" msgstr "%s - nøkkel feil" @@ -156,7 +151,7 @@ msgstr "" "PyHoca-GUI\n" "Kobler deg til ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" @@ -165,7 +160,7 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Holder på med å koble deg til X2Go serveren ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." @@ -173,7 +168,7 @@ msgstr "" "PyHoca-GUI\n" "Kobler deg til X2Go..." -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -373,278 +368,282 @@ msgid "RDP options" msgstr "RDP alternativer" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "Bruker" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "Vert" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "RSA/DSA privat nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "Server bak SSH mellomtjeneren" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "Nøkkelfil" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "Vert[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "SSH mellomtjener tunnel" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "Metode" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "Bildekvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "Fullskjerm" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "Egentilpasset størrelse" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "Sett skjermens DPI" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "Behold gjeldende tastaturoppsett" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "Tastaturoppsett" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "Aktiver lydstøtte" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "Arts (ikke supportert)" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "Benytt standard lydport" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "Selvvalgt lydport" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "Klientside utskrift" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "Benytt lokal mappedeling" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "Legg til" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "Lokal sti" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "Tilkoblingsmetode" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "Slett" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "Konverter tegnkodingen mellom klient og server" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "Klientens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "Serverens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "Benytt filens MIME boks for lokal fil import" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "Utvidelser" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "Handling" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "Lagre" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "Resett" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "manuelt" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profil håndterer - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profil håndterer - %s (tilkoblet)" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profil håndterer - %s" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "Sesjon" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "Tilkobling" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "Innstillinger" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "Deling" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "Velg et ikon for denne sesjonsprofilen" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "Velg en offentlig SSH nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "Velg en mappe som skal deles i en sesjon" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profil håndterer" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnavnet mangler, profilen er ubrukelig!" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilnavnet %s eksisterer allerede!" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -655,21 +654,21 @@ msgstr "" "lokal SSH mellomtjener.\n" "Vennligst endre SSH mellomtjener innstillingene tilsvarende." -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "%s - profil lagt til" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "En ny sesjonsprofil har blitt lagt til." -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "%s - endret" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "Endringer til profilen har blitt lagret." @@ -703,8 +702,8 @@ msgstr "Utksriftsinnstillinger" msgid "Client Options" msgstr "Klient alternativer" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Avslutt" @@ -712,7 +711,7 @@ msgstr "&Avslutt" msgid "Window title" msgstr "Vindustittel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Gjenoppta sesjon" @@ -728,35 +727,35 @@ msgstr "Overfør sesjon" msgid "Transfer Session (not possible)" msgstr "Overfør sesjon (ikke mulig)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 #, fuzzy msgid "Suspend Session (and disconnect/exit)" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 #, fuzzy msgid "Suspend Session (and disconnect)" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 #, fuzzy msgid "Terminate Session (and disconnect/exit)" msgstr "Avslutte sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 #, fuzzy msgid "Terminate Session (and disconnect)" msgstr "Avslutte sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Avslutte sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "" @@ -784,248 +783,247 @@ msgstr "Stopp deling:" msgid "Unshare &all local folders" msgstr "Stopp deling på a&lle lokale mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 #, fuzzy msgid "Education" msgstr "Handling" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 #, fuzzy msgid "Internet" msgstr "Nettleser" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 #, fuzzy msgid "Office Applications" msgstr "Enkelt applikasjon" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 #, fuzzy msgid "Other Applications" msgstr "Applikasjon" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -#, fuzzy -msgid "Retrieving Application Menu..." -msgstr "Enkelt applikasjon" - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, fuzzy, python-format msgid "Connect %s" msgstr "Tilkobling" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "Start &ny sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +#, fuzzy +msgid "Retrieving Application Menu..." +msgstr "Enkelt applikasjon" + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 #, fuzzy msgid "Retrieve Application Menu" msgstr "Enkelt applikasjon" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Start &ny sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "Start enkelt applikasjon" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 #, fuzzy msgid "Manage Application Menu" msgstr "Enkelt applikasjon" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "Aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "Frakoblet" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "&Rensk opp alle sesjoner" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "TIlpass &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "&Koble fra serveren" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 #, fuzzy msgid "Suspend Session and E&xit application" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 #, fuzzy msgid "Disconnect and E&xit application" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "Legg til profil" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "Ingen sesjonsprofiler er definert" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "Start/gjenoppta sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "Koble til server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Om %s ..." -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 #, fuzzy msgid "Suspending sessions and exiting application..." msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, fuzzy, python-format msgid "Disconnecting %s and exiting application..." msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 #, fuzzy msgid "Exiting application..." msgstr "Enkelt applikasjon" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, fuzzy, python-format msgid "%s - server warning" msgstr "%s - advarsel om sesjon" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Offentlig SSH nøkkel autentisering var vellykket." -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert " "av brukeren" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, fuzzy, python-format msgid "%s - EOF error" msgstr "%s - nøkkel feil" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen." -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "%s - Feil med autentiseringsnøkkel" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "En ukjent feil oppstod under autentiseringen! " -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 #, fuzzy msgid "Unknown session profile, configure before using it..." msgstr "ny sesjonsprofil" -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "%s - advarsel om sesjon" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "Rensker opp i X2Go sesjoner..." -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "%s - koble fra" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "X2Go profilen er nå frakoblet." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "Ny sesjonsprofil" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Virkelig slette sesjonsprofilen \"%s\"?" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "%s - profilen er slettet" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "Sesjonsprofilen har blitt slettet." -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - del lokal mappe med sesjoner av denne profilen" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1038,17 +1036,17 @@ msgstr "" "\n" "Er du sikker på at du vil fortsette tilkoblingen?" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Verifiser vert autorisasjonen" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "%s - feil med kanalen" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1057,22 +1055,22 @@ msgstr "" "Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på " "nytt til serveren..." -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - sesjonsfeil" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "Oppstart av sesjonen feilet." -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandoen \"%s\" er ikke tilgjengelig på X2Go serveren." -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1081,12 +1079,7 @@ msgstr "" "Kommandoen \"%s\" er ikke tilgjengelig på X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "%s - advarsel om sesjon" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1095,7 +1088,7 @@ msgstr "" "Revers TCP port videresendingsforespørselen for sesjon %s til server port %s " "har blitt avvist." -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1104,37 +1097,37 @@ msgstr "" "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den " "eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "%s - advarsel om lyd" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "X2Go PulseAudio systemet er ikke tilgjengelig inne i Terminal server " "sesjoner (RDP)." -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "%s - feil med lyden" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio systemet kan ikke bli startet." -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio systemet har uventet stoppet." -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "%s - problem med lyden" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1143,60 +1136,60 @@ msgstr "" "Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, fuzzy, python-format msgid "%s - client-side printing not available" msgstr "- utskriftssystemet er ikke tilgjengelig -" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "%s - feil ved utskrift" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1207,7 +1200,7 @@ msgstr "" "...oppstod på skriver %s fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1218,12 +1211,12 @@ msgstr "" "...oppstod fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1232,7 +1225,7 @@ msgstr "" "Ny X2Go sesjon starter opp...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" @@ -1241,12 +1234,12 @@ msgstr "" "En annen klient startet X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "%s - gjenoppta" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1255,7 +1248,7 @@ msgstr "" "Gjenopptar X2Go sesjon...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1264,12 +1257,12 @@ msgstr "" "En annen klient gjenopptok X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" @@ -1278,12 +1271,12 @@ msgstr "" "Fant allerede kjørende sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "%s - koble fra" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1292,12 +1285,12 @@ msgstr "" "X2Go sesjonen har blitt frakoblet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "%s - avslutt" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1441,6 +1434,10 @@ msgstr "Endre sesjonstittelen til" msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "%s - DNS error" +#~ msgstr "%s - nøkkel feil" + #~ msgid "%s - connect error" #~ msgstr "%s - tilkoblings feil" diff --git a/po/nl.po b/po/nl.po index e29cb65..8379f55 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" "PO-Revision-Date: 2012-04-18 17:30+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -49,23 +49,23 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Afbreken" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Gebruiker mag geen X2Go sessie starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,35 +91,30 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, python-format -msgid "%s - DNS error" -msgstr "%s - DNS fout" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, python-format msgid "%s - socket error" msgstr "%s - socket fout" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "De sleutel van de server is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" @@ -128,12 +123,12 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, python-format msgid "%s - SSH error" msgstr "%s - sleutel fout" @@ -156,7 +151,7 @@ msgstr "" "PyHoca-GUI\n" "Verbinden met ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" @@ -165,13 +160,13 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbinding met X2Go server ,,%s'' wordt gemaakt" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." msgstr "Bezig je te verbinden met X2Go ..." -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -370,278 +365,282 @@ msgid "RDP options" msgstr "RDP Opties" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "Private RSA/DSA Key" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "Huidige toetsenbord-instellingen behouden" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "Toetsenbord layout" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "Lokaal Pad" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "Verbindingsmethode" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "handmatig" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "Sessie" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -652,21 +651,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -699,8 +698,8 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Beeindigen" @@ -708,7 +707,7 @@ msgstr "&Beeindigen" msgid "Window title" msgstr "Scherm titel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Sessie hervatten" @@ -724,31 +723,31 @@ msgstr "Sessie overnemen" msgid "Transfer Session (not possible)" msgstr "Sessie overnemen (niet mogelijk)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" msgstr "Suspend Sessie (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" msgstr "Sessie beëindigen (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Sessie beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "Ververs menu" @@ -776,237 +775,234 @@ msgstr "Niet meer delen" msgid "Unshare &all local folders" msgstr "Niet langer delen alle lokale &mappen" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "Multimedia" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "Ontwikkeling" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 msgid "Education" msgstr "Opleiding" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "Spelletjes" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "Graphics" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Internet" msgstr "Internet" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Office Applications" msgstr "Kantoor applicaties" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "Systeem" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "Hulpmiddelen" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Other Applications" msgstr "Andere applicaties" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "nog aan het laden" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" -"Bij een langzame verbinding kan het laden van het menu met de applicaties " -"enige seconden duren" - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -msgid "Retrieving Application Menu..." -msgstr "Bezig met ophalen applicatiemenu..." - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "Verbind %s" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "Nu aan het verbinden..." -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "&Nieuwe Desktop Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +msgid "Retrieving Application Menu..." +msgstr "Bezig met ophalen applicatiemenu..." + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "Haal applicatiemenu op" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "&Nieuwe Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "Enkelvoudige Applicatie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Manage Application Menu" msgstr "Onderhoud applicatie menu" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "Aktief" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "Alle Sessies beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "Delen &mappen" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 msgid "Suspend Session and E&xit application" msgstr "Suspend Sessie en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 msgid "Disconnect and E&xit application" msgstr "verbinding verbreken en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 msgid "Suspending sessions and exiting application..." msgstr "Bezig met suspend van sessie en afsluiten van applicatie" -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, python-format msgid "Disconnecting %s and exiting application..." msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie..." -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." msgstr "Afsluiten van applicatie..." -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, python-format msgid "%s - server warning" msgstr "%s - server waarschuwing" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "De X2go server publiceert geen applicatie menu" -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, python-format msgid "%s - EOF error" msgstr "%s - EOF fout" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authenticatie was niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "%s - Verbindingsfout met auth. key" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 msgid "Unknown session profile, configure before using it..." msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..." -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "%s - sessie waarschuwing" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "Opschonen X2Go sessies..." -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "X2Go Profiel is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1019,17 +1015,17 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1038,22 +1034,22 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "Opstarten van de sessie is mislukt" -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Het commando ,,%s'' is niet beschikbaar op de X2Go server." -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1062,12 +1058,7 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2Go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "%s - sessie waarschuwing" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1076,7 +1067,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1085,36 +1076,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "Het X2Go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Het X2Go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1123,36 +1114,36 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "%s - client-side printing not available" msgstr "%s - client-side print systeem niet beschikbaar" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "De server staat client-side printing niet toe" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "%s- MIME box is niet beschikbaar" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "De server ondersteunt geen X2Go MIME box" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - client-side mappen worden niet gedeeld" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1161,12 +1152,12 @@ msgstr "" "De server staat client-side mappen deling in deze sessie niet toe.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "%s - client bronnen kunnen niet gedeeld worden" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1175,12 +1166,12 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1191,7 +1182,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1202,12 +1193,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1216,7 +1207,7 @@ msgstr "" "Nieuwe X2Go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" @@ -1225,12 +1216,12 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1239,7 +1230,7 @@ msgstr "" "X2Go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1248,12 +1239,12 @@ msgstr "" "Een andere X2Go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" @@ -1262,12 +1253,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1276,12 +1267,12 @@ msgstr "" "X2Go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1425,6 +1416,19 @@ msgstr "Wijzig sessie naam naar" msgid "OK" msgstr "OK" +#~ msgid "%s - DNS error" +#~ msgstr "%s - DNS fout" + +#~ msgid "still loading" +#~ msgstr "nog aan het laden" + +#~ msgid "" +#~ "On slow connections, the loading of the application menu can take a " +#~ "couple of seconds." +#~ msgstr "" +#~ "Bij een langzame verbinding kan het laden van het menu met de applicaties " +#~ "enige seconden duren" + #~ msgid "Disconnect and E&xit" #~ msgstr "Verbreek verbinding en e&xit" diff --git a/po/sv.po b/po/sv.po index 1218c5c..3826af5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 22:15+0200\n" +"POT-Creation-Date: 2012-05-22 00:16+0200\n" "PO-Revision-Date: 2012-04-06 09:56+0100\n" "Last-Translator: Daniel Lindgren <bd.dali(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" @@ -50,23 +50,23 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:472 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Användaren har inte rätt att starta X2Go-sessioner!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - anslut" @@ -92,33 +92,28 @@ msgstr "%s - SSH-proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentisering till SSH-proxy misslyckades!" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:520 -#, fuzzy, python-format -msgid "%s - DNS error" -msgstr "%s - nyckelfel" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:527 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, fuzzy, python-format msgid "%s - socket error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:506 -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - fel på serverns nyckel" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - hemkatalog saknas" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:548 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "Fjärranvändarens hemkatalog saknas." @@ -127,12 +122,12 @@ msgstr "Fjärranvändarens hemkatalog saknas." msgid "%s - key error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringsfel" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:499 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, fuzzy, python-format msgid "%s - SSH error" msgstr "%s - nyckelfel" @@ -155,7 +150,7 @@ msgstr "" "PyHoca-GUI\n" "Ansluter till ,,%s''" -#: ../pyhoca/wxgui/taskbar.py:82 +#: ../pyhoca/wxgui/taskbar.py:83 #, python-format msgid "" "PyHoca-GUI (Python X2goClient)\n" @@ -164,7 +159,7 @@ msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" "Anslutning till ,,%s'' pågår" -#: ../pyhoca/wxgui/taskbar.py:87 +#: ../pyhoca/wxgui/taskbar.py:89 msgid "" "PyHoca-GUI\n" "Connecting you to X2Go..." @@ -172,7 +167,7 @@ msgstr "" "PyHoca-GUI\n" "Ansluter dig till X2Go..." -#: ../pyhoca/wxgui/taskbar.py:90 +#: ../pyhoca/wxgui/taskbar.py:93 msgid "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" @@ -371,278 +366,282 @@ msgid "RDP options" msgstr "RDP-alternativ" #: ../pyhoca/wxgui/profilemanager.py:208 +msgid "Integrate remote application(s) into local desktop (rootless mode)" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Menu of published applications" msgstr "Meny med publicerade applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226 msgid "User" msgstr "Användare" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Host" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "RSA/DSA private key" msgstr "RSA/DSA privat nyckel" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Server behind SSH proxy" msgstr "Server bakom SSH-proxy" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Key file" msgstr "Nyckelfil" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Host[:Port]" msgstr "Server[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "SSH Proxy Tunnel" msgstr "SSH proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Method" msgstr "Metod" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Image quality" msgstr "Bildkvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Fullscreen" msgstr "Fullskärm" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Custom Size" msgstr "Anpassad storlek" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Set display DPI" msgstr "Ange skärmupplösning (DPI)" -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Keep current keyboard settings" msgstr "Behåll aktuella tangentbordsinställningar" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard layout" msgstr "Tangentbordslayout" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Keyboard model" msgstr "Tangentbordsmodell" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Enable sound support" msgstr "Aktivera ljudstöd" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Arts (not supported)" msgstr "Arts (ej supportad)" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Use default sound port" msgstr "Använd standardport för ljud" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Custom sound port" msgstr "Anpassad ljudport" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Client Side printing" msgstr "Stöd för utskrifter via klienten" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Use local folder sharing" msgstr "Använd lokal mappdelning" -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305 msgid "Add" msgstr "Lägg till" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Local Path" msgstr "Lokal sökväg" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:289 msgid "Connect Method" msgstr "Anslutningsmetod" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Delete" msgstr "Radera" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Convert between client and server encodings" msgstr "Konvertera kodtabell mellan klient och server" -#: ../pyhoca/wxgui/profilemanager.py:292 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Client encoding" msgstr "Kodtabell klient" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Server encoding" msgstr "Kodtabell server" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:298 msgid "Use file MIME box for local file import" msgstr "Använd MIME för lokal filimport" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Extensions" msgstr "Filändelser" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Action" msgstr "Hantering" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Save" msgstr "Spara" -#: ../pyhoca/wxgui/profilemanager.py:308 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Reset" msgstr "Återställ" -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 +#: ../pyhoca/wxgui/profilemanager.py:352 +#: ../pyhoca/wxgui/profilemanager.py:1029 +#: ../pyhoca/wxgui/profilemanager.py:1582 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 +#: ../pyhoca/wxgui/profilemanager.py:354 +#: ../pyhoca/wxgui/profilemanager.py:1031 msgid "manually" msgstr "manuellt" -#: ../pyhoca/wxgui/profilemanager.py:358 +#: ../pyhoca/wxgui/profilemanager.py:359 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilhanterare - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:360 +#: ../pyhoca/wxgui/profilemanager.py:361 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)" -#: ../pyhoca/wxgui/profilemanager.py:362 +#: ../pyhoca/wxgui/profilemanager.py:363 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilhanterare - %s" -#: ../pyhoca/wxgui/profilemanager.py:721 +#: ../pyhoca/wxgui/profilemanager.py:724 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:722 +#: ../pyhoca/wxgui/profilemanager.py:725 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:723 +#: ../pyhoca/wxgui/profilemanager.py:726 msgid "Connection" msgstr "Anslutning" -#: ../pyhoca/wxgui/profilemanager.py:724 +#: ../pyhoca/wxgui/profilemanager.py:727 msgid "Settings" msgstr "Inställningar" -#: ../pyhoca/wxgui/profilemanager.py:725 +#: ../pyhoca/wxgui/profilemanager.py:728 msgid "Sharing" msgstr "Delning" -#: ../pyhoca/wxgui/profilemanager.py:1203 +#: ../pyhoca/wxgui/profilemanager.py:1216 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1206 +#: ../pyhoca/wxgui/profilemanager.py:1219 msgid "Choose an icon for this session profile" msgstr "Välj en ikon för denna sessionsprofil" -#: ../pyhoca/wxgui/profilemanager.py:1365 +#: ../pyhoca/wxgui/profilemanager.py:1393 msgid "All files (*.*)|*" msgstr "Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1395 +#: ../pyhoca/wxgui/profilemanager.py:1410 msgid "Choose a public SSH key" msgstr "Välj en public SSH-nyckel" -#: ../pyhoca/wxgui/profilemanager.py:1534 +#: ../pyhoca/wxgui/profilemanager.py:1562 msgid "Choose a folder to share within a session" msgstr "Välj en mapp att dela i en session" -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1626 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 +#: ../pyhoca/wxgui/profilemanager.py:1637 +#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profilhanterare" -#: ../pyhoca/wxgui/profilemanager.py:1598 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnamn saknas, profil oanvändbar!" -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 +#: ../pyhoca/wxgui/profilemanager.py:1629 +#: ../pyhoca/wxgui/profilemanager.py:1632 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilen %s finns redan!" -#: ../pyhoca/wxgui/profilemanager.py:1609 +#: ../pyhoca/wxgui/profilemanager.py:1637 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." -#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/profilemanager.py:1647 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -653,21 +652,21 @@ msgstr "" "proxy.\n" "Ändra konfiguration för SSH-proxy ." -#: ../pyhoca/wxgui/profilemanager.py:1639 +#: ../pyhoca/wxgui/profilemanager.py:1667 #, python-format msgid "%s - profile added" msgstr "%s - profil tillagd" -#: ../pyhoca/wxgui/profilemanager.py:1640 +#: ../pyhoca/wxgui/profilemanager.py:1668 msgid "A new session profile has been added." msgstr "En ny sessionsprofil har lagts till." -#: ../pyhoca/wxgui/profilemanager.py:1644 +#: ../pyhoca/wxgui/profilemanager.py:1672 #, python-format msgid "%s - modified" msgstr "%s - ändrad" -#: ../pyhoca/wxgui/profilemanager.py:1645 +#: ../pyhoca/wxgui/profilemanager.py:1673 msgid "Changes to profile have been saved." msgstr "Ändringar av profil har sparats." @@ -700,8 +699,8 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 -#: ../pyhoca/wxgui/menus_taskbar.py:890 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Avsluta" @@ -709,7 +708,7 @@ msgstr "&Avsluta" msgid "Window title" msgstr "Fönstertitel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Återanslut session" @@ -725,35 +724,35 @@ msgstr "Flytta session" msgid "Transfer Session (not possible)" msgstr "Flytta session (ej möjligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 #, fuzzy msgid "Suspend Session (and disconnect/exit)" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 #, fuzzy msgid "Suspend Session (and disconnect)" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Försätt session i vila" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 #, fuzzy msgid "Terminate Session (and disconnect/exit)" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 #, fuzzy msgid "Terminate Session (and disconnect)" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "" @@ -781,237 +780,235 @@ msgstr "Avsluta delning:" msgid "Unshare &all local folders" msgstr "Avsluta delning av lokala mappar" -#: ../pyhoca/wxgui/menus_taskbar.py:387 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" msgstr "Ljud och bild" -#: ../pyhoca/wxgui/menus_taskbar.py:388 +#: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" msgstr "Programmering" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:392 msgid "Education" msgstr "Utbildning" -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" msgstr "Spel" -#: ../pyhoca/wxgui/menus_taskbar.py:391 +#: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" msgstr "Grafik" -#: ../pyhoca/wxgui/menus_taskbar.py:392 +#: ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Internet" msgstr "Internet" -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Office Applications" msgstr "Kontor" -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" msgstr "System" -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" msgstr "Verktyg" -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Other Applications" msgstr "Övriga applikationer" -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "still loading" -msgstr "laddar fortfarande" - -#: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" -"Vid långsam uppkoppling så kan laddning av programmeny ta några sekunder." - -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 -#: ../pyhoca/wxgui/menus_taskbar.py:631 -msgid "Retrieving Application Menu..." -msgstr "Hämtar applikationsmeny..." - -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "Anslut %s" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." msgstr "Anslutning pågår..." -#: ../pyhoca/wxgui/menus_taskbar.py:487 +#: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "Starta &ny Skrivbordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +msgid "Retrieving Application Menu..." +msgstr "Hämtar applikationsmeny..." + +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "Hämta applikationsmeny" -#: ../pyhoca/wxgui/menus_taskbar.py:499 +#: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Starta &ny session" -#: ../pyhoca/wxgui/menus_taskbar.py:580 +#: ../pyhoca/wxgui/menus_taskbar.py:576 msgid "Launch Single Application" msgstr "Starta applikation" -#: ../pyhoca/wxgui/menus_taskbar.py:618 +#: ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Manage Application Menu" msgstr "Hantera applikationsmeny" -#: ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" msgstr "Aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:659 msgid "Suspended" msgstr "Vilande" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:678 msgid "&Clean all sessions" msgstr "&Rensa alla sessioner" -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Customize &profile" msgstr "Anpassa &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:701 +#: ../pyhoca/wxgui/menus_taskbar.py:696 msgid "Shared &folders" msgstr "Delade &mappar" -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:708 msgid "&Disconnect from Server" msgstr "&Koppla från server" -#: ../pyhoca/wxgui/menus_taskbar.py:720 +#: ../pyhoca/wxgui/menus_taskbar.py:715 #, fuzzy msgid "Suspend Session and E&xit application" msgstr "Försätter session i vila och avslutar..." -#: ../pyhoca/wxgui/menus_taskbar.py:724 +#: ../pyhoca/wxgui/menus_taskbar.py:719 #, fuzzy msgid "Disconnect and E&xit application" msgstr "Kopplar från %s och avslutar ..." -#: ../pyhoca/wxgui/menus_taskbar.py:753 +#: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" msgstr "Lägg till profil" -#: ../pyhoca/wxgui/menus_taskbar.py:829 +#: ../pyhoca/wxgui/menus_taskbar.py:824 msgid "No session profiles defined" msgstr "Inga sessionsprofiler har definierats" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Start/Resume Session" msgstr "Starta/återanslut session" -#: ../pyhoca/wxgui/menus_taskbar.py:860 +#: ../pyhoca/wxgui/menus_taskbar.py:855 msgid "Connect Server" msgstr "Anslut till server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Om %s ..." -#: ../pyhoca/wxgui/frontend.py:361 +#: ../pyhoca/wxgui/frontend.py:371 msgid "Suspending sessions and exiting application..." msgstr "Försätter session i vila och avslutar..." -#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:374 #, fuzzy, python-format msgid "Disconnecting %s and exiting application..." msgstr "Kopplar från %s och avslutar ..." -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." msgstr "Avslutar applikation..." -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 #, python-format msgid "%s - server warning" msgstr "%s - servervarning" -#: ../pyhoca/wxgui/frontend.py:446 +#: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." msgstr "X2Go-servern publicerar inte en applikationsmeny." -#: ../pyhoca/wxgui/frontend.py:479 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Autentisering med publik SSH-nyckel lyckades." -#: ../pyhoca/wxgui/frontend.py:513 +#: ../pyhoca/wxgui/frontend.py:523 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 #, fuzzy, python-format msgid "%s - EOF error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/frontend.py:534 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Autentisering slutfördes ej! Prova igen..." -#: ../pyhoca/wxgui/frontend.py:541 +#: ../pyhoca/wxgui/frontend.py:551 #, python-format msgid "%s - auth key error" msgstr "%s - autentiseringsnyckel fel" -#: ../pyhoca/wxgui/frontend.py:562 +#: ../pyhoca/wxgui/frontend.py:572 msgid "An unknown error occurred during authentication!" msgstr "Ett okänt fel inträffade vid autentisering!" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:600 msgid "Unknown session profile, configure before using it..." msgstr "Okänd sessionsprofil, konfigurera före användning..." -#: ../pyhoca/wxgui/frontend.py:718 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#, python-format +msgid "%s - session warning" +msgstr "%s - sessionsvarning" + +#: ../pyhoca/wxgui/frontend.py:655 +#, python-format +msgid "Execution of command ,,%s'' failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." msgstr "Rensar X2Go-sessioner..." -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - disconnect" msgstr "%s - koppla från" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:763 msgid "X2Go Profile is now disconnected." msgstr "X2Go-profil är nu frånkopplad" -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:776 msgid "New Session Profile" msgstr "Ny sessionsprofil" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Är du säker på att du vill radera profil ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 #, python-format msgid "%s - profile deleted" msgstr "%s - profil raderad" -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:822 msgid "The session profile has been deleted." msgstr "Profilen har raderats." -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:837 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - dela lokal mapp med sessioner som använder denna profil" -#: ../pyhoca/wxgui/frontend.py:913 +#: ../pyhoca/wxgui/frontend.py:926 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1024,17 +1021,17 @@ msgstr "" "\n" "Litar du på denna nyckel?" -#: ../pyhoca/wxgui/frontend.py:921 +#: ../pyhoca/wxgui/frontend.py:934 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bekräfta tillägg av server" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "%s - channel error" msgstr "%s - kanalfel" -#: ../pyhoca/wxgui/frontend.py:940 +#: ../pyhoca/wxgui/frontend.py:953 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1042,22 +1039,22 @@ msgid "" msgstr "" "Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:957 -#: ../pyhoca/wxgui/frontend.py:959 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" -#: ../pyhoca/wxgui/frontend.py:950 +#: ../pyhoca/wxgui/frontend.py:964 msgid "The session startup failed." msgstr "Sessionsstart misslyckades." -#: ../pyhoca/wxgui/frontend.py:957 +#: ../pyhoca/wxgui/frontend.py:971 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandot ,,%s'' finns inte på X2Go-server." -#: ../pyhoca/wxgui/frontend.py:959 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1066,12 +1063,7 @@ msgstr "" "Kommandot ,,%s'' finns inte på X2Go-server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:965 -#, python-format -msgid "%s - session warning" -msgstr "%s - sessionsvarning" - -#: ../pyhoca/wxgui/frontend.py:965 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1079,7 +1071,7 @@ msgid "" msgstr "" "Omvänd TCP port forwarding för session %s till serverport %s har nekats." -#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1088,35 +1080,35 @@ msgstr "" "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " "Sessionsstart misslyckades." -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 #, python-format msgid "%s - audio warning" msgstr "%s - ljudvarning" -#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:997 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner." -#: ../pyhoca/wxgui/frontend.py:986 ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:1000 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio kunde ej startas." -#: ../pyhoca/wxgui/frontend.py:989 +#: ../pyhoca/wxgui/frontend.py:1003 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio avslutades oväntat." -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio problem" msgstr "%s - ljudproblem" -#: ../pyhoca/wxgui/frontend.py:992 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1125,12 +1117,12 @@ msgstr "" "Anslutning för ljud kunde ej genomföras för denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "%s - client-side printing not available" msgstr "%s - klientdelade utskrifter ej tillgängliga" -#: ../pyhoca/wxgui/frontend.py:995 +#: ../pyhoca/wxgui/frontend.py:1009 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1139,12 +1131,12 @@ msgstr "" "Servern tillåter ej utskrifter via klient från denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME ej tillgängligt" -#: ../pyhoca/wxgui/frontend.py:998 +#: ../pyhoca/wxgui/frontend.py:1012 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1153,12 +1145,12 @@ msgstr "" "Servern stöder ej X2Go MIME.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - klientmappar ej delningsbara" -#: ../pyhoca/wxgui/frontend.py:1001 +#: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1167,12 +1159,12 @@ msgstr "" "Servern tillåter ej klientdelade mappar i denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client resources not sharable" msgstr "%s - klientresurser ej delningsbara" -#: ../pyhoca/wxgui/frontend.py:1004 +#: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1181,12 +1173,12 @@ msgstr "" "Klientdelade mappar och utskrifter kan ej delas med denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1018 ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" -#: ../pyhoca/wxgui/frontend.py:1018 +#: ../pyhoca/wxgui/frontend.py:1032 #, python-format msgid "" "%s\n" @@ -1197,7 +1189,7 @@ msgstr "" "... orsakat på skrivare %s av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1020 +#: ../pyhoca/wxgui/frontend.py:1034 #, python-format msgid "" "%s\n" @@ -1208,12 +1200,12 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1024 ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "%s - start" msgstr "%s - startar" -#: ../pyhoca/wxgui/frontend.py:1024 +#: ../pyhoca/wxgui/frontend.py:1038 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1222,7 +1214,7 @@ msgstr "" "Ny X2Go-session startar ...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1028 +#: ../pyhoca/wxgui/frontend.py:1042 #, python-format msgid "" "Another client started X2Go session\n" @@ -1231,12 +1223,12 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "%s - resume" msgstr "%s - återanslut" -#: ../pyhoca/wxgui/frontend.py:1032 +#: ../pyhoca/wxgui/frontend.py:1046 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1245,7 +1237,7 @@ msgstr "" "Återansluter X2Go-session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1036 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1254,12 +1246,12 @@ msgstr "" "En annan klient återanslöt X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1040 +#: ../pyhoca/wxgui/frontend.py:1054 #, python-format msgid "" "Found already running session\n" @@ -1268,12 +1260,12 @@ msgstr "" "Hittade aktiv session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "%s - suspend" msgstr "%s - vila" -#: ../pyhoca/wxgui/frontend.py:1048 +#: ../pyhoca/wxgui/frontend.py:1062 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1282,12 +1274,12 @@ msgstr "" "X2Go-session har försatts i vila\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "%s - terminate" msgstr "%s - avsluta" -#: ../pyhoca/wxgui/frontend.py:1064 +#: ../pyhoca/wxgui/frontend.py:1078 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1430,6 +1422,19 @@ msgstr "Ändra sessionstitel till" msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "%s - DNS error" +#~ msgstr "%s - nyckelfel" + +#~ msgid "still loading" +#~ msgstr "laddar fortfarande" + +#~ msgid "" +#~ "On slow connections, the loading of the application menu can take a " +#~ "couple of seconds." +#~ msgstr "" +#~ "Vid långsam uppkoppling så kan laddning av programmeny ta några sekunder." + #~ msgid "Disconnect and E&xit" #~ msgstr "Koppla ifrån och avsluta" diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index a97f18a..a34f6b9 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -652,7 +652,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): try: _s._X2goSession__exec_published_application(exec_name=_exec, timeout=40) except x2go.x2go_exceptions.X2goControlSessionException, e: - self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Execution of command ,,%s'' failed.') % _exec, icon='session_warning', timeout=10000) + self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Execution of command ,,%s\'\' failed.') % _exec, icon='session_warning', timeout=10000) except KeyError: pass diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 7e4df6f..f1d6c5e 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -205,6 +205,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", ) self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+':') self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", ) + self.RootlessSession = wx.CheckBox(self.tab_Session, -1, _(u"Integrate remote application(s) into local desktop (rootless mode)")) self.UsePublishedApplications = wx.CheckBox(self.tab_Session, -1, _(u"Menu of published applications")) self._last_pubapp_value = None self._last_auto_start_value = None @@ -386,6 +387,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPServer.SetMinSize((-1, self._textfield_height)) self.RDPOptionsLabel.SetMinSize((180, 16)) self.RDPOptions.SetMinSize((-1, self._textfield_height)) + self.RootlessSession.SetMinSize((-1, self._textfield_height)) self.UsePublishedApplications.SetMinSize((-1, self._textfield_height)) self.UserNameLabel.SetMinSize((110, 16)) @@ -493,7 +495,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_2_1_1.Add(self.RDPServer, pos=(6,1), flag=wx.EXPAND, ) sizer_2_1_1.Add(self.RDPOptionsLabel, pos=(7,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) sizer_2_1_1.Add(self.RDPOptions, pos=(7,1), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.UsePublishedApplications, pos=(8,0), span=(1,2), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.RootlessSession, pos=(8,0), span=(1,2), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.UsePublishedApplications, pos=(9,0), span=(1,2), flag=wx.EXPAND, ) sizer_2_1.Add(sizer_2_1_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_2.Add(sizer_2_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) self.tab_Session.SetSizerAndFit(sizer_2) @@ -842,6 +845,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _command = self.profile_config['command'] _published = self.profile_config['published'] + self.RootlessSession.SetValue(self.profile_config['rootless']) # disable all command relevant widgets first self.ApplicationLabel.Enable(False) @@ -850,12 +854,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Command.Enable(False) self.XDMCPServerLabel.Enable(False) self.XDMCPServer.Enable(False) + self.RootlessSession.Enable(False) self.UsePublishedApplications.SetValue(_published) if _command in self.sessionChoices.keys(): self.SessionType.SetValue(self.sessionChoices[_command]) self.Application.SetValue('') self.Command.SetValue('') + if _command not in defaults.X2GO_DESKTOPSESSIONS.keys(): + self.RootlessSession.SetValue(True) elif _command in self.applicationChoices.keys(): self.SessionType.SetValue(self.sessionChoices['APPLICATION']) self.ApplicationLabel.Enable(True) @@ -864,6 +871,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Command.SetValue('') self.UsePublishedApplications.SetValue(False) self.UsePublishedApplications.Enable(False) + self.RootlessSession.SetValue(True) elif not _command and _published: self.SessionType.SetValue(self.sessionChoices['PUBLISHEDAPPLICATIONS']) self.UsePublishedApplications.Enable(False) @@ -871,18 +879,21 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.AutoStartSession.SetValue(True) self.Command.SetValue('') self._last_pubapp_value = True + self.RootlessSession.SetValue(True) else: self.SessionType.SetValue(self.sessionChoices['CUSTOM']) self.UsePublishedApplications.SetValue(False) self.UsePublishedApplications.Enable(False) self.Command.Enable(True) self.Command.SetValue(_command) + self.RootlessSession.Enable(True) if _command == 'XDMCP': self.XDMCPServerLabel.Enable(True) self.XDMCPServer.Enable(True) self.UsePublishedApplications.SetValue(False) self.UsePublishedApplications.Enable(False) + self.RootlessSession.Enable(False) if _command in ('RDP', 'DirectRDP'): self.RDPServerLabel.Enable(True) @@ -891,6 +902,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPOptions.Enable(True) self.UsePublishedApplications.SetValue(False) self.UsePublishedApplications.Enable(False) + self.RootlessSession.SetValue(True) + self.RootlessSession.Enable(False) else: self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) @@ -1113,7 +1126,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['rootless'] = True elif _session_type == 'CUSTOM': _command = self.Command.GetValue() - self.profile_config['rootless'] = True + self.profile_config['rootless'] = self.RootlessSession.GetValue() elif _session_type == 'RDP': _command = _session_type self.profile_config['rootless'] = True @@ -1283,6 +1296,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0] self.UsePublishedApplications.Enable(True) self.AutoStartSession.Enable(True) + + if _session_type in defaults.X2GO_DESKTOPSESSIONS.keys(): + self.RootlessSession.SetValue(False) + self.RootlessSession.Enable(False) + if _session_type == 'APPLICATION': self.ApplicationLabel.Enable(True) self.Application.Enable(True) @@ -1290,6 +1308,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UsePublishedApplications.Enable(False) if not self.Application.GetValue(): self.Application.SetValue(self.applicationChoices['TERMINAL']) + self.RootlessSession.SetValue(True) + self.RootlessSession.Enable(False) else: self.ApplicationLabel.Enable(False) self.Application.Enable(False) @@ -1301,6 +1321,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UsePublishedApplications.Enable(False) if not self.Command.GetValue(): self.Command.SetValue('xterm') + self.RootlessSession.SetValue(True) + self.RootlessSession.Enable(True) else: self.CommandLabel.Enable(False) self.Command.Enable(False) @@ -1310,6 +1332,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.XDMCPServer.Enable(True) self.UsePublishedApplications.SetValue(False) self.UsePublishedApplications.Enable(False) + self.RootlessSession.SetValue(False) + self.RootlessSession.Enable(False) else: self.XDMCPServerLabel.Enable(False) self.XDMCPServer.Enable(False) @@ -1321,6 +1345,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPOptions.Enable(True) self.UsePublishedApplications.SetValue(False) self.UsePublishedApplications.Enable(False) + self.RootlessSession.SetValue(True) + self.RootlessSession.Enable(False) else: self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) @@ -1340,6 +1366,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.AutoStartSession.SetValue(True) self.AutoStartSession.Enable(False) self.Command.SetValue('') + self.RootlessSession.SetValue(True) + self.RootlessSession.Enable(False) else: if self._last_pubapp_value is not None: self.UsePublishedApplications.SetValue(self._last_pubapp_value) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-237-g274f40e
by git-admin＠x2go.org 21 May '12

21 May '12

The branch, master has been updated via 274f40e28bb16559463a25c934c526eec99f130f (commit) from 406d9c04b562dc27c37ec082a8091aeb6b993fa4 (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 274f40e28bb16559463a25c934c526eec99f130f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 22 00:08:27 2012 +0200 Allow custom commands to be desktop sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cabacf7..c2ef1dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -125,6 +125,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Catch exceptions while calling SSH transport's getpeername() method. - Fix control session failure notifications. Show them immediately after the connection broke. + - Allow custom commands to be desktop sessions. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index c8a1ec1..0cc54ae 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -128,8 +128,6 @@ class X2goSessionParams(object): self.session_type = 'D' elif os.path.basename(cmd) in _X2GO_DESKTOPSESSIONS.values(): self.session_type = 'D' - elif self.session_type not in ("S", "shared", "shadow"): - self.session_type = 'R' if self.session_type in ("D", "desktop"): self.session_type = 'D' hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

buildscripts.git - master (branch) updated: 401c50405a8c0d739fb55f4296b37484290c83c0
by git-admin＠x2go.org 19 May '12

19 May '12

The branch, master has been updated via 401c50405a8c0d739fb55f4296b37484290c83c0 (commit) from f4331ab1477831b4f69938d3134d9fe7a167bdf9 (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 401c50405a8c0d739fb55f4296b37484290c83c0 Author: X2Go Admin Account <x2go-admin(a)Debian-60-squeeze-64-minimal.(none)> Date: Sat May 19 14:39:54 2012 +0200 add PowerPC support for Ubuntu ----------------------------------------------------------------------- Summary of changes: home/.pbuilderrc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/home/.pbuilderrc b/home/.pbuilderrc index 7043228..a873955 100644 --- a/home/.pbuilderrc +++ b/home/.pbuilderrc @@ -35,7 +35,7 @@ KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz ARCH_DISKDEVICE=sd if [ "x$ARCH" = "xarmel" ]; then MEMORY_MEGS=256 - INITRD="" + INITRD= else SMP="2" MEMORY_MEGS=512 @@ -43,7 +43,11 @@ else fi if [ "x${DIST}" = "xubuntu" ]; then - MIRRORSITE="http://localhost:3142/ubuntu" + if [ "x$ARCH" = "xarmel" ] || [ "x$ARCH" = "xpowerpc" ]; then + MIRRORSITE="http://localhost:3142/ports.ubuntu.com/" + else + MIRRORSITE="http://localhost:3142/ubuntu" + fi elif [ "x${DIST}" = "xdebian" ]; then if [ "x${CODENAME}" = "xlenny" ]; then MIRRORSITE="http://localhost:3142/archive.debian.org/debian" hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-16-gb81c5c9
by git-admin＠x2go.org 18 May '12

18 May '12

The branch, master has been updated via b81c5c9784ac0a999d2183b275e0a52300a90184 (commit) from 147d22c44167b9b2d4afbdaf17262555a7af713b (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 b81c5c9784ac0a999d2183b275e0a52300a90184 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 19 01:44:54 2012 +0200 beautify preinst script notification ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.preinst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index 117bb2c..fdff7bf 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -23,8 +23,8 @@ case "$1" in # 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" + echo "The group ,,x2gousers'' is no longer used by X2Go and can be" + echo "removed as soon as no users are members of this group anymore." fi ;; abort-upgrade) hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-246-g12e0b9a
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via 12e0b9a0396ffb5651b21e0959dd09373a4ed921 (commit) from 05d7b359e15775162ea1d0c47fd909c5cecbaf6a (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 12e0b9a0396ffb5651b21e0959dd09373a4ed921 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 13:20:14 2012 +0200 extension fix ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/about.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 72865b1..436d5b6 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -88,7 +88,7 @@ class PyHocaGUI_AboutFrame(wx.Frame): icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, icon_name)) if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): - icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, 'pyhoca-winicon.png')) + icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, 'pyhoca-winicon')) img = wx.Image(icon_file) icon = wx.IconFromBitmap(img.ConvertToBitmap()) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-245-g05d7b35
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via 05d7b359e15775162ea1d0c47fd909c5cecbaf6a (commit) from b15b026507355da01f19925b1c864a7d82f3579f (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 05d7b359e15775162ea1d0c47fd909c5cecbaf6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 13:18:16 2012 +0200 Add option --about-image. Allow changing the application's name by renaming the ,,pyhoca-gui'' script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + pyhoca-gui | 3 +- pyhoca/wxgui/about.py | 47 +++++++++++++++++++++++++++++++++------------ pyhoca/wxgui/frontend.py | 8 ++++++- 4 files changed, 45 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ddd42e5..87b9095 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,6 +133,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Do not crash if a provided system tray icon cannot be found. Use a fallback icon instead. - os.path.is<type> require string option, not Unicode. + - Add option --about-image. Allow changing the application's name by + renaming the ,,pyhoca-gui'' script. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca-gui b/pyhoca-gui index f3c6b31..8972fc3 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -214,6 +214,7 @@ x2go_gui_options = [ {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', }, {'args':['--disconnect-on-terminate'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been terminated', }, {'args':['--splash-image'], 'default': None, 'metavar': '<your-splash-image>', 'help': 'define an alternative splash image that gets shown on application startup (PNG files only, full path or filename as found in <share>/img)', }, + {'args':['--about-image'], 'default': None, 'metavar': '<your-about-window-image>', 'help': 'define an alternative image for the application\'s ,,About\'\' window (PNG files only, full path or filename as found in <share>/img)', }, {'args':['--disable-splash'], 'default': False, 'action': 'store_true', 'help': 'disable the applications splash screen', }, {'args':['--disable-options'], 'default': False, 'action': 'store_true', 'help': 'disable the client options configuration window', }, {'args':['--disable-printingprefs'], 'default': False, 'action': 'store_true', 'help': 'disable the client\'s printing preferences window', }, @@ -359,7 +360,7 @@ def main(): version() try: - thisPyHocaGUI = PyHocaGUI(args, logger, liblogger, version=VERSION) + thisPyHocaGUI = PyHocaGUI(args, logger, liblogger, appname=PROG_NAME, version=VERSION) thisPyHocaGUI.MainLoop() except KeyboardInterrupt: thisPyHocaGUI.WakeUpIdle() diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index eccd08f..72865b1 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -46,32 +46,53 @@ class PyHocaGUI_AboutFrame(wx.Frame): STILL UNDOCUMENTED """ - def __init__(self, _PyHocaGUI, caller=None): + def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png'): self._PyHocaGUI = _PyHocaGUI self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger + fallback_about_image = 'pyhoca-about-logo.png' + + if about_image is None: + about_image = fallback_about_image + + if os.path.basename(about_image) == about_image: + about_image = os.path.join(basepath.images_basepath, about_image) + + if not (os.path.isfile(about_image) or os.path.islink(about_image)): + about_image = os.path.join(basepath.images_basepath, fallback_about_image) + if x2go.X2GOCLIENT_OS == 'Windows': - wx.Frame.__init__(self, None, -1, _('About %s ...') % 'PyHoca-GUI', size=(403,319)) + wx.Frame.__init__(self, None, -1, _(u'About %s ...') % self._PyHocaGUI.appname, size=(403,319)) else: - wx.Frame.__init__(self, None, -1, _('About %s ...') % 'PyHoca-GUI', size=(400,298)) + wx.Frame.__init__(self, None, -1, _(u'About %s ...') % self._PyHocaGUI.appname, size=(400,298)) self.Bind(wx.EVT_CLOSE, self.OnHide) - panel = wx.Panel(self, -1, pos=(0,3)) - panel.SetBackgroundColour("White") + panel = wx.Panel(self, -1, pos=(0,0), size=(0,0), ) panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown) panel.SetFocus() - _logo_bitmap = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-about-logo.png')), (0, 0)) + about_wximage = wx.Image(about_image, wx.BITMAP_TYPE_PNG, ) + about_wximage.Rescale(400, int(float(400)/about_wximage.Width*about_wximage.Height)) + about_wxbitmap = about_wximage.ConvertToBitmap() + + _logo_bitmap = wx.StaticBitmap(self, wx.ID_ANY, about_wxbitmap, (0, 0)) self.bitmap = _logo_bitmap - if x2go.X2GOCLIENT_OS == 'Windows': - _icon = wx.Bitmap(os.path.join(basepath.icons_basepath, os.path.normpath('PyHoca/16x16/pyhoca-winicon.png'))) - elif x2go.X2GOCLIENT_OS == 'Mac': - _icon = wx.Bitmap(os.path.join(basepath.icons_basepath, os.path.normpath('PyHoca/128x128/pyhoca-winicon.png'))) - else: - _icon = wx.Bitmap(os.path.join(basepath.icons_basepath, os.path.normpath('PyHoca/22x22/pyhoca-winicon.png'))) - self.icon = self.SetIcon(wx.IconFromBitmap(_icon)) + if "wxMSW" in wx.PlatformInfo: + icon_size = '16x16' + elif "wxGTK" in wx.PlatformInfo: + icon_size = '22x22' + elif "wxMAC" in wx.PlatformInfo: + icon_size = '128x128' + + icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, icon_name)) + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): + icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, 'pyhoca-winicon.png')) + + img = wx.Image(icon_file) + icon = wx.IconFromBitmap(img.ConvertToBitmap()) + self.icon = self.SetIcon(icon) self.CenterOnScreen() diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 43518e2..a97f18a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -100,6 +100,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ + if appname == 'pyhoca-gui': + # capitalize the application's name + appname = 'PyHoca-GUI' self.appname = appname self.vendorname = vendorname self.version = version @@ -242,7 +245,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._pyhoca_logger('PyHoca GUI is starting up', loglevel=x2go.log.loglevel_INFO, ) self._pyhoca_logger('registering PyHocaGUI control sessions', loglevel=x2go.log.loglevel_INFO, ) - self.about = about.PyHocaGUI_AboutFrame(self) + if self.args.tray_icon: + self.about = about.PyHocaGUI_AboutFrame(self, about_image=self.args.about_image, icon_name=self.args.tray_icon) + else: + self.about = about.PyHocaGUI_AboutFrame(self, about_image=self.args.about_image) self.about.Show(False) self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self.about) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2012