This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from ae10c35 Move svg/ to img/svg/ and update references in: new 8b2510d general: move *.ts files back to the top directory (they are resources.) new a2e0a5b general: move *.ts and *.qm files to i18n/ and update references in: new 565f662 general: actually move icons/ to img/icons/ again. new 200577f nsis/gpl.txt: fix formatting errors. new 0f2ba2d nsis/x2goclient.nsi: fix whitespace errors. new c97d645 nsis/x2goclient.nsi: don't change the icons path. new 6480e24 nsis: make files non-executable. The 7 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 | 7 ++ 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 {src/i18n => i18n}/x2goclient_da.ts | 0 {src/i18n => i18n}/x2goclient_de.ts | 0 {src/i18n => i18n}/x2goclient_es.ts | 0 {src/i18n => i18n}/x2goclient_et.ts | 0 {src/i18n => i18n}/x2goclient_fi.ts | 0 {src/i18n => i18n}/x2goclient_fr.ts | 0 {src/i18n => i18n}/x2goclient_nb_no.ts | 0 {src/i18n => i18n}/x2goclient_nl.ts | 0 {src/i18n => i18n}/x2goclient_pt.ts | 0 {src/i18n => i18n}/x2goclient_ru.ts | 0 {src/i18n => i18n}/x2goclient_sv.ts | 0 {src/i18n => i18n}/x2goclient_tr.ts | 0 {src/i18n => i18n}/x2goclient_zh_tw.ts | 0 {icons => img/icons}/128x128/X.png | Bin 6255 -> 6255 bytes {icons => img/icons}/128x128/audio.png | Bin 5229 -> 5229 bytes {icons => img/icons}/128x128/create_file.png | Bin 5107 -> 5107 bytes {icons => img/icons}/128x128/delete.png | Bin 7978 -> 7978 bytes {icons => img/icons}/128x128/edit.png | Bin 5761 -> 5761 bytes {icons => img/icons}/128x128/edit_file.png | Bin 6219 -> 6219 bytes {icons => img/icons}/128x128/edit_settings.png | Bin 5806 -> 5806 bytes {icons => img/icons}/128x128/file-open.png | Bin 4051 -> 4051 bytes {icons => img/icons}/128x128/folder.png | Bin 3220 -> 3220 bytes {icons => img/icons}/128x128/gnome.png | Bin 3650 -> 3650 bytes {icons => img/icons}/128x128/kde.png | Bin 14296 -> 14296 bytes {icons => img/icons}/128x128/lxde.png | Bin 11886 -> 11886 bytes {icons => img/icons}/128x128/new_file.png | Bin 4882 -> 4882 bytes {icons => img/icons}/128x128/preferences.png | Bin 18292 -> 18292 bytes {icons => img/icons}/128x128/rdp.png | Bin 10941 -> 10941 bytes {icons => img/icons}/128x128/resolution.png | Bin 3308 -> 3308 bytes {icons => img/icons}/128x128/session.png | Bin 4936 -> 4936 bytes {icons => img/icons}/128x128/unity.png | Bin 17622 -> 17622 bytes {icons => img/icons}/128x128/x2go.png | Bin 6085 -> 6085 bytes {icons => img/icons}/128x128/x2goclient.png | Bin 19158 -> 19158 bytes {icons => img/icons}/128x128/x2gogroup.png | Bin 1817 -> 1817 bytes {icons => img/icons}/128x128/x2gohosts.png | Bin 1731 -> 1731 bytes {icons => img/icons}/128x128/x2gomailclient.png | Bin 19158 -> 19158 bytes {icons => img/icons}/128x128/x2gosession.png | Bin 9324 -> 9324 bytes {icons => img/icons}/128x128/x2gouser.png | Bin 1771 -> 1771 bytes {icons => img/icons}/16x16/X.png | Bin 657 -> 657 bytes {icons => img/icons}/16x16/audio.png | Bin 653 -> 653 bytes {icons => img/icons}/16x16/cinnamon.png | Bin 505 -> 505 bytes {icons => img/icons}/16x16/create_file.png | Bin 594 -> 594 bytes {icons => img/icons}/16x16/delete.png | Bin 680 -> 680 bytes {icons => img/icons}/16x16/edit.png | Bin 662 -> 662 bytes {icons => img/icons}/16x16/edit_file.png | Bin 649 -> 649 bytes {icons => img/icons}/16x16/edit_settings.png | Bin 646 -> 646 bytes {icons => img/icons}/16x16/file-open.png | Bin 595 -> 595 bytes {icons => img/icons}/16x16/gnome.png | Bin 463 -> 463 bytes {icons => img/icons}/16x16/icewm.png | Bin 538 -> 538 bytes {icons => img/icons}/16x16/kde.png | Bin 899 -> 899 bytes {icons => img/icons}/16x16/lxde.png | Bin 716 -> 716 bytes {icons => img/icons}/16x16/mate.png | Bin 774 -> 774 bytes {icons => img/icons}/16x16/new_file.png | Bin 593 -> 593 bytes {icons => img/icons}/16x16/openbox.png | Bin 360 -> 360 bytes {icons => img/icons}/16x16/preferences.png | Bin 340 -> 340 bytes {icons => img/icons}/16x16/rdp.png | Bin 754 -> 754 bytes {icons => img/icons}/16x16/resolution.png | Bin 446 -> 446 bytes {icons => img/icons}/16x16/session.png | Bin 846 -> 846 bytes {icons => img/icons}/16x16/tbshow.png | Bin 302 -> 302 bytes {icons => img/icons}/16x16/trinity.png | Bin 748 -> 748 bytes {icons => img/icons}/16x16/unity.png | Bin 1410 -> 1410 bytes {icons => img/icons}/16x16/x2go.png | Bin 854 -> 854 bytes {icons => img/icons}/16x16/x2goclient.png | Bin 949 -> 949 bytes {icons => img/icons}/16x16/xfce.png | Bin 639 -> 639 bytes .../icons}/22x22/applications-development.png | Bin 977 -> 977 bytes .../icons}/22x22/applications-education.png | Bin 644 -> 644 bytes {icons => img/icons}/22x22/applications-games.png | Bin 688 -> 688 bytes .../icons}/22x22/applications-graphics.png | Bin 1523 -> 1523 bytes .../icons}/22x22/applications-internet.png | Bin 1355 -> 1355 bytes .../icons}/22x22/applications-multimedia.png | Bin 1353 -> 1353 bytes {icons => img/icons}/22x22/applications-office.png | Bin 804 -> 804 bytes {icons => img/icons}/22x22/applications-other.png | Bin 775 -> 775 bytes {icons => img/icons}/22x22/applications-system.png | Bin 1403 -> 1403 bytes .../icons}/22x22/applications-utilities.png | Bin 888 -> 888 bytes {icons => img/icons}/22x22/preferences-system.png | Bin 1350 -> 1350 bytes {icons => img/icons}/32x32/X.png | Bin 1414 -> 1414 bytes {icons => img/icons}/32x32/apps.png | Bin 1664 -> 1664 bytes {icons => img/icons}/32x32/attach.png | Bin 831 -> 831 bytes {icons => img/icons}/32x32/audio.png | Bin 1465 -> 1465 bytes {icons => img/icons}/32x32/auth.png | Bin 1686 -> 1686 bytes {icons => img/icons}/32x32/contest.png | Bin 1267 -> 1267 bytes {icons => img/icons}/32x32/create_file.png | Bin 1148 -> 1148 bytes {icons => img/icons}/32x32/delete.png | Bin 1456 -> 1456 bytes {icons => img/icons}/32x32/detach.png | Bin 870 -> 870 bytes {icons => img/icons}/32x32/edit.png | Bin 1232 -> 1232 bytes {icons => img/icons}/32x32/edit_file.png | Bin 1334 -> 1334 bytes {icons => img/icons}/32x32/edit_settings.png | Bin 1313 -> 1313 bytes {icons => img/icons}/32x32/exit.png | Bin 1915 -> 1915 bytes {icons => img/icons}/32x32/file-open.png | Bin 1068 -> 1068 bytes {icons => img/icons}/32x32/gnome.png | Bin 846 -> 846 bytes {icons => img/icons}/32x32/kde.png | Bin 2245 -> 2245 bytes {icons => img/icons}/32x32/lxde.png | Bin 1731 -> 1731 bytes {icons => img/icons}/32x32/new_file.png | Bin 1109 -> 1109 bytes {icons => img/icons}/32x32/open_dir.png | Bin 476 -> 476 bytes {icons => img/icons}/32x32/preferences.png | Bin 2545 -> 2545 bytes {icons => img/icons}/32x32/rdp.png | Bin 1768 -> 1768 bytes {icons => img/icons}/32x32/reconnect.png | Bin 1651 -> 1651 bytes {icons => img/icons}/32x32/resolution.png | Bin 855 -> 855 bytes {icons => img/icons}/32x32/session.png | Bin 1177 -> 1177 bytes {icons => img/icons}/32x32/stop.png | Bin 1190 -> 1190 bytes {icons => img/icons}/32x32/stop_session.png | Bin 1093 -> 1093 bytes {icons => img/icons}/32x32/suspend.png | Bin 349 -> 349 bytes {icons => img/icons}/32x32/suspend_session.png | Bin 229 -> 229 bytes {icons => img/icons}/32x32/tbhide.png | Bin 1266 -> 1266 bytes {icons => img/icons}/32x32/tbshow.png | Bin 902 -> 902 bytes {icons => img/icons}/32x32/tbshow.xcf | Bin 2124 -> 2124 bytes {icons => img/icons}/32x32/unity.png | Bin 2984 -> 2984 bytes {icons => img/icons}/32x32/x2goclient.png | Bin 2675 -> 2675 bytes {icons => img/icons}/48x48/x2goclient.png | Bin 4817 -> 4817 bytes {icons => img/icons}/64x64/X.png | Bin 3066 -> 3066 bytes {icons => img/icons}/64x64/audio.png | Bin 2895 -> 2895 bytes {icons => img/icons}/64x64/create_file.png | Bin 2595 -> 2595 bytes {icons => img/icons}/64x64/delete.png | Bin 3752 -> 3752 bytes {icons => img/icons}/64x64/edit.png | Bin 2785 -> 2785 bytes {icons => img/icons}/64x64/edit_file.png | Bin 3057 -> 3057 bytes {icons => img/icons}/64x64/edit_settings.png | Bin 2955 -> 2955 bytes {icons => img/icons}/64x64/file-open.png | Bin 2039 -> 2039 bytes {icons => img/icons}/64x64/gnome.png | Bin 1689 -> 1689 bytes {icons => img/icons}/64x64/kde.png | Bin 5725 -> 5725 bytes {icons => img/icons}/64x64/lxde.png | Bin 4537 -> 4537 bytes {icons => img/icons}/64x64/new_file.png | Bin 2440 -> 2440 bytes {icons => img/icons}/64x64/personal.png | Bin 5046 -> 5046 bytes {icons => img/icons}/64x64/preferences.png | Bin 7000 -> 7000 bytes {icons => img/icons}/64x64/rdp.png | Bin 4498 -> 4498 bytes {icons => img/icons}/64x64/resolution.png | Bin 1805 -> 1805 bytes {icons => img/icons}/64x64/session.png | Bin 2606 -> 2606 bytes {icons => img/icons}/64x64/unity.png | Bin 7241 -> 7241 bytes {icons => img/icons}/64x64/x2goclient.png | Bin 7095 -> 7095 bytes {icons => img/icons}/hildon/x2goclient_26.png | Bin 1235 -> 1235 bytes {icons => img/icons}/hildon/x2goclient_40.png | Bin 1860 -> 1860 bytes {icons => img/icons}/hildon/x2goclient_64.png | Bin 2826 -> 2826 bytes {icons => img/icons}/hildon/x2goclient_hildon.svg | 0 {icons => img/icons}/x2go-mac.icns | Bin 134586 -> 134586 bytes {icons => img/icons}/x2go-win-48.ico | Bin 120254 -> 120254 bytes {icons => img/icons}/x2goclient.xpm | 0 nsis/gpl.txt | 22 ++--- nsis/icons/win-install.ico | Bin 1078 -> 1078 bytes nsis/icons/win-uninstall.ico | Bin 1078 -> 1078 bytes nsis/x2goclient.nsi | 104 ++++++++++---------- resources.rcc | 40 ++++---- x2goclient.pro | 26 ++--- 151 files changed, 104 insertions(+), 97 deletions(-) rename qt_da.qm => i18n/qt_da.qm (100%) rename qt_de.qm => i18n/qt_de.qm (100%) rename qt_es.qm => i18n/qt_es.qm (100%) rename qt_fr.qm => i18n/qt_fr.qm (100%) rename qt_pt.qm => i18n/qt_pt.qm (100%) rename qt_ru.qm => i18n/qt_ru.qm (100%) rename qt_sv.qm => i18n/qt_sv.qm (100%) rename qt_zh_tw.qm => i18n/qt_zh_tw.qm (100%) rename {src/i18n => i18n}/x2goclient_da.ts (100%) rename {src/i18n => i18n}/x2goclient_de.ts (100%) rename {src/i18n => i18n}/x2goclient_es.ts (100%) rename {src/i18n => i18n}/x2goclient_et.ts (100%) rename {src/i18n => i18n}/x2goclient_fi.ts (100%) rename {src/i18n => i18n}/x2goclient_fr.ts (100%) rename {src/i18n => i18n}/x2goclient_nb_no.ts (100%) rename {src/i18n => i18n}/x2goclient_nl.ts (100%) rename {src/i18n => i18n}/x2goclient_pt.ts (100%) rename {src/i18n => i18n}/x2goclient_ru.ts (100%) rename {src/i18n => i18n}/x2goclient_sv.ts (100%) rename {src/i18n => i18n}/x2goclient_tr.ts (100%) rename {src/i18n => i18n}/x2goclient_zh_tw.ts (100%) rename {icons => img/icons}/128x128/X.png (100%) rename {icons => img/icons}/128x128/audio.png (100%) rename {icons => img/icons}/128x128/create_file.png (100%) rename {icons => img/icons}/128x128/delete.png (100%) rename {icons => img/icons}/128x128/edit.png (100%) rename {icons => img/icons}/128x128/edit_file.png (100%) rename {icons => img/icons}/128x128/edit_settings.png (100%) rename {icons => img/icons}/128x128/file-open.png (100%) rename {icons => img/icons}/128x128/folder.png (100%) rename {icons => img/icons}/128x128/gnome.png (100%) rename {icons => img/icons}/128x128/kde.png (100%) rename {icons => img/icons}/128x128/lxde.png (100%) rename {icons => img/icons}/128x128/new_file.png (100%) rename {icons => img/icons}/128x128/preferences.png (100%) rename {icons => img/icons}/128x128/rdp.png (100%) rename {icons => img/icons}/128x128/resolution.png (100%) rename {icons => img/icons}/128x128/session.png (100%) rename {icons => img/icons}/128x128/unity.png (100%) rename {icons => img/icons}/128x128/x2go.png (100%) rename {icons => img/icons}/128x128/x2goclient.png (100%) rename {icons => img/icons}/128x128/x2gogroup.png (100%) rename {icons => img/icons}/128x128/x2gohosts.png (100%) rename {icons => img/icons}/128x128/x2gomailclient.png (100%) rename {icons => img/icons}/128x128/x2gosession.png (100%) rename {icons => img/icons}/128x128/x2gouser.png (100%) rename {icons => img/icons}/16x16/X.png (100%) rename {icons => img/icons}/16x16/audio.png (100%) rename {icons => img/icons}/16x16/cinnamon.png (100%) rename {icons => img/icons}/16x16/create_file.png (100%) rename {icons => img/icons}/16x16/delete.png (100%) rename {icons => img/icons}/16x16/edit.png (100%) rename {icons => img/icons}/16x16/edit_file.png (100%) rename {icons => img/icons}/16x16/edit_settings.png (100%) rename {icons => img/icons}/16x16/file-open.png (100%) rename {icons => img/icons}/16x16/gnome.png (100%) rename {icons => img/icons}/16x16/icewm.png (100%) rename {icons => img/icons}/16x16/kde.png (100%) rename {icons => img/icons}/16x16/lxde.png (100%) rename {icons => img/icons}/16x16/mate.png (100%) rename {icons => img/icons}/16x16/new_file.png (100%) rename {icons => img/icons}/16x16/openbox.png (100%) rename {icons => img/icons}/16x16/preferences.png (100%) rename {icons => img/icons}/16x16/rdp.png (100%) rename {icons => img/icons}/16x16/resolution.png (100%) rename {icons => img/icons}/16x16/session.png (100%) rename {icons => img/icons}/16x16/tbshow.png (100%) rename {icons => img/icons}/16x16/trinity.png (100%) rename {icons => img/icons}/16x16/unity.png (100%) rename {icons => img/icons}/16x16/x2go.png (100%) rename {icons => img/icons}/16x16/x2goclient.png (100%) rename {icons => img/icons}/16x16/xfce.png (100%) rename {icons => img/icons}/22x22/applications-development.png (100%) rename {icons => img/icons}/22x22/applications-education.png (100%) rename {icons => img/icons}/22x22/applications-games.png (100%) rename {icons => img/icons}/22x22/applications-graphics.png (100%) rename {icons => img/icons}/22x22/applications-internet.png (100%) rename {icons => img/icons}/22x22/applications-multimedia.png (100%) rename {icons => img/icons}/22x22/applications-office.png (100%) rename {icons => img/icons}/22x22/applications-other.png (100%) rename {icons => img/icons}/22x22/applications-system.png (100%) rename {icons => img/icons}/22x22/applications-utilities.png (100%) rename {icons => img/icons}/22x22/preferences-system.png (100%) rename {icons => img/icons}/32x32/X.png (100%) rename {icons => img/icons}/32x32/apps.png (100%) rename {icons => img/icons}/32x32/attach.png (100%) rename {icons => img/icons}/32x32/audio.png (100%) rename {icons => img/icons}/32x32/auth.png (100%) rename {icons => img/icons}/32x32/contest.png (100%) rename {icons => img/icons}/32x32/create_file.png (100%) rename {icons => img/icons}/32x32/delete.png (100%) rename {icons => img/icons}/32x32/detach.png (100%) rename {icons => img/icons}/32x32/edit.png (100%) rename {icons => img/icons}/32x32/edit_file.png (100%) rename {icons => img/icons}/32x32/edit_settings.png (100%) rename {icons => img/icons}/32x32/exit.png (100%) rename {icons => img/icons}/32x32/file-open.png (100%) rename {icons => img/icons}/32x32/gnome.png (100%) rename {icons => img/icons}/32x32/kde.png (100%) rename {icons => img/icons}/32x32/lxde.png (100%) rename {icons => img/icons}/32x32/new_file.png (100%) rename {icons => img/icons}/32x32/open_dir.png (100%) rename {icons => img/icons}/32x32/preferences.png (100%) rename {icons => img/icons}/32x32/rdp.png (100%) rename {icons => img/icons}/32x32/reconnect.png (100%) rename {icons => img/icons}/32x32/resolution.png (100%) rename {icons => img/icons}/32x32/session.png (100%) rename {icons => img/icons}/32x32/stop.png (100%) rename {icons => img/icons}/32x32/stop_session.png (100%) rename {icons => img/icons}/32x32/suspend.png (100%) rename {icons => img/icons}/32x32/suspend_session.png (100%) rename {icons => img/icons}/32x32/tbhide.png (100%) rename {icons => img/icons}/32x32/tbshow.png (100%) rename {icons => img/icons}/32x32/tbshow.xcf (100%) rename {icons => img/icons}/32x32/unity.png (100%) rename {icons => img/icons}/32x32/x2goclient.png (100%) rename {icons => img/icons}/48x48/x2goclient.png (100%) rename {icons => img/icons}/64x64/X.png (100%) rename {icons => img/icons}/64x64/audio.png (100%) rename {icons => img/icons}/64x64/create_file.png (100%) rename {icons => img/icons}/64x64/delete.png (100%) rename {icons => img/icons}/64x64/edit.png (100%) rename {icons => img/icons}/64x64/edit_file.png (100%) rename {icons => img/icons}/64x64/edit_settings.png (100%) rename {icons => img/icons}/64x64/file-open.png (100%) rename {icons => img/icons}/64x64/gnome.png (100%) rename {icons => img/icons}/64x64/kde.png (100%) rename {icons => img/icons}/64x64/lxde.png (100%) rename {icons => img/icons}/64x64/new_file.png (100%) rename {icons => img/icons}/64x64/personal.png (100%) rename {icons => img/icons}/64x64/preferences.png (100%) rename {icons => img/icons}/64x64/rdp.png (100%) rename {icons => img/icons}/64x64/resolution.png (100%) rename {icons => img/icons}/64x64/session.png (100%) rename {icons => img/icons}/64x64/unity.png (100%) rename {icons => img/icons}/64x64/x2goclient.png (100%) rename {icons => img/icons}/hildon/x2goclient_26.png (100%) rename {icons => img/icons}/hildon/x2goclient_40.png (100%) rename {icons => img/icons}/hildon/x2goclient_64.png (100%) rename {icons => img/icons}/hildon/x2goclient_hildon.svg (100%) rename {icons => img/icons}/x2go-mac.icns (100%) rename {icons => img/icons}/x2go-win-48.ico (100%) rename {icons => img/icons}/x2goclient.xpm (100%) mode change 100755 => 100644 nsis/gpl.txt mode change 100755 => 100644 nsis/icons/win-install.ico mode change 100755 => 100644 nsis/icons/win-uninstall.ico mode change 100755 => 100644 nsis/x2goclient.nsi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 8b2510d91dfc3bac9dcf60611e338255df8e553d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:28:54 2015 +0100 general: move *.ts files back to the top directory (they are resources.) --- debian/changelog | 1 + src/i18n/x2goclient_da.ts => x2goclient_da.ts | 0 src/i18n/x2goclient_de.ts => x2goclient_de.ts | 0 src/i18n/x2goclient_es.ts => x2goclient_es.ts | 0 src/i18n/x2goclient_et.ts => x2goclient_et.ts | 0 src/i18n/x2goclient_fi.ts => x2goclient_fi.ts | 0 src/i18n/x2goclient_fr.ts => x2goclient_fr.ts | 0 .../x2goclient_nb_no.ts => x2goclient_nb_no.ts | 0 src/i18n/x2goclient_nl.ts => x2goclient_nl.ts | 0 src/i18n/x2goclient_pt.ts => x2goclient_pt.ts | 0 src/i18n/x2goclient_ru.ts => x2goclient_ru.ts | 0 src/i18n/x2goclient_sv.ts => x2goclient_sv.ts | 0 src/i18n/x2goclient_tr.ts => x2goclient_tr.ts | 0 .../x2goclient_zh_tw.ts => x2goclient_zh_tw.ts | 0 14 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index f995510..cf09770 100644 --- a/debian/changelog +++ b/debian/changelog @@ -128,6 +128,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium src/onmainwindow.cpp. - 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.) -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/src/i18n/x2goclient_da.ts b/x2goclient_da.ts similarity index 100% rename from src/i18n/x2goclient_da.ts rename to x2goclient_da.ts diff --git a/src/i18n/x2goclient_de.ts b/x2goclient_de.ts similarity index 100% rename from src/i18n/x2goclient_de.ts rename to x2goclient_de.ts diff --git a/src/i18n/x2goclient_es.ts b/x2goclient_es.ts similarity index 100% rename from src/i18n/x2goclient_es.ts rename to x2goclient_es.ts diff --git a/src/i18n/x2goclient_et.ts b/x2goclient_et.ts similarity index 100% rename from src/i18n/x2goclient_et.ts rename to x2goclient_et.ts diff --git a/src/i18n/x2goclient_fi.ts b/x2goclient_fi.ts similarity index 100% rename from src/i18n/x2goclient_fi.ts rename to x2goclient_fi.ts diff --git a/src/i18n/x2goclient_fr.ts b/x2goclient_fr.ts similarity index 100% rename from src/i18n/x2goclient_fr.ts rename to x2goclient_fr.ts diff --git a/src/i18n/x2goclient_nb_no.ts b/x2goclient_nb_no.ts similarity index 100% rename from src/i18n/x2goclient_nb_no.ts rename to x2goclient_nb_no.ts diff --git a/src/i18n/x2goclient_nl.ts b/x2goclient_nl.ts similarity index 100% rename from src/i18n/x2goclient_nl.ts rename to x2goclient_nl.ts diff --git a/src/i18n/x2goclient_pt.ts b/x2goclient_pt.ts similarity index 100% rename from src/i18n/x2goclient_pt.ts rename to x2goclient_pt.ts diff --git a/src/i18n/x2goclient_ru.ts b/x2goclient_ru.ts similarity index 100% rename from src/i18n/x2goclient_ru.ts rename to x2goclient_ru.ts diff --git a/src/i18n/x2goclient_sv.ts b/x2goclient_sv.ts similarity index 100% rename from src/i18n/x2goclient_sv.ts rename to x2goclient_sv.ts diff --git a/src/i18n/x2goclient_tr.ts b/x2goclient_tr.ts similarity index 100% rename from src/i18n/x2goclient_tr.ts rename to x2goclient_tr.ts diff --git a/src/i18n/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts similarity index 100% rename from src/i18n/x2goclient_zh_tw.ts rename to x2goclient_zh_tw.ts -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit a2e0a5bacc1e9801f844d28b6f41729d360a03fd 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 cf09770..e544784 100644 --- a/debian/changelog +++ b/debian/changelog @@ -129,6 +129,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; 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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 565f6625734102fb42ff95078650f2dd1576c3e8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:33:48 2015 +0100 general: actually move icons/ to img/icons/ again. --- {icons => img/icons}/128x128/X.png | Bin 6255 -> 6255 bytes {icons => img/icons}/128x128/audio.png | Bin 5229 -> 5229 bytes {icons => img/icons}/128x128/create_file.png | Bin 5107 -> 5107 bytes {icons => img/icons}/128x128/delete.png | Bin 7978 -> 7978 bytes {icons => img/icons}/128x128/edit.png | Bin 5761 -> 5761 bytes {icons => img/icons}/128x128/edit_file.png | Bin 6219 -> 6219 bytes {icons => img/icons}/128x128/edit_settings.png | Bin 5806 -> 5806 bytes {icons => img/icons}/128x128/file-open.png | Bin 4051 -> 4051 bytes {icons => img/icons}/128x128/folder.png | Bin 3220 -> 3220 bytes {icons => img/icons}/128x128/gnome.png | Bin 3650 -> 3650 bytes {icons => img/icons}/128x128/kde.png | Bin 14296 -> 14296 bytes {icons => img/icons}/128x128/lxde.png | Bin 11886 -> 11886 bytes {icons => img/icons}/128x128/new_file.png | Bin 4882 -> 4882 bytes {icons => img/icons}/128x128/preferences.png | Bin 18292 -> 18292 bytes {icons => img/icons}/128x128/rdp.png | Bin 10941 -> 10941 bytes {icons => img/icons}/128x128/resolution.png | Bin 3308 -> 3308 bytes {icons => img/icons}/128x128/session.png | Bin 4936 -> 4936 bytes {icons => img/icons}/128x128/unity.png | Bin 17622 -> 17622 bytes {icons => img/icons}/128x128/x2go.png | Bin 6085 -> 6085 bytes {icons => img/icons}/128x128/x2goclient.png | Bin 19158 -> 19158 bytes {icons => img/icons}/128x128/x2gogroup.png | Bin 1817 -> 1817 bytes {icons => img/icons}/128x128/x2gohosts.png | Bin 1731 -> 1731 bytes {icons => img/icons}/128x128/x2gomailclient.png | Bin 19158 -> 19158 bytes {icons => img/icons}/128x128/x2gosession.png | Bin 9324 -> 9324 bytes {icons => img/icons}/128x128/x2gouser.png | Bin 1771 -> 1771 bytes {icons => img/icons}/16x16/X.png | Bin 657 -> 657 bytes {icons => img/icons}/16x16/audio.png | Bin 653 -> 653 bytes {icons => img/icons}/16x16/cinnamon.png | Bin 505 -> 505 bytes {icons => img/icons}/16x16/create_file.png | Bin 594 -> 594 bytes {icons => img/icons}/16x16/delete.png | Bin 680 -> 680 bytes {icons => img/icons}/16x16/edit.png | Bin 662 -> 662 bytes {icons => img/icons}/16x16/edit_file.png | Bin 649 -> 649 bytes {icons => img/icons}/16x16/edit_settings.png | Bin 646 -> 646 bytes {icons => img/icons}/16x16/file-open.png | Bin 595 -> 595 bytes {icons => img/icons}/16x16/gnome.png | Bin 463 -> 463 bytes {icons => img/icons}/16x16/icewm.png | Bin 538 -> 538 bytes {icons => img/icons}/16x16/kde.png | Bin 899 -> 899 bytes {icons => img/icons}/16x16/lxde.png | Bin 716 -> 716 bytes {icons => img/icons}/16x16/mate.png | Bin 774 -> 774 bytes {icons => img/icons}/16x16/new_file.png | Bin 593 -> 593 bytes {icons => img/icons}/16x16/openbox.png | Bin 360 -> 360 bytes {icons => img/icons}/16x16/preferences.png | Bin 340 -> 340 bytes {icons => img/icons}/16x16/rdp.png | Bin 754 -> 754 bytes {icons => img/icons}/16x16/resolution.png | Bin 446 -> 446 bytes {icons => img/icons}/16x16/session.png | Bin 846 -> 846 bytes {icons => img/icons}/16x16/tbshow.png | Bin 302 -> 302 bytes {icons => img/icons}/16x16/trinity.png | Bin 748 -> 748 bytes {icons => img/icons}/16x16/unity.png | Bin 1410 -> 1410 bytes {icons => img/icons}/16x16/x2go.png | Bin 854 -> 854 bytes {icons => img/icons}/16x16/x2goclient.png | Bin 949 -> 949 bytes {icons => img/icons}/16x16/xfce.png | Bin 639 -> 639 bytes .../icons}/22x22/applications-development.png | Bin 977 -> 977 bytes .../icons}/22x22/applications-education.png | Bin 644 -> 644 bytes {icons => img/icons}/22x22/applications-games.png | Bin 688 -> 688 bytes .../icons}/22x22/applications-graphics.png | Bin 1523 -> 1523 bytes .../icons}/22x22/applications-internet.png | Bin 1355 -> 1355 bytes .../icons}/22x22/applications-multimedia.png | Bin 1353 -> 1353 bytes {icons => img/icons}/22x22/applications-office.png | Bin 804 -> 804 bytes {icons => img/icons}/22x22/applications-other.png | Bin 775 -> 775 bytes {icons => img/icons}/22x22/applications-system.png | Bin 1403 -> 1403 bytes .../icons}/22x22/applications-utilities.png | Bin 888 -> 888 bytes {icons => img/icons}/22x22/preferences-system.png | Bin 1350 -> 1350 bytes {icons => img/icons}/32x32/X.png | Bin 1414 -> 1414 bytes {icons => img/icons}/32x32/apps.png | Bin 1664 -> 1664 bytes {icons => img/icons}/32x32/attach.png | Bin 831 -> 831 bytes {icons => img/icons}/32x32/audio.png | Bin 1465 -> 1465 bytes {icons => img/icons}/32x32/auth.png | Bin 1686 -> 1686 bytes {icons => img/icons}/32x32/contest.png | Bin 1267 -> 1267 bytes {icons => img/icons}/32x32/create_file.png | Bin 1148 -> 1148 bytes {icons => img/icons}/32x32/delete.png | Bin 1456 -> 1456 bytes {icons => img/icons}/32x32/detach.png | Bin 870 -> 870 bytes {icons => img/icons}/32x32/edit.png | Bin 1232 -> 1232 bytes {icons => img/icons}/32x32/edit_file.png | Bin 1334 -> 1334 bytes {icons => img/icons}/32x32/edit_settings.png | Bin 1313 -> 1313 bytes {icons => img/icons}/32x32/exit.png | Bin 1915 -> 1915 bytes {icons => img/icons}/32x32/file-open.png | Bin 1068 -> 1068 bytes {icons => img/icons}/32x32/gnome.png | Bin 846 -> 846 bytes {icons => img/icons}/32x32/kde.png | Bin 2245 -> 2245 bytes {icons => img/icons}/32x32/lxde.png | Bin 1731 -> 1731 bytes {icons => img/icons}/32x32/new_file.png | Bin 1109 -> 1109 bytes {icons => img/icons}/32x32/open_dir.png | Bin 476 -> 476 bytes {icons => img/icons}/32x32/preferences.png | Bin 2545 -> 2545 bytes {icons => img/icons}/32x32/rdp.png | Bin 1768 -> 1768 bytes {icons => img/icons}/32x32/reconnect.png | Bin 1651 -> 1651 bytes {icons => img/icons}/32x32/resolution.png | Bin 855 -> 855 bytes {icons => img/icons}/32x32/session.png | Bin 1177 -> 1177 bytes {icons => img/icons}/32x32/stop.png | Bin 1190 -> 1190 bytes {icons => img/icons}/32x32/stop_session.png | Bin 1093 -> 1093 bytes {icons => img/icons}/32x32/suspend.png | Bin 349 -> 349 bytes {icons => img/icons}/32x32/suspend_session.png | Bin 229 -> 229 bytes {icons => img/icons}/32x32/tbhide.png | Bin 1266 -> 1266 bytes {icons => img/icons}/32x32/tbshow.png | Bin 902 -> 902 bytes {icons => img/icons}/32x32/tbshow.xcf | Bin 2124 -> 2124 bytes {icons => img/icons}/32x32/unity.png | Bin 2984 -> 2984 bytes {icons => img/icons}/32x32/x2goclient.png | Bin 2675 -> 2675 bytes {icons => img/icons}/48x48/x2goclient.png | Bin 4817 -> 4817 bytes {icons => img/icons}/64x64/X.png | Bin 3066 -> 3066 bytes {icons => img/icons}/64x64/audio.png | Bin 2895 -> 2895 bytes {icons => img/icons}/64x64/create_file.png | Bin 2595 -> 2595 bytes {icons => img/icons}/64x64/delete.png | Bin 3752 -> 3752 bytes {icons => img/icons}/64x64/edit.png | Bin 2785 -> 2785 bytes {icons => img/icons}/64x64/edit_file.png | Bin 3057 -> 3057 bytes {icons => img/icons}/64x64/edit_settings.png | Bin 2955 -> 2955 bytes {icons => img/icons}/64x64/file-open.png | Bin 2039 -> 2039 bytes {icons => img/icons}/64x64/gnome.png | Bin 1689 -> 1689 bytes {icons => img/icons}/64x64/kde.png | Bin 5725 -> 5725 bytes {icons => img/icons}/64x64/lxde.png | Bin 4537 -> 4537 bytes {icons => img/icons}/64x64/new_file.png | Bin 2440 -> 2440 bytes {icons => img/icons}/64x64/personal.png | Bin 5046 -> 5046 bytes {icons => img/icons}/64x64/preferences.png | Bin 7000 -> 7000 bytes {icons => img/icons}/64x64/rdp.png | Bin 4498 -> 4498 bytes {icons => img/icons}/64x64/resolution.png | Bin 1805 -> 1805 bytes {icons => img/icons}/64x64/session.png | Bin 2606 -> 2606 bytes {icons => img/icons}/64x64/unity.png | Bin 7241 -> 7241 bytes {icons => img/icons}/64x64/x2goclient.png | Bin 7095 -> 7095 bytes {icons => img/icons}/hildon/x2goclient_26.png | Bin 1235 -> 1235 bytes {icons => img/icons}/hildon/x2goclient_40.png | Bin 1860 -> 1860 bytes {icons => img/icons}/hildon/x2goclient_64.png | Bin 2826 -> 2826 bytes {icons => img/icons}/hildon/x2goclient_hildon.svg | 0 {icons => img/icons}/x2go-mac.icns | Bin 134586 -> 134586 bytes {icons => img/icons}/x2go-win-48.ico | Bin 120254 -> 120254 bytes {icons => img/icons}/x2goclient.xpm | 0 122 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/128x128/X.png b/img/icons/128x128/X.png similarity index 100% rename from icons/128x128/X.png rename to img/icons/128x128/X.png diff --git a/icons/128x128/audio.png b/img/icons/128x128/audio.png similarity index 100% rename from icons/128x128/audio.png rename to img/icons/128x128/audio.png diff --git a/icons/128x128/create_file.png b/img/icons/128x128/create_file.png similarity index 100% rename from icons/128x128/create_file.png rename to img/icons/128x128/create_file.png diff --git a/icons/128x128/delete.png b/img/icons/128x128/delete.png similarity index 100% rename from icons/128x128/delete.png rename to img/icons/128x128/delete.png diff --git a/icons/128x128/edit.png b/img/icons/128x128/edit.png similarity index 100% rename from icons/128x128/edit.png rename to img/icons/128x128/edit.png diff --git a/icons/128x128/edit_file.png b/img/icons/128x128/edit_file.png similarity index 100% rename from icons/128x128/edit_file.png rename to img/icons/128x128/edit_file.png diff --git a/icons/128x128/edit_settings.png b/img/icons/128x128/edit_settings.png similarity index 100% rename from icons/128x128/edit_settings.png rename to img/icons/128x128/edit_settings.png diff --git a/icons/128x128/file-open.png b/img/icons/128x128/file-open.png similarity index 100% rename from icons/128x128/file-open.png rename to img/icons/128x128/file-open.png diff --git a/icons/128x128/folder.png b/img/icons/128x128/folder.png similarity index 100% rename from icons/128x128/folder.png rename to img/icons/128x128/folder.png diff --git a/icons/128x128/gnome.png b/img/icons/128x128/gnome.png similarity index 100% rename from icons/128x128/gnome.png rename to img/icons/128x128/gnome.png diff --git a/icons/128x128/kde.png b/img/icons/128x128/kde.png similarity index 100% rename from icons/128x128/kde.png rename to img/icons/128x128/kde.png diff --git a/icons/128x128/lxde.png b/img/icons/128x128/lxde.png similarity index 100% rename from icons/128x128/lxde.png rename to img/icons/128x128/lxde.png diff --git a/icons/128x128/new_file.png b/img/icons/128x128/new_file.png similarity index 100% rename from icons/128x128/new_file.png rename to img/icons/128x128/new_file.png diff --git a/icons/128x128/preferences.png b/img/icons/128x128/preferences.png similarity index 100% rename from icons/128x128/preferences.png rename to img/icons/128x128/preferences.png diff --git a/icons/128x128/rdp.png b/img/icons/128x128/rdp.png similarity index 100% rename from icons/128x128/rdp.png rename to img/icons/128x128/rdp.png diff --git a/icons/128x128/resolution.png b/img/icons/128x128/resolution.png similarity index 100% rename from icons/128x128/resolution.png rename to img/icons/128x128/resolution.png diff --git a/icons/128x128/session.png b/img/icons/128x128/session.png similarity index 100% rename from icons/128x128/session.png rename to img/icons/128x128/session.png diff --git a/icons/128x128/unity.png b/img/icons/128x128/unity.png similarity index 100% rename from icons/128x128/unity.png rename to img/icons/128x128/unity.png diff --git a/icons/128x128/x2go.png b/img/icons/128x128/x2go.png similarity index 100% rename from icons/128x128/x2go.png rename to img/icons/128x128/x2go.png diff --git a/icons/128x128/x2goclient.png b/img/icons/128x128/x2goclient.png similarity index 100% rename from icons/128x128/x2goclient.png rename to img/icons/128x128/x2goclient.png diff --git a/icons/128x128/x2gogroup.png b/img/icons/128x128/x2gogroup.png similarity index 100% rename from icons/128x128/x2gogroup.png rename to img/icons/128x128/x2gogroup.png diff --git a/icons/128x128/x2gohosts.png b/img/icons/128x128/x2gohosts.png similarity index 100% rename from icons/128x128/x2gohosts.png rename to img/icons/128x128/x2gohosts.png diff --git a/icons/128x128/x2gomailclient.png b/img/icons/128x128/x2gomailclient.png similarity index 100% rename from icons/128x128/x2gomailclient.png rename to img/icons/128x128/x2gomailclient.png diff --git a/icons/128x128/x2gosession.png b/img/icons/128x128/x2gosession.png similarity index 100% rename from icons/128x128/x2gosession.png rename to img/icons/128x128/x2gosession.png diff --git a/icons/128x128/x2gouser.png b/img/icons/128x128/x2gouser.png similarity index 100% rename from icons/128x128/x2gouser.png rename to img/icons/128x128/x2gouser.png diff --git a/icons/16x16/X.png b/img/icons/16x16/X.png similarity index 100% rename from icons/16x16/X.png rename to img/icons/16x16/X.png diff --git a/icons/16x16/audio.png b/img/icons/16x16/audio.png similarity index 100% rename from icons/16x16/audio.png rename to img/icons/16x16/audio.png diff --git a/icons/16x16/cinnamon.png b/img/icons/16x16/cinnamon.png similarity index 100% rename from icons/16x16/cinnamon.png rename to img/icons/16x16/cinnamon.png diff --git a/icons/16x16/create_file.png b/img/icons/16x16/create_file.png similarity index 100% rename from icons/16x16/create_file.png rename to img/icons/16x16/create_file.png diff --git a/icons/16x16/delete.png b/img/icons/16x16/delete.png similarity index 100% rename from icons/16x16/delete.png rename to img/icons/16x16/delete.png diff --git a/icons/16x16/edit.png b/img/icons/16x16/edit.png similarity index 100% rename from icons/16x16/edit.png rename to img/icons/16x16/edit.png diff --git a/icons/16x16/edit_file.png b/img/icons/16x16/edit_file.png similarity index 100% rename from icons/16x16/edit_file.png rename to img/icons/16x16/edit_file.png diff --git a/icons/16x16/edit_settings.png b/img/icons/16x16/edit_settings.png similarity index 100% rename from icons/16x16/edit_settings.png rename to img/icons/16x16/edit_settings.png diff --git a/icons/16x16/file-open.png b/img/icons/16x16/file-open.png similarity index 100% rename from icons/16x16/file-open.png rename to img/icons/16x16/file-open.png diff --git a/icons/16x16/gnome.png b/img/icons/16x16/gnome.png similarity index 100% rename from icons/16x16/gnome.png rename to img/icons/16x16/gnome.png diff --git a/icons/16x16/icewm.png b/img/icons/16x16/icewm.png similarity index 100% rename from icons/16x16/icewm.png rename to img/icons/16x16/icewm.png diff --git a/icons/16x16/kde.png b/img/icons/16x16/kde.png similarity index 100% rename from icons/16x16/kde.png rename to img/icons/16x16/kde.png diff --git a/icons/16x16/lxde.png b/img/icons/16x16/lxde.png similarity index 100% rename from icons/16x16/lxde.png rename to img/icons/16x16/lxde.png diff --git a/icons/16x16/mate.png b/img/icons/16x16/mate.png similarity index 100% rename from icons/16x16/mate.png rename to img/icons/16x16/mate.png diff --git a/icons/16x16/new_file.png b/img/icons/16x16/new_file.png similarity index 100% rename from icons/16x16/new_file.png rename to img/icons/16x16/new_file.png diff --git a/icons/16x16/openbox.png b/img/icons/16x16/openbox.png similarity index 100% rename from icons/16x16/openbox.png rename to img/icons/16x16/openbox.png diff --git a/icons/16x16/preferences.png b/img/icons/16x16/preferences.png similarity index 100% rename from icons/16x16/preferences.png rename to img/icons/16x16/preferences.png diff --git a/icons/16x16/rdp.png b/img/icons/16x16/rdp.png similarity index 100% rename from icons/16x16/rdp.png rename to img/icons/16x16/rdp.png diff --git a/icons/16x16/resolution.png b/img/icons/16x16/resolution.png similarity index 100% rename from icons/16x16/resolution.png rename to img/icons/16x16/resolution.png diff --git a/icons/16x16/session.png b/img/icons/16x16/session.png similarity index 100% rename from icons/16x16/session.png rename to img/icons/16x16/session.png diff --git a/icons/16x16/tbshow.png b/img/icons/16x16/tbshow.png similarity index 100% rename from icons/16x16/tbshow.png rename to img/icons/16x16/tbshow.png diff --git a/icons/16x16/trinity.png b/img/icons/16x16/trinity.png similarity index 100% rename from icons/16x16/trinity.png rename to img/icons/16x16/trinity.png diff --git a/icons/16x16/unity.png b/img/icons/16x16/unity.png similarity index 100% rename from icons/16x16/unity.png rename to img/icons/16x16/unity.png diff --git a/icons/16x16/x2go.png b/img/icons/16x16/x2go.png similarity index 100% rename from icons/16x16/x2go.png rename to img/icons/16x16/x2go.png diff --git a/icons/16x16/x2goclient.png b/img/icons/16x16/x2goclient.png similarity index 100% rename from icons/16x16/x2goclient.png rename to img/icons/16x16/x2goclient.png diff --git a/icons/16x16/xfce.png b/img/icons/16x16/xfce.png similarity index 100% rename from icons/16x16/xfce.png rename to img/icons/16x16/xfce.png diff --git a/icons/22x22/applications-development.png b/img/icons/22x22/applications-development.png similarity index 100% rename from icons/22x22/applications-development.png rename to img/icons/22x22/applications-development.png diff --git a/icons/22x22/applications-education.png b/img/icons/22x22/applications-education.png similarity index 100% rename from icons/22x22/applications-education.png rename to img/icons/22x22/applications-education.png diff --git a/icons/22x22/applications-games.png b/img/icons/22x22/applications-games.png similarity index 100% rename from icons/22x22/applications-games.png rename to img/icons/22x22/applications-games.png diff --git a/icons/22x22/applications-graphics.png b/img/icons/22x22/applications-graphics.png similarity index 100% rename from icons/22x22/applications-graphics.png rename to img/icons/22x22/applications-graphics.png diff --git a/icons/22x22/applications-internet.png b/img/icons/22x22/applications-internet.png similarity index 100% rename from icons/22x22/applications-internet.png rename to img/icons/22x22/applications-internet.png diff --git a/icons/22x22/applications-multimedia.png b/img/icons/22x22/applications-multimedia.png similarity index 100% rename from icons/22x22/applications-multimedia.png rename to img/icons/22x22/applications-multimedia.png diff --git a/icons/22x22/applications-office.png b/img/icons/22x22/applications-office.png similarity index 100% rename from icons/22x22/applications-office.png rename to img/icons/22x22/applications-office.png diff --git a/icons/22x22/applications-other.png b/img/icons/22x22/applications-other.png similarity index 100% rename from icons/22x22/applications-other.png rename to img/icons/22x22/applications-other.png diff --git a/icons/22x22/applications-system.png b/img/icons/22x22/applications-system.png similarity index 100% rename from icons/22x22/applications-system.png rename to img/icons/22x22/applications-system.png diff --git a/icons/22x22/applications-utilities.png b/img/icons/22x22/applications-utilities.png similarity index 100% rename from icons/22x22/applications-utilities.png rename to img/icons/22x22/applications-utilities.png diff --git a/icons/22x22/preferences-system.png b/img/icons/22x22/preferences-system.png similarity index 100% rename from icons/22x22/preferences-system.png rename to img/icons/22x22/preferences-system.png diff --git a/icons/32x32/X.png b/img/icons/32x32/X.png similarity index 100% rename from icons/32x32/X.png rename to img/icons/32x32/X.png diff --git a/icons/32x32/apps.png b/img/icons/32x32/apps.png similarity index 100% rename from icons/32x32/apps.png rename to img/icons/32x32/apps.png diff --git a/icons/32x32/attach.png b/img/icons/32x32/attach.png similarity index 100% rename from icons/32x32/attach.png rename to img/icons/32x32/attach.png diff --git a/icons/32x32/audio.png b/img/icons/32x32/audio.png similarity index 100% rename from icons/32x32/audio.png rename to img/icons/32x32/audio.png diff --git a/icons/32x32/auth.png b/img/icons/32x32/auth.png similarity index 100% rename from icons/32x32/auth.png rename to img/icons/32x32/auth.png diff --git a/icons/32x32/contest.png b/img/icons/32x32/contest.png similarity index 100% rename from icons/32x32/contest.png rename to img/icons/32x32/contest.png diff --git a/icons/32x32/create_file.png b/img/icons/32x32/create_file.png similarity index 100% rename from icons/32x32/create_file.png rename to img/icons/32x32/create_file.png diff --git a/icons/32x32/delete.png b/img/icons/32x32/delete.png similarity index 100% rename from icons/32x32/delete.png rename to img/icons/32x32/delete.png diff --git a/icons/32x32/detach.png b/img/icons/32x32/detach.png similarity index 100% rename from icons/32x32/detach.png rename to img/icons/32x32/detach.png diff --git a/icons/32x32/edit.png b/img/icons/32x32/edit.png similarity index 100% rename from icons/32x32/edit.png rename to img/icons/32x32/edit.png diff --git a/icons/32x32/edit_file.png b/img/icons/32x32/edit_file.png similarity index 100% rename from icons/32x32/edit_file.png rename to img/icons/32x32/edit_file.png diff --git a/icons/32x32/edit_settings.png b/img/icons/32x32/edit_settings.png similarity index 100% rename from icons/32x32/edit_settings.png rename to img/icons/32x32/edit_settings.png diff --git a/icons/32x32/exit.png b/img/icons/32x32/exit.png similarity index 100% rename from icons/32x32/exit.png rename to img/icons/32x32/exit.png diff --git a/icons/32x32/file-open.png b/img/icons/32x32/file-open.png similarity index 100% rename from icons/32x32/file-open.png rename to img/icons/32x32/file-open.png diff --git a/icons/32x32/gnome.png b/img/icons/32x32/gnome.png similarity index 100% rename from icons/32x32/gnome.png rename to img/icons/32x32/gnome.png diff --git a/icons/32x32/kde.png b/img/icons/32x32/kde.png similarity index 100% rename from icons/32x32/kde.png rename to img/icons/32x32/kde.png diff --git a/icons/32x32/lxde.png b/img/icons/32x32/lxde.png similarity index 100% rename from icons/32x32/lxde.png rename to img/icons/32x32/lxde.png diff --git a/icons/32x32/new_file.png b/img/icons/32x32/new_file.png similarity index 100% rename from icons/32x32/new_file.png rename to img/icons/32x32/new_file.png diff --git a/icons/32x32/open_dir.png b/img/icons/32x32/open_dir.png similarity index 100% rename from icons/32x32/open_dir.png rename to img/icons/32x32/open_dir.png diff --git a/icons/32x32/preferences.png b/img/icons/32x32/preferences.png similarity index 100% rename from icons/32x32/preferences.png rename to img/icons/32x32/preferences.png diff --git a/icons/32x32/rdp.png b/img/icons/32x32/rdp.png similarity index 100% rename from icons/32x32/rdp.png rename to img/icons/32x32/rdp.png diff --git a/icons/32x32/reconnect.png b/img/icons/32x32/reconnect.png similarity index 100% rename from icons/32x32/reconnect.png rename to img/icons/32x32/reconnect.png diff --git a/icons/32x32/resolution.png b/img/icons/32x32/resolution.png similarity index 100% rename from icons/32x32/resolution.png rename to img/icons/32x32/resolution.png diff --git a/icons/32x32/session.png b/img/icons/32x32/session.png similarity index 100% rename from icons/32x32/session.png rename to img/icons/32x32/session.png diff --git a/icons/32x32/stop.png b/img/icons/32x32/stop.png similarity index 100% rename from icons/32x32/stop.png rename to img/icons/32x32/stop.png diff --git a/icons/32x32/stop_session.png b/img/icons/32x32/stop_session.png similarity index 100% rename from icons/32x32/stop_session.png rename to img/icons/32x32/stop_session.png diff --git a/icons/32x32/suspend.png b/img/icons/32x32/suspend.png similarity index 100% rename from icons/32x32/suspend.png rename to img/icons/32x32/suspend.png diff --git a/icons/32x32/suspend_session.png b/img/icons/32x32/suspend_session.png similarity index 100% rename from icons/32x32/suspend_session.png rename to img/icons/32x32/suspend_session.png diff --git a/icons/32x32/tbhide.png b/img/icons/32x32/tbhide.png similarity index 100% rename from icons/32x32/tbhide.png rename to img/icons/32x32/tbhide.png diff --git a/icons/32x32/tbshow.png b/img/icons/32x32/tbshow.png similarity index 100% rename from icons/32x32/tbshow.png rename to img/icons/32x32/tbshow.png diff --git a/icons/32x32/tbshow.xcf b/img/icons/32x32/tbshow.xcf similarity index 100% rename from icons/32x32/tbshow.xcf rename to img/icons/32x32/tbshow.xcf diff --git a/icons/32x32/unity.png b/img/icons/32x32/unity.png similarity index 100% rename from icons/32x32/unity.png rename to img/icons/32x32/unity.png diff --git a/icons/32x32/x2goclient.png b/img/icons/32x32/x2goclient.png similarity index 100% rename from icons/32x32/x2goclient.png rename to img/icons/32x32/x2goclient.png diff --git a/icons/48x48/x2goclient.png b/img/icons/48x48/x2goclient.png similarity index 100% rename from icons/48x48/x2goclient.png rename to img/icons/48x48/x2goclient.png diff --git a/icons/64x64/X.png b/img/icons/64x64/X.png similarity index 100% rename from icons/64x64/X.png rename to img/icons/64x64/X.png diff --git a/icons/64x64/audio.png b/img/icons/64x64/audio.png similarity index 100% rename from icons/64x64/audio.png rename to img/icons/64x64/audio.png diff --git a/icons/64x64/create_file.png b/img/icons/64x64/create_file.png similarity index 100% rename from icons/64x64/create_file.png rename to img/icons/64x64/create_file.png diff --git a/icons/64x64/delete.png b/img/icons/64x64/delete.png similarity index 100% rename from icons/64x64/delete.png rename to img/icons/64x64/delete.png diff --git a/icons/64x64/edit.png b/img/icons/64x64/edit.png similarity index 100% rename from icons/64x64/edit.png rename to img/icons/64x64/edit.png diff --git a/icons/64x64/edit_file.png b/img/icons/64x64/edit_file.png similarity index 100% rename from icons/64x64/edit_file.png rename to img/icons/64x64/edit_file.png diff --git a/icons/64x64/edit_settings.png b/img/icons/64x64/edit_settings.png similarity index 100% rename from icons/64x64/edit_settings.png rename to img/icons/64x64/edit_settings.png diff --git a/icons/64x64/file-open.png b/img/icons/64x64/file-open.png similarity index 100% rename from icons/64x64/file-open.png rename to img/icons/64x64/file-open.png diff --git a/icons/64x64/gnome.png b/img/icons/64x64/gnome.png similarity index 100% rename from icons/64x64/gnome.png rename to img/icons/64x64/gnome.png diff --git a/icons/64x64/kde.png b/img/icons/64x64/kde.png similarity index 100% rename from icons/64x64/kde.png rename to img/icons/64x64/kde.png diff --git a/icons/64x64/lxde.png b/img/icons/64x64/lxde.png similarity index 100% rename from icons/64x64/lxde.png rename to img/icons/64x64/lxde.png diff --git a/icons/64x64/new_file.png b/img/icons/64x64/new_file.png similarity index 100% rename from icons/64x64/new_file.png rename to img/icons/64x64/new_file.png diff --git a/icons/64x64/personal.png b/img/icons/64x64/personal.png similarity index 100% rename from icons/64x64/personal.png rename to img/icons/64x64/personal.png diff --git a/icons/64x64/preferences.png b/img/icons/64x64/preferences.png similarity index 100% rename from icons/64x64/preferences.png rename to img/icons/64x64/preferences.png diff --git a/icons/64x64/rdp.png b/img/icons/64x64/rdp.png similarity index 100% rename from icons/64x64/rdp.png rename to img/icons/64x64/rdp.png diff --git a/icons/64x64/resolution.png b/img/icons/64x64/resolution.png similarity index 100% rename from icons/64x64/resolution.png rename to img/icons/64x64/resolution.png diff --git a/icons/64x64/session.png b/img/icons/64x64/session.png similarity index 100% rename from icons/64x64/session.png rename to img/icons/64x64/session.png diff --git a/icons/64x64/unity.png b/img/icons/64x64/unity.png similarity index 100% rename from icons/64x64/unity.png rename to img/icons/64x64/unity.png diff --git a/icons/64x64/x2goclient.png b/img/icons/64x64/x2goclient.png similarity index 100% rename from icons/64x64/x2goclient.png rename to img/icons/64x64/x2goclient.png diff --git a/icons/hildon/x2goclient_26.png b/img/icons/hildon/x2goclient_26.png similarity index 100% rename from icons/hildon/x2goclient_26.png rename to img/icons/hildon/x2goclient_26.png diff --git a/icons/hildon/x2goclient_40.png b/img/icons/hildon/x2goclient_40.png similarity index 100% rename from icons/hildon/x2goclient_40.png rename to img/icons/hildon/x2goclient_40.png diff --git a/icons/hildon/x2goclient_64.png b/img/icons/hildon/x2goclient_64.png similarity index 100% rename from icons/hildon/x2goclient_64.png rename to img/icons/hildon/x2goclient_64.png diff --git a/icons/hildon/x2goclient_hildon.svg b/img/icons/hildon/x2goclient_hildon.svg similarity index 100% rename from icons/hildon/x2goclient_hildon.svg rename to img/icons/hildon/x2goclient_hildon.svg diff --git a/icons/x2go-mac.icns b/img/icons/x2go-mac.icns similarity index 100% rename from icons/x2go-mac.icns rename to img/icons/x2go-mac.icns diff --git a/icons/x2go-win-48.ico b/img/icons/x2go-win-48.ico similarity index 100% rename from icons/x2go-win-48.ico rename to img/icons/x2go-win-48.ico diff --git a/icons/x2goclient.xpm b/img/icons/x2goclient.xpm similarity index 100% rename from icons/x2goclient.xpm rename to img/icons/x2goclient.xpm -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 200577f69230fc77a7fa91bdccea8ec06d9a9918 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:37:00 2015 +0100 nsis/gpl.txt: fix formatting errors. --- debian/changelog | 1 + nsis/gpl.txt | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index e544784..e78c052 100644 --- a/debian/changelog +++ b/debian/changelog @@ -131,6 +131,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - 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. + - Fix formatting errors in nsis/gpl.txt. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/nsis/gpl.txt b/nsis/gpl.txt index 7a8e8ab..3d1e3ee 100755 --- a/nsis/gpl.txt +++ b/nsis/gpl.txt @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 0f2ba2d2134a2c9127ae426954cd3f83f5d52bd3 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:44:38 2015 +0100 nsis/x2goclient.nsi: fix whitespace errors. --- debian/changelog | 1 + nsis/x2goclient.nsi | 100 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index e78c052..4e50d18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -132,6 +132,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Move *.ts and *.qm files to i18n/ and update references in resources.rcc, x2goclient.pro and debian/rules. - Fix formatting errors in nsis/gpl.txt. + - Fix whitespace errors in nsis/x2goclient.nsi. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 285a80c..1b49e4d 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -19,11 +19,11 @@ !define MUI_UNICON img\icons\win-uninstall.ico ;Default installation folder InstallDir "$PROGRAMFILES\x2goclient" - + ;NSIS 2.46 defaults to zlib. Setting this reduces the size of a default ;(no fonts) build by about 24% - SetCompressor /SOLID lzma - + SetCompressor /SOLID lzma + ;Get installation folder from registry if available InstallDirRegKey HKLM "Software\x2goclient" "" @@ -46,8 +46,8 @@ SectionEnd ;Language Selection Dialog Settings ;Remember the installer language - !define MUI_LANGDLL_REGISTRY_ROOT "HKLM" - !define MUI_LANGDLL_REGISTRY_KEY "Software\x2goclient" + !define MUI_LANGDLL_REGISTRY_ROOT "HKLM" + !define MUI_LANGDLL_REGISTRY_KEY "Software\x2goclient" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" ;------------------------------ @@ -55,10 +55,10 @@ SectionEnd Var STARTMENU_FOLDER Var MUI_TEMP - + !define UNINSTALL_REGKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\x2goclient" !define UNINSTALL_DISPLAYNAME "X2Go Client for Windows" - !define UNINSTALL_PUBLISHER "X2Go Project" + !define UNINSTALL_PUBLISHER "X2Go Project" !define UNINSTALL_DISPLAYVERSION ${VERSION} !define UNINSTALL_URL "http://www.x2go.org" @@ -71,7 +71,7 @@ SectionEnd !define MUI_STARTMENUPAGE_DEFAULTFOLDER "X2Go Client for Windows" !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\x2goclient" - !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU "Application" $STARTMENU_FOLDER !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_UNPAGE_CONFIRM @@ -81,17 +81,17 @@ SectionEnd ;-------------------------------- ;Languages - !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Russian" - + ;-------------------------------- ;Reserve Files - + ;If you are using solid compression, files that are required before ;the actual installation should be stored first in the data block, ;because this will make your installer start faster. - + !insertmacro MUI_RESERVEFILE_LANGDLL @@ -105,17 +105,17 @@ InstType "Minimal" Section "X2Go Client (required)" base - SetShellVarContext all + SetShellVarContext all SectionIn RO SetOutPath "$INSTDIR" File /a "x2goclient\*.*" File /r "x2goclient\pulse" - File /r /x "fonts" "x2goclient\VcXsrv" - + File /r /x "fonts" "x2goclient\VcXsrv" + ;Store installation folder WriteRegStr HKLM "Software\x2goclient" "" $INSTDIR - + ;Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -128,23 +128,23 @@ Section "X2Go Client (required)" base Delete "$INSTDIR\X2goClient.lnk" Delete "$SMPROGRAMS\$STARTMENU_FOLDER\X2goClient.lnk" Delete "$DESKTOP\X2goClient.lnk" - + !insertmacro MUI_STARTMENU_WRITE_END - + ;Add uninstall information to Add/Remove Programs ;http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs - WriteRegStr HKLM ${UNINSTALL_REGKEY} "InstallLocation" "$INSTDIR" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayIcon" "$INSTDIR\x2goclient.exe" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayName" "${UNINSTALL_DISPLAYNAME}" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "Publisher" "${UNINSTALL_PUBLISHER}" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayVersion" "${UNINSTALL_DISPLAYVERSION}" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "HelpLink" "${UNINSTALL_URL}" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLInfoAbout" "${UNINSTALL_URL}" - WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLUpdateInfo" "${UNINSTALL_URL}" - WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoModify" 1 - WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoRepair" 1 - + WriteRegStr HKLM ${UNINSTALL_REGKEY} "InstallLocation" "$INSTDIR" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayIcon" "$INSTDIR\x2goclient.exe" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayName" "${UNINSTALL_DISPLAYNAME}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "Publisher" "${UNINSTALL_PUBLISHER}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayVersion" "${UNINSTALL_DISPLAYVERSION}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "HelpLink" "${UNINSTALL_URL}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLInfoAbout" "${UNINSTALL_URL}" + WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLUpdateInfo" "${UNINSTALL_URL}" + WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoModify" 1 + WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoRepair" 1 + SectionEnd ;x2goclient bug 108 fix @@ -160,42 +160,42 @@ SectionGroup "Fonts" SectionIn 1 2 SetOutPath "$INSTDIR\VcXsrv\fonts\" File "x2goclient\VcXsrv\fonts\fonts.conf" - File /r "x2goclient\VcXsrv\fonts\misc" + File /r "x2goclient\VcXsrv\fonts\misc" SectionEnd - + ;As of VcXsrv-xp 1.14.3.2 ;75dpi is 1,897 files at 10.7 MB (15.6 MB on disk) Section "75dpi" fonts-75dpi SectionIn 2 SetOutPath "$INSTDIR\VcXsrv\fonts\" File "x2goclient\VcXsrv\fonts\fonts.conf" - File /r "x2goclient\VcXsrv\fonts\75dpi" + File /r "x2goclient\VcXsrv\fonts\75dpi" SectionEnd - + ;As of VcXsrv-xp 1.14.3.2 ;100dpi is 1,897 files at 12.3 MB (16.8 MB on disk) Section "100dpi" fonts-100dpi SectionIn 2 SetOutPath "$INSTDIR\VcXsrv\fonts\" File "x2goclient\VcXsrv\fonts\fonts.conf" - File /r "x2goclient\VcXsrv\fonts\100dpi" + File /r "x2goclient\VcXsrv\fonts\100dpi" SectionEnd - + ;As of VcXsrv-xp 1.14.3.2 ;everything else is 466 files at 12.8MB (13.8 MB on disk) Section "others" fonts-others SectionIn 2 SetOutPath "$INSTDIR\VcXsrv\fonts\" File "x2goclient\VcXsrv\fonts\fonts.conf" - File /r "x2goclient\VcXsrv\fonts\cyrillic" - File /r "x2goclient\VcXsrv\fonts\encodings" - File /r "x2goclient\VcXsrv\fonts\OTF" - File /r "x2goclient\VcXsrv\fonts\Speedo" - File /r "x2goclient\VcXsrv\fonts\terminus-font" - File /r "x2goclient\VcXsrv\fonts\TTF" - File /r "x2goclient\VcXsrv\fonts\Type1" + File /r "x2goclient\VcXsrv\fonts\cyrillic" + File /r "x2goclient\VcXsrv\fonts\encodings" + File /r "x2goclient\VcXsrv\fonts\OTF" + File /r "x2goclient\VcXsrv\fonts\Speedo" + File /r "x2goclient\VcXsrv\fonts\terminus-font" + File /r "x2goclient\VcXsrv\fonts\TTF" + File /r "x2goclient\VcXsrv\fonts\Type1" SectionEnd - + SectionGroupEnd Section "Desktop Shortcut" desktopshortcut @@ -205,14 +205,14 @@ Section "Desktop Shortcut" desktopshortcut SetOutPath "$INSTDIR" CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" SectionEnd - + Section -EstimatedSize SectionIn RO ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 IntFmt $0 "0x%08X" $0 WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "EstimatedSize" "$0" SectionEnd - + ;------------------------------------------- ;Descriptions @@ -238,7 +238,7 @@ FunctionEnd Section "Uninstall" - SetShellVarContext all + SetShellVarContext all !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @@ -246,7 +246,7 @@ Section "Uninstall" Delete "$DESKTOP\X2Go Client.lnk" StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" startMenuDeleteLoop: - ClearErrors + ClearErrors RMDir $MUI_TEMP GetFullPathName $MUI_TEMP "$MUI_TEMP\.." IfErrors startMenuDeleteLoopDone @@ -254,7 +254,7 @@ Section "Uninstall" startMenuDeleteLoopDone: RMDir /r "$INSTDIR" - + DeleteRegKey HKLM "Software\x2goclient" DeleteRegKey HKLM "${UNINSTALL_REGKEY}" @@ -266,5 +266,5 @@ SectionEnd Function un.onInit !insertmacro MUI_UNGETLANGUAGE - + FunctionEnd -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit c97d645185fe3804a4d14023cd62deaf518f4f84 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:46:16 2015 +0100 nsis/x2goclient.nsi: don't change the icons path. --- debian/changelog | 1 + nsis/x2goclient.nsi | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e50d18..2f2e20c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,6 +133,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium resources.rcc, x2goclient.pro and debian/rules. - Fix formatting errors in nsis/gpl.txt. - Fix whitespace errors in nsis/x2goclient.nsi. + - Don't change the icons path in nsis/x2goclient.nsi. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 1b49e4d..a0cafc5 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -15,8 +15,8 @@ Name "x2goclient ${VERSION}" Caption "x2goclient ${VERSION}" OutFile "x2goclient-${VERSION}-setup.exe" - !define MUI_ICON img\icons\win-install.ico - !define MUI_UNICON img\icons\win-uninstall.ico + !define MUI_ICON icons\win-install.ico + !define MUI_UNICON icons\win-uninstall.ico ;Default installation folder InstallDir "$PROGRAMFILES\x2goclient" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 6480e24e8e89b4a82b91ec78bc04c251c2ee86f5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:47:41 2015 +0100 nsis: make files non-executable. --- debian/changelog | 1 + nsis/icons/win-install.ico | Bin 1078 -> 1078 bytes nsis/icons/win-uninstall.ico | Bin 1078 -> 1078 bytes 3 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 2f2e20c..749a464 100644 --- a/debian/changelog +++ b/debian/changelog @@ -134,6 +134,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix formatting errors in nsis/gpl.txt. - Fix whitespace errors in nsis/x2goclient.nsi. - Don't change the icons path in nsis/x2goclient.nsi. + - Make nsis files non-executable. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/nsis/gpl.txt b/nsis/gpl.txt old mode 100755 new mode 100644 diff --git a/nsis/icons/win-install.ico b/nsis/icons/win-install.ico old mode 100755 new mode 100644 diff --git a/nsis/icons/win-uninstall.ico b/nsis/icons/win-uninstall.ico old mode 100755 new mode 100644 diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi old mode 100755 new mode 100644 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org