[X2Go-Commits] Jenkins build is back to normal : x2goclient+nightly+debian-jessie #445

2017-02-24 Thread jenkins
http://jenkins.x2go.org:8080/job/x2goclient+nightly+debian-jessie/445/
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goserver] 01/01: debian/po: translate DebConf templates to Finnish.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 78ff3166e539c50772651e3bd8a294d9e22bb370
Author: Martti Pitkänen 
Date:   Sat Feb 25 08:36:52 2017 +0100

debian/po: translate DebConf templates to Finnish.
---
 debian/changelog |4 
 debian/po/fi.po  |   53 +
 2 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b976d0..23ce919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
 - Add mandatory perl-generators Build-Requires as per
   https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
 
+  [ Martti Pitkänen ]
+  * debian/po:
+- Translate DebConf templates to Finnish.
+
  -- X2Go Release Manager   Sun, 20 Nov 2016 12:54:13 +0100
 
 x2goserver (4.0.1.20-0x2go1) unstable; urgency=low
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 000..bb58025
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,53 @@
+#
+#Translators, if you are not familiar with the PO format, gettext
+#documentation is worth reading, especially sections dedicated to
+#this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+#Some information specific to po-debconf are available at
+#/usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: X2Go\n"
+"Report-Msgid-Bugs-To: x2goser...@packages.debian.org\n"
+"POT-Creation-Date: 2012-09-20 23:46+0200\n"
+"PO-Revision-Date: 2017-02-24 13:43+0200\n"
+"Last-Translator: Martti Pitk�nen \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"Language: fi\n"
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid "X2Go Server / PostgreSQL Upgrade"
+msgstr "X2Go Server / PostgreSQL Upgrade"
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid ""
+"You have configured X2Go Server with PostgreSQL as session DB backend and "
+"you are upgrading x2goserver from a version minor to 3.1.0.0."
+msgstr ""
+"Olet m��ritellyt X2Go Serverille tietokantapalvelimeksi PostgreSQLn ja olet "
+"p�ivitt�m�ss� X2Go serveri� alemmasta versiosta kuin 3.1.0.0."
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid ""
+"Please follow these PostgreSQL DB upgrade instructions before you continue "
+"using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-"
+"database.gz"
+msgstr ""
+"Lue n�m� ohjeet ennenkuin jatkat X2Go Serverin k�ytt��: /usr/share/doc/"
+"x2goserver/README.upgrade-pgsql-database.gz"

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] branch release/4.0.1.x updated (4aaa201 -> 78ff316)

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.0.1.x
in repository x2goserver.

  from  4aaa201   x2goserver.spec: add mandatory perl-generators 
Build-Requires as per 
https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
   new  78ff316   debian/po: translate DebConf templates to Finnish.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |4 
 debian/po/fi.po  |   53 +
 2 files changed, 57 insertions(+)
 create mode 100644 debian/po/fi.po

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 01/01: src/x2ogutils.h: guard UNUSED macro definition.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 6792724a01bf1ed0c54230eb63b78d656eb9c21a
Author: Mihai Moldovan 
Date:   Sat Feb 25 06:35:52 2017 +0100

src/x2ogutils.h: guard UNUSED macro definition.
---
 debian/changelog |1 +
 src/x2goutils.h  |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 101079f..d0bb1ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -119,6 +119,7 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   files, coming up next.
 - res/i18n/x2goclient_*.ts: regenerate translation files and fix up some
   SSH and PulseManager messages manually, where possible.
+- src/x2ogutils.h: guard UNUSED macro definition.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/x2goutils.h b/src/x2goutils.h
index 41099e2..68684f0 100644
--- a/src/x2goutils.h
+++ b/src/x2goutils.h
@@ -23,7 +23,9 @@
 #include 
 #include 
 
+#ifndef UNUSED
 #define UNUSED(x) do { (void) x; } while (0)
+#endif
 
 QString expandHome (QString path);
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 17/18: src/pulsemanager.cpp: deduplicate warning/error messages - make use of show_startup_warning ().

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit a0ae3bc28afd04a8e5374e2c2d76177153e1097b
Author: Mihai Moldovan 
Date:   Sat Feb 25 05:07:13 2017 +0100

src/pulsemanager.cpp: deduplicate warning/error messages - make use of 
show_startup_warning ().

This does imply changes to the translation files, coming up next.
---
 debian/changelog |3 +++
 src/pulsemanager.cpp |   24 +++-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b706f4..e4f1d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -114,6 +114,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   could not be found in the constructor. We can live without PA and will
   show a warning message to the user later on when PA is supposed to be
   started.
+- src/pulsemanager.cpp: deduplicate warning/error messages - make use of
+  show_startup_warning (). This does imply changes to the translation
+  files, coming up next.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 69d909a..0a3e193 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -247,17 +247,14 @@ void PulseManager::start_generic () {
 QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
   }
 }
+else {
+  x2goErrorf (27) << "PulseAudio failed to start! Sound support will not 
be available.";
+  show_startup_warning ();
+}
   }
   else {
-x2goErrorf (27) << "PulseAudio failed to start! Sound support will not be 
available.";
-show_RichText_WarningMsgBox (tr ("PulseAudio failed to start!"),
- tr ("Sound support will not be available.\n\n"
- "If you downloaded the bundled, 
pre-compiled version from the official home page, "
- "please report a bug on:\n"
- "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
-   
"https://wiki.x2go.org/doku.php/wiki:bugs;
- "\n"),
- true);
+x2goErrorf (31) << "PulseAudio not detected on system! Sound support will 
not be available.";
+show_startup_warning ();
   }
 }
 
