# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1556460906 -7200
# Node ID 7584a4702457821ec8c14e98deea6942d1c0c0f0
# Parent  2801f968936e66a09c8dd1124c937619db0f633e
patch 8.1.1227: duplicate entries in the generate .desktop files

commit https://github.com/vim/vim/commit/7a9df9dd00bac462a2942dc798e298f365779fd0
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Apr 28 16:08:30 2019 +0200

    patch 8.1.1227: duplicate entries in the generate .desktop files

    Problem:    Duplicate entries in the generate .desktop files. (Ralf Schandl)
    Solution:   Remove translated entries from the .in files. (closes https://github.com/vim/vim/issues/4313)

diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in
--- a/src/po/gvim.desktop.in
+++ b/src/po/gvim.desktop.in
@@ -10,7 +10,6 @@ Comment=Edit text files
 # 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
-GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
 GenericName[fr]=Éditeur de texte
 GenericName[pl]=Edytor tekstu
@@ -27,7 +26,6 @@ Comment[ca]=Edita fitxers de text
 Comment[cs]=Úprava textových souborů
 Comment[cy]=Golygu ffeiliau testun
 Comment[da]=Rediger tekstfiler
-Comment[de]=Textdateien bearbeiten
 Comment[el]=Επεξεργασία αρχείων κειμένου
 Comment[en_CA]=Edit text files
 Comment[en_GB]=Edit text files
diff --git a/src/po/vim.desktop.in b/src/po/vim.desktop.in
--- a/src/po/vim.desktop.in
+++ b/src/po/vim.desktop.in
@@ -10,7 +10,6 @@ Comment=Edit text files
 # 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
-GenericName[de]=Texteditor
 GenericName[pl]=Edytor tekstu
 GenericName[is]=Ritvinnsluforrit
 Comment[af]=Redigeer tekslêers
@@ -25,7 +24,6 @@ Comment[ca]=Edita fitxers de text
 Comment[cs]=Úprava textových souborů
 Comment[cy]=Golygu ffeiliau testun
 Comment[da]=Rediger tekstfiler
-Comment[de]=Textdateien bearbeiten
 Comment[el]=Επεξεργασία αρχείων κειμένου
 Comment[en_CA]=Edit text files
 Comment[en_GB]=Edit text files
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1227,
+/**/
     1226,
 /**/
     1225,