[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.2.1-4-gc688541
X2Go dev team
git-admin at x2go.org
Fri Jun 8 23:25:17 CEST 2012
The branch, master has been updated
via c688541a6ef4477d3eb9eb28ca71e13a781cc69f (commit)
via 67c1fa932ae66dcf288d99c12dcd57ea57779906 (commit)
via 9667c4ffcf9c906a230991682a0f1a5d35a9c794 (commit)
via 0c50ba72235f2d23142cb2ed081d6887873284af (commit)
from 26aac92d6769fdb9194211108caf5ac96226a612 (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 c688541a6ef4477d3eb9eb28ca71e13a781cc69f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 8 23:23:24 2012 +0200
Allow QMAKE_* parameters that are needed for hardening x2goclient (see http://wiki.debian.org/Hardening).
commit 67c1fa932ae66dcf288d99c12dcd57ea57779906
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 8 23:21:35 2012 +0200
Correct spelling for mis-spelled work ,,authentication''.
commit 9667c4ffcf9c906a230991682a0f1a5d35a9c794
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 8 23:20:41 2012 +0200
Drop Encoding key from .desktop file (as it is deprecated according to latest FreeDesktop.org specs).
commit 0c50ba72235f2d23142cb2ed081d6887873284af
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 8 23:19:01 2012 +0200
Continue development...
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 ++--
VERSION | 2 +-
debian/changelog | 11 +++++++++++
desktop/x2goclient.desktop | 3 +--
onmainwindow.cpp | 2 +-
version.h | 2 +-
x2goclient_de.ts | 10 +++++-----
x2goclient_en.ts | 2 +-
x2goclient_fr.ts | 2 +-
x2goclient_nb_no.ts | 10 +++++-----
x2goclient_ru.ts | 8 ++++----
x2goclient_sv.ts | 2 +-
x2goclient_zh_tw.ts | 2 +-
x2goplugin.rc | 10 +++++-----
14 files changed, 40 insertions(+), 30 deletions(-)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 19d83db..965d0f2 100755
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,12 @@ build: build_client build_plugin build_man
build_client:
lrelease x2goclient.pro
- mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro
+ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
cd $(CLIENT_DIR) && $(MAKE)
build_plugin:
lrelease x2goclient.pro
- mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro
+ mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
cd $(PLUGIN_DIR) && $(MAKE)
build_man:
diff --git a/VERSION b/VERSION
index 399ee7b..04a87a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.2.1
+3.99.2.2
diff --git a/debian/changelog b/debian/changelog
index baad6e2..190c944 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low
+
+ * New upstream version (3.99.2.2):
+ - Drop Encoding key from .desktop file (as it is deprecated
+ according to latest FreeDesktop.org specs).
+ - Correct spelling for mis-spelled work ,,authentication''.
+ - Allow QMAKE_* parameters that are needed for hardening x2goclient
+ (see http://wiki.debian.org/Hardening).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 08 Jun 2012 23:17:02 +0200
+
x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low
[ Oleksandr Shneyder ]
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index 16f2040..9b38db6 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
-Version=3.99.2.1
+Version=3.99.2.2
Type=Application
Name=X2Go Client
Exec=/usr/bin/x2goclient
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 6cbd6b4..a85e37f 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -7103,7 +7103,7 @@ void ONMainWindow::slotAbout()
"to connect to X2Go server(s) and start, stop, "
"resume and terminate (running) desktop sessions. "
"X2Go Client stores different server connections "
- "and may automatically request authentification "
+ "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 "
diff --git a/version.h b/version.h
index 2ca866f..98195c3 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define VERSION "3.99.2.1"
+#define VERSION "3.99.2.2"
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index 8dccd18..857f720 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -1600,7 +1600,7 @@ sound system connections through firewalls</source>
</translation>
</message>
<message>
- <source><b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"><b>X2GoClient V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten Sie auf x2go.org.</translation>
</message>
<message>
@@ -1730,11 +1730,11 @@ Please check your settings</source>
<translation type="obsolete"><b>X2GoClient V. </translation>
</message>
<message>
- <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
- <source></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
@@ -2137,7 +2137,7 @@ Unsaved documents will be lost</source>
<translation>Die Sitzung wird beendet. Sind Sie sicher?<br>Ungespeicherte Dokumente gehen verloren</translation>
</message>
<message>
- <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
</message>
<message>
@@ -2252,7 +2252,7 @@ Sie können SSHD über folgenden Befehl installieren:
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1703"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
</message>
<message>
diff --git a/x2goclient_en.ts b/x2goclient_en.ts
index f7265b3..7c6d945 100644
--- a/x2goclient_en.ts
+++ b/x2goclient_en.ts
@@ -1510,7 +1510,7 @@ Unsaved documents will be lost</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1703"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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>
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index 58fd675..d64753f 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -1504,7 +1504,7 @@ Unsaved documents will be lost</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1703"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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>
diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts
index c41b517..9cff146 100644
--- a/x2goclient_nb_no.ts
+++ b/x2goclient_nb_no.ts
@@ -1242,7 +1242,7 @@
</translation>
</message>
<message>
- <source><b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"><b>X2Go Client V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
@@ -1375,11 +1375,11 @@ Vennligst sjekk instillingene dine</translation>
<translation type="obsolete"><b>X2Go Client V. </translation>
</message>
<message>
- <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
- <source></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
</message>
<message>
@@ -1791,7 +1791,7 @@ Unsaved documents will be lost</source>
Ulagrede data vil gå tapt</translation>
</message>
<message>
- <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
</message>
<message>
@@ -1906,7 +1906,7 @@ Du kan installere sshd med:
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1722"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
</message>
<message>
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index 892ba70..897e501 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -1716,7 +1716,7 @@ Public key hash: </translation>
<translation type="obsolete"><b>X2Go Client V. </translation>
</message>
<message>
- <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑной инÑоÑмаÑии.</transl
ation>
</message>
<message>
@@ -1757,7 +1757,7 @@ Please check your settings</source>
ÐÑовеÑÑÑе наÑÑÑойки</translation>
</message>
<message>
- <source></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑÐ
½Ð¾Ð¹ инÑоÑмаÑии.</translation>
</message>
<message>
@@ -2123,7 +2123,7 @@ Unsaved documents will be lost</source>
ÐÑе неÑоÑ
ÑаненнÑе докÑменÑÑ Ð±ÑдÑÑ ÑÑеÑÑнÑ</translation>
</message>
<message>
- <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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="obsolete"></b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑÐ
½Ð¾Ð¹ инÑоÑмаÑии. </translation>
</message>
<message>
@@ -2238,7 +2238,7 @@ you can install sshd with
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1703"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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><br>ÐÐ»Ð¸ÐµÐ½Ñ ÑеÑевого окÑÑÐ¶ÐµÐ½Ð¸Ñ X2Go. ÐаннÑй ÐºÐ»Ð¸ÐµÐ½Ñ Ð¿ÑедназнаÑен Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑеÑвеÑом (ÑеÑвеÑами) X2Go и запÑÑка, воÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ завеÑÑÐµÐ½Ð¸Ñ Ñдаленной ÑеÑÑии. ÐÐ»Ð¸ÐµÐ½Ñ X2Go ÑоÑ
ÑанÑÐµÑ Ð½Ð°ÑÑÑойки Ñоединений и Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑаÑиваÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑелÑÑ
из LDAP. РпоÑледнем ÑлÑÑае ÐºÐ»Ð¸ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²Ñ
ода в ÑиÑÑÐµÐ¼Ñ (замена менеджеÑа подобного xdm) Ð´Ð»Ñ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ "ÑонкиÑ
клиенÑов" X2Go. ÐоÑеÑиÑе http://x2go.org Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ деÑалÑной инÑоÑмаÑии.</translation>
</message>
<message>
diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts
index 434baed..bc730bc 100644
--- a/x2goclient_sv.ts
+++ b/x2goclient_sv.ts
@@ -1527,7 +1527,7 @@ Data som ej sparats kommer att förloras</translation>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1703"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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><br>Klient för X2Go. Denna klient kan ansluta till X2Go-servrar och starta/stoppa/återansluta/avsluta (aktiva) sessioner. X2Go-klienten kan spara anslutningsinställningar samt använda LDAP för autentisering. Klienten kan även användas som inloggningsskärm (ersättning för exempelvis xdm). Besök <a href="http://www.x2go.org">www.x2go.org</a> för vidare information.</translation>
</message>
<message>
diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts
index 5cc86b0..89b1fd0 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_zh_tw.ts
@@ -1518,7 +1518,7 @@ Unsaved documents will be lost</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1703"/>
- <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+ <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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>
diff --git a/x2goplugin.rc b/x2goplugin.rc
index ea22b6a..c9604a6 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
1 TYPELIB "x2goplugin.rc"
1 VERSIONINFO
- FILEVERSION 3,99,2,1
- PRODUCTVERSION 3,99,2,1
+ FILEVERSION 3,99,2,2
+ PRODUCTVERSION 3,99,2,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
VALUE "FileExtents", "x2go\0"
VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
- VALUE "FileVersion", "3, 99, 2 ,1\0"
+ VALUE "FileVersion", "3, 99, 2 ,2\0"
VALUE "InternalName", "x2goplugin\0"
VALUE "LegalCopyright", "Copyright © 2010-2012 Obviously Nice\0"
VALUE "MIMEType", "application/x2go\0"
VALUE "OriginalFilename", "npx2goplugin.dll\0"
- VALUE "ProductName", "X2GoClient Plug-in 3.99.2.1\0"
- VALUE "ProductVersion", "3, 99, 2, 1\0"
+ VALUE "ProductName", "X2GoClient Plug-in 3.99.2.2\0"
+ VALUE "ProductVersion", "3, 99, 2, 2\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).
More information about the x2go-commits
mailing list