Clean-up archive list and descriptions

1 files changed, 55 insertions, 55 deletions

diff --git a/src/fr-init.c b/src/fr-init.c
index 574bb48..016375c 100644
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@ -58,66 +58,66 @@
 /* The capabilities are computed automatically in
  * compute_supported_archive_types() so it's correct to initialize to 0 here. */
 FrMimeTypeDescription mime_type_desc[] = {
-	{ "application/x-7z-compressed",        ".7z",       N_("7-Zip (.7z)"), 0 },
-	{ "application/x-7z-compressed-tar",    ".tar.7z",   N_("Tar compressed with 7z (.tar.7z)"), 0 },
-	{ "application/x-ace",                  ".ace",      N_("Ace (.ace)"), 0 },
-	{ "application/x-alz",                  ".alz",      NULL, 0 },
-	{ "application/x-ar",                   ".a",        N_("Ar (.a)"), 0 },
-	{ "application/x-ar",                   ".ar",       N_("Ar (.ar)"), 0 },
-	{ "application/x-arj",                  ".arj",      N_("Arj (.arj)"), 0 },
-	{ "application/x-brotli",               ".br",       N_("brotli (.br)"), 0 },
-	{ "application/x-brotli-compressed-tar", ".tar.br", N_("Tar compressed with brotli (.tar.br)"), 0 },
-	{ "application/x-bzip",                 ".bz2",      NULL, 0 },
-	{ "application/x-bzip-compressed-tar",  ".tar.bz2",  N_("Tar compressed with bzip2 (.tar.bz2)"), 0 },
-	{ "application/x-bzip1",                ".bz",       NULL, 0 },
-	{ "application/x-bzip1-compressed-tar", ".tar.bz",   N_("Tar compressed with bzip (.tar.bz)"), 0 },
-	{ "application/vnd.ms-cab-compressed",  ".cab",      N_("Cabinet (.cab)"), 0 },
-	{ "application/vnd.oasis.opendocument.presentation",          ".odp", N_("OpenDocument Presentation"), 0 },
-	{ "application/vnd.oasis.opendocument.spreadsheet",           ".ods", N_("OpenDocument Spreadsheet"), 0 },
-	{ "application/vnd.oasis.opendocument.text",                  ".odt", N_("OpenDocument Text"), 0 },
-	{ "application/vnd.oasis.opendocument.presentation-template", ".otp", N_("OpenDocument Presentation Template"), 0 },
-	{ "application/vnd.oasis.opendocument.spreadsheet-template",  ".ots", N_("OpenDocument Spreadsheet Template"), 0 },
-	{ "application/vnd.oasis.opendocument.text-template",         ".ott", N_("OpenDocument Text Template"), 0 },
-	{ "application/x-cbr",                  ".cbr",      N_("Rar Archived Comic Book (.cbr)"), 0 },
-	{ "application/x-cbz",                  ".cbz",      N_("Zip Archived Comic Book (.cbz)"), 0 },
-	{ "application/x-cd-image",             ".iso",      NULL, 0 },
-	{ "application/x-compress",             ".Z",        NULL, 0 },
-	{ "application/x-compressed-tar",       ".tar.gz",   N_("Tar compressed with gzip (.tar.gz)"), 0 },
-	{ "application/x-cpio",                 ".cpio",     NULL, 0 },
-	{ "application/x-deb",                  ".deb",      NULL, 0 },
-	{ "application/x-ear",                  ".ear",      N_("Ear (.ear)"), 0 },
-	{ "application/x-ms-dos-executable",    ".exe",      N_("Self-extracting zip (.exe)"), 0 },
-	{ "application/x-gzip",                 ".gz",       NULL, 0 },
-	{ "application/x-java-archive",         ".jar",      N_("Jar (.jar)"), 0 },
-	{ "application/x-lha",                  ".lzh",      N_("Lha (.lzh)"), 0 },
-	{ "application/x-lrzip",                ".lrz",      N_("Lrzip (.lrz)"), 0},
-	{ "application/x-lrzip-compressed-tar", ".tar.lrz",  N_("Tar compressed with lrzip (.tar.lrz)"), 0 },
-	{ "application/x-lzip",                 ".lz",       NULL, 0 },
-	{ "application/x-lzip-compressed-tar",  ".tar.lz",   N_("Tar compressed with lzip (.tar.lz)"), 0 },
-	{ "application/x-lzma",                 ".lzma",     NULL, 0 },
-	{ "application/x-lzma-compressed-tar",  ".tar.lzma", N_("Tar compressed with lzma (.tar.lzma)"), 0 },
-	{ "application/x-lzop",                 ".lzo",      NULL, 0 },
-	{ "application/x-lzop-compressed-tar",  ".tar.lzo",  N_("Tar compressed with lzop (.tar.lzo)"), 0 },
-	{ "application/x-ms-wim",               ".wim",      N_("Windows Imaging Format (.wim)"), 0 },
-	{ "application/x-rar",                  ".rar",      N_("Rar (.rar)"), 0 },
-	{ "application/x-rpm",                  ".rpm",      NULL, 0 },
-	{ "application/x-rzip",                 ".rz",       NULL, 0 },
-	{ "application/x-tar",                  ".tar",      N_("Tar uncompressed (.tar)"), 0 },
-	{ "application/x-tarz",                 ".tar.Z",    N_("Tar compressed with compress (.tar.Z)"), 0 },
-	{ "application/x-stuffit",              ".sit",      NULL, 0 },
-	{ "application/x-war",                  ".war",      N_("War (.war)"), 0 },
-	{ "application/x-xz",                   ".xz",       N_("Xz (.xz)"), 0 },
-	{ "application/x-xz-compressed-tar",    ".tar.xz",   N_("Tar compressed with xz (.tar.xz)"), 0 },
-	{ "application/x-zoo",                  ".zoo",      N_("Zoo (.zoo)"), 0 },
-	{ "application/zip",                    ".zip",      N_("Zip (.zip)"), 0 },
+	{ "application/vnd.ms-cab-compressed",                        ".cab",      N_("Cabinet (.cab)"), 0 },
+	{ "application/vnd.oasis.opendocument.presentation",          ".odp",      N_("OpenDocument Presentation (.odp)"), 0 },
+	{ "application/vnd.oasis.opendocument.spreadsheet",           ".ods",      N_("OpenDocument Spreadsheet (.ods)"), 0 },
+	{ "application/vnd.oasis.opendocument.text",                  ".odt",      N_("OpenDocument Text (.odt)"), 0 },
+	{ "application/vnd.oasis.opendocument.presentation-template", ".otp",      N_("OpenDocument Presentation Template (.otp)"), 0 },
+	{ "application/vnd.oasis.opendocument.spreadsheet-template",  ".ots",      N_("OpenDocument Spreadsheet Template (.ots)"), 0 },
+	{ "application/vnd.oasis.opendocument.text-template",         ".ott",      N_("OpenDocument Text Template (.ott)"), 0 },
+	{ "application/x-7z-compressed",                              ".7z",       N_("7-Zip (.7z)"), 0 },
+	{ "application/x-7z-compressed-tar",                          ".tar.7z",   N_("Tar compressed with 7z (.tar.7z)"), 0 },
+	{ "application/x-ace",                                        ".ace",      N_("Ace (.ace)"), 0 },
+	{ "application/x-alz",                                        ".alz",      N_("ALZip archive (.alz)"), 0 },
+	{ "application/x-ar",                                         ".a",        N_("Ar (.a)"), 0 },
+	{ "application/x-ar",                                         ".ar",       N_("Ar (.ar)"), 0 },
+	{ "application/x-arj",                                        ".arj",      N_("Arj (.arj)"), 0 },
+	{ "application/x-brotli",                                     ".br",       N_("brotli (.br)"), 0 },
+	{ "application/x-brotli-compressed-tar",                      ".tar.br",   N_("Tar compressed with brotli (.tar.br)"), 0 },
+	{ "application/x-bzip",                                       ".bz2",      N_("Bzip2 compressed file (.bz2)"), 0 },
+	{ "application/x-bzip-compressed-tar",                        ".tar.bz2",  N_("Tar compressed with bzip2 (.tar.bz2)"), 0 },
+	{ "application/x-bzip1",                                      ".bz",       N_("Bzip compressed file (.bz)"), 0 },
+	{ "application/x-bzip1-compressed-tar",                       ".tar.bz",   N_("Tar compressed with bzip (.tar.bz)"), 0 },
+	{ "application/x-cbr",                                        ".cbr",      N_("Rar Archived Comic Book (.cbr)"), 0 },
+	{ "application/x-cbz",                                        ".cbz",      N_("Zip Archived Comic Book (.cbz)"), 0 },
+	{ "application/x-cd-image",                                   ".iso",      N_("Disc Image File (.iso)"), 0 },
+	{ "application/x-compress",                                   ".Z",        N_("Unix Compressed Archive file (.Z)"), 0 },
+	{ "application/x-compressed-tar",                             ".tar.gz",   N_("Tar compressed with gzip (.tar.gz)"), 0 },
+	{ "application/x-cpio",                                       ".cpio",     N_("Unix CPIO Archive (.cpio)"), 0 },
+	{ "application/x-deb",                                        ".deb",      N_("Debian package (.deb)"), 0 },
+	{ "application/x-ear",                                        ".ear",      N_("Ear (.ear)"), 0 },
+	{ "application/x-gzip",                                       ".gz",       N_("GZip compressed file (.gz)"), 0 },
+	{ "application/x-java-archive",                               ".jar",      N_("Jar (.jar)"), 0 },
+	{ "application/x-lha",                                        ".lzh",      N_("Lha (.lzh)"), 0 },
+	{ "application/x-lrzip",                                      ".lrz",      N_("Lrzip (.lrz)"), 0},
+	{ "application/x-lrzip-compressed-tar",                       ".tar.lrz",  N_("Tar compressed with lrzip (.tar.lrz)"), 0 },
+	{ "application/x-lzip",                                       ".lz",       N_("LZip compressed file (.lz)"), 0 },
+	{ "application/x-lzip-compressed-tar",                        ".tar.lz",   N_("Tar compressed with lzip (.tar.lz)"), 0 },
+	{ "application/x-lzma",                                       ".lzma",     N_("LZMA compressed file (.lzma)"), 0 },
+	{ "application/x-lzma-compressed-tar",                        ".tar.lzma", N_("Tar compressed with lzma (.tar.lzma)"), 0 },
+	{ "application/x-lzop",                                       ".lzo",      N_("LZO compressed file (.lzo)"), 0 },
+	{ "application/x-lzop-compressed-tar",                        ".tar.lzo",  N_("Tar compressed with lzop (.tar.lzo)"), 0 },
+	{ "application/x-ms-dos-executable",                          ".exe",      N_("Self-extracting zip (.exe)"), 0 },
+	{ "application/x-ms-wim",                                     ".wim",      N_("Windows Imaging Format (.wim)"), 0 },
+	{ "application/x-rar",                                        ".rar",      N_("Rar (.rar)"), 0 },
+	{ "application/x-rpm",                                        ".rpm",      N_("Red Hat Package Manager file (.rpm)"), 0 },
+	{ "application/x-rzip",                                       ".rz",       N_("RZip compressed file (.rz)"), 0 },
+	{ "application/x-stuffit",                                    ".sit",      N_("StuffIt Archive (.sit)"), 0 },
+	{ "application/x-tar",                                        ".tar",      N_("Tar uncompressed (.tar)"), 0 },
+	{ "application/x-tarz",                                       ".tar.Z",    N_("Tar compressed with compress (.tar.Z)"), 0 },
+	{ "application/x-war",                                        ".war",      N_("War (.war)"), 0 },
+	{ "application/x-xz",                                         ".xz",       N_("Xz (.xz)"), 0 },
+	{ "application/x-xz-compressed-tar",                          ".tar.xz",   N_("Tar compressed with xz (.tar.xz)"), 0 },
+	{ "application/x-zoo",                                        ".zoo",      N_("Zoo (.zoo)"), 0 },
+	{ "application/zip",                                          ".zip",      N_("Zip (.zip)"), 0 },
 	{ NULL, NULL, NULL, 0 }
 };
 
 FrExtensionType file_ext_type[] = {
 	{ ".7z", "application/x-7z-compressed" },
+	{ ".a", "application/x-ar" },
 	{ ".ace", "application/x-ace" },
 	{ ".alz", "application/x-alz" },
-	{ ".a", "application/x-ar" },
 	{ ".ar", "application/x-ar" },
 	{ ".arj", "application/x-arj" },
 	{ ".bin", "application/x-stuffit" },
@@ -152,6 +152,7 @@ FrExtensionType file_ext_type[] = {
 	{ ".sit", "application/x-stuffit" },
 	{ ".swm", "application/x-ms-wim" },
 	{ ".tar", "application/x-tar" },
+	{ ".tar.7z", "application/x-7z-compressed-tar" },
 	{ ".tar.br", "application/x-brotli-compressed-tar" },
 	{ ".tar.bz", "application/x-bzip-compressed-tar" },
 	{ ".tar.bz2", "application/x-bzip-compressed-tar" },
@@ -160,15 +161,14 @@ FrExtensionType file_ext_type[] = {
 	{ ".tar.lz", "application/x-lzip-compressed-tar" },
 	{ ".tar.lzma", "application/x-lzma-compressed-tar" },
 	{ ".tar.lzo", "application/x-lzop-compressed-tar" },
-	{ ".tar.7z", "application/x-7z-compressed-tar" },
 	{ ".tar.xz", "application/x-xz-compressed-tar" },
 	{ ".tar.Z", "application/x-tarz" },
 	{ ".taz", "application/x-tarz" },
 	{ ".tbz", "application/x-bzip-compressed-tar" },
 	{ ".tbz2", "application/x-bzip-compressed-tar" },
 	{ ".tgz", "application/x-compressed-tar" },
-	{ ".txz", "application/x-xz-compressed-tar" },
 	{ ".tlz", "application/x-lzip-compressed-tar" },
+	{ ".txz", "application/x-xz-compressed-tar" },
 	{ ".tzma", "application/x-lzma-compressed-tar" },
 	{ ".tzo", "application/x-lzop-compressed-tar" },
 	{ ".war", "application/x-war" },