@@ -770,14 +767,7 @@ void PulseManager::slot_play_startup_sound () {
 }
 else {
   x2goErrorf (26) << "Unable to play startup sound! Something may be 
wrong.";
-  show_RichText_WarningMsgBox (tr ("Unable to play startup sound."),
-   tr ("If you downloaded the bundled, 
pre-compiled version from the official home page "
-   "or the upstream Linux packages, "
-   "please report a bug on:\n"
-   "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
- 
"https://wiki.x2go.org/doku.php/wiki:bugs;
-   "\n"),
-   true);
+  show_startup_warning (true);
 }
   }
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 16/18: src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary could not be found in the constructor.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3fc1b2f4848d099736f25e0fae28b61d064b61ed
Author: Mihai Moldovan 
Date:   Sat Feb 25 05:05:22 2017 +0100

src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary could 
not be found in the constructor.

We can live without PA and will show a warning message to the user later
on when PA is supposed to be started.
---
 debian/changelog |4 
 src/pulsemanager.cpp |   12 
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2685967..7b706f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -110,6 +110,10 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   and (debug) startup sound playback.
 - src/pulsemanager.cpp: check server_binary_ before using it and jump over
   code that assumes the PA server binary to be available.
+- src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary
+  could not be found in the constructor. We can live without PA and will
+  show a warning message to the user later on when PA is supposed to be
+  started.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 29bf439..69d909a 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -123,18 +123,6 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
   }
 #endif /* QT_VERSION < 0x05 */
 
