Updated command-line switches.

Deprecated archive extraction options were removed and some switches
were renamed according to changes in ClamAV 0.101.0.

ClamAV seems to handle archive extraction fully on its own and thus
those options are not provided by clamscan anymore.

This relates to issue #15.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

7 files changed, 85 insertions, 662 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2edf96b..61810e0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( ${PROJECT_NAME} AUTOMOC
      ktview.cpp ktlistcron.cpp kticon.cpp
      activityviewer.cpp collectiondb.cpp
      configdialog.cpp klamavconfig.kcfgc
-     archivelimits.ui archivetypes.ui specialfiletypes.ui
+     archivelimits.ui specialfiletypes.ui
      firstrunwizard.ui logoptions.ui backend.ui
      k3bjobprogressosd_mod.cpp
 
diff --git a/src/archivetypes.ui b/src/archivetypes.ui
deleted file mode 100644
index 5e46914..0000000
--- a/src/archivetypes.ui
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>ArchiveTypes</class>
-<widget class="TQWidget">
-    <property name="name">
-        <cstring>ArchiveTypes</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>761</width>
-            <height>522</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Archive Limits</string>
-    </property>
-    <hbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="TQGroupBox">
-            <property name="name">
-                <cstring>Archive_Types</cstring>
-            </property>
-            <property name="title">
-                <string>Archive Types</string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="TQLayoutWidget">
-                    <property name="name">
-                        <cstring>layout8</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <widget class="TQCheckBox" row="6" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanDeb</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan DEB packages using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="5" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanJar</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan JAR packages using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="7" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanTar</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan TAR files using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="4" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanLzh</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan LZH archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="7" column="1">
-                            <property name="name">
-                                <cstring>kcfg_TarUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="3" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanZoo</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan ZOO archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="3" column="1">
-                            <property name="name">
-                                <cstring>kcfg_ZooUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="4" column="1">
-                            <property name="name">
-                                <cstring>kcfg_LzhUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="0" column="1">
-                            <property name="name">
-                                <cstring>kcfg_ZipUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="1" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanRar</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan RAR archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="0" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanZip</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan &amp;ZIP archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string>Alt+Z</string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="5" column="1">
-                            <property name="name">
-                                <cstring>kcfg_JarUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="1" column="1">
-                            <property name="name">
-                                <cstring>kcfg_RarUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="6" column="1">
-                            <property name="name">
-                                <cstring>kcfg_DebUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="8" column="1">
-                            <property name="name">
-                                <cstring>kcfg_TgzUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="8" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanTgz</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan TGZ archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="KURLComboRequester" row="2" column="1">
-                            <property name="name">
-                                <cstring>kcfg_ArjUsing</cstring>
-                            </property>
-                        </widget>
-                        <widget class="TQCheckBox" row="2" column="0">
-                            <property name="name">
-                                <cstring>kcfg_ScanArj</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Scan ARJ archives using:</string>
-                            </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </vbox>
-        </widget>
-    </hbox>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
-</UI>
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 94466db..b363550 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -16,7 +16,6 @@ email                : markey@web.de
 #include "configdialog.h"
 #include "backend.h"
 #include "archivelimits.h"
-#include "archivetypes.h"
 #include "specialfiletypes.h"
 /* #include "autoscanoptions.h" */
 #include "logoptions.h"
@@ -56,7 +55,6 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC
     // IMPORTANT Don't simply change the page names, they are used as identifiers in other parts of the app.
             m_klambackend = new KlamBackend( 0, "Scanning Backend" );
             m_archivelimits = new ArchiveLimits( 0, "Archive Limits" );
-            m_archivetypes = new ArchiveTypes( 0, "Archive Types" );
 	    m_emailprotection = new Sigtool ( 0, "E-mail protection" );
             m_specialfiletypes = new SpecialFileTypes( 0, "File Types" );
 	    /* m_autoscanoptions = new AutoScanOptions( 0, "Auto-Scan" ); */
@@ -68,7 +66,6 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC
     slotToggleClamdscan( m_klambackend->kcfg_ScannerClamdscan->isOn() ); // initial state
 
     addPage( m_archivelimits, i18n( "Archive Limits" ), "ark", i18n( "Configure Archive Limits" ) );
-    addPage( m_archivetypes,   i18n( "Archive Types" ), "application-x-tarz", i18n( "Configure Archive Types" ) );
     addPage( m_emailprotection, i18n( "E-mail protection" ), "email", i18n( "Set up your e-mail client to use Klammail" ) );
     addPage( m_specialfiletypes, i18n( "File Types" ), "folder", i18n( "Configure File Types" ) );
     /* addPage( m_autoscanoptions, i18n( "Auto-Scan" ), "filefind", i18n( "Configure Auto-Scan" ) ); */
@@ -96,7 +93,6 @@ void KlamavConfigDialog::slotToggleClamdscan(bool on)
 {
         m_klambackend->kcfg_ClamdMultiscan->setEnabled(on);
         m_archivelimits->setEnabled(!on);
-        m_archivetypes->setEnabled(!on);
         m_specialfiletypes->setEnabled(!on);
 }
 
diff --git a/src/configdialog.h b/src/configdialog.h
index 8bb26af..951c571 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -48,7 +48,6 @@ class KlamavConfigDialog : public TDEConfigDialog
 
 	class KlamBackend *m_klambackend;
         class ArchiveLimits  *m_archivelimits;
-        class ArchiveTypes  *m_archivetypes;
         class SpecialFileTypes     *m_specialfiletypes;
 	class Sigtool	*m_emailprotection;
 	class AutoScanOptions     *m_autoscanoptions;
diff --git a/src/klamavconfig.kcfg b/src/klamavconfig.kcfg
index 017730f..6b05806 100644
--- a/src/klamavconfig.kcfg
+++ b/src/klamavconfig.kcfg
@@ -44,99 +44,6 @@
     </entry>
 </group>
 
-<group name="ArchiveTypes"> 
-    <entry name="ScanDeb" type="Bool">
-        <label>Scan DEB files</label>
-        <whatsthis>Scan DEB files using the named program.</whatsthis>
-        <default>false</default>
-    </entry>
-    <entry name="DebUsing" type="String">
-        <label>Program to scan DEB files.</label>
-        <whatsthis>Scan DEB files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanTar" type="Bool">
-        <label>Scan TAR files</label>
-        <whatsthis>Scan TAR files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="TarUsing" type="String">
-        <label>Program to scan TAR files.</label>
-        <whatsthis>Scan TAR files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanJar" type="Bool">
-        <label>Scan JAR files</label>
-        <whatsthis>Scan JAR files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="JarUsing" type="String">
-        <label>Program to scan JAR files.</label>
-        <whatsthis>Scan JAR files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanLzh" type="Bool">
-        <label>Scan LZH files</label>
-        <whatsthis>Scan LZH files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="LzhUsing" type="String">
-        <label>Program to scan LZH files.</label>
-        <whatsthis>Scan LZH files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanZoo" type="Bool">
-        <label>Scan Zoo files</label>
-        <whatsthis>Scan Zoo files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="ZooUsing" type="String">
-        <label>Program to scan Zoo files.</label>
-        <whatsthis>Scan Zoo files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanRar" type="Bool">
-        <label>Scan RAR files</label>
-        <whatsthis>Scan RAR files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="RarUsing" type="String">
-        <label>Program to scan RAR files.</label>
-        <whatsthis>Scan RAR files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanZip" type="Bool">
-        <label>Scan Zip files</label>
-        <whatsthis>Scan Zip files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="ZipUsing" type="String">
-        <label>Program to scan Zip files.</label>
-        <whatsthis>Scan Zip files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanTgz" type="Bool">
-        <label>Scan TGZ files</label>
-        <whatsthis>Scan TGZ files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="TgzUsing" type="String">
-        <label>Program to scan TGZ files.</label>
-        <whatsthis>Scan TGZ files using the named program.</whatsthis>
-    </entry>
-
-    <entry name="ScanArj" type="Bool">
-        <label>Scan ARJ files</label>
-        <whatsthis>Scan ARJ files using the named program.</whatsthis>
-	<default>false</default>
-    </entry>
-    <entry name="ArjUsing" type="String">
-        <label>Program to scan ARJ files.</label>
-        <whatsthis>Scan ARJ files using the named program.</whatsthis>
-    </entry>
-
-</group>
-
 <group name="FileTypes"> 
     <entry name="VirusEncrypted" type="Bool">
         <label>Mark Encrypted Files as Suspicious</label>
diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp
index 0e5e702..c6efd93 100644
--- a/src/scanviewer.cpp
+++ b/src/scanviewer.cpp
@@ -384,7 +384,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
         for (TQStringList::Iterator ita = lastQuarLocations.begin(); ita == lastQuarLocations.begin() ; ita++){
                 quarloc = *ita;
         }
-        excludes += TQString(" --exclude=%1 ").arg(quarloc);
+        excludes += TQString(" --exclude-dir=%1 ").arg(quarloc);
     }
 
 
