From b9d24b688e16bfe022f01e4940108e0c1d832113 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 29 May 2018 21:59:10 +0900
Subject: [PATCH] Removed duplicated zip file mimetype. This relates to bug
 2794.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1b04b27b221ef9fe0febf5da650de9565ae5297c)
---
 mimetypes/application/CMakeLists.txt          |  2 +-
 mimetypes/application/Makefile.am             |  2 +-
 .../application/x-zip-compressed.desktop      | 92 -------------------
 3 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 mimetypes/application/x-zip-compressed.desktop

diff --git a/mimetypes/application/CMakeLists.txt b/mimetypes/application/CMakeLists.txt
index eee7508d0..283d8cdf8 100644
--- a/mimetypes/application/CMakeLists.txt
+++ b/mimetypes/application/CMakeLists.txt
@@ -16,7 +16,7 @@ install( FILES
     x-tex-gf.desktop x-gzip.desktop x-pak.desktop
     x-object.desktop x-tex-pk.desktop pdf.desktop
     x-tar.desktop x-trash.desktop x-zip.desktop
-    x-zip-compressed.desktop x-core.desktop x-javascript.desktop
+    x-core.desktop x-javascript.desktop
     java.desktop x-java.desktop x-java-applet.desktop
     x-jar.desktop x-arj.desktop x-tarz.desktop
     x-gzpostscript.desktop postscript.desktop octet-stream.desktop
diff --git a/mimetypes/application/Makefile.am b/mimetypes/application/Makefile.am
index 139dc2460..c4e2eeb34 100644
--- a/mimetypes/application/Makefile.am
+++ b/mimetypes/application/Makefile.am
@@ -3,7 +3,7 @@ mimetypeapplicationdata_DATA = x-dvi.desktop x-gzdvi.desktop x-bz2dvi.desktop \
 	x-tex-gf.desktop x-gzip.desktop x-pak.desktop \
 	x-object.desktop x-tex-pk.desktop pdf.desktop \
 	x-tar.desktop x-trash.desktop x-zip.desktop \
-	x-zip-compressed.desktop x-core.desktop x-javascript.desktop \
+	x-core.desktop x-javascript.desktop \
 	java.desktop x-java.desktop x-java-applet.desktop \
 	x-jar.desktop x-arj.desktop x-tarz.desktop \
 	x-gzpostscript.desktop postscript.desktop octet-stream.desktop \
diff --git a/mimetypes/application/x-zip-compressed.desktop b/mimetypes/application/x-zip-compressed.desktop
deleted file mode 100644
index 8b709563c..000000000
--- a/mimetypes/application/x-zip-compressed.desktop
+++ /dev/null
@@ -1,92 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-zip-compressed
-Icon=tgz
-Comment=Zip Archive
-Comment[af]=Zip Argief
-Comment[ar]=أرشيف Zip
-Comment[az]=Zip Arxivi
-Comment[be]=Архіў Zip
-Comment[bg]=Архив Zip
-Comment[bn]=জিপ (zip) আর্কাইভ
-Comment[br]=Diell Zip
-Comment[bs]=Zip arhiva
-Comment[ca]=Arxiu ZIP
-Comment[cs]=Zip archív
-Comment[csb]=Archiwa Zip
-Comment[cy]=Archif Zip
-Comment[da]=Zip-arkiv
-Comment[de]=Zip-Archiv
-Comment[el]=Αρχειοθήκη zip
-Comment[eo]=Zip-arĥivo
-Comment[es]=Archivo Zip
-Comment[et]=Zip-arhiiv
-Comment[eu]=Zip fitxategia
-Comment[fa]=بایگانی فشرده
-Comment[fi]=Zip-paketti
-Comment[fr]=Archive Zip
-Comment[fy]=Zip-argyf
-Comment[ga]=Cartlann zip
-Comment[gl]=Arquivo Zip
-Comment[he]=ארכיון Zip
-Comment[hi]=ज़िप आर्काइव
-Comment[hr]=ZIP arhiva
-Comment[hu]=Zip-archívum
-Comment[id]=Arsip Zip
-Comment[is]=Zip safnskrá
-Comment[it]=Archivio Zip
-Comment[ja]=Zip アーカイブ
-Comment[ka]=Zip არქივი
-Comment[kk]=Zip архиві
-Comment[km]=ប័ណ្ណសារ Zip
-Comment[ko]=Zip 저장고
-Comment[lb]=Zip-Archiv
-Comment[lt]=Zip archyvas
-Comment[lv]=Zip arhīvs
-Comment[mk]=Zip-архива
-Comment[mn]=Zip-Архив
-Comment[ms]=Arkib Zip
-Comment[mt]=Arkivju Zip
-Comment[nb]=Zip-arkiv
-Comment[nds]=Zip-Archiv
-Comment[ne]=जिप सङ्ग्रह
-Comment[nl]=Zip-archief
-Comment[nn]=Zip-arkiv
-Comment[nso]=Polokelo ya Zip
-Comment[pa]=Zip ਪੁਰਾਲੇਖ
-Comment[pl]=Archiwum Zip
-Comment[pt]=Pacote Zip
-Comment[pt_BR]=Arquivo ZIP
-Comment[ro]=Arhivă ZIP
-Comment[ru]=Архив zip
-Comment[rw]=Zip Idosiye yo mu bushinguro
-Comment[se]=Zip-arkiiva
-Comment[sk]=Zip archív
-Comment[sl]=Arhiv ZIP
-Comment[sq]=Zip Arkivë
-Comment[sr]=ZIP архива
-Comment[sr@Latn]=ZIP arhiva
-Comment[ss]=Silulu se Zip 
-Comment[sv]=Zip-arkiv
-Comment[ta]=Zip காப்பகம்
-Comment[te]=జిప్ ఆర్కైవ్
-Comment[tg]=Архиви Zip
-Comment[th]=แฟ้มบีบอัด Zip
-Comment[tr]=Zip Arşivi
-Comment[tt]=Zip Tuplama
-Comment[uk]=Архів Zip
-Comment[uz]=Zip arxivi
-Comment[uz@cyrillic]=Zip архиви
-Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
-Comment[vi]=Bản nén Zip
-Comment[wa]=Årtchive ZIP
-Comment[xh]=Indawo yogcino ye Zip
-Comment[zh_CN]=Zip 归档
-Comment[zh_HK]=Zip 壓縮檔
-Comment[zh_TW]=Zip 壓縮文件
-Comment[zu]=Umqulu we-Zip
-X-KDE-IsAlso=application/x-zip
-
-[Property::X-KDE-LocalProtocol]
-Type=QString
-Value=zip