This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/general in repository x2goclient. commit 5b2c94a3f014550a212174c5f2b2e07c4a261203 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 25 21:17:38 2015 +0100 {onmainwindow.cpp,README.i18n}: fix localization -- resource strings were not correctly updated. --- README.i18n | 6 +++--- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.i18n b/README.i18n index 36b79bb..d2a9386 100644 --- a/README.i18n +++ b/README.i18n @@ -47,7 +47,7 @@ First, copy the file x2goclient_de.ts, for instance via the terminal. You can do this by running the following commands: -1. cd x2goclient/ +1. cd x2goclient/res/i18n 2. cp x2goclient_de.ts "x2goclient_da.ts <or what language your going to translate it into>". @@ -60,7 +60,7 @@ The tool needed for editing qt translation files is ,,linguist-qt4'' $ open Ubuntu Software Center, search for ,,Qt 4 Linguist'' and install it from there # <--for ubuntu -Now open your language file in <current_dir>/x2goclient/x2goclient_<lang>.ts and edit it with +Now open your language file in <current_dir>/x2goclient/res/i18n/x2goclient_<lang>.ts and edit it with linguist-qt4. NOTE: Make sure you translate all boldly marked items: non-translated as well as fuzzy @@ -72,7 +72,7 @@ Sending in the Translation File ------------------------------- When done, please send the complete translation file - <current_dir>/x2goclient/x2goclient_<lang>.ts + <current_dir>/x2goclient/res/i18n/x2goclient_<lang>.ts to x2go-i18n@lists.x2go.org and remove your working copy of X2Go Client from your system (or read how to use Git and keep the folder.) diff --git a/debian/changelog b/debian/changelog index 5481173..6696463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low Linux and Windows. - onmainwindow:cpp: correctly pass escaped single quote when writing remote xinerama config file. Post-fixup for #797. + - {onmainwindow.cpp,README.i18n}: fix localization -- resource strings + were not correctly updated. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index fe10646..8f32562 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -548,7 +548,7 @@ void ONMainWindow::slotSyncX() void ONMainWindow::installTranslator() { QTranslator* x2goclientTranslator=new QTranslator(); - QString filename=QString ( ":/x2goclient_%1" ).arg ( + QString filename=QString ( ":/i18n/x2goclient_%1" ).arg ( QLocale::system().name() ); filename=filename.toLower(); if ( !x2goclientTranslator->load ( filename ) ) @@ -563,7 +563,7 @@ void ONMainWindow::installTranslator() QTranslator* qtTranslator=new QTranslator; - filename=QString ( ":/qt_%1" ).arg ( QLocale::system().name() ); + filename=QString ( ":/i18n/qt_%1" ).arg ( QLocale::system().name() ); if ( !qtTranslator->load ( filename ) ) { x2goWarningf(2)<<tr("Can't load translator: ") + filename.toAscii(); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git