-  if (server_binary_.isEmpty ()) {
-x2goErrorf (29) << "Unable to find the PulseAudio binary. Neither bundled, 
nor found in $PATH nor additional directories.";
-show_RichText_ErrorMsgBox (tr ("Unable to find the PulseAudio binary. 
Neither bundled, nor found in $PATH nor additional directories."),
-   tr ("If you downloaded the bundled, 
pre-compiled version from the official home page, "
-   "please report a bug on:\n"
-   "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
- "https://wiki.x2go.org/doku.php/wiki:bugs;
-   "\n"),
-   true);
-abort ();
-  }
-
   if (!(server_binary_.isEmpty ())) {
 QFileInfo tmp_file_info = QFileInfo (server_binary_);
 server_working_dir_ = tmp_file_info.canonicalPath ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 13/18: src/pulsemanager.cpp: make fetch_pulseaudio_version () more resilient.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 6606f4bafee53ac5293d52366aa41e15ae1c6759
Author: Mihai Moldovan 
Date:   Sat Feb 25 04:55:27 2017 +0100

src/pulsemanager.cpp: make fetch_pulseaudio_version () more resilient.

Instead of aborting hard when the version number could not be detected,
break out of the loops only.

We can make stuff work, even if the version is unknown.

Or just continue without PA support as such.
---
 debian/changelog |4 
 src/pulsemanager.cpp |   25 +
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2830d7..e6a1392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,10 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.{cpp,h}: add new pulse_version_valid_ boolean class
   member variable, set it correctly and use it whenever the version is
   accessed.
+- src/pulsemanager.cpp: make fetch_pulseaudio_version () more resilient.
+  Instead of aborting hard when the version number could not be detected,
+  break out of the loops only. We can make stuff work, even if the version
+  is unknown. Or just continue without PA support as such.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 5805099..6442b19 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -365,6 +365,8 @@ void PulseManager::fetch_pulseaudio_version () {
   tmp_server.setWorkingDirectory (server_working_dir_);
   tmp_server.start (server_binary_, args);
 
+  bool stop_processing = false;
+
   /* Wait until the process exited again. */
   if (tmp_server.waitForFinished ()) {
 /* Read stdout and split it up on newlines. */
@@ -373,7 +375,7 @@ void PulseManager::fetch_pulseaudio_version () {
 QStringList stdout_list (stdout_data.split ("\n"));
 
 bool found = false;
-for (QStringList::const_iterator cit = stdout_list.begin (); cit != 
stdout_list.end (); ++cit) {
+for (QStringList::const_iterator cit = stdout_list.begin (); (cit != 
stdout_list.end ()) && (!stop_processing); ++cit) {
   /* Remove trailing whitespace, mostly carriage returns on Windows. */
   QString tmp_str (*cit);
   tmp_str = tmp_str.trimmed ();
@@ -390,7 +392,7 @@ void PulseManager::fetch_pulseaudio_version () {
 bool numbers_skip[3] = { false, false, false };
 QString tmp_remaining_str = QString ("");
 QString numbers[3] = { };
-for (QString::const_iterator cit = tmp_str.begin (); cit != 
tmp_str.end (); ++cit) {
+for (QString::const_iterator cit = tmp_str.begin (); (cit != 
tmp_str.end ()) && (!stop_processing); ++cit) {
   if (!(numbers_finished[0])) {
 if (((*cit) >= '0') && ((*cit) <= '9')) {
   numbers[0].append (*cit);
@@ -418,7 +420,7 @@ void PulseManager::fetch_pulseaudio_version () {
  tr ("Unexpected character found when 
parsing version string for major version number")
  + ": '" + QString (*cit) + "'.",
  true);
-  abort ();
+  stop_processing = true;
 }
   }
   else if ((!(numbers_finished[1])) && (!(numbers_skip[1]))) {
@@ -443,7 +445,7 @@ void PulseManager::fetch_pulseaudio_version () {
  tr ("Unexpected character found when 
parsing version string for minor version number")
  + ": '" + QString (*cit) + "'.",
  true);
-  abort ();
+  stop_processing = true;
 }
   }
   else if ((!(numbers_finished[2])) && (!(numbers_skip[2]))) {
@@ -461,7 +463,7 @@ void PulseManager::fetch_pulseaudio_version () {
  tr ("Unexpected character found when 
parsing version string for micro version number")
  + ": '" + QString (*cit) + "'.",
  true);
-  abort ();
+  stop_processing = true;
 }
   }
   else {
@@ -476,7 +478,7 @@ void PulseManager::fetch_pulseaudio_version () {
  tr ("Supposed to skip major version 
number. "
  "Something is wrong."),
  true);
-  abort ();
+  stop_processing = true;
 }
 
 /* not skipping   and  ((met period or dash) or (have something to 
convert and met EOL)) */
@@ -489,7 +491,7 @@ void PulseManager::fetch_pulseaudio_version () {
 show_RichText_ErrorMsgBox (tr ("Error 

[X2Go-Commits] [x2goclient] 15/18: src/pulsemanager.cpp: check server_binary_ before using it and jump over code that assumes the PA server binary to be available.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 9609888276207da5cbdf62df29aeaf7b9cd19753
Author: Mihai Moldovan 
Date:   Sat Feb 25 05:03:45 2017 +0100

src/pulsemanager.cpp: check server_binary_ before using it and jump over 
code that assumes the PA server binary to be available.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   52 --
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 321e641..2685967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   is unknown. Or just continue without PA support as such.
 - src/pulsemanager.{cpp,h}: add show_startup_warning () for both PA server
   and (debug) startup sound playback.
+- src/pulsemanager.cpp: check server_binary_ before using it and jump over
+  code that assumes the PA server binary to be available.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 67d78b4..29bf439 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -135,11 +135,13 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
 abort ();
   }
 
-  QFileInfo tmp_file_info = QFileInfo (server_binary_);
-  server_working_dir_ = tmp_file_info.canonicalPath ();
+  if (!(server_binary_.isEmpty ())) {
+QFileInfo tmp_file_info = QFileInfo (server_binary_);
+server_working_dir_ = tmp_file_info.canonicalPath ();
 
-  x2goDebug << "Found PA binary as " << server_binary_;
-  x2goDebug << "Corresponding working dir: " << server_working_dir_;
+x2goDebug << "Found PA binary as " << server_binary_;
+x2goDebug << "Corresponding working dir: " << server_working_dir_;
+  }
 
 #elif defined (Q_OS_WIN)
   server_working_dir_ = QString (app_dir_ + "/pulse/");
@@ -182,7 +184,9 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
   buf = ptr = NULL;
 #endif // defined (Q_OS_DARWIN)
 
-  fetch_pulseaudio_version ();
+  if (!(server_binary_.isEmpty ())) {
+fetch_pulseaudio_version ();
+  }
 }
 
 PulseManager::~PulseManager () {
@@ -223,35 +227,37 @@ void PulseManager::start_generic () {
   pulse_server_->setProcessEnvironment (env_);
   pulse_server_->setWorkingDirectory (server_working_dir_);
 
-  pulse_server_->start (server_binary_, server_args_);
+  if (!(server_binary_.isEmpty ())) {
+pulse_server_->start (server_binary_, server_args_);
 
-  /*
-   * We may wait here, because PulseManager runs in a separate thread.
-   * Otherwise, we'd better use signals and slots to not block the main thread.
-   */
-  if (pulse_server_->waitForStarted (-1)) {
-x2goDebug << "pulse started with arguments " << server_args_ << "- waiting 
for it to finish...";
-state_ = QProcess::Running;
+/*
+ * We may wait here, because PulseManager runs in a separate thread.
+ * Otherwise, we'd better use signals and slots to not block the main 
thread.
+ */
+if (pulse_server_->waitForStarted (-1)) {
+  x2goDebug << "pulse started with arguments " << server_args_ << "- 
waiting for it to finish...";
+  state_ = QProcess::Running;
 
-connect (pulse_server_, SIGNAL (finished (int)),
- this,  SLOT (slot_on_pulse_finished (int)));
+  connect (pulse_server_, SIGNAL (finished (int)),
+   this,  SLOT (slot_on_pulse_finished (int)));
 
-env_.insert ("PULSE_SERVER", "127.0.0.1:" + QString::number (pulse_port_));
+  env_.insert ("PULSE_SERVER", "127.0.0.1:" + QString::number 
(pulse_port_));
 
 
-QString clean_pulse_dir = pulse_dir_.absolutePath ();
+  QString clean_pulse_dir = pulse_dir_.absolutePath ();
 
 #ifdef Q_OS_WIN
-clean_pulse_dir = wapiShortFileName (clean_pulse_dir);
+  clean_pulse_dir = wapiShortFileName (clean_pulse_dir);
 #endif /* defined (Q_OS_WIN) */
 
-QString tmp_auth_cookie = QDir::toNativeSeparators (clean_pulse_dir + 
"/.pulse-cookie");
+  QString tmp_auth_cookie = QDir::toNativeSeparators (clean_pulse_dir + 
"/.pulse-cookie");
 
-env_.insert ("PULSE_COOKIE", tmp_auth_cookie);
+  env_.insert ("PULSE_COOKIE", tmp_auth_cookie);
 
-if (debug_) {
-  // Give PA a little time to come up.
-  QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
+  if (debug_) {
+// Give PA a little time to come up.
+QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
+  }
 }
   }
   else {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 14/18: src/pulsemanager.{cpp, h}: add show_startup_warning () for both PA server and (debug) startup sound playback.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 54efae521a3ac02fc5064fc064f3592ec19f8f64
Author: Mihai Moldovan 
Date:   Sat Feb 25 04:57:50 2017 +0100

src/pulsemanager.{cpp,h}: add show_startup_warning () for both PA server 
and (debug) startup sound playback.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   20 
 src/pulsemanager.h   |2 ++
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e6a1392..321e641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,6 +106,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   Instead of aborting hard when the version number could not be detected,
   break out of the loops only. We can make stuff work, even if the version
   is unknown. Or just continue without PA support as such.
+- src/pulsemanager.{cpp,h}: add show_startup_warning () for both PA server
+  and (debug) startup sound playback.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 6442b19..67d78b4 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -931,3 +931,23 @@ void PulseManager::restart () {
 QProcess::ProcessState PulseManager::state () {
   return (state_);
 }
+
+void PulseManager::show_startup_warning (bool play_startup_sound) const {
+  QString main_text, informative_text;
+
+  if (!(play_startup_sound)) {
+main_text = tr ("Unable to play startup sound.");
+  }
+  else {
+main_text = tr ("PulseAudio failed to start!");
+informative_text = tr ("Sound support will not be available.") + "\n\n";
+  }
+
+  informative_text += tr ("If you downloaded the bundled, pre-compiled version 
from the official home page "
+  "or the upstream Linux packages, please report a bug 
on:\n"
+  "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
+"https://wiki.x2go.org/doku.php/wiki:bugs;
+  "\n");
+
+  show_RichText_WarningMsgBox (main_text, informative_text, true);
+}
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 5c852ed..c9359d7 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -90,6 +90,8 @@ class PulseManager: public QObject {
 
 bool is_server_running () const;
 
+void show_startup_warning (bool play_startup_sound = false) const;
+
 
   private slots:
 void slot_on_pulse_finished (int exit_code);

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 12/18: src/pulsemanager.{cpp, h}: add new pulse_version_valid_ boolean class member variable, set it correctly and use it whenever the version is accessed.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3030702728bb27d5f2e6e0b83b5ff04782f7cfdb
Author: Mihai Moldovan 
Date:   Sat Feb 25 04:53:19 2017 +0100

src/pulsemanager.{cpp,h}: add new pulse_version_valid_ boolean class member 
variable, set it correctly and use it whenever the version is accessed.
---
 debian/changelog |3 +++
 src/pulsemanager.cpp |   17 +++--
 src/pulsemanager.h   |1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aee212b..c2830d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -99,6 +99,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   XQuartz project homepage references, adapt translations.
 - src/pulsemanager.{cpp,h}: make get_* () functions const.
 - src/pulsemanager.{cpp,h}: make is_server_running () const.
+- src/pulsemanager.{cpp,h}: add new pulse_version_valid_ boolean class
+  member variable, set it correctly and use it whenever the version is
+  accessed.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index a5c164c..5805099 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -43,6 +43,7 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
 pulse_version_minor_ (0),
 pulse_version_micro_ (0),
 pulse_version_misc_ (""),
+pulse_version_valid_ (false),
 record_ (true),
 playback_ (true),
 debug_ (false),
@@ -272,6 +273,10 @@ void PulseManager::start_osx () {
<< "-F" << QDir::toNativeSeparators (pulse_dir_.absolutePath () 
+ "/config.pa");
 
   if (!system_pulse_) {
+if (!(pulse_version_valid_)) {
+  x2goDebug << "PulseAudio version number was not fetched successfully, 
data is invalid. Continuing anyway.";
+}
+
 server_args_ << "-p"
  << QDir::toNativeSeparators (QDir (app_dir_
 + "/../Frameworks/pulse-"
@@ -303,6 +308,11 @@ void PulseManager::start_win () {
  */
 #ifdef Q_OS_WIN
   server_args_ = QStringList ();
+
+  if (!(pulse_version_valid_)) {
+x2goDebug << "PulseAudio version number was not fetched successfully, data 
is invalid. Continuing anyway.";
+  }
+
   server_args_ << "--exit-idle-time=-1" << "-n"
<< "-F" << QDir::toNativeSeparators (QDir 
(pulse_dir_.absolutePath ()
   + 
"/config.pa").absolutePath ())
@@ -511,13 +521,16 @@ void PulseManager::fetch_pulseaudio_version () {
 show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version 
number!"),
tr ("Unable to convert micro version 
number string to integer."),
true);
-abort ();
+stop_processing = true;
   }
 }
 
 /* Misc version part will be set to the trailing string. */
 if (found) {
   pulse_version_misc_ = tmp_remaining_str;
+
+  pulse_version_valid_ = true;
+
   break;
 }
   }
@@ -607,7 +620,7 @@ bool PulseManager::generate_server_config () {
  * Tanu Kaskinen recommended we specify the absolute path instead.
  * The absolute path works with at least 5.0 and 6.0.
  */
-if (pulse_version_major_ > 2) {
+if ((!(pulse_version_valid_)) || (pulse_version_major_ > 2)) {
   QString clean_pulse_dir = pulse_dir_.absolutePath ();
 
 #ifdef Q_OS_WIN
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 38cc837..5c852ed 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -119,6 +119,7 @@ class PulseManager: public QObject {
 std::uint32_t pulse_version_minor_;
 std::uint32_t pulse_version_micro_;
 QString pulse_version_misc_;
+bool pulse_version_valid_;
 
 bool record_;
 bool playback_;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 09/18: {src/{configdialog, x2goutils}.cpp, res/i18n/x2goclient_*.ts}: change XQuartz project homepage references, adapt translations.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit b116007cae66b9397a3af1482d3cc8ad3034c45c
Author: Mihai Moldovan 
Date:   Fri Feb 24 15:05:17 2017 +0100

{src/{configdialog,x2goutils}.cpp,res/i18n/x2goclient_*.ts}: change XQuartz 
project homepage references, adapt translations.
---
 debian/changelog |2 ++
 res/i18n/x2goclient_da.ts|   10 --
 res/i18n/x2goclient_de.ts|   20 
 res/i18n/x2goclient_es.ts|   20 
 res/i18n/x2goclient_et.ts|   18 +++---
 res/i18n/x2goclient_fi.ts|   20 
 res/i18n/x2goclient_fr.ts|   20 
 res/i18n/x2goclient_nb_no.ts |   20 
 res/i18n/x2goclient_nl.ts|   20 
 res/i18n/x2goclient_pt.ts|   10 --
 res/i18n/x2goclient_ru.ts|   10 --
 res/i18n/x2goclient_sv.ts|   16 +++-
 res/i18n/x2goclient_tr.ts|   10 --
 res/i18n/x2goclient_zh_tw.ts |   10 --
 src/configdialog.cpp |   11 +--
 src/x2goutils.cpp|4 ++--
 16 files changed, 91 insertions(+), 130 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42246d1..3a77edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
 - src/onmainwindow.cpp: make the "not loading translator" message
   non-translatable, as it doesn't make a lot of sense to actually
   translate it.
+- {src/{configdialog,x2goutils}.cpp,res/i18n/x2goclient_*.ts}: change
+  XQuartz project homepage references, adapt translations.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts
index 046d73a..8f81727 100644
--- a/res/i18n/x2goclient_da.ts
+++ b/res/i18n/x2goclient_da.ts
@@ -341,14 +341,12 @@
 
 
 
-Your are using XQuartz (X Window System Server for OS X) 
version 
+Your are using XQuartz (X Window System Server for OS X) 
version %1.
 
 
 
 
-.
-
-This version causes problems with X applications in 24bit color mode.
+This version causes problems with X applications in 24bit 
color mode.
 You should update your X11 environment.
 
 MacPorts users please follow the steps outlined on:
@@ -356,7 +354,7 @@ MacPorts users please follow the steps outlined on:
 
 Users who have installed XQuartz via the installer package
 can find updated versions on:
-centera 
href=https://xquartz.macosforge.org/https://xquartz.macosforge.org//a/center;
+centera 
href=https://www.xquartz.org/https://www.xquartz.org//a/center;
 
 
 
@@ -3505,7 +3503,7 @@ Upon successful installation, please follow the 
instructions printed
 by the port utility to autostart/load the server.
 
 All other users, please obtain and install XQuartz from:
-centera 
href=https://xquartz.macosforge.org/https://xquartz.macosforge.org//a/center;
+centera 
href=https://www.xquartz.org/https://www.xquartz.org//a/center;
 
 Afterwards, restart X2Go Client and select the correct path
 to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index fa86157..5c2223c 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -504,14 +504,12 @@
 
 
 
-Your are using XQuartz (X Window System Server for OS X) 
version 
-Sie verwenden XQuartz (X-Window-System-Server für OS X) 
in der Version 
+Your are using XQuartz (X Window System Server for OS X) 
version %1.
+Sie verwenden XQuartz (X-Window-System-Server für OS X) 
in der Version %1.
 
 
 
-.
-
-This version causes problems with X applications in 24bit color mode.
+This version causes problems with X applications in 24bit 
color mode.
 You should update your X11 environment.
 
 MacPorts users please follow the steps outlined on:
@@ -519,10 +517,8 @@ MacPorts users please follow the steps outlined on:
 
 Users who have installed XQuartz via the installer package
 can find updated versions on:
-centera 
href=https://xquartz.macosforge.org/https://xquartz.macosforge.org//a/center;
-.
-
-Diese Version verursacht Probleme mit X-Anwendungen, wenn 24-Bit-Farbtiefe 
gesetzt sind.
+centera 
href=https://www.xquartz.org/https://www.xquartz.org//a/center;
+Diese Version verursacht Probleme mit X-Anwendungen, wenn 
24-Bit-Farbtiefe gesetzt sind.
 Sie sollten Ihre X11-Umgebung aktualisieren.
 
 MacPorts-Benutzer gehen bitte gemäß der folgenden Anleitung vor:
@@ -530,7 +526,7 @@ MacPorts-Benutzer gehen bitte gemäß der folgenden Anleitung 
vor:
 
 Benutzer, die XQuartz über das Installationspaket installiert haben,
 können aktualisierte Versionen hier herunterladen:

[X2Go-Commits] [x2goclient] 08/18: src/onmainwindow.cpp: make the "not loading translator" message non-translatable, as it doesn't make a lot of sense to actually translate it.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 4525afe53cf43fe3fd37870d41f4a79366bbdbd4
Author: Mihai Moldovan 
Date:   Fri Feb 24 13:39:12 2017 +0100

src/onmainwindow.cpp: make the "not loading translator" message 
non-translatable, as it doesn't make a lot of sense to actually translate it.
---
 debian/changelog |3 +++
 src/onmainwindow.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a929815..42246d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   as languages are unique in the number of plural forms and the like.
 - {src/printdialog.cpp,res/i18n/x2goclient_*.ts}: drop spurious left-over
   parenthesis in warning message and adapt translations.
+- src/onmainwindow.cpp: make the "not loading translator" message
+  non-translatable, as it doesn't make a lot of sense to actually
+  translate it.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 02bb3e6..dd6fa87 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -607,7 +607,7 @@ bool ONMainWindow::get_translator (QString file_name_start, 
QTranslator **transl
 for (QStringList::const_iterator it = ui_languages.constBegin (); it != 
ui_languages.constEnd (); ++it) {
 /* Respect English locales. Don't try to load any translation, because 
we do not ship nop-English translations. */
 if ((*it).startsWith ("en")) {
-x2goWarningf (1) << tr ("English language requested, not loading 
translator.");
+x2goWarningf (1) << "English language requested, not loading 
translator.";
 break;
 }
 else {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits


[X2Go-Commits] [x2goclient] 03/18: res/i18n/x2goclient_et.ts: various fixups for the Estonian translation file.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 36231da8093535fc63c71ef4d3f34dca3ba523ab
Author: Mihai Moldovan 
Date:   Fri Feb 24 12:41:22 2017 +0100

res/i18n/x2goclient_et.ts: various fixups for the Estonian translation file.
---
 debian/changelog  |2 +
 res/i18n/x2goclient_et.ts |  181 -
 2 files changed, 98 insertions(+), 85 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f535e60..e01d8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   value passed. Fixes startup problems in MacPorts.
 - src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is
   only available on Linux, so guard new section.
+- res/i18n/x2goclient_et.ts: various fixups for the Estonian translation
+  file.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index 8f82420..4727b70 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -330,7 +330,7 @@
 
 
 PulseAudio settings
-PulseAusio seaded
+PulseAudio seaded
 
 
 
@@ -345,7 +345,7 @@
 
 
 Your are using XQuartz (X Window System Server for OS X) 
version 
-Sa kasutad XQuartz (X Window System for OS X) versiooni 

+Sa kasutad XQuartz (X Window System Server for OS X) 
versiooni 
 
 
 
@@ -360,18 +360,17 @@ MacPorts users please follow the steps outlined on:
 Users who have installed XQuartz via the installer package
 can find updated versions on:
 centera 
href=https://xquartz.macosforge.org/https://xquartz.macosforge.org//a/center;
- 
+.
 
-See versioon põhjustab probleeme X aplikatsioonides 24 biti
-värviesitus reziimis.
-Sa peaksid värskendama oma X11 taristut ;-)
+See versioon põhjustab probleeme X aplikatsioonides 24 biti värviesitus 
reziimis.
+Sa peaksid värskendama oma X11 taristut.
 
-MacPorts kasutajad palun järgige alljärgnevaid juhiseid
+MacPorts kasutajad palun järgige alljärgnevaid juhiseid:
 centera 
href=https://guide.macports.org/chunked/using.common-tasks.htmlhttps://guide.macports.org/chunked/using.common-tasks.html/a/center;
 
 Kasutajad kes installeerisid XQuartzi kasutades installer 
package
 leiavad uuendatud versiooni:
-centera 
href=https://xquartz.macosforge.org/\https://xquartz.macosforge.org//a/center;
+centera 
href=https://xquartz.macosforge.org/https://xquartz.macosforge.org//a/center;
 
 
 
@@ -380,6 +379,7 @@ leiavad uuendatud versiooni:
 
 
 
+You probably should be trying to translate that, although I 
dont know how OS X calls Applications and 
Utilities in Estonian.
 You did not select a valid XQuartz application.
 Please try again.
 
@@ -387,7 +387,7 @@ Some standard installation locations may be:
 centerb/Applications/Utilities/X11.app/b/center
 
centerb/Applications/Utilities/XQuartz.app/b/center
 
centerb/Applications/MacPorts/X11.app/b/center
-
+
 
 
 X-Server settings
@@ -720,8 +720,9 @@ Some standard installation locations may be:
 
 
 
+Missing translation?
 Rename Folder ...
-
+
 
 
 
@@ -833,7 +834,7 @@ Some standard installation locations may be:
 
 
 Starts hidden (minimized to system tray where 
available.)
-Käivitub peidetult (minimiseeritult tegumiribale kus 
võimalik)
+Käivitub peidetult (minimiseeritult tegumiribale kus 
võimalik.)
 
 
 
@@ -868,12 +869,12 @@ Some standard installation locations may be:
 
 
 Adds RSA key fingerprint to .ssh/known_hosts if 
authenticity of the server cant be determined.
-Lisab RSA key sõrmejälje (fingerprint) 
\.ssh/known_hosts\ kui serveri audentsust ei ole võimalik 
määratleda.
+Lisab RSA key sõrmejälje (fingerprint) 
.ssh/known_hosts kui serveri audentsust ei ole võimalik 
määratleda.
 
 
 
 Starts with LDAP support. Example: 
--ldap=ldapserver:389:o=organization,c=de
-Alustab LDAP toega. Näiteks : 
--ldap=ldapserver:389:o=organization,c=de
+Alustab LDAP toega. Näiteks: 
--ldap=ldapserver:389:o=organization,c=ee
 
 
 
@@ -888,12 +889,12 @@ Some standard installation locations may be:
 
 
 Defines the remote SSH server port. Default: 22.
-Defineerib kaugarvuti SSH serveri pordi. Vaikimisi 
22.
+Defineerib kaugarvuti SSH serveri pordi. Vaikimisi: 
22.
 
 
 
 Defines the local machines SSH server port. Needed for 
Client-Side Printing and File Sharing support. Default: 22.
-Defineerib lokaalse seadme SSH serveri pordi. Vajalik 

[X2Go-Commits] [x2goclient] 07/18: {src/printdialog.cpp, res/i18n/x2goclient_*.ts}: drop spurious left-over parenthesis in warning message and adapt translations.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 85056d923095f25859d8bc404d1869db6a1a6890
Author: Mihai Moldovan 
Date:   Fri Feb 24 13:36:33 2017 +0100

{src/printdialog.cpp,res/i18n/x2goclient_*.ts}: drop spurious left-over 
parenthesis in warning message and adapt translations.
---
 debian/changelog |2 ++
 res/i18n/x2goclient_da.ts|2 +-
 res/i18n/x2goclient_de.ts|2 +-
 res/i18n/x2goclient_es.ts|2 +-
 res/i18n/x2goclient_et.ts|2 +-
 res/i18n/x2goclient_fi.ts|2 +-
 res/i18n/x2goclient_fr.ts|2 +-
 res/i18n/x2goclient_nb_no.ts |3 ++-
 res/i18n/x2goclient_nl.ts|5 +++--
 res/i18n/x2goclient_pt.ts|2 +-
 res/i18n/x2goclient_ru.ts|2 +-
 res/i18n/x2goclient_sv.ts|5 +++--
 res/i18n/x2goclient_tr.ts|2 +-
 res/i18n/x2goclient_zh_tw.ts |2 +-
 src/printdialog.cpp  |4 ++--
 15 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0603ef..a929815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   use correct plural forms in translations and split string up in a
   translation-friendly form. I'll leave translators to handle this beast,
   as languages are unique in the number of plural forms and the like.
+- {src/printdialog.cpp,res/i18n/x2goclient_*.ts}: drop spurious left-over
+  parenthesis in warning message and adapt translations.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts
index b4036cb..046d73a 100644
--- a/res/i18n/x2goclient_da.ts
+++ b/res/i18n/x2goclient_da.ts
@@ -3156,7 +3156,7 @@ du kan installere sshd med
 
 
 
-You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings)
+You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings
 
 
 
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index d12f045..fa86157 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -3895,7 +3895,7 @@ Bitte installieren Sie dort eine neuere Version des 
X2GoServer-Pakets.
 
 
-You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings)
+You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings
 Über die Clienteinstellungen (Menü - Einstellungen 
- Konfiguration) können Sie den Dialog wieder einblenden.
 
 
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index cea6fba..33e8c2c 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -3395,7 +3395,7 @@ puedes instalar sshd con
 
 
 
-You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings)
+You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings
 Puedes reactivar este diálogo dentro de las preferencia 
del cliente X2Go (Menú - Opciones - Preferencias)
 
 
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index d21891a..7e72101 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -3196,7 +3196,7 @@ võid installeerida selle kasutades käsku
 
 
 
-You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings)
+You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings
 Sa võid selle dialoogi uuesti taastada X2Go 
Client-Seadete menüüs. Kasuta menüüs: Valikud - Seaded)
 
 
diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts
index 6ceda75..3834656 100644
--- a/res/i18n/x2goclient_fi.ts
+++ b/res/i18n/x2goclient_fi.ts
@@ -3370,7 +3370,7 @@ voit asentaa sshd komennolla
 
 
 
-You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings)
+You may reactivate this dialog using the X2Go Client settings 
dialog. To do so, follow this path in the menu bar: Options - 
Settings
 Voit palauttaa takaisin tämän vaihtoehdon käyttäen X2Go 
asiakasohjelman asetuksia. Se onnistuu päävalikon toiminnnolla: Valinnat - 
Asetukset)
 
 
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index 

[X2Go-Commits] [x2goclient] 02/18: res/i18n/x2goclient_et.ts: update Estonian translation file.

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 483f036ea195ec46ab61d947c90da24a5061d228
Author: Robert Parts 
Date:   Fri Feb 24 09:00:33 2017 +0100

res/i18n/x2goclient_et.ts: update Estonian translation file.
---
 debian/changelog  |4 +
 res/i18n/x2goclient_et.ts |  575 ++---
 2 files changed, 332 insertions(+), 247 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a678c1a..f535e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,6 +83,10 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.1):
 - Add "direct XDMCP" functionality.
 
+  [ Robert Parts ]
+  * New upstream version (4.1.0.1):
+- res/i18n/x2goclient_et.ts: update Estonian translation file.
+
  -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
 
 x2goclient (4.1.0.0-0x2go1) unstable; urgency=medium
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index 93b19de..8f82420 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -193,12 +193,12 @@
 
 
 This value is in conflict with another option.
-
+See väärtus on konfliktis teiste 
väärtustega.
 
 
 
 Options conflict.
-
+Seadete konflikt.
 
 
 This value is in conflict with other option
@@ -251,7 +251,7 @@
 
 
 Socket operation timed out.
-
+Socket operatsioon Time Out.
 
 
 Socket operation timed out
@@ -325,27 +325,27 @@
 
 
 X.Org Server settings
-
+X.Org Serveri seaded
 
 
 
 PulseAudio settings
-
+PulseAusio seaded
 
 
 
 Disable sound input
-
+Keela heli väljund
 
 
 
 Your XQuartz version is too old.
-
+Sinu XQuartz versioon on liiga 
vana.
 
 
 
 Your are using XQuartz (X Window System Server for OS X) 
version 
-
+Sa kasutad XQuartz (X Window System for OS X) versiooni 

 
 
 
@@ -360,12 +360,23 @@ MacPorts users please follow the steps outlined on:
 Users who have installed XQuartz via the installer package
 can find updated versions on:
 centera 
href=https://xquartz.macosforge.org/https://xquartz.macosforge.org//a/center;
-
+ 
+
+See versioon põhjustab probleeme X aplikatsioonides 24 biti
+värviesitus reziimis.
+Sa peaksid värskendama oma X11 taristut ;-)
+
+MacPorts kasutajad palun järgige alljärgnevaid juhiseid
+centera 
href=https://guide.macports.org/chunked/using.common-tasks.htmlhttps://guide.macports.org/chunked/using.common-tasks.html/a/center;
+
+Kasutajad kes installeerisid XQuartzi kasutades installer 
package
+leiavad uuendatud versiooni:
+centera 
href=https://xquartz.macosforge.org/\https://xquartz.macosforge.org//a/center;
 
 
 
 No valid XQuartz application selected.
-
+Ühtegi lubatud XQuartz programmi ei ole 
valitud.
 
 
 
@@ -376,7 +387,7 @@ Some standard installation locations may be:
 centerb/Applications/Utilities/X11.app/b/center
 
centerb/Applications/Utilities/XQuartz.app/b/center
 
centerb/Applications/MacPorts/X11.app/b/center
-
+
 
 
 X-Server settings
@@ -466,12 +477,12 @@ Some standard installation locations may be:
 
 
 Input/Output
-
+Sisend/Väljund
 
 
 
 Media
-
+Media
 
 
 Settings
@@ -599,12 +610,12 @@ Some standard installation locations may be:
 
 
 Input/Output
-
+Sisend/Väljund
 
 
 
 Media
-
+Media
 
 
 
@@ -663,7 +674,7 @@ Some standard installation locations may be:
 
 
 Share Folders
-
+Jaga katalooge
 
 
 share folders
@@ -710,17 +721,17 @@ Some standard installation locations may be:
 
 
 Rename Folder ...
-
+
 
 
 
 Change Icon ...
-
+Vaheta ikooni ...
 
 
 
 Delete Folder ...
-
+Kustuta kataloog ...
 
 
 
@@ -755,7 +766,7 @@ Some standard installation locations may be:
 
 
 . Folder is not empty. Please remove the contents of 
this directory and try again.
-
+. Kataloog ei ole tühi. Palun eemalda kataloogi 
sisu ja proovi uuesti.
 
 
 . Folder is not empty. Please remove content of folder 
and try again.
@@ -777,217 +788,217 @@ Some standard installation locations may be:
 
 
 Shows this message.
-
+Näitab sedasama teadet.
 
 

[X2Go-Commits] [x2goclient] branch master updated (45d0f1b -> f34d0d3)

2017-02-24 Thread git-admin
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  45d0f1b   src/x2goutils.cpp: ensure that add_to_path () also 
processes the first value passed.
   new  f34d0d3 - Add "direct XDMCP" functionality.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |4 ++
 src/editconnectiondialog.cpp |6 +--
 src/editconnectiondialog.h   |2 +-
 src/onmainwindow.cpp |   85 +-
 src/sessionwidget.cpp|   41 +++--
 src/sessionwidget.h  |3 +-
 src/settingswidget.cpp   |  104 +-
 src/settingswidget.h |8 +++-
 8 files changed, 238 insertions(+), 15 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits