diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index 2bf57794..b25c786e 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -1,235 +1,235 @@
 /***************************************************************************
  *   Copyright (C) 2005 by Joris Guisson                                   *
  *   joris.guisson@gmail.com                                               *
  *   ivasic@gmail.com                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <klocalizedstring.h>
 #include <util/log.h>
 #include "ipblockingprefpage.h"
 #include "ipfilterpluginsettings.h"
 #include "ipfilterplugin.h"
 #include "downloadandconvertjob.h"
 
 
 using namespace bt;
 
 namespace kt
 {
 
     IPBlockingPrefPage::IPBlockingPrefPage(IPFilterPlugin* p)
         : PrefPageInterface(IPBlockingPluginSettings::self(), i18n("IP Filter"), "view-filter", 0), m_plugin(p)
     {
         setupUi(this);
         connect(kcfg_useLevel1, SIGNAL(toggled(bool)), this, SLOT(checkUseLevel1Toggled(bool)));
         connect(m_download, SIGNAL(clicked()), this, SLOT(downloadClicked()));
         connect(kcfg_autoUpdate, SIGNAL(toggled(bool)), this, SLOT(autoUpdateToggled(bool)));
         connect(kcfg_autoUpdateInterval, SIGNAL(valueChanged(int)), this, SLOT(autoUpdateIntervalChanged(int)));
-        kcfg_autoUpdateInterval->setSuffix(ki18np(" day", " days").toString());
+        kcfg_autoUpdateInterval->setSuffix(ki18np(" day", " days"));
         m_job = 0;
         m_verbose = true;
     }
 
     IPBlockingPrefPage::~IPBlockingPrefPage()
     {}
 
     void IPBlockingPrefPage::checkUseLevel1Toggled(bool check)
     {
         if (check)
         {
             kcfg_filterURL->setEnabled(true);
             m_download->setEnabled(true);
             m_plugin->loadAntiP2P();
         }
         else
         {
             m_status->setText("");
             kcfg_filterURL->setEnabled(false);
             m_download->setEnabled(false);
             m_plugin->unloadAntiP2P();
         }
 
         if (m_plugin->loadedAndRunning() && check)
             m_status->setText(i18n("Status: Loaded and running."));
         else
             m_status->setText(i18n("Status: Not loaded."));
 
         updateAutoUpdate();
     }
 
     void IPBlockingPrefPage::loadDefaults()
     {
         loadSettings();
     }
 
     void IPBlockingPrefPage::updateSettings()
     {
         m_plugin->checkAutoUpdate();
     }
 
     void IPBlockingPrefPage::loadSettings()
     {
         if (IPBlockingPluginSettings::useLevel1())
         {
             if (m_plugin->loadedAndRunning())
                 m_status->setText(i18n("Status: Loaded and running."));
             else
                 m_status->setText(i18n("Status: Not loaded."));
 
             kcfg_filterURL->setEnabled(true);
             m_download->setEnabled(true);
             m_last_updated->clear();
             m_next_update->clear();
             kcfg_autoUpdateInterval->setEnabled(IPBlockingPluginSettings::autoUpdate());
             m_auto_update_group_box->setEnabled(true);
         }
         else
         {
             m_status->setText(i18n("Status: Not loaded."));
             kcfg_filterURL->setEnabled(false);
             m_download->setEnabled(false);
             m_last_updated->clear();
             m_next_update->clear();
             kcfg_autoUpdateInterval->setEnabled(IPBlockingPluginSettings::autoUpdate());
             m_auto_update_group_box->setEnabled(false);
         }
 
         updateAutoUpdate();
     }
 
     void IPBlockingPrefPage::downloadClicked()
     {
         QUrl url = kcfg_filterURL->url();
 
         // block GUI so you cannot do stuff during conversion
         m_download->setEnabled(false);
         m_status->setText(i18n("Status: Downloading and converting new block list..."));
         kcfg_useLevel1->setEnabled(false);
         kcfg_filterURL->setEnabled(false);
 
         m_plugin->unloadAntiP2P();
         m_job = new DownloadAndConvertJob(url, m_verbose ? DownloadAndConvertJob::Verbose : DownloadAndConvertJob::Quietly);
         connect(m_job, SIGNAL(result(KJob*)), this, SLOT(downloadAndConvertFinished(KJob*)));
         connect(m_job, SIGNAL(notification(QString)), m_plugin, SLOT(notification(QString)));
         m_job->start();
     }
 
     bool IPBlockingPrefPage::doAutoUpdate()
     {
         if (m_job)
         {
             if (m_job->isAutoUpdate())
                 return true; // if we are already auto updating, lets not start it again
             else
                 return false;
         }
 
         m_verbose = false;
         Out(SYS_IPF | LOG_NOTICE) << "Doing ipfilter auto update !" << endl;
         downloadClicked();
         m_verbose = true;
         return true;
     }
 
     void IPBlockingPrefPage::restoreGUI()
     {
         m_download->setEnabled(true);
         kcfg_useLevel1->setEnabled(true);
         kcfg_filterURL->setEnabled(true);
 
         if (m_plugin->loadedAndRunning())
             m_status->setText(i18n("Status: Loaded and running."));
         else
             m_status->setText(i18n("Status: Not loaded."));
     }
 
     void IPBlockingPrefPage::downloadAndConvertFinished(KJob* j)
     {
         if (j != m_job)
             return;
 
         KConfigGroup g = KSharedConfig::openConfig()->group("IPFilterAutoUpdate");
         if (!j->error())
         {
             g.writeEntry("last_updated", QDateTime::currentDateTime());
             g.writeEntry("last_update_ok", true);
         }
         else
         {
             g.writeEntry("last_update_attempt", QDateTime::currentDateTime());
             g.writeEntry("last_update_ok", false);
         }
 
         g.sync();
 
         m_job = 0;
         m_plugin->loadAntiP2P();
         restoreGUI();
         updateAutoUpdate();
         updateFinished();
     }
 
     void IPBlockingPrefPage::updateAutoUpdate()
     {
         if (!kcfg_useLevel1->isChecked())
         {
             m_next_update->clear();
             m_last_updated->clear();
             return;
         }
 
         KConfigGroup g = KSharedConfig::openConfig()->group("IPFilterAutoUpdate");
         bool ok = g.readEntry("last_update_ok", true);
         QDate last_updated = g.readEntry("last_updated", QDate());
 
         if (last_updated.isNull())
             m_last_updated->setText(i18n("No update done yet."));
         else if (ok)
             m_last_updated->setText(last_updated.toString());
         else
             m_last_updated->setText(i18n("%1 (Last update attempt failed.)", last_updated.toString()));
 
         if (kcfg_autoUpdate->isChecked())
         {
             QDate next_update;
             if (last_updated.isNull())
                 next_update = QDate::currentDate().addDays(kcfg_autoUpdateInterval->value());
             else
                 next_update = last_updated.addDays(kcfg_autoUpdateInterval->value());
 
             m_next_update->setText(next_update.toString());
         }
         else
         {
             m_next_update->setText(i18n("Never"));
         }
     }
 
     void IPBlockingPrefPage::autoUpdateToggled(bool on)
     {
         Q_UNUSED(on);
         updateAutoUpdate();
     }
 
     void IPBlockingPrefPage::autoUpdateIntervalChanged(int val)
     {
         Q_UNUSED(val);
         updateAutoUpdate();
     }
 
 }
 
diff --git a/plugins/ipfilter/ipblockingprefpage.ui b/plugins/ipfilter/ipblockingprefpage.ui
index 90c9ce1c..d77b6c89 100644
--- a/plugins/ipfilter/ipblockingprefpage.ui
+++ b/plugins/ipfilter/ipblockingprefpage.ui
@@ -1,274 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>IPBlockingPrefPage</class>
  <widget class="QWidget" name="IPBlockingPrefPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>564</width>
     <height>444</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>IPBlocking Preferences</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="groupBox1">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="title">
       <string>PeerGuardian Filter File </string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QCheckBox" name="kcfg_useLevel1">
         <property name="toolTip">
          <string>Enable this if you want the IP filter plugin to work.</string>
         </property>
         <property name="text">
          <string>Use PeerGuardian filter</string>
         </property>
         <property name="shortcut">
          <string/>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout">
         <item>
          <widget class="QLabel" name="textLabel1_3">
           <property name="text">
            <string>IP filter file:</string>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KUrlRequester" name="kcfg_filterURL">
           <property name="toolTip">
            <string>Filter file to use, this can be a local file or a remote file.</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <layout class="QHBoxLayout">
         <item>
          <spacer>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Expanding</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>361</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QPushButton" name="m_download">
           <property name="toolTip">
            <string>Download and convert the IP filter file.</string>
           </property>
           <property name="text">
            <string>Dow&amp;nload/Convert</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <widget class="QLabel" name="textLabel1_2">
         <property name="text">
          <string>Download PeerGuardian filter from bluetack.co.uk or iblocklist.org.
 NOTE: archive files like zip and tar.gz or tar.bz2 are supported.</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="m_status">
         <property name="text">
          <string/>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="m_auto_update_group_box">
      <property name="title">
       <string>Automatic Update</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QCheckBox" name="kcfg_autoUpdate">
           <property name="toolTip">
            <string>Enable this if you want to automatically update the filter file.</string>
           </property>
           <property name="text">
            <string>Update file every:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="kcfg_autoUpdateInterval">
+         <widget class="KPluralHandlingSpinBox" name="kcfg_autoUpdateInterval">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>12</width>
             <height>0</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Update interval in days.</string>
           </property>
           <property name="minimum">
            <number>1</number>
           </property>
           <property name="maximum">
            <number>100000</number>
           </property>
           <property name="value">
            <number>5</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="label">
           <property name="text">
            <string>Last updated:</string>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="QLabel" name="m_last_updated">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string comment="KDE::DoNotExtract">TextLabel</string>
           </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
            <string>Next update:</string>
           </property>
          </widget>
         </item>
         <item row="1" column="1">
          <widget class="QLabel" name="m_next_update">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string comment="KDE::DoNotExtract">TextLabel</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
   </customwidget>
+  <customwidget>
+   <class>KPluralHandlingSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kpluralhandlingspinbox.h</header>
+  </customwidget>
  </customwidgets>
  <includes>
   <include location="local">kurlrequester.h</include>
  </includes>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_autoUpdate</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_autoUpdateInterval</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>90</x>
      <y>244</y>
     </hint>
     <hint type="destinationlabel">
      <x>360</x>
      <y>244</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_useLevel1</sender>
    <signal>toggled(bool)</signal>
    <receiver>m_auto_update_group_box</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>58</x>
      <y>52</y>
     </hint>
     <hint type="destinationlabel">
      <x>114</x>
      <y>218</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>