This fixes bug: 639

Add desktop files for:
- assistant-qt3
- designer-qt3
- linguist-qt3
- qtconfig-qt3

These files have been made with the contribution of Laurent Dard's
patch (see bugzilla:639) with little change/addition from I.

Add 'sysshare' option to the configure script.

Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

10 files changed, 430 insertions, 12 deletions

diff --git a/configure b/configure
index 77accf6..b969f4d 100755
--- a/configure
+++ b/configure
@@ -171,7 +171,7 @@ QT_INSTALL_PLUGINS=
 QT_INSTALL_DATA=
 QT_INSTALL_TRANSLATIONS=
 QT_INSTALL_SYSCONF=
-
+QT_INSTALL_SHARE=
 
 #-------------------------------------------------------------------------------
 # check SQL drivers and styles available in this package
@@ -241,7 +241,7 @@ while [ "$#" -gt 0 ]; do
 	    UNKNOWN_ARG=yes
 	fi
 	;;
-    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
+    -prefix|-sysshare|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
 	VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
 	shift
 	VAL=$1
@@ -371,6 +371,9 @@ while [ "$#" -gt 0 ]; do
     sysconfdir)
 	QT_INSTALL_SYSCONF="$VAL"
 	;;
+    sysshare)
+	QT_INSTALL_SHARE="$VAL"
+	;;
     qconfig)
 	CFG_QCONFIG="$VAL"
 	;;
@@ -940,6 +943,8 @@ done
 [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations
 # default PREFIX/etc/settings
 [ -z "$QT_INSTALL_SYSCONF" ]      && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/settings
+# default PREFIX/share
+[ -z "$QT_INSTALL_SHARE" ]        && QT_INSTALL_SHARE=$QT_INSTALL_PREFIX/share
 
 # generate qconfig.cpp
 [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
@@ -956,6 +961,7 @@ static const char QT_INSTALL_PLUGINS     [267] = "qt_plgpath=$QT_INSTALL_PLUGINS
 static const char QT_INSTALL_DATA        [267] = "qt_datpath=$QT_INSTALL_DATA";
 static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=$QT_INSTALL_TRANSLATIONS";
 static const char QT_INSTALL_SYSCONF     [267] = "qt_cnfpath=$QT_INSTALL_SYSCONF";
+static const char QT_INSTALL_SHARE       [267] = "qt_shapath=$QT_INSTALL_SHARE";
 
 /* strlen( "qt_xxxpath=" ) == 11 */
 const char *qInstallPath()             { return QT_INSTALL_PREFIX       + 11; }
@@ -967,6 +973,7 @@ const char *qInstallPathPlugins()      { return QT_INSTALL_PLUGINS      + 11; }
 const char *qInstallPathData()         { return QT_INSTALL_DATA         + 11; }
 const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }
 const char *qInstallPathSysconf()      { return QT_INSTALL_SYSCONF      + 11; }
+const char *qInstallPathShare()        { return QT_INSTALL_SHARE        + 11; }
 EOF
 
 # avoid unecessary rebuilds by copying only if qconfig.cpp has changed
@@ -1851,7 +1858,7 @@ if [ "$OPT_HELP" = "yes" ]; then
 
     cat <<EOF
 Usage:  $relconf [-prefix dir] [-buildkey key] [-docdir dir] [-headerdir dir]
-	[-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir]
+	[-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir] [-sysshare dir]
 	[-translationdir dir] [-sysconfdir dir] [-debug] [-release]
 	[-no-gif] [-qt-gif] [-no-sm] [-sm] [-qt-zlib] [-system-zlib]
 	[-qt-libpng] [-system-libpng]
@@ -1886,6 +1893,8 @@ Installation options:
                           (default PREFIX/translations)
     -sysconfdir dir ...  Settings used by Qt programs will be looked for in dir
                           (default PREFIX/etc/settings)
+    -sysshare dir .....  System shared data will be installed in dir
+                          (default PREFIX/share)
 
  You may use these options to turn on strict plugin loading.
 
@@ -2752,6 +2761,7 @@ QMAKE_VARS="$QMAKE_VARS \"libs.path=${QT_INSTALL_LIBS}\""
 QMAKE_VARS="$QMAKE_VARS \"bins.path=${QT_INSTALL_BINS}\""
 QMAKE_VARS="$QMAKE_VARS \"data.path=${QT_INSTALL_DATA}\""
 QMAKE_VARS="$QMAKE_VARS \"translations.path=${QT_INSTALL_TRANSLATIONS}\""
+QMAKE_VARS="$QMAKE_VARS \"share.path=${QT_INSTALL_SHARE}\""
 
 # turn off exceptions for the compilers that support it
 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h
index 7de3453..6046029 100644
--- a/src/tools/qglobal.h
+++ b/src/tools/qglobal.h
@@ -1040,6 +1040,7 @@ Q_EXPORT const char *qInstallPathPlugins();
 Q_EXPORT const char *qInstallPathData();
 Q_EXPORT const char *qInstallPathTranslations();
 Q_EXPORT const char *qInstallPathSysconf();
+Q_EXPORT const char *qInstallPathShare();
 
 #endif /* __cplusplus */
 
diff --git a/tools/assistant/assistant-qt3.desktop b/tools/assistant/assistant-qt3.desktop
new file mode 100644
index 0000000..2934fbb
--- /dev/null
+++ b/tools/assistant/assistant-qt3.desktop
@@ -0,0 +1,93 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=assistant-qt3
+Name=Qt3 Assistant
+Name[de]=Qt3 Assistent
+Name[bg]=Qt3 асистент
+Name[cs]=Qt3 asistent
+Name[de]=Qt3 Assistent
+Name[hu]=Qt3 Asszisztens
+Name[ja]=Qt3アシスタント
+Name[km]=អ្នក​ជំនួយការ Qt3
+Name[nb]=Qt3-assistent
+Name[pa]=Qt3 ਸਹਾਇਕ
+Name[sv]=Qt3-assistent
+Name[zh_CN]=Qt3 助手
+Name[zh_TW]=Qt3 助理
+GenericName=Document Browser
+GenericName[af]=Dokument Blaaier
+GenericName[az]=Sənəd Səyyahı
+GenericName[bg]=Преглед на документи
+GenericName[bn]=নথী ব্রাউজার
+GenericName[br]=Furcher Teulioù
+GenericName[bs]=Preglednik dokumenata
+GenericName[ca]=Navegador de documents
+GenericName[cs]=Prohlížeč dokumentace
+GenericName[cy]=Porydd Dogfen
+GenericName[da]=Dokumentfremviser
+GenericName[de]=Dokumentbrowser
+GenericName[el]=Προβολέας εγγράφων
+GenericName[eo]=Dokumentorigardilo
+GenericName[es]=Navegador de documentos
+GenericName[et]=Dokumentatsiooni brauser
+GenericName[eu]=Dokumentu Ikustailua
+GenericName[fa]=مرورگر سند
+GenericName[fi]=Asiakirjaselain
+GenericName[fo]=Skjalakagari
+GenericName[fr]=Explorateur de documentation
+GenericName[gl]=Explorador de Documentos
+GenericName[he]=דפדפן מסמכים
+GenericName[hi]=दस्तावेज़़ ब्राउज़र
+GenericName[hr]=Preglednik dokumenata
+GenericName[hu]=Dokumentumböngésző
+GenericName[is]=Skjalavafri
+GenericName[it]=Visualizzatore di documenti
+GenericName[ja]=ドキュメントブラウザ
+GenericName[km]=កម្មវិធី​រុករក​ឯកសារ
+GenericName[ko]=문서 탐색기
+GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ
+GenericName[lt]=Dokumentų žiūriklis
+GenericName[lv]=Dokumentu Pārlūks
+GenericName[mn]=Баримтын хөтөч
+GenericName[ms]=Pelungsur Dokumen
+GenericName[mt]=Browser ta' Dokumenti
+GenericName[nb]=Dokumentleser
+GenericName[nds]=Dokmentkieker
+GenericName[nl]=Documentbrowser
+GenericName[nn]=Dokumentlesar
+GenericName[nso]=Seinyakisi sa Tokomane
+GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka dokumentów
+GenericName[pt]=Navegador de Documentos
+GenericName[pt_BR]=Navegador de Documentos
+GenericName[ro]=Navigator de documente
+GenericName[ru]=Программа просмотра документов
+GenericName[se]=Dokumeantalogan
+GenericName[sk]=Prehliadač dokumentácie
+GenericName[sl]=Pregledovalnik dokumentov
+GenericName[sr]=Претраживач докумената
+GenericName[sr@Latn]=Pretraživač dokumenata
+GenericName[ss]=Ibrawuza yelidokhumente
+GenericName[sv]=Dokumentbläddrare
+GenericName[ta]=ஆவண உலாவி
+GenericName[tg]=Тафсири ҳуҷҷат
+GenericName[th]=เครื่องมือเลือกดูแฟ้มเอกสาร
+GenericName[tr]=Belge Tarayıcısı
+GenericName[uk]=Навігатор документів
+GenericName[uz]=Ҳужжат браузери
+GenericName[ven]=Buronza ya manwalwa
+GenericName[vi]=Trình duyệt tài liệu
+GenericName[wa]=Foyteu di documints
+GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu
+GenericName[xx]=xxDocument Browserxx
+GenericName[zh_CN]=文档浏览器
+GenericName[zh_TW]=文件閱讀器
+GenericName[zu]=Umcingi Woshicilelo
+Comment=Qt3 Helpcenter
+Comment[de]= Qt3 Hilfezentrum
+Comment[fr]=Centre d'aide de Qt3
+MimeType=application/x-assistant;
+Icon=assistant-qt3.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation;
diff --git a/tools/assistant/assistant.pro b/tools/assistant/assistant.pro
index 1d8ba5c..85c5d37 100644
--- a/tools/assistant/assistant.pro
+++ b/tools/assistant/assistant.pro
@@ -34,11 +34,9 @@ win32:RC_FILE = assistant.rc
 mac:RC_FILE = assistant.icns
 
 target.path = $$bins.path
-INSTALLS += target
 
 assistanttranslations.files = *.qm
 assistanttranslations.path = $$translations.path
-INSTALLS += assistanttranslations
 
 TRANSLATIONS	= assistant_de.ts \
 		  assistant_fr.ts
@@ -70,3 +68,13 @@ IMAGES	= images/editcopy.png \
 	images/addtab.png \
 	images/closetab.png \
 	images/d_closetab.png
+
+desktop.path = $$share.path/applications
+desktop.files = assistant-qt3.desktop
+
+system( cp images/appicon.png assistant-qt3.png )
+
+icon.path = $$share.path/pixmaps
+icon.files = assistant-qt3.png
+
+INSTALLS += target assistanttranslations desktop icon
diff --git a/tools/designer/designer/designer-qt3.desktop b/tools/designer/designer/designer-qt3.desktop
new file mode 100644
index 0000000..1ac742e
--- /dev/null
+++ b/tools/designer/designer/designer-qt3.desktop
@@ -0,0 +1,145 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=designer-qt3
+Name=Qt3 Designer
+Name[bg]=Qt3 Дизайнер
+Name[br]=Ergrafer Qt3
+Name[ca]=Dissenyador Qt3
+Name[cs]=Qt3 designer
+Name[de]=Qt3-Designer
+Name[eo]=Qt3-Desegnilo
+Name[es]=Diseñador Qt3
+Name[et]=Qt3 disainer
+Name[eu]=Qt3 Diseinatzailea
+Name[gl]=Deseñador de Qt3
+Name[he]=Qt3 בצעמ
+Name[it]=Designer Qt3
+Name[ja]=Qt3デザイナー
+Name[ko]=Qt3 디자이너
+Name[lv]=Qt3 Dizainers
+Name[mk]=Qt3 дизајнер
+Name[no]=Qt3-designer
+Name[oc]=Dessinador Qt3
+Name[pl]=Projektant Qt3
+Name[sk]=Qt3 Dizajnér
+Name[sl]=Snovalnik Qt3
+Name[ta]=Qt3 À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер Qt3
+Name[zh_CN.GB2312]=Qt3 设计者
+Name[zh_TW.Big5]=Qt3 設計器
+GenericName=Interface Designer
+GenericName[af]=Koppelvlak Ontwerper
+GenericName[ar]=أداة لتصميم واجهة البرامج
+GenericName[az]=Ara Üz Tərtibçisi
+GenericName[bg]=Дизайнер на интерфейси
+GenericName[bn]=ইন্টারফেস পরিকল্পনা
+GenericName[bs]=Qt alat za dizajniranje interfejsa
+GenericName[ca]=Dissenyador d'interfícies
+GenericName[cs]=Návrhář rozhraní
+GenericName[cy]=Dylunydd Rhyngwyneb
+GenericName[da]=Grænsefladedesigner
+GenericName[de]=Schnittstellen-Designer
+GenericName[el]=Σχεδιαστής διασυνδέσεων
+GenericName[eo]=Interfacdesegnilo
+GenericName[es]=Diseñador de interfaces
+GenericName[et]=Kasutajaliidese disainer
+GenericName[eu]=Interfaze Diseinatzailea
+GenericName[fa]=طراح رابط
+GenericName[fi]=Käyttöliittymäsuunnittelija
+GenericName[fo]=Nýtaramótssniðari
+GenericName[fr]=Concepteur d'interface
+GenericName[gl]=Deseñador de Interfaces
+GenericName[he]=מעצב ממשקים
+GenericName[hi]=इंटरफेस डिज़ाइनर
+GenericName[hr]=Dizajner sučelja
+GenericName[hu]=Felülettervező
+GenericName[is]=Viðmótshönnun
+GenericName[it]=Disegnatore di interfacce
+GenericName[ja]=インターフェースデザイナー
+GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់
+GenericName[ko]=인터페이스 디자이너
+GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້
+GenericName[lt]=Sąsajos redaktorius
+GenericName[lv]=Starsejas Dizainers
+GenericName[mn]=Гадаргуун дизайнер
+GenericName[ms]=Pereka Antaramuka
+GenericName[mt]=Diżinjatur tal-interfaċċji
+GenericName[nb]=Utforming av grensesnitt
+GenericName[nl]=Interface-ontwerper
+GenericName[nn]=Utforming av grensesnitt
+GenericName[nso]=Mohlami wa Interface
+GenericName[pa]=ਇੰਟਰਫੇਸ ਡਿਜਾਇਨਰ
+GenericName[pl]=Projektowanie interfejsów
+GenericName[pt]=Editor de Interfaces
+GenericName[pt_BR]=Interface do Designer
+GenericName[ro]=Dezvoltator de interfeţe
+GenericName[ru]=Редактор интерфейса приложений Qt
+GenericName[se]=Laktahábmejeaddji
+GenericName[sk]=Návrh rozhrania
+GenericName[sl]=Snovalnik vmesnikov
+GenericName[sr]=Дизајнер интерфејса
+GenericName[sr@Latn]=Dizajner interfejsa
+GenericName[ss]=Umhleli wesichumanisi
+GenericName[sv]=Gränssnittseditor
+GenericName[ta]=முகப்புப் வடிவமைப்பாளர்
+GenericName[tg]=Тароҳи робита
+GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้
+GenericName[tr]=Arayüz tasarım programı
+GenericName[uk]=Дизайн інтерфейсу
+GenericName[uz]=Интерфейс дизайнери
+GenericName[ven]=Muvhati wa nga Phanda
+GenericName[vi]=Trình thiết kế giao diện
+GenericName[wa]=Dessineu d' eterfaces
+GenericName[xh]=Umyili Wezojongongano
+GenericName[xx]=xxInterface Designerxx
+GenericName[zh_CN]=界面设计器
+GenericName[zh_TW]=界面設計師
+GenericName[zu]=Umakhi Womxhumanisi
+Comment=Qt3 interface designer
+Comment[az]=Qt3 axtar üz dizayn proqramı
+Comment[bg]=Qt3 interface дизайнер
+Comment[br]=Ergrafer etrefas Qt3
+Comment[ca]=Dissenyador d'interfícies Qt3
+Comment[cs]=Editor UI pro Qt3
+Comment[da]=Qt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für Qt3
+Comment[el]=Σχεδιασμός περιβάλλοντων Qt3
+Comment[eo]=Qt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de Qt3
+Comment[et]=Qt3 dialoogide redaktor
+Comment[eu]=Qt3 interfaze diseinatzailea
+Comment[fi]=Qt3:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec Qt3
+Comment[gl]=Editor de interfaces de Qt3
+Comment[he]=Qt3-ל םיקשממ בצעמ
+Comment[hu]=Qt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir Qt3
+Comment[it]=Editor per le interfaccie Qt3
+Comment[ja]=Qt3インターフェースデザイナー
+Comment[ko]=Qt3 인터페이스 디자이너
+Comment[lt]=Qt3 sąsajos redaktorius
+Comment[lv]=Qt3 starsejas dizainers
+Comment[mk]=Дизајнер на Qt3 дијалози
+Comment[nl]=Qt3 interface-ontwerper
+Comment[no]=Qt3-grensesnittdesigner
+Comment[no_NY]=Redigering av Qt3-miljø
+Comment[oc]=Dessinador d'interfacies Qt3
+Comment[pl]=Projektant interfejsu Qt3
+Comment[pt]=Editor de interfaces do Qt3
+Comment[pt_BR]=Designer de interface Qt3
+Comment[ro]=Dezvoltator de interfeţe Qt3
+Comment[ru]=редактор интерфейсов приложений Qt3
+Comment[sk]=Qt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za Qt3
+Comment[sr]=Dizajner Qt3 interfejsa
+Comment[sv]=Editor för gränssnitt till Qt3
+Comment[ta]=Qt3 À¨¼ôÀ¡Ç÷
+Comment[tr]=Qt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для Qt3
+Comment[zh_CN.GB2312]=Qt3 界面设计程序
+Comment[zh_TW.Big5]=Qt3 介面編輯器
+MimeType=application/x-designer;
+Icon=designer-qt3
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro
index 91de514..9fe421c 100644
--- a/tools/designer/designer/designer.pro
+++ b/tools/designer/designer/designer.pro
@@ -429,14 +429,21 @@ hpux-acc* {
 TRANSLATIONS	= designer_de.ts designer_fr.ts
 
 target.path=$$libs.path
-INSTALLS += target
 
 templates.path=$$data.path/templates
 templates.files = ../templates/*
-INSTALLS += templates
 
 designertranlations.files = *.qm
 designertranlations.path = $$translations.path
-INSTALLS += designertranlations
 
 !macx-g++:PRECOMPILED_HEADER = designer_pch.h
+
+desktop.path = $$share.path/applications
+desktop.files = designer-qt3.desktop
+
+system( cp images/designer_appicon.png designer-qt3.png )
+
+icon.path = $$share.path/pixmaps
+icon.files = designer-qt3.png
+
+INSTALLS += target templates designertranlations desktop icon
diff --git a/tools/linguist/linguist/linguist-qt3.desktop b/tools/linguist/linguist/linguist-qt3.desktop
new file mode 100644
index 0000000..7a2d9ea
--- /dev/null
+++ b/tools/linguist/linguist/linguist-qt3.desktop
@@ -0,0 +1,102 @@
+[Desktop Entry]
+Exec=linguist-qt3
+Name=Qt3 Linguist
+Name[de]=Qt3-Linguist
+Name[eo]=Qt3-Lingvisto
+Name[es]=Lingüista Qt3
+Name[ko]=Qt3 언어학자
+Name[lv]=Qt3 Lingvists
+Name[fr]=Qt3 Linguist
+Name[hu]=Qt3 Nyelvész
+Name[ja]=Qt3リンギスト
+Name[km]=ភាសាវិទូ Qt3
+Name[nb]=Qt3-Linguist
+Name[pa]=Qt3 ਅਨੁਵਾਦਕ
+Name[pl]=Lingwista Qt3
+Name[zh_TW]=Qt3 語言專家
+GenericName=Translation Tool
+GenericName[af]=Vertaling Program
+GenericName[ar]=أداة للترجمة
+GenericName[az]=Tərcümə Vasitəsi
+GenericName[bg]=Инструмент за превод
+GenericName[bn]=অনুবাদ টুল
+GenericName[bs]=Alat za prevođenje
+GenericName[ca]=Eina de traducció
+GenericName[cs]=Překladatelský nástroj
+GenericName[cy]=Erfyn Cyfieithu
+GenericName[da]=Oversættelsesværktøj
+GenericName[de]=Übersetzungsprogramm
+GenericName[el]=Εργαλείο μεταφράσεων
+GenericName[eo]=Tradukilo por Qt-programoj
+GenericName[es]=Herramienta de traducción
+GenericName[et]=Tõlkimise rakendus
+GenericName[eu]=Itzulpenerako Tresnak
+GenericName[fa]=ابزار ترجمه
+GenericName[fi]=Käännöstyökalu
+GenericName[fo]=Umsetingaramboð
+GenericName[fr]=Outil de traduction
+GenericName[gl]=Ferramenta de Traducción
+GenericName[he]=כלי תרגום
+GenericName[hi]=अनुवाद उपकरण
+GenericName[hr]=Uslužni program za prevođenje
+GenericName[hu]=Fordítássegítő
+GenericName[is]=Þýðingartól
+GenericName[it]=Strumento per le traduzioni
+GenericName[ja]=翻訳ツール
+GenericName[km]=ឧបករណ៍​បកប្រែ
+GenericName[ko]=번역 도구
+GenericName[lo]=ເຄື່ອງມືແປພາສາ
+GenericName[lt]=Vertimo įrankis
+GenericName[lv]=Tulkošanas Rīks
+GenericName[mn]=Орчуулгын програм
+GenericName[ms]=Perkakasan Penterjemahan
+GenericName[mt]=Għodda tat-traduzzjoni
+GenericName[nb]=Oversettelsesverktøy
+GenericName[nl]=Vertaalprogramma
+GenericName[nn]=Omsetjingsverktøy
+GenericName[nso]=Sebereka sa Thlathollo
+GenericName[pa]=ਅਨੁਵਾਦ ਸੰਦ
+GenericName[pl]=Narzędzie dla tłumaczy
+GenericName[pt]=Ferramenta de Tradução
+GenericName[pt_BR]=Ferramenta de Tradução
+GenericName[ro]=Utilitar de traducere
+GenericName[ru]=Утилита локализации приложений
+GenericName[se]=Jorgalanneavvu
+GenericName[sk]=Prekladací nástroj
+GenericName[sl]=Orodje za prevajanje
+GenericName[sr]=Алат за превођење
+GenericName[sr@Latn]=Alat za prevođenje
+GenericName[ss]=Lithulusi lekuhumusha
+GenericName[sv]=Översättningsverktyg
+GenericName[ta]=மொழிபெயர்ப்புக் கருவி
+GenericName[tg]=Тарҷумагар барои QT
+GenericName[th]=เครื่องมือแปลภาษา
+GenericName[tr]=Çeviri Aracı
+GenericName[uk]=Засіб для перекладів
+GenericName[uz]=Таржима қилиш воситаси
+GenericName[ven]=Zwishumiswa zwau Dologa
+GenericName[vi]=Công cụ dịch
+GenericName[wa]=Usteye di ratournaedje
+GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi
+GenericName[xx]=xxTranslation Toolxx
+GenericName[zh_CN]=翻译工具
+GenericName[zh_TW]=翻譯工具
+GenericName[zu]=Ithuluzi Lokuguqulela
+Comment=Tool for translating message catalogues of Qt3 based programs
+Comment[da]=Redskab til at oversætte Qt3 baserede programmer
+Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren
+Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3
+Comment[fr]=Outil de traduction des catalogues de messages pour les programmes utilisant Qt3
+Comment[he]=Qt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
+Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=Qt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
+Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program
+MimeType=application/x-linguist;
+Terminal=false
+Icon=linguist-qt3
+Type=Application
+Categories=Qt;Development;Translation;
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index da4d782..545d10f 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -47,15 +47,13 @@ mac {
 PROJECTNAME	= Qt Linguist
 
 target.path=$$bins.path
-INSTALLS	+= target
 
 linguisttranslations.files = *.qm
 linguisttranslations.path = $$translations.path
-INSTALLS += linguisttranslations
 
 phrasebooks.path=$$data.path/phrasebooks
 phrasebooks.files = ../phrasebooks/*
-INSTALLS += phrasebooks
+
 FORMS	= about.ui \
 	statistics.ui
 IMAGES	= images/accelerator.png \
@@ -107,3 +105,13 @@ IMAGES	= images/accelerator.png \
 	images/undo.png \
 	images/whatsthis.xpm
 INCLUDEPATH	+= ../shared
+
+desktop.path = $$share.path/applications
+desktop.files = linguist-qt3.desktop
+
+system( cp images/appicon.png linguist-qt3.png ) 
+
+icon.path = $$share.path/pixmaps
+icon.files = linguist-qt3.png
+
+INSTALLS += target linguisttranslations phrasebooks desktop icon
diff --git a/tools/qtconfig/qt3config.desktop b/tools/qtconfig/qt3config.desktop
new file mode 100644
index 0000000..81be6f0
--- /dev/null
+++ b/tools/qtconfig/qt3config.desktop
@@ -0,0 +1,34 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=qtconfig-qt3
+Name=Qt3 Configuration
+Name[de]=Qt3 Konfiguration
+Name[bg]=Настройки на Qt3
+Name[cs]=Qt3 nastavení
+Name[de]=Qt3 Konfiguration
+Name[el]=Ρυθμίσεις Qt3
+Name[fi]=Qt3 asetukset
+Name[fr]=Configuration de Qt3
+Name[hu]=Qt3 beállítások
+Name[it]=Impostazioni Qt3
+Name[ja]=Qt3設定
+Name[km]=ការ​កំណត់ Qt3
+Name[nb]=Qt3-innstillinger
+Name[nl]=Qt3 Instellingen
+Name[pa]=Qt3 ਸਥਾਪਨ
+Name[pl]=Ustawienia Qt3
+Name[pt]=Definições Qt3
+Name[pt_BR]=Configurações do Qt3
+Name[ru]=Настройки Qt3
+Name[sv]=Qt3-inställningar
+Name[uk]=Параметри Qt3
+Name[zh_CN]=Qt3 设置
+Name[zh_TW]=Qt3 設定
+Comment=A graphical configuration tool for programs using Qt 3
+Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme
+Comment[fr]=Un outil de configuration graphique pour les programmes utilisant Qt3
+MimeType=application/x-qtconfig;
+Terminal=false
+Icon=qt3config
+Type=Application
+Categories=Qt;Settings;
diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro
index aaef136..b29a1f4 100644
--- a/tools/qtconfig/qtconfig.pro
+++ b/tools/qtconfig/qtconfig.pro
@@ -12,7 +12,17 @@ TARGET		= qtconfig
 DESTDIR		= ../../bin
 
 target.path=$$bins.path
-INSTALLS	+= target
+
 INCLUDEPATH	+= .
 DBFILE		 = qtconfig.db
 REQUIRES=full-config nocrosscompiler !win32*
+
+desktop.path = $$share.path/applications
+desktop.files = qt3config.desktop
+
+system( cp images/appicon.png qt3config.png )
+
+icon.path = $$share.path/pixmaps
+icon.files = qt3config.png
+
+INSTALLS += target desktop icon