diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-28 16:08:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-28 16:08:30 +0200 |
| commit | 7a9df9dd00bac462a2942dc798e298f365779fd0 (patch) | |
| tree | 839b5a0bc4636172fe82ea3fa72b68503046aed5 | |
| parent | 6c60f47fb9251e686217d51cf81847e14d0dd26d (diff) | |
| download | vim-git-7a9df9dd00bac462a2942dc798e298f365779fd0.tar.gz | |
patch 8.1.1227: duplicate entries in the generate .desktop filesv8.1.1227
Problem: Duplicate entries in the generate .desktop files. (Ralf Schandl)
Solution: Remove translated entries from the .in files. (closes #4313)
| -rw-r--r-- | src/po/gvim.desktop.in | 2 | ||||
| -rw-r--r-- | src/po/vim.desktop.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in index 92b8aa181..287a4891b 100644 --- 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 8e03b325b..f1ce31b8f 100644 --- 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 0e20e51a1..d753b9761 100644 --- 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, |