x2go-commits June 2012

x2go-commits@lists.x2go.org

1 participants
114 discussions

x2goclient.git - master (branch) updated: 3.99.2.0-18-gadefcb0
by git-admin＠x2go.org 02 Jun '12

02 Jun '12

The branch, master has been updated via adefcb0cd27987107424e251a4d172b930390a14 (commit) via f388d5f473a4939730a10ecb1e50611c45732717 (commit) via 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd (commit) via dd0a6376138afbaec5b5447360a32bf6bdf24d7b (commit) via bad7a0bdb342649e5cad359d644bd5e33cbf7d54 (commit) via 367b245a575649a16fe01320f0ba412cc5fa73a5 (commit) via ea3adb1cce7727a6114537ee3039e044f297d2dd (commit) via 82e8f77fc996de04b148ae9c6d53a78f37442ec9 (commit) from 4f41b1600794e06c5a9ec5e14b1621c52f867ae0 (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 adefcb0cd27987107424e251a4d172b930390a14 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 05:29:33 2012 +0200 Add support for Mac OS X 10.4 Tiger. It won't be officially supported though. This patch enables a compatibility mode for Mac OS X 10.4. Using this, interaction with the local X11 server and a remote server works fine. Note however, that there is one limitation: x2goclient will start one X11 server per connection. For security reasons, this is necessary. It will *not* clean up X11 server processes. This is left to the user. More information about 10.4 support will be posted on the x2go-dev mailing list (shortly). commit f388d5f473a4939730a10ecb1e50611c45732717 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 04:09:47 2012 +0200 Add easy to turn on/off SSH packet logging to sshmasterconnection.cpp. From now on, simply use the defines at the beginning of the file. commit 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 04:06:42 2012 +0200 Fix a potential bug in the handling of ssh hosts given to libssh. Do the conversion as suggested by the Qt FAQ at http://qt-project.org/faq/answer/how_can_i_convert_a_qstring_to_char_and_vi… commit dd0a6376138afbaec5b5447360a32bf6bdf24d7b Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:59:41 2012 +0200 Fix copyright header on sshmasterconnection.cpp commit bad7a0bdb342649e5cad359d644bd5e33cbf7d54 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:53:27 2012 +0200 Change the Makefile to not delete more temporary files than necessary. A maxdepth of two will crush all temp files in the build directories. Do not mess with other stuff, especially if users are building bundled software inside a contrib/dist directory under the main tree. commit 367b245a575649a16fe01320f0ba412cc5fa73a5 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:47:47 2012 +0200 Add support for PowerPC on Mac OS X. Add the Info.plist file to x2goclient.pro commit ea3adb1cce7727a6114537ee3039e044f297d2dd Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:41:05 2012 +0200 Minor style/whitespace fixes for x2goclient.pro. commit 82e8f77fc996de04b148ae9c6d53a78f37442ec9 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:38:05 2012 +0200 Add translation file processing to x2goclient.pro. Automatically build the required x2goclient_*.qm files based on the x2goclient_*.ts translation files. ----------------------------------------------------------------------- Summary of changes: Makefile | 8 ++-- onmainwindow.cpp | 132 ++++++++++++++++++++++++++++++++++++++++++++--- sshmasterconnection.cpp | 19 +++++-- x2goclient.pro | 31 +++++++++--- 4 files changed, 166 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 30c12dc..19d83db 100755 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ build_man: ${MAKE} -f Makefile.man2html build clean: clean_client clean_plugin clean_man - find . -type f -name '*.o' -exec rm -vf {} + - find . -type f -name 'moc_*.cpp' -exec rm -vf {} + - find . -type f -name 'ui_*.h' -exec rm -vf {} + - find . -type f -name 'qrc_*.cpp' -exec rm -vf {} + + find . -type f -maxdepth 2 -name '*.o' -exec rm -vf {} + + find . -type f -maxdepth 2 -name 'moc_*.cpp' -exec rm -vf {} + + find . -type f -maxdepth 2 -name 'ui_*.h' -exec rm -vf {} + + find . -type f -maxdepth 2 -name 'qrc_*.cpp' -exec rm -vf {} + rm -f x2goclient rm -f x2goclient.tag diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 9a55755..7bda2ed 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4730,10 +4730,22 @@ void ONMainWindow::slotTunnelOk() } #endif // Q_OS_WIN #if defined ( Q_OS_DARWIN ) - //setting /usr/X11/bin to find xauth + // setting /usr/X11/bin to find xauth + // /usr/X11R6/bin is added for compatibility reasons with OS X 10.4. env.insert ( 0, - "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin" ); + "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/X11R6/bin" ); + // Set the NX base dir to bundle/exe/, used for finding nxauth. + { + QDir tmpDir (appDir); + tmpDir.cd ("../exe"); + env.append ("NX_SYSTEM=" + tmpDir.absolutePath ()); + } + if (dispInd == -1) + { + x2goDebug << "No DISPLAY variable found in global environment, using autodetected setting."; + env.append ("DISPLAY=" + disp); + } #endif nxproxy->setEnvironment ( env ); /* x2goDebug<<"new env:"<<endl; @@ -7592,19 +7604,123 @@ QString ONMainWindow::getXDisplay() QLocalSocket unixSocket (this); QString xsocket (getenv ("DISPLAY")); - // OS X starts the X11 server automatically, as soon as the launchd UNIX socket - // is accessed. + if (xsocket.isEmpty ()) + { + // Mac OS X 10.4 compatibility mode. + // There, it is possible no $DISPLAY variable is set. + // Start X11 manually. First, find a free display number. + x2goDebug << "entering 10.4 compat mode, checking for free X11 display"; + + int xFreeDisp = 0; + QDir xtmpdir ("/tmp/.X11-unix"); + + if (xtmpdir.exists ()) + { + xtmpdir.setFilter (QDir::Files | QDir::System | QDir::NoSymLinks | QDir::NoDotAndDotDot); + xtmpdir.setSorting (QDir::Name); + + QFileInfoList xtmpdirList = xtmpdir.entryInfoList (); + bool foundFreeDisp = FALSE; + xFreeDisp = -1; + + for (int i = 0; (i < 2000) && (!foundFreeDisp); ++i) + { + QFileInfo xtmpdirFile (xtmpdir.absolutePath () + "/X" + QString::number (i)); + + if ((!xtmpdirFile.exists ()) && (!xtmpdirFile.isSymLink ())) + { + xFreeDisp = i; + foundFreeDisp = TRUE; + } + } + } + + // Control flow will go to error condition if no free display port has been found. + if (xFreeDisp != -1) + { + xsocket = "/tmp/.X11-unix/X" + QString::number (xFreeDisp); + x2goDebug << "Successfully detected free socket " << xsocket << "."; + } + + if (!(xsocket.isEmpty ())) + { + QString xname = ConfigDialog::getXDarwinDirectory () + "/Contents/MacOS/X11"; + QString xopt = ":" + QString::number (xFreeDisp); + QProcessEnvironment env = QProcessEnvironment::systemEnvironment (); + QProcess* startx = new QProcess (this); + + x2goDebug << "Starting the X server on free display port."; + env.insert (0, "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin"); + + startx->setProcessEnvironment (env); + startx->start (xname + QString (" ") + xopt, QIODevice::NotOpen); + if (startx->waitForStarted (3000)) + { + x2goDebug << "sleeping for three seconds"; + int sleeptime = 3; + while ((sleeptime = sleep (sleeptime))) {}; + + x2goDebug << "Leaving OS X 10.4 compat mode."; + } + } + } + + // OS X >= 10.5 starts the X11 server automatically, as soon as the + // launchd UNIX socket is accessed. // On user login, the DISPLAY environment variable is set to this said existing // socket. - // By now, we should have a socket. Test, if connecting works. - if ((!xsocket.isEmpty ())) - { + // By now, we should have a socket, even on 10.4. Test, if connecting works. + // Note: common sense may tell you to change this if into an else. Don't. + // We do not want to skip this part, if coming from the compat section above. + if (!(xsocket.isEmpty ())) + { + if (xsocket[0] == ':') + { + // Be backwards compatible with 10.4. + // Delete the ":" character. + xsocket.remove (0, 1); + // xsocket may now contain the display value (one integer), + // or something like "0.0" - we're only interested in the + // display value, so keep the first char only. + if (xsocket.indexOf (".") != -1) + { + xsocket = xsocket.left (xsocket.indexOf (".")); + } + // Prepend the well-known socket path. + xsocket.prepend ("/tmp/.X11-unix/X"); + x2goDebug << "xsocket in compat mode: " << xsocket; + } + unixSocket.connectToServer (xsocket); if (unixSocket.waitForConnected (10000)) { unixSocket.disconnectFromServer (); - return (xsocket); + + // Mac OS X 10.4 compat: nxproxy expects + // a DISPLAY variable like ":0", passing + // an UNIX socket will just make it error out. + // Instead of altering the nxproxy code, which does + // already try to connect to "/tmp/.X11-unix/Xi" with + // i = display number, pass ":i" as DISPLAY. + if (xsocket.left (16).compare ("/tmp/.x11-unix/x", Qt::CaseInsensitive) == 0) + { + bool ok = FALSE; + int tmp = -1; + + xsocket = xsocket.mid (16); + tmp = xsocket.toInt (&ok); + + if (ok) + { + x2goDebug << "Returning" << QString (":") + xsocket; + return (QString (":") + xsocket); + } + } + else + { + return (xsocket); + } } } // And if not, error out. diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 1f7b724..9eba130 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1,7 +1,7 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -46,6 +46,9 @@ #undef DEBUG //#define DEBUG +//#define SSH_DEBUG +#undef SSH_DEBUG + static bool isLibSshInited=false; @@ -142,7 +145,12 @@ void SshMasterConnection::run() } #endif -// int verbosity=SSH_LOG_PROTOCOL; +#ifdef SSH_DEBUG + int verbosity=SSH_LOG_PACKET; +#else + int verbosity=SSH_LOG_NOLOG; +#endif + long timeout = 60; my_ssh_session = ssh_new(); @@ -159,7 +167,7 @@ void SshMasterConnection::run() #ifdef Q_OS_WIN ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif -// ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); @@ -277,7 +285,8 @@ void SshMasterConnection::finalizeLibSsh() bool SshMasterConnection::sshConnect() { int rc; - ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, host.toAscii() ); + QByteArray tmpBA = host.toLocal8Bit(); + ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, tmpBA.data() ); ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &port ); rc = ssh_connect ( my_ssh_session ); if ( rc != SSH_OK ) diff --git a/x2goclient.pro b/x2goclient.pro index e9b3599..e831f5b 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -105,7 +105,7 @@ LIBS += -lssh plugin { TARGET = x2goplugin } -else{ +else { RC_FILE = x2goclient.rc SOURCES += x2goclient.cpp TARGET = x2goclient @@ -113,6 +113,24 @@ else{ message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) } +!isEmpty(TRANSLATIONS) { + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + } + + isEmpty(TS_DIR):TS_DIR = . + + TSQM.name = lrelease ${QMAKE_FILE_IN} + TSQM.input = TRANSLATIONS + TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm + TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} + TSQM.CONFIG = no_link + QMAKE_EXTRA_COMPILERS += TSQM + PRE_TARGETDEPS += compiler_TSQM_make_all +} +else:message(No translation files in project) + TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . @@ -136,7 +154,7 @@ x2go_linux_static { macx { message(building $$TARGET with ldap and cups) LIBS += -framework LDAP -lcups -lcrypto -lssl -lz - CONFIG += x86 x86_64 + CONFIG += x86 x86_64 ppc } win32-* { message(building $$TARGET for windows without ldap and cups) @@ -144,12 +162,12 @@ win32-* { CONFIG += static release } QT += svg network -ICON =icons/x2go-mac.icns +ICON = icons/x2go-mac.icns +QMAKE_INFO_PLIST = Info.plist QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 -plugin{ - +plugin { DEFINES += CFGPLUGIN linux-g++ { include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) @@ -161,7 +179,6 @@ plugin{ DEFINES += QT_NODLL CONFIG += qaxserver include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } + } RC_FILE = x2goplugin.rc - } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-266-g70ea821
by git-admin＠x2go.org 01 Jun '12

01 Jun '12

The branch, master has been updated via 70ea8219a29ccaae472cd75f193e5d8aad01c55d (commit) from b95753e5e00970953d7b39ff4f255ec3d09057b0 (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 70ea8219a29ccaae472cd75f193e5d8aad01c55d Author: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com> Date: Fri Jun 1 13:30:26 2012 +0200 Update Spanish translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + po/es.po | 236 +++++++++++++++++++++++++----------------------------- 2 files changed, 113 insertions(+), 127 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f00e06d..3a98fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,10 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.0): - Update Dutch translation file. + [ Ricardo Díaz Martín ] + * New upstream version (0.2.0.0): + - Update Spanish translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 pyhoca-gui (0.1.0.10-0~x2go1) unstable; urgency=low diff --git a/po/es.po b/po/es.po index 33194c5..b3a8fc6 100644 --- a/po/es.po +++ b/po/es.po @@ -5,23 +5,25 @@ # # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # Ricardo Diaz Martin, 2011. +# Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>, 2012. +# msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-31 22:04+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" +"PO-Revision-Date: 2012-06-01 09:28+0200\n" +"Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" +"Language-Team: Español; Castellano <>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../pyhoca/wxgui/logon.py:80 #, python-format @@ -83,21 +85,21 @@ msgstr "Iniciado tunel SSH" #: ../pyhoca/wxgui/logon.py:320 msgid "Authentication failed!" -msgstr "Error en el nombre de usuario o contraseña!" +msgstr "¡Error en el nombre de usuario o contraseña!" #: ../pyhoca/wxgui/logon.py:327 -#, fuzzy, python-format +#, python-format msgid "%s - SSH proxy" -msgstr "%s - proxy ssh" +msgstr "%s - proxy SSH" #: ../pyhoca/wxgui/logon.py:328 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:350 ../pyhoca/wxgui/frontend.py:537 -#, fuzzy, python-format +#, python-format msgid "%s - socket error" -msgstr "%s - error en la clave" +msgstr "%s - error de socket" #: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 @@ -132,14 +134,14 @@ msgid "%s - auth error" msgstr "%s - error en la autenticación" #: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 -#, fuzzy, python-format +#, python-format msgid "%s - SSH error" -msgstr "%s - error en la clave" +msgstr "%s - error de SSH" #: ../pyhoca/wxgui/logon.py:397 -#, fuzzy, python-format +#, python-format msgid "%s - unknown error" -msgstr "%s - error en el audio" +msgstr "%s - error desconocido" #: ../pyhoca/wxgui/logon.py:398 msgid "An unknown error occured during authentication!" @@ -153,7 +155,7 @@ msgid "" "Connecting you to ,,%s''" msgstr "" "PyHoca-GUI\n" -"Conectándote a ,,%s''" +"Conectando a \"%s\"" #: ../pyhoca/wxgui/taskbar.py:83 #, python-format @@ -162,7 +164,7 @@ msgid "" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2goClient)\n" -"Conectándote a tu servidor X2Go \"%s''" +"Conectando con tu servidor remoto X2Go \"%s\"" #: ../pyhoca/wxgui/taskbar.py:89 msgid "" @@ -170,7 +172,7 @@ msgid "" "Connecting you to X2Go..." msgstr "" "PyHoca-GUI\n" -"Conectándote a X2Go..." +"Conectando a X2Go..." #: ../pyhoca/wxgui/taskbar.py:93 msgid "" @@ -205,9 +207,8 @@ msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" #: ../pyhoca/wxgui/profilemanager.py:79 -#, fuzzy msgid "Published Applications" -msgstr "Aplicación" +msgstr "Aplicaciones publicadas" #: ../pyhoca/wxgui/profilemanager.py:80 msgid "Single Application" @@ -235,9 +236,8 @@ msgid "Email Client" msgstr "Cliente de Correo" #: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 -#, fuzzy msgid "Office" -msgstr "Openoffice.org" +msgstr "Office" #: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" @@ -257,23 +257,20 @@ msgstr "Guardar archivo recibido como ..." #: ../pyhoca/wxgui/profilemanager.py:134 msgid "settings derived from " -msgstr "" +msgstr "configuraciones recuperadas de " #. boxes for all tabs #: ../pyhoca/wxgui/profilemanager.py:151 -#, fuzzy msgid "Session Title" -msgstr "Perfil de Sesión" +msgstr "Título de la Sesión" #: ../pyhoca/wxgui/profilemanager.py:152 -#, fuzzy msgid "Session Window" -msgstr "Retomar Sesión" +msgstr "Ventana de Sesión" #: ../pyhoca/wxgui/profilemanager.py:153 -#, fuzzy msgid "Session Startup" -msgstr "Sesión" +msgstr "Inicio de Sesión" #: ../pyhoca/wxgui/profilemanager.py:154 msgid "Server" @@ -319,36 +316,32 @@ msgid "Name" msgstr "Nombre" #: ../pyhoca/wxgui/profilemanager.py:174 -#, fuzzy msgid "Set session window title" -msgstr "Título de Sesión" +msgstr "Establecer título de la sesión" #: ../pyhoca/wxgui/profilemanager.py:175 -#, fuzzy msgid "Use a default session window title" -msgstr "Título de Sesión" +msgstr "Usar título de sesión por defecto" #: ../pyhoca/wxgui/profilemanager.py:176 -#, fuzzy msgid "Custom session window title" -msgstr "Título de Sesión" +msgstr "Título de sesión personalizado" #: ../pyhoca/wxgui/profilemanager.py:186 -#, fuzzy msgid "Window Icon" -msgstr "Título de Sesión" +msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## #: ../pyhoca/wxgui/profilemanager.py:192 msgid "Start session automatically after login" -msgstr "" +msgstr "Iniciar sesión automáticamente tras el login" #: ../pyhoca/wxgui/profilemanager.py:193 #, python-format msgid "Login automatically after %s has started" -msgstr "" +msgstr "El inicio de sesión automático ha comenzado tras %s" #: ../pyhoca/wxgui/profilemanager.py:194 msgid "Type" @@ -372,11 +365,11 @@ msgstr "Opciones RDP" #: ../pyhoca/wxgui/profilemanager.py:206 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "" +msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" #: ../pyhoca/wxgui/profilemanager.py:207 msgid "Menu of published applications" -msgstr "" +msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab @@ -459,17 +452,20 @@ msgstr "Establecer DPI" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" +"No establecido (usar las herramientas del lado del servidor para configurar " +"el teclado)" #: ../pyhoca/wxgui/profilemanager.py:262 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" +"Detectar automáticamente y usar la configuración de teclado del lado del " +"cliente en la sesión remota" #: ../pyhoca/wxgui/profilemanager.py:263 -#, fuzzy msgid "Use custom keyboard settings as provided below" -msgstr "Mantener configuración actual del teclado" +msgstr "Ussar configuración de teclado personalizada" #: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard model" @@ -477,11 +473,11 @@ msgstr "Modelo de teclado" #: ../pyhoca/wxgui/profilemanager.py:266 msgid "Layout" -msgstr "" +msgstr "Capa" #: ../pyhoca/wxgui/profilemanager.py:268 msgid "Layout variant" -msgstr "" +msgstr "Variante de la capa" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Enable sound support" @@ -599,9 +595,8 @@ msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" #: ../pyhoca/wxgui/profilemanager.py:735 -#, fuzzy msgid "Profile" -msgstr "Perfil " +msgstr "Perfil" #: ../pyhoca/wxgui/profilemanager.py:736 msgid "Session" @@ -621,15 +616,15 @@ msgstr "Compartir" #: ../pyhoca/wxgui/profilemanager.py:977 msgid "<xkbtype>" -msgstr "" +msgstr "<xkbtype>" #: ../pyhoca/wxgui/profilemanager.py:978 msgid "<xkblayout>" -msgstr "" +msgstr "<xkblayout>" #: ../pyhoca/wxgui/profilemanager.py:979 msgid "<xkbvariant>" -msgstr "" +msgstr "<xkbvariant>" #: ../pyhoca/wxgui/profilemanager.py:1249 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" @@ -711,7 +706,7 @@ msgstr "Editar Perfil" #: ../pyhoca/wxgui/menus_taskbar.py:71 msgid "Use as Template for New Profile" -msgstr "" +msgstr "Usar como Plantilla para Nuevos Perfiles" #: ../pyhoca/wxgui/menus_taskbar.py:72 msgid "Delete Profile" @@ -723,9 +718,8 @@ msgid "About %s (%s)..." msgstr "Acerca de %s (%s) ..." #: ../pyhoca/wxgui/menus_taskbar.py:121 -#, fuzzy msgid "Manage Session Profile" -msgstr "Nuevo Perfil de Sesión" +msgstr "Gestionar Perfil de Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:130 msgid "Printing Preferences" @@ -741,9 +735,8 @@ msgid "E&xit" msgstr "S&alir" #: ../pyhoca/wxgui/menus_taskbar.py:203 -#, fuzzy msgid "Window title" -msgstr "Título de Sesión" +msgstr "Título de la ventana" #: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" @@ -762,28 +755,24 @@ msgid "Transfer Session (not possible)" msgstr "Transferir Sesión (no disponible)" #: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 -#, fuzzy msgid "Suspend Session (and disconnect/exit)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy msgid "Suspend Session (and disconnect)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar)" #: ../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:555 -#, fuzzy msgid "Terminate Session (and disconnect/exit)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy msgid "Terminate Session (and disconnect)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar)" #: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" @@ -791,17 +780,15 @@ msgstr "Finalizar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" -msgstr "" +msgstr "Actualizar árbol de menús" #: ../pyhoca/wxgui/menus_taskbar.py:255 -#, fuzzy msgid "Rename Session Window" -msgstr "Retomar Sesión" +msgstr "Renombrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:256 -#, fuzzy msgid "Show Session Window" -msgstr "Retomar Sesión" +msgstr "Mostrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:289 msgid "&Share custom local folder" @@ -821,85 +808,76 @@ msgstr "Dejar de compartir tod&as las carpetas locales" #: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" -msgstr "" +msgstr "Multimedia" #: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" -msgstr "" +msgstr "Desarrollo" #: ../pyhoca/wxgui/menus_taskbar.py:392 -#, fuzzy msgid "Education" -msgstr "Acción" +msgstr "Educación" #: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" -msgstr "" +msgstr "Juegos" #: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" -msgstr "" +msgstr "Gráficos" #: ../pyhoca/wxgui/menus_taskbar.py:395 -#, fuzzy msgid "Internet" -msgstr "Navegador web" +msgstr "Internet" #: ../pyhoca/wxgui/menus_taskbar.py:396 -#, fuzzy msgid "Office Applications" -msgstr "Aplicación" +msgstr "Ofimática" #: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" -msgstr "" +msgstr "Sistema" #: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" -msgstr "" +msgstr "Utilidades" #: ../pyhoca/wxgui/menus_taskbar.py:399 -#, fuzzy msgid "Other Applications" -msgstr "Aplicación" +msgstr "Otras Aplicaciones" #: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 -#, fuzzy, python-format +#, python-format msgid "Connect %s" -msgstr "Conexión" +msgstr "Conectar %s" #: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." -msgstr "" +msgstr "Conectando..." #: ../pyhoca/wxgui/menus_taskbar.py:484 -#, fuzzy msgid "Start &new Desktop Session" -msgstr "Iniciar &nueva Sesión" +msgstr "Iniciar &nueva Sesión de Escritorio" #: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 -#, fuzzy msgid "Retrieving Application Menu..." -msgstr "Aplicación" +msgstr "Recuperando Menú de Aplicación..." #: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 -#, fuzzy msgid "Retrieve Application Menu" -msgstr "Aplicación" +msgstr "Recibido Menú de Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:576 -#, fuzzy msgid "Launch Single Application" -msgstr "Aplicación" +msgstr "Ejecutar la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:614 -#, fuzzy msgid "Manage Application Menu" -msgstr "Aplicación" +msgstr "Gestionar el Menú de la Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" @@ -926,14 +904,12 @@ msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" #: ../pyhoca/wxgui/menus_taskbar.py:715 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:719 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Suspender Sesión" +msgstr "Desconectar y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" @@ -957,28 +933,26 @@ msgid "About %s ..." msgstr "Acerca de %s ..." #: ../pyhoca/wxgui/frontend.py:371 -#, fuzzy msgid "Suspending sessions and exiting application..." -msgstr "Suspender Sesión" +msgstr "Suspendiendo sesiones y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:374 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Suspender Sesión" +msgstr "Desconectando %s y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:376 -#, fuzzy msgid "Exiting application..." -msgstr "Aplicación" +msgstr "Saliendo de la aplicación..." #: ../pyhoca/wxgui/frontend.py:456 -#, fuzzy, python-format +#, python-format msgid "%s - server warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia del servidor" #: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." -msgstr "" +msgstr "El servidor X2GO no publica menú de la aplicación" #: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." @@ -991,9 +965,9 @@ msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" #: ../pyhoca/wxgui/frontend.py:544 -#, fuzzy, python-format +#, python-format msgid "%s - EOF error" -msgstr "%s - error en la clave" +msgstr "%s - error EOF" #: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." @@ -1012,19 +986,18 @@ msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/frontend.py:600 -#, fuzzy msgid "Unknown session profile, configure before using it..." -msgstr "Nuevo Perfil de Sesión" +msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..." #: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia de la sesión" #: ../pyhoca/wxgui/frontend.py:655 #, python-format msgid "Execution of command ,,%s'' failed." -msgstr "" +msgstr "Fallo al ejecutar el comando \"%s\"." #: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." @@ -1071,7 +1044,7 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" "La autenticidad del servidor [%s]:%s no puede comprobarse.\n" -"la huella de la clave %s es ,,%s''.\n" +"la huella de la clave %s es \"%s\".\n" "\n" "¿Continuar con la conexión?" @@ -1115,7 +1088,7 @@ msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -"El comando ,,%s'' no está presente en el servidor X2go\n" +"El comando \"%s\" no está disponible en el servidor X2go\n" "%s." #: ../pyhoca/wxgui/frontend.py:979 @@ -1176,9 +1149,10 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:1012 -#, fuzzy, python-format +#, python-format msgid "%s - client-side printing not available" -msgstr "- el sistema de impresión no está disponible -" +msgstr "" +"%s - el sistema de impresión en el lado del cliente no está disponible -" #: ../pyhoca/wxgui/frontend.py:1012 #, python-format @@ -1186,11 +1160,13 @@ msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" +"El servidor no permite la impresión del lado del cliente para esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - MIME box not available" -msgstr "" +msgstr "%s - No está disponible el contexto MIME" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format @@ -1198,11 +1174,13 @@ msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" +"El servidor no soporta el contexto X2Go MIME.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client-side folders not sharable" -msgstr "" +msgstr "%s - las carpetas del lado del cliente no están compartidas" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format @@ -1210,11 +1188,14 @@ msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" +"El servidor no permite compartir carpetas del lado del cliente en esta " +"sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format msgid "%s - client resources not sharable" -msgstr "" +msgstr "%s - el recurso del cliente no está marcado como compartido" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format @@ -1222,6 +1203,9 @@ msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" +"La impresión y el acceso a las carpetas del lado del cliente no están " +"permitidas en esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 #, python-format @@ -1442,9 +1426,8 @@ msgid "Print" msgstr "Imprimir" #: ../pyhoca/wxgui/printingprefs.py:231 -#, fuzzy msgid "- no printers installed -" -msgstr "- el sistema de impresión no está disponible -" +msgstr "- hay impresoras instaladas -" #: ../pyhoca/wxgui/printingprefs.py:236 msgid "- print system is not available -" @@ -1459,18 +1442,17 @@ msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" #: ../pyhoca/wxgui/sessiontitle.py:69 -#, fuzzy, python-format +#, python-format msgid "Session Title - %s" -msgstr "Perfil de Sesión" +msgstr "Título de la sesión - %s" #: ../pyhoca/wxgui/sessiontitle.py:71 -#, fuzzy msgid "Change session title to" -msgstr "Nuevo Perfil de Sesión" +msgstr "Cambiar título de la sesión a" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" -msgstr "" +msgstr "Ok" #~ msgid "Keyboard layout" #~ msgstr "Máscara de teclado" 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-266-g979fe29
by git-admin＠x2go.org 01 Jun '12

01 Jun '12

The branch, master has been updated via 979fe29ab1369b064996da3843d4de6cc3dffc43 (commit) from b95753e5e00970953d7b39ff4f255ec3d09057b0 (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 979fe29ab1369b064996da3843d4de6cc3dffc43 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 1 13:30:26 2012 +0200 Update Spanish translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + po/es.po | 236 +++++++++++++++++++++++++----------------------------- 2 files changed, 113 insertions(+), 127 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f00e06d..3a98fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,10 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.0): - Update Dutch translation file. + [ Ricardo Díaz Martín ] + * New upstream version (0.2.0.0): + - Update Spanish translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 pyhoca-gui (0.1.0.10-0~x2go1) unstable; urgency=low diff --git a/po/es.po b/po/es.po index 33194c5..b3a8fc6 100644 --- a/po/es.po +++ b/po/es.po @@ -5,23 +5,25 @@ # # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # Ricardo Diaz Martin, 2011. +# Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>, 2012. +# msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-31 22:04+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" +"PO-Revision-Date: 2012-06-01 09:28+0200\n" +"Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" +"Language-Team: Español; Castellano <>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../pyhoca/wxgui/logon.py:80 #, python-format @@ -83,21 +85,21 @@ msgstr "Iniciado tunel SSH" #: ../pyhoca/wxgui/logon.py:320 msgid "Authentication failed!" -msgstr "Error en el nombre de usuario o contraseña!" +msgstr "¡Error en el nombre de usuario o contraseña!" #: ../pyhoca/wxgui/logon.py:327 -#, fuzzy, python-format +#, python-format msgid "%s - SSH proxy" -msgstr "%s - proxy ssh" +msgstr "%s - proxy SSH" #: ../pyhoca/wxgui/logon.py:328 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:350 ../pyhoca/wxgui/frontend.py:537 -#, fuzzy, python-format +#, python-format msgid "%s - socket error" -msgstr "%s - error en la clave" +msgstr "%s - error de socket" #: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 @@ -132,14 +134,14 @@ msgid "%s - auth error" msgstr "%s - error en la autenticación" #: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 -#, fuzzy, python-format +#, python-format msgid "%s - SSH error" -msgstr "%s - error en la clave" +msgstr "%s - error de SSH" #: ../pyhoca/wxgui/logon.py:397 -#, fuzzy, python-format +#, python-format msgid "%s - unknown error" -msgstr "%s - error en el audio" +msgstr "%s - error desconocido" #: ../pyhoca/wxgui/logon.py:398 msgid "An unknown error occured during authentication!" @@ -153,7 +155,7 @@ msgid "" "Connecting you to ,,%s''" msgstr "" "PyHoca-GUI\n" -"Conectándote a ,,%s''" +"Conectando a \"%s\"" #: ../pyhoca/wxgui/taskbar.py:83 #, python-format @@ -162,7 +164,7 @@ msgid "" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2goClient)\n" -"Conectándote a tu servidor X2Go \"%s''" +"Conectando con tu servidor remoto X2Go \"%s\"" #: ../pyhoca/wxgui/taskbar.py:89 msgid "" @@ -170,7 +172,7 @@ msgid "" "Connecting you to X2Go..." msgstr "" "PyHoca-GUI\n" -"Conectándote a X2Go..." +"Conectando a X2Go..." #: ../pyhoca/wxgui/taskbar.py:93 msgid "" @@ -205,9 +207,8 @@ msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" #: ../pyhoca/wxgui/profilemanager.py:79 -#, fuzzy msgid "Published Applications" -msgstr "Aplicación" +msgstr "Aplicaciones publicadas" #: ../pyhoca/wxgui/profilemanager.py:80 msgid "Single Application" @@ -235,9 +236,8 @@ msgid "Email Client" msgstr "Cliente de Correo" #: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 -#, fuzzy msgid "Office" -msgstr "Openoffice.org" +msgstr "Office" #: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" @@ -257,23 +257,20 @@ msgstr "Guardar archivo recibido como ..." #: ../pyhoca/wxgui/profilemanager.py:134 msgid "settings derived from " -msgstr "" +msgstr "configuraciones recuperadas de " #. boxes for all tabs #: ../pyhoca/wxgui/profilemanager.py:151 -#, fuzzy msgid "Session Title" -msgstr "Perfil de Sesión" +msgstr "Título de la Sesión" #: ../pyhoca/wxgui/profilemanager.py:152 -#, fuzzy msgid "Session Window" -msgstr "Retomar Sesión" +msgstr "Ventana de Sesión" #: ../pyhoca/wxgui/profilemanager.py:153 -#, fuzzy msgid "Session Startup" -msgstr "Sesión" +msgstr "Inicio de Sesión" #: ../pyhoca/wxgui/profilemanager.py:154 msgid "Server" @@ -319,36 +316,32 @@ msgid "Name" msgstr "Nombre" #: ../pyhoca/wxgui/profilemanager.py:174 -#, fuzzy msgid "Set session window title" -msgstr "Título de Sesión" +msgstr "Establecer título de la sesión" #: ../pyhoca/wxgui/profilemanager.py:175 -#, fuzzy msgid "Use a default session window title" -msgstr "Título de Sesión" +msgstr "Usar título de sesión por defecto" #: ../pyhoca/wxgui/profilemanager.py:176 -#, fuzzy msgid "Custom session window title" -msgstr "Título de Sesión" +msgstr "Título de sesión personalizado" #: ../pyhoca/wxgui/profilemanager.py:186 -#, fuzzy msgid "Window Icon" -msgstr "Título de Sesión" +msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## #: ../pyhoca/wxgui/profilemanager.py:192 msgid "Start session automatically after login" -msgstr "" +msgstr "Iniciar sesión automáticamente tras el login" #: ../pyhoca/wxgui/profilemanager.py:193 #, python-format msgid "Login automatically after %s has started" -msgstr "" +msgstr "El inicio de sesión automático ha comenzado tras %s" #: ../pyhoca/wxgui/profilemanager.py:194 msgid "Type" @@ -372,11 +365,11 @@ msgstr "Opciones RDP" #: ../pyhoca/wxgui/profilemanager.py:206 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "" +msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" #: ../pyhoca/wxgui/profilemanager.py:207 msgid "Menu of published applications" -msgstr "" +msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab @@ -459,17 +452,20 @@ msgstr "Establecer DPI" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" +"No establecido (usar las herramientas del lado del servidor para configurar " +"el teclado)" #: ../pyhoca/wxgui/profilemanager.py:262 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" +"Detectar automáticamente y usar la configuración de teclado del lado del " +"cliente en la sesión remota" #: ../pyhoca/wxgui/profilemanager.py:263 -#, fuzzy msgid "Use custom keyboard settings as provided below" -msgstr "Mantener configuración actual del teclado" +msgstr "Ussar configuración de teclado personalizada" #: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard model" @@ -477,11 +473,11 @@ msgstr "Modelo de teclado" #: ../pyhoca/wxgui/profilemanager.py:266 msgid "Layout" -msgstr "" +msgstr "Capa" #: ../pyhoca/wxgui/profilemanager.py:268 msgid "Layout variant" -msgstr "" +msgstr "Variante de la capa" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Enable sound support" @@ -599,9 +595,8 @@ msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" #: ../pyhoca/wxgui/profilemanager.py:735 -#, fuzzy msgid "Profile" -msgstr "Perfil " +msgstr "Perfil" #: ../pyhoca/wxgui/profilemanager.py:736 msgid "Session" @@ -621,15 +616,15 @@ msgstr "Compartir" #: ../pyhoca/wxgui/profilemanager.py:977 msgid "<xkbtype>" -msgstr "" +msgstr "<xkbtype>" #: ../pyhoca/wxgui/profilemanager.py:978 msgid "<xkblayout>" -msgstr "" +msgstr "<xkblayout>" #: ../pyhoca/wxgui/profilemanager.py:979 msgid "<xkbvariant>" -msgstr "" +msgstr "<xkbvariant>" #: ../pyhoca/wxgui/profilemanager.py:1249 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" @@ -711,7 +706,7 @@ msgstr "Editar Perfil" #: ../pyhoca/wxgui/menus_taskbar.py:71 msgid "Use as Template for New Profile" -msgstr "" +msgstr "Usar como Plantilla para Nuevos Perfiles" #: ../pyhoca/wxgui/menus_taskbar.py:72 msgid "Delete Profile" @@ -723,9 +718,8 @@ msgid "About %s (%s)..." msgstr "Acerca de %s (%s) ..." #: ../pyhoca/wxgui/menus_taskbar.py:121 -#, fuzzy msgid "Manage Session Profile" -msgstr "Nuevo Perfil de Sesión" +msgstr "Gestionar Perfil de Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:130 msgid "Printing Preferences" @@ -741,9 +735,8 @@ msgid "E&xit" msgstr "S&alir" #: ../pyhoca/wxgui/menus_taskbar.py:203 -#, fuzzy msgid "Window title" -msgstr "Título de Sesión" +msgstr "Título de la ventana" #: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" @@ -762,28 +755,24 @@ msgid "Transfer Session (not possible)" msgstr "Transferir Sesión (no disponible)" #: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 -#, fuzzy msgid "Suspend Session (and disconnect/exit)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy msgid "Suspend Session (and disconnect)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar)" #: ../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:555 -#, fuzzy msgid "Terminate Session (and disconnect/exit)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy msgid "Terminate Session (and disconnect)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar)" #: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" @@ -791,17 +780,15 @@ msgstr "Finalizar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" -msgstr "" +msgstr "Actualizar árbol de menús" #: ../pyhoca/wxgui/menus_taskbar.py:255 -#, fuzzy msgid "Rename Session Window" -msgstr "Retomar Sesión" +msgstr "Renombrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:256 -#, fuzzy msgid "Show Session Window" -msgstr "Retomar Sesión" +msgstr "Mostrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:289 msgid "&Share custom local folder" @@ -821,85 +808,76 @@ msgstr "Dejar de compartir tod&as las carpetas locales" #: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" -msgstr "" +msgstr "Multimedia" #: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" -msgstr "" +msgstr "Desarrollo" #: ../pyhoca/wxgui/menus_taskbar.py:392 -#, fuzzy msgid "Education" -msgstr "Acción" +msgstr "Educación" #: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" -msgstr "" +msgstr "Juegos" #: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" -msgstr "" +msgstr "Gráficos" #: ../pyhoca/wxgui/menus_taskbar.py:395 -#, fuzzy msgid "Internet" -msgstr "Navegador web" +msgstr "Internet" #: ../pyhoca/wxgui/menus_taskbar.py:396 -#, fuzzy msgid "Office Applications" -msgstr "Aplicación" +msgstr "Ofimática" #: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" -msgstr "" +msgstr "Sistema" #: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" -msgstr "" +msgstr "Utilidades" #: ../pyhoca/wxgui/menus_taskbar.py:399 -#, fuzzy msgid "Other Applications" -msgstr "Aplicación" +msgstr "Otras Aplicaciones" #: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 -#, fuzzy, python-format +#, python-format msgid "Connect %s" -msgstr "Conexión" +msgstr "Conectar %s" #: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." -msgstr "" +msgstr "Conectando..." #: ../pyhoca/wxgui/menus_taskbar.py:484 -#, fuzzy msgid "Start &new Desktop Session" -msgstr "Iniciar &nueva Sesión" +msgstr "Iniciar &nueva Sesión de Escritorio" #: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 -#, fuzzy msgid "Retrieving Application Menu..." -msgstr "Aplicación" +msgstr "Recuperando Menú de Aplicación..." #: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 -#, fuzzy msgid "Retrieve Application Menu" -msgstr "Aplicación" +msgstr "Recibido Menú de Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:576 -#, fuzzy msgid "Launch Single Application" -msgstr "Aplicación" +msgstr "Ejecutar la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:614 -#, fuzzy msgid "Manage Application Menu" -msgstr "Aplicación" +msgstr "Gestionar el Menú de la Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" @@ -926,14 +904,12 @@ msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" #: ../pyhoca/wxgui/menus_taskbar.py:715 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:719 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Suspender Sesión" +msgstr "Desconectar y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" @@ -957,28 +933,26 @@ msgid "About %s ..." msgstr "Acerca de %s ..." #: ../pyhoca/wxgui/frontend.py:371 -#, fuzzy msgid "Suspending sessions and exiting application..." -msgstr "Suspender Sesión" +msgstr "Suspendiendo sesiones y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:374 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Suspender Sesión" +msgstr "Desconectando %s y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:376 -#, fuzzy msgid "Exiting application..." -msgstr "Aplicación" +msgstr "Saliendo de la aplicación..." #: ../pyhoca/wxgui/frontend.py:456 -#, fuzzy, python-format +#, python-format msgid "%s - server warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia del servidor" #: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." -msgstr "" +msgstr "El servidor X2GO no publica menú de la aplicación" #: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." @@ -991,9 +965,9 @@ msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" #: ../pyhoca/wxgui/frontend.py:544 -#, fuzzy, python-format +#, python-format msgid "%s - EOF error" -msgstr "%s - error en la clave" +msgstr "%s - error EOF" #: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." @@ -1012,19 +986,18 @@ msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/frontend.py:600 -#, fuzzy msgid "Unknown session profile, configure before using it..." -msgstr "Nuevo Perfil de Sesión" +msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..." #: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia de la sesión" #: ../pyhoca/wxgui/frontend.py:655 #, python-format msgid "Execution of command ,,%s'' failed." -msgstr "" +msgstr "Fallo al ejecutar el comando \"%s\"." #: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." @@ -1071,7 +1044,7 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" "La autenticidad del servidor [%s]:%s no puede comprobarse.\n" -"la huella de la clave %s es ,,%s''.\n" +"la huella de la clave %s es \"%s\".\n" "\n" "¿Continuar con la conexión?" @@ -1115,7 +1088,7 @@ msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -"El comando ,,%s'' no está presente en el servidor X2go\n" +"El comando \"%s\" no está disponible en el servidor X2go\n" "%s." #: ../pyhoca/wxgui/frontend.py:979 @@ -1176,9 +1149,10 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:1012 -#, fuzzy, python-format +#, python-format msgid "%s - client-side printing not available" -msgstr "- el sistema de impresión no está disponible -" +msgstr "" +"%s - el sistema de impresión en el lado del cliente no está disponible -" #: ../pyhoca/wxgui/frontend.py:1012 #, python-format @@ -1186,11 +1160,13 @@ msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" +"El servidor no permite la impresión del lado del cliente para esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - MIME box not available" -msgstr "" +msgstr "%s - No está disponible el contexto MIME" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format @@ -1198,11 +1174,13 @@ msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" +"El servidor no soporta el contexto X2Go MIME.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client-side folders not sharable" -msgstr "" +msgstr "%s - las carpetas del lado del cliente no están compartidas" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format @@ -1210,11 +1188,14 @@ msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" +"El servidor no permite compartir carpetas del lado del cliente en esta " +"sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format msgid "%s - client resources not sharable" -msgstr "" +msgstr "%s - el recurso del cliente no está marcado como compartido" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format @@ -1222,6 +1203,9 @@ msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" +"La impresión y el acceso a las carpetas del lado del cliente no están " +"permitidas en esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 #, python-format @@ -1442,9 +1426,8 @@ msgid "Print" msgstr "Imprimir" #: ../pyhoca/wxgui/printingprefs.py:231 -#, fuzzy msgid "- no printers installed -" -msgstr "- el sistema de impresión no está disponible -" +msgstr "- hay impresoras instaladas -" #: ../pyhoca/wxgui/printingprefs.py:236 msgid "- print system is not available -" @@ -1459,18 +1442,17 @@ msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" #: ../pyhoca/wxgui/sessiontitle.py:69 -#, fuzzy, python-format +#, python-format msgid "Session Title - %s" -msgstr "Perfil de Sesión" +msgstr "Título de la sesión - %s" #: ../pyhoca/wxgui/sessiontitle.py:71 -#, fuzzy msgid "Change session title to" -msgstr "Nuevo Perfil de Sesión" +msgstr "Cambiar título de la sesión a" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" -msgstr "" +msgstr "Ok" #~ msgid "Keyboard layout" #~ msgstr "Máscara de teclado" 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.2.0.1-3-g44542ee
by git-admin＠x2go.org 01 Jun '12

01 Jun '12

The branch, master has been updated via 44542ee31e44307378364c316a0539341abd3a0d (commit) from 683be10d60d52c45a68f5dd4a852683533a5f3c9 (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 44542ee31e44307378364c316a0539341abd3a0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 1 02:07:27 2012 +0200 Be tolerant if we can not terminate a session after failure of the forwarding tunnel. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2go/session.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fc90e52..ef52702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * Bugfix release (0.2.0.2): + - Be tolerant if we can not terminate a session after failure of the + forwarding tunnel. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 30 May 2012 00:27:03 +0200 diff --git a/x2go/session.py b/x2go/session.py index ae92272..b157e8e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -386,7 +386,10 @@ class X2goSession(object): self.logger('HOOK_forwarding_tunnel_setup_failed: Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, self.session_name, self.profile_name), loglevel=log.loglevel_WARN) # get rid of the faulty session... - self.terminate() + try: + self.terminate() + except x2go_exceptions.X2goSessionException: + pass def HOOK_printing_not_available(self): """\ 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2012