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 <ionic@ionic.de> 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