This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 311cff355cdec6c814a225a03cba54d5d618f414 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:32:13 2015 +0100 general: move *.ts and *.qm files to i18n/ and update references in: - resources.rcc - x2goclient.pro - debian/rules --- debian/changelog | 2 ++ debian/rules | 2 +- qt_da.qm => i18n/qt_da.qm | Bin 119218 -> 119218 bytes qt_de.qm => i18n/qt_de.qm | Bin 328778 -> 328778 bytes qt_es.qm => i18n/qt_es.qm | Bin 87895 -> 87895 bytes qt_fr.qm => i18n/qt_fr.qm | Bin 260053 -> 260053 bytes qt_pt.qm => i18n/qt_pt.qm | Bin 75638 -> 75638 bytes qt_ru.qm => i18n/qt_ru.qm | Bin 288412 -> 288412 bytes qt_sv.qm => i18n/qt_sv.qm | Bin 71500 -> 71500 bytes qt_zh_tw.qm => i18n/qt_zh_tw.qm | Bin 119489 -> 119489 bytes x2goclient_da.ts => i18n/x2goclient_da.ts | 0 x2goclient_de.ts => i18n/x2goclient_de.ts | 0 x2goclient_es.ts => i18n/x2goclient_es.ts | 0 x2goclient_et.ts => i18n/x2goclient_et.ts | 0 x2goclient_fi.ts => i18n/x2goclient_fi.ts | 0 x2goclient_fr.ts => i18n/x2goclient_fr.ts | 0 x2goclient_nb_no.ts => i18n/x2goclient_nb_no.ts | 0 x2goclient_nl.ts => i18n/x2goclient_nl.ts | 0 x2goclient_pt.ts => i18n/x2goclient_pt.ts | 0 x2goclient_ru.ts => i18n/x2goclient_ru.ts | 0 x2goclient_sv.ts => i18n/x2goclient_sv.ts | 0 x2goclient_tr.ts => i18n/x2goclient_tr.ts | 0 x2goclient_zh_tw.ts => i18n/x2goclient_zh_tw.ts | 0 resources.rcc | 40 +++++++++++------------ x2goclient.pro | 26 +++++++-------- 25 files changed, 36 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa856b1..4963fe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -155,6 +155,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Move svg/ to img/svg/ and update references in resources.rcc, src/folderbutton.cpp, src/onmainwindow.cpp and src/sessionbutton.cpp. - Move *.ts files back to the top directory (they are resources.) + - Move *.ts and *.qm files to i18n/ and update references in + resources.rcc, x2goclient.pro and debian/rules. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/rules b/debian/rules index c4e788e..ad45228 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 x2goclient_*.qm + rm -Rf i18n/x2goclient_*.qm rm -f txt/changelog override_dh_strip: diff --git a/qt_da.qm b/i18n/qt_da.qm similarity index 100% rename from qt_da.qm rename to i18n/qt_da.qm diff --git a/qt_de.qm b/i18n/qt_de.qm similarity index 100% rename from qt_de.qm rename to i18n/qt_de.qm diff --git a/qt_es.qm b/i18n/qt_es.qm similarity index 100% rename from qt_es.qm rename to i18n/qt_es.qm diff --git a/qt_fr.qm b/i18n/qt_fr.qm similarity index 100% rename from qt_fr.qm rename to i18n/qt_fr.qm diff --git a/qt_pt.qm b/i18n/qt_pt.qm similarity index 100% rename from qt_pt.qm rename to i18n/qt_pt.qm diff --git a/qt_ru.qm b/i18n/qt_ru.qm similarity index 100% rename from qt_ru.qm rename to i18n/qt_ru.qm diff --git a/qt_sv.qm b/i18n/qt_sv.qm similarity index 100% rename from qt_sv.qm rename to i18n/qt_sv.qm diff --git a/qt_zh_tw.qm b/i18n/qt_zh_tw.qm similarity index 100% rename from qt_zh_tw.qm rename to i18n/qt_zh_tw.qm diff --git a/x2goclient_da.ts b/i18n/x2goclient_da.ts similarity index 100% rename from x2goclient_da.ts rename to i18n/x2goclient_da.ts diff --git a/x2goclient_de.ts b/i18n/x2goclient_de.ts similarity index 100% rename from x2goclient_de.ts rename to i18n/x2goclient_de.ts diff --git a/x2goclient_es.ts b/i18n/x2goclient_es.ts similarity index 100% rename from x2goclient_es.ts rename to i18n/x2goclient_es.ts diff --git a/x2goclient_et.ts b/i18n/x2goclient_et.ts similarity index 100% rename from x2goclient_et.ts rename to i18n/x2goclient_et.ts diff --git a/x2goclient_fi.ts b/i18n/x2goclient_fi.ts similarity index 100% rename from x2goclient_fi.ts rename to i18n/x2goclient_fi.ts diff --git a/x2goclient_fr.ts b/i18n/x2goclient_fr.ts similarity index 100% rename from x2goclient_fr.ts rename to i18n/x2goclient_fr.ts diff --git a/x2goclient_nb_no.ts b/i18n/x2goclient_nb_no.ts similarity index 100% rename from x2goclient_nb_no.ts rename to i18n/x2goclient_nb_no.ts diff --git a/x2goclient_nl.ts b/i18n/x2goclient_nl.ts similarity index 100% rename from x2goclient_nl.ts rename to i18n/x2goclient_nl.ts diff --git a/x2goclient_pt.ts b/i18n/x2goclient_pt.ts similarity index 100% rename from x2goclient_pt.ts rename to i18n/x2goclient_pt.ts diff --git a/x2goclient_ru.ts b/i18n/x2goclient_ru.ts similarity index 100% rename from x2goclient_ru.ts rename to i18n/x2goclient_ru.ts diff --git a/x2goclient_sv.ts b/i18n/x2goclient_sv.ts similarity index 100% rename from x2goclient_sv.ts rename to i18n/x2goclient_sv.ts diff --git a/x2goclient_tr.ts b/i18n/x2goclient_tr.ts similarity index 100% rename from x2goclient_tr.ts rename to i18n/x2goclient_tr.ts diff --git a/x2goclient_zh_tw.ts b/i18n/x2goclient_zh_tw.ts similarity index 100% rename from x2goclient_zh_tw.ts rename to i18n/x2goclient_zh_tw.ts diff --git a/resources.rcc b/resources.rcc index 35f43a8..95b7182 100644 --- a/resources.rcc +++ b/resources.rcc @@ -88,25 +88,25 @@ <file>img/icons/22x22/preferences-system.png</file> <file>txt/packs</file> <file>txt/encodings</file> - <file>x2goclient_da.qm</file> - <file>x2goclient_de.qm</file> - <file>x2goclient_es.qm</file> - <file>x2goclient_et.qm</file> - <file>x2goclient_fi.qm</file> - <file>x2goclient_fr.qm</file> - <file>x2goclient_nb_no.qm</file> - <file>x2goclient_nl.qm</file> - <file>x2goclient_pt.qm</file> - <file>x2goclient_ru.qm</file> - <file>x2goclient_sv.qm</file> - <file>x2goclient_zh_tw.qm</file> - <file>qt_da.qm</file> - <file>qt_de.qm</file> - <file>qt_es.qm</file> - <file>qt_fr.qm</file> - <file>qt_pt.qm</file> - <file>qt_ru.qm</file> - <file>qt_sv.qm</file> - <file>qt_zh_tw.qm</file> + <file>i18n/x2goclient_da.qm</file> + <file>i18n/x2goclient_de.qm</file> + <file>i18n/x2goclient_es.qm</file> + <file>i18n/x2goclient_et.qm</file> + <file>i18n/x2goclient_fi.qm</file> + <file>i18n/x2goclient_fr.qm</file> + <file>i18n/x2goclient_nb_no.qm</file> + <file>i18n/x2goclient_nl.qm</file> + <file>i18n/x2goclient_pt.qm</file> + <file>i18n/x2goclient_ru.qm</file> + <file>i18n/x2goclient_sv.qm</file> + <file>i18n/x2goclient_zh_tw.qm</file> + <file>i18n/qt_da.qm</file> + <file>i18n/qt_de.qm</file> + <file>i18n/qt_es.qm</file> + <file>i18n/qt_fr.qm</file> + <file>i18n/qt_pt.qm</file> + <file>i18n/qt_ru.qm</file> + <file>i18n/qt_sv.qm</file> + <file>i18n/qt_zh_tw.qm</file> </qresource> </RCC> diff --git a/x2goclient.pro b/x2goclient.pro index f96fac9..c9e53c6 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 += src/i18n/x2goclient_de.ts \ - src/i18n/x2goclient_da.ts \ - src/i18n/x2goclient_es.ts \ - src/i18n/x2goclient_et.ts \ - src/i18n/x2goclient_fi.ts \ - src/i18n/x2goclient_fr.ts \ - src/i18n/x2goclient_nb_no.ts \ - src/i18n/x2goclient_nl.ts \ - src/i18n/x2goclient_pt.ts \ - src/i18n/x2goclient_ru.ts \ - src/i18n/x2goclient_sv.ts \ - src/i18n/x2goclient_tr.ts \ - src/i18n/x2goclient_zh_tw.ts +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 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