x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

buildscripts.git - master (branch) updated: b085e56b5b5519a18f5b0f0f2e7ca607d149f598
by git-admin＠x2go.org 15 Feb '12

15 Feb '12

The branch, master has been updated via b085e56b5b5519a18f5b0f0f2e7ca607d149f598 (commit) from d52afed8373ccb31a84089cf2dc0676ca7a3ec0a (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 b085e56b5b5519a18f5b0f0f2e7ca607d149f598 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 15 23:35:49 2012 +0100 fix GNUPGHOME location (root/sudo vs. x2go-admin) ----------------------------------------------------------------------- Summary of changes: bin/build-package | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/bin/build-package b/bin/build-package index f1c24de..4b0ed8c 100755 --- a/bin/build-package +++ b/bin/build-package @@ -33,6 +33,7 @@ COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" +GNUPGHOME=$HOME/.gnupg test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } @@ -221,16 +222,16 @@ build_packages() { [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch 0<&- } done } hooks/post-receive -- buildscripts.git (buildscripts upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (buildscripts upstream project).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.3-2-g4e859b2
by git-admin＠x2go.org 15 Feb '12

15 Feb '12

The branch, master has been updated via 4e859b25cb7149368f855a4d53ab614c7809cd4e (commit) from 3eb7a257369717c1334d7f42fd18633d3f00f532 (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 4e859b25cb7149368f855a4d53ab614c7809cd4e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 15 10:26:20 2012 +0100 Apply implicit.diff patch from Jan Engelhardt (OpenSUSE). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- extension/nautilus-x2goumount-module.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f202170..422dc8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ x2gognomebindings (2.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream version (2.0.1.4): - - Continue development... + - Apply implicit.diff patch from Jan Engelhardt (OpenSUSE). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:08:41 +0200 diff --git a/extension/nautilus-x2goumount-module.c b/extension/nautilus-x2goumount-module.c index 87c4bde..8e75e45 100644 --- a/extension/nautilus-x2goumount-module.c +++ b/extension/nautilus-x2goumount-module.c @@ -19,6 +19,7 @@ */ #include <config.h> +#include <stdio.h> #include <glib/gi18n-lib.h> #include "nautilus-x2goumount.h" void nautilus_module_initialize (GTypeModule*module) hooks/post-receive -- x2gognomebindings.git (GNOME bindings 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 "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-28-gc26e4bd
by git-admin＠x2go.org 15 Feb '12

15 Feb '12

The branch, master has been updated via c26e4bd825826462fc73242f94369555ae0f44fe (commit) from b99168fc3f8b45a38d6efb370463ad71695cb3f9 (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 c26e4bd825826462fc73242f94369555ae0f44fe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 15 09:42:35 2012 +0100 Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas. Inspired by Jan Engelhardt's so-version.diff patch. However, the version name change requested in that patch has been rejected for NX (redistributed). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ ...omp_makefile-uninstall+autoconf.full+lite.patch | 4 ++-- ...xcompext_makefile-uninstall+autoconf.full.patch | 8 +++++--- ...compshad_makefile-uninstall+autoconf.full.patch | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 40d26e4..3139119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,11 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). * Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) variable. + * Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... + Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas. + Inspired by Jan Engelhardt's so-version.diff patch. However, the version + name change requested in that patch has been rejected for + NX (redistributed). [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch index fbeaa39..9b9da7e 100644 --- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch +++ b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch @@ -38,7 +38,7 @@ Last-Update: 2012-02-14 +install.lib: all + ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx @@ -53,7 +53,7 @@ Last-Update: 2012-02-14 +uninstall.bin: + +uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3.* ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch index 934973c..f6c522a 100644 --- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch +++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch @@ -27,7 +27,7 @@ Last-Update: 2012-02-14 # # This should be autodetected. # -@@ -147,12 +151,33 @@ +@@ -147,12 +151,35 @@ fi touch depend.status @@ -39,7 +39,8 @@ Last-Update: 2012-02-14 +install.lib: all + ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) libXcompext.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true @@ -51,7 +52,8 @@ Last-Update: 2012-02-14 +uninstall.bin: + +uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.* ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch index d1a8c1e..0577635 100644 --- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch +++ b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch @@ -40,7 +40,7 @@ Last-Update: 2012-02-14 +install.lib: all + $(INSTALL_DIR) $(DESTDIR)${libdir}/nx + $(INSTALL_DIR) $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx @@ -54,7 +54,7 @@ Last-Update: 2012-02-14 +uninstall.bin: + +uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3.* ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a 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-client/3.5.0.10-27-gb99168f
by git-admin＠x2go.org 15 Feb '12

15 Feb '12

The branch, master has been updated via b99168fc3f8b45a38d6efb370463ad71695cb3f9 (commit) via 07f9dfa05ab83e094e823b4af8478b25addd0fa5 (commit) via 548d50ba59444a399ed525aa49c040394d25801e (commit) via 3deee8f94983ea6c072663c1197d311fc1ddaf6c (commit) from 9282c00e2aaa02404809fe317308ccbb4da3b0e8 (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 b99168fc3f8b45a38d6efb370463ad71695cb3f9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 15 08:50:48 2012 +0100 changelog cleanup, fix long-line-wraps commit 07f9dfa05ab83e094e823b4af8478b25addd0fa5 Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Wed Feb 15 08:49:49 2012 +0100 Add patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch, use unique library names for nx-X11 based X11 libraries. commit 548d50ba59444a399ed525aa49c040394d25801e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 15 08:10:21 2012 +0100 changelog cleanup, typo fix commit 3deee8f94983ea6c072663c1197d311fc1ddaf6c Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Wed Feb 15 08:09:41 2012 +0100 Add patch 032_nx-X11_no-x11r6-project-root. We must not overlap with any existing files, therefore, both /usr/X11R6 and /usr are excluded possibilities for ProjectRoot. Use %_libexecdir/somename, since that is still allowed by FHS. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 15 +- debian/libnx-x11.install | 2 +- debian/patches/032_no-x11r6.full.patch | 24 + ...nxcompext+nxcompshad_unique-libnames.full.patch | 2384 ++++++++++++++++++++ debian/patches/series | 2 + 5 files changed, 2422 insertions(+), 5 deletions(-) create mode 100644 debian/patches/032_no-x11r6.full.patch create mode 100644 debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0b45f2f..40d26e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,13 +9,14 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low * Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for macros. * Enable parallel build for Debian package. - * Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing - Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...). + * Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already + existing Makefile patches (012_nxcomp..., 013_nxcompext_..., + 014_nxcompshad_...). * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name. * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). - * Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) - variable. + * Update patch: 001_add-main-makefile.full+lite.patch, fix missing + $(CONFIGURE) variable. [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of @@ -24,6 +25,12 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low * Add patch: 031_nx-X11_parallel-make.diff, enable parallel make. * Add patch: 301_nx-X11_use-shared-libs.full.diff, use shared libraries from distribution rather then libs included in source tree. + * Add patch: 032_nx-X11_no-x11r6-project-root. We must not overlap with any + existing files, therefore, both /usr/X11R6 and /usr are excluded + possibilities for ProjectRoot. Use %_libexecdir/somename, since that is + still allowed by FHS. + * Add patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch, use + unique library names for nx-X11 based X11 libraries. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100 diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index cfe4cff..f2cf59e 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,3 +1,3 @@ nx-X11/.build-exports/lib/* usr/lib/nx/X11 -nx-X11/lib/Xinerama/libXinerama.so* usr/lib/nx/X11/Xinerama +nx-X11/lib/Xinerama/libNX_Xinerama.so* usr/lib/nx/X11/Xinerama nx-X11/programs/Xserver/Xext/SecurityPolicy usr/share/nx diff --git a/debian/patches/032_no-x11r6.full.patch b/debian/patches/032_no-x11r6.full.patch new file mode 100644 index 0000000..97ce88c --- /dev/null +++ b/debian/patches/032_no-x11r6.full.patch @@ -0,0 +1,24 @@ +Description: No X11R6 Project Root + We must not overlap with any existing files, therefore, both + /usr/X11R6 and /usr are excluded possibilities for ProjectRoot. + Use %_libexecdir/somename, since that is still allowed by FHS. +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-01-27 01:35:49.164415307 +0100 +--- + nx-X11/config/cf/site.def | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nx-X11/config/cf/site.def +=================================================================== +--- a/nx-X11/config/cf/site.def ++++ b/nx-X11/config/cf/site.def +@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/X11R6 ++#define ProjectRoot /usr/lib/NX3 + #endif + + /* diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch new file mode 100644 index 0000000..5ca8f5f --- /dev/null +++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch @@ -0,0 +1,2384 @@ +Description: Unique Library Names Patch + Patch from the RPM folks... + . + We really want to make use of rpm's automatic dependency finding. + Binaries are scanned for DT_NEEDED entries, the latter of which are + then used for populating the "Requires"-type deps. The "nxagent" + binary for example would require libX11.so.6. That incurs problems: + . + 1. A package manager told to install nxagent could select xorg-x11 + rather than nx-libs, even though nxagent depends on the NX version. + . + 2. A package manager told to install $some_program could select nx-libs + rather than xorg-x11 (since both provide libX11.so.6), but, since + the NX library is in an obscure directory, running $some_program + would fail as libX11.so.6 is not found. + . + To solve this, give the NX libraries unique names different from the + Xorg ones. +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-15 +--- + nx-X11/config/cf/Imake.rules | 12 - + nx-X11/config/cf/Motif.tmpl | 4 + nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- + nx-X11/config/cf/bsdLib.rules | 6 + nx-X11/config/cf/bsdLib.tmpl | 2 + nx-X11/config/cf/bsdiLib.tmpl | 2 + nx-X11/config/cf/convex.cf | 6 + nx-X11/config/cf/cygwin.tmpl | 2 + nx-X11/config/cf/darwinLib.tmpl | 2 + nx-X11/config/cf/gnuLib.tmpl | 2 + nx-X11/config/cf/ibmLib.rules | 12 - + nx-X11/config/cf/ibmLib.tmpl | 2 + nx-X11/config/cf/lnxLib.rules | 16 - + nx-X11/config/cf/lnxLib.tmpl | 4 + nx-X11/config/cf/mingw.tmpl | 2 + nx-X11/config/cf/nto.rules | 2 + nx-X11/config/cf/os2Lib.tmpl | 58 ++-- + nx-X11/config/cf/sco5.cf | 2 + nx-X11/config/cf/sv3Lib.tmpl | 24 +- + nx-X11/config/cf/sv4Lib.tmpl | 2 + nx-X11/config/cf/usl.cf | 2 + nx-X11/extras/Mesa/src/mesa/main/Imakefile | 2 + nx-X11/extras/Xpm/lib/Imakefile | 2 + nx-X11/extras/drm/libdrm.pc.in | 2 + nx-X11/extras/fontconfig/fontconfig.pc.in | 2 + nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile | 2 + nx-X11/lib/FS/Imakefile | 2 + nx-X11/lib/GLw/Imakefile | 2 + nx-X11/lib/ICE/Imakefile | 2 + nx-X11/lib/SM/Imakefile | 2 + nx-X11/lib/X11/Imakefile | 2 + nx-X11/lib/X11/Imakefile.NX.original | 2 + nx-X11/lib/X11/Imakefile.X.original | 2 + nx-X11/lib/XRes/Imakefile | 2 + nx-X11/lib/XTrap/Imakefile | 2 + nx-X11/lib/Xau/Imakefile | 2 + nx-X11/lib/Xaw/Imakefile | 2 + nx-X11/lib/Xaw6/Imakefile | 2 + nx-X11/lib/Xaw7/Imakefile | 2 + nx-X11/lib/Xcomposite/Imakefile | 2 + nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 + nx-X11/lib/Xcursor/Imakefile | 2 + nx-X11/lib/Xcursor/xcursor.pc.in | 2 + nx-X11/lib/Xdamage/Imakefile | 2 + nx-X11/lib/Xdamage/xdamage.pc.in | 2 + nx-X11/lib/Xdmcp/Imakefile | 2 + nx-X11/lib/Xevie/Imakefile | 2 + nx-X11/lib/Xevie/xevie.pc.in | 2 + nx-X11/lib/Xext/Imakefile | 2 + nx-X11/lib/Xfixes/Imakefile | 2 + nx-X11/lib/Xfixes/xfixes.pc.in | 2 + nx-X11/lib/Xfontcache/Imakefile | 2 + nx-X11/lib/Xft/Imakefile | 2 + nx-X11/lib/Xft/xft.pc.in | 2 + nx-X11/lib/Xft1/Imakefile | 2 + nx-X11/lib/Xi/Imakefile | 2 + nx-X11/lib/Xinerama/Imakefile | 2 + nx-X11/lib/Xmu/Imakefile | 2 + nx-X11/lib/Xmuu/Imakefile | 2 + nx-X11/lib/Xp/Imakefile | 2 + nx-X11/lib/Xpm/Imakefile | 2 + nx-X11/lib/Xpm/Imakefile.NX.original | 2 + nx-X11/lib/Xpm/Imakefile.X.original | 2 + nx-X11/lib/XprintAppUtil/Imakefile | 2 + nx-X11/lib/XprintUtil/Imakefile | 2 + nx-X11/lib/Xrandr/Imakefile | 2 + nx-X11/lib/Xrender/Imakefile | 2 + nx-X11/lib/Xrender/xrender.pc.in | 2 + nx-X11/lib/Xss/Imakefile | 2 + nx-X11/lib/Xt/Imakefile | 2 + nx-X11/lib/Xt/Imakefile.NX.original | 2 + nx-X11/lib/Xt/Imakefile.X.original | 2 + nx-X11/lib/Xtst/Imakefile | 2 + nx-X11/lib/Xv/Imakefile | 2 + nx-X11/lib/XvMC/Imakefile | 2 + nx-X11/lib/XvMC/hw/i810/Imakefile | 2 + nx-X11/lib/XvMC/hw/via/unichrome/Imakefile | 2 + nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile | 2 + nx-X11/lib/XvMC/wrapper/Imakefile | 2 + nx-X11/lib/Xxf86dga/Imakefile | 2 + nx-X11/lib/Xxf86misc/Imakefile | 2 + nx-X11/lib/Xxf86rush/Imakefile | 2 + nx-X11/lib/Xxf86vm/Imakefile | 2 + nx-X11/lib/apple/Imakefile | 2 + nx-X11/lib/dmx/Imakefile | 2 + nx-X11/lib/dps/Imakefile | 2 + nx-X11/lib/dpstk/Imakefile | 2 + nx-X11/lib/expat/Imakefile | 2 + nx-X11/lib/font/Imakefile | 2 + nx-X11/lib/fontconfig/Imakefile | 2 + nx-X11/lib/fontenc/Imakefile | 2 + nx-X11/lib/freetype2/Imakefile | 2 + nx-X11/lib/oldX/Imakefile | 2 + nx-X11/lib/psres/Imakefile | 2 + nx-X11/lib/regex/Imakefile | 2 + nx-X11/lib/windows/Imakefile | 2 + nx-X11/lib/xkbfile/Imakefile | 2 + nx-X11/lib/xkbui/Imakefile | 2 + nx-X11/lib/zlib/Imakefile | 2 + nx-X11/programs/Xserver/Imakefile | 18 - + nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile | 2 + nxcompext/Makefile.in | 4 + nxcompshad/Makefile.in | 4 + 103 files changed, 294 insertions(+), 294 deletions(-) + +Index: nx-libs_3.5.0.9/nx-X11/config/cf/Imake.rules +=================================================================== +--- a/nx-X11/config/cf/Imake.rules ++++ b/nx-X11/config/cf/Imake.rules +@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsou + */ + #ifndef ProjectUnsharedFontLibReferences + #define ProjectUnsharedFontLibReferences() @@\ +-DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ +-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\ ++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + #endif + + /* +@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBS + #ifndef SharedFontLibReferences + #define SharedFontLibReferences() @@\ + SOFONTREV = SharedFontRev @@\ +-DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ ++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + #endif + + /* +Index: nx-libs_3.5.0.9/nx-X11/config/cf/Motif.tmpl +=================================================================== +--- a/nx-X11/config/cf/Motif.tmpl ++++ b/nx-X11/config/cf/Motif.tmpl +@@ -465,9 +465,9 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC) + #endif + + #if SharedLibXm +-SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) ++SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) + #else +-ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir) ++ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir) + #endif + + #if SharedLibMrm +Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl +=================================================================== +--- a/nx-X11/config/cf/X11.tmpl ++++ b/nx-X11/config/cf/X11.tmpl +@@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines + #ifndef SharedX11Rev + #define SharedX11Rev 6.2 + #endif +-SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) ++SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) + #else +-ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) + #endif + /* Common alternate spellings */ + DEPXLIBONLY = $(DEPXONLYLIB) +@@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,X11,$ + #ifndef SharedXextRev + #define SharedXextRev 6.4 + #endif +-SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) ++SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) + #else +-ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) + #endif + LINTEXTENSIONLIB = $(LINTEXTENSION) + DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) +@@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) + #ifndef SharedXssRev + #define SharedXssRev 1.0 + #endif +-SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) ++SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) + #else +-ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) + #endif + + XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc +@@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,Xss,$(X + #ifndef SharedXxf86miscRev + #define SharedXxf86miscRev 1.1 + #endif +-SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) ++SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) + #else +-ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) + #endif + + XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm +@@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,X + #ifndef SharedXxf86vmRev + #define SharedXxf86vmRev 1.0 + #endif +-SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) ++SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) + #else +-ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) + #endif + + XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga +@@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,Xxf + #ifndef SharedXxf86dgaRev + #define SharedXxf86dgaRev 1.0 + #endif +-SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) ++SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) + #else +-ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) + #endif + + #if BuildDmxLibrary +@@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,Xx + #ifndef SharedXxf86rushRev + #define SharedXxf86rushRev 1.0 + #endif +-SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) ++SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) + #else +-ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) + #endif + + +@@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,X + #ifndef SharedXvRev + #define SharedXvRev 1.0 + #endif +-SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) ++SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) + #else +-ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) + #endif + + +@@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVL + #ifndef SharedXvMCRev + #define SharedXvMCRev 1.0 + #endif +-SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) ++SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) + #else +-ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) + #endif + + XINERAMALIBSRC = $(LIBSRC)/Xinerama +@@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$ + #ifndef SharedXineramaRev + #define SharedXineramaRev 1.0 + #endif +-SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) ++SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) + #else +-ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) + #endif + + XRESLIBSRC = $(LIBSRC)/XRes +@@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,Xi + #ifndef SharedXResRev + #define SharedXResRev 1.0 + #endif +-SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) ++SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) + #else +-ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) + #endif + + DMXLIBSRC = $(LIBSRC)/dmx +@@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,XRes,$ + #ifndef SharedDmxRev + #define SharedDmxRev 1.0 + #endif +-SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) ++SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) + #else +-ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) + #endif + + DPSLIBSRC = $(LIBSRC)/dps +@@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,dmx,$(D + #ifndef SharedDpsRev + #define SharedDpsRev 1.0 + #endif +-SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) ++SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) + #else +-ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) + #endif + + DPSTKLIBSRC = $(LIBSRC)/dpstk +@@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,dps,$(D + #ifndef SharedDpsTkRev + #define SharedDpsTkRev 1.0 + #endif +-SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) ++SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) + #else +-ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) + #endif + + PSRESLIBSRC = $(LIBSRC)/psres +@@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,dpstk + #ifndef SharedPSResRev + #define SharedPSResRev 1.0 + #endif +-SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) ++SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) + #else +-ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) + #endif + + GLULIBSRC = $(LIBSRC)/GLU +@@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,psres + #ifndef SharedGluRev + #define SharedGluRev 1.3 + #endif +-SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) ++SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) + #else +-ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) + #endif + + GLXLIBSRC = $(LIBSRC)/GL +@@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,GLU,$(G + #ifndef SharedGlxRev + #define SharedGlxRev 1.2 + #endif +-SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) ++SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) + #else +-ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) + #endif + GLWIDGETSRC = $(LIBSRC)/GLw + #if SharedLibGLw + #ifndef SharedGLwRev + #define SharedGLwRev 1.0 /* used to name the shared library */ + #endif +-SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) ++SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) + #else +-ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) + #endif + + XRENDERLIBSRC = $(LIBSRC)/Xrender +@@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,GLw,$(G + #ifndef SharedXrenderRev + #define SharedXrenderRev 1.2.2 + #endif +-SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) ++SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) + #else +-ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) + #endif + + XRANDRLIBSRC = $(LIBSRC)/Xrandr +@@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,Xre + #ifndef SharedXrandrRev + #define SharedXrandrRev 2.0 + #endif +-SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) ++SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) + #else +-ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) + #endif + + XFIXESLIBSRC = $(LIBSRC)/Xfixes +@@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,Xran + #ifndef SharedXfixesRev + #define SharedXfixesRev 3.0 + #endif +-SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) ++SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) + #else +-ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) + #endif + + XDAMAGELIBSRC = $(LIBSRC)/Xdamage +@@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,Xfix + #ifndef SharedXdamageRev + #define SharedXdamageRev 1.0 + #endif +-SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) ++SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) + #else +-ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) + #endif + + XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite +@@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite + #ifndef SharedXcompositeRev + #define SharedXcompositeRev 1.0 + #endif +-SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) ++SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) + #else +-ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) + #endif + + XEVIELIBSRC = $(LIBSRC)/Xevie +@@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie + #ifndef SharedXevieRev + #define SharedXevieRev 1.0 + #endif +-SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) ++SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) + #else +-ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) + #endif + + XCURSORLIBSRC = $(LIBSRC)/Xcursor +@@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,Xevie + #ifndef SharedXcursorRev + #define SharedXcursorRev 1.0.2 + #endif +-SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) ++SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) + #else +-ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) + #endif + + APPLEWMLIBSRC = $(LIBSRC)/apple +@@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,Xcu + #ifndef SharedAppleWMRev + #define SharedAppleWMRev 1.0 + #endif +-SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) ++SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) + #else +-ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) + #endif + + WINDOWSWMLIBSRC = $(LIBSRC)/windows +@@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,App + #ifndef SharedWindowsWMRev + #define SharedWindowsWMRev 1.0 + #endif +-SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) ++SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) + #else +-ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) + #endif + + # ifndef SharedLibXfontcache +@@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,W + #ifndef SharedXfontcacheRev + #define SharedXfontcacheRev 1.2 + #endif +-SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) ++SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) + #else +-ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXau +@@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE, + #ifndef SharedXauRev + #define SharedXauRev 6.0 + #endif +-SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) ++SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) + #else + #if !UseInstalledXauLib +-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir) + #else +-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) ++ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) + #endif + #endif + +@@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$ + #ifndef SharedXdmcpRev + #define SharedXdmcpRev 6.0 + #endif +-SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) ++SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) + #else + #if !UseInstalledXdmcpLib +-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) + #else +-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) ++ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) + #endif + #endif + +@@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp + #ifndef SharedXmuRev + #define SharedXmuRev 6.2 + #endif +-SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) ++SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) + #else +-ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXmuu +@@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(X + #ifndef SharedXmuuRev + #define SharedXmuuRev 1.0 + #endif +-SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) ++SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) + #else +-ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) + #endif + + #ifndef SharedOldX +@@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$ + #ifndef SharedOldXRev + #define SharedOldXRev 6.0 + #endif +-SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) ++SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) + #else +-ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXp +@@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,oldX,$ + #ifndef SharedXpRev + #define SharedXpRev 6.2 + #endif +-SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) ++SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) + #else +-ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXt +@@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,Xp,$(XPL + #ifndef SharedXtRev + #define SharedXtRev 6.0 + #endif +-SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) ++SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) + #else +-ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) + #endif + DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) + XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) +@@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,X + #ifndef SharedXaRev + #define SharedXaRev 1.0 + #endif +-SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) ++SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev) + #else +-UnsharedLibReferences(XA,Xa,$(XALIBSRC)) ++UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) + #endif + + #ifndef BuildXaw +@@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC)) + #ifndef SharedXawRev + #define SharedXawRev 8.0 + #endif +-SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) ++SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) + #else +-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) + #endif + #endif + +@@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A + #ifndef SharedXaw7Rev + #define SharedXaw7Rev 7.0 + #endif +-SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) ++SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) + #if !BuildXaw +-SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) ++SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) + #endif + #else +-ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) + #if !BuildXaw +-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) + #endif + #endif + #endif +@@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A + #ifndef SharedXaw6Rev + #define SharedXaw6Rev 6.1 + #endif +-SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) ++SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) + #if !BuildXaw && !BuildXaw7 +-SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) ++SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) + #endif + #else +-ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) + #if !BuildXaw && !BuildXaw7 +-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) + #endif + #endif + #endif +@@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A + #ifndef SharedXiRev + #define SharedXiRev 6.0 + #endif +-SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) ++SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) + #else +-ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXtst +@@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,Xi,$(XIL + #ifndef SharedXtstRev + #define SharedXtstRev 6.1 + #endif +-SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) ++SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) + #else +-ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) + #endif + +-ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) ++ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) + + #ifndef SharedLibICE + #define SharedLibICE HasSharedLibraries +@@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$ + #ifndef SharedICERev + #define SharedICERev 6.4 + #endif +-SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) ++SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev) + #else +-ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) ++ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) + #endif + + #ifndef SharedLibSM +@@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,ICE,$(I + #ifndef SharedSMRev + #define SharedSMRev 6.0 + #endif +-SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) ++SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev) + #else +-ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXkey +@@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,SM,$(SMS + #ifndef SharedXkeyRev + #define SharedXkeyRev 6.0 + #endif +-SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) ++SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) + #else +-ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) + #endif + + #ifndef SharedLibFS +@@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,Xkey,$ + #ifndef SharedFSRev + #define SharedFSRev 6.0 + #endif +-SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) ++SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev) + #else +-ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibFont +@@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,FS,$(FSL + #define SharedFontRev 1.5 + #endif + SharedFontLibReferences() +-XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) ++XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) + #else + ProjectUnsharedFontLibReferences() +-XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) ++XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir) + #endif + + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs +-ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) + +@@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,fn + #ifndef SharedFontEncRev + #define SharedFontEncRev 1.0 + #endif +-SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) ++SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) + #else +-ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) + #endif + + #ifndef SharedLibXpm +@@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,fo + #ifndef SharedXpmRev + #define SharedXpmRev 4.11 + #endif +-SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) ++SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) + #else +-ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) + #endif + + #if UseFreetype2 +@@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(X + #define SharedFreetype2Rev 9.0 + #endif + #endif +-SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) ++SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) + #else +-ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir) + #endif + + #ifdef UseInstalled +@@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR) + #define SharedExpatRev 4.0 + #endif + #endif +-SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) ++SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) + #else +-ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir) + #endif + + #if UseExpat +@@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT + #ifndef SharedXft1Rev + #define SharedXft1Rev 1.1 + #endif +-SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) ++SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) + #else +-ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) + #endif + + #ifndef Xft1ClientDepLibs +@@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,Xft,$( + #ifndef SharedXftRev + #define SharedXftRev 2.1.2 + #endif +-SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) ++SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) + #else +-ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) + #endif + + #ifndef XftClientDepLibs +@@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,Xft,$(X + #ifndef SharedFontconfigRev + #define SharedFontconfigRev 1.0.4 + #endif +-SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) ++SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) + #else +-ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) + #endif + + #ifdef UseInstalled +@@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRunt + # ifndef SharedxkbfileRev + # define SharedxkbfileRev 1.0 + # endif +-SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) ++SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) + #else +-ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) + #endif + + #if BuildXKBlib +@@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,xkb + # ifndef SharedxkbuiRev + # define SharedxkbuiRev 1.0 + # endif +-SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) ++SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) + #else +-ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) + #endif + + #ifndef XkbuiLibs +@@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs + #ifndef SharedXTrapRev + #define SharedXTrapRev 6.4 + #endif +-SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) ++SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) + #else +-ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) ++ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir) + #endif + + #ifndef NeedDefaultDepLibs +Index: nx-X11/config/cf/bsdLib.rules +=================================================================== +--- a/nx-X11/config/cf/bsdLib.rules ++++ b/nx-X11/config/cf/bsdLib.rules +@@ -134,9 +134,9 @@ LintLibReferences(varname,libname,libsou + #ifndef SharedFontLibReferences + #define SharedFontLibReferences() @@\ + SOFONTREV = SharedFontRev @@\ +-DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ ++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + #endif + + /* +Index: nx-X11/config/cf/bsdLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/bsdLib.tmpl ++++ b/nx-X11/config/cf/bsdLib.tmpl +@@ -38,7 +38,7 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/bsdiLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/bsdiLib.tmpl ++++ b/nx-X11/config/cf/bsdiLib.tmpl +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/config/cf/bsdiLib.tmp + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/convex.cf +=================================================================== +--- a/nx-X11/config/cf/convex.cf ++++ b/nx-X11/config/cf/convex.cf +@@ -90,9 +90,9 @@ DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$ + LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln) + + XMLIBSRC = $(LIBSRC)/Xm +- DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a) +- XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB)) +- LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln) ++ DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libNX_Xm.a) ++ XMLIB = LoaderLibPrefix _Use(-lNX_Xm,$(DEPXMLIB)) ++ LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lNX_Xm.ln) + + UILLIBSRC = $(LIBSRC)/uil + DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a) +Index: nx-X11/config/cf/cygwin.tmpl +=================================================================== +--- a/nx-X11/config/cf/cygwin.tmpl ++++ b/nx-X11/config/cf/cygwin.tmpl +@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl + + #ifndef FixupLibReferences + # define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/darwinLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/darwinLib.tmpl ++++ b/nx-X11/config/cf/darwinLib.tmpl +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/config/cf/darwinLib.t + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/gnuLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/gnuLib.tmpl ++++ b/nx-X11/config/cf/gnuLib.tmpl +@@ -6,7 +6,7 @@ XCOMM + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/ibmLib.rules +=================================================================== +--- a/nx-X11/config/cf/ibmLib.rules ++++ b/nx-X11/config/cf/ibmLib.rules +@@ -127,23 +127,23 @@ LintLibReferences(varname,libname,libsou + # ifndef SharedFontLibReferences + # define SharedFontLibReferences() @@\ + DEPFONTLIB = /**/ @@\ +-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(FONTLIBSRC)/libNX_Xfont.a) @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + # endif + # else + # ifndef SharedFontLibReferences + # define SharedFontLibReferences() @@\ + DEPFONTLIB = /**/ @@\ +-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libNX_Xfont.a)) @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + # endif + # endif + # else /* OSMajorVersion < 5 */ + # ifndef SharedFontLibReferences + # define SharedFontLibReferences() @@\ + DEPFONTLIB = /**/ @@\ +-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\ +-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ++FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDI)/libNX_Xfont.so)) @@\ ++LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) + # endif + + # endif +Index: nx-X11/config/cf/ibmLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/ibmLib.tmpl ++++ b/nx-X11/config/cf/ibmLib.tmpl +@@ -81,7 +81,7 @@ XCOMM $XFree86: xc/config/cf/ibmLib.tmpl + /* we want this to be defined only when building X */ + # ifndef FixupLibReferences + # define FixupLibReferences() @@\ +-DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a) ++DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt.a) + # endif + #endif + +Index: nx-X11/config/cf/lnxLib.rules +=================================================================== +--- a/nx-X11/config/cf/lnxLib.rules ++++ b/nx-X11/config/cf/lnxLib.rules +@@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc + XCOMM libX11.so (X11, SM, ICE) + JUMP_ROOT_X11 = $(XLIBSRC) + JUMP_IS_HOST_X11 = YES +-JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa ++JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa + JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) + JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared + JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) +@@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.v + JUMP_ADDRESS_X11 = 0x60200000 + JUMP_JUMPTABLESIZE_X11 = 0x4000 + JUMP_GOTSIZE_X11 = 4096 +-JUMP_STUBNAMES_X11 = libX11 libSM libICE ++JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE + JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) +-JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ ++JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ + JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) + + XCOMM libSM (part of libX11.so) +@@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000 + JUMP_GOTSIZE_Xt = 4096 + JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp + JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) +-JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~ +-JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \ +- $(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) ++JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~ ++JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \ ++ $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc) + + XCOMM libXmu (part of libXt.so) + JUMP_ROOT_Xmu = $(XMUSRC) +@@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000 + JUMP_GOTSIZE_Xaw = 4096 + JUMP_STUBNAMES_Xaw = libXaw + JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) +-JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ +- $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ ++JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \ ++ $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \ + $(JUMP_LDLIBS_libc) + + # endif /* !UseInstalled */ +Index: nx-X11/config/cf/lnxLib.tmpl +=================================================================== +--- a/nx-X11/config/cf/lnxLib.tmpl ++++ b/nx-X11/config/cf/lnxLib.tmpl +@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +@@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLI + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIB = -lXmu $(XLIB) ++XMULIB = -lNX_Xmu $(XLIB) + #endif + + #endif /* UseElfFormat */ +Index: nx-X11/config/cf/mingw.tmpl +=================================================================== +--- a/nx-X11/config/cf/mingw.tmpl ++++ b/nx-X11/config/cf/mingw.tmpl +@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl + + #ifndef FixupLibReferences + # define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/nto.rules +=================================================================== +--- a/nx-X11/config/cf/nto.rules ++++ b/nx-X11/config/cf/nto.rules +@@ -104,7 +104,7 @@ ComplexHostProgramTarget(program) + + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/os2Lib.tmpl +=================================================================== +--- a/nx-X11/config/cf/os2Lib.tmpl ++++ b/nx-X11/config/cf/os2Lib.tmpl +@@ -107,35 +107,35 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl + #endif + + #if LinkStatically +-#define SDlibX11 -lX11_s +-#define SDlibXExt -lXExt_s +-#define SDlibXmu -lXmu_s +-#define SDlibXt -lXt_s +-#define SDlibXaw -lXaw_s +-#define SDlibXaw7 -lXaw_s +-#define SDlibXaw6 -lXaw_s +-#define SDlibXi -lXi_s +-#define SDlibXtst -lXtst_s +-#define SDlibXp -lXp_s +-#define SDlibXv -lXv_s +-#define SDlibGL -lGL_s +-#define SDlibDPS -lDPS_s +-#define SDlibDPSTK -lDPSTK_s ++#define SDlibX11 -lNX_X11_s ++#define SDlibXExt -lNX_XExt_s ++#define SDlibXmu -lNX_Xmu_s ++#define SDlibXt -lNX_Xt_s ++#define SDlibXaw -lNX_Xaw_s ++#define SDlibXaw7 -lNX_Xaw_s ++#define SDlibXaw6 -lNX_Xaw_s ++#define SDlibXi -lNX_Xi_s ++#define SDlibXtst -lNX_Xtst_s ++#define SDlibXp -lNX_Xp_s ++#define SDlibXv -lNX_Xv_s ++#define SDlibGL -lNX_GL_s ++#define SDlibDPS -lNX_DPS_s ++#define SDlibDPSTK -lNX_DPSTK_s + #else +-#define SDlibX11 -lX11 +-#define SDlibXExt -lXExt +-#define SDlibXmu -lXmu +-#define SDlibXt -lXt +-#define SDlibXaw -lXaw +-#define SDlibXaw7 -lXaw +-#define SDlibXaw6 -lXaw +-#define SDlibXi -lXi +-#define SDlibXtst -lXtst +-#define SDlibXp -lXp +-#define SDlibXv -lXv +-#define SDlibGL -lGL +-#define SDlibDPS -lDPS +-#define SDlibDPSTK -lDPSTK ++#define SDlibX11 -lNX_X11 ++#define SDlibXExt -lNX_XExt ++#define SDlibXmu -lNX_Xmu ++#define SDlibXt -lNX_Xt ++#define SDlibXaw -lNX_Xaw ++#define SDlibXaw7 -lNX_Xaw ++#define SDlibXaw6 -lNX_Xaw ++#define SDlibXi -lNX_Xi ++#define SDlibXtst -lNX_Xtst ++#define SDlibXp -lNX_Xp ++#define SDlibXv -lNX_Xv ++#define SDlibGL -lNX_GL ++#define SDlibDPS -lNX_DPS ++#define SDlibDPSTK -lNX_DPSTK + #endif + + /* +@@ -159,7 +159,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl + #endif + #if SharedOldX + DEPOLDXLIB = +- OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) ++ OLDXLIB = _Use(-lNX_oldX,-L$(OLDXLIBSRC) -lNX_oldX) + #endif + #if SharedLibXt + DEPXTOOLLIB = +Index: nx-X11/config/cf/sco5.cf +=================================================================== +--- a/nx-X11/config/cf/sco5.cf ++++ b/nx-X11/config/cf/sco5.cf +@@ -318,7 +318,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1 + */ + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/config/cf/sv3Lib.tmpl +=================================================================== +--- a/nx-X11/config/cf/sv3Lib.tmpl ++++ b/nx-X11/config/cf/sv3Lib.tmpl +@@ -40,31 +40,31 @@ XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl + * are using shared libraries, we really do not need to depend on anything + */ + #if SharedLibXext +- DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a) +- EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB)) ++ DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libNX_Xext_s.a) ++ EXTENSIONLIB = LoaderLibPrefix _Use(-lNX_Xext_s, $(DEPEXTENSIONLIB)) + #endif + #if SharedLibX +- DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a) +- XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a) ++ DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libNX_X11_s.a) ++ XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lNX_X11_s,$(XLIBSRC)/libNX_X11_s.a) + #endif + #if SharedLibXmu +- DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a) +- XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB)) ++ DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libNX_Xmu_s.a) ++ XMULIB = LoaderLibPrefix _Use(-lNX_Xmu_s,$(DEPXMULIB)) + #endif + #if SharedOldLibX + DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a) + OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB)) + #endif + #if SharedLibXt +- DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a) +- XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB)) ++ DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt_s.a) ++ XTOOLLIB = LoaderLibPrefix _Use(-lNX_Xt_s,$(DEPXTOOLLIB)) + #endif + #if SharedLibXaw +- DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a) +- XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB)) ++ DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libNX_Xaw_s.a) ++ XAWLIB = LoaderLibPrefix _Use(-lNX_Xaw_s,$(DEPXAWLIB)) + #endif + #if SharedLibXinput +- DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a) +- XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB)) ++ DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libNX_Xi_s.a) ++ XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB)) + #endif + +Index: nx-X11/config/cf/sv4Lib.tmpl +=================================================================== +--- a/nx-X11/config/cf/sv4Lib.tmpl ++++ b/nx-X11/config/cf/sv4Lib.tmpl +@@ -7,7 +7,7 @@ XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/1 + XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $ + + /* SVR4 shared libraries are deficient in link semantics */ +-XMULIBONLY = -lXmu ++XMULIBONLY = -lNX_Xmu + #ifndef FixupLibReferences + # define FixupLibReferences() @@\ + XMULIB = $(XMULIBONLY) -z nodefs +Index: nx-X11/config/cf/usl.cf +=================================================================== +--- a/nx-X11/config/cf/usl.cf ++++ b/nx-X11/config/cf/usl.cf +@@ -262,7 +262,7 @@ XCOMM operating system: OSName (OSMajorV + */ + #ifndef FixupLibReferences + #define FixupLibReferences() @@\ +-XMULIBONLY = -lXmu @@\ ++XMULIBONLY = -lNX_Xmu @@\ + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + #endif + +Index: nx-X11/extras/Mesa/src/mesa/main/Imakefile +=================================================================== +--- a/nx-X11/extras/Mesa/src/mesa/main/Imakefile ++++ b/nx-X11/extras/Mesa/src/mesa/main/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib YES + #define DoDebugLib NO + #define DoProfileLib NO +-#define LibName MESAGL ++#define LibName NX_MESAGL + #define SoRev SOX11REV + #define LibHeaders NO + +Index: nx-X11/extras/Xpm/lib/Imakefile +=================================================================== +--- a/nx-X11/extras/Xpm/lib/Imakefile ++++ b/nx-X11/extras/Xpm/lib/Imakefile +@@ -125,7 +125,7 @@ OS_NAME_DEFINES = OsNameDefines + STD_DEFINES = LibraryDefines + CDEBUGFLAGS = LibraryCDebugFlags + #else +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMLIBREV + #define IncSubdir X11 + /* we have to cheat on Library.tmpl to get what we want... */ +Index: nx-X11/extras/drm/libdrm.pc.in +=================================================================== +--- a/nx-X11/extras/drm/libdrm.pc.in ++++ b/nx-X11/extras/drm/libdrm.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: libdrm + Description: Userspace interface to kernel DRM services + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ldrm ++Libs: -L${libdir} -lNX_drm + Cflags: -I${includedir} -I${includedir}/drm +Index: nx-X11/extras/fontconfig/fontconfig.pc.in +=================================================================== +--- a/nx-X11/extras/fontconfig/fontconfig.pc.in ++++ b/nx-X11/extras/fontconfig/fontconfig.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: Fontconfig + Description: Font configuration and customization library + Version: @VERSION@ +-Libs: -L${libdir} -lfontconfig ++Libs: -L${libdir} -lNX_fontconfig + Cflags: -I${includedir} +Index: nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile +=================================================================== +--- a/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile ++++ b/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile +@@ -36,7 +36,7 @@ XCOMM + #define DoDebugLib DebugLibGlu + #define DoProfileLib ProfileLibGlu + #define IHaveSubdirs +-#define LibName GLU ++#define LibName NX_GLU + #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + #define SoRev SOGLUREV + +Index: nx-X11/lib/FS/Imakefile +=================================================================== +--- a/nx-X11/lib/FS/Imakefile ++++ b/nx-X11/lib/FS/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/FS/Imakefile,v 3. + #define DoExtraLib SharedLibFS + #define DoDebugLib DebugLibFS + #define DoProfileLib ProfileLibFS +-#define LibName FS ++#define LibName NX_FS + #define SoRev SOFSREV + #define IncSubdir X11 + #define IncSubSubdir fonts +Index: nx-X11/lib/GLw/Imakefile +=================================================================== +--- a/nx-X11/lib/GLw/Imakefile ++++ b/nx-X11/lib/GLw/Imakefile +@@ -46,7 +46,7 @@ XCOMM MOTIF_LDFLAGS = -L/usr/local/lib + #define DoProfileLib ProfileLibGLw + + #define HasSharedData NO +-#define LibName GLw ++#define LibName NX_GLw + #define SoRev SOGLWREV + #define IncSubdir GL + +Index: nx-X11/lib/ICE/Imakefile +=================================================================== +--- a/nx-X11/lib/ICE/Imakefile ++++ b/nx-X11/lib/ICE/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3 + #define DoExtraLib SharedLibICE + #define DoDebugLib DebugLibICE + #define DoProfileLib ProfileLibICE +-#define LibName ICE ++#define LibName NX_ICE + #define SoRev SOICEREV + #define IncSubdir X11 + #define IncSubSubdir ICE +Index: nx-X11/lib/SM/Imakefile +=================================================================== +--- a/nx-X11/lib/SM/Imakefile ++++ b/nx-X11/lib/SM/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/SM/Imakefile,v 1. + #define DoExtraLib SharedLibSM + #define DoDebugLib DebugLibSM + #define DoProfileLib ProfileLibSM +-#define LibName SM ++#define LibName NX_SM + #define SoRev SOSMREV + #define IncSubdir X11 + #define IncSubSubdir SM +Index: nx-X11/lib/X11/Imakefile +=================================================================== +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTL + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName NX_X11 + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +Index: nx-X11/lib/X11/Imakefile.NX.original +=================================================================== +--- a/nx-X11/lib/X11/Imakefile.NX.original ++++ b/nx-X11/lib/X11/Imakefile.NX.original +@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTL + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName NX_X11 + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +Index: nx-X11/lib/X11/Imakefile.X.original +=================================================================== +--- a/nx-X11/lib/X11/Imakefile.X.original ++++ b/nx-X11/lib/X11/Imakefile.X.original +@@ -28,7 +28,7 @@ BuildIncludes($(HEADERS),IncSubdir,..) + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName NX_X11 + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +Index: nx-X11/lib/XRes/Imakefile +=================================================================== +--- a/nx-X11/lib/XRes/Imakefile ++++ b/nx-X11/lib/XRes/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v + #define DoSharedLib SharedLibXRes + #define DoDebugLib DebugLibXRes + #define DoProfileLib ProfileLibXRes +-#define LibName XRes ++#define LibName NX_XRes + #define SoRev SOXRESREV + #define LibHeaders NO + +Index: nx-X11/lib/XTrap/Imakefile +=================================================================== +--- a/nx-X11/lib/XTrap/Imakefile ++++ b/nx-X11/lib/XTrap/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86$ + #define DoSharedLib SharedLibXTrap + #define DoDebugLib DebugLibXTrap + #define DoProfileLib ProfileLibXTrap +-#define LibName XTrap ++#define LibName NX_XTrap + #define SoRev SOXTRAPREV + #define LibHeaders NO + +Index: nx-X11/lib/Xau/Imakefile +=================================================================== +--- a/nx-X11/lib/Xau/Imakefile ++++ b/nx-X11/lib/Xau/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3 + #define DoExtraLib SharedLibXau + #define DoDebugLib DebugLibXau + #define DoProfileLib ProfileLibXau +-#define LibName Xau ++#define LibName NX_Xau + #define SoRev SOXAUTHREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xaw/Imakefile +=================================================================== +--- a/nx-X11/lib/Xaw/Imakefile ++++ b/nx-X11/lib/Xaw/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1 + #define DoDebugLib DebugLibXaw + #define DoProfileLib ProfileLibXaw + #define HasSharedData YES +-#define LibName Xaw ++#define LibName NX_Xaw + #define SoRev SOXAWREV + #define IncSubdir X11 + #define IncSubSubdir Xaw +Index: nx-X11/lib/Xaw6/Imakefile +=================================================================== +--- a/nx-X11/lib/Xaw6/Imakefile ++++ b/nx-X11/lib/Xaw6/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xaw6/Imakefile,v + #define DoDebugLib DebugLibXaw6 + #define DoProfileLib ProfileLibXaw6 + #define HasSharedData YES +-#define LibName Xaw ++#define LibName NX_Xaw + #define SoRev SOXAW6REV + #define LibHeaders NO + #define NoSoSymlink +Index: nx-X11/lib/Xaw7/Imakefile +=================================================================== +--- a/nx-X11/lib/Xaw7/Imakefile ++++ b/nx-X11/lib/Xaw7/Imakefile +@@ -5,7 +5,7 @@ XCOMM $Xorg$ + #define DoDebugLib DebugLibXaw7 + #define DoProfileLib ProfileLibXaw7 + #define HasSharedData YES +-#define LibName Xaw ++#define LibName NX_Xaw + #define SoRev SOXAW7REV + + #if BuildXaw +Index: nx-X11/lib/Xcomposite/Imakefile +=================================================================== +--- a/nx-X11/lib/Xcomposite/Imakefile ++++ b/nx-X11/lib/Xcomposite/Imakefile +@@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0 + #define DoDebugLib DebugLibXcomposite + #define DoProfileLib ProfileLibXcomposite + +-#define LibName Xcomposite ++#define LibName NX_Xcomposite + #define SoRev SOXCOMPOSITEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xcomposite/xcomposite.pc.in +=================================================================== +--- a/nx-X11/lib/Xcomposite/xcomposite.pc.in ++++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in +@@ -7,4 +7,4 @@ Name: Xcomposite + Description: X Composite Library + Version: @VERSION@ + Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ +-Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ ++Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ +Index: nx-X11/lib/Xcursor/Imakefile +=================================================================== +--- a/nx-X11/lib/Xcursor/Imakefile ++++ b/nx-X11/lib/Xcursor/Imakefile +@@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2 + #define DoDebugLib DebugLibXcursor + #define DoProfileLib ProfileLibXcursor + +-#define LibName Xcursor ++#define LibName NX_Xcursor + #define SoRev SOXCURSORREV + #define IncSubdir X11 + #define IncSubSubdir Xcursor +Index: nx-X11/lib/Xcursor/xcursor.pc.in +=================================================================== +--- a/nx-X11/lib/Xcursor/xcursor.pc.in ++++ b/nx-X11/lib/Xcursor/xcursor.pc.in +@@ -12,4 +12,4 @@ Description: X Cursor Library + Version: @VERSION@ + Requires: xrender + Cflags: -I${includedir} ${xrendercflags} ${xcflags} +-Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} ++Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} +Index: nx-X11/lib/Xdamage/Imakefile +=================================================================== +--- a/nx-X11/lib/Xdamage/Imakefile ++++ b/nx-X11/lib/Xdamage/Imakefile +@@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1 + #define DoDebugLib DebugLibXdamage + #define DoProfileLib ProfileLibXdamage + +-#define LibName Xdamage ++#define LibName NX_Xdamage + #define SoRev SOXDAMAGEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xdamage/xdamage.pc.in +=================================================================== +--- a/nx-X11/lib/Xdamage/xdamage.pc.in ++++ b/nx-X11/lib/Xdamage/xdamage.pc.in +@@ -7,4 +7,4 @@ Name: Xdamage + Description: X Damage Library + Version: @VERSION@ + Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ +-Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ ++Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ +Index: nx-X11/lib/Xdmcp/Imakefile +=================================================================== +--- a/nx-X11/lib/Xdmcp/Imakefile ++++ b/nx-X11/lib/Xdmcp/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v + #define DoExtraLib SharedLibXdmcp + #define DoDebugLib DebugLibXdmcp + #define DoProfileLib ProfileLibXdmcp +-#define LibName Xdmcp ++#define LibName NX_Xdmcp + #define SoRev SOXDMCPREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xevie/Imakefile +=================================================================== +--- a/nx-X11/lib/Xevie/Imakefile ++++ b/nx-X11/lib/Xevie/Imakefile +@@ -14,7 +14,7 @@ SOXEVIEREV=1.0.0 + #define DoDebugLib DebugLibXevie + #define DoProfileLib ProfileLibXevie + +-#define LibName Xevie ++#define LibName NX_Xevie + #define SoRev SOXEVIEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xevie/xevie.pc.in +=================================================================== +--- a/nx-X11/lib/Xevie/xevie.pc.in ++++ b/nx-X11/lib/Xevie/xevie.pc.in +@@ -9,4 +9,4 @@ Name: Xevie + Description: X Event Interceptor Library + Version: @VERSION@ + Cflags: -I${includedir} ${xcflags} +-Libs: -L${libdir} -lXevie ${xlibs} ++Libs: -L${libdir} -lNX_Xevie ${xlibs} +Index: nx-X11/lib/Xext/Imakefile +=================================================================== +--- a/nx-X11/lib/Xext/Imakefile ++++ b/nx-X11/lib/Xext/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v + #define DoExtraLib SharedLibXext + #define DoDebugLib DebugLibXext + #define DoProfileLib ProfileLibXext +-#define LibName Xext ++#define LibName NX_Xext + #define SoRev SOXEXTREV + #define LibHeaders NO + +Index: nx-X11/lib/Xfixes/Imakefile +=================================================================== +--- a/nx-X11/lib/Xfixes/Imakefile ++++ b/nx-X11/lib/Xfixes/Imakefile +@@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0 + #define DoDebugLib DebugLibXfixes + #define DoProfileLib ProfileLibXfixes + +-#define LibName Xfixes ++#define LibName NX_Xfixes + #define SoRev SOXFIXESREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xfixes/xfixes.pc.in +=================================================================== +--- a/nx-X11/lib/Xfixes/xfixes.pc.in ++++ b/nx-X11/lib/Xfixes/xfixes.pc.in +@@ -7,4 +7,4 @@ Name: Xfixes + Description: X Fixes Library + Version: @VERSION@ + Cflags: -I${includedir} @X_CFLAGS@ +-Libs: -L${libdir} -lXfixes @X_LIBS@ ++Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ +Index: nx-X11/lib/Xfontcache/Imakefile +=================================================================== +--- a/nx-X11/lib/Xfontcache/Imakefile ++++ b/nx-X11/lib/Xfontcache/Imakefile +@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/lib/Xfontcache/Imakef + #define DoExtraLib SharedLibXfontcache + #define DoDebugLib DebugLibXfontcache + #define DoProfileLib ProfileLibXfontcache +-#define LibName Xfontcache ++#define LibName NX_Xfontcache + #define SoRev SOXFONTCACHEREV + #define LibHeaders NO + +Index: nx-X11/lib/Xft/Imakefile +=================================================================== +--- a/nx-X11/lib/Xft/Imakefile ++++ b/nx-X11/lib/Xft/Imakefile +@@ -8,7 +8,7 @@ XCOMM $XdotOrg: xc/lib/Xft/Imakefile,v 1 + #define DoProfileLib ProfileLibXft + + #define HasSharedData YES +-#define LibName Xft ++#define LibName NX_Xft + #define SoRev SOXFTREV + #define IncSubdir X11 + #define IncSubSubdir Xft +Index: nx-X11/lib/Xft/xft.pc.in +=================================================================== +--- a/nx-X11/lib/Xft/xft.pc.in ++++ b/nx-X11/lib/Xft/xft.pc.in +@@ -9,4 +9,4 @@ Version: @VERSION@ + Requires: xrender, fontconfig, freetype2 + Requires.private: xrender, fontconfig, freetype2 + Cflags: -I${includedir} +-Libs: -L${libdir} -lXft ++Libs: -L${libdir} -lNX_Xft +Index: nx-X11/lib/Xft1/Imakefile +=================================================================== +--- a/nx-X11/lib/Xft1/Imakefile ++++ b/nx-X11/lib/Xft1/Imakefile +@@ -70,7 +70,7 @@ LDPRELIBS=LdPreLibs + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData YES +-#define LibName Xft ++#define LibName NX_Xft + #define SoRev SOXFT1REV + #define LibHeaders NO + #define NoSoSymlink +Index: nx-X11/lib/Xi/Imakefile +=================================================================== +--- a/nx-X11/lib/Xi/Imakefile ++++ b/nx-X11/lib/Xi/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1. + #define DoExtraLib SharedLibXi + #define DoDebugLib DebugLibXi + #define DoProfileLib ProfileLibXi +-#define LibName Xi ++#define LibName NX_Xi + #define SoRev SOXINPUTREV + #define LibHeaders NO + +Index: nx-X11/lib/Xinerama/Imakefile +=================================================================== +--- a/nx-X11/lib/Xinerama/Imakefile ++++ b/nx-X11/lib/Xinerama/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefil + #define DoSharedLib SharedLibXinerama + #define DoDebugLib DebugLibXinerama + #define DoProfileLib ProfileLibXinerama +-#define LibName Xinerama ++#define LibName NX_Xinerama + #define SoRev SOXINERAMAREV + #define LibHeaders NO + +Index: nx-X11/lib/Xmu/Imakefile +=================================================================== +--- a/nx-X11/lib/Xmu/Imakefile ++++ b/nx-X11/lib/Xmu/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1 + #define DoDebugLib DebugLibXmu + #define DoProfileLib ProfileLibXmu + #define HasSharedData YES +-#define LibName Xmu ++#define LibName NX_Xmu + #define SoRev SOXMUREV + #define IncSubdir X11 + #define IncSubSubdir Xmu +Index: nx-X11/lib/Xmuu/Imakefile +=================================================================== +--- a/nx-X11/lib/Xmuu/Imakefile ++++ b/nx-X11/lib/Xmuu/Imakefile +@@ -11,7 +11,7 @@ XCOMM other than Xlib and the system C l + #define DoExtraLib SharedLibXmuu + #define DoDebugLib DebugLibXmuu + #define DoProfileLib ProfileLibXmuu +-#define LibName Xmuu ++#define LibName NX_Xmuu + #define SoRev SOXMUUREV + #define LibHeaders NO + +Index: nx-X11/lib/Xp/Imakefile +=================================================================== +--- a/nx-X11/lib/Xp/Imakefile ++++ b/nx-X11/lib/Xp/Imakefile +@@ -44,7 +44,7 @@ XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1. + #define DoExtraLib SharedLibXp + #define DoDebugLib DebugLibXp + #define DoProfileLib ProfileLibXp +-#define LibName Xp ++#define LibName NX_Xp + #define SoRev SOXPREV + #define LibHeaders NO + +Index: nx-X11/lib/Xpm/Imakefile +=================================================================== +--- a/nx-X11/lib/Xpm/Imakefile ++++ b/nx-X11/lib/Xpm/Imakefile +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 + #define DoDebugLib DebugLibXpm + #define DoProfileLib ProfileLibXpm + #define HasSharedData NO +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xpm/Imakefile.NX.original +=================================================================== +--- a/nx-X11/lib/Xpm/Imakefile.NX.original ++++ b/nx-X11/lib/Xpm/Imakefile.NX.original +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 + #define DoDebugLib DebugLibXpm + #define DoProfileLib ProfileLibXpm + #define HasSharedData NO +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xpm/Imakefile.X.original +=================================================================== +--- a/nx-X11/lib/Xpm/Imakefile.X.original ++++ b/nx-X11/lib/Xpm/Imakefile.X.original +@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 + #define DoDebugLib DebugLibXpm + #define DoProfileLib ProfileLibXpm + #define HasSharedData NO +-#define LibName Xpm ++#define LibName NX_Xpm + #define SoRev SOXPMREV + #define IncSubdir X11 + +Index: nx-X11/lib/XprintAppUtil/Imakefile +=================================================================== +--- a/nx-X11/lib/XprintAppUtil/Imakefile ++++ b/nx-X11/lib/XprintAppUtil/Imakefile +@@ -5,7 +5,7 @@ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName XprintAppUtil ++#define LibName NX_XprintAppUtil + #define SoRev SOZLIBREV + #define IncSubdir X11 + #define IncSubSubdir XprintAppUtil +Index: nx-X11/lib/XprintUtil/Imakefile +=================================================================== +--- a/nx-X11/lib/XprintUtil/Imakefile ++++ b/nx-X11/lib/XprintUtil/Imakefile +@@ -5,7 +5,7 @@ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName XprintUtil ++#define LibName NX_XprintUtil + #define SoRev SOZLIBREV + #define IncSubdir X11 + #define IncSubSubdir XprintUtil +Index: nx-X11/lib/Xrandr/Imakefile +=================================================================== +--- a/nx-X11/lib/Xrandr/Imakefile ++++ b/nx-X11/lib/Xrandr/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile, + #define DoSharedLib SharedLibXrandr + #define DoDebugLib DebugLibXrandr + #define DoProfileLib ProfileLibXrandr +-#define LibName Xrandr ++#define LibName NX_Xrandr + #define SoRev SOXRANDRREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/Xrender/Imakefile +=================================================================== +--- a/nx-X11/lib/Xrender/Imakefile ++++ b/nx-X11/lib/Xrender/Imakefile +@@ -74,7 +74,7 @@ clean:: + #define DoSharedLib SharedLibXrender + #define DoDebugLib DebugLibXrender + #define DoProfileLib ProfileLibXrender +-#define LibName Xrender ++#define LibName NX_Xrender + #define SoRev SOXRENDERREV + + #ifdef XBuildIncDir +Index: nx-X11/lib/Xrender/xrender.pc.in +=================================================================== +--- a/nx-X11/lib/Xrender/xrender.pc.in ++++ b/nx-X11/lib/Xrender/xrender.pc.in +@@ -8,4 +8,4 @@ Description: X Render Library + Version: @VERSION@ + Requires: @X_REQUIRES@ + Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ +-Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ ++Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ +Index: nx-X11/lib/Xss/Imakefile +=================================================================== +--- a/nx-X11/lib/Xss/Imakefile ++++ b/nx-X11/lib/Xss/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3 + #define DoExtraLib SharedLibXss + #define DoDebugLib DebugLibXss + #define DoProfileLib ProfileLibXss +-#define LibName Xss ++#define LibName NX_Xss + #define SoRev SOXSSREV + #define LibHeaders NO + +Index: nx-X11/lib/Xt/Imakefile +=================================================================== +--- a/nx-X11/lib/Xt/Imakefile ++++ b/nx-X11/lib/Xt/Imakefile +@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET + #define DoDebugLib DebugLibXt + #define DoProfileLib ProfileLibXt + #define HasSharedData YES +-#define LibName Xt ++#define LibName NX_Xt + #define SoRev SOXTREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xt/Imakefile.NX.original +=================================================================== +--- a/nx-X11/lib/Xt/Imakefile.NX.original ++++ b/nx-X11/lib/Xt/Imakefile.NX.original +@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET + #define DoDebugLib DebugLibXt + #define DoProfileLib ProfileLibXt + #define HasSharedData YES +-#define LibName Xt ++#define LibName NX_Xt + #define SoRev SOXTREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xt/Imakefile.X.original +=================================================================== +--- a/nx-X11/lib/Xt/Imakefile.X.original ++++ b/nx-X11/lib/Xt/Imakefile.X.original +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3. + #define DoDebugLib DebugLibXt + #define DoProfileLib ProfileLibXt + #define HasSharedData YES +-#define LibName Xt ++#define LibName NX_Xt + #define SoRev SOXTREV + #define IncSubdir X11 + +Index: nx-X11/lib/Xtst/Imakefile +=================================================================== +--- a/nx-X11/lib/Xtst/Imakefile ++++ b/nx-X11/lib/Xtst/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v + #define DoExtraLib SharedLibXtst + #define DoDebugLib DebugLibXtst + #define DoProfileLib ProfileLibXtst +-#define LibName Xtst ++#define LibName NX_Xtst + #define SoRev SOXTESTREV + #define LibHeaders NO + +Index: nx-X11/lib/Xv/Imakefile +=================================================================== +--- a/nx-X11/lib/Xv/Imakefile ++++ b/nx-X11/lib/Xv/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1. + #define DoSharedLib SharedLibXv + #define DoDebugLib DebugLibXv + #define DoProfileLib ProfileLibXv +-#define LibName Xv ++#define LibName NX_Xv + #define SoRev SOXVREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/Imakefile ++++ b/nx-X11/lib/XvMC/Imakefile +@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XvMC/Imakefile,v + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName XvMC ++#define LibName NX_XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/hw/i810/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/hw/i810/Imakefile ++++ b/nx-X11/lib/XvMC/hw/i810/Imakefile +@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imak + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName I810XvMC ++#define LibName NX_I810XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/hw/via/unichrome/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile ++++ b/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName viaXvMC ++#define LibName NX_viaXvMC + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile ++++ b/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName viaXvMCPro ++#define LibName NX_viaXvMCPro + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/XvMC/wrapper/Imakefile +=================================================================== +--- a/nx-X11/lib/XvMC/wrapper/Imakefile ++++ b/nx-X11/lib/XvMC/wrapper/Imakefile +@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/wrapper/Imak + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC +-#define LibName XvMCW ++#define LibName NX_XvMCW + #define SoRev SOXVMCREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86dga/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86dga/Imakefile ++++ b/nx-X11/lib/Xxf86dga/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/Xxf86dga/Imakefil + #define DoExtraLib SharedLibXxf86dga + #define DoDebugLib DebugLibXxf86dga + #define DoProfileLib ProfileLibXxf86dga +-#define LibName Xxf86dga ++#define LibName NX_Xxf86dga + #define SoRev SOXXF86DGAREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86misc/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86misc/Imakefile ++++ b/nx-X11/lib/Xxf86misc/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XdotOrg: xc/lib/Xxf86misc/Imakefi + #define DoExtraLib SharedLibXxf86misc + #define DoDebugLib DebugLibXxf86misc + #define DoProfileLib ProfileLibXxf86misc +-#define LibName Xxf86misc ++#define LibName NX_Xxf86misc + #define SoRev SOXXF86MISCREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86rush/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86rush/Imakefile ++++ b/nx-X11/lib/Xxf86rush/Imakefile +@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/Xxf86rush/Imakefi + #define DoSharedLib SharedLibXxf86rush + #define DoDebugLib DebugLibXxf86rush + #define DoProfileLib ProfileLibXxf86rush +-#define LibName Xxf86rush ++#define LibName NX_Xxf86rush + #define SoRev SOXXF86RUSHREV + #define LibHeaders NO + +Index: nx-X11/lib/Xxf86vm/Imakefile +=================================================================== +--- a/nx-X11/lib/Xxf86vm/Imakefile ++++ b/nx-X11/lib/Xxf86vm/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XdotOrg: xc/lib/Xxf86vm/Imakefile + #define DoExtraLib SharedLibXxf86vm + #define DoDebugLib DebugLibXxf86vm + #define DoProfileLib ProfileLibXxf86vm +-#define LibName Xxf86vm ++#define LibName NX_Xxf86vm + #define SoRev SOXXF86VMREV + #define LibHeaders NO + +Index: nx-X11/lib/apple/Imakefile +=================================================================== +--- a/nx-X11/lib/apple/Imakefile ++++ b/nx-X11/lib/apple/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xrandr/Imakefile, + #define DoSharedLib SharedLibAppleWM + #define DoDebugLib DebugLibAppleWM + #define DoProfileLib ProfileLibAppleWM +-#define LibName AppleWM ++#define LibName NX_AppleWM + #define SoRev SOAPPLEWMREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/dmx/Imakefile +=================================================================== +--- a/nx-X11/lib/dmx/Imakefile ++++ b/nx-X11/lib/dmx/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86$ + #define DoDebugLib DebugLibDmx + #define DoProfileLib ProfileLibDmx + +-#define LibName dmx ++#define LibName NX_dmx + #define SoRev SODMXREV + #define LibHeaders NO + +Index: nx-X11/lib/dps/Imakefile +=================================================================== +--- a/nx-X11/lib/dps/Imakefile ++++ b/nx-X11/lib/dps/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/dps/Imakefile,v 1 + #define DoExtraLib SharedLibDps + #define DoDebugLib DebugLibDps + #define DoProfileLib ProfileLibDps +-#define LibName dps ++#define LibName NX_dps + #define SoRev SODPSREV + #define IncSubdir DPS + +Index: nx-X11/lib/dpstk/Imakefile +=================================================================== +--- a/nx-X11/lib/dpstk/Imakefile ++++ b/nx-X11/lib/dpstk/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/dpstk/Imakefile,v + #define DoExtraLib SharedLibDpsTk + #define DoDebugLib DebugLibDpsTk + #define DoProfileLib ProfileLibDpsTk +-#define LibName dpstk ++#define LibName NX_dpstk + #define SoRev SODPSTKREV + #define LibHeaders NO + +Index: nx-X11/lib/expat/Imakefile +=================================================================== +--- a/nx-X11/lib/expat/Imakefile ++++ b/nx-X11/lib/expat/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/expat/Imakefile,v + #define DoDebugLib DebugLibExpat + #define DoProfileLib ProfileLibExpat + #define HasSharedData YES +-#define LibName expat ++#define LibName NX_expat + #define SoRev SOEXPATREV + #ifdef SharedLibtoolExpatRev + #define SharedLibtoolRev SharedLibtoolExpatRev +Index: nx-X11/lib/font/Imakefile +=================================================================== +--- a/nx-X11/lib/font/Imakefile ++++ b/nx-X11/lib/font/Imakefile +@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v + STUBDIRS = stubs + #endif + +-LIBNAME = Xfont ++LIBNAME = NX_Xfont + SOREV = $(SOFONTREV) + + #ifndef SeparateSharedCompile +Index: nx-X11/lib/fontconfig/Imakefile +=================================================================== +--- a/nx-X11/lib/fontconfig/Imakefile ++++ b/nx-X11/lib/fontconfig/Imakefile +@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/lib/fontconfig/Imakef + #define DoDebugLib DebugLibFontconfig + #define DoProfileLib ProfileLibFontconfig + #define HasSharedData YES +-#define LibName fontconfig ++#define LibName NX_fontconfig + #define SoRev SOFONTCONFIGREV + #define LibInstall InstallFontconfigLibrary + #define LibHeaders InstallFontconfigLibrary +Index: nx-X11/lib/fontenc/Imakefile +=================================================================== +--- a/nx-X11/lib/fontenc/Imakefile ++++ b/nx-X11/lib/fontenc/Imakefile +@@ -17,7 +17,7 @@ FONTENCDEFS = -DFONTENC_NO_LIBFONT \ + #define DoSharedLib SharedLibFontEnc + #define DoDebugLib DebugLibFontEnc + #define DoProfileLib ProfileLibFontEnc +-#define LibName fontenc ++#define LibName NX_fontenc + #define SoRev SOFONTENCREV + #define IncSubdir X11 + #define IncSubSubdir fonts +Index: nx-X11/lib/freetype2/Imakefile +=================================================================== +--- a/nx-X11/lib/freetype2/Imakefile ++++ b/nx-X11/lib/freetype2/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/freetype2/Imakefi + #define DoDebugLib DebugLibFreetype2 + #define DoProfileLib ProfileLibFreetype2 + #define HasSharedData YES +-#define LibName freetype ++#define LibName NX_freetype + #define SoRev SOFREETYPE2REV + #ifdef SharedLibtoolFreetype2Rev + #define SharedLibtoolRev SharedLibtoolFreetype2Rev +Index: nx-X11/lib/oldX/Imakefile +=================================================================== +--- a/nx-X11/lib/oldX/Imakefile ++++ b/nx-X11/lib/oldX/Imakefile +@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v + #define DoExtraLib SharedOldX + #define DoDebugLib DebugOldX + #define DoProfileLib ProfileOldX +-#define LibName oldX ++#define LibName NX_oldX + #define SoRev SOOLDXREV + #define IncSubdir X11 + +Index: nx-X11/lib/psres/Imakefile +=================================================================== +--- a/nx-X11/lib/psres/Imakefile ++++ b/nx-X11/lib/psres/Imakefile +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/psres/Imakefile,v + #define DoExtraLib SharedLibPSRes + #define DoDebugLib DebugLibPSRes + #define DoProfileLib ProfileLibPSRes +-#define LibName psres ++#define LibName NX_psres + #define SoRev SOPSRESREV + #define LibHeaders NO + +Index: nx-X11/lib/regex/Imakefile +=================================================================== +--- a/nx-X11/lib/regex/Imakefile ++++ b/nx-X11/lib/regex/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86$ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName regex ++#define LibName NX_regex + #define LibHeaders NO + #define LibInstall NO + #define LibInstallBuild YES +Index: nx-X11/lib/windows/Imakefile +=================================================================== +--- a/nx-X11/lib/windows/Imakefile ++++ b/nx-X11/lib/windows/Imakefile +@@ -2,7 +2,7 @@ + #define DoSharedLib SharedLibWindowsWM + #define DoDebugLib DebugLibWindowsWM + #define DoProfileLib ProfileLibWindowsWM +-#define LibName WindowsWM ++#define LibName NX_WindowsWM + #define SoRev SOWINDOWSWMREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/xkbfile/Imakefile +=================================================================== +--- a/nx-X11/lib/xkbfile/Imakefile ++++ b/nx-X11/lib/xkbfile/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile + #define DoDebugLib DebugLibxkbfile + #define DoProfileLib ProfileLibxkbfile + #define HasSharedData NO +-#define LibName xkbfile ++#define LibName NX_xkbfile + #define SoRev SOXKBFILEREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/xkbui/Imakefile +=================================================================== +--- a/nx-X11/lib/xkbui/Imakefile ++++ b/nx-X11/lib/xkbui/Imakefile +@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/xkbui/Imakefile,v + #define DoDebugLib DebugLibxkbui + #define DoProfileLib ProfileLibxkbui + #define HasSharedData NO +-#define LibName xkbui ++#define LibName NX_xkbui + #define SoRev SOXKBUIREV + #define IncSubdir X11 + #define IncSubSubdir extensions +Index: nx-X11/lib/zlib/Imakefile +=================================================================== +--- a/nx-X11/lib/zlib/Imakefile ++++ b/nx-X11/lib/zlib/Imakefile +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/zlib/Imakefile,v + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName z ++#define LibName NX_z + #define SoRev SOZLIBREV + + ZLIBDIR = $(TOP)/extras/zlib +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -313,7 +313,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs + FONTBASE = $(FONTLIBSRC)/fontbase.o \ + $(FONTLIBSRC)/LibraryTargetName(fontbase) + #if XserverStaticFontLib +- FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) ++ FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB) + #else + FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) + #endif +@@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o + dix/main.o + #endif + +-XPMLIB = -lXpm ++XPMLIB = -lNX_Xpm + NXAGENT = hw/nxagent/LibraryTargetName(nxagent) + NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) + NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) +@@ -1012,16 +1012,16 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS + + #if defined(SunArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ +- -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp ++ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ ++ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp + #elif defined(cygwinArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ +- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ +- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp ++ -lXcomp -lXcompext -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ ++ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp + #else + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ +- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp ++ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ ++ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp + #endif + + #endif +@@ -1075,7 +1075,7 @@ nxagent_static_nolibs: nxagent + else exit 0; fi + $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ + $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ +- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) ++ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS) + #endif /* NXAgentServer */ + + #if defined(XnonServer) && XnonServer +Index: nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile ++++ b/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile +@@ -7,7 +7,7 @@ + #define DoDebugLib NO + #define DoProfileLib NO + #define HasSharedData NO +-#define LibName xf86config ++#define LibName NX_xf86config + + #define UseDBMalloc NO + +Index: nxcompext/Makefile.in +=================================================================== +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp + CCDEFINES = + + LDFLAGS = @LDFLAGS@ -L../nxcomp +-LIBS = @LIBS@ -lz -lX11 -lXcomp ++LIBS = @LIBS@ -lz -lNX_X11 -lXcomp + + # + # Only if THREADS is defined + # +-# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp ++# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp + # + + srcdir = @srcdir@ +Index: nxcompshad/Makefile.in +=================================================================== +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -48,7 +48,7 @@ CCINCLUDES = + CCDEFINES = + + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ -lX11 ++LIBS = @LIBS@ -lNX_X11 + + # + # Only if THREADS is defined. +@@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) + + else + +-EXTRALIBS = -lXtst -lXrandr -lXdamage ++EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage + + all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) + diff --git a/debian/patches/series b/debian/patches/series index 8f1a388..5360b6b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,6 +25,7 @@ 023_add-x2goagent-wrapper.full.patch 030_nx-X11_configure-args.full.diff 031_nx-X11_parallel-make.full.diff +032_no-x11r6.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 102_xserver-xext_set-securitypolicy-path.debian.patch @@ -41,5 +42,6 @@ 209_x2goagent-add-man-page.full.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.diff +600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.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 - master (branch) updated: redist-client/3.5.0.10-23-g9282c00
by git-admin＠x2go.org 14 Feb '12

14 Feb '12

The branch, master has been updated via 9282c00e2aaa02404809fe317308ccbb4da3b0e8 (commit) from 6a96ae450fb469bec1f23ebe727f6f318bfe80db (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 9282c00e2aaa02404809fe317308ccbb4da3b0e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 23:34:51 2012 +0100 Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) variable. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../patches/001_add-main-makefile.full+lite.patch | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 31384cf..0b45f2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name. * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). + * Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) + variable. [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 9f4351f..3c236b9 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,9 +5,11 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,34 @@ +@@ -0,0 +1,36 @@ +#!/usr/bin/make -f + ++CONFIGURE=./configure ++ +%: + ${MAKE} -C nxcomp $@ + ${MAKE} -C nxproxy $@ @@ -23,12 +25,12 @@ Last-Update: 2011-12-31 + echo "No testing for NX (redistributed)" + +build-lite: -+ cd nxcomp && autoconf && ./configure && ${MAKE} -+ cd nxproxy && autoconf && ./configure && ${MAKE} ++ cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} ++ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} + +build-full: +# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... -+ cd nxcomp && autoconf && ./configure ++ cd nxcomp && autoconf + cd nxcompext && autoconf + cd nxcompshad && autoconf + cd nx-X11 && ${MAKE} World 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-client/3.5.0.10-22-g6a96ae4
by git-admin＠x2go.org 14 Feb '12

14 Feb '12

The branch, master has been updated via 6a96ae450fb469bec1f23ebe727f6f318bfe80db (commit) via 8d6d0a921889498601cef9176202a456af881a9e (commit) via 01e97f0f829b90411a15c70b082a7823a26ae61f (commit) via c621c22f820ec22fe7daabf37b7b577a41a3298f (commit) via 4d6e1c4fbe549a77caa5ba0fc60e1bf668bf4a4b (commit) via ba589d1fd264f3ad3fbe8767bf215c0399a162cf (commit) via b4b4e209bf1d379adcff26e28305af076f8963d4 (commit) via 280d8751c36b6585c068a25cc180e7baa6df2019 (commit) via 165206eb288d43d68530652c31fdc26cf0bbab28 (commit) via 448a1db30bd68025dea51ea98a52a16658f6f03c (commit) from b087877b25af2c3ed9cd405fd1c867c8817223e9 (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 6a96ae450fb469bec1f23ebe727f6f318bfe80db Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 23:03:45 2012 +0100 Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). commit 8d6d0a921889498601cef9176202a456af881a9e Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Tue Feb 14 22:59:50 2012 +0100 Add patch: 301_nx-X11_use-shared-libs.full.diff, use shared libraries from distribution rather then libs included in source tree. commit 01e97f0f829b90411a15c70b082a7823a26ae61f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 22:42:48 2012 +0100 Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name. commit c621c22f820ec22fe7daabf37b7b577a41a3298f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 22:40:15 2012 +0100 Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...). commit 4d6e1c4fbe549a77caa5ba0fc60e1bf668bf4a4b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 22:30:26 2012 +0100 Enable parallel build for Debian package. commit ba589d1fd264f3ad3fbe8767bf215c0399a162cf Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Tue Feb 14 08:47:19 2012 +0100 Add patch: 031_nx-X11_parallel-make.diff, enable parallel make. commit b4b4e209bf1d379adcff26e28305af076f8963d4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 08:39:32 2012 +0100 Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for macros. commit 280d8751c36b6585c068a25cc180e7baa6df2019 Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Tue Feb 14 08:33:42 2012 +0100 Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args. commit 165206eb288d43d68530652c31fdc26cf0bbab28 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 08:27:52 2012 +0100 changelog fix, long-line-wrap commit 448a1db30bd68025dea51ea98a52a16658f6f03c Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Tue Feb 14 08:26:50 2012 +0100 Update patch: 001_add-main-makefile.full+lite.patch, allow passing of configure args. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 17 ++ .../patches/001_add-main-makefile.full+lite.patch | 22 +- ...omp_makefile-uninstall+autoconf.full+lite.patch | 74 +++++ .../012_nxcomp_makefile-uninstall.full+lite.patch | 63 ----- ...xcompext_makefile-uninstall+autoconf.full.patch | 64 +++++ .../013_nxcompext_makefile-uninstall.full.patch | 53 ---- ...compshad_makefile-uninstall+autoconf.full.patch | 70 +++++ .../014_nxcompshad_makefile-uninstall.full.patch | 61 ---- debian/patches/030_nx-X11_configure-args.full.diff | 51 ++++ debian/patches/031_nx-X11_parallel-make.full.diff | 294 ++++++++++++++++++++ .../patches/301_nx-X11_use-shared-libs.full.diff | 106 +++++++ debian/patches/series | 9 +- debian/rules | 2 +- 13 files changed, 694 insertions(+), 192 deletions(-) create mode 100644 debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch delete mode 100644 debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch create mode 100644 debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/013_nxcompext_makefile-uninstall.full.patch create mode 100644 debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/014_nxcompshad_makefile-uninstall.full.patch create mode 100644 debian/patches/030_nx-X11_configure-args.full.diff create mode 100644 debian/patches/031_nx-X11_parallel-make.full.diff create mode 100644 debian/patches/301_nx-X11_use-shared-libs.full.diff The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 35df3c1..31384cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,27 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, make build stanza work for nx-libs-full and nx-libs-lite. * Do not install libXinerama directly into /usr/lib/nx. Recommended method is installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of the Xinerama extension. + * Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for + macros. + * Enable parallel build for Debian package. + * Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing + Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...). + * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script + currently requires ,,full'' or ,,full+lite'' in the file name. + * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). + + [ Jan Engelhardt ] + * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of + configure args. + * Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args. + * Add patch: 031_nx-X11_parallel-make.diff, enable parallel make. + * Add patch: 301_nx-X11_use-shared-libs.full.diff, use shared libraries from + distribution rather then libs included in source tree. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index f101446..9f4351f 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -9,12 +9,12 @@ Last-Update: 2011-12-31 +#!/usr/bin/make -f + +%: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ ++ ${MAKE} -C nxcomp $@ ++ ${MAKE} -C nxproxy $@ + if test -d nx-X11; then \ -+ $(MAKE) -C nxcompext $@; \ -+ $(MAKE) -C nxcompshad; \ -+ $(MAKE) -C nx-X11 $@; \ ++ ${MAKE} -C nxcompext $@; \ ++ ${MAKE} -C nxcompshad; \ ++ ${MAKE} -C nx-X11 $@; \ + fi + +all: build @@ -23,20 +23,20 @@ Last-Update: 2011-12-31 + echo "No testing for NX (redistributed)" + +build-lite: -+ cd nxcomp && autoconf && ./configure && $(MAKE) -+ cd nxproxy && autoconf && ./configure && $(MAKE) ++ cd nxcomp && autoconf && ./configure && ${MAKE} ++ cd nxproxy && autoconf && ./configure && ${MAKE} + +build-full: +# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... + cd nxcomp && autoconf && ./configure + cd nxcompext && autoconf + cd nxcompshad && autoconf -+ cd nx-X11 && $(MAKE) World -+ cd nxproxy && autoconf && ./configure && $(MAKE) ++ cd nx-X11 && ${MAKE} World ++ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} + +build: + if ! test -d nx-X11; then \ -+ $(MAKE) build-lite; \ ++ ${MAKE} build-lite; \ + else \ -+ $(MAKE) build-full; \ ++ ${MAKE} build-full; \ + fi diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch new file mode 100644 index 0000000..fbeaa39 --- /dev/null +++ b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch @@ -0,0 +1,74 @@ +Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs + Provide install and uninstall functionality in nxcomp/Makefile. + . + Honor autoconf's libdir (and includedir, while at it). This is a + must-have for multiarch platforms like x86_64 et al where multiple + forms of libraries can be installed at the same time. +Forwarded: pending... +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- a/nxcomp/Makefile.in ++++ b/nxcomp/Makefile.in +@@ -64,10 +64,15 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + + # + # This should be autodetected. +@@ -264,12 +269,44 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)${libdir}/nx ++ ./mkinstalldirs $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3.* ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3 ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ diff --git a/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch deleted file mode 100644 index 36f1555..0000000 --- a/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Add install and uninstall stanzas to nxcomp/Makefile - Provide install and uninstall functionality in nxcomp/Makefile. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- nx-libs.orig/nxcomp/Makefile.in 2011-12-05 09:16:34.000000000 +0100 -+++ nx-libs/nxcomp/Makefile.in 2011-12-05 09:19:28.000000000 +0100 -@@ -68,6 +68,9 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -264,12 +267,44 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx -+ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) MD5.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3 -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.a -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXalert.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NX.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXmitshm.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXpack.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXproto.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXrender.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXvars.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/MD5.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch new file mode 100644 index 0000000..934973c --- /dev/null +++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch @@ -0,0 +1,64 @@ +Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs. + Provide install and uninstall functionality in nxcompext/Makefile. + . + Honor autoconf's libdir (and includedir, while at it). This is a + must-have for multiarch platforms like x86_64 et al where multiple + forms of libraries can be installed at the same time. +Forwarded: pending... +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -56,11 +56,15 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +- ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f + # + # This should be autodetected. + # +@@ -147,12 +151,33 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ ./mkinstalldirs $(DESTDIR)${libdir}/nx ++ ./mkinstalldirs $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.* ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h ++ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall.full.patch b/debian/patches/013_nxcompext_makefile-uninstall.full.patch deleted file mode 100644 index 97e4f03..0000000 --- a/debian/patches/013_nxcompext_makefile-uninstall.full.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompext/Makefile - Provide install and uninstall functionality in nxcompext/Makefile. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- nx-libs.orig/nxcompext/Makefile.in 2011-12-05 09:20:15.000000000 +0100 -+++ nx-libs/nxcompext/Makefile.in 2011-12-05 09:24:37.000000000 +0100 -@@ -60,7 +60,9 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -- -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - # - # This should be autodetected. - # -@@ -147,12 +149,33 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx -+ ./mkinstalldirs $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcompext.so.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h -+ $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlibint.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch new file mode 100644 index 0000000..d1a8c1e --- /dev/null +++ b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch @@ -0,0 +1,70 @@ +Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs + Provide install and uninstall functionality in nxcompshad/Makefile. + . + Honor autoconf's libdir (and includedir, while at it). This is a + must-have for multiarch platforms like x86_64 et al where multiple + forms of libraries can be installed at the same time. +Forwarded: pending... +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -74,10 +74,17 @@ + bindir = @bindir@ + man1dir = @mandir@/man1 + VPATH = @srcdir@ ++libdir = @libdir@ ++includedir = @includedir@ + + INSTALL = @INSTALL@ ++INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LINK = cp -av ++DESTDIR = ++RM_FILE = rm -f ++RM_DIR = rmdir -p --ignore-fail-on-non-empty + + # + # This should be autodetected. +@@ -178,12 +185,38 @@ + fi + touch depend.status + +-install: install.bin install.man ++install: install.bin install.lib install.man + + install.bin: + ++install.lib: all ++ $(INSTALL_DIR) $(DESTDIR)${libdir}/nx ++ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx ++ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx ++ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ + install.man: + ++uninstall: uninstall.bin uninstall.lib uninstall.man ++ ++uninstall.bin: ++ ++uninstall.lib: ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3.* ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3 ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so ++ $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a ++ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done ++ $(RM_DIR) $(DESTDIR)${libdir}/nx/ ++ $(RM_DIR) $(DESTDIR)${includedir}/nx/ ++ echo "Running ldconfig tool, this may take a while..." && ldconfig || true ++ ++uninstall.man: ++ + clean: + -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ + $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch deleted file mode 100644 index 1a78885..0000000 --- a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompshad/Makefile - Provide install and uninstall functionality in nxcompshad/Makefile. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -76,8 +76,13 @@ - VPATH = @srcdir@ - - INSTALL = @INSTALL@ -+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f -+RM_DIR = rmdir -p --ignore-fail-on-non-empty - - # - # This should be autodetected. -@@ -178,12 +183,38 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/nx -+ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) *.a $(DESTDIR)$(prefix)/lib/nx -+ $(INSTALL_DATA) *.h $(DESTDIR)$(prefix)/include/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3.* -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3 -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so -+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a -+ for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done -+ $(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/ -+ $(RM_DIR) $(DESTDIR)$(prefix)/include/nx/ -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/030_nx-X11_configure-args.full.diff b/debian/patches/030_nx-X11_configure-args.full.diff new file mode 100644 index 0000000..8304ca7 --- /dev/null +++ b/debian/patches/030_nx-X11_configure-args.full.diff @@ -0,0 +1,51 @@ +Description: Allow to pass in configure args. + Allow to pass in configure args. +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- + nx-X11/lib/X11/Imakefile | 6 ++++-- + nx-X11/programs/Xserver/Imakefile | 4 +++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +Index: nx-X11/lib/X11/Imakefile +=================================================================== +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h + + includes:: ks_tables.h + ++CONFIGURE=./configure ++ + #if NXLibraries + + $(NX_XCOMPCONFIGTARGET): + cd ../../../nxcomp && \ +- ./configure ++ ${CONFIGURE} + + $(NX_XCOMPEXTCONFIGTARGET): + cd ../../../nxcompext && \ +- ./configure ++ ${CONFIGURE} + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps + NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) + NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status + ++CONFIGURE=./configure ++ + $(NX_XSHADOWCONFIGTARGET): + cd $(NX_XSHADOWLIBDIR) && \ +- ./configure ++ ${CONFIGURE} + + #ifdef SunArchitecture + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) diff --git a/debian/patches/031_nx-X11_parallel-make.full.diff b/debian/patches/031_nx-X11_parallel-make.full.diff new file mode 100644 index 0000000..9f754d7 --- /dev/null +++ b/debian/patches/031_nx-X11_parallel-make.full.diff @@ -0,0 +1,294 @@ +Description: Enable parallel make + Restore ability to build things in parallel. + (${MAKE} must always appear in the rule directly, and not be + hidden through expansions of other variables to get this to work.) +Forward: pending +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-01-26 22:29:13.993994227 +0100 + +--- + nx-X11/Makefile | 64 +++++++++++++++++----------------- + nx-X11/config/imake/Makefile.ini | 1 + nx-X11/extras/Mesa/Makefile | 2 - + nx-X11/extras/Xpm/Makefile.noX | 1 + nx-X11/extras/drm/linux-core/Makefile | 4 +- + nx-X11/extras/drm/linux/Makefile | 4 +- + nx-X11/extras/ttf2pt1/Makefile | 4 +- + nx-X11/lib/X11/Imakefile | 12 ++---- + nx-X11/lib/X11/Imakefile.NX.original | 12 ++---- + nx-X11/programs/Xserver/Imakefile | 4 +- + 10 files changed, 60 insertions(+), 69 deletions(-) + +--- a/nx-X11/Makefile ++++ b/nx-X11/Makefile +@@ -32,8 +32,8 @@ + VERSPROG = $(CONFIGSRC)/util/printver.exe + + all: +- @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial +- @$(MAKE_CMD) $@ ++ @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial ++ @${MAKE} ${MAKE_OPTS} $@ + + all-initial: + @echo Please use make World, or on NT use nmake World.Win32. +@@ -57,8 +57,8 @@ + @date + @echo "" + @if [ -f xmakefile ]; then \ +- $(MAKE_CMD) -k distclean || \ +- $(MAKE_CMD) -k clean || \ ++ ${MAKE} ${MAKE_OPTS} -k distclean || \ ++ ${MAKE} ${MAKE_OPTS} -k clean || \ + $(RM) xmakefile; \ + fi + @if [ ! -f $(IRULESRC)/host.def ]; then \ +@@ -84,14 +84,14 @@ + # fi + cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean + $(MAKE) $(MFLAGS) Makefile.boot +- $(MAKE_CMD) $(MFLAGS) version.def ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def + $(MAKE) $(MFLAGS) Makefile.boot +- $(MAKE_CMD) $(MFLAGS) VerifyOS +- $(MAKE_CMD) $(MFLAGS) Makefiles +- $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean +- $(MAKE_CMD) $(MFLAGS) includes +- $(MAKE_CMD) $(MFLAGS) depend +- $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World + @echo "" + @date + @echo "" +@@ -153,15 +153,15 @@ + -if exist xmakefile.bak del xmakefile.bak + -if exist xmakefile ren xmakefile xmakefile.bak + $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) +- $(MAKE_CMD) $(MFLAGS) VerifyOS +- $(MAKE_CMD) $(MFLAGS) Makefiles +- $(MAKE_CMD) $(MFLAGS) clean ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) clean + cd $(CONFIGSRC)\util + $(MAKE) mkdirhier.exe + cd ..\.. +- $(MAKE_CMD) $(MFLAGS) includes +- $(MAKE_CMD) $(MFLAGS) depend +- $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS) ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend ++ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WIN32WORLDOPTS) + @echo : + @echo : + @echo Full build of $(RELEASE) complete. +@@ -197,33 +197,33 @@ + # a copy of every rule that might be invoked at top level + + clean: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + dangerous_strip_clean: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + distclean: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def + depend: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + Everything: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + external.ln: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + includes: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install.sdk: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install.ln: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install.man: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + install: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + Makefiles: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + man_keywords: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + tags: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ + VerifyOS: +- $(MAKE_CMD) $@ ++ ${MAKE} ${MAKE_OPTS} $@ +--- a/nx-X11/config/imake/Makefile.ini ++++ b/nx-X11/config/imake/Makefile.ini +@@ -21,7 +21,6 @@ + SHELL = /bin/sh + RM = rm -f + MV = mv +-MAKE = make + RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ + tags TAGS make.log + NPROC = 1 +--- a/nx-X11/extras/Mesa/Makefile ++++ b/nx-X11/extras/Mesa/Makefile +@@ -12,7 +12,7 @@ + + + doxygen: +- (cd doxygen ; make) ; \ ++ (cd doxygen ; ${MAKE}) ; \ + + clean: + @for dir in $(SUBDIRS) ; do \ +--- a/nx-X11/extras/Xpm/Makefile.noX ++++ b/nx-X11/extras/Xpm/Makefile.noX +@@ -32,7 +32,6 @@ + + SUBDIRS= lib sxpm cxpm + +-MAKE=make + MFLAGS=-f Makefile.noX + INSTALL= install -c + CURRENT_DIR=. +--- a/nx-X11/extras/drm/linux-core/Makefile ++++ b/nx-X11/extras/drm/linux-core/Makefile +@@ -176,7 +176,7 @@ + all: modules + + modules: includes +- make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules ++ ${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules + + ifeq ($(HEADERFROMBOOT),1) + +@@ -246,7 +246,7 @@ + rm -rf $(CLEANFILES) + + $(MODULE_LIST):: +- make DRM_MODULES=$@ modules ++ ${MAKE} DRM_MODULES=$@ modules + + # Build test utilities + +--- a/nx-X11/extras/drm/linux/Makefile ++++ b/nx-X11/extras/drm/linux/Makefile +@@ -184,7 +184,7 @@ + all: modules + + modules: includes +- make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules ++ ${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules + + ifeq ($(HEADERFROMBOOT),1) + +@@ -254,7 +254,7 @@ + rm -rf $(CLEANFILES) + + $(MODULE_LIST):: +- make DRM_MODULES=$@ modules ++ ${MAKE} DRM_MODULES=$@ modules + + # Build test utilities + +--- a/nx-X11/extras/ttf2pt1/Makefile ++++ b/nx-X11/extras/ttf2pt1/Makefile +@@ -158,8 +158,8 @@ + + clean: + rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core +- ( cd other && make clean; ) +- ( cd app/netscape && make clean; ) ++ ( cd other && ${MAKE} clean; ) ++ ( cd app/netscape && ${MAKE} clean; ) + + veryclean: clean + rm -f $(DOCS) $(MANS) +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -1161,21 +1161,17 @@ + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- gmake ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- gmake ++ ${MAKE} -C ../../../nxcompext + + #else + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- make ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- make ++ ${MAKE} -C ../../../nxcompext + + #endif + +--- a/nx-X11/lib/X11/Imakefile.NX.original ++++ b/nx-X11/lib/X11/Imakefile.NX.original +@@ -1159,21 +1159,17 @@ + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- gmake ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- gmake ++ ${MAKE} -C ../../../nxcompext + + #else + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +- cd $(NX_XCOMPLIBDIR) && \ +- make ++ ${MAKE} -C $(NX_XCOMPLIBDIR) + + $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +- cd ../../../nxcompext && \ +- make ++ ${MAKE} -C ../../../nxcompext + + #endif + +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1045,11 +1045,11 @@ + #ifdef SunArchitecture + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) + cd $(NX_XSHADOWLIBDIR) && \ +- gmake ++ ${MAKE} + #else + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) + cd $(NX_XSHADOWLIBDIR) && \ +- rm -f *.o && make ++ rm -f *.o && ${MAKE} + #endif + + ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/debian/patches/301_nx-X11_use-shared-libs.full.diff b/debian/patches/301_nx-X11_use-shared-libs.full.diff new file mode 100644 index 0000000..2001474 --- /dev/null +++ b/debian/patches/301_nx-X11_use-shared-libs.full.diff @@ -0,0 +1,106 @@ +Description: Use shared libraries + Many distributions have a policy to reduce code duplications. + One means to avoid such duplications is to use shared libraries + instead of using libs that are ofter shipped for convenience. + . + Fedora: + http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries + . + Debian (Section 10.7.4 of Debian policy): + http://www.debian.org/doc/debian-policy/ch-files.html +Forwarded: pending... +Author: Jan Engelhardt <jengelh(a)medozas.de> +Last-Update: 2012-02-14 +--- + nx-X11/config/cf/host.def | 11 ++++++----- + nx-X11/programs/Xserver/Imakefile | 6 +++--- + nx-X11/programs/nxauth/Imakefile | 2 +- + 3 files changed, 10 insertions(+), 9 deletions(-) + +Index: nx-X11/config/cf/host.def +=================================================================== +--- a/nx-X11/config/cf/host.def ++++ b/nx-X11/config/cf/host.def +@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildRenderLibrary YES + #define SharedLibFreetype2 YES + #define NormalLibFreetype2 YES +-#define FontLibSharedFreeType NO ++#define FontLibSharedFreeType YES + #endif + + /* +@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + * + #define XserverStaticFontLib NO + */ ++#define XserverStaticFontLib YES + + /* + * To enable binary compatibility with previous versions of the font +@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildXKB YES + #define BuildXKBlib YES + +-#define SharedLibXau NO ++#define SharedLibXau YES + + /* + * If you are running NetBSD 0.9C or later, and have the aperture driver +@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildXterm YES + */ + +-#define SharedLibXau NO ++#define SharedLibXau YES + +-#define SharedLibXdmcp NO ++#define SharedLibXdmcp YES + + #define BuildXaw7 YES + +@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + #define BuildFontServer NO + #define BuildFreeType NO + #define BuildXTrueType NO +-#define FontLibSharedFreeType NO ++#define FontLibSharedFreeType YES + #endif + + #if !defined(NXZaurusXServer) && defined(NXiPAQXServer) +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS + #if defined(SunArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp + #elif defined(cygwinArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ + -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ +- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst ++ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp + #else + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp + #endif + + #endif +Index: nx-X11/programs/nxauth/Imakefile +=================================================================== +--- a/nx-X11/programs/nxauth/Imakefile ++++ b/nx-X11/programs/nxauth/Imakefile +@@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakef + + INCLUDES=-I../../lib + DEPLIBS = $(DEPXAUTHLIB) +- LOCAL_LIBRARIES = ../../exports/lib/libXau.a ++ LOCAL_LIBRARIES = $(XAUTHLIB) + SRCS = xauth.c gethost.c process.c parsedpy.c + OBJS = xauth.o gethost.o process.o parsedpy.o + CONN_DEFINES = $(CONNECTION_FLAGS) diff --git a/debian/patches/series b/debian/patches/series index 9133bf6..8f1a388 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,9 +10,9 @@ 009_nxproxy-add-man-page.full+lite.patch 009_nxagent-add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.full.patch -012_nxcomp_makefile-uninstall.full+lite.patch -013_nxcompext_makefile-uninstall.full.patch -014_nxcompshad_makefile-uninstall.full.patch +012_nxcomp_makefile-uninstall+autoconf.full+lite.patch +013_nxcompext_makefile-uninstall+autoconf.full.patch +014_nxcompshad_makefile-uninstall+autoconf.full.patch 015_nxproxy_makefile-uninstall.full+lite.patch 016_nx-x11_install-location.full.patch 016_nx-X11_install-location.debian.patch @@ -23,6 +23,8 @@ 021_add-nxauth-wrapper.full.patch 022_add-nxproxy-wrapper.full+lite.patch 023_add-x2goagent-wrapper.full.patch +030_nx-X11_configure-args.full.diff +031_nx-X11_parallel-make.full.diff 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 102_xserver-xext_set-securitypolicy-path.debian.patch @@ -38,5 +40,6 @@ 202_nx-x11_enable-xinerama.full.patch 209_x2goagent-add-man-page.full.patch 300_nxagent_set-wm-class.full.patch +301_nx-X11_use-shared-libs.full.diff 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch diff --git a/debian/rules b/debian/rules index 520ed1a..4a4782d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ override_dh_clean: override_dh_auto_build: debian/pre-build-nx.sh - LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt + LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel debian/post-build-nx.sh override_dh_auto_install: 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: 3.99.0.6-14-gf6bd9af
by git-admin＠x2go.org 14 Feb '12