@@ -419,96 +419,24 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur
 //         options += "--block-max ";
 
     if (KlamavConfig::virusEncrypted())
-        options += "--block-encrypted ";
+        options += "--alert-encrypted ";
 
     if (!(KlamavConfig::scanMail()))
-        options += "--no-mail ";
+        options += "--scan-mail=no ";
 
     if (!(KlamavConfig::scanHTML()))
-        options += "--no-html ";
+        options += "--scan-html=no ";
 
     if (!(KlamavConfig::scanPE()))
-        options += "--no-pe ";
+        options += "--scan-pe=no ";
 
     if (!(KlamavConfig::scanMacros()))
-        options += "--no-ole2 ";
+        options += "--scan-ole2=no ";
 
     if (KlamavConfig::virusBroken())
-        options += "--detect-broken ";
+        options += "--alert-broken ";
 
 
-    if (KlamavConfig::scanZip()){
-        options += "--unzip";
-        if ((KlamavConfig::zipUsing()) != "")
-            options += "="+(KlamavConfig::zipUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanRar()){
-        options += "--unrar";
-        if ((KlamavConfig::rarUsing()) != "")
-            options += "="+(KlamavConfig::rarUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanArj()){
-        options += "--arj";
-        if ((KlamavConfig::arjUsing()) != "")
-            options += "="+(KlamavConfig::arjUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanZoo()){
-        options += "--unzoo";
-        if ((KlamavConfig::zooUsing()) != "")
-            options += "="+(KlamavConfig::zooUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanLzh()){
-        options += "--lha";
-        if ((KlamavConfig::lzhUsing()) != "")
-            options += "="+(KlamavConfig::lzhUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanJar()){
-        options += "--jar";
-        if ((KlamavConfig::jarUsing()) != "")
-            options += "="+(KlamavConfig::jarUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanDeb()){
-        options += "--deb";
-        if ((KlamavConfig::debUsing()) != "")
-            options += "="+(KlamavConfig::debUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanTar()){
-        options += "--tar";
-        if ((KlamavConfig::tarUsing()) != "")
-            options += "="+(KlamavConfig::tarUsing())+" ";
-        else
-            options+=" ";
-    }
-
-    if (KlamavConfig::scanTgz()){
-        options += "--tgz";
-        if ((KlamavConfig::tgzUsing()) != "")
-            options += "="+(KlamavConfig::tgzUsing())+" ";
-        else
-            options+=" ";
-    }
-
     if(clamdscan) {
         // make sure that clamd is running
         FILE* clamdpid;
diff --git a/translations/messages/klamav.pot b/translations/messages/klamav.pot
index 1ee945f..05dc5e5 100644
--- a/translations/messages/klamav.pot
+++ b/translations/messages/klamav.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-05 22:20+0200\n"
+"POT-Creation-Date: 2021-02-05 23:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,54 +49,53 @@ msgstr ""
 msgid "Multiple Directories Selected"
 msgstr ""
 
-#: configdialog.cpp:66
+#: configdialog.cpp:65
 msgid "Backend"
 msgstr ""
 
-#: configdialog.cpp:66
+#: configdialog.cpp:65
 msgid "Configure Scanning Backend"
 msgstr ""
 
 #: archivelimits.ui:16 archivelimits.ui:38
-#: archivetypes.ui:16 configdialog.cpp:70
+#: configdialog.cpp:69
 #, no-c-format
 msgid "Archive Limits"
 msgstr ""
 
-#: configdialog.cpp:70
+#: configdialog.cpp:69
 msgid "Configure Archive Limits"
 msgstr ""
 
-#: archivetypes.ui:27 configdialog.cpp:71 klamscanoptions.cpp:201
-#, no-c-format
+#: configdialog.cpp:70 klamscanoptions.cpp:201
 msgid "Archive Types"
 msgstr ""
 
-#: configdialog.cpp:71
+#: configdialog.cpp:70
 msgid "Configure Archive Types"
 msgstr ""
 
-#: configdialog.cpp:72
+#: configdialog.cpp:71
 msgid "E-mail protection"
 msgstr ""
 
-#: configdialog.cpp:72
+#: configdialog.cpp:71
 msgid "Set up your e-mail client to use Klammail"
 msgstr ""
 
-#: configdialog.cpp:73
+#: configdialog.cpp:72
 msgid "File Types"
 msgstr ""
 
-#: configdialog.cpp:73
+#: configdialog.cpp:72
 msgid "Configure File Types"
 msgstr ""
 
-#: configdialog.cpp:75
+#: configdialog.cpp:74
 msgid "Event Logging"
 msgstr ""
 
-#: configdialog.cpp:75
+#: configdialog.cpp:74
 msgid "Configure Events to Log"
 msgstr ""
 
@@ -547,7 +546,7 @@ msgstr ""
 msgid "Update Process Died Unexpectedly!"
 msgstr ""
 
-#: freshklam.cpp:491 scanviewer.cpp:674
+#: freshklam.cpp:491 scanviewer.cpp:602
 msgid "Unknown option passed."
 msgstr ""
 
@@ -728,7 +727,7 @@ msgstr ""
 msgid "Welcome"
 msgstr ""
 
-#: klamav.cpp:214 scanviewer.cpp:662
+#: klamav.cpp:214 scanviewer.cpp:590
 msgid "Quarantine"
 msgstr ""
 
@@ -966,11 +965,11 @@ msgid ""
 "your self."
 msgstr ""
 
-#: kuarantine.cpp:640 kuarantine.cpp:646 scanviewer.cpp:839
+#: kuarantine.cpp:640 kuarantine.cpp:646 scanviewer.cpp:767
 msgid "Search for %1 with Trend Micro"
 msgstr ""
 
-#: kuarantine.cpp:641 kuarantine.cpp:647 scanviewer.cpp:841
+#: kuarantine.cpp:641 kuarantine.cpp:647 scanviewer.cpp:769
 msgid "Search for %1 with Google"
 msgstr ""
 
@@ -1033,7 +1032,7 @@ msgid ""
 msgstr ""
 
 #: scanviewer.cpp:211 scanviewer.cpp:224 scanviewer.cpp:233 scanviewer.cpp:239
-#: scanviewer.cpp:249 scanviewer.cpp:257 scanviewer.cpp:709
+#: scanviewer.cpp:249 scanviewer.cpp:257 scanviewer.cpp:637
 #, c-format
 msgid "Files scanned: %1"
 msgstr ""
@@ -1050,177 +1049,177 @@ msgstr ""
 msgid "Files scanned:"
 msgstr ""
 
-#: scanviewer.cpp:520
+#: scanviewer.cpp:448
 msgid ""
 "The ClamAV daemon does not seem to be running on this system. Do you really "
 "want to continue with this scan or would you like to launch a standalone "
 "scan instead?'"
 msgstr ""
 
-#: scanviewer.cpp:521
+#: scanviewer.cpp:449
 msgid "Clamd not running"
 msgstr ""
 
-#: scanviewer.cpp:522
+#: scanviewer.cpp:450
 msgid "Continue this scan"
 msgstr ""
 
-#: scanviewer.cpp:523
+#: scanviewer.cpp:451
 msgid "Launch standalone scan"
 msgstr ""
 
-#: scanviewer.cpp:524
+#: scanviewer.cpp:452
 msgid "Do not ask me again"
 msgstr ""
 
-#: scanviewer.cpp:604
+#: scanviewer.cpp:532
 msgid ""
 "If viruses were found, you can right-click to quarantine selected files."
 msgstr ""
 
-#: scanviewer.cpp:629
+#: scanviewer.cpp:557
 msgid "Cancelled"
 msgstr ""
 
-#: scanviewer.cpp:646
+#: scanviewer.cpp:574
 msgid "Scan Complete"
 msgstr ""
 
-#: scanviewer.cpp:653
+#: scanviewer.cpp:581
 msgid "Scan Complete - No Viruses Found!"
 msgstr ""
 
-#: scanviewer.cpp:655
+#: scanviewer.cpp:583
 msgid "Scan Complete - No Viruses Found But Some Errors Encountered!"
 msgstr ""
 
-#: scanviewer.cpp:662
+#: scanviewer.cpp:590
 msgid ""
 "I'm going to quarantine this lot, you can restore them later if you want. If "
 "you don't want to quarantine, just press cancel."
 msgstr ""
 
-#: scanviewer.cpp:662
+#: scanviewer.cpp:590
 msgid "Quarantine Infected Files"
 msgstr ""
 
-#: scanviewer.cpp:672
+#: scanviewer.cpp:600
 msgid "Scan Complete - Viruses Found!"
 msgstr ""
 
-#: scanviewer.cpp:676
+#: scanviewer.cpp:604
 msgid "Database initialization error."
 msgstr ""
 
-#: scanviewer.cpp:678
+#: scanviewer.cpp:606
 msgid "Not supported file type."
 msgstr ""
 
-#: scanviewer.cpp:680
+#: scanviewer.cpp:608
 msgid "Can't open directory."
 msgstr ""
 
-#: scanviewer.cpp:682
+#: scanviewer.cpp:610
 msgid "Can't open file. (ofm)"
 msgstr ""
 
-#: scanviewer.cpp:684
+#: scanviewer.cpp:612
 msgid "Error reading file. (ofm)"
 msgstr ""
 
-#: scanviewer.cpp:686
+#: scanviewer.cpp:614
 msgid "Can't stat input file / directory."
 msgstr ""
 
-#: scanviewer.cpp:688
+#: scanviewer.cpp:616
 msgid "Can't get absolute path name of current working directory."
 msgstr ""
 
-#: scanviewer.cpp:690
+#: scanviewer.cpp:618
 msgid "I/O error, please check your filesystem."
 msgstr ""
 
-#: scanviewer.cpp:692
+#: scanviewer.cpp:620
 msgid "Can't get information about current user from /etc/passwd."
 msgstr ""
 
-#: scanviewer.cpp:694
+#: scanviewer.cpp:622
 msgid ""
 "Can't get information about user 'clamav' (default name) from /etc/passwd."
 msgstr ""
 
-#: scanviewer.cpp:696
+#: scanviewer.cpp:624
 msgid "Can't fork."
 msgstr ""
 
-#: scanviewer.cpp:698
+#: scanviewer.cpp:626
 msgid "Can't create temporary files/directories (check permissions)."
 msgstr ""
 
-#: scanviewer.cpp:700
+#: scanviewer.cpp:628
 msgid "Can't write to temporary directory (please specify another one)."
 msgstr ""
 
-#: scanviewer.cpp:702
+#: scanviewer.cpp:630
 msgid "Can't allocate and clear memory (calloc)."
 msgstr ""
 
-#: scanviewer.cpp:704
+#: scanviewer.cpp:632
 msgid "Can't allocate memory (malloc)."
 msgstr ""
 
-#: scanviewer.cpp:706
+#: scanviewer.cpp:634
 msgid "Unspecified Error!"
 msgstr ""
 
-#: scanviewer.cpp:734
+#: scanviewer.cpp:662
 msgid "0 viruses/problems found"
 msgstr ""
 
-#: scanviewer.cpp:784
+#: scanviewer.cpp:712
 msgid ""
 "<p>There was a problem quarantining <b>%1</b>. Check your diskspace, the "
 "permissions on your quarantine location and whether a file with the same "
 "name already exists in the quarantine. </p>"
 msgstr ""
 
-#: scanviewer.cpp:971
+#: scanviewer.cpp:899
 msgid "Please Wait"
 msgstr ""
 
-#: scanviewer.cpp:1008
+#: scanviewer.cpp:936
 msgid "Attempts to scan "
 msgstr ""
 
-#: scanviewer.cpp:1008
+#: scanviewer.cpp:936
 msgid " resulted in exceeding a limit you set in 'Archive Limits'."
 msgstr ""
 
-#: scanviewer.cpp:1010
+#: scanviewer.cpp:938
 msgid " contains the ClamAV test signature. It's not a virus."
 msgstr ""
 
-#: scanviewer.cpp:1012
+#: scanviewer.cpp:940
 msgid " is a damaged exectuable. Some viruses use this to conceal themselves."
 msgstr ""
 
-#: scanviewer.cpp:1014
+#: scanviewer.cpp:942
 msgid " has a form of zip compression sometimes used by viruses."
 msgstr ""
 
-#: scanviewer.cpp:1016
+#: scanviewer.cpp:944
 msgid " is an encrypted zip file."
 msgstr ""
 
-#: scanviewer.cpp:1018
+#: scanviewer.cpp:946
 msgid " is an encrypted RAR file."
 msgstr ""
 
-#: scanviewer.cpp:1020
+#: scanviewer.cpp:948
 msgid " is mis-formatted in a way sometimes used by viruses."
 msgstr ""
 
-#: scanviewer.cpp:1031
+#: scanviewer.cpp:959
 msgid ""
 "Hover over each entry for more info. Right-click on entries for more options."
 msgstr ""
@@ -1451,56 +1450,6 @@ msgstr ""
 msgid "Maximum MBs to Extract"
 msgstr ""
 
-#: archivetypes.ui:46
-#, no-c-format
-msgid "Scan DEB packages using:"
-msgstr ""
-
-#: archivetypes.ui:57
-#, no-c-format
-msgid "Scan JAR packages using:"
-msgstr ""
-
-#: archivetypes.ui:68
-#, no-c-format
-msgid "Scan TAR files using:"
-msgstr ""
-
-#: archivetypes.ui:79
-#, no-c-format
-msgid "Scan LZH archives using:"
-msgstr ""
-
-#: archivetypes.ui:95
-#, no-c-format
-msgid "Scan ZOO archives using:"
-msgstr ""
-
-#: archivetypes.ui:121
-#, no-c-format
-msgid "Scan RAR archives using:"
-msgstr ""
-
-#: archivetypes.ui:132
-#, no-c-format
-msgid "Scan &ZIP archives using:"
-msgstr ""
-
-#: archivetypes.ui:135
-#, no-c-format
-msgid "Alt+Z"
-msgstr ""
-
-#: archivetypes.ui:163
-#, no-c-format
-msgid "Scan TGZ archives using:"
-msgstr ""
-
-#: archivetypes.ui:179
-#, no-c-format
-msgid "Scan ARJ archives using:"
-msgstr ""
-
 #: autoscanoptions.ui:16
 #, no-c-format
 msgid "Options for On-Access Scanning"
@@ -1662,230 +1611,95 @@ msgstr ""
 
 #: klamavconfig.kcfg:49
 #, no-c-format
-msgid "Scan DEB files"
-msgstr ""
-
-#: klamavconfig.kcfg:50 klamavconfig.kcfg:55
-#, no-c-format
-msgid "Scan DEB files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:54
-#, no-c-format
-msgid "Program to scan DEB files."
-msgstr ""
-
-#: klamavconfig.kcfg:59
-#, no-c-format
-msgid "Scan TAR files"
-msgstr ""
-
-#: klamavconfig.kcfg:60 klamavconfig.kcfg:65
-#, no-c-format
-msgid "Scan TAR files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:64
-#, no-c-format
-msgid "Program to scan TAR files."
-msgstr ""
-
-#: klamavconfig.kcfg:69
-#, no-c-format
-msgid "Scan JAR files"
-msgstr ""
-
-#: klamavconfig.kcfg:70 klamavconfig.kcfg:75
-#, no-c-format
-msgid "Scan JAR files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:74
-#, no-c-format
-msgid "Program to scan JAR files."
-msgstr ""
-
-#: klamavconfig.kcfg:79
-#, no-c-format
-msgid "Scan LZH files"
-msgstr ""
-
-#: klamavconfig.kcfg:80 klamavconfig.kcfg:85
-#, no-c-format
-msgid "Scan LZH files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:84
-#, no-c-format
-msgid "Program to scan LZH files."
-msgstr ""
-
-#: klamavconfig.kcfg:89
-#, no-c-format
-msgid "Scan Zoo files"
-msgstr ""
-
-#: klamavconfig.kcfg:90 klamavconfig.kcfg:95
-#, no-c-format
-msgid "Scan Zoo files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:94
-#, no-c-format
-msgid "Program to scan Zoo files."
-msgstr ""
-
-#: klamavconfig.kcfg:99
-#, no-c-format
-msgid "Scan RAR files"
-msgstr ""
-
-#: klamavconfig.kcfg:100 klamavconfig.kcfg:105
-#, no-c-format
-msgid "Scan RAR files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:104
-#, no-c-format
-msgid "Program to scan RAR files."
-msgstr ""
-
-#: klamavconfig.kcfg:109
-#, no-c-format
-msgid "Scan Zip files"
-msgstr ""
-
-#: klamavconfig.kcfg:110 klamavconfig.kcfg:115
-#, no-c-format
-msgid "Scan Zip files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:114
-#, no-c-format
-msgid "Program to scan Zip files."
-msgstr ""
-
-#: klamavconfig.kcfg:119
-#, no-c-format
-msgid "Scan TGZ files"
-msgstr ""
-
-#: klamavconfig.kcfg:120 klamavconfig.kcfg:125
-#, no-c-format
-msgid "Scan TGZ files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:124
-#, no-c-format
-msgid "Program to scan TGZ files."
-msgstr ""
-
-#: klamavconfig.kcfg:129
-#, no-c-format
-msgid "Scan ARJ files"
-msgstr ""
-
-#: klamavconfig.kcfg:130 klamavconfig.kcfg:135
-#, no-c-format
-msgid "Scan ARJ files using the named program."
-msgstr ""
-
-#: klamavconfig.kcfg:134
-#, no-c-format
-msgid "Program to scan ARJ files."
-msgstr ""
-
-#: klamavconfig.kcfg:142
-#, no-c-format
 msgid "Mark Encrypted Files as Suspicious"
 msgstr ""
 
-#: klamavconfig.kcfg:146
+#: klamavconfig.kcfg:53
 #, no-c-format
 msgid "Mark Broken Files as Suspicious"
 msgstr ""
 
-#: klamavconfig.kcfg:150
+#: klamavconfig.kcfg:57
 #, no-c-format
 msgid "Exclude Quarantine Directories from scanning"
 msgstr ""
 
-#: klamavconfig.kcfg:154
+#: klamavconfig.kcfg:61
 #, no-c-format
 msgid "Scan Microsoft Office Macros"
 msgstr ""
 
-#: klamavconfig.kcfg:158
+#: klamavconfig.kcfg:65
 #, no-c-format
 msgid "Scan Portable Executable Files"
 msgstr ""
 
-#: klamavconfig.kcfg:162
+#: klamavconfig.kcfg:69
 #, no-c-format
 msgid "Scan Emails"
 msgstr ""
 
-#: klamavconfig.kcfg:166
+#: klamavconfig.kcfg:73
 #, no-c-format
 msgid "Scan HTML Files"
 msgstr ""
 
-#: klamavconfig.kcfg:175
+#: klamavconfig.kcfg:82
 #, no-c-format
 msgid "Scan Files When They Are Executed"
 msgstr ""
 
-#: klamavconfig.kcfg:179
+#: klamavconfig.kcfg:86
 #, no-c-format
 msgid "Scan Files When They Are Opened"
 msgstr ""
 
-#: klamavconfig.kcfg:183
+#: klamavconfig.kcfg:90
 #, no-c-format
 msgid "Scan Files When They Are Closed"
 msgstr ""
 
-#: klamavconfig.kcfg:187
+#: klamavconfig.kcfg:94
 #, no-c-format
 msgid "Scan Files When They Are Created or Modified"
 msgstr ""
 
-#: klamavconfig.kcfg:195 klamavconfig.kcfg:232
+#: klamavconfig.kcfg:102 klamavconfig.kcfg:139
 #, no-c-format
 msgid "Expire Events After the Specified Number of Days"
 msgstr ""
 
-#: klamavconfig.kcfg:199
+#: klamavconfig.kcfg:106
 #, no-c-format
 msgid "Log Software Update Events"
 msgstr ""
 
-#: klamavconfig.kcfg:203
+#: klamavconfig.kcfg:110
 #, no-c-format
 msgid "Log Quarantine Events"
 msgstr ""
 
-#: klamavconfig.kcfg:207
+#: klamavconfig.kcfg:114
 #, no-c-format
 msgid "Log KlamAV launching and shutting-down Events"
 msgstr ""
 
-#: klamavconfig.kcfg:211
+#: klamavconfig.kcfg:118
 #, no-c-format
 msgid "Log Database Events"
 msgstr ""
 
-#: klamavconfig.kcfg:215
+#: klamavconfig.kcfg:122
 #, no-c-format
 msgid "Log StartedStoppedCancelled Events"
 msgstr ""
 
-#: klamavconfig.kcfg:219
+#: klamavconfig.kcfg:126
 #, no-c-format
 msgid "Log VirusFound Events"
 msgstr ""
 
-#: klamavconfig.kcfg:223
+#: klamavconfig.kcfg:130
 #, no-c-format
 msgid "Log Error Events"
 msgstr ""