Rework appdata and desktop file generation

- attempt to merge in translations before merging in version data
- add the intermediate file (with translations) to the dist tarball
- dist builds no longer have to run the translation merge, but can instead
  use the included intermediate file. This accomodates distros with
  older gettext versions.

cmake/CMakeLists.txt

@@ -9,6 +9,6 @@ endif()
 
 
 set_dist_list(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in
-    configure-appdata.cmake configure-manpage.cmake git2version-info.cmake
+    insert-vcs-data.cmake configure-manpage.cmake git2version-info.cmake
     version-info2env.cmake
 )

cmake/insert-vcs-data.cmake

@@ -13,4 +13,4 @@
 
 include (${SRC_DIR}/cmake/version-info2env.cmake)
 versioninfo2env (${VCS_INFO_FILE})
-configure_file(${SRC} ${DST} )
+configure_file(${SRC} ${DST})