This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 5bfd6d0426f153c3bc3dc1d5605c4b2ffb6c8fee Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 01:04:49 2015 +0100 general: move i18n/ to res/i18n/ and update references in: - debian/rules - x2goclient.pro --- debian/changelog | 2 ++ debian/rules | 2 +- {i18n => res/i18n}/qt_da.qm | Bin 119218 -> 119218 bytes {i18n => res/i18n}/qt_de.qm | Bin 328778 -> 328778 bytes {i18n => res/i18n}/qt_es.qm | Bin 87895 -> 87895 bytes {i18n => res/i18n}/qt_fr.qm | Bin 260053 -> 260053 bytes {i18n => res/i18n}/qt_pt.qm | Bin 75638 -> 75638 bytes {i18n => res/i18n}/qt_ru.qm | Bin 288412 -> 288412 bytes {i18n => res/i18n}/qt_sv.qm | Bin 71500 -> 71500 bytes {i18n => res/i18n}/qt_zh_tw.qm | Bin 119489 -> 119489 bytes {i18n => res/i18n}/x2goclient_da.ts | 0 {i18n => res/i18n}/x2goclient_de.ts | 0 {i18n => res/i18n}/x2goclient_es.ts | 0 {i18n => res/i18n}/x2goclient_et.ts | 0 {i18n => res/i18n}/x2goclient_fi.ts | 0 {i18n => res/i18n}/x2goclient_fr.ts | 0 {i18n => res/i18n}/x2goclient_nb_no.ts | 0 {i18n => res/i18n}/x2goclient_nl.ts | 0 {i18n => res/i18n}/x2goclient_pt.ts | 0 {i18n => res/i18n}/x2goclient_ru.ts | 0 {i18n => res/i18n}/x2goclient_sv.ts | 0 {i18n => res/i18n}/x2goclient_tr.ts | 0 {i18n => res/i18n}/x2goclient_zh_tw.ts | 0 x2goclient.pro | 26 +++++++++++++------------- 24 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1561b6..5e151af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -164,6 +164,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Move x2go-logos/ to img/x2go-logos and update references in COPYRIGHT.x2go-logos. - Fix whitespace errors in x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc. + - Move i18n/ to res/i18n/ and update references in debian/rules and + x2goclient.pro. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/rules b/debian/rules index ad45228..8f05dda 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_auto_configure: override_dh_auto_clean: dh_auto_clean # clean stray .qm files that are not handled by clean rule in upstream Makefile - rm -Rf i18n/x2goclient_*.qm + rm -Rf res/i18n/x2goclient_*.qm rm -f txt/changelog override_dh_strip: diff --git a/i18n/qt_da.qm b/res/i18n/qt_da.qm similarity index 100% rename from i18n/qt_da.qm rename to res/i18n/qt_da.qm diff --git a/i18n/qt_de.qm b/res/i18n/qt_de.qm similarity index 100% rename from i18n/qt_de.qm rename to res/i18n/qt_de.qm diff --git a/i18n/qt_es.qm b/res/i18n/qt_es.qm similarity index 100% rename from i18n/qt_es.qm rename to res/i18n/qt_es.qm diff --git a/i18n/qt_fr.qm b/res/i18n/qt_fr.qm similarity index 100% rename from i18n/qt_fr.qm rename to res/i18n/qt_fr.qm diff --git a/i18n/qt_pt.qm b/res/i18n/qt_pt.qm similarity index 100% rename from i18n/qt_pt.qm rename to res/i18n/qt_pt.qm diff --git a/i18n/qt_ru.qm b/res/i18n/qt_ru.qm similarity index 100% rename from i18n/qt_ru.qm rename to res/i18n/qt_ru.qm diff --git a/i18n/qt_sv.qm b/res/i18n/qt_sv.qm similarity index 100% rename from i18n/qt_sv.qm rename to res/i18n/qt_sv.qm diff --git a/i18n/qt_zh_tw.qm b/res/i18n/qt_zh_tw.qm similarity index 100% rename from i18n/qt_zh_tw.qm rename to res/i18n/qt_zh_tw.qm diff --git a/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts similarity index 100% rename from i18n/x2goclient_da.ts rename to res/i18n/x2goclient_da.ts diff --git a/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts similarity index 100% rename from i18n/x2goclient_de.ts rename to res/i18n/x2goclient_de.ts diff --git a/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts similarity index 100% rename from i18n/x2goclient_es.ts rename to res/i18n/x2goclient_es.ts diff --git a/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts similarity index 100% rename from i18n/x2goclient_et.ts rename to res/i18n/x2goclient_et.ts diff --git a/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts similarity index 100% rename from i18n/x2goclient_fi.ts rename to res/i18n/x2goclient_fi.ts diff --git a/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts similarity index 100% rename from i18n/x2goclient_fr.ts rename to res/i18n/x2goclient_fr.ts diff --git a/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts similarity index 100% rename from i18n/x2goclient_nb_no.ts rename to res/i18n/x2goclient_nb_no.ts diff --git a/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts similarity index 100% rename from i18n/x2goclient_nl.ts rename to res/i18n/x2goclient_nl.ts diff --git a/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts similarity index 100% rename from i18n/x2goclient_pt.ts rename to res/i18n/x2goclient_pt.ts diff --git a/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts similarity index 100% rename from i18n/x2goclient_ru.ts rename to res/i18n/x2goclient_ru.ts diff --git a/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts similarity index 100% rename from i18n/x2goclient_sv.ts rename to res/i18n/x2goclient_sv.ts diff --git a/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts similarity index 100% rename from i18n/x2goclient_tr.ts rename to res/i18n/x2goclient_tr.ts diff --git a/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts similarity index 100% rename from i18n/x2goclient_zh_tw.ts rename to res/i18n/x2goclient_zh_tw.ts diff --git a/x2goclient.pro b/x2goclient.pro index c9e53c6..5556de8 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -20,19 +20,19 @@ FORMS += src/ui/cupsprintsettingsdialog.ui \ src/ui/helpdialog.ui \ src/ui/folderexplorer.ui -TRANSLATIONS += i18n/x2goclient_de.ts \ - i18n/x2goclient_da.ts \ - i18n/x2goclient_es.ts \ - i18n/x2goclient_et.ts \ - i18n/x2goclient_fi.ts \ - i18n/x2goclient_fr.ts \ - i18n/x2goclient_nb_no.ts \ - i18n/x2goclient_nl.ts \ - i18n/x2goclient_pt.ts \ - i18n/x2goclient_ru.ts \ - i18n/x2goclient_sv.ts \ - i18n/x2goclient_tr.ts \ - i18n/x2goclient_zh_tw.ts +TRANSLATIONS += res/i18n/x2goclient_de.ts \ + res/i18n/x2goclient_da.ts \ + res/i18n/x2goclient_es.ts \ + res/i18n/x2goclient_et.ts \ + res/i18n/x2goclient_fi.ts \ + res/i18n/x2goclient_fr.ts \ + res/i18n/x2goclient_nb_no.ts \ + res/i18n/x2goclient_nl.ts \ + res/i18n/x2goclient_pt.ts \ + res/i18n/x2goclient_ru.ts \ + res/i18n/x2goclient_sv.ts \ + res/i18n/x2goclient_tr.ts \ + res/i18n/x2goclient_zh_tw.ts HEADERS += src/configdialog.h \ src/editconnectiondialog.h \ -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git