14 Feb '12

The branch, master has been updated via f6bd9af222fe65924c721de688c5efbb6f728db9 (commit) via 2e5ee710ffbcb0b03d95c9838d0ffa60d06ecaa1 (commit) via 373da1c16fb5cad8b9f4e77db2085b96f43270ad (commit) via 805d43099179261f2cdfce7b6554e4f254fd21a9 (commit) from f452167a04ac8ac5a9e24b19c6ddc6ddf58382fc (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 f6bd9af222fe65924c721de688c5efbb6f728db9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 13:30:59 2012 +0100 Fix for zh_TW translation: add qt_zh_TW.qm file from Qt4.8. commit 2e5ee710ffbcb0b03d95c9838d0ffa60d06ecaa1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 13:26:48 2012 +0100 Build .qm translation files on the fly during build. commit 373da1c16fb5cad8b9f4e77db2085b96f43270ad Author: Terje Andersen <teranders(a)gmail.com> Date: Tue Feb 14 13:25:58 2012 +0100 Add Norwegian (Bokmal) translation. Qt4 lacks Norwegian/Bokmal support, so some of the widgets may stay in English. commit 805d43099179261f2cdfce7b6554e4f254fd21a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 14 13:01:48 2012 +0100 remove i18n build cruft ----------------------------------------------------------------------- Summary of changes: Makefile | 2 + debian/changelog | 7 + qt_zh_tw.qm | Bin 0 -> 117253 bytes resources.rcc | 3 +- x2goclient.pro | 1 + x2goclient_de.qm | Bin 44873 -> 0 bytes x2goclient_fr.qm | 1 - x2goclient_de.ts => x2goclient_nb.ts | 1368 ++++++++++++++++++---------------- x2goclient_ru.qm | Bin 43127 -> 0 bytes x2goclient_zh_tw.qm | Bin 35103 -> 0 bytes 10 files changed, 757 insertions(+), 625 deletions(-) create mode 100644 qt_zh_tw.qm delete mode 100644 x2goclient_de.qm delete mode 100644 x2goclient_fr.qm copy x2goclient_de.ts => x2goclient_nb.ts (66%) delete mode 100644 x2goclient_ru.qm delete mode 100644 x2goclient_zh_tw.qm The diff of changes is: diff --git a/Makefile b/Makefile index 28dcf9c..5831516 100755 --- a/Makefile +++ b/Makefile @@ -28,10 +28,12 @@ all: build build: build_client build_plugin build_man build_client: + lrelease-qt4 x2goclient.pro mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: + lrelease-qt4 x2goclient.pro mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) diff --git a/debian/changelog b/debian/changelog index d2ffce9..2b6b39e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,13 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.1.0): - Update German translation file (thanks to Stefan Baur). + - Build .qm translation files on the fly during build. + - Fix for zh_TW translation: add qt_zh_TW.qm file from Qt4.8. + + [ Terje Andersen ] + * New upstream version (3.99.1.0): + - Add Norwegian (Bokmal) translation. Qt4 lacks Norwegian/Bokmal + support, so some of the widgets may stay in English. [ Jan Engelhardt ] * New upstream version (3.99.1.0): diff --git a/qt_zh_tw.qm b/qt_zh_tw.qm new file mode 100644 index 0000000..a9a25b2 Binary files /dev/null and b/qt_zh_tw.qm differ diff --git a/resources.rcc b/resources.rcc index 795cc0f..efdd47e 100644 --- a/resources.rcc +++ b/resources.rcc @@ -63,8 +63,9 @@ <file>txt/packs</file> <file>txt/encodings</file> <file>x2goclient_de.qm</file> - <file>x2goclient_ru.qm</file> <file>x2goclient_fr.qm</file> + <file>x2goclient_nb.qm</file> + <file>x2goclient_ru.qm</file> <file>x2goclient_zh_tw.qm</file> <file>qt_de.qm</file> <file>qt_ru.qm</file> diff --git a/x2goclient.pro b/x2goclient.pro index 8c71ee3..2e80e2a 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -14,6 +14,7 @@ FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmd TRANSLATIONS += x2goclient_de.ts TRANSLATIONS += x2goclient_ru.ts +TRANSLATIONS += x2goclient_nb.ts TRANSLATIONS += x2goclient_fr.ts TRANSLATIONS += x2goclient_zh_tw.ts HEADERS += configdialog.h \ diff --git a/x2goclient_de.qm b/x2goclient_de.qm deleted file mode 100644 index 03d7acc..0000000 Binary files a/x2goclient_de.qm and /dev/null differ diff --git a/x2goclient_fr.qm b/x2goclient_fr.qm deleted file mode 100644 index be651ee..0000000 --- a/x2goclient_fr.qm +++ /dev/null @@ -1 +0,0 @@ -<�d��!�`�� \ No newline at end of file diff --git a/x2goclient_de.ts b/x2goclient_nb.ts similarity index 66% copy from x2goclient_de.ts copy to x2goclient_nb.ts index 35202f3..d26bfc5 100644 --- a/x2goclient_de.ts +++ b/x2goclient_nb.ts @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de"> +<TS version="2.0" language="nb_NO"> <context> <name>BrokerPassDialogUi</name> <message> <location filename="brokerpassdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished">Dialog</translation> + <translation>Dialog</translation> </message> <message> <location filename="brokerpassdialog.ui" line="22"/> <source>Old password:</source> - <translation type="unfinished"></translation> + <translation>Gammelt passord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="36"/> <source>New password:</source> - <translation type="unfinished"></translation> + <translation>Nytt passord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="50"/> <source>Confirm password:</source> - <translation type="unfinished"></translation> + <translation>Bekreft passordet:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="79"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translatorcomment>hm... Am I supposed to translate this?</translatorcomment> + <translation>TestLabel</translation> </message> </context> <context> @@ -34,7 +35,7 @@ <message> <location filename="brokerpassdlg.cpp" line="41"/> <source>Passwords do not match</source> - <translation type="unfinished"></translation> + <translation>Passordene stemmer ikke</translation> </message> </context> <context> @@ -47,12 +48,12 @@ <message> <location filename="cupsprintwidget.cpp" line="68"/> <source>Printing</source> - <translation>Druckt</translation> + <translation>Skriver</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="71"/> <source>Stopped</source> - <translation>Angehalten</translation> + <translation>Stoppet</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="81"/> @@ -62,7 +63,7 @@ <message> <location filename="cupsprintwidget.cpp" line="81"/> <source>No</source> - <translation>Nein</translation> + <translation>Nei</translation> </message> <message> <location filename="cupsprintwidget.ui" line="19"/> @@ -72,12 +73,12 @@ <message> <location filename="cupsprintwidget.ui" line="25"/> <source>Name:</source> - <translation>Name:</translation> + <translation>Navn:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="42"/> <source>Properties</source> - <translation>Eigenschaften</translation> + <translation>Egenskaper</translation> </message> <message> <location filename="cupsprintwidget.ui" line="49"/> @@ -87,17 +88,17 @@ <message> <location filename="cupsprintwidget.ui" line="63"/> <source>Accepting jobs:</source> - <translation>Aufträge werden angenommen:</translation> + <translation>Aksepterer jobber:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="77"/> <source>Type:</source> - <translation>Typ:</translation> + <translation>Type:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="91"/> <source>Location:</source> - <translation>Adresse:</translation> + <translation>Plassering:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="105"/> @@ -124,6 +125,59 @@ </message> </context> <context> + <name>ConTest</name> + <message> + <location filename="contest.ui" line="14"/> + <source>Connectivity test</source> + <translation>Tilkoblings-test</translation> + </message> + <message> + <location filename="contest.ui" line="24"/> + <source>HTTPS connection:</source> + <translation>HTTPS tilkobling</translation> + </message> + <message> + <location filename="contest.ui" line="31"/> + <source>SSH connection:</source> + <translation>SSH tilkobling</translation> + </message> + <message> + <location filename="contest.ui" line="38"/> + <source>Connection speed:</source> + <translatorcomment>Due to the limited space in the UI dialog, I couldn't choose the "correct" word for speed here, so I had to choose a shorter one which isn't the best translation, but it will do.</translatorcomment> + <translation>Sambandsfart:</translation> + </message> + <message> + <location filename="contest.ui" line="123"/> + <location filename="contest.ui" line="167"/> + <source>Failed</source> + <translation>Feilet</translation> + </message> + <message> + <location filename="contest.ui" line="211"/> + <source>0 Kb/s</source> + <translation>0 Kb/s</translation> + </message> + <message> + <location filename="contest.cpp" line="108"/> + <location filename="contest.cpp" line="115"/> + <source>OK</source> + <translation>OK</translation> + </message> + <message> + <location filename="contest.cpp" line="150"/> + <source>Socket operation timed out</source> + <translatorcomment>Grr..! really hard to get this correctly translated, should rather keep the english words here, as we don't have any good ones for these in technical terms</translatorcomment> + <translation>Sokkel handlingen ble tidsavbrutt</translation> + </message> + <message> + <location filename="contest.cpp" line="162"/> + <location filename="contest.cpp" line="168"/> + <source>Failed: </source> + <translation>Feilet: </translation> + </message> +</context> +<context> <name>ConfigDialog</name> <message> <location filename="configdialog.cpp" line="87"/> @@ -240,7 +294,7 @@ </message> <message> <source>Clientside SSH Port For File System Export Usage:</source> - <translation type="obsolete">SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation> + <translation type="obsolete">SSH Port für die Dateisystemfreigabe auf Clientseite:</translation> </message> <message> <source>LDAP settings</source> @@ -280,7 +334,7 @@ <message> <location filename="configdialog.cpp" line="250"/> <source>Clientside SSH port for file system export usage:</source> - <translation>SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation> + <translation>SSH Port für die Dateisystemfreigabe auf Clientseite:</translation> </message> <message> <location filename="configdialog.cpp" line="50"/> @@ -501,7 +555,7 @@ </message> <message> <source>Use RSA/DSA key for ssh connection:</source> - <translation type="obsolete">RSA-/DSA-Schlüssel verwenden (ssh):</translation> + <translation type="obsolete">RSA/DSA Schlüssel verwenden (ssh):</translation> </message> <message> <source>&Desktop Session</source> @@ -641,7 +695,7 @@ </message> <message> <source>SSH Port:</source> - <translation type="obsolete">SSH-Port:</translation> + <translation type="obsolete">SSH Port:</translation> </message> <message> <source>Path to executable</source> @@ -666,7 +720,7 @@ </message> <message> <source>SSH port:</source> - <translation type="obsolete">SSH-Port:</translation> + <translation type="obsolete">SSH Port:</translation> </message> <message> <source>&Session type</source> @@ -727,7 +781,7 @@ <message> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation type="obsolete">Benutze Port-Weiterleitung über Tunnel + <translation type="obsolete">Benutze Port Weiterleitung über Tunnel um Audiosignale über Firewalls zu verbinden</translation> </message> <message> @@ -740,7 +794,7 @@ sound system connections through firewalls</source> </message> <message> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation type="obsolete">Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> + <translation type="obsolete">Benutze SSH Port Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> </message> <message> <source>New session</source> @@ -842,125 +896,127 @@ sound system connections through firewalls</source> <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="164"/> + <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> - <translation>de</translation> + <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment> + <translation>no</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> + <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> - <translation>pc105/de</translation> + <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment> + <translation>pc105/no</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="294"/> <location filename="httpbrokerclient.cpp" line="308"/> - <location filename="httpbrokerclient.cpp" line="345"/> + <location filename="httpbrokerclient.cpp" line="328"/> + <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> - <translation>Fehler</translation> + <translation>Feil</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="309"/> + <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> - <translation type="unfinished"></translation> + <translation>Innlogging feilet! Vennligst forsøk igjen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="433"/> + <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> <translation> Server benutzt ein ungültiges Zertifikat. </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="436"/> + <location filename="httpbrokerclient.cpp" line="457"/> <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>Sie sollten keine Ausnahme setzen, wenn Sie sich in einem Netzwerk befinden, dem sich nicht vertrauen oder wenn Sie für diese Verbindung bereits eine Ausnahme akzeptiert haben.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="441"/> + <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> <translation>Sichere Verbindung fehlgeschlagen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="446"/> + <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> <translation>Issued to: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="447"/> - <location filename="httpbrokerclient.cpp" line="459"/> + <location filename="httpbrokerclient.cpp" line="468"/> + <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> <translation>Common Name(CN) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="450"/> - <location filename="httpbrokerclient.cpp" line="462"/> + <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> <translation>Organization(O) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="453"/> - <location filename="httpbrokerclient.cpp" line="465"/> + <location filename="httpbrokerclient.cpp" line="474"/> + <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> <translation>Organizational Unit(OU) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="456"/> + <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> <translation>Serial Number </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="458"/> + <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> <translation>Issued by: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="469"/> + <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> <translation>Validity: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="470"/> + <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> <translation>Issued on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> <translation>expires on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="472"/> + <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> <translation>Fingerprints: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="473"/> + <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> <translation>SHA1 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="475"/> + <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> <translation>MD5 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="481"/> + <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> <translation>X2Go Client beenden</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="483"/> + <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> <translation>Ausnahme hinzufügen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="346"/> + <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> <translation>Die aktuelle Sitzung wurde unterbrochen. Um erneut Zugriff auf ihre Sitzung zu erhalten, kehren Sie zur Startseite zurück oder aktualisieren Sie die aktuelle Seite über den Browserbefehl "Aktuelle Seite neu laden".</translation> </message> @@ -968,246 +1024,250 @@ sound system connections through firewalls</source> <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="80"/> - <location filename="onmainwindow_part3.cpp" line="307"/> + <location filename="onmainwindow.cpp" line="84"/> + <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> - <translation>de</translation> + <translation>no</translation> </message> <message> - <location filename="onmainwindow.cpp" line="81"/> + <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> <message> - <location filename="onmainwindow.cpp" line="329"/> + <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> - <translation type="unfinished"></translation> + <translatorcomment>Need to double-check this one</translatorcomment> + <translation>Støtte ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="601"/> - <location filename="onmainwindow.cpp" line="1782"/> - <location filename="onmainwindow_part3.cpp" line="1636"/> + <location filename="onmainwindow.cpp" line="610"/> + <location filename="onmainwindow.cpp" line="1820"/> + <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> - <translation>Sitzung:</translation> + <translation>Sesjon:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="653"/> + <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> - <translation>&Beenden</translation> + <translation>&Avslutt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="654"/> + <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> - <translation>Strg+Q</translation> + <translation>Ctrl+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="655"/> - <location filename="onmainwindow.cpp" line="940"/> + <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> - <translation>Beenden</translation> + <translation>Avslutt</translation> </message> <message> <source>&New Session ...</source> <translation type="obsolete">&Neue Sitzung ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="659"/> + <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> - <translation>Strg+N</translation> + <translation>Ctrl+N</translation> </message> <message> <source>Session Management...</source> <translation type="obsolete">Sitzungsverwaltung...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="665"/> + <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> - <translation>Strg+E</translation> + <translation>Ctrl+E</translation> </message> <message> <source>LDAP &Settings ...</source> <translation type="obsolete">LDAP &Konfiguration ...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2052"/> + <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> - <translation>Wergzeugleiste wieder anzeigen</translation> + <translation>Gjenopprett verktøylinjen</translation> </message> <message> <source>About X2GO Client</source> - <translation type="obsolete">Über X2GoClient</translation> + <translation type="obsolete">Über X2GO Client</translation> </message> <message> - <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> - <translation>Über QT</translation> + <translation>Om QT</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2456"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> - <translation>Sitzung</translation> + <translation>Sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="715"/> + <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> - <translation>Strg +Q</translation> + <translation>Ctrl+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="721"/> + <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> - <translation>&Sitzung</translation> + <translation>&Sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="722"/> + <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> - <translation>&Einstellungen</translation> + <translation>&Innstillinger</translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> - <translation>&Hilfe</translation> + <translation>&Hjelp</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1423"/> + <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> - <translation>Password:</translation> + <translation>Passord:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1424"/> + <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> - <translation type="unfinished">Tastaturlayout:</translation> + <translation>Tastatur utseende:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1465"/> + <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1467"/> - <location filename="onmainwindow_part4.cpp" line="1756"/> - <location filename="onmainwindow_part4.cpp" line="1758"/> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> - <translation>Abbrechen</translation> + <translation>Avbryt</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2252"/> + <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="807"/> - <location filename="onmainwindow.cpp" line="830"/> - <location filename="onmainwindow.cpp" line="1471"/> - <location filename="onmainwindow.cpp" line="1499"/> - <location filename="onmainwindow.cpp" line="1507"/> - <location filename="onmainwindow.cpp" line="1640"/> - <location filename="onmainwindow.cpp" line="1667"/> - <location filename="onmainwindow.cpp" line="1670"/> - <location filename="onmainwindow.cpp" line="1917"/> - <location filename="onmainwindow.cpp" line="2140"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2167"/> - <location filename="onmainwindow.cpp" line="2201"/> - <location filename="onmainwindow.cpp" line="2246"/> - <location filename="onmainwindow_part2.cpp" line="297"/> - <location filename="onmainwindow_part2.cpp" line="473"/> - <location filename="onmainwindow_part2.cpp" line="482"/> - <location filename="onmainwindow_part2.cpp" line="781"/> - <location filename="onmainwindow_part2.cpp" line="1232"/> - <location filename="onmainwindow_part2.cpp" line="1293"/> - <location filename="onmainwindow_part2.cpp" line="1344"/> - <location filename="onmainwindow_part2.cpp" line="1377"/> - <location filename="onmainwindow_part2.cpp" line="1421"/> - <location filename="onmainwindow_part2.cpp" line="1801"/> - <location filename="onmainwindow_part2.cpp" line="1827"/> - <location filename="onmainwindow_part2.cpp" line="1958"/> + <translatorcomment>Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context.</translatorcomment> + <translation>Ugyldig svar fra megleren</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="820"/> + <location filename="onmainwindow.cpp" line="848"/> + <location filename="onmainwindow.cpp" line="1495"/> + <location filename="onmainwindow.cpp" line="1524"/> + <location filename="onmainwindow.cpp" line="1532"/> + <location filename="onmainwindow.cpp" line="1678"/> + <location filename="onmainwindow.cpp" line="1705"/> + <location filename="onmainwindow.cpp" line="1708"/> + <location filename="onmainwindow.cpp" line="1955"/> + <location filename="onmainwindow.cpp" line="2178"/> + <location filename="onmainwindow.cpp" line="2192"/> + <location filename="onmainwindow.cpp" line="2205"/> + <location filename="onmainwindow.cpp" line="2239"/> + <location filename="onmainwindow.cpp" line="2284"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> + <location filename="onmainwindow_part2.cpp" line="1830"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> - <location filename="onmainwindow_part3.cpp" line="768"/> - <location filename="onmainwindow_part3.cpp" line="848"/> - <location filename="onmainwindow_part3.cpp" line="1092"/> - <location filename="onmainwindow_part3.cpp" line="1220"/> - <location filename="onmainwindow_part3.cpp" line="1273"/> - <location filename="onmainwindow_part3.cpp" line="1579"/> - <location filename="onmainwindow_part3.cpp" line="1581"/> - <location filename="onmainwindow_part3.cpp" line="1811"/> - <location filename="onmainwindow_part3.cpp" line="1859"/> - <location filename="onmainwindow_part3.cpp" line="1887"/> - <location filename="onmainwindow_part3.cpp" line="2257"/> - <location filename="onmainwindow_part3.cpp" line="2272"/> - <location filename="onmainwindow_part3.cpp" line="2326"/> + <location filename="onmainwindow_part3.cpp" line="773"/> + <location filename="onmainwindow_part3.cpp" line="854"/> + <location filename="onmainwindow_part3.cpp" line="1098"/> + <location filename="onmainwindow_part3.cpp" line="1226"/> + <location filename="onmainwindow_part3.cpp" line="1279"/> + <location filename="onmainwindow_part3.cpp" line="1585"/> + <location filename="onmainwindow_part3.cpp" line="1587"/> + <location filename="onmainwindow_part3.cpp" line="1817"/> + <location filename="onmainwindow_part3.cpp" line="1865"/> + <location filename="onmainwindow_part3.cpp" line="1893"/> + <location filename="onmainwindow_part3.cpp" line="2263"/> + <location filename="onmainwindow_part3.cpp" line="2278"/> + <location filename="onmainwindow_part3.cpp" line="2332"/> <location filename="onmainwindow_part4.cpp" line="29"/> <location filename="onmainwindow_part4.cpp" line="54"/> - <location filename="onmainwindow_part4.cpp" line="1980"/> - <location filename="onmainwindow_part4.cpp" line="2251"/> + <location filename="onmainwindow_part4.cpp" line="2214"/> + <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> - <translation>Fehler</translation> + <translation>Feil</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2372"/> + <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2443"/> + <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> - <translation> on </translation> + <translation> på </translation> </message> <message> - <location filename="onmainwindow.cpp" line="776"/> - <location filename="onmainwindow.cpp" line="1775"/> - <location filename="onmainwindow_part3.cpp" line="1629"/> - <location filename="onmainwindow_part4.cpp" line="1422"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> - <translation>Benutzername:</translation> + <translation>Brukernavn:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1002"/> - <location filename="onmainwindow_part4.cpp" line="1752"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> - <translation>Wähle Sitzung:</translation> + <translation>Velg sesjon:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1754"/> + <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> - <translation>Fortfahren</translation> + <translation>Gjenoppta</translation> </message> <message> - <location filename="onmainwindow.cpp" line="479"/> - <location filename="onmainwindow.cpp" line="927"/> - <location filename="onmainwindow_part2.cpp" line="2200"/> - <location filename="onmainwindow_part4.cpp" line="1761"/> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> - <translation>Anhalten</translation> + <translatorcomment>I disagree with the word 'Suspend' here, if it was suspending then the session would be paused. As this is not the case, it's more like disconnect (and the counterpart: reconnect). I used the translation fro 'Disconnect' here, and will research the possibility of changing the Suspend word to Disconnect also in the english translation.</translatorcomment> + <translation>Koble fra</translation> </message> <message> - <location filename="onmainwindow.cpp" line="482"/> - <location filename="onmainwindow.cpp" line="928"/> - <location filename="onmainwindow_part4.cpp" line="1609"/> - <location filename="onmainwindow_part4.cpp" line="1763"/> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> - <translation>Beenden</translation> + <translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment> + <translation>Avslutte</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1766"/> + <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> - <translation>Neu</translation> + <translation>Ny</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2458"/> - <location filename="onmainwindow_part4.cpp" line="1833"/> - <location filename="onmainwindow_part4.cpp" line="1855"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> - <translation>Display</translation> + <translation>Skjerm</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1835"/> + <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1841"/> + <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> <translation>Server</translation> </message> @@ -1216,22 +1276,22 @@ sound system connections through firewalls</source> <translation type="obsolete">Startzeit</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> + <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> - <translation>Client IP</translation> + <translation>Klient IP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1018"/> - <location filename="onmainwindow_part2.cpp" line="1112"/> - <location filename="onmainwindow_part2.cpp" line="2164"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> <translation>aktiv</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1020"/> - <location filename="onmainwindow_part2.cpp" line="1305"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> - <translation>angehalten</translation> + <translation>Frakoblet</translation> </message> <message> <source>Unable to create Folder:</source> @@ -1242,157 +1302,159 @@ sound system connections through firewalls</source> <translation type="obsolete">Datei kann nicht geschrieben werden:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1985"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> - <translation>SSL Tunnel kann nicht erzeugt werden: + <translation>Klarer ikke å opprette SSL tunnel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1153"/> - <location filename="onmainwindow_part2.cpp" line="1173"/> - <location filename="onmainwindow_part2.cpp" line="1987"/> - <location filename="onmainwindow_part2.cpp" line="2376"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> - <translation>Warnung</translation> + <translation>Advarsel</translation> </message> <message> - <location filename="onmainwindow.cpp" line="143"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2148"/> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> - <translation>verbinde</translation> + <translation>kobler til</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2156"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> - <translation>starte</translation> + <translation>starter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2158"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> - <translation>aktiviere</translation> + <translation>gjenopptar</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2220"/> - <location filename="onmainwindow_part2.cpp" line="2488"/> - <location filename="onmainwindow_part2.cpp" line="2506"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> - <translation>Zeitüberschreitung</translation> + <translation>Tilkoblingen tidsavbrutt, avbryter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2221"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> - <translation>Abbruch</translation> + <translation>Avbryter</translation> </message> <message> <source>Session ID: Server: Username: Display: Creation Time: Status:</source> <translation type="obsolete">Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1608"/> + <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> - <translation>Abbruch</translation> + <translation>Avbryt</translation> </message> <message> <source>Show Details</source> <translation type="obsolete">Zeige Details</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="404"/> + <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> - <translation type="unfinished"></translation> + <translation> (kan ikke åpne filen)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="415"/> - <location filename="onmainwindow_part3.cpp" line="425"/> - <location filename="onmainwindow_part3.cpp" line="435"/> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> - <translation type="unfinished"></translation> + <translation> (filen finnes ikke)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="459"/> + <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> - <translation type="unfinished"></translation> + <translation> (mappen finnes ikke)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="487"/> + <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> - <translation>unerwarteter Wert "--link"</translation> + <translatorcomment>Chose to use 'parameteren' here, the direct translation is 'argument', but didn't fit in my opinion. The cmdline arguments, will they be translated as well?</translatorcomment> + <translation>ugyldig verdi for parameteren "--link"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="505"/> + <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> - <translation>unerwarteter Wert "--sound"</translation> + <translation>ugyldig verdi for parameteren "--sound"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="522"/> - <location filename="onmainwindow_part3.cpp" line="533"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> - <translation>unerwarteter Wert "--geometry"</translation> + <translation>ugyldig verdi for parameteren "--geometry"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="551"/> + <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> - <translation>unerwarteter Wert "--set-kbd"</translation> + <translation>ugyldig verdi for parameteren "--set-kbd"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="568"/> + <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> - <translation>unerwarteter Wert "--ldap"</translation> + <translation>ugyldig verdi for parameteren "--ldap"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="663"/> + <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> - <translation>unerwarteter Wert "--pack"</translation> + <translation>ugyldig verdi for parameteren "--pack"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="671"/> - <location filename="onmainwindow_part3.cpp" line="674"/> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> - <translation>unerwarteter Wert: </translation> + <translation>ugyldig parameter: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> - <translation>Liste aller Packmethoden:</translation> + <translation>Tilgjengelige pakkemetoder:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1511"/> + <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> - <translation type="unfinished"></translation> + <translatorcomment>Will have to revisit this one, not sure if it fits</translatorcomment> + <translation>Støtte</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1516"/> + <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1582"/> + <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> - <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation> + <translation>Vennligst sjekk LDAP innstillingene</translation> </message> <message> <source>no X2Go Server found in LDAP </source> - <translation type="obsolete">LDAP enthält keinen X2GoServer </translation> + <translation type="obsolete">LDAP enthält keinen X2Go Server </translation> </message> <message> <source>Are you sure you want to delete this Session?</source> <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="290"/> - <location filename="onmainwindow_part2.cpp" line="1286"/> - <location filename="onmainwindow_part2.cpp" line="1370"/> - <location filename="onmainwindow_part2.cpp" line="1403"/> - <location filename="onmainwindow_part3.cpp" line="761"/> - <location filename="onmainwindow_part3.cpp" line="841"/> - <location filename="onmainwindow_part3.cpp" line="1213"/> - <location filename="onmainwindow_part3.cpp" line="1266"/> - <location filename="onmainwindow_part3.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> + <location filename="onmainwindow_part3.cpp" line="766"/> + <location filename="onmainwindow_part3.cpp" line="847"/> + <location filename="onmainwindow_part3.cpp" line="1219"/> + <location filename="onmainwindow_part3.cpp" line="1272"/> + <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> - <translation>Verbindung fehlgeschlagen + <translation>Tilkoblingen feilet </translation> </message> <message> @@ -1400,26 +1462,26 @@ sound system connections through firewalls</source> <translation type="obsolete">es konnte kein Server gefunden werden</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1848"/> + <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> - <translation>Sitzungs ID</translation> + <translation>Sesjons ID</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1250"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> - <translation>anhalten</translation> + <translation>Kobler fra</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1272"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> - <translation>beende</translation> + <translation>Avslutter</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="196"/> <source>Connection failed : </source> - <translation>Verbindung fehlgeschlagen + <translation>Tilkoblingen feilet : </translation> </message> @@ -1453,34 +1515,37 @@ sound system connections through firewalls</source> <location filename="onmainwindow_part4.cpp" line="28"/> <source>Unable to read : </source> - <translation>Lesefehler: + <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment> + <translation>Klarer ikke å lese: </translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="53"/> <source>Unable to write : </source> - <translation>Schreibfehler: + <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment> + <translation>Klarer ikke å skrive: </translation> </message> <message> <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete">X2GoClient V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete">X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> - <translation>Falsches Passwort! </translation> + <translatorcomment>Should we actually tell that it's the password that's wrong? Isn't that considered bad practice in regards to security? I propose to use "Wrong Username or Password!" instead.</translatorcomment> + <translation>Feil passord! </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="590"/> + <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> - <translation>unerwarteter Wert "--ldap1"</translation> + <translation>ugyldig verdi for parameteren "--ldap1"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="609"/> + <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> - <translation>unerwarteter Wert "--ldap2"</translation> + <translation>ugyldig verdi for parameteren "--ldap2"</translation> </message> <message> <source>Usage: x2goclient [Options] @@ -1507,551 +1572,567 @@ sound system connections through firewalls</source> <translation type="obsolete">Usage: x2goclient [Options] Options: --help Print this message --help-pack Print availabel pack methods --no-menu Hide menu bar --maximize Start maximized --add-to-known-hosts Add RSA key fingerprint to .ssh/known_hosts if authenticity of server can't be established --ldap=<host:port:dn> Start with LDAP Support. Example: --ldap=ldapserver:389:o=organization,c=de --ldap1=<host:port> LDAP Failover Server #1 --ldap2=<host:port> LDAP Failover Server #2 --command=<cmd> Set default command, default value 'KDE' --sound=<0|1> Enable sound, default value '1' --geomerty=<W>x<H>|fullscreen Set default geometry, default value '800x600' --link=<modem|isdn|adsl|wan |lan> Set default link type, default 'lan' --pack=<packmethod> Set default pack method, default '16m-jpeg-9' --kbd-layout=<layout> Set default keyboard layout, default 'us' --kbd-type=<typed> Set default keyboard type, default 'pc105/us' --set-kbd=<0|1> Overwrite current keyboard settings, default '0'</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1888"/> + <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> - <translation>Datei konnte nicht erzeugt werden: </translation> + <translation>Klarer ikke å opprette filen: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1812"/> + <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> - <translation>Es wurde keine gültige Karte gefunden</translation> + <translation>Ingen gyldige kort ble funnet</translation> </message> <message> <source>This card is unknown by X2Go System</source> - <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation> + <translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="325"/> + <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> - <translation>&Konfiguration ...</translation> + <translatorcomment>Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions</translatorcomment> + <translation>&Innstillinger</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="719"/> - <location filename="onmainwindow_part3.cpp" line="745"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> - <translation>Einstellungen</translation> + <translatorcomment>Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first</translatorcomment> + <translation>Alternativer</translation> </message> <message> <source>Can't read host rsa key:</source> <translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2053"/> - <location filename="onmainwindow_part3.cpp" line="2078"/> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> - <translation>Verbindung zu X-Server konnte nicht hergestellt werden</translation> + <translation>Klarte ikke å koble til X-Serveren</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2054"/> - <location filename="onmainwindow_part3.cpp" line="2079"/> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> - <translation>Verbindung zu X-Server konnte nicht hergestellt werden -Überprüfen Sie Ihre Einstellungen</translation> + <translation>Klarte ikke å koble til X-Serveren +Vennligst sjekk innstillingene dine</translation> </message> <message> <source>Can't start X-Server</source> <translation type="obsolete">X-Server konnte nicht gestartet werden</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2087"/> + <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> - <translation>X-Server konnte nicht gestartet werden -Überprüfen Sie Ihre Einstellungen</translation> + <translation>Klarte ikke å starte X-Serveren +Vennligst sjekk instillingene dine</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1154"/> - <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <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>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem Verlust der ganzen Sitzung. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf </translation> + <translation>Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene vil du miste hele sesjonen. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> - <translation>24 oder 32</translation> + <translation>24 eller 32</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1163"/> - <location filename="onmainwindow_part2.cpp" line="1183"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation> bit zu ändern und den verwendeten X-server neu zu starten, bevor Sie sich mit der Sitzung verbinden. Trotzdem versuchen die Sitzung fortzuführen?</translation> + <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. Gjenoppta denne sesjonen uansett?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1167"/> - <location filename="onmainwindow_part2.cpp" line="1187"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> - <translation>Nein</translation> + <translation>Nei</translation> </message> <message> <source>X2Go Client V. </source> - <translation type="obsolete">X2GoClient V. </translation> + <translation type="obsolete">X2Go Client V. </translation> </message> <message> <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> - <translation></translation> + <translation>OpenOffice.org</translation> </message> <message> - <location filename="onmainwindow.cpp" line="153"/> + <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> - <translation></translation> + <translation>Terminal</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="409"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> - <translation>unbekannt</translation> + <translation>ukjent</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1837"/> + <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> - <translation>Befehl</translation> + <translation>Kommando</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1839"/> + <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> - <translation>Typ</translation> + <translation>Type</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> - <translation>Desktopumgebung</translation> + <translation>Skrivebord</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> - <translation>Anwendung</translation> + <translation>enkel applikasjon</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1030"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> - <translation></translation> + <translatorcomment>hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian</translatorcomment> + <translation>skygge sesjonen</translation> </message> <message> <source> Sudo configuration error</source> <translation type="obsolete"> Fehler in der Sudo Konfiguration</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2273"/> + <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> - <translation>Befehl konnte nicht ausgeführt werden:</translation> + <translation>Klarte ikke å utføre:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="126"/> + <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> - <translation></translation> + <translation>X2Go klient</translation> </message> <message> - <location filename="onmainwindow.cpp" line="150"/> + <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> - <translation>Webbrowser</translation> + <translation>Nettleser</translation> </message> <message> - <location filename="onmainwindow.cpp" line="151"/> + <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> - <translation>E-Mail-Programm</translation> + <translation>Epost program</translation> </message> <message> - <location filename="onmainwindow.cpp" line="658"/> + <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> - <translation>&Neue Sitzung ...</translation> + <translation>&Ny sesjon ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> - <translation>Sitzungsverwaltung...</translation> + <translation>Sesjonshåndtering...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="692"/> - <location filename="onmainwindow.cpp" line="713"/> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> - <translation>Zeige Wergzeugleiste</translation> + <translation>Vis verktøylinje</translation> </message> <message> - <location filename="onmainwindow.cpp" line="336"/> - <location filename="onmainwindow_part3.cpp" line="1536"/> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> - <translation>Über X2GoClient</translation> + <translation>Om X2GO klient</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1472"/> - <location filename="onmainwindow.cpp" line="1641"/> - <location filename="onmainwindow.cpp" line="1671"/> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> - <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation> + <translation>Vennligst sjekk LDAP innstillingene</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1506"/> + <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> - <translation>LDAP enthält keinen X2GoServer </translation> + <translation>Inge X2Go server ble funnet i LDAP </translation> </message> <message> - <location filename="onmainwindow.cpp" line="2065"/> + <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> - <translation>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> + <translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="764"/> - <location filename="onmainwindow_part3.cpp" line="844"/> - <location filename="onmainwindow_part3.cpp" line="1216"/> - <location filename="onmainwindow_part3.cpp" line="1269"/> - <location filename="onmainwindow_part3.cpp" line="2253"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> <source>Wrong password! </source> - <translation>Falsches Passwort! </translation> + <translation>Feil passord! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="474"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> - <translation>es konnte kein Server gefunden werden</translation> + <translation>Ingen tilgjengelig server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="923"/> - <location filename="onmainwindow_part2.cpp" line="2061"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <oldsource>Active connection</oldsource> - <translation>Nicht verbunden</translation> + <translation>Ikke tilkoblet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> - <translation>Startzeit</translation> + <translation>Opprettelsestidspunkt</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1799"/> - <location filename="onmainwindow_part3.cpp" line="1090"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> - <translation>Ordner kann nicht erzeugt werden:</translation> + <translation>Klarer ikke å opprette katalogen:</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="79"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>Vertsnøkkel for serveren har endret seg. +Den er nå: </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="80"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <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>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <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>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Serveren er ukjent. Stoler du på vertsnøkkelen? +Offentlig nøkkel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> - <translation type="unfinished">Host key verification failed</translation> + <translation>Verifiseringen av vertsnøkkelen feilet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> + <location filename="onmainwindow_part2.cpp" line="146"/> <source>Authentification failed</source> - <translation type="unfinished"></translation> + <translation>Pålogging feilet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="483"/> - <location filename="onmainwindow_part2.cpp" line="782"/> - <location filename="onmainwindow_part2.cpp" line="1233"/> - <location filename="onmainwindow_part2.cpp" line="1345"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> - <translation type="unfinished"></translation> + <translation>Serveren er ikke tilgjengelig</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1825"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> - <translation>Datei kann nicht geschrieben werden:</translation> + <translation>Klarer ikke å skrive til filen:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1956"/> - <location filename="onmainwindow_part3.cpp" line="2324"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> - <translation>SSL Tunnel kann nicht erzeugt werden: + <translation>Klarte ikke å opprette SSL tunnel: </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1600"/> + <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> - <translation>Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> + <translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment> + <translation>Sesjons ID: Server: Brukernavn: Skjerm: Opprettet: Status:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="476"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow_part4.cpp" line="1610"/> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> - <translation>Ordner freigeben...</translation> + <translation>Del mappe...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1612"/> + <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> - <translation>Zeige Details</translation> + <translation>Vis detailjer</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1537"/> + <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> - <translation>X2GoClient V. </translation> + <translation>X2Go klient v. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1860"/> + <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> - <translation>Diese Karte ist dem X2Go-System unbekannt</translation> + <translatorcomment>Need to double-check if the translation of "card" is suitable here</translatorcomment> + <translation>Dette kortet er ukjent for X2Go systemet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2289"/> + <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> - <translation>Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel -Bitte installieren sie eine neuere Version von x2goserver</translation> + <translation>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel +Vennligst oppdater til en nyere x2goserver pakke</translation> </message> <message> - <location filename="onmainwindow.cpp" line="675"/> + <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> - <translation>&Desktopsymbol erzeugen...</translation> + <translation>&Opprett sesjonsikon på skrivebordet...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> + <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> - <translation type="unfinished"></translation> + <translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment> + <translation>&Sett megler passord...</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation>&Tilkoblings-test...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> + <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> - <translation type="unfinished"></translation> + <translation>Handlingen feilet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> - <translation type="unfinished"></translation> + <translation>Passordet er endret</translation> </message> <message> - <location filename="onmainwindow.cpp" line="830"/> + <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> - <translation type="unfinished"></translation> + <translation>Feil passord!</translation> </message> <message> - <location filename="onmainwindow.cpp" line="879"/> + <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> - <translation type="unfinished"></translation> + <translation>Autentisering</translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> + <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> - <translation>Wiederherstellen</translation> + <translation>Gjenopprett</translation> </message> <message> - <location filename="onmainwindow.cpp" line="951"/> + <location filename="onmainwindow.cpp" line="969"/> <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>Linke Maustaste: verstecken/wiederherstellen - rechte Maustaste: Kontextmenü</translation> + <translatorcomment>According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny"</translatorcomment> + <translation>Venstre museknapp for å skjule/gjenopprette - Høyre museknapp viser sprettoppmeny</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1805"/> + <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> - <translation>Desktopsymbol erzeugen</translation> + <translation>Opprett sesjonsikon på skrivebordet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1806"/> + <location filename="onmainwindow.cpp" line="1844"/> <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>Der Aufruf über Desktopsymbole kann erfolgen, ohne dass der X2GoClient sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Loginvorgang über einen GPG-Schlüssel oder eine GPG-Smartcard konfiguriert haben. + <translation>Skrivebordsikoner kan konfigureres til å ikke vise x2goklient (skjult modus). Om du ønsker å benytte denne muligheten må du konfigurere pålogging ved bruk av en GPG-nøkkel, eller et GPG basert smartkort. -Wollen Sie den versteckten Modus nutzen?</translation> +Ønsker du å aktivere skjult modus for x2goklient?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1817"/> + <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> - <translation>Neue Sitzung</translation> + <translation>Ny sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1917"/> + <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> - <translation type="unfinished"></translation> + <translation>X2Go sesjoner ble ikke funnet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2431"/> + <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> - <translation>RDP Verbindung</translation> + <translation>RDP tilkobling</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1867"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> - <translation></translation> + <translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment> + <translation>X2Go kobling til sesjon </translation> </message> <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow_part4.cpp" line="1054"/> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> - <translation>Fenster abkoppeln</translation> + <translation>Løsne X2Go vindu</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1930"/> - <location filename="onmainwindow_part4.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> - <translation>Fenster einbetten</translation> + <translation>Feste X2Go vindu</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2133"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> - <translation>Beendet</translation> + <translation>Ferdig</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2377"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> - <translation>Die Sitzung wird beendet. Sind Sie sicher? Ungespeicherte Dokumente gehen verloren</translation> + <translation>Er du sikker på at du vil avslutte denne sesjonen? +Ulagrede data vil gå tapt</translation> </message> <message> <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <location filename="onmainwindow_part3.cpp" line="2101"/> + <location filename="onmainwindow_part3.cpp" line="2107"/> <location filename="onmainwindow_part4.cpp" line="422"/> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server Please check your installation</source> - <translation>X-Server lässt sich nicht starten. -Bitte überprüfen Sie Ihre Installation</translation> + <translation>Klarer ikke å starte X Serveren +Vennligst sjekk din installasjon</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1118"/> + <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> - <translation>X2Go-Sitzung</translation> + <translation>X2Go sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow_part4.cpp" line="2064"/> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> - <translation>Symbole verstecken</translation> + <translation>Minimer verktøylinje</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2097"/> + <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> - <translation> &nbsp;&nbsp;&nbsp;zum Wiederherstellen&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;der Werkzeugleiste&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;hier klicken&nbsp;&nbsp;&nbsp; </translation> + <translation> &nbsp;&nbsp;&nbsp;Trykk her&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp; </translation> </message> <message> <source>Can't open config file: </source> <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1981"/> + <location filename="onmainwindow_part4.cpp" line="2215"/> <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>SSHD konnte nicht gefunden werden. SSHD wird für Dateifreigaben und Druck benötigt. -Sie können SSHD über folgenden Befehl installieren: + <translation>sshd er ikke startet og du trenger denne for skriver- og fildeling. +Du kan installere sshd med: sudo apt-get install openssh-server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2439"/> + <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> - <translation>Zugriff auf lokalen Desktop</translation> + <translation>Tilkobling til lokalt skrivebord</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1063"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> - <translation>Hinweis</translation> + <translation>Informasjon</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1077"/> - <location filename="onmainwindow_part4.cpp" line="2165"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1084"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> - <translation>Desktopauswahl:</translation> + <translation>Velg skrivebord:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1772"/> + <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> - <translation>Nur betrachten</translation> + <translation>Kun vis</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1852"/> + <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> - <translation>Benutzer</translation> + <translation>Bruker</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2435"/> + <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1064"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> - <translation>Kein freigegebener Desktop gefunden</translation> + <translation>Ingen tilgjengelige skrivebord ble funnet</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1769"/> + <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> - <translation>Vollzugriff</translation> + <translation>Full tilgang</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1883"/> + <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> - <translation>Nur eigene Desktops</translation> + <translation>Kun mine skrivebord</translation> </message> <message> - <location filename="onmainwindow.cpp" line="484"/> + <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> - <translation>Neu verbinden</translation> + <translation>Gjenoppkoble</translation> </message> <message> - <location filename="onmainwindow.cpp" line="834"/> - <location filename="onmainwindow.cpp" line="2354"/> - <location filename="onmainwindow_part4.cpp" line="2234"/> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> <source>Connecting to broker</source> - <translation>Verbinden mit Broker</translation> + <translation>Koble til megleren</translation> </message> <message> <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="obsolete"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1520"/> + <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> - <translation> x2goplugin Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> + <translation> x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1524"/> + <location filename="onmainwindow_part3.cpp" line="1530"/> <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 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> - <translation> 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> + <translation> 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> <location filename="onmainwindow_part4.cpp" line="141"/> @@ -2064,13 +2145,13 @@ Sie können SSHD über folgenden Befehl installieren: <translation>ISO8859-1</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1300"/> + <location filename="onmainwindow_part4.cpp" line="1534"/> <source>wrong value for argument"speed"</source> <translation>wrong value for argument"speed"</translation> </message> <message> <source>application/x2go:x2go:Configuration File for X2Go Session</source> - <translation type="obsolete">application/x2go:x2go:Konfigurationsdatei für eine X2Go-Sitzung</translation> + <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation> </message> </context> <context> @@ -2093,7 +2174,7 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="printdialog.ui" line="16"/> <source>Print - X2Go client</source> - <translation>Drucken - X2GoClient</translation> + <translation>Drucken - X2Go Client</translation> </message> </context> <context> @@ -2298,31 +2379,40 @@ Beispiel: <translation type="obsolete">Aktiviere Audiounterstützung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="270"/> + <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="312"/> + <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="sessionbutton.cpp" line="383"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="635"/> + <location filename="sessionbutton.cpp" line="385"/> + <location filename="sessionbutton.cpp" line="402"/> + <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> <translation>Vollbild</translation> </message> <message> - <location filename="sessionbutton.cpp" line="417"/> - <location filename="sessionbutton.cpp" line="547"/> + <location filename="sessionbutton.cpp" line="389"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="416"/> + <location filename="sessionbutton.cpp" line="669"/> + <location filename="sessionbutton.cpp" line="672"/> + <source>Display </source> + <translation>Skjerm </translation> + </message> + <message> + <location filename="sessionbutton.cpp" line="445"/> + <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> <translation>aktiviert</translation> </message> <message> - <location filename="sessionbutton.cpp" line="419"/> - <location filename="sessionbutton.cpp" line="549"/> + <location filename="sessionbutton.cpp" line="447"/> + <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> <translation>deaktiviert</translation> </message> @@ -2331,74 +2421,75 @@ Beispiel: <translation type="obsolete">/usr/bin/startkde</translation> </message> <message> - <location filename="sessionbutton.cpp" line="390"/> - <location filename="sessionbutton.cpp" line="409"/> + <location filename="sessionbutton.cpp" line="397"/> + <location filename="sessionbutton.cpp" line="437"/> <source>window</source> <translation>Fenster</translation> </message> <message> - <location filename="sessionbutton.cpp" line="114"/> + <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> <translation>Sitzungseinstellungen...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="118"/> + <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> <translation>Desktopsymbol erzeugen...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="123"/> + <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> <translation>Sitzung entfernen</translation> </message> <message> - <location filename="sessionbutton.cpp" line="136"/> + <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> <translation>Optionen</translation> </message> <message> - <location filename="sessionbutton.cpp" line="137"/> + <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> <translation>Typ</translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> + <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> <translation>Auflösung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="140"/> + <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> <translation>Sound</translation> </message> <message> - <location filename="sessionbutton.cpp" line="275"/> + <location filename="sessionbutton.cpp" line="277"/> <source>running</source> - <translation type="unfinished">aktiv</translation> + <translation>aktiv</translation> </message> <message> - <location filename="sessionbutton.cpp" line="279"/> + <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> - <translation type="unfinished">angehalten</translation> + <translatorcomment>I think the correct english word here (as best describes the function) would be 'disconnected'. The session isn't paused (=suspended), so I think it's the wrong word.</translatorcomment> + <translation>frakoblet</translation> </message> <message> - <location filename="sessionbutton.cpp" line="323"/> - <location filename="sessionbutton.cpp" line="355"/> - <location filename="sessionbutton.cpp" line="588"/> + <location filename="sessionbutton.cpp" line="325"/> + <location filename="sessionbutton.cpp" line="357"/> + <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> <translation>RDP Verbindung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="325"/> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="582"/> + <location filename="sessionbutton.cpp" line="327"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="sessionbutton.cpp" line="324"/> - <location filename="sessionbutton.cpp" line="361"/> - <location filename="sessionbutton.cpp" line="594"/> + <location filename="sessionbutton.cpp" line="326"/> + <location filename="sessionbutton.cpp" line="363"/> + <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> @@ -2488,12 +2579,12 @@ Beispiel: <message> <location filename="sessionwidget.cpp" line="89"/> <source>SSH port:</source> - <translation>SSH-Port:</translation> + <translation>SSH Port:</translation> </message> <message> <location filename="sessionwidget.cpp" line="101"/> <source>Use RSA/DSA key for ssh connection:</source> - <translation>RSA-/DSA-Schlüssel verwenden (ssh):</translation> + <translation>RSA/DSA Schlüssel verwenden (ssh):</translation> </message> <message> <location filename="sessionwidget.cpp" line="107"/> @@ -2501,109 +2592,114 @@ Beispiel: <translation>Anmeldung über voreingestellten SSH-Schlüssel oder ssh-agent</translation> </message> <message> - <location filename="sessionwidget.cpp" line="111"/> + <location filename="sessionwidget.cpp" line="108"/> + <source>Kerberos 5 (GSSAPI) authentication</source> + <translation>Kerberos 5 (GSSAPI) autentisering</translation> + </message> + <message> + <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> <translation>&Sitzungsart</translation> </message> <message> - <location filename="sessionwidget.cpp" line="116"/> + <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> <translation>Sitzungsart:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="125"/> - <location filename="sessionwidget.cpp" line="292"/> + <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> <translation>Verbindung mit Windows Terminalserver herstellen</translation> </message> <message> - <location filename="sessionwidget.cpp" line="128"/> + <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> <translation>Andere Desktopumgebung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="129"/> + <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> <translation>Anwendung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> - <location filename="sessionwidget.cpp" line="248"/> + <location filename="sessionwidget.cpp" line="133"/> + <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> <translation>Befehl:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="132"/> + <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> <translation>Erweiterte Einstellungen...</translation> </message> <message> - <location filename="sessionwidget.cpp" line="143"/> - <location filename="sessionwidget.cpp" line="420"/> - <location filename="sessionwidget.cpp" line="482"/> + <location filename="sessionwidget.cpp" line="145"/> + <location filename="sessionwidget.cpp" line="429"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> <translation>Pfad zum Programm</translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> <translation>Öffne Bild</translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> <translation>Bilder</translation> </message> <message> - <location filename="sessionwidget.cpp" line="215"/> + <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> <translation>Öffne Schlüssel</translation> </message> <message> - <location filename="sessionwidget.cpp" line="217"/> + <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="sessionwidget.cpp" line="269"/> - <location filename="sessionwidget.cpp" line="384"/> + <location filename="sessionwidget.cpp" line="273"/> + <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> <translation>Server:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="293"/> + <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> <translation>rdesktop Kommandozeilenoptionen:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="306"/> - <location filename="sessionwidget.cpp" line="404"/> + <location filename="sessionwidget.cpp" line="310"/> + <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="sessionwidget.cpp" line="275"/> - <location filename="sessionwidget.cpp" line="392"/> + <location filename="sessionwidget.cpp" line="279"/> + <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> <translation>XDMCP Server:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> + <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="sessionwidget.cpp" line="227"/> + <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="sessionwidget.cpp" line="228"/> + <location filename="sessionwidget.cpp" line="232"/> <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>x2goclient befindet sich im portablen Ausführungsmodus. Wenn Sie einen Pfad ausserhalb des USB Geräts wählen, können sie auf die Daten nicht von überall aus zugreifen.</translation> </message> @@ -2611,112 +2707,132 @@ Beispiel: <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="33"/> - <location filename="settingswidget.cpp" line="37"/> + <location filename="settingswidget.cpp" line="40"/> + <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> <translation>&Display</translation> </message> <message> - <location filename="settingswidget.cpp" line="34"/> - <location filename="settingswidget.cpp" line="38"/> + <location filename="settingswidget.cpp" line="41"/> + <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> <translation>&Tastatur</translation> </message> <message> - <location filename="settingswidget.cpp" line="35"/> - <location filename="settingswidget.cpp" line="39"/> + <location filename="settingswidget.cpp" line="42"/> + <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> <translation>Audio</translation> </message> <message> - <location filename="settingswidget.cpp" line="50"/> + <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> <translation>Vollbild</translation> </message> <message> - <location filename="settingswidget.cpp" line="52"/> + <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> <translation>Eigener</translation> </message> <message> - <location filename="settingswidget.cpp" line="54"/> + <location filename="settingswidget.cpp" line="61"/> <source>Window</source> <translation>Fenster</translation> </message> <message> - <location filename="settingswidget.cpp" line="61"/> + <location filename="settingswidget.cpp" line="63"/> + <source>Use whole display</source> + <translation>Benytt hele skjermen</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> - <translation>Auflösung festlegen (DPI)</translation> + <translation>DPI Auflösung festlegen</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="76"/> + <source>Xinerama extension (support for two or more physical displays)</source> + <translation>Xinerama utvidelsen (støtte for to, eller flere fysiske skjermer)</translation> </message> <message> - <location filename="settingswidget.cpp" line="79"/> + <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> <translation>Breite:</translation> </message> <message> - <location filename="settingswidget.cpp" line="82"/> + <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> <translation>Höhe:</translation> </message> <message> - <location filename="settingswidget.cpp" line="101"/> + <location filename="settingswidget.cpp" line="102"/> + <source>&Display:</source> + <translation>&Skjerm:</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="104"/> + <source>&Identify all displays</source> + <translation>&Identifiser alle skjermer</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> <translation>Tastaturlayout behalten</translation> </message> <message> - <location filename="settingswidget.cpp" line="111"/> + <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> <translation>Tastaturlayout:</translation> </message> <message> - <location filename="settingswidget.cpp" line="113"/> + <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> <translation>Tastatur:</translation> </message> <message> - <location filename="settingswidget.cpp" line="124"/> + <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> <translation>Audiounterstützung aktivieren</translation> </message> <message> - <location filename="settingswidget.cpp" line="133"/> + <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> <translation>Starte Sound Server</translation> </message> <message> - <location filename="settingswidget.cpp" line="135"/> + <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> <translation>Benutze existierenden Sound Server</translation> </message> <message> - <location filename="settingswidget.cpp" line="137"/> + <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation>Benutze Port-Weiterleitung über Tunnel + <translation>Benutze Port Weiterleitung über Tunnel um Audiosignale über Firewalls zu verbinden</translation> </message> <message> - <location filename="settingswidget.cpp" line="139"/> + <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> <translation>Benutze standard Audio Port</translation> </message> <message> - <location filename="settingswidget.cpp" line="146"/> + <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> <translation>Audio Port:</translation> </message> <message> - <location filename="settingswidget.cpp" line="173"/> + <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> <translation>Clientseitige Druckunterstützung</translation> </message> <message> - <location filename="settingswidget.cpp" line="440"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation>de</translation> </message> <message> - <location filename="settingswidget.cpp" line="441"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> @@ -2757,7 +2873,7 @@ sound system connections through firewalls</source> <message> <location filename="sharewidget.cpp" line="95"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> + <translation>Benutze SSH Port Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> </message> <message> <location filename="sharewidget.cpp" line="158"/> @@ -2805,97 +2921,100 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="100"/> + <location filename="sshmasterconnection.cpp" line="117"/> <source>Can not initialize libssh</source> - <translation type="unfinished"></translation> + <translatorcomment>I need to revisit the word 'initiere', a better word could be 'klargjøre'</translatorcomment> + <translation>Klarer ikke å initiere libssh</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="120"/> + <location filename="sshmasterconnection.cpp" line="137"/> <source>Can not create ssh session</source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å opprette ssh sesjon</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="135"/> + <location filename="sshmasterconnection.cpp" line="152"/> <source>Can not connect to </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å koble til </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="171"/> + <location filename="sshmasterconnection.cpp" line="193"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>Autentisering feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="209"/> <source>channel_forward_listen failed</source> - <translation type="unfinished"></translation> + <translatorcomment>I'm not sure if this is a static variable which shouldn't be translated or not, but I left it as I believe it's a variable.</translatorcomment> + <translation>channel_forward_listen feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="498"/> + <location filename="sshmasterconnection.cpp" line="523"/> <source>Can not open file </source> - <translation type="unfinished"></translation> + <translation>Kan ikke åpne filen </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="510"/> + <location filename="sshmasterconnection.cpp" line="535"/> <source>Can not create remote file </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å opprette fil over nettverket </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="523"/> + <location filename="sshmasterconnection.cpp" line="548"/> <source>Can not write to remote file </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å skrive til filen over nettverket </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="573"/> + <location filename="sshmasterconnection.cpp" line="598"/> <source>can not connect to </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å koble til </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="682"/> + <location filename="sshmasterconnection.cpp" line="707"/> <source>channel_open_forward failed</source> - <translation type="unfinished"></translation> + <translation>channel_open_forward feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="726"/> <source>channel_open_session failed</source> - <translation type="unfinished"></translation> + <translation>channel_open_session feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="708"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_request_exec failed</source> - <translation type="unfinished"></translation> + <translation>channel_request_exec feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="773"/> + <location filename="sshmasterconnection.cpp" line="798"/> <source>error writing to socket</source> - <translation type="unfinished"></translation> + <translatorcomment>Really not any great words to best translate socket into...</translatorcomment> + <translation>feil ved skriving til sokkelen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="791"/> + <location filename="sshmasterconnection.cpp" line="816"/> <source>error reading channel</source> - <translation type="unfinished"></translation> + <translation>feil under lesing av kanalen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="821"/> + <location filename="sshmasterconnection.cpp" line="846"/> <source>channel_write failed</source> - <translation type="unfinished"></translation> + <translation>channel_write feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="833"/> + <location filename="sshmasterconnection.cpp" line="858"/> <source>error reading tcp socket</source> - <translation type="unfinished"></translation> + <translation>feil ved lesing av tcp sokkelen</translation> </message> </context> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> - <translation type="unfinished"></translation> + <translation>feil under opprettelse av sokkelen</translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> - <translation type="unfinished"></translation> + <translation>Feil ved binding </translation> </message> </context> <context> @@ -2903,12 +3022,12 @@ sound system connections through firewalls</source> <message> <location filename="xsettingswidget.cpp" line="50"/> <source>Open File</source> - <translation type="unfinished"></translation> + <translation>Åpne fil</translation> </message> <message> <location filename="xsettingswidget.cpp" line="52"/> <source>Executable (*.exe)</source> - <translation type="unfinished"></translation> + <translation>Programfil (*.exe)</translation> </message> </context> <context> @@ -2916,62 +3035,65 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="14"/> <source>Form</source> - <translation type="unfinished">Form</translation> + <translation>Skjema</translation> </message> <message> <location filename="xsettingsui.ui" line="27"/> <source>You must restart the X2Go Client for the changes to take effect</source> - <translation type="unfinished"></translation> + <translation>Du må restarte X2Go klienten for at endringene skal tre i kraft</translation> </message> <message> <location filename="xsettingsui.ui" line="50"/> <source>use integrated X-Server</source> - <translation type="unfinished"></translation> + <translation>Benytt integrert X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="60"/> <source>use custom X-Server</source> - <translation type="unfinished"></translation> + <translation>Benytt egentilpasset X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="70"/> <source>custom X-Server</source> - <translation type="unfinished"></translation> + <translation>egentilpasset X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="78"/> <source>executable:</source> - <translation type="unfinished"></translation> + <translation>programfil:</translation> </message> <message> <location filename="xsettingsui.ui" line="101"/> <source>start X-Server on X2Go client start</source> - <translation type="unfinished"></translation> + <translation>start X-Serveren når X2Go klienten startes</translation> </message> <message> <location filename="xsettingsui.ui" line="113"/> <source>command line options:</source> - <translation type="unfinished"></translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>kommandolinjevalg</translation> </message> <message> <location filename="xsettingsui.ui" line="125"/> <source>X-Server command line options</source> - <translation type="unfinished"></translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>X-Server kommandolinjevalg</translation> </message> <message> <location filename="xsettingsui.ui" line="131"/> <source>window mode:</source> - <translation type="unfinished"></translation> + <translation>Vindus-modus:</translation> </message> <message> <location filename="xsettingsui.ui" line="141"/> <source>fullscreen mode:</source> - <translation type="unfinished"></translation> + <translation>fullskjerm-modus:</translation> </message> <message> <location filename="xsettingsui.ui" line="151"/> <source>single application:</source> - <translation type="unfinished"></translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>enkeltapplikasjon:</translation> </message> </context> <context> diff --git a/x2goclient_ru.qm b/x2goclient_ru.qm deleted file mode 100644 index 1dd3769..0000000 Binary files a/x2goclient_ru.qm and /dev/null differ diff --git a/x2goclient_zh_tw.qm b/x2goclient_zh_tw.qm deleted file mode 100644 index 89a9d60..0000000 Binary files a/x2goclient_zh_tw.qm and /dev/null differ 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: 3.99.0.6-11-g4f27b80
by git-admin＠x2go.org 14 Feb '12

14 Feb '12

The branch, master has been updated via 4f27b809fe041281db3442ad0d87df4c494e21a4 (commit) from f452167a04ac8ac5a9e24b19c6ddc6ddf58382fc (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 4f27b809fe041281db3442ad0d87df4c494e21a4 Author: Terje Andersen <teranders(a)gmail.com> Date: Tue Feb 14 12:44:28 2012 +0100 Add Norwegian (Bokmal) translation. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + x2goclient.pro | 1 + x2goclient_de.ts => x2goclient_nb.ts | 1368 ++++++++++++++++++---------------- 3 files changed, 750 insertions(+), 623 deletions(-) copy x2goclient_de.ts => x2goclient_nb.ts (66%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d2ffce9..df3cb30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.1.0): - Update German translation file (thanks to Stefan Baur). + [ Terje Andersen ] + * New upstream version (3.99.1.0): + - Add Norwegian (Bokmal) translation. + [ Jan Engelhardt ] * New upstream version (3.99.1.0): - Use /cgi-bin/man/ path in web'ified man pages. diff --git a/x2goclient.pro b/x2goclient.pro index 8c71ee3..2e80e2a 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -14,6 +14,7 @@ FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmd TRANSLATIONS += x2goclient_de.ts TRANSLATIONS += x2goclient_ru.ts +TRANSLATIONS += x2goclient_nb.ts TRANSLATIONS += x2goclient_fr.ts TRANSLATIONS += x2goclient_zh_tw.ts HEADERS += configdialog.h \ diff --git a/x2goclient_de.ts b/x2goclient_nb.ts similarity index 66% copy from x2goclient_de.ts copy to x2goclient_nb.ts index 35202f3..d26bfc5 100644 --- a/x2goclient_de.ts +++ b/x2goclient_nb.ts @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de"> +<TS version="2.0" language="nb_NO"> <context> <name>BrokerPassDialogUi</name> <message> <location filename="brokerpassdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished">Dialog</translation> + <translation>Dialog</translation> </message> <message> <location filename="brokerpassdialog.ui" line="22"/> <source>Old password:</source> - <translation type="unfinished"></translation> + <translation>Gammelt passord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="36"/> <source>New password:</source> - <translation type="unfinished"></translation> + <translation>Nytt passord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="50"/> <source>Confirm password:</source> - <translation type="unfinished"></translation> + <translation>Bekreft passordet:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="79"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translatorcomment>hm... Am I supposed to translate this?</translatorcomment> + <translation>TestLabel</translation> </message> </context> <context> @@ -34,7 +35,7 @@ <message> <location filename="brokerpassdlg.cpp" line="41"/> <source>Passwords do not match</source> - <translation type="unfinished"></translation> + <translation>Passordene stemmer ikke</translation> </message> </context> <context> @@ -47,12 +48,12 @@ <message> <location filename="cupsprintwidget.cpp" line="68"/> <source>Printing</source> - <translation>Druckt</translation> + <translation>Skriver</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="71"/> <source>Stopped</source> - <translation>Angehalten</translation> + <translation>Stoppet</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="81"/> @@ -62,7 +63,7 @@ <message> <location filename="cupsprintwidget.cpp" line="81"/> <source>No</source> - <translation>Nein</translation> + <translation>Nei</translation> </message> <message> <location filename="cupsprintwidget.ui" line="19"/> @@ -72,12 +73,12 @@ <message> <location filename="cupsprintwidget.ui" line="25"/> <source>Name:</source> - <translation>Name:</translation> + <translation>Navn:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="42"/> <source>Properties</source> - <translation>Eigenschaften</translation> + <translation>Egenskaper</translation> </message> <message> <location filename="cupsprintwidget.ui" line="49"/> @@ -87,17 +88,17 @@ <message> <location filename="cupsprintwidget.ui" line="63"/> <source>Accepting jobs:</source> - <translation>Aufträge werden angenommen:</translation> + <translation>Aksepterer jobber:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="77"/> <source>Type:</source> - <translation>Typ:</translation> + <translation>Type:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="91"/> <source>Location:</source> - <translation>Adresse:</translation> + <translation>Plassering:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="105"/> @@ -124,6 +125,59 @@ </message> </context> <context> + <name>ConTest</name> + <message> + <location filename="contest.ui" line="14"/> + <source>Connectivity test</source> + <translation>Tilkoblings-test</translation> + </message> + <message> + <location filename="contest.ui" line="24"/> + <source>HTTPS connection:</source> + <translation>HTTPS tilkobling</translation> + </message> + <message> + <location filename="contest.ui" line="31"/> + <source>SSH connection:</source> + <translation>SSH tilkobling</translation> + </message> + <message> + <location filename="contest.ui" line="38"/> + <source>Connection speed:</source> + <translatorcomment>Due to the limited space in the UI dialog, I couldn't choose the "correct" word for speed here, so I had to choose a shorter one which isn't the best translation, but it will do.</translatorcomment> + <translation>Sambandsfart:</translation> + </message> + <message> + <location filename="contest.ui" line="123"/> + <location filename="contest.ui" line="167"/> + <source>Failed</source> + <translation>Feilet</translation> + </message> + <message> + <location filename="contest.ui" line="211"/> + <source>0 Kb/s</source> + <translation>0 Kb/s</translation> + </message> + <message> + <location filename="contest.cpp" line="108"/> + <location filename="contest.cpp" line="115"/> + <source>OK</source> + <translation>OK</translation> + </message> + <message> + <location filename="contest.cpp" line="150"/> + <source>Socket operation timed out</source> + <translatorcomment>Grr..! really hard to get this correctly translated, should rather keep the english words here, as we don't have any good ones for these in technical terms</translatorcomment> + <translation>Sokkel handlingen ble tidsavbrutt</translation> + </message> + <message> + <location filename="contest.cpp" line="162"/> + <location filename="contest.cpp" line="168"/> + <source>Failed: </source> + <translation>Feilet: </translation> + </message> +</context> +<context> <name>ConfigDialog</name> <message> <location filename="configdialog.cpp" line="87"/> @@ -240,7 +294,7 @@ </message> <message> <source>Clientside SSH Port For File System Export Usage:</source> - <translation type="obsolete">SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation> + <translation type="obsolete">SSH Port für die Dateisystemfreigabe auf Clientseite:</translation> </message> <message> <source>LDAP settings</source> @@ -280,7 +334,7 @@ <message> <location filename="configdialog.cpp" line="250"/> <source>Clientside SSH port for file system export usage:</source> - <translation>SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation> + <translation>SSH Port für die Dateisystemfreigabe auf Clientseite:</translation> </message> <message> <location filename="configdialog.cpp" line="50"/> @@ -501,7 +555,7 @@ </message> <message> <source>Use RSA/DSA key for ssh connection:</source> - <translation type="obsolete">RSA-/DSA-Schlüssel verwenden (ssh):</translation> + <translation type="obsolete">RSA/DSA Schlüssel verwenden (ssh):</translation> </message> <message> <source>&Desktop Session</source> @@ -641,7 +695,7 @@ </message> <message> <source>SSH Port:</source> - <translation type="obsolete">SSH-Port:</translation> + <translation type="obsolete">SSH Port:</translation> </message> <message> <source>Path to executable</source> @@ -666,7 +720,7 @@ </message> <message> <source>SSH port:</source> - <translation type="obsolete">SSH-Port:</translation> + <translation type="obsolete">SSH Port:</translation> </message> <message> <source>&Session type</source> @@ -727,7 +781,7 @@ <message> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation type="obsolete">Benutze Port-Weiterleitung über Tunnel + <translation type="obsolete">Benutze Port Weiterleitung über Tunnel um Audiosignale über Firewalls zu verbinden</translation> </message> <message> @@ -740,7 +794,7 @@ sound system connections through firewalls</source> </message> <message> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation type="obsolete">Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> + <translation type="obsolete">Benutze SSH Port Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> </message> <message> <source>New session</source> @@ -842,125 +896,127 @@ sound system connections through firewalls</source> <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="164"/> + <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> - <translation>de</translation> + <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment> + <translation>no</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> + <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> - <translation>pc105/de</translation> + <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment> + <translation>pc105/no</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="294"/> <location filename="httpbrokerclient.cpp" line="308"/> - <location filename="httpbrokerclient.cpp" line="345"/> + <location filename="httpbrokerclient.cpp" line="328"/> + <location filename="httpbrokerclient.cpp" line="365"/> <source>Error</source> - <translation>Fehler</translation> + <translation>Feil</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="309"/> + <location filename="httpbrokerclient.cpp" line="329"/> <source>Login failed! Please try again</source> - <translation type="unfinished"></translation> + <translation>Innlogging feilet! Vennligst forsøk igjen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="433"/> + <location filename="httpbrokerclient.cpp" line="454"/> <source> Server uses an invalid security certificate. </source> <translation> Server benutzt ein ungültiges Zertifikat. </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="436"/> + <location filename="httpbrokerclient.cpp" line="457"/> <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>Sie sollten keine Ausnahme setzen, wenn Sie sich in einem Netzwerk befinden, dem sich nicht vertrauen oder wenn Sie für diese Verbindung bereits eine Ausnahme akzeptiert haben.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="441"/> + <location filename="httpbrokerclient.cpp" line="462"/> <source>Secure connection failed</source> <translation>Sichere Verbindung fehlgeschlagen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="446"/> + <location filename="httpbrokerclient.cpp" line="467"/> <source>Issued to: </source> <translation>Issued to: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="447"/> - <location filename="httpbrokerclient.cpp" line="459"/> + <location filename="httpbrokerclient.cpp" line="468"/> + <location filename="httpbrokerclient.cpp" line="480"/> <source>Common Name(CN) </source> <translation>Common Name(CN) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="450"/> - <location filename="httpbrokerclient.cpp" line="462"/> + <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="483"/> <source>Organization(O) </source> <translation>Organization(O) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="453"/> - <location filename="httpbrokerclient.cpp" line="465"/> + <location filename="httpbrokerclient.cpp" line="474"/> + <location filename="httpbrokerclient.cpp" line="486"/> <source>Organizational Unit(OU) </source> <translation>Organizational Unit(OU) </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="456"/> + <location filename="httpbrokerclient.cpp" line="477"/> <source>Serial Number </source> <translation>Serial Number </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="458"/> + <location filename="httpbrokerclient.cpp" line="479"/> <source>Issued by: </source> <translation>Issued by: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="469"/> + <location filename="httpbrokerclient.cpp" line="490"/> <source>Validity: </source> <translation>Validity: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="470"/> + <location filename="httpbrokerclient.cpp" line="491"/> <source>Issued on </source> <translation>Issued on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="471"/> + <location filename="httpbrokerclient.cpp" line="492"/> <source>expires on </source> <translation>expires on </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="472"/> + <location filename="httpbrokerclient.cpp" line="493"/> <source>Fingerprints: </source> <translation>Fingerprints: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="473"/> + <location filename="httpbrokerclient.cpp" line="494"/> <source>SHA1 </source> <translation>SHA1 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="475"/> + <location filename="httpbrokerclient.cpp" line="496"/> <source>MD5 </source> <translation>MD5 </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="481"/> + <location filename="httpbrokerclient.cpp" line="502"/> <source>Exit X2Go Client</source> <translation>X2Go Client beenden</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="483"/> + <location filename="httpbrokerclient.cpp" line="504"/> <source>Add exception</source> <translation>Ausnahme hinzufügen</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="346"/> + <location filename="httpbrokerclient.cpp" line="366"/> <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source> <translation>Die aktuelle Sitzung wurde unterbrochen. Um erneut Zugriff auf ihre Sitzung zu erhalten, kehren Sie zur Startseite zurück oder aktualisieren Sie die aktuelle Seite über den Browserbefehl "Aktuelle Seite neu laden".</translation> </message> @@ -968,246 +1024,250 @@ sound system connections through firewalls</source> <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="80"/> - <location filename="onmainwindow_part3.cpp" line="307"/> + <location filename="onmainwindow.cpp" line="84"/> + <location filename="onmainwindow_part3.cpp" line="312"/> <source>us</source> - <translation>de</translation> + <translation>no</translation> </message> <message> - <location filename="onmainwindow.cpp" line="81"/> + <location filename="onmainwindow.cpp" line="85"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> <message> - <location filename="onmainwindow.cpp" line="329"/> + <location filename="onmainwindow.cpp" line="333"/> <source>Support ...</source> - <translation type="unfinished"></translation> + <translatorcomment>Need to double-check this one</translatorcomment> + <translation>Støtte ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="601"/> - <location filename="onmainwindow.cpp" line="1782"/> - <location filename="onmainwindow_part3.cpp" line="1636"/> + <location filename="onmainwindow.cpp" line="610"/> + <location filename="onmainwindow.cpp" line="1820"/> + <location filename="onmainwindow_part3.cpp" line="1642"/> <source>Session:</source> - <translation>Sitzung:</translation> + <translation>Sesjon:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="653"/> + <location filename="onmainwindow.cpp" line="662"/> <source>&Quit</source> - <translation>&Beenden</translation> + <translation>&Avslutt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="654"/> + <location filename="onmainwindow.cpp" line="663"/> <source>Ctrl+Q</source> - <translation>Strg+Q</translation> + <translation>Ctrl+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="655"/> - <location filename="onmainwindow.cpp" line="940"/> + <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="958"/> <source>Quit</source> - <translation>Beenden</translation> + <translation>Avslutt</translation> </message> <message> <source>&New Session ...</source> <translation type="obsolete">&Neue Sitzung ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="659"/> + <location filename="onmainwindow.cpp" line="668"/> <source>Ctrl+N</source> - <translation>Strg+N</translation> + <translation>Ctrl+N</translation> </message> <message> <source>Session Management...</source> <translation type="obsolete">Sitzungsverwaltung...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="665"/> + <location filename="onmainwindow.cpp" line="674"/> <source>Ctrl+E</source> - <translation>Strg+E</translation> + <translation>Ctrl+E</translation> </message> <message> <source>LDAP &Settings ...</source> <translation type="obsolete">LDAP &Konfiguration ...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2052"/> + <location filename="onmainwindow_part4.cpp" line="2286"/> <source>Restore toolbar</source> - <translation>Wergzeugleiste wieder anzeigen</translation> + <translation>Gjenopprett verktøylinjen</translation> </message> <message> <source>About X2GO Client</source> - <translation type="obsolete">Über X2GoClient</translation> + <translation type="obsolete">Über X2GO Client</translation> </message> <message> - <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="717"/> <source>About Qt</source> - <translation>Über QT</translation> + <translation>Om QT</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2456"/> + <location filename="onmainwindow_part2.cpp" line="2486"/> <source>Session</source> - <translation>Sitzung</translation> + <translation>Sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="715"/> + <location filename="onmainwindow.cpp" line="734"/> <source>Ctrl+Q</source> <comment>exit</comment> - <translation>Strg +Q</translation> + <translation>Ctrl+Q</translation> </message> <message> - <location filename="onmainwindow.cpp" line="721"/> + <location filename="onmainwindow.cpp" line="740"/> <source>&Session</source> - <translation>&Sitzung</translation> + <translation>&Sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="722"/> + <location filename="onmainwindow.cpp" line="741"/> <source>&Options</source> - <translation>&Einstellungen</translation> + <translation>&Innstillinger</translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="760"/> <source>&Help</source> - <translation>&Hilfe</translation> + <translation>&Hjelp</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1423"/> + <location filename="onmainwindow_part4.cpp" line="1657"/> <source>Password:</source> - <translation>Password:</translation> + <translation>Passord:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1424"/> + <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> - <translation type="unfinished">Tastaturlayout:</translation> + <translation>Tastatur utseende:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1465"/> + <location filename="onmainwindow_part4.cpp" line="1699"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1467"/> - <location filename="onmainwindow_part4.cpp" line="1756"/> - <location filename="onmainwindow_part4.cpp" line="1758"/> + <location filename="onmainwindow_part4.cpp" line="1701"/> + <location filename="onmainwindow_part4.cpp" line="1990"/> + <location filename="onmainwindow_part4.cpp" line="1992"/> <source>Cancel</source> - <translation>Abbrechen</translation> + <translation>Avbryt</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2252"/> + <location filename="onmainwindow_part4.cpp" line="2486"/> <source>Invalid reply from broker</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="807"/> - <location filename="onmainwindow.cpp" line="830"/> - <location filename="onmainwindow.cpp" line="1471"/> - <location filename="onmainwindow.cpp" line="1499"/> - <location filename="onmainwindow.cpp" line="1507"/> - <location filename="onmainwindow.cpp" line="1640"/> - <location filename="onmainwindow.cpp" line="1667"/> - <location filename="onmainwindow.cpp" line="1670"/> - <location filename="onmainwindow.cpp" line="1917"/> - <location filename="onmainwindow.cpp" line="2140"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2167"/> - <location filename="onmainwindow.cpp" line="2201"/> - <location filename="onmainwindow.cpp" line="2246"/> - <location filename="onmainwindow_part2.cpp" line="297"/> - <location filename="onmainwindow_part2.cpp" line="473"/> - <location filename="onmainwindow_part2.cpp" line="482"/> - <location filename="onmainwindow_part2.cpp" line="781"/> - <location filename="onmainwindow_part2.cpp" line="1232"/> - <location filename="onmainwindow_part2.cpp" line="1293"/> - <location filename="onmainwindow_part2.cpp" line="1344"/> - <location filename="onmainwindow_part2.cpp" line="1377"/> - <location filename="onmainwindow_part2.cpp" line="1421"/> - <location filename="onmainwindow_part2.cpp" line="1801"/> - <location filename="onmainwindow_part2.cpp" line="1827"/> - <location filename="onmainwindow_part2.cpp" line="1958"/> + <translatorcomment>Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context.</translatorcomment> + <translation>Ugyldig svar fra megleren</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="820"/> + <location filename="onmainwindow.cpp" line="848"/> + <location filename="onmainwindow.cpp" line="1495"/> + <location filename="onmainwindow.cpp" line="1524"/> + <location filename="onmainwindow.cpp" line="1532"/> + <location filename="onmainwindow.cpp" line="1678"/> + <location filename="onmainwindow.cpp" line="1705"/> + <location filename="onmainwindow.cpp" line="1708"/> + <location filename="onmainwindow.cpp" line="1955"/> + <location filename="onmainwindow.cpp" line="2178"/> + <location filename="onmainwindow.cpp" line="2192"/> + <location filename="onmainwindow.cpp" line="2205"/> + <location filename="onmainwindow.cpp" line="2239"/> + <location filename="onmainwindow.cpp" line="2284"/> + <location filename="onmainwindow_part2.cpp" line="305"/> + <location filename="onmainwindow_part2.cpp" line="481"/> + <location filename="onmainwindow_part2.cpp" line="490"/> + <location filename="onmainwindow_part2.cpp" line="789"/> + <location filename="onmainwindow_part2.cpp" line="1240"/> + <location filename="onmainwindow_part2.cpp" line="1301"/> + <location filename="onmainwindow_part2.cpp" line="1352"/> + <location filename="onmainwindow_part2.cpp" line="1385"/> + <location filename="onmainwindow_part2.cpp" line="1429"/> + <location filename="onmainwindow_part2.cpp" line="1830"/> + <location filename="onmainwindow_part2.cpp" line="1856"/> + <location filename="onmainwindow_part2.cpp" line="1988"/> <location filename="onmainwindow_part3.cpp" line="202"/> - <location filename="onmainwindow_part3.cpp" line="768"/> - <location filename="onmainwindow_part3.cpp" line="848"/> - <location filename="onmainwindow_part3.cpp" line="1092"/> - <location filename="onmainwindow_part3.cpp" line="1220"/> - <location filename="onmainwindow_part3.cpp" line="1273"/> - <location filename="onmainwindow_part3.cpp" line="1579"/> - <location filename="onmainwindow_part3.cpp" line="1581"/> - <location filename="onmainwindow_part3.cpp" line="1811"/> - <location filename="onmainwindow_part3.cpp" line="1859"/> - <location filename="onmainwindow_part3.cpp" line="1887"/> - <location filename="onmainwindow_part3.cpp" line="2257"/> - <location filename="onmainwindow_part3.cpp" line="2272"/> - <location filename="onmainwindow_part3.cpp" line="2326"/> + <location filename="onmainwindow_part3.cpp" line="773"/> + <location filename="onmainwindow_part3.cpp" line="854"/> + <location filename="onmainwindow_part3.cpp" line="1098"/> + <location filename="onmainwindow_part3.cpp" line="1226"/> + <location filename="onmainwindow_part3.cpp" line="1279"/> + <location filename="onmainwindow_part3.cpp" line="1585"/> + <location filename="onmainwindow_part3.cpp" line="1587"/> + <location filename="onmainwindow_part3.cpp" line="1817"/> + <location filename="onmainwindow_part3.cpp" line="1865"/> + <location filename="onmainwindow_part3.cpp" line="1893"/> + <location filename="onmainwindow_part3.cpp" line="2263"/> + <location filename="onmainwindow_part3.cpp" line="2278"/> + <location filename="onmainwindow_part3.cpp" line="2332"/> <location filename="onmainwindow_part4.cpp" line="29"/> <location filename="onmainwindow_part4.cpp" line="54"/> - <location filename="onmainwindow_part4.cpp" line="1980"/> - <location filename="onmainwindow_part4.cpp" line="2251"/> + <location filename="onmainwindow_part4.cpp" line="2214"/> + <location filename="onmainwindow_part4.cpp" line="2485"/> <source>Error</source> - <translation>Fehler</translation> + <translation>Feil</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2372"/> + <location filename="onmainwindow.cpp" line="2411"/> <location filename="onmainwindow_part3.cpp" line="68"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2443"/> + <location filename="onmainwindow.cpp" line="2485"/> <source> on </source> - <translation> on </translation> + <translation> på </translation> </message> <message> - <location filename="onmainwindow.cpp" line="776"/> - <location filename="onmainwindow.cpp" line="1775"/> - <location filename="onmainwindow_part3.cpp" line="1629"/> - <location filename="onmainwindow_part4.cpp" line="1422"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="1813"/> + <location filename="onmainwindow_part3.cpp" line="1635"/> + <location filename="onmainwindow_part4.cpp" line="1656"/> <source>Login:</source> - <translation>Benutzername:</translation> + <translation>Brukernavn:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1002"/> - <location filename="onmainwindow_part4.cpp" line="1752"/> + <location filename="onmainwindow_part2.cpp" line="1010"/> + <location filename="onmainwindow_part4.cpp" line="1986"/> <source>Select session:</source> - <translation>Wähle Sitzung:</translation> + <translation>Velg sesjon:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1754"/> + <location filename="onmainwindow_part4.cpp" line="1988"/> <source>Resume</source> - <translation>Fortfahren</translation> + <translation>Gjenoppta</translation> </message> <message> - <location filename="onmainwindow.cpp" line="479"/> - <location filename="onmainwindow.cpp" line="927"/> - <location filename="onmainwindow_part2.cpp" line="2200"/> - <location filename="onmainwindow_part4.cpp" line="1761"/> + <location filename="onmainwindow.cpp" line="488"/> + <location filename="onmainwindow.cpp" line="945"/> + <location filename="onmainwindow_part2.cpp" line="2230"/> + <location filename="onmainwindow_part4.cpp" line="1995"/> <source>Suspend</source> - <translation>Anhalten</translation> + <translatorcomment>I disagree with the word 'Suspend' here, if it was suspending then the session would be paused. As this is not the case, it's more like disconnect (and the counterpart: reconnect). I used the translation fro 'Disconnect' here, and will research the possibility of changing the Suspend word to Disconnect also in the english translation.</translatorcomment> + <translation>Koble fra</translation> </message> <message> - <location filename="onmainwindow.cpp" line="482"/> - <location filename="onmainwindow.cpp" line="928"/> - <location filename="onmainwindow_part4.cpp" line="1609"/> - <location filename="onmainwindow_part4.cpp" line="1763"/> + <location filename="onmainwindow.cpp" line="491"/> + <location filename="onmainwindow.cpp" line="946"/> + <location filename="onmainwindow_part4.cpp" line="1843"/> + <location filename="onmainwindow_part4.cpp" line="1997"/> <source>Terminate</source> - <translation>Beenden</translation> + <translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment> + <translation>Avslutte</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1766"/> + <location filename="onmainwindow_part4.cpp" line="2000"/> <source>New</source> - <translation>Neu</translation> + <translation>Ny</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2458"/> - <location filename="onmainwindow_part4.cpp" line="1833"/> - <location filename="onmainwindow_part4.cpp" line="1855"/> + <location filename="onmainwindow_part2.cpp" line="2488"/> + <location filename="onmainwindow_part4.cpp" line="2067"/> + <location filename="onmainwindow_part4.cpp" line="2089"/> <source>Display</source> - <translation>Display</translation> + <translation>Skjerm</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1835"/> + <location filename="onmainwindow_part4.cpp" line="2069"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1841"/> + <location filename="onmainwindow_part4.cpp" line="2075"/> <source>Server</source> <translation>Server</translation> </message> @@ -1216,22 +1276,22 @@ sound system connections through firewalls</source> <translation type="obsolete">Startzeit</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1846"/> + <location filename="onmainwindow_part4.cpp" line="2080"/> <source>Client IP</source> - <translation>Client IP</translation> + <translation>Klient IP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1018"/> - <location filename="onmainwindow_part2.cpp" line="1112"/> - <location filename="onmainwindow_part2.cpp" line="2164"/> + <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1120"/> + <location filename="onmainwindow_part2.cpp" line="2194"/> <source>running</source> <translation>aktiv</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1020"/> - <location filename="onmainwindow_part2.cpp" line="1305"/> + <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1313"/> <source>suspended</source> - <translation>angehalten</translation> + <translation>Frakoblet</translation> </message> <message> <source>Unable to create Folder:</source> @@ -1242,157 +1302,159 @@ sound system connections through firewalls</source> <translation type="obsolete">Datei kann nicht geschrieben werden:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1985"/> + <location filename="onmainwindow_part2.cpp" line="2015"/> <source>Unable to create SSL Tunnel: </source> - <translation>SSL Tunnel kann nicht erzeugt werden: + <translation>Klarer ikke å opprette SSL tunnel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1153"/> - <location filename="onmainwindow_part2.cpp" line="1173"/> - <location filename="onmainwindow_part2.cpp" line="1987"/> - <location filename="onmainwindow_part2.cpp" line="2376"/> + <location filename="onmainwindow_part2.cpp" line="1161"/> + <location filename="onmainwindow_part2.cpp" line="1181"/> + <location filename="onmainwindow_part2.cpp" line="2017"/> + <location filename="onmainwindow_part2.cpp" line="2406"/> <source>Warning</source> - <translation>Warnung</translation> + <translation>Advarsel</translation> </message> <message> - <location filename="onmainwindow.cpp" line="143"/> - <location filename="onmainwindow_part2.cpp" line="184"/> - <location filename="onmainwindow_part2.cpp" line="2148"/> + <location filename="onmainwindow.cpp" line="147"/> + <location filename="onmainwindow_part2.cpp" line="189"/> + <location filename="onmainwindow_part2.cpp" line="2178"/> <source>connecting</source> - <translation>verbinde</translation> + <translation>kobler til</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2156"/> + <location filename="onmainwindow_part2.cpp" line="2186"/> <source>starting</source> - <translation>starte</translation> + <translation>starter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2158"/> + <location filename="onmainwindow_part2.cpp" line="2188"/> <source>resuming</source> - <translation>aktiviere</translation> + <translation>gjenopptar</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2220"/> - <location filename="onmainwindow_part2.cpp" line="2488"/> - <location filename="onmainwindow_part2.cpp" line="2506"/> + <location filename="onmainwindow_part2.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="2518"/> + <location filename="onmainwindow_part2.cpp" line="2536"/> <source>Connection timeout, aborting</source> - <translation>Zeitüberschreitung</translation> + <translation>Tilkoblingen tidsavbrutt, avbryter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2221"/> + <location filename="onmainwindow_part2.cpp" line="2251"/> <source>aborting</source> - <translation>Abbruch</translation> + <translation>Avbryter</translation> </message> <message> <source>Session ID: Server: Username: Display: Creation Time: Status:</source> <translation type="obsolete">Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1608"/> + <location filename="onmainwindow_part4.cpp" line="1842"/> <source>Abort</source> - <translation>Abbruch</translation> + <translation>Avbryt</translation> </message> <message> <source>Show Details</source> <translation type="obsolete">Zeige Details</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="404"/> + <location filename="onmainwindow_part3.cpp" line="409"/> <source> (can't open file)</source> - <translation type="unfinished"></translation> + <translation> (kan ikke åpne filen)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="415"/> - <location filename="onmainwindow_part3.cpp" line="425"/> - <location filename="onmainwindow_part3.cpp" line="435"/> + <location filename="onmainwindow_part3.cpp" line="420"/> + <location filename="onmainwindow_part3.cpp" line="430"/> + <location filename="onmainwindow_part3.cpp" line="440"/> <source> (file not exists)</source> - <translation type="unfinished"></translation> + <translation> (filen finnes ikke)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="459"/> + <location filename="onmainwindow_part3.cpp" line="464"/> <source> (directory not exists)</source> - <translation type="unfinished"></translation> + <translation> (mappen finnes ikke)</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="487"/> + <location filename="onmainwindow_part3.cpp" line="492"/> <source>wrong value for argument"--link"</source> - <translation>unerwarteter Wert "--link"</translation> + <translatorcomment>Chose to use 'parameteren' here, the direct translation is 'argument', but didn't fit in my opinion. The cmdline arguments, will they be translated as well?</translatorcomment> + <translation>ugyldig verdi for parameteren "--link"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="505"/> + <location filename="onmainwindow_part3.cpp" line="510"/> <source>wrong value for argument"--sound"</source> - <translation>unerwarteter Wert "--sound"</translation> + <translation>ugyldig verdi for parameteren "--sound"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="522"/> - <location filename="onmainwindow_part3.cpp" line="533"/> + <location filename="onmainwindow_part3.cpp" line="527"/> + <location filename="onmainwindow_part3.cpp" line="538"/> <source>wrong value for argument"--geometry"</source> - <translation>unerwarteter Wert "--geometry"</translation> + <translation>ugyldig verdi for parameteren "--geometry"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="551"/> + <location filename="onmainwindow_part3.cpp" line="556"/> <source>wrong value for argument"--set-kbd"</source> - <translation>unerwarteter Wert "--set-kbd"</translation> + <translation>ugyldig verdi for parameteren "--set-kbd"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="568"/> + <location filename="onmainwindow_part3.cpp" line="573"/> <source>wrong value for argument"--ldap"</source> - <translation>unerwarteter Wert "--ldap"</translation> + <translation>ugyldig verdi for parameteren "--ldap"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="663"/> + <location filename="onmainwindow_part3.cpp" line="668"/> <source>wrong value for argument"--pack"</source> - <translation>unerwarteter Wert "--pack"</translation> + <translation>ugyldig verdi for parameteren "--pack"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="671"/> - <location filename="onmainwindow_part3.cpp" line="674"/> + <location filename="onmainwindow_part3.cpp" line="676"/> + <location filename="onmainwindow_part3.cpp" line="679"/> <source>wrong parameter: </source> - <translation>unerwarteter Wert: </translation> + <translation>ugyldig parameter: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="729"/> <source>Available pack methodes:</source> - <translation>Liste aller Packmethoden:</translation> + <translation>Tilgjengelige pakkemetoder:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1511"/> + <location filename="onmainwindow_part3.cpp" line="1517"/> <source>Support</source> - <translation type="unfinished"></translation> + <translatorcomment>Will have to revisit this one, not sure if it fits</translatorcomment> + <translation>Støtte</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1516"/> + <location filename="onmainwindow_part3.cpp" line="1522"/> <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1582"/> + <location filename="onmainwindow_part3.cpp" line="1588"/> <source>Please check LDAP Settings</source> - <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation> + <translation>Vennligst sjekk LDAP innstillingene</translation> </message> <message> <source>no X2Go Server found in LDAP </source> - <translation type="obsolete">LDAP enthält keinen X2GoServer </translation> + <translation type="obsolete">LDAP enthält keinen X2Go Server </translation> </message> <message> <source>Are you sure you want to delete this Session?</source> <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="290"/> - <location filename="onmainwindow_part2.cpp" line="1286"/> - <location filename="onmainwindow_part2.cpp" line="1370"/> - <location filename="onmainwindow_part2.cpp" line="1403"/> - <location filename="onmainwindow_part3.cpp" line="761"/> - <location filename="onmainwindow_part3.cpp" line="841"/> - <location filename="onmainwindow_part3.cpp" line="1213"/> - <location filename="onmainwindow_part3.cpp" line="1266"/> - <location filename="onmainwindow_part3.cpp" line="2250"/> + <location filename="onmainwindow_part2.cpp" line="298"/> + <location filename="onmainwindow_part2.cpp" line="1294"/> + <location filename="onmainwindow_part2.cpp" line="1378"/> + <location filename="onmainwindow_part2.cpp" line="1411"/> + <location filename="onmainwindow_part3.cpp" line="766"/> + <location filename="onmainwindow_part3.cpp" line="847"/> + <location filename="onmainwindow_part3.cpp" line="1219"/> + <location filename="onmainwindow_part3.cpp" line="1272"/> + <location filename="onmainwindow_part3.cpp" line="2256"/> <source>Connection failed </source> - <translation>Verbindung fehlgeschlagen + <translation>Tilkoblingen feilet </translation> </message> <message> @@ -1400,26 +1462,26 @@ sound system connections through firewalls</source> <translation type="obsolete">es konnte kein Server gefunden werden</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1848"/> + <location filename="onmainwindow_part4.cpp" line="2082"/> <source>Session ID</source> - <translation>Sitzungs ID</translation> + <translation>Sesjons ID</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1250"/> + <location filename="onmainwindow_part2.cpp" line="1258"/> <source>suspending</source> - <translation>anhalten</translation> + <translation>Kobler fra</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1272"/> + <location filename="onmainwindow_part2.cpp" line="1280"/> <source>terminating</source> - <translation>beende</translation> + <translation>Avslutter</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="196"/> <source>Connection failed : </source> - <translation>Verbindung fehlgeschlagen + <translation>Tilkoblingen feilet : </translation> </message> @@ -1453,34 +1515,37 @@ sound system connections through firewalls</source> <location filename="onmainwindow_part4.cpp" line="28"/> <source>Unable to read : </source> - <translation>Lesefehler: + <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment> + <translation>Klarer ikke å lese: </translation> </message> <message> <location filename="onmainwindow_part4.cpp" line="53"/> <source>Unable to write : </source> - <translation>Schreibfehler: + <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment> + <translation>Klarer ikke å skrive: </translation> </message> <message> <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete">X2GoClient V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete">X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <location filename="onmainwindow_part2.cpp" line="1406"/> + <location filename="onmainwindow_part2.cpp" line="1414"/> <source>Wrong Password! </source> - <translation>Falsches Passwort! </translation> + <translatorcomment>Should we actually tell that it's the password that's wrong? Isn't that considered bad practice in regards to security? I propose to use "Wrong Username or Password!" instead.</translatorcomment> + <translation>Feil passord! </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="590"/> + <location filename="onmainwindow_part3.cpp" line="595"/> <source>wrong value for argument"--ldap1"</source> - <translation>unerwarteter Wert "--ldap1"</translation> + <translation>ugyldig verdi for parameteren "--ldap1"</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="609"/> + <location filename="onmainwindow_part3.cpp" line="614"/> <source>wrong value for argument"--ldap2"</source> - <translation>unerwarteter Wert "--ldap2"</translation> + <translation>ugyldig verdi for parameteren "--ldap2"</translation> </message> <message> <source>Usage: x2goclient [Options] @@ -1507,551 +1572,567 @@ sound system connections through firewalls</source> <translation type="obsolete">Usage: x2goclient [Options] Options: --help Print this message --help-pack Print availabel pack methods --no-menu Hide menu bar --maximize Start maximized --add-to-known-hosts Add RSA key fingerprint to .ssh/known_hosts if authenticity of server can't be established --ldap=<host:port:dn> Start with LDAP Support. Example: --ldap=ldapserver:389:o=organization,c=de --ldap1=<host:port> LDAP Failover Server #1 --ldap2=<host:port> LDAP Failover Server #2 --command=<cmd> Set default command, default value 'KDE' --sound=<0|1> Enable sound, default value '1' --geomerty=<W>x<H>|fullscreen Set default geometry, default value '800x600' --link=<modem|isdn|adsl|wan |lan> Set default link type, default 'lan' --pack=<packmethod> Set default pack method, default '16m-jpeg-9' --kbd-layout=<layout> Set default keyboard layout, default 'us' --kbd-type=<typed> Set default keyboard type, default 'pc105/us' --set-kbd=<0|1> Overwrite current keyboard settings, default '0'</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1888"/> + <location filename="onmainwindow_part3.cpp" line="1894"/> <source>Unable to create file: </source> - <translation>Datei konnte nicht erzeugt werden: </translation> + <translation>Klarer ikke å opprette filen: </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1812"/> + <location filename="onmainwindow_part3.cpp" line="1818"/> <source>No valid card found</source> - <translation>Es wurde keine gültige Karte gefunden</translation> + <translation>Ingen gyldige kort ble funnet</translation> </message> <message> <source>This card is unknown by X2Go System</source> - <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation> + <translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="325"/> + <location filename="onmainwindow.cpp" line="329"/> <source>&Settings ...</source> - <translation>&Konfiguration ...</translation> + <translatorcomment>Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions</translatorcomment> + <translation>&Innstillinger</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="719"/> - <location filename="onmainwindow_part3.cpp" line="745"/> + <location filename="onmainwindow_part3.cpp" line="724"/> + <location filename="onmainwindow_part3.cpp" line="750"/> <source>Options</source> - <translation>Einstellungen</translation> + <translatorcomment>Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first</translatorcomment> + <translation>Alternativer</translation> </message> <message> <source>Can't read host rsa key:</source> <translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2053"/> - <location filename="onmainwindow_part3.cpp" line="2078"/> + <location filename="onmainwindow_part3.cpp" line="2059"/> + <location filename="onmainwindow_part3.cpp" line="2084"/> <source>Can't connect to X-Server</source> - <translation>Verbindung zu X-Server konnte nicht hergestellt werden</translation> + <translation>Klarte ikke å koble til X-Serveren</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2054"/> - <location filename="onmainwindow_part3.cpp" line="2079"/> + <location filename="onmainwindow_part3.cpp" line="2060"/> + <location filename="onmainwindow_part3.cpp" line="2085"/> <source>Can't connect to X-Server Please check your settings</source> - <translation>Verbindung zu X-Server konnte nicht hergestellt werden -Überprüfen Sie Ihre Einstellungen</translation> + <translation>Klarte ikke å koble til X-Serveren +Vennligst sjekk innstillingene dine</translation> </message> <message> <source>Can't start X-Server</source> <translation type="obsolete">X-Server konnte nicht gestartet werden</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2087"/> + <location filename="onmainwindow_part3.cpp" line="2093"/> <source>Can't start X Server Please check your settings</source> - <translation>X-Server konnte nicht gestartet werden -Überprüfen Sie Ihre Einstellungen</translation> + <translation>Klarte ikke å starte X-Serveren +Vennligst sjekk instillingene dine</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1154"/> - <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1182"/> <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>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem Verlust der ganzen Sitzung. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf </translation> + <translation>Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene vil du miste hele sesjonen. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1162"/> + <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> - <translation>24 oder 32</translation> + <translation>24 eller 32</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1163"/> - <location filename="onmainwindow_part2.cpp" line="1183"/> + <location filename="onmainwindow_part2.cpp" line="1171"/> + <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation> bit zu ändern und den verwendeten X-server neu zu starten, bevor Sie sich mit der Sitzung verbinden. Trotzdem versuchen die Sitzung fortzuführen?</translation> + <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. Gjenoppta denne sesjonen uansett?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1166"/> - <location filename="onmainwindow_part2.cpp" line="1186"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1174"/> + <location filename="onmainwindow_part2.cpp" line="1194"/> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="1167"/> - <location filename="onmainwindow_part2.cpp" line="1187"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="1175"/> + <location filename="onmainwindow_part2.cpp" line="1195"/> <source>No</source> - <translation>Nein</translation> + <translation>Nei</translation> </message> <message> <source>X2Go Client V. </source> - <translation type="obsolete">X2GoClient V. </translation> + <translation type="obsolete">X2Go Client V. </translation> </message> <message> <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="156"/> <source>OpenOffice.org</source> - <translation></translation> + <translation>OpenOffice.org</translation> </message> <message> - <location filename="onmainwindow.cpp" line="153"/> + <location filename="onmainwindow.cpp" line="157"/> <source>Terminal</source> - <translation></translation> + <translation>Terminal</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="409"/> + <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> - <translation>unbekannt</translation> + <translation>ukjent</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1837"/> + <location filename="onmainwindow_part4.cpp" line="2071"/> <source>Command</source> - <translation>Befehl</translation> + <translation>Kommando</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1839"/> + <location filename="onmainwindow_part4.cpp" line="2073"/> <source>Type</source> - <translation>Typ</translation> + <translation>Type</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1026"/> + <location filename="onmainwindow_part2.cpp" line="1034"/> <source>Desktop</source> - <translation>Desktopumgebung</translation> + <translation>Skrivebord</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1028"/> + <location filename="onmainwindow_part2.cpp" line="1036"/> <source>single application</source> - <translation>Anwendung</translation> + <translation>enkel applikasjon</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1030"/> + <location filename="onmainwindow_part2.cpp" line="1038"/> <source>shadow session</source> - <translation></translation> + <translatorcomment>hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian</translatorcomment> + <translation>skygge sesjonen</translation> </message> <message> <source> Sudo configuration error</source> <translation type="obsolete"> Fehler in der Sudo Konfiguration</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2273"/> + <location filename="onmainwindow_part3.cpp" line="2279"/> <source>Unable to execute: </source> - <translation>Befehl konnte nicht ausgeführt werden:</translation> + <translation>Klarte ikke å utføre:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="126"/> + <location filename="onmainwindow.cpp" line="130"/> <source>X2Go client</source> - <translation></translation> + <translation>X2Go klient</translation> </message> <message> - <location filename="onmainwindow.cpp" line="150"/> + <location filename="onmainwindow.cpp" line="154"/> <source>Internet browser</source> - <translation>Webbrowser</translation> + <translation>Nettleser</translation> </message> <message> - <location filename="onmainwindow.cpp" line="151"/> + <location filename="onmainwindow.cpp" line="155"/> <source>Email client</source> - <translation>E-Mail-Programm</translation> + <translation>Epost program</translation> </message> <message> - <location filename="onmainwindow.cpp" line="658"/> + <location filename="onmainwindow.cpp" line="667"/> <source>&New session ...</source> - <translation>&Neue Sitzung ...</translation> + <translation>&Ny sesjon ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="664"/> + <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> - <translation>Sitzungsverwaltung...</translation> + <translation>Sesjonshåndtering...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="692"/> - <location filename="onmainwindow.cpp" line="713"/> + <location filename="onmainwindow.cpp" line="711"/> + <location filename="onmainwindow.cpp" line="732"/> <source>Show toolbar</source> - <translation>Zeige Wergzeugleiste</translation> + <translation>Vis verktøylinje</translation> </message> <message> - <location filename="onmainwindow.cpp" line="336"/> - <location filename="onmainwindow_part3.cpp" line="1536"/> + <location filename="onmainwindow.cpp" line="340"/> + <location filename="onmainwindow_part3.cpp" line="1542"/> <source>About X2GO client</source> - <translation>Über X2GoClient</translation> + <translation>Om X2GO klient</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1472"/> - <location filename="onmainwindow.cpp" line="1641"/> - <location filename="onmainwindow.cpp" line="1671"/> + <location filename="onmainwindow.cpp" line="1496"/> + <location filename="onmainwindow.cpp" line="1679"/> + <location filename="onmainwindow.cpp" line="1709"/> <source>Please check LDAP settings</source> - <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation> + <translation>Vennligst sjekk LDAP innstillingene</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1506"/> + <location filename="onmainwindow.cpp" line="1531"/> <source>no X2Go server found in LDAP </source> - <translation>LDAP enthält keinen X2GoServer </translation> + <translation>Inge X2Go server ble funnet i LDAP </translation> </message> <message> - <location filename="onmainwindow.cpp" line="2065"/> + <location filename="onmainwindow.cpp" line="2103"/> <source>Are you sure you want to delete this session?</source> - <translation>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation> + <translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="293"/> - <location filename="onmainwindow_part2.cpp" line="1289"/> - <location filename="onmainwindow_part2.cpp" line="1373"/> + <location filename="onmainwindow_part2.cpp" line="301"/> + <location filename="onmainwindow_part2.cpp" line="1297"/> + <location filename="onmainwindow_part2.cpp" line="1381"/> <location filename="onmainwindow_part3.cpp" line="199"/> - <location filename="onmainwindow_part3.cpp" line="764"/> - <location filename="onmainwindow_part3.cpp" line="844"/> - <location filename="onmainwindow_part3.cpp" line="1216"/> - <location filename="onmainwindow_part3.cpp" line="1269"/> - <location filename="onmainwindow_part3.cpp" line="2253"/> + <location filename="onmainwindow_part3.cpp" line="769"/> + <location filename="onmainwindow_part3.cpp" line="850"/> + <location filename="onmainwindow_part3.cpp" line="1222"/> + <location filename="onmainwindow_part3.cpp" line="1275"/> + <location filename="onmainwindow_part3.cpp" line="2259"/> <source>Wrong password! </source> - <translation>Falsches Passwort! </translation> + <translation>Feil passord! </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="474"/> + <location filename="onmainwindow_part2.cpp" line="482"/> <source>No server availabel</source> - <translation>es konnte kein Server gefunden werden</translation> + <translation>Ingen tilgjengelig server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="923"/> - <location filename="onmainwindow_part2.cpp" line="2061"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow_part2.cpp" line="2091"/> <source>Not connected</source> <oldsource>Active connection</oldsource> - <translation>Nicht verbunden</translation> + <translation>Ikke tilkoblet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2460"/> - <location filename="onmainwindow_part4.cpp" line="1844"/> + <location filename="onmainwindow_part2.cpp" line="2490"/> + <location filename="onmainwindow_part4.cpp" line="2078"/> <source>Creation time</source> - <translation>Startzeit</translation> + <translation>Opprettelsestidspunkt</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1799"/> - <location filename="onmainwindow_part3.cpp" line="1090"/> + <location filename="onmainwindow_part2.cpp" line="1828"/> + <location filename="onmainwindow_part3.cpp" line="1096"/> <source>Unable to create folder:</source> - <translation>Ordner kann nicht erzeugt werden:</translation> + <translation>Klarer ikke å opprette katalogen:</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="79"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>Vertsnøkkel for serveren har endret seg. +Den er nå: </translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="80"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="90"/> + <location filename="onmainwindow_part2.cpp" line="91"/> <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>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="110"/> + <location filename="onmainwindow_part2.cpp" line="113"/> <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>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="115"/> + <location filename="onmainwindow_part2.cpp" line="118"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Serveren er ukjent. Stoler du på vertsnøkkelen? +Offentlig nøkkel: </translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="119"/> - <location filename="onmainwindow_part2.cpp" line="126"/> + <location filename="onmainwindow_part2.cpp" line="122"/> + <location filename="onmainwindow_part2.cpp" line="130"/> <source>Host key verification failed</source> - <translation type="unfinished">Host key verification failed</translation> + <translation>Verifiseringen av vertsnøkkelen feilet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="141"/> + <location filename="onmainwindow_part2.cpp" line="146"/> <source>Authentification failed</source> - <translation type="unfinished"></translation> + <translation>Pålogging feilet</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="483"/> - <location filename="onmainwindow_part2.cpp" line="782"/> - <location filename="onmainwindow_part2.cpp" line="1233"/> - <location filename="onmainwindow_part2.cpp" line="1345"/> + <location filename="onmainwindow_part2.cpp" line="491"/> + <location filename="onmainwindow_part2.cpp" line="790"/> + <location filename="onmainwindow_part2.cpp" line="1241"/> + <location filename="onmainwindow_part2.cpp" line="1353"/> <source>Server not availabel</source> - <translation type="unfinished"></translation> + <translation>Serveren er ikke tilgjengelig</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1825"/> + <location filename="onmainwindow_part2.cpp" line="1854"/> <source>Unable to write file:</source> - <translation>Datei kann nicht geschrieben werden:</translation> + <translation>Klarer ikke å skrive til filen:</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1956"/> - <location filename="onmainwindow_part3.cpp" line="2324"/> + <location filename="onmainwindow_part2.cpp" line="1986"/> + <location filename="onmainwindow_part3.cpp" line="2330"/> <source>Unable to create SSL tunnel: </source> - <translation>SSL Tunnel kann nicht erzeugt werden: + <translation>Klarte ikke å opprette SSL tunnel: </translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1600"/> + <location filename="onmainwindow_part4.cpp" line="1834"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> - <translation>Sitzungs ID: Server: Login: Display: Startzeit: Status:</translation> + <translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment> + <translation>Sesjons ID: Server: Brukernavn: Skjerm: Opprettet: Status:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="476"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow_part4.cpp" line="1610"/> + <location filename="onmainwindow.cpp" line="485"/> + <location filename="onmainwindow.cpp" line="944"/> + <location filename="onmainwindow_part4.cpp" line="1844"/> <source>Share folder...</source> - <translation>Ordner freigeben...</translation> + <translation>Del mappe...</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1612"/> + <location filename="onmainwindow_part4.cpp" line="1846"/> <source>Show details</source> - <translation>Zeige Details</translation> + <translation>Vis detailjer</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1537"/> + <location filename="onmainwindow_part3.cpp" line="1543"/> <source>X2Go client V. </source> - <translation>X2GoClient V. </translation> + <translation>X2Go klient v. </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1860"/> + <location filename="onmainwindow_part3.cpp" line="1866"/> <source>This card is unknown by X2Go system</source> - <translation>Diese Karte ist dem X2Go-System unbekannt</translation> + <translatorcomment>Need to double-check if the translation of "card" is suitable here</translatorcomment> + <translation>Dette kortet er ukjent for X2Go systemet</translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="2289"/> + <location filename="onmainwindow_part3.cpp" line="2295"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> - <translation>Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel -Bitte installieren sie eine neuere Version von x2goserver</translation> + <translation>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel +Vennligst oppdater til en nyere x2goserver pakke</translation> </message> <message> - <location filename="onmainwindow.cpp" line="675"/> + <location filename="onmainwindow.cpp" line="684"/> <source>&Create session icon on desktop...</source> - <translation>&Desktopsymbol erzeugen...</translation> + <translation>&Opprett sesjonsikon på skrivebordet...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="684"/> + <location filename="onmainwindow.cpp" line="693"/> <source>&Set broker password...</source> - <translation type="unfinished"></translation> + <translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment> + <translation>&Sett megler passord...</translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="704"/> + <source>&Connectivity test...</source> + <translation>&Tilkoblings-test...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="807"/> + <location filename="onmainwindow.cpp" line="820"/> <source>Operation failed</source> - <translation type="unfinished"></translation> + <translation>Handlingen feilet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="824"/> <source>Password changed</source> - <translation type="unfinished"></translation> + <translation>Passordet er endret</translation> </message> <message> - <location filename="onmainwindow.cpp" line="830"/> + <location filename="onmainwindow.cpp" line="848"/> <source>Wrong password!</source> - <translation type="unfinished"></translation> + <translation>Feil passord!</translation> </message> <message> - <location filename="onmainwindow.cpp" line="879"/> + <location filename="onmainwindow.cpp" line="897"/> <source>Authentication</source> - <translation type="unfinished"></translation> + <translation>Autentisering</translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> + <location filename="onmainwindow.cpp" line="938"/> <source>Restore</source> - <translation>Wiederherstellen</translation> + <translation>Gjenopprett</translation> </message> <message> - <location filename="onmainwindow.cpp" line="951"/> + <location filename="onmainwindow.cpp" line="969"/> <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>Linke Maustaste: verstecken/wiederherstellen - rechte Maustaste: Kontextmenü</translation> + <translatorcomment>According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny"</translatorcomment> + <translation>Venstre museknapp for å skjule/gjenopprette - Høyre museknapp viser sprettoppmeny</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1805"/> + <location filename="onmainwindow.cpp" line="1843"/> <source>Create session icon on desktop</source> - <translation>Desktopsymbol erzeugen</translation> + <translation>Opprett sesjonsikon på skrivebordet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1806"/> + <location filename="onmainwindow.cpp" line="1844"/> <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>Der Aufruf über Desktopsymbole kann erfolgen, ohne dass der X2GoClient sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Loginvorgang über einen GPG-Schlüssel oder eine GPG-Smartcard konfiguriert haben. + <translation>Skrivebordsikoner kan konfigureres til å ikke vise x2goklient (skjult modus). Om du ønsker å benytte denne muligheten må du konfigurere pålogging ved bruk av en GPG-nøkkel, eller et GPG basert smartkort. -Wollen Sie den versteckten Modus nutzen?</translation> +Ønsker du å aktivere skjult modus for x2goklient?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1817"/> + <location filename="onmainwindow.cpp" line="1855"/> <source>New Session</source> - <translation>Neue Sitzung</translation> + <translation>Ny sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1917"/> + <location filename="onmainwindow.cpp" line="1955"/> <source>X2Go sessions not found</source> - <translation type="unfinished"></translation> + <translation>X2Go sesjoner ble ikke funnet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2431"/> + <location filename="onmainwindow.cpp" line="2473"/> <source>RDP connection</source> - <translation>RDP Verbindung</translation> + <translation>RDP tilkobling</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1867"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> - <translation></translation> + <translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment> + <translation>X2Go kobling til sesjon </translation> </message> <message> - <location filename="onmainwindow.cpp" line="488"/> - <location filename="onmainwindow_part4.cpp" line="1054"/> + <location filename="onmainwindow.cpp" line="497"/> + <location filename="onmainwindow_part4.cpp" line="1288"/> <source>Detach X2Go window</source> - <translation>Fenster abkoppeln</translation> + <translation>Løsne X2Go vindu</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1930"/> - <location filename="onmainwindow_part4.cpp" line="1029"/> + <location filename="onmainwindow_part2.cpp" line="1960"/> + <location filename="onmainwindow_part4.cpp" line="1263"/> <source>Attach X2Go window</source> - <translation>Fenster einbetten</translation> + <translation>Feste X2Go vindu</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2133"/> + <location filename="onmainwindow_part2.cpp" line="2163"/> <source>Finished</source> - <translation>Beendet</translation> + <translation>Ferdig</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="2377"/> + <location filename="onmainwindow_part2.cpp" line="2407"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> - <translation>Die Sitzung wird beendet. Sind Sie sicher? Ungespeicherte Dokumente gehen verloren</translation> + <translation>Er du sikker på at du vil avslutte denne sesjonen? +Ulagrede data vil gå tapt</translation> </message> <message> <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> + <translation type="obsolete"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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> - <location filename="onmainwindow_part3.cpp" line="2101"/> + <location filename="onmainwindow_part3.cpp" line="2107"/> <location filename="onmainwindow_part4.cpp" line="422"/> <location filename="onmainwindow_part4.cpp" line="450"/> <source>Can't start X Server Please check your installation</source> - <translation>X-Server lässt sich nicht starten. -Bitte überprüfen Sie Ihre Installation</translation> + <translation>Klarer ikke å starte X Serveren +Vennligst sjekk din installasjon</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1118"/> + <location filename="onmainwindow_part4.cpp" line="1352"/> <source>X2Go Session</source> - <translation>X2Go-Sitzung</translation> + <translation>X2Go sesjon</translation> </message> <message> - <location filename="onmainwindow.cpp" line="491"/> - <location filename="onmainwindow_part4.cpp" line="2064"/> + <location filename="onmainwindow.cpp" line="500"/> + <location filename="onmainwindow_part4.cpp" line="2298"/> <source>Minimize toolbar</source> - <translation>Symbole verstecken</translation> + <translation>Minimer verktøylinje</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="2097"/> + <location filename="onmainwindow_part4.cpp" line="2331"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> - <translation> &nbsp;&nbsp;&nbsp;zum Wiederherstellen&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;der Werkzeugleiste&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;hier klicken&nbsp;&nbsp;&nbsp; </translation> + <translation> &nbsp;&nbsp;&nbsp;Trykk her&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp; </translation> </message> <message> <source>Can't open config file: </source> <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1981"/> + <location filename="onmainwindow_part4.cpp" line="2215"/> <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>SSHD konnte nicht gefunden werden. SSHD wird für Dateifreigaben und Druck benötigt. -Sie können SSHD über folgenden Befehl installieren: + <translation>sshd er ikke startet og du trenger denne for skriver- og fildeling. +Du kan installere sshd med: sudo apt-get install openssh-server</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2439"/> + <location filename="onmainwindow.cpp" line="2481"/> <source>Connection to local desktop</source> - <translation>Zugriff auf lokalen Desktop</translation> + <translation>Tilkobling til lokalt skrivebord</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1063"/> + <location filename="onmainwindow_part2.cpp" line="1071"/> <source>Information</source> - <translation>Hinweis</translation> + <translation>Informasjon</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1077"/> - <location filename="onmainwindow_part4.cpp" line="2165"/> + <location filename="onmainwindow_part2.cpp" line="1085"/> + <location filename="onmainwindow_part4.cpp" line="2399"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1084"/> + <location filename="onmainwindow_part2.cpp" line="1092"/> <source>Select desktop:</source> - <translation>Desktopauswahl:</translation> + <translation>Velg skrivebord:</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1772"/> + <location filename="onmainwindow_part4.cpp" line="2006"/> <source>View only</source> - <translation>Nur betrachten</translation> + <translation>Kun vis</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1852"/> + <location filename="onmainwindow_part4.cpp" line="2086"/> <source>User</source> - <translation>Benutzer</translation> + <translation>Bruker</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2435"/> + <location filename="onmainwindow.cpp" line="2477"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="onmainwindow_part2.cpp" line="1064"/> + <location filename="onmainwindow_part2.cpp" line="1072"/> <source>No accessible desktop found</source> - <translation>Kein freigegebener Desktop gefunden</translation> + <translation>Ingen tilgjengelige skrivebord ble funnet</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1769"/> + <location filename="onmainwindow_part4.cpp" line="2003"/> <source>Full access</source> - <translation>Vollzugriff</translation> + <translation>Full tilgang</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1883"/> + <location filename="onmainwindow_part4.cpp" line="2117"/> <source>Only my desktops</source> - <translation>Nur eigene Desktops</translation> + <translation>Kun mine skrivebord</translation> </message> <message> - <location filename="onmainwindow.cpp" line="484"/> + <location filename="onmainwindow.cpp" line="493"/> <source>Reconnect</source> - <translation>Neu verbinden</translation> + <translation>Gjenoppkoble</translation> </message> <message> - <location filename="onmainwindow.cpp" line="834"/> - <location filename="onmainwindow.cpp" line="2354"/> - <location filename="onmainwindow_part4.cpp" line="2234"/> + <location filename="onmainwindow.cpp" line="852"/> + <location filename="onmainwindow.cpp" line="2393"/> + <location filename="onmainwindow_part4.cpp" line="2468"/> <source>Connecting to broker</source> - <translation>Verbinden mit Broker</translation> + <translation>Koble til megleren</translation> </message> <message> <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="obsolete"> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1520"/> + <location filename="onmainwindow_part3.cpp" line="1526"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> - <translation> x2goplugin Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> + <translation> x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </translation> </message> <message> - <location filename="onmainwindow_part3.cpp" line="1524"/> + <location filename="onmainwindow_part3.cpp" line="1530"/> <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 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> - <translation> 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> + <translation> 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> <location filename="onmainwindow_part4.cpp" line="141"/> @@ -2064,13 +2145,13 @@ Sie können SSHD über folgenden Befehl installieren: <translation>ISO8859-1</translation> </message> <message> - <location filename="onmainwindow_part4.cpp" line="1300"/> + <location filename="onmainwindow_part4.cpp" line="1534"/> <source>wrong value for argument"speed"</source> <translation>wrong value for argument"speed"</translation> </message> <message> <source>application/x2go:x2go:Configuration File for X2Go Session</source> - <translation type="obsolete">application/x2go:x2go:Konfigurationsdatei für eine X2Go-Sitzung</translation> + <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation> </message> </context> <context> @@ -2093,7 +2174,7 @@ Sie können SSHD über folgenden Befehl installieren: <message> <location filename="printdialog.ui" line="16"/> <source>Print - X2Go client</source> - <translation>Drucken - X2GoClient</translation> + <translation>Drucken - X2Go Client</translation> </message> </context> <context> @@ -2298,31 +2379,40 @@ Beispiel: <translation type="obsolete">Aktiviere Audiounterstützung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="270"/> + <location filename="sessionbutton.cpp" line="272"/> <source>New Session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="312"/> + <location filename="sessionbutton.cpp" line="314"/> <source>KDE</source> <translation>KDE</translation> </message> <message> - <location filename="sessionbutton.cpp" line="383"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="635"/> + <location filename="sessionbutton.cpp" line="385"/> + <location filename="sessionbutton.cpp" line="402"/> + <location filename="sessionbutton.cpp" line="663"/> <source>fullscreen</source> <translation>Vollbild</translation> </message> <message> - <location filename="sessionbutton.cpp" line="417"/> - <location filename="sessionbutton.cpp" line="547"/> + <location filename="sessionbutton.cpp" line="389"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="416"/> + <location filename="sessionbutton.cpp" line="669"/> + <location filename="sessionbutton.cpp" line="672"/> + <source>Display </source> + <translation>Skjerm </translation> + </message> + <message> + <location filename="sessionbutton.cpp" line="445"/> + <location filename="sessionbutton.cpp" line="575"/> <source>Enabled</source> <translation>aktiviert</translation> </message> <message> - <location filename="sessionbutton.cpp" line="419"/> - <location filename="sessionbutton.cpp" line="549"/> + <location filename="sessionbutton.cpp" line="447"/> + <location filename="sessionbutton.cpp" line="577"/> <source>Disabled</source> <translation>deaktiviert</translation> </message> @@ -2331,74 +2421,75 @@ Beispiel: <translation type="obsolete">/usr/bin/startkde</translation> </message> <message> - <location filename="sessionbutton.cpp" line="390"/> - <location filename="sessionbutton.cpp" line="409"/> + <location filename="sessionbutton.cpp" line="397"/> + <location filename="sessionbutton.cpp" line="437"/> <source>window</source> <translation>Fenster</translation> </message> <message> - <location filename="sessionbutton.cpp" line="114"/> + <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> <translation>Sitzungseinstellungen...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="118"/> + <location filename="sessionbutton.cpp" line="120"/> <source>Create session icon on desktop...</source> <translation>Desktopsymbol erzeugen...</translation> </message> <message> - <location filename="sessionbutton.cpp" line="123"/> + <location filename="sessionbutton.cpp" line="125"/> <source>Delete session</source> <translation>Sitzung entfernen</translation> </message> <message> - <location filename="sessionbutton.cpp" line="136"/> + <location filename="sessionbutton.cpp" line="138"/> <source>Session actions</source> <translation>Optionen</translation> </message> <message> - <location filename="sessionbutton.cpp" line="137"/> + <location filename="sessionbutton.cpp" line="139"/> <source>Select type</source> <translation>Typ</translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> + <location filename="sessionbutton.cpp" line="141"/> <source>Select resolution</source> <translation>Auflösung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="140"/> + <location filename="sessionbutton.cpp" line="142"/> <source>Toggle sound support</source> <translation>Sound</translation> </message> <message> - <location filename="sessionbutton.cpp" line="275"/> + <location filename="sessionbutton.cpp" line="277"/> <source>running</source> - <translation type="unfinished">aktiv</translation> + <translation>aktiv</translation> </message> <message> - <location filename="sessionbutton.cpp" line="279"/> + <location filename="sessionbutton.cpp" line="281"/> <source>suspended</source> - <translation type="unfinished">angehalten</translation> + <translatorcomment>I think the correct english word here (as best describes the function) would be 'disconnected'. The session isn't paused (=suspended), so I think it's the wrong word.</translatorcomment> + <translation>frakoblet</translation> </message> <message> - <location filename="sessionbutton.cpp" line="323"/> - <location filename="sessionbutton.cpp" line="355"/> - <location filename="sessionbutton.cpp" line="588"/> + <location filename="sessionbutton.cpp" line="325"/> + <location filename="sessionbutton.cpp" line="357"/> + <location filename="sessionbutton.cpp" line="616"/> <source>RDP connection</source> <translation>RDP Verbindung</translation> </message> <message> - <location filename="sessionbutton.cpp" line="325"/> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="582"/> + <location filename="sessionbutton.cpp" line="327"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="610"/> <source>Connection to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="sessionbutton.cpp" line="324"/> - <location filename="sessionbutton.cpp" line="361"/> - <location filename="sessionbutton.cpp" line="594"/> + <location filename="sessionbutton.cpp" line="326"/> + <location filename="sessionbutton.cpp" line="363"/> + <location filename="sessionbutton.cpp" line="622"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> @@ -2488,12 +2579,12 @@ Beispiel: <message> <location filename="sessionwidget.cpp" line="89"/> <source>SSH port:</source> - <translation>SSH-Port:</translation> + <translation>SSH Port:</translation> </message> <message> <location filename="sessionwidget.cpp" line="101"/> <source>Use RSA/DSA key for ssh connection:</source> - <translation>RSA-/DSA-Schlüssel verwenden (ssh):</translation> + <translation>RSA/DSA Schlüssel verwenden (ssh):</translation> </message> <message> <location filename="sessionwidget.cpp" line="107"/> @@ -2501,109 +2592,114 @@ Beispiel: <translation>Anmeldung über voreingestellten SSH-Schlüssel oder ssh-agent</translation> </message> <message> - <location filename="sessionwidget.cpp" line="111"/> + <location filename="sessionwidget.cpp" line="108"/> + <source>Kerberos 5 (GSSAPI) authentication</source> + <translation>Kerberos 5 (GSSAPI) autentisering</translation> + </message> + <message> + <location filename="sessionwidget.cpp" line="113"/> <source>&Session type</source> <translation>&Sitzungsart</translation> </message> <message> - <location filename="sessionwidget.cpp" line="116"/> + <location filename="sessionwidget.cpp" line="118"/> <source>Session type:</source> <translation>Sitzungsart:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="125"/> - <location filename="sessionwidget.cpp" line="292"/> + <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="296"/> <source>Connect to Windows terminal server</source> <translation>Verbindung mit Windows Terminalserver herstellen</translation> </message> <message> - <location filename="sessionwidget.cpp" line="128"/> + <location filename="sessionwidget.cpp" line="130"/> <source>Custom desktop</source> <translation>Andere Desktopumgebung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="129"/> + <location filename="sessionwidget.cpp" line="131"/> <source>Single application</source> <translation>Anwendung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> - <location filename="sessionwidget.cpp" line="248"/> + <location filename="sessionwidget.cpp" line="133"/> + <location filename="sessionwidget.cpp" line="252"/> <source>Command:</source> <translation>Befehl:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="132"/> + <location filename="sessionwidget.cpp" line="134"/> <source>Advanced options...</source> <translation>Erweiterte Einstellungen...</translation> </message> <message> - <location filename="sessionwidget.cpp" line="143"/> - <location filename="sessionwidget.cpp" line="420"/> - <location filename="sessionwidget.cpp" line="482"/> + <location filename="sessionwidget.cpp" line="145"/> + <location filename="sessionwidget.cpp" line="429"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Path to executable</source> <translation>Pfad zum Programm</translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Open picture</source> <translation>Öffne Bild</translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Pictures</source> <translation>Bilder</translation> </message> <message> - <location filename="sessionwidget.cpp" line="215"/> + <location filename="sessionwidget.cpp" line="219"/> <source>Open key file</source> <translation>Öffne Schlüssel</translation> </message> <message> - <location filename="sessionwidget.cpp" line="217"/> + <location filename="sessionwidget.cpp" line="221"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="sessionwidget.cpp" line="269"/> - <location filename="sessionwidget.cpp" line="384"/> + <location filename="sessionwidget.cpp" line="273"/> + <location filename="sessionwidget.cpp" line="391"/> <source>Server:</source> <translation>Server:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="293"/> + <location filename="sessionwidget.cpp" line="297"/> <source>rdesktop command line options:</source> <translation>rdesktop Kommandozeilenoptionen:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="306"/> - <location filename="sessionwidget.cpp" line="404"/> + <location filename="sessionwidget.cpp" line="310"/> + <location filename="sessionwidget.cpp" line="411"/> <source>New session</source> <translation>Neue Sitzung</translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> + <location filename="sessionwidget.cpp" line="129"/> <source>Connect to local desktop</source> <translation>Zugriff auf lokalen Desktop</translation> </message> <message> - <location filename="sessionwidget.cpp" line="275"/> - <location filename="sessionwidget.cpp" line="392"/> + <location filename="sessionwidget.cpp" line="279"/> + <location filename="sessionwidget.cpp" line="399"/> <source>XDMCP server:</source> <translation>XDMCP Server:</translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> + <location filename="sessionwidget.cpp" line="128"/> <source>XDMCP</source> <translation>XDMCP</translation> </message> <message> - <location filename="sessionwidget.cpp" line="227"/> + <location filename="sessionwidget.cpp" line="231"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="sessionwidget.cpp" line="228"/> + <location filename="sessionwidget.cpp" line="232"/> <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>x2goclient befindet sich im portablen Ausführungsmodus. Wenn Sie einen Pfad ausserhalb des USB Geräts wählen, können sie auf die Daten nicht von überall aus zugreifen.</translation> </message> @@ -2611,112 +2707,132 @@ Beispiel: <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="33"/> - <location filename="settingswidget.cpp" line="37"/> + <location filename="settingswidget.cpp" line="40"/> + <location filename="settingswidget.cpp" line="44"/> <source>&Display</source> <translation>&Display</translation> </message> <message> - <location filename="settingswidget.cpp" line="34"/> - <location filename="settingswidget.cpp" line="38"/> + <location filename="settingswidget.cpp" line="41"/> + <location filename="settingswidget.cpp" line="45"/> <source>&Keyboard</source> <translation>&Tastatur</translation> </message> <message> - <location filename="settingswidget.cpp" line="35"/> - <location filename="settingswidget.cpp" line="39"/> + <location filename="settingswidget.cpp" line="42"/> + <location filename="settingswidget.cpp" line="46"/> <source>Sound</source> <translation>Audio</translation> </message> <message> - <location filename="settingswidget.cpp" line="50"/> + <location filename="settingswidget.cpp" line="57"/> <source>Fullscreen</source> <translation>Vollbild</translation> </message> <message> - <location filename="settingswidget.cpp" line="52"/> + <location filename="settingswidget.cpp" line="59"/> <source>Custom</source> <translation>Eigener</translation> </message> <message> - <location filename="settingswidget.cpp" line="54"/> + <location filename="settingswidget.cpp" line="61"/> <source>Window</source> <translation>Fenster</translation> </message> <message> - <location filename="settingswidget.cpp" line="61"/> + <location filename="settingswidget.cpp" line="63"/> + <source>Use whole display</source> + <translation>Benytt hele skjermen</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="71"/> <source>Set display DPI</source> - <translation>Auflösung festlegen (DPI)</translation> + <translation>DPI Auflösung festlegen</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="76"/> + <source>Xinerama extension (support for two or more physical displays)</source> + <translation>Xinerama utvidelsen (støtte for to, eller flere fysiske skjermer)</translation> </message> <message> - <location filename="settingswidget.cpp" line="79"/> + <location filename="settingswidget.cpp" line="92"/> <source>Width:</source> <translation>Breite:</translation> </message> <message> - <location filename="settingswidget.cpp" line="82"/> + <location filename="settingswidget.cpp" line="95"/> <source>Height:</source> <translation>Höhe:</translation> </message> <message> - <location filename="settingswidget.cpp" line="101"/> + <location filename="settingswidget.cpp" line="102"/> + <source>&Display:</source> + <translation>&Skjerm:</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="104"/> + <source>&Identify all displays</source> + <translation>&Identifiser alle skjermer</translation> + </message> + <message> + <location filename="settingswidget.cpp" line="142"/> <source>Keep current keyboard Settings</source> <translation>Tastaturlayout behalten</translation> </message> <message> - <location filename="settingswidget.cpp" line="111"/> + <location filename="settingswidget.cpp" line="152"/> <source>Keyboard layout:</source> <translation>Tastaturlayout:</translation> </message> <message> - <location filename="settingswidget.cpp" line="113"/> + <location filename="settingswidget.cpp" line="154"/> <source>Keyboard model:</source> <translation>Tastatur:</translation> </message> <message> - <location filename="settingswidget.cpp" line="124"/> + <location filename="settingswidget.cpp" line="165"/> <source>Enable sound support</source> <translation>Audiounterstützung aktivieren</translation> </message> <message> - <location filename="settingswidget.cpp" line="133"/> + <location filename="settingswidget.cpp" line="174"/> <source>Start sound daemon</source> <translation>Starte Sound Server</translation> </message> <message> - <location filename="settingswidget.cpp" line="135"/> + <location filename="settingswidget.cpp" line="176"/> <source>Use running sound daemon</source> <translation>Benutze existierenden Sound Server</translation> </message> <message> - <location filename="settingswidget.cpp" line="137"/> + <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation>Benutze Port-Weiterleitung über Tunnel + <translation>Benutze Port Weiterleitung über Tunnel um Audiosignale über Firewalls zu verbinden</translation> </message> <message> - <location filename="settingswidget.cpp" line="139"/> + <location filename="settingswidget.cpp" line="180"/> <source>Use default sound port</source> <translation>Benutze standard Audio Port</translation> </message> <message> - <location filename="settingswidget.cpp" line="146"/> + <location filename="settingswidget.cpp" line="187"/> <source>Sound port:</source> <translation>Audio Port:</translation> </message> <message> - <location filename="settingswidget.cpp" line="173"/> + <location filename="settingswidget.cpp" line="214"/> <source>Client side printing support</source> <translation>Clientseitige Druckunterstützung</translation> </message> <message> - <location filename="settingswidget.cpp" line="440"/> + <location filename="settingswidget.cpp" line="554"/> <source>us</source> <translation>de</translation> </message> <message> - <location filename="settingswidget.cpp" line="441"/> + <location filename="settingswidget.cpp" line="555"/> <source>pc105/us</source> <translation>pc105/de</translation> </message> @@ -2757,7 +2873,7 @@ sound system connections through firewalls</source> <message> <location filename="sharewidget.cpp" line="95"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> + <translation>Benutze SSH Port Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation> </message> <message> <location filename="sharewidget.cpp" line="158"/> @@ -2805,97 +2921,100 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="100"/> + <location filename="sshmasterconnection.cpp" line="117"/> <source>Can not initialize libssh</source> - <translation type="unfinished"></translation> + <translatorcomment>I need to revisit the word 'initiere', a better word could be 'klargjøre'</translatorcomment> + <translation>Klarer ikke å initiere libssh</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="120"/> + <location filename="sshmasterconnection.cpp" line="137"/> <source>Can not create ssh session</source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å opprette ssh sesjon</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="135"/> + <location filename="sshmasterconnection.cpp" line="152"/> <source>Can not connect to </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å koble til </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="171"/> + <location filename="sshmasterconnection.cpp" line="193"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>Autentisering feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="187"/> + <location filename="sshmasterconnection.cpp" line="209"/> <source>channel_forward_listen failed</source> - <translation type="unfinished"></translation> + <translatorcomment>I'm not sure if this is a static variable which shouldn't be translated or not, but I left it as I believe it's a variable.</translatorcomment> + <translation>channel_forward_listen feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="498"/> + <location filename="sshmasterconnection.cpp" line="523"/> <source>Can not open file </source> - <translation type="unfinished"></translation> + <translation>Kan ikke åpne filen </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="510"/> + <location filename="sshmasterconnection.cpp" line="535"/> <source>Can not create remote file </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å opprette fil over nettverket </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="523"/> + <location filename="sshmasterconnection.cpp" line="548"/> <source>Can not write to remote file </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å skrive til filen over nettverket </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="573"/> + <location filename="sshmasterconnection.cpp" line="598"/> <source>can not connect to </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å koble til </translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="682"/> + <location filename="sshmasterconnection.cpp" line="707"/> <source>channel_open_forward failed</source> - <translation type="unfinished"></translation> + <translation>channel_open_forward feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="701"/> + <location filename="sshmasterconnection.cpp" line="726"/> <source>channel_open_session failed</source> - <translation type="unfinished"></translation> + <translation>channel_open_session feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="708"/> + <location filename="sshmasterconnection.cpp" line="733"/> <source>channel_request_exec failed</source> - <translation type="unfinished"></translation> + <translation>channel_request_exec feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="773"/> + <location filename="sshmasterconnection.cpp" line="798"/> <source>error writing to socket</source> - <translation type="unfinished"></translation> + <translatorcomment>Really not any great words to best translate socket into...</translatorcomment> + <translation>feil ved skriving til sokkelen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="791"/> + <location filename="sshmasterconnection.cpp" line="816"/> <source>error reading channel</source> - <translation type="unfinished"></translation> + <translation>feil under lesing av kanalen</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="821"/> + <location filename="sshmasterconnection.cpp" line="846"/> <source>channel_write failed</source> - <translation type="unfinished"></translation> + <translation>channel_write feilet</translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="833"/> + <location filename="sshmasterconnection.cpp" line="858"/> <source>error reading tcp socket</source> - <translation type="unfinished"></translation> + <translation>feil ved lesing av tcp sokkelen</translation> </message> </context> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="92"/> + <location filename="sshprocess.cpp" line="97"/> <source>Error creating socket</source> - <translation type="unfinished"></translation> + <translation>feil under opprettelse av sokkelen</translation> </message> <message> - <location filename="sshprocess.cpp" line="110"/> + <location filename="sshprocess.cpp" line="115"/> <source>Error binding </source> - <translation type="unfinished"></translation> + <translation>Feil ved binding </translation> </message> </context> <context> @@ -2903,12 +3022,12 @@ sound system connections through firewalls</source> <message> <location filename="xsettingswidget.cpp" line="50"/> <source>Open File</source> - <translation type="unfinished"></translation> + <translation>Åpne fil</translation> </message> <message> <location filename="xsettingswidget.cpp" line="52"/> <source>Executable (*.exe)</source> - <translation type="unfinished"></translation> + <translation>Programfil (*.exe)</translation> </message> </context> <context> @@ -2916,62 +3035,65 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="14"/> <source>Form</source> - <translation type="unfinished">Form</translation> + <translation>Skjema</translation> </message> <message> <location filename="xsettingsui.ui" line="27"/> <source>You must restart the X2Go Client for the changes to take effect</source> - <translation type="unfinished"></translation> + <translation>Du må restarte X2Go klienten for at endringene skal tre i kraft</translation> </message> <message> <location filename="xsettingsui.ui" line="50"/> <source>use integrated X-Server</source> - <translation type="unfinished"></translation> + <translation>Benytt integrert X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="60"/> <source>use custom X-Server</source> - <translation type="unfinished"></translation> + <translation>Benytt egentilpasset X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="70"/> <source>custom X-Server</source> - <translation type="unfinished"></translation> + <translation>egentilpasset X-Server</translation> </message> <message> <location filename="xsettingsui.ui" line="78"/> <source>executable:</source> - <translation type="unfinished"></translation> + <translation>programfil:</translation> </message> <message> <location filename="xsettingsui.ui" line="101"/> <source>start X-Server on X2Go client start</source> - <translation type="unfinished"></translation> + <translation>start X-Serveren når X2Go klienten startes</translation> </message> <message> <location filename="xsettingsui.ui" line="113"/> <source>command line options:</source> - <translation type="unfinished"></translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>kommandolinjevalg</translation> </message> <message> <location filename="xsettingsui.ui" line="125"/> <source>X-Server command line options</source> - <translation type="unfinished"></translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>X-Server kommandolinjevalg</translation> </message> <message> <location filename="xsettingsui.ui" line="131"/> <source>window mode:</source> - <translation type="unfinished"></translation> + <translation>Vindus-modus:</translation> </message> <message> <location filename="xsettingsui.ui" line="141"/> <source>fullscreen mode:</source> - <translation type="unfinished"></translation> + <translation>fullskjerm-modus:</translation> </message> <message> <location filename="xsettingsui.ui" line="151"/> <source>single application:</source> - <translation type="unfinished"></translation> + <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment> + <translation>enkeltapplikasjon:</translation> </message> </context> <context> 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.0.99.10-9-g745b2b2
by git-admin＠x2go.org 13 Feb '12

13 Feb '12

The branch, master has been updated via 745b2b21be2df3a91bf8c0870054cbc2138b37e1 (commit) from 53ce826d7ea804ca27c03e382571bdf5f54ed974 (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 745b2b21be2df3a91bf8c0870054cbc2138b37e1 Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Mon Feb 13 20:17:43 2012 +0100 Use ,,${MAKE}'' instead of ,,make'' in Makefile. ----------------------------------------------------------------------- Summary of changes: Makefile.docupload | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/Makefile.docupload b/Makefile.docupload index 70dfc1c..8c9e770 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -15,7 +15,7 @@ all: doc doc: clean docbuild docupload docbuild: - make -f Makefile build_man2html + ${MAKE} -f Makefile build_man2html docupload: ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_x2goserver}; rm -Rfv ${DOC_PATCH_x2goserver}/*; }" diff --git a/debian/changelog b/debian/changelog index aea7a3b..159a8f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low [ Jan Engelhardt ] * New upstream version (3.1.0.0): - Use /cgi-bin/man/ path in web'ified man pages. + - Use ,,${MAKE}'' instead of ,,make'' in Makefile. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 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 - master (branch) updated: 3.0.99.10-9-g52b8c82
by git-admin＠x2go.org 13 Feb '12

13 Feb '12

The branch, master has been updated via 52b8c8294c461f9ee3a9311074bc4453833818a2 (commit) via 53ce826d7ea804ca27c03e382571bdf5f54ed974 (commit) from b9ece48b618177723721afd452e506bfe521adc5 (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 52b8c8294c461f9ee3a9311074bc4453833818a2 Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Mon Feb 13 20:17:43 2012 +0100 Use ,,'' instead of ,,make'' in Makefile. commit 53ce826d7ea804ca27c03e382571bdf5f54ed974 Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Mon Feb 13 20:00:00 2012 +0100 Use /cgi-bin/man/ path in web'ified man pages. ----------------------------------------------------------------------- Summary of changes: Makefile.docupload | 2 +- debian/changelog | 5 +++++ x2goserver-compat/Makefile | 2 +- x2goserver-extensions/Makefile | 2 +- x2goserver-printing/Makefile | 2 +- x2goserver-pyhoca/Makefile | 2 +- x2goserver-xsession/Makefile | 2 +- x2goserver/Makefile | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/Makefile.docupload b/Makefile.docupload index 70dfc1c..8c9e770 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -15,7 +15,7 @@ all: doc doc: clean docbuild docupload docbuild: - make -f Makefile build_man2html + ${MAKE} -f Makefile build_man2html docupload: ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_x2goserver}; rm -Rfv ${DOC_PATCH_x2goserver}/*; }" diff --git a/debian/changelog b/debian/changelog index 748b3cb..159a8f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,11 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Only run kdialog/zenity from x2goumount-session if either of them exists in the system's $PATH. + [ Jan Engelhardt ] + * New upstream version (3.1.0.0): + - Use /cgi-bin/man/ path in web'ified man pages. + - Use ,,${MAKE}'' instead of ,,make'' in Makefile. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index 576f9ce..6bdc94c 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 02a9525..2fe807c 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 04f93bf..28ee92a 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index aa6a562..8fc06fa 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -41,7 +41,7 @@ build-arch: build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 741ec99..7a56c87 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -43,7 +43,7 @@ build-arch: build_man2html: # mkdir -p $(MAN2HTML_DEST) # for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done -# for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done +# for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html diff --git a/x2goserver/Makefile b/x2goserver/Makefile index d934497..c90f1c9 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -44,7 +44,7 @@ build-indep: build_man2html build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_arch clean_man2html 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits