From kde-commits  Fri Jan 09 01:35:27 2009
From: David Faure <faure () kde ! org>
Date: Fri, 09 Jan 2009 01:35:27 +0000
To: kde-commits
Subject: koffice/kword
Message-Id: <1231464927.816693.16542.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123146493523112

SVN commit 907987 by dfaure:

Don't install two copies of kword.desktop and kwordpart.desktop (into the same destination! confusing),
 and add X-DBUS-ServiceName=org.koffice.kword to fix #156339


 M  +0 -5      CMakeLists.txt  
 D             kword.desktop  
 D             kwordpart.desktop   [TRAILING SPACE]
 M  +19 -43    part/kword.desktop  


--- trunk/koffice/kword/CMakeLists.txt #907986:907987
@@ -4,8 +4,3 @@
 add_subdirectory( pics )
 add_subdirectory( part )
 add_subdirectory( plugins )
-
-# ########### install files ###############
-#
-install( FILES  kwordpart.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-install( FILES  kword.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
--- trunk/koffice/kword/part/kword.desktop #907986:907987
@@ -9,60 +9,35 @@
 Name[x-test]=xxKWordxx
 Name[zh_TW]=文書處理_KWord
 Exec=kword %u
-GenericName=Word Processing
-GenericName[af]=Woord Verwerking
-GenericName[bg]=Текстообработка
+GenericName=Word Processor
 GenericName[ca]=Processador de textos
-GenericName[cs]=Zpracování textu
-GenericName[cy]=Prosesu Geiriau
-GenericName[da]=Tekstbehandling
 GenericName[de]=Textverarbeitung
 GenericName[el]=Επεξεργασία κειμένου
-GenericName[eo]=Verkado kaj aranĝo de tekstoj
-GenericName[es]=Procesado de textos
+GenericName[es]=Procesador de textos
 GenericName[et]=Tekstitöötlus
-GenericName[eu]=Testu-prozesadorea
-GenericName[fa]=پردازش واژه
-GenericName[fi]=Tekstinkäsittely
-GenericName[fr]=Traitement de texte
-GenericName[fy]=Tekstverwerker
-GenericName[ga]=Próiseáil Focal
-GenericName[gl]=Procesamento de Texto
-GenericName[he]=עיבוד תמלילים
-GenericName[hi]=वर्ड प्रोसेसिंग
-GenericName[hr]=Obrada teksta
-GenericName[hu]=Szövegszerkesztő
-GenericName[is]=Ritvinnsla
-GenericName[it]=Videoscrittura
+GenericName[fi]=Tekstinkäsittelyohjelma
+GenericName[fy]=Tekstferwurker
+GenericName[ga]=Próiseálaí Focal
+GenericName[gl]=Procesador de Texto
+GenericName[he]=מעבד תמלילים
+GenericName[hi]=वर्ड प्रोसेसर
+GenericName[it]=Elaboratore di testi
 GenericName[ja]=ワープロ
-GenericName[kk]=Мәтін өңдеу
-GenericName[lt]=Tekstų apdorojimas
-GenericName[lv]=Tekstu Apstrāde
+GenericName[kk]=Мәтін өңдеуші
 GenericName[ms]=Pemproses Kata
-GenericName[nb]=Tekstbehandling
-GenericName[nds]=Textverarbeiden
-GenericName[ne]=वर्ड प्रोसेसिङ
+GenericName[nds]=Textprogramm
 GenericName[nl]=Tekstverwerker
 GenericName[oc]=Tractament de tèxt
-GenericName[pl]=Przetwarzanie tekstu
-GenericName[pt]=Processamento de Texto
-GenericName[pt_BR]=Processamento de Texto
-GenericName[ro]=Procesare text
-GenericName[ru]=Текстовые документы
-GenericName[se]=Teakstagieđahallan
-GenericName[sk]=Textové procesory
-GenericName[sl]=Urejanje besedila
+GenericName[pt]=Processador de Texto
+GenericName[pt_BR]=Processador de Texto
+GenericName[sl]=Urejevalnik besedila
 GenericName[sv]=Ordbehandling
-GenericName[ta]=சொல் தொகுத்தல்
-GenericName[tg]=Равиши Word
-GenericName[tr]=Kelime İşleme
+GenericName[tr]=Kelime İşlemci
 GenericName[uk]=Текстовий процесор
-GenericName[uz]=Matn protsessori
-GenericName[uz@cyrillic]=Матн процессори
-GenericName[wa]=Sicrijhaedje di tecses
-GenericName[x-test]=xxWord Processingxx
+GenericName[wa]=Aspougneu d' documints
+GenericName[x-test]=xxWord Processorxx
 GenericName[zh_CN]=字处理
-GenericName[zh_TW]=文書處理
+GenericName[zh_TW]=文書處理器
 Comment=Write text documents
 Comment[ca]=Escriu documents de text
 Comment[de]=Textdokumente verfassen
@@ -99,5 +74,6 @@
 X-DocPath=kword/index.html
 X-KDE-StartupNotify=true
 X-DBUS-StartupType=Multi
+X-DBUS-ServiceName=org.koffice.kword
 Categories=Qt;KDE;Office;
 InitialPreference=3