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 #4313)

diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in
index 92b8aa1817f23363db5d1faad4aa58ec7ac4bc54..287a4891b2e38210182707b4d9edba637170837d 100644 (file)
--- 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
index 8e03b325b7f756262c2367403cd9f9458ba292c7..f1ce31b8f5c74035418796bec363ed24fb8785b9 100644 (file)
--- 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
index 0e20e51a185cfa0e4b724beacab204be57125a51..d753b976141660bcea3c9cce873f983505d28e86 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1227,
 /**/
     1226,
 /**/