--- vim-7.4.979/runtime/vim.desktop~	2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/runtime/vim.desktop	2015-12-28 08:15:06.355590605 +0200
@@ -75,6 +75,6 @@
 Terminal=true
 Type=Application
 Icon=gvim
-Categories=Utility;TextEditor;
+Categories=ConsoleOnly;TextEditor;
 StartupNotify=false
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--- vim-7.4.979/gvim-athena.desktop~	2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-athena.desktop	2015-12-28 08:24:02.106735918 +0200
@@ -1,5 +1,5 @@
 # Translators: This is the Application Name used in the GVim desktop file
 Name[eo]=GVim
 Name[tr]=GVim
-Name=GVim
+Name=GVim Athena
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
@@ -71,7 +71,7 @@
 Comment[zh_CN]=编辑文本文件
 Comment[zh_TW]=編輯文字檔
-TryExec=gvim
-Exec=gvim -f %F
+TryExec=gvim.gnome
+Exec=gvim.gnome -f %F
 Terminal=false
 Type=Application
 Icon=gvim
--- vim-7.4.979/gvim-gnome.desktop~	2015-12-28 08:32:38.000000000 +0200
+++ vim-7.4.979/gvim-gnome.desktop	2015-12-28 08:33:14.285396908 +0200
@@ -1,5 +1,5 @@
 # Translators: This is the Application Name used in the GVim desktop file
 Name[eo]=GVim
 Name[tr]=GVim
-Name=GVim
+Name=GVim GNOME
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
@@ -1,14 +1,14
 Comment[de]=Textdateien bearbeiten
 Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
-Comment=Edit text files
+Comment=The vi editor for X Window System with GNOME L&F
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file!
 GenericName[da]=Teksteditor
@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
 Comment[no]=Rediger tekstfiler
 Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
 Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytuj pliki tekstowe
+Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GNOME
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
@@ -70,11 +70,11 @@
 Comment[zh_CN]=编辑文本文件
 Comment[zh_TW]=編輯文字檔
-TryExec=gvim
-Exec=gvim -f %F
+TryExec=gvim.gnome
+Exec=gvim.gnome -f %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;
 Icon=gvim
-Categories=Utility;TextEditor;
+Categories=GTK;GNOME;TextEditor;
 StartupNotify=true
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--- vim-7.4.979/gvim-gtk.desktop~	2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-gtk.desktop	2015-12-28 08:29:28.577015888 +0200
@@ -1,5 +1,5 @@
 # Translators: This is the Application Name used in the GVim desktop file
 Name[eo]=GVim
 Name[tr]=GVim
-Name=GVim
+Name=GVim GTK
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
@@ -1,14 +1,14 @@
 Comment[de]=Textdateien bearbeiten
 Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
-Comment=Edit text files
+Comment=The vi editor for X Window System with GTK L&F
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file!
 GenericName[da]=Teksteditor
@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
 Comment[no]=Rediger tekstfiler
 Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
 Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytuj pliki tekstowe
+Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GTK
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
@@ -70,11 +70,11 @@
 Comment[zh_CN]=编辑文本文件
 Comment[zh_TW]=編輯文字檔
-TryExec=gvim
-Exec=gvim -f %F
+TryExec=gvim.gtk
+Exec=gvim.gtk -f %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;
 Icon=gvim
-Categories=Utility;TextEditor;
+Categories=GTK;TextEditor;
 StartupNotify=true
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--- vim-7.4.979/gvim-motif.desktop~	2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-motif.desktop	2015-12-28 08:31:11.245677767 +0200
@@ -1,5 +1,5 @@
 # Translators: This is the Application Name used in the GVim desktop file
 Name[eo]=GVim
 Name[tr]=GVim
-Name=GVim
+Name=GVim Motif
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
@@ -1,14 +1,14 @@
 Comment[de]=Textdateien bearbeiten
 Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
-Comment=Edit text files
+Comment=The vi editor for X Window System with Motif L&F
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file!
 GenericName[da]=Teksteditor
@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
 Comment[no]=Rediger tekstfiler
 Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
 Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytuj pliki tekstowe
+Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja Motif
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
@@ -70,11 +70,11 @@
 Comment[zh_CN]=编辑文本文件
 Comment[zh_TW]=編輯文字檔
-TryExec=gvim
-Exec=gvim -f %F
+TryExec=gvim.motif
+Exec=gvim.motif -f %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;
 Icon=gvim
-Categories=Utility;TextEditor;
+Categories=Motif;TextEditor;
 StartupNotify=true
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;