Index: branches/stable/l10n-kde4/scripts/merge_desktop_files.sh
===================================================================
--- branches/stable/l10n-kde4/scripts/merge_desktop_files.sh
+++ branches/stable/l10n-kde4/scripts/merge_desktop_files.sh
@@ -1,5 +1,8 @@
 #! /bin/bash
 # kate: space-indent on; indent-width 2; replace-tabs on;
+
+g++ -O2 -march=nocona -o apply scripts/applycontext.cpp
+
 langfile=`tempfile`
 KDEDIR=`tempfile`
 logfile=`tempfile`
@@ -53,5 +56,5 @@
   done
 done
 sort $logfile
-rm -f $logfile $langfile
+rm -f $logfile $langfile apply
 rm -rf $KDEDIR
Index: branches/stable/l10n-kde4/scripts/update_translations
===================================================================
--- branches/stable/l10n-kde4/scripts/update_translations
+++ branches/stable/l10n-kde4/scripts/update_translations
@@ -498,8 +498,6 @@
     if cd $transmod; then
       test -z "$VERBOSE1" || echo "applying desktop file translations"
       test -z "$TIMING1" || date
-      # Note: the executable should not be renamed to applycontext to avoid to have to change the script merge_desktop_files.sh
-      g++ -O2 -march=nocona -o apply scripts/applycontext.cpp
       bash scripts/merge_desktop_files.sh 
       cd $BASEDIR
     fi
@@ -550,7 +548,7 @@
     echo "Skipping processing of .desktop files"
   fi
 
-  rm -rf apply all_files* messages
+  rm -rf all_files* messages
   cd $BASEDIR
   
   
Index: trunk/l10n-kde4/scripts/merge_desktop_files.sh
===================================================================
--- trunk/l10n-kde4/scripts/merge_desktop_files.sh
+++ trunk/l10n-kde4/scripts/merge_desktop_files.sh
@@ -1,5 +1,8 @@
 #! /bin/bash
 # kate: space-indent on; indent-width 2; replace-tabs on;
+
+g++ -O2 -march=nocona -o apply scripts/applycontext.cpp
+
 langfile=`tempfile`
 KDEDIR=`tempfile`
 logfile=`tempfile`
@@ -53,5 +56,5 @@
   done
 done
 sort $logfile
-rm -f $logfile $langfile
+rm -f $logfile $langfile apply
 rm -rf $KDEDIR
Index: trunk/l10n-kde4/scripts/update_translations
===================================================================
--- trunk/l10n-kde4/scripts/update_translations
+++ trunk/l10n-kde4/scripts/update_translations
@@ -491,8 +491,6 @@
     if cd $transmod; then
       test -z "$VERBOSE1" || echo "applying desktop file translations"
       test -z "$TIMING1" || date
-      # Note: the executable should not be renamed to applycontext to avoid to have to change the script merge_desktop_files.sh
-      g++ -O2 -march=nocona -o apply scripts/applycontext.cpp
       bash scripts/merge_desktop_files.sh 
       cd $BASEDIR
     fi
@@ -543,7 +541,7 @@
     echo "Skipping processing of .desktop files"
   fi
 
-  rm -rf apply all_files* messages
+  rm -rf all_files* messages
   cd $BASEDIR