x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goclient.git - master (branch) updated: 4.0.0.0-17-g6c22593
by git-admin＠x2go.org 15 Feb '13

15 Feb '13

The branch, master has been updated via 6c22593e134895ebb363e9851f457c3205257d71 (commit) from b3121c46cd4494b6d15cf644292f290bf0dadc91 (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 6c22593e134895ebb363e9851f457c3205257d71 Author: Frédéric Motte <frederic.motte(a)liazo.fr> Date: Fri Feb 15 23:45:50 2013 +0100 Add French translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + x2goclient_fr.ts | 1187 ++++++++++++------------------------------------------ 2 files changed, 255 insertions(+), 936 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 034b01c..b4acd4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low + [ Frédéric Motte ] + * New upstream version (4.0.1.0): + - Add French translation file. + [ Mike Gabriel ] * Continue new feature development... diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 1debdbc..abbba81 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -4,1772 +4,1324 @@ <context> <name>AppDialog</name> <message> - <location filename="appdialog.ui" line="15"/> <source>Published Applications</source> - <translation type="unfinished"></translation> + <translation>Applications publiées</translation> </message> <message> - <location filename="appdialog.ui" line="58"/> <source>Search:</source> - <translation type="unfinished"></translation> + <translation>Rechercher:</translation> </message> <message> - <location filename="appdialog.ui" line="74"/> <source>&Start</source> - <translation type="unfinished"></translation> + <translation>&Démarrer</translation> </message> <message> - <location filename="appdialog.ui" line="94"/> <source>&Close</source> - <translation type="unfinished"></translation> + <translation>&Fermer</translation> </message> <message> - <location filename="appdialog.cpp" line="102"/> <source>Multimedia</source> - <translation type="unfinished"></translation> + <translation>Multimedia</translation> </message> <message> - <location filename="appdialog.cpp" line="107"/> <source>Development</source> - <translation type="unfinished"></translation> + <translation>Développement</translation> </message> <message> - <location filename="appdialog.cpp" line="112"/> <source>Education</source> - <translation type="unfinished"></translation> + <translation>Éducation</translation> </message> <message> - <location filename="appdialog.cpp" line="117"/> <source>Game</source> - <translation type="unfinished"></translation> + <translation>Jeux</translation> </message> <message> - <location filename="appdialog.cpp" line="122"/> <source>Graphics</source> - <translation type="unfinished"></translation> + <translation>Graphismes</translation> </message> <message> - <location filename="appdialog.cpp" line="127"/> <source>Network</source> - <translation type="unfinished"></translation> + <translation>Internet</translation> </message> <message> - <location filename="appdialog.cpp" line="132"/> <source>Office</source> - <translation type="unfinished"></translation> + <translation>Bureautique</translation> </message> <message> - <location filename="appdialog.cpp" line="137"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Préférences</translation> </message> <message> - <location filename="appdialog.cpp" line="142"/> <source>System</source> - <translation type="unfinished"></translation> + <translation>Système</translation> </message> <message> - <location filename="appdialog.cpp" line="147"/> <source>Utility</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Accessoires</translation> </message> <message> - <location filename="appdialog.cpp" line="152"/> <source>Other</source> - <translation type="unfinished"></translation> + <translation>Autres</translation> </message> </context> <context> <name>BrokerPassDialogUi</name> <message> - <location filename="brokerpassdialog.ui" line="15"/> <source>Dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="brokerpassdialog.ui" line="23"/> <source>Old password:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Ancien mot de passe:</translation> </message> <message> - <location filename="brokerpassdialog.ui" line="37"/> <source>New password:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nouveau mot de passe:</translation> </message> <message> - <location filename="brokerpassdialog.ui" line="51"/> <source>Confirm password:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Confirmez le mot de passe:</translation> </message> <message> - <location filename="brokerpassdialog.ui" line="80"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">TextLabel</translation> </message> </context> <context> <name>BrokerPassDlg</name> <message> - <location filename="brokerpassdlg.cpp" line="39"/> <source>Passwords do not match</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Les mots de passe ne correspondent pas</translation> </message> </context> <context> <name>CUPSPrintWidget</name> <message> - <location filename="cupsprintwidget.cpp" line="71"/> <source>Idle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="74"/> <source>Printing</source> - <translation type="unfinished"></translation> + <translation type="unfinished">En cours d'impression</translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="77"/> <source>Stopped</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Arrêté</translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="87"/> <source>Yes</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Oui</translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="87"/> <source>No</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Non</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="21"/> <source>Form</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Formulaire</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="27"/> <source>Name:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nom:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="44"/> <source>Properties</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Propriétés</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="51"/> <source>State:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">État:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="65"/> <source>Accepting jobs:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">En attentes de travaux:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="79"/> <source>Type:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Type:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="93"/> <source>Location:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Emplacement:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="107"/> <source>Comment:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Commentaire:</translation> </message> </context> <context> <name>CUPSPrinterSettingsDialog</name> <message> - <location filename="cupsprintersettingsdialog.cpp" line="110"/> <source>No option selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Pas d'options séléctionnées</translation> </message> <message> - <location filename="cupsprintersettingsdialog.cpp" line="271"/> <source>This value is in conflict with other option</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Cette valeur est en conflit avec une autre option</translation> </message> <message> - <location filename="cupsprintersettingsdialog.cpp" line="281"/> <source>Options conflict</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Conflits d'options</translation> </message> </context> <context> <name>ConTest</name> <message> - <location filename="contest.ui" line="15"/> <source>Connectivity test</source> - <translation type="unfinished"></translation> + <translation>Test de connectivité</translation> </message> <message> - <location filename="contest.ui" line="25"/> <source>HTTPS connection:</source> - <translation type="unfinished"></translation> + <translation>Connection HTTPS:</translation> </message> <message> - <location filename="contest.ui" line="32"/> <source>SSH connection:</source> - <translation type="unfinished"></translation> + <translation>Connection SSH:</translation> </message> <message> - <location filename="contest.ui" line="39"/> <source>Connection speed:</source> - <translation type="unfinished"></translation> + <translation>Vitesse de connection:</translation> </message> <message> - <location filename="contest.ui" line="124"/> - <location filename="contest.ui" line="168"/> <source>Failed</source> - <translation type="unfinished"></translation> + <translation>Échec</translation> </message> <message> - <location filename="contest.ui" line="212"/> <source>0 Kb/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="contest.cpp" line="106"/> - <location filename="contest.cpp" line="113"/> <source>OK</source> - <translation type="unfinished"></translation> + <translation>Ok</translation> </message> <message> - <location filename="contest.cpp" line="148"/> <source>Socket operation timed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="contest.cpp" line="160"/> - <location filename="contest.cpp" line="166"/> <source>Failed: </source> - <translation type="unfinished"></translation> + <translation>Échec:</translation> </message> </context> <context> <name>ConfigDialog</name> <message> - <location filename="configdialog.cpp" line="56"/> <source>General</source> - <translation type="unfinished"></translation> + <translation>Général</translation> </message> <message> - <location filename="configdialog.cpp" line="65"/> <source>Display icon in system tray</source> - <translation type="unfinished"></translation> + <translation>Afficher l'icone dans la barre des tâches</translation> </message> <message> - <location filename="configdialog.cpp" line="72"/> <source>Hide to system tray when minimized</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches à la réduction de la fenêtre</translation> </message> <message> - <location filename="configdialog.cpp" line="73"/> <source>Hide to system tray when closed</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches à la fermeture de la fenêtre</translation> </message> <message> - <location filename="configdialog.cpp" line="74"/> <source>Hide to system tray after connection is established</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches quand la session est établie</translation> </message> <message> - <location filename="configdialog.cpp" line="75"/> <source>Restore from system tray after session is disconnected</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches quand la session est déconnectée</translation> </message> <message> - <location filename="configdialog.cpp" line="93"/> <source>Use LDAP</source> - <translation type="unfinished"></translation> + <translation>Utiliser LDAP</translation> </message> <message> - <location filename="configdialog.cpp" line="117"/> <source>Server URL:</source> - <translation type="unfinished"></translation> + <translation>URL du serveur:</translation> </message> <message> - <location filename="configdialog.cpp" line="118"/> <source>BaseDN:</source> - <translation type="unfinished"></translation> + <translation>BaseDN:</translation> </message> <message> - <location filename="configdialog.cpp" line="120"/> <source>Failover server 1 URL:</source> - <translation type="unfinished"></translation> + <translatorcomment>Failover en backup ?</translatorcomment> + <translation type="unfinished">URL du premier serveur de backup:</translation> </message> <message> - <location filename="configdialog.cpp" line="122"/> <source>Failover server 2 URL:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">URL du second serveur de backup:</translation> </message> <message> - <location filename="configdialog.cpp" line="204"/> - <location filename="configdialog.cpp" line="346"/> <source>X-Server settings</source> - <translation type="unfinished"></translation> + <translation>Préférences du serveur X</translation> </message> <message> - <location filename="configdialog.cpp" line="213"/> <source>X11 application:</source> - <translation type="unfinished"></translation> + <translation>Applications X11:</translation> </message> <message> - <location filename="configdialog.cpp" line="224"/> <source>X11 version:</source> - <translation type="unfinished"></translation> + <translation>Version X11:</translation> </message> <message> - <location filename="configdialog.cpp" line="239"/> <source>Find X11 application</source> - <translation type="unfinished"></translation> + <translation>Trouver une application X11</translation> </message> <message> - <location filename="configdialog.cpp" line="256"/> <source>Clientside SSH port for file system export usage:</source> - <translation type="unfinished"></translation> + <translation>Port SSH coté client pour l'export du système de fichiers:</translation> </message> <message> - <location filename="configdialog.cpp" line="266"/> <source>Start session embedded inside website</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Démarrer une session embarquée dans le site web</translation> </message> <message> - <location filename="configdialog.cpp" line="270"/> - <location filename="configdialog.cpp" line="573"/> - <location filename="configdialog.cpp" line="585"/> <source>Advanced options</source> - <translation type="unfinished"></translation> + <translation>Options avancées</translation> </message> <message> - <location filename="configdialog.cpp" line="297"/> <source>Defaults</source> - <translation type="unfinished"></translation> + <translation>Défauts</translation> </message> <message> - <location filename="configdialog.cpp" line="298"/> <source>&OK</source> - <translation type="unfinished"></translation> + <translation>&Ok</translation> </message> <message> - <location filename="configdialog.cpp" line="299"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Annuler</translation> </message> <message> - <location filename="configdialog.cpp" line="322"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation>Préférences</translation> </message> <message> - <location filename="configdialog.cpp" line="342"/> <source>Printing</source> - <translation type="unfinished"></translation> + <translation>Impression</translation> </message> <message> - <location filename="configdialog.cpp" line="509"/> - <location filename="configdialog.cpp" line="527"/> - <location filename="configdialog.cpp" line="546"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Attention</translation> </message> <message> - <location filename="configdialog.cpp" line="510"/> <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source> - <translation type="unfinished"></translation> + <translation>x2goclient ne peut pas trouve d'application X11 adaptée. Merci d'installer Apple X11 ou de séléctionner le chemin de l'application</translation> </message> <message> - <location filename="configdialog.cpp" line="528"/> <source>Your are using X11 (Apple X-Window Server) version </source> - <translation type="unfinished"></translation> + <translation>Vous utilisez X11 (Server X-Window Apple) version </translation> </message> <message> - <location filename="configdialog.cpp" line="530"/> <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz)</source> - <translation type="unfinished"></translation> + <translation>Cette version pose des problèmes avec les applications X en mode de couleurs 24bits. Vous devriez mettre à jour votre environement X11 (http://trac.macosforge.org/projects/xquartz)</translation> </message> <message> - <location filename="configdialog.cpp" line="547"/> <source>No suitable X11 application found in selected path</source> - <translation type="unfinished"></translation> + <translation>Pas d'application X11 trouvée dans le chemin sélectionné.</translation> </message> <message> - <location filename="configdialog.cpp" line="583"/> <source>&Connection</source> - <translation type="unfinished"></translation> + <translation>&Connection</translation> </message> <message> - <location filename="configdialog.cpp" line="584"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation>&Préférences</translation> </message> </context> <context> <name>ConnectionWidget</name> <message> - <location filename="connectionwidget.cpp" line="39"/> <source>&Connection speed</source> - <translation type="unfinished"></translation> + <translation>Vitesse de &connection</translation> </message> <message> - <location filename="connectionwidget.cpp" line="44"/> <source>Connection speed:</source> - <translation type="unfinished"></translation> + <translation>Vitesse de connection:</translation> </message> <message> - <location filename="connectionwidget.cpp" line="74"/> <source>C&ompression</source> - <translation type="unfinished"></translation> + <translatorcomment>C&ompression</translatorcomment> + <translation type="unfinished">C&ompression</translation> </message> <message> - <location filename="connectionwidget.cpp" line="91"/> <source>Method:</source> - <translation type="unfinished"></translation> + <translation>Méthode:</translation> </message> <message> - <location filename="connectionwidget.cpp" line="93"/> <source>Compression method:</source> - <translation type="unfinished"></translation> + <translation>Méthode de compression:</translation> </message> <message> - <location filename="connectionwidget.cpp" line="95"/> <source>Image quality:</source> - <translation type="unfinished"></translation> + <translation>Qualité d'image:</translation> </message> </context> <context> <name>CupsPrinterSettingsDialog</name> <message> - <location filename="cupsprintsettingsdialog.ui" line="21"/> <source>Dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="37"/> <source>General</source> - <translation type="unfinished"></translation> + <translation>Général</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="47"/> <source>Page size:</source> - <translation type="unfinished"></translation> + <translation>Taille de page:</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="64"/> <source>Paper type:</source> - <translation type="unfinished"></translation> + <translation>Type de papier:</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="74"/> <source>Paper source:</source> - <translation type="unfinished"></translation> + <translation>Source de papier:</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="101"/> <source>Duplex Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="107"/> <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="114"/> <source>Long side</source> - <translation type="unfinished"></translation> + <translation>Bord long</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="121"/> <source>Short side</source> - <translation type="unfinished"></translation> + <translation>Bord court</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="145"/> <source>Driver settings</source> - <translation type="unfinished"></translation> + <translation>Préférences de pilote</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="177"/> <source>Option</source> - <translation type="unfinished"></translation> + <translation>Option</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="182"/> <source>Value</source> - <translation type="unfinished"></translation> + <translation>Valeur</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="188"/> <source>No option selected</source> - <translation type="unfinished"></translation> + <translation>Pas d'option sélectionnée</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="207"/> <source>text</source> - <translation type="unfinished"></translation> + <translation>texte</translation> </message> </context> <context> <name>EditConnectionDialog</name> <message> - <location filename="editconnectiondialog.cpp" line="58"/> <source>&Session</source> - <translation type="unfinished"></translation> + <translation>&Session</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="59"/> <source>&Connection</source> - <translation type="unfinished"></translation> + <translation>&Connection</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="60"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation>&Préférences</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="61"/> <source>&Shared folders</source> - <translation type="unfinished"></translation> + <translation>&Dossiers partagés</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="63"/> <source>&OK</source> - <translation type="unfinished"></translation> + <translation>&Ok</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="64"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Cancel</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="65"/> <source>Defaults</source> - <translation type="unfinished"></translation> + <translation>Défauts</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="123"/> <source>Session preferences - </source> - <translation type="unfinished"></translation> + <translation type="unfinished">Préférences de session - </translation> </message> </context> <context> <name>ExportDialog</name> <message> - <location filename="exportdialog.cpp" line="44"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Annuler</translation> </message> <message> - <location filename="exportdialog.cpp" line="50"/> <source>&share</source> - <translation type="unfinished"></translation> + <translation>&Partager</translation> </message> <message> - <location filename="exportdialog.cpp" line="51"/> <source>&Preferences ...</source> - <translation type="unfinished"></translation> + <translation>&Préférences ...</translation> </message> <message> - <location filename="exportdialog.cpp" line="52"/> <source>&Custom folder ...</source> - <translation type="unfinished"></translation> + <translation>&Dossier personnalisé ...</translation> </message> <message> - <location filename="exportdialog.cpp" line="62"/> <source>Delete</source> <comment>Delete</comment> - <translation type="unfinished"></translation> + <translation>Effacer</translation> </message> <message> - <location filename="exportdialog.cpp" line="79"/> <source>share folders</source> - <translation type="unfinished"></translation> + <translation>partager des dossiers</translation> </message> <message> - <location filename="exportdialog.cpp" line="145"/> <source>Select folder</source> - <translation type="unfinished"></translation> + <translation>Choisir un dossier</translation> </message> </context> <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="350"/> - <location filename="httpbrokerclient.cpp" line="366"/> - <location filename="httpbrokerclient.cpp" line="386"/> - <location filename="httpbrokerclient.cpp" line="401"/> - <location filename="httpbrokerclient.cpp" line="415"/> - <location filename="httpbrokerclient.cpp" line="433"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Erreur</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="351"/> <source>Login failed! Please try again</source> - <translation type="unfinished"></translation> + <translation>Identification échouée ! Merci de réessayer</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="118"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>La clef du serveur a changée. +C'est maintenant: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="119"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Pour des raisons de sécurité, la connection va être stoppée.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="132"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation type="unfinished"></translation> + <translation type="unfinished">La clef de ce serveur n'a pas été trouvée mais un autre type de clef existe. Un attaquant peut avoir changé la clef par défaut du serveur pour faire croire à votre client que la clef n'existe pas</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="158"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation type="unfinished"></translation> + <translation>Impossible de trouver le fichier des hôtes connus. Si vous acceptez l'hôte maintenant, le fichier sera créé automatiquement</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="163"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Le serveur n'est pas connu. Avez-vous confiance en cette clef ? Hash de la clef publique: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> - <location filename="httpbrokerclient.cpp" line="177"/> <source>Host key verification failed</source> - <translation type="unfinished"></translation> + <translation>La vérification de la clef d'hôte a échouée</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> <source>Yes</source> - <translation type="unfinished"></translation> + <translation>Oui</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> <source>No</source> - <translation type="unfinished"></translation> + <translation>Non</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="190"/> <source>Enter passphrase to decrypt a key</source> - <translation type="unfinished"></translation> + <translation>Entrez la phrase de passe pour déchiffrer la clef</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="213"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>Identification échouée</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="525"/> <source> Server uses an invalid security certificate. </source> - <translation type="unfinished"></translation> + <translation> Le serveur utilise un certificat de sécurité invalide. </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="528"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> - <translation type="unfinished"></translation> + <translation>Vous ne devriez pas ajouter d'exeption si vous n'avez pas une entière confiance en la connection Internet que vous utilisez ou si vous n'avez pas l'habitude de voir cet avertissement pour ce serveur.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="533"/> <source>Secure connection failed</source> - <translation type="unfinished"></translation> + <translation>Connection sécurisée échouée</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="538"/> <source>Issued to: </source> - <translation type="unfinished"></translation> + <translation>Accordé à:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="539"/> - <location filename="httpbrokerclient.cpp" line="551"/> <source>Common Name(CN) </source> - <translation type="unfinished"></translation> + <translation>Common Name(CN)</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="542"/> - <location filename="httpbrokerclient.cpp" line="554"/> <source>Organization(O) </source> - <translation type="unfinished"></translation> + <translation>Organization(O)</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="545"/> - <location filename="httpbrokerclient.cpp" line="557"/> <source>Organizational Unit(OU) </source> - <translation type="unfinished"></translation> + <translation>Organizational Unit(OU)</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="548"/> <source>Serial Number </source> - <translation type="unfinished"></translation> + <translation>Numéro de série</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="550"/> <source>Issued by: </source> - <translation type="unfinished"></translation> + <translation>Accordé par:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="561"/> <source>Validity: </source> - <translation type="unfinished"></translation> + <translation>Validité:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="562"/> <source>Issued on </source> - <translation type="unfinished"></translation> + <translation>Accordé sur</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="563"/> <source>expires on </source> - <translation type="unfinished"></translation> + <translation>expire le</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="564"/> <source>Fingerprints: </source> - <translation type="unfinished"></translation> + <translation>Fingerprints:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="565"/> <source>SHA1 </source> - <translation type="unfinished"></translation> + <translation>SHA1</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="567"/> <source>MD5 </source> - <translation type="unfinished"></translation> + <translation>MD5</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="573"/> <source>Exit X2Go Client</source> - <translation type="unfinished"></translation> + <translation>Quitter X2Go Client</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="575"/> <source>Add exception</source> - <translation type="unfinished"></translation> + <translation>Ajouter une exception</translation> </message> </context> <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="89"/> - <location filename="onmainwindow.cpp" line="6191"/> <source>us</source> - <translation type="unfinished"></translation> + <translation>us</translation> </message> <message> - <location filename="onmainwindow.cpp" line="90"/> <source>pc105/us</source> - <translation type="unfinished"></translation> + <translation>pc105/us</translation> </message> <message> - <location filename="onmainwindow.cpp" line="142"/> <source>X2Go client</source> - <translation type="unfinished"></translation> + <translation>X2Go Client</translation> </message> <message> - <location filename="onmainwindow.cpp" line="159"/> - <location filename="onmainwindow.cpp" line="3022"/> - <location filename="onmainwindow.cpp" line="5320"/> <source>connecting</source> - <translation type="unfinished"></translation> + <translation>Connection en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="166"/> <source>Internet browser</source> - <translation type="unfinished"></translation> + <translation>Navigateur Internet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="167"/> <source>Email client</source> - <translation type="unfinished"></translation> + <translation>Client e-mail</translation> </message> <message> - <location filename="onmainwindow.cpp" line="168"/> <source>OpenOffice.org</source> - <translation type="unfinished"></translation> + <translation>OpenOffice.org</translation> </message> <message> - <location filename="onmainwindow.cpp" line="169"/> <source>Terminal</source> - <translation type="unfinished"></translation> + <translation>Terminal</translation> </message> <message> - <location filename="onmainwindow.cpp" line="344"/> <source>&Settings ...</source> - <translation type="unfinished"></translation> + <translation>&Préférences ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="348"/> <source>Support ...</source> - <translation type="unfinished"></translation> + <translation>Support ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="355"/> - <location filename="onmainwindow.cpp" line="7462"/> <source>About X2GO client</source> - <translation type="unfinished"></translation> + <translation>Apropos de X2Go Client</translation> </message> <message> - <location filename="onmainwindow.cpp" line="553"/> - <location filename="onmainwindow.cpp" line="1044"/> - <location filename="onmainwindow.cpp" line="10187"/> <source>Share folder...</source> - <translation type="unfinished"></translation> + <translation>Partager le dossier...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="556"/> - <location filename="onmainwindow.cpp" line="1045"/> - <location filename="onmainwindow.cpp" line="5376"/> - <location filename="onmainwindow.cpp" line="10360"/> <source>Suspend</source> - <translation type="unfinished"></translation> + <translation>Suspendre</translation> </message> <message> - <location filename="onmainwindow.cpp" line="559"/> - <location filename="onmainwindow.cpp" line="1046"/> - <location filename="onmainwindow.cpp" line="10200"/> - <location filename="onmainwindow.cpp" line="10362"/> <source>Terminate</source> - <translation type="unfinished"></translation> + <translation>Terminer</translation> </message> <message> - <location filename="onmainwindow.cpp" line="561"/> <source>Reconnect</source> - <translation type="unfinished"></translation> + <translation>Reconnecter</translation> </message> <message> - <location filename="onmainwindow.cpp" line="565"/> - <location filename="onmainwindow.cpp" line="9624"/> <source>Detach X2Go window</source> - <translation type="unfinished"></translation> + <translation>Détacher la fenêtre X2Go</translation> </message> <message> - <location filename="onmainwindow.cpp" line="568"/> - <location filename="onmainwindow.cpp" line="10660"/> <source>Minimize toolbar</source> - <translation type="unfinished"></translation> + <translation>Réduire la barre d'outils</translation> </message> <message> - <location filename="onmainwindow.cpp" line="678"/> - <location filename="onmainwindow.cpp" line="1996"/> - <location filename="onmainwindow.cpp" line="7562"/> <source>Session:</source> - <translation type="unfinished"></translation> + <translation>Session:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="730"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation>&Quiter</translation> </message> <message> - <location filename="onmainwindow.cpp" line="731"/> <source>Ctrl+Q</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="732"/> - <location filename="onmainwindow.cpp" line="1063"/> <source>Quit</source> - <translation type="unfinished"></translation> + <translation>Quitter</translation> </message> <message> - <location filename="onmainwindow.cpp" line="735"/> <source>&New session ...</source> - <translation type="unfinished"></translation> + <translation>&Nouvelle session ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="736"/> <source>Ctrl+N</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="741"/> <source>Session management...</source> - <translation type="unfinished"></translation> + <translation>Gestion de sessions...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="742"/> <source>Ctrl+E</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="752"/> <source>&Create session icon on desktop...</source> - <translation type="unfinished"></translation> + <translation>&Créer une icone de session sur le bureau...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="761"/> <source>&Set broker password...</source> - <translation type="unfinished"></translation> + <translation>Configurer le mot de passe du broker...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="772"/> <source>&Connectivity test...</source> - <translation type="unfinished"></translation> + <translation>Test de &Connectivité...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="779"/> - <location filename="onmainwindow.cpp" line="800"/> <source>Show toolbar</source> - <translation type="unfinished"></translation> + <translation>Afficher la barre d'outils</translation> </message> <message> - <location filename="onmainwindow.cpp" line="785"/> <source>About Qt</source> - <translation type="unfinished"></translation> + <translation>À propos de Qt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="802"/> <source>Ctrl+Q</source> <comment>exit</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="808"/> <source>&Session</source> - <translation type="unfinished"></translation> + <translation>&Session</translation> </message> <message> - <location filename="onmainwindow.cpp" line="809"/> <source>&Options</source> - <translation type="unfinished"></translation> + <translation>&Options</translation> </message> <message> - <location filename="onmainwindow.cpp" line="828"/> <source>&Help</source> - <translation type="unfinished"></translation> + <translation>&Aide</translation> </message> <message> - <location filename="onmainwindow.cpp" line="867"/> - <location filename="onmainwindow.cpp" line="1989"/> - <location filename="onmainwindow.cpp" line="7555"/> - <location filename="onmainwindow.cpp" line="9988"/> <source>Login:</source> - <translation type="unfinished"></translation> + <translation>Identifiant:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="888"/> <source>Operation failed</source> - <translation type="unfinished"></translation> + <translation>Opération échouée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="892"/> <source>Password changed</source> - <translation type="unfinished"></translation> + <translation>Mot de passe modifié</translation> </message> <message> - <location filename="onmainwindow.cpp" line="916"/> <source>Wrong password!</source> - <translation type="unfinished"></translation> + <translation>Mauvais mot de passe !</translation> </message> <message> - <location filename="onmainwindow.cpp" line="965"/> <source>Authentication</source> - <translation type="unfinished"></translation> + <translation>Identification</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1015"/> <source>Restore</source> - <translation type="unfinished"></translation> + <translation>Réstauration</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1017"/> - <location filename="onmainwindow.cpp" line="5211"/> <source>Not connected</source> - <translation type="unfinished"></translation> + <translation>Non connecté</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1019"/> <source>Multimedia</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1021"/> <source>Development</source> - <translation type="unfinished"></translation> + <translation>Développement</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1023"/> <source>Education</source> - <translation type="unfinished"></translation> + <translation>Éducation</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1025"/> <source>Game</source> - <translation type="unfinished"></translation> + <translation>Jeux</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1027"/> <source>Graphics</source> - <translation type="unfinished"></translation> + <translation>Graphismes</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1029"/> <source>Network</source> - <translation type="unfinished"></translation> + <translation>Internet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1031"/> <source>Office</source> - <translation type="unfinished"></translation> + <translation>Bureautique</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1033"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation>Préférences</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1035"/> <source>System</source> - <translation type="unfinished"></translation> + <translation>Système</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1037"/> <source>Utility</source> - <translation type="unfinished"></translation> + <translation>Accessoires</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1039"/> <source>Other</source> - <translation type="unfinished"></translation> + <translation>Autres</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1074"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> - <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="888"/> - <location filename="onmainwindow.cpp" line="916"/> - <location filename="onmainwindow.cpp" line="1671"/> - <location filename="onmainwindow.cpp" line="1700"/> - <location filename="onmainwindow.cpp" line="1708"/> - <location filename="onmainwindow.cpp" line="1854"/> - <location filename="onmainwindow.cpp" line="1881"/> - <location filename="onmainwindow.cpp" line="1884"/> - <location filename="onmainwindow.cpp" line="2136"/> - <location filename="onmainwindow.cpp" line="2369"/> - <location filename="onmainwindow.cpp" line="2383"/> - <location filename="onmainwindow.cpp" line="2396"/> - <location filename="onmainwindow.cpp" line="2430"/> - <location filename="onmainwindow.cpp" line="2475"/> - <location filename="onmainwindow.cpp" line="3386"/> - <location filename="onmainwindow.cpp" line="3564"/> - <location filename="onmainwindow.cpp" line="3573"/> - <location filename="onmainwindow.cpp" line="3881"/> - <location filename="onmainwindow.cpp" line="4356"/> - <location filename="onmainwindow.cpp" line="4432"/> - <location filename="onmainwindow.cpp" line="4496"/> - <location filename="onmainwindow.cpp" line="4526"/> - <location filename="onmainwindow.cpp" line="4568"/> - <location filename="onmainwindow.cpp" line="4940"/> - <location filename="onmainwindow.cpp" line="4966"/> - <location filename="onmainwindow.cpp" line="5116"/> - <location filename="onmainwindow.cpp" line="5896"/> - <location filename="onmainwindow.cpp" line="5926"/> - <location filename="onmainwindow.cpp" line="6703"/> - <location filename="onmainwindow.cpp" line="6783"/> - <location filename="onmainwindow.cpp" line="7025"/> - <location filename="onmainwindow.cpp" line="7150"/> - <location filename="onmainwindow.cpp" line="7201"/> - <location filename="onmainwindow.cpp" line="7505"/> - <location filename="onmainwindow.cpp" line="7507"/> - <location filename="onmainwindow.cpp" line="7738"/> - <location filename="onmainwindow.cpp" line="7786"/> - <location filename="onmainwindow.cpp" line="7814"/> - <location filename="onmainwindow.cpp" line="8252"/> - <location filename="onmainwindow.cpp" line="8267"/> - <location filename="onmainwindow.cpp" line="8313"/> - <location filename="onmainwindow.cpp" line="8339"/> - <location filename="onmainwindow.cpp" line="8364"/> - <location filename="onmainwindow.cpp" line="10578"/> + <translation>Bouton de gauche de la souris pour cacher/afficher - Bouton de droite de la souris pour afficher le menu contextuel</translation> + </message> + <message> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Erreur</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1672"/> - <location filename="onmainwindow.cpp" line="1855"/> - <location filename="onmainwindow.cpp" line="1885"/> <source>Please check LDAP settings</source> - <translation type="unfinished"></translation> + <translation>Merci de vérifier les réglages LDAP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1707"/> <source>no X2Go server found in LDAP </source> - <translation type="unfinished"></translation> + <translation>Pas de serveur X2Go trouvé dans LDAP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2019"/> <source>Create session icon on desktop</source> - <translation type="unfinished"></translation> + <translation>Créer une icone de session sur le bureau</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2020"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> - <translation type="unfinished"></translation> + <translation>Les icones de bureau peuvent être configurées pour ne pas afficher X2Go Client (mode caché). Si vous voulez utiliser cette fonctionnalité, vous aurez besoin de configurer l'identification par clef GPG ou par Smart Card GPG. + +Utiliser le mode caché de X2Go Client ?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2031"/> <source>New Session</source> - <translation type="unfinished"></translation> + <translation>Nouvelle session</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2086"/> <source>X2Go Link to session </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2136"/> <source>X2Go sessions not found</source> - <translation type="unfinished"></translation> + <translation>Sessions X2Go non trouvées</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2294"/> <source>Are you sure you want to delete this session?</source> - <translation type="unfinished"></translation> + <translation>Êtes vous sûr de vouloir effacer cette session ?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2602"/> - <location filename="onmainwindow.cpp" line="5736"/> <source>KDE</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2680"/> <source>RDP connection</source> - <translation type="unfinished"></translation> + <translation>Connection RDP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2684"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2688"/> <source>Connection to local desktop</source> - <translation type="unfinished"></translation> + <translation>Connection au bureau local</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2692"/> <source> on </source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3379"/> - <location filename="onmainwindow.cpp" line="4425"/> - <location filename="onmainwindow.cpp" line="4519"/> - <location filename="onmainwindow.cpp" line="4550"/> - <location filename="onmainwindow.cpp" line="6696"/> - <location filename="onmainwindow.cpp" line="6776"/> - <location filename="onmainwindow.cpp" line="7143"/> - <location filename="onmainwindow.cpp" line="7194"/> - <location filename="onmainwindow.cpp" line="8245"/> <source>Connection failed </source> - <translation type="unfinished"></translation> + <translation>Connection échouée +</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3382"/> - <location filename="onmainwindow.cpp" line="4428"/> - <location filename="onmainwindow.cpp" line="4522"/> - <location filename="onmainwindow.cpp" line="5893"/> - <location filename="onmainwindow.cpp" line="5923"/> - <location filename="onmainwindow.cpp" line="6699"/> - <location filename="onmainwindow.cpp" line="6779"/> - <location filename="onmainwindow.cpp" line="7146"/> - <location filename="onmainwindow.cpp" line="7197"/> - <location filename="onmainwindow.cpp" line="8248"/> <source>Wrong password! </source> - <translation type="unfinished"></translation> + <translation>Mauvais mot de passe ! </translation> </message> <message> - <location filename="onmainwindow.cpp" line="3498"/> <source>unknown</source> - <translation type="unfinished"></translation> + <translation>inconnu</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3565"/> <source>No server availabel</source> - <translation type="unfinished"></translation> + <translation>Pas de serveur disponible</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4106"/> - <location filename="onmainwindow.cpp" line="10351"/> <source>Select session:</source> - <translation type="unfinished"></translation> + <translation>Sélectionnez la session:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4122"/> - <location filename="onmainwindow.cpp" line="4219"/> - <location filename="onmainwindow.cpp" line="5340"/> <source>running</source> - <translation type="unfinished"></translation> + <translation>en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4124"/> - <location filename="onmainwindow.cpp" line="4444"/> <source>suspended</source> - <translation type="unfinished"></translation> + <translation>suspendue</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4130"/> <source>Desktop</source> - <translation type="unfinished"></translation> + <translation>Bureau</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4132"/> <source>single application</source> - <translation type="unfinished"></translation> + <translation>application simple</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4134"/> <source>shadow session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4167"/> <source>Information</source> - <translation type="unfinished"></translation> + <translation>Information</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4168"/> <source>No accessible desktop found</source> - <translation type="unfinished"></translation> + <translation>Aucun bureau distant trouvé</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4181"/> - <location filename="onmainwindow.cpp" line="10761"/> <source>Filter</source> - <translation type="unfinished"></translation> + <translation>Filtre</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4188"/> <source>Select desktop:</source> - <translation type="unfinished"></translation> + <translation>Selectionnez un bureau:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4269"/> - <location filename="onmainwindow.cpp" line="4289"/> - <location filename="onmainwindow.cpp" line="5146"/> - <location filename="onmainwindow.cpp" line="5547"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation>Attention</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4270"/> - <location filename="onmainwindow.cpp" line="4290"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> - <translation type="unfinished"></translation> + <translation>La profondeur de couleur de votre serveur X est différente de celle de votre session X2Go. Cela peut pauser problème pour se reconnecter et la plupart du temps, vous allez perdre la session. Vous êtes fortement encouragé à changer la profondeur de couleur de couleur de votre serveur X à </translation> </message> <message> - <location filename="onmainwindow.cpp" line="4278"/> <source>24 or 32</source> - <translation type="unfinished"></translation> + <translation>24 ou 32</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4279"/> - <location filename="onmainwindow.cpp" line="4299"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation type="unfinished"></translation> + <translation>bits et redémarrer votre serveur X avant de vous reconnecter à votre session. Souhaitez-vous tout de même rétablir cette session ?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2950"/> - <location filename="onmainwindow.cpp" line="4282"/> - <location filename="onmainwindow.cpp" line="4302"/> <source>Yes</source> - <translation type="unfinished"></translation> + <translation>Oui</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2873"/> <source>Enter passphrase to decrypt a key</source> - <translation type="unfinished"></translation> + <translation>Entrez une phrase de passe pour déchiffrer une clef</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2901"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>La clef d'hôte du serveur a changée. +La nouvelle clef est:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2902"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Pour des raisons de sécurité, la connection va être stoppée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2915"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation type="unfinished"></translation> + <translation>La clef d'hôte pour ce serveur n'a pas été trouvée mais un autre type de clef a été trouvé. Un attaquant peut avoir changé la clef par défaut du serveur pour faire croire à votre client que la clef n'existe pas</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2941"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation type="unfinished"></translation> + <translation>Impossible de trouver le fichier des hôtes connus. Si vouss acceptez la clef d'hôte ici, le fichier sera automatiquement créé</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2946"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Le serveur est inconnu. Avez vous confiance en la clef d'hôte ? +Hash de la clef publique: </translation> </message> <message> - <location filename="onmainwindow.cpp" line="2950"/> - <location filename="onmainwindow.cpp" line="4283"/> - <location filename="onmainwindow.cpp" line="4303"/> <source>No</source> - <translation type="unfinished"></translation> + <translation>Non</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2950"/> - <location filename="onmainwindow.cpp" line="2960"/> <source>Host key verification failed</source> - <translation type="unfinished"></translation> + <translation>La vérification de la clef d'hôte a échouée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2977"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>L'autentification a échouée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3354"/> <source>Enter password for SSH proxy</source> - <translation type="unfinished"></translation> + <translation>Entrez un mot de passe pour le proxy SSH</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3574"/> - <location filename="onmainwindow.cpp" line="3882"/> - <location filename="onmainwindow.cpp" line="4357"/> - <location filename="onmainwindow.cpp" line="4497"/> <source>Server not availabel</source> - <translation type="unfinished"></translation> + <translation>Le serveur n'est pas disponible</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4383"/> <source>suspending</source> - <translation type="unfinished"></translation> + <translation type="unfinished">suspension</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4413"/> <source>terminating</source> - <translation type="unfinished"></translation> + <translation type="unfinished">en train de se terminer</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4553"/> <source>Wrong Password! </source> - <translation type="unfinished"></translation> + <translation>Mauvais mot de passe ! </translation> </message> <message> - <location filename="onmainwindow.cpp" line="4938"/> - <location filename="onmainwindow.cpp" line="7023"/> <source>Unable to create folder:</source> - <translation type="unfinished"></translation> + <translation>Impossible de créer le dossier:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4964"/> <source>Unable to write file:</source> - <translation type="unfinished"></translation> + <translation>Impossible de créer le fichier:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5088"/> - <location filename="onmainwindow.cpp" line="9599"/> <source>Attach X2Go window</source> - <translation type="unfinished"></translation> + <translation>Atacher la fenêtre X2Go</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5114"/> - <location filename="onmainwindow.cpp" line="8311"/> <source>Unable to create SSL tunnel: </source> - <translation type="unfinished"></translation> + <translation>Impossible de créer un tunnel SSL:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5144"/> <source>Unable to create SSL Tunnel: </source> - <translation type="unfinished"></translation> + <translation>Impossible de créer un tunnel SSL:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5305"/> <source>Finished</source> - <translation type="unfinished"></translation> + <translation>Fini</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5329"/> <source>starting</source> - <translation type="unfinished"></translation> + <translation>démarrage</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5333"/> <source>resuming</source> - <translation type="unfinished"></translation> + <translation>rétablissement</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5396"/> - <location filename="onmainwindow.cpp" line="5658"/> - <location filename="onmainwindow.cpp" line="5677"/> <source>Connection timeout, aborting</source> - <translation type="unfinished"></translation> + <translation>Connection expirée, abandon en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5397"/> <source>aborting</source> - <translation type="unfinished"></translation> + <translation>abandon en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5548"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5626"/> <source>Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5628"/> - <location filename="onmainwindow.cpp" line="10432"/> - <location filename="onmainwindow.cpp" line="10454"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5630"/> - <location filename="onmainwindow.cpp" line="10443"/> <source>Creation time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5890"/> - <location filename="onmainwindow.cpp" line="5920"/> <source>Connection failed : </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6336"/> <source> (can't open file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6347"/> - <location filename="onmainwindow.cpp" line="6357"/> - <location filename="onmainwindow.cpp" line="6367"/> <source> (file not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6391"/> <source> (directory not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6419"/> <source>wrong value for argument"--link"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6437"/> <source>wrong value for argument"--sound"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6454"/> - <location filename="onmainwindow.cpp" line="6465"/> <source>wrong value for argument"--geometry"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6483"/> <source>wrong value for argument"--set-kbd"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6500"/> <source>wrong value for argument"--ldap"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6522"/> <source>wrong value for argument"--ldap1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6541"/> <source>wrong value for argument"--ldap2"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6595"/> <source>wrong value for argument"--pack"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6603"/> - <location filename="onmainwindow.cpp" line="6606"/> <source>wrong parameter: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6657"/> - <location filename="onmainwindow.cpp" line="6683"/> <source>Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6662"/> <source>Available pack methodes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7437"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7442"/> <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7446"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7450"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7463"/> <source>X2Go client V. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7508"/> <source>Please check LDAP Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7739"/> <source>No valid card found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7787"/> <source>This card is unknown by X2Go system</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7815"/> <source>Unable to create file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8089"/> <source>Can't start X server Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8088"/> <source>Can't connect to X server Please check your settings</source> - <oldsource>Can't connect to X-Server -Please check your settings</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8103"/> - <location filename="onmainwindow.cpp" line="8726"/> - <location filename="onmainwindow.cpp" line="8754"/> <source>Can't start X Server Please check your installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8268"/> <source>Unable to execute: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8285"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8338"/> <source>Unable to read : </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8363"/> <source>Unable to write : </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9688"/> <source>X2Go Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9989"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9990"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10031"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10033"/> - <location filename="onmainwindow.cpp" line="10355"/> - <location filename="onmainwindow.cpp" line="10357"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10170"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10180"/> <source>Applications...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10193"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10205"/> <source>Show details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10353"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10365"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10368"/> <source>Full access</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10371"/> <source>View only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10434"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10436"/> <source>Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10438"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10440"/> <source>Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10445"/> <source>Client IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10447"/> <source>Session ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10451"/> <source>User</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10482"/> <source>Only my desktops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10579"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10648"/> <source>Restore toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10693"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> - <location filename="onmainwindow.cpp" line="3028"/> - <location filename="onmainwindow.cpp" line="10829"/> <source>Connecting to broker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8450"/> <source>WINDOWS-1252</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8462"/> <source>ISO8859-1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9875"/> <source>wrong value for argument"speed"</source> <translation type="unfinished"></translation> </message> @@ -1777,22 +1329,18 @@ you can install sshd with <context> <name>PrintDialog</name> <message> - <location filename="printdialog.cpp" line="31"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printdialog.cpp" line="60"/> <source>You've deactivated the x2go client printing dialog.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printdialog.cpp" line="62"/> <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printdialog.ui" line="18"/> <source>Print - X2Go client</source> <translation type="unfinished"></translation> </message> @@ -1800,25 +1348,19 @@ you can install sshd with <context> <name>PrintProcess</name> <message> - <location filename="printprocess.cpp" line="161"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printprocess.cpp" line="163"/> <source>PDF Document (*.pdf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printprocess.cpp" line="257"/> - <location filename="printprocess.cpp" line="280"/> <source>Failed to execute command: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="printprocess.cpp" line="272"/> - <location filename="printprocess.cpp" line="279"/> <source>Printing error</source> <translation type="unfinished"></translation> </message> @@ -1826,73 +1368,59 @@ you can install sshd with <context> <name>PrintWidget</name> <message> - <location filename="printwidget.cpp" line="59"/> <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="15"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="25"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="35"/> <source>View as PDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="65"/> <source>Print settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="71"/> <source>Printer:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="81"/> <source>Print using default Windows PDF Viewer (Viewer application needs to be installed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="96"/> <source>Printer command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="118"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="149"/> <source>Viewer settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="155"/> <source>Open in viewer application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="167"/> <source>Command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="179"/> <source>Save to disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="209"/> <source>Show this dialog before start printing</source> <translation type="unfinished"></translation> </message> @@ -1900,29 +1428,24 @@ you can install sshd with <context> <name>PrinterCmdDialog</name> <message> - <location filename="printercmddialog.cpp" line="43"/> <source>Please enter your customized or individual printing command. Example: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.cpp" line="51"/> <source><Path to gsprint.exe> -query -color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="15"/> <source>Printer command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="21"/> <source>Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="27"/> <source>Please enter your customized or individual printing command. Examples: kprinter @@ -1930,178 +1453,121 @@ lpr -P hp_laserjet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="46"/> <source>Output format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="52"/> <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="68"/> <source>PDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="75"/> <source>PS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="88"/> <source>Data structure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="94"/> <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="110"/> <source>standard input (STDIN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="117"/> <source>Specify path as program parameter</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="ongetpass.cpp" line="76"/> - <source>No response received from the remote server. Do you want to terminate the current session?</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>SessionButton</name> <message> - <location filename="sessionbutton.cpp" line="135"/> <source>Session preferences...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> <source>Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="144"/> <source>Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="157"/> <source>Session actions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="158"/> <source>Select type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="160"/> <source>Select resolution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="161"/> <source>Toggle sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="291"/> <source>New Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="296"/> <source>running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="300"/> <source>suspended</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="333"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="348"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="684"/> <source>RDP connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="401"/> - <location filename="sessionbutton.cpp" line="690"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="350"/> - <location filename="sessionbutton.cpp" line="386"/> - <location filename="sessionbutton.cpp" line="678"/> <source>Connection to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="351"/> - <location filename="sessionbutton.cpp" line="406"/> - <location filename="sessionbutton.cpp" line="726"/> <source>Published applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="430"/> - <location filename="sessionbutton.cpp" line="448"/> - <location filename="sessionbutton.cpp" line="747"/> <source>fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="435"/> - <location filename="sessionbutton.cpp" line="458"/> - <location filename="sessionbutton.cpp" line="462"/> - <location filename="sessionbutton.cpp" line="760"/> - <location filename="sessionbutton.cpp" line="763"/> <source>Display </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="443"/> - <location filename="sessionbutton.cpp" line="483"/> <source>window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="490"/> - <location filename="sessionbutton.cpp" line="494"/> - <location filename="sessionbutton.cpp" line="495"/> - <location filename="sessionbutton.cpp" line="753"/> <source>Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="502"/> - <location filename="sessionbutton.cpp" line="632"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="504"/> - <location filename="sessionbutton.cpp" line="634"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -2109,38 +1575,31 @@ lpr -P hp_laserjet</source> <context> <name>SessionManageDialog</name> <message> - <location filename="sessionmanagedialog.cpp" line="41"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="47"/> <source>&New session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="48"/> <source>&Session preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="49"/> <source>&Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="53"/> <source>&Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="87"/> <source>Delete</source> <comment>Delete</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="115"/> <source>Session management</source> <translation type="unfinished"></translation> </message> @@ -2148,226 +1607,170 @@ lpr -P hp_laserjet</source> <context> <name>SessionWidget</name> <message> - <location filename="sessionwidget.cpp" line="61"/> <source>Session name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="66"/> <source><< change icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="69"/> <source>&Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="102"/> - <location filename="sessionwidget.cpp" line="160"/> <source>Host:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="103"/> - <location filename="sessionwidget.cpp" line="166"/> <source>Login:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="104"/> - <location filename="sessionwidget.cpp" line="367"/> <source>SSH port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="119"/> <source>Use RSA/DSA key for ssh connection:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> <source>Try auto login (ssh-agent or default ssh key)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> <source>Kerberos 5 (GSSAPI) authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="130"/> <source>Use Proxy server for SSH connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> <source>Proxy server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="137"/> <source>SSH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="138"/> <source>HTTP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="146"/> <source>Same login as on X2Go Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="148"/> <source>Same password as on X2Go Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="150"/> <source>RSA/DSA key:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="155"/> <source>ssh-agent or default ssh key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="157"/> <source>Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="161"/> <source>Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="176"/> <source>&Session type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="181"/> <source>Session type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> - <location filename="sessionwidget.cpp" line="491"/> <source>Connect to Windows terminal server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="193"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> <source>Connect to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="195"/> <source>Custom desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="196"/> <source>Single application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="197"/> <source>Published applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="199"/> - <location filename="sessionwidget.cpp" line="435"/> <source>Command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="200"/> <source>Advanced options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="212"/> - <location filename="sessionwidget.cpp" line="725"/> - <location filename="sessionwidget.cpp" line="820"/> <source>Path to executable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="222"/> <source>Direct RDP Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="363"/> <source>RDP port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="379"/> <source>Open picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="381"/> <source>Pictures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="290"/> - <location filename="sessionwidget.cpp" line="402"/> <source>Open key file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="292"/> - <location filename="sessionwidget.cpp" line="404"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="462"/> - <location filename="sessionwidget.cpp" line="680"/> <source>Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="471"/> - <location filename="sessionwidget.cpp" line="692"/> <source>XDMCP server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="492"/> <source>rdesktop command line options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="505"/> - <location filename="sessionwidget.cpp" line="704"/> <source>New session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="302"/> - <location filename="sessionwidget.cpp" line="414"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="303"/> - <location filename="sessionwidget.cpp" line="415"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> @@ -2375,156 +1778,123 @@ lpr -P hp_laserjet</source> <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="47"/> - <location filename="settingswidget.cpp" line="51"/> <source>&Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="48"/> - <location filename="settingswidget.cpp" line="52"/> <source>&Keyboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="49"/> - <location filename="settingswidget.cpp" line="53"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="244"/> <source>RDP Client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="64"/> <source>Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="66"/> <source>Custom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="68"/> <source>Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="70"/> <source>Use whole display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="72"/> <source>Maximum available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="83"/> <source>Set display DPI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="88"/> <source>Xinerama extension (support for two or more physical displays)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="104"/> <source>Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="107"/> <source>Height:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="117"/> <source>&Display:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="119"/> <source>&Identify all displays</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="159"/> <source>Keep current keyboard Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="169"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="171"/> <source>Keyboard model:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="182"/> <source>Enable sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="191"/> <source>Start sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="193"/> <source>Use running sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="195"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="197"/> <source>Use default sound port</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="204"/> <source>Sound port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="231"/> <source>Client side printing support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="256"/> <source>Additional parameters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="257"/> <source>Command line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="650"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="651"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="768"/> <source>password</source> <translation type="unfinished"></translation> </message> @@ -2532,80 +1902,62 @@ sound system connections through firewalls</source> <context> <name>ShareWidget</name> <message> - <location filename="sharewidget.cpp" line="43"/> <source>&Folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="53"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="55"/> - <location filename="sharewidget.cpp" line="137"/> <source>Automount</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="64"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="65"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="75"/> <source>Path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="101"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="164"/> <source>Select folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="82"/> <source>Filename encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="235"/> - <location filename="sharewidget.cpp" line="286"/> <source>WINDOWS-1252</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="245"/> - <location filename="sharewidget.cpp" line="292"/> <source>ISO8859-1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="88"/> <source>local:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="89"/> <source>remote:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="175"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="176"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> @@ -2613,103 +1965,82 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="221"/> <source>SSH proxy connection error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="226"/> - <location filename="sshmasterconnection.cpp" line="232"/> <source>SSH proxy connection error: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="248"/> <source>Failed to create SSH proxy tunnel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="319"/> <source>Can not initialize libssh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="345"/> <source>Can not create ssh session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="373"/> <source>Can not connect to proxy server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="394"/> <source>Can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="448"/> <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="474"/> <source>channel_forward_listen failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="893"/> <source>Can not open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="905"/> <source>Can not create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="918"/> <source>Can not write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="975"/> <source>can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1093"/> <source>channel_open_forward failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1112"/> <source>channel_open_session failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1119"/> <source>channel_request_exec failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1184"/> <source>error writing to socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1202"/> <source>error reading channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1232"/> <source>channel_write failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1244"/> <source>error reading tcp socket</source> <translation type="unfinished"></translation> </message> @@ -2717,12 +2048,10 @@ sound system connections through firewalls</source> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="95"/> <source>Error creating socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshprocess.cpp" line="113"/> <source>Error binding </source> <translation type="unfinished"></translation> </message> @@ -2730,12 +2059,10 @@ sound system connections through firewalls</source> <context> <name>XSettingsWidget</name> <message> - <location filename="xsettingswidget.cpp" line="48"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingswidget.cpp" line="50"/> <source>Executable (*.exe)</source> <translation type="unfinished"></translation> </message> @@ -2743,62 +2070,50 @@ sound system connections through firewalls</source> <context> <name>XSettingsWidgetUI</name> <message> - <location filename="xsettingsui.ui" line="15"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="28"/> <source>You must restart the X2Go Client for the changes to take effect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="51"/> <source>use integrated X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="61"/> <source>use custom X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="71"/> <source>custom X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="79"/> <source>executable:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="102"/> <source>start X-Server on X2Go client start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="114"/> <source>command line options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="126"/> <source>X-Server command line options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="132"/> <source>window mode:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="142"/> <source>fullscreen mode:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="152"/> <source>single application:</source> <translation type="unfinished"></translation> </message> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-133-g9737884
by git-admin＠x2go.org 15 Feb '13

15 Feb '13

The branch, master has been updated via 97378841e2201ccc3dd2eec5736e607d2d2da45e (commit) from cd23b80ca2f1056500e8b78cedebf60089086bda (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 97378841e2201ccc3dd2eec5736e607d2d2da45e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 15 11:08:07 2013 +0100 Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gogetapps | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8d32658..b6dd930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + - Allow for deploying X2Go Published Applications system-wide on a + per-user basis (in /etc/x2go/applications-per-user/<username>). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 28842c0..39cafa2 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -182,7 +182,8 @@ my $file; my @dirs; @dirs[0]="/etc/x2go/applications"; my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); -@dirs[1]="$homedir/.x2go/applications"; +@dirs[1]="/etc/x2go/applications-per-user/$name"; +@dirs[2]="$homedir/.x2go/applications"; foreach(@dirs) { my $dirname=$_; hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.0-6-gc12aa8e
by git-admin＠x2go.org 15 Feb '13

15 Feb '13

The branch, release/4.0.0.x has been updated via c12aa8e82a53f041c64a8f8de68abba2e1108d35 (commit) from df45ea1b2327e0ec7672234a7370002fc8347529 (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 c12aa8e82a53f041c64a8f8de68abba2e1108d35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 15 11:08:07 2013 +0100 Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gogetapps | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2625e86..ed4ee9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + - Allow for deploying X2Go Published Applications system-wide on a + per-user basis (in /etc/x2go/applications-per-user/<username>). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index dbcd8c1..8414daa 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -180,7 +180,8 @@ my $file; my @dirs; @dirs[0]="/etc/x2go/applications"; my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); -@dirs[1]="$homedir/.x2go/applications"; +@dirs[1]="/etc/x2go/applications-per-user/$name"; +@dirs[2]="$homedir/.x2go/applications"; foreach(@dirs) { my $dirname=$_; 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

x2gobroker.git - master (branch) updated: 0.0.0.1-6-g5231ba4
by git-admin＠x2go.org 14 Feb '13

14 Feb '13

The branch, master has been updated via 5231ba48183cc603a5193400884dd01b360491ba (commit) from 716736e53b9bf284d5bc196b708bc3b2362b50a4 (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 5231ba48183cc603a5193400884dd01b360491ba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 14 06:26:41 2013 +0100 Add load balancing support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + lib/x2gobroker-agent.pl | 37 ++++++++++++++ x2gobroker/agent.py | 87 +++++++++++++++++++++++++++++++++ x2gobroker/brokers/base_broker.py | 32 ++++++++++-- x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/web/plain.py | 2 +- 6 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 x2gobroker/agent.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 025cc4c..0984633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.0.2): - Make CC, CFLAGS and LDFLAGS configurable through build system. - Make host session option a list, not string. + - Add load balancing support. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 6a64bbf..74e0751 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -98,6 +98,43 @@ if($mode eq 'listsessions') exec ("/bin/su - $uid -c \"x2golistsessions --all-servers\""); } +if($mode eq 'findbestserver_by_sessionstats') || ($mode eq 'findbestserver') +{ + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); + print "OK\n"; + my $session_list = `/bin/su - -c \"x2golistsessions_root --all-servers\"`; + my $avail_servers = `/bin/su - $uid -c \"x2gogetservers\"`; + my $amount_sessions = 0; + + # initialize server_load hash + my %server_load = (); + foreach (split('\n', $avail_servers)) + { + $server_load{$_} = 0; + } + + # count sessions per server + my @session_list = split(/\n/, $session_list); + foreach (@session_list) + { + my ($apid, $sid, $disp, $hostname, $stat, $dcreated, $cookie, $gport, $sndport, $dsusp, $username, $fsport) = split('\\|', $_); + $amount_sessions++; + $server_load{$hostname} += 1; + } + + # render the output result + my @result; + for my $hostname ( keys %server_load ) { + my $available = 100-$server_load{$hostname}/$amount_sessions*100; + if ($available eq 0) { + $available = 100; + } + push @result, sprintf '%1$d:%2$s', $available, $hostname; + } + print join('\n', sort @result); + print "\n"; +} + if($mode eq 'getservers') { diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py new file mode 100644 index 0000000..3e7cdc6 --- /dev/null +++ b/x2gobroker/agent.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +import subprocess + +# X2Go Broker modules +import x2gobroker.defaults + +def call_x2gobroker_agent(username, mode): + """\ + Launch X2Go Broker Agent and process its output. + + @param username: run the broker agent for this user + @type username: C{unicode} + @param mode: execution mode of the broker (listsessions, getservers, etc.) + @type mode: C{unicode} + + """ + cmdline = [ + '{x2gobroker_agent_binary}'.format(x2gobroker_agent_binary=x2gobroker.defaults.X2GOBROKER_AGENT_CMD), + '{username}'.format(username=username), + '{mode}'.format(mode=mode), + ] + + subprocess.Popen(cmd_line, + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=False, + ) + + return subprocess.stdout.read() + +def list_sessions(username): + """\ + Query X2Go Broker Agent for a session list for a given username. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + return call_broker_agent(username, mode='listsessions') + +def find_best_server(username=None): + """\ + Query X2Go Broker Agent for the best server for the given user. + In many cases the username does not have an effect on the + detection of an optimal server. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + server_list = call_broker_agent(username, mode='findbestserver') + server_list.sort(reverse=True) + return server_list[0].split(':')[1] + +def get_servers(username=None): + """\ + Query X2Go Broker Agent for the list of available servers + for the given user. In many cases the username does not + have an effect on the list of available servers. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + return call_broker_agent(username, mode='getservers') + diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index c06dfa6..9c710b3 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -29,10 +29,12 @@ import types import copy import uuid import netaddr +import random # X2Go Broker modules import x2gobroker.config import x2gobroker.defaults +import x2gobroker.agent class X2GoBroker(object): """\ @@ -685,7 +687,7 @@ class X2GoBroker(object): return list_of_profiles - def select_session(self, profile_id): + def select_session(self, profile_id, username=None): """\ Start/resume a session by selecting a profile name offered by the X2Go client. @@ -693,16 +695,40 @@ class X2GoBroker(object): broker. @param profile_id: the selected profile ID. This matches one of the dictionary keys offered by the C{list_profiles} method - @type profile_id: C{dict} + @type profile_id: C{unicode} + @param username: specify username that this operation runs for + @type username: C{unicode} """ profile = self.get_profile(profile_id) + # if we have more than one server, pick one server randomly for X2Go Broker Agent queries + server_list = profile[u'host'] + random.shuffle(server_list) + agent_query_server = server_list[0] + + best_server = x2gobroker.agent.find_best_server() + selected_session = { - 'server': profile[u'host'][0], + 'server': best_server, 'port': profile[u'sshport'], } + # do some load balancing if more than one server is configured + if len(server_list) >= 1 and username: + + session_list = x2gobroker.agent.list_sessions(username=username) + if session_list: + + # if resuming, always select the first session in the list, there should only be one suspended session + server_name = session_list[0].split('|')[3] + session_info = session_list[0].split('|')[1] + + selected_session.update({ + 'server': server_name, + 'session_info': session_info, + }) + return selected_session def change_password(self, new='', old=''): diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index ad21567..5970659 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -76,7 +76,7 @@ class X2GoBroker(base.X2GoBroker): } return list_of_profiles - def select_session(self, profile_id): + def select_session(self, profile_id, username=None): selectprofile_output = { 'server': 'localhost', diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index b6c5f83..e25b5c0 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -142,7 +142,7 @@ class X2GoBrokerWebPlain: if profile_id: - profile_info = broker_backend.select_session(profile_id=profile_id) + profile_info = broker_backend.select_session(profile_id=profile_id, username=username) if profile_info.has_key('server'): output += "SERVER:" output += profile_info['server'] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-x2go.git - master (branch) updated: 0.4.0.1-2-g938bb81
by git-admin＠x2go.org 14 Feb '13

14 Feb '13

The branch, master has been updated via 938bb81114832e2c769218b90cd346c4258d59b8 (commit) from 4af31629e0038edcb7c8a89f463d641e50f9e88a (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 938bb81114832e2c769218b90cd346c4258d59b8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 14 05:25:55 2013 +0100 sort session list fields ----------------------------------------------------------------------- Summary of changes: x2go/backends/info/_stdout.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 2273eb3..6bbed1d 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -60,20 +60,20 @@ class X2GoServerSessionInfoSTDOUT(object): """ try: l = x2go_output.split("|") - self.name = l[1] - self.cookie = l[6] self.agent_pid = int(l[0]) + self.name = l[1] self.display = int(l[2]) - self.status = l[4] - self.graphics_port = int(l[8]) - self.snd_port = int(l[9]) - self.sshfs_port = int(l[13]) - self.username = l[11] self.hostname = l[3] + self.status = l[4] # TODO: turn into datetime object self.date_created = l[5] + self.cookie = l[6] + self.graphics_port = int(l[8]) + self.snd_port = int(l[9]) # TODO: turn into datetime object self.date_suspended = l[10] + self.username = l[11] + self.sshfs_port = int(l[13]) self.local_container = '' except IndexError, e: # DEBUGGING CODE 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

x2godesktopsharing.git - master (branch) updated: 3.1.0.6-4-g1d71a0a
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via 1d71a0a39cb3430f0efd54d24b7a329390d8aaa3 (commit) from df2c3b52274c257402026571d9ed00a9dd905762 (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 1d71a0a39cb3430f0efd54d24b7a329390d8aaa3 Author: Frédéric Motte <frederic.motte(a)liazo.fr> Date: Wed Feb 13 20:03:12 2013 +0100 Add French translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++ x2godesktopsharing_fr.ts | 97 ++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 60 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c05a3df..ac4f6ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ x2godesktopsharing (3.1.1.0-0~x2go1) UNRELEASED; urgency=low + [ Frédéric Motte ] + * New upstream version (3.1.1.0): + - Add French translation file. + + [ Mike Gabriel ] * Continue development... -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 10 Jan 2013 10:06:02 +0100 diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts index bde94cf..c3c6c8e 100644 --- a/x2godesktopsharing_fr.ts +++ b/x2godesktopsharing_fr.ts @@ -1,154 +1,124 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="fr_FR"> +<!DOCTYPE TS><TS> <context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation type="unfinished"></translation> + <translation>Sauver la selection de %1</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation type="unfinished"></translation> + <translation>Accepter %1 de %2 ?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> <source>X2GO DesktopSharing v</source> - <translation type="unfinished"></translation> + <translation>X2GO Desktop Sharing v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> - <translation type="unfinished"></translation> + <translation>L'application X2Go Desktop Sharing est déjà active pour ce display. +Si cette application n'est plus en cours d'execution, effacez le fichier %1 et redémarrez</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="337"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Erreur</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> - <translation type="unfinished"></translation> + <translation>Application X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs autorisés...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs bannis...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Activer X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Désactiver X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> - <translation type="unfinished"></translation> + <translation>Apropos de X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation>&Quitter</translation> </message> <message> - <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> - <translation type="unfinished"></translation> + <translation>Impossible d'écouter sur le socket:</translation> </message> <message> - <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> - <translation type="unfinished"></translation> + <translation>Accès autorisé</translation> </message> <message> - <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> - <translation type="unfinished"></translation> + <translation>%1(%2): accès autorisé</translation> </message> <message> - <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> - <translation type="unfinished"></translation> + <translation>Déconnecté %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> - <translation type="unfinished"></translation> + <translation>Connection distante</translation> </message> <message> - <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) connecté</translation> </message> <message> - <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> - <translation type="unfinished"></translation> + <translation>Accès refusé</translation> </message> <message> - <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> - <translation type="unfinished"></translation> + <translation>%1(%2): accès refusé</translation> </message> <message> - <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> - <translation type="unfinished"></translation> + <translation>Utilisateur déconnecté</translation> </message> <message> - <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) déconnecté</translation> </message> <message> - <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs bannis</translation> </message> <message> - <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> - <translation type="unfinished"></translation> + <translation>Utilisateurs autorisés</translation> </message> <message> - <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Desktop Sharing</translation> </message> </context> <context> <name>mwnd</name> <message> - <location filename="dlg.ui" line="22"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Desktop Sharing</translation> </message> <message> - <location filename="dlg.ui" line="34"/> <source>remove</source> - <translation type="unfinished"></translation> + <translation>retirer</translation> </message> <message> - <location filename="dlg.ui" line="75"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -157,7 +127,14 @@ p, li { white-space: pre-wrap; } This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit <a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + X2Go Desktop Sharing vous permet de partager votre session X en cours sur le réseau local ou à travers Internet. Vous aurez la possibilité d'autoriser ou refuser les connections d'utilisateurs et de sauver vos préférences. Une icone dans la barre de meun vous informera de la configuration choisie et vous informera de l'activité des connections. Pour plus d'information, merci de vous rendre sur le site web + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></translation> </message> </context> </TS> hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-5-g716736e
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via 716736e53b9bf284d5bc196b708bc3b2362b50a4 (commit) from d424e129de63d2fd187d1364bf5d2791d74571be (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 716736e53b9bf284d5bc196b708bc3b2362b50a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:35:35 2013 +0100 whitespace fix ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index f84e097..d797697 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -55,7 +55,7 @@ sshport=22 setdpi=0 pack=16m-jpeg -## +## ## pool-A (staff servers) ## ## The pool-A contains three X2Go Servers (server-A, server-B and server-C). hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-4-gd424e12
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via d424e129de63d2fd187d1364bf5d2791d74571be (commit) via dc84423e202eba6c1022821b24a25504ee1cab0c (commit) via 0e4b85183bd23e6561ba687bb693cf0f3612297d (commit) via fba2b53e36f84b12f7dfcdfe971149415cae3019 (commit) from 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (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 d424e129de63d2fd187d1364bf5d2791d74571be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:35:02 2013 +0100 Make host session option a list, not string. commit dc84423e202eba6c1022821b24a25504ee1cab0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:34:32 2013 +0100 really build x2gobroker-agent setuidwrapper commit 0e4b85183bd23e6561ba687bb693cf0f3612297d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:33:59 2013 +0100 /debian/control: Add bin:package x2gobroker-agent. commit fba2b53e36f84b12f7dfcdfe971149415cae3019 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 17:32:31 2013 +0100 Make CC, CFLAGS and LDFLAGS configurable through build system. ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +- debian/changelog | 10 +++ debian/control | 94 ++++++++++++++-------------- debian/rules | 4 +- etc/broker/x2gobroker-sessionprofiles.conf | 3 +- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/defaults.py | 2 + 7 files changed, 67 insertions(+), 54 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 1293dab..07428f6 100755 --- a/Makefile +++ b/Makefile @@ -27,6 +27,10 @@ INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_PROGRAM=install -o root -g root -m 755 +CC ?= gcc +CFLAGS += -fPIE +LDFLAGS += -pie + RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty @@ -52,7 +56,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_setuidwrappers: - gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: # run setup.py build+install somewhere here... diff --git a/debian/changelog b/debian/changelog index e040920..025cc4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.0.0.2): + - Make CC, CFLAGS and LDFLAGS configurable through build system. + - Make host session option a list, not string. + * /debian/control: + + Add bin:package x2gobroker-agent. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 + x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low * Initial upstream version. diff --git a/debian/control b/debian/control index 2789bf7..3b222bc 100644 --- a/debian/control +++ b/debian/control @@ -138,50 +138,50 @@ Description: X2Go http(s) based session broker (Python modules) This package contains common files needed by all X2Go session brokers being package for this distribution. -#Package: x2gobroker-agent -#Architecture: any -#Depends: -# ${shlibs:Depends}, -# ${misc:Depends}, -# perl, -# adduser, -# x2goserver, -#Description: X2Go http(s) based session broker (common files) -# X2Go is a server based computing environment with -# - session resuming -# - low bandwidth support -# - LDAP support -# - client side mass storage mounting support -# - client side printing support -# - audio support -# - authentication by smartcard and USB stick -# . -# The session broker is a server tool for X2Go that -# tells your X2Go Client application in a terminal -# server cluster what servers and session types are -# most appropriate for the user in front of the -# X2Go terminal. -# . -# A session broker is most useful in load balanced -# X2Go server farms. -# . -# This package contains a setuid agent command that -# is required by the X2Go session broker. This package -# has to be installed on all X2Go servers that shall get -# managed via the X2Go session broker. -# . -# WARNING: This package installs a setuid wrapper -# (/usr/lib/x2go/broker/x2gobroker-agent) on your system. -# This setuid wrapper aims to be a secure replacement -# for the deprecated suidperl exectuable that was removed -# from Perl (>= 5.12). -# . -# This wrapper is only able to execute the Perl script -# /usr/lib/x2go/broker/x2gobroker-agent.pl. For running -# properly, x2gobroker-agent.pl needs setuid privileges. -# . -# If you hesitate to install this package, study the code -# of the named wrapper and the named Perl script beforehand. -# Note that the X2Go session broker will not work without this -# x2gobroker-agent component installed on your to-be-managed -# X2Go servers. +Package: x2gobroker-agent +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + perl, + adduser, + x2goserver, +Description: X2Go http(s) based session broker (common files) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains a setuid agent command that + is required by the X2Go session broker. This package + has to be installed on all X2Go servers that shall get + managed via the X2Go session broker. + . + WARNING: This package installs a setuid wrapper + (/usr/lib/x2go/broker/x2gobroker-agent) on your system. + This setuid wrapper aims to be a secure replacement + for the deprecated suidperl exectuable that was removed + from Perl (>= 5.12). + . + This wrapper is only able to execute the Perl script + /usr/lib/x2go/broker/x2gobroker-agent.pl. For running + properly, x2gobroker-agent.pl needs setuid privileges. + . + If you hesitate to install this package, study the code + of the named wrapper and the named Perl script beforehand. + Note that the X2Go session broker will not work without this + x2gobroker-agent component installed on your to-be-managed + X2Go servers. diff --git a/debian/rules b/debian/rules index 787fc72..997158b 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall include /usr/share/dpkg/buildflags.mk -#DEB_PERL_PACKAGES=libx2go-broker-perl -#DEB_PERL_CLEAN_TARGET=realclean -#include /usr/share/cdbs/1/class/perl-makemaker.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/python-distutils.mk diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 8b332a3..f84e097 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -144,8 +144,7 @@ acl-any-order=deny-allow [pool-C-XFCE] user= # no load balancing support, yet -#host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local -host=s-E1.pool-c.domain.local +host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local name=XFCE - pool-C command=XFCE acl-users-allow=testuser-A,testuser-B diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7da6336..c06dfa6 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -699,7 +699,7 @@ class X2GoBroker(object): profile = self.get_profile(profile_id) selected_session = { - 'server': profile[u'host'], + 'server': profile[u'host'][0], 'port': profile[u'sshport'], } diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 63bc254..48b61d8 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -139,6 +139,8 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'sshport': 22, u'setdpi': 0, u'pack': u'16m-jpeg', + u'user': '', + u'host': [ u'localhost', ], u'acl-users-allow': [], u'acl-users-deny': [], u'acl-users-order': '', hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goclient.git - master (branch) updated: 4.0.0.0-16-gb3121c4
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via b3121c46cd4494b6d15cf644292f290bf0dadc91 (commit) from 11e960045237f9a303a4d9a6c7be24db3f494946 (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 b3121c46cd4494b6d15cf644292f290bf0dadc91 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Feb 13 15:46:46 2013 +0100 Launching parec to init pulseaudio input only on Windows ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 6 +++++- onmainwindow.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3cd0b94..034b01c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * Continue new feature development... + [ Oleksandr Shneyder ] + * Launching parec to init pulseaudio input only on Windows + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 31aaf7f..acef85f 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -10593,8 +10593,10 @@ void ONMainWindow::printSshDError() QMessageBox::Ok,QMessageBox::NoButton ); } +#ifdef Q_OS_WIN void ONMainWindow::slotStartParec () { + if ( !parecTunnelOk ) { // wait 1 sec and try again @@ -10611,7 +10613,7 @@ void ONMainWindow::slotStartParec () sshConnection->executeCommand ( scmd ); } - +#endif void ONMainWindow::slotSndTunOk() { @@ -10623,8 +10625,10 @@ void ONMainWindow::slotPCookieReady ( bool result, QString , int ) { +#ifdef Q_OS_WIN if ( result ) slotStartParec(); +#endif } diff --git a/onmainwindow.h b/onmainwindow.h index 5865cd2..5a48cba 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -909,6 +909,7 @@ private slots: void slotCheckXOrgLog(); void slotCheckXOrgConnection(); void slotCheckPulse(); + void slotStartParec (); #endif private slots: void slotAppDialog(); @@ -1040,7 +1041,6 @@ private slots: void slotAttachProxyWindow(); void slotEmbedIntoParentWindow(); void slotEmbedWindow(); - void slotStartParec (); void slotSndTunOk(); void slotPCookieReady ( bool result,QString output, int proc ); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-baikal (branch) updated: 4.0.0.3
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, build-baikal has been updated via d351dcec2702444a87ff9eafb5a1733281be6e85 (commit) via 2d37d608452ade797ff5ace47db44cde28edf14d (commit) from 7bf7bd92b0f2935bdac590e62519827ac6e86b95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index bbf753a..3ab15cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0.1 +4.0.0.3 diff --git a/debian/changelog b/debian/changelog index 4ef406e..31ac841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.0.3-0~x2go1) unstable; urgency=low + + * Fix version in version.h, VERSION and x2goplugin.rc. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 14:37:24 +0100 + x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/version.h b/version.h index a8921eb..b44511f 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.0.1" +#define VERSION "4.0.0.3" diff --git a/x2goplugin.rc b/x2goplugin.rc index 4939012..70eccaf 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,0,1 - PRODUCTVERSION 4,0,0,1 + FILEVERSION 4,0,0,3 + PRODUCTVERSION 4,0,0,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 0 ,1\0" + VALUE "FileVersion", "4, 0, 0 ,3\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.0.1\0" - VALUE "ProductVersion", "4, 0, 0, 1\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.0.3\0" + VALUE "ProductVersion", "4, 0, 0, 3\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits