x2go-commits January 2014

x2go-commits@lists.x2go.org

2 participants
8921 discussions

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.21-7-g08312e2
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, build-main has been updated via 08312e2e16fe5fe97b0c887353ac77457b4f5a0f (commit) from 2382d88357fa8a3196f61d2643ac190278cc8132 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++ ...s.h-dont-use-STL-internals-on-libc++.full.patch | 52 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 57 insertions(+) create mode 100644 debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a4c78fb..78ce45e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low * debian/control: + Add libfreetype6-dev to Build-Depends: field. + [ Clemens Lang ] + * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix + FTBFS of nx-libs-lite on Mac OS X Mavericks. (Fixes: #337). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 30 Aug 2013 16:20:18 +0200 nx-libs (2:3.5.0.21-0) unstable; urgency=low diff --git a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch b/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch new file mode 100644 index 0000000..60f33ce --- /dev/null +++ b/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch @@ -0,0 +1,52 @@ +Description: In Types.h, don't use STL internals on libc++. +Author: Clemens Lang <cal(a)macports.org> +Abstract: + The nx-libs-lite package does not compile on OS X Mavericks because + Apple's clang compilers now default to compiling against the libc++ STL + rather than (their outdated copy of) libstdc++. + . + While the compiler still allows changing that, we should not rely on + this being possible forever. + . + The compiler chokes in Types.h, specifically the clear() methods in + subclasses of vectors that use implementation details of the GNU STL. + The attached patch fixes these compilation issues by not overriding the + clear() method when compiling against libc++, since the libc++ headers + seem to do essentially the same as the overriden method. +--- a/nxcomp/Types.h 2013-11-05 01:35:22.000000000 +0100 ++++ b/nxcomp/Types.h 2013-11-05 01:37:30.000000000 +0100 +@@ -55,6 +55,9 @@ + return &*(vector < unsigned char >::begin()); + } + ++ // Avoid overriding clear() when using libc++. Fiddling with STL internals ++ // doesn't really seem like a good idea to me anyway. ++ #ifndef _LIBCPP_VECTOR + void clear() + { + #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) +@@ -95,12 +98,16 @@ + + #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */ + } ++ #endif /* #ifdef _LIBCPP_VECTOR */ + }; + + class T_messages : public vector < Message * > + { + public: + ++ // Avoid overriding clear() when using libc++. Fiddling with STL internals ++ // doesn't really seem like a good idea to me anyway. ++ #ifndef _LIBCPP_VECTOR + void clear() + { + #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) +@@ -141,6 +148,7 @@ + + #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */ + } ++ #endif /* #ifndef _LIBCPP_VECTOR */ + }; + + typedef md5_byte_t * T_checksum; diff --git a/debian/patches/series b/debian/patches/series index 9e49395..ce5237f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -50,6 +50,7 @@ 602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch 604_nx-X11_recent-freetype-API.full.patch +605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.21-5-g8cd7d82
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, build-main has been updated via 8cd7d82d750ae1228ba96ae45f28b0169bdebf65 (commit) from c50b2a90ed8ca08c1d177522492cc7d191fb8ed4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 86672ee..96887df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * debian/source/format: + Switch to format 1.0. + * debian/control: + + Add libfreetype6-dev to Build-Depends: field. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 30 Aug 2013 16:20:18 +0200 diff --git a/debian/control b/debian/control index 83f4367..903200a 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: quilt (>= 0.46-7~), libfontconfig1-dev, libfontenc-dev, + libfreetype6-dev, libxmltok1-dev, libxml2-dev, autoconf, hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.21-3-gca414e1
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, build-main has been updated via ca414e17539ada3e7f6712fc42eec055e08250e3 (commit) from 2ef4ab414e6d872b4acfb369193a6cd2fe4e6957 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ debian/source/format | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5bc7c8d..14574de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ nx-libs (2:3.5.0.22-0) UNRELEASED; urgency=low one implicit function declaration issue and two array index out of bounds issues. (Fixes: #314). + [ Mike Gabriel ] + * debian/source/format: + + Switch to format 1.0. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 30 Aug 2013 16:20:18 +0200 nx-libs (2:3.5.0.21-0) unstable; urgency=low diff --git a/debian/source/format b/debian/source/format index 89ae9db..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.21-1-gb29654d
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, build-main has been updated via b29654d5421008e8aab89902ea2ee528990681c8 (commit) from b2a3143f8a9c2d5aaf20c14408354ef9a712a3ee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2c3b4c7..1f0ed61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.22-0) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 30 Aug 2013 16:20:18 +0200 + nx-libs (2:3.5.0.21-0) unstable; urgency=low [ Mike Gabriel ] hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.21-2-g2ef4ab4
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, build-main has been updated via 2ef4ab414e6d872b4acfb369193a6cd2fe4e6957 (commit) from b29654d5421008e8aab89902ea2ee528990681c8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++- .../603_nx-X11_compilation_warnings.full.patch | 38 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 debian/patches/603_nx-X11_compilation_warnings.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1f0ed61..5bc7c8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ nx-libs (2:3.5.0.22-0) UNRELEASED; urgency=low - * Continue development... + [ Mirraz Mirraz ] + * Add patch: 603_nx-X11_compilation_warnings.full.patch. Fix 3 evident bugs: + one implicit function declaration issue and two array index out of bounds + issues. (Fixes: #314). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 30 Aug 2013 16:20:18 +0200 diff --git a/debian/patches/603_nx-X11_compilation_warnings.full.patch b/debian/patches/603_nx-X11_compilation_warnings.full.patch new file mode 100644 index 0000000..3656461 --- /dev/null +++ b/debian/patches/603_nx-X11_compilation_warnings.full.patch @@ -0,0 +1,38 @@ +Description: Handle some serious compilation warnings +Author: Mirraz Mirraz <mirraz1(a)rambler.ru> +--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c 2013-08-30 20:18:40.000000000 +0600 ++++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c 2013-09-30 18:39:42.357560169 +0600 +@@ -3259,7 +3259,6 @@ + vp->SrcReg[0].Swizzle = SWIZZLE_NOOP; + vp->SrcReg[1].Swizzle = SWIZZLE_NOOP; + vp->SrcReg[2].Swizzle = SWIZZLE_NOOP; +- vp->SrcReg[3].Swizzle = SWIZZLE_NOOP; + vp->DstReg.WriteMask = 0xf; + + switch (type) { +--- a/nx-X11/lib/X11/imLcPrs.c 2013-08-30 20:18:40.000000000 +0600 ++++ b/nx-X11/lib/X11/imLcPrs.c 2013-09-30 19:02:56.925125678 +0600 +@@ -589,7 +589,7 @@ + + l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1); + if (l == LOCAL_UTF8_BUFSIZE - 1) { +- local_wc_buf[l] = '\0'; ++ local_utf8_buf[l] = '\0'; + } + if( (rhs_string_utf8 = (char *)Xmalloc(l + 1)) == NULL ) { + Xfree( rhs_string_wc ); +--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c 2013-08-30 20:18:40.000000000 +0600 ++++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c 2013-09-30 18:56:27.358995920 +0600 +@@ -37,6 +37,12 @@ + #include <errno.h> + #include <stdio.h> + #include <ctype.h> ++ ++/* stat() */ ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <unistd.h> ++ + #define NEED_EVENTS 1 + #include <X11/X.h> + #include <X11/Xos.h> diff --git a/debian/patches/series b/debian/patches/series index 8c5eebd..3526c84 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,6 +48,7 @@ 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 602_nx-X11_initgroups.full.patch +603_nx-X11_compilation_warnings.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.21-4-gc50b2a9
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, build-main has been updated via c50b2a90ed8ca08c1d177522492cc7d191fb8ed4 (commit) from ca414e17539ada3e7f6712fc42eec055e08250e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 14574de..86672ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.22-0) UNRELEASED; urgency=low +nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low [ Mirraz Mirraz ] * Add patch: 603_nx-X11_compilation_warnings.full.patch. Fix 3 evident bugs: hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.21-29-g626b5db
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, master has been updated via 626b5dbae6b7b432d573f88abc8e3e8ae2bdba85 (commit) from 1d074b1ae8fbb140c17c42cc6abd6e00a6fe1ca2 (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 626b5dbae6b7b432d573f88abc8e3e8ae2bdba85 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 4 21:39:35 2014 +0100 release 3.5.0.22 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb9c77c..65b8628 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low +nx-libs (2:3.5.0.22-0x2go1) unstable; urgency=low [ Mirraz Mirraz ] * Add patch: 603_nx-X11_compilation_warnings.full.patch. Fix 3 evident bugs: @@ -39,7 +39,7 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix FTBFS of nx-libs-lite on Mac OS X Mavericks. (Fixes: #337). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 30 Aug 2013 16:20:18 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 04 Jan 2014 21:39:17 +0100 nx-libs (2:3.5.0.21-0) unstable; urgency=low hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

x2goclient.git - master (branch) updated: 4.0.1.2-15-gf36041a
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, master has been updated via f36041a68d610769a62fe99af9d104b8dacd16ea (commit) from 516d238a5f0fe9f402f3133014b61ac44f1a538b (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 f36041a68d610769a62fe99af9d104b8dacd16ea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 4 12:36:56 2014 +0100 update changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a0300c6..5a5cc7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,9 +5,8 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low - changed keyboard settings. Supported modes: auto, none and config with model/layout(variant) - Enables forwarding (delegation) of GSSAPI credentials to the server. - - make GSSAPI delegation configurable. - - update ts files - - update russian translation + - Make GSSAPI delegation configurable. + - Update Russian translation file. [ Orion Poplawski ] * New upstream version (4.0.1.3): hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.2-14-g516d238
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, master has been updated via 516d238a5f0fe9f402f3133014b61ac44f1a538b (commit) from 1d89ab91be14e5a698cffed279fe7e6af84b9de4 (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 516d238a5f0fe9f402f3133014b61ac44f1a538b Author: Stefan Baur <newsgroups.mail2(a)stefanbaur.de> Date: Sat Jan 4 12:31:43 2014 +0100 Update German translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goclient_de.ts | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aa5171e..a0300c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low 4.0.1.2 and let pulseaudio sound setup fail completely in the Linux X2Go Client of that version. (Fixes: #384). + [ Stefan Baur ] + * New upstream version (4.0.1.3): + - Update German translation file. + [ Martti Pitkanen ] * New upstream version (4.0.1.3): - New translation of X2Go Client to Finnish. diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 432a971..8d83f7c 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1067,7 +1067,7 @@ Public key hash: </source> <location filename="httpbrokerclient.cpp" line="574"/> <source>Issued to: </source> - <translation>Ausgestellt für: + <translation>Ausgestellt für: </translation> </message> <message> @@ -1097,7 +1097,7 @@ Public key hash: </source> <location filename="httpbrokerclient.cpp" line="586"/> <source>Issued by: </source> - <translation>Ausgestellt von: + <translation>Ausgestellt von: </translation> </message> <message> @@ -1121,7 +1121,7 @@ Public key hash: </source> <location filename="httpbrokerclient.cpp" line="600"/> <source>Fingerprints: </source> - <translation>Fingerabdrücke: + <translation>Fingerabdrücke: </translation> </message> <message> @@ -1214,7 +1214,7 @@ Public key hash: </source> <message> <location filename="onmainwindow.cpp" line="11108"/> <source>Restore toolbar</source> - <translation>Wergzeugleiste wieder anzeigen</translation> + <translation>Werkzeugleiste wieder anzeigen</translation> </message> <message> <source>About X2GO Client</source> @@ -1254,7 +1254,7 @@ Public key hash: </source> <message> <location filename="onmainwindow.cpp" line="2956"/> <source>Verification code:</source> - <translation type="unfinished"></translation> + <translation>Bestätigungscode:</translation> </message> <message> <location filename="onmainwindow.cpp" line="2997"/> @@ -1263,14 +1263,18 @@ Somebody might be eavesdropping on you. For security reasons, it is recommended to stop the connection. Do you want to terminate the connection? </source> - <translation type="unfinished"></translation> + <translation>Das kann ein Anzeichen für einen Man-in-the-Middle-Angriff sein. +Vielleicht werden Sie gerade von jemandem belauscht. +Aus Sicherheitsgründen ist es angeraten, die Verbindung zu beenden. +Möchten Sie die Verbindung abbrechen?</translation> </message> <message> <location filename="onmainwindow.cpp" line="3017"/> <location filename="onmainwindow.cpp" line="3044"/> <source>If you accept the new host key the security of your connection may be compromised. Do you want to update the host key?</source> - <translation type="unfinished"></translation> + <translation>Wenn Sie den neuen Host-Key akzeptieren, kann das die Sicherheit Ihrer Verbindung gefährden. +Wollen Sie den Host-Key aktualisieren?</translation> </message> <message> <location filename="onmainwindow.cpp" line="3023"/> @@ -1278,7 +1282,9 @@ Do you want to update the host key?</source> For security reasons, it is recommended to stop the connection. Do you want to terminate the connection? </source> - <translation type="unfinished"></translation> + <translation>Der Host-Key dieses Servers konnte nicht gefunden werden, aber eine anderer Schlüsseltyp für ihn ist bereits vorhanden. Ein Angreifer könnte den Standard-Key des Servers geändert haben, um Ihren Client glauben zu machen, der Key wäre noch nicht vorhanden. +Aus Sicherheitsgründen ist es angeraten, die Verbindung zu beenden. +Möchten Sie die Verbindung abbrechen?</translation> </message> <message> <location filename="onmainwindow.cpp" line="4951"/> @@ -1310,7 +1316,7 @@ Do you want to terminate the connection? <message> <location filename="onmainwindow.cpp" line="5559"/> <source>Waiting for proxy to exit.</source> - <translation>Warten darauf, dass der Proxy sich beendet</translation> + <translation>Darauf warten, dass der Proxy sich beendet.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5562"/> @@ -1341,7 +1347,7 @@ Do you want to terminate the connection? <message> <location filename="onmainwindow.cpp" line="9850"/> <source>Error getting window geometry (window closed)?</source> - <translation>Fehler beim Ermitteln der Fenstergeometrie (Fenster geschlossen?).</translation> + <translation>Fehler beim Ermitteln der Fenstergeometrie. (Fenster geschlossen?)</translation> </message> <message> <location filename="onmainwindow.cpp" line="10445"/> @@ -1964,7 +1970,7 @@ Please check your settings</source> <location filename="onmainwindow.cpp" line="801"/> <location filename="onmainwindow.cpp" line="822"/> <source>Show toolbar</source> - <translation>Zeige Wergzeugleiste</translation> + <translation>Zeige Werkzeugleiste</translation> </message> <message> <location filename="onmainwindow.cpp" line="367"/> @@ -2339,7 +2345,7 @@ Wollen Sie den versteckten Modus nutzen?</translation> <message> <location filename="onmainwindow.cpp" line="2051"/> <source>Show session tray icon when running</source> - <translation type="unfinished"></translation> + <translation>Sitzungssymbol während Verbindung in der Taskleiste anzeigen</translation> </message> <message> <location filename="onmainwindow.cpp" line="2065"/> @@ -3195,32 +3201,32 @@ Beispiel: <message> <location filename="settingswidget.cpp" line="154"/> <source>Auto detect keyboard settings</source> - <translation type="unfinished"></translation> + <translation>Tastatureinstellungen automatisch erkennen</translation> </message> <message> <location filename="settingswidget.cpp" line="155"/> <source>Do not configure keyboard</source> - <translation type="unfinished"></translation> + <translation>Tastatur nicht konfigurieren</translation> </message> <message> <location filename="settingswidget.cpp" line="156"/> <source>Configure keyboard</source> - <translation type="unfinished"></translation> + <translation>Tastatur konfigurieren</translation> </message> <message> <location filename="settingswidget.cpp" line="167"/> <source>Model: </source> - <translation type="unfinished"></translation> + <translation>Modell:</translation> </message> <message> <location filename="settingswidget.cpp" line="170"/> <source>Layout: </source> - <translation type="unfinished"></translation> + <translation>Tastaturlayout:</translation> </message> <message> <location filename="settingswidget.cpp" line="173"/> <source>Variant: </source> - <translation type="unfinished"></translation> + <translation>Variante:</translation> </message> <message> <location filename="settingswidget.cpp" line="246"/> @@ -3489,12 +3495,12 @@ sound system connections through firewalls</source> <message> <location filename="sshmasterconnection.cpp" line="1154"/> <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source> - <translation type="unfinished"></translation> + <translation>Konnte SSH Client nicht starten. Bitte überprüfen Sie Ihre Installation und die GSSApi-Konfiguration.</translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1180"/> <source>Check your GSSApi configuration or choose another authentication method</source> - <translation type="unfinished"></translation> + <translation>Überprüfen Sie die GSSApi-Konfiguration oder wählen Sie eine andere Authentisierungsmethode.</translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1279"/> 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 - release/4.0.1.x (branch) updated: 4.0.1.9-44-g5ef17da
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, release/4.0.1.x has been updated via 5ef17da0fbb0c8b688fdc80f7e02099cec8fe4e2 (commit) from 059837a4128d1e8635588b722d308059e742ff9c (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 5ef17da0fbb0c8b688fdc80f7e02099cec8fe4e2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 4 11:39:29 2014 +0100 Continue development on stable branch of X2Go Server... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0a1cbdf..7e03fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.1.11-0x2go1) UNRELEASED; urgency=low + + * Continue development on stable branch of X2Go Server... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 04 Jan 2014 11:29:35 +0100 + x2goserver (4.0.1.10-0x2go1) unstable; urgency=low * New upstream version (4.0.1.10): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index bf6b31f..667d227 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index bf6b31f..667d227 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index bf6b31f..667d227 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index bf6b31f..667d227 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index bf6b31f..667d227 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index bf6b31f..667d227 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index bf6b31f..667d227 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.10 +4.0.1.11 hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2014