14 files changed, 46 insertions, 45 deletions
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt
index 767d3ca..18471db 100644
--- a/src/CMakeL10n.txt
+++ b/src/CMakeL10n.txt
@@ -1,10 +1,20 @@
 ##### create translation templates ##############
 
 tde_l10n_create_template(
-    CATALOG "tork"
+    CATALOG "messages/tork/"
     EXCLUDES
         "^tor_ioslave/"
         "^torkapplet/"
 )
 
 tde_l10n_auto_add_subdirectories( )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/tork-desktops/"
+    SOURCES *.desktop *.protocol
+)
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/eventsrc/"
+    SOURCES eventsrc
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbab62d..75a73eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,13 +80,17 @@ install(
     DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
 )
 
-tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
+tde_create_translated_desktop(
+    SOURCE ${PROJECT_NAME}.desktop
+    PO_DIR "tork-desktops"
+)
 
 tde_create_translated_desktop(
     SOURCE tork_downloadwithfirefox.desktop
            tork_downloadwithopera.desktop
            tork_downloadwithkonqueror.desktop
     DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
+    PO_DIR "tork-desktops"
 )
 
 tde_create_translated_desktop(
diff --git a/src/eventsrc b/src/eventsrc
index ac82f57..eeb17de 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -8,4 +8,3 @@ Comment=Anonymous Use of TDE/Konqueror Disabled
 #default_sound=k3b_success1.wav
 default_presentation=16
 # None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
-
diff --git a/src/konqplugin/CMakeLists.txt b/src/konqplugin/CMakeLists.txt
index 7560f53..9bcf1ea 100644
--- a/src/konqplugin/CMakeLists.txt
+++ b/src/konqplugin/CMakeLists.txt
@@ -38,4 +38,7 @@ install(
 )
 
 
-tde_create_translated_desktop( tork_plug_in.desktop )
+tde_create_translated_desktop(
+    SOURCE tork_plug_in.desktop
+    PO_DIR "tork-desktops"
+)
diff --git a/src/konqplugin/tork_plug_in.desktop b/src/konqplugin/tork_plug_in.desktop
index 8355388..70766bc 100644
--- a/src/konqplugin/tork_plug_in.desktop
+++ b/src/konqplugin/tork_plug_in.desktop
@@ -1,4 +1,10 @@
 [Desktop Entry]
+Name=TorK
+
+Comment=Anonymity Manager
+
+Type=Application
+Icon=tdehtml_tork
 X-TDE-Library=tdehtml_tork
 X-TDE-PluginInfo-Author=Robert Hogan
 X-TDE-PluginInfo-Email=robert@roberthogan.net
@@ -9,7 +15,3 @@ X-TDE-PluginInfo-Category=Tools
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=true
-Name=TorK
-Type=Application
-Comment=Anonymity Manager
-Icon=tdehtml_tork
diff --git a/src/tor_ioslave/CMakeLists.txt b/src/tor_ioslave/CMakeLists.txt
index 922f0a1..a75b44a 100644
--- a/src/tor_ioslave/CMakeLists.txt
+++ b/src/tor_ioslave/CMakeLists.txt
@@ -31,4 +31,5 @@ tde_add_kpart( tdeio_torioslave AUTOMOC
 tde_create_translated_desktop(
     SOURCE torioslave.protocol
     DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR "tork-desktops"
 )
diff --git a/src/tor_ioslave/torioslave.protocol b/src/tor_ioslave/torioslave.protocol
index 5514d94..0eede16 100644
--- a/src/tor_ioslave/torioslave.protocol
+++ b/src/tor_ioslave/torioslave.protocol
@@ -1,29 +1,10 @@
 [Protocol]
-exec=tdeio_torioslave
+Description=A tdeioslave for tor
+
 protocol=tor
+exec=tdeio_torioslave
 input=none
 output=stream
 reading=true
 defaultMimetype=text/html
 Icon=tork_tor
-Description=A tdeioslave for tor
-Description[da]=En tdeioslave til tor
-Description[de]=Ein Ein-/Ausgabemodul für tor
-Description[es]=Un tdeioslave para tor
-Description[et]=tor IO-moodul
-Description[fr]=Un module d'entrée / sortie pour tor
-Description[hu]=tor-támogató KIOslave
-Description[it]=Un tdeioslave per tor
-Description[nl]=Kioslave voor tor
-Description[pl]=tdeioslave dla tor
-Description[pt]=Um 'tdeioslave' para tor
-Description[pt_BR]=Um tdeioslave para tor
-Description[ru]=Обработчик ввода-вывода для tor
-Description[sl]=tdeioslave za tor
-Description[sr]=KIOSlave за tor
-Description[sr@Latn]=KIOSlave za tor
-Description[sv]=En I/O-slav för tor
-Description[tr]=tor için bir tdeioslave
-Description[uk]=Підлеглий В/В (tdeioslave) для tor
-Description[xx]=xxA tdeioslave for torxx
-Description[zh_CN]=tor 的 tdeioslave
diff --git a/src/tork.desktop b/src/tork.desktop
index bb15762..44ba2b0 100644
--- a/src/tork.desktop
+++ b/src/tork.desktop
@@ -2,15 +2,13 @@
 Name=TorK
 
 GenericName=Anonymity Manager
-GenericName[de]=Anonymitätsverwaltung
 
 Comment=An Anonymity Manager for TDE
-Comment[de]=Eine Anonymitätsverwaltung für TDE
 
 Type=Application
-Categories=Qt;TDE;Network;FileTransfer
-Terminal=false
-Icon=tork
 Exec=tork %i %m -caption "%c" %u
+Icon=tork
+Terminal=false
+Categories=Qt;TDE;Network;FileTransfer
 X-DCOP-ServiceType=Unique
 X-DocPath=tork/index.html
diff --git a/src/tork_downloadwithfirefox.desktop b/src/tork_downloadwithfirefox.desktop
index 5634c38..c1434e2 100644
--- a/src/tork_downloadwithfirefox.desktop
+++ b/src/tork_downloadwithfirefox.desktop
@@ -7,7 +7,7 @@ X-TDE-ExcludeServiceTypes=kdedevice/*
 X-TDE-ShowIfRunning=tork
 
 [Desktop Action TorkDownload]
-Exec=dcop tork DCOPTork startEverything;dcop tork DCOPTork anonymizedFirefox %U;
-Icon=tork
 Name=Open Anonymously with Firefox
 
+Exec=dcop tork DCOPTork startEverything;dcop tork DCOPTork anonymizedFirefox %U;
+Icon=tork
diff --git a/src/tork_downloadwithkonqueror.desktop b/src/tork_downloadwithkonqueror.desktop
index df79c12..1e6eedd 100644
--- a/src/tork_downloadwithkonqueror.desktop
+++ b/src/tork_downloadwithkonqueror.desktop
@@ -7,7 +7,7 @@ X-TDE-ExcludeServiceTypes=kdedevice/*
 X-TDE-ShowIfRunning=tork
 
 [Desktop Action TorkDownload]
-Exec=konqueror tor:%U;
-Icon=tork
 Name=Open Anonymously with Konqueror
 
+Exec=konqueror tor:%U;
+Icon=tork
diff --git a/src/tork_downloadwithopera.desktop b/src/tork_downloadwithopera.desktop
index 1e1924a..f247229 100644
--- a/src/tork_downloadwithopera.desktop
+++ b/src/tork_downloadwithopera.desktop
@@ -7,7 +7,7 @@ X-TDE-ExcludeServiceTypes=kdedevice/*
 X-TDE-ShowIfRunning=tork
 
 [Desktop Action TorkDownload]
-Exec=dcop tork DCOPTork startEverything;dcop tork DCOPTork anonymizedOpera %U;
-Icon=tork
 Name=Open Anonymously with Opera
 
+Exec=dcop tork DCOPTork startEverything;dcop tork DCOPTork anonymizedOpera %U;
+Icon=tork
diff --git a/src/torkapplet/CMakeL10n.txt b/src/torkapplet/CMakeL10n.txt
index 49e7665..8e5397c 100644
--- a/src/torkapplet/CMakeL10n.txt
+++ b/src/torkapplet/CMakeL10n.txt
@@ -1,3 +1,3 @@
 ##### create translation templates ##############
 
-tde_l10n_create_template( "libkickermenu_tork" )
+tde_l10n_create_template( "messages/libkickermenu_tork/" )
diff --git a/src/torkapplet/CMakeLists.txt b/src/torkapplet/CMakeLists.txt
index b29088b..07e7d07 100644
--- a/src/torkapplet/CMakeLists.txt
+++ b/src/torkapplet/CMakeLists.txt
@@ -30,6 +30,8 @@ tde_add_kpart( kickermenu_tork AUTOMOC
 
 ##### other data
 
-tde_create_translated_desktop( torkmenu.desktop
+tde_create_translated_desktop(
+    SOURCE torkmenu.desktop
     DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext
+    PO_DIR "tork-desktops"
 )
diff --git a/src/torkapplet/torkmenu.desktop b/src/torkapplet/torkmenu.desktop
index 3f813e2..ce18758 100644
--- a/src/torkapplet/torkmenu.desktop
+++ b/src/torkapplet/torkmenu.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Name=TorK
-Type=Application
+
 Comment=Menu For Managing TorK
-Icon=tork
 
+Type=Application
+Icon=tork
 X-TDE-Library=kickermenu_tork
 X-TDE-AuthorizeAction=shell_access